app-arch/libdeflate: enable gzip & zlib unconditionally

Closes: https://bugs.gentoo.org/937883
Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
Signed-off-by: Sam James <sam@gentoo.org>

7 files changed, 17 insertions, 31 deletions

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-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>
diff --git a/dev-util/maxcso/maxcso-9999.ebuild b/dev-util/maxcso/maxcso-9999.ebuild
index 5ef2e19bfd9f..a4889541abed 100644
--- a/dev-util/maxcso/maxcso-9999.ebuild
+++ b/dev-util/maxcso/maxcso-9999.ebuild
@@ -19,7 +19,7 @@ LICENSE="ISC LGPL-2.1+ Apache-2.0"
 SLOT="0"
 
 DEPEND="
-	app-arch/libdeflate[zlib]
+	app-arch/libdeflate
 	app-arch/lz4:=
 	dev-libs/libuv:=
 	sys-libs/zlib
diff --git a/media-libs/openexr/openexr-3.2.3.ebuild b/media-libs/openexr/openexr-3.2.3-r1.ebuild
index 146862dea6dd..7b883cfee438 100644
--- a/media-libs/openexr/openexr-3.2.3.ebuild
+++ b/media-libs/openexr/openexr-3.2.3-r1.ebuild
@@ -29,7 +29,7 @@ REQUIRED_USE="doc? ( utils )"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	app-arch/libdeflate[zlib]
+	app-arch/libdeflate:=
 	>=dev-libs/imath-3.1.6:=
 "
 DEPEND="${RDEPEND}"
diff --git a/media-libs/openexr/openexr-3.2.4.ebuild b/media-libs/openexr/openexr-3.2.4-r1.ebuild
index 915a3cbda2ae..1207ed892873 100644
--- a/media-libs/openexr/openexr-3.2.4.ebuild
+++ b/media-libs/openexr/openexr-3.2.4-r1.ebuild
@@ -29,7 +29,7 @@ REQUIRED_USE="doc? ( utils )"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	app-arch/libdeflate[zlib]
+	app-arch/libdeflate:=
 	>=dev-libs/imath-3.1.6:=
 "
 DEPEND="${RDEPEND}"