gentoo resync : 29.12.2022

4 files changed, 2 insertions, 105 deletions

diff --git a/sci-astronomy/wcslib/Manifest b/sci-astronomy/wcslib/Manifest
index 07a70215e615..2b1209e0e917 100644
--- a/sci-astronomy/wcslib/Manifest
+++ b/sci-astronomy/wcslib/Manifest
@@ -1,12 +1,9 @@
-AUX wcslib-7.7-tofits.patch 502 BLAKE2B 645dc391cff28b6460357ee6480931025923e90a7c880633536ceb99b89ef898695930f8660d98b91b62269a344e943c77083ad24b9afbd1a1985e6a32bfb03f SHA512 9ecb53086f5fd246ac69de6d1370c3e3236ca5c01ea1ea8114105b038486c7ec602e8ea33d4a922e8edb6be1c26c1fb4869cc6a572e8058604381afc65c95112
+DIST wcslib-7.11.tar.bz2 2946962 BLAKE2B 7c812f50e3c539da3d58a70acd9128bd957fccd463b0c404c4a55740fb6d7df88f9992d1a2c5c303091dfce91943a6e5bcca73b553354f67c2d522ebb77d6dc3 SHA512 28aa67edad31a8fe27bc8b04e060a17ee75d8fa5e9ec82ccbdb72136558e03d1196151214c9ce4026df88cb807ce2645f5df80bbc479ec91cfa749bf8b9477ec
 DIST wcslib-7.3.1.tar.bz2 2434274 BLAKE2B 9789a8eb34fe37c96b52e20efe3c14368499058e5c46aad4853b2be5f32a31df26525ec2c38d0ce87bcb7891b91a3ec3ac537e3c662c716a7c4381f26cd715e4 SHA512 753e0e202fb4250d321c36a0df9cd45ed88697111a06e108bc3e5397ddecc60d460cda2b4d45b5311dd72b88b66d4c70ff150b03e2da46c834b024f15304779b
 DIST wcslib-7.3.tar.bz2 2435669 BLAKE2B c0f641b4c2fdd9d332816195f399eb2ab3c5aa585f08c4857af77bd5ed4074e653663f7cbddc6d7678cd85bed2c0bd95719cd83a5138d21ad24841396d4c11b9 SHA512 8c98c4b575056e2d966b77a4bc951256d02ecee3a11847e140fd38d93afd0f76b3e906d590c952dc9fc58ceeb1ba062b19d8e1e676ee0032f5b7ed13a9dfa892
-DIST wcslib-7.4.tar.bz2 2446483 BLAKE2B e659e0f7d4aa54d599c1300f600bc8b7b56d672fa715be1e7c3ade4ff6eebaf68a2894dac73032b1f3aee5965254f359681718c93949962f4a59bdda448d5395 SHA512 3696f59bf15f3806faff2441250f8ae38bfbbc1e2e25404c9480c82629472521d89306d9340475ea4691c5e1a8417be3f058b4a01b49c9a45e0e718056a9394c
-DIST wcslib-7.7.tar.bz2 2515760 BLAKE2B f5418513168903e14488004abeb5ec2f69d773f49a5abc28598d184ba66df2232b87fb0754fc63800951ea2e794741fbde119794feca2d822287cd63d3fa658c SHA512 372eb32d28ee78be14a3e8f1fba2a51c2b1f69de3bb70bf49487653878f905b4c463a0b7fc9cb06cf4fdd0b23114d3ec26d853072e0fd06d6e14610f0dfa06d4
 DIST wcslib-7.9.tar.bz2 2947112 BLAKE2B 797a1c51dd5b1669faf63c4a509e698f93422d6b4bfc5ace023d75e8e03b2967cc01c6764cca190f07c65b76aec76a740349349561f18f61b870af90bb66ba35 SHA512 72831ced127ad8fce934b43ddde86383273b161316ac078b03dcd8de94b0d6076b625445728695e4c8a9da46cccaa3832038f251922a759f480ef2ad33fd67a1
+EBUILD wcslib-7.11.ebuild 1693 BLAKE2B 78aeddce9d49cfd0e8d6b6dc12a1aad275f61488ceaa1868c190202c1191ec3ca66f204727f1f7fa7e5a17c4389e3e2e5e938d55096e0f0a585ae8c8a975a208 SHA512 035cdcc410645dcafc0a55d15656ccd501eba045c4d72cf8a283cbd08757bfbe160b9db9ec0c99ecb82f5070928890d623023e41e47cab4b821d8d3c42b1e680
 EBUILD wcslib-7.3.1.ebuild 1693 BLAKE2B e00e09b8e5223ef63eb2c65d626bb5f1e60d5cfa1a490ad9ceca268bec913c23f13d916520ef7b1b5c4e032f5fdc59dff3680e3448f48d0f66ccdfa7a53ed15a SHA512 e69ba5bed4b3acd3fdf871453a0a3f22faadbbaf6858f0806e260b7cb0f45fefd1a922a8f710ee1485bd33114801c03aaa1bc7baebceef0d34febb18729f2ca3
 EBUILD wcslib-7.3.ebuild 1691 BLAKE2B 98f7e1ed446fb03c86419ff096131ddc318a9b11d5d97b8fc484dcdb22e277e2908112839080aa6c9633e1101b2d56ab2d97caf2cc950e18a982ec094efa26a0 SHA512 f16ee1129c6a4c54dbdf1da67e14af94d0eeba5945c164adaa5f187f3e287a721ccb6f9a7a9c989b77f7e5d2545e0d5c2ca2cd01c93e6742e6386cf844716bb4
