Stabilise revison-bumped gdal-grass that works with grass-6.4. Punt older. This actualy makes stable compile again.

Package-Manager: portage-2.2.0_alpha46/cvs/Linux x86_64

4 files changed, 32 insertions, 55 deletions

diff --git a/sci-geosciences/gdal-grass/ChangeLog b/sci-geosciences/gdal-grass/ChangeLog
index e1c93f3e6044..d0c5da98b4b0 100644
--- a/sci-geosciences/gdal-grass/ChangeLog
+++ b/sci-geosciences/gdal-grass/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-geosciences/gdal-grass
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gdal-grass/ChangeLog,v 1.5 2010/06/13 09:20:01 scarabeus Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gdal-grass/ChangeLog,v 1.6 2011/07/22 11:28:38 scarabeus Exp $
+
+  22 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -gdal-grass-1.4.3.ebuild, gdal-grass-1.4.3-r1.ebuild:
+  Stabilise revison-bumped gdal-grass that works with grass-6.4. Punt older.
+  This actualy makes stable compile again.
 
 *gdal-grass-1.4.3-r1 (13 Jun 2010)
 
diff --git a/sci-geosciences/gdal-grass/Manifest b/sci-geosciences/gdal-grass/Manifest
index 03fb9d8d8565..819dc80c7169 100644
--- a/sci-geosciences/gdal-grass/Manifest
+++ b/sci-geosciences/gdal-grass/Manifest
@@ -1,6 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gdal-grass-makefile.patch 567 RMD160 11d843143ddac0994615c90be99ee4d061f71ea1 SHA1 618c3366923ee7aa4fd36e0d5759b4f40e59dea5 SHA256 e665998f88b483e94ccc34fb6da3c8d4c4c4bde911aa07e097ec3fd3abdbc54e
 DIST gdal-grass-1.4.3.tar.gz 47527 RMD160 60e3866a44d595cbf41368adb1b968387c7852b4 SHA1 63b87ad1688cc365dc6bd6c3ccc854d0e6aa637a SHA256 ea18d1e773e8875aaf3261a6ccd2a5fa22d998f064196399dfe73d991688f1dd
-EBUILD gdal-grass-1.4.3-r1.ebuild 973 RMD160 d753770147c322be1836f5d4eccb5ec6cc10c562 SHA1 5eadeb1f4556c83c778c266da8322fd083db79b9 SHA256 0f5e18561920c40c9111282ea9791b7b83b12fdd408101052a4a09aeb9b7d895
-EBUILD gdal-grass-1.4.3.ebuild 1150 RMD160 e92cf4f1c2439c17e0b002568a2bdff9aeafa97f SHA1 f953852e798d9054668e660d613cd0b7bb3b5c19 SHA256 0b1788fca030306bd637847e8955b7c911723bf6be411e4ff74ba325ce16764a
-MISC ChangeLog 1070 RMD160 3d2d0cdb8a83c0add0f80762536816cd302aca07 SHA1 9b84b744c23fc3629617588d5cbe6a1091f259b0 SHA256 a7ac45facce12e057ba68f533e08a0d7361a2e78563df3c3b89e95ec0dcfd187
+EBUILD gdal-grass-1.4.3-r1.ebuild 952 RMD160 b1cdcd50b5157c25b8bec37814a6f810568d7333 SHA1 2a410f5d367d6c15f1bbee478fe7f6d5150d201b SHA256 934f309d935990c47bf31f2129788968fceddd0c5f3f3b4be32cc99a93c2ff11
+MISC ChangeLog 1302 RMD160 eefbe6b01b457f901f6fcd02bb50e7b2499a62e1 SHA1 457ff5a0cafc57350c2f3212e087ce4f78d2eb3f SHA256 e8bbf5064a5bc4c226e43c5126f7c318d76ea9a79e7d178267185b068464cb48
 MISC metadata.xml 169 RMD160 6e8b9bfda4112775c6dc7890b63c7fda812954b2 SHA1 6668ff3adeef681e539d4c43db4d6c18e760b046 SHA256 530a781a7543890fe0e542618f46ab1080d23ba20701a6fb378e3eb93069376d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4pXt8ACgkQHB6c3gNBRYdbwwCfToK9L1Ko401I0Jnw7d1+bL3y
