Version bump.

Package-Manager: portage-2.1.1_rc1-r1

4 files changed, 172 insertions, 5 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index bb9590d178cc..0de666e57c47 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/ruby
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.208 2006/08/21 18:01:49 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.209 2006/08/28 03:22:46 superlag Exp $
+
+*ruby-1.8.5 (28 Aug 2006)
+
+  28 Aug 2006; <aaron@gentoo.org> +ruby-1.8.5.ebuild:
+  Version bump. +1.8.5
 
 *ruby-1.8.5_pre4 (21 Aug 2006)
 
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 7b987ab815f5..afc534fcf094 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -16,6 +16,7 @@ DIST ruby-1.8.4.20060529.tar.gz 4419855 RMD160 43c2542b56b98fe12ac0d5c5f0c916b44
 DIST ruby-1.8.4.tar.gz 4312965 RMD160 1c0572a4ee369af57a3db68027b2566052eac944 SHA1 93999577c7fc4decc6b2fe8fefa96e743f278fbf SHA256 71432841b3965b7ab2d83f0dc7c3049195ea4e9267a8dc2d825a8a0466982930
 DIST ruby-1.8.5-preview1.tar.gz 4401446 RMD160 d7dbaa58e0e0d8b6530c721c78fa5205e5e0a82a SHA1 ab9e486aaccf2e5c86dd0ef5f929acde4993715b SHA256 6c20bca328fbca08ab83b6de19ec0a6398f3fcc843744123a9c23613ee25e341
 DIST ruby-1.8.5-preview4.tar.gz 4438641 RMD160 c9ac8e5114367f1c8c4d70c6de290612babd88ec SHA1 d6f982a0c2c79fca0f11fb9299b079f9a18fa22a SHA256 4c074a849f3e1de6327e63bdaa5ed1562762daaa14cb562f30fc3feaa8121a31
+DIST ruby-1.8.5.tar.gz 4438603 RMD160 991899146c23c9ea30ac09f41b7077fa0c8686b6 SHA1 0638ea26e1088fc9f4237abde8c85331689ce77c SHA256 19590e972b80333e26a6514c34d976c2037138361481a16f27b75e5d33f33a58
 EBUILD ruby-1.8.4-r1.ebuild 3917 RMD160 3ad0e91b038c2fd9c2e939b0333c387014c53c77 SHA1 de25b4ceccf778c58c9f324a32770b052ef87fc1 SHA256 594ab20c77a31c271c8bcb5a31e0a610ae9b16dbfe71c3c32464a84d215db30a
 MD5 641c1d71603a06247dff8c88fda070ad ruby-1.8.4-r1.ebuild 3917
 RMD160 3ad0e91b038c2fd9c2e939b0333c387014c53c77 ruby-1.8.4-r1.ebuild 3917
@@ -28,6 +29,10 @@ EBUILD ruby-1.8.4.20060529.ebuild 4250 RMD160 5544ee91b599874f87e6dd63da24f503e6
 MD5 339ba65421bc1af295e084bd57212afb ruby-1.8.4.20060529.ebuild 4250
 RMD160 5544ee91b599874f87e6dd63da24f503e6dd5c17 ruby-1.8.4.20060529.ebuild 4250
 SHA256 2a60d7dd057bd22d8180819040bc433389a0239cbb6908cbe05d3d7a6f8c0f6a ruby-1.8.4.20060529.ebuild 4250
+EBUILD ruby-1.8.5.ebuild 3937 RMD160 87aaf7357eef4213d23b6d5c139cfa557f8df1f5 SHA1 b54ad7d08dabf4ce33422fff664ab7449561eb89 SHA256 541a31d0ba9beaf8384d8ebc88d28b5ec4d36d29b9d2cb6cdd7512b7aab56ede
+MD5 ae75e75eb7291e821b7845a353309d2e ruby-1.8.5.ebuild 3937
+RMD160 87aaf7357eef4213d23b6d5c139cfa557f8df1f5 ruby-1.8.5.ebuild 3937
+SHA256 541a31d0ba9beaf8384d8ebc88d28b5ec4d36d29b9d2cb6cdd7512b7aab56ede ruby-1.8.5.ebuild 3937
 EBUILD ruby-1.8.5_pre1.ebuild 4892 RMD160 89b32ba20510f7b3a15214341fdcdb3fe9d88d22 SHA1 4495d4178344b902809ee25c37772d95af83d1ac SHA256 bf476ecabda1fcff398a4ce36889eaed5994e57509013766fa70223f22a3b598
 MD5 dcc7c1423bbeb178cfdc7fb0d36ddaf4 ruby-1.8.5_pre1.ebuild 4892
 RMD160 89b32ba20510f7b3a15214341fdcdb3fe9d88d22 ruby-1.8.5_pre1.ebuild 4892
