Adding ruby for amd64

4 files changed, 46 insertions, 13 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 1af899335d2e..be9fdbdbb98c 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,10 @@
 # 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.24 2003/07/14 18:59:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.25 2003/07/18 20:06:03 tester Exp $
+
+  18 Jul 2003; root <root@gentoo.org> ruby-1.6.8-r1.ebuild,
+  files/ruby-1.6.8-fix-x86_64.patch:
+  Added x86_64 patch from redhat, marked stable
 
   14 Jul 2003; Aron Griffis <agriffis@gentoo.org> ruby-1.8.0_pre3.ebuild:
   Fix compilation on newer alpha platforms
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 1c9c14979b0e..d0c1dccc5cb3 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,17 +1,18 @@
-MD5 c7ce02c5a4a1462cf7bfe9ba95fe8750 ChangeLog 2923
-MD5 a170804ada2a5b552414ad500f8bf27f ruby-1.6.8-r1.ebuild 764
-MD5 a357995f80c9f0c2a5c928ccf2e22fb6 ruby-1.6.8.ebuild 750
 MD5 03860f14dbfb94fec12a4b8579f7bc1f ruby-1.8.0_pre2-r1.ebuild 1380
-MD5 74581d9cf84f902656ab173bbf9ce48c ruby-1.8.0_pre2-r2.ebuild 1419
-MD5 557fc0b69af82ee16ef65e0be0cffb2b ruby-1.8.0_pre2.ebuild 810
+MD5 0403378153bb43e860eff9011b1ad607 ruby-1.8.0_pre3.ebuild 1643
 MD5 59904ebd31b17bdf842d34ecba1f4387 ruby-1.8.0_pre2-r3.ebuild 1524
+MD5 34491a182f5f81f2468d799ee05dfd5d ruby-1.6.8-r1.ebuild 875
+MD5 a357995f80c9f0c2a5c928ccf2e22fb6 ruby-1.6.8.ebuild 750
+MD5 48dae1afb68a4798f36cb83a8162fdee ChangeLog 3067
+MD5 557fc0b69af82ee16ef65e0be0cffb2b ruby-1.8.0_pre2.ebuild 810
+MD5 74581d9cf84f902656ab173bbf9ce48c ruby-1.8.0_pre2-r2.ebuild 1419
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
-MD5 0403378153bb43e860eff9011b1ad607 ruby-1.8.0_pre3.ebuild 1643
-MD5 11702b3cb52c88daf5d3934e3a0c2e2a files/digest-ruby-1.6.8 63
-MD5 11702b3cb52c88daf5d3934e3a0c2e2a files/digest-ruby-1.6.8-r1 63
-MD5 2da205db4c1f8df1e100067e6c188543 files/digest-ruby-1.8.0_pre2 137
+MD5 4e97d6dfe5cd879ed2d05bbd414b46f8 files/ruby-1.8.0_pre2-socks.patch 346
 MD5 eec22a947154da0852d5914dcea2cb80 files/digest-ruby-1.8.0_pre2-r1 72
 MD5 eec22a947154da0852d5914dcea2cb80 files/digest-ruby-1.8.0_pre2-r2 72
-MD5 4e97d6dfe5cd879ed2d05bbd414b46f8 files/ruby-1.8.0_pre2-socks.patch 346
 MD5 eec22a947154da0852d5914dcea2cb80 files/digest-ruby-1.8.0_pre2-r3 72
+MD5 d05f63da27634456886e7c924eaf96da files/ruby-1.6.8-fix-x86_64.patch 431
+MD5 11702b3cb52c88daf5d3934e3a0c2e2a files/digest-ruby-1.6.8 63
+MD5 11702b3cb52c88daf5d3934e3a0c2e2a files/digest-ruby-1.6.8-r1 63
+MD5 2da205db4c1f8df1e100067e6c188543 files/digest-ruby-1.8.0_pre2 137
 MD5 e14012d537b34ba360ac8eaf900962be files/digest-ruby-1.8.0_pre3 72
diff --git a/dev-lang/ruby/files/ruby-1.6.8-fix-x86_64.patch b/dev-lang/ruby/files/ruby-1.6.8-fix-x86_64.patch
new file mode 100644
index 000000000000..ed573f3b8bd3
--- /dev/null
+++ b/dev-lang/ruby/files/ruby-1.6.8-fix-x86_64.patch
@@ -0,0 +1,21 @@
+diff -ruN ruby-1.6.8.orig/node.h ruby-1.6.8/node.h
+--- ruby-1.6.8.orig/node.h	2003-07-04 21:41:55.000000000 +0900
++++ ruby-1.6.8/node.h	2003-07-04 21:42:15.000000000 +0900
+@@ -137,7 +137,7 @@
+     union {
+ 	struct RNode *node;
+ 	ID id;
+-	long argc;
++	int argc;
+ 	VALUE value;
+     } u2;
+     union {
+@@ -145,7 +145,7 @@
+ 	ID id;
+ 	long state;
+ 	struct global_entry *entry;
+-	long cnt;
++	int cnt;
+ 	VALUE value;
+     } u3;
+ } NODE;
diff --git a/dev-lang/ruby/ruby-1.6.8-r1.ebuild b/dev-lang/ruby/ruby-1.6.8-r1.ebuild
index dbbbe4cc678d..dedb866ab879 100644
--- a/dev-lang/ruby/ruby-1.6.8-r1.ebuild
+++ b/dev-lang/ruby/ruby-1.6.8-r1.ebuild
@@ -1,13 +1,13 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.6.8-r1.ebuild,v 1.2 2003/07/18 20:06:03 tester 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"
+KEYWORDS="x86 alpha ppc sparc hppa amd64"
 SLOT="0"
 
 inherit flag-o-matic
@@ -18,6 +18,13 @@ DEPEND=">=sys-libs/glibc-2.1.3
 	>=sys-libs/readline-4.1
 	>=sys-libs/ncurses-5.2"
 
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	use amd64 && epatch ${FILESDIR}/ruby-1.6.8-fix-x86_64.patch
+}
+
 src_compile() {
 	econf --enable-shared
 	emake || die