Version bump

Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64

5 files changed, 359 insertions, 18 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 2788800bca29..f62eba571ce3 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.486 2012/06/02 16:57:16 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.487 2012/06/02 18:06:35 dilfridge Exp $
+
+*cups-1.5.3 (02 Jun 2012)
+
+  02 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +cups-1.5.3.ebuild,
+  +files/cups-1.5.3-fix-install-perms.patch, cups-9999.ebuild:
+  Version bump
 
 *cups-1.6_beta1 (02 Jun 2012)
 
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 0ca0faa67042..9f9d3f45b7aa 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -17,6 +17,7 @@ AUX cups-1.5.2-browsing.patch 513 RMD160 592b2a814f23beea82d61446989636a393ab34a
 AUX cups-1.5.2-linkperl.patch 724 RMD160 5e94f21ab236a88ec2026e69aed58ce17dafaa5c SHA1 8556aea40a07176b0daa184bcce1b1abe3d81c48 SHA256 48891623d98a1767c11865d59c72146aa277f1bd0abda9871ae90540676b648e
 AUX cups-1.5.2-threads.patch 730 RMD160 e021b2d2f5293fb58f24279f2550488f90dc91e5 SHA1 bc1b1a8048d36393995f056493b57f5022e6d854 SHA256 adb76ff55cd6857e7bc6c36e9cb9d63201fe14b0f853f52271b45a54ad07a710
 AUX cups-1.5.2-threads2.patch 3192 RMD160 9736e8b03458be45fd1f427d3726368e81d51539 SHA1 2d87e9fe0267f3d6192cc81d1410b5eb534af39d SHA256 07a495e49b7646bfbb0d9f12841f3db8ccd4493c69c8a626b96e913bca384f5c
+AUX cups-1.5.3-fix-install-perms.patch 989 RMD160 d1c3f9eb1b1f3444a5e1bc1ced03d6bfe0d90e8a SHA1 003ee9555f03e57ee3d7e440f5f2f7c365a2295e SHA256 784254b8d0580b1b9823c5a499052c4fc76e2cadf2c22f975b69ab8655fbc59c
 AUX cups-1.6.0-dont-compress-manpages.patch 435 RMD160 14221113caa783c63f04443580c013215660b73a SHA1 8ac8f95cf34c05a9b1bc3f8f5677f545ca71dc26 SHA256 d3e41e8d4a841ac71e5ed8598fc444a2f11b4c94215b55dcf5147694bbbc88c3
 AUX cups-1.6.0-fix-install-perms.patch 948 RMD160 ed566ab57fded47c6dd40364aae7f8ac19aa90ef SHA1 8d2cee2c103be6b9f5c2c20d1100bb347584a3d5 SHA256 4a4a885bb2e111bd67bcb90a5780f33841b18bc02382317fb5e64c384aa0c4c8
 AUX cupsd.init.d 402 RMD160 1b132354d01ad2ecebbe5238b09dfa3cb9391d43 SHA1 ea48170f3369486792ed9f98fe7d1c53487b455c SHA256 66b14dffc99900c0db04453765e5bf48cdf0c197c6f50dccf2a55dc66dd0cf95
@@ -26,29 +27,32 @@ DIST cups-1.5.2-avahi.patch.bz2 17252 RMD160 40c7165de7f23e01aa3edf3968406e69fd0
 DIST cups-1.5.2-ipp-r8950.patch.bz2 19525 RMD160 346a3141ae445dc9f17c7fbc0a467aea4910f10b SHA1 4bc3b40771261c37b63cbe4f65213b5db6c66534 SHA256 1a2d36136fc66b5f53e7cfb3e5d815e62cc3a6b4cc61d678f29d8a0bb748572a
 DIST cups-1.5.2-locales.patch.xz 313616 RMD160 2346f911910c19364fc67c67c22b4d7583efe616 SHA1 b3f2660affd00d6a505beeccfb1280275197bd49 SHA256 273f3583882533ce995a0d3380d6db1b5aedb88790def799c38a3454c84357eb
 DIST cups-1.5.2-source.tar.bz2 9595665 RMD160 98181e2ee8c6e574fb6d405f688f52c9b61a2355 SHA1 56fdb4f58e676607845321c0296c1e90e416883f SHA256 b150aa108c631f4f07e92cb13c01263a67170e5ac8383c5548ef8f8473a187fb
