Use Ruby 1.9 for bindings as suggested by upstream, bug #490172

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

3 files changed, 19 insertions, 22 deletions

diff --git a/dev-libs/Ice/ChangeLog b/dev-libs/Ice/ChangeLog
index b081fed439f0..2e5e6ccf5415 100644
--- a/dev-libs/Ice/ChangeLog
+++ b/dev-libs/Ice/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/Ice
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v 1.26 2013/10/11 08:01:53 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v 1.27 2013/11/26 13:31:45 pinkbyte Exp $
+
+  26 Nov 2013; Sergey Popov <pinkbyte@gentoo.org> Ice-3.5.1.ebuild:
+  Use Ruby 1.9 for bindings as suggested by upstream, bug #490172
 
 *Ice-3.5.1 (11 Oct 2013)
 
diff --git a/dev-libs/Ice/Ice-3.5.1.ebuild b/dev-libs/Ice/Ice-3.5.1.ebuild
index c05957e7eea9..9957808b85a9 100644
--- a/dev-libs/Ice/Ice-3.5.1.ebuild
+++ b/dev-libs/Ice/Ice-3.5.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild,v 1.1 2013/10/11 08:01:53 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild,v 1.2 2013/11/26 13:31:45 pinkbyte Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 RUBY_OPTIONAL="yes"
-USE_RUBY="ruby18"
+USE_RUBY="ruby19"
 
 inherit toolchain-funcs versionator python-r1 mono-env ruby-ng db-use
 
@@ -25,7 +25,7 @@ RDEPEND=">=dev-libs/expat-2.0.1
 	<sys-libs/db-6.0[cxx]
 	~dev-cpp/libmcpp-2.7.2
 	python? ( ${PYTHON_DEPS} )
-	ruby? ( $(ruby_implementation_depend ruby18) )
+	ruby? ( $(ruby_implementation_depend ruby19) )
 	mono? ( dev-lang/mono )
 	!dev-python/IcePy
 	!dev-ruby/IceRuby"
