diff options
| author |   Stefan Schweizer <genstef@gentoo.org> | 2006-05-08 22:53:36 +0000 |
|---|---|---|
| committer | Stefan Schweizer <genstef@gentoo.org> | 2006-05-08 22:53:36 +0000 |
| commit | 77044658d562add26a8f656f318d17464f29ae8e (patch) | |
| tree | f99630262fb8f530640c9ee385155481ba0682b0 /net-print | |
| parent | Make cups-1.2 aware (diff) | |
| download | gentoo-2-77044658d562add26a8f656f318d17464f29ae8e.tar.gz gentoo-2-77044658d562add26a8f656f318d17464f29ae8e.tar.bz2 gentoo-2-77044658d562add26a8f656f318d17464f29ae8e.zip | |
cups use, cups-config --serverbin
(Portage version: 2.1_pre10-r4)
Diffstat (limited to 'net-print')
| -rw-r--r-- | net-print/foomatic-filters/ChangeLog | 5 | ||||
| -rw-r--r-- | net-print/foomatic-filters/foomatic-filters-3.0.2-r1.ebuild | 16 |
2 files changed, 9 insertions, 12 deletions
diff --git a/net-print/foomatic-filters/ChangeLog b/net-print/foomatic-filters/ChangeLog index cb68a8968954..2a804209ce85 100644 --- a/net-print/foomatic-filters/ChangeLog +++ b/net-print/foomatic-filters/ChangeLog @@ -1,11 +1,10 @@ # 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.32 2006/05/08 22:40:35 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters/ChangeLog,v 1.33 2006/05/08 22:53:36 genstef Exp $ 08 May 2006; Stefan Schweizer <genstef@gentoo.org> foomatic-filters-3.0.2-r1.ebuild: - Remove pointless cups useflag - does not even configure w/o cups, Make - cups-1.2 aware, no revbump because no installed files were changed + Make cups-1.2 aware, no revbump because no installed files were changed *foomatic-filters-3.0.2-r1 (05 May 2006) diff --git a/net-print/foomatic-filters/foomatic-filters-3.0.2-r1.ebuild b/net-print/foomatic-filters/foomatic-filters-3.0.2-r1.ebuild index 464006d6e492..a30eb278eb5f 100644 --- a/net-print/foomatic-filters/foomatic-filters-3.0.2-r1.ebuild +++ b/net-print/foomatic-filters/foomatic-filters-3.0.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 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.2-r1.ebuild,v 1.2 2006/05/08 22:40:35 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters/foomatic-filters-3.0.2-r1.ebuild,v 1.3 2006/05/08 22:53:36 genstef Exp $ inherit eutils @@ -11,10 +11,10 @@ SRC_URI="http://www.linuxprinting.org/download/foomatic/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86" -IUSE="samba" +IUSE="cups samba" DEPEND="samba? ( net-fs/samba ) - >=net-print/cups-1.1.19 + cups? ( >=net-print/cups-1.1.19 ) || ( app-text/enscript net-print/cups @@ -33,7 +33,7 @@ src_unpack() { } src_compile() { - has_version =net-print/cups-1.2* && export CUPS=/usr/libexec/cups CUPS_FILTERS=/usr/libexec/cups/filter + export CUPS=$(cups-config --serverbin) CUPS_FILTERS=$(cups-config --serverbin)/filter econf || die "econf failed" emake || die "emake failed" } @@ -43,10 +43,8 @@ src_install() { dosym /usr/bin/foomatic-rip /usr/bin/lpdomatic - dosym /usr/bin/foomatic-gswrapper /usr/$(get_libdir)/cups/filter/foomatic-gswrapper - dosym /usr/bin/foomatic-rip /usr/$(get_libdir)/cups/filter/cupsomatic - if has_version =net-print/cups-1.2*; then - mv ${D}/usr/$(get_libdir)/cups/* ${D}/usr/libexec/cups - rm ${D}/usr/$(get_libdir)/cups/ + 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 fi } |