fix bug 21719 and general cleanup

5 files changed, 77 insertions, 3 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 56e6143afc43..11ef23ed58bd 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/ruby
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.18 2003/05/14 18:35:00 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.19 2003/05/26 17:59:19 agriffis Exp $
+
+*ruby-1.8.0_pre2-r1 (26 May 2003)
+
+  26 May 2003; Aron Griffis <agriffis@gentoo.org> ruby-1.8.0_pre2-r1.ebuild,
+  files/ruby-1.8.0_pre2-socks.patch:
+  Fix bug 21719 with a local patch. Pay attention to socks5 and tcltk USE flags.
+  Add ~alpha to KEYWORDS
 
   14 May 2003; Luca Barbato <lu_zero@gentoo.org> ruby-1.6.8.ebuild :
   Added ppc to keywords.
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index f5f805511ac3..7f47439f34fe 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,6 +1,6 @@
-MD5 7a45dd7266414c53473350de6c51fa7b ruby-1.8.0_pre2-r1.ebuild 1372
+MD5 03860f14dbfb94fec12a4b8579f7bc1f ruby-1.8.0_pre2-r1.ebuild 1380
 MD5 a357995f80c9f0c2a5c928ccf2e22fb6 ruby-1.6.8.ebuild 750
-MD5 8e5c21915648e15b0ea2e9e565a0ebd9 ChangeLog 2414
+MD5 be0742152765035c9e4fb2c65a8a445e ChangeLog 2415
 MD5 557fc0b69af82ee16ef65e0be0cffb2b ruby-1.8.0_pre2.ebuild 810
 MD5 4e97d6dfe5cd879ed2d05bbd414b46f8 files/ruby-1.8.0_pre2-socks.patch 346
 MD5 eec22a947154da0852d5914dcea2cb80 files/digest-ruby-1.8.0_pre2-r1 72
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.0_pre2-r1 b/dev-lang/ruby/files/digest-ruby-1.8.0_pre2-r1
new file mode 100644
index 000000000000..128aeef2c1e1
--- /dev/null
+++ b/dev-lang/ruby/files/digest-ruby-1.8.0_pre2-r1
@@ -0,0 +1 @@
+MD5 27d00977204a5892d385fd30809d119c ruby-1.8.0-preview2.tar.gz 1380771
diff --git a/dev-lang/ruby/files/ruby-1.8.0_pre2-socks.patch b/dev-lang/ruby/files/ruby-1.8.0_pre2-socks.patch
new file mode 100644
index 000000000000..7f7495e82a44
--- /dev/null
+++ b/dev-lang/ruby/files/ruby-1.8.0_pre2-socks.patch
@@ -0,0 +1,11 @@
+--- ruby-1.8.0/ext/socket/socket.c.old	2003-01-16 02:47:50.000000000 -0500
++++ ruby-1.8.0/ext/socket/socket.c	2003-05-22 15:06:31.000000000 -0400
+@@ -991,7 +991,7 @@
+ 	init = 1;
+     }
+ 
+-    return init_inetsock(class, host, serv, Qnil, Qnil, INET_SOCKS);
++    return init_inetsock(sock, host, serv, Qnil, Qnil, INET_SOCKS);
+ }
+ 
+ #ifdef SOCKS5
diff --git a/dev-lang/ruby/ruby-1.8.0_pre2-r1.ebuild b/dev-lang/ruby/ruby-1.8.0_pre2-r1.ebuild
new file mode 100644
index 000000000000..02f7c669a8ce
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.8.0_pre2-r1.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-r1.ebuild,v 1.1 2003/05/26 17:59:19 agriffis 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=''
+
+	filter-flags -fomit-frame-pointer
+
+	# Socks support via dante
+	if use socks5; then
+		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=--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
+}