CUPS 2.0 is near, so add live ebuild for the stable branch

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0x84AD142F

4 files changed, 386 insertions, 18 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index ad66813f8619..64b735bd687e 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.626 2014/09/06 18:49:59 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.627 2014/09/06 18:56:00 dilfridge Exp $
+
+*cups-1.7.9999 (06 Sep 2014)
+
+  06 Sep 2014; Andreas K. Huettel <dilfridge@gentoo.org> +cups-1.7.9999.ebuild,
+  cups-9999.ebuild:
+  CUPS 2.0 is near, so add live ebuild for the stable branch
 
 *cups-1.7.5 (06 Sep 2014)
 
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 2d7564e5cc8d..b60d3b44dfca 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -17,23 +17,24 @@ EBUILD cups-1.7.1-r1.ebuild 9367 SHA256 c53c059d2b73d4daf6c55e3d152bcc4d8a7956f8
 EBUILD cups-1.7.3.ebuild 10426 SHA256 41b50bc7a3552e3332eb378729951ed7d8673770877187a15f353222c82bd81e SHA512 372cf265fe33e338f265b4c76ce4f58fa0cdb7ecbd3c2c163cb82c2fc1a1442e5675fc36ab20e8deafb0a78ddbfbd26a53dfd43a0b0c5dfb06a6d0f4fc2d98a5 WHIRLPOOL d73157275d75f29d77f608b5adb8d1f854c4ec201b7e621cdfa82ab53e08f6b2a1c9ce9dcd891d816ea7d98ac18cad0114bff948f6c6ee62283e06910f35fd4c
 EBUILD cups-1.7.4.ebuild 10376 SHA256 c3d1f6d145436b32a67e9d5db280e9664bdc169d73c6c5d3e305405d40561185 SHA512 580c05de3639e3800d5ec17c8219c5d4f0624e8e1db05ab547b0ac5153d24c01d2219a98fcdd62c57e147292d5e3a6f84e5b0ccfe7d687cb3139a877e08fd4af WHIRLPOOL 14d0a9a0b8fe916949d35aba46d35384d46154ce63307a5f784b40926af5db0a18de93e47907184d7d47c53b98d807f9285a6e41b9ae3b54938308372a90d866
 EBUILD cups-1.7.5.ebuild 10376 SHA256 0e678909b767b93189214c0e19a7224140591c652513267f0e0d22f4dec2d90f SHA512 bbee9469d97cc63be0794d531f27115f381a898e1d68e8f765b30d42987d5114b0262d17458b9d11331b272b99607ece3d20f9450daef8db723f4723ea4c4636 WHIRLPOOL dd3cbaa819d4d54824ea202be17a6c4126e7cc34f59886d0a0c5542deb4bdb5991383b6acef4284b5e2b5405268c18dd6f0d83e2cd6ee55049317f8224685b84
