Clean up

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

9 files changed, 42 insertions, 627 deletions

diff --git a/net-print/cups-filters/ChangeLog b/net-print/cups-filters/ChangeLog
index 2d691f004f7f..5236e6c75d24 100644
--- a/net-print/cups-filters/ChangeLog
+++ b/net-print/cups-filters/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/cups-filters
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.58 2013/05/15 20:00:28 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.59 2013/06/26 23:10:08 dilfridge Exp $
+
+  26 Jun 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  -files/cups-filters-1.0.29-openrc.patch, -cups-filters-1.0.30-r1.ebuild,
+  -files/cups-filters-1.0.30-noavahi.patch, -cups-filters-1.0.34.ebuild:
+  Clean up
 
 *cups-filters-1.0.34-r1 (15 May 2013)
 
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 8753d36fcea1..0e21e3943d27 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -3,32 +3,27 @@ Hash: SHA256
 
 AUX cups-browsed.init.d 399 SHA256 d4d27c920ab062532755b553544ff3ef4d561d03bda0728d21e71c83d0e904bd SHA512 3762f18e57e317e4e2b40b1f42da79e383de4f4a360cd7317ae1780edd44ffde007b0ced88bac6b24d082d0fab19425360eec891ba86fe46d9e201e1081a2beb WHIRLPOOL 38782d813df3be20f1d6a15c2aecc94a1409bd8e90b0a2f65f73f512b3ff37afc06c57dbd6be24abd1dead189ea1c75292bc45e68303de4141ef748e9ca58577
 AUX cups-browsed.service 225 SHA256 f4cd6ac0da207deb3b9991264fcb8d3468ae7c5c4fcd1957d296d344fd9e3d44 SHA512 16d7a8b0c95827582706764ca6f96720561e8c314929f6d53c98dccb68b6df21d5928949b0aaf7c2f738ab5c07ee2678d643b9acb6b581bb77a67db950082cdb WHIRLPOOL d1606f5ebfc84398502282e9c1e42bed6701f2d4e284f1214ef924aa94fe2be3e169d83f9d9fdd34a817514df35e680f38b3e91fb7e965510621e3fad8002f14
-AUX cups-filters-1.0.29-openrc.patch 1287 SHA256 5849051486df2a66e93335a7716026370053e577b2d458e93cac36bc43f4bc5a SHA512 432cdca199f01d57910e260c3eda57615dfa3608b7484c18c29b3c00a815aeb280369ae8192ac3f38f43082356bbaa697b9ae7f867cae2cd2bcf604b55206774 WHIRLPOOL 850396b3d6db72ed98a74c1462404f4b5c484ed49b2739a7b53e6458190ae5405930b04c930a6786d8723b50f9c6c171547542a4bcb77ae156d9cd3c826bf273
-AUX cups-filters-1.0.30-noavahi.patch 1083 SHA256 b29d3d7cda682a99ba5368514b6f08bdb6c89caa38c71ba2ea6817fd383fba8a SHA512 0e4c904bbdc3ff35e76d378a37c79023ad3162a155c8cf259d6c860d1e9e02877c3de992b6fa0b6375848c27cdd656478be54c495c0a8721e9c479825d02982c WHIRLPOOL 329bb267e99b777cd697a124397ba336d6ce9e4965632e8375a821d33b8b71c244e5f95a22716c9fac5ad05b6b7628ef71876a51f7998a84c49f283ec5f1fb1b
-DIST cups-filters-1.0.30.tar.xz 1014756 SHA256 2b4f4cdd9bebb7c1db4cedcd5084c2243affbacc5fa8b94506caa67d70bd5531 SHA512 a9bdfa7251427e0a11a17b27aa60f85ac4a737e6e0faafb74718e5e50df4a9772d5997ee3b24b795af9700f1805694e9d58d93aa7c92fad04e3ed3df6ca5adbc WHIRLPOOL f917d6696b1af184124a86cd4942235982a95b642c234a0bb9b87f88d29d34f083df8b5ee8c80cc585bab527c1a00fbf002d377bbae9175956fee248a30d8849
 DIST cups-filters-1.0.34.tar.xz 1015416 SHA256 24995edfd31fc58a0c5be09631650dfacea8664e0e0d2b61c3859bf992d9b371 SHA512 1cb8e0e5998f09512276bcca17d8635223ed3717573460b351fdd5a11bcb0fc4dd46771afc1ff9c2f87d007f8035c78704dea7afc2d67978d09c035ed58cebd6 WHIRLPOOL 855bb40d200d147b87ca602aa3fdb838ee47f8c692e5a4b91b085adda890b3b869a30993ad380a0c0f8038537bf0b4536e8feedfe153e52d4e65d031bb625ad9
