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 1168915817D for ; Sun, 23 Jun 2024 00:27:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 42E3AE2B2D; Sun, 23 Jun 2024 00:27:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 271DFE2B2D for ; Sun, 23 Jun 2024 00:27:44 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6FF36341DD0 for ; Sun, 23 Jun 2024 00:27:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 82AFD1D4D for ; Sun, 23 Jun 2024 00:27:40 +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: <1719102429.ef56c608c383e7eb1554238ca6e88f6cf1f0217a.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-9999.ebuild X-VCS-Directories: net-print/cups/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: ef56c608c383e7eb1554238ca6e88f6cf1f0217a X-VCS-Branch: master Date: Sun, 23 Jun 2024 00:27:40 +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: 28d7bd62-d171-45e4-85c1-c3b24dd4d5b8 X-Archives-Hash: e0b71a240a1cfe751f97c8afb082415d commit: ef56c608c383e7eb1554238ca6e88f6cf1f0217a Author: Sam James gentoo org> AuthorDate: Sun Jun 23 00:16:21 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sun Jun 23 00:27:09 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef56c608 net-print/cups: sync live Signed-off-by: Sam James gentoo.org> net-print/cups/cups-9999.ebuild | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild index 3d6b8b8cac30..a5853547c217 100644 --- a/net-print/cups/cups-9999.ebuild +++ b/net-print/cups/cups-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]] ; then else SRC_URI="https://github.com/OpenPrinting/cups/releases/download/v${MY_PV}/cups-${MY_PV}-source.tar.gz" if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" fi fi @@ -30,16 +30,14 @@ LICENSE="Apache-2.0" SLOT="0" 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? -RESTRICT="!test? ( test ) test" +RESTRICT="!test? ( test )" BDEPEND=" acct-group/lp acct-group/lpadmin virtual/pkgconfig " -DEPEND=" +COMMON_DEPEND=" app-text/libpaper:= sys-libs/zlib acl? ( @@ -60,13 +58,17 @@ DEPEND=" xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[dbus,${MULTILIB_USEDEP}] ) " +# if libcupsfilters is installed, more tests are run. They fail without at least one of the two formats enabled. +DEPEND=" + ${COMMON_DEPEND} + test? ( || ( net-print/libcupsfilters[jpeg] net-print/libcupsfilters[png] ) ) +" RDEPEND=" - ${DEPEND} + ${COMMON_DEPEND} acct-group/lp acct-group/lpadmin selinux? ( sec-policy/selinux-cups ) " -PDEPEND=">=net-print/cups-filters-1.0.43" PATCHES=( "${FILESDIR}/${PN}-2.4.1-nostrip.patch" @@ -163,7 +165,6 @@ multilib_src_configure() { $(use_enable kerberos gssapi) $(multilib_native_use_enable pam) $(use_enable static-libs static) - $(use_enable test unit-tests) --with-tls=$(usex openssl openssl gnutls) $(use_with systemd ondemand systemd) $(multilib_native_use_enable usb libusb) @@ -218,7 +219,12 @@ multilib_src_test() { mkdir "${T}"/cups-tests || die # We only build some of CUPS for multilib, so can't run the tests. - multilib_is_native_abi && default + if multilib_is_native_abi; then + # avoid building *and running* test binaries in src_compile + # https://github.com/OpenPrinting/cups/commit/b1d42061e9286f50eefc851ed906d17c6e80c4b0 + emake UNITTESTS=unittests + default + fi } multilib_src_install() {