Sync up with portage

10 files changed, 400 insertions, 14 deletions

diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 4e924a2..4435df9 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -16,6 +16,9 @@ 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
 AUX pdftops-1.20.gentoo 10412 RMD160 16e229662c47e03af1d1f4cb5764a76d17a66642 SHA1 6afb8a655b6ff013a2c8c8cbfb615ba1e561503b SHA256 ac5fa01ca776d75bd7cef62eef9f6b0c3945ee87e8950b40ca9f9f3ff46a16c1
 DIST cups-1.4.8-source.tar.bz2 4547162 RMD160 ee80e8d0b56dc0e2edf2a9aa9a43c4b92619f741 SHA1 9167f556e78e0bc075f1eb2f695d79cc1f334007 SHA256 6bd27e1213c139ed0bbadc5c29f97cf1e8f7f8f5b0bb29b227ecaff32aafa9a6
@@ -23,9 +26,12 @@ 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
-EBUILD cups-1.4.8-r1.ebuild 7308 RMD160 c54f6afc3378f4533fba70a81596bc91cbd8f246 SHA1 90cc9c36c59700673fee34eaa838a49762b5d756 SHA256 ed07484f7896d3a6958d31a112169150a1cd93d7e20911a752d1a53e9a4fd002
-EBUILD cups-1.4.8-r23.ebuild 8918 RMD160 e9bced39eeedfa497e2fea9efa75961a4e85018f SHA1 44fe6d7673f7381809ae69b58f847b532bdba18a SHA256 2f69534f197b14cdead18a6c7d70f2aef7dd31cce739f4b96f3c85e98904d59d
-EBUILD cups-1.5.2-r21.ebuild 9018 RMD160 c24842f7c0774b9582835912fe0133d0a36fbf2c SHA1 2e3b40832b540ccbb50cb1b5ea55dced18936ef1 SHA256 513b3989cdc5a20131ebc2828092a748ac6a1ffee9f1edbdb4f4ddbace5d13e3
-EBUILD cups-1.5.2-r4.ebuild 8393 RMD160 f451292dcfb39945488d93b035051bc131d0169b SHA1 d420d07254040e56142b153dcc6bf48dcafe5c11 SHA256 f0343340d0dd046f646b58f6b00d827e2197a05180afbd96884d2be204fbf1e2
+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
+EBUILD cups-1.4.8-r1.ebuild 7314 RMD160 2dfd2b071ef96d913340dc6fcf7e4f61e1f1f51c SHA1 989f4a35877c49ee28717775cd33113e49984b06 SHA256 0d6c04eb446b29108f1fa45cfdfc74852dccfb195cd210977d4d3827ad5627d3
+EBUILD cups-1.4.8-r23.ebuild 8924 RMD160 1522fbbf1ce8a9310bc24230687efadb4034a382 SHA1 e167e46bc6a3c4827636f5853b387961ef4bd2b9 SHA256 1f7af5479a0c85f0951a986851e2cac79f35dd81e880ae6f83541192fdb5b7c3
+EBUILD cups-1.5.2-r21.ebuild 8893 RMD160 b8891bcca3f57923c4f9c7a12556b0ca00e91ed5 SHA1 7f8a673d41496108cd3d9ac6e48550994abfab3a SHA256 2450af8092e36e1a87182a31e27d591631cdfa7468b3689aa8686aa429757a73
+EBUILD cups-1.5.2-r4.ebuild 8401 RMD160 ea2b42ad2deb2d31b007ef955cb79ecc97f91a58 SHA1 c7527412604776d961545d7805c0763d41742885 SHA256 b722eaca1cba4654c6a40856d43101eebac7cf165bea0ea80ffcbb22d45cdec0
+EBUILD cups-1.5.3.ebuild 8526 RMD160 ea1a3c7c6487ef8eedd27fba3660eb45e8a70f6a SHA1 05b80956f35afc1a515c2df3ce91bb428145047a SHA256 2c35ed43d2375884bafa9e8f166a13c9dfb30a8056c18d1c26d223780924cbb7
 MISC ChangeLog 70097 RMD160 bb1d8e1c269b43c9655f9f496d6b247008a47dc7 SHA1 a88afac314bd86307d3099291fb0160c5c5b57a8 SHA256 edb8b04232217b6e3a5448233370dcc5ad3585d5c3e6e2305f867c55585ce5d7
