Migrate to python-single-r1, bug #478136.

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

6 files changed, 362 insertions, 50 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 53ad2c11cfa8..3b0228f591de 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.557 2013/07/25 11:50:21 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.558 2013/07/25 22:14:53 mgorny Exp $
+
+*cups-1.6.3-r2 (25 Jul 2013)
+
+  25 Jul 2013; Michał Górny <mgorny@gentoo.org> +cups-1.6.3-r2.ebuild,
+  cups-1.6.9999.ebuild, cups-1.7_rc1.ebuild, cups-9999.ebuild:
+  Migrate to python-single-r1, bug #478136.
 
   25 Jul 2013; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.5.2-r4.ebuild,
   cups-1.5.3.ebuild:
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index ed3b241caf74..895d83864dfd 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -32,27 +32,28 @@ EBUILD cups-1.5.2-r4.ebuild 8314 SHA256 f327eeb290f09e8c0cc48feeca4703cc2ca1ecbe
 EBUILD cups-1.5.3.ebuild 8537 SHA256 62bf53037af396fd17d5eeea961cf7f140abfc587fd8195639eee499535e1913 SHA512 32417468dd7d2a0285e58646e0ffd32e03cb55a77a856b40afde21390bc5e556af614443a1d674f741b334e302a0b22a3c9e063554eb8f25db7c626d2522169d WHIRLPOOL 258db187b866dbbfdd6b89eb135683a37be5cd7f756c1fbc40c5a1fb4452ace424f14c373bafad0ccf25118fd510f875b6d0a8eefe1d487572f0790f6d914861
 EBUILD cups-1.6.2-r5.ebuild 8930 SHA256 ffbbfd5979e1560f5eb5b5fc22e7198e906ec1b2b4488bf467104fb74a1e88a3 SHA512 e98d96dc2f2b47d368fb89393fc8cd3de55d8f63bf421c6ee3770bd54d31a799802c6ecd77221d75cee1acef6809ad482c67355d11498bce3ad276ba5cfc590d WHIRLPOOL 080171c6e8516b94a0e7f51fa8113ea563c15d4a6706158caedf24e6c196493c7425b5865845ae7cccec1083601ea4aff6413233000b97579f807ed72b2de3b3
 EBUILD cups-1.6.3-r1.ebuild 9048 SHA256 65d155b7b09fac261b9ad0a18386a5545fa895a6a541cdc103dd72dcc3bd7cfd SHA512 c311d91b04636795c97d3fb5dc0566302c7aff3c4c41a884893993cc0dd5e9718f26098b1df02fea8c281077cb79c2d4c373bf8a57e24014d79c1dc7fc107841 WHIRLPOOL a74e41e7ea0e3fbd013853b616e149091e4d42303a759b26b66f4dc21976be4b1b7cf4dbcc60107ff7cc581d953692e0c2ec3282d75ee222e9b5b92155a18a94
