gentoo resync : 03.03.2019

4 files changed, 60 insertions, 11 deletions

diff --git a/sci-geosciences/gdal-grass/Manifest b/sci-geosciences/gdal-grass/Manifest
index 28c5dce6e806..f498e16d81a6 100644
--- a/sci-geosciences/gdal-grass/Manifest
+++ b/sci-geosciences/gdal-grass/Manifest
@@ -1,5 +1,7 @@
 DIST gdal-grass-2.0.0.tar.gz 56286 BLAKE2B 191402442bc3c16f3d07f538b9eae266e75c74efbecb235dc11cb3529e4758fc8354ab5e65ec4a8805595c6f1209d70e5f76a7006d546eb3d2e8f9e4966842ff SHA512 cefa60773c2acd5c1627b896e3298d02f51979c12f70ce67b88c0b886a13de2f62821a3d3e50984f5c676ef37819c685795949b06db57004a0edf8039e898d7e
 DIST gdal-grass-2.1.0.tar.gz 54299 BLAKE2B 09b9a408584618cefcc989feebc75431ae3efed2c9f6504e65ccf28bbc02a6e5125cb049accece7fd598aeef0bb1d5cb572067fc5a764a49c99627132d650f65 SHA512 fb06b71839849de413f68beb8f2cd1c2273cc48b5205fe1b255ffc4976f8f913b4b226eba186a24f5b40fe5fbb1ceeab760d06915222e4a4b269a6fbc7bc9417
-EBUILD gdal-grass-2.0.0-r1.ebuild 1245 BLAKE2B 6102d47e8ed2fa8f58a61f19a019cc6e2189b2c5626ea9f63b982687053bcbb509c201df317955c20449bf75df63a9fa21213da1b9333ec24ef22de48aa95621 SHA512 fd33279df18a30bcbecf42ca44dca2ff31f9bb526a83c4f61072b5cb9de0c0277a99fe01d5d5754efcf88d474736d09502ca7d0e848073fb84fa2548c4c2e775
-EBUILD gdal-grass-2.1.0.ebuild 1245 BLAKE2B 6102d47e8ed2fa8f58a61f19a019cc6e2189b2c5626ea9f63b982687053bcbb509c201df317955c20449bf75df63a9fa21213da1b9333ec24ef22de48aa95621 SHA512 fd33279df18a30bcbecf42ca44dca2ff31f9bb526a83c4f61072b5cb9de0c0277a99fe01d5d5754efcf88d474736d09502ca7d0e848073fb84fa2548c4c2e775
+DIST gdal-grass-2.1.3.tar.gz 54478 BLAKE2B 172200d8362b12583f0f73316b8c6d34875682c9d76c095745152c8d4fd1da1d9d1e94df5928225f6fda5712e987379c7c3192fa81d02b9cee9145fb577faee1 SHA512 c11776f92e591f1c0136e439ab6c672015171c5b750cb9332c73b49b3173c1d57efb4854b152a1d8e1b438c68a1130b4a46a189e1be0b99af9a8fb931f246e39
+EBUILD gdal-grass-2.0.0-r1.ebuild 1244 BLAKE2B ce04fdefce1170072cb2346ad4d0e812102956ffdebb857c8e7375c8cd8fd8395fc075bdebb69017fb043ade2473b48dafba09589bee1749ba0b5add8b7ef13c SHA512 60c1cdb7628beccbdd78aa120a0a7d03188457a1976e4a25e49af2cf0b3f5336d4720d3a5bf8950f595a2e6278a3989018dedbff322fb7fa1f35ad8d57f62083
+EBUILD gdal-grass-2.1.0.ebuild 1228 BLAKE2B 0eda99e944f3b363813c24103de49cb2e53487c1a31cde230150a694d3550a30bcc1ab15ff53dc9ce2a9b232ab9aaf6cb8cea2fb2353f725ebf0c68612f54533 SHA512 f0cd6fccb7b2a0a4781ed3b59a872ee6f83bfbaaf35c2ca7cfe070bf7ecea140e561460ad2fc422c971209b576e7040bfcc9d84d90e0b67a1eb84699bd13e119
+EBUILD gdal-grass-2.1.3.ebuild 1338 BLAKE2B 8446c1ca6087b98fd7bf66f7f9533d2325503fce01935ad7245c8073abe9b583b4026bfe7cec66f07620acbffc77beef136fe527cbbab9f60aeb047a91b6a663 SHA512 0f31ea8d593720ea177a47c7aa96f04381aee17115ee0023ddebe5600ed60b0952a306478e5b46f4f48d53b83ef257158567c456739c7b21e3a15a307967d0e2
 MISC metadata.xml 374 BLAKE2B e5c65df3d92edf2be292e76594e43f701f3a3dc25af1ed82daedfa550a65f698c867d840eb926e8d114ceb86c659c8d4db16fc90f8b6936f5670d1465cc88afb SHA512 be40eaf2149affadb4a8bbdc2817f44ea5d7117ad09797fb1ffe1db4a146129cde3955ad8b8c7e9283f9c2b8b86a6dc3bcf3d889d14c00481936ed388d632898
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 0b8f94b06435..b480a2b497b9 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,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
 inherit eutils
 
 DESCRIPTION="GDAL plugin to access GRASS data"
