Version bump, remove old; fixes also bug 511994

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

6 files changed, 85 insertions, 355 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 5c4cd0f0145f..84a1ffe8cb54 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.614 2014/06/02 15:03:36 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.615 2014/06/06 22:29:48 dilfridge Exp $
+
+*cups-1.7.3 (06 Jun 2014)
+
+  06 Jun 2014; Andreas K. Huettel <dilfridge@gentoo.org> -cups-1.7.2.ebuild,
+  -cups-1.7.2-r1.ebuild, +cups-1.7.3.ebuild, cups-9999.ebuild,
+  +files/cups-1.7.3-noavahi.patch:
+  Version bump, remove old; fixes also bug 511994
 
   02 Jun 2014; Michał Górny <mgorny@gentoo.org> cups-1.7.1-r2.ebuild,
   cups-1.7.2-r1.ebuild, cups-9999.ebuild:
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 30c8aae961c3..380c292abc5b 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -7,32 +7,32 @@ AUX cups-1.6.0-dont-compress-manpages.patch 435 SHA256 d3e41e8d4a841ac71e5ed8598
 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 cups-1.7.3-noavahi.patch 1400 SHA256 63e1e2b2cf7c86eef9d39553873b157d66800d5dc50542c3261f620e18df7002 SHA512 649eb6ff2c21c8a69dc67d90ca4d9d522e75f0b91c1842c726e17e1d59ba68cfc7443840ca925f3eaebf36d507ccc976b2a9fc2955f93a8d4ef1ff66683d4db6 WHIRLPOOL 8f22c27dcec26a1c3fce992ca4f129de7ffaedb1d276eaa5c3bc5c09d7f1ffe5fd2c0b514a4431edfb84d98d4ff646a1ecc723a789d8e1a50f8641007add6d7f
 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
+DIST cups-1.7.3-source.tar.bz2 8792641 SHA256 fa989f856d1499169dc442fb2311053ea42fe455ca2721693ba5a9fe4b333e31 SHA512 78e5275682322a52c5e10d87c106059900595c4fd167924bece30d32b646c304ecc0f5051c53cb983b75d5a5ab76fd5b81931fb6f191b9e936f2528ca869798e WHIRLPOOL e988fe293c709f43313f37477eb35990b47d2eb0eb1d141b52ec0fa2e39b0b90021d4fb4916a286f0da811b3e092afff2978a812d470d083f19c6bd2acd716dc
 EBUILD cups-1.7.1-r1.ebuild 9367 SHA256 c53c059d2b73d4daf6c55e3d152bcc4d8a7956f8f95673bd3974af8119bf6e9c SHA512 f4410d2923ed7cd0a64db20eee1b73a5c1103b0425f02959a0c7aa36d2201d1b9846f0afea7d12a3169c42df9a292510eafb675672989187eede14032a01ac98 WHIRLPOOL 142be888cad5bfae60c4075fe9f04093b0408ea8b28c9b355b6a9ed87c1cd3a847d7af1a6a4e40dabcbb0f0ac71276b643c783f714910d158d2e67c6cd573c1e
 EBUILD cups-1.7.1-r2.ebuild 10384 SHA256 5f05159ae44f4c753ab26e24d14d5c7edd7714284f975ea94c3a5c9e962d2153 SHA512 c36ea73d2eb393c3ec63a7dea96b8a8c6ead92810a26a7839e207b3b5f1d16a312da433a7cfdced1dafce52f3b74f8a1152fe8add8a79873fa0961d618b859ae WHIRLPOOL c5e3ea89d2b05b6746325d0eed34fa4f3b6498fa0069e19e29a0f51ba24d7699bdca7e76f07883ccda6e66c543d2aa3d1e8e0d6eaad6355c128f733f906b675f
