Clean up

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

4 files changed, 20 insertions, 604 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 20bb0d73f9ae..6a17dce55d6a 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,10 @@
 # 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.528 2013/04/01 22:49:57 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.529 2013/04/01 22:51:09 dilfridge Exp $
+
+  01 Apr 2013; Andreas K. Huettel <dilfridge@gentoo.org> -cups-1.6.1.ebuild,
+  -cups-1.6.2.ebuild:
+  Clean up
 
   01 Apr 2013; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.6.2-r1.ebuild,
   cups-9999.ebuild:
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 30689b9d542f..1b1e85e20f5f 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -24,33 +24,30 @@ DIST cups-1.5.2-ipp-r8950.patch.bz2 19525 SHA256 1a2d36136fc66b5f53e7cfb3e5d815e
 DIST cups-1.5.2-source.tar.bz2 9595665 SHA256 b150aa108c631f4f07e92cb13c01263a67170e5ac8383c5548ef8f8473a187fb SHA512 c1d83a7540d9506bd8e7d0ce8761a4737928feef388cc5008179d408cc7cf59347fdbfb5a1c9c66b229919d316e37ef2d1863ac5caacada11afb1514ab682309 WHIRLPOOL f2db515343ee0a564436363ed9b6625cf04e6e1e1a93cfbaad1dfaaecd49a89d7afd4bf0bc2828a435aea807b41dad93229d7f0bdf3228d7c6ee3c066482c362
 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 8363 SHA256 5962ac89342b0430eb663dbd012af6ad02f836d712496088b65af28817a241c3 SHA512 dd1cb9a9c570d51e376c71c784a3c6dfff38e07a2594792666cbcded73ba3dc5301393fc59c01113cc6461fd1e63371348df015be9cd3d2aa50859ad296535b6 WHIRLPOOL 2a69b6d45f64b191dabb4b6a4f112c7a9975a356c28999e50a413e6ab73a7f292e00a5995d9008419420063ee769ee11879267acd69a12a2c81deb0ab00829f0
 EBUILD cups-1.5.3.ebuild 8623 SHA256 4cba3b3f068540fe208208dd84785b4b235883fc9d1546a7c678835ac67bc01d SHA512 b82a7a79c7ab586dd3d66b70016ce0c9c79ea7d1deffca81fb2bd8c5de0d601456245471502ab7ecbc9887fa5f732c19d933a5358c28250fc016f5837e390303 WHIRLPOOL 7925273a5321b57476c2834583f1f491bb53cba89e86babe51c13eab10506c1c7a0ae08e6e4a23b84162323a85b9010303d4f2feec4482530dee6923fb68aa40
-EBUILD cups-1.6.1.ebuild 8313 SHA256 ea7db57c0936d02be764b6c45c114c53b636384bac04f4611c91a82b1fa061fd SHA512 700d3a9c4f51e3d29b8f9853d796cfc634140c302a7684e119c9e8ef95f3427dbf843f92cf3178c9ce7203610d06f79ecf8952bdf39bc1cd1000bcfb65459566 WHIRLPOOL 7c37a51280c31899b251b29f589c06651ba49e9f3399aa7b7e6b9ced9785b6961258dda6b0eb4d1226646cfd5e1e09e7f3775789a01c663263e8ff4db1ad1b38
 EBUILD cups-1.6.2-r1.ebuild 8448 SHA256 cc178b0218e588a81163d4652f70c8962ce4c0d38aaaa572c04fe8d55102c197 SHA512 e8b8bfaba92c08041ae012fde6ba9d6651f3f51969598a9b55e1c5d9e1cd64d84dcb8ae2b39d624466839ecdeff93b18aed043a89d27594fdfa2b3d2a1369321 WHIRLPOOL e453c3f525961b597452db84f2a52cee03734c813eba9768cae9bbc535d6b5459d9cf0981d779f6a27ea04e8bb8a048a308573cc326642763c9ff1d34f687f13
-EBUILD cups-1.6.2.ebuild 8459 SHA256 d0dccfbc627276838a75c6e07f4427fa37afec936eb951303ee19d3c2865423d SHA512 0e3be444977d67f7cc27bc448a5411f5a1f5f2c6b17f773c69b2b18feafb8eb14895da168c655fcf332a309ccd0a0956555738a808e865c53de38bda7a7f6fbf WHIRLPOOL 678997cab410ed3d09a7e750df2c8131f4670728b217b2cdcba4a67a77a88188e09dd095c883fdfea553ada90bd3fa1ade618f93b07e9e3ed15559a4e2ca4f25
 EBUILD cups-9999.ebuild 8445 SHA256 a9fd2e8484f22b303c02b726f6653c5a494abf6dc2776d49d9fbe5d138bfb4f5 SHA512 5aa7b02e99c46a0e04841048d915b3ad97cb1bfded8c43bdbe97739e4d0042631e466149af6d491d92a8198120ec1db75a849e2c78c174b2e6cc173046f6e2a4 WHIRLPOOL da92431bf9ec1c79cf4a37f0a2c62d7308fc5a39ec113e63490f2df0e3589ce6db63f7b78826f668aef19d2568b009a3db2d8ce13bb58700b6805ccd7934d4c8
