Remove old and vulnerable versions, finally getting rid of CUPS 1.2.x.

(Portage version: 2.2_rc16/cvs/Linux 2.6.27-gentoo-r4 x86_64)

13 files changed, 13 insertions, 1209 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 98ca5f87117d..839bc9a92478 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.333 2008/11/09 21:44:56 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.334 2008/11/25 23:58:46 tgurr Exp $
+
+  25 Nov 2008; Timo Gurr <tgurr@gentoo.org>
+  -files/cups-1.2.12-CVE-2007-4045.patch,
+  -files/cups-1.2.12-CVE-2007-4351.patch,
+  -files/cups-1.2.12-CVE-2007-5849.patch,
+  -files/cups-1.2.12-CVE-2008-0047.patch,
+  -files/cups-1.2.12-CVE-2008-0053.patch,
+  -files/cups-1.2.12-CVE-2008-0882.patch,
+  -files/cups-1.2.12-CVE-2008-1373.patch,
+  -files/cups-1.2.12-CVE-2008-1722.patch, -files/cupsd.init,
+  -cups-1.2.12-r4.ebuild, -cups-1.2.12-r8.ebuild, -cups-1.3.8-r1.ebuild:
+  Remove old and vulnerable versions, finally getting rid of CUPS 1.2.x.
 
   09 Nov 2008; Tobias Klausmann <klausman@gentoo.org> Manifest:
   Fixed manifest for cups-1.3.8-source.tar.bz2
diff --git a/net-print/cups/cups-1.2.12-r4.ebuild b/net-print/cups/cups-1.2.12-r4.ebuild
deleted file mode 100644
index 24a83d8f8fea..000000000000
--- a/net-print/cups/cups-1.2.12-r4.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.12-r4.ebuild,v 1.8 2008/10/10 19:38:50 tgurr Exp $
-
-WANT_AUTOMAKE=latest
-
-inherit autotools eutils flag-o-matic multilib pam
-
-MY_P=${P/_}
-
-DESCRIPTION="The Common Unix Printing System"
-HOMEPAGE="http://www.cups.org/"
-SRC_URI="mirror://sourceforge/cups/${MY_P}-source.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="arm m68k s390 sh"
-IUSE="ldap ssl slp pam php samba nls dbus tiff png ppds jpeg X"
-
-DEP="pam? ( virtual/pam )
-	ssl? ( net-libs/gnutls )
-	slp? ( >=net-libs/openslp-1.0.4 )
-	ldap? ( net-nds/openldap )
-	dbus? ( sys-apps/dbus )
-	png? ( >=media-libs/libpng-1.2.1 )
-	tiff? ( >=media-libs/tiff-3.5.5 )
-	jpeg? ( >=media-libs/jpeg-6b )
-	php? ( dev-lang/php )
-	app-text/libpaper"
-DEPEND="${DEP}
-	!<net-print/foomatic-filters-ppds-20070501
-	!<net-print/hplip-1.7.4a-r1
-	nls? ( sys-devel/gettext )"
-RDEPEND="${DEP}
-	nls? ( virtual/libintl )
-	!virtual/lpr
-	>=app-text/poppler-0.4.3-r1
-	X? ( x11-misc/xdg-utils )"
-
-PDEPEND="
-	ppds? ( || (
-		(
-			net-print/foomatic-filters-ppds
-			net-print/foomatic-db-ppds
-		)
-		net-print/foomatic-filters-ppds
-		net-print/foomatic-db-ppds
-		net-print/hplip
-		net-print/gutenprint
-		net-print/foo2zjs
-		net-print/cups-pdf
-	) )
-	samba? ( >=net-fs/samba-3.0.8 )
-	virtual/ghostscript"
-PROVIDE="virtual/lpr"
-
-# upstream includes an interactive test which is a nono for gentoo.
-# therefore, since the printing herd has bigger fish to fry, for now,
-# we just leave it out, even if FEATURES=test
-RESTRICT="test"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if use x86 && [ -d "/usr/lib64" ]
-	then
-		eerror "You are running an x86 system, but /usr/lib64 exists, cups will install all library objects into this directory!"
-		eerror "You should remove /usr/lib64, but before you do, you should check for existing objects, and re-compile all affected packages."
-		eerror "You can use qfile (emerge portage-utils to install qfile) to get a list of the affected ebuilds:"
-		eerror "# qfile -qC /usr/lib64"
-		die "lib64 on x86 detected"
-	fi
-
-	enewgroup lp
-	enewuser lp -1 -1 -1 lp
-
-	enewgroup lpadmin 106
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# CVE-2007-4045 security patch, bug #199195
-	epatch "${FILESDIR}"/${PN}-1.2.12-CVE-2007-4045.patch
-	# CVE-2007-4351 security patch, bug #196736
-	epatch "${FILESDIR}"/${PN}-1.2.12-CVE-2007-4351.patch
-	# CVE-2007-5849 security patch, bug #201570
-	epatch "${FILESDIR}"/${PN}-1.2.12-CVE-2007-5849.patch
-
-	# cups does not use autotools "the usual way" and ship a static config.h.in
-	eaclocal
-	eautoconf
-}
-
-src_compile() {
-	export DSOFLAGS="${LDFLAGS}"
-
-	if use ldap; then
-		append-flags -DLDAP_DEPRECATED
-	fi
-
-	econf \
-		--with-cups-user=lp \
-		--with-cups-group=lp \
-		--with-system-groups=lpadmin \
-		--localstatedir=/var \
-		--with-docdir=/usr/share/cups/html \
-		$(use_enable pam) \
-		$(use_enable ssl) \
-		--enable-gnutls \
-		$(use_enable slp) \
-		$(use_enable nls) \
-		$(use_enable dbus) \
-		$(use_enable png) \
-		$(use_enable jpeg) \
-		$(use_enable tiff) \
-		$(use_with php) \
-		$(use_enable ldap) \
-		--enable-libpaper \
-		--enable-threads \
-		--enable-static \
-		--disable-pdftops \
-		|| die "econf failed"
-
-	# 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
-	sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/libexec/cups":' config.h
-	sed -i -e 's:cups_serverbin=.*:cups_serverbin=/usr/libexec/cups:' cups-config
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake BUILDROOT="${D}" install || die "emake install failed"
-	dodoc {CHANGES{,-1.{0,1}},CREDITS,LICENSE,README}.txt
-
-	# clean out cups init scripts
-	rm -rf "${D}"/etc/{init.d/cups,rc*,pam.d/cups}
-	# install our init scripts
-	newinitd "${FILESDIR}"/cupsd.init cupsd
-	# install our pam script
-	pamd_mimic_system cups auth account
-
-	# correct path
-	sed -i -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" "${D}"/etc/xinetd.d/cups-lpd
-	# it is safer to disable this by default, bug 137130
-	grep -w 'disable' "${D}"/etc/xinetd.d/cups-lpd || \
-		sed -i -e "s:}:\tdisable = yes\n}:" "${D}"/etc/xinetd.d/cups-lpd
-
-	# install pdftops filter
-	exeinto /usr/libexec/cups/filter/
-	newexe "${FILESDIR}"/pdftops-1.20.gentoo pdftops
-
-	# only for gs-esp this is correct, see bug 163897
-	if has_version app-text/ghostscript-gpl || has_version app-text/ghostscript-gnu; then
-		sed -i -e "s:#application/vnd.cups-postscript:application/vnd.cups-postscript:" "${D}"/etc/cups/mime.convs
-	fi
-
-	keepdir /usr/share/cups/profiles /usr/libexec/cups/driver /var/log/cups \
-		/var/run/cups/certs /var/cache/cups /var/spool/cups/tmp /etc/cups/ssl
-
-	# .desktop handling. X useflag. xdg-open from freedesktop is preferred
-	if use X; then
-		sed -i -e "s:htmlview:xdg-open:" "${D}"/usr/share/applications/cups.desktop
-	else
-		rm -r "${D}"/usr/share/applications
-	fi
-
-	# Fix a symlink collision, see bug #172341
-	dodir /usr/share/ppd
-	dosym /usr/share/ppd /usr/share/cups/model/foomatic-ppds
-}
-
-pkg_preinst() {
-	# cleanups
-	[ -n "${PN}" ] && rm -fR "${ROOT}"/usr/share/doc/${PN}-*
-	has_version "=${CATEGORY}/${PN}-1.1*"
-	upgrade_from_1_1=$?
-}
-
-pkg_postinst() {
-	echo
-	elog "Remote printing: change "
-	elog "Listen localhost:631"
-	elog "to"
-	elog "Listen *:631"
-	elog "in /etc/cups/cupsd.conf"
-	echo
-	elog "For more information about installing a printer take a look at:"
-	elog "http://www.gentoo.org/doc/en/printing-howto.xml."
-	echo
-
-	local good_gs=false
-	for x in app-text/ghostscript-gpl app-text/ghostscript-gnu app-text/ghostscript-esp; do
-		if has_version ${x} && built_with_use ${x} cups; then
-			good_gs=true
-			break
-		fi
-	done;
-	if ! ${good_gs}; then
-		ewarn
-		ewarn "You need to emerge ghostscript with the \"cups\" USE flag turned on"
-	fi
-	if [[ $upgrade_from_1_1 = 0 ]] ; then
-		ewarn
-		ewarn "The configuration changed with cups-1.2, you may want to save the old"
-		ewarn "one and start from scratch:"
-		ewarn "# mv /etc/cups /etc/cups.orig; emerge -va1 cups"
-		ewarn
-		ewarn "You need to rebuild kdelibs for kdeprinter to work with cups-1.2"
-	fi
-	if [ -e "${ROOT}"/usr/lib/cups ]; then
-		ewarn
-		ewarn "/usr/lib/cups exists - You need to remerge every ebuild that"
-		ewarn "installed into /usr/lib/cups and /etc/cups, qfile is in portage-utils:"
-		ewarn "# FEATURES=-collision-protect emerge -va1 \$(qfile -qC /usr/lib/cups /etc/cups | sed \"s:net-print/cups$::\")"
-		ewarn
-		ewarn "FEATURES=-collision-protect is needed to overwrite the compatibility"
-		ewarn "symlinks installed by this package, it wont be needed on later merges."
-		ewarn "You should also run revdep-rebuild"
-
-		# place symlinks to make the update smoothless
-		for i in "${ROOT}"/usr/lib/cups/{backend,filter}/*; do
-			if [ "${i/\*}" == "${i}" ] && ! [ -e ${i/lib/libexec} ]; then
-				ln -s ${i} ${i/lib/libexec}
-			fi
-		done
-	fi
-}
diff --git a/net-print/cups/cups-1.2.12-r8.ebuild b/net-print/cups/cups-1.2.12-r8.ebuild
deleted file mode 100644
index 5fa3c4107615..000000000000
--- a/net-print/cups/cups-1.2.12-r8.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.12-r8.ebuild,v 1.11 2008/10/10 20:26:35 tgurr Exp $
-
-inherit autotools eutils flag-o-matic multilib pam
-
-MY_P=${P/_}
-
-DESCRIPTION="The Common Unix Printing System"
-HOMEPAGE="http://www.cups.org/"
-SRC_URI="mirror://sourceforge/cups/${MY_P}-source.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~arm ~m68k ~s390 ~sh"
-IUSE="ldap ssl slp pam php samba nls dbus tiff png ppds jpeg X"
-
-DEP="pam? ( virtual/pam )
-	ssl? ( net-libs/gnutls )
-	slp? ( >=net-libs/openslp-1.0.4 )
-	ldap? ( net-nds/openldap )
-	dbus? ( sys-apps/dbus )
-	png? ( >=media-libs/libpng-1.2.1 )
-	tiff? ( >=media-libs/tiff-3.5.5 )
-	jpeg? ( >=media-libs/jpeg-6b )
-	php? ( dev-lang/php )
-	app-text/libpaper"
-DEPEND="${DEP}
-	!<net-print/foomatic-filters-ppds-20070501
-	!<net-print/hplip-1.7.4a-r1
-	nls? ( sys-devel/gettext )"
-RDEPEND="${DEP}
-	nls? ( virtual/libintl )
-	!virtual/lpr
-	>=app-text/poppler-0.4.3-r1
-	X? ( x11-misc/xdg-utils )"
-
-PDEPEND="
-	ppds? ( || (
-		(
-			net-print/foomatic-filters-ppds
-			net-print/foomatic-db-ppds
-		)
-		net-print/foomatic-filters-ppds
-		net-print/foomatic-db-ppds
-		net-print/hplip
-		net-print/gutenprint
-		net-print/foo2zjs
-		net-print/cups-pdf
-	) )
-	samba? ( >=net-fs/samba-3.0.8 )
-	virtual/ghostscript"
-PROVIDE="virtual/lpr"
-
-# upstream includes an interactive test which is a nono for gentoo.
-# therefore, since the printing herd has bigger fish to fry, for now,
-# we just leave it out, even if FEATURES=test
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use x86 && [ -d "/usr/lib64" ]
-	then
-		eerror "You are running an x86 system, but /usr/lib64 exists, cups will install all library objects into this directory!"
-		eerror "You should remove /usr/lib64, but before you do, you should check for existing objects, and re-compile all affected packages."
-		eerror "You can use qfile (emerge portage-utils to install qfile) to get a list of the affected ebuilds:"
-		eerror "# qfile -qC /usr/lib64"
-		die "lib64 on x86 detected"
-	fi
-
-	enewgroup lp
-	enewuser lp -1 -1 -1 lp
-
-	enewgroup lpadmin 106
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# CVE-2007-4351 security patch, bug #196736
-	epatch "${FILESDIR}"/${PN}-1.2.12-CVE-2007-4351.patch
-	# CVE-2007-5849 security patch, bug #201570
-	epatch "${FILESDIR}"/${PN}-1.2.12-CVE-2007-5849.patch
-	# CVE-2008-0047 security patch, bug #212364
-	epatch "${FILESDIR}"/${PN}-1.2.12-CVE-2008-0047.patch
-	# CVE-2008-0053 security patch, bug #214068
-	epatch "${FILESDIR}"/${PN}-1.2.12-CVE-2008-0053.patch
-	# CVE-2008-0882 security patch, bug #211449
-	epatch "${FILESDIR}"/${PN}-1.2.12-CVE-2008-0882.patch
-	# CVE-2008-1373 security patch, bug #214068
-	epatch "${FILESDIR}"/${PN}-1.2.12-CVE-2008-1373.patch
-	# CVE-2008-1722 security patch, bug #217232
-	epatch "${FILESDIR}"/${PN}-1.2.12-CVE-2008-1722.patch
-
-	# cups does not use autotools "the usual way" and ship a static config.h.in
-	eaclocal
-	eautoconf
-}
-
-src_compile() {
-	export DSOFLAGS="${LDFLAGS}"
-
-	if use ldap; then
-		append-flags -DLDAP_DEPRECATED
-	fi
-
-	econf \
-		--with-cups-user=lp \
-		--with-cups-group=lp \
-		--with-system-groups=lpadmin \
-		--localstatedir=/var \
-		--with-docdir=/usr/share/cups/html \
-		$(use_enable pam) \
-		$(use_enable ssl) \
-		--enable-gnutls \
-		$(use_enable slp) \
-		$(use_enable nls) \
-		$(use_enable dbus) \
-		$(use_enable png) \
-		$(use_enable jpeg) \
-		$(use_enable tiff) \
-		$(use_with php) \
-		$(use_enable ldap) \
-		--enable-libpaper \
-		--enable-threads \
-		--enable-static \
-		--disable-pdftops \
-		|| die "econf failed"
-
-	# 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
-	sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/libexec/cups":' config.h
-	sed -i -e 's:cups_serverbin=.*:cups_serverbin=/usr/libexec/cups:' cups-config
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake BUILDROOT="${D}" install || die "emake install failed"
-	dodoc {CHANGES{,-1.{0,1}},CREDITS,LICENSE,README}.txt
-
-	# clean out cups init scripts
-	rm -rf "${D}"/etc/{init.d/cups,rc*,pam.d/cups}
-	# install our init scripts
-	newinitd "${FILESDIR}"/cupsd.init cupsd
-	# install our pam script
-	pamd_mimic_system cups auth account
-
-	# correct path
-	sed -i -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" "${D}"/etc/xinetd.d/cups-lpd
-	# it is safer to disable this by default, bug 137130
-	grep -w 'disable' "${D}"/etc/xinetd.d/cups-lpd || \
-		sed -i -e "s:}:\tdisable = yes\n}:" "${D}"/etc/xinetd.d/cups-lpd
-
-	# install pdftops filter
-	exeinto /usr/libexec/cups/filter/
-	newexe "${FILESDIR}"/pdftops-1.20.gentoo pdftops
-
-	# only for gs-esp this is correct, see bug 163897
-	if has_version app-text/ghostscript-gpl || has_version app-text/ghostscript-gnu; then
-		sed -i -e "s:#application/vnd.cups-postscript:application/vnd.cups-postscript:" "${D}"/etc/cups/mime.convs
-	fi
-
-	keepdir /usr/share/cups/profiles /usr/libexec/cups/driver /var/log/cups \
-		/var/run/cups/certs /var/cache/cups /var/spool/cups/tmp /etc/cups/ssl
-
-	# .desktop handling. X useflag. xdg-open from freedesktop is preferred
-	if use X; then
-		sed -i -e "s:htmlview:xdg-open:" "${D}"/usr/share/applications/cups.desktop
-	else
-		rm -r "${D}"/usr/share/applications
-	fi
-
-	# Fix a symlink collision, see bug #172341
-	dodir /usr/share/ppd
-	dosym /usr/share/ppd /usr/share/cups/model/foomatic-ppds
-}
-
-pkg_preinst() {
-	# cleanups
-	[ -n "${PN}" ] && rm -fR "${ROOT}"/usr/share/doc/${PN}-*
-	has_version "=${CATEGORY}/${PN}-1.1*"
-	upgrade_from_1_1=$?
-}
-
-pkg_postinst() {
-	echo
-	elog "Remote printing: change "
-	elog "Listen localhost:631"
-	elog "to"
-	elog "Listen *:631"
-	elog "in /etc/cups/cupsd.conf"
-	echo
-	elog "For more information about installing a printer take a look at:"
-	elog "http://www.gentoo.org/doc/en/printing-howto.xml."
-	echo
-
-	local good_gs=false
-	for x in app-text/ghostscript-gpl app-text/ghostscript-gnu app-text/ghostscript-esp; do
-		if has_version ${x} && built_with_use ${x} cups; then
-			good_gs=true
-			break
-		fi
-	done;
-	if ! ${good_gs}; then
-		ewarn
-		ewarn "You need to emerge ghostscript with the \"cups\" USE flag turned on"
-	fi
-	if [[ $upgrade_from_1_1 = 0 ]] ; then
-		ewarn
-		ewarn "The configuration changed with cups-1.2, you may want to save the old"
-		ewarn "one and start from scratch:"
-		ewarn "# mv /etc/cups /etc/cups.orig; emerge -va1 cups"
-		ewarn
-		ewarn "You need to rebuild kdelibs for kdeprinter to work with cups-1.2"
-	fi
-	if [ -e "${ROOT}"/usr/lib/cups ]; then
-		ewarn
-		ewarn "/usr/lib/cups exists - You need to remerge every ebuild that"
-		ewarn "installed into /usr/lib/cups and /etc/cups, qfile is in portage-utils:"
-		ewarn "# FEATURES=-collision-protect emerge -va1 \$(qfile -qC /usr/lib/cups /etc/cups | sed \"s:net-print/cups$::\")"
-		ewarn
-		ewarn "FEATURES=-collision-protect is needed to overwrite the compatibility"
-		ewarn "symlinks installed by this package, it wont be needed on later merges."
-		ewarn "You should also run revdep-rebuild"
-
-		# place symlinks to make the update smoothless
-		for i in "${ROOT}"/usr/lib/cups/{backend,filter}/*; do
-			if [ "${i/\*}" == "${i}" ] && ! [ -e ${i/lib/libexec} ]; then
-				ln -s ${i} ${i/lib/libexec}
-			fi
-		done
-	fi
-}
diff --git a/net-print/cups/cups-1.3.8-r1.ebuild b/net-print/cups/cups-1.3.8-r1.ebuild
deleted file mode 100644
index 3ce36e19603f..000000000000
--- a/net-print/cups/cups-1.3.8-r1.ebuild
+++ /dev/null
@@ -1,295 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.8-r1.ebuild,v 1.11 2008/11/01 06:50:26 vapier Exp $
-
-inherit autotools eutils flag-o-matic multilib pam
-
-MY_P=${P/_}
-
-DESCRIPTION="The Common Unix Printing System"
-HOMEPAGE="http://www.cups.org/"
-SRC_URI="http://ftp.easysw.com/pub/cups/${PV}/${MY_P}-source.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="acl avahi dbus gnutls java jpeg kerberos ldap pam perl php png ppds python samba slp ssl static tiff X xinetd zeroconf"
-
-COMMON_DEPEND="acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) )
-	avahi? ( net-dns/avahi )
-	dbus? ( sys-apps/dbus )
-	gnutls? ( net-libs/gnutls )
-	java? ( >=virtual/jre-1.4 )
-	jpeg? ( >=media-libs/jpeg-6b )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	pam? ( virtual/pam )
-	perl? ( dev-lang/perl )
-	php? ( dev-lang/php )
-	png? ( >=media-libs/libpng-1.2.1 )
-	python? ( dev-lang/python )
-	slp? ( >=net-libs/openslp-1.0.4 )
-	ssl? ( !gnutls? ( >=dev-libs/openssl-0.9.8g ) )
-	tiff? ( >=media-libs/tiff-3.5.5 )
-	xinetd? ( sys-apps/xinetd )
-	zeroconf? ( !avahi? ( net-misc/mDNSResponder ) )
-	app-text/libpaper
-	dev-libs/libgcrypt"
-
-DEPEND="${COMMON_DEPEND}
-	!<net-print/foomatic-filters-ppds-20070501
-	!<net-print/hplip-1.7.4a-r1"
-
-RDEPEND="${COMMON_DEPEND}
-	!virtual/lpr
-	X? ( x11-misc/xdg-utils )
-	>=app-text/poppler-0.4.3-r1"
-
-PDEPEND="
-	ppds? ( || (
-		(
-			net-print/foomatic-filters-ppds
-			net-print/foomatic-db-ppds
-		)
-		net-print/foomatic-filters-ppds
-		net-print/foomatic-db-ppds
-		net-print/hplip
-		net-print/gutenprint
-		net-print/foo2zjs
-		net-print/cups-pdf
-	) )
-	samba? ( >=net-fs/samba-3.0.8 )
-	virtual/ghostscript"
-
-PROVIDE="virtual/lpr"
-
-# upstream includes an interactive test which is a nono for gentoo.
-# therefore, since the printing herd has bigger fish to fry, for now,
-# we just leave it out, even if FEATURES=test
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-LANGS="de en es et fr he id it ja pl sv zh_TW"
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-pkg_setup() {
-	if use avahi && ! built_with_use net-dns/avahi mdnsresponder-compat ; then
-		echo
-		eerror "In order to have cups working with avahi zeroconf support, you need"
-		eerror "to have net-dns/avahi emerged with \"mdnsresponder-compat\" in your USE"
-		eerror "flag. Please add that flag, re-emerge avahi, and then emerge cups again."
-		die "net-dns/avahi is missing the mdnsresponder-compat feature."
-	fi
-
-	enewgroup lp
-	enewuser lp -1 -1 -1 lp
-
-	enewgroup lpadmin 106
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# disable configure automagic for acl/attr, upstream bug STR #2723
-	epatch "${FILESDIR}/${PN}-1.3.0-configure.patch"
-
-	# create a missing symlink to allow https printing via IPP, bug #217293
-	epatch "${FILESDIR}/${PN}-1.3.7-backend-https.patch"
-
-	# Upstream fix for using the webinterface via SSL with FF3, upstream bug STR #2892
-	epatch "${FILESDIR}/${PN}-1.3.8-str2892-1.3.patch"
-
-	# cups does not use autotools "the usual way" and ship a static config.h.in
-	eaclocal
-	eautoconf
-}
-
-src_compile() {
-	# needed to prevent ghostscript compile failures
-	use kerberos && strip-flags
-
-	# locale support
-	strip-linguas ${LANGS}
-
-	if [ -z "${LINGUAS}" ] ; then
-		export LINGUAS=all
-	fi
-
-	export DSOFLAGS="${LDFLAGS}"
-
-	if use ldap ; then
-		append-flags -DLDAP_DEPRECATED
-	fi
-
-	local myconf
-
-	if use avahi || use zeroconf ; then
-		myconf="${myconf} --enable-dnssd"
-	else
-		myconf="${myconf} --disable-dnssd"
-	fi
-
-	if use ssl || use gnutls ; then
-		myconf="${myconf} \
-			$(use_enable gnutls) \
-			$(use_enable !gnutls openssl)"
-	else
-		myconf="${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 \
-		--with-xinetd=/etc/xinetd.d \
-		$(use_enable acl) \
-		$(use_enable dbus) \
-		$(use_enable jpeg) \
-		$(use_enable kerberos gssapi) \
-		$(use_enable ldap) \
-		$(use_enable pam) \
-		$(use_enable png) \
-		$(use_enable slp) \
-		$(use_enable static) \
-		$(use_enable tiff) \
-		$(use_with java) \
-		$(use_with perl) \
-		$(use_with php) \
-		$(use_with python) \
-		--enable-libpaper \
-		--enable-threads \
-		--disable-pdftops \
-		${myconf} \
-		|| die "econf failed"
-
-	# 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
-	sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/libexec/cups":' config.h
-	sed -i -e 's:cups_serverbin=.*:cups_serverbin=/usr/libexec/cups:' cups-config
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake BUILDROOT="${D}" install || die "emake install failed"
-	dodoc {CHANGES{,-1.{0,1}},CREDITS,README}.txt || die "dodoc install failed"
-
-	# clean out cups init scripts
-	rm -rf "${D}"/etc/{init.d/cups,rc*,pam.d/cups}
-
-	# install our init script
-	local neededservices
-	use avahi && neededservices="$neededservices avahi-daemon"
-	use dbus && neededservices="$neededservices dbus"
-	use zeroconf && ! use avahi && neededservices="$neededservices mDNSResponderPosix"
-	[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
-	sed -e "s/@neededservices@/$neededservices/" "${FILESDIR}"/cupsd.init.d > "${T}"/cupsd
-	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:" "${D}"/etc/xinetd.d/cups-lpd
-		# it is safer to disable this by default, bug #137130
-		grep -w 'disable' "${D}"/etc/xinetd.d/cups-lpd || \
-			sed -i -e "s:}:\tdisable = yes\n}:" "${D}"/etc/xinetd.d/cups-lpd
-	else
-		rm -rf "${D}"/etc/xinetd.d
-	fi
-
-	# install pdftops filter
-	exeinto /usr/libexec/cups/filter/
-	newexe "${FILESDIR}"/pdftops-1.20.gentoo pdftops
-
-	# only for gs-esp this is correct, see bug #163897
-	if has_version app-text/ghostscript-gpl || has_version app-text/ghostscript-gnu ; then
-		sed -i -e "s:#application/vnd.cups-postscript:application/vnd.cups-postscript:" "${D}"/etc/cups/mime.convs
-	fi
-
-	keepdir /usr/share/cups/profiles /usr/libexec/cups/driver /var/log/cups \
-		/var/run/cups/certs /var/cache/cups /var/spool/cups/tmp /etc/cups/ssl
-
-	# .desktop handling. X useflag. xdg-open from freedesktop is preferred, upstream bug STR #2724.
-	if use X ; then
-		sed -i -e "s:htmlview:xdg-open:" "${D}"/usr/share/applications/cups.desktop
-	else
-		rm -r "${D}"/usr/share/applications
-	fi
-
-	# fix a symlink collision, see bug #172341
-	dodir /usr/share/ppd
-	dosym /usr/share/ppd /usr/share/cups/model/foomatic-ppds
-
-	# create RSS feed directory
-	diropts -m 0740 -o lp -g lp
-	dodir /var/cache/cups/rss
-
-	# create /etc/cups/client.conf, bug #196967
-	echo "ServerName localhost" >> "${D}"/etc/cups/client.conf
-}
-
-pkg_preinst() {
-	# cleanups
-	[ -n "${PN}" ] && rm -fR "${ROOT}"/usr/share/doc/"${PN}"-*
-	has_version "=${CATEGORY}/${PN}-1.2*"
-	upgrade_from_1_2=$?
-}
-
-pkg_postinst() {
-	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
-
-	local good_gs=false
-	for x in app-text/ghostscript-gpl app-text/ghostscript-gnu app-text/ghostscript-esp ; do
-		if has_version ${x} && built_with_use ${x} cups ; then
-			good_gs=true
-			break
-		fi
-	done
-	if ! ${good_gs} ; then
-		echo
-		ewarn "You need to emerge ghostscript with the \"cups\" USE flag turned on."
-		echo
-	fi
-
-	if [[ $upgrade_from_1_2 = 0 ]] ; then
-		echo
-		ewarn "You have upgraded from an older cups version. Please make sure"
-		ewarn "to run \"etc-update\" and \"revdep-rebuild\" NOW."
-		echo
-	fi
-
-	if [ -e "${ROOT}"/usr/lib/cups ] ; then
-		echo
-		ewarn "/usr/lib/cups exists - You need to remerge every ebuild that"
-		ewarn "installed into /usr/lib/cups and /etc/cups, qfile is in portage-utils:"
-		ewarn "# FEATURES=-collision-protect emerge -va1 \$(qfile -qC /usr/lib/cups /etc/cups | sed \"s:net-print/cups$::\")"
-		echo
-		ewarn "FEATURES=-collision-protect is needed to overwrite the compatibility"
-		ewarn "symlinks installed by this package, it won't be needed on later merges."
-		ewarn "You should also run revdep-rebuild"
-		echo
-
-		# place symlinks to make the update smoothless
-		for i in "${ROOT}"/usr/lib/cups/{backend,filter}/* ; do
-			if [ "${i/\*}" == "${i}" ] && ! [ -e ${i/lib/libexec} ] ; then
-				ln -s ${i} ${i/lib/libexec}
-			fi
-		done
-	fi
-}
diff --git a/net-print/cups/files/cups-1.2.12-CVE-2007-4045.patch b/net-print/cups/files/cups-1.2.12-CVE-2007-4045.patch
deleted file mode 100644
index e28a7bb4ff9d..000000000000
--- a/net-print/cups/files/cups-1.2.12-CVE-2007-4045.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -up cups-1.2.4/scheduler/client.c.CVE-2007-4045 cups-1.2.4/scheduler/client.c
---- cups-1.2.4/scheduler/client.c.CVE-2007-4045	2007-10-30 09:51:04.000000000 +0000
-+++ cups-1.2.4/scheduler/client.c	2007-10-30 10:07:10.000000000 +0000
-@@ -105,6 +105,25 @@ static int		write_file(cupsd_client_t *c
- 				   struct stat *filestats);
- 
- 
-+void
-+_cupsdFixClientsBIO(void)
-+{
-+#ifdef HAVE_LIBSSL
-+  cupsd_client_t *c;
-+  BIO *bio;
-+  cupsArraySave (Clients);
-+  for (c = (cupsd_client_t *)cupsArrayFirst(Clients);
-+       c;
-+       c = (cupsd_client_t *)cupsArrayNext(Clients))
-+  {
-+    bio = SSL_get_wbio(c->http.tls);
-+    BIO_ctrl(bio, BIO_C_SET_FILE_PTR, 0, (char *)HTTP(c));
-+  }
-+  cupsArrayRestore (Clients);
-+#endif
-+}
-+
-+
- /*
-  * 'cupsdAcceptClient()' - Accept a new client.
-  */
-@@ -438,6 +457,7 @@ cupsdAcceptClient(cupsd_listener_t *lis)
-   }
- 
-   cupsArrayAdd(Clients, con);
-+  _cupsdFixClientsBIO();
- 
-   cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                   "cupsdAcceptClient: %d connected to server on %s:%d",
-@@ -729,6 +749,7 @@ cupsdCloseClient(cupsd_client_t *con)	/*
-     */
- 
-     cupsArrayRemove(Clients, con);
-+    _cupsdFixClientsBIO();
- 
-     free(con);
-   }
-diff -up cups-1.2.4/scheduler/main.c.CVE-2007-4045 cups-1.2.4/scheduler/main.c
---- cups-1.2.4/scheduler/main.c.CVE-2007-4045	2007-10-30 09:51:04.000000000 +0000
-+++ cups-1.2.4/scheduler/main.c	2007-10-30 09:51:05.000000000 +0000
-@@ -948,7 +948,7 @@ main(int  argc,				/* I - Number of comm
-       * Write data as needed...
-       */
- 
--      if (con->pipe_pid && FD_ISSET(con->file, input))
-+      if (con->pipe_pid && con->file >= 0 && FD_ISSET(con->file, input))
-       {
-        /*
-         * Keep track of pending input from the file/pipe separately
-
diff --git a/net-print/cups/files/cups-1.2.12-CVE-2007-4351.patch b/net-print/cups/files/cups-1.2.12-CVE-2007-4351.patch
deleted file mode 100644
index 5cd70e0a3abe..000000000000
--- a/net-print/cups/files/cups-1.2.12-CVE-2007-4351.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-Index: ipp.c
-===================================================================
---- cups-1.2.12.orig/cups/ipp.c	(revision 7023)
-+++ cups-1.2.12./cups/ipp.c	(working copy)
-@@ -1315,6 +1315,12 @@
- 	  {
- 	    case IPP_TAG_INTEGER :
- 	    case IPP_TAG_ENUM :
-+		if (n != 4)
-+		{
-+		  DEBUG_printf(("ippReadIO: bad value length %d!\n", n));
-+		  return (IPP_ERROR);
-+		}
-+
- 	        if ((*cb)(src, buffer, 4) < 4)
- 		{
- 	          DEBUG_puts("ippReadIO: Unable to read integer value!");
-@@ -1327,6 +1333,12 @@
-                 value->integer = n;
- 	        break;
- 	    case IPP_TAG_BOOLEAN :
-+		if (n != 1)
-+		{
-+		  DEBUG_printf(("ippReadIO: bad value length %d!\n", n));
-+		  return (IPP_ERROR);
-+		}
-+
- 	        if ((*cb)(src, buffer, 1) < 1)
- 		{
- 	          DEBUG_puts("ippReadIO: Unable to read boolean value!");
-@@ -1344,6 +1356,12 @@
- 	    case IPP_TAG_CHARSET :
- 	    case IPP_TAG_LANGUAGE :
- 	    case IPP_TAG_MIMETYPE :
-+		if (n >= sizeof(buffer))
-+		{
-+		  DEBUG_printf(("ippReadIO: bad value length %d!\n", n));
-+		  return (IPP_ERROR);
-+		}
-+
- 		if ((*cb)(src, buffer, n) < n)
- 		{
- 		  DEBUG_puts("ippReadIO: unable to read name!");
-@@ -1356,6 +1374,12 @@
- 		              value->string.text));
- 	        break;
- 	    case IPP_TAG_DATE :
-+		if (n != 11)
-+		{
-+		  DEBUG_printf(("ippReadIO: bad value length %d!\n", n));
-+		  return (IPP_ERROR);
-+		}
-+
- 	        if ((*cb)(src, value->date, 11) < 11)
- 		{
- 	          DEBUG_puts("ippReadIO: Unable to date integer value!");
-@@ -1363,6 +1387,12 @@
- 		}
- 	        break;
- 	    case IPP_TAG_RESOLUTION :
-+		if (n != 9)
-+		{
-+		  DEBUG_printf(("ippReadIO: bad value length %d!\n", n));
-+		  return (IPP_ERROR);
-+		}
-+
- 	        if ((*cb)(src, buffer, 9) < 9)
- 		{
- 	          DEBUG_puts("ippReadIO: Unable to read resolution value!");
-@@ -1379,6 +1409,12 @@
- 		    (ipp_res_t)buffer[8];
- 	        break;
- 	    case IPP_TAG_RANGE :
-+		if (n != 8)
-+		{
-+		  DEBUG_printf(("ippReadIO: bad value length %d!\n", n));
-+		  return (IPP_ERROR);
-+		}
-+
- 	        if ((*cb)(src, buffer, 8) < 8)
- 		{
- 	          DEBUG_puts("ippReadIO: Unable to read range value!");
-@@ -1394,7 +1430,7 @@
- 	        break;
- 	    case IPP_TAG_TEXTLANG :
- 	    case IPP_TAG_NAMELANG :
--	        if (n > sizeof(buffer) || n < 4)
-+	        if (n >= sizeof(buffer) || n < 4)
- 		{
- 		  DEBUG_printf(("ippReadIO: bad value length %d!\n", n));
- 		  return (IPP_ERROR);
-@@ -1420,22 +1456,27 @@
- 
- 		n = (bufptr[0] << 8) | bufptr[1];
- 
--                if (n >= sizeof(string))
-+		if ((bufptr + 2 + n) >= (buffer + sizeof(buffer)) ||
-+		    n >= sizeof(string))
- 		{
--		  memcpy(string, bufptr + 2, sizeof(string) - 1);
--		  string[sizeof(string) - 1] = '\0';
-+		  DEBUG_printf(("ippReadIO: bad value length %d!\n", n));
-+		  return (IPP_ERROR);
- 		}
--		else
--		{
--		  memcpy(string, bufptr + 2, n);
--		  string[n] = '\0';
--                }
- 
-+		memcpy(string, bufptr + 2, n);
-+		string[n] = '\0';
-+
- 		value->string.charset = _cupsStrAlloc((char *)string);
- 
-                 bufptr += 2 + n;
- 		n = (bufptr[0] << 8) | bufptr[1];
- 
-+		if ((bufptr + 2 + n) >= (buffer + sizeof(buffer)))
-+		{
-+		  DEBUG_printf(("ippReadIO: bad value length %d!\n", n));
-+		  return (IPP_ERROR);
-+		}
-+
- 		bufptr[2 + n] = '\0';
-                 value->string.text = _cupsStrAlloc((char *)bufptr + 2);
- 	        break;
-@@ -1477,6 +1518,12 @@
- 		* we need to carry over...
- 		*/
- 
-+		if (n >= sizeof(buffer))
-+		{
-+		  DEBUG_printf(("ippReadIO: bad value length %d!\n", n));
-+		  return (IPP_ERROR);
-+		}
-+
- 	        if ((*cb)(src, buffer, n) < n)
- 		{
- 	          DEBUG_puts("ippReadIO: Unable to read member name value!");
-@@ -1498,6 +1545,12 @@
- 		break;
- 
-             default : /* Other unsupported values */
-+		if (n > sizeof(buffer))
-+		{
-+		  DEBUG_printf(("ippReadIO: bad value length %d!\n", n));
-+		  return (IPP_ERROR);
-+		}
-+
-                 value->unknown.length = n;
- 	        if (n > 0)
- 		{
-
diff --git a/net-print/cups/files/cups-1.2.12-CVE-2007-5849.patch b/net-print/cups/files/cups-1.2.12-CVE-2007-5849.patch
deleted file mode 100644
index cc1c9067b904..000000000000
--- a/net-print/cups/files/cups-1.2.12-CVE-2007-5849.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Naur cups-1.3.4/backend/snmp.c cups-1.3.4.new/backend/snmp.c
---- cups-1.3.4/backend/snmp.c	2007-07-11 23:46:42.000000000 +0200
-+++ cups-1.3.4.new/backend/snmp.c	2007-12-10 12:56:12.680574919 +0100
-@@ -1064,18 +1064,38 @@
-     char          *string,		/* I  - String buffer */
-     int           strsize)		/* I  - String buffer size */
- {
--  if (length < strsize)
-+  if (length < 0)
-   {
--    memcpy(string, *buffer, length);
-+   /*
-+    * Disallow negative lengths!
-+    */
-+
-+    fprintf(stderr, "ERROR: Bad ASN1 string length %d!\n", length);
-+    *string = '\0';
-+  }
-+  else if (length < strsize)
-+  {
-+   /*
-+    * String is smaller than the buffer...
-+    */
-+
-+    if (length > 0)
-+      memcpy(string, *buffer, length);
-+
-     string[length] = '\0';
-   }
-   else
-   {
-+   /*
-+    * String is larger than the buffer...
-+    */
-+
-     memcpy(string, buffer, strsize - 1);
-     string[strsize - 1] = '\0';
-   }
- 
--  (*buffer) += length;
-+  if (length > 0)
-+    (*buffer) += length;
- 
-   return (string);
- }
diff --git a/net-print/cups/files/cups-1.2.12-CVE-2008-0047.patch b/net-print/cups/files/cups-1.2.12-CVE-2008-0047.patch
deleted file mode 100644
index 6eb786ff9eb4..000000000000
--- a/net-print/cups/files/cups-1.2.12-CVE-2008-0047.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: cups-1.2.12/cgi-bin/search.c
-===================================================================
---- cups-1.2.12.orig/cgi-bin/search.c
-+++ cups-1.2.12/cgi-bin/search.c
-@@ -171,7 +171,9 @@ cgiCompileSearch(const char *query)	/* I
-       * string + RE overhead...
-       */
- 
--      wlen = (sptr - s) + 4 * wlen + 2 * strlen(prefix) + 4;
-+      wlen = (sptr - s) + 2 * 4 * wlen + 2 * strlen(prefix) + 11;
-+      if (lword)
-+        wlen += strlen(lword);
- 
-       if (wlen > slen)
-       {
diff --git a/net-print/cups/files/cups-1.2.12-CVE-2008-0053.patch b/net-print/cups/files/cups-1.2.12-CVE-2008-0053.patch
deleted file mode 100644
index 8924068d6d7f..000000000000
--- a/net-print/cups/files/cups-1.2.12-CVE-2008-0053.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: cups-1.2.12/filter/hpgl-input.c
-===================================================================
---- cups-1.2.12.orig/filter/hpgl-input.c
-+++ cups-1.2.12/filter/hpgl-input.c
-@@ -56,6 +56,7 @@ ParseCommand(FILE    *fp,	/* I - File to
- 		i;		/* Looping var */
-   char		buf[262144],	/* String buffer */
- 		*bufptr;	/* Pointer into buffer */
-+  float		temp;		/* Temporary parameter value */
-   static param_t p[MAX_PARAMS];	/* Parameter buffer */
- 
- 
-@@ -220,10 +221,10 @@ ParseCommand(FILE    *fp,	/* I - File to
-       case '-' :
-       case '+' :
-           ungetc(ch, fp);
--          fscanf(fp, "%f", &(p[num_params].value.number));
--          if (num_params < MAX_PARAMS)
-+          if (fscanf(fp, "%f", &temp) == 1 && num_params < MAX_PARAMS)
-           {
--            p[num_params].type = PARAM_RELATIVE;
-+            p[num_params].type         = PARAM_RELATIVE;
-+            p[num_params].value.number = temp;
-             num_params ++;
-           }
-           break;
-@@ -239,10 +240,10 @@ ParseCommand(FILE    *fp,	/* I - File to
-       case '9' :
-       case '.' :
-           ungetc(ch, fp);
--          fscanf(fp, "%f", &(p[num_params].value.number));
--          if (num_params < MAX_PARAMS)
-+          if (fscanf(fp, "%f", &temp) == 1 && num_params < MAX_PARAMS)
-           {
--            p[num_params].type = PARAM_ABSOLUTE;
-+            p[num_params].type         = PARAM_ABSOLUTE;
-+            p[num_params].value.number = temp;
-             num_params ++;
-           }
-           break;
diff --git a/net-print/cups/files/cups-1.2.12-CVE-2008-0882.patch b/net-print/cups/files/cups-1.2.12-CVE-2008-0882.patch
deleted file mode 100644
index 655e70e01bf7..000000000000
--- a/net-print/cups/files/cups-1.2.12-CVE-2008-0882.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -up cups-1.2.4/scheduler/dirsvc.c.str2656 cups-1.2.4/scheduler/dirsvc.c
---- cups-1.2.4/scheduler/dirsvc.c.str2656	2008-02-21 13:33:06.000000000 +0000
-+++ cups-1.2.4/scheduler/dirsvc.c	2008-02-21 13:33:49.000000000 +0000
-@@ -1943,9 +1943,9 @@ process_browse_data(
-     if (hptr && !*hptr)
-       *hptr = '.';			/* Resource FQDN */
- 
--    if ((p = cupsdFindClass(name)) == NULL && BrowseShortNames)
-+    if ((p = cupsdFindDest(name)) == NULL && BrowseShortNames)
-     {
--      if ((p = cupsdFindClass(resource + 9)) != NULL)
-+      if ((p = cupsdFindDest(resource + 9)) != NULL)
-       {
-         if (p->hostname && strcasecmp(p->hostname, host))
- 	{
-@@ -2049,9 +2049,9 @@ process_browse_data(
-     if (hptr && !*hptr)
-       *hptr = '.';			/* Resource FQDN */
- 
--    if ((p = cupsdFindPrinter(name)) == NULL && BrowseShortNames)
-+    if ((p = cupsdFindDest(name)) == NULL && BrowseShortNames)
-     {
--      if ((p = cupsdFindPrinter(resource + 10)) != NULL)
-+      if ((p = cupsdFindDest(resource + 10)) != NULL)
-       {
-         if (p->hostname && strcasecmp(p->hostname, host))
- 	{
-
diff --git a/net-print/cups/files/cups-1.2.12-CVE-2008-1373.patch b/net-print/cups/files/cups-1.2.12-CVE-2008-1373.patch
deleted file mode 100644
index 299caa5442dd..000000000000
--- a/net-print/cups/files/cups-1.2.12-CVE-2008-1373.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: cups-1.2.12/filter/image-gif.c
-===================================================================
---- cups-1.2.12.orig/filter/image-gif.c
-+++ cups-1.2.12/filter/image-gif.c
-@@ -47,6 +47,8 @@
- #define GIF_INTERLACE	0x40
- #define GIF_COLORMAP	0x80
- 
-+#define MAX_LWZ_BITS	12
-+
- typedef cups_ib_t	gif_cmap_t[256][4];
- typedef short		gif_table_t[4096];
- 
-@@ -471,6 +473,9 @@ gif_read_image(FILE         *fp,	/* I - 
-   pass      = 0;
-   code_size = getc(fp);
- 
-+  if (code_size > MAX_LWZ_BITS)
-+    return (-1);
-+
-   if (gif_read_lzw(fp, 1, code_size) < 0)
-     return (-1);
- 
diff --git a/net-print/cups/files/cups-1.2.12-CVE-2008-1722.patch b/net-print/cups/files/cups-1.2.12-CVE-2008-1722.patch
deleted file mode 100644
index dad7dd083aea..000000000000
--- a/net-print/cups/files/cups-1.2.12-CVE-2008-1722.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -Naur cups-1.2.12/filter/image-png.c cups-1.2.12.new/filter/image-png.c
---- cups-1.2.12/filter/image-png.c	2006-05-11 13:41:36.000000000 +0200
-+++ cups-1.2.12.new/filter/image-png.c	2008-04-14 15:46:35.665695675 +0200
-@@ -179,16 +179,56 @@
-     * Interlaced images must be loaded all at once...
-     */
- 
-+    size_t bufsize;			/* Size of buffer */
-+
-+
-     if (color_type == PNG_COLOR_TYPE_GRAY ||
- 	color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
--      in = malloc(img->xsize * img->ysize);
-+    {
-+      bufsize = img->xsize * img->ysize;
-+
-+      if ((bufsize / img->ysize) != img->xsize)
-+      {
-+	fprintf(stderr, "DEBUG: PNG image dimensions (%ux%u) too large!\n",
-+		(unsigned)width, (unsigned)height);
-+	fclose(fp);
-+	return (1);
-+      }
-+    }
-     else
--      in = malloc(img->xsize * img->ysize * 3);
-+    {
-+      bufsize = img->xsize * img->ysize * 3;
-+
-+      if ((bufsize / (img->ysize * 3)) != img->xsize)
-+      {
-+	fprintf(stderr, "DEBUG: PNG image dimensions (%ux%u) too large!\n",
-+		(unsigned)width, (unsigned)height);
-+	fclose(fp);
-+	return (1);
-+      }
-+    }
-+
-+    in = malloc(bufsize);
-   }
- 
-   bpp = cupsImageGetDepth(img);
-   out = malloc(img->xsize * bpp);
- 
-+  if (!in || !out)
-+  {
-+    fputs("DEBUG: Unable to allocate memory for PNG image!\n", stderr);
-+
-+    if (in)
-+      free(in);
-+
-+    if (out)
-+      free(out);
-+
-+    fclose(fp);
-+
-+    return (1);
-+  }
-+
-  /*
-   * Read the image, interlacing as needed...
-   */
diff --git a/net-print/cups/files/cupsd.init b/net-print/cups/files/cupsd.init
deleted file mode 100644
index 9364c840721e..000000000000
--- a/net-print/cups/files/cupsd.init
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-
-depend() {
-	use net
-	after logger
-	before nfs
-	use hotplug
-}
-
-start() {
-	ebegin "Starting cupsd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/cupsd
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping cupsd"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/cupsd
-	eend $?
-}