gentoo resync : 08.07.2021

5 files changed, 108 insertions, 4 deletions

diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index 0467f6be678e..dddcb4fb1f12 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -1,7 +1,10 @@
+AUX proj-8.1.0-test_factory-include.patch 844 BLAKE2B 612046cbc170c16362ffc4a43f5a3f6ade303e5ce8ce2a45494dc3280fcfee63120f110f30939b0408dfb963e79f1b6f4b6438bdd6d2708cbc6ab7ebd4b2b4d6 SHA512 b7095a0b892e6b31b456f48d640cbd4abd4537676f4ceed1491888a65443a58e3747943e9e8f1889ef6138b52e1273f9896ec71d5f16b84582dd095d1b8d2ef8
 DIST proj-7.2.1.tar.gz 5714666 BLAKE2B 9379ef758b1221b9487f162a27e7afa737e668ad7a13fc7adbd8e1e2c1c4699263d5d3105d03781b423f284205de3c79fc68850b9fba6aa05f1dc553b77b0842 SHA512 59b9b31b0183e620a2f4a25a08620c170773fe4f99e8eca59e9ed6815f43bb379ea21ef71e8f759dbd747855b982657d7503bac3acc542218e0d862105f25324
 DIST proj-8.0.1.tar.gz 5731452 BLAKE2B d2235f87bead1ec35f62b99e5236d1b6dc1a8f924555d21dec7f5e07b3d341b4b4e797dd5a3843e87d12db392716ec9bb5acae871fa2bb7a78c3404fa9487875 SHA512 cb5550a9fbccfc680bebb3b8c5ad347d53c38cb526edf4dcaa3af0eff57410b4d4d028e246954c4202a1d637e1e6f4e7a6a33e8741e8aa0a58bdfc8a5dbc68c9
+DIST proj-8.1.0.tar.gz 5786723 BLAKE2B 8960ae70beda502442548542173e3f21705c8213ba5b7b3004beca67aa16b7401db4b9778ea4abd910eae3e224b7efc73e0d67b83a3d75aaab0fead51977c9ba SHA512 0c11d43bcdf97fbb3be9238c77cc111ae6df7948dc5076b1a31350c84a60299964ea1a320edfbee0568a2d9d3c7f80eafa6322adfdf99aea5f06172d7ee53a2f
 DIST proj-datumgrid-1.8.tar.gz 6604329 BLAKE2B 78df259a811a79457d011b4f675f1a72b6613928bb0083d01bfe65bb4c333628725b300efdb7cf10ebc6f26ff03733886c20f25c7aef80875e81e59bda9fd7d3 SHA512 23153f5b57d210e37cd6e9e0fced23bdabb1c67476e9fb50eb83a68ae066a5c3675822472f5d558d10ddf36ac1d73d538b75304d112a1bfcd8d0bbd26c6481a5
 DIST proj-datumgrid-europe-1.6.tar.gz 189057258 BLAKE2B 66daf2341b05d8d5f929f6d67e1913656c2380a3663b4359cb97576ff5954dbea5890862869bb1077f6cde760dada4d9f13201c5b2c29ef3458a8b43089e459c SHA512 463d2575d5ce6f5984e69897c34ef80ec31a77f5ba00a07a5f55e97c3033dbae40b7d17891e5495bc47e6faf917968b1cdb7b3be9b2a4838e3b093b74753c2a8
-EBUILD proj-7.2.1.ebuild 1209 BLAKE2B ac70d263aab2b700dcfc7f8564b81607a31c3387ed6f39770fb7583c063428680a8ef5d0dcba6e786fbce847d2791bb8285b983f662a161b171a6755b2e72a16 SHA512 ce8e0b02dad6ce6de1620328fd6e65c478eafcc81dd55b3551a4452425840d4226fa43c02f7310a3ed9779ddf1d14e00f83a35a459869dcb18eae45c29cffa94
-EBUILD proj-8.0.1.ebuild 1432 BLAKE2B 575e8654d3d429d2a52b2c47aec7ed086367aaaf5f0b2f1898997b0ba43a6badd8a37092105cc1fa22bdd4744ec8ddc5c8e9ad2475b3df2a51a12b13000b8bdd SHA512 e82e8453b99c349caec34eb2e474cc433af88f35fb47ee451561d757b86361e509bfd84879472f7b7b8eb628440cf8bb4b3c559d9201d9b85b99d85fd8c069e0
+EBUILD proj-7.2.1.ebuild 1208 BLAKE2B bfb29e3237500f2550a7f81a1321308ff456228db5b194b809f87f5d37894fa42a1969c6ac2491f45f0f60231c96b67139f3cda7215c7b51ebc7cfd7d184bda9 SHA512 d74a2e1d47be556a9d16d14136405c2bd1d57ba0c9bc9090abb74e52d56af00c10f67568a85df2b20f56fcd46d59c68d3a5bd7f6ea112deeffb21526a5a18648
+EBUILD proj-8.0.1.ebuild 1431 BLAKE2B 17e47bd41495796fb1d2c4017fc5ffd074e04dc35acc0e8884aadb157247b91bb4a5efb076fd3c96c3310c4066571afbf385ab73a0b0ee596d22017bfd42ce4d SHA512 fd310ac894ddaac7298bfba6c0308ff6ec496e264b25f584d1024f31ed140af2f25025731779b811b0be7cc3fe26183f17de8fe9ba088a889f57a3e66f66a9a6
+EBUILD proj-8.1.0-r1.ebuild 1491 BLAKE2B 1a753a5b0a1d4374cd40289425a037c95b06e9d6787dc8a511939bfeca89cf395eda816c08416c651e410d5723da959681a4e304d804f6eac2e107a3aa73a834 SHA512 a7c8f68c240e3a5bedec60fbfa83c291e4dc13f84e90e63ac5eca6d3a586c33e59e774842a73c0370c35437d6e58a87e6fb9269acce6cd91f0d6c8c78f431528
 MISC metadata.xml 449 BLAKE2B e29aeb78ff28d336ffbe19913702d656299183b1657c09deaf12f3f8c263867e9facbef4ee626f78e667f3f6ad5cebb0c490e84247fe784bc3fbf68c5418692e SHA512 a1b14653a4388d42e3e08ddabd3734e5987bf41092dd699788ed1a4b8819da831f602b48dd3ad64dbb9fc1bbc0005623456744a6b5a3fcd3313d844bf3bc6886
