gentoo resync : 10.02.2020

3 files changed, 2 insertions, 51 deletions

diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index 5c2a1e62ea51..d6256059a01f 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -1,9 +1,8 @@
 AUX zziplib-0.13.69-SDL-test.patch 453 BLAKE2B 645e55b034ec72abbab26fad4062cf9f7137aeeac2cc33aad89d9b86f4b616b5bdd256d383bfaa3252459caa2150f1b6426d3ca31ce8c055d0cae92d81547cd1 SHA512 2a524efc04721459cfb744ce7d0e3b6a4412e791250442632093116e181642184ba3cfa4a93fff8bdb792a03c293ab317696a78aed422ec75c26448552bc5721
-AUX zziplib-0.13.69-disable-docs.patch 1700 BLAKE2B f0e4ef353a9c0d86d8eb345bf03bd1f1008e81a019cc60ab480e66327fe0db06b6efb35c5ac556c1539426b56a88a9bc4ff8974f9600414d5d1fa7a4cdc577d6 SHA512 3c0b95209e215d955b1710d08dc4976caaedb512aec926b376adb7393c1cff4c269ee5741feddd8a1c4ca5e5ebfa987d40ffe5d966d799e659bc5606acd2b6dd
 DIST zziplib-0.13.69-html.tar.xz 152536 BLAKE2B 05f14b2e6d2e3af4488096eabc1614222cb9607e832618e7534cb55a022f2ba3d2c6f8c6337f4bf9e80a350e43eb05a4c1708b63efa5e0ed10297a5f19ec7adb SHA512 211a83594d4043a29472f9c556d72ad486e40f28d55426b970b8b0617aca76f9dcbd4a3ca5991df943dfac1a1cab623b19aa04fb6ef7807a7740730e01926205
 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 2365 BLAKE2B 391f285ed2defd290ef3bb2a399d0ecadf353c4fc95e6eb9087c6c802b5b75a5cac17d588e2dc5f5734423019b4f51e78656534527e89a9e9394b0ed762f513b SHA512 b9d8552ff972a391050f2c6ec02be81010c2fa3773eaf255756af742344d7afc77a08c1cbd653b89f3e04c1ac63c063559e6b10fdce9196e70735dab89890f61
+EBUILD zziplib-0.13.69-r1.ebuild 2364 BLAKE2B 5735aa94ff5fd4c6d20ce8340a94f80351662d74a29456738193b719880eb0ae2a8f829eaa8ebcd37867fb6af1cb9fbd0a98f6a3278b80ff8f703a0e0be5d210 SHA512 860c611315be3fe8fb8e5d07c3e76889e45afa390b39fb16110d731ca695506ecea9d648f704c1a0eb88853425ee393cb08a2432d05d955b53cf0a6d73ceb7b1
 EBUILD zziplib-0.13.69.ebuild 2321 BLAKE2B 70b2339cb6a663bab224a73258c433fb2bff1f20d2bb380a5f34ca54d40b43bcaf1d479bb61cfd5f02527c332cebda6ccc1bd87a68aecc0d6fbb6d250879fbe3 SHA512 5fdecae3196a733820c06bf9107edf51825d0401e7b95521793d0000d50a3f3b099e56cd611b7f9ddb5d252b7c5a1c184a50b0443f069c85410c032a048426cd
 MISC metadata.xml 244 BLAKE2B fc7489e331f708001ddc94cbb6b4e2c22d80c32883cb48c8044da1c8326143eed049e7f867342bb5b389f9252949f89dcb3084369729d52e49a8924d842d4693 SHA512 73f6d031dd2239ef69ea83120b253dbd61d8db15603514a673da83c3cbe9f7f881613e5fa3387917428b994bab1bd466e49ebe2c7a68829f0f2551e0124620a0
diff --git a/dev-libs/zziplib/files/zziplib-0.13.69-disable-docs.patch b/dev-libs/zziplib/files/zziplib-0.13.69-disable-docs.patch
deleted file mode 100644
index 8b492d10f56e..000000000000
--- a/dev-libs/zziplib/files/zziplib-0.13.69-disable-docs.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From b34cf087aaa0b02c4a9c9ab6959a3567ad31acea Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 17 Jan 2020 02:01:01 +0100
-Subject: [PATCH] Disable building docs (requires python2)
-
----
- Makefile.am | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index c54b2cc..560c9e6 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -3,8 +3,8 @@ ACLOCAL_AMFLAGS = -I m4
- WANT_AUTOMAKE = 1.7
- WANT_AUTOCONF = 2.57
- 
--DIST_SUBDIRS = zzip zzipwrap bins test docs  SDL
--SUBDIRS =      zzip zzipwrap bins test docs @SDL@
-+DIST_SUBDIRS = zzip zzipwrap bins test  SDL
-+SUBDIRS =      zzip zzipwrap bins test @SDL@
- 
- rpm: dist-bzip2 $(PACKAGE).spec
- 	rpmbuild -ta $(PACKAGE)-$(VERSION).tar.bz2
-@@ -62,9 +62,9 @@ osc-distclean:
- indent-check:
- 	(cd zzip && $(MAKE) `basename $@`)
- 
--doc docs docu clean-doc clean-docs clean-docu   zzip.html zzip.xml zzip.pdf \
-+doc docu clean-doc clean-clean-docu   zzip.html zzip.xml zzip.pdf \
- man mans manpages htmpages unpack clean-unpack  changes.htm pdfs \
--omf install-omf install-doc install-docs install-man3 install-mans \
-+omf install-omf install-doc install-install-man3 install-mans \
- upload-sourceforge www:
- 	(cd docs && $(MAKE) `basename $@`)
- 
-@@ -104,7 +104,7 @@ msvc6/zziptest.dsp     msvc6/zzip.dsp
- EXTRA_DIST =   zziplib.spec zzipback.sed Makefile.mk \
-                $(MSVC8) $(MSVC7) $(MSVC6) $(am__aclocal_m4_deps)
- 
--PHONY = auto boottrap rpm doc docs man manpages htmpages sdl testsdl \
-+PHONY = auto boottrap rpm doc man manpages htmpages sdl testsdl \
- 	comp compats msvc6 msvc7
- # ------------------------------------------------------------------------
- 
--- 
-2.25.0
-
diff --git a/dev-libs/zziplib/zziplib-0.13.69-r1.ebuild b/dev-libs/zziplib/zziplib-0.13.69-r1.ebuild
index 9ea820e6eed9..9adb168f5ea5 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 ~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 )"