fixed bug #147333

Package-Manager: portage-2.1.1

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index c51189d0b86e2e5193d2ea10c52f83f6896a4be8..9725aebc4206006e10507b56cc229638080236dd 100644 (file)
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,12 @@
 # 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.246 2006/12/05 08:07:50 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.247 2006/12/14 14:20:08 pclouds Exp $
+
+  14 Dec 2006; Nguyễn Thái Ngọc Duy <pclouds@gentoo.org>
+  ruby-1.8.5_p2.ebuild:
+  Fixed undefined variable MY_PV causing origuruma silently failed to install.
+  Also upgrade to origuruma 2.5.7. Patch by Hannes Wyss <hwyss@ywesee.com> (bug
+  #147333)
 
   05 Dec 2006; Christian Faulhammer <opfer@gentoo.org> ruby-1.8.5_p2.ebuild:
   stable x86, security bug #157048

diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 69769bf3e48663beb3580f5f635c173c337ba732..26fd8990b6f9e8dc12f9e3ae2ba5537a35cd5444 100644 (file)
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX oniguruma-2.3.1-gentoo.patch 593 RMD160 73fb0ae1e006bbd2ad6a9b6fcdd5398207a4a21f SHA1 a512797b26b023d6fc8d38f70598d90c7b248bce SHA256 cb976a2907e29d25b23fc3e8db18b40f65fbde1f22b6c511cd6cf57f4bca08b3
 MD5 be89d4c412387337e14a1d141b90b125 files/oniguruma-2.3.1-gentoo.patch 593
 RMD160 73fb0ae1e006bbd2ad6a9b6fcdd5398207a4a21f files/oniguruma-2.3.1-gentoo.patch 593
@@ -19,6 +16,7 @@ RMD160 fc51bba300ca0b653a5cc960c98d7be972c4bd47 files/ruby-1.8.5-cgi-dos-1.patch
 SHA256 674e426e9ac8f8012fb53c7320276959867c73bb1d01ec1ba2e1faabf51d4059 files/ruby-1.8.5-cgi-dos-1.patch 367
 DIST onigd2_5_0.tar.gz 210448 RMD160 2b3638e6300f8b994f334a064381b8013b286db0 SHA1 73e3f1fc91decd2fb23674c536dc4eb55cadba07 SHA256 83d379f48a9ddb469883e5d78cb06de1ae7b9102e7cebd88a132aad6996163df
 DIST onigd2_5_4.tar.gz 212280 RMD160 6f694c6cf12f803d0bc608f493789c92c3cbcf68 SHA1 68438f08aed58bb4655e9268268a0311ea524df7 SHA256 cd4b4177633e8e42e34c26e3f41b0b9bccf747dc51d72a38943fef9cbc0eaa7b
+DIST onigd2_5_7.tar.gz 215529 RMD160 43cf52af1243acf21932690307ed7b0c81ff2771 SHA1 041cac9ce58f3002228a98db3c4c6934f5682593 SHA256 205b2857d77efc4caa3b98eaf91fd1cc8b8722b497df933d1fbd23f7a5186549
 DIST ruby-1.8.4.tar.gz 4312965 RMD160 1c0572a4ee369af57a3db68027b2566052eac944 SHA1 93999577c7fc4decc6b2fe8fefa96e743f278fbf SHA256 71432841b3965b7ab2d83f0dc7c3049195ea4e9267a8dc2d825a8a0466982930
 DIST ruby-1.8.5-p2.tar.gz 4519151 RMD160 3ad4c4a4d02930cbb1a582ea5fa19db04f55ab3b SHA1 f614bba73f447ddf35f8a4beb71ccc3df87831a5 SHA256 496844dc90571454a50552912f02a42df7fc4f89cef5bd3cd4854cecf3fd1d30
 DIST ruby-1.8.5.tar.gz 4438603 RMD160 991899146c23c9ea30ac09f41b7077fa0c8686b6 SHA1 0638ea26e1088fc9f4237abde8c85331689ce77c SHA256 19590e972b80333e26a6514c34d976c2037138361481a16f27b75e5d33f33a58
@@ -46,14 +44,14 @@ EBUILD ruby-1.8.5.ebuild 3845 RMD160 490491505737dfe394b73f851a3a51592de3072b SH
 MD5 c4dd9cb7619ea13a0859d7d62238eb2f ruby-1.8.5.ebuild 3845
 RMD160 490491505737dfe394b73f851a3a51592de3072b ruby-1.8.5.ebuild 3845
 SHA256 4ef73244db14906d94a508f76ad158da30b986b15601ca7ccd180c1871e14118 ruby-1.8.5.ebuild 3845
-EBUILD ruby-1.8.5_p2.ebuild 3820 RMD160 b25371fef8529d16f6997b33bc255e862130ef45 SHA1 43eac3628021a917a24721541afbbd17951062fd SHA256 ab7e33610346c148ad17110aaed3ee9228aa0bca86ea7d57672f39823c4797b8
-MD5 3423764f7f82568c9b8843fa8a05ae94 ruby-1.8.5_p2.ebuild 3820
-RMD160 b25371fef8529d16f6997b33bc255e862130ef45 ruby-1.8.5_p2.ebuild 3820
-SHA256 ab7e33610346c148ad17110aaed3ee9228aa0bca86ea7d57672f39823c4797b8 ruby-1.8.5_p2.ebuild 3820
-MISC ChangeLog 35260 RMD160 aae5e304238f008cb3c86df9e15bcd5ff523cc55 SHA1 010cfb9799d06f8378bf8dba8cfb43ac02a00ea8 SHA256 c6650aa50abe8deb0e6f596bca109f02c9867cb94d0a39d7460d52381025f944
-MD5 4e8da73e26f4b1f3e6bf3208f834a52f ChangeLog 35260
-RMD160 aae5e304238f008cb3c86df9e15bcd5ff523cc55 ChangeLog 35260
-SHA256 c6650aa50abe8deb0e6f596bca109f02c9867cb94d0a39d7460d52381025f944 ChangeLog 35260
+EBUILD ruby-1.8.5_p2.ebuild 3877 RMD160 9ef236ee4b2a198130dcf8536efc53c1c733dfe9 SHA1 c0e556d857cdcd0327e24067646bc93dc29a835e SHA256 d3fec2a44df02c17c209ad739da230ee05cf5f904f85407f737947bee6c5cf38
+MD5 c598ea156c561894e932a4ffacb388ba ruby-1.8.5_p2.ebuild 3877
+RMD160 9ef236ee4b2a198130dcf8536efc53c1c733dfe9 ruby-1.8.5_p2.ebuild 3877
+SHA256 d3fec2a44df02c17c209ad739da230ee05cf5f904f85407f737947bee6c5cf38 ruby-1.8.5_p2.ebuild 3877
+MISC ChangeLog 35519 RMD160 e9dd41faf5ec133b177af098475c5e4b7e5884e0 SHA1 7b0c1fcef4c359008ae2504f1a6e1d086877c063 SHA256 28b76630d4007687967740b137f7bfa39a321a6d490dcdfe7a630ee73ccfbc70
+MD5 6840206853096fca9b79e076378e520f ChangeLog 35519
+RMD160 e9dd41faf5ec133b177af098475c5e4b7e5884e0 ChangeLog 35519
+SHA256 28b76630d4007687967740b137f7bfa39a321a6d490dcdfe7a630ee73ccfbc70 ChangeLog 35519
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 metadata.xml 157
@@ -76,13 +74,6 @@ SHA256 7c362e231f229a4afbd81fc401069c1411f7833a9b56122c3b3acd9d9de71eee files/di
 MD5 86b5d06a5da72078a1755ad84cf57d56 files/digest-ruby-1.8.5-r3 467
 RMD160 094acdf2c1878e06040137dd5f14a790116dccbd files/digest-ruby-1.8.5-r3 467
 SHA256 7c362e231f229a4afbd81fc401069c1411f7833a9b56122c3b3acd9d9de71eee files/digest-ruby-1.8.5-r3 467
-MD5 1f19a6f6002d866f1c87b6a6c1e67a5e files/digest-ruby-1.8.5_p2 476
-RMD160 d053ec5c6530e87fa7450736cc807161d0c73a1f files/digest-ruby-1.8.5_p2 476
-SHA256 f9a7b50302622bc5e87fbdc0caa22822562dc94774914e9e4b835bbf2fcd5a17 files/digest-ruby-1.8.5_p2 476
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFgJsKamhnQswr0vIRAjzmAJ41uDSVNE4i60VW/NA5qZ7IQL8eUACfdgsq
-XBb3DzdzUZuj9IzprRoPMhM=
-=kQ5y
------END PGP SIGNATURE-----
+MD5 a0f9393d90ca3858fcfd6dd87f6221ba files/digest-ruby-1.8.5_p2 476
+RMD160 7be7dc6b21f0cdf287cfc61a413e36eef54d702f files/digest-ruby-1.8.5_p2 476
+SHA256 94ab349ecba8a20a6642d7d93f8cee673fdbf8f548990d0d79f1c18c41349ec4 files/digest-ruby-1.8.5_p2 476

diff --git a/dev-lang/ruby/files/digest-ruby-1.8.5_p2 b/dev-lang/ruby/files/digest-ruby-1.8.5_p2
index 3c590f785d96e8a57b7f84a8b7b178055e87503e..10988d2107422411671e1d2c0ab1e161b63d1080 100644 (file)
--- a/dev-lang/ruby/files/digest-ruby-1.8.5_p2
+++ b/dev-lang/ruby/files/digest-ruby-1.8.5_p2
@@ -1,6 +1,6 @@
-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 dcaa0b3608990791a5348e94b2f427d5 onigd2_5_7.tar.gz 215529
+RMD160 43cf52af1243acf21932690307ed7b0c81ff2771 onigd2_5_7.tar.gz 215529
+SHA256 205b2857d77efc4caa3b98eaf91fd1cc8b8722b497df933d1fbd23f7a5186549 onigd2_5_7.tar.gz 215529
 MD5 a3517a224716f79b14196adda3e88057 ruby-1.8.5-p2.tar.gz 4519151
 RMD160 3ad4c4a4d02930cbb1a582ea5fa19db04f55ab3b ruby-1.8.5-p2.tar.gz 4519151
 SHA256 496844dc90571454a50552912f02a42df7fc4f89cef5bd3cd4854cecf3fd1d30 ruby-1.8.5-p2.tar.gz 4519151

diff --git a/dev-lang/ruby/ruby-1.8.5_p2.ebuild b/dev-lang/ruby/ruby-1.8.5_p2.ebuild
index 17a8c69975e9ce645f6e3414684fcac6a05517f8..8650d9a7ce2a14230743b0dd375262670683c740 100644 (file)
--- a/dev-lang/ruby/ruby-1.8.5_p2.ebuild
+++ b/dev-lang/ruby/ruby-1.8.5_p2.ebuild
@@ -1,13 +1,13 @@
 # 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.5_p2.ebuild,v 1.9 2006/12/14 00:29:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.5_p2.ebuild,v 1.10 2006/12/14 14:20:08 pclouds Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
 
-ONIGURUMA="onigd2_5_4"
+ONIGURUMA="onigd2_5_7"
 
-inherit flag-o-matic alternatives eutils multilib autotools
+inherit flag-o-matic alternatives eutils multilib autotools versionator
 
 MY_P="${P/_p/-p}"
 
@@ -44,6 +44,7 @@ src_unpack() {
                pushd ${WORKDIR}/oniguruma
 #              epatch ${FILESDIR}/oniguruma-2.3.1-gentoo.patch
                econf --with-rubydir=${S} || die "econf failed"
+               MY_PV=$(get_version_component_range 1-2)
                make ${MY_PV/./}
                popd
        fi