Detect grass using pkgconfig. Also this package should be removed in favor of gdal...

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

diff --git a/sci-geosciences/gdal-grass/ChangeLog b/sci-geosciences/gdal-grass/ChangeLog
index 2e066c8ded7afca6148baa25f9d7556523758ad9..e1c93f3e60448400f78a63e9c6a6258c9206ddd4 100644 (file)
--- a/sci-geosciences/gdal-grass/ChangeLog
+++ b/sci-geosciences/gdal-grass/ChangeLog
@@ -1,6 +1,13 @@
 # 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.4 2010/05/28 13:52:21 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gdal-grass/ChangeLog,v 1.5 2010/06/13 09:20:01 scarabeus Exp $
+
+*gdal-grass-1.4.3-r1 (13 Jun 2010)
+
+  13 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  gdal-grass-1.4.3.ebuild, +gdal-grass-1.4.3-r1.ebuild:
+  Detect grass using pkgconfig. Also this package should be removed in favor
+  of gdal[grass] in future.
 
   28 May 2010; Markus Meier <maekke@gentoo.org> gdal-grass-1.4.3.ebuild:
   x86 stable, bug #317385

diff --git a/sci-geosciences/gdal-grass/Manifest b/sci-geosciences/gdal-grass/Manifest
index 13ed67ed2ad041434bbe067d9e8f5ed36aff9ec6..03fb9d8d85658f2820bd400d1a03d93ff7c90b5e 100644 (file)
--- a/sci-geosciences/gdal-grass/Manifest
+++ b/sci-geosciences/gdal-grass/Manifest
@@ -1,15 +1,6 @@
------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.ebuild 1136 RMD160 4e8fe2f648aed562dcd6dbac110eaa37a68f6805 SHA1 25bef4fdabce1ea45280ae7f5b4e481085bfed96 SHA256 ab3a70bfea7a09b468d4b5e1c03b5fb7b74581a69cf6ebbf0fe32c194831ce7c
-MISC ChangeLog 814 RMD160 29c3a77856d7cbe845c4d7091d7a6926f63bf843 SHA1 fe5949b27498cd8d1d88a84085dd38f14804c69c SHA256 435682ec3b1c52a916e0e20419224da596030fcdd02c828eea494de1469398c0
+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
 MISC metadata.xml 169 RMD160 6e8b9bfda4112775c6dc7890b63c7fda812954b2 SHA1 6668ff3adeef681e539d4c43db4d6c18e760b046 SHA256 530a781a7543890fe0e542618f46ab1080d23ba20701a6fb378e3eb93069376d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkv/yjgACgkQkKaRLQcq0GKJ5gCfb3JobDBhPw0c/2breJqmyJbC
-0eQAn3Qjiwg0uY5+UVB3uX9+DL7lDY1D
-=SZU0
------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
new file mode 100644 (file)
index 0000000..78c8150
--- /dev/null
+++ b/sci-geosciences/gdal-grass/gdal-grass-1.4.3-r1.ebuild
@@ -0,0 +1,36 @@
+# 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-r1.ebuild,v 1.1 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() {
+       econf --with-grass=$(pkg-config grass --variable grassdir) --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"
+}

diff --git a/sci-geosciences/gdal-grass/gdal-grass-1.4.3.ebuild b/sci-geosciences/gdal-grass/gdal-grass-1.4.3.ebuild
index e322604fada25d39c90ab62c1b426edd5fde8ee0..40b52bc015dc26930c0bbb3a78ccbb59a91cea42 100644 (file)
--- a/sci-geosciences/gdal-grass/gdal-grass-1.4.3.ebuild
+++ b/sci-geosciences/gdal-grass/gdal-grass-1.4.3.ebuild
@@ -1,6 +1,6 @@
 # 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.4 2010/05/28 13:52:21 maekke Exp $
+# $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
@@ -16,7 +16,7 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="sci-libs/gdal
-       sci-geosciences/grass"
+       <sci-geosciences/grass-6.4.0_rc6"
 DEPEND="${RDEPEND}"
 
 src_prepare() {