-EBUILD wcslib-7.4.ebuild 1701 BLAKE2B b146801326acff7c25f6199413a28240ac66af2bb55a63538c671c319f4aa5a0ce3ad2767c5fa241776fb69adbb34c95ce8daf8850e5c7be858e3088148222c5 SHA512 e84137fb479a8ac961911f1d4b0258cc092e29372f467c03f81a98330e037a26f41cc2f9eb921ce96bd2fa9a1b6893b838945c48ecc1470543d4822e31238972
-EBUILD wcslib-7.7.ebuild 1811 BLAKE2B 3da5d6c62f20edacff142ab3eb9520a7193566697d5324b1ba8ba66690c25a6a20a54e0a336fefc3589f290e32f6da3b950c73f0b99b86e95d499a9bbec31d8b SHA512 07eda0730c776318f9c4614a18c840ba22c4b94123a8d8812b0a270eb232783d24b41ad2866cc0b9187e694e71993303d22bafced24634eca38c2693da527878
 EBUILD wcslib-7.9.ebuild 1765 BLAKE2B 8ffc9f07968ab04ec930f83e1139d211086190c9858a6598a25b94ce08b4628e39705c1ce55a2a1be437761d27a0dc363c6f43eb87d7c4d47044b1306c6cc95b SHA512 6dcd921ebe7782636beba4c0e9396b7a1c5b31cbdb1fe6a7f91d34165d460ea47eedcb7e3fb63caf435d6edd9470da2e5bfed5df93247847e1bdc2097a0277b1
 MISC metadata.xml 1107 BLAKE2B 82837dbdf8a7b56d330df0bdb0bf5afc90ad7efd8141c9cf63f6f9b30798a451103080393e3c2bd10e1502de50ea5bd1fc38e068119c07d1ff79fa4d61cda228 SHA512 9ab798676bf10969eb2d171598c3ecb0385322333240f002f033f36cab1060e14fbbd11462c572e2cb8ed1b7092f88824dd1fc2be6e2f93944c44d886ae9c4ef
diff --git a/sci-astronomy/wcslib/files/wcslib-7.7-tofits.patch b/sci-astronomy/wcslib/files/wcslib-7.7-tofits.patch
deleted file mode 100644
index 5c8022560220..000000000000
--- a/sci-astronomy/wcslib/files/wcslib-7.7-tofits.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- wcslib-7.7/Fortran/GNUmakefile
-+++ wcslib-7.7/Fortran/GNUmakefile
-@@ -171,8 +171,8 @@
- 	-@ echo ''
- 	   $(FC) $(FFLAGS) -c $<
- 
--%.fits : ../C/test/%.keyrec tofits
--	   ./tofits < $< > $@
-+%.fits : ../C/test/%.keyrec ../utils/tofits
-+	   ../utils/tofits < $< > $@
- 
- run_% : %
- 	-@ echo ''
-@@ -361,7 +361,7 @@
- 	-@ echo ''
- 	   $(MAKE) -C ../pgsbox lib
- 
--tofits : ../C/test/tofits.c
-+../utils/tofits : ../utils/tofits.c
- 	   $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $<
- 
- ../C/wcstab.fits : ;
diff --git a/sci-astronomy/wcslib/wcslib-7.7.ebuild b/sci-astronomy/wcslib/wcslib-7.11.ebuild
index 0e2822299e62..e1382017202a 100644
--- a/sci-astronomy/wcslib/wcslib-7.7.ebuild
+++ b/sci-astronomy/wcslib/wcslib-7.11.ebuild
@@ -24,10 +24,6 @@ BDEPEND="
 	>=sys-devel/flex-2.6.0
 	virtual/pkgconfig"
 
-PATCHES=(
-	"${FILESDIR}/${P}-tofits.patch"
-)
-
 src_configure() {
 	# workaround until upstream fix it properly
 	append-fflags $(test-flags-FC -fallow-argument-mismatch)
@@ -59,11 +55,6 @@ src_configure() {
 	sed -i -e 's/COPYING\*//' GNUmakefile || die
 }
 
-src_test() {
-	# -j1 to work around a race condition
-	emake -j1 check
-}
-
 src_install () {
 	default
 	# static libs share the same symbols as shared (i.e. compiled with PIC)
diff --git a/sci-astronomy/wcslib/wcslib-7.4.ebuild b/sci-astronomy/wcslib/wcslib-7.4.ebuild
deleted file mode 100644
index a1abd488cd58..000000000000
--- a/sci-astronomy/wcslib/wcslib-7.4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FORTRAN_NEEDED=fortran
-
-inherit flag-o-matic fortran-2
-
-DESCRIPTION="Astronomical World Coordinate System transformations library"
-HOMEPAGE="https://www.atnf.csiro.au/people/mcalabre/WCS/"
-SRC_URI="ftp://ftp.atnf.csiro.au/pub/software/${PN}/${P}.tar.bz2"
-
-SLOT="0/7"
-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() {
-	# workaround until upstream fix it properly
-	append-fflags $(test-flags-FC -fallow-argument-mismatch)
-
-	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_test() {
-	emake 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
-}