Added CVS snapshot

6 files changed, 60 insertions, 56 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index d930a88d6c36..6e6d13d15769 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,12 @@
 # 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.46 2004/01/30 08:03:38 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.47 2004/02/07 07:32:12 usata Exp $
+
+*ruby-1.8.1-r2 (07 Feb 2004)
+
+  07 Feb 2004; Mamoru KOMACHI <usata@gentoo.org> ruby-1.8.1-r2.ebuild,
+  ruby-1.8.1.ebuild, files/oniguruma-20040202.diff:
+  Added CVS snapshot
 
 *ruby-1.6.8-r6 (30 Jan 2004)
 
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 085133b77c34..8f99f15e2852 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,14 +1,12 @@
 MD5 66d304e2278118ddf754c068822ac2dc ruby-1.8.0-r5.ebuild 2562
 MD5 23014333a03d72a3a69d08b98409abf3 ruby-1.8.1-r1.ebuild 2548
-MD5 67d0e7c62241786238b77b201422b9ed ruby-1.8.1.ebuild 3369
 MD5 6c669e6e45fb864d765b9989efb815f8 ruby-1.8.0-r1.ebuild 2700
-MD5 61574258693a50773dc2908a4ca095f9 ChangeLog 7399
+MD5 80f9d06dd48291c9850096fe39a6fa26 ChangeLog 7574
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
 MD5 d8f0f1e2eec3c4ec31107cc3dbc2dd85 ruby-1.6.8-r3.ebuild 2134
-MD5 1b54cadab6b709847670ef50e19c6d36 ruby-1.8.1-r2.ebuild 2694
+MD5 279412837b8074184acd0fa02a3b2b6f ruby-1.8.1-r2.ebuild 2715
 MD5 6105054da5320aff18d09e5c506ab5cf ruby-1.6.8-r6.ebuild 1684
 MD5 d05f63da27634456886e7c924eaf96da files/ruby-1.6.8-fix-x86_64.patch 431
-MD5 88a20f230c5bd67d95a050bb781302e2 files/digest-ruby-1.8.1 128
 MD5 a1aff527ed4b468611a7e55ab17e6bc0 files/ruby-1.6.8-oniguruma-gentoo.diff 1125
 MD5 11702b3cb52c88daf5d3934e3a0c2e2a files/digest-ruby-1.6.8-r3 63
 MD5 b48dff624661317e05cd3ad1d6954096 files/digest-ruby-1.6.8-r6 128
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.1 b/dev-lang/ruby/files/digest-ruby-1.8.1
deleted file mode 100644
index 2c50ca96f18d..000000000000
--- a/dev-lang/ruby/files/digest-ruby-1.8.1
+++ /dev/null
@@ -1,2 +0,0 @@
-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-r2 b/dev-lang/ruby/files/digest-ruby-1.8.1-r2
new file mode 100644
index 000000000000..94da78abe16c
--- /dev/null
+++ b/dev-lang/ruby/files/digest-ruby-1.8.1-r2
@@ -0,0 +1,3 @@
+MD5 5d52c7d0e6a6eb6e3bc68d77e794898e ruby-1.8.1.tar.gz 2671875
+MD5 55e55e2ad237277f27ea0719a2dfebe4 ruby-1.8.1-20040206.diff.gz 184000
+MD5 e93c9691fe700a2dd4e6fc5c56ff85bf onigd20040202.tar.gz 187945
diff --git a/dev-lang/ruby/files/oniguruma-20040202.diff b/dev-lang/ruby/files/oniguruma-20040202.diff
new file mode 100644
index 000000000000..17b5f2ad8578
--- /dev/null
+++ b/dev-lang/ruby/files/oniguruma-20040202.diff
@@ -0,0 +1,18 @@
+Index: Makefile.in
+===================================================================
+--- Makefile.in	(revision 320)
++++ Makefile.in	(working copy)
+@@ -137,11 +137,13 @@
+ 	$(RANLIB)  $(libdir)/$(libname)
+ 	$(INSTALL) $(srcdir)/oniguruma.h  $(includedir)/oniguruma.h
+ 	$(INSTALL) $(srcdir)/onigposix.h  $(includedir)/onigposix.h
++	$(INSTALL) $(srcdir)/oniggnu.h    $(includedir)/oniggnu.h
+ 
+ uninstall:
+ 	-rm -f $(libdir)/$(libname)
+ 	-rm -f $(includedir)/oniguruma.h
+ 	-rm -f $(includedir)/onigposix.h
++	-rm -f $(includedir)/oniggnu.h
+ 
+ warn:
+ 	make CFLAGS='@CFLAGS@ @STATISTICS@ -Wall'
diff --git a/dev-lang/ruby/ruby-1.8.1.ebuild b/dev-lang/ruby/ruby-1.8.1-r2.ebuild
index a6ea6adaa9ae..ed989257e910 100644
--- a/dev-lang/ruby/ruby-1.8.1.ebuild
+++ b/dev-lang/ruby/ruby-1.8.1-r2.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.ebuild,v 1.1 2003/12/25 01:29:25 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.1-r2.ebuild,v 1.1 2004/02/07 07:32:12 usata Exp $
 
