[gentoo-commits] dev/dilfridge:master commit in: net-print/cups/files/, net-print/cups/

[Andreas Hüttel]

commit:     bb9b0552ea675897abaf944eae5161d3c4a065ff
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sat Jan 28 20:53:26 2012 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jan 28 20:53:26 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=bb9b0552

[net-print/cups] Not needed here anymore

---
 net-print/cups/ChangeLog                           | 1729 --------------------
 net-print/cups/Manifest                            |   39 -
 net-print/cups/cups-1.4.6-r21.ebuild               |  296 ----
 net-print/cups/cups-1.5_rc1.ebuild                 |  291 ----
 .../cups/files/cups-1.4.0-backend-https.patch      |   11 -
 net-print/cups/files/cups-1.4.2-str3200.patch      |   43 -
 .../files/cups-1.4.4-dont-compress-manpages.patch  |   20 -
 .../cups/files/cups-1.4.4-fix-install-perms.patch  |   22 -
 net-print/cups/files/cups-1.4.4-nostrip.patch      |   14 -
 .../cups/files/cups-1.4.4-perl-includes.patch      |   12 -
 net-print/cups/files/cups-1.4.4-php-destdir.patch  |   21 -
 net-print/cups/files/cups-1.4.6-force-gnutls.patch |   93 --
 .../cups/files/cups-1.4.6-serialize-gnutls.patch   |  113 --
 net-print/cups/files/cups-1.4.6-web-hang.patch     |   54 -
 net-print/cups/files/cupsd.init.d                  |   20 -
 net-print/cups/files/pdftops-1.20.gentoo           |  340 ----
 net-print/cups/metadata.xml                        |   19 -
 net-print/cups/notes.txt                           |   16 -
 18 files changed, 0 insertions(+), 3153 deletions(-)

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
deleted file mode 100644
index 4132d0f..0000000
--- a/net-print/cups/ChangeLog
+++ /dev/null
@@ -1,1729 +0,0 @@
-# ChangeLog for net-print/cups
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.416 2011/06/06 21:54:07 dilfridge Exp $
-
-*cups-1.5_rc1 (18 Jun 2011)
-
-  18 Jun 2011; Andreas K. Huettel <dilfridge@g.o> +cups-1.5_rc1.ebuild,
-  +notes.txt:
-  Version bump. Builds fine, but not otherwise tested yet.
-
-  18 Jun 2011; Andreas K. Huettel <dilfridge@g.o>
-  +files/cups-1.4.0-backend-https.patch, +files/cups-1.4.2-str3200.patch,
-  +files/cups-1.4.4-dont-compress-manpages.patch,
-  +files/cups-1.4.4-fix-install-perms.patch, +files/cups-1.4.4-nostrip.patch,
-  +files/cups-1.4.4-perl-includes.patch, +files/cups-1.4.4-php-destdir.patch,
-  +cups-1.4.6-r21.ebuild, +files/cups-1.4.6-force-gnutls.patch,
-  +files/cups-1.4.6-serialize-gnutls.patch, +files/cups-1.4.6-web-hang.patch,
-  +files/pdftops-1.20.gentoo, +files/cupsd.init.d, +metadata.xml:
-  Copied to dilfridge overlay
-
-  06 Jun 2011; Andreas K. Huettel <dilfridge@g.o> cups-1.4.6-r2.ebuild,
-  cups-1.4.6-r21.ebuild:
-  Force-enable threads whenever we use gnutls, bug 352252
-
-*cups-1.4.6-r21 (05 Jun 2011)
-*cups-1.4.6-r2 (05 Jun 2011)
-
-  05 Jun 2011; Andreas K. Huettel <dilfridge@g.o> +cups-1.4.6-r2.ebuild,
-  +cups-1.4.6-r21.ebuild:
-  Split into libusb and non-libusb ebuild revisions, so we can stable without
-  taking care of the libusb mess first.
-
-  05 Jun 2011; Andreas K. Huettel <dilfridge@g.o> cups-1.4.6-r1.ebuild:
-  Improve informational messages
-
-  03 Jun 2011; Diego E. Pettenò <flameeyes@g.o> metadata.xml:
-  QA: the meaning of python, perl, php and java USE flags is non-obvious in
-  CUPS, so make it more explicit. (I was looking for pycups as cups[python]).
-
-  03 May 2011; Tomáš Chvátal <scarabeus@g.o> cups-1.4.6-r1.ebuild:
-  Try to reorder the warnings for the usb useflag to be more self-explanatory.
-
-  01 May 2011; Tomáš Chvátal <scarabeus@g.o> cups-1.4.6-r1.ebuild:
-  use linux-info rather than linux-mod eclass. Per bug #365491.
-
-  30 Apr 2011; Tomáš Chvátal <scarabeus@g.o> cups-1.4.6-r1.ebuild:
-  Add the kernel check so we really ensure nobody tries both libusb and usblp
-  at once.
-
-  30 Apr 2011; Tomáš Chvátal <scarabeus@g.o> cups-1.4.6-r1.ebuild:
-  Add new shiny elog message about what usb useflag does on cups.
-
-*cups-1.4.6-r1 (30 Apr 2011)
-
-  30 Apr 2011; Tomáš Chvátal <scarabeus@g.o> -cups-1.4.6.ebuild,
-  +cups-1.4.6-r1.ebuild, +files/cups-1.4.6-web-hang.patch:
-  Revision bump to fix few bugs reported on bugzilla. Wrong libgcrypt
-  dependency and cgi hangup.
-
-  30 Apr 2011; Tomáš Chvátal <scarabeus@g.o> cups-1.3.11-r4.ebuild:
-  Just enforce cups useflag to be enabled on ghostscript.cd
-  /home/scarab/gentoo/gentoo-x86/net-print/cups
-
-  07 Apr 2011; Diego E. Pettenò <flameeyes@g.o> cups-1.4.6.ebuild:
-  QA: only try to set up active python version when python USE flag is enabled.
-
-  19 Mar 2011; Samuli Suominen <ssuominen@g.o> cups-1.3.11-r4.ebuild,
-  cups-1.4.6.ebuild:
-  Move virtual/lpr to new-style virtual.
-
-  28 Feb 2011; Samuli Suominen <ssuominen@g.o> cups-1.3.11-r4.ebuild:
-  Use virtual/jpeg.
-
-*cups-1.4.6 (13 Jan 2011)
-
-  13 Jan 2011; Timo Gurr <tgurr@g.o> -cups-1.4.4-r2.ebuild,
-  -cups-1.4.5.ebuild, +cups-1.4.6.ebuild, +files/cups-1.4.6-force-gnutls.patch,
-  +files/cups-1.4.6-serialize-gnutls.patch:
-  Version bump, fixing bug #313555 and #350406. Remove old.
-
-*cups-1.3.11-r4 (01 Dec 2010)
-
-  01 Dec 2010; Tomáš Chvátal <scarabeus@g.o> -cups-1.3.11-r2.ebuild,
-  -cups-1.3.11-r3.ebuild, +cups-1.3.11-r4.ebuild,
-  +files/cups-1.3.11-pdf-m4.patch:
-  Revision bump (directly stable) to fix nasty issue with pstopdf buildtime
-  requirement (only changed the m4 to work properly).
-
-*cups-1.4.5 (01 Dec 2010)
-
-  01 Dec 2010; Tomáš Chvátal <scarabeus@g.o> +cups-1.4.5.ebuild:
-  Version bump
-
-*cups-1.3.11-r3 (12 Nov 2010)
-
-  12 Nov 2010; Raúl Porcel <armin76@g.o> -cups-1.3.11-r1.ebuild,
-  +cups-1.3.11-r3.ebuild:
-  Fix super annoying bug 309901
-
-  12 Sep 2010; Tomáš Chvátal <scarabeus@g.o> cups-1.4.4-r2.ebuild,
-  +files/cups-1.4.4-perl-includes.patch:
-  Fix building with perl useflag enabled. Per bug #336839.
-
-*cups-1.4.4-r2 (11 Sep 2010)
-
-  11 Sep 2010; Timo Gurr <tgurr@g.o> -cups-1.4.4.ebuild,
-  -cups-1.4.4-r1.ebuild, +cups-1.4.4-r2.ebuild,
-  +files/cups-1.4.4-dont-compress-manpages.patch,
-  +files/cups-1.4.4-fix-install-perms.patch,
-  +files/cups-1.4.4-nostrip.patch, +files/cups-1.4.4-php-destdir.patch:
-  Revbump, fixing bug #296221.
-
-  10 Sep 2010; Tomáš Chvátal <scarabeus@g.o> cups-1.4.4-r1.ebuild:
-  Revision bump again. This time with mimimalistic patches only altering
-  build. Feel free to rework them.
-
-  13 Aug 2010; Tomáš Chvátal <scarabeus@g.o>
-  -cups-1.4.4-r1.ebuild:
-  Drop my version. I am not interested in maintaining cups fully and
-  maintainer correctly pointed out he dont want to maintian such huge
-  patchset.
-
-*cups-1.4.4-r1 (13 Aug 2010)
-
-  13 Aug 2010; Tomáš Chvátal <scarabeus@g.o>
-  +cups-1.4.4-r1.ebuild:
-  Revbump with various patches i collected around.
-
-  10 Aug 2010; Tomáš Chvátal <scarabeus@g.o>
-  cups-1.3.11-r1.ebuild, cups-1.3.11-r2.ebuild:
-  Fix deps per bug #328773.
-
-  30 Jul 2010; Jory A. Pratt <anarchy@g.o> cups-1.4.4.ebuild:
-  make threads support optional, ack from scarabeus
-
-  18 Jul 2010; Joseph Jezak <josejx@g.o> cups-1.3.11-r2.ebuild:
-  Marked ppc stable for bug #295256.
-
-  17 Jul 2010; Raúl Porcel <armin76@g.o> cups-1.3.11-r2.ebuild:
-  arm/ia64/m68k/s390/sh/sparc stable wrt #295256
-
-  12 Jul 2010; Markos Chandras <hwoarang@g.o> cups-1.3.11-r2.ebuild:
-  Stable on amd64 wrt bug #295256
-
-  11 Jul 2010; Tobias Klausmann <klausman@g.o> cups-1.3.11-r2.ebuild:
-  Stable on alpha, bug #295256
-
-  10 Jul 2010; Jeroen Roovers <jer@g.o> cups-1.3.11-r2.ebuild:
-  Stable for HPPA (bug #295256).
-
-  08 Jul 2010; Brent Baude <ranger@g.o> cups-1.3.11-r2.ebuild:
-  Marking cups-1.3.11-r2 ppc64 for bug 295256
-
-  04 Jul 2010; Pawel Hajdan jr <phajdan.jr@g.o>
-  cups-1.3.11-r2.ebuild:
-  x86 stable wrt security bug #295256
-
-  30 Jun 2010; Jeroen Roovers <jer@g.o> cups-1.4.4.ebuild:
-  Respect LDFLAGS (bug #284769).
-
-  30 Jun 2010; Jeroen Roovers <jer@g.o> cups-1.3.11-r1.ebuild,
-  cups-1.3.11-r2.ebuild:
-  Use --with-optim to respect CFLAGS (bug #261214).
-
-*cups-1.4.4 (22 Jun 2010)
-
-  22 Jun 2010; Timo Gurr <tgurr@g.o> -cups-1.4.3.ebuild,
-  +cups-1.4.4.ebuild:
-  Version bump, release includes security fixes.
-
-*cups-1.4.3 (31 Mar 2010)
-
-  31 Mar 2010; Timo Gurr <tgurr@g.o> -cups-1.4.2-r1.ebuild,
-  +cups-1.4.3.ebuild:
-  Version bump, fixing bug #284771 and #295369.
-
-  08 Mar 2010; Maciej Mrozowski <reavertm@g.o> cups-1.3.11-r1.ebuild,
-  cups-1.3.11-r2.ebuild, cups-1.4.2-r1.ebuild:
-  Fixed cyclic dependency with app-text/poppler[utils]
-
-  10 Feb 2010; Samuli Suominen <ssuominen@g.o> cups-1.3.11-r1.ebuild,
-  cups-1.3.11-r2.ebuild, cups-1.4.2-r1.ebuild:
-  Fix poppler depend.
-
-  24 Jan 2010; Jonathan Callen <abcd@g.o> cups-1.4.2-r1.ebuild:
-  Depend on virtual/poppler-utils, not app-text/poppler-utils
-
-  22 Jan 2010; Samuli Suominen <ssuominen@g.o> cups-1.4.2-r1.ebuild:
-  Require SLOT="0" of media-libs/jpeg for headers.
-
-  26 Dec 2009; Peter Volkov <pva@g.o> cups-1.3.11-r1.ebuild,
-  cups-1.3.11-r2.ebuild:
-  virtual/ghostscript->app-text/ghostscript-gpl: ghostscript-gpl is the only
-  implementation left in the tree.
-
-*cups-1.4.2-r1 (30 Nov 2009)
-*cups-1.3.11-r2 (30 Nov 2009)
-
-  30 Nov 2009; Timo Gurr <tgurr@g.o> -cups-1.3.10-r2.ebuild,
-  +cups-1.3.11-r2.ebuild, +files/cups-1.3.11-str3200.patch,
-  -cups-1.4.2.ebuild, +cups-1.4.2-r1.ebuild,
-  +files/cups-1.4.2-str3200.patch:
-  Revbumps fixing security issue CVE-2009-3553. Fix linguas handling bug
-  #293217 thanks to Rafał Mużyło, remove zeroconf of cups 1.4 since it's
-  missing an avahi implementation, bug #293295. Remove old.
-
-  24 Nov 2009; Jeroen Roovers <jer@g.o> cups-1.3.11-r1.ebuild:
-  Stable for HPPA (bug #293865).
-
-  23 Nov 2009; Brent Baude <ranger@g.o> cups-1.3.11-r1.ebuild:
-  Marking cups-1.3.11-r1 ppc64 for bug 293865
-
-  23 Nov 2009; Raúl Porcel <armin76@g.o> cups-1.3.11-r1.ebuild:
-  ia64/m68k/s390/sh/sparc stable wrt #293865
-
-  23 Nov 2009; Markus Meier <maekke@g.o> cups-1.3.11-r1.ebuild:
-  amd64/arm/x86 stable, bug #293865
-
-  22 Nov 2009; Tobias Klausmann <klausman@g.o> cups-1.3.11-r1.ebuild:
-  Stable on alpha, bug #293865
-
-  21 Nov 2009; nixnut <nixnut@g.o> cups-1.3.11-r1.ebuild:
-  ppc stable #293865
-
-  21 Nov 2009; Jeroen Roovers <jer@g.o> cups-1.3.10-r2.ebuild,
-  cups-1.3.11-r1.ebuild:
-  Correct sed command.
-
-*cups-1.4.2 (13 Nov 2009)
-*cups-1.3.11-r1 (13 Nov 2009)
-
-  13 Nov 2009; Timo Gurr <tgurr@g.o>
-  -files/cups-1.3.9-CVE-2008-5286.patch, cups-1.3.10-r2.ebuild,
-  -cups-1.3.11.ebuild, +cups-1.3.11-r1.ebuild,
-  +files/cups-1.3.11-str3367-security-1.3v2.patch,
-  +files/cups-1.3.11-str3401-security-1.3v2-regression.patch,
-  -cups-1.4.1.ebuild, -files/cups-1.4.1-usb-function-decl.patch,
-  +cups-1.4.2.ebuild:
-  Version bumps, fixing security issues. QA fixes. Remove old.
-
-  17 Sep 2009; Jim Ramsay <lack@g.o> cups-1.4.1.ebuild,
-  +files/cups-1.4.1-usb-function-decl.patch:
-  Add patch which fixes bug #285003
-
-*cups-1.4.1 (13 Sep 2009)
-
-  13 Sep 2009; Timo Gurr <tgurr@g.o> -cups-1.3.10-r1.ebuild,
-  +files/cups-1.4.0-backend-https.patch, +cups-1.4.1.ebuild:
-  Version bump including EAPI2 love and general ebuild overhaul.
-
-  09 Aug 2009; nixnut <nixnut@g.o> cups-1.3.10-r2.ebuild:
-  ppc stable #275685
-
-  21 Jul 2009; <chainsaw@g.o> cups-1.3.10-r2.ebuild:
-  Marked stable on AMD64 as requested by Arfrever Frehtes Taifersar Arahesis
-  <arfrever@g.o> in bug #275685. Tested on a Core2 Duo with a Hewlett
-  Packard 4250dtn.
-
-  12 Jul 2009; Raúl Porcel <armin76@g.o> cups-1.3.10-r2.ebuild:
-  arm/ia64/m68k/s390/sh stable wrt #275685
-
-*cups-1.3.11 (08 Jul 2009)
-
-  08 Jul 2009; Timo Gurr <tgurr@g.o> -cups-1.3.9-r1.ebuild,
-  +cups-1.3.11.ebuild:
-  Version bump fixing bug #276782. Remove old.
-
-  04 Jul 2009; Brent Baude <ranger@g.o> cups-1.3.10-r2.ebuild:
-  stable ppc64, bug 275685
-
-  30 Jun 2009; Christian Faulhammer <fauli@g.o>
-  cups-1.3.10-r2.ebuild:
-  stable x86, bug 275685
-
-  30 Jun 2009; Jeroen Roovers <jer@g.o> cups-1.3.10-r2.ebuild:
-  Stable for HPPA (bug #275685).
-
-  28 Jun 2009; Tobias Klausmann <klausman@g.o> cups-1.3.10-r2.ebuild:
-  Stable on alpha, bug #275685
-
-  28 Jun 2009; Ferris McCormick <fmccor@g.o> cups-1.3.10-r2.ebuild:
-  Sparc stable, bug #275685.
-
-*cups-1.3.10-r2 (29 May 2009)
-
-  29 May 2009; Timo Gurr <tgurr@g.o> +cups-1.3.10-r2.ebuild,
-  +files/cups-1.3.10-str3178.patch:
-  Revision bump, fixing the detection of newer libgnutls versions, bug
-  #253717. Thanks Daniel Black for the patch.
-
-  26 May 2009; Peter Volkov <pva@g.o> cups-1.3.9-r1.ebuild,
-  cups-1.3.10-r1.ebuild:
-  app-text/ghostscript-esp was removed from the tree, removing straces from
-  ebuild, bug #261434.
-
-*cups-1.3.10-r1 (25 Apr 2009)
-
-  25 Apr 2009; Timo Gurr <tgurr@g.o> -cups-1.3.10.ebuild,
-  +cups-1.3.10-r1.ebuild:
-  Revbump fixing local printing problems caused by client.conf settings due
-  to changed CUPS behaviour.
-
-  21 Apr 2009; Tobias Klausmann <klausman@g.o> cups-1.3.10:
-  Stable on alpha, bug #263070
-
-  20 Apr 2009; Raúl Porcel <armin76@g.o> cups-1.3.10.ebuild:
-  arm/ia64/m68k/s390/sh/sparc stable wrt #263070
-
-  18 Apr 2009; Jeroen Roovers <jer@g.o> cups-1.3.10:
-  Stable for HPPA (bug #263070).
-
-  18 Apr 2009; Brent Baude <ranger@g.o> cups-1.3.10.ebuild:
-  Marking cups-1.3.10 ppc64 and ppc for bug 263070
-
-  18 Apr 2009; Markus Meier <maekke@g.o> cups-1.3.10:
-  x86 stable, bug #263070
-
-  17 Apr 2009; Thomas Anderson <gentoofan23@g.o> cups-1.3.10.ebuild:
-  stable amd64, security bug #263070
-
-*cups-1.3.10 (17 Apr 2009)
-
-  17 Apr 2009; Timo Gurr <tgurr@g.o>
-  -files/cups-1.3.8-CVE-2008-3639.patch,
-  -files/cups-1.3.8-CVE-2008-3640.patch,
-  -files/cups-1.3.8-CVE-2008-3641.patch,
-  -files/cups-1.3.8-str2892-1.3.patch, -files/cups-1.3.8-str2924.patch,
-  -cups-1.3.8-r2.ebuild, +cups-1.3.10.ebuild:
-  Version bump including security fixes, see bug #263070. Drop 3rd party
-  pdftops perl wrapper in favor of the brand new upstream filter.
-
-  30 Mar 2009; Peter Alfredsen <loki_val@g.o> cups-1.3.8-r2.ebuild,
-  cups-1.3.9-r1.ebuild:
-  Update dependencies w.r.t. bug 264230, fully-split-out poppler transition.
-
-  09 Mar 2009; Raúl Porcel <armin76@g.o> cups-1.3.9-r1.ebuild:
-  Add workaround for sh
-
-  11 Dec 2008; Tobias Klausmann <klausman@g.o> cups-1.3.9-r1.ebuild:
-  Stable on alpha, bug #249727
-
-  10 Dec 2008; Raúl Porcel <armin76@g.o> cups-1.3.9-r1.ebuild:
-  arm/ia64 stable wrt #249727
-
-  09 Dec 2008; Friedrich Oslage <bluebird@g.o> cups-1.3.9-r1.ebuild:
-  Stable on sparc, security bug #249727
-
-  09 Dec 2008; Jeroen Roovers <jer@g.o> cups-1.3.9-r1.ebuild:
-  Stable for HPPA (bug #249727).
-
-  08 Dec 2008; Brent Baude <ranger@g.o> cups-1.3.9-r1.ebuild:
-  Marking cups-1.3.9-r1 ppc64 for bug 249727
-
-  08 Dec 2008; Markus Meier <maekke@g.o> cups-1.3.9-r1.ebuild:
-  x86 stable, bug #249727
-
-  07 Dec 2008; Richard Freeman <rich0@g.o> cups-1.3.9-r1.ebuild:
-  amd64 stable - 249727
-
-  06 Dec 2008; Tobias Scherbaum <dertobi123@g.o>
-  cups-1.3.9-r1.ebuild:
-  ppc stable, bug #249727
-
-*cups-1.3.9-r1 (04 Dec 2008)
-
-  04 Dec 2008; Timo Gurr <tgurr@g.o>
-  +files/cups-1.3.9-CVE-2008-5286.patch, -cups-1.3.9.ebuild,
-  +cups-1.3.9-r1.ebuild:
-  Revbump fixing security bug #249727 (CVE-2008-5286). Remove old.
-
-  25 Nov 2008; Timo Gurr <tgurr@g.o>
-  -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@g.o> Manifest:
-  Fixed manifest for cups-1.3.8-source.tar.bz2
-
-  09 Nov 2008; Raúl Porcel <armin76@g.o> cups-1.3.8-r2.ebuild:
-  ia64 stable
-
-  08 Nov 2008; Tobias Klausmann <klausman@g.o> cups-1.3.8-r2.ebuild:
-  Stable on alpha, bug #238976
-
-  11 Oct 2008; Timo Gurr <tgurr@g.o>
-  -files/cups-1.3.7-CVE-2008-1722.patch:
-  Fix broken Manifest, bug #241216. Remove leftover patch from filesdir.
-
-  10 Oct 2008; Timo Gurr <tgurr@g.o> cups-1.2.12-r8.ebuild:
-  Doh, correct copy&paste error.
-
-*cups-1.3.9 (10 Oct 2008)
-*cups-1.3.8-r2 (10 Oct 2008)
-
-  10 Oct 2008; Timo Gurr <tgurr@g.o>
-  +files/cups-1.3.8-CVE-2008-3639.patch,
-  +files/cups-1.3.8-CVE-2008-3640.patch,
-  +files/cups-1.3.8-CVE-2008-3641.patch, +files/cups-1.3.8-str2924.patch,
-  cups-1.2.12-r4.ebuild, -cups-1.2.12-r7.ebuild, cups-1.2.12-r8.ebuild,
-  -cups-1.3.7-r1.ebuild, -cups-1.3.8.ebuild, +cups-1.3.8-r2.ebuild,
-  +cups-1.3.9.ebuild:
-  Bump CUPS to new version 1.3.9 and revision 1.3.8-r2 to address some
-  security issues, bug #238976 and fix the broken desktop file, bug #236706
-  (Thanks to Pacho Ramos). Remove keywords on 1.2.12 to prevent users from
-  installing a unsecure CUPS version.
-
-  24 Sep 2008; Jeroen Roovers <jer@g.o> cups-1.3.8-r1.ebuild:
-  Stable for HPPA (bug #235907).
-
-  15 Sep 2008; Tobias Klausmann <klausman@g.o> cups-1.3.8-r1.ebuild:
-  Stable on alpha, bug #235907
-
-  12 Sep 2008; Markus Meier <maekke@g.o> cups-1.3.8-r1.ebuild:
-  x86 stable, bug #235907
-
-  08 Sep 2008; Raúl Porcel <armin76@g.o> cups-1.3.8-r1.ebuild:
-  ia64 stable wrt #235907
-
-  06 Sep 2008; nixnut <nixnut@g.o> cups-1.3.8-r1.ebuild:
-  Stable on ppc wrt bug 235907
-
-  02 Sep 2008; Ferris McCormick <fmccor@g.o> cups-1.3.8-r1.ebuild:
-  Sparc stable, Bug #235907.
-
-  01 Sep 2008; Raúl Porcel <armin76@g.o> cups-1.3.8-r1.ebuild:
-  Fix SRC_URI
-
-  01 Sep 2008; Thomas Anderson <gentoofan23@g.o>
-  cups-1.3.8-r1.ebuild:
-  stable amd64, bug 235907
-
-  31 Aug 2008; Brent Baude <ranger@g.o> cups-1.3.8-r1.ebuild:
-  stable ppc64, bug 235907
-
-*cups-1.3.8-r1 (22 Aug 2008)
-
-  22 Aug 2008; Timo Gurr <tgurr@g.o>
-  +files/cups-1.3.8-str2892-1.3.patch, +cups-1.3.8-r1.ebuild:
-  Revbump adding upstream fix for using the webinterface via SSL with FF3,
-  upstream bug STR #2892, Gentoo bug #231430.
-
-  01 Aug 2008; Timo Gurr <tgurr@g.o> cups-1.3.8.ebuild:
-  Update SRC_URI, fixing bug #232978.
-
-*cups-1.3.8 (25 Jul 2008)
-
-  25 Jul 2008; Timo Gurr <tgurr@g.o> -files/cups-1.3.7-str2750.patch,
-  -files/cups-1.3.7-str2860.patch, -cups-1.3.7-r3.ebuild,
-  +cups-1.3.8.ebuild:
-  Version bump, fixing bug #232493. Dropping patches included upstream and
-  remove older version.
-
-*cups-1.3.7-r3 (16 Jul 2008)
-
-  16 Jul 2008; Timo Gurr <tgurr@g.o> -files/cups-1.2.0-bindnow.patch,
-  -files/cups-1.3.7-peercred.patch, +files/cups-1.3.7-str2860.patch,
-  cups-1.2.12-r4.ebuild, -cups-1.3.7-r2.ebuild, +cups-1.3.7-r3.ebuild:
-  Revision bump, fixing bug #222513, bug #223333, bug #230769 and bug
-  #227013.
-
-  14 Jun 2008; Zac Medico <zmedico@g.o> cups-1.2.12-r4.ebuild,
-  cups-1.2.12-r7.ebuild, cups-1.2.12-r8.ebuild, cups-1.3.7-r1.ebuild,
-  cups-1.3.7-r2.ebuild:
-  Bug #226505 - For compatibility with phase execution order in
-  >=portage-2.1.5, call has_version inside pkg_preinst instead of
-  pkg_postinst.
-
-*cups-1.3.7-r2 (09 Jun 2008)
-
-  09 Jun 2008; Timo Gurr <tgurr@g.o>
-  +files/cups-1.3.7-peercred.patch, +files/cups-1.3.7-str2750.patch,
-  +cups-1.3.7-r2.ebuild:
-  Add cups-1.3.7-r2.ebuild, fixes glibc-2.8 compatibility bug #225421 and
-  also addresses an issue with IPP authentification.
-
-  18 May 2008; Markus Meier <maekke@g.o> cups-1.3.7-r1.ebuild:
-  amd64/x86 stable, bug #221065
-
-  12 May 2008; Brent Baude <ranger@g.o> cups-1.3.7-r1.ebuild:
-  stable ppc, bug 221065
-
-  12 May 2008; Raúl Porcel <armin76@g.o> cups-1.3.7-r1.ebuild:
-  alpha/ia64/sparc stable wrt #221065
-
-  12 May 2008; Jeroen Roovers <jer@g.o> cups-1.3.7-r1.ebuild:
-  Stable for HPPA (bug #221065).
-
-  11 May 2008; Markus Rothe <corsair@g.o> cups-1.3.7-r1.ebuild:
-  Stable on ppc64; bug #221065
-
-  17 Apr 2008; Raúl Porcel <armin76@g.o> cups-1.2.12-r8.ebuild:
-  ia64 stable
-
-  17 Apr 2008; Markus Meier <maekke@g.o> cups-1.2.12-r8.ebuild:
-  amd64/x86 stable, security bug #217232
-
-  16 Apr 2008; Tobias Klausmann <klausman@g.o> cups-1.2.12-r8.ebuild:
-  Stable on alpha, bug #217232
-
-  16 Apr 2008; Tobias Scherbaum <dertobi123@g.o>
-  cups-1.2.12-r8.ebuild:
-  ppc stable, bug #217232
-
-  15 Apr 2008; Jeroen Roovers <jer@g.o> cups-1.2.12-r8.ebuild:
-  Stable for HPPA (bug #217232).
-
-  15 Apr 2008; Ferris McCormick <fmccor@g.o> cups-1.2.12-r8.ebuild:
-  Sparc stable, security Bug #217232.
-
-  15 Apr 2008; Markus Rothe <corsair@g.o> cups-1.2.12-r8.ebuild:
-  Stable on ppc64; bug #217232
-
-*cups-1.3.7-r1 (14 Apr 2008)
-*cups-1.2.12-r8 (14 Apr 2008)
-
-  14 Apr 2008; Timo Gurr <tgurr@g.o>
-  +files/cups-1.2.12-CVE-2008-1722.patch,
-  -files/cups-1.3.6-CVE-2008-1373.patch,
-  +files/cups-1.3.7-CVE-2008-1722.patch,
-  +files/cups-1.3.7-backend-https.patch, +cups-1.2.12-r8.ebuild,
-  -cups-1.3.6-r3.ebuild, -cups-1.3.7.ebuild, +cups-1.3.7-r1.ebuild:
-  Security bump, see bug #217232. Also fixes bug #217293.
-
-*cups-1.3.7 (05 Apr 2008)
-
-  05 Apr 2008; Timo Gurr <tgurr@g.o> +cups-1.3.7.ebuild:
-  Add cups-1.3.7.ebuild, version bump, fixes bug #202914, #213121 and
-  #215901.
-
-  05 Apr 2008; Stefan Schweizer <genstef@g.o> cups-1.2.12-r4.ebuild,
-  -cups-1.2.12-r5.ebuild, -cups-1.2.12-r6.ebuild, cups-1.2.12-r7.ebuild,
-  -cups-1.3.6-r1.ebuild, -cups-1.3.6-r2.ebuild, cups-1.3.6-r3.ebuild:
-  gimp-print -> gutenprint
-
-  02 Apr 2008; Raúl Porcel <armin76@g.o> cups-1.2.12-r7.ebuild:
-  ia64 stable
-
-*cups-1.3.6-r3 (01 Apr 2008)
-
-  01 Apr 2008; Peter Volkov <pva@g.o>
-  +files/cups-1.3.6-CVE-2008-1373.patch, +cups-1.3.6-r3.ebuild:
-  Fixing overflow in gif image filter, security bug #214068, thank Robert
-  Buchholz for report.
-
-  01 Apr 2008; Robert Buchholz <rbu@g.o> cups-1.2.12-r7.ebuild:
-  amd64 stable, bug #214068
-
-*cups-1.2.12-r7 (01 Apr 2008)
-
-  01 Apr 2008; Peter Volkov <pva@g.o>
-  +files/cups-1.2.12-CVE-2008-0053.patch,
-  +files/cups-1.2.12-CVE-2008-1373.patch, +cups-1.2.12-r7.ebuild:
-  Fixing multiple security vulnerabilities, bug #214068, thank Robert
-  Buchholz and all other developers working on that bug.
-
-  23 Mar 2008; Tobias Scherbaum <dertobi123@g.o>
-  cups-1.2.12-r6.ebuild:
-  ppc stable, bug #212364
-
-  22 Mar 2008; Tobias Klausmann <klausman@g.o> cups-1.2.12-r6.ebuild:
-  Stable on alpha, bug #212364
-
-  22 Mar 2008; Raúl Porcel <armin76@g.o> cups-1.2.12-r6.ebuild:
-  ia64 stable wrt #212364
-
-*cups-1.3.6-r2 (19 Mar 2008)
-*cups-1.2.12-r6 (19 Mar 2008)
-
-  19 Mar 2008; Robert Buchholz <rbu@g.o>
-  +files/cups-1.2.12-CVE-2008-0047.patch, +cups-1.2.12-r6.ebuild,
-  +cups-1.3.6-r2.ebuild:
-  Non-maintainer-commit: Version bump for security bug 212364 (CVE-2008-0047).
-  Ebuild created by Timo Gurr <tgurr@g.o>.
-
-  04 Mar 2008; Tobias Scherbaum <dertobi123@g.o>
-  cups-1.2.12-r5.ebuild:
-  ppc stable, bug #211449
-
-  02 Mar 2008; Richard Freeman <rich0@g.o> cups-1.2.12-r5.ebuild:
-  amd64 stable - 211449
-
-  02 Mar 2008; Markus Rothe <corsair@g.o> cups-1.2.12-r5.ebuild:
-  Stable on ppc64; bug #211449
-
-  02 Mar 2008; Raúl Porcel <armin76@g.o> cups-1.2.12-r5.ebuild:
-  alpha/ia64 stable wrt #211449
-
-  29 Feb 2008; Ferris McCormick <fmccor@g.o> cups-1.2.12-r5.ebuild:
-  Sparc stable --- Security Bug #211449 --- verified (remote) with ps and pdf.
-
-  29 Feb 2008; Jeroen Roovers <jer@g.o> cups-1.2.12-r5.ebuild:
-  Stable for HPPA (bug #211449).
-
-  29 Feb 2008; Christian Faulhammer <opfer@g.o>
-  cups-1.2.12-r5.ebuild:
-  stable x86, security bug 211449
-
-*cups-1.3.6-r1 (28 Feb 2008)
-*cups-1.2.12-r5 (28 Feb 2008)
-
-  28 Feb 2008; Timo Gurr <tgurr@g.o>
-  -files/cups-1.2.4-CVE-2007-4045.patch, -files/cups-1.2-str2561-v2.patch,
-  +files/cups-1.2.12-CVE-2007-4045.patch,
-  +files/cups-1.2.12-CVE-2007-4351.patch,
-  +files/cups-1.2.12-CVE-2008-0882.patch, -files/cups-1.3.0-bindnow.patch,
-  -files/cups-1.3.4-CVE-2007-4045.patch, -files/pdftops.pl,
-  -cups-1.2.10-r1.ebuild, cups-1.2.12-r4.ebuild, +cups-1.2.12-r5.ebuild,
-  -cups-1.3.5.ebuild, -cups-1.3.6.ebuild, +cups-1.3.6-r1.ebuild:
-  Add cups-1.2.12-r5.ebuild to fix security issue CVE-2008-0882, see bug
-  #211449.Remove older vulnerable versions. Rename patches for better
-  versioning. Minor ebuild cleanups.
-
-*cups-1.3.6 (22 Feb 2008)
-
-  22 Feb 2008; Timo Gurr <tgurr@g.o> cups-1.2.10-r1.ebuild,
-  -cups-1.2.12-r2.ebuild, -cups-1.2.12-r3.ebuild, +cups-1.3.6.ebuild:
-  Add cups-1.3.6.ebuild, version bump. Also remove bindnow to solve the
-  portage QA warning. Clean up old ebuilds and fix some quoting.
-
-  26 Dec 2007; Doug Klima <cardoe@g.o> cups-1.2.12-r2.ebuild,
-  cups-1.2.12-r3.ebuild, cups-1.2.12-r4.ebuild, cups-1.3.5.ebuild:
-  Fix LDAP + CUPS issue once and for all. CUPS used older, deprecated API
-  calls to be compatible with all LDAP implementations out there. You must
-  define LDAP_DEPRECATED so that th headers define them.
-
-*cups-1.3.5 (18 Dec 2007)
-*cups-1.2.12-r4 (18 Dec 2007)
-
-  18 Dec 2007; Timo Gurr <tgurr@g.o>
-  +files/cups-1.2.12-CVE-2007-5849.patch, +files/pdftops-1.20.gentoo,
-  -cups-1.1.23-r8.ebuild, +cups-1.2.12-r4.ebuild, -cups-1.3.4-r3.ebuild,
-  +cups-1.3.5.ebuild:
-  Add cups ebuilds with security fixes for bug #201042 and bug #201570.
-  Cleanup older ones.
-
-  10 Dec 2007; Raúl Porcel <armin76@g.o> cups-1.2.12-r3.ebuild:
-  alpha/ia64 stable wrt security #199195
-
-  10 Dec 2007; Ferris McCormick <fmccor@g.o> cups-1.2.12-r3.ebuild:
-  Sparc stable --- security Bug #199195
-
-  08 Dec 2007; <welp@g.o> cups-1.2.12-r3.ebuild:
-  Stable on amd64 wrt bug 199195
-
-  08 Dec 2007; Jeroen Roovers <jer@g.o> cups-1.2.12-r3.ebuild:
-  Stable for HPPA (bug #199195).
-
-  07 Dec 2007; Tobias Scherbaum <dertobi123@g.o>
-  cups-1.2.12-r3.ebuild:
-  ppc stable, bug #199195
-
-  07 Dec 2007; Markus Rothe <corsair@g.o> cups-1.2.12-r3.ebuild:
-  Stable on ppc64; bug #199195
-
-  07 Dec 2007; Christian Faulhammer <opfer@g.o>
-  cups-1.2.12-r3.ebuild:
-  stable x86, security bug 199195
-
-  20 Nov 2007; Joshua Kinard <kumba@g.o> cups-1.2.12-r2.ebuild:
-  Stable on mips, per #196736.
-
-*cups-1.3.4-r3 (16 Nov 2007)
-*cups-1.2.12-r3 (16 Nov 2007)
-
-  16 Nov 2007; Timo Gurr <tgurr@g.o>
-  +files/cups-1.2.4-CVE-2007-4045.patch,
-  +files/cups-1.3.4-CVE-2007-4045.patch, -cups-1.2.12-r1.ebuild,
-  +cups-1.2.12-r3.ebuild, -cups-1.3.4-r2.ebuild, +cups-1.3.4-r3.ebuild:
-  Revbump adding the patches to fix CVE-2007-4045, see bug #199195. Also
-  remove an older vulnerable version.
-
-*cups-1.3.4-r2 (12 Nov 2007)
-
-  12 Nov 2007; Timo Gurr <tgurr@g.o> -cups-1.3.4-r1.ebuild,
-  +cups-1.3.4-r2.ebuild:
-  Revbump to fix remaining broken init scripts out there, fixes bug #198661.
-  Thanks vapier for the fix.
-
-  10 Nov 2007; Raúl Porcel <armin76@g.o> cups-1.2.12-r2.ebuild:
-  alpha/ia64 stable wrt #196736
-
-  09 Nov 2007; Mike Frysinger <vapier@g.o> cups-1.3.4-r1.ebuild:
-  Fix installation of cups init.d script.
-
-  09 Nov 2007; Daniel Gryniewicz <dang@g.o> cups-1.2.12-r2.ebuild:
-  Marked stable on amd64 for bug #196736
-
-  09 Nov 2007; Stefan Schweizer <genstef@g.o> files/cupsd.init,
-  files/cupsd.init.d:
-  remove after vmware to work around hanging boot, bug 89956
-
-*cups-1.3.4-r1 (08 Nov 2007)
-
-  08 Nov 2007; Timo Gurr <tgurr@g.o> +files/cupsd.init.d,
-  -cups-1.3.4.ebuild, +cups-1.3.4-r1.ebuild:
-  New revision cups-1.3.4-r1, fixes bug #198267 and bug #198305.
-
-  06 Nov 2007; Tobias Scherbaum <dertobi123@g.o>
-  cups-1.2.12-r2.ebuild:
-  ppc stable, bug #196736
-
-  06 Nov 2007; Jeroen Roovers <jer@g.o> cups-1.2.12-r2.ebuild:
-  Stable for HPPA (bug #196736).
-
-  06 Nov 2007; Markus Rothe <corsair@g.o> cups-1.2.12-r2.ebuild:
-  Stable on ppc64; bug #196736
-
-  06 Nov 2007; Christian Faulhammer <opfer@g.o>
-  cups-1.2.12-r2.ebuild:
-  stable x86, security bug 196736
-
-  05 Nov 2007; Timo Gurr <tgurr@g.o> cups-1.3.4.ebuild:
-  Remove bluetooth USE flag from cups-1.3.4.ebuild to avoid breakage on some
-  archs.
-
-  05 Nov 2007; Ferris McCormick <fmccor@g.o> cups-1.2.12-r2.ebuild:
-  Sparc stable --- security Bug #196736 --- still prints things.
-
-  05 Nov 2007; Stefan Schweizer <genstef@g.o>
-  -files/cups-1.1.23-image-png.patch, -files/cups-1.1-str2561-v2.patch,
-  -files/cups-1.1.23-bindnow.patch, -files/cups-1.1.23-respectldflags.patch,
-  -files/cups.xinetd, -files/cups-gcc4-amd64.patch,
-  -files/cups-gentooalt.patch, -files/cupsaddsmb.patch,
-  -files/disable-strip.patch, cups-1.1.23-r8.ebuild, -cups-1.1.23-r9.ebuild:
-  Change the cups-1.1 ebuild to be only a pointer to newer ebuilds. We cannot
-  remove it because the mips stable tree would break then
-
-*cups-1.3.4 (05 Nov 2007)
-*cups-1.2.12-r2 (05 Nov 2007)
-*cups-1.1.23-r9 (05 Nov 2007)
-
-  05 Nov 2007; Timo Gurr <tgurr@g.o>
-  +files/cups-1.1-str2561-v2.patch, +files/cups-1.2-str2561-v2.patch,
-  +cups-1.1.23-r9.ebuild, +cups-1.2.12-r2.ebuild, -cups-1.3.3.ebuild,
-  +cups-1.3.4.ebuild:
-  Revbump adding the patches to fix CVE-2007-4351, see bug #196736. Also add
-  cups-1.3.4.ebuild and remove old version.
-
-  28 Oct 2007; Markus Rothe <corsair@g.o> cups-1.2.12-r1.ebuild:
-  Stable on ppc64; bug #195278
-
-  27 Oct 2007; nixnut <nixnut@g.o> cups-1.2.12-r1.ebuild:
-  Stable on ppc wrt bug 195278
-
-  25 Oct 2007; Daniel Gryniewicz <dang@g.o> cups-1.2.12-r1.ebuild:
-  Marked stable on amd64 for bug #195278
-
-  24 Oct 2007; Ferris McCormick <fmccor@g.o> cups-1.2.12-r1.ebuild:
-  Sparc stable --- Bug #195278 --- poppler requirement and seems fine.
-
-  24 Oct 2007; Jeroen Roovers <jer@g.o> cups-1.2.12-r1.ebuild:
-  Stable for HPPA (bug #195278). Fixed quoting issues.
-
-  22 Oct 2007; Markus Meier <maekke@g.o> cups-1.2.12-r1.ebuild:
-  x86 stable, bug #195278
-
-*cups-1.3.3 (10 Oct 2007)
-
-  10 Oct 2007; Timo Gurr <tgurr@g.o> +files/cups-1.3.0-bindnow.patch,
-  +files/cups-1.3.0-configure.patch, +cups-1.3.3.ebuild:
-  Add cups-1.3.3.ebuild, fixes bug #188993 and also has a patch applied for
-  bug #192294.
-
-*cups-1.2.12-r1 (09 Oct 2007)
-
-  09 Oct 2007; Stefan Schweizer <genstef@g.o>
-  -files/cups-1.2.1-ssldir.patch, -files/cups-1.2.5.patch, files/pdftops.pl,
-  -cups-1.2.9.ebuild, -cups-1.2.11.ebuild, -cups-1.2.12.ebuild,
-  +cups-1.2.12-r1.ebuild:
-  Fix pdftops with poppler-0.6 thanks to Christian Aistleitner <tmgisi@×××.at>
-  in bug 195278
-
-  07 Aug 2007; Raúl Porcel <armin76@g.o> cups-1.2.10-r1.ebuild:
-  ia64 stable wrt #180906
-
-  21 Jul 2007; Raúl Porcel <armin76@g.o> cups-1.2.10-r1.ebuild:
-  alpha stable wrt #180909, thanks to Brian Evans and Tobias Klausmann for
-  testing
-
-  20 Jul 2007; Roy Marples <uberlord@g.o> cups-1.2.12.ebuild:
-  Keyworded ~sparc-fbsd.
-
-*cups-1.2.12 (13 Jul 2007)
-
-  13 Jul 2007; Stefan Schweizer <genstef@g.o> +cups-1.2.12.ebuild:
-  version bump
-
-  11 Jun 2007; Daniel Gryniewicz <dang@g.o> cups-1.2.10-r1.ebuild:
-  Marked stable on amd64 for bug #180909
-
-  10 Jun 2007; Tobias Scherbaum <dertobi123@g.o>
-  cups-1.2.10-r1.ebuild:
-  ppc stable, bug #180909
-
-  07 Jun 2007; Markus Rothe <corsair@g.o> cups-1.2.10-r1.ebuild:
-  Stable on ppc64; bug #180909
-
-  07 Jun 2007; Christian Faulhammer <opfer@g.o>
-  cups-1.2.10-r1.ebuild:
-  stable x86, bug 180909
-
-  06 Jun 2007; Raúl Porcel <armin76@g.o> cups-1.2.10-r1.ebuild:
-  Restore ~x86 as it needs some dep that isn't stable
-
-  06 Jun 2007; Christian Faulhammer <opfer@g.o>
-  cups-1.2.10-r1.ebuild:
-  stable x86, bug 180909
-
-  06 Jun 2007; Jeroen Roovers <jer@g.o> cups-1.2.10-r1.ebuild:
-  Stable for HPPA (bug #180909).
-
-  05 Jun 2007; Gustavo Zacarias <gustavoz@g.o> cups-1.2.10-r1.ebuild:
-  Stable on sparc wrt #180909
-
-*cups-1.2.11 (09 May 2007)
-
-  09 May 2007; Stefan Schweizer <genstef@g.o> +cups-1.2.11.ebuild:
-  version bump and add lib64 check thanks to Sal Gonzalez
-  <blef@××××××××××.net> in bug 173789
-
-*cups-1.2.10-r1 (01 May 2007)
-
-  01 May 2007; Denis Dupeyron <calchan@g.o> +cups-1.2.10-r1.ebuild:
-  Fixed bug #172341.
-
-  07 Apr 2007; Stefan Schweizer <genstef@g.o> cups-1.2.9.ebuild, cups-1.2.10.ebuild:
-  Use pstoraster for gs-gpl and -gnu to make them work with gimp-print for
-  example, thanks to nicola.rauseo@×××××.com in bug 163897
-
-*cups-1.2.10 (07 Apr 2007)
-
-  07 Apr 2007; Stefan Schweizer <genstef@g.o> +cups-1.2.10.ebuild:
-  version bump
-
-  29 Mar 2007; Chris Gianelloni <wolf31o2@g.o> cups-1.2.9.ebuild:
-  Stable on alpha wrt bug #170881.
-
-  27 Mar 2007; Jeroen Roovers <jer@g.o> cups-1.2.9.ebuild:
-  Stable for HPPA (bug #170881).
-
-  27 Mar 2007; Chris Gianelloni <wolf31o2@g.o> cups-1.2.9.ebuild:
-  Stable on amd64/ia64 wrt bug #170881.
-
-  26 Mar 2007; Gustavo Zacarias <gustavoz@g.o> cups-1.2.9.ebuild:
-  Stable on sparc wrt security #170881
-
-  25 Mar 2007; Andrej Kacian <ticho@g.o> cups-1.2.9.ebuild:
-  Stable on x86, security bug #170881.
-
-  25 Mar 2007; Tobias Scherbaum <dertobi123@g.o> cups-1.2.9.ebuild:
-  Stable on ppc wrt bug #170881.
-
-  25 Mar 2007; Markus Rothe <corsair@g.o> cups-1.2.9.ebuild:
-  Stable on ppc64; bug #170881
-
-*cups-1.2.9 (20 Mar 2007)
-
-  20 Mar 2007; Stefan Schweizer <genstef@g.o> +cups-1.2.9.ebuild:
-  version bump
-
-*cups-1.2.8 (19 Feb 2007)
-
-  19 Feb 2007; <genstef@g.o> +cups-1.2.8.ebuild:
-  Version bump, fixes bugs 167467 and 158404
-
-  03 Dec 2006; Tobias Scherbaum <dertobi123@g.o> cups-1.2.6.ebuild:
-  ppc stable, bug #155382
-
-  01 Dec 2006; Gustavo Zacarias <gustavoz@g.o> cups-1.2.6.ebuild:
-  Stable on hppa wrt #155382
-
-  30 Nov 2006; Markus Rothe <corsair@g.o> cups-1.2.6.ebuild:
-  Stable on ppc64; bug #155382
-
-  27 Nov 2006; Patrick McLean <chutzpah@g.o> cups-1.2.6.ebuild:
-  Stable on amd64 (bug #155382)
-
-  22 Nov 2006; Gustavo Zacarias <gustavoz@g.o> cups-1.2.6.ebuild:
-  Stable on sparc
-
-  21 Nov 2006; Christian Faulhammer <opfer@g.o> cups-1.2.6.ebuild:
-  stable x86, bug #155382
-
-*cups-1.2.7 (17 Nov 2006)
-
-  17 Nov 2006; Stefan Schweizer <genstef@g.o> +cups-1.2.7.ebuild:
-  version bump
-
-  08 Nov 2006; Stefan Schweizer <genstef@g.o> -cups-1.2.5.ebuild:
-  fix digest
-
-  08 Nov 2006; Seemant Kulleen <seemant@g.o> +files/cups-1.2.5.patch,
-  +cups-1.2.5.ebuild:
-  restoring 1.2.5 until the distfile issue is properly sorted
-
-  07 Nov 2006; Patrick McLean <chutzpah@g.o> cups-1.1.23-r8.ebuild,
-  cups-1.2.6.ebuild:
-  Add WANT_AUTOMAKE=latest to all current versions to fix a build error on
-  systems without aclocal-1.10 installed.
-
-  07 Nov 2006; Stefan Schweizer <genstef@g.o> cups-1.2.6.ebuild:
-  We DoSed easysw, mirror on gentooexperimental until it is on the Gentoo
-  mirrors, bug 154396
-
-*cups-1.2.6 (07 Nov 2006)
-
-  07 Nov 2006; Stefan Schweizer <genstef@g.o>
-  -files/cups-1.2.5.patch, -cups-1.2.4.ebuild, -cups-1.2.5.ebuild,
-  +cups-1.2.6.ebuild:
-  version bump
-
-  01 Nov 2006; Doug Goldstein <cardoe@g.o> cups-1.2.4.ebuild,
-  cups-1.2.5.ebuild:
-  Fixing dbus depend
-
-  21 Oct 2006; Stefan Schweizer <genstef@g.o> files/cups-1.2.5.patch:
-  fix patch, thanks to Kalidarn <dcecchin@×××××.com> in bug 152182
-
-*cups-1.2.5 (21 Oct 2006)
-
-  21 Oct 2006; Stefan Schweizer <genstef@g.o>
-  +files/cups-1.2.5.patch, +cups-1.2.5.ebuild:
-  version bump
-
-  14 Oct 2006; Stefan Schweizer <genstef@g.o> -cups-1.2.2.ebuild,
-  cups-1.2.4.ebuild:
-  remove old
-
-  02 Oct 2006; Stefan Schweizer <genstef@g.o> cups-1.2.4.ebuild:
-  I wonder why those blanks matter
-
-*cups-1.2.4 (24 Sep 2006)
-
-  24 Sep 2006; Stefan Schweizer <genstef@g.o>
-  -files/cupsDirRead-dont-end-on-failed-stat.patch, -cups-1.2.3.ebuild,
-  +cups-1.2.4.ebuild:
-  version bump
-
-  14 Sep 2006; Stefan Schweizer <genstef@g.o>
-  -files/cups-1.1.22-xpdf2-underflow.patch, -files/cups.pam,
-  -files/cups-lppasswd-setXid.patch, -files/xpdf-goo-sizet.patch,
-  -files/xpdf-pl3.patch, -cups-1.1.23-r1.ebuild:
-  remove old, thanks jakub
-
-  06 Sep 2006; Stefan Schweizer <genstef@g.o> cups-1.2.3.ebuild:
-  Set PDEPEND correctly thanks to Sascha Lucas
-  <sascha.lucas@×××××××××××××××××.de> in bug 146517
-
-  05 Sep 2006; Joshua Kinard <kumba@g.o> cups-1.2.3.ebuild:
-  Added ~mips to KEYWORDS.
-
-  05 Sep 2006; Joshua Kinard <kumba@g.o> cups-1.1.23-r8.ebuild:
-  Marked stable on mips.
-
-*cups-1.2.3 (04 Sep 2006)
-
-  04 Sep 2006; Stefan Schweizer <genstef@g.o>
-  +files/cupsDirRead-dont-end-on-failed-stat.patch, +cups-1.2.3.ebuild:
-  Add php useflag, bug 144464 thanks to Christian Korff
-  <christian.korff@×××××.com>, version bump thanks to Francisco Javier
-  <ffelix@××××××.com> in bug 146266, add patch from upstream issue tracker to
-  fix problems with dead links thanks to Ed Catmur
-
-  02 Sep 2006; Stefan Schweizer <genstef@g.o> cups-1.2.2.ebuild:
-  resolve circular dep by moving the ppds dep to PDEPEND, thanks to Mart
-  Raudsepp <leio@g.o> in bug 145920
-
-  21 Aug 2006; Stefan Schweizer <genstef@g.o> cups-1.2.2.ebuild:
-  Change to || dbus depend in order to solve bug 144527
-
-  19 Aug 2006; Stefan Schweizer <genstef@g.o> cups-1.2.2.ebuild:
-  make gnutls mandatory because it does not work with openssl, thanks to
-  Jari-Matti Mäkelä <jmjmak@×××.fi> and Bret Towe <magnade@×××××.com> in bug
-  138275
-
-  18 Aug 2006; Stefan Schweizer <genstef@g.o> cups-1.1.23-r8.ebuild,
-  cups-1.2.2.ebuild:
-  Fix ghostscript detection with gs-sp thanks to Sebastian Bergmann
-  <sebastian@g.o> in bug 144354
-
-  18 Aug 2006; Stefan Schweizer <genstef@g.o> cups-1.2.2.ebuild:
-  Depend with X useflag on xdg-utils to select the browser thanks to Wiktor
-  Wandachowicz <siryes@×××××.com> in bug 137934
-
-  17 Aug 2006; Stefan Schweizer <genstef@g.o> cups-1.1.23-r8.ebuild,
-  cups-1.2.2.ebuild:
-  remove old, more on-demand the postinst information thanks to ph
-  <phajdan.jr@×××××.com> in bug 142057
-
-*cups-1.2.2 (23 Jul 2006)
-
-  23 Jul 2006; Stefan Schweizer <genstef@g.o> +cups-1.2.2.ebuild:
-  version bump thanks to Timo Boettcher <spida@×××××.net> in bgu 141500
-
-  03 Jul 2006; Gustavo Zacarias <gustavoz@g.o> cups-1.1.23-r8.ebuild:
-  Stable on sparc wrt #138736
-
-*cups-1.1.23-r8 (03 Jul 2006)
-
-  03 Jul 2006; Stefan Schweizer <genstef@g.o> +cups-1.1.23-r8.ebuild:
-  Revision bump to push out libpng change, thanks to Ian Stakenvicius
-  <ian@××××××××××××××××××××××.com> in bug 136346, ~sparc because sparc does
-  not yet have libpng-1.2.10 stable
-
-  03 Jul 2006; Stefan Schweizer <genstef@g.o>
-  +files/cups-1.1.23-image-png.patch, cups-1.1.23-r7.ebuild:
-  libpng >=1.2.10 compat thanks to kojiro in bug 136346
-
-  02 Jul 2006; Stefan Schweizer <genstef@g.o> cups-1.2.1-r2.ebuild:
-  Add ppds useflag to drag in the linuxprinting.org ppds as suggested by
-  spyderous
-
-  28 Jun 2006; Stefan Schweizer <genstef@g.o> cups-1.2.1-r2.ebuild:
-  use pamd_mimic_system again thanks to robbat2 in bug 138315
-
-  27 Jun 2006; Guy Martin <gmsoft@g.o> cups-1.2.1-r2.ebuild:
-  Added ~hppa to KEYWORDS.
-
-  22 Jun 2006; Stefan Schweizer <genstef@g.o> cups-1.2.1-r2.ebuild:
-  add if has_version =net-print/cups-1.1*; for the compat symlinks and einfo
-  thanks to jakub
-
-*cups-1.2.1-r2 (22 Jun 2006)
-
-  22 Jun 2006; Stefan Schweizer <genstef@g.o> -cups-1.2.1-r1.ebuild,
-  +cups-1.2.1-r2.ebuild:
-  revision bump to allow remote administration with USE="ssl", recommend
-  emerge -va1 in postinst thanks to jakub
-
-  22 Jun 2006; Stefan Schweizer <genstef@g.o>
-  +files/cups-1.2.1-ssldir.patch, +files/cupsd.init, -files/cupsd.rc6,
-  cups-1.1.23-r1.ebuild, cups-1.1.23-r7.ebuild, cups-1.2.1-r1.ebuild:
-  Add /etc/cups/ssl, thanks to Philipp Rosenberger <philipp@××××××××××.org>
-  and Joe Kappus <joecool1029@×××××.com> in bug 137444, ebuild cleanups
-
-  20 Jun 2006; Markus Rothe <corsair@g.o> cups-1.2.1-r1.ebuild:
-  Added ~ppc64; bug #136902
-
-  19 Jun 2006; Stefan Schweizer <genstef@g.o> cups-1.2.1-r1.ebuild:
-  Add comment about rebuilding kdelibs thanks to Aaron
-  <aaron123456789@×××××.com> in bug 137274
-
-  18 Jun 2006; Stefan Schweizer <genstef@g.o> cups-1.2.1-r1.ebuild:
-  Disable xinetd by default thanks to robbat2 in bug 137130
-
-  16 Jun 2006; Jason Wever <weeve@g.o> cups-1.2.1-r1.ebuild:
-  Added ~sparc keyword wrt bug #136902.
-
-  15 Jun 2006; Stefan Schweizer <genstef@g.o> cups-1.2.1-r1.ebuild:
-  Remove all arches that have libpaper not keyworded
-
-  15 Jun 2006; Stefan Schweizer <genstef@g.o> cups-1.2.1-r1.ebuild:
-  Mention FEATURES=-collision-protect in the pkg-postinst einfo notes, thanks
-  to Michael Cramer <bigmichi1@××××××××××××××××.org> in bug 136859
-
-  15 Jun 2006; Stefan Schweizer <genstef@g.o> cups-1.1.23-r1.ebuild,
-  cups-1.1.23-r7.ebuild:
-  Make libpng depend correctly a <1.2.10 one thanks to Friedrich Oslage
-  <bluebird@×××××××××××.de>, Rob Couto <rob@××××××××.org> and moesasji
-  <henkjans_bagger@×××××××.com> in bug 136346
-
-  14 Jun 2006; Rajiv Aaron Manglani <rajiv@g.o> cups-1.2.1-r1.ebuild:
-  install web interface files in data dir so FEATURES=nodoc works.
-
-  14 Jun 2006; Stefan Schweizer <genstef@g.o> cups-1.2.1-r1.ebuild:
-  Add more useflags thanks to Gilles Dartiguelongue <dartigug@×××××.fr> in bug
-  136787, also improve postinst and add automatic update-help-symlinks
-
-*cups-1.2.1-r1 (13 Jun 2006)
-
-  13 Jun 2006; Rajiv Aaron Manglani <rajiv@g.o>
-  +cups-1.2.1-r1.ebuild:
-  put cups source files back where they belong.
-
-  05 Jun 2006; Stefan Schweizer <genstef@g.o> -cups-1.2.0_pre.ebuild,
-  -cups-1.2.0.ebuild, cups-1.2.1.ebuild:
-  default to 106 for the lpadmin gid thanks to Nils Marving <nils@×××××××.dk>
-  in bug 134519, add a workaround for my own usb printer problem that is not
-  applied upstream
-
-  27 May 2006; Stefan Schweizer <genstef@g.o> cups-1.2.1.ebuild:
-  Add ghostscript PDEPEND, add --with-docdir, readd initd file
-
-*cups-1.2.1 (25 May 2006)
-
-  25 May 2006; Stefan Schweizer <genstef@g.o> +cups-1.2.1.ebuild:
-  version bump
-
-*cups-1.2.0 (08 May 2006)
-
-  08 May 2006; Stefan Schweizer <genstef@g.o>
-  +files/cups-1.2.0-bindnow.patch, +cups-1.2.0.ebuild:
-  Version bump 1.2.0, still masked due to my printing still being
-  buggy+configuration changes whcih need user interaction
-
-  08 May 2006; Stefan Schweizer <genstef@g.o> cups-1.2.0_pre.ebuild:
-  Add libpaper depend and remove config file sed
-
-  08 May 2006; Diego Pettenò <flameeyes@g.o> cups-1.2.0_pre.ebuild:
-  Provide a lpadmin group as debian does, and use that as system group for
-  cups. Restrict test instead of providing a fake src_test.
-
-  07 May 2006; Diego Pettenò <flameeyes@g.o> cups-1.2.0_pre.ebuild:
-  Install inside /usr/libexec to workaround multilib problems, and fix
-  cups-config file, too.
-
-  07 May 2006; Diego Pettenò <flameeyes@g.o> cups-1.2.0_pre.ebuild:
-  Make sure that the cups-lpd xinetd file is safe for FreeBSD, too.
-
-  06 May 2006; Diego Pettenò <flameeyes@g.o> cups-1.2.0_pre.ebuild:
-  Fix SERVERBIN path and fix multilib-strictness. Add optional dbus useflag.
-
-*cups-1.2.0_pre (05 May 2006)
-
-  05 May 2006; Stefan Schweizer <genstef@g.o> files/pdftops.pl,
-  +cups-1.2.0_pre.ebuild:
-  Preview version of cups-1.2, masked for now
-
-  02 Apr 2006; Diego Pettenò <flameeyes@g.o> cups-1.1.23-r7.ebuild:
-  Fix nls dependencies and add ~x86-fbsd keyword.
-
-  18 Mar 2006; Diego Pettenò <flameeyes@g.o>
-  +files/cups-1.1.23-respectldflags.patch, cups-1.1.23-r7.ebuild:
-  Add patch to respect LDFLAGS while building shared libraries.
-
-  07 Feb 2006; Aron Griffis <agriffis@g.o> cups-1.1.23-r7.ebuild:
-  Mark 1.1.23-r7 stable on alpha
-
-  03 Feb 2006; Stefan Schweizer <genstef@g.o> cups-1.1.23-r4.ebuild,
-  cups-1.1.23-r7.ebuild:
-  Remove the cjk einfo+IUSE, remove the xpdfrc symlink, bug 117576, also
-  remove xpdf from deps for -r4
-
-  14 Jan 2006; Stefan Schweizer <genstef@g.o> cups-1.1.23-r7.ebuild:
-  Add post-einfo note suggesting to emerge ghsotscript with USE=cups thanks to
-  Corvus Corax <corvus-gentoo@×××××××××××.com> in bug 96985
-
-  13 Jan 2006; Diego Pettenò <flameeyes@g.o> cups-1.1.23-r7.ebuild:
-  The name of the function is bindnow-flags, not bindnow_flags.
-
-  13 Jan 2006; Mark Loeser <halcy0n@g.o> cups-1.1.23-r7.ebuild:
-  Stable on x86; bug #117495
-
-  12 Jan 2006; Simon Stelling <blubb@g.o> cups-1.1.23-r7.ebuild:
-  stable on amd64 wrt bug 117495
-
-  11 Jan 2006; Markus Rothe <corsair@g.o> cups-1.1.23-r7.ebuild:
-  Stable on ppc64; bug #117495
-
-  11 Jan 2006; Tobias Scherbaum <dertobi123@g.o>
-  cups-1.1.23-r7.ebuild:
-  ppc stable, bug #117495, #117481
-
-  11 Jan 2006; Gustavo Zacarias <gustavoz@g.o> cups-1.1.23-r7.ebuild:
-  Stable on sparc wrt #117481 #117495
-
-  10 Jan 2006; Stefan Schweizer <genstef@g.o> -cups-1.1.23-r2.ebuild,
-  -cups-1.1.23-r3.ebuild, cups-1.1.23-r4.ebuild, -cups-1.1.23-r5.ebuild,
-  -cups-1.1.23-r6.ebuild:
-  Fix poppler/xpdf depend for the stable package and remove unused ebuilds
-
-  09 Jan 2006; Jeroen Roovers <jer@g.o> cups-1.1.23-r7.ebuild:
-  Marked hppa stable (bug #117495).
-
-*cups-1.1.23-r7 (27 Dec 2005)
-
-  27 Dec 2005; <dang@g.o> +cups-1.1.23-r7.ebuild:
-  Make cups dep on poppler. Bug #115863
-
-  25 Dec 2005; Stefan Schweizer <genstef@g.o> files/cupsaddsmb.patch:
-  Remove cvs Ids from patch, #116728
-
-*cups-1.1.23-r6 (25 Dec 2005)
-
-  25 Dec 2005; Stefan Schweizer <genstef@g.o>
-  +files/cupsaddsmb.patch, +cups-1.1.23-r6.ebuild:
-  Make Windows V6 drivers work thanks to Chris Smith
-  <chris@×××××××××××××××.com> in bug 111272
-
-  15 Dec 2005; Mark Loeser <halcy0n@g.o> cups-1.1.23-r4.ebuild:
-  Stable on x86; bug #115286
-
-*cups-1.1.23-r5 (14 Dec 2005)
-
-  14 Dec 2005; <dang@g.o> +files/cups-1.1.23-bindnow.patch,
-  +cups-1.1.23-r5.ebuild:
-  Allow configuration of bindnow-flags. Bug #115504
-
-  14 Dec 2005; Fernando J. Pereda <ferdy@g.o> cups-1.1.23-r4.ebuild:
-  stable on alpha wrt bug #115286
-
-  13 Dec 2005; Michael Hanselmann <hansmi@g.o> cups-1.1.23-r4.ebuild:
-  Stable on hppa, ppc.
-
-  13 Dec 2005; Markus Rothe <corsair@g.o> cups-1.1.23-r4.ebuild:
-  Stable on ppc64; bug #115286
-
-  13 Dec 2005; Gustavo Zacarias <gustavoz@g.o> cups-1.1.23-r4.ebuild:
-  Stable on sparc wrt security #115286
-
-  13 Dec 2005; <dang@g.o> cups-1.1.23-r4.ebuild:
-  Marked stable on amd64
-
-  03 Oct 2005; MATSUU Takuto <matsuu@g.o> cups-1.1.23-r1.ebuild:
-  Stable on sh.
-
-  29 Jul 2005; Jonathan Smith <smithj@g.o> cups-1.1.23-r1.ebuild,
-  cups-1.1.23-r2.ebuild, cups-1.1.23-r3.ebuild, cups-1.1.23-r4.ebuild:
-  #71202: make test is broken due to an interactive testing mechanism, so i
-  replaced the default src_test with a dummy one
-
-  18 Jul 2005; Carsten Lohrke <carlo@g.o> cups-1.1.23-r4.ebuild:
-  Let's be a bit more careful what to rm -fR in pkg_preinst().
-
-  12 Jun 2005; Heinrich Wendel <lanius@g.o> cups-1.1.23-r3.ebuild,
-  cups-1.1.23-r4.ebuild:
-  bug #95852
-
-  07 Jun 2005; Heinrich Wendel <lanius@g.o> +files/pdftops.pl,
-  cups-1.1.23-r4.ebuild:
-  add pdftops to files, bug #93871
-
-*cups-1.1.23-r4 (06 Jun 2005)
-
-  06 Jun 2005; Heinrich Wendel <lanius@g.o>
-  +files/cups-gentooalt.patch, +files/cups-lppasswd-setXid.patch,
-  +cups-1.1.23-r4.ebuild:
-  cleanups, bsd support, bug #93960
-
-  06 Jun 2005; Heinrich Wendel <lanius@g.o> cups-1.1.23-r3.ebuild:
-  bug #48309
-
-*cups-1.1.23-r3 (21 May 2005)
-
-  21 May 2005; Heinrich Wendel <lanius@g.o> +cups-1.1.23-r3.ebuild:
-  add support for new pam eclass, use external xpdf
-
-  14 May 2005; Heinrich Wendel <lanius@g.o> files/cupsd.rc6:
-  remove use vmware, bug #89956
-
-*cups-1.1.23-r2 (10 May 2005)
-
-  10 May 2005; Heinrich Wendel <lanius@g.o> +cups-1.1.23-r2.ebuild:
-  remove filter-fomit-frame-poitner; change coldplug to boot runlevel; add
-  info regarding printing guide
-
-  30 Apr 2005; Simon Stelling <blubb@g.o>
-  +files/cups-gcc4-amd64.patch, cups-1.1.23-r1.ebuild:
-  added DieMumiee's patch to fix bug #79791
-
-  28 Apr 2005; Heinrich Wendel <lanius@g.o> files/cupsd.rc6:
-  revert 'use samba' again, it was the wrong way around
-
-  23 Apr 2005; Heinrich Wendel <lanius@g.o> files/cupsd.rc6:
-  add use samba again, bug #89956
-
-  08 Mar 2005; Heinrich Wendel <lanius@g.o> -cups-1.1.23.ebuild,
-  -cups-1.1.23_rc1.ebuild:
-  cleanups
-
-  06 Feb 2005; Joshua Kinard <kumba@g.o> cups-1.1.23-r1.ebuild:
-  Marked stable on mips.
-
-  21 Jan 2005; Jan Brinkmann <luckyduck@g.o> cups-1.1.23-r1.ebuild:
-  stable on amd64. bug #78249.
-
-  21 Jan 2005; Lars Weiler <pylon@g.o> cups-1.1.23-r1.ebuild:
-  Stable on ppc; bug #78249.
-
-  20 Jan 2005; Markus Rothe <corsair@g.o> cups-1.1.23-r1.ebuild:
-  Stable on ppc64; bug #78249
-
-  20 Jan 2005; Bryan Østergaard <kloeri@g.o> cups-1.1.23-r1.ebuild:
-  Stable on alpha, bug 78249.
-
-  20 Jan 2005; Gustavo Zacarias <gustavoz@g.o> :
-  Actually with respect to #78249, bummer.
-
-  20 Jan 2005; Gustavo Zacarias <gustavoz@g.o> cups-1.1.23-r1.ebuild:
-  Stable on sparc wrt #77805
-
-*cups-1.1.23-r1 (19 Jan 2005)
-
-  19 Jan 2005; Heinrich Wendel <lanius@g.o> +files/xpdf-pl3.patch,
-  +cups-1.1.23-r1.ebuild:
-  security bump; bug #78249
-
-  19 Jan 2005; Joshua Kinard <kumba@g.o> cups-1.1.23.ebuild:
-  Marked stable on mips.
-
-  11 Jan 2005; Bryan Østergaard <kloeri@g.o> cups-1.1.23.ebuild:
-  Stable on alpha, bug 77023.
-
-  11 Jan 2005; Guy Martin <gmsoft@g.o> cups-1.1.23.ebuild:
-  Stable on hppa.
-
-  10 Jan 2005; Markus Rothe <corsair@g.o> cups-1.1.23.ebuild:
-  Stable on ppc64
-
-  10 Jan 2005; Jeremy Huddleston <eradicator@g.o> cups-1.1.23.ebuild:
-  Stable amd64, sparc.
-
-  10 Jan 2005; Lars Weiler <pylon@g.o> cups-1.1.23.ebuild:
-  Stable on ppc; bug #77023.
-
-*cups-1.1.23 (07 Jan 2005)
-
-  07 Jan 2005; Heinrich Wendel <lanius@g.o> +cups-1.1.23.ebuild:
-  security bump, bug #77023; use pdftops wrapper instead of builtin pdftops
-
-  03 Jan 2005; Heinrich Wendel <lanius@g.o>
-  -files/cups-1.1.20-str633.patch,
-  -files/cups-1.1.20-xpdf-CESA-2004-007.patch.bz2,
-  -files/cups-1.1.20-xpdf2-underflow.patch,
-  -files/cups-1.1.20-zero-len-udp-dos.patch,
-  -files/cups-1.1.21-xpdf-CESA-2004-007.patch.bz2, -files/cupsd.conf-1.1.18,
-  -files/str920.patch, -cups-1.1.20-r5.ebuild, -cups-1.1.22.ebuild,
-  cups-1.1.23_rc1.ebuild:
-  cleanups; replace hotplug with coldplug
-
-  31 Dec 2004; Hardave Riar <hardave@g.o> cups-1.1.23_rc1.ebuild:
-  Stable on mips, bug #74479
-
-  29 Dec 2004; Ciaran McCreesh <ciaranm@g.o> :
-  Change encoding to UTF-8 for GLEP 31 compliance
-
-  27 Dec 2004; Bryan Østergaard <kloeri@g.o> cups-1.1.23_rc1.ebuild:
-  Stable on alpha, bug 74479.
-
-  27 Dec 2004; <SeJo@g.o> cups-1.1.23_rc1.ebuild:
-  stable on ppc: 74479
-
-  27 Dec 2004; Markus Rothe <corsair@g.o> cups-1.1.23_rc1.ebuild:
-  Stable on ppc64; bug #74479
-
-  26 Dec 2004; Jeremy Huddleston <eradicator@g.o>
-  cups-1.1.23_rc1.ebuild:
-  Stable sparc and amd64.
-
-*cups-1.1.23_rc1 (26 Dec 2004)
-
-  26 Dec 2004; Heinrich Wendel <lanius@g.o> +cups-1.1.23_rc1.ebuild:
-  version bump; mark stable on x86 because of security bugs in pdftops and
-  lppasswd, bug #74479
-
-  12 Nov 2004; Heinrich Wendel <lanius@g.o> -cups-1.1.20-r3.ebuild,
-  -cups-1.1.20-r4.ebuild, cups-1.1.22.ebuild:
-  move samba to PDEPEND, bug #62560; remove old ebuilds
-
-  07 Nov 2004; Joshua Kinard <kumba@g.o> cups-1.1.20-r5.ebuild:
-  Marked stable on mips.
-
-  04 Nov 2004; Travis Tilley <lv@g.o> cups-1.1.20-r5.ebuild:
-  stable on amd64
-
-  03 Nov 2004; Bryan Østergaard <kloeri@g.o> cups-1.1.20-r5.ebuild:
-  Stable on alpha, bug 69662.
-
-  03 Nov 2004; Markus Rothe <corsair@g.o> cups-1.1.20-r5.ebuild:
-  Stable on ppc64, bug #69662
-
-  03 Nov 2004; <SeJo@g.o> cups-1.1.20-r5.ebuild:
-  stable on ppc gsla: 69662
-
-  03 Nov 2004; Gustavo Zacarias <gustavoz@g.o> cups-1.1.20-r5.ebuild:
-  Stable on sparc wrt #69662
-
-*cups-1.1.22 (01 Nov 2004)
-
-  01 Nov 2004; <heino@g.o> +files/xpdf-goo-sizet.patch,
-  +cups-1.1.20-r5.ebuild, -cups-1.1.21-r2.ebuild, +cups-1.1.22.ebuild:
-  fix secrutiy issue in pdftops, bug #69662
-
-*cups-1.1.21-r2 (21 Oct 2004)
-
-  21 Oct 2004; Heinrich Wendel <lanius@g.o> +cups-1.1.20-r4.ebuild,
-  +cups-1.1.21-r2.ebuild:
-  fix integer overflows in xpdf, bug #68058
-
-  16 Oct 2004; Hardave Riar <hardave@g.o> cups-1.1.20-r3.ebuild:
-  Stable on mips, bug #66501.
-
-  09 Oct 2004; Tom Gall <tgall@g.o> cups-1.1.20-r3.ebuild:
-  stable on ppc64, bug #64168
-
-  07 Oct 2004; Jeremy Huddleston <eradicator@g.o>
-  cups-1.1.20-r3.ebuild:
-  Stable amd64.
-
-  08 Oct 2004; Guy Martin <gmsoft@g.o> cups-1.1.20-r3.ebuild:
-  Marked stable on hppa.
-
-  07 Oct 2004; Lars Weiler <pylon@g.o> cups-1.1.20-r3.ebuild:
-  Stable on ppc as requested in bug #66501.
-
-  07 Oct 2004; Bryan Østergaard <kloeri@g.o> cups-1.1.20-r3.ebuild:
-  Stable on alpha, bug 66501.
-
-  06 Oct 2004; Gustavo Zacarias <gustavoz@g.o> cups-1.1.20-r3.ebuild:
-  Stable on sparc wrt #66501
-
-*cups-1.1.20-r3 (06 Oct 2004)
-
-  06 Oct 2004; Heinrich Wendel <lanius@g.o> +files/str920.patch,
-  +cups-1.1.20-r3.ebuild, +cups-1.1.21-r1.ebuild:
-  fix security issue in logfiles; bug #66501
-
-  22 Sep 2004; Joshua Kinard <kumba@g.o> cups-1.1.20-r2.ebuild:
-  Marked stable on mips.
-
-  19 Sep 2004; Danny van Dyk <kugelfang@g.o> cups-1.1.20-r2.ebuild:
-  Marked stable on amd64.
-
-  18 Sep 2004; Thomas Matthijs <axxo@g.o> cups-1.1.21.ebuild:
-  Added some more mirrors since i was unable to fetch it
-
-  17 Sep 2004; Bryan Østergaard,,, <kloeri@g.o> cups-1.1.20-r2.ebuild:
-  Stable on alpha, bug 64168.
-
-  17 Sep 2004; <SeJo@g.o> cups-1.1.20-r2.ebuild:
-  stable ppc bug:64168
-
-  16 Sep 2004; Gustavo Zacarias <gustavoz@g.o> cups-1.1.20-r2.ebuild:
-  Stable on sparc wrt #64168
-
-  22 Sep 2004; Heinrich Wendel <lanius@g.o> cups-1.1.21.ebuild:
-  move samba depend to rdepend, bug #62560
-
-  02 Sep 2004; Danny van Dyk <kugelfang@g.o> cups-1.1.20-r1.ebuild,
-  cups-1.1.21_rc2.ebuild:
-  Made cups $(get_libdir) aware.
-
-*cups-1.1.21 (16 Sep 2004)
-
-  16 Sep 2004; Heinrich Wendel <lanius@g.o>
-  +files/cups-1.1.20-zero-len-udp-dos.patch, +cups-1.1.20-r2.ebuild,
-  +cups-1.1.21.ebuild, cups-1.1.21_rc2.ebuild:
-  version bump; fix security bug in 1.1.20, bug #64168
-
-*cups-1.1.21_rc2 (24 Aug 2004)
-
-  24 Aug 2004; Heinrich Wendel <lanius@g.o>
-  -files/configure-jpeg-buildfix.diff, -cups-1.1.21_rc1.ebuild,
-  +cups-1.1.21_rc2.ebuild:
-  version bump
-
-  05 Jul 2004; Heinrich Wendel <lanius@g.o> cups-1.1.21_rc1.ebuild:
-  enable raw printing, bug #54981
-
-*cups-1.1.21_rc1 (05 Jul 2004)
-
-  05 Jul 2004; Heinrich Wendel <lanius@g.o> cups-1.1.19-r1.ebuild,
-  cups-1.1.20.ebuild, cups-1.1.21_rc1.ebuild:
-  version bump, add samba use flag, bug #52198
-
-  01 Jul 2004; Jeremy Huddleston <eradicator@g.o>
-  cups-1.1.19-r1.ebuild, cups-1.1.20-r1.ebuild, cups-1.1.20.ebuild:
-  virtual/glibc -> virtual/libc
-
-  19 Jun 2004; Tom Gall <tgall@g.o> cups-1.1.20-r1.ebuild:
-  stable on ppc64, bug #54123
-
-  12 May 2004; Michael McCabe <randy@g.o> cups-1.1.20-r1.ebuild:
-  Added s390 keywords
-
-  09 Apr 2004; Heinrich Wendel <lanius@g.o> cups-1.1.19-r1.ebuild:
-  remove S=${WORKDIR}/${P}
-
-*cups-1.1.20-r1 (08 Apr 2004)
-
-  08 Apr 2004; Heinrich Wendel <lanius@g.o>
-  files/cups-1.1.20-str633.patch, cups-1.1.20-r1.ebuild:
-  pdftops doesn't print pdf form elements properly, bug #46529
-
-  31 Mar 2004; Tom Gall <tgall@g.o> cups-1.1.20.ebuild:
-  remove ppc64, we're not ready
-
-  23 Mar 2004; Joshua Kinard <kumba@g.o> cups-1.1.20.ebuild:
-  Marked stable on mips.
-
-  27 Feb 2004; Joshua Kinard <kumba@g.o> cups-1.1.20.ebuild:
-  Added ~mips to KEYWORDS to satisfy repoman deps.
-
-  22 Feb 2004; Aron Griffis <agriffis@g.o> cups-1.1.20.ebuild:
-  stable on alpha and ia64
-
-  28 Jan 2004; <gustavoz@g.o> cups-1.1.20.ebuild:
-  stable on hppa
-
-  26 Jan 2004; <gustavoz@g.o> cups-1.1.20.ebuild:
-  stable on sparc
-
-  30 Jan 2004; Heinrich Wendel <lanius@g.o> cups-1.1.19-r1.ebuild,
-  cups-1.1.20.ebuild:
-  fixed depend
-
-  15 Jan 2004; Heinrich Wendel <lanius@g.o> cups-1.1.20.ebuild:
-  mark x86
-
-  28 Dec 2003; Heinrich Wendel <lanius@g.o> cups-1.1.19-r1.ebuild,
-  cups-1.1.20.ebuild:
-  fix newdepend, not allowed in ebuilds
-
-  09 Dec 2003; Heinrich Wendel <lanius@g.o> cups-1.1.19-r1.ebuild:
-  changed app-text/ghostscript to virtual/ghostscript
-
-  02 Dec 2003; Heinrich Wendel <lanius@g.o> cups-1.1.20.ebuild:
-  replace Os by O2 on amd64, bug #38450
-
-  29 Nov 2003; Brad House <brad_mssw@g.o> cups-1.1.20.ebuild:
-  mark stable on amd64
-
-*cups-1.1.20 (25 Nov 2003)
-
-  25 Nov 2003; Heinrich Wendel <lanius@g.o>  cups-1.1.20.ebuild:
-  version bump, removed libjpeg patch
-
-  05 Nov 2003; Heinrich Wendel <lanius@g.o> files/cupsd.rc6:
-  bug #32768 (hotplug dep)
-
-  24 Sep 2003; Daniel Robbins <drobbins@g.o> cups-1.1.19-r1.ebuild:
-  removed 'usb' dependencies entirely, since cups does not directly depend
-  on hotplug, and is not necessarily needed for USB support (if USB is
-  compiled directly into the kernel.) Also, the 'usb' variable is 
-  designed to enable optional build-time functionality for USB support, not
-  auto-configure your system to detect USB (which emerging hotplug doesn't
-  do by itself anyway -- an rc-update add hotplug default is needed -- and
-  you need to enable USB in your kernel.) Also unmasked for ia64.  
-
-  19 Sep 2003; Rajiv Aaron Manglani <rajiv@g.o> cups-1.1.19-r1.ebuild:
-  added 'usb' to IUSE.
-
-  29 Jul 2003; Heinrich Wendel <lanius@g.o>
-  cups-1.1.14-r4.ebuild, cups-1.1.15-r2.ebuild,
-  cups-1.1.16.ebuild, cups-1.1.18-r5.ebuild, cups-1.1.19-r1.ebuild,
-  files/configure-jpeg-buildfix-1.1.15.diff:
-  bumped 1.1.19-r1 to stable, cleaned up old packages
-
-  25 Jul 2003; Heinrich Wendel <lanius@g.o> files/cupsd.rc6:
-  added use logger to init.d script (bug #25214)
-
-  22 Jul 2003; Heinrich Wendel <lanius@g.o> cups-1.1.19-r1.ebuild:
-  added depend on foomatic-3 if foomatic-2 is installed
-
-  20 Jul 2003; Heinrich Wendel <lanius@g.o> files/cupsd.rc6:
-  added use vmware to initscript, see bug #23971
-
-  18 Jul 2003; Heinrich Wendel <lanius@g.o> files/cupsd.rc6:
-  fixed bug #24682
-
-*cups-1.1.19-r1 (16 Jul 2003)
-
-  16 Jul 2003; Heinrich Wendel <lanius@g.o> cups-1.1.19-r1.ebuild,
-  files/cupsd.rc6:
-  fixed init script / made compatible with new foomatic
-
-*cups-1.1.19 (02 Jul 2003)
-
-  03 Jul 2003; Daniel Ahlerg <aliz@g.o> cups-1.1.19.ebuild :
-  Version bump.
-
-  17 Jun 2003; Donny Davies <woodchip@g.o> cups-1.1.18-r5.ebuild:
-  Dont install lppasswd setuid.
-
-*cups-1.1.18-r5 (30 May 2003)
-
-  30 May 2003; Daniel Ahlberg <aliz@g.o> cups-1.1.18.ebuild :
-  Security update.
-
-*cups-1.1.18-r4 (28 Jan 2003)
-  
-  07 Apr 2003; Guy Martin <gmsoft@g.o> cups-1.1.18-r4.ebuild :
-  Added hppa to KEYWORDS.
-
-  25 Feb 2003; Thomas Raschbacher <lordvan@g.o> cups-1.1.18-r4.ebuild:
-  Mark stable on x86
-	
-  21 Feb 2003; Aron Griffis <agriffis@g.o> cups-1.1.18-r4.ebuild :
-  Mark stable on Alpha
-
-  28 Jan 2003; Thomas Raschbacher <lordvan@g.o> cups-1.1.18-r4.ebuild:
-  new revision to add usb use var (bug #14417)
-
-*cups-1.1.18-r3 (27 Jan 2003)
-  27 Jan 2003; Thomas Raschbacher; <lordvan@g.o> cups-1.1.18-r3.ebuild:
-  new revision to fix bug #12518
-  (new default config to listen only on localhost)
-
-*cups-1.1.18-r2 (21 Jan 2003)
-  21 Jan 2003; Thomas Raschbacher; <lordvan@g.o> cups-1.1.18-r2.ebuild:
-  added dep for sys-apps/hotplug (needed for usb-printers)
-  fixes bug #12976
-
-*cups-1.1.18-r1 (13 Jan 2003)
-  13 Jan 2003; Thomas Raschbacher <lordvan@g.o> cups-1.1.18-r1.ebuild:
-  filter -fomit-frame-pointers; ~arch masked for all archs(at least for now)
-  fixes bug #13471
-	
-*cups-1.1.18 (27 Dec 2002)
-  27 Dec 2002; Thomas Raschbacher <lordvan@g.o> cups-1.1.18.ebuild:
-  changed pkg_postinst
-  ~arch masked on all archs
-  30 Dec 2002; Thomas Raschbacher <lordvan@g.o> cups-1.1.18.ebuild:
-  unmasked for x86
-	
-*cups-1.1.18 (20 Dec 2002)
-
-  20 Dec 2002; Daniel Ahlberg <aliz@g.o> :
-  Security update. Masked for now.
-
-  06 Dec 2002; Rodney Rees <manson@g.o> : changed sparc ~sparc keywords
- 
-*cups-1.1.17_pre20021025 (25 Oct 2002)
-
-  25 Oct 2002; Grant Goodyear <g2boojum@g.o> ChangeLog  :
-  cvs version to fix latest problems.
-
-  25 Oct 2002; Donny Davies <woodchip@g.o> cups-1.1.16.ebuild : fix #9188.
-
-*cups-1.1.16 (10 Oct 2002)
-
-  19 Oct 2002; Donny Davies <woodchip@g.o> cupsd.rc6 : fix #9201.
-
-  12 Oct 2002; Donny Davies <woodchip@g.o> cupsomatic :
-  Update to latest http://www.linuxprinting.org/cupsomatic; close #7350.
-
-  10 Oct 2002; Nick Hadaway <raker@g.o> cups-1.1.16.ebuild :
-  Thanks to g2boojum for jumping right on this.  This version bump is
-  more like a shove.  Lots of bug fixes.  No real feature adds but many
-  printing issues seem to be resolved by this release.  Check out
-  http://www.cups.org/relnotes.html for the gory details.
-
-*cups-1.1.15-r2 (19 Jul 2002)
-
-  07 Oct 2002; Nick Hadaway <raker@g.o> cups-1.1.15-r2.ebuild :
-  Removed RDEPEND on ghostscript and left comment in pkg_postinst.  This
-  should resolve the circular dependancy problems related to ghostscript
-
-  13 Aug 2002; Mark Guertin <gerk@g.o> :
-  Added ppc to keywords
-
-  19 Jul 2002; Grant Goodyear <g2boojum@g.o> ChangeLog  :
-  added ghostscript as an rdepend
-
-*cups-1.1.15 (17 Jun 2002)
-
-  14 Jul 2002; Daniel Ahlberg <aliz@g.o> cups-1.1.15.ebuild :
-  Added KEYWORDS.
-
-  17 Jun 2002; mjc <mjc@g.o> :
-  New CUPS.
-
-*cups-1.1.14-r4 (4 May 2002)
-
-  14 Jul 2002; Daniel Ahlberg <aliz@g.o> cups-1.1.14-r4.ebuild :
-  Added KEYWORDS.
-
-  4 May 2002; Donny Davies <woodchip@g.o> :
-  Added LICENSE, SLOT, $Headers, pam_stack aware pam.d/ file.
-
-*cups-1.1.14-r3 (1 May 2002)
-
-  1 May 2002; Jon Nelson <jnelson@g.o> :
-  Added patch to allow for unstripped builds.
-
-*cups-1.1.14-r3 (30 Apr 2002)
-
-  30 Apr 2002; Seemant Kulleen <seemant@g.o> :
-  Unzip html doc.
-
-*cups-1.1.14-r3 (12 Apr 2002)
-
-  12 Apr 2002; Spider <spider@g.o>:
-  New revision with updated libpng dependency forces a rebuild.
-
-*cups-1.1.14-r2 (29 Mar 2002)
-
-  29 Mar 2002; Donny Davies <woodchip@g.o> :
-  Add link to the html docs.  Cleaned syntax of several statements.  No need to
-  recompile/reinstall unless you enjoy that sort of thing ;)
-
-*cups-1.1.14-r1 (7 Mar 2002)
-
-  7 Mar 2002; Geert Bevin <gbevin@g.o>:
-  Added support for the foomagic printer filters.
-
-*cups-1.1.14 (16 Feb 2002)
-
-  16 Feb 2002; Donny Davies <woodchip@g.o>: Update to latest release.
-  See http://www.cups.org/news.php?V66 for the changes.  Security fixes in
-  this one, upgrade reccomended.
-
-  17 Feb 2002; Martin Schlemmer <azarah@g.o>: added samba to the 'use'
-  dependancy type of cups.  Modified files/cupsd.rc6
-
-*cups-1.1.13-r2 (9 Feb 2002)
-
-  9 Feb 2002; Daniel Robbins <drobbins@g.o>: Moved all empty directory
-  creations to pkg_postinst() to prevent them from being unmerged on upgrade
-
-*cups-1.1.13-r1 (8 Feb 2002)
-
-  8 Feb 2002; Daniel Robbins <drobbins@g.o>:
-  Added back configure-jpeg-buildfix.diff which is apparently still needed.
-  This closes bug #608.
-
-*cups-1.1.13 (1 Feb 2002)
-
-  1 Feb 2002; Donny Davies <woodchip@g.o> /etc/cupsd.conf:
-  Updated to the latest release, cups-1.1.13.  Now installing the html docs
-  into /usr/share/cups/docs, which will let people upgrade cups in the
-  future without having to change /etc/cupsd.conf to point to a new
-  directory.  Makes things a little more user friendly.
-
-*cups-1.1.12 (1 Feb 2002)
-
-  1 Feb 2002; G.Bevin <gbevin@g.o> ChangeLog :  
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  comments should well explained and written in clean English. The details about
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.

diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
deleted file mode 100644
index 9b92ddc..0000000
--- a/net-print/cups/Manifest
+++ /dev/null
@@ -1,39 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-AUX cups-1.4.0-backend-https.patch 483 RMD160 b338f67ebf0719b5e12eaa8490affbd7a1bb8c0e SHA1 bfeadba67792203d654a64bdec16f3d2a31aeca6 SHA256 9060a5d848d6655db4629822d01fd772a3fbe1a5107109c50cb0ecb4de7a9526
-AUX cups-1.4.2-str3200.patch 1654 RMD160 cc40d26f7e9dbe5a12d9426535d09de10254da26 SHA1 b330108bcfb8ca3ab5d6dd3b48dc3d2937c7bca1 SHA256 8a64f5c72d64ecd95d330fd90630eb02a67865c07921ecb0c010e84b49b537e0
-AUX cups-1.4.4-dont-compress-manpages.patch 580 RMD160 cbc2bf11025c1f27286bd7f2ece7ba76be6aa7ee SHA1 d7b2447263724eeb092b8cfc8ce54553ad1e5e11 SHA256 cdefd273dcdc78aa5fe14bb0246e25572da7d28a91de5c7ac8be2a0bdd915860
-AUX cups-1.4.4-fix-install-perms.patch 838 RMD160 206bd49e918bab96d24ca72f85f679d3c9122975 SHA1 6e8ef0f3e5c0efa636b4d2324bab2c8edc9461db SHA256 66e68f3bebd7339434e3de99582190d0bedce4b2e5370ff65104cc863daee6c2
-AUX cups-1.4.4-nostrip.patch 487 RMD160 27fe9a5512abb3496416e492dc4ec4fcd9c733c2 SHA1 2a1b6e7b718a5feb5921f38ec02f37b9d0edd310 SHA256 b96448896f08c5f91d5afb0c093f2638a262d1c45e716c29d5164cefee18bc61
-AUX cups-1.4.4-perl-includes.patch 637 RMD160 88d4f170ed5c9392860462f140adf9f860a24cfd SHA1 93185acfe7252ff9a69499f63192b3483d857cb0 SHA256 c730419e7b4bc16a8773a01eeb66523882901480af68686d0790558a2f5fe57d
-AUX cups-1.4.4-php-destdir.patch 679 RMD160 1b15d42373a952a608a01cb8c97efbbd3c78ac77 SHA1 e312bbae57224dead45284f9c62942b1a25282fc SHA256 d5126c5e917d8c41c7a4da1477800edd4aa752aaa4c6a67a73adbe1e3b050110
-AUX cups-1.4.6-force-gnutls.patch 3319 RMD160 c6cc024a702305eb81661d5cdadd9857e9a6778e SHA1 5ac62ed3ca20bc7a4541c990c676c433299b2177 SHA256 beb4014eac5218d9f424b81946ac1e209625026bf20a7f4820758e5ee1fe5b66
-AUX cups-1.4.6-serialize-gnutls.patch 3625 RMD160 873b2806cfec732c4a4f3f2981f666a958dd5b0e SHA1 aae046121d0139fbba1cb9147c8742f73b2f1fa0 SHA256 6bc9e16fc6865b2f3e0ee2d1947bdde691e41f90fce32b9839b3661dcea4a827
-AUX cups-1.4.6-web-hang.patch 1749 RMD160 ff8d4cfa10a5de5a911c8672313904f50b13fd0f SHA1 f37a3fb7d71a6d56bbb3e5e7a8cf74ca8cb19276 SHA256 f49cef2ce1f2eecdd8ee07d85f306a19375f6d48510763aa51e96a0c54ad27c5
-AUX cupsd.init.d 293 RMD160 19fbef21cee7e472e7028f3101b680baa0089c54 SHA1 e6b27b2638fec258fe2f55c926c2530e909ca3d2 SHA256 b4268a6bae95e96b6af21c3716ecc905073736ce7dc33be1489d574a447f3c48
-AUX pdftops-1.20.gentoo 10412 RMD160 16e229662c47e03af1d1f4cb5764a76d17a66642 SHA1 6afb8a655b6ff013a2c8c8cbfb615ba1e561503b SHA256 ac5fa01ca776d75bd7cef62eef9f6b0c3945ee87e8950b40ca9f9f3ff46a16c1
-DIST cups-1.4.6-source.tar.bz2 4517061 RMD160 94c9921e03f5ec52d9c16947435622365f53aef6 SHA1 42fb1ca00ee7291561564d3072716eb2045f05d1 SHA256 f08711702a77b52c7150f96fe1f45482f6151cb95ef601268c528607fe6ad514
-DIST cups-1.5rc1-source.tar.bz2 4083416 RMD160 380160554012912bf8e22dc6f70fe6824c16bb13 SHA1 b46b3d0255fe6ed36d516a61c397d27b5efb7d13 SHA256 04d4f1e4a5ac4c9907c2a81fcbde6b6b87f852e85e410d145a08a964434a1697
-EBUILD cups-1.4.6-r21.ebuild 8509 RMD160 6178c8831132937a82ab0c5452c6f46e3b3d1879 SHA1 3f51dd19726a31c71c3fda6def94c112974434b9 SHA256 a10216bb3af633739ac6aefa06d4e89aa88690f774768bdf66a03b7569a09b16
-EBUILD cups-1.5_rc1.ebuild 8195 RMD160 1b2e39d0ba830ab80077db7977e667e7efa9755c SHA1 79cb3db068c20b7936ef488474002976e753fe23 SHA256 5c4755644224a9e4605a96808115d96cd270cc51a33a9013bb78fef5d2c8c5eb
-MISC ChangeLog 63367 RMD160 8b0bb735fad05a083fdd07c9c2dcac9c34112948 SHA1 ad3a8ac14c5a56e6aba0c401eb54e10b1408ce50 SHA256 c979404d3a11429c6699cc16bb8682760f929515dca76650cf23573c971db4b8
-MISC metadata.xml 586 RMD160 73a1f1c0096d5035dfa53207b00c125894f6822a SHA1 123501263490cab57af2b99f2336fb70c094d9b0 SHA256 3b729c497ee38452b1ca051b759f43b5f9e117f9c36c0f3b660e4bd8ab7c295b
-MISC notes.txt 537 RMD160 211ab75e584ab30e9b69c9bc54b8b7e13398e5a9 SHA1 041a82e5c969f89105861a2b1574b78594979b97 SHA256 ff62381674ffebcbab2445358c130cfdd2ac2a2264d385784286ee1fa334f5b7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJN/HFhAAoJENwGBM22xffefCoQAJt9iGOuusFIxewWkxUPL9pF
-r+9L5flHfrLxeeMZqC902pZGRS17EgthIyE5rB3A4xl8jgR3ToNvyC79LGtG8qOB
-YhMCL9G4HHYPrcnuYwlB9st+nlozPFTCt7f2g6ssbtNK9TulnKZmJZy5gQExMFgA
-GxuCK+/vwikfdab4AYXP0mrhS4FOYLv1AS9vKXjPDkRU5mPTefqt1Kxn9SiQ6hn/
-1Qy2T7usWNT4nRL5lWdIsruWHXmr80/biUYFEmauU2DafeLYnplsqaVECrz0vAfw
-QtSGe5bU646As1fGYFRTPmwWkefOT3Yy6OOknzcuOImdac6bwuuwXrR2myoGLbkT
-j0ubHcxx6ZBCIuxQUkzFl+64VXdAyoFQjPzv9kX+CMx9wlSj1jT//Py68MFXKclN
-1ih4E+iXQlCEAfZ5bwtZylr1Y5bsDS3sjcYqGhOl7LZdNjo4mGXDrh1VmGrw7XJv
-Cj2ynH3vgfoJugchdBq7JCqV1bKJHRLicIKLIrRiliJ8lrk8TWsDUFTTC5Vc2GjK
-nmbVbEmYeSHl5PXmEPU+KDMqPK13P+ReRGfxnS5qTfVZKkukaeFxXqN76GDG8x1H
-SWKnWmc8a2S6CW49zD+KCz7M1I1nucWHaiRoOZkKJE0VM7ILgv1sA1bOoH0xB0/t
-iFVFwHoAmThYqJZL0MiL
-=yuca
------END PGP SIGNATURE-----

diff --git a/net-print/cups/cups-1.4.6-r21.ebuild b/net-print/cups/cups-1.4.6-r21.ebuild
deleted file mode 100644
index 6d4343a..0000000
--- a/net-print/cups/cups-1.4.6-r21.ebuild
+++ /dev/null
@@ -1,296 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.6-r21.ebuild,v 1.2 2011/06/06 21:54:07 dilfridge Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="python? 2:2.5"
-
-inherit autotools eutils flag-o-matic linux-info multilib pam perl-module python versionator java-pkg-opt-2
-
-MY_P=${P/_}
-
-DESCRIPTION="The Common Unix Printing System"
-HOMEPAGE="http://www.cups.org/"
-SRC_URI="mirror://easysw/${PN}/${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 dbus debug gnutls java +jpeg kerberos ldap pam perl php +png python samba slp +ssl static-libs +threads +tiff usb X xinetd"
-
-LANGS="da de es eu fi fr id it ja ko nl no pl pt pt_BR ru sv zh zh_TW"
-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 )
-	jpeg? ( virtual/jpeg:0 )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap[ssl?,gnutls?] )
-	pam? ( virtual/pam )
-	perl? ( dev-lang/perl )
-	php? ( dev-lang/php )
-	png? ( >=media-libs/libpng-1.4.3 )
-	slp? ( >=net-libs/openslp-1.0.4 )
-	ssl? (
-		gnutls? (
-			dev-libs/libgcrypt
-			net-libs/gnutls
-		)
-		!gnutls? ( >=dev-libs/openssl-0.9.8g )
-	)
-	tiff? ( >=media-libs/tiff-3.5.5 )
-	usb? ( virtual/libusb:0 )
-	X? ( x11-misc/xdg-utils )
-	xinetd? ( sys-apps/xinetd )
-	!net-print/cupsddk
-"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-"
-
-PDEPEND="
-	app-text/ghostscript-gpl[cups]
-	>=app-text/poppler-0.12.3-r3[utils]
-"
-
-# upstream includes an interactive test which is a nono for gentoo.
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-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 usb; then
-		elog "You are going to use new libusb backed to access your usb printer."
-		elog "This interface has quite few known issues and does not report all"
-		elog "issues and just refuses to print."
-		elog "Please consider disabling usb useflag if you are having issues."
-		elog
-		elog "Please note that if you disable the usb useflag your device will be"
-		elog "still working using kernel usblp interface instead of libusb."
-		echo
-	fi
-
-	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 which collides with kernel module."
-				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)."
-				die "USB_PRINTER module enabled"
-			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 new, less-tested libusb code."
-			fi
-		fi
-	fi
-}
-
-src_prepare() {
-	# create a missing symlink to allow https printing via IPP, bug #217293
-	epatch "${FILESDIR}/${PN}-1.4.0-backend-https.patch"
-	# various build time fixes
-	epatch "${FILESDIR}/${PN}-1.4.4-dont-compress-manpages.patch"
-	epatch "${FILESDIR}/${PN}-1.4.4-fix-install-perms.patch"
-	epatch "${FILESDIR}/${PN}-1.4.4-nostrip.patch"
-	epatch "${FILESDIR}/${PN}-1.4.4-php-destdir.patch"
-	epatch "${FILESDIR}/${PN}-1.4.4-perl-includes.patch"
-	epatch "${FILESDIR}/${PN}-1.4.6-force-gnutls.patch"
-	epatch "${FILESDIR}/${PN}-1.4.6-serialize-gnutls.patch"
-	# interface hangs using some browsers, bug #325871
-	epatch "${FILESDIR}/${PN}-1.4.6-web-hang.patch"
-
-	AT_M4DIR=config-scripts eaclocal
-	eautoconf
-}
-
-src_configure() {
-	export DSOFLAGS="${LDFLAGS}"
-
-	# locale support
-	strip-linguas ${LANGS}
-	if [ -z "${LINGUAS}" ] ; then
-		export LINGUAS=none
-	fi
-
-	local myconf
-	if use ssl || use gnutls ; then
-		myconf+="
-			$(use_enable gnutls)
-			$(use_enable !gnutls openssl)
-		"
-	else
-		myconf+="
-			--disable-gnutls
-			--disable-openssl
-		"
-	fi
-
-	# bug 352252, recheck for later versions if still necessary....
-	if use gnutls && ! use threads ; then
-		ewarn "The useflag gnutls requires also threads enabled. Switching on threads."
-	fi
-	if use gnutls || use threads ; then
-		myconf+=" --enable-threads "
-	else
-		myconf+=" --disable-threads "
-	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-pdftops=/usr/bin/pdftops \
-		--with-system-groups=lpadmin \
-		$(use_enable acl) \
-		$(use_enable dbus) \
-		$(use_enable debug) \
-		$(use_enable debug debug-guards) \
-		$(use_enable jpeg) \
-		$(use_enable kerberos gssapi) \
-		$(use_enable ldap) \
-		$(use_enable pam) \
-		$(use_enable png) \
-		$(use_enable slp) \
-		$(use_enable static-libs static) \
-		$(use_enable tiff) \
-		$(use_enable usb libusb) \
-		$(use_with java) \
-		$(use_with perl) \
-		$(use_with php) \
-		$(use_with python) \
-		$(use_with xinetd xinetd /etc/xinetd.d) \
-		--enable-libpaper \
-		--disable-dnssd \
-		${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_compile() {
-	emake || die "emake failed"
-
-	if use perl ; then
-		cd "${S}"/scripting/perl
-		perl-module_src_prep
-		perl-module_src_compile
-	fi
-
-	if use php ; then
-		cd "${S}"/scripting/php
-		emake || die "emake php failed"
-	fi
-}
-
-src_install() {
-	emake BUILDROOT="${D}" install || die "emake install failed"
-	dodoc {CHANGES,CREDITS,README}.txt || die "dodoc install failed"
-
-	if use perl ; then
-		cd "${S}"/scripting/perl
-		perl-module_src_install
-		fixlocalpod
-	fi
-
-	if use php ; then
-		cd "${S}"/scripting/php
-		emake DESTDIR="${D}" install || die "emake install for php bindings failed"
-	fi
-
-	# clean out cups init scripts
-	rm -rf "${D}"/etc/{init.d/cups,rc*,pam.d/cups}
-
-	# install our init script
-	local neededservices
-	use dbus && neededservices+=" dbus"
-	[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
-	cp "${FILESDIR}"/cupsd.init.d "${T}"/cupsd || die
-	sed -i \
-		-e "s/@neededservices@/$neededservices/" \
-		"${T}"/cupsd || die
-	doinitd "${T}"/cupsd || die "doinitd failed"
-
-	# 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 || die
-		# 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 || die ; }
-		# write permission for file owner (root), bug #296221
-		fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed"
-	else
-		rm -rf "${D}"/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/run/cups/certs \
-		/var/spool/cups/tmp
-
-	keepdir /etc/cups/{interfaces,ppd,ssl}
-
-	use X || rm -r "${D}"/usr/share/applications
-
-	# create /etc/cups/client.conf, bug #196967 and #266678
-	echo "ServerName /var/run/cups/cups.sock" >> "${D}"/etc/cups/client.conf
-}
-
-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
-}

diff --git a/net-print/cups/cups-1.5_rc1.ebuild b/net-print/cups/cups-1.5_rc1.ebuild
deleted file mode 100644
index 6692615..0000000
--- a/net-print/cups/cups-1.5_rc1.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.6-r21.ebuild,v 1.2 2011/06/06 21:54:07 dilfridge Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="python? 2:2.5"
-
-inherit autotools eutils flag-o-matic linux-info multilib pam perl-module python versionator java-pkg-opt-2
-
-MY_P=${P/_}
-MY_PV=${PV/_}
-
-DESCRIPTION="The Common Unix Printing System"
-HOMEPAGE="http://www.cups.org/"
-SRC_URI="mirror://easysw/${PN}/${MY_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 dbus debug gnutls java +jpeg kerberos ldap pam perl php +png python samba slp +ssl static-libs +threads +tiff usb X xinetd"
-
-LANGS="da de es eu fi fr id it ja ko nl no pl pt pt_BR ru sv zh zh_TW"
-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 )
-	jpeg? ( virtual/jpeg:0 )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap[ssl?,gnutls?] )
-	pam? ( virtual/pam )
-	perl? ( dev-lang/perl )
-	php? ( dev-lang/php )
-	png? ( >=media-libs/libpng-1.4.3 )
-	slp? ( >=net-libs/openslp-1.0.4 )
-	ssl? (
-		gnutls? (
-			dev-libs/libgcrypt
-			>=net-libs/gnutls-2.11
-		)
-		!gnutls? ( >=dev-libs/openssl-0.9.8g )
-	)
-	tiff? ( >=media-libs/tiff-3.5.5 )
-	usb? ( virtual/libusb:0 )
-	X? ( x11-misc/xdg-utils )
-	xinetd? ( sys-apps/xinetd )
-	!net-print/cupsddk
-"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-"
-
-PDEPEND="
-	app-text/ghostscript-gpl[cups]
-	>=app-text/poppler-0.12.3-r3[utils]
-"
-
-# upstream includes an interactive test which is a nono for gentoo.
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-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 usb; then
-		elog "You are going to use new libusb backed to access your usb printer."
-		elog "This interface has quite few known issues and does not report all"
-		elog "issues and just refuses to print."
-		elog "Please consider disabling usb useflag if you are having issues."
-		elog
-		elog "Please note that if you disable the usb useflag your device will be"
-		elog "still working using kernel usblp interface instead of libusb."
-		echo
-	fi
-
-	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 which collides with kernel module."
-				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)."
-				die "USB_PRINTER module enabled"
-			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 new, less-tested libusb code."
-			fi
-		fi
-	fi
-}
-
-src_prepare() {
-	# various build time fixes
-	epatch "${FILESDIR}/${PN}-1.4.4-dont-compress-manpages.patch"
-	epatch "${FILESDIR}/${PN}-1.4.4-fix-install-perms.patch"
-	epatch "${FILESDIR}/${PN}-1.4.4-nostrip.patch"
-	epatch "${FILESDIR}/${PN}-1.4.4-php-destdir.patch"
-	epatch "${FILESDIR}/${PN}-1.4.4-perl-includes.patch"
-
-	AT_M4DIR=config-scripts eaclocal
-	eautoconf
-}
-
-src_configure() {
-	export DSOFLAGS="${LDFLAGS}"
-
-	# locale support
-	strip-linguas ${LANGS}
-	if [ -z "${LINGUAS}" ] ; then
-		export LINGUAS=none
-	fi
-
-	local myconf
-	if use ssl || use gnutls ; then
-		myconf+="
-			$(use_enable gnutls)
-			$(use_enable !gnutls openssl)
-		"
-	else
-		myconf+="
-			--disable-gnutls
-			--disable-openssl
-		"
-	fi
-
-	# bug 352252, recheck for later versions if still necessary....
-	if use gnutls && ! use threads ; then
-		ewarn "The useflag gnutls requires also threads enabled. Switching on threads."
-	fi
-	if use gnutls || use threads ; then
-		myconf+=" --enable-threads "
-	else
-		myconf+=" --disable-threads "
-	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-pdftops=/usr/bin/pdftops \
-		--with-system-groups=lpadmin \
-		$(use_enable acl) \
-		$(use_enable dbus) \
-		$(use_enable debug) \
-		$(use_enable debug debug-guards) \
-		$(use_enable jpeg) \
-		$(use_enable kerberos gssapi) \
-		$(use_enable ldap) \
-		$(use_enable pam) \
-		$(use_enable png) \
-		$(use_enable slp) \
-		$(use_enable static-libs static) \
-		$(use_enable tiff) \
-		$(use_enable usb libusb) \
-		$(use_with java) \
-		$(use_with perl) \
-		$(use_with php) \
-		$(use_with python) \
-		$(use_with xinetd xinetd /etc/xinetd.d) \
-		--enable-libpaper \
-		--disable-dnssd \
-		${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_compile() {
-	emake || die "emake failed"
-
-	if use perl ; then
-		cd "${S}"/scripting/perl
-		perl-module_src_prep
-		perl-module_src_compile
-	fi
-
-	if use php ; then
-		cd "${S}"/scripting/php
-		emake || die "emake php failed"
-	fi
-}
-
-src_install() {
-	emake BUILDROOT="${D}" install || die "emake install failed"
-	dodoc {CHANGES,CREDITS,README}.txt || die "dodoc install failed"
-
-	if use perl ; then
-		cd "${S}"/scripting/perl
-		perl-module_src_install
-		fixlocalpod
-	fi
-
-	if use php ; then
-		cd "${S}"/scripting/php
-		emake DESTDIR="${D}" install || die "emake install for php bindings failed"
-	fi
-
-	# clean out cups init scripts
-	rm -rf "${D}"/etc/{init.d/cups,rc*,pam.d/cups}
-
-	# install our init script
-	local neededservices
-	use dbus && neededservices+=" dbus"
-	[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
-	cp "${FILESDIR}"/cupsd.init.d "${T}"/cupsd || die
-	sed -i \
-		-e "s/@neededservices@/$neededservices/" \
-		"${T}"/cupsd || die
-	doinitd "${T}"/cupsd || die "doinitd failed"
-
-	# 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 || die
-		# 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 || die ; }
-		# write permission for file owner (root), bug #296221
-		fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed"
-	else
-		rm -rf "${D}"/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/run/cups/certs \
-		/var/spool/cups/tmp
-
-	keepdir /etc/cups/{interfaces,ppd,ssl}
-
-	use X || rm -r "${D}"/usr/share/applications
-
-	# create /etc/cups/client.conf, bug #196967 and #266678
-	echo "ServerName /var/run/cups/cups.sock" >> "${D}"/etc/cups/client.conf
-}
-
-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
-}

diff --git a/net-print/cups/files/cups-1.4.0-backend-https.patch b/net-print/cups/files/cups-1.4.0-backend-https.patch
deleted file mode 100644
index 8a70a20..0000000
--- a/net-print/cups/files/cups-1.4.0-backend-https.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur cups-1.4.0/backend/Makefile cups-1.4.0.new/backend/Makefile
---- cups-1.4.0/backend/Makefile	2009-03-03 20:39:21.000000000 +0100
-+++ cups-1.4.0.new/backend/Makefile	2009-09-01 14:00:05.592615359 +0200
-@@ -91,6 +91,7 @@
- 	done
- 	$(RM) $(SERVERBIN)/backend/http
- 	$(LN) ipp $(SERVERBIN)/backend/http
-+	$(LN) ipp $(SERVERBIN)/backend/https
- 	if test "x$(DNSSD_BACKEND)" != x; then \
- 		$(RM) $(SERVERBIN)/backend/mdns; \
- 		$(LN) $(DNSSD_BACKEND) $(SERVERBIN)/backend/mdns; \

diff --git a/net-print/cups/files/cups-1.4.2-str3200.patch b/net-print/cups/files/cups-1.4.2-str3200.patch
deleted file mode 100644
index 47d9114..0000000
--- a/net-print/cups/files/cups-1.4.2-str3200.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: scheduler/select.c
-===================================================================
---- scheduler/select.c	(revision 8887)
-+++ scheduler/select.c	(working copy)
-@@ -454,7 +454,7 @@
-     if (fdptr->read_cb && event->filter == EVFILT_READ)
-       (*(fdptr->read_cb))(fdptr->data);
- 
--    if (fdptr->write_cb && event->filter == EVFILT_WRITE)
-+    if (fdptr->use > 1 && fdptr->write_cb && event->filter == EVFILT_WRITE)
-       (*(fdptr->write_cb))(fdptr->data);
- 
-     release_fd(fdptr);
-@@ -499,7 +499,8 @@
- 	if (fdptr->read_cb && (event->events & (EPOLLIN | EPOLLERR | EPOLLHUP)))
- 	  (*(fdptr->read_cb))(fdptr->data);
- 
--	if (fdptr->write_cb && (event->events & (EPOLLOUT | EPOLLERR | EPOLLHUP)))
-+	if (fdptr->use > 1 && fdptr->write_cb &&
-+	    (event->events & (EPOLLOUT | EPOLLERR | EPOLLHUP)))
- 	  (*(fdptr->write_cb))(fdptr->data);
- 
- 	release_fd(fdptr);
-@@ -590,7 +591,8 @@
-       if (fdptr->read_cb && (pfd->revents & (POLLIN | POLLERR | POLLHUP)))
-         (*(fdptr->read_cb))(fdptr->data);
- 
--      if (fdptr->write_cb && (pfd->revents & (POLLOUT | POLLERR | POLLHUP)))
-+      if (fdptr->use > 1 && fdptr->write_cb &&
-+          (pfd->revents & (POLLOUT | POLLERR | POLLHUP)))
-         (*(fdptr->write_cb))(fdptr->data);
- 
-       release_fd(fdptr);
-@@ -645,7 +647,8 @@
-       if (fdptr->read_cb && FD_ISSET(fdptr->fd, &cupsd_current_input))
-         (*(fdptr->read_cb))(fdptr->data);
- 
--      if (fdptr->write_cb && FD_ISSET(fdptr->fd, &cupsd_current_output))
-+      if (fdptr->use > 1 && fdptr->write_cb &&
-+          FD_ISSET(fdptr->fd, &cupsd_current_output))
-         (*(fdptr->write_cb))(fdptr->data);
- 
-       release_fd(fdptr);

diff --git a/net-print/cups/files/cups-1.4.4-dont-compress-manpages.patch b/net-print/cups/files/cups-1.4.4-dont-compress-manpages.patch
deleted file mode 100644
index 4a639c0..0000000
--- a/net-print/cups/files/cups-1.4.4-dont-compress-manpages.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# Source: Fedora
-
-diff -up cups-1.4b2-svn8404/config-scripts/cups-manpages.m4.no-gzip-man cups-1.4b2-svn8404/config-scripts/cups-manpages.m4
---- cups-1.4b2-svn8404/config-scripts/cups-manpages.m4.no-gzip-man	2009-01-16 08:58:42.000000000 +0000
-+++ cups-1.4b2-svn8404/config-scripts/cups-manpages.m4	2009-03-05 11:11:12.000000000 +0000
-@@ -69,10 +69,10 @@ case "$uname" in
- 		;;
- 	Linux* | GNU* | Darwin*)
- 		# Linux, GNU Hurd, and Mac OS X
--		MAN1EXT=1.gz
--		MAN5EXT=5.gz
--		MAN7EXT=7.gz
--		MAN8EXT=8.gz
-+		MAN1EXT=1
-+		MAN5EXT=5
-+		MAN7EXT=7
-+		MAN8EXT=8
- 		MAN8DIR=8
- 		;;
- 	*)

diff --git a/net-print/cups/files/cups-1.4.4-fix-install-perms.patch b/net-print/cups/files/cups-1.4.4-fix-install-perms.patch
deleted file mode 100644
index 726f030..0000000
--- a/net-print/cups/files/cups-1.4.4-fix-install-perms.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-# Source: Fedora
-
-diff -up cups-1.4.2/Makedefs.in.0755 cups-1.4.2/Makedefs.in
---- cups-1.4.2/Makedefs.in.0755	2010-01-13 17:06:48.507913044 +0000
-+++ cups-1.4.2/Makedefs.in	2010-01-13 17:07:10.049912905 +0000
-@@ -41,13 +41,13 @@ SHELL		=	/bin/sh
- # Installation programs...
- #
- 
--INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
-+INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
- INSTALL_CONFIG	=	$(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
- INSTALL_DATA	=	$(INSTALL) -c -m 444
- INSTALL_DIR	=	$(INSTALL) -d
--INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
-+INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
- INSTALL_MAN	=	$(INSTALL) -c -m 444
--INSTALL_SCRIPT	=	$(INSTALL) -c -m 555
-+INSTALL_SCRIPT	=	$(INSTALL) -c -m 755
- 
- #
- # Default user, group, and system groups for the scheduler...

diff --git a/net-print/cups/files/cups-1.4.4-nostrip.patch b/net-print/cups/files/cups-1.4.4-nostrip.patch
deleted file mode 100644
index cd2b070..0000000
--- a/net-print/cups/files/cups-1.4.4-nostrip.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# Source: Gentoo
-
-diff -urN cups-1.4.4/config-scripts/cups-compiler.m4 cups-1.4.4.new/config-scripts/cups-compiler.m4
---- cups-1.4.4/config-scripts/cups-compiler.m4	2009-05-17 02:13:47.000000000 +0200
-+++ cups-1.4.4.new/config-scripts/cups-compiler.m4	2010-08-12 19:19:45.937020635 +0200
-@@ -30,7 +30,7 @@
- if test x$enable_debug = xyes; then
- 	OPTIM="-g"
- else
--	INSTALL_STRIP="-s"
-+	INSTALL_STRIP=""
- fi
- 
- dnl Debug printfs can slow things down, so provide a separate option for that

diff --git a/net-print/cups/files/cups-1.4.4-perl-includes.patch b/net-print/cups/files/cups-1.4.4-perl-includes.patch
deleted file mode 100644
index 677c57d..0000000
--- a/net-print/cups/files/cups-1.4.4-perl-includes.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN cups-1.4.4/scripting/perl/Makefile.PL cups-1.4.4.new//scripting/perl/Makefile.PL
---- cups-1.4.4/scripting/perl/Makefile.PL	2002-08-19 22:43:03.000000000 +0200
-+++ cups-1.4.4.new//scripting/perl/Makefile.PL	2010-09-12 19:12:53.173000149 +0200
-@@ -11,7 +11,7 @@
-     'LIBS'		=> ['-lcups '], # e.g., '-lm'
-     'DEFINE'		=> '', # e.g., '-DHAVE_SOMETHING'
- 	# Insert -I. if you add *.h files later:
--    'INC'		=> '', # e.g., '-I/usr/include/other'
-+    'INC'		=> '-I../../', # e.g., '-I/usr/include/other'
- 	# Un-comment this if you add C files to link with later:
-     # 'OBJECT'		=> '$(O_FILES)', # link all the C files too
- );

diff --git a/net-print/cups/files/cups-1.4.4-php-destdir.patch b/net-print/cups/files/cups-1.4.4-php-destdir.patch
deleted file mode 100644
index 01a64c8..0000000
--- a/net-print/cups/files/cups-1.4.4-php-destdir.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-# Source: Gentoo
-
-diff -urN cups-1.4.4/scripting/php/Makefile cups-1.4.4.new//scripting/php/Makefile
---- cups-1.4.4/scripting/php/Makefile	2008-08-27 23:12:43.000000000 +0200
-+++ cups-1.4.4.new//scripting/php/Makefile	2010-08-13 10:32:35.764063909 +0200
-@@ -95,11 +95,11 @@
- 
- install-exec:
- 	echo Installing $(PHPCUPS) in $(PHPDIR)
--	$(INSTALL_DIR) $(PHPDIR)
--	$(INSTALL_LIB) $(PHPCUPS) $(PHPDIR)
-+	$(INSTALL_DIR) $(DESTDIR)/$(PHPDIR)
-+	$(INSTALL_LIB) $(PHPCUPS) $(DESTDIR)/$(PHPDIR)
- 	if test "x$(SYMROOT)" != x; then \
--		$(INSTALL_DIR) $(SYMROOT); \
--		cp $(PHPCUPS) $(SYMROOT); \
-+		$(INSTALL_DIR) $(DESTDIR)/$(SYMROOT); \
-+		cp $(PHPCUPS) $(DESTDIR)/$(SYMROOT); \
- 	fi
- 
- 

diff --git a/net-print/cups/files/cups-1.4.6-force-gnutls.patch b/net-print/cups/files/cups-1.4.6-force-gnutls.patch
deleted file mode 100644
index 06daeb3..0000000
--- a/net-print/cups/files/cups-1.4.6-force-gnutls.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-Source: http://pkgs.fedoraproject.org/gitweb/?p=cups.git;a=blob;f=cups-force-gnutls.patch;h=85adaa8bdcc013e5401fffe74306a5fe644cf088;hb=HEAD
-Reason: Force the use of gnutls despite thread-safety concerns (Gentoo bug #350406)
-Upstream: http://cups.org/str.php?L3605
-
-diff -up cups-1.4.4/config-scripts/cups-ssl.m4.force-gnutls cups-1.4.4/config-scripts/cups-ssl.m4
---- cups-1.4.4/config-scripts/cups-ssl.m4.force-gnutls	2010-09-15 16:49:22.343502552 +0100
-+++ cups-1.4.4/config-scripts/cups-ssl.m4	2010-09-15 16:49:42.347502595 +0100
-@@ -65,23 +65,21 @@ if test x$enable_ssl != xno; then
- 	if $PKGCONFIG --exists gnutls; then
- 	    if test "x$have_pthread" = xyes; then
- 		AC_MSG_WARN([The current version of GNU TLS cannot be made thread-safe.])
--	    else
--	        have_ssl=1
--	        SSLLIBS=`$PKGCONFIG --libs gnutls`
--	        SSLFLAGS=`$PKGCONFIG --cflags gnutls`
--	        AC_DEFINE(HAVE_SSL)
--	        AC_DEFINE(HAVE_GNUTLS)
- 	    fi
-+	    have_ssl=1
-+	    SSLLIBS=`$PKGCONFIG --libs gnutls`
-+	    SSLFLAGS=`$PKGCONFIG --cflags gnutls`
-+	    AC_DEFINE(HAVE_SSL)
-+	    AC_DEFINE(HAVE_GNUTLS)
- 	elif test "x$LIBGNUTLSCONFIG" != x; then
- 	    if test "x$have_pthread" = xyes; then
- 		AC_MSG_WARN([The current version of GNU TLS cannot be made thread-safe.])
--	    else
--	        have_ssl=1
--	        SSLLIBS=`$LIBGNUTLSCONFIG --libs`
--	        SSLFLAGS=`$LIBGNUTLSCONFIG --cflags`
--	        AC_DEFINE(HAVE_SSL)
--	        AC_DEFINE(HAVE_GNUTLS)
- 	    fi
-+	    have_ssl=1
-+	    SSLLIBS=`$LIBGNUTLSCONFIG --libs`
-+	    SSLFLAGS=`$LIBGNUTLSCONFIG --cflags`
-+	    AC_DEFINE(HAVE_SSL)
-+	    AC_DEFINE(HAVE_GNUTLS)
- 	fi
- 
- 	if test $have_ssl = 1; then
-diff -up cups-1.4.4/configure.force-gnutls cups-1.4.4/configure
---- cups-1.4.4/configure.force-gnutls	2010-06-17 19:25:47.000000000 +0100
-+++ cups-1.4.4/configure	2010-09-15 16:50:01.689503165 +0100
-@@ -17542,36 +17542,34 @@ fi
- 	    if test "x$have_pthread" = xyes; then
- 		{ echo "$as_me:$LINENO: WARNING: The current version of GNU TLS cannot be made thread-safe." >&5
- echo "$as_me: WARNING: The current version of GNU TLS cannot be made thread-safe." >&2;}
--	    else
--	        have_ssl=1
--	        SSLLIBS=`$PKGCONFIG --libs gnutls`
--	        SSLFLAGS=`$PKGCONFIG --cflags gnutls`
--	        cat >>confdefs.h <<\_ACEOF
-+	    fi
-+	    have_ssl=1
-+	    SSLLIBS=`$PKGCONFIG --libs gnutls`
-+	    SSLFLAGS=`$PKGCONFIG --cflags gnutls`
-+	    cat >>confdefs.h <<\_ACEOF
- #define HAVE_SSL 1
- _ACEOF
- 
--	        cat >>confdefs.h <<\_ACEOF
-+	    cat >>confdefs.h <<\_ACEOF
- #define HAVE_GNUTLS 1
- _ACEOF
- 
--	    fi
- 	elif test "x$LIBGNUTLSCONFIG" != x; then
- 	    if test "x$have_pthread" = xyes; then
- 		{ echo "$as_me:$LINENO: WARNING: The current version of GNU TLS cannot be made thread-safe." >&5
- echo "$as_me: WARNING: The current version of GNU TLS cannot be made thread-safe." >&2;}
--	    else
--	        have_ssl=1
--	        SSLLIBS=`$LIBGNUTLSCONFIG --libs`
--	        SSLFLAGS=`$LIBGNUTLSCONFIG --cflags`
--	        cat >>confdefs.h <<\_ACEOF
-+	    fi
-+	    have_ssl=1
-+	    SSLLIBS=`$LIBGNUTLSCONFIG --libs`
-+	    SSLFLAGS=`$LIBGNUTLSCONFIG --cflags`
-+	    cat >>confdefs.h <<\_ACEOF
- #define HAVE_SSL 1
- _ACEOF
- 
--	        cat >>confdefs.h <<\_ACEOF
-+	    cat >>confdefs.h <<\_ACEOF
- #define HAVE_GNUTLS 1
- _ACEOF
- 
--	    fi
- 	fi
- 
- 	if test $have_ssl = 1; then

diff --git a/net-print/cups/files/cups-1.4.6-serialize-gnutls.patch b/net-print/cups/files/cups-1.4.6-serialize-gnutls.patch
deleted file mode 100644
index bfe9f5e..0000000
--- a/net-print/cups/files/cups-1.4.6-serialize-gnutls.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-Source: http://pkgs.fedoraproject.org/gitweb/?p=cups.git;a=blob;f=cups-serialize-gnutls.patch;h=cdd82cb95574801bf714364a585e31eb05191750;hb=HEAD
-Reason: Perform locking for gnutls and avoid libgcrypt's broken locking (Gentoo bug #350406)
-Upstream: http://cups.org/str.php?L3605
-
-diff -up cups-1.4.4/cups/http.c.serialize-gnutls cups-1.4.4/cups/http.c
---- cups-1.4.4/cups/http.c.serialize-gnutls	2010-09-17 13:37:01.858871762 +0100
-+++ cups-1.4.4/cups/http.c	2010-09-17 13:55:22.579871934 +0100
-@@ -149,7 +149,7 @@ static int		http_write_ssl(http_t *http,
- 
- #  ifdef HAVE_GNUTLS
- #    ifdef HAVE_PTHREAD_H
--GCRY_THREAD_OPTION_PTHREAD_IMPL;
-+static pthread_mutex_t gnutls_lock;
- #    endif /* HAVE_PTHREAD_H */
- 
- #  elif defined(HAVE_LIBSSL) && defined(HAVE_PTHREAD_H)
-@@ -1231,7 +1231,7 @@ httpInitialize(void)
-   */
- 
- #  ifdef HAVE_PTHREAD_H
--  gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
-+  pthread_mutex_init(&gnutls_lock, NULL);
- #  endif /* HAVE_PTHREAD_H */
- 
-  /*
-@@ -2228,6 +2228,7 @@ _httpWait(http_t *http,			/* I - Connect
-     if (SSL_pending((SSL *)(http->tls)))
-       return (1);
- #  elif defined(HAVE_GNUTLS)
-+    /* lock already held here... */
-     if (gnutls_record_check_pending(((http_tls_t *)(http->tls))->session))
-       return (1);
- #  elif defined(HAVE_CDSASSL)
-@@ -2294,6 +2295,8 @@ int					/* O - 1 if data is available, 0
- httpWait(http_t *http,			/* I - Connection to server */
-          int    msec)			/* I - Milliseconds to wait */
- {
-+  int ret;
-+
-  /*
-   * First see if there is data in the buffer...
-   */
-@@ -2318,7 +2321,17 @@ httpWait(http_t *http,			/* I - Connecti
-   * If not, check the SSL/TLS buffers and do a select() on the connection...
-   */
- 
--  return (_httpWait(http, msec, 1));
-+#if defined(HAVE_SSL) && defined(HAVE_GNUTLS) && defined(HAVE_PTHREAD_H)
-+  pthread_mutex_lock(&gnutls_lock);
-+#endif
-+
-+  ret = _httpWait(http, msec, 1);
-+
-+#if defined(HAVE_SSL) && defined(HAVE_GNUTLS) && defined(HAVE_PTHREAD_H)
-+  pthread_mutex_unlock(&gnutls_lock);
-+#endif
-+
-+  return (ret);
- }
- 
- 
-@@ -2769,7 +2782,9 @@ http_read_ssl(http_t *http,		/* I - Conn
-   ssize_t	result;			/* Return value */
- 
- 
-+  pthread_mutex_lock(&gnutls_lock);
-   result = gnutls_record_recv(((http_tls_t *)(http->tls))->session, buf, len);
-+  pthread_mutex_unlock(&gnutls_lock);
- 
-   if (result < 0 && !errno)
-   {
-@@ -3085,6 +3100,7 @@ http_setup_ssl(http_t *http)		/* I - Con
-     return (-1);
-   }
- 
-+  pthread_mutex_lock(&gnutls_lock);
-   gnutls_certificate_allocate_credentials(credentials);
- 
-   gnutls_init(&(conn->session), GNUTLS_CLIENT);
-@@ -3104,9 +3120,11 @@ http_setup_ssl(http_t *http)		/* I - Con
-     free(credentials);
-     free(conn);
- 
-+    pthread_mutex_unlock(&gnutls_lock);
-     return (-1);
-   }
- 
-+  pthread_mutex_unlock(&gnutls_lock);
-   conn->credentials = credentials;
- 
- #  elif defined(HAVE_CDSASSL)
-@@ -3196,9 +3214,11 @@ http_shutdown_ssl(http_t *http)		/* I - 
-   conn = (http_tls_t *)(http->tls);
-   credentials = (gnutls_certificate_client_credentials *)(conn->credentials);
- 
-+  pthread_mutex_lock(&gnutls_lock);
-   gnutls_bye(conn->session, GNUTLS_SHUT_RDWR);
-   gnutls_deinit(conn->session);
-   gnutls_certificate_free_credentials(*credentials);
-+  pthread_mutex_unlock(&gnutls_lock);
-   free(credentials);
-   free(conn);
- 
-@@ -3445,7 +3465,9 @@ http_write_ssl(http_t     *http,	/* I - 
- #  elif defined(HAVE_GNUTLS)
-   ssize_t	result;			/* Return value */
- 
-+  pthread_mutex_lock(&gnutls_lock);
-   result = gnutls_record_send(((http_tls_t *)(http->tls))->session, buf, len);
-+  pthread_mutex_unlock(&gnutls_lock);
- 
-   if (result < 0 && !errno)
-   {

diff --git a/net-print/cups/files/cups-1.4.6-web-hang.patch b/net-print/cups/files/cups-1.4.6-web-hang.patch
deleted file mode 100644
index 6ccf05a..0000000
--- a/net-print/cups/files/cups-1.4.6-web-hang.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Index: cgi-bin/html.c
-===================================================================
---- cgi-bin/html.c	(revision 9428)
-+++ cgi-bin/html.c	(working copy)
-@@ -1,9 +1,9 @@
- /*
-  * "$Id: cups-1.4.6-web-hang.patch,v 1.1 2011/04/30 15:39:45 scarabeus Exp $"
-  *
-- *   HTML support functions for the Common UNIX Printing System (CUPS).
-+ *   HTML support functions for CUPS.
-  *
-- *   Copyright 2007-2009 by Apple Inc.
-+ *   Copyright 2007-2011 by Apple Inc.
-  *   Copyright 1997-2006 by Easy Software Products.
-  *
-  *   These coded instructions, statements, and computer programs are the
-@@ -208,31 +208,13 @@
- int					/* O - 1 if multi-part supported, 0 otherwise */
- cgiSupportsMultipart(void)
- {
--  const char	*user_agent;		/* User-Agent string */
--  static int	supports_multipart = -1;/* Cached value */
-+ /*
-+  * Too many bug reports for browsers that don't support it, and too much pain
-+  * to whitelist known-good browsers, so for now we just punt on multi-part
-+  * support... :(
-+  */
- 
--
--  if (supports_multipart < 0)
--  {
--   /*
--    * CUPS STR #3049: Apparently some browsers don't support multi-part
--    * documents, which makes them useless for many web sites.  Rather than
--    * abandoning those users, we'll offer a degraded single-part mode...
--    *
--    * Currently we know that anything based on Gecko, MSIE, and Safari all
--    * work.  We'll add more as they are reported/tested.
--    */
--
--    if ((user_agent = getenv("HTTP_USER_AGENT")) != NULL &&
--        (strstr(user_agent, " Gecko/") != NULL ||
--	 strstr(user_agent, " MSIE ") != NULL ||
--	 strstr(user_agent, " Safari/") != NULL))
--      supports_multipart = 1;
--    else
--      supports_multipart = 0;
--  }
--
--  return (supports_multipart);
-+  return (0);
- }
- 
- 

diff --git a/net-print/cups/files/cupsd.init.d b/net-print/cups/files/cupsd.init.d
deleted file mode 100644
index e5529ee..0000000
--- a/net-print/cups/files/cupsd.init.d
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-
-depend() {
-	use net
-	@neededservices@
-	before nfs
-	after logger
-}
-
-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 $?
-}

diff --git a/net-print/cups/files/pdftops-1.20.gentoo b/net-print/cups/files/pdftops-1.20.gentoo
deleted file mode 100644
index 8fdafe3..0000000
--- a/net-print/cups/files/pdftops-1.20.gentoo
+++ /dev/null
@@ -1,340 +0,0 @@
-#!/usr/bin/perl -w
-# pdftops.pl - wrapper script for xpdf's pdftops utility to act as a CUPS filter
-# ==============================================================================
-# 1.00 - 2004-10-05/Bl
-#	Initial implementation
-# 1.10 - 2006-09-27/Bl
-#	Alternatively, use Adobe Reader in place of Xpdf's pdftops
-# 1.20 - 2007-12-03/Bl
-#	Safe temp file creation (fix gentoo bug # 201042)
-#
-# Copyright: Helge Blischke / SRZ Berlin 2004-2006
-# This program is free seoftware and governed by the GNU Public License Version 2.
-#
-# Description:
-# ------------
-#	This program wraps the pdftops utility from the xpdf 3.00 (and higher) suite
-#	to behave as a CUPS filter as a replacement for the original pdftops filter.
-#	As an alternative the Adobe Reader may be used.
-#
-#	The main purpose of this approach is to keep the properties of a PDF to be
-#	printed as undesturbed as possible, especially with respect to page size,
-#	scaling, and positioning.
-#
-#	The pdftops utility reads a configuration file 'pdftops.conf' or 'acroread.conf',
-#	respectively, in the CUPS_SERVERROOT directory, which must exist but may be empty. 
-#	The sample configuration file accompanying this program sets the defaults which
-#	seem plausible to me with respect to high end production printers.
-#
-#	To give the user highest possible flexibility, this program accepts and
-#	evaluates a set of job attributes special to this filter, which are 
-#	described below:
-#	
-#		pdf-pages=<f>,<l>
-#				expands to the -f and -l options of pdftops
-#				or the -start and -end options of acroread, respectively
-#				to select a page range to process. This is independent
-#				of the page-ranges attribute and may significantly
-#				increase throughput when printing page ranges.
-#				Either of these numbers may be omitted.
-#
-#		pdf-paper=<name>
-#				For pdftops, <name> may be one of "letter", "legal",
-#				"A4", "A3", or "match"; for acroread, the permetted values
-#				are "letter", "legal", "tabloid", "ledger", "executive",
-#				"a3", "a4", "a5", "b4", "b5", respectively (without the
-#				quotes; the names are treated case independent).
-#				In case of acroread, no paper specification is equivalent
-#				to pdsftops's "match".
-#		pdf-paper=<width>x<height>
-#				<name> may be one of letter, legal , A4, A3, or match;
-#				<width> and <height> are the paper width and height
-#				in printers points (1/72 inch). This expands to
-#				either the -paper or the -paperh and -paperw options
-#				of pdftops or the -size option of acroread.
-#
-#		pdf-opw=<password>
-#		pdf-upw=<password>
-#				expand to the -opw and -upw options of pdftops,
-#				respectively and permit printing of password
-#				protected PDFs.
-#
-#		pdf-<option>	where <option> is one of
-#				level1, level1sep, level2, level2sep, level3, level3sep,
-#				opi, nocrop, expand, noshrink, nocenter.
-#				See the pdftops manpage for a detailed description of
-#				the respective options.
-#				In case of acroread, the options level1, level?sep, opi,
-#				nocrop, noshrink, and nocenter are silently ignored.
-#
-#	All other pdftops commandline options are refused.
-#
-#	The return code of the pdftops utility or acroread, if nonzero, is used as the exit code
-#	of this program; error messages of the pdftops utility are only visible
-#	if 'debug' is specified as LogLevel in cupsd.conf.
-#
-#	NOTE:
-#	-----
-#	This wrapper script has been initially designed to use the original pdftops utility
-#	as a CUPS filter and now extended to alternately use acroread.
-#	But there are situations where you need to be able to select either variant, thus it
-#	is possible to configure the wrapper to both programs but select one of them by default;
-#	the other one then may be selected by command line option:
-#
-#	use-pdftops		selects pdftops
-#	use-acroread		selects acroread
-#
-#	if both are configured (by defining the appropriate configuration file).
-#
-
-#
-# Site specific parameters - modify as needed
-# ----------------------------------------------------------------------------------
-$pdftops_path = "/usr/bin/pdftops";		# path to the xpdf utility
-$acroread_path = "/opt/bin/acroread";		# path to Adobe Reader
-$default_app = 'use-pdftops';			# the default if both are configured
-$use_pdftops = 1;				# default on gentoo and highly recommended
-$use_acroread = 0;				# not supported/working on gentoo yet, use at your own risk
-# ----------------------------------------------------------------------------------
-
-use File::Temp qw( tempfile );
-
-#
-# Check which app to use - pdftops or acroread
-#
-$rootdir = $ENV{CUPS_SERVERROOT} || die ("ERROR: CUPS server root directory undefined\n");
-$use_both = $use_pdftops && $use_acroread;
-
-#
-# Check the arguments
-#
-die ("ERROR: wrong number of arguments\n") if (scalar @ARGV < 5);
-
-$jobid = $username = $title = $copies = undef;
-$jobid = shift;					# Job ID
-$username = shift;				# Job requesting user name
-$title = shift;					# Job title
-$copies = shift;				# Number of requested copies
-$options = shift;				# Textual representation of job attributes
-$pdffile = shift;				# Pathname of PDF file to process
-
-if (defined $use_both && $use_both)
-{
-	my $optstr = " $options ";
-	my $to_use = '';
-	if ($optstr =~ /\s+(use-acroread|use-pdftops)\s+/)
-	{
-		$to_use = $1;
-	}
-	else
-	{
-		$to_use = $default_app;
-	}
-	if ($to_use eq 'use-acroread')
-	{
-		undef $use_pdftops;
-	}
-	elsif ($to_use eq 'use-pdftops')
-	{
-		undef $use_acroread;
-	}
-	else
-	{
-		die ("ERROR: cannot use both pdftops and acroread simultaneously\n");
-	}
-}
-
-
-if (defined $use_pdftops)
-{
-	# If we are reading from STDIN, we must copy the input to a temporary file
-	# as the PDF consumer needs a seekable input.
-	if (! defined $pdffile)
-	{
-		my $template = "pdfinXXXXXX";
-		my $tmpdir = $ENV{TMPDIR};
-		my ($bytes, $buffer);
-		my ($tmpfh, $tmpfile) = tempfile ($template, OPEN => 1, DIR => $tmpdir, UNLINK => 0, SUFFIX => '.tmp');
-		while (($bytes = read (STDIN, $buffer, 1024)) > 0)
-		{
-			print $tmpfh "$buffer";
-		}
-		if ($bytes < 0)
-		{
-			close ($tmpfh);
-			unlink $tmpfile;
-			die ("ERROR: pdftops wrapper: $tmpfile: $!\n");
-		}
-		close ($tmpfh);
-		$pdffile = $tmpfile;
-		$delete_input = 1;			# for deleting the temp file after converting
-	}
-}
-		
-
-# 
-# Check the options string for options to modify the bahaviour of the pdftops utility:
-#
-@optarr = split (/\s+/, $options);
-if (defined $use_pdftops)
-{
-	$cmdopt = ""; # do not pass the -cfg argument to the poppler pdftops util
-	# The following are the (parameterless) command line options that may be used to change the 
-	# defaults defiend by pdftops.conf
-	$simple = 'level1|level1sep|level2|level2sep|level3|level3sep|opi|nocrop|expand|noshrink|nocenter';
-	%papernames = (
-		'letter'	=>	'-paper letter',
-		'tabloid'	=>	'-paperw 792 -paperh 1224',
-		'ledger'	=>	'-paperw 1224 -paperh 792',
-		'legal'		=>	'-paper legal',
-		'executive'	=>	'-paperw 756 -paperh 522',
-		'a3'		=>	'-paper A3',
-		'a4'		=>	'-paper A4',
-		'a5'		=>	'-paperw 421 -paperh 595',
-		'b4'		=>	'-paperw 709 -paperh 1002',
-		'b5'		=>	'-paperw 501 -paperh 709',
-		'match'		=>	'-paper match'
-	);
-}
-else
-{
-	open (CFG, "<$rootdir/acroread.conf") || die ("ERROR: acroread.conf: $!\n");
-	$cmdopt = '-toPostScript';
-	while (<CFG>)
-	{
-		chomp;
-		next if (/^\s*#/);			# skip comment lines
-		next if (/^\s*$/);			# skip blank lines
-		s/^-\s*//;				# discard leading '-' and white space, as it will be generated later
-		s/\s+$//;				# discard trailing white space
-		$cmdopt .= " -$_";
-	}
-	close (CFG);
-	$simple = 'level1|level1sep|level2|level2sep|level3|level3sep|opi|nocrop|expand|noshrink|nocenter';
-	%papernames = (
-		'letter'	=>	'-size letter',
-		'tabloid'	=>	'-size tabloid',
-		'ledger'	=>	'-size ledger',
-		'legal'		=>	'-size legal',
-		'executive'	=>	'-size executive',
-		'a3'		=>	'-size a3',
-		'a4'		=>	'-size a4',
-		'a5'		=>	'-size a5',
-		'b4'		=>	'-size b4',
-		'b5'		=>	'-size b5',
-		'match'		=>	''		# this is the default with acroread
-	);
-}
-
-foreach my $option (@optarr)
-{
-	if ($option =~ /^pdf-(.+)$/)
-	{	# We assume this is an option to evaluate
-		my $optkey = $1;		# possible pdftops option
-		if ($optkey =~ /^pages=(\d*),(\d*)$/)
-		{
-			# We do this hack here to avoid clashes with the page-ranges atrribute
-			# which is handled by the pstops filter. And we allow one of the numbers
-			# to be omitted.
-			my $first = $1;
-			my $lastp = $2;
-			if (defined $use_pdftops)
-			{
-				$cmdopt .= " -f $1" if ($1);		# first page
-				$cmdopt .= " -l $2" if ($2);		# last page
-			}
-			else
-			{
-				$cmdopt .= " -start $1" if ($1);	# first page
-				$cmdopt .= " -end $2" if ($2);		# last page
-			}
-		}
-		elsif ($optkey =~ /^paper=(letter|tabloid|ledger|legal|[Aa]3|[Aa]4|[Aa]5|[Bb]4|[Bb]5|match)$/)
-		{
-			# evaluate paper name
-			my $paper = $1;
-			$paper =~ tr/A-Z/a-z/;
-			my $value = $papernames{$paper};
-			$cmdopt .= " $value" if ($value);
-		}
-		elsif ($optkey =~ /^paper=(\d+)x(\d+)$/)
-		{
-			# evaluate paper dimensions
-			if (defined $use_pdftops)
-			{
-				$cmdopt .= " -paperw $1 -paperh $2";
-			}
-			else
-			{
-				$cmdopt .= " -size $1" . 'x' . "$2";
-			}
-		}
-		elsif ($optkey =~ /^(o|u)pw=(\S+)$/)
-		{
-			$cmdopt .= " $1" . 'pw ' . $2 if (defined $use_pdftops);	# owner/user password
-		}
-		elsif ($optkey =~ /^($simple)$/)
-		{
-			my $thisopt = $1;
-			if (defined $use_pdftops)
-			{
-				$cmdopt .= ' -' . $1;				# allowed simple options
-			}
-			else
-			{
-				$thisopt =~ s/sep$//;				# ignore the ...sep suffix
-				if ($thisopt =~ /level1|opi|nocrop|nocenter/)
-				{
-					$thisopt = '';
-				}
-				elsif ($thisopt eq 'noshrink')
-				{
-					$thisopt = '';
-					$cmdopt =~ s/ -shrink//;
-				}
-				$cmdopt .= " -" . $thisopt if ($thisopt);
-			}
-		}
-		else
-		{
-			warn ("ERROR: pdftops wrapper: illegal attribute \"pdf-$optkey\"\n");
-		}
-	}
-	# All other attributes are processed elsewhere
-}
-#
-# Complete the command
-#
-if (defined $use_pdftops)
-{
-	warn ("ERROR: pdftops-options: $cmdopt\n");
-}
-else
-{
-	warn ("ERROR: acroread-options: $cmdopt\n");
-}
-if (defined $use_pdftops)
-{
-	$rc = system ("$pdftops_path $cmdopt $pdffile -");
-}
-else
-{
-	if (defined $pdffile && $pdffile)
-	{
-		$rc = system ("$acroread_path $cmdopt < $pdffile")
-	}
-	else
-	{
-		$rc = system ("$acroread_path $cmdopt");
-	}
-}
-if ($rc)
-{
-	$ir = $rc & 127;
-	$rc >>= 8;
-	my $temp = (defined $use_pdftops) ? $pdftops_path : $acroread_path;
-	warn ("ERROR: $temp exited with ", ($ir) ? "signal $ir, " : " exit code $rc", "\n");
-	exit $rc;
-}
-unlink ($pdffile) if (defined $delete_input);		# Delete the temp file if any
-exit 0;

diff --git a/net-print/cups/metadata.xml b/net-print/cups/metadata.xml
deleted file mode 100644
index 5b5f2ac..0000000
--- a/net-print/cups/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>printing</herd>
-  <use>
-    <flag name='python'>
-      Add support for the Python interpeter in the web server CGIs.
-    </flag>
-    <flag name='perl'>
-      Add support for the Perl interpeter in the web server CGIs.
-    </flag>
-    <flag name='php'>
-      Add support for the PHP interpeter in the web server CGIs.
-    </flag>
-    <flag name='java'>
-      Add support for the Java interpeter in the web server CGIs.
-    </flag>
-  </use>
-</pkgmetadata>

diff --git a/net-print/cups/notes.txt b/net-print/cups/notes.txt
deleted file mode 100644
index da3a268..0000000
--- a/net-print/cups/notes.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-About bugs / feature / patches in cups-1.5:
-
-cups-1.4.0-backend-https.patch does not apply anymore:
-	Upstream claims it's not needed anymore and fixed, see
-		http://www.cups.org/str.php?L3122+P0+S0+C0+I0+E0+M20+Qhttps
-	Cannot find any relevant commit or details in source
-	Patch could be ported
-	Needs testing
-
-cups-1.4.6-force-gnutls.patch does not apply anymore:
-	GNU TLS >= 2.11 supports threading now, see
-		http://www.cups.org/str.php?L3605
-	Patch is obsolete
-
-cups-1.4.6-web-hang.patch does not apply anymore:
-	has been integrated