Version bump; remove old

Package-Manager: portage-2.2.8/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0xEBE6A336BE19039C!

6 files changed, 48 insertions, 338 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 3e499c289f3f..38d47de6e019 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,13 @@
 # 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.578 2014/01/01 19:15:40 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.579 2014/01/12 17:41:28 dilfridge Exp $
+
+*cups-1.7.1 (12 Jan 2014)
+
+  12 Jan 2014; Andreas K. Huettel <dilfridge@gentoo.org> -cups-1.6.9999.ebuild,
+  -cups-1.7.0.ebuild, +cups-1.7.1.ebuild, cups-9999.ebuild,
+  files/cupsd.init.d-r1:
+  Version bump; remove old
 
 *cups-1.7.0-r1 (01 Jan 2014)
 
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 2908bc696930..2a7a4f38a2df 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -8,33 +8,35 @@ AUX cups-1.6.0-fix-install-perms.patch 948 SHA256 4a4a885bb2e111bd67bcb90a5780f3
 AUX cups-1.6.2-statedir.patch 468 SHA256 52867308281522fce419b704ddf5c2c7c10b670fe4977050cf926f1d2f4259ca SHA512 dd9a609aa3d24d23cbb96f14c0a177d7d571508f63cfc98f7050d11b4ec59162bc48df2875ff2d39de1d1bba79ae0b163b82272fc5a48c1f080baff33502925c WHIRLPOOL 5fce69513834e675bd8c9dc843f75131f452601007f086db40878d0fc5453ebd7c5d06e25f3d556447fb9bf29a1df712f87477561d67d521e973835de1eb94e9
 AUX cups-1.6.3-colord-profile.patch 1461 SHA256 1666a6ac70007bc2a505174daee9993d6df6c3a10afb18d0e86e3fd770961f65 SHA512 b85d0b739e0412834ced80ef90c175098dc692beb31471e34edafcd46c26a88dc21c6fac29e6815e2ed2923eb6303e2e40ed7709ab8de0f88d31a95f0067a00f WHIRLPOOL 32242bfa8cf3947d93e6e501806dec5afcf04fcfea43eb995e2d4da9ffc2f23de806582cca4448cef66cf80ea587f18e81b521367e6b9bd5da04e9aaa5bd59af
 AUX cupsd.init.d 402 SHA256 66b14dffc99900c0db04453765e5bf48cdf0c197c6f50dccf2a55dc66dd0cf95 SHA512 1f71ba4240f5e8735f782dc688f21db5020065eed9063e1f452eeb5c7cef10cf50519c88746ce4b6a3133ce178fe7dd0ac975e5270ec0df95274e4b13627ef1b WHIRLPOOL c3a1be2ac335642ce85940855c4405af1d0e6e0b45f8e121e18ba98402ce5d035a6202e817bf7b03357b7727191ec7c2e7394d6e856df518b4443c5f81eff8de
-AUX cupsd.init.d-r1 394 SHA256 239f9831ba2a9df36d334037307cdc11cfa6476a11cbf6668db4ffb4096a248d SHA512 1050fb3073a2ef97660af061ce4b892f302cddc2c16c4db24a06549eef141b946ba104c140cc647d8afe9d78241267aaa894c593bed139a893fe13d6d60a4610 WHIRLPOOL 29118adc80f1593002f6c4d208b1978c2ec16aaa4fe84c9e547ec4412a7eb0d82c7e10f6bf4e1df52d5e37139f290f98a0d7a0cf6c6cc2532b97386ce67b4415
+AUX cupsd.init.d-r1 504 SHA256 4705b68372090ee7db69da1ad35131551ed1ba99032db2486ff6c31d2170ce6b SHA512 9eac4fc725b14615bb31c96a69c00a14ab2fb23fa355f1ced655f93e6364555b2710a277ceab439199a275405b016492b4c9183fab755c02354013e0904a03bc WHIRLPOOL e0ce34f4b73de6e63ba1f01b0df543cd66fecc692af8254acb3dd1147c0cd4e1f42ed7df4b18b26af0114db54c3b8c1bca526ed54146307223ac24a0b3d3502c
 AUX pdftops-1.20.gentoo 10412 SHA256 ac5fa01ca776d75bd7cef62eef9f6b0c3945ee87e8950b40ca9f9f3ff46a16c1 SHA512 ee6179e862ef3561412a246e755a8c4379ca1afca3885412452104e2dbc8335d745cc7a4336f806d2bcd25a466a37751b34ce6283ee5d8682f41107b9e989469 WHIRLPOOL 8ebf6a8ad25485171f3cb55dfbdea4ccf30d56f095554e27f9800e72cefd2ae00dfe58ac28ddd8b8c30ab53e1fe74f4a5451d4b313ebe48b9832bc1a11b6262d
 DIST cups-1.6.2-source.tar.bz2 8363773 SHA256 37a3ebd305e76cfd4c9c53013e89c0f7a4dcb04b2e9da61029a29faa57e0f10d SHA512 08b7ae95af9c19a1bb72f851b801d55a51360a4c2993c34878d18a605bf1d9381eada5a8f51653c4467738f0509bb8ad713b79e78c8d2a80f1aa86f1d2196038 WHIRLPOOL 527f4eb1016ac20e737cb5171c8cb4c71295e36da8704dd97c8d405c1cf31a8861cab4dc1b2c8a37e21f83672b5212bf8ffbf7568bd118e8056aa777d0caa1ba
 DIST cups-1.6.4-source.tar.bz2 8262021 SHA256 b910c3e43b2d06f54154d12710e849455d0710c9983dab0a5f49a5e93b1b7e73 SHA512 b150b5915a6ab433546e14024c673372fba04623accc10c637742c83342d73bfb91b9bfbb2e3e6a64a4cc189449ae811eb4a721a994ed42e1a9c489a166f2719 WHIRLPOOL 4152b1b2699af91831f21f308e9836f66649bf6ccaeb03b7fe2fef7017ecaa0907dce5adf7eb7c37af0e6dd10de53f295b29cad52dad38fe1a8c141525b87541
 DIST cups-1.7.0-source.tar.bz2 8421353 SHA256 cf15b8caa9dab4638b628427ef309ab381817fc574b8e736d58680e0475cb2c8 SHA512 764b0fdf9a2d6d1b0be1990f8144ede7cae22a78502776f342fd76ff292ad9ba02dfbcecca5a2c1bf8bfb9597d227bdc953b790ad4eb8380ddcb2c63e4bda915 WHIRLPOOL 78ec4fa7db588ae73e0a8151d78884840c0419b8828c908a6383e259d7d0aec6e5967e7887b03e8ba6317a5572ab9f9feab947ac8f4884f1d51db7049c68da8a
+DIST cups-1.7.1-source.tar.bz2 8738002 SHA256 f52bec893d9daf92b6029be79c07e6c516b4c85ffae3e6e01885cc85e9081681 SHA512 e52f98f00e8b2c0eb7a8b29a8ed5e33b14b1a68a18f3f4558e473d8146c2dfd659c9a96ae07257c456d7a34dcc7bcabf858dcf719e8557173c8849d734711e57 WHIRLPOOL b715560357b22d0cc5887059137b79132e1f46a9adc76410d3ad2e8a1a16047fd2179372632f544b1d798a03a3d41410071f09d2ed82aeda66afe789c080cb04
 EBUILD cups-1.6.2-r5.ebuild 8950 SHA256 62b61bdb510ed6be19602a1be3a5f7f38de0930706076eaaab13d534b77538b0 SHA512 82896c9597e929ce23b0abbf1b093f981fc00896f663b129de34a403548a9eb9b2ef6f11c55840dc154719e44676ade9b2c265f35218e7f105a49115fe486ff5 WHIRLPOOL 834ebf4dab854b84bd90ed749a2d0f0af8a5d9425f3f9afd77f0538784830258c1e02af8592fcb43767e46d6587d30171edab99f65b3644827277a8cca422f3c
 EBUILD cups-1.6.4.ebuild 9037 SHA256 6bc57c839899ba182130d6953c55e9166a54ff9bcd3ff3c67872755cf3e30b94 SHA512 e5ba57a582bb84bdf2e4068e65e07e9fa83788452784fe876abcbf4fc382de163045d815c566e95c438812ad4391e256eb215b17208fb14e0baa5d0f81521f56 WHIRLPOOL 21723af98511fd808c2c9b53b4790ad5c6a77f766a46bd19d4a572ad0f73710ee29414a7de76faa761657e86059ffc57fbb6922f7a7f97b4a485ead97c49e013
