Version bump; remove old

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

5 files changed, 31 insertions, 337 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index ac3d06da639d..42f58f476a68 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.566 2013/10/22 16:41:12 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.567 2013/10/30 21:48:47 dilfridge Exp $
+
+*cups-1.7.0 (30 Oct 2013)
+
+  30 Oct 2013; Andreas K. Huettel <dilfridge@gentoo.org> -cups-1.6.3-r2.ebuild,
+  -cups-1.7_rc1.ebuild, +cups-1.7.0.ebuild, cups-9999.ebuild:
+  Version bump; remove old
 
   22 Oct 2013; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.6.2-r5.ebuild:
   Drop stable keywords on unstable-only arches
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 7b7063ae2f31..66913dcf9d52 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -20,34 +20,32 @@ AUX pdftops-1.20.gentoo 10412 SHA256 ac5fa01ca776d75bd7cef62eef9f6b0c3945ee87e89
 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.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.6.4-source.tar.bz2 8262021 SHA256 b910c3e43b2d06f54154d12710e849455d0710c9983dab0a5f49a5e93b1b7e73 SHA512 b150b5915a6ab433546e14024c673372fba04623accc10c637742c83342d73bfb91b9bfbb2e3e6a64a4cc189449ae811eb4a721a994ed42e1a9c489a166f2719 WHIRLPOOL 4152b1b2699af91831f21f308e9836f66649bf6ccaeb03b7fe2fef7017ecaa0907dce5adf7eb7c37af0e6dd10de53f295b29cad52dad38fe1a8c141525b87541
-DIST cups-1.7rc1-source.tar.bz2 8373136 SHA256 891c0b745f5f7ef843049fb881a27d4c9c01978d5e9f03ebad6e29c755a26a4b SHA512 45041ff19ab5e8671633805a341f7621bd7075cb81b065c659c2a17d14998ae4824b6b925efcfcf6a943d6af6b38659c8f3f4fef4819a6b2643e259d99e5c65d WHIRLPOOL 6ec5d2672fee46253efd8ce9e874c0ec21cfb2fa23af5734af6deb3ab5295082c2929b671d0cf0e0f990f6a9aef8abc4d6839e5519c6fe8fcd2e929743809103
+DIST cups-1.7.0-source.tar.bz2 8421353 SHA256 cf15b8caa9dab4638b628427ef309ab381817fc574b8e736d58680e0475cb2c8 SHA512 764b0fdf9a2d6d1b0be1990f8144ede7cae22a78502776f342fd76ff292ad9ba02dfbcecca5a2c1bf8bfb9597d227bdc953b790ad4eb8380ddcb2c63e4bda915 WHIRLPOOL 78ec4fa7db588ae73e0a8151d78884840c0419b8828c908a6383e259d7d0aec6e5967e7887b03e8ba6317a5572ab9f9feab947ac8f4884f1d51db7049c68da8a
 EBUILD cups-1.5.3.ebuild 8531 SHA256 f69a635b9c64076a183274a49eec89e5c84c2ec37b6c97c492ad3e8d2c3d243f SHA512 b0ebb91b9ca2f0473ce628f2e5df205bf1821df450aa1456572590c7be769ee89120c717c81bf15d03fdb7ba8176950a7835b85aeadbc1d77596d8967f5056e7 WHIRLPOOL c5b42134aeca5361c0a9c0c06830a0882614a836ab623c85345aec3435976bc6e2388ac4b4aea2e5326ea3235b5aacc7206aa65ba880e45bf154ea76b652950b
 EBUILD cups-1.6.2-r5.ebuild 8943 SHA256 f990666793e13ab80e25a31a127973914a7fb167099b8bedf54fbc734c7c4a6d SHA512 2cab80062934036ddf102ce79fa7aacb26ea700cd49f938bccc6d804b343f409b26bd65dae5aa738f29045323e33d5f61ec981e8026ab76f8f3d9d7aaeb7aa40 WHIRLPOOL 1fd0ef47536d9d7f724a46112fc324a0cc6492c111a84fc15e43e0941f6f23ba38c13164119f62ac7a1b0bdde5d89b6e3131ab805d24becd96b8f198810375bb
