Marked stable to fix rdoc (see bug #48127). Removed old ebuilds.

7 files changed, 9 insertions, 179 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 9ffc5d0c4381..f2c264785e8c 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,10 @@
 # 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.58 2004/04/17 08:21:49 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.59 2004/04/17 19:22:07 usata Exp $
+
+  18 Apr 2004; Mamoru KOMACHI <usata@gentoo.org> ruby-1.6.8-r7.ebuild,
+  ruby-1.8.0-r5.ebuild, ruby-1.8.0-r6.ebuild, ruby-1.8.1-r3.ebuild:
+  Marked stable to fix rdoc (see bug #48127). Removed old ebuilds.
 
   17 Apr 2004; Travis Tilley <lv@gentoo.org> ruby-1.8.1-r3.ebuild:
   added missing ~amd64 keyword
diff --git a/dev-lang/ruby/files/digest-ruby-1.6.8-r7 b/dev-lang/ruby/files/digest-ruby-1.6.8-r7
deleted file mode 100644
index d4677c7a751c..000000000000
--- a/dev-lang/ruby/files/digest-ruby-1.6.8-r7
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 bf48d49dbd94b5c0eda5f75b3bfbac16 ruby-1.6.8.tar.gz 1023403
-MD5 3b4aa9689c3e92dd10432eec5ad513ca onigd20040316.tar.gz 196326
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.0-r5 b/dev-lang/ruby/files/digest-ruby-1.8.0-r5
deleted file mode 100644
index 1bc80db6100c..000000000000
--- a/dev-lang/ruby/files/digest-ruby-1.8.0-r5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 582a65e52598a4a1e9fce523e16e67d6 ruby-1.8.0.tar.gz 1979070
-MD5 8e0dd61b25ce83be9bca657fbda5a172 onigd20031224.tar.gz 178287
diff --git a/dev-lang/ruby/ruby-1.6.8-r7.ebuild b/dev-lang/ruby/ruby-1.6.8-r7.ebuild
deleted file mode 100644
index 5aa442bfbc0c..000000000000
--- a/dev-lang/ruby/ruby-1.6.8-r7.ebuild
+++ /dev/null
@@ -1,71 +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-r7.ebuild,v 1.1 2004/04/10 06:41:55 usata Exp $
-
-IUSE="cjk"
-
-ONIGURUMA="onigd20040316"
-
-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
-	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}
-	if [ -n "`use cjk`" ] ; then
-		pushd oniguruma
-		econf --with-rubydir=${S}
-		make ${SLOT/./}
-		cd ${S}/lib
-		epatch ${FILESDIR}/${P}-oniguruma-gentoo.diff
-		popd
-	fi
-	cd ${S}
-	use amd64 && epatch ${FILESDIR}/${P}-fix-x86_64.patch
-}
-
-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 [ ! -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() {
-
-	if [ ! -e "$(readlink /usr/bin/ruby)" ] ; then
-		/usr/sbin/ruby-config ruby${SLOT/./}
-	fi
-}
diff --git a/dev-lang/ruby/ruby-1.8.0-r5.ebuild b/dev-lang/ruby/ruby-1.8.0-r5.ebuild
deleted file mode 100644
index d05554c2a7cf..000000000000
--- a/dev-lang/ruby/ruby-1.8.0-r5.ebuild
+++ /dev/null
@@ -1,99 +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.0-r5.ebuild,v 1.8 2004/04/11 18:10:08 usata Exp $
-
-IUSE="socks5 tcltk 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
-	cjk? ( ftp://ftp.ruby-lang.org/pub/ruby/contrib/${ONIGURUMA}.tar.gz )"
-
-LICENSE="Ruby"
-SLOT="1.8"
-KEYWORDS="alpha hppa ia64 mips ppc sparc x86"
-
-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"
-
-src_unpack() {
-	unpack ${A}
-	if [ -n "`use cjk`" ] ; then
-		pushd oniguruma
-		econf --with-rubydir=${S}
-		make ${SLOT/./}
-		popd
-	fi
-
-	# Enable build on alpha EV67
-	if [ "${ARCH}" = "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.8 to 1.8.0 due to the library version change."
-	ewarn "In that case, you will need to remerge vim."
-	ewarn
-
-	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() {
-
-	if [ ! -e "$(readlink /usr/bin/ruby)" ] ; then
-		/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 71fba6d0939b..bd0f186b7b88 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.1 2004/04/10 06:41:55 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.0-r6.ebuild,v 1.2 2004/04/17 19:22:07 usata Exp $
 
 IUSE="socks5 tcltk cjk"
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://ruby/${PV%.*}/${P/_pre/-preview}.tar.gz
 
 LICENSE="Ruby"
 SLOT="1.8"
-KEYWORDS="~alpha ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="alpha hppa ia64 mips ppc sparc x86"
 
 DEPEND=">=sys-libs/glibc-2.1.3
 	>=sys-libs/gdbm-1.8.0
diff --git a/dev-lang/ruby/ruby-1.8.1-r3.ebuild b/dev-lang/ruby/ruby-1.8.1-r3.ebuild
index e7db1d81d824..fec9116a7730 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.2 2004/04/17 08:21:49 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.1-r3.ebuild,v 1.3 2004/04/17 19:22:07 usata Exp $
 
 IUSE="socks5 tcltk cjk"
 
@@ -18,7 +18,7 @@ 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
 	>=sys-libs/gdbm-1.8.0