-EBUILD cups-9999.ebuild 10373 SHA256 b1ad06fbea0629c0f290723a999fc5d79a56d2caf5916b7dbe5b15a66945ea6f SHA512 f4815ee78c338e5ffa1c9217988f56c980bd902593beb37493dfce4bfbde11ba0eafbc94d86345e59cd03c9c0da4dde6e381d78c38f9f489fa20d5884d80b129 WHIRLPOOL 05b352d32f2104fc8d69b26df7805abd045ea22c192ecb7d8bda6d2e87a86feb358c70a2595968ee9bcf0a6ea812e5b965fdee8ec42aa2f50e7ac9eb2e85ad10
-MISC ChangeLog 94587 SHA256 a2f6cf621e2cf669be7469be779835be5ada915e1ff2efdf28faf069cf80ccdf SHA512 99628420bb2deaba0a14233a47bbe38678716e7532365c7ca2a306bdc1ad1bc51395830dd6d2cd086d6761e3d0c987021dc377cb41620657a1806c506d0045e5 WHIRLPOOL 0588bee6155a69b2454ff321003662e1bce6521956d03d4cd223113ce272c8856cb158b611f433f5ed3b0ee5fb61297e121495d07e828a05e6a1e13a6ae28e05
+EBUILD cups-1.7.9999.ebuild 10380 SHA256 4fd778c3c175079cf12ea03cc05e29544ddf4bc1eff6bc652e30980414cc0a4f SHA512 1adba706643292db1c6a1e8b7a931bba7f820905fc976b53ef8aa359161b9dd7d81bc4c4eaa27e9aecf6d4576438021dbc1146b2dafb487ffb7035d4e0200cc1 WHIRLPOOL a85214855425d7acc36190c833a21e00e2f958d56566b99c0726b5dacb3a84df2c5e197eded78d94c8c9714a9f017c87f7d56c69d06f5227a1d169818d4ea19a
+EBUILD cups-9999.ebuild 10377 SHA256 0bd88b110ec1b8bcd0356d5189c7c23d7a0faa8dc070f4ed88aa06e41c9f28dc SHA512 db33a347f853d0531277601c3d0ae61e6f4604fc997161f04a94818641bc5bb2cd4981888ed68cd9230fe24cd5f283c2d42734531cca65c01db31ba6e597eb34 WHIRLPOOL 8efb3ab78cb8acbf3988aec7bddad700826a42168db09b212a2851a2b2f6b761e25f85bc4c69be4422129e74df7ed77676d4fe589f86e6eaff44bdff20600216
+MISC ChangeLog 94779 SHA256 007cfe2d5eed80f74a6b5909e932eeb7b7275048352ff40d01b75289d27e8be6 SHA512 beca977fd78d8d652c3d441d4ff58fb0772923975d10c4b6be8ccffa4a55250be3c2f0d24fc96b306f0f91ab95917bba60090408e0eff9cc284ecfdfe8609160 WHIRLPOOL c8d058b687af393457e6246d413eedf82a09967a8cb4e5029bce4aeb2dc4eaf3f1f5632fc86d09eb084f052ddf5b1c9e195e11ed8f262dbbcc50a1852443ea76
 MISC metadata.xml 496 SHA256 732bba7ee060b7be5e0b23d06d24c12c2bfc1c6be1440cdfebe6d5d94d145c47 SHA512 713300abb461ad923c4f6e59326fa97b2372181df4ef82bf04dd6f2d68dc0eb7c34e518cbb40ebd535cb9c4bf52d2648512002cc2cb55c6f21406cc973fa4496 WHIRLPOOL 061013ee6ddaf510964589024e39c4a05f18f0a6d2488eb5b121bb962a378348e71261f7e153f34dbb33337a2e49eb7da94e52d0cb7a128d71e9b4466f8a5933
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUC1dbAAoJEJS/30SErRQvRYwP/j7hWeNdhr+4/AHPgFsKlP85
-mBLGVQFszPe3iwiBWcgCtJB0BEBSMX5OksMo9Cvpn0aZVvrkZ1I/MkGrkRiy+IM/
-qamJcCojInPpUFaMGPCev2qWAldUmFpWhOEZUgNptEnyAah1QHkDMz7JwVVjCC2C
-qEep7wHApNYjMg3ErTK9jTaCW1dUAJZzASmP7FGkDC4C9LCzCqWUXwOrRG8M6OZ/
-JWgJeVYg4RkM3bmg5zqeSIuOw1FdT3vzScJCfqisLKbUwSrCPHLa3EBgn/ZVCv1f
-va9JdHZCCAbauXUnPfsgyHyb+pe/KbrlMkq0i6HWymFrdddBuxLB1LUGi1W2Tr1Z
-AZegy08LyxXegQZ0poYQMewwevNmXCE8Ui7TjRQfabS/3HjjeRVEkicVmrwjAHkz
-TA/NhMpP+gOBGBhICtB5TeJCBnsv+LKD6FcJ7RtseS7nUnQ7260x9iB5RvmiPVhX
-dwEWTRk20nrIrH6hAEdVWJjboAHPgnAj3MSr9vKLAJGpuUVPpEs2kCUajO28M/wg
-4i7MPSn/PWCah47eXryPx0eW2yHvtVsa77uq/kwsLo2YLsnmrDtwPEndbpuDs3sK
-aYhrNmRsyLx63RQ0Y+T2iJvlBvyLISS2e0r89sdIqsh/QaFE89lGYMrOPJRmOVyP
-QNKVXic1tgcK3XZBdgJ8
-=ud6x
+iQIcBAEBCAAGBQJUC1jHAAoJEJS/30SErRQvS7cQAI84gMYiFJmubDO6vFR8AUOv
+WwpUk+k+1loAvuIeeZVvc0W/N1/h8ayvaVugThRd/K+bpVgU5Z32t2woGPa9tdA4
+lvnXgtYtQR21FCJfMgu3QZJ/3j4BQnlmC7ji9MC3bwLUcfRmbY4sk4sjw1Wt77No
+vVBWY9hF2vvmPJlisDxS4iRFv4qAltk4HhNieiBNXiXIyFE/zYqm+Uq2OnOLKKIk
++GQGbDJCnnHdN9nB6KQXFPiAr/cSE08CNF+1f6E/jQfOKXLslXbKLF78e9dqLDdI
+yE5hs+svUGjSfDYsheRfT6BFLknZjKd7tE4q01HNu4g96LL1Ogk9up2Dxp8DgNML
+TaXWdclk0GtqmJwYDbKPpQIuKeXOGVN0/dZSHGmAQCkf2xiJ13HrEKFnFm7V/I7d
+7q3IkHBwX73O3YfxTT/YMaHl0Syr8nROKBHYUxoMBF0oRZj+UPTGB/42UH3OYFkB
+I4P2gTf0R2j2ZmbkPlhnOMjvK65xjHrJ3SS2Tth9qHRZlmObrXD020W7GxNjJ3wd
+cM40/tH3xKXfOJzRj/0kNemK8x7ZJvn7oXyiifGOqOpbd/ZRCZY9dU0fgXDRKNNN
+ctCe2xJ3p+3JCF0IUNQ1kTcRpD5Uk4xWokoRFQ/SysPNH54t/OnU95CnTzhPLKzk
+exgc1k+I3slaLIFfxbul
+=pHH9
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.7.9999.ebuild b/net-print/cups/cups-1.7.9999.ebuild
new file mode 100644
index 000000000000..32446973ffdd
--- /dev/null
+++ b/net-print/cups/cups-1.7.9999.ebuild
@@ -0,0 +1,361 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.9999.ebuild,v 1.1 2014/09/06 18:56:00 dilfridge Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info \
+	multilib multilib-minimal pam python-single-r1 user versionator \
+	java-pkg-opt-2 systemd toolchain-funcs
+
+MY_P=${P/_rc/rc}
+MY_P=${MY_P/_beta/b}
+MY_PV=${PV/_rc/rc}
+MY_PV=${MY_PV/_beta/b}
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="http://www.cups.org/cups.git"
+	if [[ ${PV} != 9999 ]]; then
+		EGIT_BRANCH=branch-${PV/.9999}
+	fi
+	KEYWORDS=""
+else
+	SRC_URI="http://www.cups.org/software/${MY_PV}/${MY_P}-source.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
+fi
+
+DESCRIPTION="The Common Unix Printing System"
+HOMEPAGE="http://www.cups.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="acl dbus debug gnutls java kerberos lprng-compat pam
+	python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
+
+LANGS="ca es fr it ja pt_BR ru"
+for X in ${LANGS} ; do
+	IUSE="${IUSE} +linguas_${X}"
+done
+
+RDEPEND="
+	app-text/libpaper
+	acl? (
+		kernel_linux? (
+			sys-apps/acl
+			sys-apps/attr
+		)
+	)
+	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
+	java? ( >=virtual/jre-1.6 )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	!lprng-compat? ( !net-print/lprng )
+	pam? ( virtual/pam )
+	python? ( ${PYTHON_DEPS} )
+	selinux? ( sec-policy/selinux-cups )
+	ssl? (
+		gnutls? (
+			>=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}]
+			>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}]
+		)
+		!gnutls? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+	)
+	usb? ( virtual/libusb:1 )
+	X? ( x11-misc/xdg-utils )
+	xinetd? ( sys-apps/xinetd )
+	zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)
+"
+
+DEPEND="${RDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+PDEPEND="
+	app-text/ghostscript-gpl[cups]
+	app-text/poppler[utils]
+	>=net-print/cups-filters-1.0.43
+"
+
+REQUIRED_USE="
+	gnutls? ( ssl )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	usb? ( threads )
+"
+
+# 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"
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/cups-config
+)
+
+pkg_setup() {
+	enewgroup lp
+	enewuser lp -1 -1 -1 lp
+	enewgroup lpadmin 106
+
+	use python && python-single-r1_pkg_setup
+
+	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
+	use systemd && epatch "${FILESDIR}/${PN}-1.7.2-systemd-socket-2.patch"
+
+	# Fix install-sh, posix sh does not have 'function'.
+	sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh"
+
+	AT_M4DIR=config-scripts eaclocal
+	eautoconf
+
+	# custom Makefiles
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	export DSOFLAGS="${LDFLAGS}"
+
+	einfo LANGS=\"${LANGS}\"
+	einfo LINGUAS=\"${LINGUAS}\"
+
+	local myconf=()
+	if use ssl ; then
+		myconf+=(
+			$(use_enable gnutls)
+			$(use_enable !gnutls openssl)
+		)
+	else
+		myconf+=(
+			--disable-gnutls
+			--disable-openssl
+		)
+	fi
+
+	if tc-is-static-only; then
+		myconf+=(
+			--disable-shared
+		)
+	fi
+
+	if use systemd; then
+		myconf+=(
+			--with-systemdsystemunitdir="$(systemd_get_unitdir)"
+		)
+	fi
+
+	# need to override KRB5CONFIG for proper flags
+	# https://www.cups.org/str.php?L4423
+	econf \
+		KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--localstatedir="${EPREFIX}"/var \
+		--with-rundir="${EPREFIX}"/run/cups \
+		--with-cups-user=lp \
+		--with-cups-group=lp \
+		--with-docdir="${EPREFIX}"/usr/share/cups/html \
+		--with-languages="${LINGUAS}" \
+		--with-system-groups=lpadmin \
+		$(multilib_native_use_enable acl) \
+		$(use_enable zeroconf avahi) \
+		$(use_enable dbus) \
+		$(use_enable debug) \
+		$(use_enable debug debug-guards) \
+		$(use_enable kerberos gssapi) \
+		$(multilib_native_use_enable pam) \
+		$(use_enable static-libs static) \
+		$(use_enable threads) \
+		$(multilib_native_use_enable usb libusb) \
+		--disable-dnssd \
+		$(multilib_native_use_with java) \
+		--without-perl \
+		--without-php \
+		$(multilib_native_use_with python python "${PYTHON}") \
+		$(multilib_native_use_with xinetd xinetd /etc/xinetd.d) \
+		$(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper) \
+		"${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\)${EPREFIX}/usr/libexec/cups\":" Makedefs || die
+	sed -i -e "s:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN \"${EPREFIX}/usr/libexec/cups\":" config.h || die
+	sed -i -e "s:cups_serverbin=.*:cups_serverbin=\"${EPREFIX}/usr/libexec/cups\":" cups-config || die
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake libs
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake BUILDROOT="${D}" install
+	else
+		emake BUILDROOT="${D}" install-libs install-headers
+		dobin cups-config
+	fi
+}
+
+multilib_src_install_all() {
+	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 zeroconf && neededservices+=" avahi-daemon"
+	use dbus && neededservices+=" dbus"
+	[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
+	cp "${FILESDIR}"/cupsd.init.d-r1 "${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/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 ${EPREFIX}/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
+
+	# the following are created by the init script
+	rm -r "${ED}"/var/cache/cups || die
+	rm -r "${ED}"/run || die
+
+	# for the special case of running lprng and cups together, bug 467226
+	if use lprng-compat ; then
+		rm -fv "${ED}"/usr/bin/{lp*,cancel}
+		rm -fv "${ED}"/usr/sbin/lp*
+		rm -fv "${ED}"/usr/share/man/man1/{lp*,cancel*}
+		rm -fv "${ED}"/usr/share/man/man8/lp*
+		ewarn "Not installing lp... binaries, since the lprng-compat useflag is set."
+		ewarn "Unless you plan to install an exotic server setup, you most likely"
+		ewarn "do not want this. Disable the useflag then and all will be fine."
+	fi
+}
+
+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
+
+	# not slotted - at most one value
+	if ! [[ "${REPLACING_VERSIONS}" ]]; then
+		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
+	fi
+
+	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
+	fi
+
+	if [[ "${REPLACING_VERSIONS}" == "1.6.2-r4" ]]; then
+		ewarn
+		ewarn "You are upgrading from the broken version net-print/cups-1.6.2-r4."
+		ewarn "Please rebuild net-print/cups-filters now to make sure everything is OK."
+		ewarn
+	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 726638967aa8..6bd2523e2586 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.60 2014/06/18 20:44:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.61 2014/09/06 18:56:00 dilfridge Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ MY_PV=${PV/_rc/rc}
 MY_PV=${MY_PV/_beta/b}
 
 if [[ ${PV} == *9999 ]]; then
-	inherit git-2
+	inherit git-r3
 	EGIT_REPO_URI="http://www.cups.org/cups.git"
 	if [[ ${PV} != 9999 ]]; then
 		EGIT_BRANCH=branch-${PV/.9999}