Version bump

Package-Manager: portage-2.2.0_alpha169/cvs/Linux x86_64
Manifest-Sign-Key: 0x7887F787

4 files changed, 333 insertions, 23 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 9b514cccbd7a..96a4aa10dc87 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.520 2013/03/17 15:08:23 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.521 2013/03/24 16:27:23 dilfridge Exp $
+
+*cups-1.6.2 (24 Mar 2013)
+
+  24 Mar 2013; Andreas K. Huettel <dilfridge@gentoo.org> +cups-1.6.2.ebuild,
+  cups-9999.ebuild:
+  Version bump
 
   17 Mar 2013; Andreas K. Huettel <dilfridge@gentoo.org> cups-9999.ebuild:
   Update keyword list from 1.6.1
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 4b7282d57a56..555b531e001a 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -23,29 +23,29 @@ DIST cups-1.5.2-source.tar.bz2 9595665 SHA256 b150aa108c631f4f07e92cb13c01263a67
 DIST cups-1.5.3-avahi.patch.bz2 17298 SHA256 daed1232c56ff7a3cb293c7eedbb669f3200ac36120a4d2fec09bd91631038ef SHA512 144f059e092e8b254ac31b156a6330fbd573ff22bcabc8a13703ef7c17e3fbda328ec7607b6a5e72b6ad7050142c6e73db733ebad31121c6b91b5a49d724b901 WHIRLPOOL c3c753580c0eb00b7842cc12d1799afe14e9b696c621150b1e23f8a115c18a442b9f45e7dfcf3721cb3efd7bfc7da366ac52fc4d4caa002adcdbc23164633820
 DIST cups-1.5.3-source.tar.bz2 9580485 SHA256 9d716a8ffcefdaff1c37f4a4b590f1d74ff9ff72383a18f3c883c9235907f93d SHA512 0de371eb347a41226a4a84de02f6eddf1585874c606b16173d8ff3e48d4317b1c90b4ef188068786a562c663117c8782339731d4f339ba76f438e8fae0d364cb WHIRLPOOL 09d564c6ac6cb4933e45f7e70b362a61416173cfcbbb3f26ed69c1b2dd51d7e9d8d1ec40993709ccc52a55b7842567a163425f18264ae8e86d20361f75448f5e
 DIST cups-1.6.1-source.tar.bz2 8218340 SHA256 5842ab1144e653160fe667ee78b932ee036b054c0c2d20533d19e309149a7790 SHA512 4652ab1c2a1d7650b4cb7e552a1689624471e0196bb1a5f389614f8727c1b1d6c59370511217ba6ae8ba427b4b0787ade8de0a9eadb0af3fe483833fbf152305 WHIRLPOOL e1c298d1c8bcaa81ac80734bf271fcb9bf8e232a88150d9c6ce628b179ef88e6cdf7299684af14b6addea268b75d8fd982a789117f81c81f9b9b5985837f91bd
+DIST cups-1.6.2-source.tar.bz2 8363773 SHA256 37a3ebd305e76cfd4c9c53013e89c0f7a4dcb04b2e9da61029a29faa57e0f10d SHA512 08b7ae95af9c19a1bb72f851b801d55a51360a4c2993c34878d18a605bf1d9381eada5a8f51653c4467738f0509bb8ad713b79e78c8d2a80f1aa86f1d2196038 WHIRLPOOL 527f4eb1016ac20e737cb5171c8cb4c71295e36da8704dd97c8d405c1cf31a8861cab4dc1b2c8a37e21f83672b5212bf8ffbf7568bd118e8056aa777d0caa1ba
 EBUILD cups-1.5.0.ebuild 8250 SHA256 0e7967449e58ad9c385154c93c7dd35cd211f8dd0624a7409843601e3ab6802f SHA512 725b0b632a55a227177ee6313d8ce21ff49ede6aa2cdecc62448069ad85dd979a8643e49054ee695408c66c46de7eb2d42c37cf411363be0fe638d1ad68d6829 WHIRLPOOL c11ebd1fa34492e7af49e8e0e3e131abd244529e7331c7a3421cce84777b44108f3e924fbaf7a86f3e031a0b8579f0e14580993e5063f3e6672d8d2b37e2badf
 EBUILD cups-1.5.2-r4.ebuild 8421 SHA256 ce3c4b59de12421bef0918ac4f6c47b7b3dccca820f29c92311ee738e34415c0 SHA512 c142b72652c27ccc8fca9653f9c4c34d971cc94d6cabb3ef54c46d126b5b03d0a627f2a4461637c443ec5fe52619f66f93f493af80a87b7d5eb8bb7a129e40c2 WHIRLPOOL 91cfdcc8499d4dc539f1fc60743eafc1cb3842032c6cbf394963e980b73e698d902df972b716433781782f1558cbaa9005345ebe382a6fdd55509e65df0a42de
 EBUILD cups-1.5.3.ebuild 8683 SHA256 93862c6bf66eb1003dbfef73cd1e199be45cfad8fcd5e1b36a6bc298e6fb3e6c SHA512 b44d3d5cdc343fe3686b6b0accc48ac44db76fc0d8b3562aa47b1a018cec1a8e9ae46cf7b0b1b1f47df4ff3bb9d35dbc1831cb5e4e94f620ecfcea3ae181318a WHIRLPOOL f39c84f449084790e1382283851a4a750dc01c0929fe0a20b6dca9a8635289bcefb3686c6d6de3b8453e2f718aea48769018701acd2618b71911df2424296dbf
 EBUILD cups-1.6.1.ebuild 8313 SHA256 ea7db57c0936d02be764b6c45c114c53b636384bac04f4611c91a82b1fa061fd SHA512 700d3a9c4f51e3d29b8f9853d796cfc634140c302a7684e119c9e8ef95f3427dbf843f92cf3178c9ce7203610d06f79ecf8952bdf39bc1cd1000bcfb65459566 WHIRLPOOL 7c37a51280c31899b251b29f589c06651ba49e9f3399aa7b7e6b9ced9785b6961258dda6b0eb4d1226646cfd5e1e09e7f3775789a01c663263e8ff4db1ad1b38
-EBUILD cups-9999.ebuild 8318 SHA256 6329066d46de658d2d097e53a47fa8dd09e85744f43216c78b018f15296d0d8f SHA512 8e8cf8f4e2c4e21e659b57fb822e4bb86fe287f9211a3a489eabbe596ae255959011876bb86960941163583d6b84cadd4c7a8641b9502253b43223e0821f260a WHIRLPOOL 0b38e9bb38352d1ee055a3c00463ce2b1c2feee53e4eb3181355ec6bac34100dcc4177f0bbb3ffd6b19ee309394b5eafb2a7086ba5280c144b69ed43201f874a
-MISC ChangeLog 79188 SHA256 9071dafafcf8a2f35cfd896d834f4ed99dc4b8e1298ff33d8d168d1c84571fed SHA512 7f941c4b12b21c3d124746f90261a6b2a5f917ed4e108a346c738b02eda91225d244244d94bc22f8d8fe38c5c249a4d33e688899998ac795f356cc6011cc8086 WHIRLPOOL 7773e88f3e3f943a20f6b0e49879f4124621c2067860ba28ed7c87d0b09ec12fe4bd16892a83c4d0bf53fbe27b8e8a4aeddbc4f340d4e4dc732d56f9b56affdf
+EBUILD cups-1.6.2.ebuild 8675 SHA256 c29d65a6c86fe4d6fe093a1f182d18b2a5969978af97fcd5dd03cd38a7c91e9f SHA512 f0fe06adfdbb79644f71f741d1649444637cbffb71574ff34388f079db13c549fc63929e9dc4eced9dae878b75615420164ac778da3d6f03238333d6f90f838e WHIRLPOOL 896489a2c9b8f7b17c676b58d77692da4f49fdd65cb28daf7402cceb4864a80ee851d26dde3abcd9f67ad23b938e18dcf2b99427d1d888d492f559285ad41fc4
+EBUILD cups-9999.ebuild 8675 SHA256 b906493b6caf4264a7e298559bea06508f42958d36eed681ecc7f22e27b4ba9e SHA512 3e98a14d328fe88227156e0a157c15b3983bb4418760faa2ddc985b006ec07baabd0c38b2ba47e8b2969efa5dee2720641267f00fe77a946322958947e44658d WHIRLPOOL 55a6bf39dd55454e6128bd1129e098c9d90b1c81f956e7a711b3499f6b3859afa20d36b688a6018a9293409d9fdbdc4d16c4515aee23f82eee0902a3f2590c9d
+MISC ChangeLog 79328 SHA256 d1e0ad2f6b22a6cd2feedce130c8da0d9732e2cfbfce82f779f7b7ab99eeed0c SHA512 5c91fccaba407478fccde0e346b8620b0bae449141425fbfd490bf17dd0c5b15452195dddde292b7e1d438290aa6c6f32b72d1bbfc573011902846c483491b24 WHIRLPOOL 3a23ae8d21d63ec70246ac7eac45636b19ccb59d0b8c588218f7d1eca822ccb6271e7c5c5b37f639ff2c4fa82b20b50dd93bce93a0100ff036a85d86e0f27572
 MISC metadata.xml 778 SHA256 26a8d1221a4334579f98705c38f3e3a882c223df86181dcf7968eac2118188b8 SHA512 717b6c3d940b2de149a68bb1c66175cd6fac04e21fcf581d6f1dd248c1bc5ee8fb98ec26a1fa2fca94e8fcb33f131c6635d40a6954721020a989dc260e8b8fbc WHIRLPOOL 057426e3c3f1e7e5a6bb124e0af0d804e15f6bbf17f7b278ef90d773f997beed6c6376bcc9603ac4c67f75675a33bc1fb7a02bb89f7a1ed69634a5d7bf9befbb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRRdyeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcExsP/1Bedv7DMF4ZeFwrd7585ly/
