commit:     67d6e574d01759ae62a75ca6d6919824e59e89c7
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 20 14:04:45 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 20 14:32:02 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67d6e574

dev-util/ostree: remove USE="httpd"

`--enable-trivial-httpd-cmdline` was dropped from code between
v2023.5 and v2023.6, in commit [1]. As a result, this useflag was a
NOP, so we can drop the useflag and it's relevant $(use_enable).

[1] 
https://github.com/ostreedev/ostree/commit/0c36e8143d3c95d454b65c38f923cf71d08d5eb7

Closes: https://bugs.gentoo.org/925427
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-util/ostree/ostree-2024.3-r1.ebuild | 4 +---
 dev-util/ostree/ostree-2024.3.ebuild    | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/dev-util/ostree/ostree-2024.3-r1.ebuild 
b/dev-util/ostree/ostree-2024.3-r1.ebuild
index 05bac56034ba..29dd0ff2a1fb 100644
--- a/dev-util/ostree/ostree-2024.3-r1.ebuild
+++ b/dev-util/ostree/ostree-2024.3-r1.ebuild
@@ -16,12 +16,11 @@ S="${WORKDIR}/lib${P}"
 LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="archive +curl doc dracut gnutls +gpg grub +http2 httpd introspection 
libmount selinux sodium ssl +soup systemd zeroconf"
+IUSE="archive +curl doc dracut gnutls +gpg grub +http2 introspection libmount 
selinux sodium ssl +soup systemd zeroconf"
 RESTRICT="test"
 REQUIRED_USE="
        dracut? ( systemd )
        http2? ( curl )
-       httpd? ( || ( curl soup ) )
 "
 
 RDEPEND="
@@ -93,7 +92,6 @@ src_configure() {
                $(usex introspection --enable-introspection={,} yes no)
                $(use_with gpg gpgme)
                $(use_enable http2)
-               $(use_enable httpd trivial-httpd-cmdline)
                $(use_with selinux )
                $(use_with soup soup3)
                --without-soup # libsoup:2.4

diff --git a/dev-util/ostree/ostree-2024.3.ebuild 
b/dev-util/ostree/ostree-2024.3.ebuild
index 385ce99ce4cb..bc45f57a3635 100644
--- a/dev-util/ostree/ostree-2024.3.ebuild
+++ b/dev-util/ostree/ostree-2024.3.ebuild
@@ -16,12 +16,11 @@ S="${WORKDIR}/lib${P}"
 LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="archive +curl doc dracut gnutls +gpg grub +http2 httpd introspection 
libmount selinux sodium ssl +soup systemd zeroconf"
+IUSE="archive +curl doc dracut gnutls +gpg grub +http2 introspection libmount 
selinux sodium ssl +soup systemd zeroconf"
 RESTRICT="test"
 REQUIRED_USE="
        dracut? ( systemd )
        http2? ( curl )
-       httpd? ( || ( curl soup ) )
 "
 
 RDEPEND="
@@ -92,7 +91,6 @@ src_configure() {
                $(usex introspection --enable-introspection={,} yes no)
                $(use_with gpg gpgme)
                $(use_enable http2)
-               $(use_enable httpd trivial-httpd-cmdline)
                $(use_with selinux )
                $(use_with soup soup3)
                --without-soup # libsoup:2.4

Reply via email to