commit: f0b88d62bdd4b6fee3d4add668de349a22167c11
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 23 22:22:28 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Mar 23 22:25:08 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0b88d62
net-print/cups-filters: add --enable-ijs control too
Was missed in previous commit here.
Also sync the live git version.
.../cups-filters/cups-filters-1.8.2-r1.ebuild | 1 +
net-print/cups-filters/cups-filters-9999.ebuild | 26 ++++++++++------------
2 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/net-print/cups-filters/cups-filters-1.8.2-r1.ebuild
b/net-print/cups-filters/cups-filters-1.8.2-r1.ebuild
index 844bf04..276c3a0 100644
--- a/net-print/cups-filters/cups-filters-1.8.2-r1.ebuild
+++ b/net-print/cups-filters/cups-filters-1.8.2-r1.ebuild
@@ -64,6 +64,7 @@ src_configure() {
$(use_enable foomatic) \
$(use_enable ldap) \
$(use_enable postscript ghostscript) \
+ $(use_enable postscript ijs) \
--with-fontdir="fonts/conf.avail" \
--with-pdftops=pdftops \
--enable-imagefilters \
diff --git a/net-print/cups-filters/cups-filters-9999.ebuild
b/net-print/cups-filters/cups-filters-9999.ebuild
index fad7ebc..fe1b994 100644
--- a/net-print/cups-filters/cups-filters-9999.ebuild
+++ b/net-print/cups-filters/cups-filters-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -20,10 +20,10 @@
HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdf
LICENSE="MIT GPL-2"
SLOT="0"
-IUSE="dbus +foomatic jpeg ldap perl png static-libs tiff zeroconf"
+IUSE="dbus +foomatic jpeg ldap perl png +postscript static-libs tiff zeroconf"
RDEPEND="
- >=app-text/ghostscript-gpl-9.09[cups]
+ postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils,xpdf-headers(+)]
>=app-text/qpdf-3.0.2:=
dev-libs/glib:2
@@ -59,7 +59,10 @@ src_configure() {
$(use_enable dbus) \
$(use_enable zeroconf avahi) \
$(use_enable static-libs static) \
+ $(use_enable foomatic) \
$(use_enable ldap) \
+ $(use_enable postscript ghostscript) \
+ $(use_enable postscript ijs) \
--with-fontdir="fonts/conf.avail" \
--with-pdftops=pdftops \
--enable-imagefilters \
@@ -67,7 +70,7 @@ src_configure() {
$(use_with png) \
$(use_with tiff) \
--with-rcdir=no \
- --with-browseremoteprotocols=DNSSD,CUPS \
+ --with-browseremoteprotocols=DNSSD,CUPS \
--without-php
}
@@ -92,9 +95,11 @@ src_install() {
popd > /dev/null
fi
- # workaround: some printer drivers still require pstoraster and
pstopxl, bug #383831
- dosym /usr/libexec/cups/filter/gstoraster
/usr/libexec/cups/filter/pstoraster
- dosym /usr/libexec/cups/filter/gstopxl /usr/libexec/cups/filter/pstopxl
+ if use postscript; then
+ # workaround: some printer drivers still require pstoraster and
pstopxl, bug #383831
+ dosym gstoraster /usr/libexec/cups/filter/pstoraster
+ dosym gstopxl /usr/libexec/cups/filter/pstopxl
+ fi
prune_libtool_files --all
@@ -105,13 +110,6 @@ src_install() {
sed -i -e 's:cups\.service
avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
fi
- if ! use foomatic ; then
- # this needs an upstream solution / configure switch
- rm -v "${ED}/usr/bin/foomatic-rip" || die
- rm -v "${ED}/usr/libexec/cups/filter/foomatic-rip" || die
- rm -v "${ED}/usr/share/man/man1/foomatic-rip.1" || die
- fi
-
doinitd "${T}"/cups-browsed
systemd_dounit "${S}/utils/cups-browsed.service"
}
