Mention FEATURES=-collision-protect in the pkg-postinst einfo notes, thanks to Michae...

Package-Manager: portage-2.1

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index e289c350f99e0f515281e855bf40d5aa48f30e98..01a598c7fd89694a94431fe107a9ca456ac2a4e7 100644 (file)
--- 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/Manifest b/net-print/cups/Manifest
index 120050a8e9ef2f632689a0ff0e8a9dec6a97312c..bf9a9d37e8e97ce4546af84aae15188718b4fa71 100644 (file)
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -68,14 +68,14 @@ EBUILD cups-1.1.23-r7.ebuild 4653 RMD160 3e0eda3b93c9626b3f81dcb1a77c4a6d6e70a48
 MD5 09c9a9dc9a485404b7828210068bcf0f cups-1.1.23-r7.ebuild 4653
 RMD160 3e0eda3b93c9626b3f81dcb1a77c4a6d6e70a489 cups-1.1.23-r7.ebuild 4653
 SHA256 09cf15f1ea38a706c673454d6b932aff09d2af8c260b15fc303151f09735f7bc cups-1.1.23-r7.ebuild 4653
-EBUILD cups-1.2.1-r1.ebuild 4660 RMD160 81b985f399026adfdfe97912cef5ab80c2a62ee5 SHA1 8bd46fd04995c41683a5b915cb3a79e4128de7f3 SHA256 147f0cbf4b3046c79ffd6a92245603783090129aa1c7bb4cf191840197584daf
-MD5 d1dca55a4a3b38da3d230f8f348e3e13 cups-1.2.1-r1.ebuild 4660
-RMD160 81b985f399026adfdfe97912cef5ab80c2a62ee5 cups-1.2.1-r1.ebuild 4660
-SHA256 147f0cbf4b3046c79ffd6a92245603783090129aa1c7bb4cf191840197584daf cups-1.2.1-r1.ebuild 4660
-MISC ChangeLog 23959 RMD160 7d8796b648f23f4a69cb7a6bfcce2067533ffec6 SHA1 7f3d4d627dd79b74dd1125a11a75e521f65f4969 SHA256 0fb92005c2338ed339849ef596e23423fcf96f815361cec3ba230835ee037b75
-MD5 f5f51ccdb8da4983586cd72d26cf0c5f ChangeLog 23959
-RMD160 7d8796b648f23f4a69cb7a6bfcce2067533ffec6 ChangeLog 23959
-SHA256 0fb92005c2338ed339849ef596e23423fcf96f815361cec3ba230835ee037b75 ChangeLog 23959
+EBUILD cups-1.2.1-r1.ebuild 4846 RMD160 78b798183f4e9a974d7aa9845caff8b2bb6a15cd SHA1 36d675a64151dc8e9ac454189de12913b211a79d SHA256 f61e3fd25837478106e4255cdaade75e07725b5d1538c4b6f6bae092c4cd2a3b
+MD5 30f5b3335ddc92df8ca83a242fa1eee9 cups-1.2.1-r1.ebuild 4846
+RMD160 78b798183f4e9a974d7aa9845caff8b2bb6a15cd cups-1.2.1-r1.ebuild 4846
+SHA256 f61e3fd25837478106e4255cdaade75e07725b5d1538c4b6f6bae092c4cd2a3b cups-1.2.1-r1.ebuild 4846
+MISC ChangeLog 24180 RMD160 c5f9a55ef39df52564035c4baef8ed9a114d27e5 SHA1 a8691b9df0662d0630b46e25f5a55747d50aae0e SHA256 75386b16c50ae708256dbe07bd30edc36fe5f52dacf6c3fd1da4131849012017
+MD5 154ea32fa8240a7d0a02a7d67ac1d28a ChangeLog 24180
+RMD160 c5f9a55ef39df52564035c4baef8ed9a114d27e5 ChangeLog 24180
+SHA256 75386b16c50ae708256dbe07bd30edc36fe5f52dacf6c3fd1da4131849012017 ChangeLog 24180
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161

diff --git a/net-print/cups/cups-1.2.1-r1.ebuild b/net-print/cups/cups-1.2.1-r1.ebuild
index f4831752d33f06020e6d41483390d227722b7800..473639624479d7a61f2f53a73d313538ff66ce9a 100644 (file)
--- 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