Updated Ruby eclass handling; fixes bug 281000.

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

5 files changed, 21 insertions, 14 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index 9184a2f7edb8..e1c7226b8b59 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/gdal
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.67 2009/10/11 17:32:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.68 2009/10/18 23:06:27 nerdboy Exp $
+
+  18 Oct 2009; Steve Arnold <nerdboy@gentoo.org> gdal-1.6.0-r1.ebuild,
+  gdal-1.6.1.ebuild, gdal-1.6.2.ebuild:
+  Updated Ruby eclass handling; fixes bug 281000.
 
   11 Oct 2009; Raúl Porcel <armin76@gentoo.org> gdal-1.6.1.ebuild:
   sparc stable wrt #285489
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index fac310ae4209..7bf2f9352461 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -13,8 +13,8 @@ DIST gdal-1.6.1.tar.gz 6999411 RMD160 64955b4940675475bfaf0cc8fd5f0b264b56b0bb S
 DIST gdal-1.6.2.tar.gz 7002816 RMD160 e445680953f25047a280f36cedba0597094e0562 SHA1 1d9e1d8f01f06bca99e7335d7e86dff784eee819 SHA256 60c49a58e8641e6bf640b08306f4a0434915026fd3e0af0b53f0dcd5f5e3f74d
 EBUILD gdal-1.5.2.ebuild 6420 RMD160 0619a3660937eda53d501235d3b95de7f492e13f SHA1 3d0a948f9959ad3b0e232476fe77345db6d727b8 SHA256 c09aabaa7019c25adf18763d16bfde2d5b4e801dc2a4747cc22155e1f5767fce
 EBUILD gdal-1.5.3.ebuild 6510 RMD160 f3ed966b180a4dc169c00c3fbfa0d2095759b78e SHA1 b810791d98d84867812cd6700558b00cf32ce03d SHA256 995c6f2b68fd78234580d7612f720ad6d3dc398dec707c65236c17cfcd1b322f
-EBUILD gdal-1.6.0-r1.ebuild 6652 RMD160 18ff508ff3e30f9ca59ae1b0d14b7bfd328f4742 SHA1 b03d0cadc2ecf18e637f91536c5d01a3a1491401 SHA256 9601fc023623040470983dca89fae17770034158db3daed485d6c4d3e5554907
-EBUILD gdal-1.6.1.ebuild 6214 RMD160 ba7c2e462bcd10c68e4fe21f80ee3f33247ae010 SHA1 be42c5009fec6b63f2a822c1239ee64e559c0e3b SHA256 a17cf255291d86cbb8c6090ec195def4d58b6f27f42dd920ba17c878f4377265
-EBUILD gdal-1.6.2.ebuild 6211 RMD160 c6fcef3ca1005500dcb35bca0b6cc4b7604025a1 SHA1 536829f739e541ca2a79a5d65af667575b5aa2bd SHA256 2bf4ab4fa766d3f15a36ac0882adebbaddce2309e83b8aace89095f9eb7358e4
-MISC ChangeLog 13498 RMD160 9574f3ab44e4f9bd6b3b5fc56344b6f3bdd15415 SHA1 9e5ce04b8917d9067e764e471534299bcc16811c SHA256 8b18e0f39166adbceeb29edb929b75e53798a66e31666ba83f82610359d6b5ed
+EBUILD gdal-1.6.0-r1.ebuild 6653 RMD160 271dc8fb8ac3b8941a008f5459fe5c9264060f51 SHA1 5f5d5179d95a9c69e888641276d5202f0061782c SHA256 ca12c8f828064b7a6a5340a97a495799d767df095a3fbe9db39e4e656ebf2142
+EBUILD gdal-1.6.1.ebuild 6215 RMD160 59a91b42648690a06cfc734e4198b967ea121310 SHA1 f9ab548d9feec943419518dbe09d482ecd851fba SHA256 bed01a55ed754d075cadf8f0b86cd527b722f32d1d20b330660085ffcf0df525
+EBUILD gdal-1.6.2.ebuild 6212 RMD160 6d9d5c00aeb2e1622fe8fa3c732af266289a7fbc SHA1 bdd450c47c3f5cd946c987b061c4ddd974ab95bb SHA256 daa876d53e3475d90b62af4dce1f6c6da27665b7c6990e1e9a493fdbe9878fcf
+MISC ChangeLog 13660 RMD160 8439e9f5bad3b3387d59b5f68932fe1233b1f874 SHA1 53b408b931df21b621dc127e67f81285283e5848 SHA256 27374b476725b98cd611874af06864d4dc3fb5f5b1ede946b3bb80ebf6a50846
 MISC metadata.xml 1100 RMD160 edad0e7b25dec94f4b1f7a66ce2289da3115c9d1 SHA1 b3ad2e46e137bcd069a6867c6a5c9f6fbba00e66 SHA256 2aff971ad868d45f5d30128cfbc508e2c1eab7adb05028a95d182ec1821b15b3
