Added autoconf dependancy, closing bug #51301. Marked 1.6.8-r10 and 1.8.1-r6 stable on x86, alpha and ppc.

11 files changed, 32 insertions, 230 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 0c1304bc7174..072938072e21 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,13 @@
 # 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.67 2004/04/30 16:54:23 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.68 2004/05/18 05:41:57 usata Exp $
+
+  18 May 2004; Mamoru KOMACHI <usata@gentoo.org> ruby-1.6.8-r10.ebuild,
+  ruby-1.6.8-r9.ebuild, ruby-1.8.0-r6.ebuild, ruby-1.8.1-r2.ebuild,
+  ruby-1.8.1-r3.ebuild, ruby-1.8.1-r5.ebuild, ruby-1.8.1-r6.ebuild,
+  files/oniguruma-20040202.diff:
+  Added autoconf dependancy, closing bug #51301. Marked 1.6.8-r10 and
+  1.8.1-r6 stable on x86, alpha and ppc.
 
 *ruby-1.8.1-r6 (01 May 2004)
 *ruby-1.6.8-r10 (01 May 2004)
diff --git a/dev-lang/ruby/files/digest-ruby-1.6.8-r9 b/dev-lang/ruby/files/digest-ruby-1.6.8-r9
deleted file mode 100644
index d6b29f487baa..000000000000
--- a/dev-lang/ruby/files/digest-ruby-1.6.8-r9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bf48d49dbd94b5c0eda5f75b3bfbac16 ruby-1.6.8.tar.gz 1023403
-MD5 90bc144e1f2f4f54be96b396052ead1f ruby-1.6.8-20031015.diff.gz 43717
-MD5 b22a2282adb9fe829915f9e99856c4ed onigd2_2_6.tar.gz 199028
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.1-r5 b/dev-lang/ruby/files/digest-ruby-1.8.1-r5
deleted file mode 100644
index 9a662dbb91fb..000000000000
--- a/dev-lang/ruby/files/digest-ruby-1.8.1-r5
+++ /dev/null
@@ -1,3 +0,0 @@
-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/files/oniguruma-20040202.diff b/dev-lang/ruby/files/oniguruma-20040202.diff
deleted file mode 100644
index 17b5f2ad8578..000000000000
--- a/dev-lang/ruby/files/oniguruma-20040202.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-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.6.8-r10.ebuild b/dev-lang/ruby/ruby-1.6.8-r10.ebuild
index 721728a21db8..1a53a44d5b83 100644
--- a/dev-lang/ruby/ruby-1.6.8-r10.ebuild
+++ b/dev-lang/ruby/ruby-1.6.8-r10.ebuild
@@ -1,6 +1,6 @@
 # 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.6.8-r10.ebuild,v 1.1 2004/04/30 16:54:23 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.6.8-r10.ebuild,v 1.2 2004/05/18 05:41:57 usata Exp $
 
 IUSE="cjk"
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://ruby/${PV%.*}/${P/_pre/-preview}.tar.gz
 
 LICENSE="Ruby"
 SLOT="1.6"
-KEYWORDS="~x86 ~alpha ~ppc ~sparc ~hppa ~amd64 -ia64 ~mips"
+KEYWORDS="x86 alpha ppc ~sparc ~hppa ~amd64 -ia64 ~mips"
 
 DEPEND=">=sys-libs/glibc-2.1.3
 	>=sys-libs/gdbm-1.8.0