@@ -36,10 +41,10 @@ EBUILD ruby-1.8.5_pre4.ebuild 4888 RMD160 41ece7224b1bb10bd75c045acb92634ff60fc9
 MD5 5c5425d4f2f1d989027fb24ced149867 ruby-1.8.5_pre4.ebuild 4888
 RMD160 41ece7224b1bb10bd75c045acb92634ff60fc9ab ruby-1.8.5_pre4.ebuild 4888
 SHA256 3a87af0c0cb59c565dcedd4d3b5beea64250dfb47f19258cb993f45b60a44003 ruby-1.8.5_pre4.ebuild 4888
-MISC ChangeLog 30446 RMD160 6d2482ef8ec90d86e9f699bd7dab8225ff598ce0 SHA1 ad5eddc721e3f82db5ab86bd81375d52b81c6250 SHA256 063356f8c19fd833ab5a39810244f6127252874d658d62c1a57a5105002afff7
-MD5 c3d128a910de57510ba7c5c9388a8b59 ChangeLog 30446
-RMD160 6d2482ef8ec90d86e9f699bd7dab8225ff598ce0 ChangeLog 30446
-SHA256 063356f8c19fd833ab5a39810244f6127252874d658d62c1a57a5105002afff7 ChangeLog 30446
+MISC ChangeLog 30554 RMD160 11adf3bc507b5ad87b16af9aa62d2705f9c0bde9 SHA1 6ce693b2c918961fe56cbc50bbf5d4c6d45e5c52 SHA256 e0c3f967f925f2c17a90a6183dafe5f20919715228beb3c19d6cb267279c1bc2
+MD5 7c15d4b9f908ed2f8b0e60a0186449d4 ChangeLog 30554
+RMD160 11adf3bc507b5ad87b16af9aa62d2705f9c0bde9 ChangeLog 30554
+SHA256 e0c3f967f925f2c17a90a6183dafe5f20919715228beb3c19d6cb267279c1bc2 ChangeLog 30554
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 metadata.xml 157
@@ -53,6 +58,9 @@ SHA256 f9a1f94eb7aaa8da1e8ac2e65220ac6ea865b6c0b2dc0e1c8ecdfb4fca699b4a files/di
 MD5 0f3358d0670ec83d5ba209c568b313ec files/digest-ruby-1.8.4.20060529 494
 RMD160 81d7d9dfba3cc1b145d874acd891c33ff0aaf1f7 files/digest-ruby-1.8.4.20060529 494
 SHA256 af7b7370ad332b22fd13b1374dafd9fb9218c95bc1786724ce665f7ccda139b7 files/digest-ruby-1.8.4.20060529 494
