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 E280A158089 for ; Wed, 4 Oct 2023 15:33:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 30E592BC01A; Wed, 4 Oct 2023 15:33:20 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 185742BC01A for ; Wed, 4 Oct 2023 15:33:20 +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 4E0C4335CD2 for ; Wed, 4 Oct 2023 15:33:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C01A897C for ; Wed, 4 Oct 2023 15:33:17 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1696433547.517e978ef861d2037bf46f4d96e78c2bacbcef3b.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-print/cups/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-print/cups/cups-2.4.7-r1.ebuild net-print/cups/cups-2.4.7.ebuild net-print/cups/cups-9999.ebuild X-VCS-Directories: net-print/cups/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 517e978ef861d2037bf46f4d96e78c2bacbcef3b X-VCS-Branch: master Date: Wed, 4 Oct 2023 15:33:17 +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: 9dfca378-3669-4caa-907a-cde6bcecb573 X-Archives-Hash: 81c0a9c00f2980579913d22f6083bf1b commit: 517e978ef861d2037bf46f4d96e78c2bacbcef3b Author: Sam James gentoo org> AuthorDate: Wed Oct 4 15:32:27 2023 +0000 Commit: Sam James gentoo org> CommitDate: Wed Oct 4 15:32:27 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=517e978e net-print/cups: require SSL Upstream have started to require SSL on master and the --disable-tls build broke in 2.4.7. There's no point in fighting it given master now requires it, see https://github.com/OpenPrinting/cups/commit/123baa03a4e09047cfa25e003a0a9db8cc8fc363. Closes: https://bugs.gentoo.org/914869 Signed-off-by: Sam James gentoo.org> net-print/cups/{cups-2.4.7.ebuild => cups-2.4.7-r1.ebuild} | 12 ++++-------- net-print/cups/cups-9999.ebuild | 12 ++++-------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/net-print/cups/cups-2.4.7.ebuild b/net-print/cups/cups-2.4.7-r1.ebuild similarity index 96% rename from net-print/cups/cups-2.4.7.ebuild rename to net-print/cups/cups-2.4.7-r1.ebuild index fb26dd7c4f2a..ca1eb9e72744 100644 --- a/net-print/cups/cups-2.4.7.ebuild +++ b/net-print/cups/cups-2.4.7-r1.ebuild @@ -28,7 +28,7 @@ HOMEPAGE="https://www.cups.org/ https://github.com/OpenPrinting/cups" LICENSE="Apache-2.0" SLOT="0" -IUSE="acl dbus debug kerberos openssl pam selinux +ssl static-libs systemd test usb X xinetd zeroconf" +IUSE="acl dbus debug kerberos openssl pam selinux static-libs systemd test usb X xinetd zeroconf" # As of 2.4.2, they don't actually seem to be interactive (they pass some flags # by default to input for us), but they fail on some greyscale issue w/ poppler? @@ -52,10 +52,8 @@ DEPEND=" kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) pam? ( sys-libs/pam ) !pam? ( virtual/libcrypt:= ) - ssl? ( - !openssl? ( >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] ) - openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] ) - ) + !openssl? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) + openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) @@ -166,9 +164,7 @@ multilib_src_configure() { $(multilib_native_use_enable pam) $(use_enable static-libs static) $(use_enable test unit-tests) - # USE="ssl" => gnutls - # USE="ssl openssl" => openssl - $(use_with ssl tls $(usex openssl openssl gnutls)) + --with-tls=$(usex openssl openssl gnutls) $(use_with systemd ondemand systemd) $(multilib_native_use_enable usb libusb) $(use_with zeroconf dnssd avahi) diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild index d1f511ef75b9..3d6b8b8cac30 100644 --- a/net-print/cups/cups-9999.ebuild +++ b/net-print/cups/cups-9999.ebuild @@ -28,7 +28,7 @@ HOMEPAGE="https://www.cups.org/ https://github.com/OpenPrinting/cups" LICENSE="Apache-2.0" SLOT="0" -IUSE="acl dbus debug kerberos openssl pam selinux +ssl static-libs systemd test usb X xinetd zeroconf" +IUSE="acl dbus debug kerberos openssl pam selinux static-libs systemd test usb X xinetd zeroconf" # As of 2.4.2, they don't actually seem to be interactive (they pass some flags # by default to input for us), but they fail on some greyscale issue w/ poppler? @@ -52,10 +52,8 @@ DEPEND=" kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) pam? ( sys-libs/pam ) !pam? ( virtual/libcrypt:= ) - ssl? ( - !openssl? ( >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] ) - openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] ) - ) + !openssl? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) + openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) @@ -166,9 +164,7 @@ multilib_src_configure() { $(multilib_native_use_enable pam) $(use_enable static-libs static) $(use_enable test unit-tests) - # USE="ssl" => gnutls - # USE="ssl openssl" => openssl - $(use_with ssl tls $(usex openssl openssl gnutls)) + --with-tls=$(usex openssl openssl gnutls) $(use_with systemd ondemand systemd) $(multilib_native_use_enable usb libusb) $(use_with zeroconf dnssd avahi)