Added preview release.

Package-Manager: portage-2.0.51.19

7 files changed, 246 insertions, 90 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index e01f4e326827..93d974e99dba 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.138 2005/05/19 10:52:36 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.139 2005/05/21 21:19:56 usata Exp $
+
+*ruby-1.8.3_pre1 (21 May 2005)
+
+  21 May 2005; Mamoru KOMACHI <usata@gentoo.org> +files/re.c.182.patch,
+  -ruby-1.6.8-r11.ebuild, +ruby-1.8.3_pre1.ebuild:
+  Added preview release.
 
   19 May 2005; Guy Martin <gmsoft@gentoo.org> ruby-1.6.8-r12.ebuild:
   Stable on hppa.
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 33be24d12c19..f7616930a793 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,16 +1,17 @@
-MD5 9ca3abd2b7c896bc16856b4f026897f5 ChangeLog 20519
+MD5 04fecd3a9f0a6621cd3a1143acc96654 ruby-1.8.3_pre1.ebuild 3648
+MD5 07a852a6580f6bda64ac0be2427277d2 ChangeLog 20699
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
-MD5 56ec59d6a7e76f2523f4e3367af3403d ruby-1.6.8-r11.ebuild 1973
 MD5 a63962eec3291eb3762c7462570b39bc ruby-1.6.8-r12.ebuild 1937
 MD5 67de00f5d7b9ced2530317f945d0ebc9 ruby-1.8.2.ebuild 3446
 MD5 1a9856b348cad7e3e9da96847fcaf877 ruby-1.8.2-r1.ebuild 3757
-MD5 00ccb2b51acb8e90488b9bd2f8bf2c32 files/digest-ruby-1.6.8-r11 136
-MD5 844ffd93bddeeb9decf86b49669423e8 files/digest-ruby-1.6.8-r12 136
+MD5 d05f63da27634456886e7c924eaf96da files/ruby-1.6.8-fix-x86_64.patch 431
+MD5 c0305f496353b27f98c0c42e4005cb8a files/digest-ruby-1.8.2-r1 125
+MD5 2b7f4a180b9678de56681a4d5c254c48 files/digest-ruby-1.8.3_pre1 134
 MD5 c0305f496353b27f98c0c42e4005cb8a files/digest-ruby-1.8.2 125
+MD5 d4b55b8964955655827a50afba707a69 files/re.c.182.patch 2472
+MD5 e7fc14a584186eb629eddc20bc853a24 files/ruby-rdoc-gentoo.diff 455
+MD5 844ffd93bddeeb9decf86b49669423e8 files/digest-ruby-1.6.8-r12 136
 MD5 be89d4c412387337e14a1d141b90b125 files/oniguruma-2.3.1-gentoo.patch 593
 MD5 a061fe32b8e0538c203bccebcd2ad8ac files/ruby-1.6.8-20040728-20041024.diff 3094
-MD5 d05f63da27634456886e7c924eaf96da files/ruby-1.6.8-fix-x86_64.patch 431
-MD5 e7fc14a584186eb629eddc20bc853a24 files/ruby-rdoc-gentoo.diff 455
-MD5 c0305f496353b27f98c0c42e4005cb8a files/digest-ruby-1.8.2-r1 125
 MD5 5d27b5dca2842607d0dd0469612a2224 files/ruby-1.8.2-soap.diff 596
 MD5 2026b6d80f876e54e87b8fe906d469ca files/ruby-1.8.2-unittest.diff 822
diff --git a/dev-lang/ruby/files/digest-ruby-1.6.8-r11 b/dev-lang/ruby/files/digest-ruby-1.6.8-r11
deleted file mode 100644
index 42604e50ef89..000000000000
--- a/dev-lang/ruby/files/digest-ruby-1.6.8-r11
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 19eae3f81026270a201004d0decd3bc8 ruby-1.6.8-2004.07.28.tar.gz 1056477
-MD5 d7bd9315973b64aa2e7c6eb58ea3f483 onigd2_3_2.tar.gz 198680
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.3_pre1 b/dev-lang/ruby/files/digest-ruby-1.8.3_pre1
new file mode 100644
index 000000000000..cabf224ea2bd
--- /dev/null
+++ b/dev-lang/ruby/files/digest-ruby-1.8.3_pre1
@@ -0,0 +1,2 @@
+MD5 a5ae008de3332dc831244ac63289b761 ruby-1.8.3-preview1.tar.gz 4142554
+MD5 271d3d39201b3a049fa5bbed417c3f0a onigd2_4_2.tar.gz 203684
diff --git a/dev-lang/ruby/files/re.c.182.patch b/dev-lang/ruby/files/re.c.182.patch
new file mode 100644
index 000000000000..3ac7737d0897
--- /dev/null
+++ b/dev-lang/ruby/files/re.c.182.patch
@@ -0,0 +1,98 @@
+--- re.c.orig	2005-03-16 18:26:36.000000000 +0900
++++ re.c	2005-05-16 04:48:56.000000000 +0900
+@@ -483,11 +483,13 @@
+ 	    goto again;
+ 	}
+ 	if (*ptr == ':' && ptr[len-1] == ')') {
++	    int r;
+ 	    Regexp *rp;
+ 	    kcode_set_option(re);
+-	    rp = ALLOC(Regexp);
+-	    MEMZERO((char *)rp, Regexp, 1);
+-	    err = re_compile_pattern(++ptr, len -= 2, rp) != 0;
++	    r = re_alloc_pattern(&rp);
++	    if (r == 0) {
++	      err = (re_compile_pattern(++ptr, len -= 2, rp, NULL) != 0);
++	    }
+ 	    kcode_reset_option();
+ 	    re_free_pattern(rp);
+ 	}
+@@ -621,7 +623,8 @@
+     int flags;
+ {
+     Regexp *rp;
+-    char *err;
++    char err[ONIG_MAX_ERROR_MESSAGE_LEN];
++    int r;
+ 
+     /* Handle escaped characters first. */
+ 
+@@ -630,17 +633,18 @@
+        from that.
+     */
+ 
+-    rp = ALLOC(Regexp);
+-    MEMZERO((char *)rp, Regexp, 1);
+-    rp->buffer = ALLOC_N(char, 16);
+-    rp->allocated = 16;
+-    rp->fastmap = ALLOC_N(char, 256);
++     r = re_alloc_pattern(&rp);
++     if (r) {
++       re_error_code_to_str((UChar* )err, r);
++       rb_reg_raise(s, len, err, 0);
++     }
++       
+     if (flags) {
+ 	rp->options = flags;
+     }
+-    err = re_compile_pattern(s, len, rp);
++    r = re_compile_pattern(s, len, rp, err);
+ 
+-    if (err != NULL) {
++    if (r != 0) {
+ 	re_free_pattern(rp);
+ 	rb_reg_raise(s, len, err, 0);
+     }
+@@ -842,14 +846,14 @@
+     }
+ 
+     if (need_recompile) {
+-	char *err;
++	char err[ONIG_MAX_ERROR_MESSAGE_LEN];
++	int r;
+ 
+ 	if (FL_TEST(re, KCODE_FIXED))
+ 	    kcode_set_option(re);
+ 	rb_reg_check(re);
+-	RREGEXP(re)->ptr->fastmap_accurate = 0;
+-	err = re_compile_pattern(RREGEXP(re)->str, RREGEXP(re)->len, RREGEXP(re)->ptr);
+-	if (err != NULL) {
++	r = re_recompile_pattern(RREGEXP(re)->str, RREGEXP(re)->len, RREGEXP(re)->ptr, err);
++	if (r != 0) {
+ 	    rb_reg_raise(RREGEXP(re)->str, RREGEXP(re)->len, err, re);
+ 	}
+     }
+@@ -916,14 +920,16 @@
+     if (FL_TEST(re, KCODE_FIXED))
+ 	kcode_reset_option();
+ 
+-    if (result == -2) {
+-	rb_reg_raise(RREGEXP(re)->str, RREGEXP(re)->len,
+-		     "Stack overflow in regexp matcher", re);
+-    }
+-
+     if (result < 0) {
+-	rb_backref_set(Qnil);
+-	return result;
++      if (result == ONIG_MISMATCH) {
++        rb_backref_set(Qnil);
++        return result;
++      }
++      else {
++        char err[ONIG_MAX_ERROR_MESSAGE_LEN];
++        re_error_code_to_str((UChar* )err, result);
++        rb_reg_raise(RREGEXP(re)->str, RREGEXP(re)->len, err, 0);
++      }
+     }
+ 
+     match = rb_backref_get();
diff --git a/dev-lang/ruby/ruby-1.6.8-r11.ebuild b/dev-lang/ruby/ruby-1.6.8-r11.ebuild
deleted file mode 100644
index 10194638df6c..000000000000
--- a/dev-lang/ruby/ruby-1.6.8-r11.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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.6.8-r11.ebuild,v 1.13 2005/01/01 15:47:09 usata Exp $
-
-IUSE="cjk"
-
-ONIGURUMA="onigd2_3_2"
-SNAP_DATE="2004.07.28"
-MY_P="${P}-${SNAP_DATE}"
-S="${WORKDIR}/${MY_P}"
-
-inherit flag-o-matic alternatives eutils
-
-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/snapshots/${MY_P}.tar.gz
-	cjk? ( http://www.geocities.jp/kosako1/oniguruma/archive/${ONIGURUMA}.tar.gz )"
-
-LICENSE="Ruby"
-SLOT="1.6"
-KEYWORDS="x86 alpha ppc sparc hppa amd64 -ia64 mips"
-
-DEPEND="virtual/libc
-	>=sys-libs/gdbm-1.8.0
-	>=sys-libs/readline-4.1
-	>=sys-libs/ncurses-5.2
-	>=dev-ruby/ruby-config-0.3"
-PROVIDE="virtual/ruby"
-
-# oniguruma patch breaks make test
-#RESTRICT="maketest"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	#epatch ../${P}-${SNAP_DATE}.diff
-	use amd64 && epatch ${FILESDIR}/${P}-fix-x86_64.patch
-
-	if use cjk ; then
-		einfo "Applying ${ONIGURUMA}"
-		cd ${WORKDIR}/oniguruma
-		epatch ${FILESDIR}/oniguruma-2.3.1-gentoo.patch
-		econf --with-rubydir=${S} || die "econf failed"
-		make ${SLOT/./}
-	fi
-}
-
-src_compile() {
-	filter-flags -fomit-frame-pointer
-	econf --program-suffix=${SLOT/./} --enable-shared || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	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() {
-
-	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
-}
diff --git a/dev-lang/ruby/ruby-1.8.3_pre1.ebuild b/dev-lang/ruby/ruby-1.8.3_pre1.ebuild
new file mode 100644
index 000000000000..6fc89640786f
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.8.3_pre1.ebuild
@@ -0,0 +1,131 @@
+# 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.3_pre1.ebuild,v 1.1 2005/05/21 21:19:56 usata Exp $
+
+ONIGURUMA="onigd2_4_2"
+
+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
+		cp ${FILESDIR}/re.c.182.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) \
+		|| 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
+}