version bump

Package-Manager: portage-2.1.1_pre5-r1

4 files changed, 199 insertions, 7 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 557ff2e24ab1..bb9590d178cc 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.207 2006/08/07 12:30:09 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.208 2006/08/21 18:01:49 caleb Exp $
+
+*ruby-1.8.5_pre4 (21 Aug 2006)
+
+  21 Aug 2006; Caleb Tennis <caleb@gentoo.org> +ruby-1.8.5_pre4.ebuild:
+  version bump
 
   07 Aug 2006; Ferris McCormick <fmccor@gentoo.org> ruby-1.8.4-r3.ebuild:
   Stable on sparc --- Bug #133002 --- builds and runs fine.  (But notice
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index deca5dc153ac..7b987ab815f5 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -11,10 +11,11 @@ MD5 2fade36ba9727ddc61257d1588b5db16 files/ruby-1.8.4-yaml.diff 457
 RMD160 6bb5d1700c877d5dc4192da6eaae9bc6712f78b0 files/ruby-1.8.4-yaml.diff 457
 SHA256 425847a21b2c794c4cf910bcd7d6603951bc20c55f39e768dd6befd99ea1a0bb files/ruby-1.8.4-yaml.diff 457
 DIST onigd2_5_0.tar.gz 210448 RMD160 2b3638e6300f8b994f334a064381b8013b286db0 SHA256 83d379f48a9ddb469883e5d78cb06de1ae7b9102e7cebd88a132aad6996163df
-DIST onigd2_5_4.tar.gz 212280 RMD160 6f694c6cf12f803d0bc608f493789c92c3cbcf68 SHA256 cd4b4177633e8e42e34c26e3f41b0b9bccf747dc51d72a38943fef9cbc0eaa7b
+DIST onigd2_5_4.tar.gz 212280 RMD160 6f694c6cf12f803d0bc608f493789c92c3cbcf68 SHA1 68438f08aed58bb4655e9268268a0311ea524df7 SHA256 cd4b4177633e8e42e34c26e3f41b0b9bccf747dc51d72a38943fef9cbc0eaa7b
 DIST ruby-1.8.4.20060529.tar.gz 4419855 RMD160 43c2542b56b98fe12ac0d5c5f0c916b44b5b5586 SHA256 cbba5719e5d1bc3ee069a9ceb7c2da9f385d6469b3e46f01bb918e733b451c26
 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 SHA256 6c20bca328fbca08ab83b6de19ec0a6398f3fcc843744123a9c23613ee25e341
+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
 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
@@ -31,10 +32,14 @@ EBUILD ruby-1.8.5_pre1.ebuild 4892 RMD160 89b32ba20510f7b3a15214341fdcdb3fe9d88d
 MD5 dcc7c1423bbeb178cfdc7fb0d36ddaf4 ruby-1.8.5_pre1.ebuild 4892
 RMD160 89b32ba20510f7b3a15214341fdcdb3fe9d88d22 ruby-1.8.5_pre1.ebuild 4892
 SHA256 bf476ecabda1fcff398a4ce36889eaed5994e57509013766fa70223f22a3b598 ruby-1.8.5_pre1.ebuild 4892
-MISC ChangeLog 30327 RMD160 872fb157cbceddbd5663aee60a4be7b41e2a41d5 SHA1 bcac1c8855db30873db9b3e3aba34cfb6f819888 SHA256 695fca32b12433833f58d67c185ed8b690d272042cc09f2e6d60307590d25c6a
-MD5 721a66541c2a6b4125662672c659844e ChangeLog 30327
-RMD160 872fb157cbceddbd5663aee60a4be7b41e2a41d5 ChangeLog 30327
-SHA256 695fca32b12433833f58d67c185ed8b690d272042cc09f2e6d60307590d25c6a ChangeLog 30327
+EBUILD ruby-1.8.5_pre4.ebuild 4888 RMD160 41ece7224b1bb10bd75c045acb92634ff60fc9ab SHA1 d32a70cd4276c85b7dfe05c984dba643d53cb7f3 SHA256 3a87af0c0cb59c565dcedd4d3b5beea64250dfb47f19258cb993f45b60a44003
+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 metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 metadata.xml 157
@@ -51,3 +56,6 @@ SHA256 af7b7370ad332b22fd13b1374dafd9fb9218c95bc1786724ce665f7ccda139b7 files/di
 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
+MD5 dc518d8bfc9597a96a9261868a799381 files/digest-ruby-1.8.5_pre4 494
+RMD160 dce5a038d3d1fb2e1212836de2a34f8220533bd6 files/digest-ruby-1.8.5_pre4 494
+SHA256 0ba49e7e9db3d2886138e42376f3ea25dd58c37a43d52df2d3e7cccfbf508916 files/digest-ruby-1.8.5_pre4 494
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.5_pre4 b/dev-lang/ruby/files/digest-ruby-1.8.5_pre4
new file mode 100644
index 000000000000..c5185d20b7e1
--- /dev/null
+++ b/dev-lang/ruby/files/digest-ruby-1.8.5_pre4
@@ -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 c30cdad5b208116682db24d548f20b2f ruby-1.8.5-preview4.tar.gz 4438641
+RMD160 c9ac8e5114367f1c8c4d70c6de290612babd88ec ruby-1.8.5-preview4.tar.gz 4438641
+SHA256 4c074a849f3e1de6327e63bdaa5ed1562762daaa14cb562f30fc3feaa8121a31 ruby-1.8.5-preview4.tar.gz 4438641
diff --git a/dev-lang/ruby/ruby-1.8.5_pre4.ebuild b/dev-lang/ruby/ruby-1.8.5_pre4.ebuild
new file mode 100644
index 000000000000..d6c3035c5980
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.8.5_pre4.ebuild
@@ -0,0 +1,173 @@
+# 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_pre4.ebuild,v 1.1 2006/08/21 18:01:49 caleb Exp $
+
+ONIGURUMA="onigd2_5_4"
+
+inherit flag-o-matic alternatives eutils multilib autotools
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="http://www.ruby-lang.org/"
+SRC_URI="mirror://ruby/${PV%.*}/${P/_pre/-preview}.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"
+
+PROVIDE="virtual/ruby"
+
+S="${WORKDIR}/ruby-${PV/_pre*/}"
+
+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"
+		emake ${SLOT/./}
+		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() {
+	filter-flags -fomit-frame-pointer
+	export EXTLDFLAGS="${LDFLAGS}"
+
+	filter-flags -Wl,-Bdirect
+	filter-ldflags -Wl,-Bdirect
+	filter-ldflags -Bdirect
+
+	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
+
+	# 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
+}
+
+src_test() {
+
+       if hasq test $FEATURES; then
+
+               if ! hasq userpriv $FEATURES; then
+                       einfo "Ruby's unit tests require the userpriv feature of portage.  Skipping."
+               else
+                      if emake -j1 check -n &> /dev/null; then
+                       vecho ">>> Test phase [check]: ${CATEGORY}/${PF}"
+                               if ! emake -j1 check; then
+                               hasq test $FEATURES && die "Make check failed. See above for details."
+                               hasq test $FEATURES || eerror "Make check failed. See above for details."
+                               fi
+                       fi
+               fi
+
+       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
+}