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
commitb1d856c5a2518f46a84ba6cbc161c3e446f4b5cf (patch)
tree12d2fe4dfdc74b31e08ec08c81ff58d49e44dd1e /net-print
parentfix bug #283163 and bug #239595 (diff)
downloadhistorical-b1d856c5a2518f46a84ba6cbc161c3e446f4b5cf.tar.gz
historical-b1d856c5a2518f46a84ba6cbc161c3e446f4b5cf.tar.bz2
historical-b1d856c5a2518f46a84ba6cbc161c3e446f4b5cf.zip
Correct sed command.
Package-Manager: portage-2.2_rc50/cvs/Linux i686
Diffstat (limited to 'net-print')
-rw-r--r--net-print/cups/ChangeLog6
-rw-r--r--net-print/cups/Manifest6
-rw-r--r--net-print/cups/cups-1.3.10-r2.ebuild4
-rw-r--r--net-print/cups/cups-1.3.11-r1.ebuild4
4 files changed, 12 insertions, 8 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/Manifest b/net-print/cups/Manifest
index 3e567ee6a8db..d34bc5e198f7 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -9,8 +9,8 @@ AUX pdftops-1.20.gentoo 10412 RMD160 16e229662c47e03af1d1f4cb5764a76d17a66642 SH
DIST cups-1.3.10-source.tar.bz2 3778970 RMD160 9c8f5366f84b5f9087f7a29bace677db309a933f SHA1 48689f07104106216d35198cc90ed56df33faf38 SHA256 9701a545a6a05a991beeb49b41fbb4d450c3bdbb4eb74b132b0d2988640bb566
DIST cups-1.3.11-source.tar.bz2 3799424 RMD160 aa263fe29350cee307bbd72ef2f5cb061c2476e0 SHA1 c8304ee8d631bb370fc10fc1fffbe8ebae413df2 SHA256 824b7fe5cefa981f2ce20f356983be182a551f716ccab8f5194fe645b1178303
DIST cups-1.4.2-source.tar.bz2 4450466 RMD160 3848989e3e585e69def0b5ccc9645c1670b0a687 SHA1 84be13b1a83a981cf1f3f9f812d53f3a3ca247cf SHA256 646bc0dbac064d05c0a93735fb556299eda0ae32ce4568506654cb952c719314
-EBUILD cups-1.3.10-r2.ebuild 8318 RMD160 2fa08234e3a4598abc934eefad5d14dd8eb5b5c0 SHA1 b8578495327461d6f8b0108145498a78d769e8a4 SHA256 e22133dfd11f5c5420860470df5fdf975a0d10dbe2a86d9368529fc947e77ec6
-EBUILD cups-1.3.11-r1.ebuild 8587 RMD160 65c2a8ddee6422c1535719a8e4cc0b87da22a73e SHA1 a204c7a91c675192a5cbc8e919c2045ba5312944 SHA256 6923fa687a8e22cc97ab63986759a29c259929dbea6fee54a911508632f51918
+EBUILD cups-1.3.10-r2.ebuild 8319 RMD160 0a37bfa1d47d4c2e52ea2332b11f0bd8c638b5e3 SHA1 b6366c068a19b660af54d096e4883725f32c7799 SHA256 ef0e52aad51833d3937145997eec22b3bb0a0edaa8aad5d77b0be2c8295c4f7f
+EBUILD cups-1.3.11-r1.ebuild 8588 RMD160 f2f8e13f280ce1332809ade805a0df4897eb5ae9 SHA1 e20aab0d23ab8befcccfb8f3f08e9729b2913702 SHA256 c6920ed51f50d413ec43af3e331692ffa65166150022d9a89205fc93051a918b
EBUILD cups-1.4.2.ebuild 5406 RMD160 bac8252dc86b8cb1f401289eb33f8b9891d44b60 SHA1 0c0529d5d57d76c9bcdaa5d2614838448638acbe SHA256 ea0cf5b9f4e3f795e02ab2e44f9b4918610937ae791ff17dd557314a7d64785b
-MISC ChangeLog 54723 RMD160 ab096d095a4a72f86b7c1f68877dc43344abef1e SHA1 b3219061070f691a64011a1af395384cda699adc SHA256 a9d4736d2d81d0b8c6f6355c544911048c1129b6ffee34d5cb9c7f4bab7e968d
+MISC ChangeLog 54840 RMD160 e402a02ca3b668f4f0fb3b0f588675514e577830 SHA1 ea64498117411c3b91e3573f351d14106332b52e SHA256 5d11f6884fdd5a16cc5d2f9bbc268b57e1e4d700b51eda7096a94248911b30e0
MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
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."