Version bump

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

3 files changed, 330 insertions, 16 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index c69b1ad141a3..02ec8e28f2d6 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.563 2013/09/30 23:19:51 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.564 2013/10/01 21:10:50 dilfridge Exp $
+
+*cups-1.6.4 (01 Oct 2013)
+
+  01 Oct 2013; Andreas K. Huettel <dilfridge@gentoo.org> +cups-1.6.4.ebuild:
+  Version bump
 
   30 Sep 2013; Andreas K. Huettel <dilfridge@gentoo.org> -cups-1.5.2-r4.ebuild,
   -files/cups-1.4.4-fix-install-perms.patch, -files/cups-1.5.2-threads.patch,
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index b2ba14c249bd..c7bc502bf13b 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -21,31 +21,33 @@ DIST cups-1.5.3-avahi.patch.bz2 17298 SHA256 daed1232c56ff7a3cb293c7eedbb669f320
 DIST cups-1.5.3-source.tar.bz2 9580485 SHA256 9d716a8ffcefdaff1c37f4a4b590f1d74ff9ff72383a18f3c883c9235907f93d SHA512 0de371eb347a41226a4a84de02f6eddf1585874c606b16173d8ff3e48d4317b1c90b4ef188068786a562c663117c8782339731d4f339ba76f438e8fae0d364cb WHIRLPOOL 09d564c6ac6cb4933e45f7e70b362a61416173cfcbbb3f26ed69c1b2dd51d7e9d8d1ec40993709ccc52a55b7842567a163425f18264ae8e86d20361f75448f5e
 DIST cups-1.6.2-source.tar.bz2 8363773 SHA256 37a3ebd305e76cfd4c9c53013e89c0f7a4dcb04b2e9da61029a29faa57e0f10d SHA512 08b7ae95af9c19a1bb72f851b801d55a51360a4c2993c34878d18a605bf1d9381eada5a8f51653c4467738f0509bb8ad713b79e78c8d2a80f1aa86f1d2196038 WHIRLPOOL 527f4eb1016ac20e737cb5171c8cb4c71295e36da8704dd97c8d405c1cf31a8861cab4dc1b2c8a37e21f83672b5212bf8ffbf7568bd118e8056aa777d0caa1ba
 DIST cups-1.6.3-source.tar.bz2 8265065 SHA256 84fa83dea6ed08dbd4d1112d9b0005424713b32bcb13111857836312896cf29d SHA512 31cafa52bdf1f00d6cf78456bc1dbb2f0440e29a18d45d3088c0da6858b0e35c43be8a1fc10d0efff7572dac5cf16eb93e299a978c4c7ae8af1b2e1e1365ddba WHIRLPOOL da506e757d8d8fd8e8c0e3f8f11776360f59f72a031e94919e5e6999125cf09193b77bcf3ef87f1711c1b1b98ed5fb3ddb3f570137cada4ce80ade3d5b72f4e8
+DIST cups-1.6.4-source.tar.bz2 8262021 SHA256 b910c3e43b2d06f54154d12710e849455d0710c9983dab0a5f49a5e93b1b7e73 SHA512 b150b5915a6ab433546e14024c673372fba04623accc10c637742c83342d73bfb91b9bfbb2e3e6a64a4cc189449ae811eb4a721a994ed42e1a9c489a166f2719 WHIRLPOOL 4152b1b2699af91831f21f308e9836f66649bf6ccaeb03b7fe2fef7017ecaa0907dce5adf7eb7c37af0e6dd10de53f295b29cad52dad38fe1a8c141525b87541
 DIST cups-1.7rc1-source.tar.bz2 8373136 SHA256 891c0b745f5f7ef843049fb881a27d4c9c01978d5e9f03ebad6e29c755a26a4b SHA512 45041ff19ab5e8671633805a341f7621bd7075cb81b065c659c2a17d14998ae4824b6b925efcfcf6a943d6af6b38659c8f3f4fef4819a6b2643e259d99e5c65d WHIRLPOOL 6ec5d2672fee46253efd8ce9e874c0ec21cfb2fa23af5734af6deb3ab5295082c2929b671d0cf0e0f990f6a9aef8abc4d6839e5519c6fe8fcd2e929743809103
 EBUILD cups-1.5.3.ebuild 8531 SHA256 f69a635b9c64076a183274a49eec89e5c84c2ec37b6c97c492ad3e8d2c3d243f SHA512 b0ebb91b9ca2f0473ce628f2e5df205bf1821df450aa1456572590c7be769ee89120c717c81bf15d03fdb7ba8176950a7835b85aeadbc1d77596d8967f5056e7 WHIRLPOOL c5b42134aeca5361c0a9c0c06830a0882614a836ab623c85345aec3435976bc6e2388ac4b4aea2e5326ea3235b5aacc7206aa65ba880e45bf154ea76b652950b
 EBUILD cups-1.6.2-r5.ebuild 8935 SHA256 f859d9f6088b5af047bf7563dffe868748db4b9604d0fbc8ac7a02ed88284ba0 SHA512 cc3d4195ef127ee42aebafdbf87ee969498f09a9043535d56b2ded6320b94a8bb949eea3158c0f2d67722b2db742be375a7202c244b9770e6ad09ba361df3431 WHIRLPOOL 2eb79e5be94c6ea7847586135d879d8f3de0643a6cfd83062c972ede9d66a3ca285236af7ea72191b0f149a6efb8cb5e3aa0dcd8d838b79fc737264477876261
 EBUILD cups-1.6.3-r2.ebuild 9098 SHA256 97d50eb632303ba5ad32b83772162c979246615249d551706b9c03aee6d79b30 SHA512 a4a40611f3e9760db405c5cd120414f482a6f998c1233b1f756400bd476ec9793f10571b3dbd9567b3fbb9614b59761cd8df4eb7e18bd7d934f11ab89d71ed52 WHIRLPOOL 87d55158816c5c004d8d5e12bfa6c684cfafc6fcd19d9707808d0e538ae7be38fa75c2a685da65308f53778e33781dafe19d1966b08381564fb33780ddce16ba
