Redo of the last patch (rexml update)

4 files changed, 132 insertions, 14 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index e3c4842f62a7..95cc17df6659 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/ruby
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.62 2004/04/23 22:20:47 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.63 2004/04/24 12:27:10 usata Exp $
+
+*ruby-1.8.1-r5 (24 Apr 2004)
+
+  24 Apr 2004; Mamoru KOMACHI <usata@gentoo.org> ruby-1.8.1-r5.ebuild:
+  Redo of the last patch (rexml update)
 
   23 Apr 2004; Aron Griffis <agriffis@gentoo.org> ruby-1.8.1-r2.ebuild,
   ruby-1.8.1-r3.ebuild, ruby-1.8.1-r4.ebuild:
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 87f7ac10cf6a..a8564c4f42c0 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,19 +1,21 @@
+MD5 001ca112d1bc93d2684c33a8354d4713 ruby-1.8.1-r4.ebuild 2770
+MD5 fb8520ca3b33852dc697241100c205ae ruby-1.6.8-r8.ebuild 1824
+MD5 00b32484c8fac7f1737eddf0f3437627 ruby-1.6.8-r9.ebuild 1811
+MD5 0f6ba42f98901ba374870f06c5853655 ruby-1.8.1-r5.ebuild 2772
+MD5 5212d3f2ec54a0b5a113b1ba6534d79b ChangeLog 10031
+MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
 MD5 d17c6f871d6ae960f14891098013a22e ruby-1.8.1-r2.ebuild 2765
 MD5 d004436115828778437c2cde1d37f620 ruby-1.6.8-r6.ebuild 1736
-MD5 c3f4d432715bda08c2d24d5e9d0a1cf0 ruby-1.8.1-r3.ebuild 2722
-MD5 5212d3f2ec54a0b5a113b1ba6534d79b ChangeLog 10031
-MD5 00b32484c8fac7f1737eddf0f3437627 ruby-1.6.8-r9.ebuild 1811
-MD5 fb8520ca3b33852dc697241100c205ae ruby-1.6.8-r8.ebuild 1824
 MD5 cc2383194b4782659be96b387e3cb400 ruby-1.8.0-r6.ebuild 2603
-MD5 001ca112d1bc93d2684c33a8354d4713 ruby-1.8.1-r4.ebuild 2770
-MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
+MD5 c3f4d432715bda08c2d24d5e9d0a1cf0 ruby-1.8.1-r3.ebuild 2722
+MD5 d05f63da27634456886e7c924eaf96da files/ruby-1.6.8-fix-x86_64.patch 431
+MD5 b7a75b4f66bd81a2db8b21fcc40e4557 files/digest-ruby-1.8.1-r4 197
+MD5 a1aff527ed4b468611a7e55ab17e6bc0 files/ruby-1.6.8-oniguruma-gentoo.diff 1125
+MD5 f216de64996efc5fe3b1cef2f7f643e7 files/digest-ruby-1.6.8-r8 199
 MD5 b48dff624661317e05cd3ad1d6954096 files/digest-ruby-1.6.8-r6 128
 MD5 b0561e76eede4d5e5dfa49efc56bdfc3 files/digest-ruby-1.6.8-r9 196
-MD5 e74e6ef0cfcafd538fe1a52f30cae316 files/digest-ruby-1.8.1-r3 200
-MD5 512336d825e446e013bd383519b6559c files/digest-ruby-1.8.0-r6 128
-MD5 760dc7b65ddbc8e3069dcf95ec8b00ba files/digest-ruby-1.8.1-r2 200
-MD5 b7a75b4f66bd81a2db8b21fcc40e4557 files/digest-ruby-1.8.1-r4 197
+MD5 d1be36298e194dc8c1aa6100e82aecaa files/digest-ruby-1.8.1-r5 199
 MD5 b71bbee8fb97a82541eb43ce30a62f09 files/oniguruma-20040202.diff 589
