Patchlevel bump, removing old, cleanup.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 41 insertions, 30 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index aeec2a3c3110..29b2cc30026c 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lang/ruby
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.414 2009/06/17 15:45:48 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.415 2009/06/18 13:12:32 a3li Exp $
+
+*ruby-1.8.7_p174 (18 Jun 2009)
+
+  18 Jun 2009; Alex Legler <a3li@gentoo.org> ruby-1.8.6_p369.ebuild,
+  -ruby-1.8.7_p173.ebuild, +ruby-1.8.7_p174.ebuild:
+  Replacing 187_p173 with _p174 because of a regression. Unifying the
+  ebuilds by adding unset RUBYOPT to the 186 ebuild. Migrated 187_p174 to
+  patchsets.
 
   17 Jun 2009; Brent Baude <ranger@gentoo.org> ruby-1.8.6_p369.ebuild:
   Marking ruby-1.8.6_p369 ppc64 for bug 273213
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index a901a944e93c..4028109d57b6 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX auto_gem.rb 509 RMD160 f8ffc36e384592956e6508b952ea80110f73efe3 SHA1 498f8963c27cad7e8334b2e797c51f6ac2101b1b SHA256 f0f7f61b110955325be52d278fcc1d3f3ea395cd9523dba33af37a44fd59666d
 AUX ruby-1.8.6-memory-leak.diff 1351 RMD160 cba1335fcd52df26b4b2884dea14e0c74852b67a SHA1 184c1743592684abfc1cce8ffa38ae749fe0a1b1 SHA256 90dbc7b444ed936ed8a1fadb443240ec494a6c748d38ff089af423e50bdd9528
 AUX ruby-1.8.6-uclibc-udp.patch 572 RMD160 7f460b16cbb1385aa9be62bd5df5e4f8fa919af3 SHA1 e119dabbf9654be3eaa1e944f71eb334ef207ffb SHA256 520994dcff6873d089213cf07342b419472a762be44247daebcfe0e853d32e37
@@ -11,12 +14,20 @@ AUX ruby19-rubygems-gentoo.patch 1914 RMD160 9668808eb50ac0e96265d8756d6751f625c
 AUX ruby19-rubygems-proxy.patch 407 RMD160 0bfedce42f4879d729b8de650f99a345faaa7ec4 SHA1 aa23a497f0c581374f687690b0b1035092b4b488 SHA256 3cadd23dfbb128e7029ecc01aab3f00f1aaf011e50492c3a967812a2395e1a59
 DIST ruby-1.8.6-p368.tar.bz2 3967709 RMD160 fba1ef4f6b2b069f4fcd4734b09fc36197138929 SHA1 7a2cfb9f0803d21221e7d066837037bbbc50b6ad SHA256 1bd398a125040261f8e9e74289277c82063aae174ada9f300d2bea0a42ccdcc1
 DIST ruby-1.8.6-p369.tar.bz2 3981771 RMD160 34d2763fd7b24c5883eaea457b871708d20c51e8 SHA1 d121f84b1b264f3a72878797222852b272a099fd SHA256 fb6974ab8a0de52511e846eacf113432b5227a867e3c9741d65775f162e13715
-DIST ruby-1.8.7-p173.tar.bz2 4144667 RMD160 4892b14b9f86b6b9c2332f67c22badbc7ebd4201 SHA1 7dd92fedb49f8db5de7c501f5f0a27efd5e94010 SHA256 7cec49bc4afb82188ca4bdb5a0400ec7ede6bf0937af9dd6acaca4e54b8aa760
+DIST ruby-1.8.7-p174.tar.bz2 4144807 RMD160 f854d456003af1e31d50330c88c3cb152c434249 SHA1 9e84b49ad545ad54b8e7dc3c227eaaefeb1041aa SHA256 203978b6db1cc77a79ff03d141d162f6f17d86c3574f76de9eae9d0c8cb920bc
 DIST ruby-1.9.1-p129.tar.bz2 7183891 RMD160 570f567508f9a4ee41e7983ab0a399cbd1a47b8a SHA1 4e36be3bea89c17e2c7e908d5b18bf6071cc91c0 SHA256 cb730f035aec0e3ac104d23d27a79aa9625fdeb115dae2295de65355f449ce27
+DIST ruby-patches-1.8.7_p174.tar.bz2 1255 RMD160 2070ae0a6650331b91bf0f2a3b694a4d1837391f SHA1 f9caa7237c79ab9644c8432665bffaabda407ed3 SHA256 63cb9753737658e7983b7a306be353635085d6966ce94afebfd7ed9b2a3b1fa7
 EBUILD ruby-1.8.6_p368.ebuild 5331 RMD160 2b54339e972132c9927867a9f40aa727ea8a3652 SHA1 bdf903dec1d9d00329be434cd821e473e5f61477 SHA256 14e652675b7a911217f7c03880e687c1a1c4b6382a5b441d7511ee396cf734c3
-EBUILD ruby-1.8.6_p369.ebuild 5334 RMD160 edfd56e4aedf7ab4610e251232595ad29bb54089 SHA1 30a204cf3a95fc23658ede318b48bfc6bd8b7907 SHA256 463c6f9a75df41f67e24ec4d5d759c0602aae3f2c52f8e0e0966cc0d48633efe
-EBUILD ruby-1.8.7_p173.ebuild 5616 RMD160 f61f7ed0073beb08c1d15226b875f94d6ce5c389 SHA1 88c23b7f5ef1cbe268556c5a34230ec85d1e2ed8 SHA256 60e324d0b908680493d966dd3b6ac74fc2967528aef936bfd0503f6aa3960b22
+EBUILD ruby-1.8.6_p369.ebuild 5425 RMD160 ab53dd35a0096cb29b0e9ab1f82c43292e8ffb90 SHA1 8a5521e4182f47db532b651f9a58683d198d49b1 SHA256 c0fc48615e885e9ab69573994278eebc23e388303717e9131b612a48cb077786
+EBUILD ruby-1.8.7_p174.ebuild 5364 RMD160 789658363e9acb34e628e941fbf0ad1f87f169aa SHA1 6dd334c8dd8191f0e7fe49692f960e8f9d62dce7 SHA256 f742994bd3a3b7f02ef9947d8a03ea74fe831c648cdd4ddea827d352258b85b9
 EBUILD ruby-1.9.1_p129-r1.ebuild 5678 RMD160 6e9abf937c66f8be2f483415288daf00c657bf39 SHA1 ad522a26a719f60705af4083edde740ebed458cb SHA256 29f368130ee67073419f74ddeeb4af348575905a2f54c521ab33e0d96d303b7c
 EBUILD ruby-1.9.1_p129.ebuild 5538 RMD160 b8608e8b5287de43ef6f1996270d1d2cccd95ac7 SHA1 77e713a450b68d10ddbebd1cf7d967da95068255 SHA256 8c1c213d9cb537b3428db51653ea50f3e42810359f53d0fd9fed7d378f368872
-MISC ChangeLog 63262 RMD160 54cd37acac38f0bbcb688aae707bf1e37d758de4 SHA1 a08c09c48fbf684cc21ff72709d16d5b11f4c01f SHA256 e0b127e6f8d98008dcbfad42f09a825aa325a3898872dfa53edb08b36bff7b10
+MISC ChangeLog 63571 RMD160 70d9ac1d592fec805b6345d1fcb3201dee96e20a SHA1 5c23b24a3fa6434f578bb447d18d6c62d1444f50 SHA256 65ad8fe81aa8e322f830ec20031d7cd8bb5118b5530df459b418abd4f551df38
 MISC metadata.xml 262 RMD160 f8642aa78425fe09dc0e0660cb20a5bd4233d5bb SHA1 64def0369477ecf76b9285fb9c1cf0e6a4f334e5 SHA256 5ee3c0cfedcb966505e4fafcfc5321a8ee20c128da9bbcafff5aa268df588d59
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAko6PUkACgkQaGsKqSU7eCRptwCggiAjt57F0UdDi5i18oRE3gur
+w7YAn1BO0FWkWOckRvbWM2uLbkE6lb0W
+=YOSJ
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/ruby/ruby-1.8.6_p369.ebuild b/dev-lang/ruby/ruby-1.8.6_p369.ebuild
index f54abccef8ba..010d3f69f309 100644
--- a/dev-lang/ruby/ruby-1.8.6_p369.ebuild
+++ b/dev-lang/ruby/ruby-1.8.6_p369.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.6_p369.ebuild,v 1.8 2009/06/17 15:45:48 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.6_p369.ebuild,v 1.9 2009/06/18 13:12:32 a3li Exp $
 
 inherit autotools eutils flag-o-matic multilib versionator
 
