Version bumped, upstream source and Oniguruma patch.

11 files changed, 36 insertions, 142 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 0f1a1ffdbcb7..4397bbcdca10 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/ruby
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.44 2003/12/22 10:44:20 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.45 2003/12/25 01:29:25 usata Exp $
+
+*ruby-1.8.1 (25 Dec 2003)
+
+  25 Dec 2003; Mamoru KOMACHI <usata@gentoo.org> ruby-1.6.8-r4.ebuild,
+  ruby-1.6.8-r5.ebuild, ruby-1.8.0-r3.ebuild, ruby-1.8.0-r4.ebuild,
+  ruby-1.8.1.ebuild, ruby-1.8.1_pre3.ebuild, ruby-1.8.1_pre4.ebuild:
+  Version bumped, upstream source and Oniguruma patch
 
 *ruby-1.8.1_pre4 (22 Dec 2003)
 
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 08a09a5a750f..66e249249cbf 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,24 +1,17 @@
-MD5 27bdc62896ed806e807da1839ee4b31f ChangeLog 6830
+MD5 5236d43d8d1218c6a81fcf0ce24cae01 ChangeLog 7120
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
 MD5 d8f0f1e2eec3c4ec31107cc3dbc2dd85 ruby-1.6.8-r3.ebuild 2134
-MD5 0b45d4b26301ad383c99dc8a7092aa99 ruby-1.6.8-r4.ebuild 2401
-MD5 3a150175600da9cdda4d0fbf053f0f4d ruby-1.6.8-r5.ebuild 2401
+MD5 6dc9f7612be6916ae4014ac7f472285e ruby-1.6.8-r5.ebuild 2401
 MD5 cbaaf90adcfd34b3ea5b7ad536673778 ruby-1.8.0-r2.ebuild 2975
-MD5 1fcf8dad89fedfa322d116b5accbdff2 ruby-1.8.0-r3.ebuild 3175
-MD5 8876c2ff8984f322724810562c972546 ruby-1.8.1_pre4.ebuild 3177
 MD5 6c669e6e45fb864d765b9989efb815f8 ruby-1.8.0-r1.ebuild 2700
-MD5 6b9a96aef32cef5ff4055c8aa566adbf ruby-1.8.0-r4.ebuild 3175
-MD5 05079a8da0aa307b54768e5e240cccb8 ruby-1.8.1.ebuild 3374
-MD5 3da42d1704918eca7ecf885c81661a30 files/digest-ruby-1.6.8-r4 128
+MD5 a770961059ee2747898896a5ff134410 ruby-1.8.0-r4.ebuild 3175
+MD5 67d0e7c62241786238b77b201422b9ed ruby-1.8.1.ebuild 3369
 MD5 a1aff527ed4b468611a7e55ab17e6bc0 files/ruby-1.6.8-oniguruma-gentoo.diff 1125
 MD5 e1c6eac35da8ce7f11bab66795de0b80 files/digest-ruby-1.8.0-r1 63
-MD5 1b04774d0056760ad9f57c4623a47946 files/digest-ruby-1.8.0-r3 128
 MD5 d2922d69e61de0bef77ed561b6107cca files/ruby-config 2863
 MD5 11702b3cb52c88daf5d3934e3a0c2e2a files/digest-ruby-1.6.8-r3 63
 MD5 e1c6eac35da8ce7f11bab66795de0b80 files/digest-ruby-1.8.0-r2 63
-MD5 1f94484d263ce369766279ba4df2e3c6 files/digest-ruby-1.8.1_pre4 137
 MD5 88a20f230c5bd67d95a050bb781302e2 files/digest-ruby-1.8.1 128
 MD5 d05f63da27634456886e7c924eaf96da files/ruby-1.6.8-fix-x86_64.patch 431
 MD5 b48dff624661317e05cd3ad1d6954096 files/digest-ruby-1.6.8-r5 128
 MD5 7dc5ca634977d643f01b063a7a046433 files/digest-ruby-1.8.0-r4 128
-MD5 d1ce81bc574d44c960a6a5bc979e04eb files/digest-ruby-1.8.1_pre4-r1 137
diff --git a/dev-lang/ruby/files/digest-ruby-1.6.8-r4 b/dev-lang/ruby/files/digest-ruby-1.6.8-r5
index 9d5dd45b04c7..9808595b6b70 100644
--- a/dev-lang/ruby/files/digest-ruby-1.6.8-r4
+++ b/dev-lang/ruby/files/digest-ruby-1.6.8-r5
@@ -1,2 +1,2 @@
 MD5 bf48d49dbd94b5c0eda5f75b3bfbac16 ruby-1.6.8.tar.gz 1023403
