Remove libedit USE flag from 1.9.2 because of upstream bug #3698.

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

3 files changed, 30 insertions, 20 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index daa7f38e9585..ba4ae391cec9 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,10 @@
 # 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.460 2010/08/13 15:00:43 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.461 2010/08/15 11:54:27 flameeyes Exp $
+
+  15 Aug 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  ruby-1.9.2_rc2.ebuild:
+  Remove libedit USE flag from 1.9.2 because of upstream bug #3698.
 
   13 Aug 2010; Alex Legler <a3li@gentoo.org> ruby-1.8.6_p388-r1.ebuild,
   ruby-1.8.7_p299.ebuild:
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index f27fd80eef92..9c87e0612c1d 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 DIST ruby-1.8.6-p388.tar.bz2 3973412 RMD160 9f451182ef4fb485109d96953e6af388151cadc8 SHA1 175e7f1571761e522e88cc8a8ed123f000c99c59 SHA256 8536b18413f2475698fa275b356daff6ceab5232bc503496f4afbee64e8b4abc
 DIST ruby-1.8.7-p249.tar.bz2 4153461 RMD160 96b238bd7194652ec194a505c2e5911441c5c5ee SHA1 2947f21f22e9345a3e94d84e6f88e7d0fc98a871 SHA256 8b89448fc79df6862660e9f77e884f06c76da28f078d8edd2f17567a615f3af5
@@ -14,13 +14,13 @@ EBUILD ruby-1.8.6_p388-r1.ebuild 5584 RMD160 878fefd6c474d6cbf38d033cd698a1f2460
 EBUILD ruby-1.8.6_p388.ebuild 5329 RMD160 91d80731628a54a76254540a816b7be7cb22e91e SHA1 2bfe49e18e9c39cd2fcc79dd6aadbc678073c8b5 SHA256 92c012a949f9d274754f22d0fb80e35f0c22559b2cad2ce5d7c79ab64fa8bce7
 EBUILD ruby-1.8.7_p249.ebuild 5344 RMD160 1c78a00aceb9f3ddeb6c18f4c45d289bc507b370 SHA1 34808e3e70b3c0c20f87f991ebdd9d51dd98b848 SHA256 3d2a1eb8198d65adad424198f35e42679408ffb44e5e9c281f98ee9a45c970eb
 EBUILD ruby-1.8.7_p299.ebuild 5593 RMD160 1567275df5ac7d4ff773826fd282ac02cb8da230 SHA1 01302a245f322c65e9d88ababbd5efc0d4bf40f6 SHA256 79611095f6778ab78d53ab1e7dfaa00479d06e0a930d1ff2c8caaeb42e61070b
-EBUILD ruby-1.9.2_rc2.ebuild 5685 RMD160 b6a40b5f1e8ed1149bee39a9db98e237b1d9ef5e SHA1 3704a33cd8d6d505326642082905eab232ce0390 SHA256 d70003e4378a391f61fd2c112f908b0fe56beb1630a3f14e1d793ace080ab014
-MISC ChangeLog 71514 RMD160 86401028cadd6665d369bfa064dad45a5bddb75d SHA1 f0524b23f275306b02170c376b02ed93d6eb8c42 SHA256 e79285263d06e74da6825886b5c53b4df19863b99a2498a08b89ac5fbf817069
+EBUILD ruby-1.9.2_rc2.ebuild 5892 RMD160 07d3e1509c6589290875677f390afd36715d51da SHA1 37bdb572613e9f09b6fd522e6865e1a48733d298 SHA256 fb6822e409082c95dd65a782d7e7f767dd2cc2d8248ba6376d814c76131f4be0
+MISC ChangeLog 71669 RMD160 552e70ba69692a7842108211fe8d55f320afe731 SHA1 5dcb88fdc4a8f90c846a24e9379123d1bac2ee13 SHA256 b3cecc0421ea32b6c972424b72ee4edb260b792683c1134625875d38dac4b614
 MISC metadata.xml 1081 RMD160 77ebe9b23b118075684351f9c6443aaa81fab263 SHA1 d3d03be57aab9b84a4712b51a69eff47bc47124d SHA256 428eb9a33cba960d1d03ba6c9b4566b99f0ff8171d5d16873b600bb75837745d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkxlXicACgkQ3Ca6Xy8+rvTeWwD/fktnWprdP/oFFvtgAOGO+rvs
