Make ebuild consistent with Ruby (MRI) 1.8 and 1.9; add patch to build with BerkDB 5.0 (bug #319583) and add --no-undefined as well.

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

4 files changed, 96 insertions, 71 deletions

diff --git a/dev-lang/ruby-enterprise/ChangeLog b/dev-lang/ruby-enterprise/ChangeLog
index cb2e160e0072..7a42e2e96ca7 100644
--- a/dev-lang/ruby-enterprise/ChangeLog
+++ b/dev-lang/ruby-enterprise/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lang/ruby-enterprise
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby-enterprise/ChangeLog,v 1.2 2010/05/13 16:31:19 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby-enterprise/ChangeLog,v 1.3 2010/05/18 23:10:00 flameeyes Exp $
+
+*ruby-enterprise-1.8.7.2010.01-r2 (18 May 2010)
+
+  18 May 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -ruby-enterprise-1.8.7.2010.01.ebuild,
+  +ruby-enterprise-1.8.7.2010.01-r2.ebuild, metadata.xml:
+  Make ebuild consistent with Ruby (MRI) 1.8 and 1.9; add patch to build
+  with BerkDB 5.0 (bug #319583) and add --no-undefined as well.
 
 *ruby-enterprise-1.8.7.2010.01-r1 (13 May 2010)
 
diff --git a/dev-lang/ruby-enterprise/Manifest b/dev-lang/ruby-enterprise/Manifest
index 9dea3c260e46..a74a7c7e181d 100644
--- a/dev-lang/ruby-enterprise/Manifest
+++ b/dev-lang/ruby-enterprise/Manifest
@@ -2,16 +2,16 @@
 Hash: SHA1
 
 DIST ruby-enterprise-1.8.7-2010.01.tar.gz 7470579 RMD160 305dbc1fbae4abe152baca886d36f9216be2a4e1 SHA1 453ceba47df157d89e2ff9412c3c9f8a601c0718 SHA256 ccdf836693ea9c110bf8b97ced91be3db100487428a6668d0b45fb883fa6793d
+DIST ruby-enterprise-patches-1.8.7.2010.01-r2.tar.bz2 2592 RMD160 5d3625eb8cd6929d0597f98821140c844a2ef07c SHA1 31fd089d3e2bfee58ba81dc843b15b14b47eff96 SHA256 9f8ea53e45ee5446d0d8196ac79cd84deb0ec68e3699c05abf926480e708e717
 DIST ruby-patches-ee-1.8.7.2010.01-r1.tar.bz2 2286 RMD160 88aae59790b019184beadff68a6470a7cab9b066 SHA1 acccb1bca4977c3a6a1d030b3120dabd48a7f3d6 SHA256 20783384eff56cb031204ca2567c1d598dc8c6e589f96344e9d4bbea9cf95d0d
-DIST ruby-patches-ee-1.8.7.2010.01.tar.bz2 1975 RMD160 d70450519f014bab6285e73a3ec55eb0a192aaad SHA1 3b574afa836d50dc51e5e5252975b4b45b127c84 SHA256 8611eaa48d1e7b189e45a622ed1bbb7681f01d8805715eabf436555658461108
 EBUILD ruby-enterprise-1.8.7.2010.01-r1.ebuild 5623 RMD160 2e1cdbcd0a10405d98c523bf5d802b908aaf33bc SHA1 1bee3ce571fe871200c04c93381394266456e770 SHA256 cd219804f2b4c7fc9973207594724fdc71fa1e7574fd977711d1a1cdfe350860
-EBUILD ruby-enterprise-1.8.7.2010.01.ebuild 5618 RMD160 e2b502401554545198eb770dc8c3a6a668bd640e SHA1 370d1a7c7e5ce3aa98fca9059c6f77bac2f3bd8e SHA256 8bbb323517ac9f9d5cad11ab09961bbfe2b2597f73c548b992989b10f0ffc63b
-MISC ChangeLog 794 RMD160 15c038d9336f4bed7ab1bc74d037dc8256a170ab SHA1 a88e32bcf444c910b6c5565db98f895e65cf6373 SHA256 f8f3e7221e1627044fb08dd696ccc61872b2554a8a29d612ff8c5cc063ef1ae9
-MISC metadata.xml 363 RMD160 265014e60fc37dedcf1723670fa15924e976647e SHA1 7f78bb234c1ecfdfd7e7f972287fc02e0cbec0af SHA256 23231e6f00711864020aea6dfc458362d568d5a1adab4a591b9a21e75afadae6
+EBUILD ruby-enterprise-1.8.7.2010.01-r2.ebuild 5376 RMD160 ac289e6ef5f2764d9d794556e66d2f87e574b171 SHA1 3c5fa948de0d294a386a33274c41734cd5d80b64 SHA256 aace21e3282e589fe83de02761fa1907a82310039a2e2b537880f924cb4ad0d2
+MISC ChangeLog 1141 RMD160 c5afc70e5c44c36e11433d85e38af78e3c997318 SHA1 4509c00fdbbc6758ec1a9c2edd1784af9df71ae3 SHA256 f600b20a9d183c352d4bbe57220b50f93b177f07be548fed215a50040d112b93
+MISC metadata.xml 1201 RMD160 3d992cbc732e08676b7b562ca4eac71a3ac3201a SHA1 6f5051c74fbc0b5f337f798567be951e9b612f2a SHA256 7f2dfb145b624ddce3051e9b6f004266761bae9e29fbc288747b2e06cf6b05fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvsKWgACgkQ+tgfDpkAy6ColwCeJp4c4oZt3qEtIZ5cOau4P7uz
-nkgAn0EM/7H6E2jqnHbOStJHbuefdf6I
-=A6+g
+iEYEARECAAYFAkvzHkAACgkQAiZjviIA2XgkZgCfV3Z3xTk2GH9UMyRux2vSEZX3
+EOoAnRZ6LRX0TG+I/sQGKJVC7CNau37s
+=QCSN
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ruby-enterprise/metadata.xml b/dev-lang/ruby-enterprise/metadata.xml
index f59d4743a649..0b08f2909351 100644
--- a/dev-lang/ruby-enterprise/metadata.xml
+++ b/dev-lang/ruby-enterprise/metadata.xml
@@ -1,9 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>ruby</herd>
-	<use>
-		<flag name="rubytests">Install ruby tests that can only be run after ruby is installed</flag>
-		<flag name="tcmalloc">Add support for TCMalloc provided by dev-util/google-perftools</flag>
-	</use>
+  <herd>ruby</herd>
+  <use>
+    <flag name='rubytests'>
+      Install ruby tests that can only be run after ruby is installed
+    </flag>
+
+    <flag name='libedit'>
+      Use the <pkg>dev-libs/libedit</pkg> library to provide the
+      readline extension, used for instance by the irb tool. This flag
+      will take precedence over the readline USE flag.
+
+      If neither libedit nor readline USE flags are enabled, the
+      readline extension will not be built (and irb will lose line
+      editing functionality).
+    </flag>
+
+    <flag name='readline'>
+      Use the <pkg>sys-libs/readline</pkg> library to provide the
+      readline extension, used for instance by the irb tool. This flag
+      is meaningful only if the libedit USE flag is disabled.
+
+      If neither libedit nor readline USE flags are enabled, the
+      readline extension will not be built (and irb will lose line
+      editing functionality).
+    </flag>
+
+    <flag name="tcmalloc">
+      Add support for TCMalloc provided by <pkg>dev-util/google-perftools</pkg>
+    </flag>
+  </use>
 </pkgmetadata>
diff --git a/dev-lang/ruby-enterprise/ruby-enterprise-1.8.7.2010.01.ebuild b/dev-lang/ruby-enterprise/ruby-enterprise-1.8.7.2010.01-r2.ebuild
index 239299338a82..ef6681a15534 100644
--- a/dev-lang/ruby-enterprise/ruby-enterprise-1.8.7.2010.01.ebuild
+++ b/dev-lang/ruby-enterprise/ruby-enterprise-1.8.7.2010.01-r2.ebuild
@@ -1,63 +1,48 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby-enterprise/ruby-enterprise-1.8.7.2010.01.ebuild,v 1.1 2010/04/03 06:39:01 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby-enterprise/ruby-enterprise-1.8.7.2010.01-r2.ebuild,v 1.1 2010/05/18 23:10:00 flameeyes Exp $
+
+EAPI=2
 
-EAPI="2"
 inherit autotools eutils flag-o-matic multilib versionator
 
-MY_PV=$(replace_version_separator 3 '-')
-S="${WORKDIR}/${PN}-${MY_PV}/source"
+MY_P="${PN}-$(replace_version_separator 3 '-')"
+S="${WORKDIR}/${MY_P}/source"
 
 SLOT=$(get_version_component_range 1-2)
-MY_VSUFFIX="ee$(delete_version_separator 1 ${SLOT})"
-MY_SUFFIX="ee"
+MY_SUFFIX="ee$(delete_version_separator 1 ${SLOT})"
+# 1.8 and 1.9 series disagree on this
+RUBYVERSION=$(get_version_component_range 1-2)
 
 DESCRIPTION="Ruby Enterprise Edition is a branch of Ruby including various enhancements"
 HOMEPAGE="http://www.rubyenterpriseedition.com/"
-SRC_URI="mirror://rubyforge/emm-ruby/${PN}-${MY_PV}.tar.gz
-		 http://dev.a3li.li/gentoo/distfiles/ruby-patches-ee-${PV}.tar.bz2"
+SRC_URI="mirror://rubyforge/emm-ruby/${MY_P}.tar.gz
+		 http://www.flameeyes.eu/gentoo-distfiles/${PN}-patches-${PVR}.tar.bz2"
 
 LICENSE="|| ( Ruby GPL-2 )"
 KEYWORDS="~amd64 ~x86"
-IUSE="+berkdb debug doc emacs examples +gdbm ipv6 rubytests socks5 ssl tcmalloc
-threads tk xemacs"
+IUSE="tcmalloc +berkdb debug doc examples +gdbm ipv6 rubytests ssl threads tk xemacs ncurses +readline libedit"
 
 RDEPEND="
 	berkdb? ( sys-libs/db )
 	gdbm? ( sys-libs/gdbm )
-	ssl? ( dev-libs/openssl )
-	socks5? ( >=net-proxy/dante-1.1.13 )
-	tk? ( dev-lang/tk )
+	ssl? ( >=dev-libs/openssl-0.9.8m )
+	tk? ( dev-lang/tk[threads=] )
+	ncurses? ( sys-libs/ncurses )
+	libedit? ( dev-libs/libedit )
+	!libedit? ( readline? ( sys-libs/readline ) )
+	sys-libs/zlib
 	>=app-admin/eselect-ruby-20100402
 	tcmalloc? ( dev-util/google-perftools )"
-DEPEND="${REPEND}"
+DEPEND="${RDEPEND}"
 # TODO rubygems
-PDEPEND="emacs? ( app-emacs/ruby-mode )
-	xemacs? ( app-xemacs/ruby-modes )"
+PDEPEND="xemacs? ( app-xemacs/ruby-modes )"
 
 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
-		eerror "You have Tk support enabled."
-		eerror
-		eerror "Ruby and Tk need the same 'threads' USE flag settings."
-		eerror "Either change the USE flag on dev-lang/ruby or on dev-lang/tk"
-		eerror "and recompile tk."
-
-		die "threads USE flag mismatch"
-	fi
-}
-
 src_prepare() {
 	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
-		epatch "${WORKDIR}/patches-ee-${PV}"
+		epatch "${WORKDIR}/patches"
 
 	if use tcmalloc ; then
 		sed -i 's:^EXTLIBS.*:EXTLIBS = -ltcmalloc_minimal:' Makefile.in
@@ -65,7 +50,7 @@ src_prepare() {
 
 	# Fix a hardcoded lib path in configure script
 	sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
-	configure.in || die "sed failed"
+		configure.in || die "sed failed"
 
 	eautoreconf
 }
@@ -79,24 +64,26 @@ src_configure() {
 	# as it's risky with newer compilers to leave it as it is.
 	append-flags -fno-strict-aliasing
 
-	# Socks support via dante
-	if use socks5 ; then
-		# Socks support can't be disabled as long as SOCKS_SERVER is
-		# set and socks library is present, so need to unset
-		# SOCKS_SERVER in that case.
-		unset SOCKS_SERVER
-	fi
-
 	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
 	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
 		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
 	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"
+		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
 
 	econf \
-		--program-suffix="${MY_VSUFFIX}" \
+		--program-suffix="${MY_SUFFIX}" \
 		--enable-shared \
 		$(use_enable doc install-doc) \
 		$(use_enable threads pthread) \
@@ -106,9 +93,10 @@ src_configure() {
 		$(use_with gdbm) \
 		$(use_with ssl openssl) \
 		$(use_with tk) \
+		$(use_with ncurses curses) \
 		${myconf} \
-		--with-sitedir=/usr/$(get_libdir)/ruby${MY_SUFFIX}/site_ruby \
-		--with-vendordir=/usr/$(get_libdir)/ruby${MY_SUFFIX}/vendor_ruby \
+		--with-sitedir=/usr/$(get_libdir)/rubyee/site_ruby \
+		--with-vendordir=/usr/$(get_libdir)/rubyee/vendor_ruby \
 		--enable-option-checking=no \
 		|| die "econf failed"
 }
@@ -129,7 +117,7 @@ src_test() {
 		elog "than root, and you must place them into a writeable directory."
 		elog "Then call: "
 		elog
-		elog "ruby${MY_VSUFFIX} -C /location/of/tests runner.rb"
+		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
 	else
 		elog "Enable the rubytests USE flag to install the make check tests"
 	fi
@@ -139,8 +127,11 @@ src_install() {
 	# Ruby is involved in the install process, we don't want interference here.
 	unset RUBYOPT
 
-	LD_LIBRARY_PATH="${D}/usr/$(get_libdir)"
-	RUBYLIB="${S}:${D}/usr/$(get_libdir)/rubyee/${SLOT}"
+	# Creating the rubygems directories, bug #230163 once more.
+	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
+
+	LD_LIBRARY_PATH="${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+	RUBYLIB="${S}:${D}/usr/$(get_libdir)/rubyee/${RUBYVERSION}"
 	for d in $(find "${S}/ext" -type d) ; do
 		RUBYLIB="${RUBYLIB}:$d"
 	done
@@ -148,7 +139,6 @@ src_install() {
 
 	emake DESTDIR="${D}" install || die "make install failed"
 
-	MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo	$(MINIRUBY)' | make -f - getminiruby)
 	keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitelibdir']")
 	keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitearchdir']")
 
@@ -157,21 +147,23 @@ src_install() {
 	fi
 
 	if use examples; then
-		dodir /usr/share/doc/${PF}
-		cp -pPR sample "${D}/usr/share/doc/${PF}"
+		insinto /usr/share/doc/${PF}
+		doins -r sample
 	fi
 
-	dodoc ChangeLog NEWS README* ToDo
+	dodoc ChangeLog NEWS README* ToDo || die
 
 	if use rubytests; then
-		dodir /usr/share/${PN}-${SLOT}
-		cp -pPR test "${D}/usr/share/${PN}-${SLOT}"
+		pushd test
+		insinto /usr/share/${PN}-${SLOT}
+		doins -r .
+		popd
 	fi
 }
 
 pkg_postinst() {
 	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
-		eselect ruby set ruby${MY_VSUFFIX}
+		eselect ruby set ruby${MY_SUFFIX}
 	fi
 
 	ewarn