+EBUILD cups-1.6.4.ebuild 9050 SHA256 72014fe36a18cc1e24a8e90f5f69645fb468e578d6f4d420e7b136d6d01696d1 SHA512 97765d4b393ac179e78fcfe0f9d061a95b79cfc7e490af50aae04c4fcac6c523995c0d46d2847c591a36f619d85a03f626a651dac86829c2da79ad22044890ea WHIRLPOOL f21d9b9e4d43b0276353201c374fe995d30ab3ab673848d7f46e01124f25327221af85c981b6f72779f6f6d1874fc2d9d44a91d4d4343fd3103eeb378dabe1d2
 EBUILD cups-1.6.9999.ebuild 9098 SHA256 b1a840074d6cbae0b1c5e0bc3002f80651181641aac011b48e4a5d9dfdc2f00b SHA512 be8f749a411fd12e0698a72c8345d05b6b8e27b9d84e8de8295574b06c0ccc52d9ebcd811da3a70e4be89381efe7164381d01ad9ed4645dfcb754a3e9c6bf6ba WHIRLPOOL 0e66ee6a43f305b91c0ea5fe0dee260cbfb2b3f09d67ce0c4dfab377f12cb6a1d017b29df38d977493b0536b3276c43ec4c5f68c3d7fe599702652c2577b139a
 EBUILD cups-1.7_rc1.ebuild 9045 SHA256 3dd0c298e28e393977754665b90c72f9dd3d36ce3f5eb4fa644e16fa92d8904b SHA512 11c0f16211347b05b7c374e8ed0ff27283e85b088b7d8d36a68459a114a0e44a479813c71c431b49dd5617b8a79e3fac0f82252cecebaf0ab74aa45eb039feac WHIRLPOOL 784f11612b83d7b5991fb94aee0d14dd6d4a689457b3fac92083636205f749bf2121a8adde2ea67ac805077fbc01f34ea3ff027bdac2ff97c7a5adee0ec7e8d0
 EBUILD cups-9999.ebuild 9135 SHA256 afc37a88aaa837ede1e7972dfd2e13a55d85462e2793ca7f15b5918c73ecbf96 SHA512 0a5497ac6fa1d85a7ec7ffac6886c5de95f2fc72c268e90ebdf762ca55820f5618ae621c17b680361c23b0b3f8cf7c0dbe6fd9bc4b942783b03e3b922dffc6ac WHIRLPOOL 39bc399bf7d1b2bfb5606da97752a9e0704144ccc0df66faf6d864f4ea8a0d0af3e76afdfedb12d5d65603dbb489d0852230c4137cf7c8509df0a00e50ae66ff