-HOMEPAGE="http://www.gdal.org/"
-SRC_URI="http://download.osgeo.org/gdal/${PV}/${P}.tar.gz"
+HOMEPAGE="https://www.gdal.org/"
+SRC_URI="https://download.osgeo.org/gdal/${PV}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
diff --git a/sci-geosciences/gdal-grass/gdal-grass-2.1.0.ebuild b/sci-geosciences/gdal-grass/gdal-grass-2.1.0.ebuild
index 0b8f94b06435..1d121dde9203 100644
--- a/sci-geosciences/gdal-grass/gdal-grass-2.1.0.ebuild
+++ b/sci-geosciences/gdal-grass/gdal-grass-2.1.0.ebuild
@@ -1,13 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils
-
 DESCRIPTION="GDAL plugin to access GRASS data"
-HOMEPAGE="http://www.gdal.org/"
-SRC_URI="http://download.osgeo.org/gdal/${PV}/${P}.tar.gz"
+HOMEPAGE="https://www.gdal.org/"
+SRC_URI="https://download.osgeo.org/gdal/${PV}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
@@ -21,11 +19,11 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-libs/expat
 	dev-libs/json-c:=
-	virtual/jpeg
 	media-libs/tiff
 	sci-libs/libgeotiff
 	sci-libs/proj
 	sys-libs/zlib
+	virtual/jpeg
 	postgres? ( dev-db/postgresql )"
 
 # these drivers are copied at install from the already installed GRASS
diff --git a/sci-geosciences/gdal-grass/gdal-grass-2.1.3.ebuild b/sci-geosciences/gdal-grass/gdal-grass-2.1.3.ebuild
new file mode 100644
index 000000000000..745a05ffcfa8
--- /dev/null
+++ b/sci-geosciences/gdal-grass/gdal-grass-2.1.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="GDAL plugin to access GRASS data"
+HOMEPAGE="https://www.gdal.org/"
+SRC_URI="https://download.osgeo.org/gdal/${PV}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="postgres"
+RDEPEND="
+	>=sci-libs/gdal-2.0.0:=
+	sci-geosciences/grass:=
+"
+DEPEND="${RDEPEND}
+	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() {
+	sed -e 's:mkdir ${GRASSTABLES_DIR}$:mkdir -p ${GRASSTABLES_DIR}:' \
+		-i Makefile.in || die
+	default
+}
+
+src_configure() {
+	local grassp=$(best_version sci-geosciences/grass)
+	local grasspv=$(echo ${grassp/%-r[0-9]*/} | rev | cut -d - -f 1 | rev)
+	local grasspm=$(ver_cut 1-2 ${grasspv})
+	local myeconfargs=(
+		--with-grass="/usr/$(get_libdir)/grass$(ver_rs 1 '' ${grasspm})"
+		--with-gdal="/usr/bin/gdal-config"
+		$(use_with postgres postgres-includes "/usr/include/postgresql")
+	)
+	econf "${myeconfargs[@]}"
+}
+
+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
+}