gentoo auto-resync : 21:11:2024 - 03:03:00

5 files changed, 2 insertions, 129 deletions

diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index b83861814488..f327b22c933a 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -1,10 +1,6 @@
-AUX zziplib-0.13.72-Wint-conversion.patch 1043 BLAKE2B 6ff6a4079cd6fba6f67649eb41e175caae47455bcd31d4deebaa2e4e66995c8d9c0aa6ef3f9d2edbb18570f47a5e6350eb7ba2a644e7115954876357b3fe64e9 SHA512 45af2a1268ded5a2e88ce6956e3ad775e7c51ac4aebea753d630d53e465d3444bcdcbbc5d8e47b6843cd50d5cd3d1467648eba9059dad2fbb52704bf4525ce29
-AUX zziplib-0.13.72-incompatible-pointer-types.patch 1838 BLAKE2B 4211b5cb8f6ae4531ffb8463714f96ed9850a2a61e41449923519c99ac218fe54872363ade9238f52071b05b92e0f7660800300bbb4047865004e694cfb20429 SHA512 09a4af9a2880fe410fcbbbf3f6ba0af329f781e8a5078a634851298f27bb13eba83f010c0e3ff7c6e9d4a699b60935737d23383efc577401e3436cba502f0cf2
-DIST zziplib-0.13.72.tar.gz 1162175 BLAKE2B ff5617645e25040e4666e5440651fbb2b04c0505c7bda08b158f44c63c5dd53ec97a9942908314c3b103a4685be49368e964d249fcf9b9d685e328f0ebabdedd SHA512 4bb089e74813c6fac9657cd96e44e4a6469bf86aba3980d885c4573e8db45e74fd07bbdfcec9f36297c72227c8c0b2c37dab1bc4326cef8529960e482fe501c8
 DIST zziplib-0.13.74-testdata.tar.xz 166188 BLAKE2B f3cc98495542fb95e8bd9cfb98ecd22c9e6206fd13c1d0607ee8b7640ddb3d3c4b9cb7bc7ca7a95a787ffef4e5a8c2b4ab1bc0c5890811ab21c681239840dcdb SHA512 d4545f770c4f00658ec69a7f393f38d0c649704adb30b6a25f2c0b48711829416985258d34911d48b9bd394d9334ab89c8deda719f2aae509a75441f8a8d8902
 DIST zziplib-0.13.77.tar.gz 1190133 BLAKE2B 30ab10a440dbef6a9d37e75652734ed6c51fa902f6106d864b923a2d5d0ad170bcb279681e05f613ab8c20ade374ce1f8be21575b1b5f27cb9c7e7da9441c16a SHA512 63071f1ea7290d7658ff4cfdb2aaef5d07f319e12077365ddef6c57c671fcc66efa10e40c6885879063bb8c724524e04264ebfcdc9493e0299f03e3637a1b1d9
 DIST zziplib-0.13.78.tar.gz 1190713 BLAKE2B 65b073bd72bb97be62a2ec29e597eba5e0da5a35351e6f16a3f53ae95870a843b1204f763c3783bd1d9c73b144caa4d7dde6d042a69eed152058e79c99ebeede SHA512 e96771c310a1a9eb227027e8c2a495409c01dd273b483b3a04119d6a273cce7c88ba77c192fcde5e85d0a37c847a0df8e521f460d00920e62153400f0743ea78
-EBUILD zziplib-0.13.72-r4.ebuild 1571 BLAKE2B e275900b711129fcc2c3e6b515060ebaf2e882b668d101c05ae473985458e9c1ba54234713324f88eb90ed61ddcc06eb0a39f3a1efed9b60f74ad3c085355d21 SHA512 fc9e3972df06d0bdd0f1b44915a22ec2be49986cab55cd4a3ab7fe4bbb0412a469d8065748933d1d3167931042611d49721478ae748bb3327f379bfa27f68430
-EBUILD zziplib-0.13.77.ebuild 1951 BLAKE2B 9f8fc10fb837ec38bd1ed6a3a2be0e01bda15784a1fd6a0776ac7654b148916763d5a75a70f085d3370b5d0fa95e7218f004244050b17d5d85b87d813f2a40ef SHA512 415467043691e4ffa939063c8a828dd9da5e7d3231c6db48a77be56b6b25e6efb42cce7cc215dfc34cccac4a3ccedc781cfd6b3a18d22eccc9baaa56f80070cc
+EBUILD zziplib-0.13.77.ebuild 1950 BLAKE2B 6f96408be0f7ef40c4eafc0bbdeb40fca80d6dcbb2975bfbcf284828f567420d7289807d99654ca1aa71e89168fa4a61f2b30937ddab46cf968178bfa7224166 SHA512 0632de11ea6e5acecbe0ebad7d3513275fb9da81d080fa6f28990a483c9b8be3dc7eb22241d647c1ada8b54ea7535ae7070b1b347a0be88d33ab80368d817c1e
 EBUILD zziplib-0.13.78.ebuild 1958 BLAKE2B a546da3aa5324761fd01a12b9c716835a490e36fed83c6d5eac1b57a30321d001a10bc1cfae9e7dfbec778344d797532a24069d35ce4e92d5537738762947f4b SHA512 fab0a1bb6ad23f7cf8a275bd50d212c8e84528abb0bd593bfb919e7507b113f011514e5888d897b313ceabf8613906cb2b56cd68b5287c2bb69b0f012e7aeefe
 MISC metadata.xml 300 BLAKE2B 5bd0efee346b2d954d36b1dd83e1d8ef54944ec7f7fb3a88bdcba73b2f85d0236cd638f763388ed43a30c44f9db5b83223310d66232731e6d37ef57315c04129 SHA512 0a233cbfe081cd55c76d8229261f1d8d8a8bf1435886c36e938a3a059a2db9b44bed165b7aeddbe568756a3e19e3cbd12dbee659a5a8eb2feea21c5f2ab35d22