-MISC ChangeLog 85814 SHA256 0d400fa3e450633b842ffc7ba7afe5d1345677eca2bb37d7cd21f9f99c1ed2b3 SHA512 53fd7d33501ef2f767ff0dd6abb681be5ea7395a38ddb4f2141f574fdd756d1aa999d7a47f39f2719485aacbe8427bde718affc2506e0ab1c89f614e43209777 WHIRLPOOL 9670a38dcb5fa3cefe96625cff4648013cbc5c01c2e38ddea3bd780996715e0ed5f4d128f2d9880e64aefd572a8776f6a7a38f9adbebb911823bbfaf4de5ffe2
+MISC ChangeLog 85934 SHA256 299d8dfd55aa305893c1e3bc0a92d4997635444e11f1f715a9d07f499a2c363d SHA512 1539e9fb34f3be8e4477d5d4e8f5a94a9d728002f110cc3533a05a118ab4510854597439e308cbf6c96e77aeb586cbf47c295be697201f27e35bc232812ed367 WHIRLPOOL bfbc12b45222b860a5b3cf9ce756fbaecb2e3ddb65c91e6b65b1846a60624d15f83efd00bec7fc7cc05b7e42796de407f7bf0bc56c78e5eaa77255018f505dc3
 MISC metadata.xml 789 SHA256 6efaa6b3229db0ca62837556ed72fb497546d46178f10107b1aa17570665c742 SHA512 63fa10e24551505a9251f633818364459211f53be2e310c9f94364b6c6635ef911a73da5c9952a6963fa997b9e3178dd224afbc55cb56fe7cc00f2a53a9c4a69 WHIRLPOOL 0e4f27d31bbdc3e57d14e27c2c46395a937b01a991a12b291f29014064113073693f389d5d2103d609b303f951fc9c124829f339b73cd12e4ec58fb8e93dcae4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSSgfNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJSSzsWXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOc/JcQAOYBreuVdHxTMGU/p0CDcrRb
-jYrWTC9dU1IOP/vTbhGWX5E2VlBislyPwB/JelWJetXJ3CpbfdrVQkc2ePbBnQUY
-LnsRhLBrqyM7Am5+av3TEtntYKX8JcRBfDyNN6RpaeTK7NSIDHJQvrkHH7EDKUOM
-WXxU3Xy2R3bR6MEfEXW6Ajg/eeC0ZeBSCd7G2z1RluIcLr7hBGDILSEFN0E9LuBg
-RnCpia/mNGuPiE+j/gD8sEnJepahyU6+wubD7YAsSMmnbb31ZtHdScYWzCMUXuP3
-jk3ScTxLZizJEuCX012P3BCLRF493cAyvD0gQlIykjhuveHtKT67tLV0egSlUEL7
-uu+ggSCFAe3IiHz8zbxnxG7H0etoXEQJIgc4wn0hRv0XLLRXMdTYQwXJ3AuK4aZ+
-0+VcXc5d0Ty0bhL1WJI9VJn9j4vLvw0EuD1CNKO7NVoPTGYGv/B5z6lMTo5hH/Bg
-iVImpxUjw8+boeDLZKdrR6Iz7WU1DAdeX/EihtRJPKaJQR/VgdExKssJ7D2HleZs
-X18aKAXKM0ra+eJ6Lqr/k5Mf88ND7nLm44fX6NhDXaTE0bpPJpXSsxD2hxoP89KV
-PUxUuEEe5LuvqmcYnH4hrcG+694HbZa1TmXlY6ete8nIsXubEnu6MYXogIqWh/no
-17aTXfmdwzZeqW+y/2+a
-=QX9i
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcJe0QANxevnV9r0qmNG2ouREMCokI
+3MvWus+KmJr4bOEnZOkrrw/sOlskfX6aoL4nOPEtJwHC/N9s1lmg3aNk0tEQU6Qi
+ICQwMmA8sbbVqTjlZgTH293sUhVH1sfP7Tzh55asb/4GOHmd+xHo121Jc/isKS6m
+GkOrhQ5nF7FD/4YyoFuakpUnmOzSkK8UhLxohWkuSyRAIQhA+HJ/D/WeG0lsR743
+YDJ8bQe+Uj9ft3mpa5+WzzIXJx93zM6WcZ6WruR3fK38kG3rFNCgJNdFF+3Qd+Ue
+uu3tM40IrmxN7R+ovNCWLDRiY0ONWUM+fRonkTZhPX7W/ReRRtdsbpAPciJ4TXi4
+qOZB/fpxt8atEs/sQbLEA4KWBDLHXsTfbZiTo+4lCaE8945UO1lyJO72Xd82wl8h
+fB23cesatP0+eckDq4Is2Fc5dBYu+A4i6boPPLwOqpy41kKLBBToZZhNae6Fl/x3
+xV9pEcQJvMkOe+9DlOodsQQJQwu7aGyJD1dkcP4B55YL4htdn7hHEgShtjT5OQOa
+wO6jGJ4X8ZRSa/NnGOD8h0WZhzOTRpry61fYbF09mFppNnYHMZAsx0tOcgTHJ/Q0
+9AUMg8F6jtl4FkQOLeGaymZ2yi7LycotCxNtA9GbSW8+WKfjZonCpQTojcFzuDH2
+igFqS6IjIGUJY4cV4frX
+=C/GT
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.6.4.ebuild b/net-print/cups/cups-1.6.4.ebuild
new file mode 100644
index 000000000000..d1410a8f50de
--- /dev/null
+++ b/net-print/cups/cups-1.6.4.ebuild
@@ -0,0 +1,307 @@
+# 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.4.ebuild,v 1.1 2013/10/01 21:10:50 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
+
+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"
+)
+
+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
+}