diff --git a/dev-lang/ruby/ruby-1.6.8-r9.ebuild b/dev-lang/ruby/ruby-1.6.8-r9.ebuild
deleted file mode 100644
index c2ec0c012402..000000000000
--- a/dev-lang/ruby/ruby-1.6.8-r9.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# 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.6.8-r9.ebuild,v 1.2 2004/04/26 17:52:58 agriffis Exp $
-
-IUSE="cjk"
-
-ONIGURUMA="onigd2_2_6"
-SNAP_DATE="20031015"
-
-inherit flag-o-matic alternatives eutils
-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.6"
-KEYWORDS="~x86 ~alpha ~ppc ~sparc ~hppa ~amd64 -ia64 ~mips"
-
-DEPEND=">=sys-libs/glibc-2.1.3
-	>=sys-libs/gdbm-1.8.0
-	>=sys-libs/readline-4.1
-	>=sys-libs/ncurses-5.2
-	>=dev-ruby/ruby-config-0.2"
-PROVIDE="virtual/ruby"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ../${P}-${SNAP_DATE}.diff
-	use amd64 && epatch ${FILESDIR}/${P}-fix-x86_64.patch
-
-	if [ -n "`use cjk`" ] ; then
-		einfo "Applying ${ONIGURUMA}"
-		cd ${WORKDIR}/oniguruma
-		econf --with-rubydir=${S} || die "econf failed"
-		make ${SLOT/./}
-	fi
-}
-
-src_compile() {
-	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.0-r6.ebuild b/dev-lang/ruby/ruby-1.8.0-r6.ebuild
index a25ab500f8ef..8f4cd71112bd 100644
--- a/dev-lang/ruby/ruby-1.8.0-r6.ebuild
+++ b/dev-lang/ruby/ruby-1.8.0-r6.ebuild
@@ -1,6 +1,6 @@
 # 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.0-r6.ebuild,v 1.4 2004/04/26 00:14:15 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.0-r6.ebuild,v 1.5 2004/05/18 05:41:57 usata Exp $
 
 IUSE="socks5 tcltk cjk"
 
@@ -19,16 +19,16 @@ LICENSE="Ruby"
 SLOT="1.8"
 KEYWORDS="alpha hppa ia64 mips ppc sparc x86"
 
-DEPEND=">=sys-libs/glibc-2.1.3
+RDEPEND=">=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}*"
+DEPEND="sys-devel/autoconf
+	sys-apps/findutils
+	${RDEPEND}"
 PROVIDE="virtual/ruby"
 
 src_unpack() {
diff --git a/dev-lang/ruby/ruby-1.8.1-r2.ebuild b/dev-lang/ruby/ruby-1.8.1-r2.ebuild
index a2610cf1def1..da65ab1f3591 100644
--- a/dev-lang/ruby/ruby-1.8.1-r2.ebuild
+++ b/dev-lang/ruby/ruby-1.8.1-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.9 2004/04/26 00:14:15 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.1-r2.ebuild,v 1.10 2004/05/18 05:41:57 usata Exp $
 
 IUSE="socks5 tcltk cjk"
 
@@ -20,16 +20,16 @@ LICENSE="Ruby"
 SLOT="1.8"
 KEYWORDS="alpha hppa -ia64 mips ppc sparc x86 s390"
 
-DEPEND=">=sys-libs/glibc-2.1.3
+RDEPEND=">=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}*"
+DEPEND="sys-devel/autoconf
+	sys-apps/findutils
+	${RDEPEND}"
 PROVIDE="virtual/ruby"
 
 S=${WORKDIR}/${P%_pre*}
diff --git a/dev-lang/ruby/ruby-1.8.1-r3.ebuild b/dev-lang/ruby/ruby-1.8.1-r3.ebuild
index 472dea57bf86..a4277f86ae3b 100644
--- a/dev-lang/ruby/ruby-1.8.1-r3.ebuild
+++ b/dev-lang/ruby/ruby-1.8.1-r3.ebuild
@@ -1,6 +1,6 @@
 # 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-r3.ebuild,v 1.7 2004/04/26 00:14:15 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.1-r3.ebuild,v 1.8 2004/05/18 05:41:57 usata Exp $
 
 IUSE="socks5 tcltk cjk"
 
@@ -20,16 +20,16 @@ LICENSE="Ruby"
 SLOT="1.8"
 KEYWORDS="amd64 alpha hppa -ia64 mips ppc sparc x86 s390"
 
-DEPEND=">=sys-libs/glibc-2.1.3
+RDEPEND=">=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}*"
+DEPEND="sys-devel/autoconf
+	sys-apps/findutils
+	${RDEPEND}"
 PROVIDE="virtual/ruby"
 
 S=${WORKDIR}/${P%_pre*}
diff --git a/dev-lang/ruby/ruby-1.8.1-r5.ebuild b/dev-lang/ruby/ruby-1.8.1-r5.ebuild
deleted file mode 100644
index 385582c009cf..000000000000
--- a/dev-lang/ruby/ruby-1.8.1-r5.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# 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.2 2004/04/26 00:14:15 agriffis 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} || die "econf failed"
-		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
-}
diff --git a/dev-lang/ruby/ruby-1.8.1-r6.ebuild b/dev-lang/ruby/ruby-1.8.1-r6.ebuild
index 0b5e1ac8a6c8..9bbf5de23d71 100644
--- a/dev-lang/ruby/ruby-1.8.1-r6.ebuild
+++ b/dev-lang/ruby/ruby-1.8.1-r6.ebuild
@@ -1,6 +1,6 @@
 # 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-r6.ebuild,v 1.1 2004/04/30 16:54:23 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.1-r6.ebuild,v 1.2 2004/05/18 05:41:57 usata Exp $
 
 IUSE="socks5 tcltk cjk"
 
@@ -18,18 +18,19 @@ SRC_URI="mirror://ruby/${PV%.*}/${P/_pre/-preview}.tar.gz
 
 LICENSE="Ruby"
 SLOT="1.8"
-KEYWORDS="~amd64 ~alpha ~hppa -ia64 ~mips ~ppc ~sparc ~x86 ~s390"
+KEYWORDS="~amd64 alpha ~hppa -ia64 ~mips ppc ~sparc x86 ~s390"
 
-DEPEND=">=sys-libs/glibc-2.1.3
+RDEPEND=">=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}*"
+DEPEND="sys-devel/autoconf
+	sys-apps/findutils
+	${RDEPEND}"
+	
 PROVIDE="virtual/ruby"
 
 S=${WORKDIR}/${P%_pre*}