gentoo resync : 15.01.2020

3 files changed, 49 insertions, 57 deletions

diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index 5a59171c7f41..5e088f938c9f 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -1,17 +1,16 @@
-DIST proj-4.8.0-org_proj4_PJ.h 2960 BLAKE2B f5f367910490fb781a7ddb512e8eaae2d6de4fd1f5b8e9e1dc1b189959a57499174f6b1e90476f10cb4cb8860e069061eb8b507fbbb46b3e1e394df43f67561e SHA512 db2c2b8920ef1c0c56395480dd514e372d5385839ac553a36c92431f5662bb8ec47706489b5c12e0c4308967da58fc94b29a957ede627274ab685ab647151f2c
-DIST proj-4.8.0.tar.gz 785279 BLAKE2B c0b71012128f395347f1233cca55c5d6af258bdc1d0c67ca8b847e8b69c2f6fead7176f69ae1546f45dddcd96e05c6409167b0c078029de0be1d7bc4e550edec SHA512 6076289f8bdf1ca3b76ea879d8c221a668fcb4a6deec7cf6a293c489dfe0b21c36da0c6ed2c7a0b8042436106e851018aa429b4731f4ff018fea2fdb8887ec76
 DIST proj-4.9.2-org_proj4_PJ.h 2960 BLAKE2B f5f367910490fb781a7ddb512e8eaae2d6de4fd1f5b8e9e1dc1b189959a57499174f6b1e90476f10cb4cb8860e069061eb8b507fbbb46b3e1e394df43f67561e SHA512 db2c2b8920ef1c0c56395480dd514e372d5385839ac553a36c92431f5662bb8ec47706489b5c12e0c4308967da58fc94b29a957ede627274ab685ab647151f2c
 DIST proj-4.9.2.tar.gz 874816 BLAKE2B a59a405298a7c8d5bcf3e1a29c5949b466fed5c3745d0f6d631fff3282f6135d6be21cd75c9b377692f4fb98ae6e10e75867fdeab868fdb49c1578073cd7e802 SHA512 34a506742bb27cbc7f5ee91ee7f8c7a27d0f5644a1dcfd11b1e59120040804b1621ddfa4212bff45a1c3fb85511e48ece21612e86033139bafbb50c165e77cda
 DIST proj-5.2.0.tar.gz 1398188 BLAKE2B 37a3a8ed78fd65342f33859662a38f85c3087409db9f00eb031feb5a2527a056e5f0debd97b47f9d08ba6575af2c41d9051de0865e1ad8bd88c956358e519d77 SHA512 f773117d22309d4ee8dbedc2a7b6ba27e8cd032e1bd0af3c98f270bf7b7ab3353be0b04d91202a1f137fc45164c8e8a52712bb06281948008160d08f9f9074ba
 DIST proj-6.0.0.tar.gz 2405217 BLAKE2B 7d0be7753048ffb0b95a7aca8bf73346c4239112527bf0c4a37b22a25c66f97c7692445608cd7aff422edeec18e9eb90839d84cda117dda0bbdefbe274b3e5e3 SHA512 bc4d2f02d697aa01099f5e973a7ca70072f51210754e4d9331ae5bfdef886a41984ce27c1ff926da14fd199005bf9cad7162ab3ea8f3f421ac8b60bc8defd8f7
 DIST proj-6.2.0.tar.gz 2685319 BLAKE2B 8af166a9c98e07cde9e469fc8dbc5033f785181793b989211619fefa443f6449402d66bd42670ca17d81bf3a00d9d7d5c196e16a7975da2a5937ff5a81b771ee SHA512 4c2fd898103c8955a48557353c6866723d6e6b3769580d0b9cb63a685cf4e53ebe63b965498c2ba03eac4827a68fd0036a2234364a7d92dc28e5cdaecf90142d
