Remove dependencies on system packages. Add berkdb (bug #199705), gdbm and ssl USE flags. Patch to p113.

Package-Manager: portage-2.1.3.19

4 files changed, 204 insertions, 5 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 1b6cd4f63c82..1ebaa044e8c1 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/ruby
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.313 2007/12/23 17:15:53 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.314 2007/12/23 17:40:37 rbrown Exp $
+
+*ruby-1.8.6_p111-r1 (23 Dec 2007)
+
+  23 Dec 2007; Richard Brown <rbrown@gentoo.org> +ruby-1.8.6_p111-r1.ebuild:
+  Remove dependencies on system packages. Add berkdb (bug #199705), gdbm and
+  ssl USE flags. Patch to p113.
 
   23 Dec 2007; Brent Baude <ranger@gentoo.org> ruby-1.8.6_p111.ebuild:
   Marking  ruby-1.8.6_p111 ppc and ppc64 for bug 199191
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 710120c0a52b..bc2bda405654 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -40,6 +40,7 @@ DIST ruby-1.8.5-p2.tar.gz 4519151 RMD160 3ad4c4a4d02930cbb1a582ea5fa19db04f55ab3
 DIST ruby-1.8.6-p110.tar.gz 4546509 RMD160 6495c22a94149e4dbc3608f0bf2f0c75683060e0 SHA1 0954a9d308d12393e2a6880743f752eb171bbe81 SHA256 d3f11ecaf2b0bd7bd3f0bc24007b1c7c12640c55cd40e8e4cc396ba835186fbe
 DIST ruby-1.8.6-p111.tar.bz2 3919396 RMD160 8ff9b8592a80062742be61b2b4e1158282b61c4b SHA1 d85d25786e0ce30f8f54f5cfa36968ec0f6b9a5f SHA256 85c694678313818a5083bcfd66ae389fc053b506d93b5ad46f3764981c120fbb
 DIST ruby-1.8.6.tar.gz 4589394 RMD160 a1ad902bb1311233cd3cf9db52ab2ec076a709f5 SHA1 c915f65e1e42dbedc43acabcbef2bbe03233bf20 SHA256 3ef37fb961d04471a1aef2c8079d6fab09932e3281d79859d5cd5d426bde0868
+DIST ruby-1.8.6_p111-to-p113.patch.bz2 5823 RMD160 bee2dedd786450fb8008ced74af95c8e2401fa3b SHA1 0ed730d65593c828b1122c909900402f4d3d8f74 SHA256 cfe2d2e95ad708c5e00c274b9547e20076d31ccf7655860f7661be531dcdacc4
 EBUILD ruby-1.8.4-r3.ebuild 3771 RMD160 ec30e7108ca305568d6a435944eee43d198c5b8d SHA1 862eb815f09e6bfbee4dbfb45f2b9b9249cb28e4 SHA256 819b09c7279d9fbbd588236ad0a7bb98dc73d220b191007406cfc80adab77237
 MD5 691fd9a765ea473f0511eb5f10959c7d ruby-1.8.4-r3.ebuild 3771
 RMD160 ec30e7108ca305568d6a435944eee43d198c5b8d ruby-1.8.4-r3.ebuild 3771
@@ -64,14 +65,18 @@ EBUILD ruby-1.8.6_p110-r2.ebuild 4960 RMD160 b2db20834f7d3b0ba66b07c8832c0000670
 MD5 c67f62c20fbd537dfab988f6157033f2 ruby-1.8.6_p110-r2.ebuild 4960
 RMD160 b2db20834f7d3b0ba66b07c8832c0000670664ca ruby-1.8.6_p110-r2.ebuild 4960
 SHA256 a1798ef423bbef7186ab0b96d0d4be02fa182037ff7d54346ef60fc37fe84dd1 ruby-1.8.6_p110-r2.ebuild 4960
+EBUILD ruby-1.8.6_p111-r1.ebuild 5173 RMD160 257d5fb0f8637071d331fe99454ef1b62c477f21 SHA1 cf263c23221fbe7a55ecc37d102e7149f36af2f9 SHA256 61e6d8af2811ffef11e80510d509371c66279e44cfa84e28cdbb7b3b007ea2ba
+MD5 5f7b8146ece82f20f8152e2ed1cdcc8e ruby-1.8.6_p111-r1.ebuild 5173
+RMD160 257d5fb0f8637071d331fe99454ef1b62c477f21 ruby-1.8.6_p111-r1.ebuild 5173
+SHA256 61e6d8af2811ffef11e80510d509371c66279e44cfa84e28cdbb7b3b007ea2ba ruby-1.8.6_p111-r1.ebuild 5173
 EBUILD ruby-1.8.6_p111.ebuild 4988 RMD160 97d4e01d91fabec7bab444b4a0c81afb13e0105d SHA1 0e99852e0e9bc62c38995b875c12aef438ff9b9c SHA256 c7e58ae971309816c1af040ec376d0426fcae210164c7eeb4c8290c9fecc616d
 MD5 a5264a50b1bfa2a19c429c1491eb8858 ruby-1.8.6_p111.ebuild 4988
 RMD160 97d4e01d91fabec7bab444b4a0c81afb13e0105d ruby-1.8.6_p111.ebuild 4988
 SHA256 c7e58ae971309816c1af040ec376d0426fcae210164c7eeb4c8290c9fecc616d ruby-1.8.6_p111.ebuild 4988
-MISC ChangeLog 45844 RMD160 a5d90c8397a4dbb5b4b57e5641a75991d7874aba SHA1 cc5cd53bc01945867d3edd028ea3b015a345b206 SHA256 f72196bb132e725b906099f35f730a505526bca98ac22e495199c440909c0b6d
-MD5 f51b591a501328094cfb272a119c61c1 ChangeLog 45844
-RMD160 a5d90c8397a4dbb5b4b57e5641a75991d7874aba ChangeLog 45844
-SHA256 f72196bb132e725b906099f35f730a505526bca98ac22e495199c440909c0b6d ChangeLog 45844
+MISC ChangeLog 46066 RMD160 03542fdb2bb991695e5214055dea6583ac0828e6 SHA1 d5bcae5df5e18f41eed68381f0223d4a49fa95e7 SHA256 418ba7bf438ee1aa5ecb2efd55a435142c2752d79b8294a93529d84222fb0145
+MD5 cdf67b10206fdef6b5983031a7d7a88b ChangeLog 46066
+RMD160 03542fdb2bb991695e5214055dea6583ac0828e6 ChangeLog 46066
+SHA256 418ba7bf438ee1aa5ecb2efd55a435142c2752d79b8294a93529d84222fb0145 ChangeLog 46066
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 metadata.xml 157
@@ -97,3 +102,6 @@ SHA256 9bc1c506ca3cd4d1813cb1756a00fef2f24386df406ae7eb77829ea3d1c51bb2 files/di
 MD5 72a72f267a24fdff1b528b6718ec39b3 files/digest-ruby-1.8.6_p111 485
 RMD160 67ff0b7e88994c69f61a14ca7540296db0a264f1 files/digest-ruby-1.8.6_p111 485
 SHA256 e9a39ea0a83d404093b35ddb43182cd653b93c676c767efeaae82a3bb82c11b5 files/digest-ruby-1.8.6_p111 485
+MD5 e1d4b3a12c62a75abf03c931b5f22096 files/digest-ruby-1.8.6_p111-r1 759
+RMD160 2f252b5133bbbf8f58eba29d6dda2dd362d7e8d6 files/digest-ruby-1.8.6_p111-r1 759
+SHA256 3792d1e7d214e0eaa31de6526d605a062e52ea6271c594391cd6c22375371867 files/digest-ruby-1.8.6_p111-r1 759
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.6_p111-r1 b/dev-lang/ruby/files/digest-ruby-1.8.6_p111-r1
new file mode 100644
index 000000000000..46e69feeec5d
--- /dev/null
+++ b/dev-lang/ruby/files/digest-ruby-1.8.6_p111-r1
@@ -0,0 +1,9 @@
+MD5 7e4c2b197387232afd9a11378feeb246 onigd2_5_9.tar.gz 221355
+RMD160 ceeee9a0221d431d6576a566621ba9badab6423d onigd2_5_9.tar.gz 221355
+SHA256 b24df7c0fa6fc72ce37fd1e203f378359f29f739a3f4c5b6bdd40ca5f7d25db0 onigd2_5_9.tar.gz 221355
+MD5 e1d38b7d4f1be55726d6927a3395ce3b ruby-1.8.6-p111.tar.bz2 3919396
+RMD160 8ff9b8592a80062742be61b2b4e1158282b61c4b ruby-1.8.6-p111.tar.bz2 3919396
+SHA256 85c694678313818a5083bcfd66ae389fc053b506d93b5ad46f3764981c120fbb ruby-1.8.6-p111.tar.bz2 3919396
+MD5 64ac7a77d4141c32362e47e79921bab8 ruby-1.8.6_p111-to-p113.patch.bz2 5823
+RMD160 bee2dedd786450fb8008ced74af95c8e2401fa3b ruby-1.8.6_p111-to-p113.patch.bz2 5823
+SHA256 cfe2d2e95ad708c5e00c274b9547e20076d31ccf7655860f7661be531dcdacc4 ruby-1.8.6_p111-to-p113.patch.bz2 5823
diff --git a/dev-lang/ruby/ruby-1.8.6_p111-r1.ebuild b/dev-lang/ruby/ruby-1.8.6_p111-r1.ebuild
new file mode 100644
index 000000000000..9ac6c81203d1
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.8.6_p111-r1.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.6_p111-r1.ebuild,v 1.1 2007/12/23 17:40:37 rbrown Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+ONIGURUMA="onigd2_5_9"
+
+inherit autotools eutils flag-o-matic multilib versionator
+
+MY_P="${PN}-$(replace_version_separator 3 '-')"
+S=${WORKDIR}/${MY_P}
+
+SLOT=$(get_version_component_range 1-2)
+MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="http://www.ruby-lang.org/"
+SRC_URI="ftp://ftp.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.bz2
+	mirror://gentoo/${P}-to-p113.patch.bz2
+	cjk? ( http://www.geocities.jp/kosako3/oniguruma/archive/${ONIGURUMA}.tar.gz )"
+
+LICENSE="Ruby"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="berkdb cjk debug doc emacs examples gdbm ipv6 rubytests socks5 ssl 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 )
+	>=dev-ruby/ruby-config-0.3.1
+	!=dev-lang/ruby-cvs-${SLOT}*
+	!dev-ruby/rdoc
+	!dev-ruby/rexml"
+DEPEND="${RDEPEND}"
+PDEPEND="emacs? ( app-emacs/ruby-mode )
+	xemacs? ( app-xemacs/ruby-modes )"
+
+PROVIDE="virtual/ruby"
+
+src_unpack() {
+	unpack ${A}
+
+	if use cjk ; then
+		einfo "Applying ${ONIGURUMA}"
+		pushd "${WORKDIR}/oniguruma"
+		econf --with-rubydir="${S}" || die "oniguruma econf failed"
+		emake $MY_SUFFIX || die "oniguruma emake failed"
+		popd
+	fi
+
+	cd "${S}/ext/dl"
+	epatch "${FILESDIR}/${PN}-1.8.6-memory-leak.diff"
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-r13657.patch"
+	epatch "${WORKDIR}/${P}-to-p113.patch"
+
+	# 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_compile() {
+	# -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
+
+	econf --program-suffix=$MY_SUFFIX --enable-shared \
+		$(use_enable socks5 socks) \
+		$(use_enable doc install-doc) \
+		$(use_enable threads pthread) \
+		$(use_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/site_ruby \
+		|| die "econf failed"
+
+	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 -C /location/of/tests runner.rb"
+	else
+		elog "Enable the rubytests USE flag to install the make check tests"
+	fi
+}
+
+src_install() {
+	LD_LIBRARY_PATH="${D}/usr/$(get_libdir)"
+	RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${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
+
+	dosym libruby$MY_SUFFIX$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%.*})
+	dosym libruby$MY_SUFFIX$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%_*})
+
+	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() {
+
+	ewarn "If you upgrade to >=sys-apps/coreutils-6.7-r1,"
+	ewarn "you should re-emerge ruby again."
+	ewarn "See bug #159922 for details"
+	ewarn
+	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
+		"${ROOT}usr/sbin/ruby-config" ruby$MY_SUFFIX
+	fi
+	elog
+	elog "You can change the default ruby interpreter by ${ROOT}usr/sbin/ruby-config"
+	elog
+}
+
+pkg_postrm() {
+	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
+		"${ROOT}usr/sbin/ruby-config" ruby$MY_SUFFIX
+	fi
+}