7 files changed, 9 insertions, 156 deletions
diff --git a/dev-lang/ruby-cvs/ChangeLog b/dev-lang/ruby-cvs/ChangeLog
index 3f1ae2fbf54b..a9e94c38ed25 100644
--- a/dev-lang/ruby-cvs/ChangeLog
+++ b/dev-lang/ruby-cvs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/ruby-cvs
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby-cvs/ChangeLog,v 1.10 2004/02/21 10:39:51 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby-cvs/ChangeLog,v 1.11 2004/04/10 06:00:46 usata Exp $
+
+  10 Apr 2004; Mamoru KOMACHI <usata@gentoo.org> ruby-cvs-1.8.1-r1.ebuild,
+  ruby-cvs-1.8.1.ebuild, ruby-cvs-1.9.0-r1.ebuild, ruby-cvs-1.9.0.ebuild:
+  Provides virtual/ruby instead of dev-lang/ruby-${PV}, see bug #46968
 
   21 Feb 2004; Mamoru KOMACHI <usata@gentoo.org> ruby-cvs-1.8.1-r1.ebuild,
   ruby-cvs-1.9.0-r1.ebuild:
diff --git a/dev-lang/ruby-cvs/files/digest-ruby-cvs-1.8.1 b/dev-lang/ruby-cvs/files/digest-ruby-cvs-1.8.1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/dev-lang/ruby-cvs/files/digest-ruby-cvs-1.8.1
+++ /dev/null
diff --git a/dev-lang/ruby-cvs/files/digest-ruby-cvs-1.9.0 b/dev-lang/ruby-cvs/files/digest-ruby-cvs-1.9.0
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/dev-lang/ruby-cvs/files/digest-ruby-cvs-1.9.0
+++ /dev/null
diff --git a/dev-lang/ruby-cvs/ruby-cvs-1.8.1-r1.ebuild b/dev-lang/ruby-cvs/ruby-cvs-1.8.1-r1.ebuild
index 1c107dfc7dc4..8ee2fe0287cb 100644
--- a/dev-lang/ruby-cvs/ruby-cvs-1.8.1-r1.ebuild
+++ b/dev-lang/ruby-cvs/ruby-cvs-1.8.1-r1.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-cvs/ruby-cvs-1.8.1-r1.ebuild,v 1.2 2004/02/21 10:39:51 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby-cvs/ruby-cvs-1.8.1-r1.ebuild,v 1.3 2004/04/10 06:00:46 usata Exp $
 
 IUSE="socks5 tcltk"
 
@@ -26,7 +26,7 @@ DEPEND=">=sys-libs/glibc-2.1.3
 	>=dev-ruby/ruby-config-0.2"
 RDEPEND="${DEPEND}
 	!=dev-lang/ruby-1.8*"
-PROVIDE="dev-lang/ruby-${PV}"
+PROVIDE="virtual/ruby"
 
 ECVS_SERVER="cvs.ruby-lang.org:/src"
 ECVS_MODULE="ruby"
