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 <[email protected]> +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 +}