-MISC metadata.xml 691 RMD160 2a77a55b3ba142202c16f7c9e5710107cdd7565f SHA1 0fedf6ebd837708cd218a4a03741a20091714950 SHA256 3d89754273130856a7433fb325a132b07b86f7c0391284ab2c7dc8a2fa46fec7
+MISC metadata.xml 778 RMD160 39d95458b469079b683adf4f2e79eb0b803ce0b9 SHA1 62b298bb9c5435716ce81550213ccd086ec065aa SHA256 26a8d1221a4334579f98705c38f3e3a882c223df86181dcf7968eac2118188b8
diff --git a/net-print/cups/cups-1.4.8-r1.ebuild b/net-print/cups/cups-1.4.8-r1.ebuild
index 823d596..1223748 100644
--- a/net-print/cups/cups-1.4.8-r1.ebuild
+++ b/net-print/cups/cups-1.4.8-r1.ebuild
@@ -1,12 +1,12 @@
 # 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.4.8-r1.ebuild,v 1.12 2012/05/03 07:22:30 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.8-r1.ebuild,v 1.13 2012/06/01 04:19:51 zmedico Exp $
 
 EAPI=3
 
 PYTHON_DEPEND="python? 2:2.5"
 
-inherit autotools eutils flag-o-matic linux-info multilib pam perl-module python versionator java-pkg-opt-2
+inherit autotools eutils flag-o-matic linux-info multilib pam perl-module python versionator user java-pkg-opt-2
 
 MY_P=${P/_}
 
diff --git a/net-print/cups/cups-1.4.8-r23.ebuild b/net-print/cups/cups-1.4.8-r23.ebuild
index 8e55b79..d293c36 100644
--- a/net-print/cups/cups-1.4.8-r23.ebuild
+++ b/net-print/cups/cups-1.4.8-r23.ebuild
@@ -1,12 +1,12 @@
 # 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.4.8-r23.ebuild,v 1.6 2012/05/03 07:22:30 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.8-r23.ebuild,v 1.7 2012/06/01 04:19:51 zmedico Exp $
 
 EAPI=3
 
 PYTHON_DEPEND="python? 2:2.5"
 
-inherit autotools eutils fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python versionator java-pkg-opt-2
+inherit autotools eutils fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python user versionator java-pkg-opt-2
 
 MY_P=${P/_}
 
diff --git a/net-print/cups/cups-1.5.2-r21.ebuild b/net-print/cups/cups-1.5.2-r21.ebuild
index 8db919d..d822ae6 100644
--- a/net-print/cups/cups-1.5.2-r21.ebuild
+++ b/net-print/cups/cups-1.5.2-r21.ebuild
@@ -1,16 +1,17 @@
 # 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.2-r21.ebuild,v 1.4 2012/05/21 22:25:01 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r21.ebuild,v 1.5 2012/06/01 04:19:51 zmedico 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
-	inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python versionator java-pkg-opt-2 systemd
 	SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2
 		http://dev.gentoo.org/~dilfridge/distfiles/${P}-ipp-r8950.patch.bz2
 		http://dev.gentoo.org/~dilfridge/distfiles/${P}-avahi.patch.bz2
@@ -18,7 +19,7 @@ if [[ "${PV}" != "9999" ]]; then
 	"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
 else
-	inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python versionator java-pkg-opt-2 systemd subversion
+	inherit subversion
 	ESVN_REPO_URI="http://svn.easysw.com/public/cups/trunk"
 	KEYWORDS=""
 fi
