Commited wrong ebuilds

Package-Manager: portage-2.1.3.9

3 files changed, 14 insertions, 35 deletions

diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index d9a62d11db2f..a76d82c48b3b 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -41,10 +41,10 @@ EBUILD ruby-1.8.4-r3.ebuild 3771 RMD160 ec30e7108ca305568d6a435944eee43d198c5b8d
 MD5 691fd9a765ea473f0511eb5f10959c7d ruby-1.8.4-r3.ebuild 3771
 RMD160 ec30e7108ca305568d6a435944eee43d198c5b8d ruby-1.8.4-r3.ebuild 3771
 SHA256 819b09c7279d9fbbd588236ad0a7bb98dc73d220b191007406cfc80adab77237 ruby-1.8.4-r3.ebuild 3771
-EBUILD ruby-1.8.5_p113.ebuild 5114 RMD160 12b74e4a922abe3a22cb2903d47ffb6d322980c3 SHA1 f41cd4bb2daa503bae0c93ea3ab3be19abced08f SHA256 eb0d70caf1b66b4e3bd3e86c746eee2cf79692af67567d89c2a4c83273dbda77
-MD5 f8ad55142dafc14e8c89254cef4f8f9b ruby-1.8.5_p113.ebuild 5114
-RMD160 12b74e4a922abe3a22cb2903d47ffb6d322980c3 ruby-1.8.5_p113.ebuild 5114
-SHA256 eb0d70caf1b66b4e3bd3e86c746eee2cf79692af67567d89c2a4c83273dbda77 ruby-1.8.5_p113.ebuild 5114
+EBUILD ruby-1.8.5_p113.ebuild 4836 RMD160 9adb8273a092a81513665a4fc5ba5043c0cf87a9 SHA1 ff2e8e21d741db029cdfb33e8e5011498a0a941d SHA256 600d5308659fb7ada0a6adf66a575e02c1564fa942fa582aa2873be83ff02a85
+MD5 d3cbc1f3c850e2ea8674c893eaaaddf7 ruby-1.8.5_p113.ebuild 4836
+RMD160 9adb8273a092a81513665a4fc5ba5043c0cf87a9 ruby-1.8.5_p113.ebuild 4836
+SHA256 600d5308659fb7ada0a6adf66a575e02c1564fa942fa582aa2873be83ff02a85 ruby-1.8.5_p113.ebuild 4836
 EBUILD ruby-1.8.5_p2-r1.ebuild 3705 RMD160 3e63db3982accac72314c52eb63f1d61baaf7755 SHA1 87163b26eb53b1221fcb736c97906eecc30555d7 SHA256 3acc443bf52df1245d4003e682d78d8b8dc83891a5b33971865570a433025cfa
 MD5 ec499e09f4792c4d2f90f844df2007f9 ruby-1.8.5_p2-r1.ebuild 3705
 RMD160 3e63db3982accac72314c52eb63f1d61baaf7755 ruby-1.8.5_p2-r1.ebuild 3705
@@ -57,10 +57,10 @@ EBUILD ruby-1.8.6-r1.ebuild 4974 RMD160 9c3b1b305cdb0845d90949f4208ddfeb65be22a9
 MD5 f8cecf90037eeea8cc16fab2d3ead58c ruby-1.8.6-r1.ebuild 4974
 RMD160 9c3b1b305cdb0845d90949f4208ddfeb65be22a9 ruby-1.8.6-r1.ebuild 4974
 SHA256 e501162db6479de297170292ed828c110f49f606f4e5d1efe9cea158a416636d ruby-1.8.6-r1.ebuild 4974
