gentoo auto-resync : 26:08:2024 - 12:00:09

7 files changed, 75 insertions, 32 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 9fb3346cf2ab..8473e6f892e8 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/libdeflate/Manifest b/app-arch/libdeflate/Manifest
index 0149e0a9ab90..91d6ea1fb306 100644
--- a/app-arch/libdeflate/Manifest
+++ b/app-arch/libdeflate/Manifest
@@ -1,7 +1,9 @@
 AUX libdeflate-1.19-make-gzip-tests-conditional.patch 1376 BLAKE2B 9480aed1f1a316899e844f99af988560cd5f07ff98336dbaef63a350ab9a7a76c75c4bf6d8e3709c0e99719dfcd0d3216976a9daab89e2c1277b4a20f036d074 SHA512 469698465c70804b356e628290cc50def2f6281262521b53794f5682c738f9245ec47a36877ebb506e0d070f21fd781478039c32a764d35ffd860ec98b34a30b
 DIST libdeflate-1.19.tar.gz 187684 BLAKE2B 6d3c58b4095f91f64c25e09a062f1d7e68cd43b4dffc2de6484cd941ede4bffd8a82dd3af08eda6c94ad4120d40809c1d6a1814c28bad5387dfbaad418b93070 SHA512 fe57542a0d28ad61d70bef9b544bb6805f9f30930b16432712b3b1caab041f1f4e64315a4306a0635b96c2632239c5af0e45a3915581d0b89975729fc2e95613
 DIST libdeflate-1.20.tar.gz 194212 BLAKE2B b3633f1068f36bf346e1f435c67259612ad5ed1571e83f1bbc4a58c6a67b3eadca85e0abb2d2d47f180dd2ff01c5891c8b3958a63ddbcc2447106f2e5cb3c0fe SHA512 5ebe6af9ce81872cba508d1f0aa087ddeb0e0f0c8e6360da66b8a9db2a76203dafbf3d3f6b3b791618ea9c6d0231fab5b4a55badb31a4480fb4174b9445c658b
-EBUILD libdeflate-1.19.ebuild 1334 BLAKE2B 3777957c8ac7c30df7cf3b838bbe15dd47e7df202945aa7b6848a57d7ce8f56c2fd03e76ac1cf05ebfd6be4b7ab9b5a1599483f92925b5a8605a7ff5adfaa3a0 SHA512 d9e5cd50722a7c5cb7bba2d11feb34f2a034dcc9d2d23a53a423368139f091de017ab882a924977652fcb1d550f4d584e50634a409927fdecb2bc6e52c094c11
-EBUILD libdeflate-1.20.ebuild 1381 BLAKE2B 5a0095637719ffc5f54ea7a3bd54432de2052f87a2982168126fbd33274a3580d3476599843dc2698d0010c140c17dc86c848eb7d7f49e026f0f35d1d39fc5ec SHA512 ac1377bc69e7f271c10ddaa9cecd1c0942e0d7bea6c874936429039adb15679028f196b66384676e9ae14406afc68ef2c5bbff2e8af22b4e4f9b7c587da9cf79
-EBUILD libdeflate-9999.ebuild 1381 BLAKE2B 5a0095637719ffc5f54ea7a3bd54432de2052f87a2982168126fbd33274a3580d3476599843dc2698d0010c140c17dc86c848eb7d7f49e026f0f35d1d39fc5ec SHA512 ac1377bc69e7f271c10ddaa9cecd1c0942e0d7bea6c874936429039adb15679028f196b66384676e9ae14406afc68ef2c5bbff2e8af22b4e4f9b7c587da9cf79
-MISC metadata.xml 778 BLAKE2B 91c91f6056ae4d819e47afbf0827a78d03e0d6c9508f7be719f04e1d2b26e62953ee5cf616cfb5f64ecb200a8c308df1bd0f19b020666f3516562311ea028bb6 SHA512 ed0195a5aa10b6ec10852e6b08b2740f513d333a1c458ec051dc30862844f659335c2d7cbe180fee31c24d68660ee4f2fcd182ff7a564f7bc06d48d4e4eb22f5
+DIST libdeflate-1.21.tar.gz 195361 BLAKE2B 8d1f2a71cb6a0823ab93631720f9807a6907f1d92490bb258b9bfcf9daf08b517eab3bdee064326a4274d7b193cffbafa24037e2be2503c17fa8daddef5cfff5 SHA512 7cd9bc91992ef824a0fdf175b0da081b8381decc325013477a3fbfcfe6cf240f66cedbeec830a51343fedb8c27c76fba8782c1aed3fc538e3afd6c9f8cdc90fb
+EBUILD libdeflate-1.19-r1.ebuild 1253 BLAKE2B bc930446a369d7966707d3ad3e47fc2e19a1fa4e808fc10e3488549dc874612d8e122caf4d6c69065cb7286b240942dd6aa6b26d3b429d1bba616503795d177e SHA512 734614aa87b2e5ac48d7a817926b26f05064c39351ee4145a54aef8a1d1a45f0feb49353391d2b57660f84e142f8ff04aba09af9445980f3cf34aa3709a20f55
+EBUILD libdeflate-1.20-r1.ebuild 1300 BLAKE2B a2fe5aba2e57817cc06cd083d05c9ae7494a9a886c00d386bb1506849a92faf6da33e6f25ca29f62dc6ba2c9054a276f6ac52d120047665090c825056f131caf SHA512 b6ed62847f540c2c95e81688bb729626f2946f19cd68fe253ebcd6a11448bf02a64649689cc9e5c35843346e93629b81f54ba49f68b10fb01c761865e30a460a
+EBUILD libdeflate-1.21.ebuild 1300 BLAKE2B a2fe5aba2e57817cc06cd083d05c9ae7494a9a886c00d386bb1506849a92faf6da33e6f25ca29f62dc6ba2c9054a276f6ac52d120047665090c825056f131caf SHA512 b6ed62847f540c2c95e81688bb729626f2946f19cd68fe253ebcd6a11448bf02a64649689cc9e5c35843346e93629b81f54ba49f68b10fb01c761865e30a460a
+EBUILD libdeflate-9999.ebuild 1300 BLAKE2B a2fe5aba2e57817cc06cd083d05c9ae7494a9a886c00d386bb1506849a92faf6da33e6f25ca29f62dc6ba2c9054a276f6ac52d120047665090c825056f131caf SHA512 b6ed62847f540c2c95e81688bb729626f2946f19cd68fe253ebcd6a11448bf02a64649689cc9e5c35843346e93629b81f54ba49f68b10fb01c761865e30a460a
+MISC metadata.xml 676 BLAKE2B c2b96242f8e26c2f5d52210bcac2540952ddfa0a7e0808ac7bddbfaa83c37005a98f40dc563b4c92ebb6ce838f1625b26c158b50c4ae1d1236892ae03fff5b92 SHA512 643f7f64deb72219b21866c3e5a5485bb7c1b95f9b5a6e507a9493a9d81be1f879939384e8173044d00bbd8750ff2f7d050602244dea6ceeb71d44fe27168e4e
diff --git a/app-arch/libdeflate/libdeflate-1.19.ebuild b/app-arch/libdeflate/libdeflate-1.19-r1.ebuild
index b637d83a6dfe..322c508072c7 100644
--- a/app-arch/libdeflate/libdeflate-1.19.ebuild
+++ b/app-arch/libdeflate/libdeflate-1.19-r1.ebuild
@@ -20,16 +20,12 @@ LICENSE="MIT"
 SLOT="0"
 # the zlib USE-flag enables support for zlib
 # the test USE-flag programs depend on sys-libs/zlib for comparison tests
