add if has_version =net-print/cups-1.1*; for the compat symlinks and einfo thanks to jakub

Package-Manager: portage-2.1.1_pre1-r1

3 files changed, 34 insertions, 28 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 40aa81ef53dc..1e1962a3bdfd 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.184 2006/06/22 17:54:14 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.185 2006/06/22 18:09:59 genstef Exp $
+
+  22 Jun 2006; Stefan Schweizer <genstef@gentoo.org> cups-1.2.1-r2.ebuild:
+  add if has_version =net-print/cups-1.1*; for the compat symlinks and einfo
+  thanks to jakub
 
 *cups-1.2.1-r2 (22 Jun 2006)
 
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index d8102a55d121..16961ffe9191 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -72,14 +72,14 @@ EBUILD cups-1.1.23-r7.ebuild 4654 RMD160 3b50b26d2519c60d5f86274dc1d998af69bee78
 MD5 28058673f2f754db6b5c8ea6ad9490ac cups-1.1.23-r7.ebuild 4654
 RMD160 3b50b26d2519c60d5f86274dc1d998af69bee783 cups-1.1.23-r7.ebuild 4654
 SHA256 71115c06cf8608d96b56fb3ba4cab0dd725648938a3e28e0a8af6c294585db39 cups-1.1.23-r7.ebuild 4654
-EBUILD cups-1.2.1-r2.ebuild 5024 RMD160 417843c950088e224d9cf9878647561341845c8d SHA1 b02040533c11efc44bb68cfc2a53bd892c3ec4b1 SHA256 9d5616aa6fbd03417d05c2fd9c0fc51d956a345ceb9d66192fbfa3c4d7ccde16
-MD5 0471b36c275ab3fffb9d688135c86fa8 cups-1.2.1-r2.ebuild 5024
-RMD160 417843c950088e224d9cf9878647561341845c8d cups-1.2.1-r2.ebuild 5024
-SHA256 9d5616aa6fbd03417d05c2fd9c0fc51d956a345ceb9d66192fbfa3c4d7ccde16 cups-1.2.1-r2.ebuild 5024
-MISC ChangeLog 25418 RMD160 dd7e943c3debeb7a5c34eba93bb95b34137afe11 SHA1 2f6566980724b961fa9449582a53def104ddeb79 SHA256 e01cd7bbfc5d816d0c01ef17129a757c40f5507f04e7b5bd00fe3411f48a3e7b
-MD5 8f9c02ac89a24555148be45a20030453 ChangeLog 25418
-RMD160 dd7e943c3debeb7a5c34eba93bb95b34137afe11 ChangeLog 25418
-SHA256 e01cd7bbfc5d816d0c01ef17129a757c40f5507f04e7b5bd00fe3411f48a3e7b ChangeLog 25418
+EBUILD cups-1.2.1-r2.ebuild 5088 RMD160 fb6f2899496b4ece8d86dc6dea816c7bf409faf6 SHA1 7f89f80680ba636148a4be8e3d557e4a0b1f01a2 SHA256 caf2b0cf336b478b017f0f634a122731bf99c682cbf130c6c04f93a4a1c54112
+MD5 83398007634c3a8c15688f4e19078e2f cups-1.2.1-r2.ebuild 5088
+RMD160 fb6f2899496b4ece8d86dc6dea816c7bf409faf6 cups-1.2.1-r2.ebuild 5088
+SHA256 caf2b0cf336b478b017f0f634a122731bf99c682cbf130c6c04f93a4a1c54112 cups-1.2.1-r2.ebuild 5088
+MISC ChangeLog 25589 RMD160 f959c8fa6f3060c52b887f38ad9c498d7c64f33b SHA1 5271cfe5bb20aaef13b74dc49d2adb8fad7961d8 SHA256 7e6036c2a79d3132d049d62f4d4d4778ca1387375f93ce7101f16f713b87d225
+MD5 b3a46008f9d3c95842288cc2d8a595fe ChangeLog 25589
+RMD160 f959c8fa6f3060c52b887f38ad9c498d7c64f33b ChangeLog 25589
+SHA256 7e6036c2a79d3132d049d62f4d4d4778ca1387375f93ce7101f16f713b87d225 ChangeLog 25589
 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-r2.ebuild b/net-print/cups/cups-1.2.1-r2.ebuild
index b9ad5469627d..4fa300c26e20 100644
--- a/net-print/cups/cups-1.2.1-r2.ebuild
+++ b/net-print/cups/cups-1.2.1-r2.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-r2.ebuild,v 1.1 2006/06/22 17:54:14 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.1-r2.ebuild,v 1.2 2006/06/22 18:09:59 genstef Exp $
 
 inherit eutils flag-o-matic multilib autotools
 
@@ -143,22 +143,24 @@ pkg_postinst() {
 	einfo
 	einfo "You need to emerge ghostscript with the cups-USEflag turned on"
 	ewarn
-	ewarn "The configuration changed with cups-1.2, you may want to save the old"
-	ewarn "one and start from scratch:"
-	ewarn "# mv /etc/cups /etc/cups.orig; emerge -va1 cups"
-	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 "# FEATURES=-collision-protect emerge -va1 \$(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"
-	einfo "Rebuilding kdelibs is also a good idea when you want to use it for cups"
-
-	# place symlinks to make the update smoothless
-	for i in ${ROOT}/usr/lib/cups/{backend,filter}/*; do
-		[ "${i/\*}" != "${i}" ] && continue;
-		ln -s ${i} ${i/lib/libexec}
-	done
+	if has_version =net-print/cups-1.1*; then
+		ewarn "The configuration changed with cups-1.2, you may want to save the old"
+		ewarn "one and start from scratch:"
+		ewarn "# mv /etc/cups /etc/cups.orig; emerge -va1 cups"
+		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 "# FEATURES=-collision-protect emerge -va1 \$(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"
+		einfo "Rebuilding kdelibs is also a good idea when you want to use it for cups"
+
+		# place symlinks to make the update smoothless
+		for i in ${ROOT}/usr/lib/cups/{backend,filter}/*; do
+			[ "${i/\*}" != "${i}" ] && continue;
+			ln -s ${i} ${i/lib/libexec}
+		done
+	fi
 }