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 D10B659CA5 for ; Wed, 23 Mar 2016 06:29:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6F1CA21C01B; Wed, 23 Mar 2016 06:29:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 00AE921C01B for ; Wed, 23 Mar 2016 06:29:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D416E340C7F for ; Wed, 23 Mar 2016 06:29:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 39DC3851 for ; Wed, 23 Mar 2016 06:29:49 +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: <1458714460.393b6e8a6b288317111fc4edaf4ffa42660b261f.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-print/cups-filters/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-print/cups-filters/cups-filters-1.8.2-r1.ebuild net-print/cups-filters/cups-filters-9999.ebuild X-VCS-Directories: net-print/cups-filters/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 393b6e8a6b288317111fc4edaf4ffa42660b261f X-VCS-Branch: master Date: Wed, 23 Mar 2016 06:29:49 +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: b82a85c5-70df-4165-849e-f28a9f5d6ff5 X-Archives-Hash: 774b84803edc81657d9b40d406af10b0 commit: 393b6e8a6b288317111fc4edaf4ffa42660b261f Author: Brian Norris chromium org> AuthorDate: Wed Mar 23 06:22:39 2016 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Wed Mar 23 06:27:40 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=393b6e8a net-print/cups-filters: fix paths to cups runtime state This allows the cups browser to locate the cups server state and matches the flags used in the cups ebuild. ...rs-9999.ebuild => cups-filters-1.8.2-r1.ebuild} | 33 +++++++++------------- net-print/cups-filters/cups-filters-9999.ebuild | 2 ++ 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/net-print/cups-filters/cups-filters-9999.ebuild b/net-print/cups-filters/cups-filters-1.8.2-r1.ebuild similarity index 76% copy from net-print/cups-filters/cups-filters-9999.ebuild copy to net-print/cups-filters/cups-filters-1.8.2-r1.ebuild index a07e103..00d2626 100644 --- a/net-print/cups-filters/cups-filters-9999.ebuild +++ b/net-print/cups-filters/cups-filters-1.8.2-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$ @@ -6,7 +6,7 @@ EAPI=5 GENTOO_DEPEND_ON_PERL=no -inherit eutils perl-module autotools systemd +inherit eutils perl-module systemd if [[ "${PV}" == "9999" ]] ; then inherit bzr @@ -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 @@ -47,17 +47,17 @@ DEPEND="${RDEPEND} dev-util/gdbus-codegen " -src_prepare() { - eautoreconf -} - src_configure() { econf \ --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --localstatedir="${EPREFIX}"/var \ + --with-cups-rundir="${EPREFIX}"/run/cups \ $(use_enable dbus) \ $(use_enable zeroconf avahi) \ $(use_enable static-libs static) \ + $(use_enable foomatic) \ $(use_enable ldap) \ + $(use_enable postscript ghostscript) \ --with-fontdir="fonts/conf.avail" \ --with-pdftops=pdftops \ --enable-imagefilters \ @@ -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 } @@ -90,9 +90,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 @@ -103,13 +105,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" } diff --git a/net-print/cups-filters/cups-filters-9999.ebuild b/net-print/cups-filters/cups-filters-9999.ebuild index a07e103..fad7ebc 100644 --- a/net-print/cups-filters/cups-filters-9999.ebuild +++ b/net-print/cups-filters/cups-filters-9999.ebuild @@ -54,6 +54,8 @@ src_prepare() { src_configure() { econf \ --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --localstatedir="${EPREFIX}"/var \ + --with-cups-rundir="${EPREFIX}"/run/cups \ $(use_enable dbus) \ $(use_enable zeroconf avahi) \ $(use_enable static-libs static) \