commit: 4adb3f4034e0b22a089470fbbf9de19e65ca6331
Author: Brian Norris <computersforpeace <AT> gmail <DOT> com>
AuthorDate: Sat Feb 6 01:23:45 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Feb 11 02:16:00 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4adb3f40
net-print/cups{,-filters}: consolidate dependencies into cups-filters #573970
Currently, the CUPS ebuild is specifying the required USE flags and
dependencies for ghostscript and poppler. However, these utilities are
only required by the cups-filters ebuild, not CUPS proper.
Let's move the dependencies to cups-filters and phase out those
dependencies in the CUPS ebuild.
...-filters-9999.ebuild => cups-filters-1.8.1-r1.ebuild} | 12 ++++++------
net-print/cups-filters/cups-filters-9999.ebuild | 4 ++--
.../cups/{cups-9999.ebuild => cups-2.1.3-r1.ebuild} | 16 +++++-----------
net-print/cups/cups-9999.ebuild | 6 +-----
4 files changed, 14 insertions(+), 24 deletions(-)
diff --git a/net-print/cups-filters/cups-filters-9999.ebuild
b/net-print/cups-filters/cups-filters-1.8.1-r1.ebuild
similarity index 89%
copy from net-print/cups-filters/cups-filters-9999.ebuild
copy to net-print/cups-filters/cups-filters-1.8.1-r1.ebuild
index 7c54732..a7a1a9a 100644
--- a/net-print/cups-filters/cups-filters-9999.ebuild
+++ b/net-print/cups-filters/cups-filters-1.8.1-r1.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$
@@ -24,8 +24,8 @@ SLOT="0"
IUSE="dbus +foomatic jpeg perl png static-libs tiff zeroconf"
RDEPEND="
- >=app-text/ghostscript-gpl-9.09
- app-text/poppler:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)]
+ >=app-text/ghostscript-gpl-9.09[cups]
+ app-text/poppler:=[cxx,jpeg?,lcms,tiff?,utils,xpdf-headers(+)]
>=app-text/qpdf-3.0.2:=
media-libs/fontconfig
media-libs/freetype:2
@@ -65,7 +65,7 @@ src_configure() {
$(use_with png) \
$(use_with tiff) \
--with-rcdir=no \
- --with-browseremoteprotocols=DNSSD,CUPS \
+ --with-browseremoteprotocols=DNSSD,CUPS \
--without-php
}
@@ -91,8 +91,8 @@ src_install() {
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
+ dosym gstoraster /usr/libexec/cups/filter/pstoraster
+ dosym gstopxl /usr/libexec/cups/filter/pstopxl
prune_libtool_files --all
diff --git a/net-print/cups-filters/cups-filters-9999.ebuild
b/net-print/cups-filters/cups-filters-9999.ebuild
index 7c54732..6293a33 100644
--- a/net-print/cups-filters/cups-filters-9999.ebuild
+++ b/net-print/cups-filters/cups-filters-9999.ebuild
@@ -24,8 +24,8 @@ SLOT="0"
IUSE="dbus +foomatic jpeg perl png static-libs tiff zeroconf"
RDEPEND="
- >=app-text/ghostscript-gpl-9.09
- app-text/poppler:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)]
+ >=app-text/ghostscript-gpl-9.09[cups]
+ app-text/poppler:=[cxx,jpeg?,lcms,tiff?,utils,xpdf-headers(+)]
>=app-text/qpdf-3.0.2:=
media-libs/fontconfig
media-libs/freetype:2
diff --git a/net-print/cups/cups-9999.ebuild
b/net-print/cups/cups-2.1.3-r1.ebuild
similarity index 97%
copy from net-print/cups/cups-9999.ebuild
copy to net-print/cups/cups-2.1.3-r1.ebuild
index 6e5807f..4db122b 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-2.1.3-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
PYTHON_COMPAT=( python2_7 )
@@ -76,11 +76,7 @@ RDEPEND="${CDEPEND}
selinux? ( sec-policy/selinux-cups )
"
-PDEPEND="
- app-text/ghostscript-gpl[cups]
- app-text/poppler[utils]
- >=net-print/cups-filters-1.0.43
-"
+PDEPEND=">=net-print/cups-filters-1.0.43"
REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )
@@ -152,9 +148,7 @@ pkg_setup() {
}
src_prepare() {
- epatch ${PATCHES[@]}
-
- epatch_user
+ default
# Remove ".SILENT" rule for verbose output (bug 524338).
sed 's#^.SILENT:##g' -i "${S}"/Makedefs.in || die "sed failed"
@@ -263,7 +257,7 @@ multilib_src_install_all() {
use zeroconf && neededservices+=" avahi-daemon"
use dbus && neededservices+=" dbus"
[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
- cp "${FILESDIR}"/cupsd.init.d-r1 "${T}"/cupsd || die
+ cp "${FILESDIR}"/cupsd.init.d-r2 "${T}"/cupsd || die
sed -i \
-e "s/@neededservices@/$neededservices/" \
"${T}"/cupsd || die
@@ -298,7 +292,7 @@ multilib_src_install_all() {
# create /etc/cups/client.conf, bug #196967 and #266678
echo "ServerName ${EPREFIX}/run/cups/cups.sock" >>
"${ED}"/etc/cups/client.conf
- # the following file iw now provided by cups-filters:
+ # the following file is now provided by cups-filters:
rm -r "${ED}"/usr/share/cups/banners || die
# the following are created by the init script
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index 6e5807f..c71f152 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.ebuild
@@ -76,11 +76,7 @@ RDEPEND="${CDEPEND}
selinux? ( sec-policy/selinux-cups )
"
-PDEPEND="
- app-text/ghostscript-gpl[cups]
- app-text/poppler[utils]
- >=net-print/cups-filters-1.0.43
-"
+PDEPEND=">=net-print/cups-filters-1.0.43"
REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )
