* [gentoo-commits] repo/gentoo:master commit in: dev-libs/zziplib/, dev-libs/zziplib/files/
@ 2019-01-03 9:55 Lars Wendler
0 siblings, 0 replies; 4+ messages in thread
From: Lars Wendler @ 2019-01-03 9:55 UTC (permalink / raw
To: gentoo-commits
commit: 5da92145f220cedef0799c8fadecd430f2046218
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 3 09:54:55 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Jan 3 09:55:08 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5da92145
dev-libs/zziplib: Bump to version 0.13.69
Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
dev-libs/zziplib/Manifest | 1 +
.../zziplib/files/zziplib-0.13.69-SDL-test.patch | 14 ++++
dev-libs/zziplib/zziplib-0.13.69.ebuild | 91 ++++++++++++++++++++++
3 files changed, 106 insertions(+)
diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index acdb84670d2..7ae3c8d24a6 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -1 +1,2 @@
DIST zziplib-0.13.62.tar.bz2 685770 BLAKE2B 24ef46370cd490498cedeea4b83abffd40b4bf7092ca994defb0c7c90a2c6863c56d19933dca1b20700ed9a55369cd1e8d3f6e1c5ed966b966d15eed4e5b75aa SHA512 fd3b9e9015ba7603bdebd8f6a2ac6d11003705bfab22f3a0025f75455042664aea69440845b59e6f389417dff5ac777f49541d8cbacb2a220e67d20bb6973e25
+DIST zziplib-0.13.69.tar.gz 1132204 BLAKE2B 92e9f5e95665c7a47d1e472f570402e3c174d404abf461bed644ea8a37ff7661ee98b8fa241728aae375e32c470f2f48a817f72410eeda81a6a3be6e6bdb2635 SHA512 ade026289737f43ca92a8746818d87dd7618d473dbce159546ce9071c9e4cbe164a6b1c9efff16efb7aa0327b2ec6b34f3256c6bda19cd6e325703fffc810ef0
diff --git a/dev-libs/zziplib/files/zziplib-0.13.69-SDL-test.patch b/dev-libs/zziplib/files/zziplib-0.13.69-SDL-test.patch
new file mode 100644
index 00000000000..7f85b686469
--- /dev/null
+++ b/dev-libs/zziplib/files/zziplib-0.13.69-SDL-test.patch
@@ -0,0 +1,14 @@
+this test isnt even run automatically and the dependencies are all broken,
+so just disable it and be done
+
+--- zziplib-0.13.69/SDL/Makefile.am
++++ zziplib-0.13.69/SDL/Makefile.am
+@@ -5,7 +5,7 @@
+ zzipsdl_DATA = SDL_rwops_zzip.c SDL_rwops_zzip.h
+
+ EXTRA_DIST = $(sdl_DATA)
+-check_PROGRAMS = zzcatsdl
++check_PROGRAMS =
+
+ zzcatsdl_SOURCES = SDL_rwops_zzcat.c SDL_rwops_zzip.c
+ ZZIP_CFLAGS= `export PKG_CONFIG_PATH=../zzip; pkg-config zziplib --cflags`
diff --git a/dev-libs/zziplib/zziplib-0.13.69.ebuild b/dev-libs/zziplib/zziplib-0.13.69.ebuild
new file mode 100644
index 00000000000..973505427e7
--- /dev/null
+++ b/dev-libs/zziplib/zziplib-0.13.69.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc sdl static-libs 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
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/zziplib/, dev-libs/zziplib/files/
@ 2020-01-17 2:40 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2020-01-17 2:40 UTC (permalink / raw
To: gentoo-commits
commit: 96a37b919d95cd982eb4bbee6901dca6f3c54c17
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 17 01:31:11 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 17 02:38:13 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96a37b91
dev-libs/zziplib: Patch away docs build depending on python2
So far, man and html docs were always built with only html installed
conditionally. Provide pre-generated tarballs instead.
Python dependency remains only for test.
Add missing || die.
Bug: https://bugs.gentoo.org/700490
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-libs/zziplib/Manifest | 2 +
.../files/zziplib-0.13.69-disable-docs.patch | 48 ++++++++++++
dev-libs/zziplib/zziplib-0.13.69-r1.ebuild | 90 ++++++++++++++++++++++
3 files changed, 140 insertions(+)
diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index 5ec366a6c5a..75d60a5e23b 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -1 +1,3 @@
+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.tar.gz 1132204 BLAKE2B 92e9f5e95665c7a47d1e472f570402e3c174d404abf461bed644ea8a37ff7661ee98b8fa241728aae375e32c470f2f48a817f72410eeda81a6a3be6e6bdb2635 SHA512 ade026289737f43ca92a8746818d87dd7618d473dbce159546ce9071c9e4cbe164a6b1c9efff16efb7aa0327b2ec6b34f3256c6bda19cd6e325703fffc810ef0
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
new file mode 100644
index 00000000000..8b492d10f56
--- /dev/null
+++ b/dev-libs/zziplib/files/zziplib-0.13.69-disable-docs.patch
@@ -0,0 +1,48 @@
+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
new file mode 100644
index 00000000000..54f0d278073
--- /dev/null
+++ b/dev-libs/zziplib/zziplib-0.13.69-r1.ebuild
@@ -0,0 +1,90 @@
+# 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
+ https://dev.gentoo.org/~asturm/distfiles/${P}-man.tar.xz
+ doc? ( https://dev.gentoo.org/~asturm/distfiles/${P}-html.tar.xz )"
+
+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 )"
+
+BDEPEND="
+ virtual/pkgconfig
+ test? (
+ ${PYTHON_DEPS}
+ app-arch/zip
+ )
+"
+DEPEND="
+ sys-libs/zlib
+ sdl? ( >=media-libs/libsdl-1.2.6 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-SDL-test.patch
+ "${FILESDIR}"/${P}-disable-docs.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+
+ use test && 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 || die
+}
+
+src_configure() {
+ cd "${S}"/build || die
+
+ append-flags -fno-strict-aliasing # bug reported upstream
+
+ 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() {
+ use doc && local HTML_DOCS=( "${WORKDIR}"/html/. )
+ default
+ doman "${WORKDIR}"/man3/*
+ find "${D}" -name '*.la' -type f -delete || die
+}
+
+src_test() {
+ # need this because `make test` will always return true
+ # tests fail with -j > 1 (bug #241186)
+ emake -j1 check
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/zziplib/, dev-libs/zziplib/files/
@ 2020-08-15 9:30 Joonas Niilola
0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2020-08-15 9:30 UTC (permalink / raw
To: gentoo-commits
commit: 48f85b04cad6910dfeda4f6f7bae80b3a19c6cd3
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Jul 27 10:26:42 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Aug 15 09:29:48 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48f85b04
dev-libs/zziplib: 0.13.71 version bump
Closes: https://bugs.gentoo.org/723418
Thanks to Nico R. for the ebuild attached to the bug
Adding myself as a proxied maintainer
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/16851
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-libs/zziplib/Manifest | 1 +
.../zziplib/files/zziplib-0.13.69-009-perror.patch | 13 ++
.../zziplib/files/zziplib-0.13.71-find-bash.patch | 44 +++++++
.../zziplib-0.13.71-join-paths-pc-zzipsdldir.patch | 26 ++++
.../files/zziplib-0.13.71-shell-DESTDIR.patch | 51 ++++++++
...-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch | 137 +++++++++++++++++++++
dev-libs/zziplib/metadata.xml | 9 +-
dev-libs/zziplib/zziplib-0.13.71.ebuild | 68 ++++++++++
8 files changed, 348 insertions(+), 1 deletion(-)
diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index 9c8fa1075fe..84aef6fe9d6 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -2,3 +2,4 @@ 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
+DIST zziplib-0.13.71.tar.gz 1150654 BLAKE2B 00394de5da8b3c5b95ef0aea060e523354845261b846e3c876b13d2d05c6569496475a279d6b211c3215a6f17e6bfe53958baabcebb13cd72d30a9f0c40d9449 SHA512 e035d0ac26dca78335ae3defc652543ff7b353a1a95d76ed1beeb21a08e16f287a62d488f528cfbb77d5b558581b68d439aa0823577524e9aa61a3cf5f208cb5
diff --git a/dev-libs/zziplib/files/zziplib-0.13.69-009-perror.patch b/dev-libs/zziplib/files/zziplib-0.13.69-009-perror.patch
new file mode 100644
index 00000000000..678ff3670df
--- /dev/null
+++ b/dev-libs/zziplib/files/zziplib-0.13.69-009-perror.patch
@@ -0,0 +1,13 @@
+Index: zziplib-0.13.69/bins/unzip-mem.c
+===================================================================
+--- zziplib-0.13.69.orig/bins/unzip-mem.c
++++ zziplib-0.13.69/bins/unzip-mem.c
+@@ -93,7 +93,7 @@ static void zzip_mem_entry_make(ZZIP_MEM
+ {
+ FILE* file = fopen (entry->zz_name, "wb");
+ if (file) { zzip_mem_entry_pipe (disk, entry, file); fclose (file); }
+- perror (entry->zz_name);
++ else perror (entry->zz_name);
+ if (status < EXIT_WARNINGS) status = EXIT_WARNINGS;
+ }
+
diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-find-bash.patch b/dev-libs/zziplib/files/zziplib-0.13.71-find-bash.patch
new file mode 100644
index 00000000000..e29599c1b2d
--- /dev/null
+++ b/dev-libs/zziplib/files/zziplib-0.13.71-find-bash.patch
@@ -0,0 +1,44 @@
+diff --git a/SDL/CMakeLists.txt b/SDL/CMakeLists.txt
+index 7ceba4a..c1b8172 100644
+--- a/SDL/CMakeLists.txt
++++ b/SDL/CMakeLists.txt
+@@ -47,6 +47,7 @@ endif()
+
+ if(SDL_FOUND)
+ if(UNIX)
++find_package ( UnixCommands REQUIRED ) # bash
+ join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
+ join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
+ add_custom_command(OUTPUT SDL_rwops_zzip.pc
+diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt
+index a9f6e3a..2cdd275 100644
+--- a/zzip/CMakeLists.txt
++++ b/zzip/CMakeLists.txt
+@@ -194,6 +194,7 @@ SET_TARGET_PROPERTIES(libzzipmmapped PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVE
+ endif()
+
+ if(ZZIPCOMPAT)
++find_package ( UnixCommands REQUIRED ) # bash
+ add_custom_command(OUTPUT compat/zzip.h
+ COMMAND ${BASH} -c "rm -rf compat; mkdir compat"
+ COMMAND ${BASH} -c "echo '#ifndef ZZIP_WARNING' > compat/zzip.h"
+@@ -215,6 +216,7 @@ add_custom_target(compat ALL DEPENDS compat/zzip.h)
+ endif()
+
+ if(UNIX)
++find_package ( UnixCommands REQUIRED ) # bash
+ join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
+ join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
+ add_custom_command(OUTPUT zziplib.pc
+diff --git a/zzipwrap/CMakeLists.txt b/zzipwrap/CMakeLists.txt
+index 220d93b..d0bf1ae 100644
+--- a/zzipwrap/CMakeLists.txt
++++ b/zzipwrap/CMakeLists.txt
+@@ -49,6 +49,7 @@ target_link_libraries(zzipwrap libzzipwrap )
+ target_include_directories(zzipwrap PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
+
+ if(UNIX)
++find_package ( UnixCommands REQUIRED ) # bash
+ join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
+ join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
+ add_custom_command(OUTPUT zzipwrap.pc
diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-join-paths-pc-zzipsdldir.patch b/dev-libs/zziplib/files/zziplib-0.13.71-join-paths-pc-zzipsdldir.patch
new file mode 100644
index 00000000000..7597f989dcc
--- /dev/null
+++ b/dev-libs/zziplib/files/zziplib-0.13.71-join-paths-pc-zzipsdldir.patch
@@ -0,0 +1,26 @@
+commit 497c1598cea9dcb13d210de59b1dc65425ca5fdb
+Author: Jan Tojnar <jtojnar@gmail.com>
+Date: Thu Apr 16 20:09:11 2020 +0200
+
+ build: Produce more correct pc file with zzipsdldir
+
+ Just like described in commit 892dea3b82208654cc9f57ffc4ef555d0d934cf5,
+ the CMAKE_INSTALL_INCLUDEDIR variable can be absolute path so simply
+ appending it to \${prefix} might not work.
+
+diff --git a/SDL/CMakeLists.txt b/SDL/CMakeLists.txt
+index 7ceba4a..6a4f860 100644
+--- a/SDL/CMakeLists.txt
++++ b/SDL/CMakeLists.txt
+@@ -49,9 +49,10 @@ if(SDL_FOUND)
+ if(UNIX)
+ join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
+ join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
++join_paths(pc_zzipsdldir "\${prefix}" "${zzipsdldir}")
+ add_custom_command(OUTPUT SDL_rwops_zzip.pc
+ COMMAND ${BASH} -c "echo 'prefix=${CMAKE_INSTALL_PREFIX}' > SDL_rwops_zzip.pc"
+- COMMAND ${BASH} -c "echo 'zzipsdldir=\${prefix}/${zzipsdldir}' >> SDL_rwops_zzip.pc"
++ COMMAND ${BASH} -c "echo 'zzipsdldir=${pc_zzipsdldir}' >> SDL_rwops_zzip.pc"
+ COMMAND ${BASH} -c "echo '' >> SDL_rwops_zzip.pc"
+ COMMAND ${BASH} -c "echo 'Name: SDL_rwops_zzip' >> SDL_rwops_zzip.pc"
+ COMMAND ${BASH} -c "echo 'Version: ${PROJECT_VERSION}' >> SDL_rwops_zzip.pc"
diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-shell-DESTDIR.patch b/dev-libs/zziplib/files/zziplib-0.13.71-shell-DESTDIR.patch
new file mode 100644
index 00000000000..582a1504ee0
--- /dev/null
+++ b/dev-libs/zziplib/files/zziplib-0.13.71-shell-DESTDIR.patch
@@ -0,0 +1,51 @@
+commit 75e22f3c365b62acbad8d8645d5404242800dfba
+Author: Guido Draheim <guidod@gmx.de>
+Date: Fri Apr 17 20:47:59 2020 +0200
+
+ #88 use shell $DESTDIR instead of make $(DESTDIR)
+
+diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
+index 442e877..d1284e6 100644
+--- a/docs/CMakeLists.txt
++++ b/docs/CMakeLists.txt
+@@ -145,27 +145,27 @@ string(REPLACE ";" " " all_bins_FILES "${bins_FILES}")
+ string(REPLACE ";" " " all_SDLs_FILES "${SDLs_FILES}")
+ add_custom_target(install-site
+ COMMAND ${BASH} -c "ls -l ${CMAKE_CURRENT_BINARY_DIR}/site.html"
+- COMMAND ${BASH} -c "mkdir -vp $(DESTDIR)${docdir} >&2 || ls -ld $(DESTDIR)${docdir} >&2"
+- COMMAND ${BASH} -c "cd ${outdir} && cp zziplib.html zzipmmapped.html zzipfseeko.html $(DESTDIR)${docdir}/"
+- COMMAND ${BASH} -c "cd ${srcdir} && cp README.* COPYING.* $(DESTDIR)${docdir}/"
+- COMMAND ${BASH} -c "cd ${topdir} && cp ChangeLog $(DESTDIR)${docdir}/"
+- COMMAND ${BASH} -c "cd ${topdir} && cp ${all_bins_FILES} $(DESTDIR)${docdir}/"
+- COMMAND ${BASH} -c "cd ${topdir} && cp ${all_SDLs_FILES} $(DESTDIR)${docdir}/"
+- COMMAND ${BASH} -c "cd $(DESTDIR)${docdir} && cp ${outdir}/*.html ."
+- COMMAND ${BASH} -c "cd $(DESTDIR)${docdir} && ln -s zzip-index.html index.html"
++ COMMAND ${BASH} -c "mkdir -vp $DESTDIR${docdir} >&2 || ls -ld $DESTDIR${docdir} >&2"
++ COMMAND ${BASH} -c "cd ${outdir} && cp zziplib.html zzipmmapped.html zzipfseeko.html $DESTDIR${docdir}/"
++ COMMAND ${BASH} -c "cd ${srcdir} && cp README.* COPYING.* $DESTDIR${docdir}/"
++ COMMAND ${BASH} -c "cd ${topdir} && cp ChangeLog $DESTDIR${docdir}/"
++ COMMAND ${BASH} -c "cd ${topdir} && cp ${all_bins_FILES} $DESTDIR${docdir}/"
++ COMMAND ${BASH} -c "cd ${topdir} && cp ${all_SDLs_FILES} $DESTDIR${docdir}/"
++ COMMAND ${BASH} -c "cd $DESTDIR${docdir} && cp ${outdir}/*.html ."
++ COMMAND ${BASH} -c "cd $DESTDIR${docdir} && ln -s zzip-index.html index.html"
+ DEPENDS site.html zziplib.html zzipmmapped.html zzipfseeko.html
+ VERBATIM)
+ add_custom_target(install-htmpages
+ COMMAND ${BASH} -c "ls -l ${CMAKE_CURRENT_BINARY_DIR}/*pages.tar"
+- COMMAND ${BASH} -c "mkdir -vp $(DESTDIR)${docdir} >&2 || ls -ld $(DESTDIR)${docdir} >&2"
+- COMMAND ${BASH} -c "cd $(DESTDIR)${docdir} && tar x -f ${outdir}/htmpages.tar"
+- COMMAND ${BASH} -c "cd $(DESTDIR)${docdir} && mv html man"
++ COMMAND ${BASH} -c "mkdir -vp $DESTDIR${docdir} >&2 || ls -ld $DESTDIR${docdir} >&2"
++ COMMAND ${BASH} -c "cd $DESTDIR${docdir} && tar x -f ${outdir}/htmpages.tar"
++ COMMAND ${BASH} -c "cd $DESTDIR${docdir} && mv html man"
+ DEPENDS htmpages.tar
+ VERBATIM)
+ add_custom_target(install-manpages
+ COMMAND ${BASH} -c "ls -l ${CMAKE_CURRENT_BINARY_DIR}/*pages.tar"
+- COMMAND ${BASH} -c "mkdir -vp $(DESTDIR)${mandir} >&2 || ls -ld $(DESTDIR)${mandir} >&2"
+- COMMAND ${BASH} -c "cd $(DESTDIR)${mandir} && tar xf ${outdir}/manpages.tar"
++ COMMAND ${BASH} -c "mkdir -vp $DESTDIR${mandir} >&2 || ls -ld $DESTDIR${mandir} >&2"
++ COMMAND ${BASH} -c "cd $DESTDIR${mandir} && tar xf ${outdir}/manpages.tar"
+ DEPENDS manpages.tar
+ VERBATIM)
+ add_custom_target(install-docs DEPENDS install-manpages install-htmpages install-site)
diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch b/dev-libs/zziplib/files/zziplib-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch
new file mode 100644
index 00000000000..d2436ae9012
--- /dev/null
+++ b/dev-libs/zziplib/files/zziplib-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch
@@ -0,0 +1,137 @@
+commit ddaa538e8cfa46413b0e92613b54123e4b759616
+Author: Guido Draheim <guidod@gmx.de>
+Date: Fri Apr 17 20:46:30 2020 +0200
+
+ #88 adding testbuilds/opensuse15-ninja-sdl2.dockerfile
+
+diff --git a/testbuilds.py b/testbuilds.py
+index 756e77e..35ac70c 100755
+--- a/testbuilds.py
++++ b/testbuilds.py
+@@ -1080,6 +1080,42 @@ class ZZiplibBuildTest(unittest.TestCase):
+ cmd = "docker rmi {images}:{testname}"
+ sx____(cmd.format(**locals()))
+ self.rm_testdir()
++ def test_431_opensuse15_ninja_sdl2_dockerfile(self):
++ if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test")
++ testname=self.testname()
++ testdir = self.testdir()
++ dockerfile="testbuilds/opensuse15-ninja-sdl2.dockerfile"
++ addhosts = self.local_addhosts(dockerfile)
++ savename = docname(dockerfile)
++ saveto = SAVETO
++ images = IMAGES
++ build = "build --build-arg=no_check=true"
++ cmd = "docker {build} . -f {dockerfile} {addhosts} --tag {images}:{testname}"
++ sh____(cmd.format(**locals()))
++ cmd = "docker rm --force {testname}"
++ sx____(cmd.format(**locals()))
++ cmd = "docker run -d --name {testname} {images}:{testname} sleep 60"
++ sh____(cmd.format(**locals()))
++ #:# container = self.ip_container(testname)
++ cmd = "docker exec {testname} ls -l /usr/local/bin"
++ sh____(cmd.format(**locals()))
++ cmd = "docker exec {testname} find /usr/local/include -type f"
++ sh____(cmd.format(**locals()))
++ cmd = "docker exec {testname} bash -c 'ls -l /usr/local/lib64/libzz*'"
++ sh____(cmd.format(**locals()))
++ #
++ cmd = "docker exec {testname} bash -c 'test -d /usr/local/include/SDL_rwops_zzip'"
++ sh____(cmd.format(**locals()))
++ #
++ cmd = "docker rm --force {testname}"
++ sx____(cmd.format(**locals()))
++ cmd = "docker rmi {saveto}/{savename}:latest"
++ sx____(cmd.format(**locals()))
++ cmd = "docker tag {images}:{testname} {saveto}/{savename}:latest"
++ sh____(cmd.format(**locals()))
++ cmd = "docker rmi {images}:{testname}"
++ sx____(cmd.format(**locals()))
++ self.rm_testdir()
+ def test_701_centos7_am_docs_dockerfile(self):
+ if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test")
+ testname=self.testname()
+@@ -1520,6 +1556,53 @@ class ZZiplibBuildTest(unittest.TestCase):
+ cmd = "docker rm --force {testname2}"
+ sx____(cmd.format(**locals()))
+ self.rm_testdir()
++ def test_9431_opensuse_ninja_sdl2_dockerfile(self):
++ if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test")
++ testname1=self.testname() + "_1"
++ testname2=self.testname() + "_2"
++ testdir = self.testdir()
++ dockerfile1="testbuilds/opensuse15-sdl2.dockerfile"
++ dockerfile2="testbuilds/opensuse15-ninja-sdl2.dockerfile"
++ addhosts = self.local_addhosts(dockerfile1)
++ savename1 = docname(dockerfile1)
++ savename2 = docname(dockerfile2)
++ saveto = SAVETO
++ images = IMAGES
++ cmd = "docker rm --force {testname1}"
++ sx____(cmd.format(**locals()))
++ cmd = "docker rm --force {testname2}"
++ sx____(cmd.format(**locals()))
++ cmd = "docker run -d --name {testname1} {addhosts} {saveto}/{savename1} sleep 600"
++ sh____(cmd.format(**locals()))
++ cmd = "docker run -d --name {testname2} {addhosts} {saveto}/{savename2} sleep 600"
++ #
++ sh____(cmd.format(**locals()))
++ cmd = "docker exec {testname2} bash -c 'cd /usr/local && tar czvf /local.tgz .'"
++ sh____(cmd.format(**locals()))
++ cmd = "docker cp {testname2}:/local.tgz tmp.local.tgz"
++ sh____(cmd.format(**locals()))
++ cmd = "docker cp tmp.local.tgz {testname1}:/local.tgz"
++ sh____(cmd.format(**locals()))
++ cmd = "rm tmp.local.tgz"
++ sh____(cmd.format(**locals()))
++ cmd = "docker exec {testname1} mkdir -p /new/local"
++ sh____(cmd.format(**locals()))
++ cmd = "docker exec {testname1} bash -c 'cd /new/local && tar xzvf /local.tgz'"
++ sh____(cmd.format(**locals()))
++ #
++ item="{}"
++ end="\\;"
++ cmd = "docker exec {testname1} diff -urw --no-dereference /usr/local /new/local"
++ sx____(cmd.format(**locals()))
++ out = output(cmd.format(**locals()))
++ self.assertFalse(greps(out, "---"))
++ self.assertFalse(greps(out, "Only"))
++ #
++ cmd = "docker rm --force {testname1}"
++ sx____(cmd.format(**locals()))
++ cmd = "docker rm --force {testname2}"
++ sx____(cmd.format(**locals()))
++ self.rm_testdir()
+ def test_9711_centos7_docs_dockerfile(self):
+ if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test")
+ testname1=self.testname() + "_1"
+diff --git a/testbuilds/opensuse15-ninja-sdl2.dockerfile b/testbuilds/opensuse15-ninja-sdl2.dockerfile
+new file mode 100644
+index 0000000..8a46dd4
+--- /dev/null
++++ b/testbuilds/opensuse15-ninja-sdl2.dockerfile
+@@ -0,0 +1,24 @@
++FROM opensuse/leap:15.1
++ARG no_check=false
++ARG no_install=false
++# -DMAKE_INSTALL_PREFIX:PATH=/usr
++
++RUN zypper refresh repo-oss
++RUN zypper install -r repo-oss -y gcc zlib-devel python3 cmake unzip zip gzip tar libSDL2-devel ninja
++
++RUN mkdir src
++COPY CMakeLists.txt README COPYING.LIB ChangeLog src/
++COPY CMakeScripts src/CMakeScripts
++COPY bins src/bins
++COPY docs src/docs
++COPY test src/test
++COPY SDL src/SDL
++COPY zzipwrap src/zzipwrap
++COPY zzip src/zzip
++
++RUN mkdir src/build
++RUN cd src/build && cmake .. -GNinja
++RUN cd src/build && ninja
++RUN $no_check || (cd src/build && ninja check VERBOSE=1)
++RUN $no_install || (cd src/build && ninja install)
++
diff --git a/dev-libs/zziplib/metadata.xml b/dev-libs/zziplib/metadata.xml
index e127af63717..c47cd2c82f8 100644
--- a/dev-libs/zziplib/metadata.xml
+++ b/dev-libs/zziplib/metadata.xml
@@ -1,7 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gentoo@pogatzki.net</email>
+ <name>Volkmar W. Pogatzki</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">zziplib</remote-id>
</upstream>
diff --git a/dev-libs/zziplib/zziplib-0.13.71.ebuild b/dev-libs/zziplib/zziplib-0.13.71.ebuild
new file mode 100644
index 00000000000..c325793d994
--- /dev/null
+++ b/dev-libs/zziplib/zziplib-0.13.71.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+inherit cmake eutils 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 ~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 )"
+
+BDEPEND="
+ doc? (
+ ${PYTHON_DEPS}
+ )
+ test? (
+ ${PYTHON_DEPS}
+ app-arch/zip
+ )
+"
+DEPEND="
+ sys-libs/zlib
+ sdl? ( >=media-libs/libsdl-1.2.6 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/zziplib-0.13.69-009-perror.patch
+ "${FILESDIR}"/zziplib-0.13.71-join-paths-pc-zzipsdldir.patch
+ "${FILESDIR}"/zziplib-0.13.71-find-bash.patch
+ "${FILESDIR}"/zziplib-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch
+ "${FILESDIR}"/zziplib-0.13.71-shell-DESTDIR.patch
+)
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ (use test || use doc) && python_fix_shebang .
+}
+
+src_configure() {
+ append-flags -fno-strict-aliasing # bug reported upstream
+
+ append-cppflags -D_ZZIP_LARGEFILE
+ local mycmakeargs=(
+ -DZZIPCOMPAT=OFF
+ -DZZIPSDL="$(usex sdl ON OFF)"
+ -DBUILD_STATIC_LIBS="$(usex static-libs ON OFF)"
+ -DBUILD_TESTS="$(usex test ON OFF)"
+ -DZZIPTEST="$(usex test ON OFF)"
+ -DZZIPDOCS="$(usex doc ON OFF)"
+ -DZZIPWRAP=OFF
+ )
+
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/zziplib/, dev-libs/zziplib/files/
@ 2021-02-18 23:12 Conrad Kostecki
0 siblings, 0 replies; 4+ messages in thread
From: Conrad Kostecki @ 2021-02-18 23:12 UTC (permalink / raw
To: gentoo-commits
commit: 4dc79694189a14ac69fabfb14e7fdafbb154942e
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Feb 16 12:53:44 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Feb 18 23:12:29 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dc79694
dev-libs/zziplib: remove old
Closes: https://github.com/gentoo/gentoo/pull/19487
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
dev-libs/zziplib/Manifest | 2 -
.../zziplib/files/zziplib-0.13.69-009-perror.patch | 13 -
...lib-0.13.71-58_manvolnum_should_be_in_.so.patch | 19 --
...13.71-copy_directory_instead_of_unpacking.patch | 54 ----
.../zziplib/files/zziplib-0.13.71-find-bash.patch | 44 ---
.../zziplib-0.13.71-installing-man3-pages.patch | 33 ---
.../zziplib-0.13.71-join-paths-pc-zzipsdldir.patch | 26 --
...iplib-0.13.71-reorganize-ZZIP_OPTIONFLAGS.patch | 317 ---------------------
.../files/zziplib-0.13.71-shell-DESTDIR.patch | 51 ----
...-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch | 137 ---------
dev-libs/zziplib/zziplib-0.13.71-r2.ebuild | 68 -----
dev-libs/zziplib/zziplib-0.13.71_p20201021.ebuild | 55 ----
12 files changed, 819 deletions(-)
diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index 56281af571c..b561f2a5b06 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -1,3 +1 @@
-DIST zziplib-0.13.71.tar.gz 1150654 BLAKE2B 00394de5da8b3c5b95ef0aea060e523354845261b846e3c876b13d2d05c6569496475a279d6b211c3215a6f17e6bfe53958baabcebb13cd72d30a9f0c40d9449 SHA512 e035d0ac26dca78335ae3defc652543ff7b353a1a95d76ed1beeb21a08e16f287a62d488f528cfbb77d5b558581b68d439aa0823577524e9aa61a3cf5f208cb5
-DIST zziplib-0.13.71_p20201021.tar.gz 1151849 BLAKE2B b4caf8b6b03d8de742d4e727a2aa03dd8b5e96df50c6e9d5aaf2df9bc072cd8389959019e41c06bd808f3df8e710dd11d198438bf70e58e5ae278a882d854d5b SHA512 ebbc5bc9e403e203d36cacb0ec5aea9d1750f1a8b144a41748c9475e6cc0b1c3af197a4ef7df5f38f90be40bd4f9b68edbcb4624ceff1d48a47127065e570cb3
DIST zziplib-0.13.72.tar.gz 1162175 BLAKE2B ff5617645e25040e4666e5440651fbb2b04c0505c7bda08b158f44c63c5dd53ec97a9942908314c3b103a4685be49368e964d249fcf9b9d685e328f0ebabdedd SHA512 4bb089e74813c6fac9657cd96e44e4a6469bf86aba3980d885c4573e8db45e74fd07bbdfcec9f36297c72227c8c0b2c37dab1bc4326cef8529960e482fe501c8
diff --git a/dev-libs/zziplib/files/zziplib-0.13.69-009-perror.patch b/dev-libs/zziplib/files/zziplib-0.13.69-009-perror.patch
deleted file mode 100644
index 678ff3670df..00000000000
--- a/dev-libs/zziplib/files/zziplib-0.13.69-009-perror.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: zziplib-0.13.69/bins/unzip-mem.c
-===================================================================
---- zziplib-0.13.69.orig/bins/unzip-mem.c
-+++ zziplib-0.13.69/bins/unzip-mem.c
-@@ -93,7 +93,7 @@ static void zzip_mem_entry_make(ZZIP_MEM
- {
- FILE* file = fopen (entry->zz_name, "wb");
- if (file) { zzip_mem_entry_pipe (disk, entry, file); fclose (file); }
-- perror (entry->zz_name);
-+ else perror (entry->zz_name);
- if (status < EXIT_WARNINGS) status = EXIT_WARNINGS;
- }
-
diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-58_manvolnum_should_be_in_.so.patch b/dev-libs/zziplib/files/zziplib-0.13.71-58_manvolnum_should_be_in_.so.patch
deleted file mode 100644
index 262d309d8d8..00000000000
--- a/dev-libs/zziplib/files/zziplib-0.13.71-58_manvolnum_should_be_in_.so.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 03ddd0ce0864e629256bc078eaadb0d21d0df6d9
-Author: Guido Draheim <guidod@gmx.de>
-Date: Sat Apr 18 02:11:37 2020 +0200
-
- #58 manvolnum should be in .so (see other) manpages
-
-diff --git a/docs/dbk2man.py b/docs/dbk2man.py
-index 49cac4e..e0d93d2 100755
---- a/docs/dbk2man.py
-+++ b/docs/dbk2man.py
-@@ -387,7 +387,7 @@ def refentry2(man, refentry, subdirectory = ".", title = ""):
- refentrytitle = manpage
- filename = "%s/man%s/%s.%s" % (subdirectory, manvolnum, manpage, manvolnum)
- if manpage != refentrytitle:
-- manpagetext = ".so %s.%s\n" % (refentrytitle, manvolnum)
-+ manpagetext = ".so man%s/%s.%s\n" % (manvolnum, refentrytitle, manvolnum)
- writefile(filename, manpagetext)
- else:
- manpagetext = text
diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-copy_directory_instead_of_unpacking.patch b/dev-libs/zziplib/files/zziplib-0.13.71-copy_directory_instead_of_unpacking.patch
deleted file mode 100644
index 51059ed77be..00000000000
--- a/dev-libs/zziplib/files/zziplib-0.13.71-copy_directory_instead_of_unpacking.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-commit 31d8a958610592bce683366c0808fb610f67a366
-Author: Guido Draheim <guidod@gmx.de>
-Date: Sun Apr 19 18:25:16 2020 +0200
-
- copy directory instead of unpacking manpages.tar to install-man #93
-
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 623da24..b679f7b 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -174,33 +174,28 @@ add_custom_target(install-site
- DEPENDS site.html zziplib.html zzipmmapped.html zzipfseeko.html
- VERBATIM)
- add_custom_target(install-htmpages
-- COMMAND ${BASH} -c "ls -l ${CMAKE_CURRENT_BINARY_DIR}/*pages.tar"
- COMMAND ${BASH} -c "mkdir -vp $DESTDIR${docdir} >&2 || ls -ld $DESTDIR${docdir} >&2"
-- COMMAND ${BASH} -c "cd $DESTDIR${docdir} && tar x -f ${outdir}/htmpages.tar"
-+ COMMAND ${BASH} -c "cp -r ${outdir}/html $DESTDIR${docdir}/"
- COMMAND ${BASH} -c "cd $DESTDIR${docdir} && mv html man"
- DEPENDS htmpages.tar
- VERBATIM)
- add_custom_target(install-manpages
-- COMMAND ${BASH} -c "ls -l ${CMAKE_CURRENT_BINARY_DIR}/*pages.tar"
- COMMAND ${BASH} -c "mkdir -vp $DESTDIR${mandir} >&2 || ls -ld $DESTDIR${mandir} >&2"
-- COMMAND ${BASH} -c "cd $DESTDIR${mandir} && tar xf ${outdir}/manpages.tar"
-+ COMMAND ${BASH} -c "cp -r ${outdir}/man3 $DESTDIR${mandir}/"
- DEPENDS manpages.tar
- VERBATIM)
--
-+if(ZZIP_HTMPAGES)
-+ install(CODE "message(STATUS \"Installing: html pages to ${docdir}/man\")")
-+ install(DIRECTORY html/ DESTINATION ${docdir}/man MESSAGE_NEVER)
-+endif()
-+if(ZZIP_MANPAGES)
-+ install(CODE "message(STATUS \"Installing: man3 pages to ${mandir}/man3\")")
-+ install(DIRECTORY man3/ DESTINATION ${mandir}/man3 MESSAGE_NEVER)
-+endif()
- add_custom_target(install-docs DEPENDS install-manpages install-htmpages install-site)
- add_custom_target(install-mans DEPENDS install-manpages)
--
--if(ZZIP_MANPAGES)
--add_custom_target(install-man ALL DEPENDS install-manpages)
--else()
- add_custom_target(install-man DEPENDS install-manpages)
--endif()
--
--if(ZZIP_HTMPAGES)
--add_custom_target(install-htm ALL DEPENDS install-htmpages)
--else()
- add_custom_target(install-htm DEPENDS install-htmpages)
--endif()
-
- # messages #######################################################
-
diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-find-bash.patch b/dev-libs/zziplib/files/zziplib-0.13.71-find-bash.patch
deleted file mode 100644
index 6c62442c5df..00000000000
--- a/dev-libs/zziplib/files/zziplib-0.13.71-find-bash.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/SDL/CMakeLists.txt b/SDL/CMakeLists.txt
-index 7ceba4a..c1b8172 100644
---- a/SDL/CMakeLists.txt
-+++ b/SDL/CMakeLists.txt
-@@ -47,6 +47,7 @@ endif()
-
- if(SDL_FOUND)
- if(UNIX)
-+find_package ( UnixCommands REQUIRED ) # bash
- join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
- join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
- join_paths(pc_zzipsdldir "\${prefix}" "${zzipsdldir}")
-diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt
-index a9f6e3a..2cdd275 100644
---- a/zzip/CMakeLists.txt
-+++ b/zzip/CMakeLists.txt
-@@ -194,6 +194,7 @@ SET_TARGET_PROPERTIES(libzzipmmapped PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVE
- endif()
-
- if(ZZIPCOMPAT)
-+find_package ( UnixCommands REQUIRED ) # bash
- add_custom_command(OUTPUT compat/zzip.h
- COMMAND ${BASH} -c "rm -rf compat; mkdir compat"
- COMMAND ${BASH} -c "echo '#ifndef ZZIP_WARNING' > compat/zzip.h"
-@@ -215,6 +216,7 @@ add_custom_target(compat ALL DEPENDS compat/zzip.h)
- endif()
-
- if(UNIX)
-+find_package ( UnixCommands REQUIRED ) # bash
- join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
- join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
- add_custom_command(OUTPUT zziplib.pc
-diff --git a/zzipwrap/CMakeLists.txt b/zzipwrap/CMakeLists.txt
-index 220d93b..d0bf1ae 100644
---- a/zzipwrap/CMakeLists.txt
-+++ b/zzipwrap/CMakeLists.txt
-@@ -49,6 +49,7 @@ target_link_libraries(zzipwrap libzzipwrap )
- target_include_directories(zzipwrap PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
-
- if(UNIX)
-+find_package ( UnixCommands REQUIRED ) # bash
- join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
- join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
- add_custom_command(OUTPUT zzipwrap.pc
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
deleted file mode 100644
index 55fb4be7a51..00000000000
--- a/dev-libs/zziplib/files/zziplib-0.13.71-installing-man3-pages.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index b679f7b..cafa6b4 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -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\")")
-- install(DIRECTORY man3/ DESTINATION ${mandir}/man3 MESSAGE_NEVER)
-+ install(DIRECTORY ${outdir}/man3/ DESTINATION ${mandir}/man3 MESSAGE_NEVER)
- endif()
- add_custom_target(install-docs DEPENDS install-manpages install-htmpages install-site)
- add_custom_target(install-mans DEPENDS install-manpages)
diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-join-paths-pc-zzipsdldir.patch b/dev-libs/zziplib/files/zziplib-0.13.71-join-paths-pc-zzipsdldir.patch
deleted file mode 100644
index 7597f989dcc..00000000000
--- a/dev-libs/zziplib/files/zziplib-0.13.71-join-paths-pc-zzipsdldir.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 497c1598cea9dcb13d210de59b1dc65425ca5fdb
-Author: Jan Tojnar <jtojnar@gmail.com>
-Date: Thu Apr 16 20:09:11 2020 +0200
-
- build: Produce more correct pc file with zzipsdldir
-
- Just like described in commit 892dea3b82208654cc9f57ffc4ef555d0d934cf5,
- the CMAKE_INSTALL_INCLUDEDIR variable can be absolute path so simply
- appending it to \${prefix} might not work.
-
-diff --git a/SDL/CMakeLists.txt b/SDL/CMakeLists.txt
-index 7ceba4a..6a4f860 100644
---- a/SDL/CMakeLists.txt
-+++ b/SDL/CMakeLists.txt
-@@ -49,9 +49,10 @@ if(SDL_FOUND)
- if(UNIX)
- join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
- join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
-+join_paths(pc_zzipsdldir "\${prefix}" "${zzipsdldir}")
- add_custom_command(OUTPUT SDL_rwops_zzip.pc
- COMMAND ${BASH} -c "echo 'prefix=${CMAKE_INSTALL_PREFIX}' > SDL_rwops_zzip.pc"
-- COMMAND ${BASH} -c "echo 'zzipsdldir=\${prefix}/${zzipsdldir}' >> SDL_rwops_zzip.pc"
-+ COMMAND ${BASH} -c "echo 'zzipsdldir=${pc_zzipsdldir}' >> SDL_rwops_zzip.pc"
- COMMAND ${BASH} -c "echo '' >> SDL_rwops_zzip.pc"
- COMMAND ${BASH} -c "echo 'Name: SDL_rwops_zzip' >> SDL_rwops_zzip.pc"
- COMMAND ${BASH} -c "echo 'Version: ${PROJECT_VERSION}' >> SDL_rwops_zzip.pc"
diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-reorganize-ZZIP_OPTIONFLAGS.patch b/dev-libs/zziplib/files/zziplib-0.13.71-reorganize-ZZIP_OPTIONFLAGS.patch
deleted file mode 100644
index a2567720bfa..00000000000
--- a/dev-libs/zziplib/files/zziplib-0.13.71-reorganize-ZZIP_OPTIONFLAGS.patch
+++ /dev/null
@@ -1,317 +0,0 @@
-commit 5583ccc7a247ee27556ede344e93d3ac1dc72e9b
-Author: Guido Draheim <guidod@gmx.de>
-Date: Sat Apr 18 01:39:56 2020 +0200
-
- reorganize ZZIP_OPTIONFLAGS and make install-man ON by default if UNIX
-
-# diff --git a/GNUmakefile b/GNUmakefile
-# index 3571fd1..53077b0 100644
-# --- a/GNUmakefile
-# +++ b/GNUmakefile
-# @@ -10,10 +10,16 @@ default:
-# @ test ! -f Makefile || test -f build/Makefile || echo 'DONE make all - please run make check (before make install)'
-#
-# .PHONY: build-am build-cm
-# -build-cm: ; mkdir build-cm; cd build-cm && cmake .. -DCMAKE_INSTALL_PREFIX:PATH=$$HOME/local
-# build-am: ; mkdir build-am; cd build-am && sh ../configure --prefix=$$HOME/local --enable-sdl
-# -cm cmake: ; rm -rf build-cm; $(MAKE) build-cm && cd build-cm && $(MAKE) all
-# +build-cm: ; mkdir build-cm; cd build-cm && cmake .. -DCMAKE_INSTALL_PREFIX:PATH=$$HOME/local
-# +build-nj: ; mkdir build-nj; cd build-nj && cmake .. -DCMAKE_INSTALL_PREFIX:PATH=$$HOME/local -GNinja
-# +build-nm: ; mkdir build-nj; cd build-nj && cmake .. -DCMAKE_INSTALL_PREFIX:PATH=$$HOME/local -GNmake
-# am autom: ; rm -rf build-am; $(MAKE) build-am && cd build-am && $(MAKE) all
-# +cm cmake: ; rm -rf build-cm; $(MAKE) build-cm && cd build-cm && $(MAKE) all
-# +nj ninja: ; rm -rf build-nj; $(MAKE) build-nj && cd build-nj && ninja
-# +
-# +build-cm2: ; mkdir build-cm2; cd build-cm2 && cmake .. -DCMAKE_INSTALL_PREFIX:PATH=$$HOME/local -DZZIP_MANPAGES=OFF
-# +cm2: ; rm -rf build-cm2; $(MAKE) build-cm2 && cd build-cm2 && $(MAKE) all
-#
-# new: ; rm -rf build; $(MAKE) default
-#
-diff --git a/SDL/CMakeLists.txt b/SDL/CMakeLists.txt
-index 7ceba4a..c0d68d4 100644
---- a/SDL/CMakeLists.txt
-+++ b/SDL/CMakeLists.txt
-@@ -14,6 +14,15 @@ option(BUILD_STATIC_LIBS "Build the static library" OFF)
- option(BUILD_TESTS "Build test programs" OFF)
- option(MSVC_STATIC_RUNTIME "Build with static runtime libs (/MT)" ON)
-
-+if(UNIX)
-+option(ZZIP_LIBTOOL "Ensure binary compatibility with libtool" ON)
-+option(ZZIP_PKGCONFIG "Generate pkg-config files for linking" ON)
-+else()
-+option(ZZIP_LIBTOOL "Ensure binary compatibility with libtool" OFF)
-+option(ZZIP_PKGCONFIG "Generate pkg-config files for linking" OFF)
-+endif()
-+
-+
- # Zlib library needed
- find_package ( ZLIB REQUIRED )
- # pkg_search_module ( ZZIP zzip )
-@@ -46,7 +55,7 @@ endif()
- # pkgconfig ######################################################
-
- if(SDL_FOUND)
--if(UNIX)
-+if(ZZIP_PKGCONFIG)
- join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
- join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
- join_paths(pc_zzipsdldir "\${prefix}" "${zzipsdldir}")
-@@ -64,5 +73,11 @@ add_custom_target(pkgconfig-sdl ALL DEPENDS SDL_rwops_zzip.pc)
-
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/SDL_rwops_zzip.pc
- DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" )
--endif()
--endif()
-+endif(ZZIP_PKGCONFIG)
-+endif(SDL_FOUND)
-+
-+# messages ##################################################
-+
-+message(STATUS "installing SDL_rwops_zzip example headers: ${SDL_FOUND}")
-+message(STATUS "installing SDL_rwops_zzip pkgconfig files: ${ZZIP_PKGCONFIG}")
-+
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index d1284e6..623da24 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -9,6 +9,14 @@ option(BUILD_SHARED_LIBS "Build a shared library" ON)
- option(BUILD_STATIC_LIBS "Build the static library" OFF)
- option(BUILD_TESTS "Build test programs" OFF)
- option(MSVC_STATIC_RUNTIME "Build with static runtime libs (/MT)" ON)
-+option(ZZIP_HTMLSITE "Generate site html pages from docs" OFF)
-+option(ZZIP_HTMPAGES "Generate html manpages from sources" OFF)
-+
-+if(UNIX)
-+option(ZZIP_MANPAGES "Generate man3 manpages from sources" ON)
-+else()
-+option(ZZIP_MANPAGES "Generate man3 manpages from sources" OFF)
-+endif()
-
- # Zlib library needed
- find_package ( ZLIB REQUIRED )
-@@ -132,14 +140,24 @@ add_custom_command(OUTPUT htmpages.tar
- DEPENDS zziplib.xml zzipmmapped.xml zzipfseeko.xml
- VERBATIM)
-
--add_custom_target(mans DEPENDS manpages)
--add_custom_target(man DEPENDS manpages)
--add_custom_target(htm DEPENDS htmpages)
- add_custom_target(manpages DEPENDS manpages.tar)
- add_custom_target(htmpages DEPENDS htmpages.tar)
- add_custom_target(doc DEPENDS zziplib.xml zzipmmapped.xml zzipfseeko.xml site.html)
- add_custom_target(docs DEPENDS doc manpages htmpages)
-+add_custom_target(mans DEPENDS manpages)
-+
-+if(ZZIP_MANPAGES)
-+add_custom_target(man ALL DEPENDS manpages)
-+else()
-+add_custom_target(man DEPENDS manpages)
-+endif()
-+if(ZZIP_HTMPAGES)
-+add_custom_target(htm ALL DEPENDS htmpages)
-+else()
-+add_custom_target(htm DEPENDS htmpages)
-+endif()
-
-+# install ########################################################
-
- string(REPLACE ";" " " all_bins_FILES "${bins_FILES}")
- string(REPLACE ";" " " all_SDLs_FILES "${SDLs_FILES}")
-@@ -168,13 +186,24 @@ add_custom_target(install-manpages
- COMMAND ${BASH} -c "cd $DESTDIR${mandir} && tar xf ${outdir}/manpages.tar"
- DEPENDS manpages.tar
- VERBATIM)
-+
- add_custom_target(install-docs DEPENDS install-manpages install-htmpages install-site)
- add_custom_target(install-mans DEPENDS install-manpages)
--add_custom_target(install-man DEPENDS install-manpages)
-
--# install ########################################################
--set(mandir ${CMAKE_INSTALL_FULL_MANDIR})
--install(CODE "execute_process(COMMAND ${BASH} -c \"set -e
-- mkdir -vp $DESTDIR/${mandir} || ls -ld $DESTDIR/${mandir}
-- cd $DESTDIR/${mandir} && tar xf ${CMAKE_CURRENT_BINARY_DIR}/manpages.tar
-- \")")
-+if(ZZIP_MANPAGES)
-+add_custom_target(install-man ALL DEPENDS install-manpages)
-+else()
-+add_custom_target(install-man DEPENDS install-manpages)
-+endif()
-+
-+if(ZZIP_HTMPAGES)
-+add_custom_target(install-htm ALL DEPENDS install-htmpages)
-+else()
-+add_custom_target(install-htm DEPENDS install-htmpages)
-+endif()
-+
-+# messages #######################################################
-+
-+message(STATUS "html site to be generated: ${ZZIP_HTMLSITE}" )
-+message(STATUS "man pages to be generated: ${ZZIP_MANPAGES}" )
-+message(STATUS "htm pages to be generated: ${ZZIP_HTMPAGES}" )
-diff --git a/testbuilds/centos7-build.dockerfile b/testbuilds/centos7-build.dockerfile
-index 4509b68..0b7b656 100644
---- a/testbuilds/centos7-build.dockerfile
-+++ b/testbuilds/centos7-build.dockerfile
-@@ -19,4 +19,4 @@ RUN mkdir src/build
- RUN cd src/build && cmake3 ..
- RUN cd src/build && make
- RUN $no_check || (cd src/build && make check)
--RUN $no_install || (cd src/build && make install)
-+RUN $no_install || (cd src/build && make install VERBOSE=1)
-diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt
-index a9f6e3a..2f7eda5 100644
---- a/zzip/CMakeLists.txt
-+++ b/zzip/CMakeLists.txt
-@@ -18,8 +18,16 @@ option(BUILD_STATIC_LIBS "Build the static library" OFF)
- option(MSVC_STATIC_RUNTIME "Build with static runtime libs (/MT)" ON)
- option(ZZIPMMAPPED "Build libzzipmmapped (not fully portable)" ON)
- option(ZZIPFSEEKO "Build libzzipfseeko (based on posix.1 api)" ON)
--option(ZZIPCOMPAT "Build compatibility with old libzzip releases" ON)
--option(ZZIPLIBTOOL "Ensure binary compatibility with libtool" ON)
-+
-+if(UNIX)
-+option(ZZIP_COMPAT "Build compatibility with old libzzip releases" ON)
-+option(ZZIP_LIBTOOL "Ensure binary compatibility with libtool" ON)
-+option(ZZIP_PKGCONFIG "Generate pkg-config files for linking" ON)
-+else()
-+option(ZZIP_COMPAT "Build compatibility with old libzzip releases" OFF)
-+option(ZZIP_LIBTOOL "Ensure binary compatibility with libtool" OFF)
-+option(ZZIP_PKGCONFIG "Generate pkg-config files for linking" OFF)
-+endif()
-
- # used in zzip/_config.h
- set(ZZIP_PACKAGE "${PROJECT_NAME}lib")
-@@ -27,7 +35,7 @@ set(ZZIP_VERSION "${PROJECT_VERSION}")
- set(ZZIP_PACKAGE_NAME "${PROJECT_NAME}lib")
- set(ZZIP_PACKAGE_VERSION "${PROJECT_VERSION}")
-
--if(ZZIPCOMPAT)
-+if(ZZIP_COMPAT)
- find_package ( UnixCommands REQUIRED ) # bash cp mv rm gzip tar
- endif()
-
-@@ -193,7 +201,7 @@ set_target_properties(libzzipmmapped PROPERTIES OUTPUT_NAME "zzipmmapped" RELEAS
- SET_TARGET_PROPERTIES(libzzipmmapped PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVERSION ${VERNUM})
- endif()
-
--if(ZZIPCOMPAT)
-+if(ZZIP_COMPAT)
- add_custom_command(OUTPUT compat/zzip.h
- COMMAND ${BASH} -c "rm -rf compat; mkdir compat"
- COMMAND ${BASH} -c "echo '#ifndef ZZIP_WARNING' > compat/zzip.h"
-@@ -212,9 +220,9 @@ add_custom_command(OUTPUT compat/zzip.h
- BYPRODUCTS compat/zziplib.h compat/zzip-io.h
- VERBATIM)
- add_custom_target(compat ALL DEPENDS compat/zzip.h)
--endif()
-+endif(ZZIP_COMPAT)
-
--if(UNIX)
-+if(ZZIP_PKGCONFIG)
- join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
- join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
- add_custom_command(OUTPUT zziplib.pc
-@@ -235,12 +243,12 @@ add_custom_command(OUTPUT zziplib.pc
- BYPRODUCTS zzipmmapped.pc zzipfseeko.pc
- VERBATIM)
- add_custom_target(pkgconfig ALL DEPENDS zziplib.pc)
--endif()
-+endif(ZZIP_PKGCONFIG)
-
- # install ########################################################
- set(outdir ${CMAKE_CURRENT_BINARY_DIR})
-
--if(UNIX)
-+if(ZZIP_PKGCONFIG)
- install(FILES ${outdir}/zziplib.pc ${outdir}/zzipmmapped.pc ${outdir}/zzipfseeko.pc
- DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" )
- endif()
-@@ -264,7 +272,7 @@ install(TARGETS libzzipmmapped
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
- endif()
-
--if(ZZIPCOMPAT)
-+if(ZZIP_COMPAT)
- install(FILES ${outdir}/compat/zzip.h ${outdir}/compat/zziplib.h ${outdir}/compat/zzip-io.h
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
- if(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG)
-@@ -289,7 +297,7 @@ if(ZZIPCOMPAT)
- endif()
- endif()
-
--if(ZZIPLIBTOOL)
-+if(ZZIP_LIBTOOL)
- if(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG)
- set(lib ${CMAKE_SHARED_LIBRARY_PREFIX})
- set(dll ${CMAKE_SHARED_LIBRARY_SUFFIX})
-@@ -340,4 +348,12 @@ if(ZZIPLIBTOOL)
- ln -svf ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll}.12
- \")")
- endif()
--endif()
-+endif(ZZIP_LIBTOOL)
-+
-+## messages ##############################################
-+
-+message(STATUS "lib zzipfseeko to be compiled: ${ZZIPFSEEKO}")
-+message(STATUS "lib zzipmmapped to be compiled: ${ZZIPFSEEKO}")
-+message(STATUS "lib zzip symlinks as by libtool: ${ZZIP_LIBTOOL}")
-+message(STATUS "installing zzip compat headers: ${ZZIP_COMPAT}")
-+message(STATUS "installing zzip pkgconfig files: ${ZZIP_PKGCONFIG}")
-diff --git a/zzipwrap/CMakeLists.txt b/zzipwrap/CMakeLists.txt
-index 220d93b..8ae0587 100644
---- a/zzipwrap/CMakeLists.txt
-+++ b/zzipwrap/CMakeLists.txt
-@@ -13,7 +13,14 @@ option(BUILD_SHARED_LIBS "Build a shared library" ON)
- option(BUILD_STATIC_LIBS "Build the static library" OFF)
- option(BUILD_TESTS "Build test programs" OFF)
- option(MSVC_STATIC_RUNTIME "Build with static runtime libs (/MT)" ON)
--option(ZZIPLIBTOOL "Ensure binary compatibility with libtool" ON)
-+
-+if(UNIX)
-+option(ZZIP_LIBTOOL "Ensure binary compatibility with libtool" ON)
-+option(ZZIP_PKGCONFIG "Generate pkg-config files for linking" ON)
-+else()
-+option(ZZIP_LIBTOOL "Ensure binary compatibility with libtool" OFF)
-+option(ZZIP_PKGCONFIG "Generate pkg-config files for linking" OFF)
-+endif()
-
- check_include_files ( unistd.h ZZIP_HAVE_UNISTD_H )
- # set ( ZZIP_HAVE_ZLIB_H 1 )
-@@ -48,7 +55,7 @@ add_executable(zzipwrap ${zzipwrap_SRCS} )
- target_link_libraries(zzipwrap libzzipwrap )
- target_include_directories(zzipwrap PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
-
--if(UNIX)
-+if(ZZIP_PKGCONFIG)
- join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
- join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
- add_custom_command(OUTPUT zzipwrap.pc
-@@ -69,7 +76,7 @@ endif()
- # install ########################################################
- set(outdir ${CMAKE_CURRENT_BINARY_DIR})
-
--if(UNIX)
-+if(ZZIP_PKGCONFIG)
- install(FILES ${outdir}/zzipwrap.pc
- DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" )
- endif()
-@@ -79,7 +86,7 @@ install(TARGETS libzzipwrap
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
--if(ZZIPLIBTOOL)
-+if(ZZIP_LIBTOOL)
- if(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG)
- set(lib ${CMAKE_SHARED_LIBRARY_PREFIX})
- set(dll ${CMAKE_SHARED_LIBRARY_SUFFIX})
-@@ -95,3 +102,8 @@ if(ZZIPLIBTOOL)
- \")")
- endif()
- endif()
-+
-+# messages #######################################################
-+
-+message(STATUS "lib zzipwrap symlinks as by libtool: ${ZZIP_LIBTOOL}")
-+message(STATUS "installing zzipwrap pkgconfig files: ${ZZIP_PKGCONFIG}")
diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-shell-DESTDIR.patch b/dev-libs/zziplib/files/zziplib-0.13.71-shell-DESTDIR.patch
deleted file mode 100644
index 582a1504ee0..00000000000
--- a/dev-libs/zziplib/files/zziplib-0.13.71-shell-DESTDIR.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-commit 75e22f3c365b62acbad8d8645d5404242800dfba
-Author: Guido Draheim <guidod@gmx.de>
-Date: Fri Apr 17 20:47:59 2020 +0200
-
- #88 use shell $DESTDIR instead of make $(DESTDIR)
-
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 442e877..d1284e6 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -145,27 +145,27 @@ string(REPLACE ";" " " all_bins_FILES "${bins_FILES}")
- string(REPLACE ";" " " all_SDLs_FILES "${SDLs_FILES}")
- add_custom_target(install-site
- COMMAND ${BASH} -c "ls -l ${CMAKE_CURRENT_BINARY_DIR}/site.html"
-- COMMAND ${BASH} -c "mkdir -vp $(DESTDIR)${docdir} >&2 || ls -ld $(DESTDIR)${docdir} >&2"
-- COMMAND ${BASH} -c "cd ${outdir} && cp zziplib.html zzipmmapped.html zzipfseeko.html $(DESTDIR)${docdir}/"
-- COMMAND ${BASH} -c "cd ${srcdir} && cp README.* COPYING.* $(DESTDIR)${docdir}/"
-- COMMAND ${BASH} -c "cd ${topdir} && cp ChangeLog $(DESTDIR)${docdir}/"
-- COMMAND ${BASH} -c "cd ${topdir} && cp ${all_bins_FILES} $(DESTDIR)${docdir}/"
-- COMMAND ${BASH} -c "cd ${topdir} && cp ${all_SDLs_FILES} $(DESTDIR)${docdir}/"
-- COMMAND ${BASH} -c "cd $(DESTDIR)${docdir} && cp ${outdir}/*.html ."
-- COMMAND ${BASH} -c "cd $(DESTDIR)${docdir} && ln -s zzip-index.html index.html"
-+ COMMAND ${BASH} -c "mkdir -vp $DESTDIR${docdir} >&2 || ls -ld $DESTDIR${docdir} >&2"
-+ COMMAND ${BASH} -c "cd ${outdir} && cp zziplib.html zzipmmapped.html zzipfseeko.html $DESTDIR${docdir}/"
-+ COMMAND ${BASH} -c "cd ${srcdir} && cp README.* COPYING.* $DESTDIR${docdir}/"
-+ COMMAND ${BASH} -c "cd ${topdir} && cp ChangeLog $DESTDIR${docdir}/"
-+ COMMAND ${BASH} -c "cd ${topdir} && cp ${all_bins_FILES} $DESTDIR${docdir}/"
-+ COMMAND ${BASH} -c "cd ${topdir} && cp ${all_SDLs_FILES} $DESTDIR${docdir}/"
-+ COMMAND ${BASH} -c "cd $DESTDIR${docdir} && cp ${outdir}/*.html ."
-+ COMMAND ${BASH} -c "cd $DESTDIR${docdir} && ln -s zzip-index.html index.html"
- DEPENDS site.html zziplib.html zzipmmapped.html zzipfseeko.html
- VERBATIM)
- add_custom_target(install-htmpages
- COMMAND ${BASH} -c "ls -l ${CMAKE_CURRENT_BINARY_DIR}/*pages.tar"
-- COMMAND ${BASH} -c "mkdir -vp $(DESTDIR)${docdir} >&2 || ls -ld $(DESTDIR)${docdir} >&2"
-- COMMAND ${BASH} -c "cd $(DESTDIR)${docdir} && tar x -f ${outdir}/htmpages.tar"
-- COMMAND ${BASH} -c "cd $(DESTDIR)${docdir} && mv html man"
-+ COMMAND ${BASH} -c "mkdir -vp $DESTDIR${docdir} >&2 || ls -ld $DESTDIR${docdir} >&2"
-+ COMMAND ${BASH} -c "cd $DESTDIR${docdir} && tar x -f ${outdir}/htmpages.tar"
-+ COMMAND ${BASH} -c "cd $DESTDIR${docdir} && mv html man"
- DEPENDS htmpages.tar
- VERBATIM)
- add_custom_target(install-manpages
- COMMAND ${BASH} -c "ls -l ${CMAKE_CURRENT_BINARY_DIR}/*pages.tar"
-- COMMAND ${BASH} -c "mkdir -vp $(DESTDIR)${mandir} >&2 || ls -ld $(DESTDIR)${mandir} >&2"
-- COMMAND ${BASH} -c "cd $(DESTDIR)${mandir} && tar xf ${outdir}/manpages.tar"
-+ COMMAND ${BASH} -c "mkdir -vp $DESTDIR${mandir} >&2 || ls -ld $DESTDIR${mandir} >&2"
-+ COMMAND ${BASH} -c "cd $DESTDIR${mandir} && tar xf ${outdir}/manpages.tar"
- DEPENDS manpages.tar
- VERBATIM)
- add_custom_target(install-docs DEPENDS install-manpages install-htmpages install-site)
diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch b/dev-libs/zziplib/files/zziplib-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch
deleted file mode 100644
index d2436ae9012..00000000000
--- a/dev-libs/zziplib/files/zziplib-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-commit ddaa538e8cfa46413b0e92613b54123e4b759616
-Author: Guido Draheim <guidod@gmx.de>
-Date: Fri Apr 17 20:46:30 2020 +0200
-
- #88 adding testbuilds/opensuse15-ninja-sdl2.dockerfile
-
-diff --git a/testbuilds.py b/testbuilds.py
-index 756e77e..35ac70c 100755
---- a/testbuilds.py
-+++ b/testbuilds.py
-@@ -1080,6 +1080,42 @@ class ZZiplibBuildTest(unittest.TestCase):
- cmd = "docker rmi {images}:{testname}"
- sx____(cmd.format(**locals()))
- self.rm_testdir()
-+ def test_431_opensuse15_ninja_sdl2_dockerfile(self):
-+ if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test")
-+ testname=self.testname()
-+ testdir = self.testdir()
-+ dockerfile="testbuilds/opensuse15-ninja-sdl2.dockerfile"
-+ addhosts = self.local_addhosts(dockerfile)
-+ savename = docname(dockerfile)
-+ saveto = SAVETO
-+ images = IMAGES
-+ build = "build --build-arg=no_check=true"
-+ cmd = "docker {build} . -f {dockerfile} {addhosts} --tag {images}:{testname}"
-+ sh____(cmd.format(**locals()))
-+ cmd = "docker rm --force {testname}"
-+ sx____(cmd.format(**locals()))
-+ cmd = "docker run -d --name {testname} {images}:{testname} sleep 60"
-+ sh____(cmd.format(**locals()))
-+ #:# container = self.ip_container(testname)
-+ cmd = "docker exec {testname} ls -l /usr/local/bin"
-+ sh____(cmd.format(**locals()))
-+ cmd = "docker exec {testname} find /usr/local/include -type f"
-+ sh____(cmd.format(**locals()))
-+ cmd = "docker exec {testname} bash -c 'ls -l /usr/local/lib64/libzz*'"
-+ sh____(cmd.format(**locals()))
-+ #
-+ cmd = "docker exec {testname} bash -c 'test -d /usr/local/include/SDL_rwops_zzip'"
-+ sh____(cmd.format(**locals()))
-+ #
-+ cmd = "docker rm --force {testname}"
-+ sx____(cmd.format(**locals()))
-+ cmd = "docker rmi {saveto}/{savename}:latest"
-+ sx____(cmd.format(**locals()))
-+ cmd = "docker tag {images}:{testname} {saveto}/{savename}:latest"
-+ sh____(cmd.format(**locals()))
-+ cmd = "docker rmi {images}:{testname}"
-+ sx____(cmd.format(**locals()))
-+ self.rm_testdir()
- def test_701_centos7_am_docs_dockerfile(self):
- if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test")
- testname=self.testname()
-@@ -1520,6 +1556,53 @@ class ZZiplibBuildTest(unittest.TestCase):
- cmd = "docker rm --force {testname2}"
- sx____(cmd.format(**locals()))
- self.rm_testdir()
-+ def test_9431_opensuse_ninja_sdl2_dockerfile(self):
-+ if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test")
-+ testname1=self.testname() + "_1"
-+ testname2=self.testname() + "_2"
-+ testdir = self.testdir()
-+ dockerfile1="testbuilds/opensuse15-sdl2.dockerfile"
-+ dockerfile2="testbuilds/opensuse15-ninja-sdl2.dockerfile"
-+ addhosts = self.local_addhosts(dockerfile1)
-+ savename1 = docname(dockerfile1)
-+ savename2 = docname(dockerfile2)
-+ saveto = SAVETO
-+ images = IMAGES
-+ cmd = "docker rm --force {testname1}"
-+ sx____(cmd.format(**locals()))
-+ cmd = "docker rm --force {testname2}"
-+ sx____(cmd.format(**locals()))
-+ cmd = "docker run -d --name {testname1} {addhosts} {saveto}/{savename1} sleep 600"
-+ sh____(cmd.format(**locals()))
-+ cmd = "docker run -d --name {testname2} {addhosts} {saveto}/{savename2} sleep 600"
-+ #
-+ sh____(cmd.format(**locals()))
-+ cmd = "docker exec {testname2} bash -c 'cd /usr/local && tar czvf /local.tgz .'"
-+ sh____(cmd.format(**locals()))
-+ cmd = "docker cp {testname2}:/local.tgz tmp.local.tgz"
-+ sh____(cmd.format(**locals()))
-+ cmd = "docker cp tmp.local.tgz {testname1}:/local.tgz"
-+ sh____(cmd.format(**locals()))
-+ cmd = "rm tmp.local.tgz"
-+ sh____(cmd.format(**locals()))
-+ cmd = "docker exec {testname1} mkdir -p /new/local"
-+ sh____(cmd.format(**locals()))
-+ cmd = "docker exec {testname1} bash -c 'cd /new/local && tar xzvf /local.tgz'"
-+ sh____(cmd.format(**locals()))
-+ #
-+ item="{}"
-+ end="\\;"
-+ cmd = "docker exec {testname1} diff -urw --no-dereference /usr/local /new/local"
-+ sx____(cmd.format(**locals()))
-+ out = output(cmd.format(**locals()))
-+ self.assertFalse(greps(out, "---"))
-+ self.assertFalse(greps(out, "Only"))
-+ #
-+ cmd = "docker rm --force {testname1}"
-+ sx____(cmd.format(**locals()))
-+ cmd = "docker rm --force {testname2}"
-+ sx____(cmd.format(**locals()))
-+ self.rm_testdir()
- def test_9711_centos7_docs_dockerfile(self):
- if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test")
- testname1=self.testname() + "_1"
-diff --git a/testbuilds/opensuse15-ninja-sdl2.dockerfile b/testbuilds/opensuse15-ninja-sdl2.dockerfile
-new file mode 100644
-index 0000000..8a46dd4
---- /dev/null
-+++ b/testbuilds/opensuse15-ninja-sdl2.dockerfile
-@@ -0,0 +1,24 @@
-+FROM opensuse/leap:15.1
-+ARG no_check=false
-+ARG no_install=false
-+# -DMAKE_INSTALL_PREFIX:PATH=/usr
-+
-+RUN zypper refresh repo-oss
-+RUN zypper install -r repo-oss -y gcc zlib-devel python3 cmake unzip zip gzip tar libSDL2-devel ninja
-+
-+RUN mkdir src
-+COPY CMakeLists.txt README COPYING.LIB ChangeLog src/
-+COPY CMakeScripts src/CMakeScripts
-+COPY bins src/bins
-+COPY docs src/docs
-+COPY test src/test
-+COPY SDL src/SDL
-+COPY zzipwrap src/zzipwrap
-+COPY zzip src/zzip
-+
-+RUN mkdir src/build
-+RUN cd src/build && cmake .. -GNinja
-+RUN cd src/build && ninja
-+RUN $no_check || (cd src/build && ninja check VERBOSE=1)
-+RUN $no_install || (cd src/build && ninja install)
-+
diff --git a/dev-libs/zziplib/zziplib-0.13.71-r2.ebuild b/dev-libs/zziplib/zziplib-0.13.71-r2.ebuild
deleted file mode 100644
index 9782c484590..00000000000
--- a/dev-libs/zziplib/zziplib-0.13.71-r2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{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"
-HOMEPAGE="https://github.com/gdraheim/zziplib 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/13"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc sdl static-libs test"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- doc? (
- ${PYTHON_DEPS}
- )
- test? (
- ${PYTHON_DEPS}
- app-arch/zip
- )
-"
-DEPEND="
- sys-libs/zlib
- sdl? ( >=media-libs/libsdl-1.2.6 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.13.69-009-perror.patch
- "${FILESDIR}"/${PN}-0.13.71-join-paths-pc-zzipsdldir.patch
- "${FILESDIR}"/${PN}-0.13.71-find-bash.patch
- "${FILESDIR}"/${PN}-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch
- "${FILESDIR}"/${PN}-0.13.71-shell-DESTDIR.patch
-)
-
-pkg_setup() {
- (use test || use doc) && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
-
- (use test || use doc) && python_fix_shebang .
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing # bug reported upstream
-
- local mycmakeargs=(
- -DZZIPCOMPAT=OFF
- -DZZIPSDL="$(usex sdl ON OFF)"
- -DBUILD_STATIC_LIBS="$(usex static-libs ON OFF)"
- -DBUILD_TESTS="$(usex test ON OFF)"
- -DZZIPTEST="$(usex test ON OFF)"
- -DZZIPDOCS="$(usex doc ON OFF)"
- -DZZIPWRAP=OFF
- )
-
- cmake_src_configure
-}
diff --git a/dev-libs/zziplib/zziplib-0.13.71_p20201021.ebuild b/dev-libs/zziplib/zziplib-0.13.71_p20201021.ebuild
deleted file mode 100644
index f18a88e5b77..00000000000
--- a/dev-libs/zziplib/zziplib-0.13.71_p20201021.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit cmake flag-o-matic python-any-r1
-
-MY_COMMIT="3921fc43bca7283f126bfb2e47ec7e7e24b5a5ea" # master Oct 21, 2020
-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"
-
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="sdl static-libs"
-
-# Tests require internet access
-# https://github.com/gdraheim/zziplib/issues/24
-
-BDEPEND="
- ${PYTHON_DEPS}
-"
-DEPEND="
- sys-libs/zlib
- sdl? ( >=media-libs/libsdl-1.2.6 )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_COMMIT}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.13.71-reorganize-ZZIP_OPTIONFLAGS.patch # https://github.com/gdraheim/zziplib/commit/5583ccc
- "${FILESDIR}"/${PN}-0.13.71-58_manvolnum_should_be_in_.so.patch # https://github.com/gdraheim/zziplib/commit/03ddd0c
- "${FILESDIR}"/${PN}-0.13.71-copy_directory_instead_of_unpacking.patch # https://github.com/gdraheim/zziplib/commit/31d8a95
- "${FILESDIR}"/${PN}-0.13.71-installing-man3-pages.patch # https://github.com/gdraheim/zziplib/issues/93#issuecomment-616219417
-)
-
-src_configure() {
- # https://github.com/gdraheim/zziplib/commit/f3bfc0dd6663b7df272cc0cf17f48838ad724a2f#diff-b7b1e314614cf326c6e2b6eba1540682R100
- append-flags -fno-strict-aliasing
-
- local mycmakeargs=(
- -DZZIPSDL="$(usex sdl)"
- -DBUILD_STATIC_LIBS="$(usex static-libs)"
- -DBUILD_TESTS=OFF
- -DZZIPTEST=OFF
- -DZZIPDOCS=ON
- -DZZIPWRAP=OFF
- )
-
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-02-18 23:12 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-15 9:30 [gentoo-commits] repo/gentoo:master commit in: dev-libs/zziplib/, dev-libs/zziplib/files/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2021-02-18 23:12 Conrad Kostecki
2020-01-17 2:40 Andreas Sturmlechner
2019-01-03 9:55 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox