diff options
author | Sam James <sam@gentoo.org> | 2024-03-04 10:18:51 +0000 |
---|---|---|
committer | Sam James <sam@gentoo.org> | 2024-03-04 10:23:42 +0000 |
commit | a8cc2594a53fb360a7494e30a79b5a67908c2790 (patch) | |
tree | 2fb1579a9107b48ef09dd9a8573e4c097ee10159 /sys-libs | |
parent | sys-libs/zlib-ng: drop 2.1.5 (diff) | |
download | gentoo-a8cc2594a53fb360a7494e30a79b5a67908c2790.tar.gz gentoo-a8cc2594a53fb360a7494e30a79b5a67908c2790.tar.bz2 gentoo-a8cc2594a53fb360a7494e30a79b5a67908c2790.zip |
sys-libs/minizip-ng: drop 4.0.3
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-libs')
-rw-r--r-- | sys-libs/minizip-ng/Manifest | 1 | ||||
-rw-r--r-- | sys-libs/minizip-ng/files/minizip-ng-4.0.3-libbsd-overlay.patch | 16 | ||||
-rw-r--r-- | sys-libs/minizip-ng/minizip-ng-4.0.3.ebuild | 97 |
3 files changed, 0 insertions, 114 deletions
diff --git a/sys-libs/minizip-ng/Manifest b/sys-libs/minizip-ng/Manifest index 3f5a6a60e99d..98c8a16c5a21 100644 --- a/sys-libs/minizip-ng/Manifest +++ b/sys-libs/minizip-ng/Manifest @@ -1,2 +1 @@ -DIST minizip-ng-4.0.3.tar.gz 770041 BLAKE2B a5772de8a372738fc1736a5ba307928ebf50ce9de26c845beb0798b2593662a0d990b8ad305238086eea11ad4aba2d7db2a5386d6ca65968bfd40f1fa573e693 SHA512 96d1a5ac1106f737f4db161867a440c272b65c617add30aa0224215abba8098ece9f2bde5c4e407932d0fa5d3ca8696a1db82b5a19ce7ffd8019dba83ab5fd01 DIST minizip-ng-4.0.4.tar.gz 770202 BLAKE2B 5b9f4a66325de4298db0f7cdb8830050fe55c46c3914f51d7e7c4fe4cd9e080ab9658739dc936da602d67199333b6eca71218ad155244b9c04f50944486a02b1 SHA512 2662ddf90666babe73474f6fc48f5a64f276d555b7a0f04f790b9edef570cb958356e900632c3795fb2053f4813c449240ff101d32b063eca4ad869bef0546fd diff --git a/sys-libs/minizip-ng/files/minizip-ng-4.0.3-libbsd-overlay.patch b/sys-libs/minizip-ng/files/minizip-ng-4.0.3-libbsd-overlay.patch deleted file mode 100644 index 2fb884161a5a..000000000000 --- a/sys-libs/minizip-ng/files/minizip-ng-4.0.3-libbsd-overlay.patch +++ /dev/null @@ -1,16 +0,0 @@ -https://bugs.gentoo.org/889266 -https://gitlab.freedesktop.org/libbsd/libbsd/-/issues/15 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -538,10 +538,10 @@ else() -
- if(HAVE_LIBBSD_ARC4RANDOM_BUF)
- list(APPEND MINIZIP_DEF -DHAVE_LIBBSD -DHAVE_ARC4RANDOM_BUF)
-- list(APPEND MINIZIP_INC ${LIBBSD_INCLUDE_DIRS})
- list(APPEND MINIZIP_LIB ${LIBBSD_LIBRARIES})
- list(APPEND MINIZIP_LBD ${LIBBSD_LIBRARY_DIRS})
-
-+ add_compile_options(${LIBBSD_CFLAGS}) - link_directories(${LIBBSD_LIBRARY_DIRS})
- endif()
- else()
diff --git a/sys-libs/minizip-ng/minizip-ng-4.0.3.ebuild b/sys-libs/minizip-ng/minizip-ng-4.0.3.ebuild deleted file mode 100644 index b67dd2d9534c..000000000000 --- a/sys-libs/minizip-ng/minizip-ng-4.0.3.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-multilib - -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/4" -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[${MULTILIB_USEDEP}] - app-arch/xz-utils - dev-libs/libbsd[${MULTILIB_USEDEP}] - sys-libs/zlib-ng[${MULTILIB_USEDEP}] - virtual/libiconv - compat? ( !sys-libs/zlib[minizip] ) - openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] ) - zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) -" -DEPEND=" - ${RDEPEND} - test? ( dev-cpp/gtest ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-4.0.3-libbsd-overlay.patch -) - -multilib_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 - - # Character conversion options - -DMZ_ICONV=ON - ) - - cmake_src_configure -} - -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)" - ) - - # 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 -} - -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!" - fi -} |