ressurect accidentally deleted latest stable version for ia64, bug #551846

Package-Manager: portage-2.2.18/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0xBD3A97A3

3 files changed, 380 insertions, 15 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 28e8a4b6c253..f0c97517ad61 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.678 2015/07/06 06:57:17 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.679 2015/07/06 07:16:24 tamiko Exp $
+
+*cups-2.0.1-r1 (06 Jul 2015)
+
+  06 Jul 2015; Matthias Maier <tamiko@gentoo.org> +cups-2.0.1-r1.ebuild:
+  ressurect accidentally deleted latest stable version for ia64, bug #551846
 
 *cups-2.0.3 (06 Jul 2015)
 
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 399b0deec5a4..d05ea17f019e 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -14,27 +14,29 @@ AUX cups-2.0.2-poll-CPU-loop-STR-4605.patch 1520 SHA256 275435151b311de03514e266
 AUX cups-2.0.2-rename-systemd-service-files.patch 2092 SHA256 f6ef6f3fcbf96d383e7207130393660630a3c159b19d2c6a5437106e52bee1d6 SHA512 409a7508dccbbcfca60ba448f8cea84ecb2710890e7655c67b8292c34c8d555884e7e82e70c2c700691af1a786ce0d8c8c799b6fb471a18f1b87eda99eacd9cb WHIRLPOOL 388300e7e95fee7e6b1ed49885ae13ef79ad743b335d60f44e2745c75d4b203ac84401a9bda1a5e5a6a67c2a599243d8f2a9fd714a58ab76b74ca97041ca9a62
 AUX cups-2.0.2-systemd-socket.patch 2390 SHA256 250d8c8bb406f2c0fff8c71b0e04c23610eb287ee4980a6597b727ef3ba7cbfd SHA512 221972ff8749fc8ee674bc4f1487f4e29b28d14494ee9ab177b86c5e042c342a004c6b22469f16687400bde8e40c7d82c923d8d3bbba1a072771f2b27a347a4e WHIRLPOOL 997f9a4fbe41f1ba9ed6bae6c48e4b8891f7c5cacee54a77d8ee105fe1bd4b0d3091ffecee97f7f9c926c547161569aeead44024576927e91031060c8cfdac66
 AUX cupsd.init.d-r1 504 SHA256 4705b68372090ee7db69da1ad35131551ed1ba99032db2486ff6c31d2170ce6b SHA512 9eac4fc725b14615bb31c96a69c00a14ab2fb23fa355f1ced655f93e6364555b2710a277ceab439199a275405b016492b4c9183fab755c02354013e0904a03bc WHIRLPOOL e0ce34f4b73de6e63ba1f01b0df543cd66fecc692af8254acb3dd1147c0cd4e1f42ed7df4b18b26af0114db54c3b8c1bca526ed54146307223ac24a0b3d3502c
+DIST cups-2.0.1-source.tar.bz2 8738217 SHA256 60f7f2cca69f3b761a029fb314ee4299e3ea0fc02350f06d192cf31d58215525 SHA512 a92e4735f23f45fd16fb47ea729be762001c5b74f785d344bb11d3e87a361aa772ef79ff41106cdc30f45a1396ba419d6e5f77164b9deee27876e9928357f3ce WHIRLPOOL 4f9695bfa759d5bcf611f30c0f071ad352066313f871e2459c005511a4713ad1c58b90bbe3cc233bb72a5b0a51e27b630c0a27d1ddfed80044c0f6dca14e53c8
 DIST cups-2.0.2-source.tar.bz2 8766982 SHA256 858720f76b66fd0441ae2a16f7cabd9554c8c64607e28ffacf16c36c53a3b18b SHA512 6b0ae58983f66ea295aabe7367880931aabbb4390085d31bcdd8d42830c958c23b34bfa8b761bd681e233d9727a7841524076dd9760f5b093a6001676d74bc2e WHIRLPOOL 6a6282c0f72f3c1fdae0652245e7cb69c9f3a8a51d1ec4b1e81ffcf1a6871a67f17fa497f41737b37b7fb8c0fe964abad141ea1dc4c065c70c72dee8b965bf60
 DIST cups-2.0.3-source.tar.bz2 8797220 SHA256 bc3167048690a7379f29a37d9fbd2143cf0ca033b54eedd9333ddfc4ee258881 SHA512 fcc2be8d12cec624423a07706486afd226c9cb29b2ba694d63b8250c16a7d0f39aa51e6c831ca7c978ba5009e98b1daedad4b119a4f3287a88e21e48f0d07e18 WHIRLPOOL d12771b6d941db78854a1b05644a4402fa6a62f8acab1332c7490887e0099463b129684f4dd21b5e9f02e4f8e23bef633a06fca01ad8fa8b34de9298b72ab3ba