+DIST cups-1.5.3-avahi.patch.bz2 17298 RMD160 fb2856801c08ddd73eb2677211cc0bba3f74cc57 SHA1 2d15bd82350806a4dfbedc6b3c48da08b3a7efcb SHA256 daed1232c56ff7a3cb293c7eedbb669f3200ac36120a4d2fec09bd91631038ef
+DIST cups-1.5.3-source.tar.bz2 9580485 RMD160 3516c1a0909921c9ae6f33eed9e06c9d9c475e3f SHA1 f7c4fc7d115da20dbbb6a3a568259df6702a7caa SHA256 9d716a8ffcefdaff1c37f4a4b590f1d74ff9ff72383a18f3c883c9235907f93d
 DIST cups-1.6b1-source.tar.bz2 8144645 RMD160 2cd340359661776361cc8d91d3514b0cd0d1f96c SHA1 ef3d67a49cb4c61207f66c9d5f792f04ef65fdf4 SHA256 ab2bd150635bfd84b710c92a942cdbff98fd74702d4aba04dd720064ccaa1fa1
 EBUILD cups-1.4.8-r1.ebuild 7244 RMD160 a1c15926b837ec497fe496a7f0f9051a0de8d923 SHA1 4068757755bb1b9d7e5a7057e041238232d458c7 SHA256 36ab04f13134fdc205b2ca137473e9489fd4dfd1cd0046362d94fbeecffa920a
 EBUILD cups-1.4.8-r23.ebuild 8854 RMD160 b84a4dbe91f91f012f457d2436e44a69c1f78727 SHA1 7bf8931ed2731b5600aeb70f78dd06dbdace0dbc SHA256 901288e3a86de7a3f2d797c63e20086da01c01141f63ac4b531281c3273ee587
 EBUILD cups-1.5.2-r21.ebuild 8826 RMD160 5f18a992b36f0eabc3e644f96cbff42a2adf5228 SHA1 e3f3732d6a29b03131d878bb162abb437c1829c5 SHA256 f0c8b7b022b1989845f7cb3b7b412ffbdeff4006332d25fb9bf120b5c01c9487
 EBUILD cups-1.5.2-r4.ebuild 8331 RMD160 90cfea788dea3d15ae896fe7cb79a2d6de47b267 SHA1 e3b70a5022f02593781112cb54f15fc9d226ce69 SHA256 073f73dd2344da4affcb8bc190a40aa019a69794d35787797c5890266004cc28
+EBUILD cups-1.5.3.ebuild 8459 RMD160 abbab5ad629bcd8cc4871716e1e44453a80cc355 SHA1 5300a52b66f98495a91e6bc412003da9a297e96a SHA256 571e753f11a063792799c4a9e6950dca426a8fd02f8e75df4084ebd88e2dbdf8
 EBUILD cups-1.6_beta1.ebuild 7550 RMD160 d47fcb4acc0793c5921feed00f82f5345759d523 SHA1 a2ec889e6def9ebf0193996cf356735692003b84 SHA256 ba7e46c4f138fe0c553458cc3a80710ce12f93ff82afb764b9a3aae0335f3785
-EBUILD cups-9999.ebuild 7608 RMD160 69d76e79379944200910275670a619938d67212e SHA1 e9e7fc553933cd1725a416ca4251f4ac4358998a SHA256 ac38b9bf4b058769c07dfbc8146182bd401f7226b9a92e25de40bb1470aa0ec0
-MISC ChangeLog 74056 RMD160 3f618abf6193ecf52d77573208e330904250a74c SHA1 0b556e51f398ee5ccd2c8fd83191d3851307b5bb SHA256 09026cd52e771b74b6fa991a3b1e3d759143ddab6af92d578b2cd94a21a12509
+EBUILD cups-9999.ebuild 7627 RMD160 b41f51f94206d56908a1d1961b3405a1e59c7e3e SHA1 65dcac962a3c75c4ef3540d9417c8ce61210554c SHA256 9faa089b60b9e3e58f6660095e4837465cd068a821ed7780d880b7626bcee08b
+MISC ChangeLog 74239 RMD160 92fcd7f2b9958c56cf8d8586478b7ffbf2ae3634 SHA1 8368d38b54f8b4a3204670b986d43bc0e0b757d8 SHA256 c073d3ffe5c66cd6d0559f28ed9ab5ce21c4cf4ae64b40a0875c0f036cb165df
 MISC metadata.xml 778 RMD160 39d95458b469079b683adf4f2e79eb0b803ce0b9 SHA1 62b298bb9c5435716ce81550213ccd086ec065aa SHA256 26a8d1221a4334579f98705c38f3e3a882c223df86181dcf7968eac2118188b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPykY1AAoJENwGBM22xffePI8P/0q8sF3GvS25D1JFkDjKWTOT
