Fixed compilation failure on ppc with cjk USE flag.

8 files changed, 54 insertions, 17 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index da8108b71eb3..e30aa3bd9ed1 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/ruby
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.93 2004/10/10 03:53:59 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.94 2004/10/10 09:06:17 usata Exp $
+
+  10 Oct 2004; Mamoru KOMACHI <usata@gentoo.org>
+  +files/oniguruma-2.3.1-fix-ppc.patch, ruby-1.6.8-r11.ebuild,
+  ruby-1.8.0-r7.ebuild, ruby-1.8.1-r7.ebuild, ruby-1.8.2_pre2.ebuild:
+  Fixed compilation failure on ppc with cjk USE flag.
 
   09 Oct 2004; Tom Gall <tgall@gentoo.org> ruby-1.8.2_pre2.ebuild:
   stable on ppc64, bug #60525
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 831ee5d925d5..8599e397b4d5 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,13 +1,14 @@
 MD5 11ecacb573f9654c07c34fadfc392f68 ChangeLog 15052
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
-MD5 778ebd2c3f082bd27aabd1ac5cc7bcb1 ruby-1.6.8-r11.ebuild 1934
-MD5 70f61fd1ce3bacdd874ebec32890acd1 ruby-1.8.0-r7.ebuild 2728
-MD5 d05526a7c6693f88fd5339de15984f99 ruby-1.8.1-r7.ebuild 2778
-MD5 7efc820aec597e4e48ad06b3c79aed4e ruby-1.8.2_pre2.ebuild 3364
-MD5 00ccb2b51acb8e90488b9bd2f8bf2c32 files/digest-ruby-1.6.8-r11 136
+MD5 27188c6e066a8c1f2f557c40fc9118cf ruby-1.8.1-r7.ebuild 2934
+MD5 12a29f8ab42476db84e1a210b6dbd5c5 ruby-1.6.8-r11.ebuild 2014
+MD5 f60420ea5509b547f4513a7343b64227 ruby-1.8.2_pre2.ebuild 3454
+MD5 272724abac9da0ef6fa132808312aec1 ruby-1.8.0-r7.ebuild 2817
 MD5 19938f076658cc6b4edb91d62ae357f0 files/digest-ruby-1.8.0-r7 125
-MD5 e1fe59c9583e8cff244a322c15cee217 files/digest-ruby-1.8.1-r7 137
-MD5 a5d6f26168583bd4fd399f0855323175 files/digest-ruby-1.8.2_pre2 134
+MD5 3e8d8ff915f444c975169748675b06c9 files/digest-ruby-1.8.1-r7 137
+MD5 be89d4c412387337e14a1d141b90b125 files/oniguruma-2.3.1-fix-ppc.patch 593
 MD5 d05f63da27634456886e7c924eaf96da files/ruby-1.6.8-fix-x86_64.patch 431
+MD5 00ccb2b51acb8e90488b9bd2f8bf2c32 files/digest-ruby-1.6.8-r11 136
+MD5 a5d6f26168583bd4fd399f0855323175 files/digest-ruby-1.8.2_pre2 134
 MD5 c20ec6eaf6847e4eb46d8865241f1016 files/ruby-1.8.0-CGI::Session.patch 801
 MD5 999d392f0a17f7643659081973e99def files/ruby-rdoc-gentoo.diff 432
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.1-r7 b/dev-lang/ruby/files/digest-ruby-1.8.1-r7
index dd1e67c53201..5b7cabbe3e9e 100644
--- a/dev-lang/ruby/files/digest-ruby-1.8.1-r7
+++ b/dev-lang/ruby/files/digest-ruby-1.8.1-r7
@@ -1,2 +1,2 @@
 MD5 1247756b47a1540647d27813891e12a3 ruby-1.8.1-2004.05.02.tar.bz2 2395420
-MD5 cd9f62b31db87a0705adbb8d3f2cd23a onigd2_2_8.tar.gz 200706
+MD5 d7bd9315973b64aa2e7c6eb58ea3f483 onigd2_3_2.tar.gz 198680
diff --git a/dev-lang/ruby/files/oniguruma-2.3.1-fix-ppc.patch b/dev-lang/ruby/files/oniguruma-2.3.1-fix-ppc.patch
new file mode 100644
index 000000000000..bba6a5a25113
--- /dev/null
+++ b/dev-lang/ruby/files/oniguruma-2.3.1-fix-ppc.patch
@@ -0,0 +1,19 @@
+diff -urN oniguruma/regint.h oniguruma-ppc/regint.h
+--- oniguruma/regint.h	2004-09-18 14:33:09.000000000 +0900
++++ oniguruma-ppc/regint.h	2004-10-10 17:04:02.280027232 +0900
+@@ -539,11 +539,11 @@
+ #define ARG_MEMNUM       4
+ #define ARG_OPTION       5
+ 
+-typedef int RelAddrType;
+-typedef int AbsAddrType;
+-typedef int LengthType;
+-typedef int RepeatNumType;
++typedef short int RelAddrType;
++typedef short int AbsAddrType;
++typedef short int LengthType;
+ typedef short int MemNumType;
++typedef int RepeatNumType;
+ 
+ #define SIZE_OPCODE        1
+ #define SIZE_RELADDR       sizeof(RelAddrType)
diff --git a/dev-lang/ruby/ruby-1.6.8-r11.ebuild b/dev-lang/ruby/ruby-1.6.8-r11.ebuild
index dedaf2a7e6e1..93a42e590bb3 100644
--- a/dev-lang/ruby/ruby-1.6.8-r11.ebuild
+++ b/dev-lang/ruby/ruby-1.6.8-r11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.6.8-r11.ebuild,v 1.8 2004/10/03 15:11:28 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.6.8-r11.ebuild,v 1.9 2004/10/10 09:06:17 usata Exp $
 
 IUSE="cjk"
 