-EBUILD cups-1.6.9999.ebuild 9048 SHA256 cef849b198422821b555545df39d63bac9929ae4ef685d6776976c870bee870d SHA512 4f2d5f5655c7b8740f6511a3899803e965ba858695ad33edde47c2bdf19d962747f3abff68e5ba446684a4fe136d526b7a0a85ffa0dbe7a6c33face2abc29343 WHIRLPOOL c24daae9ddc25acbd2f44761656bab50cee54359994e047b6ecadfd0509d4ed763c2f61d6296339fc6ce89064345d4e35c66d94e0d4e2a4116e0c033dea1ea66
-EBUILD cups-1.7_rc1.ebuild 9001 SHA256 7a16b5e08dd775610f1fb846931fc5e26c137fd0472313e9b7d7045f79082b00 SHA512 450b24fc9d29ca5a33267a59fe1fcbeddc28968da97c56437e919508d6050705cbbbda5d0d00ee83d37d27b32a83ffd8bc4ba56df7f2667547ee1e9f4cfe92bd WHIRLPOOL 7dee68a00a7d268acc6fe45b6a755e84677535ac4e13242844656ef94506d646b481287fbf2a339c17a59c1d58a08f83a0140339aa07ec9a66f48062cdb96026
-EBUILD cups-9999.ebuild 9085 SHA256 538dc45ebf98763c2b66b3408f92c888ae63dc2df04ffef845903b1135860221 SHA512 aff493e0aa0f4269868437298a5868d4b00a7cda6a6d45818e6f665e867e4220a15e877db20d6136d78a89a24ba4f20a6e70bb5bb769bf99c167495db4334506 WHIRLPOOL bf23baec0b869b8d8530a56d6e40e3ba5ad6cebde78bb4e0a79ae6f86da735b8ecb1801498c8cf20e7ed2d57edee8289f01cf5b1c48b1ca30fc5fa28c7534407
-MISC ChangeLog 84809 SHA256 a5020f2879d628d93e1e7f4c41ad7af95e5658002760eec377e411eeba4a5238 SHA512 87ba23880efedef073f4a7395b2c2c851ff8a1998666c44d6d400619bd4d0b5b3ec67f1bd20a57131b78f5c957f5a123300104634e277a7ca2ed1f2313709ddd WHIRLPOOL 33a5f2624b4c92d6a0d865ac60f247d15daa731a3944627886050fa578d6996dc5b92c57ecac7d2250fd6fc2a1a2d36f617a4fa71678e8575681d2191e33306b
+EBUILD cups-1.6.3-r2.ebuild 9096 SHA256 2d5c6f68a33da04d94b2fb25da38f9975e4ea3092fcaa1d44e806b46c8bed4ca SHA512 8e45cbd10b5bd7c897ec0b7fe68f65c51d273ee69d1d8c8b018a5af25584805080dd993d8611897ccd8db4839781dee984d512ad8d2c9219a8ab0a4eda67c7dd WHIRLPOOL a94b0f6bc41514993730543b9549f28a46d3152e636f648163723d0d1d5ff0680194efe3f9fc61261fe7c3139074ca80ceedabffdeab1755f9f72260966f3dac
+EBUILD cups-1.6.9999.ebuild 9096 SHA256 93a56b569d6134771cd87b0422d68f6912a05db58c359febf475ec9f029b381d SHA512 5eab01a40ea1fdfd37150fe8987658f4b7407547781d4f50894321083dce9278c2b4ff46872f8a620582772fd274e0ce78c202dfb9c7c02877d86fb606d43961 WHIRLPOOL e56905f66060994c68d8ed356a93ec37e757c9a4671bfa981e41e08e283f219df87f19db8d19c620129782dfe93a53b24ea85d491ac98b8ac836632718b14823
+EBUILD cups-1.7_rc1.ebuild 9049 SHA256 b957d99553a99ba9c0c427fded4dcd996cdd67d21c53abf99a108777d73c7363 SHA512 8ff4d7308cedb8cfc038ae47836c03ae5d97d70ef70e7ea3b72385792ab23dd54f34003bead51f409210d1929735927804c4dfd96c590dd025d6adcabcff70e8 WHIRLPOOL e5149a97c6ec58e5a6348b3f6d0cee823dd6b2c81bb6b17c26ec853ae511227df634f5b04e42fb02c3e9b57857c785da18c58e0739fbc513731eca7577c7666b
+EBUILD cups-9999.ebuild 9133 SHA256 eb79025118f4df4945b74ed5f042a0769b0bbf397dce9b51a6afbd2e6b2fcef3 SHA512 9228137768b23c1c2d75732463e4108e0ed1e1ca247f8b7b5f70052f593c3251bea846988ae5b7a5708a2879cee911a0a4684ea3befcd2ded35d8a34734c07e1 WHIRLPOOL 0171968e29ead0c283dc71c9854ebb16e773b5e0e967df8e2c2e5d12d3bbc8a11c0b974a93c7324d04e06b31a4e4983f11fc0449ec3f1063a5da8e717a0dbef1
+MISC ChangeLog 85017 SHA256 38d69c5b9dae86ee05ec88fc700bb63f43953c4e07c621eccedc86c3537b9412 SHA512 682ebf28295fc7252e359e442075963230724c3de390f91a42c756f5e5a1928f3296d0e0f215168dc8e409a9c216517df6f867129d4f0771ff881c846f4b9cea WHIRLPOOL 693951f2111ba0b4349376cc7830e2edab2bc9fd03eee82b2117537043d10815b76744109147afbcde976b85be7c139a4e17bfe5a258e218f030024f0ef602bd
 MISC metadata.xml 789 SHA256 6efaa6b3229db0ca62837556ed72fb497546d46178f10107b1aa17570665c742 SHA512 63fa10e24551505a9251f633818364459211f53be2e310c9f94364b6c6635ef911a73da5c9952a6963fa997b9e3178dd224afbc55cb56fe7cc00f2a53a9c4a69 WHIRLPOOL 0e4f27d31bbdc3e57d14e27c2c46395a937b01a991a12b291f29014064113073693f389d5d2103d609b303f951fc9c124829f339b73cd12e4ec58fb8e93dcae4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJR8RDSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNUIxN0RGNTc1MjU3N0NBMEM1NDFDRUI5