@@ -127,6 +127,9 @@ src_test() {
 }
 
 src_install() {
+	# Ruby is involved in the install process, we don't want interference here.
+	unset RUBYOPT
+
 	LD_LIBRARY_PATH="${D}/usr/$(get_libdir)"
 	RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${SLOT}"
 	for d in $(find "${S}/ext" -type d) ; do
diff --git a/dev-lang/ruby/ruby-1.8.7_p173.ebuild b/dev-lang/ruby/ruby-1.8.7_p174.ebuild
index 744d53ef47e3..6fc018e7e2e7 100644
--- a/dev-lang/ruby/ruby-1.8.7_p173.ebuild
+++ b/dev-lang/ruby/ruby-1.8.7_p174.ebuild
@@ -1,26 +1,23 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.7_p173.ebuild,v 1.1 2009/06/10 05:00:47 graaff Exp $
-
-#PATCHES APPLY, DOESN'T COMPILE THOUGH
-#ONIGURUMA="onigd2_5_9"
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.7_p174.ebuild,v 1.1 2009/06/18 13:12:32 a3li Exp $
 
 inherit autotools eutils flag-o-matic multilib versionator
 
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
-
 MY_P="${PN}-$(replace_version_separator 3 '-')"
 S=${WORKDIR}/${MY_P}
 
+SLOT=$(get_version_component_range 1-2)
+MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
+
 DESCRIPTION="An object-oriented scripting language"
 HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.bz2"
-#	cjk? ( http://www.geocities.jp/kosako3/oniguruma/archive/${ONIGURUMA}.tar.gz )"
+SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.bz2
+		 http://dev.a3li.info/gentoo/distfiles/${PN}-patches-${PV}.tar.bz2"
 
 LICENSE="|| ( Ruby GPL-2 )"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="berkdb debug doc emacs examples gdbm ipv6 rubytests socks5 ssl threads tk xemacs" #cjk
+IUSE="berkdb debug doc emacs examples gdbm ipv6 rubytests socks5 ssl threads tk xemacs"
 
 RDEPEND="
 	berkdb? ( sys-libs/db )
@@ -41,6 +38,8 @@ PROVIDE="virtual/ruby"
 pkg_setup() {
 	use tk || return
 
+	# Note for EAPI-2 lovers: We'd like to show that custom message.
+	# *If* you can make USE dependencies show that, too, feel free to migrate.
 	if (use threads && ! built_with_use dev-lang/tk threads) \
 		|| (! use threads && built_with_use dev-lang/tk threads) ; then
 		eerror
@@ -56,20 +55,10 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-
-#	if use cjk ; then
-#		einfo "Applying ${ONIGURUMA}"
-#		pushd "${WORKDIR}/oniguruma"
-#		econf --with-rubydir="${S}" || die "oniguruma econf failed"
-#		emake $MY_SUFFIX || die "oniguruma emake failed"
-#		popd
-#	fi
-
-	cd "${S}/ext/dl"
-	epatch "${FILESDIR}/${PN}-1.8.6-memory-leak.diff"
 	cd "${S}"
-	epatch "${FILESDIR}/${PN}-mkconfig.patch"
-	epatch "${FILESDIR}/${PN}${MY_SUFFIX}-mkmf-parallel-install.patch"
+
+	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
+		epatch "${WORKDIR}/patches-${PV}"
 
 	# Fix a hardcoded lib path in configure script
 	sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
@@ -139,7 +128,7 @@ src_install() {
 	unset RUBYOPT
 
 	LD_LIBRARY_PATH="${D}/usr/$(get_libdir)"
-	RUBYLIB="${S}:${LD_LIBRARY_PATH}/ruby/${SLOT}"
+	RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${SLOT}"
 	for d in $(find "${S}/ext" -type d) ; do
 		RUBYLIB="${RUBYLIB}:$d"
 	done