-IUSE="+gzip +utils +zlib test"
+IUSE="+utils test"
 
 RESTRICT="
 	!test? ( test )
 "
 
-REQUIRED_USE="
-	utils? ( gzip )
-"
-
 DEPEND="
 	test? ( sys-libs/zlib )
 "
@@ -47,10 +43,10 @@ src_configure() {
 		-DLIBDEFLATE_COMPRESSION_SUPPORT="yes"
 		-DLIBDEFLATE_DECOMPRESSION_SUPPORT="yes"
 
-		-DLIBDEFLATE_BUILD_GZIP="$(usex gzip "$(usex utils)" )"
-		-DLIBDEFLATE_GZIP_SUPPORT="$(usex gzip)"
+		-DLIBDEFLATE_BUILD_GZIP="$(usex utils)"
+		-DLIBDEFLATE_GZIP_SUPPORT="yes"
 
-		-DLIBDEFLATE_ZLIB_SUPPORT="$(usex zlib)"
+		-DLIBDEFLATE_ZLIB_SUPPORT="yes"
 
 		-DLIBDEFLATE_BUILD_TESTS="$(usex test)"
 	)
diff --git a/app-arch/libdeflate/libdeflate-1.20.ebuild b/app-arch/libdeflate/libdeflate-1.20-r1.ebuild
index 395b2234ceea..12a547db272d 100644
--- a/app-arch/libdeflate/libdeflate-1.20.ebuild
+++ b/app-arch/libdeflate/libdeflate-1.20-r1.ebuild
@@ -20,16 +20,12 @@ LICENSE="MIT"
 SLOT="0"
 # the zlib USE-flag enables support for zlib
 # the test USE-flag programs depend on sys-libs/zlib for comparison tests
-IUSE="+gzip +utils +zlib test"
+IUSE="+utils test"
 
 RESTRICT="
 	!test? ( test )
 "
 
-REQUIRED_USE="
-	utils? ( gzip )
-"
-
 DEPEND="
 	test? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
 "
