diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2010-08-15 11:54:27 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2010-08-15 11:54:27 +0000 |
| commit | b08ca18e83bf56c1cf5160ae1148c1ff0cdc4b97 (patch) | |
| tree | c46e23eb85a4f216b576f4ca9d6080a464386f7d /dev-lang/ruby | |
| parent | Version bump. (diff) | |
| download | gentoo-2-b08ca18e83bf56c1cf5160ae1148c1ff0cdc4b97.tar.gz gentoo-2-b08ca18e83bf56c1cf5160ae1148c1ff0cdc4b97.tar.bz2 gentoo-2-b08ca18e83bf56c1cf5160ae1148c1ff0cdc4b97.zip | |
Remove libedit USE flag from 1.9.2 because of upstream bug #3698.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang/ruby')
| -rw-r--r-- | dev-lang/ruby/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/ruby/ruby-1.9.2_rc2.ebuild | 32 |
2 files changed, 24 insertions, 14 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/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} \ |