From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DA79115808B for ; Wed, 23 Mar 2022 17:06:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 10954E0923; Wed, 23 Mar 2022 17:06:48 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1FFF2E0923 for ; Wed, 23 Mar 2022 17:06:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0A807342E71 for ; Wed, 23 Mar 2022 17:06:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 03DEB317 for ; Wed, 23 Mar 2022 17:06:44 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1648055188.9d58cdc65e555a187b0a511e222748e94a023fd2.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/glib-networking/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/glib-networking/glib-networking-2.72.0-r1.ebuild net-libs/glib-networking/glib-networking-2.72.0.ebuild X-VCS-Directories: net-libs/glib-networking/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 9d58cdc65e555a187b0a511e222748e94a023fd2 X-VCS-Branch: master Date: Wed, 23 Mar 2022 17:06:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 040055e5-117d-4b2f-b119-200ce44144ae X-Archives-Hash: 0959c067f92c18e373c6d03df365f08e commit: 9d58cdc65e555a187b0a511e222748e94a023fd2 Author: Matt Turner gentoo org> AuthorDate: Wed Mar 23 17:00:57 2022 +0000 Commit: Matt Turner gentoo 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 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 }