gentoo resync : 12.01.2019

3 files changed, 108 insertions, 0 deletions

diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index d7aa56ba45bb..a51d4a165f8e 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -1,4 +1,7 @@
 AUX zziplib-0.13.49-SDL-test.patch 392 BLAKE2B b09eb8e5fa14dd4936e1235ab29e8730182e25b5c2811851a99fbe95c9fcc6a7274bffd41d490bc9c7fece866ded73260d85c94ffbe43c9075a614e038a39d18 SHA512 b5a3e6e7fb4af7ab48a9aa26bdecbde6f3345ee3997c810fafa3d0e348ea0aee9247ae7acab7ccdc3fc1b9ab62daa7f29ac54862013206de8dd094361dd6facf
+AUX zziplib-0.13.69-SDL-test.patch 453 BLAKE2B 645e55b034ec72abbab26fad4062cf9f7137aeeac2cc33aad89d9b86f4b616b5bdd256d383bfaa3252459caa2150f1b6426d3ca31ce8c055d0cae92d81547cd1 SHA512 2a524efc04721459cfb744ce7d0e3b6a4412e791250442632093116e181642184ba3cfa4a93fff8bdb792a03c293ab317696a78aed422ec75c26448552bc5721
 DIST zziplib-0.13.62.tar.bz2 685770 BLAKE2B 24ef46370cd490498cedeea4b83abffd40b4bf7092ca994defb0c7c90a2c6863c56d19933dca1b20700ed9a55369cd1e8d3f6e1c5ed966b966d15eed4e5b75aa SHA512 fd3b9e9015ba7603bdebd8f6a2ac6d11003705bfab22f3a0025f75455042664aea69440845b59e6f389417dff5ac777f49541d8cbacb2a220e67d20bb6973e25
+DIST zziplib-0.13.69.tar.gz 1132204 BLAKE2B 92e9f5e95665c7a47d1e472f570402e3c174d404abf461bed644ea8a37ff7661ee98b8fa241728aae375e32c470f2f48a817f72410eeda81a6a3be6e6bdb2635 SHA512 ade026289737f43ca92a8746818d87dd7618d473dbce159546ce9071c9e4cbe164a6b1c9efff16efb7aa0327b2ec6b34f3256c6bda19cd6e325703fffc810ef0
 EBUILD zziplib-0.13.62-r2.ebuild 2183 BLAKE2B 3d46cdd0afd006f807c8015b93214eec481d120d200a9f92e03176d9ea7d95988fbd10fc6dbdf655c8e73b8f809eeabd39703a9d9cb24261a14ad6f4022fbd53 SHA512 39fc10a12b8374a5b737fa0fbc0c229721ddf3f8a30d3a987633d5890e63a76b4b358a0803517e209365a804a67dcf7af37159c28f8e7f315c6ba1d1d1a0f838
+EBUILD zziplib-0.13.69.ebuild 2326 BLAKE2B bc54cecf24cda0cd1bdd93aaca779f38d61fd114af157c6c8a55cf33d7503144283778e4644556b97ec3659aacd439bb733f52793984f4fea2dd989dfa92319d SHA512 c4e7a37cf2a6350f251f52a5e0589fd94a51b7220166ff83cc8a7a66d143e8c31420ca1d49bc9136878de298d668824bfd1532b92a0e514d173fdd9ce4ef2cc3
 MISC metadata.xml 244 BLAKE2B fc7489e331f708001ddc94cbb6b4e2c22d80c32883cb48c8044da1c8326143eed049e7f867342bb5b389f9252949f89dcb3084369729d52e49a8924d842d4693 SHA512 73f6d031dd2239ef69ea83120b253dbd61d8db15603514a673da83c3cbe9f7f881613e5fa3387917428b994bab1bd466e49ebe2c7a68829f0f2551e0124620a0
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 000000000000..7f85b6864696
--- /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 000000000000..973505427e73
--- /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
+}