gentoo resync : 23.09.2020

4 files changed, 47 insertions, 11 deletions

diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index ad580b6ac819..bd23e08d4a18 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -1,11 +1,11 @@
 AUX zziplib-0.13.69-009-perror.patch 499 BLAKE2B ffbf0a74204a575068843c55a538dd858a76bd3e7592fbc0860f7201877c9aebfcbf14ca2cb42274b71843acceceb9b3240d34423639f7f4835641ad5a95a86c SHA512 10720e172c1482e7d2f1241dffaef2f4f41ae94724cd3617c9b39e2ada558a173eb4e262121f49661e9101d260f429aad6c94c9e7c1eb6dfe56aa807e87d6510
 AUX zziplib-0.13.71-find-bash.patch 1758 BLAKE2B d4d98b1886a67867de90fc303f2bc6aab07e1c27fd8fc1827ddd30b8d8427938c4bccff14359de683585aa8ebfbc4a675ad98acf6e6fa982bb1254e4aac8eb1e SHA512 e939072da1e27008f0d23145e74cd37574426a6d4b2d578bc0a8e880054b89580bf4a48c81b70f6232251216d2f73cf5c071dfd0cb7bfd2f6f1f5dd09738efc7
-AUX zziplib-0.13.71-installing-man3-pages.patch 654 BLAKE2B c9a990258795e997c99642ba1c3489a097d07d7c90663d6205accccc87728d6861db446407f0457711bddd997bad29c82b25412286e3e52380c03bd5e4f7f101 SHA512 65cdfea81902f38af24dea828caf3bc562471ca0ee5e711b4ab6c1f344c9cf63efc09b3fc038fe971b3a2e3933fb411dbb0af65b37b5b76f75e56704d07dfb36
+AUX zziplib-0.13.71-installing-man3-pages.patch 1588 BLAKE2B f2b00692d7a1c06cee51748242211c220e9a16da8f21cf33c26a2c2b8f708faa171e63218c8bc7d789794bea6fafe198e0f713400589524f0cd9bb7e49640589 SHA512 213732d9a6b0cb9bd20ffd7563fd9b0fe2f673ad44888b4c393afc8b37e5e207cedce8d71bb776a91089f61ca084917797b9e3206f0ee32cf443d9ee4abb62a2
 AUX zziplib-0.13.71-join-paths-pc-zzipsdldir.patch 1250 BLAKE2B 77ba09afa144ac5aaf1393d1bd612590e664d0885eb34354f2fa8cfd28005d225d1960f25d4b56d32956c13e99315e3e067a83b8f7f2c84703dff1e718f8dff1 SHA512 b81b34885aa1017b0f0d834565818b2464e0c827b2c428c14442b4d741bfa91c90e5915af98cf4fcbeababf29bb89a13f76efa98b4de1a88ac3659f666069110
 AUX zziplib-0.13.71-shell-DESTDIR.patch 3206 BLAKE2B 4f542e0f26ce332e75f341dfdd84b9907cf1e1c67f259d3626e34284991421e1931ee2f896d36dc444b37d7873269a21e780992e25b689f8ca57e5def9ae27fe SHA512 427a633de7b5928fe6150d8e5a711bc48c3d68978344ae840da512919c8151215bcc2b29f025cabd5204db9561d71d1925394f7695ddfbd9b4137c53d52b32da
 AUX zziplib-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch 5840 BLAKE2B fac60aa6271dd189198ea7b9640567378def938a09d2362acf60a4aeb2a3787121f644685fb4f1310459eb665b509951c02ad7a40a78a216b9778e7599dd764f SHA512 ed6d3101587d6d0088bffb1bb1483cffe1629d2ff5301e88cdab8e654bac79f84534012e129d7c17ff23beb19ca46a96598894cd383040d41993732ff62ab05d
 DIST zziplib-0.13.71.tar.gz 1150654 BLAKE2B 00394de5da8b3c5b95ef0aea060e523354845261b846e3c876b13d2d05c6569496475a279d6b211c3215a6f17e6bfe53958baabcebb13cd72d30a9f0c40d9449 SHA512 e035d0ac26dca78335ae3defc652543ff7b353a1a95d76ed1beeb21a08e16f287a62d488f528cfbb77d5b558581b68d439aa0823577524e9aa61a3cf5f208cb5
 DIST zziplib-0.13.71_p20200419.tar.gz 1153032 BLAKE2B 34aa38fde43805636a83f34c064ab09880b7200c414d3666786b7d750a26d8f39dbb431dde7cb81e785cd20a0d444e2a7308b5c79eb71bf0e9f52a051fe01883 SHA512 7f94524ddd745d81656ea9b0314db791e636ed9a8305c4fde7f88572b0302bff4c7f8fa76ccf368b7b8b1c8062a4ad85dfab8f30cdf6ee37f835ff5758751222
