Apply oniguruma fix patch on all arches.

9 files changed, 43 insertions, 39 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 1fb6eac07144..fc3e493bd875 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,12 @@
 # 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.101 2004/11/08 05:20:36 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.102 2004/11/09 20:22:40 usata Exp $
+
+  10 Nov 2004; Mamoru KOMACHI <usata@gentoo.org>
+  -files/oniguruma-2.3.1-fix-ppc.patch, +files/oniguruma-2.3.1-gentoo.patch,
+  ruby-1.6.8-r11.ebuild, ruby-1.6.8-r12.ebuild, ruby-1.8.0-r7.ebuild,
+  ruby-1.8.1-r7.ebuild, ruby-1.8.2_pre2.ebuild, ruby-1.8.2_pre3.ebuild:
+  Apply oniguruma fix patch on all arches.
 
   09 Nov 2004; Aron Griffis <agriffis@gentoo.org> ruby-1.8.2_pre3.ebuild:
   On ia64 we need to build without optimization #48824.  Add ~ia64
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index dd4fa2ac518a..e679c6932820 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,19 +1,29 @@
-MD5 12ce0cb507499150f837706fb9d75c7a ChangeLog 16218
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
-MD5 11ecace5202cab15511d50309f13b118 ruby-1.6.8-r12.ebuild 1993
-MD5 c6785f789524148d460393d2259f418f ruby-1.8.2_pre3.ebuild 3515
-MD5 4b89f50a9cbac9ffab8b388d96574ff9 ruby-1.8.1-r7.ebuild 2870
-MD5 a3c17148005564e47795b4928b35c61a ruby-1.8.0-r7.ebuild 2817
-MD5 f5f52fddda233f187521a2543738cc59 ruby-1.8.2_pre2.ebuild 3419
-MD5 8f0fe45b59ec7a1bf9d07cf6e42828ed ruby-1.6.8-r11.ebuild 2014
-MD5 d604e46a2d8a4c411b03c101e36ee29a files/ruby-rdoc-gentoo.diff 473
-MD5 be89d4c412387337e14a1d141b90b125 files/oniguruma-2.3.1-fix-ppc.patch 593
-MD5 3e8d8ff915f444c975169748675b06c9 files/digest-ruby-1.8.1-r7 137
+MD5 4ff0d64ae0b5553a20e403ccebac1a46 ruby-1.6.8-r11.ebuild 1973
+MD5 41863ebeaa11551a919c12c1c4c315d6 ruby-1.6.8-r12.ebuild 1940
+MD5 4f420e12003a91bd479563bef413fe88 ruby-1.8.0-r7.ebuild 2777
+MD5 0da8a12f606c5cfde132006465b43252 ruby-1.8.2_pre3.ebuild 3459
+MD5 10085510b8dc690546ac99fd32ec988e ruby-1.8.2_pre2.ebuild 3366
+MD5 058e9207055f949fa2f86ed07133c2cc ruby-1.8.1-r7.ebuild 2830
+MD5 f41e450c1e1d9e90e265c6186f86678b ChangeLog 16527
+MD5 00ccb2b51acb8e90488b9bd2f8bf2c32 files/digest-ruby-1.6.8-r11 136
+MD5 19938f076658cc6b4edb91d62ae357f0 files/digest-ruby-1.8.0-r7 125
 MD5 844ffd93bddeeb9decf86b49669423e8 files/digest-ruby-1.6.8-r12 136
-MD5 d05f63da27634456886e7c924eaf96da files/ruby-1.6.8-fix-x86_64.patch 431
 MD5 d3cbd264b66bd70c262aaf9e4a79aa4b files/digest-ruby-1.8.2_pre3 134
-MD5 19938f076658cc6b4edb91d62ae357f0 files/digest-ruby-1.8.0-r7 125
+MD5 3e8d8ff915f444c975169748675b06c9 files/digest-ruby-1.8.1-r7 137
 MD5 a5d6f26168583bd4fd399f0855323175 files/digest-ruby-1.8.2_pre2 134
-MD5 00ccb2b51acb8e90488b9bd2f8bf2c32 files/digest-ruby-1.6.8-r11 136
-MD5 c20ec6eaf6847e4eb46d8865241f1016 files/ruby-1.8.0-CGI::Session.patch 801
+MD5 d05f63da27634456886e7c924eaf96da files/ruby-1.6.8-fix-x86_64.patch 431
 MD5 a061fe32b8e0538c203bccebcd2ad8ac files/ruby-1.6.8-20040728-20041024.diff 3094
+MD5 c20ec6eaf6847e4eb46d8865241f1016 files/ruby-1.8.0-CGI::Session.patch 801
+MD5 d604e46a2d8a4c411b03c101e36ee29a files/ruby-rdoc-gentoo.diff 473
+MD5 be89d4c412387337e14a1d141b90b125 files/oniguruma-2.3.1-gentoo.patch 593
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (Darwin)
+
+iD8DBQFBkScaVWNWqTUmv+0RAlu6AJ9TYF9VteWIz1BuH4bzmbSLGFm64wCgl/5I
+fuEvbMT4BVdRazLR8wrixaU=
+=HV0s
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/ruby/files/oniguruma-2.3.1-fix-ppc.patch b/dev-lang/ruby/files/oniguruma-2.3.1-gentoo.patch
index bba6a5a25113..bba6a5a25113 100644
--- a/dev-lang/ruby/files/oniguruma-2.3.1-fix-ppc.patch
+++ b/dev-lang/ruby/files/oniguruma-2.3.1-gentoo.patch
diff --git a/dev-lang/ruby/ruby-1.6.8-r11.ebuild b/dev-lang/ruby/ruby-1.6.8-r11.ebuild
index b1dfeb631673..17db79bdfcdf 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.11 2004/10/19 20:22:53 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.6.8-r11.ebuild,v 1.12 2004/11/09 20:22:40 usata Exp $
 
 IUSE="cjk"
 