+/ygAn0oOuUb2SApyjhGAPY0JhNAC7Zv9
+=ogAZ
+-----END PGP SIGNATURE-----
diff --git a/sci-geosciences/gdal-grass/gdal-grass-1.4.3-r1.ebuild b/sci-geosciences/gdal-grass/gdal-grass-1.4.3-r1.ebuild
index 78c8150e3f12..01980fb9d6af 100644
--- a/sci-geosciences/gdal-grass/gdal-grass-1.4.3-r1.ebuild
+++ b/sci-geosciences/gdal-grass/gdal-grass-1.4.3-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gdal-grass/gdal-grass-1.4.3-r1.ebuild,v 1.1 2010/06/13 09:20:01 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gdal-grass/gdal-grass-1.4.3-r1.ebuild,v 1.2 2011/07/22 11:28:38 scarabeus Exp $
+
+EAPI=4
 
-EAPI=2
 inherit eutils
 
 DESCRIPTION="GDAL plugin to access GRASS data"
@@ -11,12 +12,14 @@ SRC_URI="http://download.osgeo.org/gdal/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE=""
 
-RDEPEND="sci-libs/gdal
-	>=sci-geosciences/grass-6.4.0_rc6"
+RDEPEND="
+	sci-libs/gdal
+	>=sci-geosciences/grass-6.4.0_rc6
+"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
@@ -24,7 +27,9 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --with-grass=$(pkg-config grass --variable grassdir) --with-gdal
+	econf \
+		--with-grass=$(pkg-config grass --variable grassdir) \
+		--with-gdal
 }
 
 src_install() {
@@ -32,5 +37,5 @@ src_install() {
 	emake DESTDIR="${D}" \
 		GRASSTABLES_DIR="${D}$(gdal-config --prefix)/share/gdal/grass" \
 		AUTOLOAD_DIR="${D}/usr/$(get_libdir)/gdalplugins" \
-		install || die "emake install failure"
+		install
 }
diff --git a/sci-geosciences/gdal-grass/gdal-grass-1.4.3.ebuild b/sci-geosciences/gdal-grass/gdal-grass-1.4.3.ebuild
deleted file mode 100644
index 40b52bc015dc..000000000000
--- a/sci-geosciences/gdal-grass/gdal-grass-1.4.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gdal-grass/gdal-grass-1.4.3.ebuild,v 1.5 2010/06/13 09:20:01 scarabeus Exp $
-
-EAPI=2
-inherit eutils
-
-DESCRIPTION="GDAL plugin to access GRASS data"
-HOMEPAGE="http://www.gdal.org/"
-SRC_URI="http://download.osgeo.org/gdal/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-RDEPEND="sci-libs/gdal
-	<sci-geosciences/grass-6.4.0_rc6"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-makefile.patch"
-}
-
-src_configure() {
-	GRASS_ENVD="/etc/env.d/99grass /etc/env.d/99grass-6 /etc/env.d/99grass-cvs";
-	for file in ${GRASS_ENVD}; do
-		if test -r ${file}; then
-			GRASSPATH=$(sed -n 's/LDPATH="\(.*\)\/lib"$/\1/p' ${file});
-		fi
-	done
-	econf --with-grass=${GRASSPATH} --with-gdal
-}
-
-src_install() {
-	#pass the right variables to 'make install' to prevent a sandbox access violation
-	emake DESTDIR="${D}" \
-		GRASSTABLES_DIR="${D}$(gdal-config --prefix)/share/gdal/grass" \
-		AUTOLOAD_DIR="${D}/usr/$(get_libdir)/gdalplugins" \
-		install || die "emake install failure"
-}