summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2012-08-08 17:28:41 +0000
committerAndreas K. Hüttel <dilfridge@gentoo.org>2012-08-08 17:28:41 +0000
commit16d13e74facb51c14aac3d4f35e095e16550d729 (patch)
treef98a5e5117ef3f9973cd868ab32cdb69a49ac5a0 /net-print/cups
parentalpha/s390 stable wrt #425360 (diff)
downloadgentoo-2-16d13e74facb51c14aac3d4f35e095e16550d729.tar.gz
gentoo-2-16d13e74facb51c14aac3d4f35e095e16550d729.tar.bz2
gentoo-2-16d13e74facb51c14aac3d4f35e095e16550d729.zip
Block cups-filters, bug 429338
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Diffstat (limited to 'net-print/cups')
-rw-r--r--net-print/cups/ChangeLog6
-rw-r--r--net-print/cups/cups-1.4.8-r1.ebuild3
-rw-r--r--net-print/cups/cups-1.5.2-r4.ebuild3
-rw-r--r--net-print/cups/cups-1.5.3.ebuild3
4 files changed, 11 insertions, 4 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 9f411d5d3bdb..1a7cb44bd073 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-print/cups
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.503 2012/08/05 15:40:52 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.504 2012/08/08 17:28:41 dilfridge Exp $
+
+ 08 Aug 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.4.8-r1.ebuild,
+ cups-1.5.2-r4.ebuild, cups-1.5.3.ebuild:
+ Block cups-filters, bug 429338
05 Aug 2012; Markus Meier <maekke@gentoo.org> cups-1.6.1.ebuild:
add ~arm, bug #428356
diff --git a/net-print/cups/cups-1.4.8-r1.ebuild b/net-print/cups/cups-1.4.8-r1.ebuild
index 221a9a1fd7af..544f533ece69 100644
--- a/net-print/cups/cups-1.4.8-r1.ebuild
+++ b/net-print/cups/cups-1.4.8-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.8-r1.ebuild,v 1.16 2012/07/31 17:35:03 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.8-r1.ebuild,v 1.17 2012/08/08 17:28:41 dilfridge Exp $
EAPI=3
@@ -54,6 +54,7 @@ RDEPEND="
X? ( x11-misc/xdg-utils )
xinetd? ( sys-apps/xinetd )
!net-print/cupsddk
+ !net-print/cups-filters
"
DEPEND="${RDEPEND}
diff --git a/net-print/cups/cups-1.5.2-r4.ebuild b/net-print/cups/cups-1.5.2-r4.ebuild
index 7f7b51625c21..c5c9666e1932 100644
--- a/net-print/cups/cups-1.5.2-r4.ebuild
+++ b/net-print/cups/cups-1.5.2-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r4.ebuild,v 1.15 2012/07/23 15:09:45 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r4.ebuild,v 1.16 2012/08/08 17:28:41 dilfridge Exp $
EAPI=4
@@ -60,6 +60,7 @@ RDEPEND="
usb? ( virtual/libusb:0 )
X? ( x11-misc/xdg-utils )
xinetd? ( sys-apps/xinetd )
+ !net-print/cups-filters
"
DEPEND="${RDEPEND}
diff --git a/net-print/cups/cups-1.5.3.ebuild b/net-print/cups/cups-1.5.3.ebuild
index cb7dc5183986..969c9b393e5b 100644
--- a/net-print/cups/cups-1.5.3.ebuild
+++ b/net-print/cups/cups-1.5.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.3.ebuild,v 1.6 2012/07/23 15:09:45 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.3.ebuild,v 1.7 2012/08/08 17:28:41 dilfridge Exp $
EAPI=4
@@ -67,6 +67,7 @@ RDEPEND="
usb? ( virtual/libusb:0 )
X? ( x11-misc/xdg-utils )
xinetd? ( sys-apps/xinetd )
+ !net-print/cups-filters
"
DEPEND="${RDEPEND}