Snapshot bump

Package-Manager: portage-2.1_rc3-r2

4 files changed, 178 insertions, 16 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 3ebf4778e6b4..8dbbb3119d4d 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.198 2006/05/28 21:26:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.199 2006/05/30 13:24:07 caleb Exp $
+
+*ruby-1.8.4.20060529 (30 May 2006)
+
+  30 May 2006; Caleb Tennis <caleb@gentoo.org> +ruby-1.8.4.20060529.ebuild:
+  Snapshot bump
 
   28 May 2006; Diego Pettenò <flameeyes@gentoo.org>
   ruby-1.8.4.20060226.ebuild:
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 793e5cd1c488..3d191c6368e4 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX oniguruma-2.3.1-gentoo.patch 593 RMD160 73fb0ae1e006bbd2ad6a9b6fcdd5398207a4a21f SHA1 a512797b26b023d6fc8d38f70598d90c7b248bce SHA256 cb976a2907e29d25b23fc3e8db18b40f65fbde1f22b6c511cd6cf57f4bca08b3
 MD5 be89d4c412387337e14a1d141b90b125 files/oniguruma-2.3.1-gentoo.patch 593
 RMD160 73fb0ae1e006bbd2ad6a9b6fcdd5398207a4a21f files/oniguruma-2.3.1-gentoo.patch 593
@@ -16,7 +13,8 @@ SHA256 425847a21b2c794c4cf910bcd7d6603951bc20c55f39e768dd6befd99ea1a0bb files/ru
 DIST onigd2_5_0.tar.gz 210448 RMD160 2b3638e6300f8b994f334a064381b8013b286db0 SHA1 73e3f1fc91decd2fb23674c536dc4eb55cadba07 SHA256 83d379f48a9ddb469883e5d78cb06de1ae7b9102e7cebd88a132aad6996163df
 DIST onigd2_5_4.tar.gz 212280 RMD160 6f694c6cf12f803d0bc608f493789c92c3cbcf68 SHA1 68438f08aed58bb4655e9268268a0311ea524df7 SHA256 cd4b4177633e8e42e34c26e3f41b0b9bccf747dc51d72a38943fef9cbc0eaa7b
 DIST ruby-1.8.4.20060226.tar.gz 4359171 RMD160 b018754466b859929cb4e0fd9cf27586a089a902 SHA1 3dd99c0542a8da30743c6e4b378b3a37bdaae84f SHA256 a9fe1f96ab87844ef11bb55e4de978610a98dbb3c10c7dabbbea288df4446736
-DIST ruby-1.8.4.tar.gz 4312965 RMD160 1c0572a4ee369af57a3db68027b2566052eac944 SHA256 71432841b3965b7ab2d83f0dc7c3049195ea4e9267a8dc2d825a8a0466982930
+DIST ruby-1.8.4.20060529.tar.gz 4419855 RMD160 43c2542b56b98fe12ac0d5c5f0c916b44b5b5586 SHA1 e7068ede33c9afa218e150e73d44223e23d11a33 SHA256 cbba5719e5d1bc3ee069a9ceb7c2da9f385d6469b3e46f01bb918e733b451c26
+DIST ruby-1.8.4.tar.gz 4312965 RMD160 1c0572a4ee369af57a3db68027b2566052eac944 SHA1 93999577c7fc4decc6b2fe8fefa96e743f278fbf SHA256 71432841b3965b7ab2d83f0dc7c3049195ea4e9267a8dc2d825a8a0466982930
 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
@@ -29,10 +27,14 @@ EBUILD ruby-1.8.4.20060226.ebuild 4275 RMD160 21c201317abf1174da718f5f36fe95de12
 MD5 e06a0667f0b1328d5c5d84c7cbdf56d7 ruby-1.8.4.20060226.ebuild 4275
 RMD160 21c201317abf1174da718f5f36fe95de12592d46 ruby-1.8.4.20060226.ebuild 4275
 SHA256 7057ea434ae5e80d78e4e4c120ac82624e947bec97710ab9b90f85952ddd6a6d ruby-1.8.4.20060226.ebuild 4275