-EBUILD cups-1.7.2-r1.ebuild 10322 SHA256 cd8a55421d2ce001f88a9fa6904f19eb2e09ba01a0849dda0c7a517b7d2e3cc8 SHA512 df9a61f3458dbaea53a5701b634ed18f052a3a8029d5b0011b64400c5debbc40c357db34d4a86d4b18aa5de1c0be752e9e180554b489416f89a23bbef38e41e8 WHIRLPOOL 4413804e1b6aff81f726c7b64523d954ff1996f0034c3de6e1f12517abfb73de3de12592c185487ccad55e43d53391e9c0ae86915370eb6b8c9da352d5d4e445
-EBUILD cups-1.7.2.ebuild 9316 SHA256 45fe7e8a5a85e239d22dff7fcc9aaeb03872722093c05d57f25ddb05b3f32b4c SHA512 8dcba2b955614693a04b8fd452732c084fc7f548ec0349f6694f6d2b1d535407242565e826d2c93675f9431ddf3d13bdef29b71c36c5e0582d8f007916df3b55 WHIRLPOOL 8cbeba452f75000c7760bfda0ae9521552d62890b2ef62d279b3e2ac4e8067d346137de5982447b4d03f49f23f620f9fab640712f67cdfb2e8fa05925a1500dd
-EBUILD cups-9999.ebuild 10305 SHA256 7ac4536a29b9dd2c6217af7d89376dac720844ae6139197dddf30105f27d1a81 SHA512 d0c48c0a9d71f01edd402e3d427cd8fa6068f1a6117aad9b64a6f278730e4601f45dccd4f92e095c7ce5447459a0eadf7b9b7a8b38029158c58aa5e752f17d3a WHIRLPOOL 4e3684a2c1f63027cab6557c4e669f70d6ab71013a1e0de9b91781725c398bebf51cbec682c0460a6662963730280d376808e4e2cc197cd9eb69e37244dc96ac
-MISC ChangeLog 92947 SHA256 8c5f6896b32e6eb23c061281d8958d38403e720e22c11c817eb5d658673f15d1 SHA512 de5530f8d030614c69d8addbe0a803858d5798cd18ba5488cacbc56bf1835f846f6b2606f8d2b52677b6611724ad1a5645d773fd3fb4a53aa11842a31afa6dc4 WHIRLPOOL 1b8c60baa74ab590820473ea681391564ef9fb1b4defab7ed1069647ff6cc5eeea2e957545229191fd4a044df90078e90505ed1e926ae7de40d4bf2af27f8931
+EBUILD cups-1.7.3.ebuild 10355 SHA256 f1d1b44d20313469ab0f71dad75d6a6a89f6ed299dc4c12d0b209f763d3b335b SHA512 0896f59b8404b7a511e8e8cf2847baffbc47562ade8117e7f697625b2026a9a404ec12c524949be29e47dc5d85168af92841cc921d9ae3c0ebc3f63530e1f722 WHIRLPOOL a4c8588041dc97ce19991d8ca86f02869e2ab3b5ca2b94dcec3f36bd4150551c5ea6a2b6c47522eea112249e3a9373cdbcae1e8455ff0c83bae11e739980cf51
+EBUILD cups-9999.ebuild 10314 SHA256 4004c408821d80c4f713bcce26145748b085470a37fd8041b466d22884ffb448 SHA512 a6b7e4241396b334cb7fca9d833f8f1ae72df745fef664784c56a812a92ad73cfc8925eb9bbeb40a90c4d8a8c02e2a41781c1509f3f0aa2efbdbd06eb374b9f1 WHIRLPOOL 1e8aa16606382addf1ebd6439eddc3067e226dee6bc253ab934db823eae476f694f3c8bf44a793380046d597d70a8d968ab35c65a4660f707f294834d3bd60a4
+MISC ChangeLog 93203 SHA256 117f9f352867ec70a8e3f728f668b8b9e36ffb08ee63afa0ba5f1946fdc8c0a0 SHA512 8c871c704d085bd222c9f9611fe17e9ddecd41e6a2a7a41bf5ba16d3e85e090cc03657953edf9228fa1ff47e4aaec181bb3c6e10609d6bb2f228e99da1bd4229 WHIRLPOOL b909e216367d5e4b921eb691b246c94f9bf31b3f1f528b285465657b3273e814f8a003a8df81d1a0f11cd752f48b737103c840472b3f799ba1be850bde05d7da
 MISC metadata.xml 496 SHA256 732bba7ee060b7be5e0b23d06d24c12c2bfc1c6be1440cdfebe6d5d94d145c47 SHA512 713300abb461ad923c4f6e59326fa97b2372181df4ef82bf04dd6f2d68dc0eb7c34e518cbb40ebd535cb9c4bf52d2648512002cc2cb55c6f21406cc973fa4496 WHIRLPOOL 061013ee6ddaf510964589024e39c4a05f18f0a6d2488eb5b121bb962a378348e71261f7e153f34dbb33337a2e49eb7da94e52d0cb7a128d71e9b4466f8a5933
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTjJJRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOVnwP/1cHiZWTFPJ1nnTF8SPqtZ3D
-i3r630AZx4sBQbA/j/kMkqmBiof6RQ8G3g4ZxU2IAkvIBSr9Mbtk0WwCLWmeNcEv
-0PD0I/R+I/2auIw+daOc7awaLDFpeFfo8R0dQFxN3MvW9oFaiAgXEzJQM1tMH0/l
-5oTIgj/XmFRVD1iFlmJbhqiTOLb0abCEKXcFB4zmccLAOLBdgLrknoeyxlBhLfoE
-xEiRvytX0jDmXcpE0LwRHz52NgVuFYiyK3DuqBds80rs9ZpvRbKOInIjf1JalavV
-JM+98RY710dp3KjGttMirkYwKIHcmxbaScC9BjklvQEkBGfJlh07vOEYWpTEh1Lz
-TEBAzHb9WnaBIhqhX/TRItj8/ZENehb/D7mNBG+zag0kvrfLk5e4TgtT55VWJns1
-WL4eCmZIi0UlMaGDo2ehi9hDJw+tmZalizfoVGXrD0u/M4SLHA1R9Nuxei6mweka
-8FP2wwjWw4hTQQwK+pAH25M0ApB1w7q9X1tKUbAqLvNjKcbRsxV7gvaQQc9NrQKe
-PQI+BecvDL/NXD4ygoK+S4OcSczL8Gx2pk+VRQybA9U8LoOuWeWuTluSIsT+HQIB
-bScsp1hXNp1le3xxiDleKaOTqdNnl4k1xssm9AXFDQjIbmZK7SgjznAYAye14yOD
-foSXZeuTIZMe0x58oD8b
-=MzJV
+iQJ8BAEBCABmBQJTkkDjXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcxKAP/REOeLBXMI1vp0iHLhdMPEPC
+psu8ettw6vvfkwaIqTp3LtwQCfFFurgyeQfr4JMiJ3WbUEcoDjqEzuhZp489y59v
+o3K/ej0R3ctR3xbVcFZMaJhkFnK0ruDLB9gVLZl0YQFP5Zu+KlZbeyWa1eWDQXhM
+cayeHUzY8rV7W1kAKwjPYLmcIiHOyhWT2Z5bL46upV/t7yO8246pdfAM3DshzgTY
+Bn/eLB0070p8KcFi/C30ZpdzkmGwph+MWVHcCFN+drI7TUzS6nJKbIlk4bXji9+t
+tUMRe5os5yCyyDbnEoEvcD4RU7DUKIz484OZleMFWT+x+2NM4J8bNjzb5OcDsxPs
+n0LPdyy5uxByKC+oLc0l/4RliMhNv25l5PV5YdcNcqa+26wcjOh5EYkfLwhN6sVJ
+u6q5cIX5Xh/8s4ycFeuHTrUz13bA6QzXyo9EOR2Nmi+RpIUgollZ0/PnD6IES99Y
+0Zp04cs/scaVxNe8Zw2zWu/Xl2d+ZUovOA7cuQdlv+oBb9OknkjKu+taok3+oOIk
+x7zD2UDaYFRqWeftOyQPHtAkz3bG8lxQExTCZYW3ehzEEl6lG3cmJMy4KtV3aLf+
+eOm7vh1Wx2IqpdI2o8t8SnNmEeE7Wdwn2uNtYiUJ3rs5fFkZQz0/thzHlBJQxFRp
+K8Mn/7wBgDZ5FbfQqoJP
+=+chl
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.7.2.ebuild b/net-print/cups/cups-1.7.2.ebuild
deleted file mode 100644
index 43fbdfaecb83..000000000000
--- a/net-print/cups/cups-1.7.2.ebuild
+++ /dev/null
@@ -1,328 +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.7.2.ebuild,v 1.3 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"
-	KEYWORDS=""
-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"
-)
-
-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.7.2-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-r1.ebuild b/net-print/cups/cups-1.7.3.ebuild
index 4396ae060a4d..df1dd1c80ffc 100644
--- a/net-print/cups/cups-1.7.2-r1.ebuild
+++ b/net-print/cups/cups-1.7.3.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-r1.ebuild,v 1.3 2014/06/02 15:03:36 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.3.ebuild,v 1.1 2014/06/06 22:29:48 dilfridge Exp $
 
 EAPI=5
 
