Backport for bug 507696

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

6 files changed, 377 insertions, 22 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 1ca0ad5c9e10..0bce92e3f60f 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,12 @@
 # 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.600 2014/04/15 21:05:29 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.601 2014/04/15 21:26:13 dilfridge Exp $
+
+*cups-1.7.1-r1 (15 Apr 2014)
+
+  15 Apr 2014; Andreas K. Huettel <dilfridge@gentoo.org> +cups-1.7.1-r1.ebuild,
+  cups-1.7.2.ebuild, cups-9999.ebuild, +files/cups-1.7.1-str4356.patch:
+  Backport for bug 507696
 
   15 Apr 2014; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.7.2.ebuild,
   cups-9999.ebuild:
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 1baf6aa7c1fe..b4e71e588a43 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -5,31 +5,33 @@ 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.7.1-str4356.patch 502 SHA256 8f21ec8acecf6c8ea3331b53c72b2351fe96f6353862d7ae9285d24daf3c94d7 SHA512 55a181a7adba15a40023270f030d0a9222832a1cd5e3e3693100191e9a88af7915cc6f2929f003a6adf26a32748a6b8169707d675cd679b8b8c297f3640498c2 WHIRLPOOL 87a052a1f5bf078b897145435965ec1411d282fcbc5e58793a9bc2067833b261c9b273d8bc41697cccf725fcbcb169031e664846225877ec50557ef218bb97f8
 AUX cups-1.7.2-systemd-socket-2.patch 11799 SHA256 aec7a98202143e26384fc46baa434f9da022b97793413c95bc1b3765449aceef SHA512 f551e6e1917303ce3e2206284f396885a9aa15bfdee6fdcd88182279cd52a26fc92f5e529b8b30edb0c58dbc749440d23515fa1246959875f525fb5e6b08d466 WHIRLPOOL 063253ffc641c1fd35d929f65c3e42374d5223afc106c2a2f2f0098d5115788573eeaad8fb2c53efe90334ef7a1605d164b1741189c8f8b77e7788097aa76923
 AUX cupsd.init.d-r1 504 SHA256 4705b68372090ee7db69da1ad35131551ed1ba99032db2486ff6c31d2170ce6b SHA512 9eac4fc725b14615bb31c96a69c00a14ab2fb23fa355f1ced655f93e6364555b2710a277ceab439199a275405b016492b4c9183fab755c02354013e0904a03bc WHIRLPOOL e0ce34f4b73de6e63ba1f01b0df543cd66fecc692af8254acb3dd1147c0cd4e1f42ed7df4b18b26af0114db54c3b8c1bca526ed54146307223ac24a0b3d3502c
 DIST cups-1.7.1-source.tar.bz2 8738002 SHA256 f52bec893d9daf92b6029be79c07e6c516b4c85ffae3e6e01885cc85e9081681 SHA512 e52f98f00e8b2c0eb7a8b29a8ed5e33b14b1a68a18f3f4558e473d8146c2dfd659c9a96ae07257c456d7a34dcc7bcabf858dcf719e8557173c8849d734711e57 WHIRLPOOL b715560357b22d0cc5887059137b79132e1f46a9adc76410d3ad2e8a1a16047fd2179372632f544b1d798a03a3d41410071f09d2ed82aeda66afe789c080cb04
 DIST cups-1.7.2-source.tar.bz2 8754601 SHA256 315cdff436924c4efe04cb110b145fb1a6e038e2eed8445359052f86e9e95676 SHA512 441256bdfbe4a720244143d229f12e0a3e2e27e6298baee3ddca9f7f6bd3e3c2818136c90a110bebbbf9b034a48f8bd1af06788c25258e61aa3bc524e492a912 WHIRLPOOL b3c977275a89c6c8b2773bddf615168bcc6f2379bf49f991e0141eb5db482035e0e611d22d6c99351dc1e41e003470322dedabcc37244289c237671bae5f792c
+EBUILD cups-1.7.1-r1.ebuild 9346 SHA256 28d16e995d23cbdb4ee96fcd6143e0e26ce2ead0ef4473083887282ae1107e34 SHA512 8c15018bcf5f23813898e00c52d7d20e297d0d2fb08be7f0853b691447254b1b452c6fa7d8f8b166da0ba046b806116661ac4031ee744f109a38ce650fbfedf2 WHIRLPOOL 99cd03b3412dc38a7b1b9c90503ce147b65ce5e8f9ba73129e9e84a20846fab12973d512f33b421f35375c88ad15d2e157a46f417f094c8d6e3c87c1ca440f82
 EBUILD cups-1.7.1.ebuild 9236 SHA256 aa03e3d61ee332799dace86f969c82ba68a76ec9aff2f39d7b67c198f1e21b94 SHA512 e9fbe6287cac20d06b4278e99013fba7bf15f1e7f23f037115373f4193320faf5fe96e86338bb181a9f084606c757f30a711754bc3df746bb27f07fb79a0aa15 WHIRLPOOL 46353815cc0df8ffcd0d9eb1b0026ee0db234bb74f81d5195caebbd8241004a768b154e38e09d918a75c7875f1e69756165c2cf6218e4a7b59d19941385cad54
-EBUILD cups-1.7.2.ebuild 9317 SHA256 ab7ddd09a89ac9acc0774e603289b85caf1ba1088b221585a26ae39d5dabaeef SHA512 7776c1fcfc17d7ffe87f6d137fe26f45af68b192799d0c49386dff6c854ae470f6b9f9bf2b27b5e3e8dff450e4fc0487b83b2b950ce8bfd839a1b999bb6ce088 WHIRLPOOL 891a9988dd5f1be6bb9b3886e685c9b122eb553625d91fabf898cfa2aefb50a9d51cae0bf49f1bf5980964f94d1facd69abb043aae91e9dd2e2065cfaf91dbc9
-EBUILD cups-9999.ebuild 9303 SHA256 7f49a77d5689cf50891a9c74b4d0c9ffcdc1125f99e453a48590b50af96e59d3 SHA512 73ef8e4d4db293233c8b1a114856f2cb8c518a4672662a5706d91b0417bfeab923fe74e57cbe6aab9fb3a4a9d52f91d988663c72e72f482ae7de24bf5e2174c4 WHIRLPOOL 568391cdd7e62775cfdd08e4e12afa1a8e6dd4234786539e3007577cddc9209b1cfa6e87ddb3ee645ff067e3d4187baacbf3e3eaea85efa55313b65c18b206b5
-MISC ChangeLog 91140 SHA256 cfb45487d9f2cd2f464214b323be65406600b9dc827be53f7329c3b662811ef2 SHA512 76af33a020d4983701d166e87bcdd7ad7a0c6e929610be872d1b8c6ed43608fe2f0e6e6dc71dff92f97ae4b63d235e941020896941f98f8eb2a1dfc7977cbc4e WHIRLPOOL 867a170049c87793a60986e1cc157f44549cfa6c35d5db87a387c7ce0cb3c9b66125a47f421e49cc85ce27ba0026bb7d09cdc579963a6e58f9c0662168eab2ed
+EBUILD cups-1.7.2.ebuild 9316 SHA256 45fe7e8a5a85e239d22dff7fcc9aaeb03872722093c05d57f25ddb05b3f32b4c SHA512 8dcba2b955614693a04b8fd452732c084fc7f548ec0349f6694f6d2b1d535407242565e826d2c93675f9431ddf3d13bdef29b71c36c5e0582d8f007916df3b55 WHIRLPOOL 8cbeba452f75000c7760bfda0ae9521552d62890b2ef62d279b3e2ac4e8067d346137de5982447b4d03f49f23f620f9fab640712f67cdfb2e8fa05925a1500dd
+EBUILD cups-9999.ebuild 9302 SHA256 c16fca09ff01ead9370aee37b7d8050c2ce653e6eae12b72c09759b5737d40a2 SHA512 5d9cedcdfcec299ebfeef457fc04a69e7dd9134886f143f5922cd374556cab047c64990910f5d6ce10c97c090279c790a7d2f1c24116dce6557d303f4c68e906 WHIRLPOOL f6aaccb1481f6cb35796f053b6fe3a39a3254abb2250e7606e1d7a80337dcdedb1927823e225ba41422adf945c1ecb7dc6628d466931487ae9b106cf0e56c405
+MISC ChangeLog 91349 SHA256 93e7d7bb98083640ade3ad5e35ad1063c72c8fbf66ad2973f4615bfce92dc994 SHA512 29b4a9c6ee1a85dc529738d07b3ef03ca30d5277dfdfdeca4105cda8caf754098b392d65081c6a05ed5a2ea4c67afd245c052e49ed973c126f41a486dd3eff51 WHIRLPOOL 99dc596f44637c09b97636a1fe26b23fec3482bae39a41e4e783a4efd6c2c391e382f874c611469e293819364838f71e4b86d22764223813908eff69c6bac709
 MISC metadata.xml 496 SHA256 732bba7ee060b7be5e0b23d06d24c12c2bfc1c6be1440cdfebe6d5d94d145c47 SHA512 713300abb461ad923c4f6e59326fa97b2372181df4ef82bf04dd6f2d68dc0eb7c34e518cbb40ebd535cb9c4bf52d2648512002cc2cb55c6f21406cc973fa4496 WHIRLPOOL 061013ee6ddaf510964589024e39c4a05f18f0a6d2488eb5b121bb962a378348e71261f7e153f34dbb33337a2e49eb7da94e52d0cb7a128d71e9b4466f8a5933
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTTZ8aXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTTaP2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOc2xMQAMJjLR82EJAEk5BZXg1Dg8HY
-P5FExMMVvsPpRi4it0FHTTFlAbIHZTgZj3+4zjfTr4d2/ZldMISPEBV2FH1cTZHZ
-5Nd4k9qBua9B1FCGXwz5Wy1orefq3WL3OMoOGmMeDMjT3HGnAE5i92yOxua1HXi4
-caeVyEFdt4kANrRu79PAlP5QMWPbmRvXM8gltzNBXvE2hUesp7/WPPOt9sRnHqBK
-8PAm5fUXDYksDg+7WmVF6dks+glX0fDr6YFSJfP/LF1aXD7U3T/oG7KBNb6UEjRU
-nqSR4VYRaWOgtwNMBygkypQCk8U0DYARiLOwHYFq4WrIgj8i/fVsT8Bd8d5Tp14B
-l6w1ZrEa0XQCfcmUDYdAbfiwH+zQOOJwGqg8gNJTKdW6gkHsJW8i1/ljVOAaW0Sg
-bXqIM5zN85W+uLUzeKNiPGtNc9+spvmEMdvRJ39hZAz6HCOiixA+na80IsTva3nc
-K1ToBhFXyyGoSkUMbrS+EhwMjXNinciNCn/NHQun1GygZYpvTHMtFRQeHCXrtpQd
-40OjQZuV26cgyd0Osj3iTaF4h6+MDiJHKmpy4WfIQ0P5Wc2elhJK4uGOQfJIRfm1
-RKp1u0vl+rN/5zvPOC19OmBoYisvaJOyZEXxR10B6Had8lTvldWER2LPLyOf7fRq
-tXzwlPumgBp2SuFn96kz
-=/5oC
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOc970P/0AL49TANNy2i3aJ4icvLTf1
+ABYHuNIC8EoQWLRICXSEen1fDnztgR2HvVEs39xulX6T3fA4svL7FltaZBhFfK69
+W5ebVeZDCrEDXx3Q/Se1VYlbwwG3F+h9OdoOJWpSSJRk9syLz0Tfe45LqwP8jflu
+B07kFNbHDwe1OlMdpF/rqqjgKFAwt3YHQjyvKvLX6Apz0edU9lHCJhe2YABsXcur
+Mn0W/5S1fL4sXo1S+aAcSu6zwB12OkDmElNPvB4QpILD4UU0IsuW1ThjNLwAJ0wF
+zcemUqK8nAap72lgxeYsVB8iTD5Shee6zy+lGgn3WoK1yL5OHNi/PF8Us4DH2N7a
+nZTWsKCT6ZY/q5EFe2M+rRmFXRv+oXCoS0oIt6Tag5T0hCq+JlnMQzP4pI5jsVJr
+YeJXAhyBWCStJnYVdPF/kEzMpa36+P+FKtsPPBKwgOmsnDwPpsfFB0bTqBfSS/c+
+2Ua02OmW26gJGYsM8JDdv99xJENTPEvLUGiUD+zEsq1l1Io8hEcBxxVaUGgEfEL+
+hPzzI6khXnvivdifrj9QS1BlXWqggQxpW7p0mXl8DTFXfEjSN+t5kVNUZwrTKPiy
+jHw7VLOWgASO8wXQpM+6eD6lVrP4KGsc8VmyBCvCMxNCc3/LwibrpfYNOSPKV5r+
+/eh4DiroSMfgLKkX94pg
+=iN66
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.7.1-r1.ebuild b/net-print/cups/cups-1.7.1-r1.ebuild
new file mode 100644
index 000000000000..08dd40be2329
--- /dev/null
+++ b/net-print/cups/cups-1.7.1-r1.ebuild
@@ -0,0 +1,328 @@
+# 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.1-r1.ebuild,v 1.1 2014/04/15 21:26:13 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 \
+	toolchain-funcs
+
+MY_P=${P/_rc/rc}
+MY_P=${MY_P/_beta/b}
+MY_PV=${PV/_rc/rc}
+MY_PV=${MY_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 ~m68k-mint"
+fi
+
+DESCRIPTION="The Common Unix Printing System"
+HOMEPAGE="http://www.cups.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="acl dbus debug gnutls java kerberos lprng-compat pam
+	python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
+
+LANGS="ca es fr it 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:0
+			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.43
+"
+
+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.7.1-str4356.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
+	use systemd && epatch "${FILESDIR}/${PN}-1.5.0-systemd-socket-2.patch"
+
+	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
+
+	if tc-is-static-only; then
+		myconf+="
+			--disable-shared
+		"
+	fi
+
+	if use systemd; then
+		myconf+="
+			--with-systemdsystemunitdir="$(systemd_get_unitdir)"
+		"
+	fi
+
+	econf \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--localstatedir="${EPREFIX}"/var \
+		--with-rundir="${EPREFIX}"/run/cups \
+		--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 \
+		${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/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 ${EPREFIX}/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
+
+	# 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}
+		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.2.ebuild b/net-print/cups/cups-1.7.2.ebuild
index 5ae3ac3fe1dc..43fbdfaecb83 100644
--- a/net-print/cups/cups-1.7.2.ebuild
+++ b/net-print/cups/cups-1.7.2.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-1.7.2.ebuild,v 1.2 2014/04/15 21:05:29 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.2.ebuild,v 1.3 2014/04/15 21:26:13 dilfridge Exp $
 
 EAPI=5
 
@@ -173,7 +173,7 @@ src_configure() {
 		"
 	fi
 
-	if use systemd; then 
+	if use systemd; then
 		myconf+="
 			--with-systemdsystemunitdir="$(systemd_get_unitdir)"
 		"
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index 7330a68609d5..9ffd45a82703 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.53 2014/04/15 21:05:29 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.54 2014/04/15 21:26:13 dilfridge Exp $
 
 EAPI=5
 
@@ -172,7 +172,7 @@ src_configure() {
 		"
 	fi
 
-	if use systemd; then 
+	if use systemd; then
 		myconf+="
 			--with-systemdsystemunitdir="$(systemd_get_unitdir)"
 		"
diff --git a/net-print/cups/files/cups-1.7.1-str4356.patch b/net-print/cups/files/cups-1.7.1-str4356.patch
new file mode 100644
index 000000000000..6a1c8c473115
--- /dev/null
+++ b/net-print/cups/files/cups-1.7.1-str4356.patch
@@ -0,0 +1,19 @@
+Index: scheduler/client.c
+===================================================================
+--- scheduler/client.c	(revision 11597)
++++ scheduler/client.c	(working copy)
+@@ -3316,6 +3316,14 @@
+     return (0);
+ 
+  /*
++  * Check for "<" or quotes in the path and reject since this is probably
++  * someone trying to inject HTML...
++  */
++
++  if (strchr(path, '<') != NULL || strchr(path, '\"') != NULL || strchr(path, '\'') != NULL)
++    return (0);
++
++ /*
+   * Check for "/.." in the path...
+   */
+