gentoo resync : 15.12.2019

4 files changed, 20 insertions, 17 deletions

diff --git a/sci-libs/qfits/Manifest b/sci-libs/qfits/Manifest
index 7cc7431680e6..5e966b58301c 100644
--- a/sci-libs/qfits/Manifest
+++ b/sci-libs/qfits/Manifest
@@ -1,5 +1,5 @@
-AUX qfits-6.2.0-open.patch 683 BLAKE2B 5c381b5c2a2367d75e4d158029952377e0fa7d562636f4c24ac68cc3b495c69e5b31bba45fe0d5cbe9bfadb783de21108d269260ee7e3f49b6d03e31d6881806 SHA512 3c1303640f3d30340f11be173ebc2ce87b33064912f4fa071c3381519d19eeda1244955d07e850f0a2e54552f6fc83eb5d1fd297199023f7c6084e374f960cb7
-AUX qfits-6.2.0-ttest.patch 376 BLAKE2B b03ac305275ebb5297c83cd552d375429c19c3795ca2198bf7a4942f9143cb6857c2ba849a55b9049c78085243b1ff94dd34996675dbbea75677256195ec3d5d SHA512 32b822144f7b4a4eaf258078004410c5c7c1cd7117eea678c382b2cd8b08ca855fc3d3f2498383cfafdd57d09dee5b9a2eed2e50b483c28255fab9b8d5b8c243
+AUX qfits-6.2.0-open.patch 512 BLAKE2B a3701d2a9f8d6cbee3d5d9e95b281068b29b2d2f327140086830462a89cb657b00fd1a6e57fd5b593ada0788ba398cfda1fbdd15c9bf302fe84d6b7e09d32e14 SHA512 83bb2d96725e62fd1f593cd38f86d7c4dba2248b34d9eeecb6af11d41b20fde2a5b0bf22e3b64001d9d473b0344120f3df604982ab7d998c37c08771f17309b5
+AUX qfits-6.2.0-ttest.patch 304 BLAKE2B a5cebbd782f1d8fd9090a20f51a52fd756509b479ec199c1efea734e557eae5994515ab003ac920dde1781ee98afff0cb25ed0eb91a92e8821d269e1e9188c8d SHA512 dde0bfbe7aef8ec381ec57b4fdae5419c9ad23ec20d90ee795bf5cc124abf3e6e936f7069d3cc56ff86b766425c2a94304048263310fcf3f7c84415638e073f8
 DIST qfits-6.2.0.tar.gz 475191 BLAKE2B fea94bf77b07e5fbc9493f4bafbf37387b4f9ae83212ffc5a6c0607cad972a592e3937ba042ee94f053f30fd05cbafb8fcbcf2df1c4cd6ee4d2422bf108d9395 SHA512 a0f6863a9e5b26d08de487cfdf468b3d04218a36a01cd9df8b786b1cdf2ffa61acf12b087f4fbd751ba023f02b5a32410949a4ee08432108a7129a283ab3d824
-EBUILD qfits-6.2.0.ebuild 560 BLAKE2B 82d4e1f866055a73a5e15578c2d8a62ae44966d270a72a624b0dfe6150293c902fbc7fac6bfbb0cbf0a0a9bbd3cfb27b13da41c98691ea6b4fb6ff8a0311cf21 SHA512 5c1733cbffe81295cea50f3625150f43d741fd9159280444e4e1df358363baaef0536a9cbe52e641a1fc65d16e927b5a1ebac44e81ea95fcf459415dc8a5ff00
+EBUILD qfits-6.2.0.ebuild 596 BLAKE2B 90ec42dfc65cdc7352b05d357ac0974ebbc0283b35bc07dbd883ffd0f0c92b1bed80a3b017a54341e5d6710a16eee8ac8a25c7a653e9c196a21c820004c8a0ed SHA512 4ca8e8669e922ebf91bd1a4fa1295bf33abec479e050211531af77c969574ec4dacd7f51b0743d5d7e651acbe72c521db6f160168a13956d6a9c5b2f772da41e
 MISC metadata.xml 851 BLAKE2B 2f9e24aaf6d2ca99ed72b95723d2cd05ea2f0b88515366f258f1c6e547174d946d43377396365e0c69ed2fba1450085c5c1187b45efbf240bcabb60c3a08e24a SHA512 97081bccbae198d305fba171d6969993599b8008d82f28acb7489879013564bc95dd42ad9c8d04d883f442cdf70361f080e9ac8bd770752ea2a9ca87e3478434
diff --git a/sci-libs/qfits/files/qfits-6.2.0-open.patch b/sci-libs/qfits/files/qfits-6.2.0-open.patch
index 71d2df1a692a..951970da6dc4 100644
--- a/sci-libs/qfits/files/qfits-6.2.0-open.patch
+++ b/sci-libs/qfits/files/qfits-6.2.0-open.patch
@@ -1,6 +1,5 @@
-diff -ur qfits-6.2.0/src/qfits_memory.c qfits-6.2.0.new/src/qfits_memory.c
---- qfits-6.2.0/src/qfits_memory.c	2006-08-24 17:01:56.000000000 +0200
-+++ qfits-6.2.0.new/src/qfits_memory.c	2007-09-21 13:43:19.000000000 +0200
+--- a/src/qfits_memory.c
++++ b/src/qfits_memory.c
 @@ -308,7 +308,7 @@
          /* Create swap file with rights: rw-rw-rw- */
          swapfileid = ++ qfits_memory_table.file_reg ;
diff --git a/sci-libs/qfits/files/qfits-6.2.0-ttest.patch b/sci-libs/qfits/files/qfits-6.2.0-ttest.patch
index ee87bfc702ca..a333a32e0a68 100644
--- a/sci-libs/qfits/files/qfits-6.2.0-ttest.patch
+++ b/sci-libs/qfits/files/qfits-6.2.0-ttest.patch
@@ -1,5 +1,5 @@
---- test/test_tfits.c	2006-04-27 14:08:43.000000000 +0100
-+++ test/test_tfits.c.new	2007-02-23 00:29:41.000000000 +0000
+--- a/test/test_tfits.c
++++ b/test/test_tfits.c
 @@ -322,7 +322,7 @@
       *    Test on BINARY tables
       */
diff --git a/sci-libs/qfits/qfits-6.2.0.ebuild b/sci-libs/qfits/qfits-6.2.0.ebuild
index e98cd4afcfa2..181c4777ba8a 100644
--- a/sci-libs/qfits/qfits-6.2.0.ebuild
+++ b/sci-libs/qfits/qfits-6.2.0.ebuild
@@ -1,23 +1,27 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-
-inherit autotools-utils
+EAPI=7
 
 DESCRIPTION="ESO stand-alone C library offering easy access to FITS files"
 HOMEPAGE="http://www.eso.org/projects/aot/qfits/"
 SRC_URI="ftp://ftp.hq.eso.org/pub/${PN}/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs"
-DEPEND=""
-RDEPEND=""
+IUSE="doc"
 
 PATCHES=( "${FILESDIR}"/${P}-{ttest,open}.patch )
 
+src_configure() {
+	econf --disable-static
+}
+
 src_install() {
-	autotools-utils_src_install
-	use doc && dohtml html/*
+	use doc && HTML_DOCS=( html/. )
+	default
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }