gentoo resync : 15.12.2019

3 files changed, 3 insertions, 76 deletions

diff --git a/sci-astronomy/wcslib/Manifest b/sci-astronomy/wcslib/Manifest
index b8571ec71851..711d226ca4af 100644
--- a/sci-astronomy/wcslib/Manifest
+++ b/sci-astronomy/wcslib/Manifest
@@ -1,5 +1,3 @@
-DIST wcslib-5.15.tar.bz2 2222193 BLAKE2B 7e198b7d80d801794443fa6a0e6137588049605af131bdd547408d2eb8ac391078c750f782734bf8b86af99084bfc64bbd807245f452dee838a58037985ef022 SHA512 b98111d7ca4b14dd479b56a368fd89a4d6f5d3741a61edeecc4a738def35bf448b68daf6a553fe88d4c84f91f5fcab3bc8d3ead1dccbd4e7c4190f31de2242ef
 DIST wcslib-5.16.tar.bz2 2222111 BLAKE2B e11da145db6366804321cf415bdac621a930418f09d788c8b94413980710bb43357129a830462339127398082700a9f44f56dc0b8c96ef923d41ea0174dfd07f SHA512 bf7ab586995bdade8b96c77dee891c7d7ab6de82a7e2f94a09d89643e93658063f832efdb66e0bba11ad114b6e0ca555cba9308a84f0f22fb833e3a6303cefe6
-EBUILD wcslib-5.15.ebuild 1675 BLAKE2B 12ff159558252dc381c1cc6759239cf9e85b160c2ddb336b0a956acad9a536c8920445aef6715eaf14bbe4c6f3df22fd9903bca438e6b7aa331e0d3d2fc37948 SHA512 d2648e929258ceaa92d9651c456b8f71493143035a8950d21189cadf31921d2a92d7d1fd7cde7a07d8fdf7a105b3097da8a57eaf9f1484b08ae69e050f532f42
-EBUILD wcslib-5.16.ebuild 1677 BLAKE2B a1f699e1156aedf692ab1c212b8416ef1cbc091663482132529be8e5aff1bcd2d1f7cc105172af1d5ed08b59de9d7046f64be53c89e2c39634d1e2a626b687e0 SHA512 5c9a572e8cf41b650da3a7f98cc8abe331386c896193366b7ed6d73052208c5ab89ce8b68434268f2420da8a770a2368c2e5f90fb3c43d4c7257cbdcd0dea244
+EBUILD wcslib-5.16.ebuild 1672 BLAKE2B cb4b23307baf6e981b6760398a90e864bb1adcfb066d8c973e0c848febc4942a34647cfbaa170a31f35d1390d1fe9ac321127d69e66c431c8659b42c98f9affb SHA512 2b6c660d4683a5833aafdd0b379fc0c9df512ec1ff09d2792272b6bbe9659896ea9bab8789997abbbab74a381f5ddcd01cce6dc42004746c6313a85fffd9b366
 MISC metadata.xml 976 BLAKE2B 7507ba6725d4a27888d6bc57c2e6c10bcb4a2bd06a2809228423b40009aa1fbef15303cb8a78a510cca5771f3d7cd3b59501751a0969990130d297fe6b1d7312 SHA512 cd4bc1614ea120e04ced965a92fdd343db9e4d1a6046b57efd503674547cfa45ce6a03bb3a2d34a472dccd885d598cbf3cd3d9d9fe182a2fc067a801e8eb9577
diff --git a/sci-astronomy/wcslib/wcslib-5.15.ebuild b/sci-astronomy/wcslib/wcslib-5.15.ebuild
deleted file mode 100644
index 035f15d89123..000000000000
--- a/sci-astronomy/wcslib/wcslib-5.15.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-
-inherit fortran-2
-
-DESCRIPTION="Astronomical World Coordinate System transformations library"
-HOMEPAGE="http://www.atnf.csiro.au/people/mcalabre/WCS/"
-SRC_URI="ftp://ftp.atnf.csiro.au/pub/software/${PN}/${P}.tar.bz2"
-
-SLOT="0/5"
-LICENSE="LGPL-3"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc fortran fits pgplot static-libs +tools"
-
-RDEPEND="
-	fits? ( sci-libs/cfitsio:0= )
-	pgplot? ( sci-libs/pgplot:0= )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable fortran)
-		$(use_enable tools utils)
-	)
-	# hacks because cfitsio and pgplot directories are hard-coded
-	if use fits; then
-		myconf+=(
-			--with-cfitsioinc="${EPREFIX}/usr/include"
-			--with-cfitsiolib="${EPREFIX}/usr/$(get_libdir)"
-		)
-	else
-		myconf+=( --without-cfitsio )
-	fi
-	if use pgplot; then
-		myconf+=(
-			--with-pgplotinc="${EPREFIX}/usr/include"
-			--with-pgplotlib="${EPREFIX}/usr/$(get_libdir)"
-		)
-	else
-		myconf+=( --without-pgplot )
-	fi
-	econf ${myconf[@]}
-	sed -i -e 's/COPYING\*//' GNUmakefile || die
-}
-
-src_compile() {
-	# nasty makefile, debugging means probably full rewrite
-	emake -j1
-}
-
-src_test() {
-	emake -j1 check
-}
-
-src_install () {
-	default
-	# static libs share the same symbols as shared (i.e. compiled with PIC)
-	# so they are not compiled twice
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/lib*.a
-	use doc || rm -r \
-		"${ED}"/usr/share/doc/${PF}/html \
-		"${ED}"/usr/share/doc/${PF}/*.pdf
-}
diff --git a/sci-astronomy/wcslib/wcslib-5.16.ebuild b/sci-astronomy/wcslib/wcslib-5.16.ebuild
index 7b3cdbfbdf79..8dd1482b0a44 100644
--- a/sci-astronomy/wcslib/wcslib-5.16.ebuild
+++ b/sci-astronomy/wcslib/wcslib-5.16.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
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.atnf.csiro.au/pub/software/${PN}/${P}.tar.bz2"
 
 SLOT="0/5"
 LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc fortran fits pgplot static-libs +tools"
 
 RDEPEND="