From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 477C858973 for ; Thu, 11 Feb 2016 02:22:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CE11921C04D; Thu, 11 Feb 2016 02:22:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 63CB621C04D for ; Thu, 11 Feb 2016 02:22:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4D538340B8D for ; Thu, 11 Feb 2016 02:22:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 01168CEB for ; Thu, 11 Feb 2016 02:22:24 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1455156960.4adb3f4034e0b22a089470fbbf9de19e65ca6331.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-print/cups/, net-print/cups-filters/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-print/cups-filters/cups-filters-1.8.1-r1.ebuild net-print/cups-filters/cups-filters-9999.ebuild net-print/cups/cups-2.1.3-r1.ebuild net-print/cups/cups-9999.ebuild X-VCS-Directories: net-print/cups/ net-print/cups-filters/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 4adb3f4034e0b22a089470fbbf9de19e65ca6331 X-VCS-Branch: master Date: Thu, 11 Feb 2016 02:22:24 +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-Archives-Salt: 993a9533-dcbe-418b-b1e3-c12d588f4651 X-Archives-Hash: 31ddef448e8f43f185d42c56b831c549 commit: 4adb3f4034e0b22a089470fbbf9de19e65ca6331 Author: Brian Norris gmail com> AuthorDate: Sat Feb 6 01:23:45 2016 +0000 Commit: Mike Frysinger gentoo 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} )