-EBUILD ruby-1.8.6_p110-r1.ebuild 5187 RMD160 77a8d6da404e43125a1539f50d26da56c7b7f739 SHA1 5bc7c1064d49e5c99f4aefdf180b153316f61a6e SHA256 abf5f32214161aef1b64348eb9378e63bb7f575e8cfdc167e0a1d83f30c750c0
-MD5 62f7c3c132503299d6d6896700c0cf78 ruby-1.8.6_p110-r1.ebuild 5187
-RMD160 77a8d6da404e43125a1539f50d26da56c7b7f739 ruby-1.8.6_p110-r1.ebuild 5187
-SHA256 abf5f32214161aef1b64348eb9378e63bb7f575e8cfdc167e0a1d83f30c750c0 ruby-1.8.6_p110-r1.ebuild 5187
+EBUILD ruby-1.8.6_p110-r1.ebuild 4908 RMD160 43d13bdb4583164cfda628a1826a582ce43db14e SHA1 df31f52541621de636348870c2c87f0fcfdeb517 SHA256 7365d91b72b41daf26d91578996d6727a22a7e80e68115a9c56d3eae9b580235
+MD5 0b067040f11e88c1c06429970422fb00 ruby-1.8.6_p110-r1.ebuild 4908
+RMD160 43d13bdb4583164cfda628a1826a582ce43db14e ruby-1.8.6_p110-r1.ebuild 4908
+SHA256 7365d91b72b41daf26d91578996d6727a22a7e80e68115a9c56d3eae9b580235 ruby-1.8.6_p110-r1.ebuild 4908
 EBUILD ruby-1.8.6_p110.ebuild 4814 RMD160 d04025fc537059c21487523a0410df7fe61b73da SHA1 580823767f5dc1d3f50a9e098713cad016d8c996 SHA256 8a1bff98db20762814833fa634c7c7fdaf2c34688ba6024bb336c5ee73157bd5
 MD5 5fa0573f254954153cc0a0678d77ec1f ruby-1.8.6_p110.ebuild 4814
 RMD160 d04025fc537059c21487523a0410df7fe61b73da ruby-1.8.6_p110.ebuild 4814
diff --git a/dev-lang/ruby/ruby-1.8.5_p113.ebuild b/dev-lang/ruby/ruby-1.8.5_p113.ebuild
index b2eb8d241e6f..006aeb2a2311 100644
--- a/dev-lang/ruby/ruby-1.8.5_p113.ebuild
+++ b/dev-lang/ruby/ruby-1.8.5_p113.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.5_p113.ebuild,v 1.1 2007/09/30 08:44:50 rbrown Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.5_p113.ebuild,v 1.2 2007/09/30 08:55:53 rbrown Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -22,7 +22,7 @@ SRC_URI="ftp://ftp.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.gz
 
 LICENSE="Ruby"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="cjk debug doc elibc_glibc examples ipv6 rubytests socks5 threads tk"
+IUSE="cjk debug doc examples ipv6 rubytests socks5 threads tk"
 
 RDEPEND=">=sys-libs/gdbm-1.8.0
 	>=sys-libs/readline-4.1
@@ -77,22 +77,12 @@ src_compile() {
 		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
 	fi
 
-	# Bug #168939
-	# We need to always enable ipv6, use --with-lookup-order-hack=INET
-	# when we don't want ipv6 with glibc
-	if use elibc_glibc; then
-		myconf="--enable-ipv6"
-		if ! use ipv6; then
-			myconf="${myconf} --with-lookup-order-hack=INET"
-		fi
-	else
-		myconf=$(use_enable ipv6)
-	fi
 
 	econf --program-suffix=$MY_SUFFIX --enable-shared \
 		$(use_enable socks5 socks) \
 		$(use_enable doc install-doc) \
 		$(use_enable threads pthread) \
+		$(use_enable ipv6) \
 		$(use_enable debug) \
 		$(use_with tk) \
 		${myconf} \
diff --git a/dev-lang/ruby/ruby-1.8.6_p110-r1.ebuild b/dev-lang/ruby/ruby-1.8.6_p110-r1.ebuild
index 94513d46b213..5e58dd7424ef 100644
--- a/dev-lang/ruby/ruby-1.8.6_p110-r1.ebuild
+++ b/dev-lang/ruby/ruby-1.8.6_p110-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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_p110-r1.ebuild,v 1.1 2007/09/30 08:44:50 rbrown Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.6_p110-r1.ebuild,v 1.2 2007/09/30 08:55:53 rbrown Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -22,7 +22,7 @@ SRC_URI="ftp://ftp.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.gz
 
 LICENSE="Ruby"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="cjk debug doc elibc_glibc examples ipv6 rubytests socks5 threads tk"
+IUSE="cjk debug doc examples ipv6 rubytests socks5 threads tk"
 
 RDEPEND=">=sys-libs/gdbm-1.8.0
 	>=sys-libs/readline-4.1
@@ -80,22 +80,11 @@ src_compile() {
 		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
 	fi
 
-	# Bug #168939
-	# We need to always enable ipv6, use --with-lookup-order-hack=INET
-	# when we don't want ipv6 with glibc
-	if use elibc_glibc; then
-		myconf="--enable-ipv6"
-		if ! use ipv6; then
-			myconf="${myconf} --with-lookup-order-hack=INET"
-		fi
-	else
-		myconf=$(use_enable ipv6)
-	fi
-
 	econf --program-suffix=$MY_SUFFIX --enable-shared \
 		$(use_enable socks5 socks) \
 		$(use_enable doc install-doc) \
 		$(use_enable threads pthread) \
+		$(use_enable ipv6) \
 		$(use_enable debug) \
 		$(use_with tk) \
 		${myconf} \