-MD5 f216de64996efc5fe3b1cef2f7f643e7 files/digest-ruby-1.6.8-r8 199
-MD5 d05f63da27634456886e7c924eaf96da files/ruby-1.6.8-fix-x86_64.patch 431
-MD5 a1aff527ed4b468611a7e55ab17e6bc0 files/ruby-1.6.8-oniguruma-gentoo.diff 1125
+MD5 760dc7b65ddbc8e3069dcf95ec8b00ba files/digest-ruby-1.8.1-r2 200
+MD5 512336d825e446e013bd383519b6559c files/digest-ruby-1.8.0-r6 128
+MD5 e74e6ef0cfcafd538fe1a52f30cae316 files/digest-ruby-1.8.1-r3 200
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.1-r5 b/dev-lang/ruby/files/digest-ruby-1.8.1-r5
new file mode 100644
index 000000000000..9a662dbb91fb
--- /dev/null
+++ b/dev-lang/ruby/files/digest-ruby-1.8.1-r5
@@ -0,0 +1,3 @@
+MD5 5d52c7d0e6a6eb6e3bc68d77e794898e ruby-1.8.1.tar.gz 2671875
+MD5 6164e59038395806b73c6f2eda865a2f ruby-1.8.1-20040424-1.diff.gz 360023
+MD5 b22a2282adb9fe829915f9e99856c4ed onigd2_2_6.tar.gz 199028
diff --git a/dev-lang/ruby/ruby-1.8.1-r5.ebuild b/dev-lang/ruby/ruby-1.8.1-r5.ebuild
new file mode 100644
index 000000000000..f72c07a7772f
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.8.1-r5.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.1-r5.ebuild,v 1.1 2004/04/24 12:27:11 usata Exp $
+
+IUSE="socks5 tcltk cjk"
+
+ONIGURUMA="onigd2_2_6"
+SNAP_DATE="20040424-1"
+
+inherit flag-o-matic alternatives eutils gnuconfig
+filter-flags -fomit-frame-pointer
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="http://www.ruby-lang.org/"
+SRC_URI="mirror://ruby/${PV%.*}/${P/_pre/-preview}.tar.gz
+	mirror://gentoo/${P}-${SNAP_DATE}.diff.gz
+	cjk? ( ftp://ftp.ruby-lang.org/pub/ruby/contrib/${ONIGURUMA}.tar.gz )"
+
+LICENSE="Ruby"
+SLOT="1.8"
+KEYWORDS="~amd64 ~alpha ~hppa -ia64 ~mips ~ppc ~sparc ~x86 ~s390"
+
+DEPEND=">=sys-libs/glibc-2.1.3
+	>=sys-libs/gdbm-1.8.0
+	>=sys-libs/readline-4.1
+	>=sys-libs/ncurses-5.2
+	socks5? ( >=net-misc/dante-1.1.13 )
+	tcltk?  ( dev-lang/tk )
+	sys-apps/findutils
+	>=dev-ruby/ruby-config-0.2"
+RDEPEND="${DEPEND}
+	!=dev-lang/ruby-cvs-${SLOT}*"
+PROVIDE="virtual/ruby"
+
+S=${WORKDIR}/${P%_pre*}
+
+src_unpack() {
+	unpack ${A}
+
+	pushd ${S}
+	epatch ../${P}-${SNAP_DATE}.diff
+	popd
+
+	if [ -n "`use cjk`" ] ; then
+		einfo "Applying ${ONIGURUMA}"
+		pushd ${WORKDIR}/oniguruma
+		econf --with-rubydir=${S}
+		make ${SLOT/./}
+		popd
+	fi
+
+	# Enable build on alpha EV67
+	if use alpha; then
+		gnuconfig_update || die "gnuconfig_update failed"
+	fi
+}
+
+src_compile() {
+	# Socks support via dante
+	if [ ! -n "`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
+		CFLAGS="${CFLAGS} -DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
+		export CFLAGS
+	fi
+
+	econf --program-suffix=${SLOT/./} --enable-shared \
+		`use_enable socks5 socks` \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+
+	dosym /usr/lib/libruby${SLOT/./}.so.${PV} /usr/lib/libruby.so.${PV%.*}
+	dosym /usr/lib/libruby${SLOT/./}.so.${PV} /usr/lib/libruby.so.${PV}
+
+	dodoc COPYING* ChangeLog MANIFEST README* ToDo
+}
+
+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
+
+	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
+}
+
+pkg_postrm() {
+
+	if [ ! -n "$(readlink ${ROOT}usr/bin/ruby)" ] ; then
+		${ROOT}usr/sbin/ruby-config ruby${SLOT/./}
+	fi
+}