-MISC ChangeLog 29082 RMD160 3dce8938f970a916643ca3e69b9739fd520d008f SHA1 cb5eb7c03983353f09e6a8ee99373fc631b2535d SHA256 383587f2de9ec7ecf7d3c8e711d0bfb9d09bbe57ea15ab7dee6b6f20e854f35e
-MD5 e7aea50641bf72a5f53891972090bf09 ChangeLog 29082
-RMD160 3dce8938f970a916643ca3e69b9739fd520d008f ChangeLog 29082
-SHA256 383587f2de9ec7ecf7d3c8e711d0bfb9d09bbe57ea15ab7dee6b6f20e854f35e ChangeLog 29082
+EBUILD ruby-1.8.4.20060529.ebuild 4250 RMD160 5544ee91b599874f87e6dd63da24f503e6dd5c17 SHA1 e0c549ecbb4d90b7d800cbe88971d8ac142c19a2 SHA256 2a60d7dd057bd22d8180819040bc433389a0239cbb6908cbe05d3d7a6f8c0f6a
+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
+MISC ChangeLog 29207 RMD160 b9cdbb10afeb424635b9a4b4355c25a7b06f7f59 SHA1 7b74cd94d144527837d55a317b01f247fc0cda5f SHA256 aa2334a31e899a2e107a40507425c5d4586757f38752fdb36185b0d7bbfe5d35
+MD5 847a9866547a8fc1b589ddb2dbe8d4c7 ChangeLog 29207
+RMD160 b9cdbb10afeb424635b9a4b4355c25a7b06f7f59 ChangeLog 29207
+SHA256 aa2334a31e899a2e107a40507425c5d4586757f38752fdb36185b0d7bbfe5d35 ChangeLog 29207
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 metadata.xml 157
@@ -46,10 +48,6 @@ SHA256 f9a1f94eb7aaa8da1e8ac2e65220ac6ea865b6c0b2dc0e1c8ecdfb4fca699b4a files/di
 MD5 fd4ee62a9d8185cc9ce901b6efe82921 files/digest-ruby-1.8.4.20060226 494
 RMD160 1d366d5810386625d39c5a9172fe9e3d8707882b files/digest-ruby-1.8.4.20060226 494
 SHA256 65225d6ced2a5d9b7994adb02588775d6df150a547c5905e53783c5ff47205ed files/digest-ruby-1.8.4.20060226 494
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEehWBAiZjviIA2XgRAj+vAKCcIVoGrXFvrqxdnT+Wp4nQOP6KlQCffYPx
-jV4p4BThVZC32qUWdCo6tZo=
-=46AO
------END PGP SIGNATURE-----
+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
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.4.20060529 b/dev-lang/ruby/files/digest-ruby-1.8.4.20060529
new file mode 100644
index 000000000000..aa5396242b39
--- /dev/null
+++ b/dev-lang/ruby/files/digest-ruby-1.8.4.20060529
@@ -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 3d328af9ef0d7c2d608d67ad257a1506 ruby-1.8.4.20060529.tar.gz 4419855
+RMD160 43c2542b56b98fe12ac0d5c5f0c916b44b5b5586 ruby-1.8.4.20060529.tar.gz 4419855
+SHA256 cbba5719e5d1bc3ee069a9ceb7c2da9f385d6469b3e46f01bb918e733b451c26 ruby-1.8.4.20060529.tar.gz 4419855
diff --git a/dev-lang/ruby/ruby-1.8.4.20060529.ebuild b/dev-lang/ruby/ruby-1.8.4.20060529.ebuild
new file mode 100644
index 000000000000..1a435b6180f4
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.8.4.20060529.ebuild
@@ -0,0 +1,153 @@
+# 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.4.20060529.ebuild,v 1.1 2006/05/30 13:24:07 caleb Exp $
+
+ONIGURUMA="onigd2_5_4"
+
+inherit flag-o-matic alternatives eutils gnuconfig multilib
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="http://www.ruby-lang.org/"
+SRC_URI="mirror://gentoo/${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 ~x86-fbsd"
+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
+	${RDEPEND}"
+PROVIDE="virtual/ruby"
+
+S="${WORKDIR}/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"
+		make ${SLOT/./}
+		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"
+}
+
+src_compile() {
+	filter-flags -fomit-frame-pointer
+	export EXTLDFLAGS="${LDFLAGS}"
+
+	filter-flags -Wl,-Bdirect
+	filter-ldflags -Wl,-Bdirect
+	filter-ldflags -Bdirect
+
+	# 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 EXTLDFLAGS="${EXTLDFLAGS}" DLDFLAGS="${LDFLAGS}" || die "emake failed"
+
+	# Remove the expanded ${LDFLAGS} variable on the configuration file
+	sed -i -e 's:CONFIG\["LDFLAGS"\] =.*:CONFIG["LDFLAGS"] = "-Wl,-export-dynamic":' \
+		rbconfig.rb
+}
+
+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
+}