summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2012-06-09 10:59:47 +0000
committerAndreas K. Hüttel <dilfridge@gentoo.org>2012-06-09 10:59:47 +0000
commitfc74c4c06e2acbc9bfd962d0f92ddf4beac1f821 (patch)
treec907c191a1db66da104ae0ce9cad9cb239b46b6a /net-print
parentMask polkit-0.106, ok'ed by ssuominen on IRC (diff)
downloadgentoo-2-fc74c4c06e2acbc9bfd962d0f92ddf4beac1f821.tar.gz
gentoo-2-fc74c4c06e2acbc9bfd962d0f92ddf4beac1f821.tar.bz2
gentoo-2-fc74c4c06e2acbc9bfd962d0f92ddf4beac1f821.zip
Remove banners and testprint, now provided by cups-filters
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Diffstat (limited to 'net-print')
-rw-r--r--net-print/cups/ChangeLog8
-rw-r--r--net-print/cups/cups-1.6_beta1-r1.ebuild (renamed from net-print/cups/cups-1.6_beta1.ebuild)6
-rw-r--r--net-print/cups/cups-9999.ebuild6
3 files changed, 17 insertions, 3 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 721ab3b358e3..3d7878940679 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,12 @@
# 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.490 2012/06/07 19:42:52 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.491 2012/06/09 10:59:47 dilfridge Exp $
+
+*cups-1.6_beta1-r1 (09 Jun 2012)
+
+ 09 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+ -cups-1.6_beta1.ebuild, +cups-1.6_beta1-r1.ebuild, cups-9999.ebuild:
+ Remove banners and testprint, now provided by cups-filters
07 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
-cups-1.5.2-r21.ebuild, cups-1.5.3.ebuild, cups-1.6_beta1.ebuild,
diff --git a/net-print/cups/cups-1.6_beta1.ebuild b/net-print/cups/cups-1.6_beta1-r1.ebuild
index 35dd1fd2acfa..3087c815c885 100644
--- a/net-print/cups/cups-1.6_beta1.ebuild
+++ b/net-print/cups/cups-1.6_beta1-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.6_beta1.ebuild,v 1.3 2012/06/07 19:42:52 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6_beta1-r1.ebuild,v 1.1 2012/06/09 10:59:47 dilfridge Exp $
EAPI=4
@@ -249,6 +249,10 @@ src_install() {
# create /etc/cups/client.conf, bug #196967 and #266678
echo "ServerName /var/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf
+
+ # the following files are now provided by cups-filters:
+ rm -r "${ED}"/usr/share/cups/banners || die
+ rm -r "${ED}"/usr/share/cups/data/testprint || die
}
pkg_preinst() {
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index 8c5f6dcf3026..d4e663576e17 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.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-9999.ebuild,v 1.11 2012/06/07 19:42:52 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.12 2012/06/09 10:59:47 dilfridge Exp $
EAPI=4
@@ -249,6 +249,10 @@ src_install() {
# create /etc/cups/client.conf, bug #196967 and #266678
echo "ServerName /var/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf
+
+ # the following files are now provided by cups-filters:
+ rm -r "${ED}"/usr/share/cups/banners || die
+ rm -r "${ED}"/usr/share/cups/data/testprint || die
}
pkg_preinst() {