summaryrefslogtreecommitdiff
path: root/dev-libs/zziplib
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-09-16 09:32:48 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-09-16 09:32:48 +0100
commit9ee6d97c2883d42f204a533a8bc1f4562df778fb (patch)
treeb690ddc0ca30f1472887edbb0b8313629bfcbbb2 /dev-libs/zziplib
parentb17a3ef12038de50228bade1f05502c74e135321 (diff)
gentoo resync : 16.09.2020
Diffstat (limited to 'dev-libs/zziplib')
-rw-r--r--dev-libs/zziplib/Manifest14
-rw-r--r--dev-libs/zziplib/files/zziplib-0.13.71-find-bash.patch2
-rw-r--r--dev-libs/zziplib/files/zziplib-0.13.71-installing-man3-pages.patch14
-rw-r--r--dev-libs/zziplib/metadata.xml1
-rw-r--r--dev-libs/zziplib/zziplib-0.13.69-r1.ebuild92
-rw-r--r--dev-libs/zziplib/zziplib-0.13.71-r2.ebuild4
-rw-r--r--dev-libs/zziplib/zziplib-0.13.71_p20200419.ebuild56
7 files changed, 80 insertions, 103 deletions
diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index 61133af9aecb..ad580b6ac819 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -1,13 +1,11 @@
AUX zziplib-0.13.69-009-perror.patch 499 BLAKE2B ffbf0a74204a575068843c55a538dd858a76bd3e7592fbc0860f7201877c9aebfcbf14ca2cb42274b71843acceceb9b3240d34423639f7f4835641ad5a95a86c SHA512 10720e172c1482e7d2f1241dffaef2f4f41ae94724cd3617c9b39e2ada558a173eb4e262121f49661e9101d260f429aad6c94c9e7c1eb6dfe56aa807e87d6510
-AUX zziplib-0.13.71-find-bash.patch 1747 BLAKE2B 48735330538b5ad72e8e962e09626dcb28d7bf28ad5f3877ae064f8f0113b42799674eeb53b95b248d20e6dce2b8d913bc540f98dc377ad66e82f95dde1378d5 SHA512 16ba20dc1eeaddbfc3eeb04db0fd93e719d8d4b0781d6821696f6911b30cc96a3e668b4e8ceb1751b34906a9a096da868b0e882a9b1e8f0daca0650ba59b60b7
+AUX zziplib-0.13.71-find-bash.patch 1758 BLAKE2B d4d98b1886a67867de90fc303f2bc6aab07e1c27fd8fc1827ddd30b8d8427938c4bccff14359de683585aa8ebfbc4a675ad98acf6e6fa982bb1254e4aac8eb1e SHA512 e939072da1e27008f0d23145e74cd37574426a6d4b2d578bc0a8e880054b89580bf4a48c81b70f6232251216d2f73cf5c071dfd0cb7bfd2f6f1f5dd09738efc7
+AUX zziplib-0.13.71-installing-man3-pages.patch 654 BLAKE2B c9a990258795e997c99642ba1c3489a097d07d7c90663d6205accccc87728d6861db446407f0457711bddd997bad29c82b25412286e3e52380c03bd5e4f7f101 SHA512 65cdfea81902f38af24dea828caf3bc562471ca0ee5e711b4ab6c1f344c9cf63efc09b3fc038fe971b3a2e3933fb411dbb0af65b37b5b76f75e56704d07dfb36
AUX zziplib-0.13.71-join-paths-pc-zzipsdldir.patch 1250 BLAKE2B 77ba09afa144ac5aaf1393d1bd612590e664d0885eb34354f2fa8cfd28005d225d1960f25d4b56d32956c13e99315e3e067a83b8f7f2c84703dff1e718f8dff1 SHA512 b81b34885aa1017b0f0d834565818b2464e0c827b2c428c14442b4d741bfa91c90e5915af98cf4fcbeababf29bb89a13f76efa98b4de1a88ac3659f666069110
AUX zziplib-0.13.71-shell-DESTDIR.patch 3206 BLAKE2B 4f542e0f26ce332e75f341dfdd84b9907cf1e1c67f259d3626e34284991421e1931ee2f896d36dc444b37d7873269a21e780992e25b689f8ca57e5def9ae27fe SHA512 427a633de7b5928fe6150d8e5a711bc48c3d68978344ae840da512919c8151215bcc2b29f025cabd5204db9561d71d1925394f7695ddfbd9b4137c53d52b32da
AUX zziplib-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch 5840 BLAKE2B fac60aa6271dd189198ea7b9640567378def938a09d2362acf60a4aeb2a3787121f644685fb4f1310459eb665b509951c02ad7a40a78a216b9778e7599dd764f SHA512 ed6d3101587d6d0088bffb1bb1483cffe1629d2ff5301e88cdab8e654bac79f84534012e129d7c17ff23beb19ca46a96598894cd383040d41993732ff62ab05d
-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
DIST zziplib-0.13.71.tar.gz 1150654 BLAKE2B 00394de5da8b3c5b95ef0aea060e523354845261b846e3c876b13d2d05c6569496475a279d6b211c3215a6f17e6bfe53958baabcebb13cd72d30a9f0c40d9449 SHA512 e035d0ac26dca78335ae3defc652543ff7b353a1a95d76ed1beeb21a08e16f287a62d488f528cfbb77d5b558581b68d439aa0823577524e9aa61a3cf5f208cb5
-EBUILD zziplib-0.13.69-r1.ebuild 2412 BLAKE2B 60415e9912525a046630ecca9f466801a3bfe29a5f48e48c937508f9ba6cda2f55974e218d3dbf9e41196798f049851e6e4c68871a09ee7dacd05afe892012bb SHA512 e7ff6954f36159d88e74fe0789d7a38b1ac22516f189170533e2b05a8bf9455c8cb459af7794be0bf81ae3af4c58a6b0abcddce8282357c5f4daf727134bd912
-EBUILD zziplib-0.13.71-r2.ebuild 1662 BLAKE2B 001c1b96f530e4ab9ae1f3051d0d2c61c81f68231d4dddac9307009cd3217940c838214b968ee8c82eb6780209a92d1ffb4a9c1b330a8dc8d1a2ec1e5669506a SHA512 5836b3101e1073dd59028988934c65f086c498f95575faef5b33a9f6436f5ff3e2b7a2769c9d9ece4dc363ae3551e68af62ea9641762ece380b8ee60fdfba860
-MISC metadata.xml 448 BLAKE2B b3c0c50b50155b120d35504fd0237bbdd681f7b98c8b9bb5df38a07102a987211861ef66c692152b625274f3957f8e3d03e1b4cb1c95410b4fc64bc9f9b04cf4 SHA512 f128ee3580c81af1a61388285aadb8481adccd9f113a734c853bc4b1ae5f9924ee12dbfa2086a28eb3972348084d5c86c81747f0deb04094322af70836c1f58d
+DIST zziplib-0.13.71_p20200419.tar.gz 1153032 BLAKE2B 34aa38fde43805636a83f34c064ab09880b7200c414d3666786b7d750a26d8f39dbb431dde7cb81e785cd20a0d444e2a7308b5c79eb71bf0e9f52a051fe01883 SHA512 7f94524ddd745d81656ea9b0314db791e636ed9a8305c4fde7f88572b0302bff4c7f8fa76ccf368b7b8b1c8062a4ad85dfab8f30cdf6ee37f835ff5758751222
+EBUILD zziplib-0.13.71-r2.ebuild 1697 BLAKE2B e0bd52b503282616a25e68ea19c97710dc125a7f7d425ac8e856a861cbdfe6f861364984bd89f6893ff4cc549c7014606e02f87c44133c2c4486e8c6172cbb8c SHA512 6ea9b49bf19412a20a952242ff56aa7a3d5148552e92d168ca4d61507ccdea9b2480c07afe773ef4b6ab103873a8de9e43e137fb5e6e4ef03c671e2c06ac4c26
+EBUILD zziplib-0.13.71_p20200419.ebuild 1424 BLAKE2B 3aed19e9f270d72517f7267bec8c0e85f4682578ec5a60e4ae03ddefa76adc11d1cadf0d07174013deb98e9d9f1cc33188f8071e6fb67400bb0309158a00dd92 SHA512 f3ff2dfa70c3c059c55ff6b5a1e4ef6b6102ce9ce46ac053da6c4760001c9ec0405e7b15887b008d2095334245167037bc52c5e9027ec5fe376b994d8dc807e3
+MISC metadata.xml 504 BLAKE2B 406cd214aabfba1e0061bab2db1f297ad2e20df92d9ab4f381153a1e5434fb6138565949e2356ed79579df98343c5300c516c9bb0c0883eb026e144181d52b18 SHA512 a7b627e728607f9902420489fe7f3bdca2a5f165f25b1bf5d1a361e92ab40a1b70b212e97bed6c70793210103c6f45407d02faa3990237272373d40942aa11a9
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/metadata.xml b/dev-libs/zziplib/metadata.xml
index c47cd2c82f84..6183ccc5b3b4 100644
--- a/dev-libs/zziplib/metadata.xml
+++ b/dev-libs/zziplib/metadata.xml
@@ -10,6 +10,7 @@
<name>Proxy Maintainers</name>
</maintainer>
<upstream>
+ <remote-id type="github">gdraheim/zziplib</remote-id>
<remote-id type="sourceforge">zziplib</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-libs/zziplib/zziplib-0.13.69-r1.ebuild b/dev-libs/zziplib/zziplib-0.13.69-r1.ebuild
deleted file mode 100644
index 852084f7d26c..000000000000
--- a/dev-libs/zziplib/zziplib-0.13.69-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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 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 )
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-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
-}
diff --git a/dev-libs/zziplib/zziplib-0.13.71-r2.ebuild b/dev-libs/zziplib/zziplib-0.13.71-r2.ebuild
index 3ba3ea9854ef..20fc04ec8876 100644
--- a/dev-libs/zziplib/zziplib-0.13.71-r2.ebuild
+++ b/dev-libs/zziplib/zziplib-0.13.71-r2.ebuild
@@ -7,12 +7,12 @@ 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="http://zziplib.sourceforge.net/"
+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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 )"
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..cc20d2152c50
--- /dev/null
+++ b/dev-libs/zziplib/zziplib-0.13.71_p20200419.ebuild
@@ -0,0 +1,56 @@
+# 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="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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="sdl static-libs test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ ${PYTHON_DEPS}
+ test? ( 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() {
+ 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=ON
+ -DZZIPWRAP=OFF
+ )
+
+ cmake_src_configure
+}