+EBUILD cups-2.0.1-r1.ebuild 10426 SHA256 f6803bc9d3dcb78de8356ccdd1022714238679d1a81e25bc83b8ac5e4b71a76b SHA512 7501cb23dd20aa04343bc601b3d8c9cd864a7657dcf123559c8c93a383bfbfc8e31d2a844497555cbbb787dc53db3b19695489559ce85e9f9635fb3e67a3d522 WHIRLPOOL e5664b0c9d0cd5a03ca5a4e4b75a4fb5ec06e2a52c19e3ce7212685c50b0a924a6f8d53ec89cb2716114a464c3f220232b4a6516fa75cf8aa3c33c2853d92a08
 EBUILD cups-2.0.2-r1.ebuild 10497 SHA256 3a0933d57a929c8d76722d2c71fa3fee79cfcf7248a9dad218786f10de529704 SHA512 a21513e29d2ce306c61aa401226df1ac5b07dd6aa27759e1a3fc2330c887f1b65435a0b513900747cd678aa67e0d622d113b486e76d5dff3ee9dae8c634841f7 WHIRLPOOL 9d9da682ac0cca3f5aa3129861f1ede1885b4e38356062e532a5f03ed1e8d073f2143ac9cfa060ff3656dde6f593172b28e7e8e13a4016f15552bea32c8a3d96
 EBUILD cups-2.0.3.ebuild 10504 SHA256 e98d068867ab4204135e593d81a37f0151b999fabef89d7f6d0b0dae0971f1c4 SHA512 07d2a78401a1519fef955d2df7980a3830f12d40860aa06d770eb5b5fff8c1d55eb1dfb4592384261baa4e5110c43ab391c0fc5710544170786bd9109f602362 WHIRLPOOL 81d0588a9bd8064acaf61ee148e253243bf3da2d580df6d7cc27ebc0c606f1ddf06c61f2251d5699388a985f141a6cec356d7772ae2c53b6cbce3cf1d6f6aed4
 EBUILD cups-9999.ebuild 10351 SHA256 e25fdfff3311daf414c5dc99afde79667cf7a549bf85de5cf8824a495dd630a5 SHA512 49cfd816c505fcb190a7382c25efd84b20151bdda0344c357458fa9603d2a924e331f6e93e40d65fd8e45035196e344c44656dc815b1a6b481d71ab4b5daa94e WHIRLPOOL 8f24de7b1d214a8ceba57af4dc7460cf8ce55d5e2fea1fb52b44faa14f9661e9a3ec2a4c17bf1301defe2850fa33591844410afe2e44bdfcddc54a4866107d76
