[gentoo-commits] repo/gentoo:master commit in: net-libs/glib-networking/

["Matt Turner" <mattst88@gentoo.org>]

commit:     9d58cdc65e555a187b0a511e222748e94a023fd2
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 23 17:00:57 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Mar 23 17:06:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d58cdc6

net-libs/glib-networking: Avoid gnutls[pkcs11] dep without USE=test

Commit 7068209eac9 ("net-libs/glib-networking: gnutls needs pkcs11
support") added a USE dependency on net-libs/gnutls[pkcs11] in response
to a build problem. The appropriate fix was to double check the sed in
src_prepare() whose purpose is clearly noted as avoiding the pkcs11
dependence. It turns out the `subdir` line it attempted to modify had
been moved. With that resolved, we can continue avoiding the pkcs11
dependence.

Also revbump as required when runtime dependencies change, as should
have been done in the aforementioned commit.

Revert "net-libs/glib-networking: gnutls needs pkcs11 support"

This reverts commit 7068209eac9441762c2ad3ba1fe64d392e22e68b.

Closes: https://bugs.gentoo.org/835833
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 ...glib-networking-2.72.0.ebuild => glib-networking-2.72.0-r1.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-libs/glib-networking/glib-networking-2.72.0.ebuild b/net-libs/glib-networking/glib-networking-2.72.0-r1.ebuild
similarity index 94%
rename from net-libs/glib-networking/glib-networking-2.72.0.ebuild
rename to net-libs/glib-networking/glib-networking-2.72.0-r1.ebuild
index 88a974947073..845eea9072fe 100644
--- a/net-libs/glib-networking/glib-networking-2.72.0.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.72.0-r1.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~
 RDEPEND="
 	>=dev-libs/glib-2.69.0:2[${MULTILIB_USEDEP}]
 	libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[${MULTILIB_USEDEP}] )
-	>=net-libs/gnutls-3.7.2:=[pkcs11,${MULTILIB_USEDEP}]
+	>=net-libs/gnutls-3.7.2:=[${MULTILIB_USEDEP}]
 	ssl? ( app-misc/ca-certificates )
 	gnome? ( gnome-base/gsettings-desktop-schemas )
 "
@@ -40,7 +40,7 @@ src_prepare() {
 		# It may become a real runtime dependency in future
 		# Please check!
 		# bug #777462
-		sed -i "/^subdir('tls\/tests')/d" meson.build || die
+		sed -i "/^subdir('tests')/d" tls/meson.build || die
 	fi
 }