[gentoo-commits] repo/gentoo:master commit in: net-print/cups/

[Sam James]

commit:     ffc571efc7e9ceaf2dbce31083da164a86bb172f
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Sun Nov 12 16:44:38 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 18 03:53:23 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffc571ef

net-print/cups: re-enable tests

They appear to work at the moment. There's a fun oddity, in that if
libcupsfilters is installed you need image support of some variety.

Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-print/cups/cups-2.4.7-r2.ebuild | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/net-print/cups/cups-2.4.7-r2.ebuild 
b/net-print/cups/cups-2.4.7-r2.ebuild
index d63cb0132e9a..3f63cd43a70c 100644
--- a/net-print/cups/cups-2.4.7-r2.ebuild
+++ b/net-print/cups/cups-2.4.7-r2.ebuild
@@ -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"
        fi
 fi
 
@@ -32,14 +32,14 @@ IUSE="acl dbus debug kerberos openssl pam selinux 
static-libs systemd test usb X
 
 # 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,8 +60,13 @@ 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 )