Remove old; propagate keywords to live ebuild

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

5 files changed, 22 insertions, 345 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 6e42f4eefc1d..b78f74f64c96 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,10 @@
 # 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.595 2014/02/22 07:40:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.596 2014/02/22 16:01:24 dilfridge Exp $
+
+  22 Feb 2014; Andreas K. Huettel <dilfridge@gentoo.org>
+  -files/cups-1.6.2-statedir.patch, -cups-1.6.4.ebuild, cups-9999.ebuild:
+  Remove old; propagate keywords to live ebuild
 
   22 Feb 2014; Agostino Sarubbo <ago@gentoo.org> cups-1.7.1.ebuild:
   Stable for sparc, wrt bug #501198
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 78be44fa0cd6..f6e1e883b953 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -5,29 +5,26 @@ AUX cups-1.4.4-nostrip.patch 487 SHA256 b96448896f08c5f91d5afb0c093f2638a262d1c4
 AUX cups-1.5.0-systemd-socket-2.patch 12914 SHA256 779a91231b62f6467b3ee08d5cf9cb85c1fc5408a23b727aa4c4ddc54f450ed6 SHA512 9577ba50e737dd920ef06e6a5d95938ef10db5fcab8254137f15b2214846de56360dbf8c40c3a95e0b3459f5f925d18a9cd07a844cdda7dd9a41d9fac0118291 WHIRLPOOL a15a97f64db18c7ef7ba5e80096d3aeb06dbb19c388424b069e5fc8e125c159c0623aed59dc0748c8359c349a3fa314ef79f32a7b59aad214e92b974eb4f332e
 AUX cups-1.6.0-dont-compress-manpages.patch 435 SHA256 d3e41e8d4a841ac71e5ed8598fc444a2f11b4c94215b55dcf5147694bbbc88c3 SHA512 f004b1e7178212eddefda8416c33514834e0e444243c456a8f0723e763247330b8366e71f64ee0e84196789498c5b22334049a8bec210068e02f06b64b683d7c WHIRLPOOL 1453927d8478c740f74ad9f18ef2bdc3dea30596b59cd5fb2a740942da14bef76a2418c3e536aeaad1cbf5ffb14c72e914ba6726776fe5f23f8b43ef4dedd25f
 AUX cups-1.6.0-fix-install-perms.patch 948 SHA256 4a4a885bb2e111bd67bcb90a5780f33841b18bc02382317fb5e64c384aa0c4c8 SHA512 9b2ecc47be2fd08d092017316af39e217e17a540d096cc62971521052632c40033a06cd7bdd5b319bd7f623fea803d569ced6728504d680fd50087288302164f WHIRLPOOL 7d6f4a5eab9964e6c2277f03affaf0eada9b7408eeac742a75d541ec5efe883940c816ea508a59c733327d3bbe0e31bd242b8c183e3f817a54208ed4a3071982
-AUX cups-1.6.2-statedir.patch 468 SHA256 52867308281522fce419b704ddf5c2c7c10b670fe4977050cf926f1d2f4259ca SHA512 dd9a609aa3d24d23cbb96f14c0a177d7d571508f63cfc98f7050d11b4ec59162bc48df2875ff2d39de1d1bba79ae0b163b82272fc5a48c1f080baff33502925c WHIRLPOOL 5fce69513834e675bd8c9dc843f75131f452601007f086db40878d0fc5453ebd7c5d06e25f3d556447fb9bf29a1df712f87477561d67d521e973835de1eb94e9
 AUX cupsd.init.d-r1 504 SHA256 4705b68372090ee7db69da1ad35131551ed1ba99032db2486ff6c31d2170ce6b SHA512 9eac4fc725b14615bb31c96a69c00a14ab2fb23fa355f1ced655f93e6364555b2710a277ceab439199a275405b016492b4c9183fab755c02354013e0904a03bc WHIRLPOOL e0ce34f4b73de6e63ba1f01b0df543cd66fecc692af8254acb3dd1147c0cd4e1f42ed7df4b18b26af0114db54c3b8c1bca526ed54146307223ac24a0b3d3502c
-DIST cups-1.6.4-source.tar.bz2 8262021 SHA256 b910c3e43b2d06f54154d12710e849455d0710c9983dab0a5f49a5e93b1b7e73 SHA512 b150b5915a6ab433546e14024c673372fba04623accc10c637742c83342d73bfb91b9bfbb2e3e6a64a4cc189449ae811eb4a721a994ed42e1a9c489a166f2719 WHIRLPOOL 4152b1b2699af91831f21f308e9836f66649bf6ccaeb03b7fe2fef7017ecaa0907dce5adf7eb7c37af0e6dd10de53f295b29cad52dad38fe1a8c141525b87541
 DIST cups-1.7.1-source.tar.bz2 8738002 SHA256 f52bec893d9daf92b6029be79c07e6c516b4c85ffae3e6e01885cc85e9081681 SHA512 e52f98f00e8b2c0eb7a8b29a8ed5e33b14b1a68a18f3f4558e473d8146c2dfd659c9a96ae07257c456d7a34dcc7bcabf858dcf719e8557173c8849d734711e57 WHIRLPOOL b715560357b22d0cc5887059137b79132e1f46a9adc76410d3ad2e8a1a16047fd2179372632f544b1d798a03a3d41410071f09d2ed82aeda66afe789c080cb04
