Adding a new 1.8.4 snapshot as of today, see if it helps with some YAML and other bugs

Package-Manager: portage-2.1_pre4-r1

4 files changed, 198 insertions, 2 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 68c4f645f481..8d5c05a352b4 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,12 @@
 # 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.187 2006/02/26 18:16:51 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.188 2006/02/27 14:34:54 caleb Exp $
+
+*ruby-1.8.4.20060226 (27 Feb 2006)
+
+  27 Feb 2006; Caleb Tennis <caleb@gentoo.org> +ruby-1.8.4.20060226.ebuild:
+  Adding a new 1.8.4 snapshot as of today, see if it helps with some YAML and
+  other bugs
 
   26 Feb 2006; Joshua Kinard <kumba@gentoo.org> ruby-1.8.4-r1.ebuild:
   Marked stable on mips.
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 00eaf4c10c55..378d3629c9db 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,17 +1,57 @@
-MD5 f15fbe43dd339bc53329b80c09c00679 ChangeLog 27271
+MD5 d684f34d1d15079832c9e237ea4918c5 ChangeLog 27475
+RMD160 0b51a7d5f27940103c3ce872e3ed7ea64bf83619 ChangeLog 27475
+SHA256 e1c751a41df2c7e16a5d8e40a93cab985126db913f80e720a06d35080253eacc ChangeLog 27475
 MD5 c0305f496353b27f98c0c42e4005cb8a files/digest-ruby-1.8.2-r2 125
+RMD160 d08b97b5ff912943f8b1e24a2b59605358f95151 files/digest-ruby-1.8.2-r2 125
+SHA256 38843a08d2481f4d395f8b3184f88e6c2ece0a51746cc017a5249c6645d6cc3b files/digest-ruby-1.8.2-r2 125
 MD5 e496eaf8c6af0debd1c74f8e66746a0c files/digest-ruby-1.8.3 125
+RMD160 f8b9347c4730e4b293989c2d555115cb46f11f1e files/digest-ruby-1.8.3 125
+SHA256 0550a5aec45c6ca3ee7814085979e86ca7c58982f0fb31307f424320d09d8851 files/digest-ruby-1.8.3 125
 MD5 abf0468a972fff8b129ec750fd804ab5 files/digest-ruby-1.8.4 125
+RMD160 ef877a22b2f8b30abec9064a141ac23b1be73e76 files/digest-ruby-1.8.4 125
+SHA256 69cae7d6d6f7512668861867fc1111f21e7998be5247a6d7bf1d3f5e27fca42d files/digest-ruby-1.8.4 125
 MD5 abf0468a972fff8b129ec750fd804ab5 files/digest-ruby-1.8.4-r1 125
+RMD160 ef877a22b2f8b30abec9064a141ac23b1be73e76 files/digest-ruby-1.8.4-r1 125
+SHA256 69cae7d6d6f7512668861867fc1111f21e7998be5247a6d7bf1d3f5e27fca42d files/digest-ruby-1.8.4-r1 125
+MD5 16c628d57fa38e629d61513a047e8d00 files/digest-ruby-1.8.4.20060226 494
+RMD160 db28b122ba200ec9ed8d3f74845c1eea0984c269 files/digest-ruby-1.8.4.20060226 494
+SHA256 f9a6752fcf1b41547deb13bd7c99d5c6f2b5879dcae64965f20c5a9f5cbe7492 files/digest-ruby-1.8.4.20060226 494
 MD5 be89d4c412387337e14a1d141b90b125 files/oniguruma-2.3.1-gentoo.patch 593
+RMD160 73fb0ae1e006bbd2ad6a9b6fcdd5398207a4a21f files/oniguruma-2.3.1-gentoo.patch 593
+SHA256 cb976a2907e29d25b23fc3e8db18b40f65fbde1f22b6c511cd6cf57f4bca08b3 files/oniguruma-2.3.1-gentoo.patch 593
 MD5 d4b55b8964955655827a50afba707a69 files/re.c.182.patch 2472
+RMD160 d1ed0e88571e8d68086b4377b6e09a3a16da4502 files/re.c.182.patch 2472
+SHA256 b05d5cc98e052d96bc15cf256abb1b64ec8b3f87387bb1a6c5bf92c7f1faa617 files/re.c.182.patch 2472
 MD5 5d27b5dca2842607d0dd0469612a2224 files/ruby-1.8.2-soap.diff 596
+RMD160 73c27555ce93c679ec70ad516c9526b232e4d34c files/ruby-1.8.2-soap.diff 596
+SHA256 9e72a18cb2804856597e734452888524286c3d06f4551c4e0f81e82099521687 files/ruby-1.8.2-soap.diff 596
 MD5 2026b6d80f876e54e87b8fe906d469ca files/ruby-1.8.2-unittest.diff 822
+RMD160 33635aba1e6f45e093b4b18b8ac4bbe3b6b31b8b files/ruby-1.8.2-unittest.diff 822
+SHA256 7dace5f8ba88c4ca51125524dbbe1d07a7e8509817d8a9dc6066f7402b691a55 files/ruby-1.8.2-unittest.diff 822
 MD5 d1fd7f979894cfe7da89ec38992788eb files/ruby-1.8.2-xmlrpc-ipimethods-fix.diff 441