diff --git a/dev-libs/zziplib/files/zziplib-0.13.72-Wint-conversion.patch b/dev-libs/zziplib/files/zziplib-0.13.72-Wint-conversion.patch
deleted file mode 100644
index c27c33f7c3ab..000000000000
--- a/dev-libs/zziplib/files/zziplib-0.13.72-Wint-conversion.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://copr-dist-git.fedorainfracloud.org/cgit/@fedora-llvm-team/clang-rpm-config/clang-rpm-config.git/tree/zziplib-0001-Fix-Wint-conversion-warning.patch
-https://bugs.gentoo.org/869980
-https://github.com/gdraheim/zziplib/issues/140
-
-From 1189f99a7f84d6a5e66a6057abfe0543de48ec82 Mon Sep 17 00:00:00 2001
-From: Tom Stellard <tstellar@redhat.com>
-Date: Wed, 26 Oct 2022 05:32:17 +0000
-Subject: [PATCH] Fix -Wint-conversion warning
-
-/builddir/build/BUILD/zziplib-0.13.72/zzip/mmapped.c:685:24: error: incompatible integer to pointer conversion assigning to 'Bytef *' (aka 'unsigned char *') from 'off_t' (aka 'long') [-Wint-conversion]
-    file->zlib.next_in = offset;
---- a/zzip/mmapped.c
-+++ b/zzip/mmapped.c
-@@ -682,7 +682,7 @@ zzip_disk_entry_fopen(ZZIP_DISK * disk, ZZIP_DISK_ENTRY * entry)
-     file->zlib.zalloc = Z_NULL;
-     file->zlib.zfree = Z_NULL;
-     file->zlib.avail_in = csize;
--    file->zlib.next_in = offset;
-+    file->zlib.next_in = (Bytef*)offset;
-     ____;
- 
-     DBG2("compressed size %i", (int) file->zlib.avail_in);
diff --git a/dev-libs/zziplib/files/zziplib-0.13.72-incompatible-pointer-types.patch b/dev-libs/zziplib/files/zziplib-0.13.72-incompatible-pointer-types.patch
deleted file mode 100644
index 6f6459bcc8a5..000000000000
--- a/dev-libs/zziplib/files/zziplib-0.13.72-incompatible-pointer-types.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Remove implicit pointer types conversions.
-
-See also: https://wiki.gentoo.org/wiki/Modern_C_porting
-Bug: https://bugs.gentoo.org/919066
-Upstream PR: https://github.com/gdraheim/zziplib/pull/150
-
---- a/SDL/SDL_rwops_zzip.c
-+++ b/SDL/SDL_rwops_zzip.c
-@@ -15,17 +15,17 @@
- #define SDL_RWOPS_ZZIP_FILE(_context)  (ZZIP_FILE*) \
-              ((_context)->hidden.unknown.data1)
- 
--static int _zzip_seek(SDL_RWops *context, int offset, int whence)
-+static Sint64 _zzip_seek(SDL_RWops *context, Sint64 offset, int whence)
- {
-     return zzip_seek(SDL_RWOPS_ZZIP_FILE(context), offset, whence);
- }
- 
--static int _zzip_read(SDL_RWops *context, void *ptr, int size, int maxnum)
-+static size_t _zzip_read(SDL_RWops *context, void *ptr, size_t size, size_t maxnum)
- {
-     return zzip_read(SDL_RWOPS_ZZIP_FILE(context), ptr, size*maxnum) / size;
- }
- 
--static int _zzip_write(SDL_RWops *context, const void *ptr, int size, int num)
-+static size_t _zzip_write(SDL_RWops *context, const void *ptr, size_t size, size_t num)
- {
-     return 0; /* ignored */
- }
---- a/zzip/mmapped.c
-+++ b/zzip/mmapped.c
-@@ -664,14 +664,14 @@ zzip_disk_entry_fopen(ZZIP_DISK * disk, ZZIP_DISK_ENTRY * entry)
-     off_t offset = zzip_file_header_to_data(header);
-     if (csize == 0xFFFFu) {
-         struct zzip_extra_zip64* zip64 =
--           zzip_file_header_to_extras(header);
-+         (struct zzip_extra_zip64*)zzip_file_header_to_extras(header);
-         if (ZZIP_EXTRA_ZIP64_CHECK(zip64)) {
-             csize = zzip_extra_zip64_csize(zip64);
-         }
-     }
-     if (offset == 0xFFFFu) {
-         struct zzip_extra_zip64* zip64 =
--           zzip_file_header_to_extras(header);
-+           (struct zzip_extra_zip64*)zzip_file_header_to_extras(header);
-         if (ZZIP_EXTRA_ZIP64_CHECK(zip64)) {
-             offset = zzip_extra_zip64_offset(zip64);
-         }
diff --git a/dev-libs/zziplib/zziplib-0.13.72-r4.ebuild b/dev-libs/zziplib/zziplib-0.13.72-r4.ebuild
deleted file mode 100644
index 3c5b4fea1994..000000000000
--- a/dev-libs/zziplib/zziplib-0.13.72-r4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..12} )
-# Needed for docs, bug #835755
-PYTHON_REQ_USE="xml(+)"
-inherit cmake flag-o-matic python-any-r1
-
-DESCRIPTION="Lightweight library for extracting data from files archived in a single zip file"
-HOMEPAGE="https://github.com/gdraheim/zziplib https://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 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="sdl static-libs"
-
-# Tests require internet access
-# https://github.com/gdraheim/zziplib/issues/24
-
-BDEPEND="
-	${PYTHON_DEPS}
-"
-DEPEND="
-	sys-libs/zlib
-	sdl? ( >=media-libs/libsdl-1.2.6 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.13.72-Wint-conversion.patch
-	"${FILESDIR}"/${PN}-0.13.72-incompatible-pointer-types.patch
-)
-
-src_configure() {
-	# https://github.com/gdraheim/zziplib/commit/f3bfc0dd6663b7df272cc0cf17f48838ad724a2f#diff-b7b1e314614cf326c6e2b6eba1540682R100
-	append-flags -fno-strict-aliasing
-	# https://github.com/gdraheim/zziplib/issues/140 (bug #869980)
-	append-flags $(test-flags-CC -Wno-error=incompatible-function-pointer-types -Wno-error=int-conversion)
-
-	local mycmakeargs=(
-		-DZZIPSDL="$(usex sdl)"
-		-DBUILD_STATIC_LIBS="$(usex static-libs)"
-		-DBUILD_TESTS=OFF
-		-DZZIPTEST=OFF
-		-DZZIPDOCS=ON
-		-DZZIPWRAP=OFF
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/zziplib/zziplib-0.13.77.ebuild b/dev-libs/zziplib/zziplib-0.13.77.ebuild
index eb63c22c7ca5..001c2a6f0e44 100644
--- a/dev-libs/zziplib/zziplib-0.13.77.ebuild
+++ b/dev-libs/zziplib/zziplib-0.13.77.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0/13"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="sdl test"
 RESTRICT="!test? ( test )"