Adapting dev-libs/openssl dependency for older ebuild, fixing rubytests installation path. Cleaning up even older ebuild.

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

4 files changed, 15 insertions, 202 deletions

diff --git a/dev-lang/ruby-enterprise/ChangeLog b/dev-lang/ruby-enterprise/ChangeLog
index 97044741e905..82ee09bb4b64 100644
--- a/dev-lang/ruby-enterprise/ChangeLog
+++ b/dev-lang/ruby-enterprise/ChangeLog
@@ -1,6 +1,12 @@
 # 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.5 2010/08/06 17:00:59 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby-enterprise/ChangeLog,v 1.6 2010/08/06 17:04:32 a3li Exp $
+
+  06 Aug 2010; Alex Legler <a3li@gentoo.org>
+  -ruby-enterprise-1.8.7.2010.01-r1.ebuild,
+  ruby-enterprise-1.8.7.2010.01-r2.ebuild:
+  Adapting dev-libs/openssl dependency for older ebuild, fixing rubytests
+  installation path. Cleaning up even older ebuild.
 
 *ruby-enterprise-1.8.7.2010.02 (06 Aug 2010)
 
diff --git a/dev-lang/ruby-enterprise/Manifest b/dev-lang/ruby-enterprise/Manifest
index 2f469e02a230..47f55979cfb9 100644
--- a/dev-lang/ruby-enterprise/Manifest
+++ b/dev-lang/ruby-enterprise/Manifest
@@ -5,16 +5,14 @@ DIST ruby-enterprise-1.8.7-2010.01.tar.gz 7470579 RMD160 305dbc1fbae4abe152baca8
 DIST ruby-enterprise-1.8.7-2010.02.tar.gz 7812593 RMD160 8cca0a8d9c11f6e27a523f3595dacc3f78ccfeee SHA1 81eaf97b1f8a0c561c29d90c55e1fbd38c120ce7 SHA256 5e7268021aa30f9b79f3ed066989cffc8b31b17db9e2aca40c039ff017da4813
 DIST ruby-enterprise-patches-1.8.7.2010.01-r2.tar.bz2 2592 RMD160 5d3625eb8cd6929d0597f98821140c844a2ef07c SHA1 31fd089d3e2bfee58ba81dc843b15b14b47eff96 SHA256 9f8ea53e45ee5446d0d8196ac79cd84deb0ec68e3699c05abf926480e708e717
 DIST ruby-enterprise-patches-1.8.7.2010.02.tar.bz2 16570 RMD160 7b672147b7e13a5dc77bf0704fdf27d7a6427c97 SHA1 f1f24d7d55f09663b4a0187e478fe31f56916010 SHA256 a18d6eaf349e63a71cd29a856a3d9a96cf02b18feb84c144f4c574ac7a207c5a
-DIST ruby-patches-ee-1.8.7.2010.01-r1.tar.bz2 2286 RMD160 88aae59790b019184beadff68a6470a7cab9b066 SHA1 acccb1bca4977c3a6a1d030b3120dabd48a7f3d6 SHA256 20783384eff56cb031204ca2567c1d598dc8c6e589f96344e9d4bbea9cf95d0d
-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-r2.ebuild 5312 RMD160 94b5f6c0d268e95b127b14f38f5db06e2f3dc3b9 SHA1 a448a493cceb3cf26566a6c1be98b2ae5373f080 SHA256 0684106c2351a85c4c2d0ff3fbe1edd7e8a5f0d5a52c3ccc92038002b3f3b53d
+EBUILD ruby-enterprise-1.8.7.2010.01-r2.ebuild 5337 RMD160 89fe8d681c2ddb85707ee0c22b583e6cbd567511 SHA1 4fef6abef1406228fef15e3ab8bd0f029253d877 SHA256 dff83869a60afc554f7294f2adc885c22de460a43d2af14b1fc59b980ec9b9b7
 EBUILD ruby-enterprise-1.8.7.2010.02.ebuild 5485 RMD160 a58198e0955fc5f95e3aba68465770878a1c2b8b SHA1 3349b9ae28dff98b00b1f54f3900b53a45e974a2 SHA256 210916560e813691320d21552c7f885cdb286411e5877c6328d6ff636bbf7021