diff --git a/net-print/cups/cups-1.5.2-r4.ebuild b/net-print/cups/cups-1.5.2-r4.ebuild
index dbe3c8f..5c5f9d8 100644
--- a/net-print/cups/cups-1.5.2-r4.ebuild
+++ b/net-print/cups/cups-1.5.2-r4.ebuild
@@ -1,12 +1,12 @@
 # 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.2-r4.ebuild,v 1.12 2012/05/24 21:37:03 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r4.ebuild,v 1.13 2012/06/01 04:19:51 zmedico Exp $
 
 EAPI=4
 
 PYTHON_DEPEND="python? 2:2.5"
 
-inherit autotools eutils fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python versionator java-pkg-opt-2
+inherit autotools eutils fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python user versionator java-pkg-opt-2
 
 MY_P=${P/_}
 MY_PV=${PV/_}
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 0000000..7ae5c1e
--- /dev/null
+++ b/net-print/cups/cups-1.5.3.ebuild
@@ -0,0 +1,308 @@
+# 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
+	"${FILESDIR}/${PN}-1.5.0-group_fix.patch"       # Dan's group fix
+)
+
+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/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 0000000..50ad424
--- /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...
diff --git a/net-print/cups/files/cups-1.6.0-dont-compress-manpages.patch b/net-print/cups/files/cups-1.6.0-dont-compress-manpages.patch
new file mode 100644
index 0000000..62db46e
--- /dev/null
+++ b/net-print/cups/files/cups-1.6.0-dont-compress-manpages.patch
@@ -0,0 +1,19 @@
+Index: config-scripts/cups-manpages.m4
+===================================================================
+--- config-scripts/cups-manpages.m4	(Revision 10458)
++++ config-scripts/cups-manpages.m4	(Arbeitskopie)
+@@ -69,10 +69,10 @@
+ 		;;
+ 	Linux* | GNU* | Darwin*)
+ 		# Linux, GNU Hurd, and OS X
+-		MAN1EXT=1.gz
+-		MAN5EXT=5.gz
+-		MAN7EXT=7.gz
+-		MAN8EXT=8.gz
++		MAN1EXT=1
++		MAN5EXT=5
++		MAN7EXT=7
++		MAN8EXT=8
+ 		MAN8DIR=8
+ 		;;
+ 	*)
diff --git a/net-print/cups/files/cups-1.6.0-fix-install-perms.patch b/net-print/cups/files/cups-1.6.0-fix-install-perms.patch
new file mode 100644
index 0000000..2d7a77c
--- /dev/null
+++ b/net-print/cups/files/cups-1.6.0-fix-install-perms.patch
@@ -0,0 +1,25 @@
+Index: Makedefs.in
+===================================================================
+--- Makedefs.in	(Revision 10520)
++++ Makedefs.in	(Arbeitskopie)
+@@ -40,14 +40,14 @@
+ # Installation programs...
+ #
+ 
+-INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
+-INSTALL_COMPDATA =	$(INSTALL) -c -m 444 @INSTALL_GZIP@
++INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
++INSTALL_COMPDATA =	$(INSTALL) -c -m 644 @INSTALL_GZIP@
+ INSTALL_CONFIG	=	$(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
+-INSTALL_DATA	=	$(INSTALL) -c -m 444
++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...
diff --git a/net-print/cups/metadata.xml b/net-print/cups/metadata.xml
index e209898..3beaf28 100644
--- a/net-print/cups/metadata.xml
+++ b/net-print/cups/metadata.xml
@@ -18,5 +18,8 @@
     <flag name='java'>
       Add support for the Java interpeter in the web server CGIs.
     </flag>
+    <flag name='systemd'>
+      Add support for systemd socket activation.
+    </flag>
   </use>
 </pkgmetadata>