-EBUILD zziplib-0.13.71-r2.ebuild 1697 BLAKE2B e0bd52b503282616a25e68ea19c97710dc125a7f7d425ac8e856a861cbdfe6f861364984bd89f6893ff4cc549c7014606e02f87c44133c2c4486e8c6172cbb8c SHA512 6ea9b49bf19412a20a952242ff56aa7a3d5148552e92d168ca4d61507ccdea9b2480c07afe773ef4b6ab103873a8de9e43e137fb5e6e4ef03c671e2c06ac4c26
-EBUILD zziplib-0.13.71_p20200419.ebuild 1424 BLAKE2B 3aed19e9f270d72517f7267bec8c0e85f4682578ec5a60e4ae03ddefa76adc11d1cadf0d07174013deb98e9d9f1cc33188f8071e6fb67400bb0309158a00dd92 SHA512 f3ff2dfa70c3c059c55ff6b5a1e4ef6b6102ce9ce46ac053da6c4760001c9ec0405e7b15887b008d2095334245167037bc52c5e9027ec5fe376b994d8dc807e3
+EBUILD zziplib-0.13.71-r2.ebuild 1700 BLAKE2B cfeba81175ad06f4ba3caafe065fd9e7922759338c6de1fe00553f13150737ff91278ef7bfc6745646720d94dd8667222e7b32abdb522129d63e345494305699 SHA512 eff9630a050fb3d492e44339e6109a57ce065bdca8a2084199803673c6d5781f37b1f99a9a5e7ae09771032daac7671be420e4668a842f2dd432b5ef3f2657bb
+EBUILD zziplib-0.13.71_p20200419.ebuild 1878 BLAKE2B 8a81295a1c2161b049b97eb379d0629ed5e01d3e1f975aac59af75dc3490551c1316cf9314b208d70de5c07e13a4a6502014c8f5aacc7e0b0c9f64263ab8c411 SHA512 4a240b12ac796847d985d5bc2fb50105ac251d63006e5e18646afc335262199744d6816ee5e8c9bf19d771cf537891eb1cb3d7c9d79344f0b6f8e189ee093c43
 MISC metadata.xml 504 BLAKE2B 406cd214aabfba1e0061bab2db1f297ad2e20df92d9ab4f381153a1e5434fb6138565949e2356ed79579df98343c5300c516c9bb0c0883eb026e144181d52b18 SHA512 a7b627e728607f9902420489fe7f3bdca2a5f165f25b1bf5d1a361e92ab40a1b70b212e97bed6c70793210103c6f45407d02faa3990237272373d40942aa11a9
diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-installing-man3-pages.patch b/dev-libs/zziplib/files/zziplib-0.13.71-installing-man3-pages.patch
index 08130f958dda..55fb4be7a51c 100644
--- a/dev-libs/zziplib/files/zziplib-0.13.71-installing-man3-pages.patch
+++ b/dev-libs/zziplib/files/zziplib-0.13.71-installing-man3-pages.patch
@@ -1,9 +1,28 @@
-# https://github.com/gdraheim/zziplib/issues/93
 diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index b679f7b..e2887ee 100644
+index b679f7b..cafa6b4 100644
 --- a/docs/CMakeLists.txt
 +++ b/docs/CMakeLists.txt