-EBUILD cups-filters-1.0.30-r1.ebuild 2663 SHA256 1ba3a0a83275138681161daa73bc3680e3863fc4b65461fba041feb0d59a7af0 SHA512 734366fcb942e1445745fd288bcd9ed11a8c46159dbd4a52194af83b374bdcb3545c7cbb626f74ab1e0aba9872efa06e03545a6ed2fcca4f8398771c7fbe377e WHIRLPOOL 823fea5d49f59c1932197d11777faec31fccf262610b680316e89055b337171250bc84b663ba8710d2ae7a47d2160348dff6d873b9f085c813e17abf0818f70e
 EBUILD cups-filters-1.0.34-r1.ebuild 2801 SHA256 2ed1787d3b59297c0d255a5d7c2becf48a8c929d491d7e09ecf03466985cf6a2 SHA512 5411115f34bc9a141ab322bbc22b76ac6572d49531ed3f74ad7949ab6e980c09b2c5a427d8b53164de44815a70dca8f14a52632da5b8da0949c19f33599df205 WHIRLPOOL 35501b94ac1e7b4eb0f253bb8c4c331a275d8c59cdc1c86b6745bceb6bc6a9c6c65a1929cd4f41cd6498c73560b3c99f0f04c2935b183a9e32f5d31a6d5e84ef
-EBUILD cups-filters-1.0.34.ebuild 2500 SHA256 63e7ed79dd09e27aeac40868619ac897b9ce78bfefc1e59fa919dd086bdd465e SHA512 5471513bc22bfef56586b5dd100354c3b1e032ad456bdd2f958ded0e9c134ac2dc0c0b038b3838cfb2fe5fa6c6e31430da30d85b1faa2c1ee0fd37bd78bed16a WHIRLPOOL d41503848d65e6bfea9903ed09f498e9f44108201abc77bdcd0eb787411b9f2d6880dde5207d2d02441f0f33dfa01f549b85cc10a7e5de172ad6ec8a66b74613
 EBUILD cups-filters-9999.ebuild 2797 SHA256 d561471b02ec51367b67dd506f68628da81474cf714d561e186853665a10ba80 SHA512 04da2225be0926c90df585884dbc211927022bfa6c0a66f59154207253c71d1e7f7311e6e4be20091720b6e6d1217cc69e9573e09681207ee6ba770ffd7469c8 WHIRLPOOL 185f2e6cd301d1ff55c5cba729472b2df439721f1b25c43342460d2f6cc8a0e9feedcb2ed613ff49f89990edf37537ba4f40faa414a9ced2b9f5173eab5f1e94
-MISC ChangeLog 10781 SHA256 e1aac937288ff50e1775cdb895d35b3a56267405788fbc1606c55500c1e9f08f SHA512 aa346504e9566a254f290e832aed342fc637ce88aaa46043c16d14b120605f11cbd9b5de653cfe19821e89d7f40acddb33203c02ffea7fc82acd8e0510aa7baf WHIRLPOOL 3178b8fac64fd53dd3672213eb1136c246a43b504c249c628360ccf2e40f87a8f792e1e0ff58bebf04c9bbce236483735f1c4571b30de4e8aba207fa483871cf
+MISC ChangeLog 10998 SHA256 a6ed790739f95a95c7ba754ff186de28fcccf6fae6c3e8afb249e036ca7d426f SHA512 77fbb664138be45df8fb9a95e3d49f16a2440bcce406d809bf161944c9c41461aac4ee1e4055f8a4d6f05e51eee2f56543e738ca99b6eac8f1a1f136d956e667 WHIRLPOOL 63c7dfb2cb9db8062c8936eca99442c48ed7542f47ce49930c2c3600c5976d3d756775922ae0fac47713257178e8ef2bfd7349992edff252e8dc641f9bfb5214
 MISC metadata.xml 162 SHA256 753dd90680a9d937cb438cbf14dc217d518514d1596682a4e3478b1b7c7ba051 SHA512 ff7cd6e9d088c1ce0107a86a693abddb12d1385e8f9abb2614aa5cb8ed0c046a1387ccab1643fe711e84df1fa23659ce490f68f0504bbb908b7662a0ac490a03 WHIRLPOOL ccbf59144f058b49de3d54bbe6d92e2d2e8b605df10d5143ccfd7e4a021069ca025e87b4179179a60091c03d8bf1e371207c35f1102c2c1f848bf6697e9c2bb2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRk+nCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJRy3VPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOc8ccP/2T0Q4KVLLfx6Br6Vdawdg/z
