gentoo resync : 17.01.2010

3 files changed, 141 insertions, 0 deletions

diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index 8c64ed6d5bbc..dd97bb5a30e0 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -1,4 +1,9 @@
 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 2371 BLAKE2B 1596a6b8b257f099926fa9a4334f12746251767fe84b652888ac1bce8a1a8f799263fb77f0b047bd045213381fdd8cf47e1c72e9826b97f4f943a878d3e8c414 SHA512 5fa0a17db47ffb517a4dad4f401eab345876a42ffe4a269f322c786df9ce4c52d4537ec0f8a1a9788ef95c6e4c21a3532b8c732439accc0c9478574c5f80a3c6
 EBUILD zziplib-0.13.69.ebuild 2320 BLAKE2B 86d2e5148cfb1b89a322c611d9240d59a303b2433a767718e7bc53ef1e5db6e3d7867a8e28bbcf32b610b34576dbeb0dd3f2817c5b5d1960f7e95dfc94351f38 SHA512 aa7fb89b20dbcabcbcbc800bbf07058538d30eb5de9fee6f8e6766645ececf2691ba5ab4586a6494f2299d1abc9760b780841ffd65c7ea05253e87984f7c9e69
 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
new file mode 100644
index 000000000000..8b492d10f56e
--- /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 000000000000..582884e002c2
--- /dev/null
+++ b/dev-libs/zziplib/zziplib-0.13.69-r1.ebuild
@@ -0,0 +1,88 @@
+# 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}-patches.tar.xz
+	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=( "${WORKDIR}"/${P}-patches )
+
+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
+}