-dTbkqkbv2Mt70nBqsTC5obshc/1jJca0nWYMWYgqb5DE5FtMUMiIyXCgW+T5lsRo
-JhYrrATlGAyX5R6J56tfmv3U0iO2fvoD6tisa4OiizirX+0zDFTyRBKVv4+t2VzT
-W1zeHG/ZTx8ej6DKJRnuAN5Zw58juxHfRcr9LNzz1ak42aOEPmJWSWZ8C7odxL74
-vVhUMcit9e2EdBlTtZD4qLsqofwWtap/mvirOx7K+eeov9YAfSiGx5MjczZkn7yS
-agmsMrebqPvFeozLnNr1mZRN3+PV1JeIx/KVPgMaWg/Av1vqKS7U2NoQcbBSEzJq
-QnuhPB3s6izEy6b5uFra21qsUyBKIVHellvAjz9cTIjCyjXrWzVjR7kmGrNRbUFN
-1kymPgagaRQ5cW0ej1GHPIGJgvt7Dxy9AEjs6JvSPM1c7w7fQX0wlh3dlQMHOWW+
-BpVBH/T/3RLHu+9YhjKjLBNS0bdq01jyUBOsIyRIug12odMtqC8jeMx728arm3Pt
-DP9gzjiYQ1HEBVUJcP5SDeb2e5wH9yvVq6wUbYU2bbrMyh4m1evPuGD7qf4u7tRL
-sBjWg64MBXCe9mYGQDSuPzVNTeQTv4auUnO2C7kQ0GZp0xO5O9lPopXz5nDLVq8s
-VeGW/qCgdSdC0FTr09Om
-=fxFd
+iQIcBAEBCAAGBQJRTyoXAAoJEEb+UGWnxTyHq5sQAKzRFchuCbMao2YDSze6qRTv
+rvyicOJ5LCDUcakyOpXoc8lYmC/pZO+1IKzwnCdBcTUez8mzZUllVr68tZ7qmPUx
+it2x8QkE1R6NI4teDg2CsfneNnnEkhVIGktHrduihGLGalxVsYBpQ4o5xljwqBCJ
+oOcbxZUMpqa/l3k9B6bs5AyUUNfwsihfhVJhBW+R83SGzTVsjimlxrcxvh5n2xnD
+F/KEiVezClmmcIgigBXd0pwNCbq2xE4WhX7Bv4W+mOcfLuVOkBW6yEMaLGLmiC0r
+NKgkbDtKzWmQgSlSX8pscaWuv6ZnOkMsyNANdSqSr+pKENXRJ4gFlRT+7ummuYyK
+nM0NvHKfC/BH9rUSi7DvoBeyByuWBdiKNLy4Rs8Dx+93X2xKY3yPAVipMHCQfKsA
+y90Y7KqwA02AFfWjtLuafk08QrpqWMnDSYyKrAUtEJocvM8yR9w2heQePJsAaVr6
+RQDd52hIg28+bIyNmGAlo4msc6sVuUHCJWhS39ssD5W9JpOdtgkanVxlISu45199
+kCam0xYc5/roEfhslRoerJTkV58eNQXtLcKR1EaEeoCcNpBo9lO/hLOEOCARVdxa
+dry7Y217DdNwHQ3Cg6rLlLdKEQcZirT7oFcWvmKUMtBvhBG0FCs6uBpXazjgP/IB
+J+W1Wthdx5vmMzIVuMQt
+=g2Xz
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.6.2.ebuild b/net-print/cups/cups-1.6.2.ebuild
new file mode 100644
index 000000000000..af0e3afb0b49
--- /dev/null
+++ b/net-print/cups/cups-1.6.2.ebuild
@@ -0,0 +1,298 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6.2.ebuild,v 1.1 2013/03/24 16:27:24 dilfridge Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="python? 2:2.5"
+
+inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam python user versionator java-pkg-opt-2 systemd
+
+MY_P=${P/_beta/b}
+MY_PV=${PV/_beta/b}
+
+if [[ "${PV}" != "9999" ]]; then
+	SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+else
+	inherit subversion
+	ESVN_REPO_URI="http://svn.easysw.com/public/cups/trunk"
+	KEYWORDS=""
+fi
+
+DESCRIPTION="The Common Unix Printing System"
+HOMEPAGE="http://www.cups.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="acl avahi dbus debug +filters gnutls java kerberos pam
+	python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
+
+LANGS="ca es ja"
+for X in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+RDEPEND="
+	app-text/libpaper
+	acl? (
+		kernel_linux? (
+			sys-apps/acl
+			sys-apps/attr
+		)
+	)
+	avahi? ( net-dns/avahi )
+	dbus? ( sys-apps/dbus )
+	java? ( >=virtual/jre-1.6 )
+	kerberos? ( virtual/krb5 )
+	pam? ( virtual/pam )
+	selinux? ( sec-policy/selinux-cups )
+	ssl? (
+		gnutls? (
+			dev-libs/libgcrypt
+			net-libs/gnutls
+		)
+		!gnutls? ( >=dev-libs/openssl-0.9.8g )
+	)
+	systemd? ( sys-apps/systemd )
+	usb? ( virtual/libusb:0 )
+	X? ( x11-misc/xdg-utils )
+	xinetd? ( sys-apps/xinetd )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+PDEPEND="
+	app-text/ghostscript-gpl[cups]
+	>=app-text/poppler-0.12.3-r3[utils]
+	>=net-print/cups-filters-1.0.30
+	filters? ( net-print/foomatic-filters )
+"
+
+REQUIRED_USE="gnutls? ( ssl )"
+
+# upstream includes an interactive test which is a nono for gentoo
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.6.0-dont-compress-manpages.patch"
+	"${FILESDIR}/${PN}-1.6.0-fix-install-perms.patch"
+	"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
+	"${FILESDIR}/${PN}-1.5.0-systemd-socket.patch"		# systemd support
+)
+
+pkg_setup() {
+	enewgroup lp
+	enewuser lp -1 -1 -1 lp
+	enewgroup lpadmin 106
+
+	# python 3 is no-go
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+
+	if use kernel_linux; then
+		linux-info_pkg_setup
+		if  ! linux_config_exists; then
+			ewarn "Can't check the linux kernel configuration."
+			ewarn "You might have some incompatible options enabled."
+		else
+			# recheck that we don't have usblp to collide with libusb
+			if use usb; then
+				if linux_chkconfig_present USB_PRINTER; then
+					eerror "Your usb printers will be managed via libusb. In this case, "
+					eerror "${P} requires the USB_PRINTER support disabled."
+					eerror "Please disable it:"
+					eerror "    CONFIG_USB_PRINTER=n"
+					eerror "in /usr/src/linux/.config or"
+					eerror "    Device Drivers --->"
+					eerror "        USB support  --->"
+					eerror "            [ ] USB Printer support"
+					eerror "Alternatively, just disable the usb useflag for cups (your printer will still work)."
+				fi
+			else
+				#here we should warn user that he should enable it so he can print
+				if ! linux_chkconfig_present USB_PRINTER; then
+					ewarn "If you plan to use USB printers you should enable the USB_PRINTER"
+					ewarn "support in your kernel."
+					ewarn "Please enable it:"
+					ewarn "    CONFIG_USB_PRINTER=y"
+					ewarn "in /usr/src/linux/.config or"
+					ewarn "    Device Drivers --->"
+					ewarn "        USB support  --->"
+					ewarn "            [*] USB Printer support"
+					ewarn "Alternatively, enable the usb useflag for cups and use the libusb code."
+				fi
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	base_src_prepare
+	AT_M4DIR=config-scripts eaclocal
+	eautoconf
+}
+
+src_configure() {
+	export DSOFLAGS="${LDFLAGS}"
+
+	# locale support
+	strip-linguas ${LANGS}
+	if [ -z "${LINGUAS}" ] ; then
+		export LINGUAS=none
+	fi
+
+	local myconf
+	if use ssl ; then
+		myconf+="
+			$(use_enable gnutls)
+			$(use_enable !gnutls openssl)
+		"
+	else
+		myconf+="
+			--disable-gnutls
+			--disable-openssl
+		"
+	fi
+
+	econf \
+		--libdir=/usr/$(get_libdir) \
+		--localstatedir=/var \
+		--with-cups-user=lp \
+		--with-cups-group=lp \
+		--with-docdir=/usr/share/cups/html \
+		--with-languages="${LINGUAS}" \
+		--with-system-groups=lpadmin \
+		$(use_enable acl) \
+		$(use_enable avahi) \
+		$(use_enable dbus) \
+		$(use_enable debug) \
+		$(use_enable debug debug-guards) \
+		$(use_enable kerberos gssapi) \
+		$(use_enable pam) \
+		$(use_enable static-libs static) \
+		$(use_enable threads) \
+		$(use_enable usb libusb) \
+		$(use_enable zeroconf dnssd) \
+		$(use_with java) \
+		--without-perl \
+		--without-php \
+		$(use_with python) \
+		$(use_with xinetd xinetd /etc/xinetd.d) \
+		--enable-libpaper \
+		$(use_with systemd systemdsystemunitdir "$(systemd_get_unitdir)") \
+		${myconf}
+
+	# install in /usr/libexec always, instead of using /usr/lib/cups, as that
+	# makes more sense when facing multilib support.
+	sed -i -e 's:SERVERBIN.*:SERVERBIN = "$(BUILDROOT)"/usr/libexec/cups:' Makedefs || die
+	sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/libexec/cups":' config.h || die
+	sed -i -e 's:cups_serverbin=.*:cups_serverbin=/usr/libexec/cups:' cups-config || die
+}
+
+src_install() {
+	# Fix install-sh, posix sh does not have 'function'.
+	sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh"
+
+	emake BUILDROOT="${D}" install
+	dodoc {CHANGES,CREDITS,README}.txt
+
+	# move the default config file to docs
+	dodoc "${ED}"/etc/cups/cupsd.conf.default
+	rm -f "${ED}"/etc/cups/cupsd.conf.default
+
+	# clean out cups init scripts
+	rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups}
+
+	# install our init script
+	local neededservices
+	use avahi && neededservices+=" avahi-daemon"
+	use dbus && neededservices+=" dbus"
+	[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
+	cp "${FILESDIR}"/cupsd.init.d "${T}"/cupsd || die
+	sed -i \
+		-e "s/@neededservices@/$neededservices/" \
+		"${T}"/cupsd || die
+	doinitd "${T}"/cupsd
+
+	# install our pam script
+	pamd_mimic_system cups auth account
+
+	if use xinetd ; then
+		# correct path
+		sed -i \
+			-e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \
+			"${ED}"/etc/xinetd.d/cups-lpd || die
+		# it is safer to disable this by default, bug #137130
+		grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \
+			{ sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; }
+		# write permission for file owner (root), bug #296221
+		fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed"
+	else
+		rm -rf "${ED}"/etc/xinetd.d
+	fi
+
+	keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
+		/var/cache/cups /var/cache/cups/rss /var/log/cups \
+		/var/spool/cups/tmp
+
+	keepdir /etc/cups/{interfaces,ppd,ssl}
+
+	use X || rm -r "${ED}"/usr/share/applications
+
+	# create /etc/cups/client.conf, bug #196967 and #266678
+	echo "ServerName /var/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf
+
+	# the following files are now provided by cups-filters:
+	rm -r "${ED}"/usr/share/cups/banners || die
+	rm -r "${ED}"/usr/share/cups/data/testprint || die
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	# Update desktop file database and gtk icon cache (bug 370059)
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+
+	echo
+	elog "For information about installing a printer and general cups setup"
+	elog "take a look at: http://www.gentoo.org/doc/en/printing-howto.xml"
+	echo
+	elog "Network browsing for printers is now switched off by default in the config file."
+	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, enter"
+		elog "the location manually, or run cups-browsed from net-print/cups-filters"
+		elog "which re-adds that functionality as a separate daemon."
+		echo
+	elif [[ "${REPLACING_VERSIONS}" ]] && [[ "${REPLACING_VERSIONS}" < "1.6.2" ]]; then
+		echo
+		elog "Starting with net-print/cups-filters-1.0.30, that package provides"
+		elog "a daemon cups-browsed which implements printer discovery via the"
+		elog "Cups-1.5 protocol. Not much tested so far though."
+		echo
+	fi
+}
+
+pkg_postrm() {
+	# Update desktop file database and gtk icon cache (bug 370059)
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index 017dfff6cd92..ae3e47d394ac 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.22 2013/03/17 15:08:23 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.23 2013/03/24 16:27:24 dilfridge Exp $
 
 EAPI=4
 
@@ -68,7 +68,7 @@ DEPEND="${RDEPEND}
 PDEPEND="
 	app-text/ghostscript-gpl[cups]
 	>=app-text/poppler-0.12.3-r3[utils]
-	net-print/cups-filters
+	>=net-print/cups-filters-1.0.30
 	filters? ( net-print/foomatic-filters )
 "
 
@@ -84,7 +84,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.6.0-fix-install-perms.patch"
 	"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
 	"${FILESDIR}/${PN}-1.5.0-systemd-socket.patch"		# systemd support
-	"${FILESDIR}/${PN}-1.5.2-browsing.patch"		# browsing off by default
 )
 
 pkg_setup() {
@@ -279,8 +278,15 @@ pkg_postinst() {
 		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."
+		elog "You will have to find printers using zeroconf/avahi instead, enter"
+		elog "the location manually, or run cups-browsed from net-print/cups-filters"
+		elog "which re-adds that functionality as a separate daemon."
+		echo
+	elif [[ "${REPLACING_VERSIONS}" ]] && [[ "${REPLACING_VERSIONS}" < "1.6.2" ]]; then
+		echo
+		elog "Starting with net-print/cups-filters-1.0.30, that package provides"
+		elog "a daemon cups-browsed which implements printer discovery via the"
+		elog "Cups-1.5 protocol. Not much tested so far though."
 		echo
 	fi
 }