-MISC ChangeLog 80416 SHA256 d9bb6ccd8f9532e76f3605a6a8eefac4395efa9089a23f5ecf861919a64984e6 SHA512 89d06b030c6b118115f14424ac751c7f5b5db2dd74271e289976db06eb60b8ad1f2c2086cdc1bdb720017926abd3c3101da17f20694302e1c9fa1f646a91a542 WHIRLPOOL c9d4b52c7fcb4a8466b580f3bcb619fe7e75d635842023f759c91b13479e6ea31cd5036fe38991b60e7e2c078ff6e68ad0e50fbaadfc4451b6ccf9e9ad8eabfb
+MISC ChangeLog 80527 SHA256 035eac86662f24142d19f9cb25b3701b41cbfa9198b05a6ff1833b54b249c480 SHA512 285f6686e70643dacd203f49dd5fa82b8fe46fa104c5a033fb74dc54b7e187d1953b897c4b6f3ab5120bce72ff57af6abc074f8346fc5eb6c5abadbe721c806d WHIRLPOOL 33bde5c2a0986b9bbbc419f38ac82fbea33dfa850c5e6e26a941775a9b30409d10ce3f49c323b4a3378fc8dccbc0e81edd7ab9850efa90e991113ceed6990dbd
 MISC metadata.xml 778 SHA256 26a8d1221a4334579f98705c38f3e3a882c223df86181dcf7968eac2118188b8 SHA512 717b6c3d940b2de149a68bb1c66175cd6fac04e21fcf581d6f1dd248c1bc5ee8fb98ec26a1fa2fca94e8fcb33f131c6635d40a6954721020a989dc260e8b8fbc WHIRLPOOL 057426e3c3f1e7e5a6bb124e0af0d804e15f6bbf17f7b278ef90d773f997beed6c6376bcc9603ac4c67f75675a33bc1fb7a02bb89f7a1ed69634a5d7bf9befbb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRWg9MXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJRWg+UXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcpAAP/R1jD8ysF5kRNaGJ1dvXJPXn
-K+r1w5/Ept6Ojyac/Vtm3udcnbp9cKGwUkWcBWGrG57382IrKi1zgByCy+oYnmWK
-iYyS8jG6DfDxOE5vCW6EQdmNP2JXDeJ5lEb51u7+JhOVW7JmQX3ukHja3qV3bRpR
-J88R6UbHue5uz2plxWfOkFb1g4/LbOb1aZs0pZDkztTr/VkhhVmXJUij7fPRlCPA
-RgVQQiebT/UcDtoy1nzqlUHk7SsU0IvUw5V/pEjLEbmB5qndng2mxPicCV4Gry5p
-dF+qn1umtPa+0meVRaKqa82IMLP3TpLlualJXfqPwFpOF2LvCt2DG4u/+/M9sl3A
-vyJBIMxjLPku4Y4twxyEAd0p56nFGo44zPqQS3sSsmLa6lb8pGDsLilElllYwiaS
-MltkzmFK160h3/IPCxNrScK8p/c4y1kBe884yzhSP3mZ7Y8aehiZn0Pt/4WqpIns
-JrBjQzWvZpNcExMK3qnuYlC5M3Bda5/1vS4vevtOCcRMfD+c0Mk8QkJktbyBSdsN
-gmPWeWcq3LXsyXveoymwKko64t5IDTgXhtTTNzTH+UiZ5dhDLJUn3kn5AqQRl8hS
-vW9R/6gIPCSY0+1GuPMgAd4FcW1wx8VvDDrtNMIa+rJEUBTZiuGwFlKt5wc+JQDV
-B9ps7CEmMjzIY6ABYNr3
-=S+yc
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcHL0P/0F8QSrawrSUvq4mrd4JnTSM
+oTCAfdNCIbXBeB8bPzdhA4tXLaTLx53jXhtGGqyzVE7eeXKnPAYYi9BxasWMit0a
+KQ4X3ROza5qr9t9QxFGPgw3dOcZv8pFx61fUjD3tuDvCtZL71gdVEwa1uHCRiz94
+H24PgV0bVTDSYyBRtqLkAWLP7Qfu/VeipLzw7o+kCgLPWz9BLzqQEZCFrR67Ubno
+Z2Zf194c7B7sEt/BVFyQi3eSrz/vEAj4DKfjnWJX8HbgPdz+BuZCZJ1SzplB6tBG
+hJI6FPQS3mtb9PHrq1Vv+KHqJgzuM8BQ/aFLzc8yf15N2Rs1LB3mnlGUGZC8P6wS
+ByknM6zbk57Ye+3+PlwxcTlVEyCDortefGd7WucQBuPfSOwOgVxRBmsGrQJ8dNIs
+/bvFHzvBNVI/QbgL5SvatwUU2lRuOVqOJhLPJWmPbda0iBu6IjqgTYlTuhnUwrHM
+gS62K1RVnipQ9JY3tulvNaYNSoDXdjnrhU7onq3DqArIBJ4HSu6UEtl5OchMQssO
+XKuNLJO0TQg3BELk6k2jTd3eW3+cLO5JuYoRFi6pzjCguvIWVsLjMxwToJKvvUEa
+JB1iB9rzUJZwFpoqgJgYrI95nUbWG8rvnXBP/fb5kWLHpMU+X/p2ICLLzZC3EDef
+5EZI5lL8mcMI/PPKil0m
+=BfLn
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.6.1.ebuild b/net-print/cups/cups-1.6.1.ebuild
deleted file mode 100644
index 22e4683f1e92..000000000000
--- a/net-print/cups/cups-1.6.1.ebuild
+++ /dev/null
@@ -1,292 +0,0 @@
-# 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.1.ebuild,v 1.12 2013/02/08 15:27:09 ago 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
-	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
-	"${FILESDIR}/${PN}-1.5.2-browsing.patch"		# browsing off by default
-)
-
-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, or enter"
-		elog "the location manually."
-		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-1.6.2.ebuild b/net-print/cups/cups-1.6.2.ebuild
deleted file mode 100644
index cefd2b4475a4..000000000000
--- a/net-print/cups/cups-1.6.2.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# 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.4 2013/03/24 21:59:55 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/_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 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
-		)
-	)
-	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[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}"
-
-	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=/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
-
-	# 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
-	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
-}