-sSTCmVTm48rKWi6k6zlQX8PesICAF2RIuES0Zt2ZA0pONDt2rS7iuE6AxkAtFi/x
-JrghReazyxVpFPMbmfilMM2crGdy/i6C3gfMSNBqO2XiRUgAirnoXvEQRRqt1W9o
-81PCGSb2U+bxTGrKK0sj2pEIL8z82pG/09Gt/aZZtya+N6YOH19iM3Z4D46HPEpO
-+IaJXk6XCpm4A03m6qL78ecXJcH7ROSwhq0dQgY2ht4RDD/mdcX2rNOx6Mx2fS/d
-2Cicq1NAjXRKs3SDASOEY+jP0vsTMAN2Rycha1jmWN+NcIW3N8KqX1OYMDy1hh4z
-rc6ggm8L18z1OILxndIwn7ouwD4NjiGS8QfjVHWyWrsXyRcel1IqRsFGDt+Qj+ad
-0nprxqQ5SgyHP3rHehNzMx66GqdD0/Ie/jdETAQviLDzMOGLd7103uVpCTWozdaI
-+CNyc2fPK0+9q3aUH3Vm3OFs551DINqK5I7RjFs2XYoCIrAWI18cAzWV2vQfYrEl
-wEG2chZULVRrVXD0H652xho/GVpfqXYvBCLfe8KdLI5YM/n6V6wPBz1vXn0Newi/
-BiiTT4yFGDRMDpSTpSP2AcxUwgyMOW38u8EwsiuqZi2NF/63Z5Mf0aJGO5F+YdbK
-OozHdUrOk6hpMr01n37J
-=Taxm
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcOsYP/2bcGshmhT2gcgkMPQOOSPZY
+WEALqV3NxjkhMfsIA9g2gn71OfBxlIfNtbXUNx4KFkKB/j0FFEJKux6h2j0cMUQQ
+R9z6Rv9q1oVnI62V8qb7PSLzq+QP6fURW4jPsBZC3w0No64LUGUDvK2hV4rO5dB8
+NGW7hO8NhoUMxWwLvH2U4PDtzvnwjHslyQ3Sr4vSLdnQ92QSYNYRUq5glThooEqU
+JZVYpNnWL/Gl2RxiriJgkkC/4gN5tlwN/HI4NEkGoYvXWJw0fKa825vl1cll2RnK
+CsHJhUiBEOpFVioSKCPm1RwvwGKqulwKD0myYdnObQE8xDLB41zswwmejdx0Dw0a
+sc4Kzckh+f0omyig0lWKsx2qQb1I2utVO3d6DGFn+pc9ZTuxSWeIssU17/KmROa/
+DjVjdr6kuIR954I4IvXP/i+4ZtTRICswKiDwvTVLRMyrepSKdn9QjC7wvvgllCoX
+FkMAhILJ+op7SqevlQRfsDrYgtGRomnzRvy7ZrATyRyI6rZ+GOtMR+gv3Dc6GCvg
+2NS2t5pBMSeBBkwXo0qDNHCdvcSNXJCWTNQEp9tqhwE79lxyKANQGhP+K1jwWZQ2
+hOD/RLLgFq9D17NbIiWCRq+ssfldZUoKeHCPeCfV3EXnxmwOJb9jHDfFmx47kHaO
+fS708n2+tzh8zfEJs5qU
+=Q481
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups-filters/cups-filters-1.0.30-r1.ebuild b/net-print/cups-filters/cups-filters-1.0.30-r1.ebuild
deleted file mode 100644
index 8d60dce2f2c7..000000000000
--- a/net-print/cups-filters/cups-filters-1.0.30-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.30-r1.ebuild,v 1.1 2013/05/11 10:31:47 dilfridge Exp $
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-
-inherit base eutils perl-module autotools systemd
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit bzr
-	EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
-	KEYWORDS=""
-else
-	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-fi
-DESCRIPTION="Cups PDF filters"
-HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-IUSE="jpeg perl png static-libs tiff zeroconf"
-
-RDEPEND="
-	app-text/ghostscript-gpl
-	app-text/poppler:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)]
-	>=app-text/qpdf-3.0.2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/lcms:2
-	>net-print/cups-1.5.9999
-	!<=net-print/cups-1.5.9999
-	sys-devel/bc
-	sys-libs/zlib
-	jpeg? ( virtual/jpeg )
-	perl? ( dev-lang/perl )
-	png? ( media-libs/libpng:0= )
-	tiff? ( media-libs/tiff )
-	zeroconf? ( net-dns/avahi )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.29-openrc.patch"
-	"${FILESDIR}/${PN}-1.0.30-noavahi.patch"
-)
-
-src_prepare() {
-	base_src_prepare
-	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable zeroconf avahi) \
-		$(use_enable static-libs static) \
-		--with-fontdir="fonts/conf.avail" \
-		--with-pdftops=pdftops \
-		--enable-imagefilters \
-		$(use_with jpeg) \
-		$(use_with png) \
-		$(use_with tiff) \
-		--with-rcdir=no \
- 		--with-browseremoteprotocols=DNSSD,CUPS \
-		--without-php
-}
-
-src_compile() {
-	default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
-		perl-module_src_prep
-		perl-module_src_compile
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
-		perl-module_src_install
-		fixlocalpod
-		popd > /dev/null
-	fi
-
-	prune_libtool_files --all
-
-	use zeroconf && newinitd "${FILESDIR}"/cups-browsed.init.d cups-browsed
-	use zeroconf && systemd_dounit "${FILESDIR}/cups-browsed.service"
-}
-
-pkg_postinst() {
-	perl-module_pkg_postinst
-
-	if use zeroconf; then
-		elog "This version of cups-filters includes cups-browsed, a daemon that autodiscovers"
-		elog "remote queues via avahi and adds them to your cups configuration. You may want"
-		elog "to add it to your default runlevel. Not much tested so far, though."
-	fi
-}
diff --git a/net-print/cups-filters/cups-filters-1.0.34.ebuild b/net-print/cups-filters/cups-filters-1.0.34.ebuild
deleted file mode 100644
index 6fe72b3da9c5..000000000000
--- a/net-print/cups-filters/cups-filters-1.0.34.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.34.ebuild,v 1.1 2013/05/11 11:47:47 dilfridge Exp $
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-
-inherit base eutils perl-module autotools systemd
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit bzr
-	EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
-	KEYWORDS=""
-else
-	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-fi
-DESCRIPTION="Cups PDF filters"
-HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-IUSE="jpeg perl png static-libs tiff zeroconf"
-
-RDEPEND="
-	app-text/ghostscript-gpl
-	app-text/poppler:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)]
-	>=app-text/qpdf-3.0.2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/lcms:2
-	>net-print/cups-1.5.9999
-	!<=net-print/cups-1.5.9999
-	sys-devel/bc
-	sys-libs/zlib
-	jpeg? ( virtual/jpeg )
-	perl? ( dev-lang/perl )
-	png? ( media-libs/libpng:0= )
-	tiff? ( media-libs/tiff )
-	zeroconf? ( net-dns/avahi )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	base_src_prepare
-	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable zeroconf avahi) \
-		$(use_enable static-libs static) \
-		--with-fontdir="fonts/conf.avail" \
-		--with-pdftops=pdftops \
-		--enable-imagefilters \
-		$(use_with jpeg) \
-		$(use_with png) \
-		$(use_with tiff) \
-		--with-rcdir=no \
- 		--with-browseremoteprotocols=DNSSD,CUPS \
-		--without-php
-}
-
-src_compile() {
-	default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
-		perl-module_src_prep
-		perl-module_src_compile
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
-		perl-module_src_install
-		fixlocalpod
-		popd > /dev/null
-	fi
-
-	prune_libtool_files --all
-
-	newinitd "${FILESDIR}"/cups-browsed.init.d cups-browsed
-	systemd_dounit "${FILESDIR}/cups-browsed.service"
-}
-
-pkg_postinst() {
-	perl-module_pkg_postinst
-
-	elog "This version of cups-filters includes cups-browsed, a daemon that autodiscovers"
-	elog "remote queues via avahi or cups-1.5 browsing protocol and adds them to your cups"
-	elog "configuration. You may want to add it to your default runlevel."
-}
diff --git a/net-print/cups-filters/files/cups-filters-1.0.29-openrc.patch b/net-print/cups-filters/files/cups-filters-1.0.29-openrc.patch
deleted file mode 100644
index 3c56c3b1e3b2..000000000000
--- a/net-print/cups-filters/files/cups-filters-1.0.29-openrc.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -ruN cups-filters-1.0.29.orig/Makefile.am cups-filters-1.0.29/Makefile.am
---- cups-filters-1.0.29.orig/Makefile.am	2013-01-02 19:12:39.000000000 +0100
-+++ cups-filters-1.0.29/Makefile.am	2013-02-02 21:18:22.000000000 +0100
-@@ -602,7 +602,7 @@
- # UTILS
- # =====
- 
--EXTRA_DIST += utils/cups-browsed.in
-+# EXTRA_DIST += utils/cups-browsed.in
- sbin_PROGRAMS =
- if ENABLE_AVAHI
- sbin_PROGRAMS += \
-@@ -655,28 +655,9 @@
- 	rm -rf *.cache *~
- 
- install-data-hook:
--if ENABLE_AVAHI
--if RCLINKS
--	for level in $(RCLEVELS); do \
--		$(INSTALL) -d -m 755 $(DESTDIR)$(INITDIR)/rc$${level}.d; \
--		$(LN_S) ../init.d/cups-browsed $(DESTDIR)$(INITDIR)/rc$${level}.d/S$(RCSTART)cups-browsed; \
--		$(LN_S) ../init.d/cups-browsed $(DESTDIR)$(INITDIR)/rc$${level}.d/K$(RCSTOP)cups-browsed; \
--	done; \
--	$(INSTALL) -d -m 755 $(DESTDIR)$(INITDIR)/rc0.d; \
--	$(LN_S) ../init.d/cups-browsed $(DESTDIR)$(INITDIR)/rc0.d/K$(RCSTOP)cups-browsed;
--endif
--endif
- 	$(LN_S) pdf.utf-8.simple \
- 		$(DESTDIR)$(pkgcharsetdir)/pdf.utf-8
- 
- 
- uninstall-hook:
--if ENABLE_AVAHI
--if RCLINKS
--	if test "x$(INITDIR)" != x; then \
--		$(RM) $(DESTDIR)$(BUILDROOT)$(INITDIR)/rc?.d/[SK]??cups-browsed || :; \
--		rmdir $(DESTDIR)$(BUILDROOT)$(INITDIR)/rc?.d || :;\
--	fi
--endif
--endif
- 	$(RM) $(DESTDIR)$(pkgcharsetdir)/pdf.utf-8
diff --git a/net-print/cups-filters/files/cups-filters-1.0.30-noavahi.patch b/net-print/cups-filters/files/cups-filters-1.0.30-noavahi.patch
deleted file mode 100644
index 1177f4d8f99e..000000000000
--- a/net-print/cups-filters/files/cups-filters-1.0.30-noavahi.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ruN cups-filters-1.0.30.orig/configure.ac cups-filters-1.0.30/configure.ac
---- cups-filters-1.0.30.orig/configure.ac	2013-03-07 19:19:51.000000000 +0100
-+++ cups-filters-1.0.30/configure.ac	2013-03-17 16:34:35.000000000 +0100
-@@ -204,6 +204,10 @@
- dnl Check for pkg-config, which is used for some other tests later on...
- AC_PATH_PROG(PKGCONFIG, pkg-config)
- 
-+PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.30.2])
-+AC_SUBST(GLIB_CFLAGS)
-+AC_SUBST(GLIB_LIBS)
-+
- dnl Avahi for cups-browsed
- AVAHI_LIBS=""
- AVAHI_CFLAGS=""
-@@ -229,6 +233,8 @@
- 		AVAHI_CFLAGS="$AVAHI_CFLAGS `$PKGCONFIG --cflags avahi-client`"
- 		AVAHI_LIBS="$AVAHI_LIBS `$PKGCONFIG --libs avahi-client`"
- 		AC_DEFINE(HAVE_AVAHI, [], [Define if you have the avahi library])
-+
-+		PKG_CHECK_MODULES(AVAHI_GLIB, [avahi-glib])
- 	else
- 		AC_MSG_RESULT(no)
- 	fi
-@@ -237,11 +243,6 @@
- AC_SUBST(AVAHI_LIBS)
- AC_SUBST(AVAHI_CFLAGS)
- 
--PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.30.2])
--AC_SUBST(GLIB_CFLAGS)
--AC_SUBST(GLIB_LIBS)
--
--PKG_CHECK_MODULES(AVAHI_GLIB, [avahi-glib])
- AC_SUBST(AVAHI_GLIB_CFLAGS)
- AC_SUBST(AVAHI_GLIB_LIBS)
- 
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 2279f3d71367..b4a3bdafb5dc 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,9 @@
 # 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.537 2013/05/14 18:44:48 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.538 2013/06/26 23:14:34 dilfridge Exp $
+
+  26 Jun 2013; Andreas K. Huettel <dilfridge@gentoo.org> -cups-1.6.2-r3.ebuild:
+  Clean up
 
 *cups-1.6.2-r5 (14 May 2013)
 
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 471bb0fbb2af..c703fb4d36be 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -29,27 +29,26 @@ DIST cups-1.6.2-source.tar.bz2 8363773 SHA256 37a3ebd305e76cfd4c9c53013e89c0f7a4
 EBUILD cups-1.5.0.ebuild 8250 SHA256 0e7967449e58ad9c385154c93c7dd35cd211f8dd0624a7409843601e3ab6802f SHA512 725b0b632a55a227177ee6313d8ce21ff49ede6aa2cdecc62448069ad85dd979a8643e49054ee695408c66c46de7eb2d42c37cf411363be0fe638d1ad68d6829 WHIRLPOOL c11ebd1fa34492e7af49e8e0e3e131abd244529e7331c7a3421cce84777b44108f3e924fbaf7a86f3e031a0b8579f0e14580993e5063f3e6672d8d2b37e2badf
 EBUILD cups-1.5.2-r4.ebuild 8363 SHA256 5962ac89342b0430eb663dbd012af6ad02f836d712496088b65af28817a241c3 SHA512 dd1cb9a9c570d51e376c71c784a3c6dfff38e07a2594792666cbcded73ba3dc5301393fc59c01113cc6461fd1e63371348df015be9cd3d2aa50859ad296535b6 WHIRLPOOL 2a69b6d45f64b191dabb4b6a4f112c7a9975a356c28999e50a413e6ab73a7f292e00a5995d9008419420063ee769ee11879267acd69a12a2c81deb0ab00829f0
 EBUILD cups-1.5.3.ebuild 8623 SHA256 0a7ce20dfd2db91a6ed81c54bea74f57c2b416f245b33798fab8df01f8c3a2c6 SHA512 8e58e10a2c3c0cacc22bf2fb234ececcc6e9dc2c9a17d2babc7c491e0a956e8d42a29abc2d5e196b82593b593139430278fd83f27b6a6148f733aa65ea44a311 WHIRLPOOL 65af0f97161198ab8699da209f9de93d397d4d754258821ce29e5f772465906d4aeadae48a26dbee412ff5953eedc6e50d6b9da76d54626d1922fb1b55e2ec71
-EBUILD cups-1.6.2-r3.ebuild 8922 SHA256 4275ed53ca9aec23a415f95e214b83ccf83bb0c1566ec46bcd0fc855892f4c4b SHA512 e61aee93408fa21707f602dba03e7487d8eb286a2f2c30a9194f6c82f3d4689e89c91908603fb742caff595e32647132703fb3afe93da281acfcb29fc485e54a WHIRLPOOL 3d62981aba362fa3ccf5a8c6c63c9df5d90288479d423ca2e0b2010ce0beb753562dc938ca728108c9c586ee5b49bc5f630bf43fe9247e7e95b918e52519bbd0
 EBUILD cups-1.6.2-r5.ebuild 9222 SHA256 99c8495c9035aee48e1f8ef9f7101c4aa4dfa4ca9cdd5f43d421a64af56e32e7 SHA512 9fba4f202f5d638492ece0505bad9033b151ee91e62dd7f2a519aaf57e0b16795ab842ee9a7f6bcf5cec5745c5e40978fe478dc4395d91052ebb43008bfb7dd5 WHIRLPOOL a0e0df76ca5d897939e4114e1e2003330ee85c39f6618a43705a03a7ccb0a87ff81eca09862402a703aaad031cfc43ca2de7e1a2e2e66db827b20aba85a5431d
 EBUILD cups-9999.ebuild 9219 SHA256 0a6f4afc17194d15575c1daf19d4655b18ad430281d331d99ada0d951be6e75c SHA512 c77178d1875fa90cb81eff79af88d59fa5f96e751a0e1e1e6bf0a883b679256655e4741018c4175eb7326b9cf3a5906e8d96b545f07655eed4ebdc14792cc816 WHIRLPOOL a161c0c57c97a67f7a435c176e64b905a313a7468ff57c986ebc5aedcb56e36e72e46aecbbed0e6dcdde7623c05752b8510f77b3aad93e40e5ff7ff61a43bd03