+DIST proj-6.2.1.tar.gz 2698759 BLAKE2B 69867c05ef727df63351bbb8bc787d039c6a333a6e28b5fbbd1814fd9ca3ec279dd58ee7f0f79c3601ced270b6fa38619120e58f4407c49890a74996bbf88da5 SHA512 1e8632a9c6fa00c0354473f60d81e4644f173b42f6613856ba03e2404f429864fd5052aacba945ccd265173397bed2abdbe325320b54bc7b1c4a75ad95395a89
 DIST proj-datumgrid-1.5.zip 2250131 BLAKE2B c83b5bab72b790c70fbf3b95782ba4e8e93e2accc93a0a8c06667908dc437de44aa3623799f685e020269090be103bac568fe6a9d73ce128b8af024ec1ca8442 SHA512 9d9a935b3e984721a1ceafac49c139d3c5d9923c5bcef5f57fec8028a043c86e7de8bad9c200fa38cd6d1bf27b32dd0126597d42fee793d055e686f090604bf3
 DIST proj-datumgrid-1.8.tar.gz 6604329 BLAKE2B 78df259a811a79457d011b4f675f1a72b6613928bb0083d01bfe65bb4c333628725b300efdb7cf10ebc6f26ff03733886c20f25c7aef80875e81e59bda9fd7d3 SHA512 23153f5b57d210e37cd6e9e0fced23bdabb1c67476e9fb50eb83a68ae066a5c3675822472f5d558d10ddf36ac1d73d538b75304d112a1bfcd8d0bbd26c6481a5
 DIST proj-datumgrid-1.8.zip 6601640 BLAKE2B d439286c27b04767b4085f109a3bbbd555ac9e5acad2f673d5641fee433235b5a5410236ce32e42d3b11ce06d3199dec76c6e41aaa2b5dfd14a09b6b33928164 SHA512 991206f17348b3de484eb5364d773cd06577057228c2d1a0a1c1658308e2596ca13338a666fa71ddd76d538f23dd5bf21e178fd26a785717edd847a17e5c0cd1
 DIST proj-datumgrid-europe-1.4.tar.gz 26115747 BLAKE2B 3dfb5c19362f9d9cdfc4ee5469e536b97d963a5ac3bcf6652ef5935ec393f4035bc15abc444d62cfa477478faabd66a8effe64dbb8eb26b7d73a717b4eae2e53 SHA512 4043c0791af086541a3e08f7ad667b25968ed25e6595c1f047e1272f52838d28ab4010a076f9524882f97d7aa9104769c0b9cdf17394915c5b70b0dc13e019ee
-EBUILD proj-4.8.0.ebuild 1299 BLAKE2B 0ebc7c73ece64fe41bf071f96becad9f416824e85e031cc1290b16e06d15717e4ef833f207687c7341a9cc09f94508aef508147ca1cd1a084b52bfda6a9e5b36 SHA512 1df5171dfd85e0eee8e49cbd9d603f016978658e73226a1809d5efc6aef96955784b7fc176b06e94e87a2ccdc13d92982d31807f104932a407e16f32f8d50254
 EBUILD proj-4.9.2.ebuild 1276 BLAKE2B ab895282e8e50e906163c9be2541abf8420826aae4c9a5090224eb6b0edff8c64ae68dba2bfeb7ab58c4b733807f7f0c45b6bfd2bbd844819c66738984f92af8 SHA512 0a5fa49e0307e1ff228c38484d7b83f398c12b61b846585150a1fec5c933f82650b37677ddd6e87fffdc77381bc4d66cbd56a1b97be407301a5838bcfbbfa394
 EBUILD proj-5.2.0.ebuild 916 BLAKE2B c14d391decf32d2888cdcdb300087eac27e78e3d9843ec88d541e633ce91f4f66bdfbf1ac147e10befe11d9750c0aa60a3b0f6ca8c8b7ad58722f59b44e782a7 SHA512 bcacfa39b1b550c05bd5ba9a1da5984a2bcb1826cc82f859f39e1e566aa3747e5742c7f03cad0a2dd0c87e7623102147a3c037ec151dea062f7450d4ced77562
 EBUILD proj-6.0.0.ebuild 943 BLAKE2B ab7c16f6128d96f499063c030f4c938bc2d3aab88b0ef5cd3491b631e485862cb1603c5cd74be13882b498f6a62f4fcc51a85afa4c3d8c4effab6d7d092e8964 SHA512 374ae20f1ce4192d62be5b8519270c57fa172e4c4f30d9dbc0bf0cad02ccffaa2f0a527d33d7e9b197b910ce40457c77d72ab52c77d08bb03935cb1e83a16f16
 EBUILD proj-6.2.0.ebuild 1123 BLAKE2B 9994c8f1d89ab06ae4f68714ebd50fe6689d846b5654b1004c850801bc384d923fba5a4e4cf57f5c3d5160da77a24500438414c93f08729f3c45a51ed3b09643 SHA512 84869c368a4bb63aa43ea765c72bc8ad173a02b86950249bc7c766d5bcd6e2be057d6877d2ddcb89c9d836f1ee75e870a1aa8bd67b2282cfd2f2c4833769fc20