-lBr2j2m+1dqTxxJJsMgA/R6q92z8LJrSi834ZguX+/NZI6PINCnxYKn9JXIFLV9e
-=MJOP
+iEYEARECAAYFAkxn1VYACgkQAiZjviIA2XjSZwCcDP7J17Qs7Y1RsOlx+zOnY8rh
+ECEAn0h2Jy8DazCXBP2NCKe61oRpJEMC
+=+0HP
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ruby/ruby-1.9.2_rc2.ebuild b/dev-lang/ruby/ruby-1.9.2_rc2.ebuild
index 887fd43507d1..e014b4bf21c8 100644
--- a/dev-lang/ruby/ruby-1.9.2_rc2.ebuild
+++ b/dev-lang/ruby/ruby-1.9.2_rc2.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.2_rc2.ebuild,v 1.3 2010/07/21 12:18:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.9.2_rc2.ebuild,v 1.4 2010/08/15 11:54:27 flameeyes Exp $
 
 EAPI=2
 
@@ -33,7 +33,10 @@ SRC_URI="mirror://ruby/${MY_P}.tar.bz2
 
 LICENSE="|| ( Ruby GPL-2 )"
 KEYWORDS="~amd64 ~hppa ~x86 ~x86-fbsd"
-IUSE="berkdb debug doc examples gdbm ipv6 rubytests socks5 ssl tk xemacs ncurses +readline libedit"
+IUSE="berkdb debug doc examples gdbm ipv6 rubytests socks5 ssl tk xemacs ncurses +readline" #libedit
+
+# libedit support is removed everywhere because of this upstream bug:
+# http://redmine.ruby-lang.org/issues/show/3698
 
 RDEPEND="
 	berkdb? ( sys-libs/db )
@@ -42,14 +45,16 @@ RDEPEND="
 	socks5? ( >=net-proxy/dante-1.1.13 )
 	tk? ( dev-lang/tk[threads] )
 	ncurses? ( sys-libs/ncurses )
-	libedit? ( dev-libs/libedit )
-	!libedit? ( readline? ( sys-libs/readline ) )
+	readline?  ( sys-libs/readline )
 	dev-libs/libffi
 	sys-libs/zlib
 	>=app-admin/eselect-ruby-20100402
 	!=dev-lang/ruby-cvs-${SLOT}*
 	!<dev-ruby/rdoc-2
 	!dev-ruby/rexml"
+#	libedit? ( dev-libs/libedit )
+#	!libedit? ( readline? ( sys-libs/readline ) )
+
 DEPEND="${RDEPEND}"
 PDEPEND="xemacs? ( app-xemacs/ruby-modes )"
 
@@ -96,15 +101,16 @@ src_configure() {
 	# ipv6 hack, bug 168939. Needs --enable-ipv6.
 	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
 
-	if use libedit; then
-		einfo "Using libedit to provide readline extension"
-		myconf="${myconf} --enable-libedit --with-readline"
-	elif use readline; then
-		einfo "Using readline to provide readline extension"
-		myconf="${myconf} --with-readline"
-	else
-		myconf="${myconf} --without-readline"
-	fi
+#	if use libedit; then
+#		einfo "Using libedit to provide readline extension"
+#		myconf="${myconf} --enable-libedit --with-readline"
+#	elif use readline; then
+#		einfo "Using readline to provide readline extension"
+#		myconf="${myconf} --with-readline"
+#	else
+#		myconf="${myconf} --without-readline"
+#	fi
+	myconf="${myconf} $(use_with readline)"
 
 	econf \
 		--program-suffix=${MY_SUFFIX} \