dev-libs/zziplib: manpages and cleanup

remove upstream patches and use commit 223930775aa5b from upstream's develop branch
removing -DZZIP_COMPAT in order to use default
remove unneeded src_prepare()
fix for installing manpages

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/17257
Signed-off-by: Sam James <sam@gentoo.org>

4 files changed, 77 insertions, 1 deletions

diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index ecc774b0985a..3dca2d49d453 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -1 +1,2 @@
 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
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
index e29599c1b2d1..6c62442c5dfb 100644
--- a/dev-libs/zziplib/files/zziplib-0.13.71-find-bash.patch
+++ b/dev-libs/zziplib/files/zziplib-0.13.71-find-bash.patch
@@ -9,7 +9,7 @@ index 7ceba4a..c1b8172 100644
 +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
+ join_paths(pc_zzipsdldir "\${prefix}" "${zzipsdldir}")
 diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt
 index a9f6e3a..2cdd275 100644
 --- a/zzip/CMakeLists.txt
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
new file mode 100644
index 000000000000..08130f958dda
--- /dev/null
+++ b/dev-libs/zziplib/files/zziplib-0.13.71-installing-man3-pages.patch
@@ -0,0 +1,14 @@
+# https://github.com/gdraheim/zziplib/issues/93
+diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
+index b679f7b..e2887ee 100644
+--- a/docs/CMakeLists.txt
++++ b/docs/CMakeLists.txt
+@@ -190,7 +190,7 @@ add_custom_target(install-manpages
+ 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/zziplib-0.13.71_p20200419.ebuild b/dev-libs/zziplib/zziplib-0.13.71_p20200419.ebuild
new file mode 100644
index 000000000000..7928de22d9ec
--- /dev/null
+++ b/dev-libs/zziplib/zziplib-0.13.71_p20200419.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 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
+
+MY_COMMIT="223930775aa5b325f04cec01f0b18726a7918821"
+
+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/${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 ~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}"
+
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.13.69-009-perror.patch
+	"${FILESDIR}"/${PN}-0.13.71-installing-man3-pages.patch
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing # bug reported upstream
+
+	local mycmakeargs=(
+		-DZZIPSDL="$(usex sdl)"
+		-DBUILD_STATIC_LIBS="$(usex static-libs)"
+		-DBUILD_TESTS="$(usex test)"
+		-DZZIPTEST="$(usex test)"
+		-DZZIPDOCS="$(usex doc)"
+		-DZZIPWRAP=OFF
+	)
+
+	cmake_src_configure
+}