@@ -47,10 +43,10 @@ src_configure() {
 		-DLIBDEFLATE_COMPRESSION_SUPPORT="yes"
 		-DLIBDEFLATE_DECOMPRESSION_SUPPORT="yes"
 
-		-DLIBDEFLATE_BUILD_GZIP="$(usex gzip "$(usex utils)" )"
-		-DLIBDEFLATE_GZIP_SUPPORT="$(usex gzip)"
+		-DLIBDEFLATE_BUILD_GZIP="$(usex utils)"
+		-DLIBDEFLATE_GZIP_SUPPORT="yes"
 
-		-DLIBDEFLATE_ZLIB_SUPPORT="$(usex zlib)"
+		-DLIBDEFLATE_ZLIB_SUPPORT="yes"
 
 		-DLIBDEFLATE_BUILD_TESTS="$(usex test)"
 	)
diff --git a/app-arch/libdeflate/libdeflate-1.21.ebuild b/app-arch/libdeflate/libdeflate-1.21.ebuild
new file mode 100644
index 000000000000..12a547db272d
--- /dev/null
+++ b/app-arch/libdeflate/libdeflate-1.21.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="Heavily optimized DEFLATE/zlib/gzip (de)compression"
+HOMEPAGE="https://github.com/ebiggers/libdeflate"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ebiggers/libdeflate.git"
+else
+	SRC_URI="https://github.com/ebiggers/libdeflate/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+# the zlib USE-flag enables support for zlib
+# the test USE-flag programs depend on sys-libs/zlib for comparison tests
+IUSE="+utils test"
+
+RESTRICT="
+	!test? ( test )
+"
+
+DEPEND="
+	test? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.19-make-gzip-tests-conditional.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIBDEFLATE_BUILD_SHARED_LIB="yes"
+		-DLIBDEFLATE_BUILD_STATIC_LIB="no"
+		-DLIBDEFLATE_USE_SHARED_LIB="yes"
+
+		-DLIBDEFLATE_COMPRESSION_SUPPORT="yes"
+		-DLIBDEFLATE_DECOMPRESSION_SUPPORT="yes"
+
+		-DLIBDEFLATE_BUILD_GZIP="$(usex utils)"
+		-DLIBDEFLATE_GZIP_SUPPORT="yes"
+
+		-DLIBDEFLATE_ZLIB_SUPPORT="yes"
+
+		-DLIBDEFLATE_BUILD_TESTS="$(usex test)"
+	)
+
+	cmake-multilib_src_configure
+}
diff --git a/app-arch/libdeflate/libdeflate-9999.ebuild b/app-arch/libdeflate/libdeflate-9999.ebuild
index 395b2234ceea..12a547db272d 100644
--- a/app-arch/libdeflate/libdeflate-9999.ebuild
+++ b/app-arch/libdeflate/libdeflate-9999.ebuild
@@ -20,16 +20,12 @@ LICENSE="MIT"
 SLOT="0"
 # the zlib USE-flag enables support for zlib
 # the test USE-flag programs depend on sys-libs/zlib for comparison tests
-IUSE="+gzip +utils +zlib test"
+IUSE="+utils test"
 
 RESTRICT="
 	!test? ( test )
 "
 
-REQUIRED_USE="
-	utils? ( gzip )
-"
-
 DEPEND="
 	test? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
 "
@@ -47,10 +43,10 @@ src_configure() {
 		-DLIBDEFLATE_COMPRESSION_SUPPORT="yes"
 		-DLIBDEFLATE_DECOMPRESSION_SUPPORT="yes"
 
-		-DLIBDEFLATE_BUILD_GZIP="$(usex gzip "$(usex utils)" )"
-		-DLIBDEFLATE_GZIP_SUPPORT="$(usex gzip)"
+		-DLIBDEFLATE_BUILD_GZIP="$(usex utils)"
+		-DLIBDEFLATE_GZIP_SUPPORT="yes"
 
-		-DLIBDEFLATE_ZLIB_SUPPORT="$(usex zlib)"
+		-DLIBDEFLATE_ZLIB_SUPPORT="yes"
 
 		-DLIBDEFLATE_BUILD_TESTS="$(usex test)"
 	)
diff --git a/app-arch/libdeflate/metadata.xml b/app-arch/libdeflate/metadata.xml
index 17956aa98f85..a55b0a6392fb 100644
--- a/app-arch/libdeflate/metadata.xml
+++ b/app-arch/libdeflate/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-wanted -->
-		<maintainer type="person" proxied="yes">
+	<maintainer type="person" proxied="yes">
 		<email>negril.nx+gentoo@gmail.com</email>
 		<name>Paul Zander</name>
 	</maintainer>
@@ -11,10 +11,8 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
-		<flag name="gzip">Support the gzip format</flag>
 		<flag name="test">Build the test programs (requires <pkg>sys-libs/zlib</pkg>)</flag>
 		<flag name="utils">Build the libdeflate-gzip program</flag>
-		<flag name="zlib">Support the zlib format</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">ebiggers/libdeflate</remote-id>