Fix build of master and add 1.7rc1 without keywords

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0xEBE6A336BE19039C!

4 files changed, 341 insertions, 21 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 467fe64c3d02..9b59fb87f3b8 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.551 2013/07/12 19:33:09 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.552 2013/07/12 19:44:20 dilfridge Exp $
+
+*cups-1.7_rc1 (12 Jul 2013)
+
+  12 Jul 2013; Andreas K. Huettel <dilfridge@gentoo.org> +cups-1.7_rc1.ebuild,
+  cups-9999.ebuild:
+  Fix build of master and add 1.7rc1 without keywords
 
   12 Jul 2013; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.6.9999.ebuild,
   cups-9999.ebuild:
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 07605f267cdf..fea2e1750830 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -26,30 +26,32 @@ DIST cups-1.5.3-avahi.patch.bz2 17298 SHA256 daed1232c56ff7a3cb293c7eedbb669f320
 DIST cups-1.5.3-source.tar.bz2 9580485 SHA256 9d716a8ffcefdaff1c37f4a4b590f1d74ff9ff72383a18f3c883c9235907f93d SHA512 0de371eb347a41226a4a84de02f6eddf1585874c606b16173d8ff3e48d4317b1c90b4ef188068786a562c663117c8782339731d4f339ba76f438e8fae0d364cb WHIRLPOOL 09d564c6ac6cb4933e45f7e70b362a61416173cfcbbb3f26ed69c1b2dd51d7e9d8d1ec40993709ccc52a55b7842567a163425f18264ae8e86d20361f75448f5e
 DIST cups-1.6.2-source.tar.bz2 8363773 SHA256 37a3ebd305e76cfd4c9c53013e89c0f7a4dcb04b2e9da61029a29faa57e0f10d SHA512 08b7ae95af9c19a1bb72f851b801d55a51360a4c2993c34878d18a605bf1d9381eada5a8f51653c4467738f0509bb8ad713b79e78c8d2a80f1aa86f1d2196038 WHIRLPOOL 527f4eb1016ac20e737cb5171c8cb4c71295e36da8704dd97c8d405c1cf31a8861cab4dc1b2c8a37e21f83672b5212bf8ffbf7568bd118e8056aa777d0caa1ba
 DIST cups-1.6.3-source.tar.bz2 8265065 SHA256 84fa83dea6ed08dbd4d1112d9b0005424713b32bcb13111857836312896cf29d SHA512 31cafa52bdf1f00d6cf78456bc1dbb2f0440e29a18d45d3088c0da6858b0e35c43be8a1fc10d0efff7572dac5cf16eb93e299a978c4c7ae8af1b2e1e1365ddba WHIRLPOOL da506e757d8d8fd8e8c0e3f8f11776360f59f72a031e94919e5e6999125cf09193b77bcf3ef87f1711c1b1b98ed5fb3ddb3f570137cada4ce80ade3d5b72f4e8
