summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2014-02-12 17:21:10 +0000
committerAndreas K. Hüttel <dilfridge@gentoo.org>2014-02-12 17:21:10 +0000
commit24c81b2ad67906a2e105d73cc4e794a631c126a1 (patch)
treeb4abb237e65b2a31dd12e95a9963423fb98a9cc4 /net-print
parentinitial commit for bug #191149. (diff)
downloadgentoo-2-24c81b2ad67906a2e105d73cc4e794a631c126a1.tar.gz
gentoo-2-24c81b2ad67906a2e105d73cc4e794a631c126a1.tar.bz2
gentoo-2-24c81b2ad67906a2e105d73cc4e794a631c126a1.zip
Allow newer cups-filters to replace foomatic-filters here too.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 94BFDF4484AD142F)
Diffstat (limited to 'net-print')
-rw-r--r--net-print/cups/ChangeLog5
-rw-r--r--net-print/cups/cups-1.6.4.ebuild6
2 files changed, 8 insertions, 3 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index ba146f5dadd9..a40338b85338 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-print/cups
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.585 2014/01/24 18:56:52 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.586 2014/02/12 17:21:10 dilfridge Exp $
+
+ 12 Feb 2014; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.6.4.ebuild:
+ Allow newer cups-filters to replace foomatic-filters here too.
24 Jan 2014; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.6.4.ebuild,
cups-1.7.1.ebuild, cups-9999.ebuild:
diff --git a/net-print/cups/cups-1.6.4.ebuild b/net-print/cups/cups-1.6.4.ebuild
index 7c6a7d20f2de..5edde95efe14 100644
--- a/net-print/cups/cups-1.6.4.ebuild
+++ b/net-print/cups/cups-1.6.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6.4.ebuild,v 1.11 2014/01/24 18:56:52 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6.4.ebuild,v 1.12 2014/02/12 17:21:10 dilfridge Exp $
EAPI=5
@@ -73,7 +73,9 @@ PDEPEND="
app-text/ghostscript-gpl[cups]
app-text/poppler[utils]
>=net-print/cups-filters-1.0.30
- filters? ( net-print/foomatic-filters )
+ filters? (
+ || ( >=net-print/cups-filters-1.0.43-r1[foomatic] net-print/foomatic-filters )
+ )
"
REQUIRED_USE="