Bump with patch for bug #96784

(Portage version: 2.0.51.22-r1)

5 files changed, 168 insertions, 20 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 8ba24637b873..d3f493e9f8a0 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/ruby
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.143 2005/07/03 09:50:38 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.144 2005/07/09 16:38:51 caleb Exp $
+
+*ruby-1.8.2-r2 (09 Jul 2005)
+
+  09 Jul 2005; Caleb Tennis <caleb@gentoo.org>
+  +files/ruby-1.8.2-xmlrpc-ipimethods-fix.diff, +ruby-1.8.2-r2.ebuild:
+  Bump with patch for GLSA Bug #96784
 
   03 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> ruby-1.8.2-r1.ebuild:
   Stable on alpha.
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 44a2ae4b07c9..43d500cfbf45 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,27 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 5c6eba6633365e3d738ba6e3a3b6b5b1 ruby-1.8.3_pre1.ebuild 3653
+MD5 a63962eec3291eb3762c7462570b39bc ruby-1.6.8-r12.ebuild 1937
+MD5 f01da83095fc80f61eb4e058ce168a67 ruby-1.8.2-r2.ebuild 3811
 MD5 67de00f5d7b9ced2530317f945d0ebc9 ruby-1.8.2.ebuild 3446
+MD5 3f3ef53019f559def811f446ba1b0f04 ruby-1.8.2-r1.ebuild 3753
 MD5 18669963f4120ae03703b8acd2c78a9f ChangeLog 21282
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
-MD5 3f3ef53019f559def811f446ba1b0f04 ruby-1.8.2-r1.ebuild 3753
-MD5 a63962eec3291eb3762c7462570b39bc ruby-1.6.8-r12.ebuild 1937
-MD5 5c6eba6633365e3d738ba6e3a3b6b5b1 ruby-1.8.3_pre1.ebuild 3653
+MD5 047eb947640c4aa1e05d4610999342a1 files/ruby-1.8.2-xmlrpc.diff 661
+MD5 d05f63da27634456886e7c924eaf96da files/ruby-1.6.8-fix-x86_64.patch 431
+MD5 5d27b5dca2842607d0dd0469612a2224 files/ruby-1.8.2-soap.diff 596
+MD5 e7fc14a584186eb629eddc20bc853a24 files/ruby-rdoc-gentoo.diff 455
+MD5 2026b6d80f876e54e87b8fe906d469ca files/ruby-1.8.2-unittest.diff 822
 MD5 c0305f496353b27f98c0c42e4005cb8a files/digest-ruby-1.8.2 125
+MD5 d4b55b8964955655827a50afba707a69 files/re.c.182.patch 2472
 MD5 844ffd93bddeeb9decf86b49669423e8 files/digest-ruby-1.6.8-r12 136
+MD5 d1fd7f979894cfe7da89ec38992788eb files/ruby-1.8.2-xmlrpc-ipimethods-fix.diff 441
+MD5 be89d4c412387337e14a1d141b90b125 files/oniguruma-2.3.1-gentoo.patch 593
 MD5 c0305f496353b27f98c0c42e4005cb8a files/digest-ruby-1.8.2-r1 125
-MD5 d4b55b8964955655827a50afba707a69 files/re.c.182.patch 2472
-MD5 e7fc14a584186eb629eddc20bc853a24 files/ruby-rdoc-gentoo.diff 455
-MD5 d05f63da27634456886e7c924eaf96da files/ruby-1.6.8-fix-x86_64.patch 431
-MD5 2026b6d80f876e54e87b8fe906d469ca files/ruby-1.8.2-unittest.diff 822
+MD5 c0305f496353b27f98c0c42e4005cb8a files/digest-ruby-1.8.2-r2 125
 MD5 2b7f4a180b9678de56681a4d5c254c48 files/digest-ruby-1.8.3_pre1 134
-MD5 be89d4c412387337e14a1d141b90b125 files/oniguruma-2.3.1-gentoo.patch 593
-MD5 5d27b5dca2842607d0dd0469612a2224 files/ruby-1.8.2-soap.diff 596
 MD5 a061fe32b8e0538c203bccebcd2ad8ac files/ruby-1.6.8-20040728-20041024.diff 3094
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCx7UBKf2g/qXtneoRAtDfAJ4jALwyHh6+S+sRbMzEhaeaD5ga/wCgsg5R
-xzJ4m3RgOdIpKaIkmDtEbb4=
-=jMUH
------END PGP SIGNATURE-----
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.2-r2 b/dev-lang/ruby/files/digest-ruby-1.8.2-r2
new file mode 100644
index 000000000000..8d52d012ead8
--- /dev/null
+++ b/dev-lang/ruby/files/digest-ruby-1.8.2-r2
@@ -0,0 +1,2 @@
+MD5 8ffc79d96f336b80f2690a17601dea9b ruby-1.8.2.tar.gz 3627349
+MD5 f64bad67181b02fbd67fac16710537f3 onigd2_4_0.tar.gz 202285
diff --git a/dev-lang/ruby/files/ruby-1.8.2-xmlrpc-ipimethods-fix.diff b/dev-lang/ruby/files/ruby-1.8.2-xmlrpc-ipimethods-fix.diff
new file mode 100644
index 000000000000..c2cb0f639d84
--- /dev/null
+++ b/dev-lang/ruby/files/ruby-1.8.2-xmlrpc-ipimethods-fix.diff
@@ -0,0 +1,11 @@
+--- ruby-1.8.2/lib/xmlrpc/utils.rb.orig	2003-08-15 02:20:14.000000000 +0900
++++ ruby-1.8.2/lib/xmlrpc/utils.rb	2005-07-01 16:33:19.243521736 +0900
+@@ -138,7 +138,7 @@
+ 
+     def get_methods(obj, delim=".")
+       prefix = @prefix + delim
+-      obj.class.public_instance_methods.collect { |name|
++      obj.class.public_instance_methods(false).collect { |name|
+         [prefix + name, obj.method(name).to_proc, nil, nil] 
+       }
+     end
diff --git a/dev-lang/ruby/ruby-1.8.2-r2.ebuild b/dev-lang/ruby/ruby-1.8.2-r2.ebuild
new file mode 100644
index 000000000000..29f62a72fabf
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.8.2-r2.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.2-r2.ebuild,v 1.1 2005/07/09 16:38:51 caleb Exp $
+
+ONIGURUMA="onigd2_4_0"
+
+inherit flag-o-matic alternatives eutils gnuconfig
+
+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"
+# please keep sorted
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc-macos ppc64 s390 sparc x86"
+IUSE="socks5 tcltk cjk doc threads"
+
+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*"
+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 ${SLOT/./}
+		popd
+	fi
+
+	# Enable build on alpha EV67 (but run gnuconfig_update everywhere)
+	gnuconfig_update || die "gnuconfig_update failed"
+
+	cd ${S}
+	epatch ${FILESDIR}/ruby-rdoc-gentoo.diff
+	epatch ${FILESDIR}/ruby-1.8.2-soap.diff
+	epatch ${FILESDIR}/ruby-1.8.2-unittest.diff
+	epatch ${FILESDIR}/ruby-1.8.2-xmlrpc-ipimethods-fix.diff
+
+	# 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
+		CFLAGS="${CFLAGS} -DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
+		export CFLAGS
+	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) \
+		|| 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 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 /usr/$(get_libdir)/libruby${SLOT/./}.so.${PV%_*} /usr/$(get_libdir)/libruby.so.${PV%.*}
+		dosym /usr/$(get_libdir)/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
+}