+RMD160 8a91c7039af3e1cd65582fa0673950a129d8ca47 files/ruby-1.8.2-xmlrpc-ipimethods-fix.diff 441
+SHA256 d2e0ae291d0e6f5c2690fd620a4dc75de5d8cb629513f81b0be6402a8f59f75f files/ruby-1.8.2-xmlrpc-ipimethods-fix.diff 441
 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
 MD5 e7fc14a584186eb629eddc20bc853a24 files/ruby-rdoc-gentoo.diff 455
+RMD160 a6f6a8aa29cf3530f094e4b4ffbc651d120460d4 files/ruby-rdoc-gentoo.diff 455
+SHA256 02f8ec2858e87f2db7f3b84a1ce2930919396c82f70285a11cc252dda52bb418 files/ruby-rdoc-gentoo.diff 455
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
+RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 metadata.xml 157
+SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c metadata.xml 157
 MD5 9ca8067e28b43508365945b7c966f4cb ruby-1.8.2-r2.ebuild 3938
+RMD160 0b2ee02daeda4543cdd91b545e155255a4097a28 ruby-1.8.2-r2.ebuild 3938
+SHA256 740c74c26d2ace33e9166262cd542f5404088a35476b212709154fc5bd503cb1 ruby-1.8.2-r2.ebuild 3938
 MD5 54cbaa87fca2660aa6dba405ab273c66 ruby-1.8.3.ebuild 3708
+RMD160 a6c926eddf62cca18ffe732f4b6f970e52e86252 ruby-1.8.3.ebuild 3708
+SHA256 04351cbf664e212c69729fc095946594d48a0add6ee17348013da9d13e1a0e32 ruby-1.8.3.ebuild 3708
 MD5 b661b758b11d050928e4bb863892bc59 ruby-1.8.4-r1.ebuild 3918
+RMD160 e658e7852523aef7b9d99ba0a61b39f5add40546 ruby-1.8.4-r1.ebuild 3918
+SHA256 48aa73ecf2a7de187b6c21277a805934d8fba70c028774b3bfcd1cba31eca652 ruby-1.8.4-r1.ebuild 3918
+MD5 f1c5de92b15fa6a9db0beac3ba1e05fd ruby-1.8.4.20060226.ebuild 3888
+RMD160 e302c4933f0dc697851f963f4da904cab9ab4c38 ruby-1.8.4.20060226.ebuild 3888
+SHA256 58e4200f525e7dcb8fce6c5f03d9ad8c4be7e5a362c68264ef96b70e380510bb ruby-1.8.4.20060226.ebuild 3888
 MD5 f6ff8646fa6f1678684b64bd596b9ceb ruby-1.8.4.ebuild 3783
+RMD160 bd84b3c647cd3c06e3a94b1dfac34db8af883dca ruby-1.8.4.ebuild 3783
+SHA256 35b4211adb89ca75585669ea60f377a8bd04825bce0aa414e1059ee612a65169 ruby-1.8.4.ebuild 3783
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.4.20060226 b/dev-lang/ruby/files/digest-ruby-1.8.4.20060226
new file mode 100644
index 000000000000..478a6dbfb5f7
--- /dev/null
+++ b/dev-lang/ruby/files/digest-ruby-1.8.4.20060226
@@ -0,0 +1,6 @@
+MD5 40cb52605c7292373d8dfd11015cb687 onigd2_5_0.tar.gz 210448
+RMD160 2b3638e6300f8b994f334a064381b8013b286db0 onigd2_5_0.tar.gz 210448
+SHA256 83d379f48a9ddb469883e5d78cb06de1ae7b9102e7cebd88a132aad6996163df onigd2_5_0.tar.gz 210448
+MD5 7597b5205e03fe05bb6fc14c27d62f1e ruby-1.8.4.20060226.tar.gz 4359171
+RMD160 b018754466b859929cb4e0fd9cf27586a089a902 ruby-1.8.4.20060226.tar.gz 4359171
+SHA256 a9fe1f96ab87844ef11bb55e4de978610a98dbb3c10c7dabbbea288df4446736 ruby-1.8.4.20060226.tar.gz 4359171
diff --git a/dev-lang/ruby/ruby-1.8.4.20060226.ebuild b/dev-lang/ruby/ruby-1.8.4.20060226.ebuild
new file mode 100644
index 000000000000..3ebd67fcda3d
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.8.4.20060226.ebuild
@@ -0,0 +1,144 @@
+# 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.20060226.ebuild,v 1.1 2006/02/27 14:34:54 caleb Exp $
+
+ONIGURUMA="onigd2_5_0"
+
+inherit flag-o-matic alternatives eutils gnuconfig multilib
+
+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"
+IUSE="socks5 tcltk cjk doc threads examples"
+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}/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
+
+	# 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) \
+		--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
+}