@@ -115,13 +115,13 @@ src_configure() {
 	fi
 
 	if use ruby ; then
-		SITERUBY="$(ruby18 -r rbconfig -e 'print Config::CONFIG["sitedir"]')"
+		SITERUBY="$(ruby19 -r rbconfig -e 'print Config::CONFIG["sitedir"]')"
 		MAKE_RULES_RB="install_rubydir=\"${ED}/${SITERUBY}\"
 			install_libdir=\"${ED}/${SITERUBY}\""
 
-		# make it use ruby18 only
+		# make it use ruby19 only
 		sed -i \
-			-e 's|RUBY = ruby|\018|' \
+			-e 's|RUBY = ruby|\019|' \
 			rb/config/Make.rules || die "sed failed"
 	fi
 
diff --git a/dev-libs/Ice/Manifest b/dev-libs/Ice/Manifest
index 5c33e1c1811c..ba5083f77d61 100644
--- a/dev-libs/Ice/Manifest
+++ b/dev-libs/Ice/Manifest
@@ -12,23 +12,17 @@ DIST Ice-3.5.1.pdf 8279548 SHA256 236f509a3868301ebe688f50417f30155ffa1d330a6c7a
 DIST Ice-3.5.1.tar.gz 4799296 SHA256 989e51194c6adadbd156da3288e37bad847b93b3b876502e83033b70493af392 SHA512 610fa317bd75e64802d1b5216db4747f86157d3246a2022397bafaefdd9b1b78d131733762003ee779065401c8a83120db65cf9b86fbf1914266309571baf58f WHIRLPOOL 0b760edcd7e3eb1220af81a2236634b86775a18050b0645e4e662bf0fb543aa14177d83e2c8659a62bd5bf6e403384998b893e84b9d547c32bbc2064b5f7de9c
 EBUILD Ice-3.4.2.ebuild 6943 SHA256 223d6682df8a00fbe262b9fa881cc67110e75b7eccd6769137b551715f087339 SHA512 ddb90a72e4adb1a660d54ab562ec1d54492c417f94cdc7e02db6db0b147c3c9ed49c09f11a267da2d1c821ae5563dd639c5dda18adc64ef2b024d0a04c2d95ad WHIRLPOOL 81f67259aa23356b35d0673d6fd0f91acf41a72538d021c6061b30e3368558593cc6f3b2f124eddd1582a864723b97cdafa8b2ac770ac2e754965aa51037083c
 EBUILD Ice-3.5.0-r1.ebuild 6742 SHA256 b313b7484483e7ed33895e786bf2cab4b1e89333df61609050e6c6d4b906dd49 SHA512 d0c9969881a9cf7f433f2c2a9398f1b8099f6968dac016ff27e09214d69be742507f94b450d816d1bebcad8473a4d24cf3c34d7259073d0f8961476c0d99dd94 WHIRLPOOL 3076974438db2d3f7a4cba7bc41d4f97985881107a0739f8feadfa38317aa933254eac393378f299dc39097fa547eee852c9e0262edfee1800b9c1ec3884015b
-EBUILD Ice-3.5.1.ebuild 6786 SHA256 f008c6174777fdb46f071d13c1fc3661f72e3aaffac3990f09811fa14a4c22af SHA512 aa2f9ba0262abae122f78ac40bd73662bc6cfaf082f54c33a5812e001d558813ced0b15e2684c5cb35f8ef2f27276c879e675965a55f011ad353c6117c76c9cf WHIRLPOOL 207eba39f12375151f5d470f2625aa835cc013ab53dbe25ecabbf99b5f21edc6db4850458363348e6a9008a2d4ccf760adb5b7672f766709f7f061ac691ad3c9
-MISC ChangeLog 11496 SHA256 3b27c4eb34fb5141406e1abfd1ff6e251fb69c3b1506635b9c63e8f7ec28913a SHA512 a16cf0b1709330fc6da789837cb5c89e3ce964e38edf375da4ae3b13a8e994091482db08eab8bb4616755ebabb208079750c3f7b26c501c874b2679f22b92756 WHIRLPOOL 7e49ac00e7a7b0292a1e404c0c1c3850098144e2899b3386ca5b7ce686f2a39c31e8880664888e510ac1347c14c737a24134be602ed267a5bf2612120b6ef010
+EBUILD Ice-3.5.1.ebuild 6782 SHA256 87325399b104ddb9c02e9825ea7d4706c91bb504ca82b71729f5f2c6529224ea SHA512 9f83c9b09303d0d74ce4bb76696c714f2e7695859e4b444b27d3c644f09b382c8d5da064ae5a7aafb8e8651f4ff7fd9bb13ca70ed3722b9684db9f415270d768 WHIRLPOOL e815f16762570523973725bedc30612c1486da4884853753e5f2418025f2fec49a90f7b74ee1e32425586275c69afd02e34a963801ab74428cedd4ea4c33c87d
+MISC ChangeLog 11627 SHA256 b664dbc863fb4e43a6362bb1199a183b72a8d65a0b230d6740dfee78e9b0a460 SHA512 4a4f0e1f58edacd4c26d5627ffc89a96e24d344a6069e2aa21e86548dce2cca1fe9de7ad4dda8df4901d38bb4b091da06520c8ca0f7991b3dbdab7c1842696df WHIRLPOOL 8971ea7d26ec3e744807dcafe694f28a797a7259538b27954fabdf41cf8b1b6325e329c52836b6d3b9d7733cdcc5c07e88d083a905d818065994d409ce10d8bd
 MISC metadata.xml 339 SHA256 dec27f6d803819a7791826c1a98a83a1c21a23df0a3384234ac68abf8b8466a3 SHA512 a52d0a34b45483cbf16e870e458c31e002a62fbe4c18b7839964476696a8650c6db254392f8ff6166f4a434958eb2384cd3267f004c45726d75907983f494e60 WHIRLPOOL 8362526bb468b608b63bb17ea08ee20050904aeed1728efea1e48420fb2b5e820cedcedbecee0a37c0a2b061e0a06aa67ce6b18e148d4fbb785d528e6a80c2f3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSV7BzAAoJEPiazRVxLXTFLv0QANj9knHpz3qJBZunBsTKThOx
-/EN+4GwebjYgM+bAmfa0ZuiFcd5SrUZqshkYUUdSONE54DaCbYwFxZ5xh1o1SE/r
-oO+ByGWTSJU+TBvi5JFn88z6qfEcsCbnIVeSV/mtMgBzU7YVcYBdygGYkhUEV4YJ
-eN8YiuQFSK4bwe/r3E9NpZ8diVLpb+uZe9Fbq08FNMROgqyr0OrEKsMRgiXefW/A
-ztFoc9OPFEJtC4a32aofO1wOOTnlTRhfKuUYLs8N+MTIH7OcyAtlx0nzzZnswlHK
-vQhyjU/KkAR2pZKc/H5vM/vLpxP43p+00kCmtZhDWbMWAOhL9zLvMsihJJDch5ZA
-Kq60mt2BVb2X1K84A3DolG1MCSkvoe/Z5H6c433CBDxP5Q+4WODzclK63UoD84zg
-ICYwXqxhPTZdRIHwNbjgMIMl1K7ljF302mE4f9Y+ehE6LxrGodQXPadsePmISAqf
-2f65zKRFhy5PotvzS+Y7Go2AcxgVIIvr3syAFgT05AOx0C/P90ljscRqb52tuDnH
-I+jBL79cieF5jzzFyBqdHLe3YkuUlGvtxaGtNGsLArVmmLODp00vjm772FGTn3Sa
-wD08FPq2ZFno0Mm+rd9cPpufl1KeiYzFN7G26h6BlY+PlpXHrAUq224Fy0KzjF4Y
-SEEH9cXMelhRCqflUjWh
-=ZxYo
+iQEcBAEBCAAGBQJSlKK1AAoJECo/aRed9267swsIAISPBpOtBtb0KtYZdx7BSbx1
+VZpSDDm1yu1C6oXWwDR1tyUolsIkFHiiHiuSo7p7bEeXW7Kheav6xJSSAdpGZ0IH
+JVCrX7zhp2B5PgpQT85A/K6Hpen4kNASGjWspnZ/J14CAOzOX+jKaJ11gv3mMS8R
+HFBw8VJ8brIYBGNm+nkSUES6row51V7DrHJlex/cY4yrIdkPwxPQfY2Alzx3e5na
+aPlPoOvIWt1OcM4ns2V/995OUHtU61I7ZbyotrbVfiH8tvAkszvHmYhqUoLpn/i5
+O9HwXQGf/Dd+9TnCjUDGvSN3jAoGSY+LLq6Klp3mCxcg2vGtFu6fg6fYvoRJd0k=
+=mD9k
 -----END PGP SIGNATURE-----