diff options
Diffstat (limited to 'sys-libs/minizip-ng')
| -rw-r--r-- | sys-libs/minizip-ng/Manifest | 7 | ||||
| -rw-r--r-- | sys-libs/minizip-ng/files/minizip-3.0.9-strdup.patch | 37 | ||||
| -rw-r--r-- | sys-libs/minizip-ng/minizip-ng-3.0.8.ebuild | 93 | ||||
| -rw-r--r-- | sys-libs/minizip-ng/minizip-ng-3.0.9.ebuild | 97 | ||||
| -rw-r--r-- | sys-libs/minizip-ng/minizip-ng-4.0.0-r1.ebuild (renamed from sys-libs/minizip-ng/minizip-ng-4.0.0.ebuild) | 22 |
5 files changed, 12 insertions, 244 deletions
diff --git a/sys-libs/minizip-ng/Manifest b/sys-libs/minizip-ng/Manifest index 8ec0905a7fe0..7cede0e4e997 100644 --- a/sys-libs/minizip-ng/Manifest +++ b/sys-libs/minizip-ng/Manifest @@ -1,10 +1,5 @@ -AUX minizip-3.0.9-strdup.patch 1255 BLAKE2B f2c31ba2caa656cea80b507f7b8918cb3d5eba235474822c87f3e993ae3ac0e4d9a922b8e535150f8d509c148b2c7532d33985dbdec9e8a20b625538300441ec SHA512 2887e3c56967989d4596ac48eac24ab8971b752f79c0ce5da8998d0aea67eb165e067fcc07c2584422f065bf1994673eb43d5061afd339e09e2d4cc94a158558 DIST minizip-ng-3.0.10.tar.gz 771145 BLAKE2B 6bab59f830b8be929b6293c9408dd70165ffe094a71bcff82eab71f9d077f4d5360f6081e0ca631090810dfc58a81b03926c797e5c156d0f1437df78292a1f09 SHA512 38021137bebb8805279e729e0801ee15133e6379bdd1862d0dea60f13fb1d63402477f3ea9a6c22fc8c85eb13dd9b38d9536680806850060a44a5a9f015fa829 -DIST minizip-ng-3.0.8.tar.gz 643788 BLAKE2B aa937fe8d0e776c8a00754c7a5eae7769b096d044a1b65b124adc0531b757579d8e0e0f5a4784669d9d94a7ea512625160b8b02f908a29e027f31911adf0f524 SHA512 f9742c5fc54ac08d78d7e942e90a7e7f1bc40a2812e7555570bd152ed441dbc5a004b79d2edf32d3fbda64db493cd1a0512d16deb84c0791d3fc86718e9ad0b1 -DIST minizip-ng-3.0.9.tar.gz 646390 BLAKE2B ba823e371dd65788404c8628d1e3de74d28bb86a378eb19b2f9636d96b402e43831238a5296d22febe46c58f2e340d8439ad4117db513b949c9cd99a32fa5df6 SHA512 a52c43d0e208eb6acf56f80804fe99c265baec2a60f6cd80fc9ba160ca3c076e6c118be9108db84728310b14640cab0e0d301d4c763713c90bd344990a43f5fd DIST minizip-ng-4.0.0.tar.gz 766989 BLAKE2B c46bccb277ee5c712710aae41a7b46af4d60fb8fecad7489b97fc4475059f5f8cfbb1aa2d3693d25ada90f3089535e0d060c7a918df1d0fd635d57cbc93a317d SHA512 be3a9e9580847d595abbd200ec89a97e38086cab5b34d3a4db1507247ed04f9209290945989b200225ea412ee0e37fb9f1947404d1631d2dfeb5c6dc55ce3d05 EBUILD minizip-ng-3.0.10.ebuild 2552 BLAKE2B 7fd09980a0724edd98ddfcca947b67932893b2d9eaa350ef6907e3499a420cdfdebb17c3e8938b466db0d3a10de549c19c396b30adb5f234800ab2736cf3fa81 SHA512 bcb836b1031bd5be51be1b502f8489c12b34293a61499cc4174b68002e41b93a9607e1eb5a0f0a2530ccaf38a5e96e22d905032863393ee294de2e1229d52acf -EBUILD minizip-ng-3.0.8.ebuild 2552 BLAKE2B 7fd09980a0724edd98ddfcca947b67932893b2d9eaa350ef6907e3499a420cdfdebb17c3e8938b466db0d3a10de549c19c396b30adb5f234800ab2736cf3fa81 SHA512 bcb836b1031bd5be51be1b502f8489c12b34293a61499cc4174b68002e41b93a9607e1eb5a0f0a2530ccaf38a5e96e22d905032863393ee294de2e1229d52acf -EBUILD minizip-ng-3.0.9.ebuild 2607 BLAKE2B a6e42fcfe2460977ac0ee506a92204559c96b0eaffc18b32417f49999b475abed5d602e8856fa495c4ab6dcb89ec03ab1a1fbf054b74ca4db914a4b1f62d71fd SHA512 bad1bd8435517449a55f363d82b08340bc9e07c8b0815b6dd6172b042c537b281ef1e2ccb1a99593ee90ee90f56f3e0c5b41313cee783c257b5436bb29af4ddb -EBUILD minizip-ng-4.0.0.ebuild 2536 BLAKE2B d3bd717b82c68e237f69e28888f0223a2027bafc5e905862d115629e02fe9ad2184df93f2389bc75af85f5b0b555147452fcb9b4004579cb53a90fb42d308ced SHA512 3b876edd0145af313944af25aedfac8f425316b6a76266c6d51e9f5aaeb600088095fec8ffa7099222cfbf0e7451e030ce50d0840b6477118d2dd16ff770452e +EBUILD minizip-ng-4.0.0-r1.ebuild 2671 BLAKE2B 7425c19e3eb2c4f043631156b797056d7adcdb82b9588adda9bc9a2d713b010ace28e8ea2b57f31a8e3bcb28bc4256d28ea1bee30e3a910080df7e06c005c3d6 SHA512 5654162ba3f1a9dc73c08c44c619e47e8b7620054a1b5e4218ff5a368195ce0391f00254b5e485089aec9aea72d8f54ef1540f05fb11e618fa8febbeed6b00af MISC metadata.xml 638 BLAKE2B 8a74cb73b53a8fa34aa5ad31ff7770fe47a6224161b6cce692d837004ffcbad15de7d318b3eb9dfa6db0f6f83eae0ed6238df19c27a82daeb7d958113f96478f SHA512 596d4f19cd3680b59ba2f94a8ebedb1fa84f5ca9e3d5125c76b5e787cd8b2e560152bf8151bfe140d03beae6a244b7a87210cc211c8493e0766852c776eef721 diff --git a/sys-libs/minizip-ng/files/minizip-3.0.9-strdup.patch b/sys-libs/minizip-ng/files/minizip-3.0.9-strdup.patch deleted file mode 100644 index 9cb1dd991b17..000000000000 --- a/sys-libs/minizip-ng/files/minizip-3.0.9-strdup.patch +++ /dev/null @@ -1,37 +0,0 @@ -https://github.com/zlib-ng/minizip-ng/pull/682 - -From 5aaa8bf0c348a27d9a7a0d82d4af26748278828c Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Thu, 16 Mar 2023 23:35:34 +0000 -Subject: [PATCH] CMake: set newer POSIX_C_SOURCE -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Enable POSIX 2008 as it's needed for strdup(), otherwise we get: -``` -/var/tmp/portage/sys-libs/minizip-ng-3.0.9/work/minizip-ng-3.0.9/mz_os.c: In function ‘mz_dir_make’: -/var/tmp/portage/sys-libs/minizip-ng-3.0.9/work/minizip-ng-3.0.9/mz_os.c:286:19: error: implicit declaration of function ‘strdup’ [-Werror=implicit-function-declaration] - 286 | current_dir = strdup(path); - | ^~~~~~ -``` - -The man page for strdup says: -``` -strdup(): - _XOPEN_SOURCE >= 500 - || /* Since glibc 2.12: */ _POSIX_C_SOURCE >= 200809L - || /* glibc <= 2.19: */ _BSD_SOURCE || _SVID_SOURCE -``` ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -455,7 +455,7 @@ endif() - - # Unix specific - if(UNIX) -- list(APPEND STDLIB_DEF -D_POSIX_C_SOURCE=200112L) -+ list(APPEND STDLIB_DEF -D_POSIX_C_SOURCE=200809L) - list(APPEND MINIZIP_SRC mz_os_posix.c mz_strm_os_posix.c) - - if(MZ_PKCRYPT OR MZ_WZAES OR MZ_SIGNING) - diff --git a/sys-libs/minizip-ng/minizip-ng-3.0.8.ebuild b/sys-libs/minizip-ng/minizip-ng-3.0.8.ebuild deleted file mode 100644 index 35459128380a..000000000000 --- a/sys-libs/minizip-ng/minizip-ng-3.0.8.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Worth keeping an eye on 'develop' branch upstream for possible backports, -# as they copied this practice from sys-libs/zlib upstream. - -inherit cmake - -DESCRIPTION="Fork of the popular zip manipulation library found in the zlib distribution" -HOMEPAGE="https://github.com/zlib-ng/minizip-ng" -SRC_URI="https://github.com/zlib-ng/minizip-ng/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="compat openssl test zstd" -RESTRICT="!test? ( test )" - -# Automagically prefers sys-libs/zlib-ng if installed, so let's -# just depend on it as presumably it's better tested anyway. -RDEPEND=" - app-arch/bzip2 - app-arch/xz-utils - sys-libs/zlib-ng - virtual/libiconv - compat? ( !sys-libs/zlib[minizip] ) - openssl? ( dev-libs/openssl:= ) - zstd? ( app-arch/zstd:= ) -" -DEPEND=" - ${RDEPEND} - test? ( dev-cpp/gtest ) -" - -src_configure() { - local mycmakeargs=( - -DMZ_COMPAT=$(usex compat) - - -DMZ_BUILD_TESTS=$(usex test) - -DMZ_BUILD_UNIT_TESTS=$(usex test) - - -DMZ_FETCH_LIBS=OFF - -DMZ_FORCE_FETCH_LIBS=OFF - - # Compression library options - -DMZ_ZLIB=ON - -DMZ_BZIP2=ON - -DMZ_LZMA=ON - -DMZ_ZSTD=$(usex zstd) - -DMZ_LIBCOMP=OFF - - # Encryption support options - -DMZ_PKCRYPT=ON - -DMZ_WZAES=ON - -DMZ_OPENSSL=$(usex openssl) - -DMZ_LIBBSD=ON - -DMZ_SIGNING=ON - - # Character conversion options - -DMZ_ICONV=ON - ) - - cmake_src_configure -} - -src_test() { - local myctestargs=( - # TODO: investigate - -E "(raw-unzip-pkcrypt|raw-append-unzip-pkcrypt|raw-erase-unzip-pkcrypt|deflate-unzip-pkcrypt|deflate-append-unzip-pkcrypt|deflate-erase-unzip-pkcrypt|bzip2-unzip-pkcrypt|bzip2-append-unzip-pkcrypt|bzip2-erase-unzip-pkcrypt|lzma-unzip-pkcrypt|lzma-append-unzip-pkcrypt|lzma-erase-unzip-pkcrypt|xz-unzip-pkcrypt|xz-append-unzip-pkcrypt|xz-erase-unzip-pkcrypt|zstd-unzip-pkcrypt|zstd-append-unzip-pkcrypt|zstd-erase-unzip-pkcrypt)" - ) - - # TODO: A bunch of tests end up looping and writing over each other's files - # It gets better with a patch applied (see https://github.com/zlib-ng/minizip-ng/issues/623#issuecomment-1264518994) - # but still hangs. - cmake_src_test -j1 -} - -src_install() { - cmake_src_install - - if use test ; then - # Test binaries, bug #874591 - rm "${ED}"/usr/bin/minigzip || die - rm "${ED}"/usr/bin/minizip-ng || die - fi - - if use compat ; then - ewarn "minizip-ng is experimental and replacing the system zlib[minizip] is dangerous" - ewarn "Please be careful!" - fi -} diff --git a/sys-libs/minizip-ng/minizip-ng-3.0.9.ebuild b/sys-libs/minizip-ng/minizip-ng-3.0.9.ebuild deleted file mode 100644 index 9817a6cb9ba6..000000000000 --- a/sys-libs/minizip-ng/minizip-ng-3.0.9.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Worth keeping an eye on 'develop' branch upstream for possible backports, -# as they copied this practice from sys-libs/zlib upstream. - -inherit cmake - -DESCRIPTION="Fork of the popular zip manipulation library found in the zlib distribution" -HOMEPAGE="https://github.com/zlib-ng/minizip-ng" -SRC_URI="https://github.com/zlib-ng/minizip-ng/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="compat openssl test zstd" -RESTRICT="!test? ( test )" - -# Automagically prefers sys-libs/zlib-ng if installed, so let's -# just depend on it as presumably it's better tested anyway. -RDEPEND=" - app-arch/bzip2 - app-arch/xz-utils - sys-libs/zlib-ng - virtual/libiconv - compat? ( !sys-libs/zlib[minizip] ) - openssl? ( dev-libs/openssl:= ) - zstd? ( app-arch/zstd:= ) -" -DEPEND=" - ${RDEPEND} - test? ( dev-cpp/gtest ) -" - -PATCHES=( - "${FILESDIR}"/minizip-3.0.9-strdup.patch -) - -src_configure() { - local mycmakeargs=( - -DMZ_COMPAT=$(usex compat) - - -DMZ_BUILD_TESTS=$(usex test) - -DMZ_BUILD_UNIT_TESTS=$(usex test) - - -DMZ_FETCH_LIBS=OFF - -DMZ_FORCE_FETCH_LIBS=OFF - - # Compression library options - -DMZ_ZLIB=ON - -DMZ_BZIP2=ON - -DMZ_LZMA=ON - -DMZ_ZSTD=$(usex zstd) - -DMZ_LIBCOMP=OFF - - # Encryption support options - -DMZ_PKCRYPT=ON - -DMZ_WZAES=ON - -DMZ_OPENSSL=$(usex openssl) - -DMZ_LIBBSD=ON - -DMZ_SIGNING=ON - - # Character conversion options - -DMZ_ICONV=ON - ) - - cmake_src_configure -} - -src_test() { - local myctestargs=( - # TODO: investigate - -E "(raw-unzip-pkcrypt|raw-append-unzip-pkcrypt|raw-erase-unzip-pkcrypt|deflate-unzip-pkcrypt|deflate-append-unzip-pkcrypt|deflate-erase-unzip-pkcrypt|bzip2-unzip-pkcrypt|bzip2-append-unzip-pkcrypt|bzip2-erase-unzip-pkcrypt|lzma-unzip-pkcrypt|lzma-append-unzip-pkcrypt|lzma-erase-unzip-pkcrypt|xz-unzip-pkcrypt|xz-append-unzip-pkcrypt|xz-erase-unzip-pkcrypt|zstd-unzip-pkcrypt|zstd-append-unzip-pkcrypt|zstd-erase-unzip-pkcrypt)" - ) - - # TODO: A bunch of tests end up looping and writing over each other's files - # It gets better with a patch applied (see https://github.com/zlib-ng/minizip-ng/issues/623#issuecomment-1264518994) - # but still hangs. - cmake_src_test -j1 -} - -src_install() { - cmake_src_install - - if use test ; then - # Test binaries, bug #874591 - rm "${ED}"/usr/bin/minigzip || die - rm "${ED}"/usr/bin/minizip-ng || die - fi - - if use compat ; then - ewarn "minizip-ng is experimental and replacing the system zlib[minizip] is dangerous" - ewarn "Please be careful!" - fi -} diff --git a/sys-libs/minizip-ng/minizip-ng-4.0.0.ebuild b/sys-libs/minizip-ng/minizip-ng-4.0.0-r1.ebuild index fd2a6d9b2507..a0229283ac8f 100644 --- a/sys-libs/minizip-ng/minizip-ng-4.0.0.ebuild +++ b/sys-libs/minizip-ng/minizip-ng-4.0.0-r1.ebuild @@ -6,7 +6,7 @@ EAPI=8 # Worth keeping an eye on 'develop' branch upstream for possible backports, # as they copied this practice from sys-libs/zlib upstream. -inherit cmake +inherit cmake-multilib DESCRIPTION="Fork of the popular zip manipulation library found in the zlib distribution" HOMEPAGE="https://github.com/zlib-ng/minizip-ng" @@ -21,20 +21,20 @@ RESTRICT="!test? ( test )" # Automagically prefers sys-libs/zlib-ng if installed, so let's # just depend on it as presumably it's better tested anyway. RDEPEND=" - app-arch/bzip2 + app-arch/bzip2[${MULTILIB_USEDEP}] app-arch/xz-utils - sys-libs/zlib-ng + sys-libs/zlib-ng[${MULTILIB_USEDEP}] virtual/libiconv compat? ( !sys-libs/zlib[minizip] ) - openssl? ( dev-libs/openssl:= ) - zstd? ( app-arch/zstd:= ) + openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] ) + zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) " DEPEND=" ${RDEPEND} test? ( dev-cpp/gtest ) " -src_configure() { +multilib_src_configure() { local mycmakeargs=( -DMZ_COMPAT=$(usex compat) @@ -64,7 +64,7 @@ src_configure() { cmake_src_configure } -src_test() { +multilib_src_test() { local myctestargs=( # TODO: investigate -E "(raw-unzip-pkcrypt|raw-append-unzip-pkcrypt|raw-erase-unzip-pkcrypt|deflate-unzip-pkcrypt|deflate-append-unzip-pkcrypt|deflate-erase-unzip-pkcrypt|bzip2-unzip-pkcrypt|bzip2-append-unzip-pkcrypt|bzip2-erase-unzip-pkcrypt|lzma-unzip-pkcrypt|lzma-append-unzip-pkcrypt|lzma-erase-unzip-pkcrypt|xz-unzip-pkcrypt|xz-append-unzip-pkcrypt|xz-erase-unzip-pkcrypt|zstd-unzip-pkcrypt|zstd-append-unzip-pkcrypt|zstd-erase-unzip-pkcrypt)" @@ -76,15 +76,15 @@ src_test() { cmake_src_test -j1 } -src_install() { - cmake_src_install - - if use test ; then +multilib_src_install_all() { + if ! use compat && use test ; then # Test binaries, bug #874591 rm "${ED}"/usr/bin/minigzip || die rm "${ED}"/usr/bin/minizip-ng || die fi +} +pkg_postinst() { if use compat ; then ewarn "minizip-ng is experimental and replacing the system zlib[minizip] is dangerous" ewarn "Please be careful!" |