-NEJGREY0NDg0QUQxNDJGAAoJEJS/30SErRQvBbAP/3NbqTd11q8ic7o40WgXynX8
-wOXRYdsiUzmhgv2bZagQk06D8AsQgpRUy3jdq6PdnC/uL2GPOTsEab1ZFxYUTwlO
-Ty6PCCLoZ4TacJj6fSdl6Yus7z/uP+vllkn1/L47HPQKEg4KmKqN3+IhPRYEnYXb
-ENmyji/DEJioL37qlTm6knEo1WhgMwCJqYDDER6L2Xzz0zIL8xpRy0NK5YEhqHyN
-LGNfvfrNMPuTQCzIAHJotWV/fuJI0zHgIgbqJjKehosgXUCW6lmvT1CxNOB39QrH
-bP9Fqzb76xBBSmltLmwEiaf3Teqk1/bjUZoAMIwiYdmOYnqHClKWOZZ6NF74XGZP
-vzsvU1a+aS3xj8QCf+Cs0pmDBDksUw7jFrOQ0s0jBCKyK8IxNJc2XjUB/tEUhEXk
-GuV4AUf4G6pMbCQbkl8uIXVX3PQYB5dCvtpeosNSZZ5f1rSV27HiSN4E8NmZN5dj
-6ToY/FnLLHplFNlcwfZi1MyZYGn4WNAiIOZuFSEapZGZ97pBs1kxPThfT4pKztkV
-Wg79VhsFpDOBcgpWiyUt3jHB/BvDcP3md9hS7vdVuo3YLPbSV8Ns8rqpfwApXLqg
-BvVoBY7GDNanFpHWHkvxSnqvPRVnIvMyX8SE7NyQsJBjDQXkCZqSfMiEXkdv01qz
-FGwkG8Ri37USgiBKHa3Z
-=OGQl
+iQJ8BAEBCABmBQJR8aNzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
+NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDDPoP/AnyoJpKVQtFVLwxEzh7KQ6i
+yFrL4x0HDRHbh/N37PHdlk+7a5OeeKEu7JpYAABXSbichcdgErDTWHkTyLOX+4vx
+8GZzlhdCoWMzqi+++GayZdY07rkbFKtgu8RZ2G2Kx+4EM0RpCvAOgKfAmgLw53u5
+5x+oUBTxwZ1hBbE2bDLLb13wQZSsyqgrqtXv+1fOYf02t2iK55r1JcKYj2KCcoul
+Z+bNqj9ToHhb/+vIQbZq3sb1YZ8O8XYYD6V78Ms2JgAv5pTXrIDNu8NeV7DYIG8J
+XvzV4S9igknxyVZOQetQ5AQkTvfrD/mijhFWSKDkL6pMnxsZekxLjL1v2SseDMRf
+rmY+5R5mZ8m9ljkLPjcm2+nfsK4VUMZx8XkGeKFIr7ThjkA7g/OLE4atIL9MQRZ/
+D6qorYHYY1T48OVWS3yHXVDcGZgR0wQHZUp18rPvdZKPbayXzPTBrZH8KYLOFq5T
+ROjeHvujPBYAGNbcBIYHBlnNUic1zTb6mt3WQXXxiQnUh7LHW4H/p7ZsPg1YDaRr
+v0dJFOSqSAJnPI3FEwPlRu42Ix08/guN9PlV20kA6YrRMg5w1vQiU3TDbDr1dsrS
+c1Y9XTFy0Av9gahJEZ7uFf++ngjbSTRqTASxgVobBUwTGo47aMNlznGT9CiH3Agw
+u9XmrzNbOb6pg9cnNErD
+=MXYO
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.6.3-r2.ebuild b/net-print/cups/cups-1.6.3-r2.ebuild
new file mode 100644
index 000000000000..7b1b1e266e3e
--- /dev/null
+++ b/net-print/cups/cups-1.6.3-r2.ebuild
@@ -0,0 +1,308 @@
+# 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.3-r2.ebuild,v 1.1 2013/07/25 22:14:53 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info \
+	multilib pam python-single-r1 user versionator java-pkg-opt-2 systemd
+
+MY_P=${P/_beta/b}
+MY_PV=${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="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+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 )
+	python? ( ${PYTHON_DEPS} )
+	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 )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+# 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
+	"${FILESDIR}/${PN}-1.6.2-statedir.patch"
+	"${FILESDIR}/${PN}-1.6.3-colord-profile.patch"
+)
+
+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
+	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-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 python "${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-1.6.9999.ebuild b/net-print/cups/cups-1.6.9999.ebuild
index 521eafd02c4b..8e4312cc4bb3 100644
--- a/net-print/cups/cups-1.6.9999.ebuild
+++ b/net-print/cups/cups-1.6.9999.ebuild
@@ -1,12 +1,13 @@
 # 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.9999.ebuild,v 1.3 2013/07/12 20:02:55 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6.9999.ebuild,v 1.4 2013/07/25 22:14:53 mgorny Exp $
 
 EAPI=5
 