@@ -41,9 +41,7 @@ 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
+		epatch ${FILESDIR}/oniguruma-2.3.1-gentoo.patch
 		econf --with-rubydir=${S} || die "econf failed"
 		make ${SLOT/./}
 	fi
diff --git a/dev-lang/ruby/ruby-1.6.8-r12.ebuild b/dev-lang/ruby/ruby-1.6.8-r12.ebuild
index 3a2269c5c002..2e78f7079ca5 100644
--- a/dev-lang/ruby/ruby-1.6.8-r12.ebuild
+++ b/dev-lang/ruby/ruby-1.6.8-r12.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-r12.ebuild,v 1.1 2004/11/04 16:25:59 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.6.8-r12.ebuild,v 1.2 2004/11/09 20:22:40 usata Exp $
 
 IUSE="cjk"
 
@@ -38,9 +38,7 @@ src_unpack() {
 	if use cjk ; then
 		einfo "Applying ${ONIGURUMA}"
 		cd ${WORKDIR}/oniguruma
-		if use ppc || use ppc64 || use alpha ; then
-			epatch ${FILESDIR}/oniguruma-2.3.1-fix-ppc.patch
-		fi
+		epatch ${FILESDIR}/oniguruma-2.3.1-gentoo.patch
 		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 cafc9cea0d2d..72eff4e31008 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.6 2004/10/10 09:06:17 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.0-r7.ebuild,v 1.7 2004/11/09 20:22:40 usata Exp $
 
 ONIGURUMA="onigd2_3_2"
 MY_P=${P/_pre/-preview}
@@ -38,9 +38,7 @@ 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
+		epatch ${FILESDIR}/oniguruma-2.3.1-gentoo.patch
 		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 85746bb55031..b1493d86abff 100644
--- a/dev-lang/ruby/ruby-1.8.1-r7.ebuild
+++ b/dev-lang/ruby/ruby-1.8.1-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.1-r7.ebuild,v 1.10 2004/10/10 09:06:17 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.1-r7.ebuild,v 1.11 2004/11/09 20:22:40 usata Exp $
 
 ONIGURUMA="onigd2_3_2"
 SNAP_DATE="2004.05.02"
@@ -40,9 +40,7 @@ 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
+		epatch ${FILESDIR}/oniguruma-2.3.1-gentoo.patch
 		econf --with-rubydir=${S} || die "econf failed"
 		make ${SLOT/./}
 		popd
diff --git a/dev-lang/ruby/ruby-1.8.2_pre2.ebuild b/dev-lang/ruby/ruby-1.8.2_pre2.ebuild
index 59a77eec0604..77dbc0879bb3 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.19 2004/10/27 08:12:46 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.2_pre2.ebuild,v 1.20 2004/11/09 20:22:40 usata Exp $
 
 ONIGURUMA="onigd2_3_2"
 MY_P=${P/_pre/-preview}
@@ -40,9 +40,7 @@ src_unpack() {
 	if use cjk ; then
 		einfo "Applying ${ONIGURUMA}"
 		pushd ${WORKDIR}/oniguruma
-		if use ppc || use ppc64 || use alpha ; then
-			epatch ${FILESDIR}/oniguruma-2.3.1-fix-ppc.patch
-		fi
+		epatch ${FILESDIR}/oniguruma-2.3.1-gentoo.patch
 		econf --with-rubydir=${S} || die "econf failed"
 		make ${SLOT/./}
 		popd
diff --git a/dev-lang/ruby/ruby-1.8.2_pre3.ebuild b/dev-lang/ruby/ruby-1.8.2_pre3.ebuild
index 49a1530626fe..ad7044b208be 100644
--- a/dev-lang/ruby/ruby-1.8.2_pre3.ebuild
+++ b/dev-lang/ruby/ruby-1.8.2_pre3.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_pre3.ebuild,v 1.2 2004/11/08 05:20:36 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.2_pre3.ebuild,v 1.3 2004/11/09 20:22:40 usata Exp $
 
 ONIGURUMA="onigd2_3_2"
 
@@ -38,9 +38,7 @@ src_unpack() {
 	if use cjk ; then
 		einfo "Applying ${ONIGURUMA}"
 		pushd ${WORKDIR}/oniguruma
-		if use ppc || use ppc64 || use alpha ; then
-			epatch ${FILESDIR}/oniguruma-2.3.1-fix-ppc.patch
-		fi
+		epatch ${FILESDIR}/oniguruma-2.3.1-gentoo.patch
 		econf --with-rubydir=${S} || die "econf failed"
 		make ${SLOT/./}
 		popd