Revbump to new patchset including a patch for an OpenSSL function name typo. Upstream bug: http://code.google.com/p/rubyenterpriseedition/issues/detail?id=39

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

3 files changed, 207 insertions, 6 deletions

diff --git a/dev-lang/ruby-enterprise/ChangeLog b/dev-lang/ruby-enterprise/ChangeLog
index 8841e4447667..cb2e160e0072 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.1 2010/04/03 06:39:01 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby-enterprise/ChangeLog,v 1.2 2010/05/13 16:31:19 a3li Exp $
+
+*ruby-enterprise-1.8.7.2010.01-r1 (13 May 2010)
+
+  13 May 2010; Alex Legler <a3li@gentoo.org>
+  +ruby-enterprise-1.8.7.2010.01-r1.ebuild:
+  Revbump to new patchset including a patch for an OpenSSL function name
+  typo. Upstream bug:
+  http://code.google.com/p/rubyenterpriseedition/issues/detail?id=39
 
 *ruby-enterprise-1.8.7.2010.01 (03 Apr 2010)
 
diff --git a/dev-lang/ruby-enterprise/Manifest b/dev-lang/ruby-enterprise/Manifest
index 52969720ef33..9dea3c260e46 100644
--- a/dev-lang/ruby-enterprise/Manifest
+++ b/dev-lang/ruby-enterprise/Manifest
@@ -2,14 +2,16 @@
 Hash: SHA1
 
 DIST ruby-enterprise-1.8.7-2010.01.tar.gz 7470579 RMD160 305dbc1fbae4abe152baca886d36f9216be2a4e1 SHA1 453ceba47df157d89e2ff9412c3c9f8a601c0718 SHA256 ccdf836693ea9c110bf8b97ced91be3db100487428a6668d0b45fb883fa6793d
+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 491 RMD160 a2941406e3ef422ca88bf500edc3541a208d2ec2 SHA1 a1447e2265a45515a51020afd0d2fac6cdbb9a95 SHA256 a627630cb84dfcf542ad7fc1616316cf92e9a8a64b479fc0f5d2b39af8f02f1c
+MISC ChangeLog 794 RMD160 15c038d9336f4bed7ab1bc74d037dc8256a170ab SHA1 a88e32bcf444c910b6c5565db98f895e65cf6373 SHA256 f8f3e7221e1627044fb08dd696ccc61872b2554a8a29d612ff8c5cc063ef1ae9
 MISC metadata.xml 363 RMD160 265014e60fc37dedcf1723670fa15924e976647e SHA1 7f78bb234c1ecfdfd7e7f972287fc02e0cbec0af SHA256 23231e6f00711864020aea6dfc458362d568d5a1adab4a591b9a21e75afadae6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAku24pUACgkQ+tgfDpkAy6CFrQCfcf5awkbO8qlVdn9wMXok6735
-3IsAnRWzs8T6zQtvSvRcfq8QGs5/BXxG
-=GXDK
+iEYEARECAAYFAkvsKWgACgkQ+tgfDpkAy6ColwCeJp4c4oZt3qEtIZ5cOau4P7uz
+nkgAn0EM/7H6E2jqnHbOStJHbuefdf6I
+=A6+g
 -----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
new file mode 100644
index 000000000000..a4c1b01ead25
--- /dev/null
+++ b/dev-lang/ruby-enterprise/ruby-enterprise-1.8.7.2010.01-r1.ebuild
@@ -0,0 +1,191 @@
+# 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
+}