Add warning about network browsing on update from 1.5 and earlier

Package-Manager: portage-2.2.0_alpha123/cvs/Linux x86_64
RepoMan-Options: --force

4 files changed, 43 insertions, 9 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 209d227f29df..8351475ac1e7 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.505 2012/08/16 17:07:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.506 2012/08/30 21:37:47 dilfridge Exp $
+
+  30 Aug 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.6.1.ebuild,
+  cups-9999.ebuild:
+  Add warning about network browsing on update from 1.5 and earlier
 
   16 Aug 2012; Jeroen Roovers <jer@gentoo.org> cups-1.6.1.ebuild:
   Marked ~hppa (bug #428356).
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 48ac36734976..4a10ff97bca5 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -32,14 +32,24 @@ DIST cups-1.6.1-source.tar.bz2 8218340 SHA256 5842ab1144e653160fe667ee78b932ee03
 EBUILD cups-1.4.8-r1.ebuild 7317 SHA256 55daeffa41d049b77696c5c19bcc1a2a063077ab36c3d2f15ca91190dfd88958 SHA512 5a6bdd0180aa81cf033d0b7b66cdc0bd8375e78370fb25d2381e88385ae29f8a47feb5c62631347b67707a75092a1ce3f33eaa95bb80912eb16d724f46e2493c WHIRLPOOL 5db1f9e1b9d9246a9bed62013569cc70572c32e1abf5480b7eaa60f047309056f57781efe63d494779672f7351d7c7a936d495c88cb38e44b67ff842437c698a
 EBUILD cups-1.5.2-r4.ebuild 8429 SHA256 556634f25a3decf1322f7ba7d84b0475e7947afef61b6b46f71061ff8dbea735 SHA512 4e6d471127fa78047d492763aeaeec7cf874fb65a6211e567cd5beecbd711085623aa369fcba3a5428e25ddc2eced3e21704dc3eb81792e5e2f4bbb3fd354b97 WHIRLPOOL 37e4766bd70f5f51c1c79e67dac6185af54e26d3d3a93039971a5c1f1537475db56103d0dbf83e7d9a0899f12c45f8bd2608c6d8d2512c1a4fbb66410f014d65
 EBUILD cups-1.5.3.ebuild 8683 SHA256 93862c6bf66eb1003dbfef73cd1e199be45cfad8fcd5e1b36a6bc298e6fb3e6c SHA512 b44d3d5cdc343fe3686b6b0accc48ac44db76fc0d8b3562aa47b1a018cec1a8e9ae46cf7b0b1b1f47df4ff3bb9d35dbc1831cb5e4e94f620ecfcea3ae181318a WHIRLPOOL f39c84f449084790e1382283851a4a750dc01c0929fe0a20b6dca9a8635289bcefb3686c6d6de3b8453e2f718aea48769018701acd2618b71911df2424296dbf
-EBUILD cups-1.6.1.ebuild 7851 SHA256 db2f96ee55e48313049e5dc4600d197859fccc705e0cb83b392aad258d51df6a SHA512 1a062fa497bf1c0968984cee960217afe79a304b093c546417dff41cb2183e0872c9d8753100cb335e9224b2022ea22676b985d86589576970a8e23c2d874e0f WHIRLPOOL 75283833486df2ea8146ffafbf480ad177b812d525da2e4d98c214ec1cec076eb4ea430f3c250cdfabf73f6603b515c20da5845aec4fac872511064de20be19a
-EBUILD cups-9999.ebuild 7845 SHA256 8437950e59c8d5e18e26692b00638722cb5c50ce9d10cd39a70df5c090cfddff SHA512 ad60800164205574d18db9fdedd92ad21059b91d3186d54694c7e374373bdd22fa35ce17ea299c5cf80e7c9448ef5b66c50fb38f6091ddcfeae78c3a0cea1461 WHIRLPOOL f732d8a6535fbcc0ce085535b474a70bd78fb163fa4b62a22cb989ae3fa7e804fafef18a9b606700eb83c98ea0c77e90eccde1e7497f6311b407188b99173f4c
-MISC ChangeLog 77195 SHA256 15e54a5cebd47be057a0370da19f415031e4849dbb0b7932689ce83b3cd0554e SHA512 20cd20c6032ca4b7cf86063d1db743e706fcf35e3605216bebb39223f097f3f27416f1f498980ad7cbb7162f08dac315f05fe0bb043cc3e9c585db36329fb762 WHIRLPOOL e9507124f37ae4d6d7c6ac77e4f8f295bb5486f0b2bc9df56a672070d27adfd772beb9554769256bec28707764856966b3996b8e01382ca36f5bdc65a303ea74
+EBUILD cups-1.6.1.ebuild 8260 SHA256 3ba36f5ddd128d0daf9df4876a230e7c50d99eee5be0ca33894db440d16ae401 SHA512 1fbd58c79fcb3c115a2e94d1cbf0aba101845e6175d756231e81c33f8504cb546d12b7865fba3870ec01016ecdebc0daa452b75a099a9aa4afefb3216c257573 WHIRLPOOL ceb66a03fe1e8b85eeffe958da0a766989bba9e7a0e483b57531fa8621b4f42b364f74807c24ab0ab37fc6e3ffab2515f289ab636c576ad8cad6720b1a8cafde
+EBUILD cups-9999.ebuild 8249 SHA256 ef1599c80fa4869a901f0693efd4cd554a2e3c20932e137e4ad0a813d6863820 SHA512 7090fbdb3a4d322196d671247185fb623f1887de8d29b0f16ac2b6133d4a2e948261de9914965e7b76ae1905b2290928b2b392204d714b09fdd504a1d47dc0b0 WHIRLPOOL 0e746abc1a4ccedeb3922d220a683d79ffaa8d534bc6eba7b7affd07eca5831d688506b9981394c0a240228686040ed9335281c7907bd6bd4bf538528d543c98
+MISC ChangeLog 77366 SHA256 da8c31ac806e894e909d5582497bf93352eb9d411dc237dae1b395e1100286ea SHA512 07f25a6136cdda14e0f94aa4db211fdb8d8cd080a8bd13840af04c7113ad984b96dec924a1220991c96782f39612dbfe0d0aa1258f39bb2956c5b421701da665 WHIRLPOOL 4473eee5b2d13a7996d2c01e37965af73276e753d06dc4f3b3ca970e43d90e5b3e199c31707d2d328cd248355056847f1a7cb7a9ccba0a40071e1e2a2f66b278
 MISC metadata.xml 778 SHA256 26a8d1221a4334579f98705c38f3e3a882c223df86181dcf7968eac2118188b8 SHA512 717b6c3d940b2de149a68bb1c66175cd6fac04e21fcf581d6f1dd248c1bc5ee8fb98ec26a1fa2fca94e8fcb33f131c6635d40a6954721020a989dc260e8b8fbc WHIRLPOOL 057426e3c3f1e7e5a6bb124e0af0d804e15f6bbf17f7b278ef90d773f997beed6c6376bcc9603ac4c67f75675a33bc1fb7a02bb89f7a1ed69634a5d7bf9befbb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAtKOIACgkQVWmRsqeSphNNOwCfZioC6wgJDcck5jfzJAnvJz18
-kiMAnAu2nvy6gKjwK80IAmRLMNc+CEfd
-=hwU0
+iQIcBAEBCAAGBQJQP92lAAoJEEb+UGWnxTyHk/YP/1Rf5O6LRO4sZIRY7z++lEsW
+m2tu+EstK4A+bEffr4jBVb+SLaZboZU401Ru2tolBpxUqCQFIMs5UWyQnFRM0W93
+jUlxzPuDQ2bww7hx6jpcSGuTqGdZZvK5+1YXm0E6EcNepKJbKQDpM6Lao4GRC0jL
+sxW7hadrXwy6R4QfBzxeLzrixIRjN2AmpfCFecue8ZkokaaFL/qRnFpBfB/tnFIY
+oMFVawf85ALGJxgUyoqWiVARgcC3DIJJprA7HR/hsUsopc1hgEaUowZ9/69cZndV
+ziKpVupGoCMBf+gA0FLWB3sckIuEHbhGfM9wuNmiBczPnRAucoL/m21tu0vk7oJ/
+YwLIFIp0x11nOdNVgFow6P0p1KQ8qIuaQqeEuSSh0Db+qqO4mISmIzxSNi3dB4KX
+cZez57201Si0bN05zslYs4/Ov4F1uPC+HzXAXZsKQaI4SCJTHYORvtrQnEqnL2LL
+vUHzK4kqE6WObVs+BsaxXJc25uicI5DZvniL3s7Q4t9A01AZJ20y63g6Anli1wqI
+1M3AsskJHfe66OqiXkBZuGt2ra7GWO2PsjOHUcOF8V2H/vdkWShwxCX/Or1pz9ZH
+cWtMSLk1VV3vpeNydag69bSyrKTy741DvbGGLWzPyUFymZ2uh1O9y55OM2YWrE6h
+oQwJ7n+XBtSHBODJlPnC
+=ClSl
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.6.1.ebuild b/net-print/cups/cups-1.6.1.ebuild
index 8a565ccb223c..5d7e401fb057 100644
--- a/net-print/cups/cups-1.6.1.ebuild
+++ b/net-print/cups/cups-1.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6.1.ebuild,v 1.3 2012/08/16 17:07:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6.1.ebuild,v 1.4 2012/08/30 21:37:47 dilfridge Exp $
 
 EAPI=4
 
@@ -273,6 +273,16 @@ pkg_postinst() {
 	elog "To (re-)enable it, edit /etc/cups/cupsd.conf and set \"Browsing On\", "
 	elog "afterwards re-start or reload cups."
 	echo
+
+	# not slotted - at most one value
+	if [[ "${REPLACING_VERSIONS}" ]] && [[ "${REPLACING_VERSIONS}" < "1.6" ]]; then
+		echo
+		elog "CUPS-1.6 no longer supports automatic remote printers or implicit classes"
+		elog "via the CUPS, LDAP, or SLP protocols, i.e. \"network browsing\"."
+		elog "You will have to find printers using zeroconf/avahi instead, or enter"
+		elog "the location manually."
+		echo
+	fi
 }
 
 pkg_postrm() {
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index 7cc4a0f043c3..950e5009b0e6 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.16 2012/07/28 15:34:31 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.17 2012/08/30 21:37:47 dilfridge Exp $
 
 EAPI=4
 
@@ -273,6 +273,16 @@ pkg_postinst() {
 	elog "To (re-)enable it, edit /etc/cups/cupsd.conf and set \"Browsing On\", "
 	elog "afterwards re-start or reload cups."
 	echo
+
+	# not slotted - at most one value
+	if [[ "${REPLACING_VERSIONS}" ]] && [[ "${REPLACING_VERSIONS}" < "1.6" ]]; then
+		echo
+		elog "CUPS-1.6 no longer supports automatic remote printers or implicit classes"
+		elog "via the CUPS, LDAP, or SLP protocols, i.e. \"network browsing\"."
+		elog "You will have to find printers using zeroconf/avahi instead, or enter"
+		elog "the location manually."
+		echo
+	fi
 }
 
 pkg_postrm() {