Semi auto-sync

(manually editted for 0m 37s) -- dev-lang/ruby (2009-06-19 18:39:29.856214256 +0200)
(Portage version: 2.2.00.13629-prefix/svn/SunOS i386)

4 files changed, 31 insertions, 30 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index aeec2a3c31..29b2cc3002 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 a30935bb23..5419c69f5c 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -16,10 +16,11 @@ AUX ruby19-mkmf-parallel-install.patch 541 RMD160 c780d1900a0286c9ab66ac1b4c545e
 AUX ruby19-rubygems-gentoo.patch 1914 RMD160 9668808eb50ac0e96265d8756d6751f625c396dd SHA1 621918bcba23dbf2fdd1343ffd73b791bc94d996 SHA256 aeacba7ef60e7dee601303470bdc41216f2b5c9d3da88369849568bc95359512
 AUX ruby19-rubygems-proxy.patch 407 RMD160 0bfedce42f4879d729b8de650f99a345faaa7ec4 SHA1 aa23a497f0c581374f687690b0b1035092b4b488 SHA256 3cadd23dfbb128e7029ecc01aab3f00f1aaf011e50492c3a967812a2395e1a59
 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
-EBUILD ruby-1.8.6_p369.ebuild 5768 RMD160 bb9b8e4ad3317ce3c4cf3ffc5619fe55409005f1 SHA1 10e7d080c21cde9d72d6361d0039a51acf8b4441 SHA256 55f2ef9272c589b4584ce53dccc39c32070b223fee0ee74a827b21f706bc08d6
-EBUILD ruby-1.8.7_p173.ebuild 5985 RMD160 8d8af59001abe0b8de4ca0c415d925075973063a SHA1 81d38c3488cc2f89911972bb713babc5d2425b6d SHA256 95f92cb463523b1f47cc4fc7abe3d891509f1c3484c34f772578c4bf82a58924
+DIST ruby-patches-1.8.7_p174.tar.bz2 1255 RMD160 2070ae0a6650331b91bf0f2a3b694a4d1837391f SHA1 f9caa7237c79ab9644c8432665bffaabda407ed3 SHA256 63cb9753737658e7983b7a306be353635085d6966ce94afebfd7ed9b2a3b1fa7
+EBUILD ruby-1.8.6_p369.ebuild 5859 RMD160 558de2d6d9ef298aed2b31a81b311436175a04a2 SHA1 38def2de828e39c3ec855a6f1d79d5c62e10cfe5 SHA256 7403febf14311b69cc06db8ace483988867c6855fd1f1d5cb452d8d21e5ea952
+EBUILD ruby-1.8.7_p174.ebuild 5734 RMD160 5b38ebf6cec75895ed826788c8ffa8ea870cb42d SHA1 ec02fe85ee0d6045f783a30e24b7a9ad11cf9321 SHA256 ca5b9c6c54ad51d076cefb6d71bf8e691713d291f79d05253f49b83057d4d571
 EBUILD ruby-1.9.1_p129-r1.ebuild 6100 RMD160 7c6303a18d7f99fc41a684724fa4e4371f563a95 SHA1 914bac95e3f95bb3b16effe3a93edca59d125193 SHA256 0a79053e4923bd358e8421cea185c50f876390d41aca5db27f6125f24fbdad7f
-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
diff --git a/dev-lang/ruby/ruby-1.8.6_p369.ebuild b/dev-lang/ruby/ruby-1.8.6_p369.ebuild
index e1d70e56e6..fdb143ad4e 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
 
@@ -135,6 +135,9 @@ src_test() {
 }
 
 src_install() {
+	# Ruby is involved in the install process, we don't want interference here.
+	unset RUBYOPT
+
 	LD_LIBRARY_PATH="${ED}/usr/$(get_libdir)"
 	RUBYLIB="${S}:${ED}/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 7bfb8ff692..2061664de5 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="~ppc-aix ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-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}"
 
 	epatch "${FILESDIR}/${PN}-1.8.6_p36-only-ncurses.patch"
 	epatch "${FILESDIR}/${PN}-1.8.6_p36-prefix.patch"
@@ -146,7 +135,7 @@ src_install() {
 	unset RUBYOPT
 
 	LD_LIBRARY_PATH="${ED}/usr/$(get_libdir)"
-	RUBYLIB="${S}:${LD_LIBRARY_PATH}/ruby/${SLOT}"
+	RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${SLOT}"
 	for d in $(find "${S}/ext" -type d) ; do
 		RUBYLIB="${RUBYLIB}:$d"
 	done