-MD5 e0eff399310ce45a8a449791d1141804 onigd20031112.tar.gz 165697
+MD5 8e0dd61b25ce83be9bca657fbda5a172 onigd20031224.tar.gz 178287
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.0-r3 b/dev-lang/ruby/files/digest-ruby-1.8.0-r4
index 5fa0fec13127..1bc80db6100c 100644
--- a/dev-lang/ruby/files/digest-ruby-1.8.0-r3
+++ b/dev-lang/ruby/files/digest-ruby-1.8.0-r4
@@ -1,2 +1,2 @@
 MD5 582a65e52598a4a1e9fce523e16e67d6 ruby-1.8.0.tar.gz 1979070
-MD5 e0eff399310ce45a8a449791d1141804 onigd20031112.tar.gz 165697
+MD5 8e0dd61b25ce83be9bca657fbda5a172 onigd20031224.tar.gz 178287
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.1 b/dev-lang/ruby/files/digest-ruby-1.8.1
new file mode 100644
index 000000000000..2c50ca96f18d
--- /dev/null
+++ b/dev-lang/ruby/files/digest-ruby-1.8.1
@@ -0,0 +1,2 @@
+MD5 5d52c7d0e6a6eb6e3bc68d77e794898e ruby-1.8.1.tar.gz 2671875
+MD5 8e0dd61b25ce83be9bca657fbda5a172 onigd20031224.tar.gz 178287
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.1_pre3 b/dev-lang/ruby/files/digest-ruby-1.8.1_pre3
deleted file mode 100644
index 546fef07423d..000000000000
--- a/dev-lang/ruby/files/digest-ruby-1.8.1_pre3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b68032fc40688242f57f61a412e229f8 ruby-1.8.1-preview3.tar.gz 2590668
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.1_pre4 b/dev-lang/ruby/files/digest-ruby-1.8.1_pre4
deleted file mode 100644
index f461ef57bd09..000000000000
--- a/dev-lang/ruby/files/digest-ruby-1.8.1_pre4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 683e3452a7fc261d5ac339cd1f38670b ruby-1.8.1-preview4.tar.gz 2651885
diff --git a/dev-lang/ruby/ruby-1.6.8-r4.ebuild b/dev-lang/ruby/ruby-1.6.8-r5.ebuild
index bcdf51c02d54..59b9b2cd3a93 100644
--- a/dev-lang/ruby/ruby-1.6.8-r4.ebuild
+++ b/dev-lang/ruby/ruby-1.6.8-r5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.6.8-r4.ebuild,v 1.1 2003/12/10 23:03:05 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.6.8-r5.ebuild,v 1.1 2003/12/25 01:29:25 usata Exp $
 
 IUSE="ruby16 cjk"
 
-ONIGURUMA="onigd20031112"
+ONIGURUMA="onigd20031224"
 
 inherit flag-o-matic alternatives eutils
 filter-flags -fomit-frame-pointer
diff --git a/dev-lang/ruby/ruby-1.8.0-r3.ebuild b/dev-lang/ruby/ruby-1.8.0-r4.ebuild
index 7a454c8d7528..18cc9b45193a 100644
--- a/dev-lang/ruby/ruby-1.8.0-r3.ebuild
+++ b/dev-lang/ruby/ruby-1.8.0-r4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 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.0-r3.ebuild,v 1.1 2003/12/10 23:03:05 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.0-r4.ebuild,v 1.1 2003/12/25 01:29:25 usata Exp $
 
 IUSE="socks5 tcltk ruby16 cjk"
 
-ONIGURUMA="onigd20031112"
+ONIGURUMA="onigd20031224"
 
 inherit flag-o-matic alternatives eutils gnuconfig
 filter-flags -fomit-frame-pointer
diff --git a/dev-lang/ruby/ruby-1.8.1_pre3.ebuild b/dev-lang/ruby/ruby-1.8.1.ebuild
index 02d53241ea59..a6ea6adaa9ae 100644
--- a/dev-lang/ruby/ruby-1.8.1_pre3.ebuild
+++ b/dev-lang/ruby/ruby-1.8.1.ebuild
@@ -1,19 +1,22 @@
 # Copyright 1999-2003 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_pre3.ebuild,v 1.2 2003/12/10 23:03:05 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.1.ebuild,v 1.1 2003/12/25 01:29:25 usata Exp $
+
+IUSE="socks5 tcltk ruby16 cjk"
+
+ONIGURUMA="onigd20031224"
 
 inherit flag-o-matic alternatives eutils gnuconfig
 filter-flags -fomit-frame-pointer
 