-EBUILD cups-1.6.4.ebuild 9118 SHA256 a30eb0e4f2e47a3189a163df7bd293806607d03420d6c002bb84cd3bb9777817 SHA512 702091d21e097bd5d5b142feab6da59fffa8377e29fbdd8c53caea81d4168ec44b771bcd355d1aae8ed8380630796a8a1e0dcb9bf76675f046d7a4d6496538a5 WHIRLPOOL d9854fcdd866f8bbdacf255f14806221b18c81e93634d53fd8eff5dc02d0b0b5feab5f2dd00c8a435a0fe8052b7af1bc5738173a6e622862ed2b98be68ba5ebd
 EBUILD cups-1.7.1.ebuild 9231 SHA256 c2a5990fc9cba4fc0c395dcdc16d007b8d8213fad7e575c772bf57de7ec25f54 SHA512 69636ec52c8d5e743dd7261fc12a90dc22be2ff3a4f09272b60a855add63373fcea8d456d9a60c7ff016c69c64d553a79b7426a8f86436913f16512e359dd637 WHIRLPOOL e996f67da9863d2867be39ecd55dd1bc2bdcc7b0770ffe765e3c954c02da04441524f5925671b7bbfb4554f0a8fbd2994b077ea94e2ffa1531c0df256f3928b8
-EBUILD cups-9999.ebuild 9234 SHA256 eed33cb98895899f6a89f2a921cd76978d92d3304b4b0757e0110376205ae60f SHA512 7cfc10fd34f978a3106fc31ef9d3e02d3e25d7fca1f78e312b52e35460a9f8fe0f1d49cd98206ae328f150f47a34898b3e8b056c1ef5f3f01ce91cde403453ad WHIRLPOOL b8859f0632999afe1c7e2b4099fa18ce5974aa0f8df2f37bb7ddfcadd03d370cca8b42b70781c73f616d94f39785b056a238855e1112c93ce8cf304dded623f0
-MISC ChangeLog 90088 SHA256 d3acd338b2dedfee049e4bee5cc70f7a78272f2aa149cd3e97c8ed38281e32d5 SHA512 82ea135bf414211639505cbaa6e66c3f47cc45ab897e1d5e629ecb16ba5190b4f7a56263fe398a23a34881423b972e2e2a6e2120a3850964c9915b1208d0d4ca WHIRLPOOL 88abf1ecb8a5d55e1e1ac11e736ef1541cbf6e09916a0cdcd11d47263a6315f9c048745823d23ba6cb876c421691ab7cb3d5f6056841e35b89e8fecc500136a6
+EBUILD cups-9999.ebuild 9245 SHA256 978ced6bbee4a47ccb9922f2ccfc0f44889e2beeca963cb7c0fb789fc6bfa154 SHA512 29e02723e71f8714152ecbd0f361a2c39a71bb53e83eef41d252f1400df755928c5ad351705ae6268b536e2548f75e27976d0f3ade337dd28d6ddad519f52d1c WHIRLPOOL 0e943e62ec4a2384d1bf1d82601b52decb228e5fcc39fdd2884f91d2829ba95b0cf8ee91360b273b71b03c130afc0744dcf1f3b58a86f758336ad45b16c23b69
+MISC ChangeLog 90274 SHA256 e107da9099e9dba8f4f376124581a2fdb933b46a59dbd79cfa0fcbfde346a85a SHA512 eef3f60cfab8902001d16a7b17a6bde0d12312c6cc96c62630613df690ebb210fb97b6e72a08e12cbeb2eddedbc5527dbde63f98440b124b597fa17ab1645929 WHIRLPOOL 16d5d773e0f7fc921032a3ed9be87787be6232f7c362ac4c95efdddb7a45f5ee5fbdf5aa8f14838ded8f3fe41e872b5f6ec3f70dc4bf46ec77429065bb4685d8
 MISC metadata.xml 601 SHA256 9bcf6942c89c7dd963f9a34c413c1da17e25cd36489b95b708d4a89ff9659ea8 SHA512 58f0fe7d1f7b66a637013eeddb26a5c409d46915c8f4220e54850cf17cfa0cb082b3c2c5055a660857729cb4c5a53c7ac229dab6a29f801e53dae0ddc94cb573 WHIRLPOOL 55660efe3345c304742dbb12947776a97ebec51354fbab55423dd1fa7efa1b3d9321f067dfcc469462911e12446892b223ebbd3b670d1126255ffe642a64a527
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTCFSMAAoJELp701BxlEWfbLAQAJtX4LyuNJtK5RyNmCRLF+0e
-0yQcrq3AEeo+4pgsdDIabEIY7G4jHrRlbEmLZG6tZKS59byiViSjIM8dhiUPf5s9
-KtgtVp+pQh6wRWfY2GzaQUJMPs4OKxaIpwXooZz3BBz+Kivq9p7Y6cF1UUIakVcH
-xfRLcq+q9cs0/WK6k9UuWlkX5UZZe9FQKY2SHXC2E3EjzNI2VRJCg5Ad3ujEc4qL
-+RWuS1RoU5lvUYTtAmacYAxsFLj/rKMRjCINx0hG+7Gr/Am5f6/Gc5p4OBlyEpWH
-ja2YZTTE0Ixh4WJE2NRWXw5vCLNfEb0IuIiT3w7zHKfB7qyNvWmLagAf0n6RH2ci
-gjMGr2zZORDRykyyC+qVbGabq3+XzPBdn4z+YAQl2d9N6Ib/to6G4xhH4ysfKtXb
-AYwRSVB90WxrmmGi3sIRzj6/dP93cIi1Pne3+fpP6hPd6evcAVcXAXkQECfAfnGm
-xXFwm6wS0TqEr5U5vejzaU30/Mg9M55+ZDLyanNwvJ5aZeOM76gGM0Xn5AH6twGo
-ME3AYhkH2yeFQ3R01oy4Yz2PEktvcS6tThrKfIek6USrxMXFw/10AVLmWdaevMNr
-VIYjF8qg7ZRKZRMeUFliAOQVr9A8aZmcTUJCpqy6DgsTYD/tP+t3xjicuWY+T+Hc
-qt+HmgtSAsaX7oUukBfD
-=fyxg
+iQIcBAEBCAAGBQJTCMqpAAoJEJS/30SErRQvhVsP/j1GiH9CJmUHQXjNtCmX28MB
+o1m89vqaxJFPKhWvNeHEFrB6a9NxMD56xYxrI/wZKAGHn7Jvjf1ykJ6NvFdL4k0q
+bGdTRsCbCQ03I/jYqf3LSyTNpC/kmIegOMxKvjLJqmhF+lmptKMo6LH9mqgTb+2Q
+Xctl5LgsYe3jxZyUm4UJaLYG7qT/dBqCKdaOb7TIc63HUGQygSQQ2dJMvkSzWM1J
+Zf6srFWM6pIcxLQpy17B9gduPXVxfJVBLFDtzpH7nEwpnSR3E6Y4J4Yy9XP6d4Tl
+AGoidmx42c8MoYGXRnJ27onhVuxlF4OB0EKM/zllSk3D7QtqJWH2VYbJxk0OGkWB
+vN1nCSoFQix1o2hyfenzn7Y36sRPmsD4AJIgj1uyuNVOtfU+j1ekVqC7LzAU0+Fx
++xydqE2NskTcWk0l7a66x4EzoyxlHYE0lQ+4dg8C3CKffME2eHV3cVVDTatRpcRK
+JzL8zzRdKrUwPh7tPxP8762Ojkhz+FYLH9aYMkkYev9mILA3diiYd1c5KAlBlnt5
+TMOMw7o3PMIv0t9R/IRCbOye3ZggMyt5PFUD6daFiCbbsGYavFZJUG6IFQx37KtH
+Lf8B0Pvw01m75SzD9UqLhRHqKF+tqOkpHM/5obuABDljuv3hGN7mjait1V5qLM3O
+XB6SxSa0r9lNv5dcTQd+
+=/TWz
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.6.4.ebuild b/net-print/cups/cups-1.6.4.ebuild
deleted file mode 100644
index 5edde95efe14..000000000000
--- a/net-print/cups/cups-1.6.4.ebuild
+++ /dev/null
@@ -1,312 +0,0 @@
-# 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.6.4.ebuild,v 1.12 2014/02/12 17:21:10 dilfridge Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{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 ~s390 ~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/cups-filters-1.0.43-r1[foomatic] net-print/foomatic-filters )
-	)
-"
-
-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"
-	"${FILESDIR}/${PN}-1.5.0-systemd-socket-2.patch"	# systemd support
-	"${FILESDIR}/${PN}-1.6.2-statedir.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-9999.ebuild b/net-print/cups/cups-9999.ebuild
index 8a52a4a4a41f..8fc093cb9534 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.50 2014/01/24 18:56:52 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.51 2014/02/22 16:01:24 dilfridge Exp $
 
 EAPI=5
 
@@ -24,7 +24,7 @@ if [[ ${PV} == *9999 ]]; then
 	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"
+	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"
diff --git a/net-print/cups/files/cups-1.6.2-statedir.patch b/net-print/cups/files/cups-1.6.2-statedir.patch
deleted file mode 100644
index 3e836657de8a..000000000000
--- a/net-print/cups/files/cups-1.6.2-statedir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN cups-1.6.2.orig/config-scripts/cups-directories.m4 cups-1.6.2/config-scripts/cups-directories.m4
---- cups-1.6.2.orig/config-scripts/cups-directories.m4	2012-10-01 03:55:23.000000000 +0200
-+++ cups-1.6.2/config-scripts/cups-directories.m4	2013-04-02 00:11:41.000000000 +0200
-@@ -429,7 +429,7 @@
- 		;;
- 	*)
- 		# All others
--		CUPS_STATEDIR="$localstatedir/run/cups"
-+		CUPS_STATEDIR="/run/cups"
- 		;;
- esac
- AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR")