From 401a8c5780728f48029edd740e8e437a9c813490 Mon Sep 17 00:00:00 2001 From: Stefan Schweizer Date: Mon, 19 Feb 2007 21:37:57 +0000 Subject: [PATCH] Really fix bug 156966 Package-Manager: portage-2.1.2-r9 --- net-print/foomatic-filters/ChangeLog | 7 ++++-- net-print/foomatic-filters/Manifest | 16 ++++++------- .../foomatic-filters-3.0.20060720.ebuild | 24 ++++++++++++------- 3 files changed, 29 insertions(+), 18 deletions(-) diff --git a/net-print/foomatic-filters/ChangeLog b/net-print/foomatic-filters/ChangeLog index f154fd443e1a..46c6ff3260c8 100644 --- a/net-print/foomatic-filters/ChangeLog +++ b/net-print/foomatic-filters/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-print/foomatic-filters -# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters/ChangeLog,v 1.50 2006/12/28 18:58:37 the_paya Exp $ +# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters/ChangeLog,v 1.51 2007/02/19 21:37:57 genstef Exp $ + + 19 Feb 2007; foomatic-filters-3.0.20060720.ebuild: + Really fix bug 156966 28 Dec 2006; Javier Villavicencio foomatic-filters-3.0.20060720.ebuild: diff --git a/net-print/foomatic-filters/Manifest b/net-print/foomatic-filters/Manifest index 39d54b552dc7..9aabdc7927d4 100644 --- a/net-print/foomatic-filters/Manifest +++ b/net-print/foomatic-filters/Manifest @@ -12,14 +12,14 @@ EBUILD foomatic-filters-3.0.2-r1.ebuild 1407 RMD160 52d55701f8c826fd595f1f849c2e MD5 658edfe9010222096838e20b468447bb foomatic-filters-3.0.2-r1.ebuild 1407 RMD160 52d55701f8c826fd595f1f849c2e8bcd943b6c65 foomatic-filters-3.0.2-r1.ebuild 1407 SHA256 a6a175500af996da97b2189be25e2ff4d2fdda2363595e7839712cd30d2b63c8 foomatic-filters-3.0.2-r1.ebuild 1407 -EBUILD foomatic-filters-3.0.20060720.ebuild 1774 RMD160 2ab7805da067e02deba558cf84108063691c1beb SHA1 b4ae428a24204664e38a87b93c161286e9dc9e23 SHA256 7c546dc3207e6ccc0a50306d35132801297246151d4017d6e39e1150ce1f13e8 -MD5 225937dba5cc91237233691df5481d33 foomatic-filters-3.0.20060720.ebuild 1774 -RMD160 2ab7805da067e02deba558cf84108063691c1beb foomatic-filters-3.0.20060720.ebuild 1774 -SHA256 7c546dc3207e6ccc0a50306d35132801297246151d4017d6e39e1150ce1f13e8 foomatic-filters-3.0.20060720.ebuild 1774 -MISC ChangeLog 6532 RMD160 cdf714a1504ebc85a5058495990217e820153d0d SHA1 59762b40a9b9c40720fc2dda8e4b0042d5519acf SHA256 027dffc14adbceece7b7374ce67aa737c60c9a15181f6990ba3fa68c6c70eaf3 -MD5 71ec06f07e61220a72ebf5316759fc79 ChangeLog 6532 -RMD160 cdf714a1504ebc85a5058495990217e820153d0d ChangeLog 6532 -SHA256 027dffc14adbceece7b7374ce67aa737c60c9a15181f6990ba3fa68c6c70eaf3 ChangeLog 6532 +EBUILD foomatic-filters-3.0.20060720.ebuild 1770 RMD160 adbf9081aa2d20f7f8296524881d8c9a3d3e0234 SHA1 1daabf0a02d2bb2ee160187d9acababafaad5a53 SHA256 d644259be8c918ddad71829ad670bc929976f266ed3783a9fa50e06ee61be76c +MD5 c879dfd63ef9445b57edde9c75cf0653 foomatic-filters-3.0.20060720.ebuild 1770 +RMD160 adbf9081aa2d20f7f8296524881d8c9a3d3e0234 foomatic-filters-3.0.20060720.ebuild 1770 +SHA256 d644259be8c918ddad71829ad670bc929976f266ed3783a9fa50e06ee61be76c foomatic-filters-3.0.20060720.ebuild 1770 +MISC ChangeLog 6630 RMD160 579e3807e42ce6ea636f0f61a1f7868ecd91b0a5 SHA1 a1e97438831f622a26e7daad50ae8d7742ffebc3 SHA256 c37b0f226b1000476ff02638cde205c1246c798b21c038e12a07046cb46bfc6d +MD5 b48f5b9cfa96a6f77a7d684fa7e442cb ChangeLog 6630 +RMD160 579e3807e42ce6ea636f0f61a1f7868ecd91b0a5 ChangeLog 6630 +SHA256 c37b0f226b1000476ff02638cde205c1246c798b21c038e12a07046cb46bfc6d ChangeLog 6630 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161 diff --git a/net-print/foomatic-filters/foomatic-filters-3.0.20060720.ebuild b/net-print/foomatic-filters/foomatic-filters-3.0.20060720.ebuild index bfb753ccd0f6..9754dbc6d9df 100644 --- a/net-print/foomatic-filters/foomatic-filters-3.0.20060720.ebuild +++ b/net-print/foomatic-filters/foomatic-filters-3.0.20060720.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters/foomatic-filters-3.0.20060720.ebuild,v 1.14 2006/12/28 18:58:37 the_paya Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters/foomatic-filters-3.0.20060720.ebuild,v 1.15 2007/02/19 21:37:57 genstef Exp $ inherit eutils versionator autotools @@ -28,6 +28,14 @@ DEPEND="${RDEPEND}" S=${WORKDIR}/${MY_P} +pkg_setup() { + if use cups; then + CUPS_SERVERBIN="$(cups-config --serverbin)" + else + CUPS_SERVERBIN="" + fi +} + src_unpack() { unpack ${A} cd "${S}" @@ -37,8 +45,8 @@ src_unpack() { } src_compile() { - export CUPS_BACKENDS=$(cups-config --serverbin 2>/dev/null)/backend \ - CUPS_FILTERS=$(cups-config --serverbin 2>/dev/null)/filter CUPS=$(cups-config --serverbin 2>&1) + export CUPS_BACKENDS=${CUPS_SERVERBIN}/backend \ + CUPS_FILTERS=${CUPS_SERVERBIN}/filter CUPS=${CUPS_SERVERBIN}/ econf || die "econf failed" emake || die "emake failed" } @@ -49,10 +57,10 @@ src_install() { dosym /usr/bin/foomatic-rip /usr/bin/lpdomatic if use cups; then - dosym /usr/bin/foomatic-gswrapper $(cups-config --serverbin)/filter/foomatic-gswrapper - dosym /usr/bin/foomatic-rip $(cups-config --serverbin)/filter/cupsomatic + dosym /usr/bin/foomatic-gswrapper ${CUPS_SERVERBIN}/filter/foomatic-gswrapper + dosym /usr/bin/foomatic-rip ${CUPS_SERVERBIN}/filter/cupsomatic else - rm -r "${D}"/$(cups-config --serverbin 2>/dev/null)/filter - rm -r "${D}"/$(cups-config --serverbin 2>/dev/null)/backend + rm -r "${D}"/${CUPS_SERVERBIN}/filter + rm -r "${D}"/${CUPS_SERVERBIN}/backend fi } -- 2.26.2