-S=${WORKDIR}/${P%_pre*}
 DESCRIPTION="An object-oriented scripting language"
 HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/${PV%.*}/${P/_pre/-preview}.tar.gz"
+SRC_URI="mirror://ruby/${PV%.*}/${P/_pre/-preview}.tar.gz
+	cjk? ( ftp://ftp.ruby-lang.org/pub/ruby/contrib/${ONIGURUMA}.tar.gz )"
 
 LICENSE="Ruby"
 SLOT="1.8"
-KEYWORDS="~alpha ~arm ~hppa ~mips ~sparc ~x86"
-IUSE="socks5 tcltk ruby16"
+KEYWORDS="~alpha ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
 
 DEPEND=">=sys-libs/glibc-2.1.3
 	>=sys-libs/gdbm-1.8.0
@@ -23,6 +26,8 @@ DEPEND=">=sys-libs/glibc-2.1.3
 	tcltk?  ( dev-lang/tk )
 	sys-apps/findutils"
 
+S=${WORKDIR}/${P%_pre*}
+
 pkg_setup() {
 
 	einfo
@@ -34,7 +39,12 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${WORKDIR}
+	if [ -n "`use cjk`" ] ; then
+		pushd oniguruma
+		econf --with-rubydir=${S}
+		make 18
+		popd
+	fi
 
 	# Enable build on alpha EV67
 	if use alpha; then
diff --git a/dev-lang/ruby/ruby-1.8.1_pre4.ebuild b/dev-lang/ruby/ruby-1.8.1_pre4.ebuild
deleted file mode 100644
index 9ce4e7339805..000000000000
--- a/dev-lang/ruby/ruby-1.8.1_pre4.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2003 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_pre4.ebuild,v 1.1 2003/12/22 10:44:20 usata Exp $
-
-inherit flag-o-matic alternatives eutils gnuconfig
-filter-flags -fomit-frame-pointer
-
-S=${WORKDIR}/${P%_pre*}
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/${PV%.*}/${P/_pre/-preview}.tar.gz"
-
-LICENSE="Ruby"
-SLOT="1.8"
-KEYWORDS="~alpha ~arm ~hppa ~mips ~sparc ~x86"
-IUSE="socks5 tcltk ruby16"
-
-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"
-
-pkg_setup() {
-
-	einfo
-	einfo "If you want to use ruby-1.6 by default you need to set"
-	einfo "\tUSE=\"ruby16\""
-	einfo "otherwise ruby-1.8 will be used."
-	einfo
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${WORKDIR}
-
-	# 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=18 --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/libruby18.so.${PV} /usr/lib/libruby.so.${PV%.*}
-	dosym /usr/lib/libruby18.so.${PV} /usr/lib/libruby.so.${PV}
-
-	if has_version '=dev-lang/ruby-1.6.8*' ; then
-		dobin ${FILESDIR}/ruby-config
-	fi
-
-	dodoc COPYING* ChangeLog MANIFEST README* ToDo
-}
-
-ruby_alternatives() {
-	if [ -n "`use ruby16`" ] ; then
-		alternatives_makesym /usr/bin/ruby /usr/bin/ruby{16,18}
-		alternatives_makesym /usr/bin/irb /usr/bin/irb{16,18}
-		alternatives_makesym /usr/bin/erb /usr/bin/erb{16,18}
-		alternatives_makesym /usr/lib/libruby.so \
-			/usr/lib/libruby{16,18}.so
-		alternatives_makesym /usr/share/man/man1/ruby.1.gz \
-			/usr/share/man/man1/ruby{16,18}.1.gz
-	else
-		alternatives_makesym /usr/bin/ruby /usr/bin/ruby{18,16}
-		alternatives_makesym /usr/bin/irb /usr/bin/irb{18,16}
-		alternatives_makesym /usr/bin/erb /usr/bin/erb{18,16}
-		alternatives_makesym /usr/lib/libruby.so \
-			/usr/lib/libruby{18,16}.so
-		alternatives_makesym /usr/share/man/man1/ruby.1.gz \
-			/usr/share/man/man1/ruby{18,16}.1.gz
-	fi
-}
-
-pkg_postinst() {
-	ruby_alternatives
-	ewarn
-	ewarn "Warning: Vim won't work if you've just updated ruby from"
-	ewarn "1.6.8 to 1.8.0 due to the library version change."
-	ewarn "In that case, you will need to remerge vim."
-	ewarn
-
-	if [ -x "/usr/bin/ruby-config" ] ; then
-	einfo "If you have both ruby 1.6 and 1.8 installed, you can switch"
-	einfo "default ruby by /usr/bin/ruby-config."
-	einfo
-	fi
-}
-
-pkg_postrm() {
-	ruby_alternatives
-}