+DIST cups-1.7rc1-source.tar.bz2 8373136 SHA256 891c0b745f5f7ef843049fb881a27d4c9c01978d5e9f03ebad6e29c755a26a4b SHA512 45041ff19ab5e8671633805a341f7621bd7075cb81b065c659c2a17d14998ae4824b6b925efcfcf6a943d6af6b38659c8f3f4fef4819a6b2643e259d99e5c65d WHIRLPOOL 6ec5d2672fee46253efd8ce9e874c0ec21cfb2fa23af5734af6deb3ab5295082c2929b671d0cf0e0f990f6a9aef8abc4d6839e5519c6fe8fcd2e929743809103
 EBUILD cups-1.5.2-r4.ebuild 8363 SHA256 5962ac89342b0430eb663dbd012af6ad02f836d712496088b65af28817a241c3 SHA512 dd1cb9a9c570d51e376c71c784a3c6dfff38e07a2594792666cbcded73ba3dc5301393fc59c01113cc6461fd1e63371348df015be9cd3d2aa50859ad296535b6 WHIRLPOOL 2a69b6d45f64b191dabb4b6a4f112c7a9975a356c28999e50a413e6ab73a7f292e00a5995d9008419420063ee769ee11879267acd69a12a2c81deb0ab00829f0
 EBUILD cups-1.5.3.ebuild 8623 SHA256 0a7ce20dfd2db91a6ed81c54bea74f57c2b416f245b33798fab8df01f8c3a2c6 SHA512 8e58e10a2c3c0cacc22bf2fb234ececcc6e9dc2c9a17d2babc7c491e0a956e8d42a29abc2d5e196b82593b593139430278fd83f27b6a6148f733aa65ea44a311 WHIRLPOOL 65af0f97161198ab8699da209f9de93d397d4d754258821ce29e5f772465906d4aeadae48a26dbee412ff5953eedc6e50d6b9da76d54626d1922fb1b55e2ec71
 EBUILD cups-1.6.2-r5.ebuild 8932 SHA256 efc33bf31ffe80f9ddff3dac97c9ce9f790e5128ab6cb17447d4e5939e4c454a SHA512 ea11e6351321bd5c48bb4e987613c64452a99cc4e82e4485fdd6e183b53fe9110cb1728591fb48fdfd16b284d5082da71c54c529b2d94dd2d97e040ada81aee6 WHIRLPOOL 7888df4ec29e39d75a6c79dcadcfb63ce47e95c77edc5658cd6f86c9b5880586513acfbf748ac77ceee1fc082549d3654a73832477ccd77fa4ae50273e0a107b
 EBUILD cups-1.6.3.ebuild 8933 SHA256 6a8bc87edb8f88558546dfb758c7919ee2fdc6e532e2e54f5cb2e86ebc4b8c24 SHA512 e3a832d3922a2aea0712f0e3f57f07c0b9092d0a3fa4ffb0275bf6c7beb7cd49159514b1de6fbd03a1c2443e28fde12a1b4d273bd20d5bfadc8009dcab7c5bbf WHIRLPOOL 6cbdb1b3b580464f6b5b8f410cec3a6cc4551886e1479479a8fe887910fdde7148ec3c815f502dde1a092236a78a97edaf4ff5d8ca09287059f31ec21a590708
 EBUILD cups-1.6.9999.ebuild 9000 SHA256 27daf02840140bcd800f30f4dc96ba5d53f4cdc0eaa3d3b44ef469725aeba2a5 SHA512 78f343e1a5616a51fa8b8fa51154e5f1dd2094f44e7a66ed2c3e6d1b5835802c72c0eaa6d472e93f8f670412216087de655cbbb015c4d90c8ed16a877c6dd6ad WHIRLPOOL 8e80728a6787365a4f32881f12f5b39ce7dcff42ab0c8b978079f2da5fee9963ca6f8b1dbbc0a07059b03edea39366f0650191357184bf1d42059f03190d397d
-EBUILD cups-9999.ebuild 8997 SHA256 92c3601473eb03c1d4691dff6607ba3c7ae587361c8524f16c6ad477b17897c9 SHA512 8e54abb4da5bf70ff2a2ac107f08f873b676407a5eb5f66511fc3db7f877e07df7cdfd5a85f34d690d5f8b1a6de948985bbe6aa3b70ed45b130143fb059ad4b7 WHIRLPOOL 4bf90ab1f552f2f3b71350a69d021db21547a3c77cfedd10c09cbf8e87e08145d1d13096261089a9982181f664db8cdeee5d05d3decd5b01060219a279bb73b4
-MISC ChangeLog 83853 SHA256 40975437467f7397c71a61aa91c2844bf2182d0ca620b0a0cf93d5d778fe9abc SHA512 1bd7ed29620173b3f3049798ee0e789739d604ca5f0b0881465b60d9d67693bd3e0dcab2fdfa73cff9df40c3fcf941f8c9f790fa79ba36063ecef7ddb0312500 WHIRLPOOL de711599cda18880a20b8b863b6e3cc5eda1da5cfbbe19bb95d3e70ff31b4cec4eba7f4c350b00753d2c21565e74324144998c5df2091ee1c090437aa2b019ff
+EBUILD cups-1.7_rc1.ebuild 8953 SHA256 f30740dc99910d8bf5a55139c367858e353b3ec69fed0432675f5c2214e9da30 SHA512 15be8e8f8228c45576ce276cef67d4e45e40f0e93f43865114d85e1a863fea5e7d556cfb282e453d4ff33cb9e7578e4b4b821dbd754c45e862fd834d6119a6c8 WHIRLPOOL 5afa9b5a2f4cd8f3d6d7f39833d3ab2f73f72ae5c486f3b292ba046ae315a88d9e11656755f7673c66eb8b92be76832eed50996eed16c61d7c21c3da15b89612
+EBUILD cups-9999.ebuild 9037 SHA256 cb41480188a0c4c4df0be6105bd1ffec9be37a4b847d7990c4c3b8f01492cd35 SHA512 b7f45fa8c8599429879549da342afa5ea24a5408997c4bee1ad8ecb567154809f3c6aa0024bc4764b624a66eee2993222410314dcef66eef4900610477e7928c WHIRLPOOL 64e12b377b68b442a97022605bcde67f0f2141fb967944dea3f2f01ac0d075ea08c8ed90099f485927cfaf56c6fff3d391fe7e3782672790cff8ba8478036ee0
+MISC ChangeLog 84036 SHA256 63ad2469d4c287aabfcb1b861c830b059d2c5d2d833b5281c85eb0013ef364fd SHA512 96d25237a7c9a02b40577fc375abf56ed992078c9ad566ef5984d0a0c7616ea80de7f7bc936d23838664b647a4ce0185c2695059878e34896f866c1dff95f170 WHIRLPOOL b10f39f36e8919842ea190b54c009026ceee40af045ea8b1a9fb21659148190a50175e92e2c6ad4b937fd9ed880725a0d3769d062cd542bcf57298ef6aea7ed4
 MISC metadata.xml 888 SHA256 fc10de1798aeb6e16d8457d45abad85d39802e59a5f461d1374043a629ab8c6f SHA512 ff93d64033d5d7f3491b77af44a92553d9cefa4ea4671eb7a9380b5a2645fe7e384bf1e277a81431578524b6dce55528d6e0c1d3408c43f3f11140b21d9b623b WHIRLPOOL ab3145f58da411364c4c12e35d66c034ef02be686e8dfd696c207fffdf193ae4a4619a184364710f2409cc92b2dc3dfc75f703c29dfb5f59423b20c7dbd9fc87
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJR4FpyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJR4F0SXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcRZ8P+wSx9i/bt/TV1bW+WIT82U5a
-VjOzTh3rdDmGHDsUInxPrvFWY30pfX64lx3Vr1lnMcoB2p8SO0cmJLKIGB/80dUN
-mdgMOVpxyIiqf5LWsCEplHlpP+6csnIVxulU11HhY5y6wpN0eq9qMNK8oPKKLq2m
-Vr7vO1yA1w2iru9Md50QZQrB1CWDqAFVUWzM1LWnEOw4CqFItrrTiYPVog0E7M3V
-lxXIKGXLhEsb1m2Seb+WxNjz2jXy0SgYybDawzGs1i50J0QYQVQR4Ylpq3fYkW4L
-zlkmo2ToyOxLj5Ew5rsZAIJSuiIjI5tzK/t4w+yjIDzeMaQ1ml8TWX+qzcuDUPCM
-RVdqaOFzWnA70PIbNdoTXkVkAMwZiSdTBTkjsX1jJvVTAdRTqq7UozM2lqBp55Oa
-3sPDd4KTx6ls5JP366AlA2SQydPx13FZou9FXoM+T/n6dCSDDUHBpwqdkq9LIJJH
-6XkzOhNrlihV1DfkPAkEK7/lyDXvaonGG0JwydVBBjkhKOVnjgPZAi1DevpQxIuf
-x3y3PESyLiNNFbl7CzzCnpDVPK8se4IURbRC9I9MWIZ5uuoqaKxnHqK1SPa6ukv9
-poavH+Y1ZwgTabfoC2CmsdVpcV2iEliSsJBl7VS+od1mgZ+7XZ950NfdQCU+dPoa
-KCY6Y8eI/iDBVp+1Rlcz
-=ogP8
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcOQMP+weuMdcfN9iXiGzIWF8dpr8x
+dXZAvKhhifeX0qxZB2uBRJPTqcp7QHGP0pGuaSh90vS4wqFvcQCR+2MhhoxAkTr/
+LzukKPeeXYMi3vdZmbdNE3Orh27oYzqJlTOudo1xQWCjRqhNhyEiP+YgbXGrONk6
+t/ioLAAOaWjllJej8PvJE58sBMjcInvWfeP0PijRiw21o+4o+zsBkdMxkQb+/wkK
+VBOxLQQsfncPYioRR7BVbRjuwBOSxSrvIKrzWV7RgYo8Y59GKRplzBX/dKLGqJIY
+2zYvcnqiVJ+iyI124fYV+THbizU8jmes/78vMUK/RmlIUL2fNVLPNrJ90zu1NVlm
+y5sCwzWQ+WpoP5lVflrGfY2JQLC7prjHuDqTCZxIKsjCRGIKhsln++MTWhw/qxMF
+k3Pqtc7J4FsCyk+pTH3qGFaJkNer7a2CvlRlKC5L/A+RGUtXwxg0TGW27acbyy7y
+z/kz0EOJY+pNf7sx9XEUFJogap/T7ZthV80o9ODhNweZwoLuB9TYs4zpCunVf4su
+nldVv9PP87AK8cjf7Kk11KjglfzbEMei1K/bIaGYAiynwkSVBkPGI8dEiKGhyc8F
+M4Z4wuOOExZv+tYHKRgv9ez/lw0SAh3aOYfh6rhdRJV/8R+o9wDyFv5jVgqqtpbx
+C4k86310cBfrA/mEaGd6
+=XN/C
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.7_rc1.ebuild b/net-print/cups/cups-1.7_rc1.ebuild
new file mode 100644
index 000000000000..c57d8281d940
--- /dev/null
+++ b/net-print/cups/cups-1.7_rc1.ebuild
@@ -0,0 +1,310 @@
+# 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.7_rc1.ebuild,v 1.1 2013/07/12 19:44:20 dilfridge Exp $
+
+EAPI=5
+
+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/_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-2
+	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=""
+fi
+
+DESCRIPTION="The Common Unix Printing System"
+HOMEPAGE="http://www.cups.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="acl dbus debug +filters gnutls java kerberos lprng-compat pam
+	python selinux +ssl static-libs +threads usb X xinetd zeroconf"
+
+LANGS="ca es fr ja 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 )
+	java? ( >=virtual/jre-1.6 )
+	kerberos? ( virtual/krb5 )
+	!lprng-compat? ( !net-print/lprng )
+	pam? ( virtual/pam )
+	selinux? ( sec-policy/selinux-cups )
+	ssl? (
+		gnutls? (
+			dev-libs/libgcrypt
+			net-libs/gnutls
+		)
+		!gnutls? ( >=dev-libs/openssl-0.9.8g )
+	)
+	usb? ( virtual/libusb:1 )
+	X? ( x11-misc/xdg-utils )
+	xinetd? ( sys-apps/xinetd )
+	zeroconf? ( net-dns/avahi )
+"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+PDEPEND="
+	app-text/ghostscript-gpl[cups]
+	app-text/poppler[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-2.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}"
+
+	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
+
+	econf \
+		--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 \
+		$(use_enable acl) \
+		$(use_enable zeroconf 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) \
+		--disable-dnssd \
+		$(use_with java) \
+		--without-perl \
+		--without-php \
+		$(use_with python) \
+		$(use_with xinetd xinetd /etc/xinetd.d) \
+		--enable-libpaper \
+		--with-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\)${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
+}
+
+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 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/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 /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
+
+	# 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 2054c2f82fd3..ca4f346978ac 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.38 2013/07/12 19:33:09 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.39 2013/07/12 19:44:20 dilfridge Exp $
 
 EAPI=5
 
@@ -8,8 +8,10 @@ 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}
+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-2
@@ -86,7 +88,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-2.patch"	# systemd support
-	"${FILESDIR}/${PN}-1.6.2-statedir.patch"
 )
 
 pkg_setup() {
@@ -165,6 +166,7 @@ src_configure() {
 	econf \
 		--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 \