commit: 0b20c4576b9707ca9deaa94e0f79999b3ad77617 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Jul 16 21:07:57 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Jul 17 15:55:30 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b20c457
dev-libs/libzip: drop 1.11.3 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-libs/libzip/Manifest | 1 - dev-libs/libzip/files/libzip-1.11.3-uninit.patch | 25 ----- dev-libs/libzip/libzip-1.11.3.ebuild | 123 ----------------------- 3 files changed, 149 deletions(-) diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest index 1fc11368e7b8..816ab7f40dcb 100644 --- a/dev-libs/libzip/Manifest +++ b/dev-libs/libzip/Manifest @@ -1,2 +1 @@ -DIST libzip-1.11.3.tar.xz 788520 BLAKE2B 3296ff48ce853687ea4fbe310130c2468c87990da9a6c285acb09406afb23fe2240fb27a94c23db8b2ad58bd7b80f5b6e84d0702957792d0baddd13487c483dd SHA512 7ad7e5f04f28e777604833e702aaa68d603b9895e70d6ee9e587549eb628a89e5569aca0ea255f82de1adb8f4599b828c63dd282eb15a5ea55a147aa7df7b2a4 DIST libzip-1.11.4.tar.xz 793340 BLAKE2B 940df082260bffde68579a8eac3e23e987d8e8ef3a87710dce1401e8c73acc8ba4503ac2418bc4aed595a1ca930feb2335ae2b595237cb5e37e5c68df96b7ac7 SHA512 dc7929ed7a0f43e793041fc3f0639649233d4ecbe59f90b0275582b51d2951e240ce5182220fb14ade7dcccc08dab90fda22c87dc7365fec4fe70ee4f14eaa37 diff --git a/dev-libs/libzip/files/libzip-1.11.3-uninit.patch b/dev-libs/libzip/files/libzip-1.11.3-uninit.patch deleted file mode 100644 index 97722e9f9d94..000000000000 --- a/dev-libs/libzip/files/libzip-1.11.3-uninit.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://github.com/nih-at/libzip/commit/aa3a6b4da7577de63581f8db2f9d2757481b4cc8 - -From aa3a6b4da7577de63581f8db2f9d2757481b4cc8 Mon Sep 17 00:00:00 2001 -From: Dieter Baron <[email protected]> -Date: Thu, 23 Jan 2025 11:01:57 +0100 -Subject: [PATCH] Initialize have_dos_time. - -Fixes issue #480 ---- - lib/zip_close.c | 3 ++- - 2 files changed, 3 insertions(+), 1 deletion(-) - ---- a/lib/zip_close.c -+++ b/lib/zip_close.c -@@ -304,7 +304,8 @@ static int add_data(zip_t *za, zip_source_t *src, zip_dirent_t *de, zip_uint32_t - int is_zip64; - zip_flags_t flags; - bool needs_recompress, needs_decompress, needs_crc, needs_compress, needs_reencrypt, needs_decrypt, needs_encrypt; -- bool have_dos_time, dirent_changed; -+ bool dirent_changed; -+ bool have_dos_time = false; - time_t mtime_before_copy; - - if (zip_source_stat(src, &st) < 0) { - diff --git a/dev-libs/libzip/libzip-1.11.3.ebuild b/dev-libs/libzip/libzip-1.11.3.ebuild deleted file mode 100644 index ade0b6d14d6e..000000000000 --- a/dev-libs/libzip/libzip-1.11.3.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake multibuild flag-o-matic - -DESCRIPTION="Library for manipulating zip archives" -HOMEPAGE="https://nih.at/libzip/"; -SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"; - -LICENSE="BSD" -SLOT="0/5" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv sparc x86" -IUSE="bzip2 gnutls lzma mbedtls ssl static-libs test tools zstd" -REQUIRED_USE="test? ( ssl tools )" -RESTRICT="!test? ( test )" - -DEPEND=" - sys-libs/zlib - bzip2? ( app-arch/bzip2:= ) - lzma? ( app-arch/xz-utils ) - ssl? ( - gnutls? ( - dev-libs/nettle:= - >=net-libs/gnutls-3.6.5:= - ) - !gnutls? ( - mbedtls? ( net-libs/mbedtls:0= ) - !mbedtls? ( dev-libs/openssl:= ) - ) - ) - zstd? ( >=app-arch/zstd-1.4.0:= ) -" -RDEPEND="${DEPEND}" -BDEPEND=" - test? ( dev-util/nihtest ) -" - -PATCHES=( - "${FILESDIR}"/${P}-uninit.patch -) - -pkg_setup() { - # Upstream doesn't support building dynamic & static - # simultaneously: https://github.com/nih-at/libzip/issues/76 - MULTIBUILD_VARIANTS=( shared $(usev static-libs) ) -} - -src_configure() { - append-lfs-flags - myconfigure() { - local mycmakeargs=( - -DBUILD_OSSFUZZ=OFF - -DBUILD_EXAMPLES=OFF # nothing is installed - -DENABLE_COMMONCRYPTO=OFF # not in tree - -DENABLE_BZIP2=$(usex bzip2) - -DENABLE_LZMA=$(usex lzma) - -DENABLE_ZSTD=$(usex zstd) - ) - if [[ ${MULTIBUILD_VARIANT} = static-libs ]]; then - mycmakeargs+=( - -DBUILD_DOC=OFF - -DBUILD_EXAMPLES=OFF - -DBUILD_SHARED_LIBS=OFF - -DBUILD_TOOLS=OFF - ) - else - mycmakeargs+=( - -DBUILD_DOC=ON - -DBUILD_REGRESS=$(usex test) - -DBUILD_TOOLS=$(usex tools) - ) - fi - - if use ssl; then - if use gnutls; then - mycmakeargs+=( - -DENABLE_GNUTLS=$(usex gnutls) - -DENABLE_MBEDTLS=OFF - -DENABLE_OPENSSL=OFF - ) - elif use mbedtls; then - mycmakeargs+=( - -DENABLE_GNUTLS=OFF - -DENABLE_MBEDTLS=$(usex mbedtls) - -DENABLE_OPENSSL=OFF - ) - else - mycmakeargs+=( - -DENABLE_GNUTLS=OFF - -DENABLE_MBEDTLS=OFF - -DENABLE_OPENSSL=ON - ) - fi - else - mycmakeargs+=( - -DENABLE_GNUTLS=OFF - -DENABLE_MBEDTLS=OFF - -DENABLE_OPENSSL=OFF - ) - fi - cmake_src_configure - } - - multibuild_foreach_variant myconfigure -} - -src_compile() { - multibuild_foreach_variant cmake_src_compile -} - -src_test() { - run_tests() { - [[ ${MULTIBUILD_VARIANT} = shared ]] && cmake_src_test - } - - multibuild_foreach_variant run_tests -} - -src_install() { - multibuild_foreach_variant cmake_src_install -}