-MISC ChangeLog 1592 RMD160 77c99c94ee6169ff6ebe926abd1a61063fd2fcac SHA1 ba272f922a90c113e019fd7be6c1b51f68668178 SHA256 a3f2037633a112acca3d109980f64e74bb8c069b943a343283f5e6b95c09a7a0
+MISC ChangeLog 1851 RMD160 7dd33b610b7e45e275941d0611b2279170901a96 SHA1 ff22f4c74030d4f2bc19334bb37026ebf1d5c3dd SHA256 66117e79440e63e462708dada2b696518a049a9fb522c4b2c9947599c9ff9d1b
 MISC metadata.xml 1201 RMD160 3d992cbc732e08676b7b562ca4eac71a3ac3201a SHA1 6f5051c74fbc0b5f337f798567be951e9b612f2a SHA256 7f2dfb145b624ddce3051e9b6f004266761bae9e29fbc288747b2e06cf6b05fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkxcP9MACgkQ3Ca6Xy8+rvSfowD/eS6GdbBKZrIuXp7J9jxqtKGf
-MMIPBdhQ56brA3LZ75wA/A9o0WuIXn5MLgNzkFulcY4iqXtG2MpqSTFZkOSObU9m
-=ejdz
+iF4EAREIAAYFAkxcQKYACgkQ3Ca6Xy8+rvRTXgD8DwVAY0pPDkXw4dguyLtvpHHO
+SLNjYXncjM3i8YbjcNcA/R3mlzmMywcGjkwQiLqMvExgCzcQVO2EmtyyICzJXgu1
+=8ROT
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ruby-enterprise/ruby-enterprise-1.8.7.2010.01-r1.ebuild b/dev-lang/ruby-enterprise/ruby-enterprise-1.8.7.2010.01-r1.ebuild
deleted file mode 100644
index a4c1b01ead25..000000000000
--- a/dev-lang/ruby-enterprise/ruby-enterprise-1.8.7.2010.01-r1.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# 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-r1.ebuild,v 1.1 2010/05/13 16:31:19 a3li Exp $
-
-EAPI="2"
-inherit autotools eutils flag-o-matic multilib versionator
-
-MY_PV=$(replace_version_separator 3 '-')
-S="${WORKDIR}/${PN}-${MY_PV}/source"
-
-SLOT=$(get_version_component_range 1-2)
-MY_VSUFFIX="ee$(delete_version_separator 1 ${SLOT})"
-MY_SUFFIX="ee"
-
-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-${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"
-
-RDEPEND="
-	berkdb? ( sys-libs/db )
-	gdbm? ( sys-libs/gdbm )
-	ssl? ( dev-libs/openssl )
-	socks5? ( >=net-proxy/dante-1.1.13 )
-	tk? ( dev-lang/tk )
-	>=app-admin/eselect-ruby-20100402
-	tcmalloc? ( dev-util/google-perftools )"
-DEPEND="${REPEND}"
-# TODO rubygems
-PDEPEND="emacs? ( app-emacs/ruby-mode )
-	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-${PVR}"
-
-	if use tcmalloc ; then
-		sed -i 's:^EXTLIBS.*:EXTLIBS = -ltcmalloc_minimal:' Makefile.in
-	fi
-
-	# 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"
-
-	eautoreconf
-}
-
-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
-	# 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"
-
-	econf \
-		--program-suffix="${MY_VSUFFIX}" \
-		--enable-shared \
-		$(use_enable doc install-doc) \
-		$(use_enable threads pthread) \
-		--enable-ipv6 \
-		$(use_enable debug) \
-		$(use_with berkdb dbm) \
-		$(use_with gdbm) \
-		$(use_with ssl openssl) \
-		$(use_with tk) \
-		${myconf} \
-		--with-sitedir=/usr/$(get_libdir)/ruby${MY_SUFFIX}/site_ruby \
-		--with-vendordir=/usr/$(get_libdir)/ruby${MY_SUFFIX}/vendor_ruby \
-		--enable-option-checking=no \
-		|| die "econf failed"
-}
-
-src_compile() {
-	emake EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
-	emake -j1 test || die "make test failed"
-
-	elog "Ruby's make test has been run. Ruby also ships with a make check"
-	elog "that cannot be run until after ruby has been installed."
-	elog
-	if use rubytests; then
-		elog "You have enabled rubytests, so they will be installed to"
-		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
-		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"
-	else
-		elog "Enable the rubytests USE flag to install the make check tests"
-	fi
-}
-
-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}"
-	for d in $(find "${S}/ext" -type d) ; do
-		RUBYLIB="${RUBYLIB}:$d"
-	done
-	export LD_LIBRARY_PATH RUBYLIB
-
-	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']")
-
-	if use doc; then
-		make DESTDIR="${D}" install-doc || die "make install-doc failed"
-	fi
-
-	if use examples; then
-		dodir /usr/share/doc/${PF}
-		cp -pPR sample "${D}/usr/share/doc/${PF}"
-	fi
-
-	dodoc ChangeLog NEWS README* ToDo
-
-	if use rubytests; then
-		dodir /usr/share/${PN}-${SLOT}
-		cp -pPR test "${D}/usr/share/${PN}-${SLOT}"
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
-		eselect ruby set ruby${MY_VSUFFIX}
-	fi
-
-	ewarn
-	ewarn "Ruby Enterprise Edition is not guaranteed to be binary-compatible to"
-	ewarn "MRI (dev-lang/ruby). Exercise care especially with C extensions!"
-	ewarn "Gentoo does *not* accept any bugs regarding such failures."
-	ewarn
-
-	elog
-	elog "To switch between available Ruby profiles, execute as root:"
-	elog "\teselect ruby set ruby(18|19|...)"
-	elog
-}
-
-pkg_postrm() {
-	eselect ruby cleanup
-}
diff --git a/dev-lang/ruby-enterprise/ruby-enterprise-1.8.7.2010.01-r2.ebuild b/dev-lang/ruby-enterprise/ruby-enterprise-1.8.7.2010.01-r2.ebuild
index 974fa7e4229d..5f003e3b6ef1 100644
--- a/dev-lang/ruby-enterprise/ruby-enterprise-1.8.7.2010.01-r2.ebuild
+++ b/dev-lang/ruby-enterprise/ruby-enterprise-1.8.7.2010.01-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-enterprise/ruby-enterprise-1.8.7.2010.01-r2.ebuild,v 1.2 2010/05/20 19:15:39 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby-enterprise/ruby-enterprise-1.8.7.2010.01-r2.ebuild,v 1.3 2010/08/06 17:04:32 a3li Exp $
 
 EAPI=2
 
@@ -26,7 +26,7 @@ IUSE="tcmalloc +berkdb debug doc examples +gdbm ipv6 rubytests ssl threads tk xe
 RDEPEND="
 	berkdb? ( sys-libs/db )
 	gdbm? ( sys-libs/gdbm )
-	ssl? ( >=dev-libs/openssl-0.9.8m )
+	ssl? ( >=dev-libs/openssl-0.9.8m <dev-libs/openssl-1 )
 	tk? ( dev-lang/tk[threads=] )
 	ncurses? ( sys-libs/ncurses )
 	libedit? ( dev-libs/libedit )
@@ -154,7 +154,7 @@ src_install() {
 
 	if use rubytests; then
 		pushd test
-		insinto /usr/share/${PN}-${SLOT}
+		insinto /usr/share/${PN}-${SLOT}/test
 		doins -r .
 		popd
 	fi