-MISC ChangeLog 82176 SHA256 90a16bcb03fa39d6689269d54f857f0e64c232b3f6b97cc32868936e5dd01d99 SHA512 a9ae2562a6b3ad7a779483ed1868cd9d42ba5d4435326dabca4a54f40707f80ab2152f6b2e529d73fb89429501dc939163246fbd0ed5eb805747aadd74241722 WHIRLPOOL 6e03c1187319dc3058116cf1f457b453f8a286cee54123e3285b04d7060e7000f0ea1cfb5b69f1913698ba270fedc9cca137b35a9b4afd10b506d734ce5c5049
+MISC ChangeLog 82268 SHA256 38a5167c8c5ece3a7e3580cf05267a6ab1d1b038a89cde2eab8f6135684bc6b2 SHA512 a1ce74f28b3f816cec97764376359ed651140ee2484c2a0b60f9dac0928aa29200ee958846228da992f9cb256bcb6c03ee9eb140fbd88b49baeec4a5caa88069 WHIRLPOOL ccae26e86eef7d62f916b194de4f3f5b571d5f0f8b62c70eeb42f6056133c37653f40d1ce05ebf17d343207653995ae1e49b25312c43c74ae915ce28c9d87714
 MISC metadata.xml 888 SHA256 fc10de1798aeb6e16d8457d45abad85d39802e59a5f461d1374043a629ab8c6f SHA512 ff93d64033d5d7f3491b77af44a92553d9cefa4ea4671eb7a9380b5a2645fe7e384bf1e277a81431578524b6dce55528d6e0c1d3408c43f3f11140b21d9b623b WHIRLPOOL ab3145f58da411364c4c12e35d66c034ef02be686e8dfd696c207fffdf193ae4a4619a184364710f2409cc92b2dc3dfc75f703c29dfb5f59423b20c7dbd9fc87
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRkoaJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJRy3ZUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcEbQP/1TYwzm8FtkCG9vvYen05wnC
-QszA0DsDuq6lNUtQXb6TUTDSqtR08w1h4q2TqdympxXzd3KZ5AL89m+nrtjFwBvU
-ZiaoXNOeOmEt2Or5mW/NBnReNXMQ/e8r10zXIfetIRVJ1PO+sI8bjFX4QK0SUIZV
-+Xa7pHw60A6cTab9PAaGfKWYYSHqPiTrOwCgVsYLenIEWq+9UM6n2KmTgItzBnp0
-5WQbPqqmywqwmu+uNoppHNvXh6xGni9kgLILu9IT7HjKYAzsrNxb77OZ0S0+92DT
-oh6mk8iuOdqox07+Gecl4xhY12or7Qe4dmRDzDIIR/MgFN8fr/ursAS7ntvCOmD8
-HMr2lhBiU6PfHEjkQOUS4a9y5Ob0OMcSVSuzp5OlQUwhzYGQo00WK+TzTk59b+Xe
-nFI2gMhNBWPV5V7twqz++bnk6evZBxNCjlLmzKO3+ItJ6epQkhtYmoIzP3FdhX3s
-NShMIuOVyEmhNy0y5eLw+ZLFUWEjPI3SPQWGHpOsGwA+u+iPTJSqIPg5sf5aMPL8
-wmmAtwllMwuIbbtLXR0K9ODbMej+Rm4yDgSrl+zVSbKLNkvrekxubpqyu8qIbAHP
-fHSUqK8ki00BZKkg5flB4ac2uC23vH2nU/qEV4CTeYQnVzbTEuIbqs2wcJAifk9C
-Olwd7fXqvtZD00V5zpRR
-=cpY3
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcSPMP/2umJjkzRGq29o3vDjJXL2w7
+zGepjskJ0sZf5X3ZPOHBnJmbpdGATKXpfm0kr7Krw2dcf0TFjDoom04VhRDJ0VCk
+waPI8WwE+cL9jrQRuiVTT8f+aPAyflgqrwGMzVwkeBfnzuA0JIFBYTyqB/Vas6KT
+qc4ZGLpgTZzF4ZMA6jCadIyBzaPjy5RAB1Dt726M2V+9uVCzksUIqXpT/iXD3byL
+BMbXjag72ZZQSqmS+uqibiqKeWkpqZVytUc2O6ioqXg0+tgiPKgoPrq4zSTgZfAN
+m96hYRQtCTj1Q9Y7kEnVbmtT0Sc08xkRBjH28Sra6OrseIXrCfqLHCpk+Y6FkB1G
+bRWnNzj0HIuIT2hcObY60Hg30qbYKfy8+MQO5sqQlXZkVFBECdxGNwg+Op+LqfOK
+qdHOP3H2mIYB31X2T9XpCfmCfe/nANYR5GCFruyv7jSx92h6wNaIKhERqx8/+2HS
+9sZcwUROl2Okeday1IHYB1NNyVpKdd6KckaUgNC/mpKb4FN7iWbS+mUKg3kkxhVq
+nc4E2/xF8papNEvBfKWLyo6MeqBZIrHg/C6QgOZ/3jHj9RUhsiWaQBamae1YS5l1
+GuoQYhutfkEHO+pvs6zcfsLdPHFnxe3SED7PmIp4x2hLDpil/iUjE/JLmA6Y26I2
+DnuEaohYG3ZA09ay8ceK
+=0ct5
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.6.2-r3.ebuild b/net-print/cups/cups-1.6.2-r3.ebuild
deleted file mode 100644
index a41b3653f5fa..000000000000
--- a/net-print/cups/cups-1.6.2-r3.ebuild
+++ /dev/null
@@ -1,304 +0,0 @@
-# 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.2-r3.ebuild,v 1.4 2013/05/14 16:04:04 scarabeus Exp $
-
-EAPI=5
-
-PYTHON_DEPEND="python? 2:2.5"
-
-inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam python user versionator java-pkg-opt-2 systemd
-
-MY_P=${P/_beta/b}
-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 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-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 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 )
-	selinux? ( sec-policy/selinux-cups )
-	ssl? (
-		gnutls? (
-			dev-libs/libgcrypt
-			net-libs/gnutls
-		)
-		!gnutls? ( >=dev-libs/openssl-0.9.8g )
-	)
-	usb? ( virtual/libusb:0 )
-	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 )"
-
-# 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
-
-	# 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}"
-
-	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=/usr/$(get_libdir) \
-		--localstatedir=/var \
-		--with-cups-user=lp \
-		--with-cups-group=lp \
-		--with-docdir=/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) \
-		$(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)"/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_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*
-		rm -fv "${ED}"/usr/sbin/lp*
-		rm -fv "${ED}"/usr/share/man/man1/lp*
-		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
-	elif [[ "${REPLACING_VERSIONS}" ]] && [[ "${REPLACING_VERSIONS}" < "1.6.2" ]]; then
-		echo
-		elog "Starting with net-print/cups-filters-1.0.30, that package provides"
-		elog "a daemon cups-browsed which implements printer discovery via the"
-		elog "Cups-1.5 protocol. Not much tested so far though."
-		echo
-	fi
-}
-
-pkg_postrm() {
-	# Update desktop file database and gtk icon cache (bug 370059)
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}