Version Bump. Bug #181379

Package-Manager: portage-2.1.2.7

4 files changed, 190 insertions, 5 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 4f65862e14fa..8618e932ce83 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,11 @@
 # 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.281 2007/06/10 20:46:28 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.282 2007/06/12 18:23:41 rbrown Exp $
+
+*ruby-1.8.6_p36 (12 Jun 2007)
+
+  12 Jun 2007; Richard Brown <rbrown@gentoo.org> +ruby-1.8.6_p36.ebuild:
+  Version Bump. Bug #181379
 
   10 Jun 2007; Joshua Kinard <kumba@gentoo.org> ruby-1.8.6-r1.ebuild:
   Stable on mips, per #181110.
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 86d1e7a9c1cf..0bfcaa006552 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -16,6 +16,7 @@ DIST ruby-1.8.4.tar.gz 4312965 RMD160 1c0572a4ee369af57a3db68027b2566052eac944 S
 DIST ruby-1.8.5-p12.tar.gz 4526961 RMD160 104e78ea4ce0d8fbd3ca1195ca064eda9c9721ea SHA1 15a34958c12e2fe5f41bec0ac935398b60d9c72e SHA256 c72ad433adee87c79ece02f506008afa9ea783a11d1acdaf4107306caede5d0a
 DIST ruby-1.8.5-p2.tar.gz 4519151 RMD160 3ad4c4a4d02930cbb1a582ea5fa19db04f55ab3b SHA1 f614bba73f447ddf35f8a4beb71ccc3df87831a5 SHA256 496844dc90571454a50552912f02a42df7fc4f89cef5bd3cd4854cecf3fd1d30
 DIST ruby-1.8.5-p35.tar.gz 4522314 RMD160 8a87fb77ce5eab0a663431a7ad689d48cd9ca06c SHA1 04067b47c27c4e5197a11e4e3ea2504842a46f66 SHA256 4d937d5c51e95b4f5c881e334c1c3f69c8e894deac1024ed7c9911c4f78548f0
+DIST ruby-1.8.6-p36.tar.gz 4535005 RMD160 8e3ca34149b60c649ee50ee98c5e89de04099eba SHA1 8146074ddfdc7d1dedc172b4956a8b131c0f58bf SHA256 1a9db5f4720a7023d9ecfaa6c4128ecb5f8cd59460744fb4b5f3b64ed3786935
 DIST ruby-1.8.6.tar.gz 4589394 RMD160 a1ad902bb1311233cd3cf9db52ab2ec076a709f5 SHA1 c915f65e1e42dbedc43acabcbef2bbe03233bf20 SHA256 3ef37fb961d04471a1aef2c8079d6fab09932e3281d79859d5cd5d426bde0868
 EBUILD ruby-1.8.4-r3.ebuild 3790 RMD160 4d616773d8cc7dd3016edec2fb2b4642174accd9 SHA1 d469f8e207e0ac8800771e7c98ee28b99b6fe2ad SHA256 46d32ff24e1f577b391445244bf9eb196e22db55edb249053422a3767eb46969
 MD5 229085a7bb4e871ef16568eca377600c ruby-1.8.4-r3.ebuild 3790
@@ -41,10 +42,14 @@ EBUILD ruby-1.8.6-r1.ebuild 4995 RMD160 00e836a5a920cc59187275193019a7ae77c7a2a6
 MD5 6270c17abf53bb1f882af0613f301a9a ruby-1.8.6-r1.ebuild 4995
 RMD160 00e836a5a920cc59187275193019a7ae77c7a2a6 ruby-1.8.6-r1.ebuild 4995
 SHA256 80ce81f0e1db36de15afb97036da410fb52d44feed35a26b4222c87972ac125a ruby-1.8.6-r1.ebuild 4995