+EBUILD proj-6.2.1.ebuild 1123 BLAKE2B 9994c8f1d89ab06ae4f68714ebd50fe6689d846b5654b1004c850801bc384d923fba5a4e4cf57f5c3d5160da77a24500438414c93f08729f3c45a51ed3b09643 SHA512 84869c368a4bb63aa43ea765c72bc8ad173a02b86950249bc7c766d5bcd6e2be057d6877d2ddcb89c9d836f1ee75e870a1aa8bd67b2282cfd2f2c4833769fc20
 MISC metadata.xml 513 BLAKE2B 4068b4ddcb4e95578df8da19650ab86b4dbfdba294a3d03f10ada37a578a2113b0d71720545c269b1c097d3a37dbc66ee0cdfe61889466171c109413088707fd SHA512 e841ea4fb30d3632fecca7d584121fce35dff2b23ad8a1feeb98a47f0a3b1d78f57a05b0d303aeff47f981f5b7feb831deb14644ab6615644c0a8593a6e321b3
diff --git a/sci-libs/proj/proj-4.8.0.ebuild b/sci-libs/proj/proj-4.8.0.ebuild
deleted file mode 100644
index 544b6e767021..000000000000
--- a/sci-libs/proj/proj-4.8.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils java-pkg-opt-2 flag-o-matic
-
-DESCRIPTION="Proj.4 cartographic projection software with updated NAD27 grids"
-HOMEPAGE="http://trac.osgeo.org/proj/"
-SRC_URI="
-	ftp://ftp.remotesensing.org/pub/proj/${P}.tar.gz
-	http://download.osgeo.org/proj/${PN}-datumgrid-1.5.zip
-	http://trac.osgeo.org/proj/export/2190/tags/${PV}/proj/src/org_proj4_PJ.h -> ${P}-org_proj4_PJ.h
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="java static-libs"
-
-RDEPEND=""
-DEPEND="
-	app-arch/unzip
-	java? ( >=virtual/jdk-1.5 )"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}"/nad || die
-	mv README README.NAD || die
-	cp "${DISTDIR}/${P}-org_proj4_PJ.h" "${S}/src/org_proj4_PJ.h" || die
-	unpack ${PN}-datumgrid-1.5.zip
-}
-
-src_configure() {
-	if use java; then
-		export JAVACFLAGS="$(java-pkg_javac-args)"
-		append-cflags "$(java-pkg_get-jni-cflags)"
-	fi
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with java jni)
-}
-
-src_install() {
-	default
-	cd nad || die
-	dodoc README.{NAD,NADUS}
-	insinto /usr/share/proj
-	insopts -m 755
-	doins test27 test83
-	insopts -m 644
-	doins pj_out27.dist pj_out83.dist
-	prune_libtool_files
-}
diff --git a/sci-libs/proj/proj-6.2.1.ebuild b/sci-libs/proj/proj-6.2.1.ebuild
new file mode 100644
index 000000000000..70e5a2e53a6b
--- /dev/null
+++ b/sci-libs/proj/proj-6.2.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DATUMGRID="${PN}-datumgrid-1.8.tar.gz"
+EUROPE_DATUMGRID="${PN}-datumgrid-europe-1.4.tar.gz"
+
+DESCRIPTION="PROJ coordinate transformation software"
+HOMEPAGE="https://proj4.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/15"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="europe static-libs test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( !europe )"
+
+RDEPEND="dev-db/sqlite:3"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}"/data || die
+	mv README README.DATA || die
+	unpack ${DATUMGRID}
+	use europe && unpack ${EUROPE_DATUMGRID}
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--without-jni
+}
+
+src_install() {
+	default
+	cd data || die
+	dodoc README.{DATA,DATUMGRID}
+	use europe && dodoc README.EUROPE
+	find "${D}" -name '*.la' -delete || die
+}