summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2009-11-21 14:21:41 +0000
committerJeroen Roovers <jer@gentoo.org>2009-11-21 14:21:41 +0000
commit82a3314488337761438328a35812a2cc52222571 (patch)
treee2952fa47c96e46094d60b5474a2f247d7a50434 /net-print
parentfix bug #283163 and bug #239595 (diff)
downloadgentoo-2-82a3314488337761438328a35812a2cc52222571.tar.gz
gentoo-2-82a3314488337761438328a35812a2cc52222571.tar.bz2
gentoo-2-82a3314488337761438328a35812a2cc52222571.zip
Correct sed command.
(Portage version: 2.2_rc50/cvs/Linux i686)
Diffstat (limited to 'net-print')
-rw-r--r--net-print/cups/ChangeLog6
-rw-r--r--net-print/cups/cups-1.3.10-r2.ebuild4
-rw-r--r--net-print/cups/cups-1.3.11-r1.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index ef3e84545473..feea37afc763 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-print/cups
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.367 2009/11/13 18:53:55 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.368 2009/11/21 14:21:40 jer Exp $
+
+ 21 Nov 2009; Jeroen Roovers <jer@gentoo.org> cups-1.3.10-r2.ebuild,
+ cups-1.3.11-r1.ebuild:
+ Correct sed command.
*cups-1.4.2 (13 Nov 2009)
*cups-1.3.11-r1 (13 Nov 2009)
diff --git a/net-print/cups/cups-1.3.10-r2.ebuild b/net-print/cups/cups-1.3.10-r2.ebuild
index b71164ba2024..1fe361948ede 100644
--- a/net-print/cups/cups-1.3.10-r2.ebuild
+++ b/net-print/cups/cups-1.3.10-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.10-r2.ebuild,v 1.10 2009/11/13 18:53:55 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.10-r2.ebuild,v 1.11 2009/11/21 14:21:41 jer Exp $
inherit autotools eutils flag-o-matic multilib pam
@@ -273,7 +273,7 @@ pkg_postinst() {
echo
ewarn "/usr/lib/cups exists - You need to remerge every ebuild that"
ewarn "installed into /usr/lib/cups and /etc/cups, qfile is in portage-utils:"
- ewarn "# FEATURES=-collision-protect emerge -va1 \$(qfile -qC /usr/lib/cups /etc/cups | sed \"s:net-print/cups$::\")"
+ ewarn "# FEATURES=-collision-protect emerge -va1 \$(qfile -qC /usr/lib/cups /etc/cups | sed -e \"s:net-print/cups$::\")"
echo
ewarn "FEATURES=-collision-protect is needed to overwrite the compatibility"
ewarn "symlinks installed by this package, it won't be needed on later merges."
diff --git a/net-print/cups/cups-1.3.11-r1.ebuild b/net-print/cups/cups-1.3.11-r1.ebuild
index 8097a8abfc04..d03c64d3c044 100644
--- a/net-print/cups/cups-1.3.11-r1.ebuild
+++ b/net-print/cups/cups-1.3.11-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.11-r1.ebuild,v 1.1 2009/11/13 18:53:55 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.11-r1.ebuild,v 1.2 2009/11/21 14:21:41 jer Exp $
inherit autotools eutils flag-o-matic multilib pam
@@ -278,7 +278,7 @@ pkg_postinst() {
echo
ewarn "/usr/lib/cups exists - You need to remerge every ebuild that"
ewarn "installed into /usr/lib/cups and /etc/cups, qfile is in portage-utils:"
- ewarn "# FEATURES=-collision-protect emerge -va1 \$(qfile -qC /usr/lib/cups /etc/cups | sed \"s:net-print/cups$::\")"
+ ewarn "# FEATURES=-collision-protect emerge -va1 \$(qfile -qC /usr/lib/cups /etc/cups | sed -e \"s:net-print/cups$::\")"
echo
ewarn "FEATURES=-collision-protect is needed to overwrite the compatibility"
ewarn "symlinks installed by this package, it won't be needed on later merges."