-EBUILD cups-1.6.3-r2.ebuild 9098 SHA256 97d50eb632303ba5ad32b83772162c979246615249d551706b9c03aee6d79b30 SHA512 a4a40611f3e9760db405c5cd120414f482a6f998c1233b1f756400bd476ec9793f10571b3dbd9567b3fbb9614b59761cd8df4eb7e18bd7d934f11ab89d71ed52 WHIRLPOOL 87d55158816c5c004d8d5e12bfa6c684cfafc6fcd19d9707808d0e538ae7be38fa75c2a685da65308f53778e33781dafe19d1966b08381564fb33780ddce16ba
 EBUILD cups-1.6.4.ebuild 9050 SHA256 72014fe36a18cc1e24a8e90f5f69645fb468e578d6f4d420e7b136d6d01696d1 SHA512 97765d4b393ac179e78fcfe0f9d061a95b79cfc7e490af50aae04c4fcac6c523995c0d46d2847c591a36f619d85a03f626a651dac86829c2da79ad22044890ea WHIRLPOOL f21d9b9e4d43b0276353201c374fe995d30ab3ab673848d7f46e01124f25327221af85c981b6f72779f6f6d1874fc2d9d44a91d4d4343fd3103eeb378dabe1d2
 EBUILD cups-1.6.9999.ebuild 9098 SHA256 b1a840074d6cbae0b1c5e0bc3002f80651181641aac011b48e4a5d9dfdc2f00b SHA512 be8f749a411fd12e0698a72c8345d05b6b8e27b9d84e8de8295574b06c0ccc52d9ebcd811da3a70e4be89381efe7164381d01ad9ed4645dfcb754a3e9c6bf6ba WHIRLPOOL 0e66ee6a43f305b91c0ea5fe0dee260cbfb2b3f09d67ce0c4dfab377f12cb6a1d017b29df38d977493b0536b3276c43ec4c5f68c3d7fe599702652c2577b139a
