Fix Ruby 1.8.4's oniguruma per bug #127860

Package-Manager: portage-2.1_pre7-r2

4 files changed, 20 insertions, 17 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 6d4813a1e5b0..a91e479ee957 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/ruby
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.189 2006/03/21 13:33:53 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.190 2006/03/31 14:42:03 caleb Exp $
+
+  31 Mar 2006; Caleb Tennis <caleb@gentoo.org> ruby-1.8.4-r2.ebuild:
+  Fix Ruby 1.8.4's oniguruma per bug #127860
 
 *ruby-1.8.4-r2 (21 Mar 2006)
 
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index cd9a7ab8ae7a..2f20702b64bc 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,6 +1,6 @@
-MD5 8089f00e8a34166e183a84dbe1d20f4b ChangeLog 27698
-RMD160 949c00fcb3ecf045e0675de14a1feac5b37fd968 ChangeLog 27698
-SHA256 0b93bb28bae26a30d20ef602d4aeea8da9088129d2c267bc081209ebe3ab5c24 ChangeLog 27698
+MD5 509a27030d50974438434c988272fb3c ChangeLog 27813
+RMD160 57d6aecd1b483dbb83a58eabc3dd0146b2355c18 ChangeLog 27813
+SHA256 9446b198839eb0b8b10e5bbd30509c5d0f6a517cbd69e225f5602a611ac51df7 ChangeLog 27813
 MD5 c0305f496353b27f98c0c42e4005cb8a files/digest-ruby-1.8.2-r2 125
 RMD160 d08b97b5ff912943f8b1e24a2b59605358f95151 files/digest-ruby-1.8.2-r2 125
 SHA256 38843a08d2481f4d395f8b3184f88e6c2ece0a51746cc017a5249c6645d6cc3b files/digest-ruby-1.8.2-r2 125
@@ -13,9 +13,9 @@ SHA256 69cae7d6d6f7512668861867fc1111f21e7998be5247a6d7bf1d3f5e27fca42d files/di
 MD5 abf0468a972fff8b129ec750fd804ab5 files/digest-ruby-1.8.4-r1 125
 RMD160 ef877a22b2f8b30abec9064a141ac23b1be73e76 files/digest-ruby-1.8.4-r1 125
 SHA256 69cae7d6d6f7512668861867fc1111f21e7998be5247a6d7bf1d3f5e27fca42d files/digest-ruby-1.8.4-r1 125
-MD5 a32bc6bfd54d82552c10f1c2d08036c9 files/digest-ruby-1.8.4-r2 467
-RMD160 fcb0337314f008813b4d06b081f652e1207a5117 files/digest-ruby-1.8.4-r2 467
-SHA256 cf0613bb6cfc3faba67afc36c8e1a4731b8b471b41942d48d7265c037c50ca78 files/digest-ruby-1.8.4-r2 467
+MD5 38ebdc02f8e5fe10b4c7bde101a57fa0 files/digest-ruby-1.8.4-r2 467
+RMD160 d80d4411e88a9afbdd9d5c7a9e3b118f64ac2af6 files/digest-ruby-1.8.4-r2 467
+SHA256 f9a1f94eb7aaa8da1e8ac2e65220ac6ea865b6c0b2dc0e1c8ecdfb4fca699b4a files/digest-ruby-1.8.4-r2 467
 MD5 16c628d57fa38e629d61513a047e8d00 files/digest-ruby-1.8.4.20060226 494
 RMD160 db28b122ba200ec9ed8d3f74845c1eea0984c269 files/digest-ruby-1.8.4.20060226 494
 SHA256 f9a6752fcf1b41547deb13bd7c99d5c6f2b5879dcae64965f20c5a9f5cbe7492 files/digest-ruby-1.8.4.20060226 494
@@ -55,9 +55,9 @@ SHA256 04351cbf664e212c69729fc095946594d48a0add6ee17348013da9d13e1a0e32 ruby-1.8
 MD5 b661b758b11d050928e4bb863892bc59 ruby-1.8.4-r1.ebuild 3918
 RMD160 e658e7852523aef7b9d99ba0a61b39f5add40546 ruby-1.8.4-r1.ebuild 3918
 SHA256 48aa73ecf2a7de187b6c21277a805934d8fba70c028774b3bfcd1cba31eca652 ruby-1.8.4-r1.ebuild 3918