diff --git a/dev-lang/ruby-cvs/ruby-cvs-1.8.1.ebuild b/dev-lang/ruby-cvs/ruby-cvs-1.8.1.ebuild
deleted file mode 100644
index 4de8cf99e154..000000000000
--- a/dev-lang/ruby-cvs/ruby-cvs-1.8.1.ebuild
+++ /dev/null
@@ -1,76 +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-cvs/ruby-cvs-1.8.1.ebuild,v 1.2 2004/02/21 10:39:51 usata Exp $
-
-IUSE="socks5 tcltk"
-
-inherit flag-o-matic alternatives gnuconfig cvs
-filter-flags -fomit-frame-pointer
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI=""
-
-LICENSE="Ruby"
-SLOT="1.8"
-KEYWORDS="~alpha ~hppa ~ia64 ~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
-	dev-util/gperf
-	socks5? ( >=net-misc/dante-1.1.13 )
-	tcltk?  ( dev-lang/tk )
-	sys-apps/findutils"
-RDEPEND="${DEPEND}
-	!=dev-lang/ruby-1.8*"
-PROVIDE="dev-lang/ruby-${PV}"
-
-ECVS_SERVER="cvs.ruby-lang.org:/src"
-ECVS_MODULE="ruby"
-ECVS_AUTH="pserver"
-ECVS_PASS="anonymous"
-ECVS_UP_OPTS="-dP -rruby_1_8"
-ECVS_CO_OPTS="-rruby_1_8"
-
-S=${WORKDIR}/${ECVS_MODULE}
-
-src_compile() {
-
-	local ruby_version=`gawk '$2=="RUBY_VERSION" {print $3}' version.h | tr -d \"`
-	if [ "${PV}" != "${ruby_version}" ]; then
-		die "version mismatch"
-	fi
-
-	# 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
-
-	autoconf || die "autoconf failed"
-
-	# disable install-doc because of yaml/parser
-	econf --program-suffix=${SLOT/./} --enable-shared \
-		`use_enable socks5 socks` \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	einstall DESTDIR=${D} || die "einstall 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
-}
diff --git a/dev-lang/ruby-cvs/ruby-cvs-1.9.0-r1.ebuild b/dev-lang/ruby-cvs/ruby-cvs-1.9.0-r1.ebuild
index 7cac2c27c9f4..2fefbe077828 100644
--- a/dev-lang/ruby-cvs/ruby-cvs-1.9.0-r1.ebuild
+++ b/dev-lang/ruby-cvs/ruby-cvs-1.9.0-r1.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-cvs/ruby-cvs-1.9.0-r1.ebuild,v 1.2 2004/02/21 10:39:51 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby-cvs/ruby-cvs-1.9.0-r1.ebuild,v 1.3 2004/04/10 06:00:46 usata Exp $
 
 IUSE="socks5 tcltk"
 
@@ -26,7 +26,7 @@ DEPEND=">=sys-libs/glibc-2.1.3
 	dev-ruby/ruby-config"
 RDEPEND="${DEPEND}
 	!=dev-lang/ruby-${SLOT}*"
-PROVIDE="dev-lang/ruby-${PV}"
+PROVIDE="virtual/ruby"
 
 ECVS_SERVER="cvs.ruby-lang.org:/src"
 ECVS_MODULE="ruby"
diff --git a/dev-lang/ruby-cvs/ruby-cvs-1.9.0.ebuild b/dev-lang/ruby-cvs/ruby-cvs-1.9.0.ebuild
deleted file mode 100644
index 14c42594e70d..000000000000
--- a/dev-lang/ruby-cvs/ruby-cvs-1.9.0.ebuild
+++ /dev/null
@@ -1,75 +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-cvs/ruby-cvs-1.9.0.ebuild,v 1.2 2004/02/21 10:39:51 usata Exp $
-
-IUSE="socks5 tcltk"
-
-inherit flag-o-matic cvs
-filter-flags -fomit-frame-pointer
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI=""
-
-LICENSE="Ruby"
-SLOT="1.9"
-KEYWORDS="~alpha ~hppa ~ia64 ~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
-	dev-util/gperf
-	socks5? ( >=net-misc/dante-1.1.13 )
-	tcltk?  ( dev-lang/tk )
-	sys-apps/findutils"
-PROVIDE="dev-lang/ruby-${PV}"
-
-ECVS_SERVER="cvs.ruby-lang.org:/src"
-ECVS_MODULE="ruby"
-ECVS_AUTH="pserver"
-ECVS_PASS="anonymous"
-
-S=${WORKDIR}/${ECVS_MODULE}
-
-src_compile() {
-
-	local ruby_version=`gawk '$2=="RUBY_VERSION" {print $3}' version.h | tr -d \"`
-	if [ "${PV}" != "${ruby_version}" ]; then
-		die "version mismatch"
-	fi
-
-	# 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
-
-	autoconf || die "autoconf failed"
-
-	# disable install-doc because of yaml/parser
-	econf --program-suffix=${SLOT/./} --enable-shared \
-		`use_enable socks5 socks` \
-		--disable-install-doc \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	#export RUBY=${D}/usr/bin/ruby19
-	export LD_LIBRARY_PATH=${D}/usr/lib RUBYLIB=${D}/usr/lib/ruby/1.9
-	einstall DESTDIR=${D} || die "einstall 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
-}