@@ -24,8 +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 ~m68k-mint"
-	KEYWORDS=""
+	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"
@@ -36,7 +35,7 @@ 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"
+LANGS="ca es fr it ja pt_BR ru"
 for X in ${LANGS} ; do
 	IUSE="${IUSE} +linguas_${X}"
 done
@@ -98,6 +97,7 @@ 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.3-noavahi.patch"
 )
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index 944260675484..21712cf0d567 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.57 2014/06/02 15:03:36 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.58 2014/06/06 22:29:48 dilfridge Exp $
 
 EAPI=5
 
@@ -35,7 +35,7 @@ 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"
+LANGS="ca es fr it ja pt_BR ru"
 for X in ${LANGS} ; do
 	IUSE="${IUSE} +linguas_${X}"
 done
diff --git a/net-print/cups/files/cups-1.7.3-noavahi.patch b/net-print/cups/files/cups-1.7.3-noavahi.patch
new file mode 100644
index 000000000000..8280bbd89f22
--- /dev/null
+++ b/net-print/cups/files/cups-1.7.3-noavahi.patch
@@ -0,0 +1,51 @@
+From 8441e27ce4008828cbdd25bdd6249c0019853b92 Mon Sep 17 00:00:00 2001
+From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
+Date: Fri, 9 May 2014 20:57:11 +0000
+Subject: [PATCH] CUPS did not compile when Avahi or mDNSResponder was not
+ present (STR #4402)
+
+[modified: stripped ChangeLog hunk]
+
+git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11871 a1ca3aef-8c08-0410-bb20-df032aa958be
+---
+ CHANGES-1.7.txt    | 2 ++
+ scheduler/dirsvc.c | 4 +++-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
+index 495bf1b..4e417b0 100644
+--- a/scheduler/dirsvc.c
++++ b/scheduler/dirsvc.c
+@@ -237,11 +237,13 @@ cupsdStartBrowsing(void)
+   if (BrowseLocalProtocols & BROWSE_SMB)
+     update_smb(1);
+ 
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+  /*
+   * Register the individual printers
+   */
+ 
+   dnssdRegisterAllPrinters(0);
++#endif /* HAVE_DNSSD || HAVE_AVAHI */
+ }
+ 
+ 
+@@ -255,6 +257,7 @@ cupsdStopBrowsing(void)
+   if (!Browsing || !BrowseLocalProtocols)
+     return;
+ 
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+  /*
+   * De-register the individual printers
+   */
+@@ -265,7 +268,6 @@ cupsdStopBrowsing(void)
+   * Shut down browsing sockets...
+   */
+ 
+-#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+   if ((BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDMaster)
+     dnssdStop();
+ #endif /* HAVE_DNSSD || HAVE_AVAHI */
+-- 
+2.0.0
+