Use user LDFLAGS, #181436

Package-Manager: portage-2.1.3_rc8

4 files changed, 196 insertions, 15 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 4c22cfccccb3..c287637c902c 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.293 2007/08/17 19:37:18 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.294 2007/08/26 06:25:38 pclouds Exp $
+
+*ruby-1.8.6_p36-r4 (26 Aug 2007)
+
+  26 Aug 2007; Nguyễn Thái Ngọc Duy <pclouds@gentoo.org>
+  +ruby-1.8.6_p36-r4.ebuild:
+  Use user LDFLAGS, #181436
 
   17 Aug 2007; Hans de Graaff <graaff@gentoo.org> ruby-1.8.4-r3.ebuild,
   ruby-1.8.5_p2-r1.ebuild, ruby-1.8.5_p35.ebuild:
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 273d546d4520..7436d56beed0 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ruby-1.8.4-glibc24-eaccess.diff 2619 RMD160 8ec70e117b01a53917b47c829455f77023d393b9 SHA1 bd3600fc8e22ef083663b6b90bb1ec748aa87cce SHA256 bde0e69a78528560c574df8e53bce25a243e86a4cdbb6b33bdc9310f15f861a7
 MD5 bb134d27fc11d3ac2f6ca0526e2ee5a1 files/ruby-1.8.4-glibc24-eaccess.diff 2619
 RMD160 8ec70e117b01a53917b47c829455f77023d393b9 files/ruby-1.8.4-glibc24-eaccess.diff 2619
@@ -49,10 +46,14 @@ EBUILD ruby-1.8.6_p36-r3.ebuild 4964 RMD160 d3b9f2cd70d62b64738323a6bf560a692a5e
 MD5 073af124ff26824537d057a02cd6e0d0 ruby-1.8.6_p36-r3.ebuild 4964
 RMD160 d3b9f2cd70d62b64738323a6bf560a692a5e7c9b ruby-1.8.6_p36-r3.ebuild 4964
 SHA256 7f06aa179ada2b0637218a6ade9649344b5cc31bbca33f3bfd6f0c0b9abd96fe ruby-1.8.6_p36-r3.ebuild 4964
-MISC ChangeLog 42828 RMD160 312f2c658d35cbd3dde9414bf40598f0eebdd74e SHA1 64467d24ff7241cee783447f5347d9aa375777b4 SHA256 bc9d1c1432f6f818ce181d3829f2ca74c7c6ff094bafdf83f19ff31bedcd978d
-MD5 5bed7479790eed37e8595383d6186343 ChangeLog 42828
-RMD160 312f2c658d35cbd3dde9414bf40598f0eebdd74e ChangeLog 42828
-SHA256 bc9d1c1432f6f818ce181d3829f2ca74c7c6ff094bafdf83f19ff31bedcd978d ChangeLog 42828
+EBUILD ruby-1.8.6_p36-r4.ebuild 4990 RMD160 0a9f843a567e7c3bfb67f1ba0eb5bc9f025f19c9 SHA1 47645ff2c54a16817e78de23c14a4ac8e67fe0af SHA256 c17692d08fe66f168ff61e1072bd12967f02b0eacb6a9191164e54ca47d20e2c
+MD5 f10edd5b59cb7c30163814381c396454 ruby-1.8.6_p36-r4.ebuild 4990
+RMD160 0a9f843a567e7c3bfb67f1ba0eb5bc9f025f19c9 ruby-1.8.6_p36-r4.ebuild 4990
+SHA256 c17692d08fe66f168ff61e1072bd12967f02b0eacb6a9191164e54ca47d20e2c ruby-1.8.6_p36-r4.ebuild 4990
+MISC ChangeLog 42983 RMD160 25d4d42a387ddab54336148883318aa46178ef95 SHA1 9eb18a1fe3ac4e951e81e42245cf81bbe4fac80b SHA256 7bd1522d6acb3e4e736e9bda6807c0b806aa18dd537f653d8944438a93c788c5
+MD5 48a47063387d65403f22315bd002f6b8 ChangeLog 42983
+RMD160 25d4d42a387ddab54336148883318aa46178ef95 ChangeLog 42983
+SHA256 7bd1522d6acb3e4e736e9bda6807c0b806aa18dd537f653d8944438a93c788c5 ChangeLog 42983
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 metadata.xml 157
@@ -72,10 +73,6 @@ SHA256 06257e9ae516624582d8e9067e50d992537ffddab879573208164353cc3d8075 files/di
 MD5 a3f4418fce22647071dd4933a1eadcf0 files/digest-ruby-1.8.6_p36-r3 479
 RMD160 3f088121f5c934ea461a83023031adabd210a0d4 files/digest-ruby-1.8.6_p36-r3 479
 SHA256 7a9bfbd900c349de6e3685df9d0879e5f026a00a03c6873f241bf17d03de1429 files/digest-ruby-1.8.6_p36-r3 479
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.6 (GNU/Linux)
-
-iD8DBQFG0LRYp/wUKkr7RBoRAs1qAKCr6w6q2jU5chMHrxtFOre7ZdN14wCfQlRw
-zqfqDtiRnqE94EycTnThYvQ=
-=ZleA
------END PGP SIGNATURE-----
+MD5 a3f4418fce22647071dd4933a1eadcf0 files/digest-ruby-1.8.6_p36-r4 479
+RMD160 3f088121f5c934ea461a83023031adabd210a0d4 files/digest-ruby-1.8.6_p36-r4 479
+SHA256 7a9bfbd900c349de6e3685df9d0879e5f026a00a03c6873f241bf17d03de1429 files/digest-ruby-1.8.6_p36-r4 479
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.6_p36-r4 b/dev-lang/ruby/files/digest-ruby-1.8.6_p36-r4
new file mode 100644
index 000000000000..2cc0191d7069
--- /dev/null
+++ b/dev-lang/ruby/files/digest-ruby-1.8.6_p36-r4
@@ -0,0 +1,6 @@
+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 2a252394ecdcbcb3a55732efd9d38e27 ruby-1.8.6-p36.tar.gz 4535005
+RMD160 8e3ca34149b60c649ee50ee98c5e89de04099eba ruby-1.8.6-p36.tar.gz 4535005
+SHA256 1a9db5f4720a7023d9ecfaa6c4128ecb5f8cd59460744fb4b5f3b64ed3786935 ruby-1.8.6-p36.tar.gz 4535005
diff --git a/dev-lang/ruby/ruby-1.8.6_p36-r4.ebuild b/dev-lang/ruby/ruby-1.8.6_p36-r4.ebuild
new file mode 100644
index 000000000000..4d1553982e6f
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.8.6_p36-r4.ebuild
@@ -0,0 +1,172 @@
+# 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_p36-r4.ebuild,v 1.1 2007/08/26 06:25:38 pclouds Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+ONIGURUMA="onigd2_5_9"
+
+inherit flag-o-matic alternatives eutils multilib autotools versionator
+
+MY_P="${P/_p/-p}"
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="http://www.ruby-lang.org/"
+SRC_URI="ftp://ftp.ruby-lang.org/pub/ruby/1.8/${MY_P}.tar.gz
+	cjk? ( http://www.geocities.jp/kosako3/oniguruma/archive/${ONIGURUMA}.tar.gz )"
+
+LICENSE="Ruby"
+SLOT="1.8"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="cjk debug doc examples ipv6 rubytests socks5 threads tk"
+
+RDEPEND=">=sys-libs/gdbm-1.8.0
+	>=sys-libs/readline-4.1
+	>=sys-libs/ncurses-5.2
+	socks5? ( >=net-proxy/dante-1.1.13 )
+	tk? ( dev-lang/tk )
+	>=dev-ruby/ruby-config-0.3.1
+	!=dev-lang/ruby-cvs-1.8*
+	!dev-ruby/rdoc
+	!dev-ruby/rexml"
+DEPEND="${RDEPEND}"
+PROVIDE="virtual/ruby"
+
+src_unpack() {
+	unpack ${A}
+
+	if use cjk ; then
+		einfo "Applying ${ONIGURUMA}"
+		pushd ${WORKDIR}/oniguruma
+		econf --with-rubydir=${S} || die "econf failed"
+		MY_PV=$(get_version_component_range 1-2)
+		make ${MY_PV/./}
+		popd
+	fi
+
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-rb_thread_status_prototype.patch"
+
+	cd "${S}/ext/dl"
+	epatch "${FILESDIR}/${PN}-1.8.6-memory-leak.diff"
+
+	cd "${S}"
+	# 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=${SLOT/./} --enable-shared \
+		$(use_enable socks5 socks) \
+		$(use_enable doc install-doc) \
+		$(use_enable threads pthread) \
+		$(use_enable ipv6) \
+		$(use_enable debug) \
+		$(use_with tk) \
+		--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
+
+	make 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${SLOT/./}$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%.*})
+	dosym libruby${SLOT/./}$(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
+	ewarn "Warning: Vim won't work if you've just updated ruby from"
+	ewarn "1.6.x to 1.8.x due to the library version change."
+	ewarn "In that case, you will need to remerge vim."
+	ewarn
+
+	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${SLOT/./}
+	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${SLOT/./}
+	fi
+}