gentoo resync : 20.02.2019

3 files changed, 8 insertions, 77 deletions

diff --git a/app-forensics/afflib/Manifest b/app-forensics/afflib/Manifest
index 3006a79df8ac..236b7bdbc7be 100644
--- a/app-forensics/afflib/Manifest
+++ b/app-forensics/afflib/Manifest
@@ -1,9 +1,7 @@
 AUX afflib-3.6.12-pyaff-header.patch 330 BLAKE2B 37b682545d6c193a5c2668bbfa81990fe4e7497fafcffe97c6e4fb01e0cb2001a3e23e522cdcc143ee6dc969e2e9782fbf378286e226d2bf45f552a17ab2903c SHA512 9d57dd60bfe933961a5df4e4be2e8bee1bca0971bbb364c7c3888bc9b54ca7073e03864d30e4401abba3fff7ff5f7435b5219299f8f781d0fbbf065bfa9c800e
 AUX afflib-3.7.1-python-module.patch 540 BLAKE2B bac33993b6a7e8933c71eeba7730a0614bd22b7db6fbebf0c13974a338cc9cddd428b283669a3cde15464709931d50dc88aa3c75a0d8b86cdce15f81e17657c6 SHA512 3309977b2b1bd716d244e76e1ab6c270dc91e7b8e9e32bbfb11f017df6e08de47f11aaf4fa91cd79153c54cad7ada09d001197da3460105dcf017d6647b39974
-DIST afflib-3.7.17.tar.gz 533720 BLAKE2B da38d29b7dedc07a7594f24e263e04645aa0f04e561af1f31e54a40c76e62d8eff0e815ee5592d1bfe2e8873fc53701f0126bf0d0b595ce2df5d61f8bb52dc8c SHA512 21067a8cb7c7b3d75f91883b2f9b1c978e055a2df6331dc68245332226d042a6b82f9f5d996e6bd1d5155de511827d5636c75ab1ee0a6957815aab3bb1cff49b
+DIST afflib-3.7.18.tar.gz 540371 BLAKE2B 6c1837ebcb5cca97622736f38e61c35f149c045bc1a60acea455dd9059e8c60447cd8f45304fd55aa7f2e5f783d40e266a23d09b33209f9dc5441f971b8a188d SHA512 47ab74c86bbaedc2494558962f99463066e267f7a3f583902a53e1f488085a309b0d871093c67439033272c3ebf03d213649886930b9812013e66782ea84df85
 DIST afflib-3.7.4.tar.gz 569346 BLAKE2B e296bf58499bff4d44c9f5e1dd7363b4a68581213ff04ab14ffbe35b877c8307da03fb49e967a722ad9869f6284de496b86258f1b20c7c9e6b6a6cdcf473a03f SHA512 58791388a05d614dd5f219a74173de2ff0938a1f93b21e2dd0731aca52ea544ba60cc4325f0d284937467ce600a4302b7a2f724d84710ecc7f12db1a22a8e41c
-DIST afflib-3.7.8.tar.gz 518399 BLAKE2B 80bc168d63ff53d8f3c60aeb2a1f0d25eec39a1d850095f694a11b755d3a0cc9765be4ed076d07cb98185e8375004d12592d14c1fc370c95a15f054d02f96a55 SHA512 a547ea459c479ccba1b4805bcbbac6f670abdccf8fe6685406d0662483a2b643652e3798e6396ecb24cfeea9bf711f636aeebb64794637ee54e7dbb62c0bdbb7
-EBUILD afflib-3.7.17.ebuild 1503 BLAKE2B e022c9f7e3fd716c9c044ca03720a645874718241bce929263e70874762bb3244952aa4366f1ff514ebeb9fdf54268adaf9dfe704ec601e8d8dfcb3876abd536 SHA512 1a701fdc67e0808436e2b45ed0eef36e5e74cc9efcc1efcb53b94d5f1d443eceec6320dd04d66b08770de52f3d25db366966a281415db6d73029649d480cbb45
+EBUILD afflib-3.7.18.ebuild 1509 BLAKE2B b5f9bd61a735879c332e18d9401a6176fb1db35c9f04e7120a03db701f36e43453e217163c90261a5591b4fb4ebdacc162058bc7a93ceb57b1f65285eb92b83c SHA512 2d6d9514b5ef8427d3431454c658118a8e7e470826ba5806137fef10de13c8887885244140c6b5c836b1bc9bdc560738362113735bd6781e20dc0353f3c61de0
 EBUILD afflib-3.7.4.ebuild 1549 BLAKE2B 0ef8a65f815f5d8e37ad7c8ebf0b6a03b8a644cd96265417792a412f32228ba3e03bcfba1fe79733b3bd00bc1762215d65a6c16f1aaeb2ec05263f1bd5fe4617 SHA512 80601cd55941257eafcef2871ed27352983f5946d7a693ae42f809e7b1dca6cabb380fa6392abb29fcdf45266f991f9a2493c1eb280e84f59771a2c4d617b3da
-EBUILD afflib-3.7.8.ebuild 1530 BLAKE2B afdfb443c4cf9df7cd590370a39b241b5be1bec9fe435aad375926892140e6aa25100d24e8f47f4bd9762b88ee212aee2f728c7262d5c2ef35a9b04d3795e2bf SHA512 75f5af879d32f7628ee2a44b848c5a449d2c79fe15628a9afd6f32ad77bf1e976e23d5a4eb70324d5f76d47dccdb95cd45111ccda3524f9489d2119bb302abfd
 MISC metadata.xml 429 BLAKE2B 64f4ca1a2220e6b7dedc1b9886c271e2cdc96013d63f2262ae7510f5189ec69fefc0b616dbe94d4cd21cf9cef13809ebec12c99e18415fb97691dec08a8da04f SHA512 172d0b4a9759b0bd5153e1cecf1a2c1b3f0927528fbc76941fe19c77f6960455628af22823c81b156b8575cacfe58d525950bafcdb31aca752752274ec989191
diff --git a/app-forensics/afflib/afflib-3.7.17.ebuild b/app-forensics/afflib/afflib-3.7.18.ebuild
index b83099399703..720fd1226f8f 100644
--- a/app-forensics/afflib/afflib-3.7.17.ebuild
+++ b/app-forensics/afflib/afflib-3.7.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,15 +19,17 @@ 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
+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 )"
+	s3? ( net-misc/curl )
+"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/app-forensics/afflib/afflib-3.7.8.ebuild b/app-forensics/afflib/afflib-3.7.8.ebuild
deleted file mode 100644
index 0a4795a67809..000000000000
--- a/app-forensics/afflib/afflib-3.7.8.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils 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 ncurses python qemu readline s3 static-libs threads"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="dev-libs/expat
-	dev-libs/openssl:0=
-	sys-libs/zlib
-	fuse? ( sys-fs/fuse )
-	ncurses? ( sys-libs/ncurses:0= )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	s3? ( net-misc/curl )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.7.1-python-module.patch
-	"${FILESDIR}"/${PN}-3.6.12-pyaff-header.patch
-)
-
-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
-	prune_libtool_files --modules
-}