-PYTHON_DEPEND="python? 2:2.5"
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
 
-inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam python user versionator java-pkg-opt-2 systemd
+inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info \
+	multilib pam python-single-r1 user versionator java-pkg-opt-2 systemd
 
 MY_P=${P/_beta/b}
 MY_PV=${PV/_beta/b}
@@ -49,6 +50,7 @@ RDEPEND="
 	kerberos? ( virtual/krb5 )
 	!lprng-compat? ( !net-print/lprng )
 	pam? ( virtual/pam )
+	python? ( ${PYTHON_DEPS} )
 	selinux? ( sec-policy/selinux-cups )
 	ssl? (
 		gnutls? (
@@ -74,7 +76,8 @@ PDEPEND="
 	filters? ( net-print/foomatic-filters )
 "
 
-REQUIRED_USE="gnutls? ( ssl )"
+REQUIRED_USE="gnutls? ( ssl )
+	python? ( ${PYTHON_REQUIRED_USE} )"
 
 # upstream includes an interactive test which is a nono for gentoo
 RESTRICT="test"
@@ -95,11 +98,7 @@ pkg_setup() {
 	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
+	use python && python-single-r1_pkg_setup
 
 	if use kernel_linux; then
 		linux-info_pkg_setup
@@ -185,7 +184,7 @@ src_configure() {
 		$(use_with java) \
 		--without-perl \
 		--without-php \
-		$(use_with python) \
+		$(use_with python python "${PYTHON}") \
 		$(use_with xinetd xinetd /etc/xinetd.d) \
 		--enable-libpaper \
 		--with-systemdsystemunitdir="$(systemd_get_unitdir)" \
diff --git a/net-print/cups/cups-1.7_rc1.ebuild b/net-print/cups/cups-1.7_rc1.ebuild
index feb7aaa894d8..8f475db98ddf 100644
--- a/net-print/cups/cups-1.7_rc1.ebuild
+++ b/net-print/cups/cups-1.7_rc1.ebuild
@@ -1,12 +1,13 @@
 # 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.2 2013/07/12 20:02:55 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7_rc1.ebuild,v 1.3 2013/07/25 22:14:53 mgorny Exp $
 
 EAPI=5
 
-PYTHON_DEPEND="python? 2:2.5"
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
 
-inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam python user versionator java-pkg-opt-2 systemd
+inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info \
+	multilib pam python-single-r1 user versionator java-pkg-opt-2 systemd
 
 MY_P=${P/_rc/rc}
 MY_P=${MY_P/_beta/b}
@@ -51,6 +52,7 @@ RDEPEND="
 	kerberos? ( virtual/krb5 )
 	!lprng-compat? ( !net-print/lprng )
 	pam? ( virtual/pam )
+	python? ( ${PYTHON_DEPS} )
 	selinux? ( sec-policy/selinux-cups )
 	ssl? (
 		gnutls? (
@@ -76,7 +78,8 @@ PDEPEND="
 	filters? ( net-print/foomatic-filters )
 "
 
-REQUIRED_USE="gnutls? ( ssl )"
+REQUIRED_USE="gnutls? ( ssl )
+	python? ( ${PYTHON_REQUIRED_USE} )"
 
 # upstream includes an interactive test which is a nono for gentoo
 RESTRICT="test"
@@ -96,11 +99,7 @@ pkg_setup() {
 	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
+	use python && python-single-r1_pkg_setup
 
 	if use kernel_linux; then
 		linux-info_pkg_setup
@@ -187,7 +186,7 @@ src_configure() {
 		$(use_with java) \
 		--without-perl \
 		--without-php \
-		$(use_with python) \
+		$(use_with python python "${PYTHON}") \
 		$(use_with xinetd xinetd /etc/xinetd.d) \
 		--enable-libpaper \
 		--with-systemdsystemunitdir="$(systemd_get_unitdir)" \
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index 077203c5d692..610abb6f319c 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.ebuild
@@ -1,12 +1,13 @@
 # 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.40 2013/07/12 20:02:55 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.41 2013/07/25 22:14:53 mgorny Exp $
 
 EAPI=5
 
-PYTHON_DEPEND="python? 2:2.5"
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
 
-inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam python user versionator java-pkg-opt-2 systemd
+inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info \
+	multilib pam python-single-r1 user versionator java-pkg-opt-2 systemd
 
 MY_P=${P/_rc/rc}
 MY_P=${MY_P/_beta/b}
@@ -51,6 +52,7 @@ RDEPEND="
 	kerberos? ( virtual/krb5 )
 	!lprng-compat? ( !net-print/lprng )
 	pam? ( virtual/pam )
+	python? ( ${PYTHON_DEPS} )
 	selinux? ( sec-policy/selinux-cups )
 	ssl? (
 		gnutls? (
@@ -76,7 +78,8 @@ PDEPEND="
 	filters? ( net-print/foomatic-filters )
 "
 
-REQUIRED_USE="gnutls? ( ssl )"
+REQUIRED_USE="gnutls? ( ssl )
+	python? ( ${PYTHON_REQUIRED_USE} )"
 
 # upstream includes an interactive test which is a nono for gentoo
 RESTRICT="test"
@@ -96,11 +99,7 @@ pkg_setup() {
 	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
+	use python && python-single-r1_pkg_setup
 
 	if use kernel_linux; then
 		linux-info_pkg_setup
@@ -187,7 +186,7 @@ src_configure() {
 		$(use_with java) \
 		--without-perl \
 		--without-php \
-		$(use_with python) \
+		$(use_with python python "${PYTHON}") \
 		$(use_with xinetd xinetd /etc/xinetd.d) \
 		--enable-libpaper \
 		--with-systemdsystemunitdir="$(systemd_get_unitdir)" \