+MD5 86b5d06a5da72078a1755ad84cf57d56 files/digest-ruby-1.8.5 467
+RMD160 094acdf2c1878e06040137dd5f14a790116dccbd files/digest-ruby-1.8.5 467
+SHA256 7c362e231f229a4afbd81fc401069c1411f7833a9b56122c3b3acd9d9de71eee files/digest-ruby-1.8.5 467
 MD5 fa6b06ade11f050c73cb9dc8b68e6e57 files/digest-ruby-1.8.5_pre1 494
 RMD160 f69e17d7bab9c66499e81570b30fece67f8e763d files/digest-ruby-1.8.5_pre1 494
 SHA256 5e37b7f8403c803e74d559a3f5a1f4ad8181abd4c63df72c5df0ad2e9efd07ab files/digest-ruby-1.8.5_pre1 494
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.5 b/dev-lang/ruby/files/digest-ruby-1.8.5
new file mode 100644
index 000000000000..55d88e714851
--- /dev/null
+++ b/dev-lang/ruby/files/digest-ruby-1.8.5
@@ -0,0 +1,6 @@
+MD5 b3b6b2d2f77f1f485d055d74f6eb6f2a onigd2_5_4.tar.gz 212280
+RMD160 6f694c6cf12f803d0bc608f493789c92c3cbcf68 onigd2_5_4.tar.gz 212280
+SHA256 cd4b4177633e8e42e34c26e3f41b0b9bccf747dc51d72a38943fef9cbc0eaa7b onigd2_5_4.tar.gz 212280
+MD5 3fbb02294a8ca33d4684055adba5ed6f ruby-1.8.5.tar.gz 4438603
+RMD160 991899146c23c9ea30ac09f41b7077fa0c8686b6 ruby-1.8.5.tar.gz 4438603
+SHA256 19590e972b80333e26a6514c34d976c2037138361481a16f27b75e5d33f33a58 ruby-1.8.5.tar.gz 4438603
diff --git a/dev-lang/ruby/ruby-1.8.5.ebuild b/dev-lang/ruby/ruby-1.8.5.ebuild
new file mode 100644
index 000000000000..9504bbba038e
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.8.5.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.5.ebuild,v 1.1 2006/08/28 03:22:46 superlag Exp $
+
+ONIGURUMA="onigd2_5_4"
+
+inherit flag-o-matic alternatives eutils gnuconfig multilib autotools
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="http://www.ruby-lang.org/"
+SRC_URI="ftp://ftp.ruby-lang.org/pub/ruby/${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 ~ppc-macos ~ppc64 ~s390 ~sh
+~sparc ~x86"
+IUSE="socks5 tcltk cjk doc threads examples ipv6"
+RESTRICT="confcache"
+
+RDEPEND="virtual/libc
+	>=sys-libs/gdbm-1.8.0
+	>=sys-libs/readline-4.1
+	>=sys-libs/ncurses-5.2
+	socks5? ( >=net-proxy/dante-1.1.13 )
+	tcltk? ( dev-lang/tk )
+	>=dev-ruby/ruby-config-0.3
+	!=dev-lang/ruby-cvs-1.8*
+	!dev-ruby/rdoc
+	!dev-ruby/rexml"
+
+DEPEND="sys-devel/autoconf
+	sys-apps/findutils
+	${RDEPEND}"
+PROVIDE="virtual/ruby"
+
+S=${WORKDIR}/${P%_*}
+
+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"
+		make ${PV/./}
+		popd
+	fi
+
+	# Enable build on alpha EV67 (but run gnuconfig_update everywhere)
+	gnuconfig_update || die "gnuconfig_update failed"
+
+	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() {
+	filter-flags -fomit-frame-pointer
+
+	# 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
+
+	# On ia64 we need to build without optimization #48824
+	if use ia64; then
+		replace-flags '-O*' -O0
+	fi
+
+	econf --program-suffix=${SLOT/./} --enable-shared \
+		$(use_enable socks5 socks) \
+		$(use_enable doc install-doc) \
+		$(use_enable threads pthread) \
+		$(use_enable ipv6 ipv6) \
+		--with-sitedir=/usr/$(get_libdir)/ruby/site_ruby \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+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"
+
+	if use doc; then
+		make DESTDIR=${D} install-doc || die "make install-doc failed"
+	fi
+
+	if use examples; then
+		dodir ${ROOT}usr/share/doc/${PF}
+		cp -pPR sample ${D}/${ROOT}usr/share/doc/${PF}
+	fi
+
+	if use ppc-macos ; then
+		dosym /usr/lib/libruby${SLOT/./}.${PV%_*}.dylib /usr/lib/libruby.${PV%.*}.dylib
+		dosym /usr/lib/libruby${SLOT/./}.${PV%_*}.dylib /usr/lib/libruby.${PV%_*}.dylib
+	else
+		dosym libruby${SLOT/./}.so.${PV%_*} /usr/$(get_libdir)/libruby.so.${PV%.*}
+		dosym libruby${SLOT/./}.so.${PV%_*} /usr/$(get_libdir)/libruby.so.${PV%_*}
+	fi
+
+	dodoc COPYING* ChangeLog MANIFEST README* ToDo
+}
+
+pkg_postinst() {
+	if ! use ppc-macos ; then
+		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
+
+		if [ ! -n "$(readlink ${ROOT}usr/bin/ruby)" ] ; then
+			${ROOT}usr/sbin/ruby-config ruby${SLOT/./}
+		fi
+		einfo
+		einfo "You can change the default ruby interpreter by ${ROOT}usr/sbin/ruby-config"
+		einfo
+	fi
+}
+
+pkg_postrm() {
+	if ! use ppc-macos ; then
+		if [ ! -n "$(readlink ${ROOT}usr/bin/ruby)" ] ; then
+			${ROOT}usr/sbin/ruby-config ruby${SLOT/./}
+		fi
+	fi
+}