Marked 1.6.8-r6, 1.8.0-r5 and 1.8.1-r2 stable on all arches. Removed old versions.

10 files changed, 17 insertions, 322 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 19f7c28f3871..d6e7f9cd526e 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.55 2004/04/10 06:41:55 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.56 2004/04/11 18:10:08 usata Exp $
+
+  12 Apr 2004; Mamoru KOMACHI <usata@gentoo.org> ruby-1.6.8-r3.ebuild,
+  ruby-1.6.8-r6.ebuild, ruby-1.8.0-r1.ebuild, ruby-1.8.0-r5.ebuild,
+  ruby-1.8.1-r2.ebuild, files/ruby-config:
+  Marked 1.6.8-r6, 1.8.0-r5 and 1.8.1-r2 stable on all arches. Removed old
+  versions.
 
 *ruby-1.6.8-r7 (10 Apr 2004)
 *ruby-1.8.0-r6 (10 Apr 2004)
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 2524ac5d1b88..03c2ca0dc231 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,21 +1,16 @@
-MD5 2202788be4cc6643f2bfab4468d2d4e9 ruby-1.8.0-r5.ebuild 2575
+MD5 3ea0b3f3d671f0836be6c99098b821d3 ruby-1.8.0-r5.ebuild 2573
 MD5 5d0d280e7d4e8c980d7a7fa5eb74d4c7 ruby-1.6.8-r7.ebuild 1713
-MD5 5640e126c6bb18c1d039f2684c81f70d ruby-1.8.0-r1.ebuild 2769
-MD5 e382d65e565675fb72ad4697adba2a1b ChangeLog 8757
+MD5 e26a7678a5e9659f1372dd00dbaa5682 ChangeLog 9027
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
-MD5 9f533c6633c05f3ac5352143c38b4ea2 ruby-1.6.8-r3.ebuild 2157
-MD5 56321e2543b93569be9aa66c5945d64c ruby-1.8.1-r2.ebuild 2738
-MD5 6432aaf9ea7aa13a98d3459268d41658 ruby-1.6.8-r6.ebuild 1710
+MD5 a67678c5d4619e11cbf781c7e373d92a ruby-1.8.1-r2.ebuild 2731
+MD5 184f7f996a21f876116fad5f2bcffcc9 ruby-1.6.8-r6.ebuild 1706
 MD5 5c4647e8642a7215b8043a33f720a29d ruby-1.8.0-r6.ebuild 2580
 MD5 2183b43d1f8faf7ff0506ab9f24290d1 ruby-1.8.1-r3.ebuild 2690
 MD5 d05f63da27634456886e7c924eaf96da files/ruby-1.6.8-fix-x86_64.patch 431
 MD5 cd55590075f2b5edad6366efe7804ce9 files/digest-ruby-1.6.8-r7 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
-MD5 e1c6eac35da8ce7f11bab66795de0b80 files/digest-ruby-1.8.0-r1 63
 MD5 7dc5ca634977d643f01b063a7a046433 files/digest-ruby-1.8.0-r5 128
-MD5 d2922d69e61de0bef77ed561b6107cca files/ruby-config 2863
 MD5 b71bbee8fb97a82541eb43ce30a62f09 files/oniguruma-20040202.diff 589
 MD5 760dc7b65ddbc8e3069dcf95ec8b00ba files/digest-ruby-1.8.1-r2 200
 MD5 512336d825e446e013bd383519b6559c files/digest-ruby-1.8.0-r6 128