@@ -29,7 +29,7 @@ DEPEND="virtual/libc
 PROVIDE="virtual/ruby"
 
 # oniguruma patch breaks make test
-use cjk && RESTRICT="maketest"
+#RESTRICT="maketest"
 
 src_unpack() {
 	unpack ${A}
@@ -41,6 +41,9 @@ src_unpack() {
 	if use cjk ; then
 		einfo "Applying ${ONIGURUMA}"
 		cd ${WORKDIR}/oniguruma
+		if use ppc || use ppc64 ; then
+			epatch ${FILESDIR}/oniguruma-2.3.1-fix-ppc.patch
+		fi
 		econf --with-rubydir=${S} || die "econf failed"
 		make ${SLOT/./}
 	fi
diff --git a/dev-lang/ruby/ruby-1.8.0-r7.ebuild b/dev-lang/ruby/ruby-1.8.0-r7.ebuild
index f5d853b1f4da..cafc9cea0d2d 100644
--- a/dev-lang/ruby/ruby-1.8.0-r7.ebuild
+++ b/dev-lang/ruby/ruby-1.8.0-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.0-r7.ebuild,v 1.5 2004/10/03 15:11:28 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.0-r7.ebuild,v 1.6 2004/10/10 09:06:17 usata Exp $
 
 ONIGURUMA="onigd2_3_2"
 MY_P=${P/_pre/-preview}
@@ -14,7 +14,7 @@ SRC_URI="mirror://ruby/${PV%.*}/${P/_pre/-preview}.tar.gz
 
 LICENSE="Ruby"
 SLOT="1.8"
-KEYWORDS="~alpha hppa ia64 ~mips ppc ~sparc x86"
+KEYWORDS="alpha hppa ia64 ~mips ppc ~sparc x86"
 IUSE="socks5 tcltk cjk"
 
 RDEPEND="virtual/libc
@@ -38,6 +38,9 @@ src_unpack() {
 	if use cjk ; then
 		einfo "Applying ${ONIGURUMA}"
 		pushd oniguruma
+		if use ppc || use ppc64 ; then
+			epatch ${FILESDIR}/oniguruma-2.3.1-fix-ppc.patch
+		fi
 		econf --with-rubydir=${S} || die "econf failed"
 		make ${SLOT/./}
 		popd
diff --git a/dev-lang/ruby/ruby-1.8.1-r7.ebuild b/dev-lang/ruby/ruby-1.8.1-r7.ebuild
index 799ef2df5f02..85746bb55031 100644
--- a/dev-lang/ruby/ruby-1.8.1-r7.ebuild
+++ b/dev-lang/ruby/ruby-1.8.1-r7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.1-r7.ebuild,v 1.9 2004/10/03 13:32:40 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.1-r7.ebuild,v 1.10 2004/10/10 09:06:17 usata Exp $
 
-ONIGURUMA="onigd2_2_8"
+ONIGURUMA="onigd2_3_2"
 SNAP_DATE="2004.05.02"
 
 inherit flag-o-matic alternatives eutils gnuconfig
@@ -40,6 +40,9 @@ src_unpack() {
 	if use cjk ; then
 		einfo "Applying ${ONIGURUMA}"
 		pushd ${WORKDIR}/oniguruma
+		if use ppc || use ppc64 ; then
+			epatch ${FILESDIR}/oniguruma-2.3.1-fix-ppc.patch
+		fi
 		econf --with-rubydir=${S} || die "econf failed"
 		make ${SLOT/./}
 		popd
@@ -71,7 +74,7 @@ src_compile() {
 	econf \
 		--program-suffix=${SLOT/./} \
 		--enable-shared \
-		`use_enable socks5 socks` \
+		$(use_enable socks5 socks) \
 		|| die "econf failed"
 	emake || die "emake failed"
 }
diff --git a/dev-lang/ruby/ruby-1.8.2_pre2.ebuild b/dev-lang/ruby/ruby-1.8.2_pre2.ebuild
index 7f69d43a3cbb..158025580730 100644
--- a/dev-lang/ruby/ruby-1.8.2_pre2.ebuild
+++ b/dev-lang/ruby/ruby-1.8.2_pre2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.2_pre2.ebuild,v 1.15 2004/10/10 03:53:59 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.2_pre2.ebuild,v 1.16 2004/10/10 09:06:17 usata Exp $
 
 ONIGURUMA="onigd2_3_2"
 MY_P=${P/_pre/-preview}
@@ -40,6 +40,9 @@ src_unpack() {
 	if use cjk ; then
 		einfo "Applying ${ONIGURUMA}"
 		pushd ${WORKDIR}/oniguruma
+		if use ppc || use ppc64 ; then
+			epatch ${FILESDIR}/oniguruma-2.3.1-fix-ppc.patch
+		fi
 		econf --with-rubydir=${S} || die "econf failed"
 		make ${SLOT/./}
 		popd