-jFf5fkdHsBUMUdzGAc2ZxlDroTKaiHtZTz0/ETgQyIPfZVn0bMU7kiIrREAUPpve
-3KXeX6mrQSnOaHANkkQsrnfPmbIRpalKFzDzHr4+OyKmn3oZzLK8ZArQY8l0Dkw9
-303V7J7lHcAiW0xGoG/ufSzbrRtT3e51xqMUlvbId3G7to/IDa+sbfB1sKIydvO+
-gHhql6NbXBDJsxyWEjEpetTNyO2hRu9AHIlhN6L8eOVFzsJxBXkqCEq6TDycT4mx
-lS0ksEHqU6ATSGdzfwAcMRlNrpZRQ88r29tNIO1iMZ7R/O1R1HsOKOFgTzNCpRbi
-Njz2iWOWoUbMcyUM4lqUXtPLvuQwFIZXBuaCUF4GUbXj/MPJCusBMbRe+4hB1+C6
-Ue2wHFwnwREilLHwLRrdvGQrgw3L1bm3KDeXHkH0T0bPk2+uRc/agpKZN6brhAgn
-VhuGZXiP7zsedevV1rOuKfdyFst+uMAvvolHYEKSzYrfZAJ2aTgtmyiTCXMg6O3s
-03iY5NFQYrmhATms7sPr5btenxQhVy7llv0n2H4JjKxuSIKYRp/kHUp3eHZgj6HX
-RCN5mJ92w4BnW4nSZJiz602winKwFVzndQynpMmOGGTZLDHs8mx1olf4Nahll5TY
-A1kkZKLKVoOavk1d6Xm0
-=Tpic
+iQIcBAEBCgAGBQJPylZ1AAoJENwGBM22xffeONQQAJjCZ9ZkzsaKTy7EaxYRk7r2
+cgIm5MdDa7dB/iBVGZZhwMU/udGqi0D8X8XjsUhS9nF72xXwnmfXyebDjYa7qNjd
+vcOM3piB3c6mix7T8ChIrhAeDi6ZnbpAI6ZV8/g/8dftuYnL1dd1Nu3ftgxh2YUm
+uTLBp2w7iiopjxJEFzJ6TC1KE5wib/LihB8ozW817BH5o06GPueeL9RN7t+rTOIr
+RnpCRKdMTB1gUUMptfU+eEkMI4JA+zIbmg3MZwWyJTJRO17475ClV73ES600H2RH
+P4F67eQwbRZgzTFEbHwaELCW5MGqxmtj8KsUoOoYoGYWGESvQigt+EzAXmbV39ai
+7jsqU4V+Qei+s0W8/OAcgnhHL7ZZvgrrOML4rIEXIiZ0J9DCpkPtPBoNazu4LWAZ
+wSQRuktd0D3qajt0TesRa7Edq+vZ6L0BJN46SzGwOdmXk2hZgkD1tzjpUnfXQbch
+5aSXinx/QOxK3yUS7ua861qc9+bsUB8qyU50bkEDissC82zjKpqi0bWhAVGa9ifx
+i6byfP7smJtnGIh55bLofyrpE/R8yWEohamSWED340rQpBmWvUzIF4+I9I0OfL6H
+xgLFt+p9FvBMu4G2KVL2K72lZMJ7mbCV8gxyOgC/2q7AnCKlYuGWAx0pOdSh5QGu
+HzCNoxp1wVj+0RBEqTW+
+=s+NF
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.5.3.ebuild b/net-print/cups/cups-1.5.3.ebuild
new file mode 100644
index 000000000000..c3510842fba6
--- /dev/null
+++ b/net-print/cups/cups-1.5.3.ebuild
@@ -0,0 +1,307 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.3.ebuild,v 1.1 2012/06/02 18:06:35 dilfridge Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="python? 2:2.5"
+
+inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python user versionator java-pkg-opt-2 systemd
+
+MY_P=${P/_}
+MY_PV=${PV/_}
+
+if [[ "${PV}" != "9999" ]]; then
+	SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2
+		http://dev.gentoo.org/~dilfridge/distfiles/${P}-avahi.patch.bz2
+	"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+else
+	inherit subversion
+	ESVN_REPO_URI="http://svn.easysw.com/public/cups/trunk"
+	KEYWORDS=""
+fi
+
+DESCRIPTION="The Common Unix Printing System"
+HOMEPAGE="http://www.cups.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="acl avahi dbus debug +filters gnutls java +jpeg kerberos ldap pam perl
+	+png python slp +ssl static-libs systemd +threads +tiff usb X xinetd"
+
+LANGS="da de es eu fi fr hu id it ja ko nl no pl pt pt_BR ru sv zh zh_TW"
+for X in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+RDEPEND="
+	app-text/libpaper
+	acl? (
+		kernel_linux? (
+			sys-apps/acl
+			sys-apps/attr
+		)
+	)
+	avahi? ( net-dns/avahi )
+	dbus? ( sys-apps/dbus )
+	java? ( >=virtual/jre-1.6 )
+	jpeg? ( virtual/jpeg:0 )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap[ssl?,gnutls?] )
+	pam? ( virtual/pam )
+	perl? ( dev-lang/perl )
+	png? ( >=media-libs/libpng-1.4.3:0 )
+	slp? ( >=net-libs/openslp-1.0.4 )
+	ssl? (
+		gnutls? (
+			dev-libs/libgcrypt
+			net-libs/gnutls
+		)
+		!gnutls? ( >=dev-libs/openssl-0.9.8g )
+	)
+	systemd? ( sys-apps/systemd )
+	tiff? ( >=media-libs/tiff-3.5.5:0 )
+	usb? ( virtual/libusb:0 )
+	X? ( x11-misc/xdg-utils )
+	xinetd? ( sys-apps/xinetd )
+"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+PDEPEND="
+	app-text/ghostscript-gpl[cups]
+	>=app-text/poppler-0.12.3-r3[utils]
+	filters? ( net-print/foomatic-filters )
+"
+
+REQUIRED_USE="gnutls? ( ssl )"
+
+# upstream includes an interactive test which is a nono for gentoo
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4.4-dont-compress-manpages.patch"
+	"${FILESDIR}/${PN}-1.5.3-fix-install-perms.patch"
+	"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
+	"${FILESDIR}/${PN}-1.4.4-php-destdir.patch"
+	"${FILESDIR}/${PN}-1.4.4-perl-includes.patch"
+	"${FILESDIR}/${PN}-1.5.2-linkperl.patch"
+	"${FILESDIR}/${PN}-1.5.0-systemd-socket.patch"		# systemd support
+	"${WORKDIR}/${PN}-1.5.3-avahi.patch"			# avahi support from debian
+	"${FILESDIR}/${PN}-1.5.2-browsing.patch"		# browsing off by default
+)
+
+pkg_setup() {
+	enewgroup lp
+	enewuser lp -1 -1 -1 lp
+	enewgroup lpadmin 106
+
+	# python 3 is no-go
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+
+	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}"
+
+	# locale support
+	strip-linguas ${LANGS}
+	if [ -z "${LINGUAS}" ] ; then
+		export LINGUAS=none
+	fi
+
+	local myconf
+	if use ssl ; then
+		myconf+="
+			$(use_enable gnutls)
+			$(use_enable !gnutls openssl)
+		"
+	else
+		myconf+="
+			--disable-gnutls
+			--disable-openssl
+		"
+	fi
+
+	econf \
+		--libdir=/usr/$(get_libdir) \
+		--localstatedir=/var \
+		--with-cups-user=lp \
+		--with-cups-group=lp \
+		--with-docdir=/usr/share/cups/html \
+		--with-languages="${LINGUAS}" \
+		--with-pdftops=/usr/bin/pdftops \
+		--with-system-groups=lpadmin \
+		$(use_enable acl) \
+		$(use_enable avahi) \
+		$(use_enable dbus) \
+		$(use_enable debug) \
+		$(use_enable debug debug-guards) \
+		$(use_enable jpeg) \
+		$(use_enable kerberos gssapi) \
+		$(use_enable ldap) \
+		$(use_enable pam) \
+		$(use_enable png) \
+		$(use_enable slp) \
+		$(use_enable static-libs static) \
+		$(use_enable threads) \
+		$(use_enable tiff) \
+		$(use_enable usb libusb) \
+		$(use_with java) \
+		$(use_with perl) \
+		--without-php \
+		$(use_with python) \
+		$(use_with xinetd xinetd /etc/xinetd.d) \
+		--enable-libpaper \
+		--disable-dnssd \
+		$(use_with systemd 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)"/usr/libexec/cups:' Makedefs || die
+	sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/libexec/cups":' config.h || die
+	sed -i -e 's:cups_serverbin=.*:cups_serverbin=/usr/libexec/cups:' cups-config || die
+}
+
+src_compile() {
+	emake
+
+	if use perl ; then
+		cd "${S}"/scripting/perl
+		perl-module_src_prep
+		perl-module_src_compile
+	fi
+}
+
+src_install() {
+	emake BUILDROOT="${D}" install
+	dodoc {CHANGES,CREDITS,README}.txt
+
+	if use perl ; then
+		pushd scripting/perl > /dev/null
+		perl-module_src_install
+		fixlocalpod
+		popd > /dev/null
+	fi
+
+	# 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 avahi && neededservices+=" avahi-daemon"
+	use dbus && neededservices+=" dbus"
+	[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
+	cp "${FILESDIR}"/cupsd.init.d "${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 /var/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf
+}
+
+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
+
+	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
+	elog "Network browsing for printers is now switched off by default in the config file."
+	elog "To (re-)enable it, edit /etc/cups/cupsd.conf and set \"Browsing On\", "
+	elog "afterwards re-start or reload cups."
+	echo
+}
+
+pkg_postrm() {
+	# Update desktop file database and gtk icon cache (bug 370059)
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index 6a90caf09f48..5222ec899367 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.8 2012/06/02 16:57:16 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.9 2012/06/02 18:06:35 dilfridge Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ MY_PV=${PV/_beta/b}
 
 if [[ "${PV}" != "9999" ]]; then
 	SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
 else
 	inherit subversion
 	ESVN_REPO_URI="http://svn.easysw.com/public/cups/trunk"
diff --git a/net-print/cups/files/cups-1.5.3-fix-install-perms.patch b/net-print/cups/files/cups-1.5.3-fix-install-perms.patch
new file mode 100644
index 000000000000..50ad42485e12
--- /dev/null
+++ b/net-print/cups/files/cups-1.5.3-fix-install-perms.patch
@@ -0,0 +1,24 @@
+diff -ruN cups-1.5.3.orig/Makedefs.in cups-1.5.3/Makedefs.in
+--- cups-1.5.3.orig/Makedefs.in	2012-03-01 01:05:55.000000000 +0100
++++ cups-1.5.3/Makedefs.in	2012-06-02 19:32:42.000000000 +0200
+@@ -41,14 +41,14 @@
+ # Installation programs...
+ #
+ 
+-INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
++INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
+ INSTALL_CONFIG	=	$(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
+-INSTALL_COMPDATA =	$(INSTALL) -c -m 444 @INSTALL_GZIP@
+-INSTALL_DATA	=	$(INSTALL) -c -m 444
++INSTALL_COMPDATA =	$(INSTALL) -c -m 644 @INSTALL_GZIP@
++INSTALL_DATA	=	$(INSTALL) -c -m 644
+ INSTALL_DIR	=	$(INSTALL) -d
+-INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
+-INSTALL_MAN	=	$(INSTALL) -c -m 444
+-INSTALL_SCRIPT	=	$(INSTALL) -c -m 555
++INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
++INSTALL_MAN	=	$(INSTALL) -c -m 644
++INSTALL_SCRIPT	=	$(INSTALL) -c -m 755
+ 
+ #
+ # Default user, group, and system groups for the scheduler...