Bug # 21723

5 files changed, 89 insertions, 3 deletions

diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index a40bc80c6925..2afaa2d9a7a6 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,9 +1,9 @@
-MD5 cdf3e8d5e38fbc464e64e3a249c03de9 ChangeLog 2543
-MD5 a53f27fe8d8f8c6edae4bac105817efa ruby-1.6.8-r1.ebuild 766
+MD5 ba6f6fcc71262de225d3e2a09b4a68ca ChangeLog 2538
+MD5 a170804ada2a5b552414ad500f8bf27f ruby-1.6.8-r1.ebuild 764
 MD5 a357995f80c9f0c2a5c928ccf2e22fb6 ruby-1.6.8.ebuild 750
 MD5 557fc0b69af82ee16ef65e0be0cffb2b ruby-1.8.0_pre2.ebuild 810
 MD5 03860f14dbfb94fec12a4b8579f7bc1f ruby-1.8.0_pre2-r1.ebuild 1380
-MD5 58e37937805dba555c624371bc6491c5 ruby-1.8.0_pre2-r2.ebuild 1420
+MD5 4ac6ef5923b8d2bd51fa440913d0f0f2 ruby-1.8.0_pre2-r2.ebuild 1415
 MD5 11702b3cb52c88daf5d3934e3a0c2e2a files/digest-ruby-1.6.8-r1 63
 MD5 11702b3cb52c88daf5d3934e3a0c2e2a files/digest-ruby-1.6.8 63
 MD5 2da205db4c1f8df1e100067e6c188543 files/digest-ruby-1.8.0_pre2 137
diff --git a/dev-lang/ruby/files/digest-ruby-1.6.8-r1 b/dev-lang/ruby/files/digest-ruby-1.6.8-r1
new file mode 100644
index 000000000000..0b9291d168d1
--- /dev/null
+++ b/dev-lang/ruby/files/digest-ruby-1.6.8-r1
@@ -0,0 +1 @@
+MD5 bf48d49dbd94b5c0eda5f75b3bfbac16 ruby-1.6.8.tar.gz 1023403
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.0_pre2-r2 b/dev-lang/ruby/files/digest-ruby-1.8.0_pre2-r2
new file mode 100644
index 000000000000..128aeef2c1e1
--- /dev/null
+++ b/dev-lang/ruby/files/digest-ruby-1.8.0_pre2-r2
@@ -0,0 +1 @@
+MD5 27d00977204a5892d385fd30809d119c ruby-1.8.0-preview2.tar.gz 1380771
diff --git a/dev-lang/ruby/ruby-1.6.8-r1.ebuild b/dev-lang/ruby/ruby-1.6.8-r1.ebuild
new file mode 100644
index 000000000000..dbbbe4cc678d
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.6.8-r1.ebuild
@@ -0,0 +1,29 @@
+# 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/ruby-1.6.8-r1.ebuild,v 1.1 2003/05/28 13:07:05 twp Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="An object-oriented scripting language"
+SRC_URI="ftp://ftp.ruby-lang.org/pub/ruby/${P}.tar.gz"
+HOMEPAGE="http://www.ruby-lang.org/"
+LICENSE="Ruby"
+KEYWORDS="x86 alpha ppc sparc hppa"
+SLOT="0"
+
+inherit flag-o-matic
+filter-flags -fomit-frame-pointer
+
+DEPEND=">=sys-libs/glibc-2.1.3
+	>=sys-libs/gdbm-1.8.0
+	>=sys-libs/readline-4.1
+	>=sys-libs/ncurses-5.2"
+
+src_compile() {
+	econf --enable-shared
+	emake || die
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+	dodoc COPYING* ChangeLog MANIFEST README* ToDo
+}
diff --git a/dev-lang/ruby/ruby-1.8.0_pre2-r2.ebuild b/dev-lang/ruby/ruby-1.8.0_pre2-r2.ebuild
new file mode 100644
index 000000000000..a8700c6c8dd8
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.8.0_pre2-r2.ebuild
@@ -0,0 +1,55 @@
+# 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/ruby-1.8.0_pre2-r2.ebuild,v 1.1 2003/05/28 13:07:05 twp Exp $
+
+IUSE="socks5 tcltk"
+
+inherit flag-o-matic eutils
+
+S=${WORKDIR}/${P%_pre*}
+DESCRIPTION="An object-oriented scripting language"
+SRC_URI="ftp://ftp.ruby-lang.org/pub/ruby/1.8/${P/_pre/-preview}.tar.gz"
+HOMEPAGE="http://www.ruby-lang.org/"
+LICENSE="Ruby"
+KEYWORDS="~x86 ~alpha"
+SLOT="0"
+
+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 )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${WORKDIR}
+
+	# Allow Ruby to build correctly with Dante/SOCKS support.
+	epatch ${FILESDIR}/ruby-1.8.0_pre2-socks.patch
+}
+
+src_compile() {
+	local myconf='--enabled-shared'
+
+	filter-flags -fomit-frame-pointer
+
+	# Socks support via dante
+	if use socks5; then
+		myconf="${myconf} --enable-socks"
+	else
+		# 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.
+		myconf="${myconf} --disable-socks"
+		unset SOCKS_SERVER
+	fi
+
+	econf ${myconf} || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install () {
+	make DESTDIR=${D} install || die "make install failed"
+	dodoc COPYING* ChangeLog MANIFEST README* ToDo
+}