gentoo resync : 08.01.2021

4 files changed, 3 insertions, 72 deletions

diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index b7d95ad857e4..9a43c5e367c7 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/afflib/Manifest b/app-forensics/afflib/Manifest
index 33200b62bcfe..92530678056a 100644
--- a/app-forensics/afflib/Manifest
+++ b/app-forensics/afflib/Manifest
@@ -1,6 +1,4 @@
 AUX afflib-3.7.19-search-path.patch 1132 BLAKE2B 8314c7591277658c704f0e82105ecb2af7e70761aaab1e9329aa72f400a4b3774e2ba3ccc6e271b4a1be78b0935cbac058acb3e5dbc8e16123e9d3f21b4ef018 SHA512 80551435c89a7dbacfbce5c9d73a47e89d31600511abffab9a8235b60b0b398bc26d10a144676c99e5f11b680a994a2ffc8eab3409a332f708f5cdd5782985fb
-DIST afflib-3.7.18.tar.gz 540371 BLAKE2B 6c1837ebcb5cca97622736f38e61c35f149c045bc1a60acea455dd9059e8c60447cd8f45304fd55aa7f2e5f783d40e266a23d09b33209f9dc5441f971b8a188d SHA512 47ab74c86bbaedc2494558962f99463066e267f7a3f583902a53e1f488085a309b0d871093c67439033272c3ebf03d213649886930b9812013e66782ea84df85
 DIST afflib-3.7.19.tar.gz 540165 BLAKE2B dea0998741121d2c1ae0e42ced9652ec46816282128469af75e0a32f9e4e2d09ac4afb4888ee7925366a03a867932f2446bfcd3800ab4dc021939ab6c38c797b SHA512 6e0df7477bf7dbd3814099d94e3fce122e0cf9b714a425521b7458f4eedc6e8b8e7283fd37926b7c992cdf21d3adec620df29a79a6a5311bf1d1b5d4930768bc
-EBUILD afflib-3.7.18.ebuild 1498 BLAKE2B cef6627be9d3e9e983270f45fe9ebd4be21ffae6ad66db61fb65bb395a3b11cf4973083e1101d3c551d2f673734a5e7b5f4d4fe11241debb442ec1668db730dc SHA512 2d8cdc929c9807cf6e36b74125dd509521301f52102c07f5f9b92ca776ff8f3be1fb5533b23b04158173fc9bbe9f22a28cbe081e39c214454464af3b0e304f73
-EBUILD afflib-3.7.19.ebuild 1681 BLAKE2B 3635de01499a48e589fb3b104b000e22640c95559d043cd348decc98908ae1b8dc59efc70fe659a2fc0f3bf6fc75e37ec73701a9058c926928d8f62b6b296745 SHA512 7eebc4d407b8324661e5c89154e152a842f7d066ec6a2b76326ab4b990e41afe0423d2b1ea63884d29b6b738cfcbc107d7882fb035d0d8405c36c83f323f4f5a
+EBUILD afflib-3.7.19.ebuild 1678 BLAKE2B 985843b0f2a5b95bcf32bc943416d9cf296ecc2280be2f98312bc176979b7a875f9ff2931c98a415e226e82e5e2fb0c0921bde920bdaf77f29de088730493241 SHA512 e2f91e9b7ef2352e1ca784c7c2c346b3fbce0da686f772d05449e0f2bd9d19c17787ec70208e94261f5e30ed68b31240c0fcc193511741b5caa571543c816fcc
 MISC metadata.xml 429 BLAKE2B 64f4ca1a2220e6b7dedc1b9886c271e2cdc96013d63f2262ae7510f5189ec69fefc0b616dbe94d4cd21cf9cef13809ebec12c99e18415fb97691dec08a8da04f SHA512 172d0b4a9759b0bd5153e1cecf1a2c1b3f0927528fbc76941fe19c77f6960455628af22823c81b156b8575cacfe58d525950bafcdb31aca752752274ec989191
diff --git a/app-forensics/afflib/afflib-3.7.18.ebuild b/app-forensics/afflib/afflib-3.7.18.ebuild
deleted file mode 100644
index b8c40e67d71d..000000000000
--- a/app-forensics/afflib/afflib-3.7.18.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit autotools python-single-r1
-
-MY_PN=AFFLIBv3
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Library that implements the AFF image standard"
-HOMEPAGE="https://github.com/sshock/AFFLIBv3/"
-SRC_URI="https://github.com/sshock/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc x86 ~x64-macos"
-IUSE="fuse libressl ncurses python qemu readline s3 static-libs threads"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/expat
-	sys-libs/zlib:0=
-	fuse? ( sys-fs/fuse:= )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )
-	ncurses? ( sys-libs/ncurses:0= )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	s3? ( net-misc/curl )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i '/FLAGS/s: -g::' configure.ac || die
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Hacks for automagic dependencies
-	use ncurses || export ac_cv_lib_ncurses_initscr=no
-	use readline || export ac_cv_lib_readline_readline=no
-
-	local myeconfargs=(
-		$(use_enable fuse)
-		$(use_enable python)
-		$(use_enable qemu)
-		$(use_enable s3)
-		$(use_enable static-libs static)
-		$(use_enable threads threading)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/app-forensics/afflib/afflib-3.7.19.ebuild b/app-forensics/afflib/afflib-3.7.19.ebuild
index 20fece7ebabd..f8e09116e700 100644
--- a/app-forensics/afflib/afflib-3.7.19.ebuild
+++ b/app-forensics/afflib/afflib-3.7.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~hppa ppc x86 ~x64-macos"
 IUSE="fuse libressl ncurses python qemu readline s3 static-libs threads"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # Tests don't play well with sandbox