version bump

(Portage version: 2.1.2_rc1-r4)
 (Unsigned Manifest commit)

6 files changed, 12 insertions, 459 deletions

diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 768da5e9306c..2c5562b969c4 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX cups-1.1.23-bindnow.patch 2087 RMD160 35c18c1bbeb7c79f9207ecbd69c004f2ddf68f80 SHA1 6f3c24500c50016c0bb2f1913b7c3cb6384c6b21 SHA256 fb932b7e9d04dfe7d52bd455f3514818a3bba1eaa3a3342b5c6b840bf957e67b
 MD5 b22c12cb42113ddc40988cfbe93e3519 files/cups-1.1.23-bindnow.patch 2087
 RMD160 35c18c1bbeb7c79f9207ecbd69c004f2ddf68f80 files/cups-1.1.23-bindnow.patch 2087
@@ -21,10 +18,6 @@ AUX cups-1.2.1-ssldir.patch 509 RMD160 bc0f4927e4260b57bb898f55d5f4215489d94a71
 MD5 4cfb62e82b82ffc2291f3bdfcc21e600 files/cups-1.2.1-ssldir.patch 509
 RMD160 bc0f4927e4260b57bb898f55d5f4215489d94a71 files/cups-1.2.1-ssldir.patch 509
 SHA256 e536ae455fdbee0fdea6bae2a800060c81c66ff7ab007ecd317b99b8b9552be7 files/cups-1.2.1-ssldir.patch 509
-AUX cups-1.2.5.patch 1208 RMD160 7bae5ce8ae2266be441a3373283e30ffbd8d1279 SHA1 3b0b1fe7654adf0ac3b8abcc713d4c1a4f68279a SHA256 8613ee1343489b5324c09e363ff6dde00e51fb43f04b80b714f2470d48f9740f
-MD5 f66a1efa00c0c292e8eb896e61c6066f files/cups-1.2.5.patch 1208
-RMD160 7bae5ce8ae2266be441a3373283e30ffbd8d1279 files/cups-1.2.5.patch 1208
-SHA256 8613ee1343489b5324c09e363ff6dde00e51fb43f04b80b714f2470d48f9740f files/cups-1.2.5.patch 1208
 AUX cups-gcc4-amd64.patch 566 RMD160 12372ca22d689df7f3129d43ba1b7e6c9161868b SHA1 9e23ed973685c279edfee76fc0a7a9c6fd94a103 SHA256 e5d7cfb3a96731362008ff7e103cb3156059b0b86031564cc0a3e4bf9ea334fa
 MD5 7888ddf6a0c4cfb38b8882651e22d66c files/cups-gcc4-amd64.patch 566
 RMD160 12372ca22d689df7f3129d43ba1b7e6c9161868b files/cups-gcc4-amd64.patch 566
@@ -54,24 +47,19 @@ MD5 24d215a1cf4e63bc56e89755e90f3645 files/pdftops.pl 5624
 RMD160 17b481f70cb47acff4272ec143261e920459d0bd files/pdftops.pl 5624
 SHA256 60fc863f11c5b114b5bfd8bbba905abca5526c92581f7a5b5570e8723a4aeebc files/pdftops.pl 5624
 DIST cups-1.1.23-source.tar.bz2 8705521 RMD160 255ec4c22422b14f2367d69f3ec7e590dc46bea5 SHA1 32d5bfb44c4edc1b54ccb014b5a44499295c6c5c SHA256 87da0f7b1e03236e183045f1e787957132658ead56c4b0f80ac7f86c1574a85e
-DIST cups-1.2.4-source.tar.bz2 3546082 RMD160 eb8414dafa5e8a108ae6644a1a62f68ae8cfdc13 SHA1 4a6cb772cf64242b71a716711896c004c3636ad7 SHA256 707910641f5dc30253e548ac32033fe23a70e4e0ac589ce956ee0b8869279dcd
-DIST cups-1.2.5-source.tar.bz2 3565622 RMD160 5415dc0f111cfdcfc34b801b4e22e7a27bf5eadc SHA1 25703de2bc09aa161bfd1ece88d30926269156df SHA256 43569d152bd0665729bbe3c50c3a611c1425b679745a009fbd7f9bfd5631f19a
+DIST cups-1.2.6-source.tar.bz2 3566806 RMD160 a239738f711168cb82c11ee20a7aa92b070e5811 SHA1 1e12d2db23c6a46ae8960b9b765be0f1b829bbac SHA256 cdad0e2e461121257e740b8cb1111c7266cea434dd532a8bcc69c69adffe8aa8
 EBUILD cups-1.1.23-r8.ebuild 4985 RMD160 e01cbcb4bd77aa3e2b232253235e185129167ee6 SHA1 78928d8874e21abfa07a6dc315182e7b201207a0 SHA256 37605ea842c753d35a37cc36f651dad3e6cc6fae9c3cb1c832a689b3f3961321
 MD5 54a99ab704429d053d41ff1fe558188e cups-1.1.23-r8.ebuild 4985
 RMD160 e01cbcb4bd77aa3e2b232253235e185129167ee6 cups-1.1.23-r8.ebuild 4985
 SHA256 37605ea842c753d35a37cc36f651dad3e6cc6fae9c3cb1c832a689b3f3961321 cups-1.1.23-r8.ebuild 4985
-EBUILD cups-1.2.4.ebuild 5751 RMD160 6e71fef8d736718e1404d20bfaa2daf817eff6b6 SHA1 95a6895c648e811e92ccaa91c5de31282d439564 SHA256 cb580324fa58ea196eb94d7aa3462dbb7e7422fe1a10e9c791998005c0e431bb
-MD5 a7dfa140cadd75395bd5b89275874089 cups-1.2.4.ebuild 5751
-RMD160 6e71fef8d736718e1404d20bfaa2daf817eff6b6 cups-1.2.4.ebuild 5751
-SHA256 cb580324fa58ea196eb94d7aa3462dbb7e7422fe1a10e9c791998005c0e431bb cups-1.2.4.ebuild 5751
-EBUILD cups-1.2.5.ebuild 5788 RMD160 05ee7c23daedb7de015f6592bbee5148bf610370 SHA1 29cc77115d166b862d862b7187cf30274d8f8ce5 SHA256 f7abfac67a3575ded1102b984b333458d9d0c493987fdc04f96837c35984d7f1
-MD5 65d93b590eb04aef1ff28aeaefc6af91 cups-1.2.5.ebuild 5788
-RMD160 05ee7c23daedb7de015f6592bbee5148bf610370 cups-1.2.5.ebuild 5788
-SHA256 f7abfac67a3575ded1102b984b333458d9d0c493987fdc04f96837c35984d7f1 cups-1.2.5.ebuild 5788
-MISC ChangeLog 29720 RMD160 c246839c46457d05c347e174c66383adb4de07c3 SHA1 f95136385f16bc3f868c1b65e1a7011f8987a9f3 SHA256 579b2aa66860f33779484fb98e800b81c24cbca89820218858edd3c562f987c3
-MD5 d6a380d791aef4da965b8ba8f456e05c ChangeLog 29720
-RMD160 c246839c46457d05c347e174c66383adb4de07c3 ChangeLog 29720
-SHA256 579b2aa66860f33779484fb98e800b81c24cbca89820218858edd3c562f987c3 ChangeLog 29720
+EBUILD cups-1.2.6.ebuild 5752 RMD160 0e2a9b823a8b5948d9f7625114e3f6dc495f2b69 SHA1 247c8889d18d7c230eab482af6ecf2a7f1f7e2f5 SHA256 b7bb44c4afcca4c0794945cd390864fdfa5bc2fc4050d5dd4f1a5599404d7f90
+MD5 64ac6d8b39be98c52670f8f2a11cff43 cups-1.2.6.ebuild 5752
+RMD160 0e2a9b823a8b5948d9f7625114e3f6dc495f2b69 cups-1.2.6.ebuild 5752
+SHA256 b7bb44c4afcca4c0794945cd390864fdfa5bc2fc4050d5dd4f1a5599404d7f90 cups-1.2.6.ebuild 5752
+MISC ChangeLog 29906 RMD160 8fd1c601396ba6e6b0b19036f288b1b5f203e235 SHA1 47af07ef357d4a1dda45f690800cb740265baad8 SHA256 687064ea7fc5caba27043b2b0d86d831d1c31311f55a2c16a91953b25c237dc6
+MD5 326726427196cb6d91b1b5d821c8576e ChangeLog 29906
+RMD160 8fd1c601396ba6e6b0b19036f288b1b5f203e235 ChangeLog 29906
+SHA256 687064ea7fc5caba27043b2b0d86d831d1c31311f55a2c16a91953b25c237dc6 ChangeLog 29906
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
@@ -79,16 +67,6 @@ SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 metadata
 MD5 abdc9df96d571ef4acff9bba51363e05 files/digest-cups-1.1.23-r8 262
 RMD160 d874b0af63ed920fb5c6f2ebf457c319b6e2f752 files/digest-cups-1.1.23-r8 262
 SHA256 ac20d82dc48e47fa2124e971108c121a1e0600ae2215e4be38c138332b4c3415 files/digest-cups-1.1.23-r8 262
-MD5 64e535db8d839184a0b4e3a3c7bc9571 files/digest-cups-1.2.4 259
-RMD160 b6fb48422caa94e5e43e654b5dff450e1ba0d940 files/digest-cups-1.2.4 259
-SHA256 a7c03e62e92a4a9a394acd423c6cce5af8e0c6a6afae5b44686c21858e79ec52 files/digest-cups-1.2.4 259
-MD5 b8e30436b4c06424b912140b59189cb5 files/digest-cups-1.2.5 259
-RMD160 71eb4e72bce763377f3f0aa0529bb57845026ad4 files/digest-cups-1.2.5 259
-SHA256 02c5089d6f092247fb7edc49dee8dad9dabf7ad7b182368adcdde7451d59cb6e files/digest-cups-1.2.5 259
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFSCP8oeSe8B0zEfwRAnGWAJ9bFxp+nCs3YI4aeZ98TiJsZrHUbQCeNXXZ
-m/cj4we/gaz8vmnVQbiJJ6M=
-=wr0N
------END PGP SIGNATURE-----
+MD5 5b3f9aec328891f1e9bded2d2577bd98 files/digest-cups-1.2.6 259
+RMD160 d5f75c2671a926c71c6698fc3100d9acb106fedd files/digest-cups-1.2.6 259
+SHA256 3f7f97c3ff4a6096c1b2209892b447540a6dca6b1e53d03232340d5e74cdc60a files/digest-cups-1.2.6 259
diff --git a/net-print/cups/cups-1.2.4.ebuild b/net-print/cups/cups-1.2.4.ebuild
deleted file mode 100644
index 017da015c732..000000000000
--- a/net-print/cups/cups-1.2.4.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.4.ebuild,v 1.5 2006/11/01 04:34:23 cardoe 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"
-#ESVN_REPO_URI="http://svn.easysw.com/public/cups/trunk"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="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 )
-	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}
-	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
-		media-gfx/gimp-print
-		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() {
-	enewgroup lp
-	enewuser lp -1 -1 -1 lp
-
-	enewgroup lpadmin 106
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# upstream does not acknowledge bindnow as a solution
-	epatch ${FILESDIR}/cups-1.2.0-bindnow.patch
-
-	# cups does not use autotools "the usual way" and ship a static config.h.in
-	eaclocal
-	eautoconf
-}
-
-src_compile() {
-	export DSOFLAGS="${LDFLAGS}"
-	econf \
-		--with-cups-user=lp \
-		--with-cups-group=lp \
-		--with-system-groups=lpadmin \
-		--localstatedir=/var \
-		--with-docdir=/usr/share/cups/html \
-		--with-bindnow=$(bindnow-flags) \
-		$(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) \
-		--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.pl pdftops
-
-	keepdir /usr/share/cups/profiles /usr/libexec/cups/driver /var/log/cups \
-		/var/run/cups/certs /var/cache/cups /var/spool/cups/tmp
-
-	# .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
-}
-
-pkg_preinst() {
-	# cleanups
-	[ -n "${PN}" ] && rm -fR ${ROOT}/usr/share/doc/${PN}-*
-}
-
-pkg_postinst() {
-	einfo "Remote printing: change "
-	einfo "Listen localhost:631"
-	einfo "to"
-	einfo "Listen *:631"
-	einfo "in /etc/cups/cupsd.conf"
-	einfo
-	einfo "For more information about installing a printer take a look at:"
-	einfo "http://www.gentoo.org/doc/en/printing-howto.xml."
-
-	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 has_version =net-print/cups-1.1*; 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.5.ebuild b/net-print/cups/cups-1.2.5.ebuild
deleted file mode 100644
index e64266e75112..000000000000
--- a/net-print/cups/cups-1.2.5.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.5.ebuild,v 1.2 2006/11/01 04:34:23 cardoe 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"
-#ESVN_REPO_URI="http://svn.easysw.com/public/cups/trunk"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="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 )
-	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}
-	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
-		media-gfx/gimp-print
-		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() {
-	enewgroup lp
-	enewuser lp -1 -1 -1 lp
-
-	enewgroup lpadmin 106
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# upstream does not acknowledge bindnow as a solution
-	epatch ${FILESDIR}/cups-1.2.0-bindnow.patch
-	epatch ${FILESDIR}/cups-1.2.5.patch
-
-	# cups does not use autotools "the usual way" and ship a static config.h.in
-	eaclocal
-	eautoconf
-}
-
-src_compile() {
-	export DSOFLAGS="${LDFLAGS}"
-	econf \
-		--with-cups-user=lp \
-		--with-cups-group=lp \
-		--with-system-groups=lpadmin \
-		--localstatedir=/var \
-		--with-docdir=/usr/share/cups/html \
-		--with-bindnow=$(bindnow-flags) \
-		$(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) \
-		--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.pl pdftops
-
-	keepdir /usr/share/cups/profiles /usr/libexec/cups/driver /var/log/cups \
-		/var/run/cups/certs /var/cache/cups /var/spool/cups/tmp
-
-	# .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
-}
-
-pkg_preinst() {
-	# cleanups
-	[ -n "${PN}" ] && rm -fR ${ROOT}/usr/share/doc/${PN}-*
-}
-
-pkg_postinst() {
-	einfo "Remote printing: change "
-	einfo "Listen localhost:631"
-	einfo "to"
-	einfo "Listen *:631"
-	einfo "in /etc/cups/cupsd.conf"
-	einfo
-	einfo "For more information about installing a printer take a look at:"
-	einfo "http://www.gentoo.org/doc/en/printing-howto.xml."
-
-	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 has_version =net-print/cups-1.1*; 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/files/cups-1.2.5.patch b/net-print/cups/files/cups-1.2.5.patch
deleted file mode 100644
index f062e0aa0b2b..000000000000
--- a/net-print/cups/files/cups-1.2.5.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur cups-1.2.5.orig/scheduler/ipp.c cups-1.2.5/scheduler/ipp.c
---- cups-1.2.5.orig/scheduler/ipp.c	2006-10-21 02:35:26.000000000 +0200
-+++ cups-1.2.5/scheduler/ipp.c	2006-10-21 02:35:41.000000000 +0200
-@@ -4020,14 +4020,14 @@
-     if ((!strcmp(system_paper, "Letter") && have_letter) ||
-         (!strcmp(system_paper, "A4") && have_a4))
-     {
--      num_defaults = ppd_add_default("PageSize", system_paper, 
--				     num_defaults, &defaults);
--      num_defaults = ppd_add_default("PageRegion", system_paper, 
--				     num_defaults, &defaults);
--      num_defaults = ppd_add_default("PaperDimension", system_paper, 
--				     num_defaults, &defaults);
--      num_defaults = ppd_add_default("ImageableArea", system_paper, 
--				     num_defaults, &defaults);
-+      num_defaults = cupsAddOption("PageSize", system_paper, 
-+				   num_defaults, &defaults);
-+      num_defaults = cupsAddOption("PageRegion", system_paper, 
-+				   num_defaults, &defaults);
-+      num_defaults = cupsAddOption("PaperDimension", system_paper, 
-+				   num_defaults, &defaults);
-+      num_defaults = cupsAddOption("ImageableArea", system_paper, 
-+				   num_defaults, &defaults);
-     }
-   }
- #endif /* HAVE_LIBPAPER */
diff --git a/net-print/cups/files/digest-cups-1.2.4 b/net-print/cups/files/digest-cups-1.2.4
deleted file mode 100644
index c11ba563b92f..000000000000
--- a/net-print/cups/files/digest-cups-1.2.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 528650aba3b56541f75370ef09541850 cups-1.2.4-source.tar.bz2 3546082
-RMD160 eb8414dafa5e8a108ae6644a1a62f68ae8cfdc13 cups-1.2.4-source.tar.bz2 3546082
-SHA256 707910641f5dc30253e548ac32033fe23a70e4e0ac589ce956ee0b8869279dcd cups-1.2.4-source.tar.bz2 3546082
diff --git a/net-print/cups/files/digest-cups-1.2.5 b/net-print/cups/files/digest-cups-1.2.5
deleted file mode 100644
index 8e4e8e9db945..000000000000
--- a/net-print/cups/files/digest-cups-1.2.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3e5d2c127890fd3ed97e2249c278b6e8 cups-1.2.5-source.tar.bz2 3565622
-RMD160 5415dc0f111cfdcfc34b801b4e22e7a27bf5eadc cups-1.2.5-source.tar.bz2 3565622
-SHA256 43569d152bd0665729bbe3c50c3a611c1425b679745a009fbd7f9bfd5631f19a cups-1.2.5-source.tar.bz2 3565622