-MISC ChangeLog 102748 SHA256 4be418a4f2588ab23be4cdea577be4047595114b1309392c4cc8d00fc2b885ab SHA512 85c675c72cc552e8e5405cda68c043afd82f9fbfb7bf5c22d67ae051c7b5ee0b854feca3039939018644ed6a1e6bf24c4dd7e661f62168becfdd2544f12b6276 WHIRLPOOL 360328f5c6872b1c4d8d28cd92ed2d650722b40fdcf993c02600e0e9f122aee5ea3f147f4e7ae4dabaa07375ed13cdb631fe214057acbea3cffe1c864e87aa62
+MISC ChangeLog 102929 SHA256 e89eff0c362f3c79038502607d5b445393a8e2ce6f2ba144c02b0c1a8b672972 SHA512 70c97c1edd9ffa174b4365bddd0359184b0dac778a7e8633f146779abd502c4a6c55b4e841728728aa40937530c41db983f0971b48ecfcc6a5f310163e14aac8 WHIRLPOOL ca1f573468c75ed162a85cb9a0da3f349338427da8553167aae8fe81410a8bf8803e07ab4fcdc9199488dd048b356550f0b20b4167b8f45675f4b43ad6d2ed8f
 MISC metadata.xml 496 SHA256 732bba7ee060b7be5e0b23d06d24c12c2bfc1c6be1440cdfebe6d5d94d145c47 SHA512 713300abb461ad923c4f6e59326fa97b2372181df4ef82bf04dd6f2d68dc0eb7c34e518cbb40ebd535cb9c4bf52d2648512002cc2cb55c6f21406cc973fa4496 WHIRLPOOL 061013ee6ddaf510964589024e39c4a05f18f0a6d2488eb5b121bb962a378348e71261f7e153f34dbb33337a2e49eb7da94e52d0cb7a128d71e9b4466f8a5933
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQIcBAEBCAAGBQJVmibPAAoJELhOzYlK7nn/5jcQAJ677Ea9AF9scKnNY519guZe
-eZOFaWvKVl3JyOv0TkgL3P3YJ8GGvS2/AAf4hHh5J8JePVbFP0etdYlQ9nXAF5jH
-cgwbOqHO5BY9ODPQzCngHAxulsciUfeWVZVuFqrul+6r0fcY/sEily95hJtjejbN
-9BDr1/v7H3l2gjtmVNNSrO6wrj6LXevoYpiBqnLZ/DAzY8nmDyb8z7SbGz8q7mtc
-w76gZmWwiFiYpJh33Ou4bmIwLYDtL2+eRJVF+DYGYoY8/cxCgEqP1C1IByhS1w05
-F2iy6VfA53ZueIorUUKvlJxZseL0WGCwEZLrgbFkqo/2csRxaVfbTsLRohRO8Hqy
-XmLQvMMwXO7LI0fqdJhkwxR5XmM7TjvpjiZ8JpoZNXOLNemXWs+SzEovrrAknRqg
-IbyHXpsrvc55f8uTmG961F7w+tCNAi+XWWWLcyx4RAhMBTeU2gp0CE05Blw6E7QK
-N8HTgimdcHLtNH0KzfSeaIKa6osoxgIfByEXhluyNJ8i5mDFab4nv96nU/0NHGZP
-2i+YUH9KQbHPrdx88tjkpkBRvGrBJcj1KsNxNboPEZKMyP78tRxe/BF3lqiaEoKW
-TJPi/FCixPS2f7NQ6bnQ542JszRC3XmcdE2UniL2b5qvUQRZlkG6xnw5RSGnCXdx
-ClXXeShsfoEMCNPSg3W8
-=EYx2
+iQIcBAEBCAAGBQJVmitMAAoJELhOzYlK7nn/UrkQAMzAWog6b7s3g4huMG2rhdVn
+MGOsLiDaGql0bMBQOH/JyMGNrGKwAqSnQ1dwqrFCQg1eAq5GvdwiZCA6X2qEgGsP
+rXym73KYUCLwUYOZxSXZczAz13Na//KxHXJ2DeEPlaFVRxvkv2pGQwC+uwBx0D7A
+Pn/2voI2NsEFD9a2lfgM1+rzZfGSTPZ5Zescd5K7qz7t/Kw4OrZ6HXu/OLHItQTT
+vvIixfm0SWKcbAXu9M6uhKFrpWyjdvOkShGKCZR+lPuqG8Fp+e2qg/RxHt3T3f1r
+HmcwRlQZvkxhTOd3nI/HzckloXdvAvnSIIegNKtmkTzlHOofYoyVRKj+d2fg4LKu
+KAgxJh/fGYusnj6CmECfjMOpq0d0dNTc6ty6xduCh4frQJmWLoq67BXz3N+EGOHW
+wh/r8HYPsmg2Y5EAhqF0kCWhZUBtQzaFu/KTuEHE6lqai2mM8x0U8G9X5jSUkg7y
+ulG04awcSDQt/MBAM+PhI3I9Q9eLMjmL1lJT7g0p2Zg4wjrjtEOTAzRxaRwFnQxA
+R/vG3IYYIEVn4jDCVaog8hz8HA4QX3x9iaXNs5iGuXSwvLSd5nF2/U6ep/bRa2Hp
++Owh3sBdE8wb6RNLU4VtbS8W/6mjEY95ObkqlyIQU+ipui94vDT3aWxWzcfAiEJa
+nalbhXhjNnU28FFCX7vW
+=NHdU
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-2.0.1-r1.ebuild b/net-print/cups/cups-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..a2046a48bf8b
--- /dev/null
+++ b/net-print/cups/cups-2.0.1-r1.ebuild
@@ -0,0 +1,358 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-2.0.1-r1.ebuild,v 1.15 2015/07/06 07:16:24 tamiko Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info \
+	multilib multilib-minimal 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-r3
+	EGIT_REPO_URI="http://www.cups.org/cups.git"
+	if [[ ${PV} != 9999 ]]; then
+		EGIT_BRANCH=branch-${PV/.9999}
+	fi
+	KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+else
+	SRC_URI="http://www.cups.org/software/${MY_PV}/${MY_P}-source.tar.bz2"
+	KEYWORDS="ia64"
+fi
+
+DESCRIPTION="The Common Unix Printing System"
+HOMEPAGE="http://www.cups.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="acl dbus debug java kerberos lprng-compat pam
+	python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
+
+LANGS="es"
+for X in ${LANGS} ; do
+	IUSE="${IUSE} +linguas_${X}"
+done
+
+CDEPEND="
+	app-text/libpaper
+	acl? (
+		kernel_linux? (
+			sys-apps/acl
+			sys-apps/attr
+		)
+	)
+	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
+	java? ( >=virtual/jre-1.6 )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	!lprng-compat? ( !net-print/lprng )
+	pam? ( virtual/pam )
+	python? ( ${PYTHON_DEPS} )
+	ssl? (
+		>=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}]
+		>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}]
+	)
+	systemd? ( sys-apps/systemd )
+	usb? ( virtual/libusb:1 )
+	X? ( x11-misc/xdg-utils )
+	xinetd? ( sys-apps/xinetd )
+	zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)
+"
+
+DEPEND="${CDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-cups )
+"
+
+PDEPEND="
+	app-text/ghostscript-gpl[cups]
+	app-text/poppler[utils]
+	>=net-print/cups-filters-1.0.43
+"
+
+REQUIRED_USE="
+	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.4.4-nostrip.patch"
+	"${FILESDIR}/${PN}-1.6.0-dont-compress-manpages.patch"
+	"${FILESDIR}/${PN}-1.6.0-fix-install-perms.patch"
+	"${FILESDIR}/${P}-rename-systemd-service-files.patch"
+	"${FILESDIR}/${P}-fix-compilation.patch"
+	"${FILESDIR}/${P}-xinetd-installation-fix.patch"
+	"${FILESDIR}/${P}-fix-linkage-to-gnutls.patch"
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/cups-config
+)
+
+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
+
+	# Remove ".SILENT" rule for verbose output (bug 524338).
+	sed 's#^.SILENT:##g' -i "${S}"/Makedefs.in || die "sed failed"
+
+	# Fix install-sh, posix sh does not have 'function'.
+	sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh"
+
+	AT_M4DIR=config-scripts eaclocal
+	eautoconf
+
+	# custom Makefiles
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	export DSOFLAGS="${LDFLAGS}"
+
+	einfo LANGS=\"${LANGS}\"
+	einfo LINGUAS=\"${LINGUAS}\"
+
+	local myconf=()
+
+	if tc-is-static-only; then
+		myconf+=(
+			--disable-shared
+		)
+	fi
+
+	# explicitly specify compiler wrt bug 524340
+	#
+	# need to override KRB5CONFIG for proper flags
+	# https://www.cups.org/str.php?L4423
+	econf \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config \
+		--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 \
+		--with-xinetd=/etc/xinetd.d \
+		$(multilib_native_use_enable acl) \
+		$(use_enable dbus) \
+		$(use_enable debug) \
+		$(use_enable debug debug-guards) \
+		$(multilib_native_use_with java) \
+		$(use_enable kerberos gssapi) \
+		$(multilib_native_use_enable pam) \
+		$(multilib_native_use_with python python "${PYTHON}") \
+		$(use_enable static-libs static) \
+		$(use_enable threads) \
+		$(use_enable ssl gnutls) \
+		$(use_enable systemd) \
+		$(multilib_native_use_enable usb libusb) \
+		$(use_enable zeroconf avahi) \
+		--disable-dnssd \
+		--without-perl \
+		--without-php \
+		$(multilib_is_native_abi && echo --enable-libpaper || echo --disable-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
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake libs
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake BUILDROOT="${D}" install
+	else
+		emake BUILDROOT="${D}" install-libs install-headers
+		dobin cups-config
+	fi
+}
+
+multilib_src_install_all() {
+	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
+		# always configure with --with-xinetd= and clean up later,
+		# bug #525604
+		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
+}