gentoo Easter resync : 12.04.2020

4 files changed, 62 insertions, 68 deletions

diff --git a/sci-libs/libgeotiff/Manifest b/sci-libs/libgeotiff/Manifest
index 5dec6b95bece..110c8c1b0b09 100644
--- a/sci-libs/libgeotiff/Manifest
+++ b/sci-libs/libgeotiff/Manifest
@@ -1,6 +1,5 @@
 AUX Doxyfile 9282 BLAKE2B 0dcda644c528df5bd495db1785ce0f3213f0ce0c3551205e9c043a52151b59e82704545d55521f1983ca2b77a93c20dc0e9ddcc6b446a6485e942f301e19e165 SHA512 cc0324c682d5f45f516f0a71311a9b6527c5c4cd6c1a4113503ad9023b72c64ef9c257008cda95d565723183f932f61f79aab73e123e7b7ecf8b7fdb30457fee
-DIST libgeotiff-1.4.1.tar.gz 1674928 BLAKE2B 6c83ca77728c40995bf262d165c8566573c995f0d0116a3756f688b5686ff6529295d3340afdd771268c80050fb81b10953f7ae7339c46ed23d44dbd73cf302d SHA512 4a68bd7b9adf7453fdcb8f98cdeb79289b5f21315d1ef91d54fcc01724c8d687d243826c05a5523bb08c930296335959d2290916d46b6d802e63ac9be727c628
+AUX libgeotiff-1.5.1-proj-6.2-tests.patch 2102 BLAKE2B 643afa6f1a39a1990307c50415ded096ce08cf0cb88f70206c3e471cbdd2d619d61e3bd08aecfcb8a2fbf7deafdd773768e9cfb80ffcde0aaa05d4a96e3cacaf SHA512 f4c8fadce30f3ade704cc38b1646beefbc3676e9f68e06067e89617fe584b3f2a2b13615e5e8949c6a1ec4d88fcf4937922d8d47f498f1feefddb096b17df51b
 DIST libgeotiff-1.5.1.tar.gz 528083 BLAKE2B 24dd812c4b12a942b21640c031fd890bb2151f6dfedfd98d0b54cf41d6341ee4d352edd427d350f36542169f822a360f8d0c9f3bb13019a422db77f43e7bd893 SHA512 6599ec89dd39d975ba389584778dd084ded628d3304b302e3af25bb7d156cf583c56b52f1c89c253b041df43f99d6893190ee1556398dab1ba044f12ef8b8dc1
-EBUILD libgeotiff-1.4.1-r1.ebuild 1282 BLAKE2B 878dfb3f73781cd4d799900bcb556bd0c3080e1b7c57854a09f058614162bd0fcf84070ff277b9184e7d670b272190199a6f7a8597e369c819ab24fb64a6d051 SHA512 f1faee1223815f7ade357a1f2d3d32a8da3b7b491da69548dc2183948fdf334234b0542cced920bc5a8cc231a790881ae22a3e078bf31be06d0981b2badcb30a
-EBUILD libgeotiff-1.5.1-r1.ebuild 1285 BLAKE2B 20670f3f191b57c775ac89de77d7c10018f5af38017addf1e5191c25ebf57b7340d1b50e6ac64d0683ace80c43198b42a9d7ea2b1ca174b8f2e7d0c3d015b9a1 SHA512 958b9790b8a23417d80fca53af5f772fc3f754f5052256ed24c759f198424bd1454c2b2b89b2cf2422ef3d106a076a27fcabc87124a627cf89c7c0423cff9904
+EBUILD libgeotiff-1.5.1-r1.ebuild 1337 BLAKE2B 42db8b2918566dfb5ac357f4f52c37cce9bea0b0db94c8a5debec154f5bec3bc429be55c11ca932f09acb4cf10acde6efffa62ae43e600068ac613b22bf509ef SHA512 017990200b71efda4294f80791e340f4bfe6dd2296e20b79c980b783242c5035f716ef9d166bb6e7f97d3f2c242c2d67559f9c7f9bff0db428f5e7c2326adfbc
 MISC metadata.xml 275 BLAKE2B 054c49c4cc7e0607212f55ec7e66b38585457f74ce21e0483503814df58d31dee0b784e9b0bd9cdf0c8fca04e7454bd1b515085e5aac2c0d7fd2700df08c9b26 SHA512 5877508750864819a1d129ac2406c0d11721cd0e4e64d55c9bd6a44649991fda435e7752e841cca94b348f74078226f12e90dcdd323915bce3d601e65865c225
