diff options
author | Michał Górny <mgorny@gentoo.org> | 2013-05-05 07:09:16 +0000 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2013-05-05 07:09:16 +0000 |
commit | 1feb0352e045d7da0a1f563623d0f626789204f0 (patch) | |
tree | 93f4f997b27edd8fb75e03218237365a458d379d /net-print | |
parent | Cleanup. (diff) | |
download | gentoo-2-1feb0352e045d7da0a1f563623d0f626789204f0.tar.gz gentoo-2-1feb0352e045d7da0a1f563623d0f626789204f0.tar.bz2 gentoo-2-1feb0352e045d7da0a1f563623d0f626789204f0.zip |
Add the "cancel" executable to the lprng-compat flag as well.
(Portage version: 2.2.0_alpha174/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!)
Diffstat (limited to 'net-print')
-rw-r--r-- | net-print/cups/ChangeLog | 8 | ||||
-rw-r--r-- | net-print/cups/cups-1.6.2-r4.ebuild (renamed from net-print/cups/cups-1.6.2-r3.ebuild) | 6 | ||||
-rw-r--r-- | net-print/cups/cups-9999.ebuild | 6 |
3 files changed, 13 insertions, 7 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog index 695dee94d2d5..dd6134f8f0b1 100644 --- a/net-print/cups/ChangeLog +++ b/net-print/cups/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-print/cups # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.532 2013/05/03 20:00:49 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.533 2013/05/05 07:09:16 mgorny Exp $ + +*cups-1.6.2-r4 (05 May 2013) + + 05 May 2013; Michał Górny <mgorny@gentoo.org> +cups-1.6.2-r4.ebuild, + -cups-1.6.2-r3.ebuild, cups-9999.ebuild: + Add the "cancel" executable to the lprng-compat flag as well. 03 May 2013; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.6.2-r3.ebuild, cups-9999.ebuild, metadata.xml: diff --git a/net-print/cups/cups-1.6.2-r3.ebuild b/net-print/cups/cups-1.6.2-r4.ebuild index 27fcbf732e5f..def7608a93b1 100644 --- a/net-print/cups/cups-1.6.2-r3.ebuild +++ b/net-print/cups/cups-1.6.2-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6.2-r3.ebuild,v 1.2 2013/05/03 20:00:49 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6.2-r4.ebuild,v 1.1 2013/05/05 07:09:16 mgorny Exp $ EAPI=5 @@ -253,9 +253,9 @@ src_install() { # for the special case of running lprng and cups together, bug 467226 if use lprng-compat ; then - rm -fv "${ED}"/usr/bin/lp* + rm -fv "${ED}"/usr/bin/{lp*,cancel} rm -fv "${ED}"/usr/sbin/lp* - rm -fv "${ED}"/usr/share/man/man1/lp* + rm -fv "${ED}"/usr/share/man/man1/{lp*,cancel*} rm -fv "${ED}"/usr/share/man/man8/lp* ewarn "Not installing lp... binaries, since the lprng-compat useflag is set." ewarn "Unless you plan to install an exotic server setup, you most likely" diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild index ca9b1afa35a5..b19951c6042e 100644 --- a/net-print/cups/cups-9999.ebuild +++ b/net-print/cups/cups-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 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.30 2013/05/03 20:00:49 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.31 2013/05/05 07:09:16 mgorny Exp $ EAPI=5 @@ -253,9 +253,9 @@ src_install() { # for the special case of running lprng and cups together, bug 467226 if use lprng-compat ; then - rm -fv "${ED}"/usr/bin/lp* + rm -fv "${ED}"/usr/bin/{lp*,cancel} rm -fv "${ED}"/usr/sbin/lp* - rm -fv "${ED}"/usr/share/man/man1/lp* + rm -fv "${ED}"/usr/share/man/man1/{lp*,cancel*} rm -fv "${ED}"/usr/share/man/man8/lp* ewarn "Not installing lp... binaries, since the lprng-compat useflag is set." ewarn "Unless you plan to install an exotic server setup, you most likely" |