gentoo resync : 03.03.2021

3 files changed, 2 insertions, 52 deletions

diff --git a/sci-libs/ccfits/Manifest b/sci-libs/ccfits/Manifest
index bcb8834657b9..144146f7b918 100644
--- a/sci-libs/ccfits/Manifest
+++ b/sci-libs/ccfits/Manifest
@@ -1,6 +1,4 @@
 AUX ccfits-2.2-makefile.patch 710 BLAKE2B 8368c98ecc0b9c7e2d56ab43473a8b3d83d16e6683e5f58da6e3a25ccaa5353404ae6b8e3c457aee99ca5b6af3ee228973ea2d0aa9d990aa8853032e204ea63c SHA512 ea4553b9a794131fe1b90172d49623bb97c6d78c52a3cdbdd43c8bb3ec23ae535081a981f83c61d425fc9fe1b6258e7ef78cea580f7df302893840ab3a35e7e5
-DIST CCfits-2.4.tar.gz 1792643 BLAKE2B 5304789d01278884faa9765be3f22e03e7a37370f0f3996045a663d5793a1686ce4c2d379227bae57bee5643ac398242223cb0300337f4ad67b662679019e92e SHA512 b12d455bb6dd631056e02a12e996d3bf0b6169f8922011e4b64f979b08d2ab8f405e14947c6f5d26ad18bf2f5764854a84987ae105944515f533fe6b0b4ef7be
 DIST CCfits-2.5.tar.gz 1416358 BLAKE2B 4c525761f98bdb133f8d0c5fd582db5326dda84dc103a7c816cdf8d1a1fa02ac5b8e9c9431629304e3eaf21b4ec9767796c8b2cc8d22dd877a2e043084cae683 SHA512 63ab4d153063960510cf60651d5c832824cf85f937f84adc5390c7c2fb46eb8e9f5d8cda2554d79d24c7a4f1b6cf0b7a6e20958fb69920b65d7c362c0a5f26b5
-EBUILD ccfits-2.4-r1.ebuild 918 BLAKE2B 2f817e91add7ee23a1575355b4978ff241be1bba2fed999f59b24a1bd04248d0d48856ee4390cb874542aec83f1c0724cba27d0ffb39f976eced8b5c81728303 SHA512 bc7f26b5dbad51c16f35fc3f5892523eba313cfefdfd9687f408d5fea1961cd69a1badffc416469dfae30b927da5d5dd01f241747fd7ccad8e05af2f1351866e
-EBUILD ccfits-2.5.ebuild 859 BLAKE2B 2b00b9e3fc988db20fbe2023c614d089b426d1bb0ad0727e9fbaec89eb61c88940a91b202034b83d2c2e091ee79c06d3db29796764c050b89edb22680b62a080 SHA512 35adc47118a47e76b324f352496f5d047763b1a7c02f2a46f908f1e14647b55dff7b45a142704c29b943a2246472bde508d6e204120356e13fa4e364bb1e393e
+EBUILD ccfits-2.5.ebuild 857 BLAKE2B 79284aa94e87dea6da937cc40a1d5df881c7a9e3580e45589df5a01465832e1bdfde735645882ca18ff76f0c967b407b3a274db1b72eb4559d0a174e4a830ccf SHA512 1f54a64b7aba19bc36be0dfe7e36b3526950ef8ddd6c33860514108194e347021480ecb710befb7f1d2c8bd3c3ede2b0b477640064c3dff2d6dd8ca807f2df34
 MISC metadata.xml 639 BLAKE2B 6cccb8d66f9dcde2f82383b919dcf67122a8d27f24641b262899831bc60b19b4cf433df5e1d05fcd2a140b20bfbb5a1add4bee162ba7574834a50c455f983a85 SHA512 163801f94ad9076cf5306b4f06682fc7186e724704b4ad1e5dfca871fc770ed0b06827caa2aa83eeebc7bb65b5bbc27f254431d6472735abb30f0872eeccf721
diff --git a/sci-libs/ccfits/ccfits-2.4-r1.ebuild b/sci-libs/ccfits/ccfits-2.4-r1.ebuild
deleted file mode 100644
index 56d8533e3fd9..000000000000
--- a/sci-libs/ccfits/ccfits-2.4-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-MYPN=CCfits
-MYP=${MYPN}-${PV}
-
-DESCRIPTION="C++ interface for cfitsio"
-HOMEPAGE="https://heasarc.gsfc.nasa.gov/fitsio/CCfits/"
-SRC_URI="https://heasarc.gsfc.nasa.gov/fitsio/CCfits/${MYP}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs"
-
-RDEPEND=">=sci-libs/cfitsio-3.080"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MYPN}"
-
-DOCS=( CHANGES README.INSTALL )
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2-makefile.patch # avoid building cookbook by default and no rpath
-)
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	AT_M4DIR=config/m4 eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	if use doc; then
-		DOCS+=( *.pdf )
-		HTML_DOCS=( html/. )
-	fi
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/ccfits/ccfits-2.5.ebuild b/sci-libs/ccfits/ccfits-2.5.ebuild
index c2dbe59e5bce..4dcbba0d8ac3 100644
--- a/sci-libs/ccfits/ccfits-2.5.ebuild
+++ b/sci-libs/ccfits/ccfits-2.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://heasarc.gsfc.nasa.gov/fitsio/CCfits/${MYP}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND=">=sci-libs/cfitsio-3.080"