diff --git a/sci-libs/libgeotiff/files/libgeotiff-1.5.1-proj-6.2-tests.patch b/sci-libs/libgeotiff/files/libgeotiff-1.5.1-proj-6.2-tests.patch
new file mode 100644
index 000000000000..5004aadb9817
--- /dev/null
+++ b/sci-libs/libgeotiff/files/libgeotiff-1.5.1-proj-6.2-tests.patch
@@ -0,0 +1,57 @@
+From 678ffd97db2d63cf6856428bea65a93e069f812f Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Wed, 4 Sep 2019 16:11:37 +0200
+Subject: [PATCH] Adapt test script for PROJ 6.2 EPSG database (fixes #22)
+
+---
+ libgeotiff/test/testlistgeo          | 8 +++++++-
+ libgeotiff/test/testlistgeo_out.dist | 4 ++--
+ 3 files changed, 11 insertions(+), 5 deletions(-)
+
+diff --git a/test/testlistgeo b/test/testlistgeo
+index 7fb4a2f..571f5d0 100755
+--- a/test/testlistgeo
++++ b/test/testlistgeo
+@@ -210,10 +210,15 @@ echo "Testing listgeo equidistant_cylindrical.tif" >> ${OUT}
+ $EXE ${DATA_DIR}/equidistant_cylindrical.tif >>${OUT}
+ echo "" >>${OUT}
+ 
++# Normalize for results depending on the exact version of PROJ / EPSG database
++sed "s/ETRS89-extended/ETRS89/g" < ${OUT} > ${OUT}.tmp
++mv ${OUT}.tmp ${OUT}
++
++sed "s/ETRS89-extended/ETRS89/g" < ${TEST_CLI_DIR}/testlistgeo_out.dist > testlistgeo_out.dist.tmp
+ 
+ # do 'diff' with distribution results
+ echo "diff ${OUT} with testlistgeo_out.dist"
+-diff -u ${OUT} ${TEST_CLI_DIR}/testlistgeo_out.dist
++diff -u ${OUT} testlistgeo_out.dist.tmp
+ if [ $? -ne 0 ] ; then
+     echo  ""
+     echo "PROBLEMS HAVE OCCURRED"
+@@ -224,6 +229,7 @@ else
+     echo "TEST OK"
+     echo "test file ${OUT} removed"
+     echo
++    rm testlistgeo_out.dist.tmp
+     /bin/rm -f ${OUT}
+     exit 0
+ fi
+diff --git a/test/testlistgeo_out.dist b/test/testlistgeo_out.dist
+index 68a948c..c157f00 100644
+--- a/test/testlistgeo_out.dist
++++ b/test/testlistgeo_out.dist
+@@ -1738,11 +1738,11 @@ Geotiff_Information:
+    Keyed_Information:
+       GTModelTypeGeoKey (Short,1): ModelTypeProjected
+       GTRasterTypeGeoKey (Short,1): RasterPixelIsArea
+-      ProjectedCSTypeGeoKey (Short,1): Code-3035 (ETRS89 / LAEA Europe)
++      ProjectedCSTypeGeoKey (Short,1): Code-3035 (ETRS89-extended / LAEA Europe)
+       End_Of_Keys.
+    End_Of_Geotiff.
+ 
+-PCS = 3035 (ETRS89 / LAEA Europe)
++PCS = 3035 (ETRS89-extended / LAEA Europe)
+ Projection = 19986 (Europe Equal Area 2001)
+ Projection Method: CT_LambertAzimEqualArea
+    ProjCenterLatGeoKey: 52.000000 ( 52d 0' 0.00"N)
diff --git a/sci-libs/libgeotiff/libgeotiff-1.4.1-r1.ebuild b/sci-libs/libgeotiff/libgeotiff-1.4.1-r1.ebuild
deleted file mode 100644
index fe26ae0b2647..000000000000
--- a/sci-libs/libgeotiff/libgeotiff-1.4.1-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-MY_P=${P/_rc/RC}
-
-DESCRIPTION="Library for reading TIFF files with embedded tags for geographic information"
-HOMEPAGE="http://geotiff.osgeo.org/"
-SRC_URI="http://download.osgeo.org/geotiff/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug doc static-libs"
-
-RDEPEND="
-	virtual/jpeg:=
-	>=media-libs/tiff-3.9.1:0
-	sci-libs/proj:=
-	sys-libs/zlib"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-S=${WORKDIR}/${MY_P/RC*/}
-
-DOCS=( README ChangeLog )
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s:-O3::g" \
-		configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--enable-debug=$(usex debug) \
-		--with-jpeg="${EPREFIX}"/usr/ \
-		--with-zip="${EPREFIX}"/usr/
-
-}
-src_compile() {
-	default
-
-	if use doc; then
-		mkdir -p docs/api || die
-		cp "${FILESDIR}"/Doxyfile Doxyfile || die
-		doxygen -u Doxyfile || die "updating doxygen config failed"
-		doxygen Doxyfile || die "docs generation failed"
-	fi
-}
-
-src_install() {
-	default
-
-	use doc && dohtml docs/api/*
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/libgeotiff/libgeotiff-1.5.1-r1.ebuild b/sci-libs/libgeotiff/libgeotiff-1.5.1-r1.ebuild
index 7806a36e7258..58b7bdac277c 100644
--- a/sci-libs/libgeotiff/libgeotiff-1.5.1-r1.ebuild
+++ b/sci-libs/libgeotiff/libgeotiff-1.5.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.osgeo.org/geotiff/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/5"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc static-libs"
 
 BDEPEND="
@@ -25,6 +25,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-proj-6.2-tests.patch" )
+
 src_prepare() {
 	default
 	sed -e "s:-O3::g" -i configure.ac || die