-EBUILD cups-1.6.9999.ebuild 9098 SHA256 b1a840074d6cbae0b1c5e0bc3002f80651181641aac011b48e4a5d9dfdc2f00b SHA512 be8f749a411fd12e0698a72c8345d05b6b8e27b9d84e8de8295574b06c0ccc52d9ebcd811da3a70e4be89381efe7164381d01ad9ed4645dfcb754a3e9c6bf6ba WHIRLPOOL 0e66ee6a43f305b91c0ea5fe0dee260cbfb2b3f09d67ce0c4dfab377f12cb6a1d017b29df38d977493b0536b3276c43ec4c5f68c3d7fe599702652c2577b139a
 EBUILD cups-1.7.0-r1.ebuild 9056 SHA256 300074d4c67084036fd2ee1d3b559a9edbe308691991121a3301c28d8e7d8bf6 SHA512 7314c8c42f0111fee15b18a8ed82314fc93fb724c66d82bfaf261308f35e5cc6d5942cbd8677b25932016a00720472bb8f498146122fe4f2ae72e03392766b70 WHIRLPOOL 55026c2d63dd8ef45f63f2cd31cbb1259d3e1fc5e7c0aaeecb0dbacf2b6e27f5e2b25342fbad575f016e11b10095f137561bf177704989df1d697fb17be6dd94
-EBUILD cups-1.7.0.ebuild 9103 SHA256 9d887f3e844dae6004c43404178ae7349346c1e6df6fc4106063956644e25a02 SHA512 23786e8694b4c152ce910acf6ea8f37fe59fd862b3b40dc9182b101409fac87515cf2a5f6f903bbfe99056d7ccd058ee8e86f4102009ad398e9ee327d0948e92 WHIRLPOOL a5f5a7912a0d5fdadd7e95aa86e0e18fe4ceff73823e2819f6bb6dd76af77597ecf698b55396ee74d4e6b4e0767b244562cf878c94d407998f77f3960f720fcd
-EBUILD cups-9999.ebuild 9053 SHA256 246650fb2053d82badd63a94a704a3f7aab255740e052cc431feab0efd27d13b SHA512 37a9ca3412390c1997e6ea6dd3287a5f9431d1f18080557fccb19c1a4a25420e97ea90a1042a0725e04894f2d7c47ea90bb71eca9281d778676474d0dac3001e WHIRLPOOL 992d31ef7c334467c6ae6b6443c9ad0a64f7fd980778622766ecc7fc757bab58b6f94d985db4f0cb9d2e9bb92de6447073c75bf55b7e3765bc3b37e0e1977ca6
-MISC ChangeLog 87966 SHA256 3ccd170848b81d8cb1ced9baad65bd7d0115837445c305240e5fba20aefcdbf6 SHA512 4d06bbbd2df05432ec048fca3aa7db048b4e94b37aec258ab61946c5d2b73ec1524af263b153d50fe342d3c426be80c71dc14eb519fb9fe78e010e76f381d3c3 WHIRLPOOL 9afbb99b048a5d70d9257c9abd4c009cea46d6e6e51868c4163e071c526684a31ad18a8342adf618035631d4a5c31df7efc5bc6fb883075c43ea6bb3a9ee3e5a
+EBUILD cups-1.7.1.ebuild 9125 SHA256 578c0a9c27f0128673bdc6fbfa58b545811a0653dd3f07fb0fdbbad33cf50881 SHA512 970c209b2d8663b6cebfb469efa3624e519395211d9abb4cbb984b58fbb13b1ea65ac0406fcc94529ccbdea8ca52dcc898a5b56e66c228191f742e7a133bf987 WHIRLPOOL fbfa57c92b126ccdb90b1b7bfef13c33626bb3b72f4d006cf73106afbf73369d5c74640b07898326b73febfedb10553fd997c2488b8131832d21005d82eeacfa
+EBUILD cups-9999.ebuild 9125 SHA256 7ab665ec0c76899bc8807316131baf6b620dc3512398a55bce6e95e85da1b8be SHA512 42ab847adf4b35c412fa0b03f8e3384661fcf5f60b96192517bd93f9724f5671ee633d25d3ac870f51bc857cad3d6dc96811b81f91f249c9401484e90e906e72 WHIRLPOOL 81129cbf9891058ef207284e6f7d4f225478a9d2da5e45a1746907d3709c5fca9f6b19ecbc025c8f9399a0a854e46182235735406b6c405240717757099042a0
+MISC ChangeLog 88186 SHA256 557ab3f1df6eda0e9b46d5df9cbf8cf7691b30d7067a2d4b71d54bfe2e9ea32c SHA512 de9466e996b1e3ea273328895a71c00ca3877c301c4062004c65e6e08462b7bcadbb93e6a3843f9aeaa014c8be142fbd6eb7e03113dee2813a50f3d2d7881c2c WHIRLPOOL b96c10a0e8d3c896885af88480600288cac7cd7a8e00d2e73813afd09c663070a55e2bfa042785950c481ed75e473af8671e48a2bae7463c869d746d3cf6b6d6
 MISC metadata.xml 601 SHA256 9bcf6942c89c7dd963f9a34c413c1da17e25cd36489b95b708d4a89ff9659ea8 SHA512 58f0fe7d1f7b66a637013eeddb26a5c409d46915c8f4220e54850cf17cfa0cb082b3c2c5055a660857729cb4c5a53c7ac229dab6a29f801e53dae0ddc94cb573 WHIRLPOOL 55660efe3345c304742dbb12947776a97ebec51354fbab55423dd1fa7efa1b3d9321f067dfcc469462911e12446892b223ebbd3b670d1126255ffe642a64a527
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSxGn4AAoJEJS/30SErRQvkKoP/RWmbCqnJvXiLkaeAk2xbat2
-iKr8XB75m9nZu+4QRgQsjPQQSk+nKy5A8OL+JiNQdmVb/bNs8jTcNT2jsRgly3c8
-DapnIBZj5bxnylZvGgQQ4or+LrDIo7W8HprczhmZZUd8x7Ko6GEELSHZUbMUsAFt
-ZfDEO86uN5GEW1t+YWPNY2H5Y/AihOdRJHZMPYZ1cVqrVod+yMIVgtfrC96K7QLr
-Op81ah8XUlFisiXMovSdTxMBQnDwn7lBrZfN751e5ktqvqgFXul/p8jiG6zscwp+
-owXRjyQ6fzoHMSu/xYwVx/PFCA5FP2MUURwl8ZXuD7jnbd9dF8NDK716/Fqr8MQw
-tFw3slr44TMXE/VnMS/mLjeG5YNE18kkwKTELGKL2DY29kxq+B6pGA6CLxbo5q+j
-LmmQMP4HVNz50WjxmEE3UiblR0BRbVACxFVOH2Cw0zFDhI2CXSAQnX25KBJ6RBgJ
-4tDDIGzazQoUN5wG9mSwfG7FK4rk3A3t0f7CIIpTadzI4ClBPVPEMZ/fnY2ot0XY
-Jj78EIsHwPGlifAHOltCyERbgEJtQ+86XYFK2iOKcG+RLAT1U39a5zxSh5kx5c7F
-6J5yTJ8K5nNPstDtdFHhZQuv7HNYRDZ9+hMYtDm6z11rHxqb75lh7QdMZat9f8kg
-UP3TiqDACHqQRnk/efYI
-=cZpx
+iQJ8BAEBCABmBQJS0tQcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcZW4QAJp/7NLeUfQdSfXcjn2GGwX8
+yDDw26Wp8/f0xyU8tbm8GRncyC2Qjhr9hcPryWhCT6qMHHXbkinNOLtvOpjIhA8K
+zCJyNyzOYapNRDgk9Cmneuien42Xao0kOKgUWyisi6hWOy8HgACCZhLXSovEUyJI
+DtOLcuIjSec4Hnu04cKhMyYVPjDJWIHv0A7j9vVeB4wQ7mpzjXx/s4g+MhmHbgbR
++BuBUky1WgkkgiF13uJNkXJo9lLmjxnHV70gSkMCaID0z9lvnffPU8NR0cKtCNEj
+MXDeck0TNSf+0OkRZNcglTcDOSXoS0JStnAB0PjzOjWC/Z0fim2XKnDpVyOiCsii
+pqzT191JsIzEGBNzS8mYW8iawfk0mwLrzPEvX+dElhpOLHaDV8iPnxeid2U3T3D7
+UtiLWorGaLCe9XV1b84KCvM+/4PfS6QLuvW8DQ0QGYRNC6+04RKIYLKscOzqVAQa
+vf4w356qeTSXjeso0httrPYElUUqU4V5KuHIlGEkhTlVnIGb7FiXtMw1Feq62GAI
+OVOeHT05TIqOQdizdP0wEVwfg4Up4N1HkAt9WOzYZkpjLtLXNrc0T7zp/cL6CEJh
+8L1qm/fiX/rQ5IeKoDn0l2AH1PfxQCq0YIEc8WPLZwia4n77TJrjkx0LItt0iZJ8
+Z9v2Txc/NBRTYCwSgLaP
+=1KP8
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.6.9999.ebuild b/net-print/cups/cups-1.6.9999.ebuild
deleted file mode 100644
index ed553674b515..000000000000
--- a/net-print/cups/cups-1.6.9999.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.9999.ebuild,v 1.6 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.0.ebuild b/net-print/cups/cups-1.7.1.ebuild
index a6e11a6bdde1..3969e6cdb041 100644
--- a/net-print/cups/cups-1.7.0.ebuild
+++ b/net-print/cups/cups-1.7.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.7.0.ebuild,v 1.1 2013/10/30 21:48:47 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.1.ebuild,v 1.1 2014/01/12 17:41:28 dilfridge Exp $
 
 EAPI=5
 
@@ -31,7 +31,7 @@ HOMEPAGE="http://www.cups.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="acl dbus debug +filters gnutls java kerberos lprng-compat pam
+IUSE="acl dbus debug gnutls java kerberos lprng-compat pam
 	python selinux +ssl static-libs +threads usb X xinetd zeroconf"
 
 LANGS="ca es fr it ja ru"
@@ -74,8 +74,7 @@ DEPEND="${RDEPEND}
 PDEPEND="
 	app-text/ghostscript-gpl[cups]
 	app-text/poppler[utils]
-	>=net-print/cups-filters-1.0.30
-	filters? ( net-print/foomatic-filters )
+	>=net-print/cups-filters-1.0.43
 "
 
 REQUIRED_USE="gnutls? ( ssl )
@@ -241,8 +240,7 @@ src_install() {
 	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
+		/var/log/cups /var/spool/cups/tmp
 
 	keepdir /etc/cups/{interfaces,ppd,ssl}
 
@@ -255,6 +253,10 @@ src_install() {
 	rm -r "${ED}"/usr/share/cups/banners || die
 	rm -r "${ED}"/usr/share/cups/data/testprint || die
 
+	# the following are created by the init script
+	rm -r "${ED}"/var/cache/cups || die
+	rm -r "${ED}"/run || 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}
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index 246580a57eba..3f4ba8f2be5c 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.46 2013/12/29 18:18:32 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.47 2014/01/12 17:41:28 dilfridge Exp $
 
 EAPI=5
 
@@ -240,8 +240,7 @@ src_install() {
 	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
+		/var/log/cups /var/spool/cups/tmp
 
 	keepdir /etc/cups/{interfaces,ppd,ssl}
 
@@ -254,6 +253,10 @@ src_install() {
 	rm -r "${ED}"/usr/share/cups/banners || die
 	rm -r "${ED}"/usr/share/cups/data/testprint || die
 
+	# the following are created by the init script
+	rm -r "${ED}"/var/cache/cups || die
+	rm -r "${ED}"/run || 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}
diff --git a/net-print/cups/files/cupsd.init.d-r1 b/net-print/cups/files/cupsd.init.d-r1
index 99f617498823..2f2e9e2df192 100644
--- a/net-print/cups/files/cupsd.init.d-r1
+++ b/net-print/cups/files/cupsd.init.d-r1
@@ -9,8 +9,12 @@ depend() {
 
 start() {
 	ebegin "Starting cupsd"
+
+	checkpath -q -d -m 0775 -o root:lp /var/cache/cups
+	checkpath -q -d -m 0775 -o root:lp /var/cache/cups/rss
 	checkpath -q -d -m 0755 -o root:lp /run/cups
 	checkpath -q -d -m 0511 -o lp:lpadmin /run/cups/certs
+
 	start-stop-daemon --start --quiet --exec /usr/sbin/cupsd
 	eend $?
 }