-@@ -190,7 +190,7 @@ add_custom_target(install-manpages
+@@ -126,9 +126,10 @@ add_custom_command(OUTPUT manpages.tar
+     COMMAND ${BASH} -c "test -d man3/man3 && mv man3 man3_; test -d man3_/man3 && mv man3_/man3 .; rm -rf man3_"
+     COMMAND ${BASH} -c "chmod 664 man3/*.3"
+     COMMAND ${BASH} -c "tar cf manpages.tar man3"
+-    COMMAND ${BASH} -c "ls -l `pwd`/manpages.tar `pwd`/htmpages.tar >&2 || true"
++    COMMAND ${BASH} -c "ls -l `pwd`/manpages.tar >&2 || true"
+     DEPENDS zziplib.xml zzipmmapped.xml zzipfseeko.xml
+     VERBATIM)
++if(ZZIP_HTMPAGES)
+ add_custom_command(OUTPUT htmpages.tar
+     COMMAND ${BASH} -c "test -d html && rm -rf html; mkdir html"
+     COMMAND ${PY} ${srcdir}/dbk2man.py -o html html zziplib.xml
+@@ -139,6 +140,7 @@ add_custom_command(OUTPUT htmpages.tar
+     COMMAND ${BASH} -c "ls -l `pwd`/htmpages.tar `pwd`/manpages.tar >&2 || true"
+     DEPENDS zziplib.xml zzipmmapped.xml zzipfseeko.xml
+     VERBATIM)
++endif()
+ 
+ add_custom_target(manpages DEPENDS manpages.tar)
+ add_custom_target(htmpages DEPENDS htmpages.tar)
+@@ -190,7 +192,7 @@ if(ZZIP_HTMPAGES)
  endif()
  if(ZZIP_MANPAGES)
     install(CODE "message(STATUS \"Installing: man3 pages to ${mandir}/man3\")")
diff --git a/dev-libs/zziplib/zziplib-0.13.71-r2.ebuild b/dev-libs/zziplib/zziplib-0.13.71-r2.ebuild
index 20fc04ec8876..8cea5e4c9cc0 100644
--- a/dev-libs/zziplib/zziplib-0.13.71-r2.ebuild
+++ b/dev-libs/zziplib/zziplib-0.13.71-r2.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
 inherit cmake flag-o-matic python-any-r1
 
 DESCRIPTION="Lightweight library for extracting data from files archived in a single zip file"
diff --git a/dev-libs/zziplib/zziplib-0.13.71_p20200419.ebuild b/dev-libs/zziplib/zziplib-0.13.71_p20200419.ebuild
index cc20d2152c50..ffa83af37362 100644
--- a/dev-libs/zziplib/zziplib-0.13.71_p20200419.ebuild
+++ b/dev-libs/zziplib/zziplib-0.13.71_p20200419.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
 inherit cmake flag-o-matic python-any-r1
 
 MY_COMMIT="223930775aa5b325f04cec01f0b18726a7918821"
-
 DESCRIPTION="Lightweight library for extracting data from files archived in a single zip file"
 HOMEPAGE="https://github.com/gdraheim/zziplib http://zziplib.sourceforge.net/"
 SRC_URI="https://github.com/gdraheim/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
@@ -16,8 +16,11 @@ LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0/13"
 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="sdl static-libs test"
-
-RESTRICT="!test? ( test )"
+# Tests fail for now, only recently added.
+# Restricted to avoid blocking stabilisations.
+# https://github.com/gdraheim/zziplib/issues/97
+RESTRICT="test"
+#RESTRICT="!test? ( test )"
 
 BDEPEND="
 	${PYTHON_DEPS}
@@ -40,6 +43,14 @@ pkg_setup() {
 	python-any-r1_pkg_setup
 }
 
+src_prepare() {
+	sed -e "/^topsrcdir/s:..\/..::" \
+		-e "/^bindir/s:\.\.:${WORKDIR}/${P}_build:" \
+		-e 's:\(..\/\)\+{exe}:{exe}:' \
+		-i test/zziptests.py || die
+	cmake_src_prepare
+}
+
 src_configure() {
 	append-flags -fno-strict-aliasing # bug reported upstream
 
@@ -54,3 +65,8 @@ src_configure() {
 
 	cmake_src_configure
 }
+
+src_test() {
+	cd "$S"/test/ || die
+	"${EPYTHON}" "$S"/test/zziptests.py || die "Tests failed with ${EPYTHON}"
+}