diff --git a/sci-libs/proj/files/proj-8.1.0-test_factory-include.patch b/sci-libs/proj/files/proj-8.1.0-test_factory-include.patch
new file mode 100644
index 000000000000..c88fe83cb509
--- /dev/null
+++ b/sci-libs/proj/files/proj-8.1.0-test_factory-include.patch
@@ -0,0 +1,29 @@
+https://patch-diff.githubusercontent.com/raw/OSGeo/PROJ/pull/2760.patch
+
+From fc983b6e3343ba4d52fd0a889bb6bbf6f143f417 Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Thu, 1 Jul 2021 21:24:26 +0200
+Subject: [PATCH] =?UTF-8?q?test=5Ffactory.cpp:=20fix=20build,=20in=20parti?=
+ =?UTF-8?q?cular=20on=20Alpine=20Edge=20(fixes=C2=A0#2759)?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ test/unit/test_factory.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/test/unit/test_factory.cpp b/test/unit/test_factory.cpp
+index 985499150e..a60296d10a 100644
+--- a/test/unit/test_factory.cpp
++++ b/test/unit/test_factory.cpp
+@@ -39,6 +39,8 @@
+ #include "proj/metadata.hpp"
+ #include "proj/util.hpp"
+ 
++#include <algorithm>
++
+ #include <sqlite3.h>
+ 
+ #ifdef _MSC_VER
+
diff --git a/sci-libs/proj/proj-7.2.1.ebuild b/sci-libs/proj/proj-7.2.1.ebuild
index 6bfd83430fca..11efd85db877 100644
--- a/sci-libs/proj/proj-7.2.1.ebuild
+++ b/sci-libs/proj/proj-7.2.1.ebuild
@@ -7,7 +7,7 @@ DATUMGRID="${PN}-datumgrid-1.8.tar.gz"
 EUROPE_DATUMGRID="${PN}-datumgrid-europe-1.6.tar.gz"
 
 DESCRIPTION="PROJ coordinate transformation software"
-HOMEPAGE="https://proj4.org/"
+HOMEPAGE="https://proj.org/"
 SRC_URI="
 	https://download.osgeo.org/proj/${P}.tar.gz
 	https://download.osgeo.org/proj/${DATUMGRID}
diff --git a/sci-libs/proj/proj-8.0.1.ebuild b/sci-libs/proj/proj-8.0.1.ebuild
index c6a3966a2684..d9e6bfd7022b 100644
--- a/sci-libs/proj/proj-8.0.1.ebuild
+++ b/sci-libs/proj/proj-8.0.1.ebuild
@@ -9,7 +9,7 @@ DATUMGRID="${PN}-datumgrid-1.8.tar.gz"
 EUROPE_DATUMGRID="${PN}-datumgrid-europe-1.6.tar.gz"
 
 DESCRIPTION="PROJ coordinate transformation software"
-HOMEPAGE="https://proj4.org/"
+HOMEPAGE="https://proj.org/"
 SRC_URI="
 	https://download.osgeo.org/proj/${P}.tar.gz
 	https://download.osgeo.org/proj/${DATUMGRID}
diff --git a/sci-libs/proj/proj-8.1.0-r1.ebuild b/sci-libs/proj/proj-8.1.0-r1.ebuild
new file mode 100644
index 000000000000..501de56a4e62
--- /dev/null
+++ b/sci-libs/proj/proj-8.1.0-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DATUMGRID="${PN}-datumgrid-1.8.tar.gz"
+EUROPE_DATUMGRID="${PN}-datumgrid-europe-1.6.tar.gz"
+
+DESCRIPTION="PROJ coordinate transformation software"
+HOMEPAGE="https://proj.org/"
+SRC_URI="
+	https://download.osgeo.org/proj/${P}.tar.gz
+	https://download.osgeo.org/proj/${DATUMGRID}
+	europe? ( https://download.osgeo.org/proj/${EUROPE_DATUMGRID} )
+"
+
+LICENSE="MIT"
+SLOT="0/23"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="curl europe test +tiff"
+REQUIRED_USE="test? ( !europe )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-db/sqlite:3
+	curl? ( net-misc/curl )
+	tiff? ( media-libs/tiff )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-test_factory-include.patch
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+
+	cd "${S}"/data || die
+	mv README README.DATA || die
+
+	unpack ${DATUMGRID}
+	use europe && unpack ${EUROPE_DATUMGRID}
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDOCDIR="${EPREFIX}"/usr/share/${PF}
+		-DBUILD_TESTING=$(usex test)
+		-DENABLE_CURL=$(usex curl)
+		-DBUILD_PROJSYNC=$(usex curl)
+		-DENABLE_TIFF=$(usex tiff)
+	)
+
+	use test && mycmakeargs+=( -DUSE_EXTERNAL_GTEST=ON )
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	cd data || die
+	dodoc README.{DATA,DATUMGRID}
+	use europe && dodoc README.EUROPE
+	find "${ED}" -name '*.la' -type f -delete || die
+}