diff --git a/sci-libs/gdal/gdal-1.6.0-r1.ebuild b/sci-libs/gdal/gdal-1.6.0-r1.ebuild
index d9868a6572d2..3b46372e950a 100644
--- a/sci-libs/gdal/gdal-1.6.0-r1.ebuild
+++ b/sci-libs/gdal/gdal-1.6.0-r1.ebuild
@@ -1,8 +1,11 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.0-r1.ebuild,v 1.3 2009/08/03 03:49:06 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.0-r1.ebuild,v 1.4 2009/10/18 23:06:27 nerdboy Exp $
 
 WANT_AUTOCONF="2.5"
+RUBY_OPTIONAL="yes"
+USE_RUBY="ruby18"
+
 inherit autotools distutils eutils perl-module ruby toolchain-funcs
 
 DESCRIPTION="GDAL is a translator library for raster geospatial data formats (includes OGR support)"
@@ -54,8 +57,6 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
 AT_M4DIR="${S}/m4"
-USE_RUBY="ruby18"
-RUBY_OPTIONAL="yes"
 
 pkg_setup() {
 	if [ -n "${GDAL_CONFIGURE_OPTS}" ]; then
diff --git a/sci-libs/gdal/gdal-1.6.1.ebuild b/sci-libs/gdal/gdal-1.6.1.ebuild
index 2aca851107f1..69247cf134d0 100644
--- a/sci-libs/gdal/gdal-1.6.1.ebuild
+++ b/sci-libs/gdal/gdal-1.6.1.ebuild
@@ -1,9 +1,12 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.1.ebuild,v 1.5 2009/10/11 17:32:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.1.ebuild,v 1.6 2009/10/18 23:06:27 nerdboy Exp $
 
 EAPI="2"
 WANT_AUTOCONF="2.5"
+RUBY_OPTIONAL="yes"
+USE_RUBY="ruby18"
+
 inherit autotools distutils eutils perl-module ruby toolchain-funcs
 
 DESCRIPTION="GDAL is a translator library for raster geospatial data formats (includes OGR support)"
@@ -55,8 +58,6 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
 AT_M4DIR="${S}/m4"
-USE_RUBY="ruby18"
-RUBY_OPTIONAL="yes"
 
 pkg_setup() {
 	if [ -n "${GDAL_CONFIGURE_OPTS}" ]; then
diff --git a/sci-libs/gdal/gdal-1.6.2.ebuild b/sci-libs/gdal/gdal-1.6.2.ebuild
index 091e58d21112..c5ccf355b029 100644
--- a/sci-libs/gdal/gdal-1.6.2.ebuild
+++ b/sci-libs/gdal/gdal-1.6.2.ebuild
@@ -1,9 +1,12 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.2.ebuild,v 1.1 2009/09/19 06:18:46 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.2.ebuild,v 1.2 2009/10/18 23:06:27 nerdboy Exp $
 
 EAPI="2"
 WANT_AUTOCONF="2.5"
+RUBY_OPTIONAL="yes"
+USE_RUBY="ruby18"
+
 inherit autotools distutils eutils perl-module ruby toolchain-funcs
 
 DESCRIPTION="GDAL is a translator library for raster geospatial data formats (includes OGR support)"
@@ -55,8 +58,6 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
 AT_M4DIR="${S}/m4"
-USE_RUBY="ruby18"
-RUBY_OPTIONAL="yes"
 
 pkg_setup() {
 	if [ -n "${GDAL_CONFIGURE_OPTS}" ]; then