-IUSE="socks5 tcltk ruby16 cjk"
+IUSE="socks5 tcltk cjk"
 
-ONIGURUMA="onigd20031224"
+ONIG_DATE="20040202"
+SNAP_DATE="20040206"
 
 inherit flag-o-matic alternatives eutils gnuconfig
 filter-flags -fomit-frame-pointer
@@ -12,7 +13,8 @@ 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
-	cjk? ( ftp://ftp.ruby-lang.org/pub/ruby/contrib/${ONIGURUMA}.tar.gz )"
+	mirror://gentoo/${P}-${SNAP_DATE}.diff.gz
+	cjk? ( ftp://ftp.ruby-lang.org/pub/ruby/contrib/onigd${ONIG_DATE}.tar.gz )"
 
 LICENSE="Ruby"
 SLOT="1.8"
@@ -24,25 +26,25 @@ DEPEND=">=sys-libs/glibc-2.1.3
 	>=sys-libs/ncurses-5.2
 	socks5? ( >=net-misc/dante-1.1.13 )
 	tcltk?  ( dev-lang/tk )
-	sys-apps/findutils"
+	sys-apps/findutils
+	>=dev-ruby/ruby-config-0.2"
+RDEPEND="${DEPEND}
+	!=dev-lang/ruby-cvs-${SLOT}*"
 
 S=${WORKDIR}/${P%_pre*}
 
-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}
+
+	pushd ${S}
+	epatch ../${P}-${SNAP_DATE}.diff
+	popd
+
 	if [ -n "`use cjk`" ] ; then
 		pushd oniguruma
+		epatch ${FILESDIR}/oniguruma-${ONIG_DATE}.diff
 		econf --with-rubydir=${S}
-		make 18
+		make ${SLOT/./}
 		popd
 	fi
 
@@ -67,7 +69,7 @@ src_compile() {
 		export CFLAGS
 	fi
 
-	econf --program-suffix=18 --enable-shared \
+	econf --program-suffix=${SLOT/./} --enable-shared \
 		`use_enable socks5 socks` \
 		|| die "econf failed"
 	emake || die "emake failed"
@@ -76,51 +78,30 @@ src_compile() {
 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
+	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
 }
 
-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
+	if [ ! -e "$(readlink /usr/bin/ruby)" ] ; then
+		/usr/sbin/ruby-config ruby${SLOT/./}
 	fi
+	einfo
+	einfo "You can change the default ruby interpreter by /usr/sbin/ruby-config"
+	einfo
 }
 
 pkg_postrm() {
-	ruby_alternatives
+
+	if [ ! -e "$(readlink /usr/bin/ruby)" ] ; then
+		/usr/sbin/ruby-config ruby${SLOT/./}
+	fi
 }