-MD5 5a523e84e335b411ae467be1d31405e6 ruby-1.8.4-r2.ebuild 4003
-RMD160 f3d6360294c026b614a17a0547ea37ddff2d7357 ruby-1.8.4-r2.ebuild 4003
-SHA256 1430adf10ad6651db84b3609ee6155e34033e38656b3649b631d078af7cbe864 ruby-1.8.4-r2.ebuild 4003
+MD5 9952f2a1d56534619b4860844d7000ec ruby-1.8.4-r2.ebuild 4002
+RMD160 7d08032961988fa7e4fb6f6018e5b563a2bd46e6 ruby-1.8.4-r2.ebuild 4002
+SHA256 1101e90e65c403576a7a78e8675d18fee394bc91fd81dc7d2d79ca33cb45c950 ruby-1.8.4-r2.ebuild 4002
 MD5 f1c5de92b15fa6a9db0beac3ba1e05fd ruby-1.8.4.20060226.ebuild 3888
 RMD160 e302c4933f0dc697851f963f4da904cab9ab4c38 ruby-1.8.4.20060226.ebuild 3888
 SHA256 58e4200f525e7dcb8fce6c5f03d9ad8c4be7e5a362c68264ef96b70e380510bb ruby-1.8.4.20060226.ebuild 3888
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.4-r2 b/dev-lang/ruby/files/digest-ruby-1.8.4-r2
index 190f3748a2c1..7ed61deab901 100644
--- a/dev-lang/ruby/files/digest-ruby-1.8.4-r2
+++ b/dev-lang/ruby/files/digest-ruby-1.8.4-r2
@@ -1,6 +1,6 @@
-MD5 40cb52605c7292373d8dfd11015cb687 onigd2_5_0.tar.gz 210448
-RMD160 2b3638e6300f8b994f334a064381b8013b286db0 onigd2_5_0.tar.gz 210448
-SHA256 83d379f48a9ddb469883e5d78cb06de1ae7b9102e7cebd88a132aad6996163df onigd2_5_0.tar.gz 210448
+MD5 b3b6b2d2f77f1f485d055d74f6eb6f2a onigd2_5_4.tar.gz 212280
+RMD160 6f694c6cf12f803d0bc608f493789c92c3cbcf68 onigd2_5_4.tar.gz 212280
+SHA256 cd4b4177633e8e42e34c26e3f41b0b9bccf747dc51d72a38943fef9cbc0eaa7b onigd2_5_4.tar.gz 212280
 MD5 bd8c2e593e1fa4b01fd98eaf016329bb ruby-1.8.4.tar.gz 4312965
 RMD160 1c0572a4ee369af57a3db68027b2566052eac944 ruby-1.8.4.tar.gz 4312965
 SHA256 71432841b3965b7ab2d83f0dc7c3049195ea4e9267a8dc2d825a8a0466982930 ruby-1.8.4.tar.gz 4312965
diff --git a/dev-lang/ruby/ruby-1.8.4-r2.ebuild b/dev-lang/ruby/ruby-1.8.4-r2.ebuild
index 6175496c6f67..dad03c12d056 100644
--- a/dev-lang/ruby/ruby-1.8.4-r2.ebuild
+++ b/dev-lang/ruby/ruby-1.8.4-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.4-r2.ebuild,v 1.1 2006/03/21 13:33:53 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.4-r2.ebuild,v 1.2 2006/03/31 14:42:03 caleb Exp $
 
-ONIGURUMA="onigd2_5_0"
+ONIGURUMA="onigd2_5_4"
 
 inherit flag-o-matic alternatives eutils gnuconfig multilib autotools
 
@@ -41,9 +41,9 @@ src_unpack() {
 	if use cjk ; then
 		einfo "Applying ${ONIGURUMA}"
 		pushd ${WORKDIR}/oniguruma
-		epatch ${FILESDIR}/oniguruma-2.3.1-gentoo.patch
+#		epatch ${FILESDIR}/oniguruma-2.3.1-gentoo.patch
 		econf --with-rubydir=${S} || die "econf failed"
-		make ${SLOT/./}
+		make ${PV/./}
 		popd
 	fi