[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gdal-grass/files/, sci-geosciences/gdal-grass/

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gdal-grass/files/, sci-geosciences/gdal-grass/

[Sam Jorna]

commit:     2de5c1551e43c19bf118c307cde6c6101afe76d2
Author:     Sam Jorna <wraeth <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  8 03:30:14 2016 +0000
Commit:     Sam Jorna <wraeth <AT> gentoo <DOT> org>
CommitDate: Wed Jun  8 03:43:14 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2de5c155

sci-geosciences/gdal-grass: bump to EAPI6

Bumps EAPI to 6, replaces single-line patch with sed, adds files copied
from system-installed GRASS to QA_PREBUILT.

Package-Manager: portage-2.3.0_rc1

 sci-geosciences/gdal-grass/files/gdal-grass-makefile.patch | 11 -----------
 sci-geosciences/gdal-grass/gdal-grass-2.0.0-r1.ebuild      | 12 ++++++++----
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/sci-geosciences/gdal-grass/files/gdal-grass-makefile.patch b/sci-geosciences/gdal-grass/files/gdal-grass-makefile.patch
deleted file mode 100644
index dcf5bc4..0000000
--- a/sci-geosciences/gdal-grass/files/gdal-grass-makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2009-07-12 00:09:33.000000000 +0200
-+++ Makefile.in	2009-07-12 00:11:09.000000000 +0200
-@@ -26,7 +26,7 @@
- 	install -d $(AUTOLOAD_DIR)
- 	cp $(GLIBNAME) $(AUTOLOAD_DIR)
- 	cp $(OLIBNAME) $(AUTOLOAD_DIR)
--	test -d ${GRASSTABLES_DIR} || mkdir ${GRASSTABLES_DIR}
-+	test -d ${GRASSTABLES_DIR} || mkdir -p ${GRASSTABLES_DIR}
- 	test -d ${GRASSTABLES_DIR}/etc || mkdir ${GRASSTABLES_DIR}/etc
- 	cp @GRASS_GISBASE@/etc/ellipse.table ${GRASSTABLES_DIR}/etc
- 	cp @GRASS_GISBASE@/etc/datum.table @GRASS_GISBASE@/etc/datumtransform.table ${GRASSTABLES_DIR}/etc

diff --git a/sci-geosciences/gdal-grass/gdal-grass-2.0.0-r1.ebuild b/sci-geosciences/gdal-grass/gdal-grass-2.0.0-r1.ebuild
index 9fc8276..50b440e 100644
--- a/sci-geosciences/gdal-grass/gdal-grass-2.0.0-r1.ebuild
+++ b/sci-geosciences/gdal-grass/gdal-grass-2.0.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit eutils
 
@@ -29,9 +29,13 @@ DEPEND="${RDEPEND}
 	sys-libs/zlib
 	postgres? ( dev-db/postgresql )"
 
+# these drivers are copied at install from the already installed GRASS
+QA_PREBUILT="/usr/share/gdal/grass/driver/db/*"
+
 src_prepare() {
-	# fix mkdir not called with -p in Makefile
-	epatch "${FILESDIR}/gdal-grass-makefile.patch"
+	sed -e 's:mkdir ${GRASSTABLES_DIR}$:mkdir -p ${GRASSTABLES_DIR}:' \
+		-i Makefile.in || die
+	default
 }
 
 src_configure() {