-EBUILD cups-1.7_rc1.ebuild 9056 SHA256 1f3f2d7122a97ea75725347c6666e374b2ee2e4a4507ba41e170a286d230e5b0 SHA512 82fd156ebd9691c880eb1d62272bf5a6f9e541b41c4d01a363c4c7c7417d5669b53f77b0d713623d624c05c4e78323a4f72b1ff03bac2629eb6e5720432fe3ba WHIRLPOOL a8268d0bec4f03ab3bab5970f86e7534a10139cfc2f271b15068b6fb36a75d555f4d2977fae1392c07dde89d23fbe7e9514834e67e5eb56dc26d016c9a3366bb
-EBUILD cups-9999.ebuild 9146 SHA256 163c3b135d019d8848cd078a80beef69d34f46bcc2e50fb9395e6355fe846a61 SHA512 ec29de12383df43cf2520c7182f91b3d3879ec06f59a0bbdb0c9c3941e789eb17dc8a23be68f1aea7bb6231371a474e88fad17f4a8253ec4dab1baa35132a4c8 WHIRLPOOL f3a427395953ef5e9f72b1d373c8a31693419dde51677ffd36f65edfa75b2c9c94770d2e85b5d0582ca94735e3fc025bfd796fb26ee9ac979d0f104c3f9f4816
-MISC ChangeLog 86203 SHA256 e51166e189a4f12bcfd61512ce3df0761dc3b539267e796c2292ec4ec41012b5 SHA512 8a0ddf7cd66e5a79bc56d34f395121f030c961a322e161e20629779dd330a0818a29f151fbbf19100e7ac7531f6c3c356a4756b609d1793e874ecff7877fded1 WHIRLPOOL b7880eb185da0222902d802e804c52da263f6374494e1da232d54d65ee4a3dae2a175e3d141d3c9eda8f28d502b4034a3d3561faeb27db92ac16e39c28d7ef6d
+EBUILD cups-1.7.0.ebuild 9103 SHA256 9d887f3e844dae6004c43404178ae7349346c1e6df6fc4106063956644e25a02 SHA512 23786e8694b4c152ce910acf6ea8f37fe59fd862b3b40dc9182b101409fac87515cf2a5f6f903bbfe99056d7ccd058ee8e86f4102009ad398e9ee327d0948e92 WHIRLPOOL a5f5a7912a0d5fdadd7e95aa86e0e18fe4ceff73823e2819f6bb6dd76af77597ecf698b55396ee74d4e6b4e0767b244562cf878c94d407998f77f3960f720fcd
+EBUILD cups-9999.ebuild 9103 SHA256 1750515b8358e1c73e3691886457f0a7d718e1559e84530a24c8edb2a887fe90 SHA512 9970cd82623eed3ff577e80ed7b05a465baa939aca0977ba231d08f20bf1bfabe7d5c65a2e09ff3b39f6acb07d9cbc3b61457c76c6b9054b24ca600b8da4695d WHIRLPOOL 4557c6f4ee5b19cb09a189e5159e9de268013934f0f1d2bde41d264045445a4471471b4a082a0655c84fed4da0ce26d1642a0c20840d0b3eaa8d274ca3ae4764
+MISC ChangeLog 86400 SHA256 a0bc092101922b80cf4325117a9d44f0a39276e1ba694991d1d0c38b7df4ff57 SHA512 0535f23625584f3e99c8d7dbea2006f91f31795e35022b75090d9b23a79622cb43979684aba7ec68a8e1716d487eb2c650835f5c1111dbc94fa2c74960253613 WHIRLPOOL 34574c0b36a80b30043e1e24913fabad935c8cbb42fef64dfb0ea9da8b4572f4f7faa99bde56424f6f6a670e8813ecec568009b2507ccfca9003cc47ded6292a
 MISC metadata.xml 789 SHA256 6efaa6b3229db0ca62837556ed72fb497546d46178f10107b1aa17570665c742 SHA512 63fa10e24551505a9251f633818364459211f53be2e310c9f94364b6c6635ef911a73da5c9952a6963fa997b9e3178dd224afbc55cb56fe7cc00f2a53a9c4a69 WHIRLPOOL 0e4f27d31bbdc3e57d14e27c2c46395a937b01a991a12b291f29014064113073693f389d5d2103d609b303f951fc9c124829f339b73cd12e4ec58fb8e93dcae4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSZqp9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNUIxN0RGNTc1MjU3N0NBMEM1NDFDRUI5
-NEJGREY0NDg0QUQxNDJGAAoJEJS/30SErRQv+E0P/jsMu7Zeo79/tB7wgMAKBwY+
-Z5On9nVdUrVsuHz5fdS6/yDM9YWaIIQKQyCGxRsH7I6LRXk8ZiMDqprdJRkukbG9
-CohGzAX3lEI2lXM6hw/KPVF64EnzlpRH9Sjf5lNYrP/3xLVZvouV8WqttOfKy/qi
-cuyA54uLdlO6r89MO986/US53vm4BvuIuJ/aaQb+WkskizQccKh2JuPmXPnURUp+
-xxL+dm/dT+wjcG4AdIaii2uHSQc9M5HiedvT38GE5rKvhlEBMDgfyzkd77TFoKN9
-/wQo35Ls9R9GAlOZUinppa/DJGH4htLsTHZ2FViYH45BRfroxlsRRNNf+MP6NDAH
-+P82sO27LpxAKTLnUtHDgrhUuD5jhfaqhDQUSoccYWTfsHsoNVBfIUk5V8sJdCxg
-9OdHweBdtPNqv9dhelywUxxLqCYBh9fVS3jTd92NpR5eOE0bzVsiJAk6uSXC2mG3
-z8syYSTW5d/IZxLoZhoAFSjQAq4DrlBxO7gpbLPtWzGA66Z9xeqR6/IP/a/xmohY
-8cMFfqrYB9v3RlvbyTGtKS5A704GLZSYwR+ibHwrdFNWvDlrjJj8Cxy2my9qmUJ/
-KPbm1rzTpk/jrgLeNjCRUaErNSfrA280NOTJiotYquoL+ytDYGR8DGxCFCOqXiTW
-H5bFCHEErTj8CNTLiGwp
-=RYqC
+iQJ8BAEBCABmBQJScX7aXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcemAQAM8nsCuMTdl+1U20XeE76Esr
+hAteXMJ7o/2n1saimKFQfV0wNhIY0aLDSkqfbY4/mLEZsqtoIZP/IubBc8dONnXr
+PvQlPIgQGpskc/8qHbTvLLCw2k4aac8qYUYDIgrbuJmjhIN0rVvMLsSNfqiwAmVU
+JQdeFLBedzETE1IK7GMXA4MGbPs7bD0cjPG4oW2MrEdYfyQZ7ICXgThZ5/d4j16O
+dDI7O691/tjTyybVMqfiG2BT9mAdCHWTps5YQ5xpCAM5n2whl5FqPMp5tjtcSquk
+o270jX2SftdlDCan4pfvg616xoXTNC0m35Yvd+dtC1re46VHJptEQMU9DRNtg9OH
+LlOkUAcTB6sKFZC58Xd1noPUtT/lEFeT3vrqHCwu7p9Yi1mVUsz9aO3CFA1XK0bc
+w+FDe6IY3XTfSMKzaj8zkGxM1T7OHip/DY+7OBYmudxdy5Za+UaZt/WU63TvC+SQ
+ePRYlMWkh5DtdTabxjpnqib45H71sMsiYbQoWwX6xEz6taCGpkU6wVNq3wy2dR30
+kDVP/qEC7TGZhgMHyGqoRzzTR4QO3eJeXGuALhY/K9oocLT68uO/DfzVRvVzN2zg
+2PjwKHt1c3Hh/vCyp6n6scdRbOChwynLqAl2YZmUqsZU38hY9+f0wFnakrYhtphz
+l4LWp2S4EoYdhCEtFYW0
+=ibzb
 -----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
deleted file mode 100644
index 6314ea9c5ff4..000000000000
--- a/net-print/cups/cups-1.6.3-r2.ebuild
+++ /dev/null
@@ -1,308 +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.3-r2.ebuild,v 1.3 2013/09/05 19:44:46 mgorny 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/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.7_rc1.ebuild b/net-print/cups/cups-1.7.0.ebuild
index cc789a07ee37..a6e11a6bdde1 100644
--- a/net-print/cups/cups-1.7_rc1.ebuild
+++ b/net-print/cups/cups-1.7.0.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-1.7_rc1.ebuild,v 1.5 2013/10/21 15:21:03 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.0.ebuild,v 1.1 2013/10/30 21:48:47 dilfridge Exp $
 
 EAPI=5
 
@@ -23,7 +23,7 @@ if [[ ${PV} == *9999 ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="http://www.cups.org/software/${MY_PV}/${MY_P}-source.tar.bz2"
-	KEYWORDS=""
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 DESCRIPTION="The Common Unix Printing System"
@@ -34,7 +34,7 @@ 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"
+LANGS="ca es fr it ja ru"
 for X in ${LANGS} ; do
 	IUSE="${IUSE} +linguas_${X}"
 done
@@ -91,7 +91,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.3-colord-profile.patch"
 )
 
 pkg_setup() {
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index 788d8b2124a8..b6995a2b6b75 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.44 2013/10/21 15:21:03 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.45 2013/10/30 21:48:47 dilfridge Exp $
 
 EAPI=5
 
@@ -34,7 +34,7 @@ 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"
+LANGS="ca es fr it ja ru"
 for X in ${LANGS} ; do
 	IUSE="${IUSE} +linguas_${X}"
 done
@@ -91,7 +91,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.3-colord-profile.patch"
 )
 
 pkg_setup() {