-MISC ChangeLog 40669 RMD160 fcffa3ffe4fe03177e4daa93b7cc211a92644527 SHA1 b544a9ebce464558d6ea9d8e9afa0a90268d4104 SHA256 b936dc406472f6ace445cc326caad3605f7e059c39ee7ee7334053c74dfe05ef
-MD5 8ee9ad5816bcae518c805217bb9d8c17 ChangeLog 40669
-RMD160 fcffa3ffe4fe03177e4daa93b7cc211a92644527 ChangeLog 40669
-SHA256 b936dc406472f6ace445cc326caad3605f7e059c39ee7ee7334053c74dfe05ef ChangeLog 40669
+EBUILD ruby-1.8.6_p36.ebuild 4962 RMD160 b0561634e331071e7df8fbd3a10d1c9e0513728c SHA1 5553368c3817ceaf5f9027e3c562066f8e195b22 SHA256 99ddd6d9a73cd8fe9938e0923206bc351fb32978536b6090c77e40f57a66ac3d
+MD5 b48d2f54366b0771e4903ce2543b659a ruby-1.8.6_p36.ebuild 4962
+RMD160 b0561634e331071e7df8fbd3a10d1c9e0513728c ruby-1.8.6_p36.ebuild 4962
+SHA256 99ddd6d9a73cd8fe9938e0923206bc351fb32978536b6090c77e40f57a66ac3d ruby-1.8.6_p36.ebuild 4962
+MISC ChangeLog 40803 RMD160 f3bf17cc187ef11eb259105ee1ab57a34e18db64 SHA1 d75f6d24f4876a8aa4cc154a7b03fe9c8fc1713d SHA256 c92511b0a3badd158caba5517d41d08e12edbd23fdc7a33454c96bdcb09bf855
+MD5 61c98b3435f73308848025be29f8bb93 ChangeLog 40803
+RMD160 f3bf17cc187ef11eb259105ee1ab57a34e18db64 ChangeLog 40803
+SHA256 c92511b0a3badd158caba5517d41d08e12edbd23fdc7a33454c96bdcb09bf855 ChangeLog 40803
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 metadata.xml 157
@@ -67,3 +72,6 @@ SHA256 bbb5d32f084537e89f7ac201de06942620d794d744c8ae0c07797efb1bd00942 files/di
 MD5 e7fc9a14d094a485d0db9eac1e17ca88 files/digest-ruby-1.8.6-r1 235
 RMD160 d8b37132ebe5eba9d4485f1ce320ab3fc824cc4d files/digest-ruby-1.8.6-r1 235
 SHA256 06257e9ae516624582d8e9067e50d992537ffddab879573208164353cc3d8075 files/digest-ruby-1.8.6-r1 235
+MD5 19033eb75e6c9df9009f6a93bac65f62 files/digest-ruby-1.8.6_p36 247
+RMD160 7ff098f76dfd9c1f2708e6721dc36c90cd15b924 files/digest-ruby-1.8.6_p36 247
+SHA256 435325500fe2783c1b9623f2d81129f232f308b4a8d70e845b71778957d7a54e files/digest-ruby-1.8.6_p36 247
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.6_p36 b/dev-lang/ruby/files/digest-ruby-1.8.6_p36
new file mode 100644
index 000000000000..a534e3240b65
--- /dev/null
+++ b/dev-lang/ruby/files/digest-ruby-1.8.6_p36
@@ -0,0 +1,3 @@
+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.ebuild b/dev-lang/ruby/ruby-1.8.6_p36.ebuild
new file mode 100644
index 000000000000..3107ececfe7c
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.8.6_p36.ebuild
@@ -0,0 +1,169 @@
+# 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.ebuild,v 1.1 2007/06/12 18:23:41 rbrown Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+# A new version is needed for 1.8.6, currently disabled.
+ONIGURUMA="onigd2_5_8"
+
+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="debug doc examples ipv6 rubytests socks5 threads tk" # cjk
+RESTRICT="confcache"
+
+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
+##		epatch ${FILESDIR}/oniguruma-2.3.1-gentoo.patch
+#		econf --with-rubydir=${S} || die "econf failed"
+#		MY_PV=$(get_version_component_range 1-2)
+#		make ${MY_PV/./}
+#		popd
+#	fi
+
+	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 || 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
+}