Split ruby_1_8 branch and CVS HEAD. Added SLOT support. Closing bug #39204

7 files changed, 154 insertions, 95 deletions

diff --git a/dev-lang/ruby-cvs/Manifest b/dev-lang/ruby-cvs/Manifest
index 143cfe9b2d4e..ca1c249f9a54 100644
--- a/dev-lang/ruby-cvs/Manifest
+++ b/dev-lang/ruby-cvs/Manifest
@@ -1,10 +1,6 @@
-MD5 739650a0204adc4c5fcbd9151b7886f3 ruby-cvs-1.8.0-r4.ebuild 1044
-MD5 9c88c060f2482e387af6ed3f7302223a ChangeLog 1212
+MD5 02fd7a969e7bd3fe3f54a585a29215f3 ChangeLog 1452
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
-MD5 fbfd09e540f68b8817d87452f59d1be9 ruby-cvs-1.8.0-r3.ebuild 1083
-MD5 3cd6f54ad93914c0b22f7f1ff147b074 ruby-cvs-1.9.0.ebuild 2016
-MD5 f4ff226938424b4e6fa566c53184bb84 ruby-cvs-1.8.1.ebuild 2041
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ruby-cvs-1.8.0-r3 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ruby-cvs-1.8.0-r4 0
+MD5 d69bc7e829fa73bab9973b6768a858cd ruby-cvs-1.9.0.ebuild 2054
+MD5 e8dd8478a903bbc1e2b3c6b754bd3816 ruby-cvs-1.8.1.ebuild 2048
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ruby-cvs-1.9.0 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ruby-cvs-1.8.1 0
diff --git a/dev-lang/ruby-cvs/files/digest-ruby-cvs-1.8.0-r3 b/dev-lang/ruby-cvs/files/digest-ruby-cvs-1.8.1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/dev-lang/ruby-cvs/files/digest-ruby-cvs-1.8.0-r3
+++ b/dev-lang/ruby-cvs/files/digest-ruby-cvs-1.8.1
diff --git a/dev-lang/ruby-cvs/files/digest-ruby-cvs-1.8.0-r4 b/dev-lang/ruby-cvs/files/digest-ruby-cvs-1.9.0
index e69de29bb2d1..e69de29bb2d1 100644
--- a/dev-lang/ruby-cvs/files/digest-ruby-cvs-1.8.0-r4
+++ b/dev-lang/ruby-cvs/files/digest-ruby-cvs-1.9.0
diff --git a/dev-lang/ruby-cvs/ruby-cvs-1.8.0-r3.ebuild b/dev-lang/ruby-cvs/ruby-cvs-1.8.0-r3.ebuild
deleted file mode 100644
index 76d7b1df3626..000000000000
--- a/dev-lang/ruby-cvs/ruby-cvs-1.8.0-r3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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-cvs/ruby-cvs-1.8.0-r3.ebuild,v 1.1 2003/07/22 14:30:13 twp Exp $
-
-DESCRIPTION="An object-oriented scripting language"
-SRC_URI=""
-HOMEPAGE="http://www.ruby-lang.org/"
-LICENSE="Ruby"
-KEYWORDS="~alpha ~arm ~hppa ~mips ~ppc ~sparc ~x86"
-SLOT="0"
-PROVIDE="dev-lang/ruby-${PV}
-	dev-ruby/rexml
-	dev-ruby/ruby-syck
-	dev-ruby/optparse"
-
-DEPEND=">=sys-libs/glibc-2.1.3
-	>=sys-libs/gdbm-1.8.0
-	>=sys-libs/readline-4.1
-	>=sys-libs/ncurses-5.2"
-
-ECVS_SERVER="cvs.ruby-lang.org:/src"
-ECVS_MODULE="ruby"
-ECVS_AUTH="pserver"
-ECVS_PASS="anonymous"
-inherit cvs
-
-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
-
-	autoconf || die
-	CFLAGS=${CFLAGS/-fomit-frame-pointer/} econf
-	emake
-
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc COPYING* ChangeLog MANIFEST README* ToDo
-}
diff --git a/dev-lang/ruby-cvs/ruby-cvs-1.8.0-r4.ebuild b/dev-lang/ruby-cvs/ruby-cvs-1.8.0-r4.ebuild
deleted file mode 100644
index b00367470324..000000000000
--- a/dev-lang/ruby-cvs/ruby-cvs-1.8.0-r4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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-cvs/ruby-cvs-1.8.0-r4.ebuild,v 1.1 2003/08/09 11:10:53 twp Exp $
-
-DESCRIPTION="An object-oriented scripting language"
-SRC_URI=""
-HOMEPAGE="http://www.ruby-lang.org/"
-LICENSE="Ruby"
-KEYWORDS="~alpha ~arm ~hppa ~mips ~ppc ~sparc ~x86"
-SLOT="0"
-PROVIDE="dev-lang/ruby-${PV}"
-
-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"
-
-ECVS_SERVER="cvs.ruby-lang.org:/src"
-ECVS_MODULE="ruby"
-ECVS_AUTH="pserver"
-ECVS_PASS="anonymous"
-inherit cvs
-
-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
-
-	autoconf || die
-	CFLAGS=${CFLAGS/-fomit-frame-pointer/} econf
-	emake
-
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc COPYING* ChangeLog MANIFEST README* ToDo
-}
diff --git a/dev-lang/ruby-cvs/ruby-cvs-1.8.1.ebuild b/dev-lang/ruby-cvs/ruby-cvs-1.8.1.ebuild
new file mode 100644
index 000000000000..b7462cf1d8dc
--- /dev/null
+++ b/dev-lang/ruby-cvs/ruby-cvs-1.8.1.ebuild
@@ -0,0 +1,76 @@
+# 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.1 2004/01/25 12:10:15 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 ~arm ~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
+	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.ebuild b/dev-lang/ruby-cvs/ruby-cvs-1.9.0.ebuild
new file mode 100644
index 000000000000..35b342321a0c
--- /dev/null
+++ b/dev-lang/ruby-cvs/ruby-cvs-1.9.0.ebuild
@@ -0,0 +1,75 @@
+# 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.1 2004/01/25 12:10:15 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 ~arm ~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
+	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
+}