gentoo Easter resync : 12.04.2020

3 files changed, 6 insertions, 95 deletions

diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index f4e6cddfc35e..76178c557379 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -3,6 +3,5 @@ DIST zziplib-0.13.69-html.tar.xz 152536 BLAKE2B 05f14b2e6d2e3af4488096eabc161422
 DIST zziplib-0.13.69-man.tar.xz 10988 BLAKE2B 2c3c5cfd17b3d3e17a3e72031b2246e32c9fe471b9578a4717c128725493054ceafc34763a763d31cf5532f082a596a6bceb8e417ef70476a59f4daa0a14b587 SHA512 5a804896a2d06b1d32d6b8715ffdb374ff7179145d033e919acecd46426dad3e44d4889adabce33e7f6bbc18e2b70b50a8a059498bf4f1f3d6844dda90c33c7e
 DIST zziplib-0.13.69-patches.tar.xz 5000 BLAKE2B 4612052bb8a312831daec9283cad8593b2161e2acd76122a982339154cd76d58b5398c61f605e3e29e0f63399c9a176710f95a1e6632ff4e1249ac596978006b SHA512 16190e20b8c722f3aee8e77ef7cc24026976b067402430c833d21761a13e32ed5f2eff543a2c13469e442d01c2ed5ae373badd6b8851c962852d6c09620a0d91
 DIST zziplib-0.13.69.tar.gz 1132204 BLAKE2B 92e9f5e95665c7a47d1e472f570402e3c174d404abf461bed644ea8a37ff7661ee98b8fa241728aae375e32c470f2f48a817f72410eeda81a6a3be6e6bdb2635 SHA512 ade026289737f43ca92a8746818d87dd7618d473dbce159546ce9071c9e4cbe164a6b1c9efff16efb7aa0327b2ec6b34f3256c6bda19cd6e325703fffc810ef0
-EBUILD zziplib-0.13.69-r1.ebuild 2361 BLAKE2B af4642c8a4984606064d25849dfa92ca4cba3081782a4f3fc117b01f7a24bf69ff4cf00509853a8e2740b3406df6a603e9d3a0b0651f84e4c8c2a3c03faa9768 SHA512 844ca1ed790f525021527f4891d607a0d2f9759bf604069b0240acd796b76e921d5a3acb74a5713544d2784de56e768414ade79cba775b67f46da5282692048d
-EBUILD zziplib-0.13.69.ebuild 2321 BLAKE2B 001e06fe6a5597f9bf3f71fa3513fa08cfb5c99b999376faaa1f2201ae2bb4070d4208f7c9c1e9817120eb75bc997871e604f20d83a9a5ce98520ecb5d500bd7 SHA512 73b06d0a465c7340ddc38444ce44a30e71e90d36db7e9a5f965376fb9d49aac72fbbf1b21b58d105d8d7e7e20ce2beb4710b932761c509963b9889c4035661d9
+EBUILD zziplib-0.13.69-r1.ebuild 2412 BLAKE2B 60415e9912525a046630ecca9f466801a3bfe29a5f48e48c937508f9ba6cda2f55974e218d3dbf9e41196798f049851e6e4c68871a09ee7dacd05afe892012bb SHA512 e7ff6954f36159d88e74fe0789d7a38b1ac22516f189170533e2b05a8bf9455c8cb459af7794be0bf81ae3af4c58a6b0abcddce8282357c5f4daf727134bd912
 MISC metadata.xml 244 BLAKE2B fc7489e331f708001ddc94cbb6b4e2c22d80c32883cb48c8044da1c8326143eed049e7f867342bb5b389f9252949f89dcb3084369729d52e49a8924d842d4693 SHA512 73f6d031dd2239ef69ea83120b253dbd61d8db15603514a673da83c3cbe9f7f881613e5fa3387917428b994bab1bd466e49ebe2c7a68829f0f2551e0124620a0
diff --git a/dev-libs/zziplib/zziplib-0.13.69-r1.ebuild b/dev-libs/zziplib/zziplib-0.13.69-r1.ebuild
index 2157af9f0a5f..852084f7d26c 100644
--- a/dev-libs/zziplib/zziplib-0.13.69-r1.ebuild
+++ b/dev-libs/zziplib/zziplib-0.13.69-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/gdraheim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc sdl static-libs test"
 
 RESTRICT="!test? ( test )"
@@ -35,6 +35,10 @@ RDEPEND="${DEPEND}"
 
 PATCHES=( "${WORKDIR}"/${P}-patches )
 
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
 src_prepare() {
 	default
 	eautoreconf
diff --git a/dev-libs/zziplib/zziplib-0.13.69.ebuild b/dev-libs/zziplib/zziplib-0.13.69.ebuild
deleted file mode 100644
index dce05955c343..000000000000
--- a/dev-libs/zziplib/zziplib-0.13.69.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools libtool flag-o-matic python-any-r1
-
-DESCRIPTION="Lightweight library for extracting data from files archived in a single zip file"
-HOMEPAGE="http://zziplib.sourceforge.net/"
-SRC_URI="https://github.com/gdraheim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc sdl static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-libs/zlib
-	sdl? ( >=media-libs/libsdl-1.2.6 )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	test? ( app-arch/zip )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.13.69-SDL-test.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-
-	python_fix_shebang .
-
-	# workaround AX_CREATE_PKGCONFIG_INFO bug #353195
-	sed -i \
-		-e '/ax_create_pkgconfig_ldflags/s:$LDFLAGS::' \
-		-e '/ax_create_pkgconfig_cppflags/s:$CPPFLAGS::' \
-		configure || die
-
-	# zziplib tries to install backwards compat symlinks we dont want
-	sed -i -e '/^zzip-postinstall:/s|$|\ndisable-this:|' Makefile.in || die
-	sed -i -e '/^install-exec-hook:/s|$|\ndisable-this:|' zzip/Makefile.in || die
-
-	elibtoolize
-
-	# Do an out-of-tree build as their configure will do it automatically
-	# otherwise and that can lead to funky errors. #492816
-	mkdir -p build
-}
-
-src_configure() {
-	cd "${S}"/build
-
-	append-flags -fno-strict-aliasing # bug reported upstream
-	export ac_cv_path_XMLTO= # man pages are bundled in .tar's
-
-	local myeconfargs=(
-		$(use_enable sdl)
-		$(use_enable static-libs static)
-	)
-
-	# Disable aclocal probing as the default path works #449156
-	ECONF_SOURCE=${S} ACLOCAL=true \
-		econf "${myeconfargs[@]}"
-	MAKEOPTS+=' -C build'
-}
-
-src_install() {
-	default
-
-	# fowners fails when we don't have enough permissions (Prefix)
-	if [[ ${EUID} == 0 ]] ; then
-		fowners -R root /usr/share/man #321975
-	fi
-
-	find "${ED}" -name "*.la" -delete || die
-
-	if use doc ; then
-		docinto html
-		dodoc -r docs/*
-	fi
-}
-
-src_test() {
-	# need this because `make test` will always return true
-	# tests fail with -j > 1 (bug #241186)
-	emake -j1 check
-}