diff --git a/dev-lang/ruby/files/digest-ruby-1.6.8-r3 b/dev-lang/ruby/files/digest-ruby-1.6.8-r3
deleted file mode 100644
index 0b9291d168d1..000000000000
--- a/dev-lang/ruby/files/digest-ruby-1.6.8-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bf48d49dbd94b5c0eda5f75b3bfbac16 ruby-1.6.8.tar.gz 1023403
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.0-r1 b/dev-lang/ruby/files/digest-ruby-1.8.0-r1
deleted file mode 100644
index 6bc2df5cd820..000000000000
--- a/dev-lang/ruby/files/digest-ruby-1.8.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 582a65e52598a4a1e9fce523e16e67d6 ruby-1.8.0.tar.gz 1979070
diff --git a/dev-lang/ruby/files/ruby-config b/dev-lang/ruby/files/ruby-config
deleted file mode 100644
index d6993cb81f8b..000000000000
--- a/dev-lang/ruby/files/ruby-config
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/bash
-
-# 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/files/ruby-config,v 1.2 2003/12/05 19:29:59 usata Exp $
-
-# Author: Mamoru KOMACHI <usata@gentoo.org>
-
-if [ -z "${PORTDIR}" ] ; then
-	[ -r /etc/make.conf ] && source /etc/make.conf
-	if [ -z "${PORTDIR}" ] ; then
-		[ -r /etc/make.globals ] && source /etc/make.globals
-	fi
-fi
-
-if [ -r /etc/init.d/functions.sh ] ; then
-	source /etc/init.d/functions.sh
-else
-	echo "Could not find /etc/init.d/functions.sh"
-	exit 1
-fi
-
-#dummy function
-EXPORT_FUNCTIONS() { :; }
-
-if [ -r ${PORTDIR:-/usr/portage}/eclass/alternatives.eclass ] ; then
-	source ${PORTDIR:-/usr/portage}/eclass/alternatives.eclass
-else
-	echo "Could not find ${PORTDIR:-/usr/portage}/bin/ebuild.sh"
-	exit 1
-fi
-
-usage() {
-cat << "USAGE_END"
-Usage: ruby-config [Option] [Ruby Profile]
-Change the current ruby profile, or give info about profiles.
-
-Options:
-
-  -c, --get-current-profile
-                         Print current used ruby profile.
-  -h, --show-help
-                         Print this help.
-
-The profile name is either ruby16 or ruby18.
-
-USAGE_END
-exit 1
-}
-
-if [ "$#" -lt 1 ] ; then
-	usage
-fi
-
-switch_profile() {
-	if [ "$EUID" != 0 ] ; then
-		eerror "You need root privilege to switch profile."
-		exit 1
-	fi
-	if [ "$1" = 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
-	elif [ "$1" = ruby18 ] ; then
-		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
-	else
-		eerror "Unsupported profile."
-	fi
-}
-
-get_current_profile() {
-	if [ ! -L /usr/bin/ruby ] ; then
-		eerror "Your ruby doesn't seem to support SLOT."
-		exit 1
-	fi
-	if [ `readlink /usr/bin/ruby` = ruby18 ] ; then
-		einfo "Your current profile refers to ruby18."
-	elif [ `readlink /usr/bin/ruby` = ruby16 ] ; then
-		einfo "Your current profile refers to ruby16."
-	else
-		eerror "Unknown profile."
-	fi
-}
-
-for x in $* ; do
-	if [ "$#" -gt 1 ] ; then
-		eerror "ruby-config accepts only one argument."
-		eerror "Run $0 -h for help."
-		exit 1
-	fi
-	case "${x}" in
-		-c|--get-current-profile)
-			get_current_profile 
-			;;
-		-h|--show-help)
-			usage
-			;;
-		-*)
-			eerror "Invalid option. Run $0 -h for help."
-			exit 1
-			;;
-		*)
-			switch_profile $*
-			;;
-	esac
-
-	exit 0
-done
diff --git a/dev-lang/ruby/ruby-1.6.8-r3.ebuild b/dev-lang/ruby/ruby-1.6.8-r3.ebuild
deleted file mode 100644
index 9e8f9e476aaf..000000000000
--- a/dev-lang/ruby/ruby-1.6.8-r3.ebuild
+++ /dev/null
@@ -1,87 +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-r3.ebuild,v 1.5 2004/04/10 06:41:55 usata Exp $
-
-IUSE="ruby16"
-
-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"
-
-LICENSE="Ruby"
-SLOT="1.6"
-KEYWORDS="x86 alpha ppc sparc hppa amd64 -ia64"
-
-DEPEND=">=sys-libs/glibc-2.1.3
-	>=sys-libs/gdbm-1.8.0
-	>=sys-libs/readline-4.1
-	>=sys-libs/ncurses-5.2"
-PROVIDE="virtual/ruby"
-
-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 ${S}
-	use amd64 && epatch ${FILESDIR}/${P}-fix-x86_64.patch
-}
-
-src_compile() {
-	econf --program-suffix=16 --enable-shared || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dosym /usr/lib/libruby16.so.${PV} /usr/lib/libruby.so.${PV%.*}
-	dosym /usr/lib/libruby16.so.${PV} /usr/lib/libruby.so.${PV}
-
-	if has_version '>=dev-lang/ruby-1.8.0-r1'; 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/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/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
-
-	if [ -x "/usr/bin/ruby-config" ] ; then
-	einfo
-	einfo "You can switch default ruby by /usr/bin/ruby-config."
-	einfo
-	fi
-}
-
-pkg_postrm() {
-	ruby_alternatives
-}
diff --git a/dev-lang/ruby/ruby-1.6.8-r6.ebuild b/dev-lang/ruby/ruby-1.6.8-r6.ebuild
index 4dce66a70d04..13387791ae94 100644
--- a/dev-lang/ruby/ruby-1.6.8-r6.ebuild
+++ b/dev-lang/ruby/ruby-1.6.8-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.6.8-r6.ebuild,v 1.4 2004/04/10 06:41:55 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.6.8-r6.ebuild,v 1.5 2004/04/11 18:10:08 usata Exp $
 
 IUSE="cjk"
 
@@ -16,7 +16,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.8.0-r1.ebuild b/dev-lang/ruby/ruby-1.8.0-r1.ebuild
deleted file mode 100644
index 2cd2636f26ef..000000000000
--- a/dev-lang/ruby/ruby-1.8.0-r1.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-r1.ebuild,v 1.8 2004/04/10 06:41:55 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 hppa ia64 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"
-RDEPEND="${DEPEND}
-	!=dev-lang/ruby-cvs-${SLOT}*"
-PROVIDE="virtual/ruby"
-
-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}
-
-	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/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/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
-	alternatives_auto_makesym /usr/bin/erb /usr/bin/erb?*
-}
-
-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
-}
-
-pkg_postrm() {
-	ruby_alternatives
-}
diff --git a/dev-lang/ruby/ruby-1.8.0-r5.ebuild b/dev-lang/ruby/ruby-1.8.0-r5.ebuild
index aaff74095ec1..d05554c2a7cf 100644
--- a/dev-lang/ruby/ruby-1.8.0-r5.ebuild
+++ b/dev-lang/ruby/ruby-1.8.0-r5.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-r5.ebuild,v 1.7 2004/04/10 06:41:55 usata Exp $
+# $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"
 
@@ -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-r2.ebuild b/dev-lang/ruby/ruby-1.8.1-r2.ebuild
index d1b01d4e88eb..72c8877b1d93 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.5 2004/04/11 03:22:52 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.1-r2.ebuild,v 1.6 2004/04/11 18:10:08 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="~alpha ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 s390"
+KEYWORDS="alpha hppa ia64 mips ppc sparc x86 s390"
 
 DEPEND=">=sys-libs/glibc-2.1.3
 	>=sys-libs/gdbm-1.8.0