Update with portage

4 files changed, 2127 insertions, 85 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index cfea41b..f8da780 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,125 +1,1879 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.454 2012/02/08 14:51:03 jer Exp $
+
+  08 Feb 2012; Jeroen Roovers <jer@gentoo.org> cups-1.5.0-r4.ebuild,
+  cups-1.5.2-r1.ebuild:
+  Marked ~hppa (bug #401067).
+
+  07 Feb 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.5.2-r1.ebuild:
+  Drop php scripting support; it is unmaintained by upstream, has already been
+  removed in trunk, and displays build failures with recent php. Bug 388105
+
+*cups-1.5.2-r1 (07 Feb 2012)
+
+  07 Feb 2012; Andreas K. Huettel <dilfridge@gentoo.org> -cups-1.5.2.ebuild,
+  +cups-1.5.2-r1.ebuild:
+  Follow Ubuntu/Debian and use their patch to revert the buggy ipp backend to
+  1.4 state, should fix bug 402063 for now.
+
+*cups-1.5.2 (07 Feb 2012)
+
+  07 Feb 2012; Andreas K. Huettel <dilfridge@gentoo.org> +cups-1.5.2.ebuild:
+  Version bump
+
+  05 Feb 2012; Markus Meier <maekke@gentoo.org> cups-1.5.0-r4.ebuild:
+  add ~arm, bug #401067
+
+  01 Feb 2012; Brent Baude <ranger@gentoo.org> cups-1.5.0-r4.ebuild:
+  Marking cups-1.5.0-r4 ~ppc for bug 401067
 
 *cups-1.5.0-r4 (28 Jan 2012)
 
-  28 Jan 2012; Daniel Solano Gómez <gentoo@sattvik.com> -cups-1.5.0-r3.ebuild,
+  28 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org> -cups-1.5.0-r3.ebuild,
   +cups-1.5.0-r4.ebuild, +files/cups-1.5.0-systemd-socket.patch:
-  Sync with portage
+  Add systemd support, bug 376021
+
+  27 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.5.0-r3.ebuild:
+  Re-add usb useflag / kernel configuration checks, but only on linux, bug
+  382675
+
+  27 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.4.8-r1.ebuild,
+  cups-1.4.8-r23.ebuild, cups-1.5.0-r3.ebuild:
+  Remove unused useflag samba, bug 373849
+
+  27 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.5.0-r3.ebuild:
+  Downgrade gnutls version requirement. Lets see what breaks now.
+
+  27 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  -cups-1.4.8-r22.ebuild, -cups-1.5.0-r2.ebuild:
+  Remove old
+
+  27 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.5.0-r3.ebuild:
+  Some cleanups in the ebuild
+
+  22 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.4.8-r1.ebuild,
+  cups-1.4.8-r23.ebuild, cups-1.5.0-r3.ebuild:
+  Break circular dependency
+
+  15 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.4.8-r1.ebuild,
+  cups-1.4.8-r23.ebuild, cups-1.5.0-r3.ebuild, metadata.xml:
+  Pull in net-print/foomatic-filters via a default-on useflag, bug 384793
+
+  15 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.4.8-r23.ebuild,
+  cups-1.5.0-r3.ebuild, files/cupsd.init.d:
+  Create dirs in /var/run in initscript, bug 387893
 
-  28 Jan 2012; Daniel Solano Gómez <gentoo@sattvik.com> cups-1.4.8-r1.ebuild,
-  -cups-1.4.8-r22.ebuild, cups-1.4.8-r23.ebuild, -cups-1.5.0-r2.ebuild,
-  cups-1.5.0-r3.ebuild:
-  Sync up with portage.
+*cups-1.5.0-r3 (15 Jan 2012)
+*cups-1.4.8-r23 (15 Jan 2012)
 
-*cups-1.5.0-r3 (19 Jan 2012)
-*cups-1.4.8-r23 (19 Jan 2012)
+  15 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +cups-1.4.8-r23.ebuild, +cups-1.5.0-r3.ebuild:
+  Update icon cache etc, bug 370059
 
-  19 Jan 2012; Daniel Solano Gómez <gentoo@sattvik.com>
+  15 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org>
   -files/cups-1.3.0-configure.patch, -files/cups-1.3.7-backend-https.patch,
-  -files/cups-1.3.8-group_fix.patch, -files/cups-1.3.10-str3178.patch,
-  -cups-1.3.11-r4.ebuild, -files/cups-1.3.11-pdf-m4.patch,
-  -files/cups-1.3.11-str3200.patch,
+  -files/cups-1.3.10-str3178.patch, -cups-1.3.11-r4.ebuild,
+  -files/cups-1.3.11-pdf-m4.patch, -files/cups-1.3.11-str3200.patch,
   -files/cups-1.3.11-str3367-security-1.3v2.patch,
   -files/cups-1.3.11-str3401-security-1.3v2-regression.patch,
   -cups-1.4.6-r2.ebuild, -files/cups-1.4.6-web-hang.patch,
-  cups-1.4.8-r1.ebuild, -cups-1.4.8-r21.ebuild, cups-1.4.8-r22.ebuild,
-  +cups-1.4.8-r23.ebuild, -cups-1.5.0-r1.ebuild, cups-1.5.0-r2.ebuild,
-  +cups-1.5.0-r3.ebuild, files/cupsd.init.d, metadata.xml:
-  Sync up with portage.
+  -cups-1.4.8-r21.ebuild, -cups-1.5.0-r1.ebuild:
+  Remove old
 
-  06 Oct 2011; Daniel Solano Gómez <gentoo@sattvik.com> cups-1.4.8-r1.ebuild,
-  cups-1.4.8-r21.ebuild, cups-1.5.0-r1.ebuild, cups-1.5.0-r2.ebuild:
-  Sync up with main tree.
+  13 Nov 2011; Justin Lecher <jlec@gentoo.org> cups-1.3.11-r4.ebuild,
+  cups-1.4.6-r2.ebuild, cups-1.4.8-r1.ebuild, cups-1.4.8-r21.ebuild,
+  cups-1.4.8-r22.ebuild, cups-1.5.0-r1.ebuild, cups-1.5.0-r2.ebuild:
+  Corrected Slotting of media-libs/tiff and media-libs/libpng
 
-*cups-1.5.0-r2 (01 Sep 2011)
-*cups-1.4.8-r22 (01 Sep 2011)
+  18 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org> cups-1.5.0-r2.ebuild:
+  cups 1.5 should handle the usb printing properly without any kernel hackery.
 
-  01 Sep 2011; Daniel Solano Gómez <gentoo@sattvik.com>
-  +cups-1.4.8-r22.ebuild, -files/cups-1.4.8-CVE-2011-2896.patch,
-  +files/cups-1.4.8-CVE-2011-3170.patch, +files/cups-1.4.8-largeimage.patch,
+  03 Sep 2011; Raúl Porcel <armin76@gentoo.org> cups-1.4.8-r1.ebuild:
+  alpha/arm/ia64/m68k/s390/sh/sparc stable wrt #380771
+
+  29 Aug 2011; Jeroen Roovers <jer@gentoo.org> cups-1.4.8-r1.ebuild:
+  Stable for HPPA (bug #380771).
+
+*cups-1.5.0-r2 (28 Aug 2011)
+*cups-1.4.8-r22 (28 Aug 2011)
+
+  28 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +cups-1.4.8-r22.ebuild, +files/cups-1.4.8-largeimage.patch,
   +cups-1.5.0-r2.ebuild:
-  Security updates.
+  Add upstream fix for bug 378597, mis-printing of large image files
+
+  28 Aug 2011; Tony Vroon <chainsaw@gentoo.org> cups-1.4.8-r1.ebuild:
+  Marked stable on AMD64 based on arch testing by Agostino "ago" Sarubbo &
+  Tomáš "Mepho" Pružina in security bug #380771.
+
+  27 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org> cups-1.4.8-r1.ebuild:
+  ppc/ppc64 stable wrt #380771
+
+  27 Aug 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> cups-1.4.8-r1.ebuild:
+  x86 stable wrt security bug #380771
+
+  27 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.4.8-r1.ebuild,
+  cups-1.4.8-r21.ebuild, -files/cups-1.4.8-CVE-2011-2896.patch,
+  +files/cups-1.4.8-CVE-2011-3170.patch, cups-1.5.0-r1.ebuild:
+  Dont die on kernel misconfiguration; correct CVE number, the patch fixes
+  CVE-2011-3170
+
+*cups-1.5.0-r1 (25 Aug 2011)
+*cups-1.4.8-r21 (25 Aug 2011)
+*cups-1.4.8-r1 (25 Aug 2011)
+
+  25 Aug 2011; Timo Gurr <tgurr@gentoo.org> -cups-1.4.6-r21.ebuild,
+  -cups-1.4.8.ebuild, +cups-1.4.8-r1.ebuild, +cups-1.4.8-r21.ebuild,
+  +files/cups-1.4.8-CVE-2011-2896.patch, -cups-1.5.0.ebuild,
+  +cups-1.5.0-r1.ebuild:
+  Revbumps fixing security issue CVE-2011-2896. Remove old.
+
+*cups-1.5.0 (17 Aug 2011)
+*cups-1.4.8 (17 Aug 2011)
+
+  17 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org> +cups-1.4.8.ebuild,
+  -cups-1.5_rc1.ebuild, +cups-1.5.0.ebuild:
+  Version bump; cups-1.5 remains package-masked
+
+  07 Aug 2011; Raúl Porcel <armin76@gentoo.org> cups-1.4.6-r2.ebuild:
+  ia64/m68k/s390/sh/sparc stable wrt #333781
+
+  09 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> cups-1.4.6-r2.ebuild:
+  ppc64 stable wrt #333781
+
+  29 Jun 2011; Markus Meier <maekke@gentoo.org> cups-1.4.6-r2.ebuild:
+  x86 stable, bug #333781
+
+  26 Jun 2011; Markus Meier <maekke@gentoo.org> cups-1.4.6-r2.ebuild:
+  arm stable, bug #333781
+
+  23 Jun 2011; Brent Baude <ranger@gentoo.org> cups-1.4.6-r2.ebuild:
+  Marking cups-1.4.6-r2 ppc for bug 333781
 
-*cups-1.5.0-r1 (26 Aug 2011)
-*cups-1.4.8-r21 (26 Aug 2011)
-*cups-1.4.8-r1 (26 Aug 2011)
+  21 Jun 2011; Tobias Klausmann <klausman@gentoo.org> cups-1.4.6-r2.ebuild:
+  Stable on alpha, bug #333781
 
-  26 Aug 2011; Daniel Solano Gómez <gentoo@sattvik.com>
-  -cups-1.4.6-r21.ebuild, -cups-1.4.8.ebuild, +cups-1.4.8-r1.ebuild,
-  +cups-1.4.8-r21.ebuild, +files/cups-1.4.8-CVE-2011-2896.patch,
-  -cups-1.5.0.ebuild, +cups-1.5.0-r1.ebuild, metadata.xml:
-  Sync up with portage (security fix)
+  21 Jun 2011; Markos Chandras <hwoarang@gentoo.org> cups-1.4.6-r2.ebuild:
+  Stable on amd64 wrt bug #333781
 
-*cups-1.5.0 (23 Aug 2011)
-*cups-1.4.8 (23 Aug 2011)
-*cups-1.4.6-r2 (23 Aug 2011)
+  18 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org> -cups-1.4.6-r1.ebuild:
+  Remove old
 
-  23 Aug 2011; Daniel Solano Gómez <gentoo@sattvik.com> -cups-1.4.6-r1.ebuild,
-  +cups-1.4.6-r2.ebuild, cups-1.4.6-r21.ebuild, +cups-1.4.8.ebuild,
-  +cups-1.5.0.ebuild, +files/cups-1.5.0-group_fix.patch:
-  Sync up with portage.
+*cups-1.5_rc1 (18 Jun 2011)
 
-*cups-1.4.6-r1 (02 May 2011)
+  18 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org> +cups-1.5_rc1.ebuild:
+  Package-masked version bump
 
-  02 May 2011; Daniel Solano Gómez <gentoo@sattvik.com> cups-1.3.11-r4.ebuild,
-  -cups-1.4.6.ebuild, +cups-1.4.6-r1.ebuild, +files/cups-1.4.6-web-hang.patch:
-  Sync up with portage
+  17 Jun 2011; Jeroen Roovers <jer@gentoo.org> cups-1.4.6-r2.ebuild:
+  Stable for HPPA (bug #333781).
 
-*cups-1.4.6 (16 Jan 2011)
+  06 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.4.6-r2.ebuild,
+  cups-1.4.6-r21.ebuild:
+  Force-enable threads whenever we use gnutls, bug 352252
 
-  16 Jan 2011; Daniel Solano Gómez <gentoo@sattvik.com> -cups-1.4.4-r2.ebuild,
+*cups-1.4.6-r21 (05 Jun 2011)
+*cups-1.4.6-r2 (05 Jun 2011)
+
+  05 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org> +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@gentoo.org> cups-1.4.6-r1.ebuild:
+  Improve informational messages
+
+  03 Jun 2011; Diego E. Pettenò <flameeyes@gentoo.org> 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@gentoo.org> 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@gentoo.org> cups-1.4.6-r1.ebuild:
+  use linux-info rather than linux-mod eclass. Per bug #365491.
+
+  30 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> 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@gentoo.org> 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@gentoo.org> -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@gentoo.org> 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@gentoo.org> 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@gentoo.org> cups-1.3.11-r4.ebuild,
+  cups-1.4.6.ebuild:
+  Move virtual/lpr to new-style virtual.
+
+  28 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> cups-1.3.11-r4.ebuild:
+  Use virtual/jpeg.
+
+*cups-1.4.6 (13 Jan 2011)
+
+  13 Jan 2011; Timo Gurr <tgurr@gentoo.org> -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, clean old versions.
+  Version bump, fixing bug #313555 and #350406. Remove old.
+
+*cups-1.3.11-r4 (01 Dec 2010)
 
-*cups-1.4.5 (03 Jan 2011)
-*cups-1.4.4-r2 (03 Jan 2011)
-*cups-1.3.11-r4 (03 Jan 2011)
+  01 Dec 2010; Tomáš Chvátal <scarabeus@gentoo.org> -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).
 
-  03 Jan 2011; Daniel Solano Gómez <gentoo@sattvik.com>
-  -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, -cups-1.4.4.ebuild, +cups-1.4.4-r2.ebuild,
+*cups-1.4.5 (01 Dec 2010)
+
+  01 Dec 2010; Tomáš Chvátal <scarabeus@gentoo.org> +cups-1.4.5.ebuild:
+  Version bump
+
+*cups-1.3.11-r3 (12 Nov 2010)
+
+  12 Nov 2010; Raúl Porcel <armin76@gentoo.org> -cups-1.3.11-r1.ebuild,
+  +cups-1.3.11-r3.ebuild:
+  Fix super annoying bug 309901
+
+  12 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org> 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@gentoo.org> -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-perl-includes.patch, +files/cups-1.4.4-php-destdir.patch,
-  +cups-1.4.5.ebuild:
-  Version bumps/sync with portage.
+  +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@gentoo.org> 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@gentoo.org>
+  -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.3.11-r3 (15 Nov 2010)
+*cups-1.4.4-r1 (13 Aug 2010)
 
-  15 Nov 2010; Daniel Solano Gómez <gentoo@sattvik.com>
-  -cups-1.3.11-r1.ebuild, +cups-1.3.11-r3.ebuild:
-  Sync up with portage.
+  13 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  +cups-1.4.4-r1.ebuild:
+  Revbump with various patches i collected around.
 
-  23 Oct 2010; Daniel Solano Gómez <gentoo@sattvik.com>
+  10 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org>
   cups-1.3.11-r1.ebuild, cups-1.3.11-r2.ebuild:
-  Merged in changes form portage.
+  Fix deps per bug #328773.
+
+  30 Jul 2010; Jory A. Pratt <anarchy@gentoo.org> cups-1.4.4.ebuild:
+  make threads support optional, ack from scarabeus
+
+  18 Jul 2010; Joseph Jezak <josejx@gentoo.org> cups-1.3.11-r2.ebuild:
+  Marked ppc stable for bug #295256.
+
+  17 Jul 2010; Raúl Porcel <armin76@gentoo.org> cups-1.3.11-r2.ebuild:
+  arm/ia64/m68k/s390/sh/sparc stable wrt #295256
+
+  12 Jul 2010; Markos Chandras <hwoarang@gentoo.org> cups-1.3.11-r2.ebuild:
+  Stable on amd64 wrt bug #295256
+
+  11 Jul 2010; Tobias Klausmann <klausman@gentoo.org> cups-1.3.11-r2.ebuild:
+  Stable on alpha, bug #295256
+
+  10 Jul 2010; Jeroen Roovers <jer@gentoo.org> cups-1.3.11-r2.ebuild:
+  Stable for HPPA (bug #295256).
+
+  08 Jul 2010; Brent Baude <ranger@gentoo.org> cups-1.3.11-r2.ebuild:
+  Marking cups-1.3.11-r2 ppc64 for bug 295256
+
+  04 Jul 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  cups-1.3.11-r2.ebuild:
+  x86 stable wrt security bug #295256
 
-*cups-1.4.4 (23 Jun 2010)
-*cups-1.3.11-r2 (23 Jun 2010)
+  30 Jun 2010; Jeroen Roovers <jer@gentoo.org> cups-1.4.4.ebuild:
+  Respect LDFLAGS (bug #284769).
 
-  23 Jun 2010; Daniel Solano Gómez <gentoo@sattvik.com>
-  -cups-1.3.10-r2.ebuild, cups-1.3.11-r1.ebuild, +cups-1.3.11-r2.ebuild,
-  +files/cups-1.3.11-str3200.patch, +files/cups-1.4.2-str3200.patch,
-  -cups-1.4.3.ebuild, +cups-1.4.4.ebuild:
-  Copy in changes from portage.
+  30 Jun 2010; Jeroen Roovers <jer@gentoo.org> cups-1.3.11-r1.ebuild,
+  cups-1.3.11-r2.ebuild:
+  Use --with-optim to respect CFLAGS (bug #261214).
 
-*cups-1.4.3 (27 Apr 2010)
+*cups-1.4.4 (22 Jun 2010)
 
-  27 Apr 2010; Daniel Solano Gómez <gentoo@sattvik.com> -cups-1.4.1.ebuild,
+  22 Jun 2010; Timo Gurr <tgurr@gentoo.org> -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@gentoo.org> -cups-1.4.2-r1.ebuild,
   +cups-1.4.3.ebuild:
-  Version bump.
+  Version bump, fixing bug #284771 and #295369.
+
+  08 Mar 2010; Maciej Mrozowski <reavertm@gentoo.org> 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@gentoo.org> 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@gentoo.org> cups-1.4.2-r1.ebuild:
+  Depend on virtual/poppler-utils, not app-text/poppler-utils
+
+  22 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> cups-1.4.2-r1.ebuild:
+  Require SLOT="0" of media-libs/jpeg for headers.
+
+  26 Dec 2009; Peter Volkov <pva@gentoo.org> 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@gentoo.org> -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@gentoo.org> cups-1.3.11-r1.ebuild:
+  Stable for HPPA (bug #293865).
+
+  23 Nov 2009; Brent Baude <ranger@gentoo.org> cups-1.3.11-r1.ebuild:
+  Marking cups-1.3.11-r1 ppc64 for bug 293865
+
+  23 Nov 2009; Raúl Porcel <armin76@gentoo.org> cups-1.3.11-r1.ebuild:
+  ia64/m68k/s390/sh/sparc stable wrt #293865
+
+  23 Nov 2009; Markus Meier <maekke@gentoo.org> cups-1.3.11-r1.ebuild:
+  amd64/arm/x86 stable, bug #293865
+
+  22 Nov 2009; Tobias Klausmann <klausman@gentoo.org> cups-1.3.11-r1.ebuild:
+  Stable on alpha, bug #293865
+
+  21 Nov 2009; nixnut <nixnut@gentoo.org> cups-1.3.11-r1.ebuild:
+  ppc stable #293865
+
+  21 Nov 2009; Jeroen Roovers <jer@gentoo.org> 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@gentoo.org>
+  -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@gentoo.org> 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@gentoo.org> -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@gentoo.org> cups-1.3.10-r2.ebuild:
+  ppc stable #275685
+
+  21 Jul 2009; <chainsaw@gentoo.org> cups-1.3.10-r2.ebuild:
+  Marked stable on AMD64 as requested by Arfrever Frehtes Taifersar Arahesis
+  <arfrever@gentoo.org> in bug #275685. Tested on a Core2 Duo with a Hewlett
+  Packard 4250dtn.
+
+  12 Jul 2009; Raúl Porcel <armin76@gentoo.org> 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@gentoo.org> -cups-1.3.9-r1.ebuild,
+  +cups-1.3.11.ebuild:
+  Version bump fixing bug #276782. Remove old.
+
+  04 Jul 2009; Brent Baude <ranger@gentoo.org> cups-1.3.10-r2.ebuild:
+  stable ppc64, bug 275685
+
+  30 Jun 2009; Christian Faulhammer <fauli@gentoo.org>
+  cups-1.3.10-r2.ebuild:
+  stable x86, bug 275685
+
+  30 Jun 2009; Jeroen Roovers <jer@gentoo.org> cups-1.3.10-r2.ebuild:
+  Stable for HPPA (bug #275685).
+
+  28 Jun 2009; Tobias Klausmann <klausman@gentoo.org> cups-1.3.10-r2.ebuild:
+  Stable on alpha, bug #275685
+
+  28 Jun 2009; Ferris McCormick <fmccor@gentoo.org> cups-1.3.10-r2.ebuild:
+  Sparc stable, bug #275685.
+
+*cups-1.3.10-r2 (29 May 2009)
+
+  29 May 2009; Timo Gurr <tgurr@gentoo.org> +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@gentoo.org> 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@gentoo.org> -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@gentoo.org> cups-1.3.10:
+  Stable on alpha, bug #263070
+
+  20 Apr 2009; Raúl Porcel <armin76@gentoo.org> cups-1.3.10.ebuild:
+  arm/ia64/m68k/s390/sh/sparc stable wrt #263070
+
+  18 Apr 2009; Jeroen Roovers <jer@gentoo.org> cups-1.3.10:
+  Stable for HPPA (bug #263070).
+
+  18 Apr 2009; Brent Baude <ranger@gentoo.org> cups-1.3.10.ebuild:
+  Marking cups-1.3.10 ppc64 and ppc for bug 263070
+
+  18 Apr 2009; Markus Meier <maekke@gentoo.org> cups-1.3.10:
+  x86 stable, bug #263070
+
+  17 Apr 2009; Thomas Anderson <gentoofan23@gentoo.org> cups-1.3.10.ebuild:
+  stable amd64, security bug #263070
+
+*cups-1.3.10 (17 Apr 2009)
+
+  17 Apr 2009; Timo Gurr <tgurr@gentoo.org>
+  -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@gentoo.org> 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@gentoo.org> cups-1.3.9-r1.ebuild:
+  Add workaround for sh
+
+  11 Dec 2008; Tobias Klausmann <klausman@gentoo.org> cups-1.3.9-r1.ebuild:
+  Stable on alpha, bug #249727
+
+  10 Dec 2008; Raúl Porcel <armin76@gentoo.org> cups-1.3.9-r1.ebuild:
+  arm/ia64 stable wrt #249727
+
+  09 Dec 2008; Friedrich Oslage <bluebird@gentoo.org> cups-1.3.9-r1.ebuild:
+  Stable on sparc, security bug #249727
+
+  09 Dec 2008; Jeroen Roovers <jer@gentoo.org> cups-1.3.9-r1.ebuild:
+  Stable for HPPA (bug #249727).
+
+  08 Dec 2008; Brent Baude <ranger@gentoo.org> cups-1.3.9-r1.ebuild:
+  Marking cups-1.3.9-r1 ppc64 for bug 249727
+
+  08 Dec 2008; Markus Meier <maekke@gentoo.org> cups-1.3.9-r1.ebuild:
+  x86 stable, bug #249727
+
+  07 Dec 2008; Richard Freeman <rich0@gentoo.org> cups-1.3.9-r1.ebuild:
+  amd64 stable - 249727
+
+  06 Dec 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  cups-1.3.9-r1.ebuild:
+  ppc stable, bug #249727
+
+*cups-1.3.9-r1 (04 Dec 2008)
+
+  04 Dec 2008; Timo Gurr <tgurr@gentoo.org>
+  +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@gentoo.org>
+  -files/cups-1.2.12-CVE-2007-4045.patch,
+  -files/cups-1.2.12-CVE-2007-4351.patch,
+  -files/cups-1.2.12-CVE-2007-5849.patch,
+  -files/cups-1.2.12-CVE-2008-0047.patch,
+  -files/cups-1.2.12-CVE-2008-0053.patch,
+  -files/cups-1.2.12-CVE-2008-0882.patch,
+  -files/cups-1.2.12-CVE-2008-1373.patch,
+  -files/cups-1.2.12-CVE-2008-1722.patch, -files/cupsd.init,
+  -cups-1.2.12-r4.ebuild, -cups-1.2.12-r8.ebuild, -cups-1.3.8-r1.ebuild:
+  Remove old and vulnerable versions, finally getting rid of CUPS 1.2.x.
+
+  09 Nov 2008; Tobias Klausmann <klausman@gentoo.org> Manifest:
+  Fixed manifest for cups-1.3.8-source.tar.bz2
+
+  09 Nov 2008; Raúl Porcel <armin76@gentoo.org> cups-1.3.8-r2.ebuild:
+  ia64 stable
+
+  08 Nov 2008; Tobias Klausmann <klausman@gentoo.org> cups-1.3.8-r2.ebuild:
+  Stable on alpha, bug #238976
+
+  11 Oct 2008; Timo Gurr <tgurr@gentoo.org>
+  -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@gentoo.org> 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@gentoo.org>
+  +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@gentoo.org> cups-1.3.8-r1.ebuild:
+  Stable for HPPA (bug #235907).
+
+  15 Sep 2008; Tobias Klausmann <klausman@gentoo.org> cups-1.3.8-r1.ebuild:
+  Stable on alpha, bug #235907
+
+  12 Sep 2008; Markus Meier <maekke@gentoo.org> cups-1.3.8-r1.ebuild:
+  x86 stable, bug #235907
+
+  08 Sep 2008; Raúl Porcel <armin76@gentoo.org> cups-1.3.8-r1.ebuild:
+  ia64 stable wrt #235907
+
+  06 Sep 2008; nixnut <nixnut@gentoo.org> cups-1.3.8-r1.ebuild:
+  Stable on ppc wrt bug 235907
+
+  02 Sep 2008; Ferris McCormick <fmccor@gentoo.org> cups-1.3.8-r1.ebuild:
+  Sparc stable, Bug #235907.
+
+  01 Sep 2008; Raúl Porcel <armin76@gentoo.org> cups-1.3.8-r1.ebuild:
+  Fix SRC_URI
+
+  01 Sep 2008; Thomas Anderson <gentoofan23@gentoo.org>
+  cups-1.3.8-r1.ebuild:
+  stable amd64, bug 235907
+
+  31 Aug 2008; Brent Baude <ranger@gentoo.org> cups-1.3.8-r1.ebuild:
+  stable ppc64, bug 235907
+
+*cups-1.3.8-r1 (22 Aug 2008)
+
+  22 Aug 2008; Timo Gurr <tgurr@gentoo.org>
+  +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@gentoo.org> cups-1.3.8.ebuild:
+  Update SRC_URI, fixing bug #232978.
+
+*cups-1.3.8 (25 Jul 2008)
+
+  25 Jul 2008; Timo Gurr <tgurr@gentoo.org> -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@gentoo.org> -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@gentoo.org> 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@gentoo.org>
+  +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@gentoo.org> cups-1.3.7-r1.ebuild:
+  amd64/x86 stable, bug #221065
+
+  12 May 2008; Brent Baude <ranger@gentoo.org> cups-1.3.7-r1.ebuild:
+  stable ppc, bug 221065
+
+  12 May 2008; Raúl Porcel <armin76@gentoo.org> cups-1.3.7-r1.ebuild:
+  alpha/ia64/sparc stable wrt #221065
+
+  12 May 2008; Jeroen Roovers <jer@gentoo.org> cups-1.3.7-r1.ebuild:
+  Stable for HPPA (bug #221065).
+
+  11 May 2008; Markus Rothe <corsair@gentoo.org> cups-1.3.7-r1.ebuild:
+  Stable on ppc64; bug #221065
+
+  17 Apr 2008; Raúl Porcel <armin76@gentoo.org> cups-1.2.12-r8.ebuild:
+  ia64 stable
+
+  17 Apr 2008; Markus Meier <maekke@gentoo.org> cups-1.2.12-r8.ebuild:
+  amd64/x86 stable, security bug #217232
+
+  16 Apr 2008; Tobias Klausmann <klausman@gentoo.org> cups-1.2.12-r8.ebuild:
+  Stable on alpha, bug #217232
+
+  16 Apr 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  cups-1.2.12-r8.ebuild:
+  ppc stable, bug #217232
+
+  15 Apr 2008; Jeroen Roovers <jer@gentoo.org> cups-1.2.12-r8.ebuild:
+  Stable for HPPA (bug #217232).
+
+  15 Apr 2008; Ferris McCormick <fmccor@gentoo.org> cups-1.2.12-r8.ebuild:
+  Sparc stable, security Bug #217232.
+
+  15 Apr 2008; Markus Rothe <corsair@gentoo.org> 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@gentoo.org>
+  +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@gentoo.org> +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@gentoo.org> 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@gentoo.org> cups-1.2.12-r7.ebuild:
+  ia64 stable
+
+*cups-1.3.6-r3 (01 Apr 2008)
+
+  01 Apr 2008; Peter Volkov <pva@gentoo.org>
+  +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@gentoo.org> cups-1.2.12-r7.ebuild:
+  amd64 stable, bug #214068
+
+*cups-1.2.12-r7 (01 Apr 2008)
+
+  01 Apr 2008; Peter Volkov <pva@gentoo.org>
+  +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@gentoo.org>
+  cups-1.2.12-r6.ebuild:
+  ppc stable, bug #212364
+
+  22 Mar 2008; Tobias Klausmann <klausman@gentoo.org> cups-1.2.12-r6.ebuild:
+  Stable on alpha, bug #212364
+
+  22 Mar 2008; Raúl Porcel <armin76@gentoo.org> 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@gentoo.org>
+  +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@gentoo.org>.
+
+  04 Mar 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  cups-1.2.12-r5.ebuild:
+  ppc stable, bug #211449
+
+  02 Mar 2008; Richard Freeman <rich0@gentoo.org> cups-1.2.12-r5.ebuild:
+  amd64 stable - 211449
+
+  02 Mar 2008; Markus Rothe <corsair@gentoo.org> cups-1.2.12-r5.ebuild:
+  Stable on ppc64; bug #211449
+
+  02 Mar 2008; Raúl Porcel <armin76@gentoo.org> cups-1.2.12-r5.ebuild:
+  alpha/ia64 stable wrt #211449
+
+  29 Feb 2008; Ferris McCormick <fmccor@gentoo.org> cups-1.2.12-r5.ebuild:
+  Sparc stable --- Security Bug #211449 --- verified (remote) with ps and pdf.
+
+  29 Feb 2008; Jeroen Roovers <jer@gentoo.org> cups-1.2.12-r5.ebuild:
+  Stable for HPPA (bug #211449).
+
+  29 Feb 2008; Christian Faulhammer <opfer@gentoo.org>
+  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@gentoo.org>
+  -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@gentoo.org> 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@gentoo.org> 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@gentoo.org>
+  +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@gentoo.org> cups-1.2.12-r3.ebuild:
+  alpha/ia64 stable wrt security #199195
+
+  10 Dec 2007; Ferris McCormick <fmccor@gentoo.org> cups-1.2.12-r3.ebuild:
+  Sparc stable --- security Bug #199195
+
+  08 Dec 2007; <welp@gentoo.org> cups-1.2.12-r3.ebuild:
+  Stable on amd64 wrt bug 199195
+
+  08 Dec 2007; Jeroen Roovers <jer@gentoo.org> cups-1.2.12-r3.ebuild:
+  Stable for HPPA (bug #199195).
+
+  07 Dec 2007; Tobias Scherbaum <dertobi123@gentoo.org>
+  cups-1.2.12-r3.ebuild:
+  ppc stable, bug #199195
+
+  07 Dec 2007; Markus Rothe <corsair@gentoo.org> cups-1.2.12-r3.ebuild:
+  Stable on ppc64; bug #199195
+
+  07 Dec 2007; Christian Faulhammer <opfer@gentoo.org>
+  cups-1.2.12-r3.ebuild:
+  stable x86, security bug 199195
+
+  20 Nov 2007; Joshua Kinard <kumba@gentoo.org> 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@gentoo.org>
+  +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@gentoo.org> -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@gentoo.org> cups-1.2.12-r2.ebuild:
+  alpha/ia64 stable wrt #196736
+
+  09 Nov 2007; Mike Frysinger <vapier@gentoo.org> cups-1.3.4-r1.ebuild:
+  Fix installation of cups init.d script.
+
+  09 Nov 2007; Daniel Gryniewicz <dang@gentoo.org> cups-1.2.12-r2.ebuild:
+  Marked stable on amd64 for bug #196736
+
+  09 Nov 2007; Stefan Schweizer <genstef@gentoo.org> 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@gentoo.org> +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@gentoo.org>
+  cups-1.2.12-r2.ebuild:
+  ppc stable, bug #196736
+
+  06 Nov 2007; Jeroen Roovers <jer@gentoo.org> cups-1.2.12-r2.ebuild:
+  Stable for HPPA (bug #196736).
+
+  06 Nov 2007; Markus Rothe <corsair@gentoo.org> cups-1.2.12-r2.ebuild:
+  Stable on ppc64; bug #196736
+
+  06 Nov 2007; Christian Faulhammer <opfer@gentoo.org>
+  cups-1.2.12-r2.ebuild:
+  stable x86, security bug 196736
+
+  05 Nov 2007; Timo Gurr <tgurr@gentoo.org> 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@gentoo.org> cups-1.2.12-r2.ebuild:
+  Sparc stable --- security Bug #196736 --- still prints things.
+
+  05 Nov 2007; Stefan Schweizer <genstef@gentoo.org>
+  -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@gentoo.org>
+  +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@gentoo.org> cups-1.2.12-r1.ebuild:
+  Stable on ppc64; bug #195278
+
+  27 Oct 2007; nixnut <nixnut@gentoo.org> cups-1.2.12-r1.ebuild:
+  Stable on ppc wrt bug 195278
+
+  25 Oct 2007; Daniel Gryniewicz <dang@gentoo.org> cups-1.2.12-r1.ebuild:
+  Marked stable on amd64 for bug #195278
+
+  24 Oct 2007; Ferris McCormick <fmccor@gentoo.org> cups-1.2.12-r1.ebuild:
+  Sparc stable --- Bug #195278 --- poppler requirement and seems fine.
+
+  24 Oct 2007; Jeroen Roovers <jer@gentoo.org> cups-1.2.12-r1.ebuild:
+  Stable for HPPA (bug #195278). Fixed quoting issues.
+
+  22 Oct 2007; Markus Meier <maekke@gentoo.org> cups-1.2.12-r1.ebuild:
+  x86 stable, bug #195278
+
+*cups-1.3.3 (10 Oct 2007)
+
+  10 Oct 2007; Timo Gurr <tgurr@gentoo.org> +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@gentoo.org>
+  -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@gmx.at>
+  in bug 195278
+
+  07 Aug 2007; Raúl Porcel <armin76@gentoo.org> cups-1.2.10-r1.ebuild:
+  ia64 stable wrt #180906
+
+  21 Jul 2007; Raúl Porcel <armin76@gentoo.org> 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@gentoo.org> cups-1.2.12.ebuild:
+  Keyworded ~sparc-fbsd.
+
+*cups-1.2.12 (13 Jul 2007)
+
+  13 Jul 2007; Stefan Schweizer <genstef@gentoo.org> +cups-1.2.12.ebuild:
+  version bump
+
+  11 Jun 2007; Daniel Gryniewicz <dang@gentoo.org> cups-1.2.10-r1.ebuild:
+  Marked stable on amd64 for bug #180909
+
+  10 Jun 2007; Tobias Scherbaum <dertobi123@gentoo.org>
+  cups-1.2.10-r1.ebuild:
+  ppc stable, bug #180909
+
+  07 Jun 2007; Markus Rothe <corsair@gentoo.org> cups-1.2.10-r1.ebuild:
+  Stable on ppc64; bug #180909
+
+  07 Jun 2007; Christian Faulhammer <opfer@gentoo.org>
+  cups-1.2.10-r1.ebuild:
+  stable x86, bug 180909
+
+  06 Jun 2007; Raúl Porcel <armin76@gentoo.org> cups-1.2.10-r1.ebuild:
+  Restore ~x86 as it needs some dep that isn't stable
+
+  06 Jun 2007; Christian Faulhammer <opfer@gentoo.org>
+  cups-1.2.10-r1.ebuild:
+  stable x86, bug 180909
+
+  06 Jun 2007; Jeroen Roovers <jer@gentoo.org> cups-1.2.10-r1.ebuild:
+  Stable for HPPA (bug #180909).
+
+  05 Jun 2007; Gustavo Zacarias <gustavoz@gentoo.org> cups-1.2.10-r1.ebuild:
+  Stable on sparc wrt #180909
+
+*cups-1.2.11 (09 May 2007)
+
+  09 May 2007; Stefan Schweizer <genstef@gentoo.org> +cups-1.2.11.ebuild:
+  version bump and add lib64 check thanks to Sal Gonzalez
+  <blef@codejunkie.net> in bug 173789
+
+*cups-1.2.10-r1 (01 May 2007)
+
+  01 May 2007; Denis Dupeyron <calchan@gentoo.org> +cups-1.2.10-r1.ebuild:
+  Fixed bug #172341.
+
+  07 Apr 2007; Stefan Schweizer <genstef@gentoo.org> 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@gmail.com in bug 163897
+
+*cups-1.2.10 (07 Apr 2007)
+
+  07 Apr 2007; Stefan Schweizer <genstef@gentoo.org> +cups-1.2.10.ebuild:
+  version bump
+
+  29 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org> cups-1.2.9.ebuild:
+  Stable on alpha wrt bug #170881.
+
+  27 Mar 2007; Jeroen Roovers <jer@gentoo.org> cups-1.2.9.ebuild:
+  Stable for HPPA (bug #170881).
+
+  27 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org> cups-1.2.9.ebuild:
+  Stable on amd64/ia64 wrt bug #170881.
+
+  26 Mar 2007; Gustavo Zacarias <gustavoz@gentoo.org> cups-1.2.9.ebuild:
+  Stable on sparc wrt security #170881
+
+  25 Mar 2007; Andrej Kacian <ticho@gentoo.org> cups-1.2.9.ebuild:
+  Stable on x86, security bug #170881.
+
+  25 Mar 2007; Tobias Scherbaum <dertobi123@gentoo.org> cups-1.2.9.ebuild:
+  Stable on ppc wrt bug #170881.
+
+  25 Mar 2007; Markus Rothe <corsair@gentoo.org> cups-1.2.9.ebuild:
+  Stable on ppc64; bug #170881
+
+*cups-1.2.9 (20 Mar 2007)
 
-  08 Dec 2009; Daniel Solano Gómez <gentoo@sattvik.com> Manifest:
-  Updated manifest for correct source file length.
+  20 Mar 2007; Stefan Schweizer <genstef@gentoo.org> +cups-1.2.9.ebuild:
+  version bump
 
-*cups-1.3.11-r1 (01 Dec 2009)
+*cups-1.2.8 (19 Feb 2007)
 
-  01 Dec 2009; Daniel Solano Gómez <gentoo@sattvik.com>
-  -files/cups-1.3.9-CVE-2008-5286.patch, -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:
+  19 Feb 2007; <genstef@gentoo.org> +cups-1.2.8.ebuild:
+  Version bump, fixes bugs 167467 and 158404
+
+  03 Dec 2006; Tobias Scherbaum <dertobi123@gentoo.org> cups-1.2.6.ebuild:
+  ppc stable, bug #155382
+
+  01 Dec 2006; Gustavo Zacarias <gustavoz@gentoo.org> cups-1.2.6.ebuild:
+  Stable on hppa wrt #155382
+
+  30 Nov 2006; Markus Rothe <corsair@gentoo.org> cups-1.2.6.ebuild:
+  Stable on ppc64; bug #155382
+
+  27 Nov 2006; Patrick McLean <chutzpah@gentoo.org> cups-1.2.6.ebuild:
+  Stable on amd64 (bug #155382)
+
+  22 Nov 2006; Gustavo Zacarias <gustavoz@gentoo.org> cups-1.2.6.ebuild:
+  Stable on sparc
+
+  21 Nov 2006; Christian Faulhammer <opfer@gentoo.org> cups-1.2.6.ebuild:
+  stable x86, bug #155382
+
+*cups-1.2.7 (17 Nov 2006)
+
+  17 Nov 2006; Stefan Schweizer <genstef@gentoo.org> +cups-1.2.7.ebuild:
+  version bump
+
+  08 Nov 2006; Stefan Schweizer <genstef@gentoo.org> -cups-1.2.5.ebuild:
+  fix digest
+
+  08 Nov 2006; Seemant Kulleen <seemant@gentoo.org> +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@gentoo.org> 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@gentoo.org> 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@gentoo.org>
+  -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@gentoo.org> cups-1.2.4.ebuild,
+  cups-1.2.5.ebuild:
+  Fixing dbus depend
+
+  21 Oct 2006; Stefan Schweizer <genstef@gentoo.org> files/cups-1.2.5.patch:
+  fix patch, thanks to Kalidarn <dcecchin@gmail.com> in bug 152182
+
+*cups-1.2.5 (21 Oct 2006)
+
+  21 Oct 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/cups-1.2.5.patch, +cups-1.2.5.ebuild:
+  version bump
+
+  14 Oct 2006; Stefan Schweizer <genstef@gentoo.org> -cups-1.2.2.ebuild,
+  cups-1.2.4.ebuild:
+  remove old
+
+  02 Oct 2006; Stefan Schweizer <genstef@gentoo.org> cups-1.2.4.ebuild:
+  I wonder why those blanks matter
+
+*cups-1.2.4 (24 Sep 2006)
+
+  24 Sep 2006; Stefan Schweizer <genstef@gentoo.org>
+  -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@gentoo.org>
+  -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@gentoo.org> cups-1.2.3.ebuild:
+  Set PDEPEND correctly thanks to Sascha Lucas
+  <sascha.lucas@rus.uni-stuttgart.de> in bug 146517
+
+  05 Sep 2006; Joshua Kinard <kumba@gentoo.org> cups-1.2.3.ebuild:
+  Added ~mips to KEYWORDS.
+
+  05 Sep 2006; Joshua Kinard <kumba@gentoo.org> cups-1.1.23-r8.ebuild:
+  Marked stable on mips.
+
+*cups-1.2.3 (04 Sep 2006)
+
+  04 Sep 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/cupsDirRead-dont-end-on-failed-stat.patch, +cups-1.2.3.ebuild:
+  Add php useflag, bug 144464 thanks to Christian Korff
+  <christian.korff@gmail.com>, version bump thanks to Francisco Javier
+  <ffelix@sshinf.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@gentoo.org> cups-1.2.2.ebuild:
+  resolve circular dep by moving the ppds dep to PDEPEND, thanks to Mart
+  Raudsepp <leio@gentoo.org> in bug 145920
+
+  21 Aug 2006; Stefan Schweizer <genstef@gentoo.org> cups-1.2.2.ebuild:
+  Change to || dbus depend in order to solve bug 144527
+
+  19 Aug 2006; Stefan Schweizer <genstef@gentoo.org> cups-1.2.2.ebuild:
+  make gnutls mandatory because it does not work with openssl, thanks to
+  Jari-Matti Mäkelä <jmjmak@utu.fi> and Bret Towe <magnade@gmail.com> in bug
+  138275
+
+  18 Aug 2006; Stefan Schweizer <genstef@gentoo.org> cups-1.1.23-r8.ebuild,
+  cups-1.2.2.ebuild:
+  Fix ghostscript detection with gs-sp thanks to Sebastian Bergmann
+  <sebastian@gentoo.org> in bug 144354
+
+  18 Aug 2006; Stefan Schweizer <genstef@gentoo.org> cups-1.2.2.ebuild:
+  Depend with X useflag on xdg-utils to select the browser thanks to Wiktor
+  Wandachowicz <siryes@gmail.com> in bug 137934
+
+  17 Aug 2006; Stefan Schweizer <genstef@gentoo.org> cups-1.1.23-r8.ebuild,
+  cups-1.2.2.ebuild:
+  remove old, more on-demand the postinst information thanks to ph
+  <phajdan.jr@gmail.com> in bug 142057
+
+*cups-1.2.2 (23 Jul 2006)
+
+  23 Jul 2006; Stefan Schweizer <genstef@gentoo.org> +cups-1.2.2.ebuild:
+  version bump thanks to Timo Boettcher <spida@spida.net> in bgu 141500
+
+  03 Jul 2006; Gustavo Zacarias <gustavoz@gentoo.org> 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@gentoo.org> +cups-1.1.23-r8.ebuild:
+  Revision bump to push out libpng change, thanks to Ian Stakenvicius
+  <ian@syndicated-productions.com> in bug 136346, ~sparc because sparc does
+  not yet have libpng-1.2.10 stable
+
+  03 Jul 2006; Stefan Schweizer <genstef@gentoo.org>
+  +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@gentoo.org> 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@gentoo.org> cups-1.2.1-r2.ebuild:
+  use pamd_mimic_system again thanks to robbat2 in bug 138315
+
+  27 Jun 2006; Guy Martin <gmsoft@gentoo.org> cups-1.2.1-r2.ebuild:
+  Added ~hppa to KEYWORDS.
+
+  22 Jun 2006; Stefan Schweizer <genstef@gentoo.org> 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@gentoo.org> -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@gentoo.org>
+  +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@iluminat23.org>
+  and Joe Kappus <joecool1029@gmail.com> in bug 137444, ebuild cleanups
+
+  20 Jun 2006; Markus Rothe <corsair@gentoo.org> cups-1.2.1-r1.ebuild:
+  Added ~ppc64; bug #136902
+
+  19 Jun 2006; Stefan Schweizer <genstef@gentoo.org> cups-1.2.1-r1.ebuild:
+  Add comment about rebuilding kdelibs thanks to Aaron
+  <aaron123456789@gmail.com> in bug 137274
+
+  18 Jun 2006; Stefan Schweizer <genstef@gentoo.org> cups-1.2.1-r1.ebuild:
+  Disable xinetd by default thanks to robbat2 in bug 137130
+
+  16 Jun 2006; Jason Wever <weeve@gentoo.org> cups-1.2.1-r1.ebuild:
+  Added ~sparc keyword wrt bug #136902.
+
+  15 Jun 2006; Stefan Schweizer <genstef@gentoo.org> cups-1.2.1-r1.ebuild:
+  Remove all arches that have libpaper not keyworded
+
+  15 Jun 2006; Stefan Schweizer <genstef@gentoo.org> cups-1.2.1-r1.ebuild:
+  Mention FEATURES=-collision-protect in the pkg-postinst einfo notes, thanks
+  to Michael Cramer <bigmichi1@bigmichi1.dyndns.org> in bug 136859
+
+  15 Jun 2006; Stefan Schweizer <genstef@gentoo.org> 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@mnet-online.de>, Rob Couto <rob@cafe4111.org> and moesasji
+  <henkjans_bagger@hotmail.com> in bug 136346
+
+  14 Jun 2006; Rajiv Aaron Manglani <rajiv@gentoo.org> cups-1.2.1-r1.ebuild:
+  install web interface files in data dir so FEATURES=nodoc works.
+
+  14 Jun 2006; Stefan Schweizer <genstef@gentoo.org> cups-1.2.1-r1.ebuild:
+  Add more useflags thanks to Gilles Dartiguelongue <dartigug@esiee.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@gentoo.org>
+  +cups-1.2.1-r1.ebuild:
+  put cups source files back where they belong.
+
+  05 Jun 2006; Stefan Schweizer <genstef@gentoo.org> -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@marving.dk>
+  in bug 134519, add a workaround for my own usb printer problem that is not
+  applied upstream
+
+  27 May 2006; Stefan Schweizer <genstef@gentoo.org> 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@gentoo.org> +cups-1.2.1.ebuild:
+  version bump
+
+*cups-1.2.0 (08 May 2006)
+
+  08 May 2006; Stefan Schweizer <genstef@gentoo.org>
+  +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@gentoo.org> cups-1.2.0_pre.ebuild:
+  Add libpaper depend and remove config file sed
+
+  08 May 2006; Diego Pettenò <flameeyes@gentoo.org> 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@gentoo.org> 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@gentoo.org> 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@gentoo.org> 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@gentoo.org> files/pdftops.pl,
+  +cups-1.2.0_pre.ebuild:
+  Preview version of cups-1.2, masked for now
+
+  02 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> cups-1.1.23-r7.ebuild:
+  Fix nls dependencies and add ~x86-fbsd keyword.
+
+  18 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +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@gentoo.org> cups-1.1.23-r7.ebuild:
+  Mark 1.1.23-r7 stable on alpha
+
+  03 Feb 2006; Stefan Schweizer <genstef@gentoo.org> 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@gentoo.org> cups-1.1.23-r7.ebuild:
+  Add post-einfo note suggesting to emerge ghsotscript with USE=cups thanks to
+  Corvus Corax <corvus-gentoo@cybertrench.com> in bug 96985
+
+  13 Jan 2006; Diego Pettenò <flameeyes@gentoo.org> cups-1.1.23-r7.ebuild:
+  The name of the function is bindnow-flags, not bindnow_flags.
+
+  13 Jan 2006; Mark Loeser <halcy0n@gentoo.org> cups-1.1.23-r7.ebuild:
+  Stable on x86; bug #117495
+
+  12 Jan 2006; Simon Stelling <blubb@gentoo.org> cups-1.1.23-r7.ebuild:
+  stable on amd64 wrt bug 117495
+
+  11 Jan 2006; Markus Rothe <corsair@gentoo.org> cups-1.1.23-r7.ebuild:
+  Stable on ppc64; bug #117495
+
+  11 Jan 2006; Tobias Scherbaum <dertobi123@gentoo.org>
+  cups-1.1.23-r7.ebuild:
+  ppc stable, bug #117495, #117481
+
+  11 Jan 2006; Gustavo Zacarias <gustavoz@gentoo.org> cups-1.1.23-r7.ebuild:
+  Stable on sparc wrt #117481 #117495
+
+  10 Jan 2006; Stefan Schweizer <genstef@gentoo.org> -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@gentoo.org> cups-1.1.23-r7.ebuild:
+  Marked hppa stable (bug #117495).
+
+*cups-1.1.23-r7 (27 Dec 2005)
+
+  27 Dec 2005; <dang@gentoo.org> +cups-1.1.23-r7.ebuild:
+  Make cups dep on poppler. Bug #115863
+
+  25 Dec 2005; Stefan Schweizer <genstef@gentoo.org> files/cupsaddsmb.patch:
+  Remove cvs Ids from patch, #116728
+
+*cups-1.1.23-r6 (25 Dec 2005)
+
+  25 Dec 2005; Stefan Schweizer <genstef@gentoo.org>
+  +files/cupsaddsmb.patch, +cups-1.1.23-r6.ebuild:
+  Make Windows V6 drivers work thanks to Chris Smith
+  <chris@realcomputerguy.com> in bug 111272
+
+  15 Dec 2005; Mark Loeser <halcy0n@gentoo.org> cups-1.1.23-r4.ebuild:
+  Stable on x86; bug #115286
+
+*cups-1.1.23-r5 (14 Dec 2005)
+
+  14 Dec 2005; <dang@gentoo.org> +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@gentoo.org> cups-1.1.23-r4.ebuild:
+  stable on alpha wrt bug #115286
+
+  13 Dec 2005; Michael Hanselmann <hansmi@gentoo.org> cups-1.1.23-r4.ebuild:
+  Stable on hppa, ppc.
+
+  13 Dec 2005; Markus Rothe <corsair@gentoo.org> cups-1.1.23-r4.ebuild:
+  Stable on ppc64; bug #115286
+
+  13 Dec 2005; Gustavo Zacarias <gustavoz@gentoo.org> cups-1.1.23-r4.ebuild:
+  Stable on sparc wrt security #115286
+
+  13 Dec 2005; <dang@gentoo.org> cups-1.1.23-r4.ebuild:
+  Marked stable on amd64
+
+  03 Oct 2005; MATSUU Takuto <matsuu@gentoo.org> cups-1.1.23-r1.ebuild:
+  Stable on sh.
+
+  29 Jul 2005; Jonathan Smith <smithj@gentoo.org> 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@gentoo.org> 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@gentoo.org> cups-1.1.23-r3.ebuild,
+  cups-1.1.23-r4.ebuild:
+  bug #95852
+
+  07 Jun 2005; Heinrich Wendel <lanius@gentoo.org> +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@gentoo.org>
+  +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@gentoo.org> cups-1.1.23-r3.ebuild:
+  bug #48309
+
+*cups-1.1.23-r3 (21 May 2005)
+
+  21 May 2005; Heinrich Wendel <lanius@gentoo.org> +cups-1.1.23-r3.ebuild:
+  add support for new pam eclass, use external xpdf
+
+  14 May 2005; Heinrich Wendel <lanius@gentoo.org> files/cupsd.rc6:
+  remove use vmware, bug #89956
+
+*cups-1.1.23-r2 (10 May 2005)
+
+  10 May 2005; Heinrich Wendel <lanius@gentoo.org> +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@gentoo.org>
+  +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@gentoo.org> files/cupsd.rc6:
+  revert 'use samba' again, it was the wrong way around
+
+  23 Apr 2005; Heinrich Wendel <lanius@gentoo.org> files/cupsd.rc6:
+  add use samba again, bug #89956
+
+  08 Mar 2005; Heinrich Wendel <lanius@gentoo.org> -cups-1.1.23.ebuild,
+  -cups-1.1.23_rc1.ebuild:
+  cleanups
+
+  06 Feb 2005; Joshua Kinard <kumba@gentoo.org> cups-1.1.23-r1.ebuild:
+  Marked stable on mips.
+
+  21 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> cups-1.1.23-r1.ebuild:
+  stable on amd64. bug #78249.
+
+  21 Jan 2005; Lars Weiler <pylon@gentoo.org> cups-1.1.23-r1.ebuild:
+  Stable on ppc; bug #78249.
+
+  20 Jan 2005; Markus Rothe <corsair@gentoo.org> cups-1.1.23-r1.ebuild:
+  Stable on ppc64; bug #78249
+
+  20 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> cups-1.1.23-r1.ebuild:
+  Stable on alpha, bug 78249.
+
+  20 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> :
+  Actually with respect to #78249, bummer.
+
+  20 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> 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@gentoo.org> +files/xpdf-pl3.patch,
+  +cups-1.1.23-r1.ebuild:
+  security bump; bug #78249
+
+  19 Jan 2005; Joshua Kinard <kumba@gentoo.org> cups-1.1.23.ebuild:
+  Marked stable on mips.
+
+  11 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> cups-1.1.23.ebuild:
+  Stable on alpha, bug 77023.
+
+  11 Jan 2005; Guy Martin <gmsoft@gentoo.org> cups-1.1.23.ebuild:
+  Stable on hppa.
+
+  10 Jan 2005; Markus Rothe <corsair@gentoo.org> cups-1.1.23.ebuild:
+  Stable on ppc64
+
+  10 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org> cups-1.1.23.ebuild:
+  Stable amd64, sparc.
+
+  10 Jan 2005; Lars Weiler <pylon@gentoo.org> cups-1.1.23.ebuild:
+  Stable on ppc; bug #77023.
+
+*cups-1.1.23 (07 Jan 2005)
+
+  07 Jan 2005; Heinrich Wendel <lanius@gentoo.org> +cups-1.1.23.ebuild:
+  security bump, bug #77023; use pdftops wrapper instead of builtin pdftops
+
+  03 Jan 2005; Heinrich Wendel <lanius@gentoo.org>
+  -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@gentoo.org> cups-1.1.23_rc1.ebuild:
+  Stable on mips, bug #74479
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  27 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> cups-1.1.23_rc1.ebuild:
+  Stable on alpha, bug 74479.
+
+  27 Dec 2004; <SeJo@gentoo.org> cups-1.1.23_rc1.ebuild:
+  stable on ppc: 74479
+
+  27 Dec 2004; Markus Rothe <corsair@gentoo.org> cups-1.1.23_rc1.ebuild:
+  Stable on ppc64; bug #74479
+
+  26 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  cups-1.1.23_rc1.ebuild:
+  Stable sparc and amd64.
+
+*cups-1.1.23_rc1 (26 Dec 2004)
+
+  26 Dec 2004; Heinrich Wendel <lanius@gentoo.org> +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@gentoo.org> -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@gentoo.org> cups-1.1.20-r5.ebuild:
+  Marked stable on mips.
+
+  04 Nov 2004; Travis Tilley <lv@gentoo.org> cups-1.1.20-r5.ebuild:
+  stable on amd64
+
+  03 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> cups-1.1.20-r5.ebuild:
+  Stable on alpha, bug 69662.
+
+  03 Nov 2004; Markus Rothe <corsair@gentoo.org> cups-1.1.20-r5.ebuild:
+  Stable on ppc64, bug #69662
+
+  03 Nov 2004; <SeJo@gentoo.org> cups-1.1.20-r5.ebuild:
+  stable on ppc gsla: 69662
+
+  03 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> cups-1.1.20-r5.ebuild:
+  Stable on sparc wrt #69662
+
+*cups-1.1.22 (01 Nov 2004)
+
+  01 Nov 2004; <heino@gentoo.org> +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@gentoo.org> +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@gentoo.org> cups-1.1.20-r3.ebuild:
+  Stable on mips, bug #66501.
+
+  09 Oct 2004; Tom Gall <tgall@gentoo.org> cups-1.1.20-r3.ebuild:
+  stable on ppc64, bug #64168
+
+  07 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  cups-1.1.20-r3.ebuild:
+  Stable amd64.
+
+  08 Oct 2004; Guy Martin <gmsoft@gentoo.org> cups-1.1.20-r3.ebuild:
+  Marked stable on hppa.
+
+  07 Oct 2004; Lars Weiler <pylon@gentoo.org> cups-1.1.20-r3.ebuild:
+  Stable on ppc as requested in bug #66501.
+
+  07 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> cups-1.1.20-r3.ebuild:
+  Stable on alpha, bug 66501.
+
+  06 Oct 2004; Gustavo Zacarias <gustavoz@gentoo.org> 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@gentoo.org> +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@gentoo.org> cups-1.1.20-r2.ebuild:
+  Marked stable on mips.
+
+  19 Sep 2004; Danny van Dyk <kugelfang@gentoo.org> cups-1.1.20-r2.ebuild:
+  Marked stable on amd64.
+
+  18 Sep 2004; Thomas Matthijs <axxo@gentoo.org> cups-1.1.21.ebuild:
+  Added some more mirrors since i was unable to fetch it
+
+  17 Sep 2004; Bryan Østergaard,,, <kloeri@gentoo.org> cups-1.1.20-r2.ebuild:
+  Stable on alpha, bug 64168.
+
+  17 Sep 2004; <SeJo@gentoo.org> cups-1.1.20-r2.ebuild:
+  stable ppc bug:64168
+
+  16 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> cups-1.1.20-r2.ebuild:
+  Stable on sparc wrt #64168
+
+  22 Sep 2004; Heinrich Wendel <lanius@gentoo.org> cups-1.1.21.ebuild:
+  move samba depend to rdepend, bug #62560
+
+  02 Sep 2004; Danny van Dyk <kugelfang@gentoo.org> 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@gentoo.org>
+  +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@gentoo.org>
+  -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@gentoo.org> 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@gentoo.org> 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@gentoo.org>
+  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@gentoo.org> cups-1.1.20-r1.ebuild:
+  stable on ppc64, bug #54123
+
+  12 May 2004; Michael McCabe <randy@gentoo.org> cups-1.1.20-r1.ebuild:
+  Added s390 keywords
+
+  09 Apr 2004; Heinrich Wendel <lanius@gentoo.org> cups-1.1.19-r1.ebuild:
+  remove S=${WORKDIR}/${P}
+
+*cups-1.1.20-r1 (08 Apr 2004)
+
+  08 Apr 2004; Heinrich Wendel <lanius@gentoo.org>
+  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@gentoo.org> cups-1.1.20.ebuild:
+  remove ppc64, we're not ready
+
+  23 Mar 2004; Joshua Kinard <kumba@gentoo.org> cups-1.1.20.ebuild:
+  Marked stable on mips.
+
+  27 Feb 2004; Joshua Kinard <kumba@gentoo.org> cups-1.1.20.ebuild:
+  Added ~mips to KEYWORDS to satisfy repoman deps.
+
+  22 Feb 2004; Aron Griffis <agriffis@gentoo.org> cups-1.1.20.ebuild:
+  stable on alpha and ia64
+
+  28 Jan 2004; <gustavoz@gentoo.org> cups-1.1.20.ebuild:
+  stable on hppa
+
+  26 Jan 2004; <gustavoz@gentoo.org> cups-1.1.20.ebuild:
+  stable on sparc
+
+  30 Jan 2004; Heinrich Wendel <lanius@gentoo.org> cups-1.1.19-r1.ebuild,
+  cups-1.1.20.ebuild:
+  fixed depend
+
+  15 Jan 2004; Heinrich Wendel <lanius@gentoo.org> cups-1.1.20.ebuild:
+  mark x86
+
+  28 Dec 2003; Heinrich Wendel <lanius@gentoo.org> cups-1.1.19-r1.ebuild,
+  cups-1.1.20.ebuild:
+  fix newdepend, not allowed in ebuilds
+
+  09 Dec 2003; Heinrich Wendel <lanius@gentoo.org> cups-1.1.19-r1.ebuild:
+  changed app-text/ghostscript to virtual/ghostscript
+
+  02 Dec 2003; Heinrich Wendel <lanius@gentoo.org> cups-1.1.20.ebuild:
+  replace Os by O2 on amd64, bug #38450
+
+  29 Nov 2003; Brad House <brad_mssw@gentoo.org> cups-1.1.20.ebuild:
+  mark stable on amd64
+
+*cups-1.1.20 (25 Nov 2003)
+
+  25 Nov 2003; Heinrich Wendel <lanius@gentoo.org>  cups-1.1.20.ebuild:
+  version bump, removed libjpeg patch
+
+  05 Nov 2003; Heinrich Wendel <lanius@gentoo.org> files/cupsd.rc6:
+  bug #32768 (hotplug dep)
+
+  24 Sep 2003; Daniel Robbins <drobbins@gentoo.org> 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@gentoo.org> cups-1.1.19-r1.ebuild:
+  added 'usb' to IUSE.
+
+  29 Jul 2003; Heinrich Wendel <lanius@gentoo.org>
+  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@gentoo.org> files/cupsd.rc6:
+  added use logger to init.d script (bug #25214)
+
+  22 Jul 2003; Heinrich Wendel <lanius@gentoo.org> cups-1.1.19-r1.ebuild:
+  added depend on foomatic-3 if foomatic-2 is installed
+
+  20 Jul 2003; Heinrich Wendel <lanius@gentoo.org> files/cupsd.rc6:
+  added use vmware to initscript, see bug #23971
+
+  18 Jul 2003; Heinrich Wendel <lanius@gentoo.org> files/cupsd.rc6:
+  fixed bug #24682
+
+*cups-1.1.19-r1 (16 Jul 2003)
+
+  16 Jul 2003; Heinrich Wendel <lanius@gentoo.org> 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@gentoo.org> cups-1.1.19.ebuild :
   Version bump.
 
+  17 Jun 2003; Donny Davies <woodchip@gentoo.org> cups-1.1.18-r5.ebuild:
+  Dont install lppasswd setuid.
+
+*cups-1.1.18-r5 (30 May 2003)
+
+  30 May 2003; Daniel Ahlberg <aliz@gentoo.org> cups-1.1.18.ebuild :
+  Security update.
+
+*cups-1.1.18-r4 (28 Jan 2003)
+  
+  07 Apr 2003; Guy Martin <gmsoft@gentoo.org> cups-1.1.18-r4.ebuild :
+  Added hppa to KEYWORDS.
+
+  25 Feb 2003; Thomas Raschbacher <lordvan@gentoo.org> cups-1.1.18-r4.ebuild:
+  Mark stable on x86
+	
+  21 Feb 2003; Aron Griffis <agriffis@gentoo.org> cups-1.1.18-r4.ebuild :
+  Mark stable on Alpha
+
+  28 Jan 2003; Thomas Raschbacher <lordvan@gentoo.org> 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@gentoo.org> 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@gentoo.org> 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@gentoo.org> 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@gentoo.org> cups-1.1.18.ebuild:
+  changed pkg_postinst
+  ~arch masked on all archs
+  30 Dec 2002; Thomas Raschbacher <lordvan@gentoo.org> cups-1.1.18.ebuild:
+  unmasked for x86
+	
+*cups-1.1.18 (20 Dec 2002)
+
+  20 Dec 2002; Daniel Ahlberg <aliz@gentoo.org> :
+  Security update. Masked for now.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*cups-1.1.17_pre20021025 (25 Oct 2002)
+
+  25 Oct 2002; Grant Goodyear <g2boojum@gentoo.org> ChangeLog  :
+  cvs version to fix latest problems.
+
+  25 Oct 2002; Donny Davies <woodchip@gentoo.org> cups-1.1.16.ebuild : fix #9188.
+
+*cups-1.1.16 (10 Oct 2002)
+
+  19 Oct 2002; Donny Davies <woodchip@gentoo.org> cupsd.rc6 : fix #9201.
+
+  12 Oct 2002; Donny Davies <woodchip@gentoo.org> cupsomatic :
+  Update to latest http://www.linuxprinting.org/cupsomatic; close #7350.
+
+  10 Oct 2002; Nick Hadaway <raker@gentoo.org> 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@gentoo.org> 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@gentoo.org> :
+  Added ppc to keywords
+
+  19 Jul 2002; Grant Goodyear <g2boojum@gentoo.org> ChangeLog  :
+  added ghostscript as an rdepend
+
+*cups-1.1.15 (17 Jun 2002)
+
+  14 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> cups-1.1.15.ebuild :
+  Added KEYWORDS.
+
+  17 Jun 2002; mjc <mjc@gentoo.org> :
+  New CUPS.
+
+*cups-1.1.14-r4 (4 May 2002)
+
+  14 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> cups-1.1.14-r4.ebuild :
+  Added KEYWORDS.
+
+  4 May 2002; Donny Davies <woodchip@gentoo.org> :
+  Added LICENSE, SLOT, $Headers, pam_stack aware pam.d/ file.
+
+*cups-1.1.14-r3 (1 May 2002)
+
+  1 May 2002; Jon Nelson <jnelson@gentoo.org> :
+  Added patch to allow for unstripped builds.
+
+*cups-1.1.14-r3 (30 Apr 2002)
+
+  30 Apr 2002; Seemant Kulleen <seemant@gentoo.org> :
+  Unzip html doc.
+
+*cups-1.1.14-r3 (12 Apr 2002)
+
+  12 Apr 2002; Spider <spider@gentoo.org>:
+  New revision with updated libpng dependency forces a rebuild.
+
+*cups-1.1.14-r2 (29 Mar 2002)
+
+  29 Mar 2002; Donny Davies <woodchip@gentoo.org> :
+  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@gentoo.org>:
+  Added support for the foomagic printer filters.
+
+*cups-1.1.14 (16 Feb 2002)
+
+  16 Feb 2002; Donny Davies <woodchip@gentoo.org>: 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@gentoo.org>: 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@gentoo.org>: 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@gentoo.org>:
+  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@gentoo.org> /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@gentoo.org> 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
index 51fbf84..0ca8b6f 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -16,8 +16,11 @@ AUX cupsd.init.d 402 RMD160 1b132354d01ad2ecebbe5238b09dfa3cb9391d43 SHA1 ea4817
 AUX pdftops-1.20.gentoo 10412 RMD160 16e229662c47e03af1d1f4cb5764a76d17a66642 SHA1 6afb8a655b6ff013a2c8c8cbfb615ba1e561503b SHA256 ac5fa01ca776d75bd7cef62eef9f6b0c3945ee87e8950b40ca9f9f3ff46a16c1
 DIST cups-1.4.8-source.tar.bz2 4547162 RMD160 ee80e8d0b56dc0e2edf2a9aa9a43c4b92619f741 SHA1 9167f556e78e0bc075f1eb2f695d79cc1f334007 SHA256 6bd27e1213c139ed0bbadc5c29f97cf1e8f7f8f5b0bb29b227ecaff32aafa9a6
 DIST cups-1.5.0-source.tar.bz2 4090210 RMD160 e7be9b6b44428561609c59abaea8fa31a11aefff SHA1 628f549867751e373fc20c7558fec422f9eb942b SHA256 c6f99b68a558f4d626e9a5076d664f38e9925715dc541b07f0328c9aeb02ec33
+DIST cups-1.5.2-ipp-r8950.patch.bz2 19525 RMD160 346a3141ae445dc9f17c7fbc0a467aea4910f10b SHA1 4bc3b40771261c37b63cbe4f65213b5db6c66534 SHA256 1a2d36136fc66b5f53e7cfb3e5d815e62cc3a6b4cc61d678f29d8a0bb748572a
+DIST cups-1.5.2-source.tar.bz2 9595665 RMD160 98181e2ee8c6e574fb6d405f688f52c9b61a2355 SHA1 56fdb4f58e676607845321c0296c1e90e416883f SHA256 b150aa108c631f4f07e92cb13c01263a67170e5ac8383c5548ef8f8473a187fb
 EBUILD cups-1.4.8-r1.ebuild 7312 RMD160 c05be205bbc05df5034bf57880adfaa8c58be907 SHA1 ce80b4276953ed364583762b659b2e52c29645ee SHA256 d9ad745fe8312f307b5b13979a6ae000ac6e10216d8779466af99b14a60a30a9
 EBUILD cups-1.4.8-r23.ebuild 8922 RMD160 1ef9e2c1f6f52a7adb8b30b2d4c43b74e74fcf59 SHA1 a24491edffbc09ab0a2e010593677d22dcc138b7 SHA256 d7c2bdd62e77815a7bfe2aef62107fc03d3bae7fa81cbf6bd1b89268c4db0300
-EBUILD cups-1.5.0-r4.ebuild 7838 RMD160 6a79405c885dca4211d607b309b5995a11272345 SHA1 2074e17bc1c8cfad89a62cf784842ac45751b33a SHA256 fd4703c2d5b85a6f3a29a05784a0180434e063d9b0f8091c3f4e65cac8cfe95a
-MISC ChangeLog 4678 RMD160 bbe7586cc8c02c79552c1e7f16816a4abb08c15c SHA1 7736397b4c3d0603f03a96895d0baf87689b15b6 SHA256 2ba64cf7aa50fe6c3f5e40bcdea2f7b1d278ff3c2eaa4d4743bd6309ab087ab7
+EBUILD cups-1.5.0-r4.ebuild 7848 RMD160 bca20bcf29f7ae5a866c52285f648dc499fd359f SHA1 1d55cd51dd882fa38372245a6be17fbbfe4f88a6 SHA256 ed8e3017c6edfdb8d12a1fa6da58c93281efab12f83d3f6adee9b76aafb796b8
+EBUILD cups-1.5.2-r1.ebuild 7682 RMD160 0984d6f813f201f167aa4f206c90cf0f6f65ddc7 SHA1 e25dc918c960b793a1707e02c016b992e44f0158 SHA256 a6fc11b2cc88b059a9be2742e62425805c61aa7c7739dee1ba9a266974346e22
+MISC ChangeLog 69042 RMD160 f43ca45433cf7a134316ca4d4212cbae0bb2b992 SHA1 1c67d49452b23a38d0b2916392d9d1e6f0bf1519 SHA256 6411766dfbfd5be4eed426b51569e454dbfca067e6cfba6d4ce3b43543684d08
 MISC metadata.xml 691 RMD160 2a77a55b3ba142202c16f7c9e5710107cdd7565f SHA1 0fedf6ebd837708cd218a4a03741a20091714950 SHA256 3d89754273130856a7433fb325a132b07b86f7c0391284ab2c7dc8a2fa46fec7
diff --git a/net-print/cups/cups-1.5.0-r4.ebuild b/net-print/cups/cups-1.5.0-r4.ebuild
index 926b575..5af7e4a 100644
--- a/net-print/cups/cups-1.5.0-r4.ebuild
+++ b/net-print/cups/cups-1.5.0-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.0-r4.ebuild,v 1.1 2012/01/28 20:43:10 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.0-r4.ebuild,v 1.4 2012/02/08 14:51:03 jer Exp $
 
 EAPI=4
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
 IUSE="acl dbus debug +filters gnutls java +jpeg kerberos ldap pam perl php +png python 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"
diff --git a/net-print/cups/cups-1.5.2-r1.ebuild b/net-print/cups/cups-1.5.2-r1.ebuild
new file mode 100644
index 0000000..a8eb21b
--- /dev/null
+++ b/net-print/cups/cups-1.5.2-r1.ebuild
@@ -0,0 +1,285 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r1.ebuild,v 1.3 2012/02/08 14:51:03 jer Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="python? 2:2.5"
+
+inherit autotools eutils fdo-mime gnome2-utils 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
+	http://dev.gentoo.org/~dilfridge/distfiles/${P}-ipp-r8950.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
+IUSE="acl dbus debug +filters gnutls java +jpeg kerberos ldap pam perl +png python 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 )
+	png? ( >=media-libs/libpng-1.4.3:0 )
+	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:0 )
+	usb? ( virtual/libusb:0 )
+	X? ( x11-misc/xdg-utils )
+	xinetd? ( sys-apps/xinetd )
+"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+"
+
+PDEPEND="
+	app-text/ghostscript-gpl[cups]
+	>=app-text/poppler-0.12.3-r3[utils]
+	filters? ( net-print/foomatic-filters )
+"
+
+# 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 kernel_linux; then
+		linux-info_pkg_setup
+		if  ! linux_config_exists; then
+			ewarn "Can't check the linux kernel configuration."
+			ewarn "You might have some incompatible options enabled."
+		else
+			# recheck that we don't have usblp to collide with libusb
+			if use usb; then
+				if linux_chkconfig_present USB_PRINTER; then
+					eerror "Your usb printers will be managed via libusb. In this case, "
+					eerror "${P} requires the USB_PRINTER support disabled."
+					eerror "Please disable it:"
+					eerror "    CONFIG_USB_PRINTER=n"
+					eerror "in /usr/src/linux/.config or"
+					eerror "    Device Drivers --->"
+					eerror "        USB support  --->"
+					eerror "            [ ] USB Printer support"
+					eerror "Alternatively, just disable the usb useflag for cups (your printer will still work)."
+				fi
+			else
+				#here we should warn user that he should enable it so he can print
+				if ! linux_chkconfig_present USB_PRINTER; then
+					ewarn "If you plan to use USB printers you should enable the USB_PRINTER"
+					ewarn "support in your kernel."
+					ewarn "Please enable it:"
+					ewarn "    CONFIG_USB_PRINTER=y"
+					ewarn "in /usr/src/linux/.config or"
+					ewarn "    Device Drivers --->"
+					ewarn "        USB support  --->"
+					ewarn "            [*] USB Printer support"
+					ewarn "Alternatively, enable the usb useflag for cups and use the libusb code."
+				fi
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	# 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"
+
+	# systemd support
+	epatch "${FILESDIR}/${PN}-1.5.0-systemd-socket.patch"
+
+	# revert ipp backend to 1.4 state, as ubuntu and debian
+	epatch "${DISTDIR}/${P}-ipp-r8950.patch.bz2"
+
+	# Dan's group fix
+	epatch "${FILESDIR}/${PN}-1.5.0-group_fix.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
+
+	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 threads) \
+		$(use_enable tiff) \
+		$(use_enable usb libusb) \
+		$(use_with java) \
+		$(use_with perl) \
+		--without-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
+
+	if use perl ; then
+		cd "${S}"/scripting/perl
+		perl-module_src_prep
+		perl-module_src_compile
+	fi
+}
+
+src_install() {
+	emake BUILDROOT="${D}" install
+	dodoc {CHANGES,CREDITS,README}.txt
+
+	if use perl ; then
+		cd "${S}"/scripting/perl
+		perl-module_src_install
+		fixlocalpod
+	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
+
+	# 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/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_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	# Update desktop file database and gtk icon cache (bug 370059)
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+
+	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
+}
+
+pkg_postrm() {
+	# Update desktop file database and gtk icon cache (bug 370059)
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}