Update ebuilds to be consistent with ruby-enterprise; patches are moved to dev.gentoo.org now.

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

5 files changed, 39 insertions, 20 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 5b55c092e427..dd0866058537 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/ruby
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.450 2010/05/18 22:26:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.451 2010/05/18 22:59:44 flameeyes Exp $
+
+  18 May 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  ruby-1.8.6_p388-r1.ebuild, ruby-1.8.7_p249-r2.ebuild,
+  ruby-1.9.1_p376.ebuild:
+  Update ebuilds to be consistent with ruby-enterprise; patches are moved to
+  dev.gentoo.org now.
 
   18 May 2010; Diego E. Pettenò <flameeyes@gentoo.org>
   ruby-1.9.1_p376.ebuild:
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 4f9b29fe1ac9..4cffe453dda6 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -10,18 +10,18 @@ DIST ruby-patches-1.8.7_p249-r1.tar.bz2 3186 RMD160 94ec3d9cb38cd20f7431e796da0d
 DIST ruby-patches-1.8.7_p249-r2.tar.bz2 3598 RMD160 6351f14327273702837626c4ad0cdb54bbce6181 SHA1 cafee0570901094d57e0f91141e3f166fbe946a6 SHA256 13cf40dcf3fd15c8559cad2784e129abc74b1b4c2dda7db78dc9d8da8826d27a
 DIST ruby-patches-1.8.7_p249.tar.bz2 1499 RMD160 98670658db00a1c4ad563e68bf25263fd7f317fd SHA1 d371f7f25a75ac8626e2e87a570bb52a60579fb8 SHA256 b35ba05fb07c0264a9232e756cd80ff7f284fb8aa464368ce028d67fa11f31af
 DIST ruby-patches-1.9.1_p376.tar.bz2 2091 RMD160 b3a899bb98481081ff2de01c5c9e89549b28ebc8 SHA1 cea557a7732b3bc7c8140c3405dd193eb1c10714 SHA256 c2de7c1c0efb7e4f22d1a771931c886e8e76011cc02aab82652b6f71f4b613c6
-EBUILD ruby-1.8.6_p388-r1.ebuild 5439 RMD160 174b3c6915ba89e0d8db2aad6f1d7f7672787c9e SHA1 2e37b6bc4aeeb08e6504a7107cc1ba55ab8f0816 SHA256 69213147628ed90d7af278c97e4d45780bcb083c54c080d5b71c82023da15d5e
+EBUILD ruby-1.8.6_p388-r1.ebuild 5479 RMD160 14b1406a342453bb86fd2c1219316064aad9a807 SHA1 b4dce1a886b01cbcb55429f79b70665e725a5acc SHA256 d3efd0d421b7dbada91a6353906d47d0a0bb2522f9d43eea295a92bb22e18415
 EBUILD ruby-1.8.6_p388.ebuild 5329 RMD160 91d80731628a54a76254540a816b7be7cb22e91e SHA1 2bfe49e18e9c39cd2fcc79dd6aadbc678073c8b5 SHA256 92c012a949f9d274754f22d0fb80e35f0c22559b2cad2ce5d7c79ab64fa8bce7
 EBUILD ruby-1.8.7_p249-r1.ebuild 5358 RMD160 7f1cab9efc8ef9a41c5c5645462358fa00c8acf4 SHA1 ba9ec839d4e42e8960f5739e5efd0c78d5987816 SHA256 9c328f8d00228d982c7b0b9294fe646f7fdfcf711a75e74a2ba316149afbc53a
-EBUILD ruby-1.8.7_p249-r2.ebuild 5451 RMD160 e83002122bdd66a4712217f05c057707b32c96c6 SHA1 663141d2f01733aef672a1ab57a7036c2b0af2b8 SHA256 2366dd2265375c73a34afc2497679f0c3e6a5a34b44ea61007ed0640e30836c3
+EBUILD ruby-1.8.7_p249-r2.ebuild 5491 RMD160 a90859d8b3bdeef5a7511df4f0c3dc41a7ff21be SHA1 749a8a865756c41b14b494b02afc047cedff247c SHA256 06752fb9fca414826ea036e46f86f4608357b9546719a63a1ac1ac9293db4aa4
 EBUILD ruby-1.8.7_p249.ebuild 5344 RMD160 1c78a00aceb9f3ddeb6c18f4c45d289bc507b370 SHA1 34808e3e70b3c0c20f87f991ebdd9d51dd98b848 SHA256 3d2a1eb8198d65adad424198f35e42679408ffb44e5e9c281f98ee9a45c970eb
-EBUILD ruby-1.9.1_p376.ebuild 5472 RMD160 0dccd3ef8fb48e9b08208f4f10d82b73f4e012a8 SHA1 8bc67cc7d78f402af63a2a21054aeed5bc8a975b SHA256 03d0b81c65a1dd5040e9d0571f7e042cc8557156e5c5c7983f559c81ac2144c2
-MISC ChangeLog 69574 RMD160 afc89917cd46bf773a2508589c0f420cb3592d47 SHA1 4b688daa0bfabd1d966d97ac48ef2e7106006ff5 SHA256 2d2c04b52b171b90d1dd1b3bdcddd7924d286b1696a25fd5cb74239649b4bb68
+EBUILD ruby-1.9.1_p376.ebuild 5520 RMD160 f1d29836d4792282066c62948035c7c6153e26cc SHA1 13d477cab493e2a8fb2aa5ad7d0df6ff3fdccc6a SHA256 bf363ef0f576355dc45ff114f16b1d7fb4dad57e28aab936ecd634dbe9e0fdcd
+MISC ChangeLog 69812 RMD160 4bf117a987e71e6dff61b4381a430aac8071566b SHA1 4923365d7eef5120477654aeb7d2c5b01d72cb1c SHA256 029462d56c8547224a3288813f41a4cd5692675d8bf80fe793ee014aec2ec6c7
 MISC metadata.xml 1081 RMD160 77ebe9b23b118075684351f9c6443aaa81fab263 SHA1 d3d03be57aab9b84a4712b51a69eff47bc47124d SHA256 428eb9a33cba960d1d03ba6c9b4566b99f0ff8171d5d16873b600bb75837745d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvzFCoACgkQAiZjviIA2Xgd1QCgySOPblNzvyC2yX+WvAw4xERG
-NF0AoO/zhc2u5k/6DyeXBZODAgIf2pZz
-=oVEb
+iEYEARECAAYFAkvzG9gACgkQAiZjviIA2XjyswCdF6M0nY8neJbgy47InfC+wkRy
+TocAoK6J/+pa+lRIDjHx8KUTAMuuzQG1
+=INnf
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ruby/ruby-1.8.6_p388-r1.ebuild b/dev-lang/ruby/ruby-1.8.6_p388-r1.ebuild
index dfe5164dc4d5..bd98536054c0 100644
--- a/dev-lang/ruby/ruby-1.8.6_p388-r1.ebuild
+++ b/dev-lang/ruby/ruby-1.8.6_p388-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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_p388-r1.ebuild,v 1.1 2010/05/18 22:18:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.6_p388-r1.ebuild,v 1.2 2010/05/18 22:59:44 flameeyes Exp $
 
 EAPI=2
 
@@ -17,7 +17,7 @@ RUBYVERSION=$(get_version_component_range 1-2)
 DESCRIPTION="An object-oriented scripting language"
 HOMEPAGE="http://www.ruby-lang.org/"
 SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.bz2
-		 http://www.flameeyes.eu/gentoo-distfiles/${PN}-patches-${PVR}.tar.bz2"
+		 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PVR}.tar.bz2"
 
 LICENSE="|| ( Ruby GPL-2 )"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
@@ -54,6 +54,8 @@ src_prepare() {
 }
 
 src_configure() {
+	local myconf=
+
 	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
 	filter-flags -fomit-frame-pointer
 	# In many places aliasing rules are broken; play it safe
@@ -74,7 +76,7 @@ src_configure() {
 	fi
 
 	# ipv6 hack, bug 168939. Needs --enable-ipv6.
-	use ipv6 || myconf="--with-lookup-order-hack=INET"
+	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
 
 	if use libedit; then
 		einfo "Using libedit to provide readline extension"
@@ -86,7 +88,9 @@ src_configure() {
 		myconf="${myconf} --without-readline"
 	fi
 
-	econf --program-suffix=$MY_SUFFIX --enable-shared \
+	econf \
+		--program-suffix="${MY_SUFFIX}" \
+		--enable-shared \
 		$(use_enable socks5 socks) \
 		$(use_enable doc install-doc) \
 		$(use_enable threads pthread) \
diff --git a/dev-lang/ruby/ruby-1.8.7_p249-r2.ebuild b/dev-lang/ruby/ruby-1.8.7_p249-r2.ebuild
index 9beed90b1c17..9996869b82b9 100644
--- a/dev-lang/ruby/ruby-1.8.7_p249-r2.ebuild
+++ b/dev-lang/ruby/ruby-1.8.7_p249-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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_p249-r2.ebuild,v 1.1 2010/05/18 22:18:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.7_p249-r2.ebuild,v 1.2 2010/05/18 22:59:44 flameeyes Exp $
 
 EAPI=2
 
@@ -17,7 +17,7 @@ RUBYVERSION=$(get_version_component_range 1-2)
 DESCRIPTION="An object-oriented scripting language"
 HOMEPAGE="http://www.ruby-lang.org/"
 SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.bz2
-		 http://www.flameeyes.eu/gentoo-distfiles/${PN}-patches-${PVR}.tar.bz2"
+		 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PVR}.tar.bz2"
 
 LICENSE="|| ( Ruby GPL-2 )"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
@@ -54,6 +54,8 @@ src_prepare() {
 }
 
 src_configure() {
+	local myconf=
+
 	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
 	filter-flags -fomit-frame-pointer
 	# In many places aliasing rules are broken; play it safe
@@ -74,7 +76,7 @@ src_configure() {
 	fi
 
 	# ipv6 hack, bug 168939. Needs --enable-ipv6.
-	use ipv6 || myconf="--with-lookup-order-hack=INET"
+	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
 
 	if use libedit; then
 		einfo "Using libedit to provide readline extension"
@@ -86,7 +88,9 @@ src_configure() {
 		myconf="${myconf} --without-readline"
 	fi
 
-	econf --program-suffix=$MY_SUFFIX --enable-shared \
+	econf \
+		--program-suffix="${MY_SUFFIX}" \
+		--enable-shared \
 		$(use_enable socks5 socks) \
 		$(use_enable doc install-doc) \
 		$(use_enable threads pthread) \
diff --git a/dev-lang/ruby/ruby-1.9.1_p376.ebuild b/dev-lang/ruby/ruby-1.9.1_p376.ebuild
index 489c3b061dbd..8604596ca465 100644
--- a/dev-lang/ruby/ruby-1.9.1_p376.ebuild
+++ b/dev-lang/ruby/ruby-1.9.1_p376.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.9.1_p376.ebuild,v 1.3 2010/05/18 22:26:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.9.1_p376.ebuild,v 1.4 2010/05/18 22:59:44 flameeyes Exp $
 
 EAPI=2
 
@@ -17,7 +17,7 @@ RUBYVERSION=$(get_version_component_range 1-3)
 DESCRIPTION="An object-oriented scripting language"
 HOMEPAGE="http://www.ruby-lang.org/"
 SRC_URI="mirror://ruby/${MY_P}.tar.bz2
-		http://dev.a3li.li/gentoo/distfiles/${PN}-patches-${PVR}.tar.bz2"
+		 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PVR}.tar.bz2"
 
 LICENSE="|| ( Ruby GPL-2 )"
 KEYWORDS="~amd64 ~hppa ~x86 ~x86-fbsd"
@@ -59,6 +59,8 @@ src_prepare() {
 }
 
 src_configure() {
+	local myconf=
+
 	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
 	filter-flags -fomit-frame-pointer
 	# In many places aliasing rules are broken; play it safe
@@ -79,7 +81,7 @@ src_configure() {
 	fi
 
 	# ipv6 hack, bug 168939. Needs --enable-ipv6.
-	use ipv6 || myconf="--with-lookup-order-hack=INET"
+	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
 
 	if use libedit; then
 		einfo "Using libedit to provide readline extension"
@@ -91,7 +93,10 @@ src_configure() {
 		myconf="${myconf} --without-readline"
 	fi
 
-	econf --program-suffix=${MY_SUFFIX} --enable-shared --enable-pthread \
+	econf \
+		--program-suffix="${MY_SUFFIX}" \
+		--enable-shared \
+		--enable-pthread \
 		$(use_enable socks5 socks) \
 		$(use_enable doc install-doc) \
 		--enable-ipv6 \