summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schweizer <genstef@gentoo.org>2006-06-15 09:54:09 +0000
committerStefan Schweizer <genstef@gentoo.org>2006-06-15 09:54:09 +0000
commit94b355bd110dd3441587432ac32257ae310419c7 (patch)
tree7fbffe8fa9b251e23e7b78d44f124b00dacd14be /net-print/cups
parentAdd pmount useflag to unieject. (diff)
downloadgentoo-2-94b355bd110dd3441587432ac32257ae310419c7.tar.gz
gentoo-2-94b355bd110dd3441587432ac32257ae310419c7.tar.bz2
gentoo-2-94b355bd110dd3441587432ac32257ae310419c7.zip
Mention FEATURES=-collision-protect in the pkg-postinst einfo notes, thanks to Michael Cramer <bigmichi1@bigmichi1.dyndns.org> in bug 136859
(Portage version: 2.1)
Diffstat (limited to 'net-print/cups')
-rw-r--r--net-print/cups/ChangeLog6
-rw-r--r--net-print/cups/cups-1.2.1-r1.ebuild6
2 files changed, 9 insertions, 3 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index e289c350f99e..01a598c7fd89 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-print/cups
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.176 2006/06/15 00:07:10 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.177 2006/06/15 09:54:09 genstef Exp $
+
+ 15 Jun 2006; Stefan Schweizer <genstef@gentoo.org> cups-1.2.1-r1.ebuild:
+ Mention FEATURES=-collision-protect in the pkg-postinst einfo notes, thanks
+ to Michael Cramer <bigmichi1@bigmichi1.dyndns.org> in bug 136859
15 Jun 2006; Stefan Schweizer <genstef@gentoo.org> cups-1.1.23-r1.ebuild,
cups-1.1.23-r7.ebuild:
diff --git a/net-print/cups/cups-1.2.1-r1.ebuild b/net-print/cups/cups-1.2.1-r1.ebuild
index f4831752d33f..473639624479 100644
--- a/net-print/cups/cups-1.2.1-r1.ebuild
+++ b/net-print/cups/cups-1.2.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.1-r1.ebuild,v 1.4 2006/06/14 21:48:36 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.1-r1.ebuild,v 1.5 2006/06/15 09:54:09 genstef Exp $
inherit eutils pam flag-o-matic multilib autotools
@@ -147,8 +147,10 @@ pkg_postinst() {
ewarn
ewarn "If you are updating from cups-1.1.* you need to remerge every ebuild"
ewarn "that installed into /usr/lib/cups and /etc/cups, qfile is in portage-utils:"
- ewarn "# emerge -va \$(qfile -qC /usr/lib/cups /etc/cups | sed \"s:net-print/cups$::\")"
+ ewarn "# FEATURES=-collision-protect emerge -va \$(qfile -qC /usr/lib/cups /etc/cups | sed \"s:net-print/cups$::\")"
ewarn
+ einfo "FEATURES=-collision-protect is needed to overwrite the compatibility"
+ einfo "symlinks installed by this package, it wont be needed on later merges."
ewarn "You should also run revdep-rebuild"
# place symlinks to make the update smoothless