net-print/cups: drop as multilibutized upstream

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

12 files changed, 0 insertions, 3859 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
deleted file mode 100644
index 8d1f0b6..0000000
--- a/net-print/cups/ChangeLog
+++ /dev/null
@@ -1,2528 +0,0 @@
-# ChangeLog for net-print/cups
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.612 2014/05/14 17:46:09 dilfridge Exp $
-
-  14 May 2014; Andreas K. Huettel <dilfridge@gentoo.org> -cups-1.7.1.ebuild:
-  Remove old
-
-  14 May 2014; Agostino Sarubbo <ago@gentoo.org> cups-1.7.1-r1.ebuild:
-  Stable for sparc, wrt bug #507696
-
-*cups-1.7.2-r1 (14 May 2014)
-*cups-1.7.1-r2 (14 May 2014)
-
-  14 May 2014; Michał Górny <mgorny@gentoo.org> +cups-1.7.1-r2.ebuild,
-  +cups-1.7.2-r1.ebuild, cups-9999.ebuild:
-  Enable multilib support, bug #493172.
-
-  13 May 2014; Agostino Sarubbo <ago@gentoo.org> cups-1.7.1-r1.ebuild:
-  Stable for ia64, wrt bug #507696
-
-  11 May 2014; Agostino Sarubbo <ago@gentoo.org> cups-1.7.1-r1.ebuild:
-  Stable for ppc64, wrt bug #507696
-
-  10 May 2014; Agostino Sarubbo <ago@gentoo.org> cups-1.7.1-r1.ebuild:
-  Stable for ppc, wrt bug #507696
-
-  22 Apr 2014; Agostino Sarubbo <ago@gentoo.org> cups-1.7.1-r1.ebuild:
-  Stable for arm, wrt bug #507696
-
-  21 Apr 2014; Agostino Sarubbo <ago@gentoo.org> cups-1.7.1-r1.ebuild:
-  Stable for alpha, wrt bug #507696
-
-  19 Apr 2014; Jeroen Roovers <jer@gentoo.org> cups-1.7.1-r1.ebuild:
-  Stable for HPPA (bug #507696).
-
-  19 Apr 2014; Agostino Sarubbo <ago@gentoo.org> cups-1.7.1-r1.ebuild:
-  Stable for x86, wrt bug #507696
-
-  19 Apr 2014; Agostino Sarubbo <ago@gentoo.org> cups-1.7.1-r1.ebuild:
-  Stable for amd64, wrt bug #507696
-
-*cups-1.7.1-r1 (15 Apr 2014)
-
-  15 Apr 2014; Andreas K. Huettel <dilfridge@gentoo.org> +cups-1.7.1-r1.ebuild,
-  cups-1.7.2.ebuild, cups-9999.ebuild, +files/cups-1.7.1-str4356.patch:
-  Backport for bug 507696
-
-  15 Apr 2014; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.7.2.ebuild,
-  cups-9999.ebuild:
-  systemd support was added to net-print/cups with the understanding that the
-  systemd team takes care of relevant bugs as long as the patches are not
-  upstreamed. Unfortunately noone of them cares, which is why we will only
-  conditionally apply the patch now. See bug 450282, bug 494582, bug 500300.
-
-*cups-1.7.2 (15 Apr 2014)
-
-  15 Apr 2014; Andreas K. Huettel <dilfridge@gentoo.org> +cups-1.7.2.ebuild,
-  +files/cups-1.7.2-systemd-socket-2.patch:
-  Version bump, bug 507696; no keywords because of build failures
-
-  01 Mar 2014; Michał Górny <mgorny@gentoo.org> cups-1.7.1.ebuild,
-  cups-9999.ebuild:
-  Update libgcrypt dep to use slot :0.
-
-  23 Feb 2014; Patrick Lauer <patrick@gentoo.org> metadata.xml:
-  Remove unneeded useflag description from metadata.xml
-
-  22 Feb 2014; Andreas K. Huettel <dilfridge@gentoo.org>
-  -files/cups-1.6.2-statedir.patch, -cups-1.6.4.ebuild, cups-9999.ebuild:
-  Remove old; propagate keywords to live ebuild
-
-  22 Feb 2014; Agostino Sarubbo <ago@gentoo.org> cups-1.7.1.ebuild:
-  Stable for sparc, wrt bug #501198
-
-  22 Feb 2014; Agostino Sarubbo <ago@gentoo.org> cups-1.7.1.ebuild:
-  Stable for ppc64, wrt bug #501198
-
-  22 Feb 2014; Agostino Sarubbo <ago@gentoo.org> cups-1.7.1.ebuild:
-  Stable for alpha, wrt bug #501198
-
-  22 Feb 2014; Agostino Sarubbo <ago@gentoo.org> cups-1.7.1.ebuild:
-  Stable for arm, wrt bug #501198
-
-  20 Feb 2014; Agostino Sarubbo <ago@gentoo.org> cups-1.7.1.ebuild:
-  Stable for ppc, wrt bug #501198
-
-  16 Feb 2014; Agostino Sarubbo <ago@gentoo.org> cups-1.7.1.ebuild:
-  Stable for ia64, wrt bug #501198
-
-  16 Feb 2014; Agostino Sarubbo <ago@gentoo.org> cups-1.7.1.ebuild:
-  Stable for x86, wrt bug #501198
-
-  16 Feb 2014; Agostino Sarubbo <ago@gentoo.org> cups-1.7.1.ebuild:
-  Stable for amd64, wrt bug #501198
-
-  13 Feb 2014; Jeroen Roovers <jer@gentoo.org> cups-1.7.1.ebuild:
-  Stable for HPPA (bug #501198).
-
-  12 Feb 2014; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.6.4.ebuild:
-  Allow newer cups-filters to replace foomatic-filters here too.
-
-  24 Jan 2014; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.6.4.ebuild,
-  cups-1.7.1.ebuild, cups-9999.ebuild:
-  The libusb backend hard-requires threading, bug 497194
-
-  18 Jan 2014; Andreas K. Huettel <dilfridge@gentoo.org> -cups-1.6.2-r5.ebuild,
-  -files/cups-1.6.3-colord-profile.patch, -cups-1.7.0-r1.ebuild,
-  -files/pdftops-1.20.gentoo, -files/cupsd.init.d:
-  Remove old
-
-  18 Jan 2014; Agostino Sarubbo <ago@gentoo.org> cups-1.6.4.ebuild:
-  Stable for alpha, wrt bug #489914
-
-  17 Jan 2014; Patrick Lauer <patrick@gentoo.org> cups-1.7.1.ebuild,
-  cups-9999.ebuild:
-  Whitespace
-
-  16 Jan 2014; Fabian Groffen <grobian@gentoo.org> cups-1.7.1.ebuild,
-  cups-9999.ebuild:
-  Fixed for and marked ~m68k-mint, bug #498100
-
-  15 Jan 2014; Agostino Sarubbo <ago@gentoo.org> cups-1.6.4.ebuild:
-  Stable for ia64, wrt bug #489914
-
-*cups-1.7.1 (12 Jan 2014)
-
-  12 Jan 2014; Andreas K. Huettel <dilfridge@gentoo.org> -cups-1.6.9999.ebuild,
-  -cups-1.7.0.ebuild, +cups-1.7.1.ebuild, cups-9999.ebuild,
-  files/cupsd.init.d-r1:
-  Version bump; remove old
-
-*cups-1.7.0-r1 (01 Jan 2014)
-
-  01 Jan 2014; Andreas K. Huettel <dilfridge@gentoo.org> +cups-1.7.0-r1.ebuild:
-  Revision bump to remove filters useflag and dependency on foomatic-filters
-
-  29 Dec 2013; Andreas K. Huettel <dilfridge@gentoo.org> cups-9999.ebuild:
-  Depend on newer cups-filters that integrate foomatic, and drop filters useflag
-
-  26 Dec 2013; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.6.2-r5.ebuild:
-  Update SRC_URI
-
-  26 Dec 2013; Andreas K. Huettel <dilfridge@gentoo.org>
-  -files/cups-1.4.4-dont-compress-manpages.patch,
-  -files/cups-1.4.4-perl-includes.patch, -files/cups-1.4.4-php-destdir.patch,
-  -files/cups-1.5.0-systemd-socket.patch, -files/cups-1.5.2-browsing.patch,
-  -files/cups-1.5.2-linkperl.patch, -cups-1.5.3.ebuild,
-  -files/cups-1.5.3-fix-install-perms.patch:
-  Drop cups-1.5, bug 428356 was filed 07/2012
-
-  23 Dec 2013; Agostino Sarubbo <ago@gentoo.org> cups-1.6.4.ebuild:
-  Stable for sparc, wrt bug #489914
-
-  22 Dec 2013; Agostino Sarubbo <ago@gentoo.org> cups-1.6.4.ebuild:
-  Stable for ppc64, wrt bug #489914
-
-  21 Dec 2013; Agostino Sarubbo <ago@gentoo.org> cups-1.6.4.ebuild:
-  Stable for ppc, wrt bug #489914
-
-  29 Nov 2013; Markus Meier <maekke@gentoo.org> cups-1.6.4.ebuild:
-  arm stable, bug #489914
-
-  11 Nov 2013; Jeroen Roovers <jer@gentoo.org> cups-1.6.4.ebuild:
-  Stable for HPPA (bug #489914).
-
-  31 Oct 2013; Agostino Sarubbo <ago@gentoo.org> cups-1.6.4.ebuild:
-  Stable for x86, wrt bug #489914
-
-  31 Oct 2013; Agostino Sarubbo <ago@gentoo.org> cups-1.6.4.ebuild:
-  Stable for amd64, wrt bug #489914
-
-*cups-1.7.0 (30 Oct 2013)
-
-  30 Oct 2013; Andreas K. Huettel <dilfridge@gentoo.org> -cups-1.6.3-r2.ebuild,
-  -cups-1.7_rc1.ebuild, +cups-1.7.0.ebuild, cups-9999.ebuild:
-  Version bump; remove old
-
-  22 Oct 2013; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.6.2-r5.ebuild:
-  Drop stable keywords on unstable-only arches
-
-  21 Oct 2013; Fabian Groffen <grobian@gentoo.org> cups-1.7_rc1.ebuild,
-  cups-9999.ebuild:
-  Fix cups.sock location for Prefix, bug #488204
-
-*cups-1.6.4 (01 Oct 2013)
-
-  01 Oct 2013; Andreas K. Huettel <dilfridge@gentoo.org> +cups-1.6.4.ebuild:
-  Version bump
-
-  30 Sep 2013; Andreas K. Huettel <dilfridge@gentoo.org> -cups-1.5.2-r4.ebuild,
-  -files/cups-1.4.4-fix-install-perms.patch, -files/cups-1.5.2-threads.patch,
-  -files/cups-1.5.2-threads2.patch:
-  Drop old
-
-  05 Sep 2013; Michał Górny <mgorny@gentoo.org> cups-1.6.3-r2.ebuild,
-  cups-1.6.9999.ebuild, cups-1.7_rc1.ebuild, cups-9999.ebuild:
-  Clean up PYTHON_COMPAT from old implementations.
-
-  14 Aug 2013; Andreas K. Huettel <dilfridge@gentoo.org> -cups-1.6.3-r1.ebuild,
-  cups-1.5.2-r4.ebuild, cups-1.5.3.ebuild:
-  Clean up
-
-  14 Aug 2013; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.6.3-r2.ebuild,
-  cups-1.6.9999.ebuild, cups-9999.ebuild:
-  Re-add nonsensically dropped ~s390
-
-  06 Aug 2013; Agostino Sarubbo <ago@gentoo.org> cups-1.6.2-r5.ebuild:
-  Stable for s390, wrt bug #442926
-
-*cups-1.6.3-r2 (25 Jul 2013)
-
-  25 Jul 2013; Michał Górny <mgorny@gentoo.org> +cups-1.6.3-r2.ebuild,
-  cups-1.6.9999.ebuild, cups-1.7_rc1.ebuild, cups-9999.ebuild:
-  Migrate to python-single-r1, bug #478136.
-
-  25 Jul 2013; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.5.2-r4.ebuild,
-  cups-1.5.3.ebuild:
-  Drop as many keywords as possible in old versions.
-
-  22 Jul 2013; Agostino Sarubbo <ago@gentoo.org> cups-1.6.2-r5.ebuild:
-  Stable for sparc, wrt bug #442926
-
-  22 Jul 2013; Agostino Sarubbo <ago@gentoo.org> cups-1.6.2-r5.ebuild:
-  Stable for sh, wrt bug #442926
-
-  13 Jul 2013; Patrick Lauer <patrick@gentoo.org> metadata.xml:
-  Remove unneeded useflag description from metadata.xml
-
-*cups-1.6.3-r1 (12 Jul 2013)
-
-  12 Jul 2013; Andreas K. Huettel <dilfridge@gentoo.org> -cups-1.6.3.ebuild,
-  +cups-1.6.3-r1.ebuild, +files/cups-1.6.3-colord-profile.patch,
-  cups-1.6.9999.ebuild, cups-1.7_rc1.ebuild, cups-9999.ebuild:
-  Add colord profile fix from Debian, bug 475714
-
-*cups-1.7_rc1 (12 Jul 2013)
-
-  12 Jul 2013; Andreas K. Huettel <dilfridge@gentoo.org> +cups-1.7_rc1.ebuild,
-  cups-9999.ebuild:
-  Fix build of master and add 1.7rc1 without keywords
-
-  12 Jul 2013; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.6.9999.ebuild,
-  cups-9999.ebuild:
-  Whitespace
-
-*cups-1.6.9999 (12 Jul 2013)
-
-  12 Jul 2013; Andreas K. Huettel <dilfridge@gentoo.org> +cups-1.6.9999.ebuild,
-  cups-9999.ebuild:
-  Make live ebuild branch-capable and add live ebuild for stable branch 1.6
-
-*cups-1.6.3 (12 Jul 2013)
-
-  12 Jul 2013; Andreas K. Huettel <dilfridge@gentoo.org> +cups-1.6.3.ebuild,
-  cups-9999.ebuild:
-  Update SRC_URI and VCS; version bump
-
-  12 Jul 2013; Andreas K. Huettel <dilfridge@gentoo.org> -cups-1.5.0.ebuild:
-  No e-mail reply from contact. Removing.
-
-  07 Jul 2013; Agostino Sarubbo <ago@gentoo.org> cups-1.6.2-r5.ebuild:
-  Stable for ia64, wrt bug #442926
-
-  07 Jul 2013; Agostino Sarubbo <ago@gentoo.org> cups-1.6.2-r5.ebuild:
-  Stable for arm, wrt bug #442926
-
-  06 Jul 2013; Agostino Sarubbo <ago@gentoo.org> cups-1.6.2-r5.ebuild:
-  Stable for alpha, wrt bug #442926
-
-  05 Jul 2013; Jeroen Roovers <jer@gentoo.org> cups-1.6.2-r5.ebuild:
-  Stable for HPPA (bug #442926).
-
-  04 Jul 2013; Agostino Sarubbo <ago@gentoo.org> cups-1.6.2-r5.ebuild:
-  Stable for ppc64, wrt bug #442926
-
-  30 Jun 2013; Agostino Sarubbo <ago@gentoo.org> cups-1.6.2-r5.ebuild:
-  Stable for ppc, wrt bug #442926
-
-  30 Jun 2013; Agostino Sarubbo <ago@gentoo.org> cups-1.6.2-r5.ebuild:
-  Stable for x86, wrt bug #442926
-
-  30 Jun 2013; Agostino Sarubbo <ago@gentoo.org> cups-1.6.2-r5.ebuild:
-  Stable for amd64, wrt bug #442926
-
-  28 Jun 2013; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.6.2-r5.ebuild,
-  cups-9999.ebuild:
-  Simplify elog output logic
-
-  26 Jun 2013; Andreas K. Huettel <dilfridge@gentoo.org> -cups-1.6.2-r3.ebuild:
-  Clean up
-
-*cups-1.6.2-r5 (14 May 2013)
-
-  14 May 2013; Andreas K. Huettel <dilfridge@gentoo.org> -cups-1.6.2-r4.ebuild,
-  +cups-1.6.2-r5.ebuild, cups-9999.ebuild:
-  Let's put some sanity into the prefix directory offsets. Bug 469846.
-
-*cups-1.6.2-r3 (14 May 2013)
-
-  14 May 2013; Tomáš Chvátal <scarabeus@gentoo.org> +cups-1.6.2-r3.ebuild:
-  Restore 1.6.2-r3 as requested by dillfridge.
-
-  12 May 2013; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.5.3.ebuild,
-  cups-1.6.2-r4.ebuild, cups-9999.ebuild:
-  Depend on correct libusb slot, bug 434440
-
-  11 May 2013; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.6.2-r4.ebuild,
-  cups-9999.ebuild:
-  Add prefix support (dir offsets), bug 416217
-
-*cups-1.6.2-r4 (05 May 2013)
-
-  05 May 2013; Michał Górny <mgorny@gentoo.org> +cups-1.6.2-r4.ebuild,
-  -cups-1.6.2-r3.ebuild, cups-9999.ebuild:
-  Add the "cancel" executable to the lprng-compat flag as well.
-
-  03 May 2013; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.6.2-r3.ebuild,
-  cups-9999.ebuild, metadata.xml:
-  Support simultaneous installation of cups and lprng, bug 467226
-
-*cups-1.6.2-r3 (11 Apr 2013)
-
-  11 Apr 2013; Fabio Erculiani <lxnay@gentoo.org>
-  files/cups-1.5.0-systemd-socket-2.patch, -cups-1.6.2-r2.ebuild,
-  +cups-1.6.2-r3.ebuild:
-  fix systemd units path variable setup, see bug #465474
-
-*cups-1.6.2-r2 (10 Apr 2013)
-
-  10 Apr 2013; Fabio Erculiani <lxnay@gentoo.org>
-  +files/cups-1.5.0-systemd-socket-2.patch, -cups-1.6.2-r1.ebuild,
-  +cups-1.6.2-r2.ebuild, cups-9999.ebuild:
-  detect systemd at runtime and try not to fail if it's not found, this makes
-  possible to support systems with both systemd and openrc installed
-
-  01 Apr 2013; Andreas K. Huettel <dilfridge@gentoo.org> -cups-1.6.1.ebuild,
-  -cups-1.6.2.ebuild:
-  Clean up
-
-  01 Apr 2013; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.6.2-r1.ebuild,
-  cups-9999.ebuild:
-  Remove avahi useflag, use only zeroconf useflag for full avahi interface
-
-*cups-1.6.2-r1 (01 Apr 2013)
-
-  01 Apr 2013; Andreas K. Huettel <dilfridge@gentoo.org> +cups-1.6.2-r1.ebuild,
-  +files/cups-1.6.2-statedir.patch, cups-9999.ebuild, +files/cupsd.init.d-r1:
-  Move /var/run/cups to /run/cups, bug 451756
-
-  24 Mar 2013; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.6.2.ebuild,
-  cups-9999.ebuild:
-  Fix LINGUAS logic, bug 452896
-
-  24 Mar 2013; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.5.2-r4.ebuild,
-  cups-1.5.3.ebuild:
-  Remove non-functional localizations
-
-  24 Mar 2013; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.5.2-r4.ebuild:
-  Remove de locale since it is nonfunctional, bug 450220
-
-  24 Mar 2013; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.6.2.ebuild,
-  cups-9999.ebuild:
-  EAPI bump to 5, clean up elog messages, (also) bug 440502
-
-  24 Mar 2013; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.6.2.ebuild,
-  cups-9999.ebuild:
-  Fix linguas list
-
-*cups-1.6.2 (24 Mar 2013)
-
-  24 Mar 2013; Andreas K. Huettel <dilfridge@gentoo.org> +cups-1.6.2.ebuild,
-  cups-9999.ebuild:
-  Version bump
-
-  17 Mar 2013; Andreas K. Huettel <dilfridge@gentoo.org> cups-9999.ebuild:
-  Update keyword list from 1.6.1
-
-  08 Feb 2013; Agostino Sarubbo <ago@gentoo.org> cups-1.6.1.ebuild:
-  Add ~sh, wrt bug #449220
-
-  06 Jan 2013; Agostino Sarubbo <ago@gentoo.org> cups-1.6.1.ebuild:
-  Add ~sparc, wrt bug #449220
-
-  01 Jan 2013; Agostino Sarubbo <ago@gentoo.org> cups-1.6.1.ebuild:
-  Add ~alpha, wrt bug #449220
-
-  19 Dec 2012; Agostino Sarubbo <ago@gentoo.org> cups-1.6.1.ebuild:
-  Add ~ia64, wrt bug #428356
-
-  03 Dec 2012; Tomáš Chvátal <scarabeus@gentoo.org> cups-1.6.1.ebuild:
-  Add ~ppc64 also to release version.
-
-  06 Nov 2012; Alexis Ballier <aballier@gentoo.org> cups-1.6.1.ebuild,
-  cups-9999.ebuild:
-  keyword ~amd64-fbsd, bug #428356
-
-*cups-1.5.0 (22 Oct 2012)
-
-  22 Oct 2012; Tomáš Chvátal <scarabeus@gentoo.org> +cups-1.5.0.ebuild:
-  Add unkeyworded 1.5.0 required for FIT CVUT setup. Contact
-  petr.hodac@fit.cvut.cz if you want to remove this first.
-
-  04 Oct 2012;  <naota@gentoo.org> cups-1.6.1.ebuild:
-  Add ~x86-fbsd wrt bug #428356
-
-  21 Sep 2012; Anthony G. Basile <blueness@gentoo.org> cups-9999.ebuild:
-  Keyword ~ppc64, bug #428356
-
-  09 Sep 2012; Andreas K. Huettel <dilfridge@gentoo.org>
-  -files/cups-1.4.0-backend-https.patch, -files/cups-1.4.2-str3200.patch,
-  -files/cups-1.4.6-force-gnutls.patch,
-  -files/cups-1.4.6-serialize-gnutls.patch, -cups-1.4.8-r1.ebuild,
-  -files/cups-1.4.8-CVE-2011-3170.patch, -files/cups-1.4.8-largeimage.patch:
-  Remove old
-
-  09 Sep 2012; Raúl Porcel <armin76@gentoo.org> cups-1.5.2-r4.ebuild:
-  alpha/ia64/m68k/s390/sh/sparc stable wrt #411887
-
-  01 Sep 2012; Anthony G. Basile <blueness@gentoo.org> cups-1.6.1.ebuild,
-  cups-9999.ebuild:
-  Keyword ~ppc, bug #428356
-
-  31 Aug 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-9999.ebuild:
-  Sync keywords
-
-  30 Aug 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.6.1.ebuild,
-  cups-9999.ebuild:
-  Add warning about network browsing on update from 1.5 and earlier
-
-  16 Aug 2012; Jeroen Roovers <jer@gentoo.org> cups-1.6.1.ebuild:
-  Marked ~hppa (bug #428356).
-
-  08 Aug 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.4.8-r1.ebuild,
-  cups-1.5.2-r4.ebuild, cups-1.5.3.ebuild:
-  Block cups-filters, bug 429338
-
-  05 Aug 2012; Markus Meier <maekke@gentoo.org> cups-1.6.1.ebuild:
-  add ~arm, bug #428356
-
-*cups-1.4.8-r1 (31 Jul 2012)
-
-  31 Jul 2012; Mike Gilbert <floppym@gentoo.org> +cups-1.4.8-r1.ebuild,
-  +files/cups-1.4.0-backend-https.patch, +files/cups-1.4.2-str3200.patch,
-  +files/cups-1.4.6-force-gnutls.patch,
-  +files/cups-1.4.6-serialize-gnutls.patch,
-  +files/cups-1.4.8-CVE-2011-3170.patch, +files/cups-1.4.8-largeimage.patch:
-  Restore old version to repair dependency graph.
-
-*cups-1.6.1 (31 Jul 2012)
-
-  31 Jul 2012; Andreas K. Huettel <dilfridge@gentoo.org> -cups-1.6.0.ebuild,
-  +cups-1.6.1.ebuild:
-  Version bump
-
-  29 Jul 2012; Andreas K. Huettel <dilfridge@gentoo.org>
-  -files/cups-1.4.0-backend-https.patch, -files/cups-1.4.2-str3200.patch,
-  -files/cups-1.4.6-force-gnutls.patch,
-  -files/cups-1.4.6-serialize-gnutls.patch, -cups-1.4.8-r1.ebuild,
-  -files/cups-1.4.8-CVE-2011-3170.patch, -files/cups-1.4.8-largeimage.patch:
-  Drop cups-1.4 and support for sparc-fbsd
-
-  28 Jul 2012; Anthony G. Basile <blueness@gentoo.org> cups-1.6.0.ebuild,
-  cups-9999.ebuild:
-  Keyword ~mips, bug #428356
-
-*cups-1.6.0 (27 Jul 2012)
-
-  27 Jul 2012; Andreas K. Huettel <dilfridge@gentoo.org> -cups-1.6_rc1.ebuild,
-  +cups-1.6.0.ebuild, cups-9999.ebuild:
-  Version bump
-
-  23 Jul 2012; <swift@gentoo.org> cups-1.4.8-r1.ebuild, cups-1.5.2-r4.ebuild,
-  cups-1.5.3.ebuild, cups-1.6_rc1.ebuild, cups-9999.ebuild:
-  Adding optional dependency on SELinux policy for CUPS
-
-  19 Jul 2012; Andreas K. Huettel <dilfridge@gentoo.org>
-  -cups-1.4.8-r23.ebuild:
-  Remove old
-
-  30 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.6_rc1.ebuild,
-  cups-9999.ebuild:
-  Correct language list
-
-*cups-1.6_rc1 (30 Jun 2012)
-
-  30 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
-  -cups-1.6_beta1-r1.ebuild, +cups-1.6_rc1.ebuild:
-  Version bump
-
-  26 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.5.2-r4.ebuild,
-  cups-1.5.3.ebuild:
-  Fix perl dependency, thanks _AxS_
-
-  14 Jun 2012; Naohiro Aota <naota@gentoo.org> cups-1.5.3.ebuild:
-  Add ~x86-fbsd. #401067
-
-*cups-1.6_beta1-r1 (09 Jun 2012)
-
-  09 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
-  -cups-1.6_beta1.ebuild, +cups-1.6_beta1-r1.ebuild, cups-9999.ebuild:
-  Remove banners and testprint, now provided by cups-filters
-
-  07 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
-  -cups-1.5.2-r21.ebuild, cups-1.5.3.ebuild, cups-1.6_beta1.ebuild,
-  cups-9999.ebuild:
-  Fix bashism in install-sh, bug 419735
-
-  05 Jun 2012; Anthony G. Basile <blueness@gentoo.org> cups-1.5.3.ebuild:
-  Keyword ~mips, bug #401067
-
-  02 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.6_beta1.ebuild,
-  cups-9999.ebuild:
-  Add cups-filters as PDEPEND
-
-*cups-1.5.3 (02 Jun 2012)
-
-  02 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +cups-1.5.3.ebuild,
-  +files/cups-1.5.3-fix-install-perms.patch, cups-9999.ebuild:
-  Version bump
-
-*cups-1.6_beta1 (02 Jun 2012)
-
-  02 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
-  +cups-1.6_beta1.ebuild, files/cups-1.6.0-fix-install-perms.patch,
-  cups-9999.ebuild:
-  Add 1.6.0 beta1 release
-
-  01 Jun 2012; Zac Medico <zmedico@gentoo.org> cups-1.4.8-r1.ebuild,
-  cups-1.4.8-r23.ebuild, cups-1.5.2-r21.ebuild, cups-1.5.2-r4.ebuild,
-  cups-9999.ebuild:
-  inherit user for enewgroup and enewuser, and eliminate duplication in inherit
-  lines
-
-  24 May 2012; Johannes Huber <johu@gentoo.org> cups-1.5.2-r4.ebuild:
-  Stable for x86, wrt bug #411887
-
-  22 May 2012; Brent Baude <ranger@gentoo.org> cups-1.5.2-r4.ebuild:
-  marking straight to ppc64 for bug 411887
-
-  22 May 2012; Brent Baude <ranger@gentoo.org> cups-1.5.2-r4.ebuild:
-  Marking cups-1.5.2-r4 ~ppc64 for bug 411887
-
-  21 May 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.5.2-r21.ebuild,
-  cups-9999.ebuild:
-  Move the default server configuration example into the documentation
-  directory
-
-  21 May 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.5.2-r4.ebuild,
-  cups-1.5.2-r21.ebuild, cups-9999.ebuild:
-  Fix path in elog message
-
-  17 May 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-9999.ebuild:
-  net-dns/avahi[mdnsresponder-compat] works for zeroconf too
-
-  16 May 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-9999.ebuild:
-  slp and ldap code is gone in trunk, but we have bonjour now
-
-  12 May 2012; Alexis Ballier <aballier@gentoo.org> cups-1.5.2-r21.ebuild:
-  keyword ~amd64-fbsd
-
-*cups-1.5.2-r21 (11 May 2012)
-
-  11 May 2012; Andreas K. Huettel <dilfridge@gentoo.org>
-  -cups-1.5.2-r20.ebuild, +cups-1.5.2-r21.ebuild:
-  Re-add translation data that got lost from 1.5.0 to 1.5.2, bug 415455
-
-  08 May 2012; Andreas K. Huettel <dilfridge@gentoo.org>
-  +files/cups-1.6.0-dont-compress-manpages.patch,
-  +files/cups-1.6.0-fix-install-perms.patch, cups-9999.ebuild:
-  Configures but does not build yet
-
-*cups-9999 (08 May 2012)
-
-  08 May 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.5.2-r20.ebuild,
-  +cups-9999.ebuild:
-  Cleanup and coding style; add (so-far not working) live ebuild
-
-  06 May 2012; Brent Baude <ranger@gentoo.org> cups-1.5.2-r4.ebuild:
-  Marking cups-1.5.2-r4 ppc for bug 411887
-
-  06 May 2012; Raúl Porcel <armin76@gentoo.org> cups-1.5.2-r4.ebuild,
-  cups-1.5.2-r20.ebuild:
-  Add ~alpha/~ia64/~m68k/~s390/~sh/~sparc wrt #401067
-
-  03 May 2012; Markus Meier <maekke@gentoo.org> cups-1.5.2-r4.ebuild:
-  arm stable, bug #411887
-
-  03 May 2012; Jeff Horelick <jdhore@gentoo.org> cups-1.4.8-r1.ebuild,
-  cups-1.4.8-r23.ebuild, cups-1.5.2-r4.ebuild, cups-1.5.2-r20.ebuild:
-  dev-util/pkgconfig -> virtual/pkgconfig
-
-  02 May 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.5.2-r20.ebuild,
-  cups-1.5.2-r4.ebuild:
-  Add missing avahi dependencies, bug 414349.
-
-  01 May 2012; Jeroen Roovers <jer@gentoo.org> cups-1.5.2-r4.ebuild:
-  Stable for HPPA (bug #411887).
-
-  28 Apr 2012; Agostino Sarubbo <ago@gentoo.org> cups-1.5.2-r4.ebuild:
-  Stable for amd64, wrt bug #411887
-
-*cups-1.5.2-r20 (26 Apr 2012)
-*cups-1.5.2-r4 (26 Apr 2012)
-
-  26 Apr 2012; Andreas K. Huettel <dilfridge@gentoo.org> +cups-1.5.2-r20.ebuild,
-  +cups-1.5.2-r4.ebuild, -cups-1.5.2-r3.ebuild:
-  Copy -r3 unchanged to -r20; cleanse -r3 of all things systemd and make it -r4
-  for stabilization
-
-  26 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> cups-1.5.2-r3.ebuild:
-  Prefixy.
-
-  24 Apr 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.5.2-r3.ebuild:
-  Do not try to install non-existing files, bug 412873
-
-  23 Apr 2012; Andreas K. Huettel <dilfridge@gentoo.org> -cups-1.5.2-r2.ebuild:
-  Remove old
-
-  23 Apr 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.5.2-r3.ebuild,
-  +files/cups-1.5.2-threads.patch, +files/cups-1.5.2-threads2.patch:
-  Add backport patch for building without thread support, bug 401323
-
-  21 Apr 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.5.2-r3.ebuild:
-  Fix build with USE=-systemd, thanks Arfrever
-
-*cups-1.5.2-r3 (20 Apr 2012)
-
-  20 Apr 2012; Andreas K. Huettel <dilfridge@gentoo.org> +cups-1.5.2-r3.ebuild,
-  metadata.xml:
-  Add systemd useflag and dependency, install unit files properly. Should
-  finally fix bug 407975. Patch by Michal Gorny.
-
-  19 Apr 2012; Andreas K. Huettel <dilfridge@gentoo.org> -cups-1.5.0-r4.ebuild,
-  -cups-1.5.2-r1.ebuild:
-  Remove old
-
-  19 Apr 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.5.2-r2.ebuild,
-  +files/cups-1.5.2-linkperl.patch:
-  Link perl module properly if cups is not installed yet, bug 398277
-
-  18 Apr 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.5.2-r2.ebuild:
-  Set systemd unit dir correctly, bug 407975
-
-  18 Apr 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.5.2-r2.ebuild,
-  +files/cups-1.5.2-browsing.patch:
-  Switch browsing off by default, bug 401927
-
-*cups-1.5.2-r2 (18 Apr 2012)
-
-  18 Apr 2012; Andreas K. Huettel <dilfridge@gentoo.org> +cups-1.5.2-r2.ebuild:
-  Add avahi support (patch from Debian), as this will be included in 1.6
-  anyway; bug 374153
-
-  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; 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:
-  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
-
-*cups-1.5.0-r3 (15 Jan 2012)
-*cups-1.4.8-r23 (15 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
-
-  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.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-r21.ebuild, -cups-1.5.0-r1.ebuild:
-  Remove old
-
-  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
-
-  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.
-
-  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:
-  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
-
-  21 Jun 2011; Tobias Klausmann <klausman@gentoo.org> cups-1.4.6-r2.ebuild:
-  Stable on alpha, bug #333781
-
-  21 Jun 2011; Markos Chandras <hwoarang@gentoo.org> cups-1.4.6-r2.ebuild:
-  Stable on amd64 wrt bug #333781
-
-  18 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org> -cups-1.4.6-r1.ebuild:
-  Remove old
-
-*cups-1.5_rc1 (18 Jun 2011)
-
-  18 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org> +cups-1.5_rc1.ebuild:
-  Package-masked version bump
-
-  17 Jun 2011; Jeroen Roovers <jer@gentoo.org> cups-1.4.6-r2.ebuild:
-  Stable for HPPA (bug #333781).
-
-  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
-
-*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, fixing bug #313555 and #350406. Remove old.
-
-*cups-1.3.11-r4 (01 Dec 2010)
-
-  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).
-
-*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-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.4.4-r1 (13 Aug 2010)
-
-  13 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org>
-  +cups-1.4.4-r1.ebuild:
-  Revbump with various patches i collected around.
-
-  10 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org>
-  cups-1.3.11-r1.ebuild, cups-1.3.11-r2.ebuild:
-  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
-
-  30 Jun 2010; Jeroen Roovers <jer@gentoo.org> cups-1.4.4.ebuild:
-  Respect LDFLAGS (bug #284769).
-
-  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.4 (22 Jun 2010)
-
-  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, 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)
-
-  20 Mar 2007; Stefan Schweizer <genstef@gentoo.org> +cups-1.2.9.ebuild:
-  version bump
-
-*cups-1.2.8 (19 Feb 2007)
-
-  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
deleted file mode 100644
index 5a731c8..0000000
--- a/net-print/cups/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX cups-1.4.4-nostrip.patch 487 SHA256 b96448896f08c5f91d5afb0c093f2638a262d1c45e716c29d5164cefee18bc61 SHA512 10f46e841aa5646f40564e92b6c5b90a5d27702ea8a4dd8652cfd39834be54feec20a2c8d4fea663b90685865deae17851e57161aad7ff250916ce4accbb01fa WHIRLPOOL d55a6bf19e55e3cdb04510eb55b67c011ccdb8b3b73d8787b2da15a584f3e91437c0dc4b53bb62aac2b67c9985c18dddac85e06ca866722fa246a952eda16c0b
-AUX cups-1.5.0-systemd-socket-2.patch 12914 SHA256 779a91231b62f6467b3ee08d5cf9cb85c1fc5408a23b727aa4c4ddc54f450ed6 SHA512 9577ba50e737dd920ef06e6a5d95938ef10db5fcab8254137f15b2214846de56360dbf8c40c3a95e0b3459f5f925d18a9cd07a844cdda7dd9a41d9fac0118291 WHIRLPOOL a15a97f64db18c7ef7ba5e80096d3aeb06dbb19c388424b069e5fc8e125c159c0623aed59dc0748c8359c349a3fa314ef79f32a7b59aad214e92b974eb4f332e
-AUX cups-1.6.0-dont-compress-manpages.patch 435 SHA256 d3e41e8d4a841ac71e5ed8598fc444a2f11b4c94215b55dcf5147694bbbc88c3 SHA512 f004b1e7178212eddefda8416c33514834e0e444243c456a8f0723e763247330b8366e71f64ee0e84196789498c5b22334049a8bec210068e02f06b64b683d7c WHIRLPOOL 1453927d8478c740f74ad9f18ef2bdc3dea30596b59cd5fb2a740942da14bef76a2418c3e536aeaad1cbf5ffb14c72e914ba6726776fe5f23f8b43ef4dedd25f
-AUX cups-1.6.0-fix-install-perms.patch 948 SHA256 4a4a885bb2e111bd67bcb90a5780f33841b18bc02382317fb5e64c384aa0c4c8 SHA512 9b2ecc47be2fd08d092017316af39e217e17a540d096cc62971521052632c40033a06cd7bdd5b319bd7f623fea803d569ced6728504d680fd50087288302164f WHIRLPOOL 7d6f4a5eab9964e6c2277f03affaf0eada9b7408eeac742a75d541ec5efe883940c816ea508a59c733327d3bbe0e31bd242b8c183e3f817a54208ed4a3071982
-AUX cups-1.7.1-str4356.patch 502 SHA256 8f21ec8acecf6c8ea3331b53c72b2351fe96f6353862d7ae9285d24daf3c94d7 SHA512 55a181a7adba15a40023270f030d0a9222832a1cd5e3e3693100191e9a88af7915cc6f2929f003a6adf26a32748a6b8169707d675cd679b8b8c297f3640498c2 WHIRLPOOL 87a052a1f5bf078b897145435965ec1411d282fcbc5e58793a9bc2067833b261c9b273d8bc41697cccf725fcbcb169031e664846225877ec50557ef218bb97f8
-AUX cups-1.7.2-compile-without-zeroconf.patch 1377 SHA256 9ffe78ab7222c8542884bc399a70c6da23b8fd40e70e22d9c3043819151de8b5 SHA512 ce99769e07af0295482c61283c05a18afdb7bd05a5d51e446566ab913f6bbb0f28c6bf0161fb1d13b4d0d80c3358942fbe53f7d4dddd8d8937b9afa16b5d9bc3 WHIRLPOOL 0021a446896a71cb8bd9ec01763cc53b756cdc0709863d127d7636d82f77327136157e3b52b34a661b4d891d7dea921e09739a0ef906c1aaa5afe8a8bf7029d9
-AUX cups-1.7.2-systemd-socket-2.patch 11799 SHA256 aec7a98202143e26384fc46baa434f9da022b97793413c95bc1b3765449aceef SHA512 f551e6e1917303ce3e2206284f396885a9aa15bfdee6fdcd88182279cd52a26fc92f5e529b8b30edb0c58dbc749440d23515fa1246959875f525fb5e6b08d466 WHIRLPOOL 063253ffc641c1fd35d929f65c3e42374d5223afc106c2a2f2f0098d5115788573eeaad8fb2c53efe90334ef7a1605d164b1741189c8f8b77e7788097aa76923
-AUX cupsd.init.d-r1 504 SHA256 4705b68372090ee7db69da1ad35131551ed1ba99032db2486ff6c31d2170ce6b SHA512 9eac4fc725b14615bb31c96a69c00a14ab2fb23fa355f1ced655f93e6364555b2710a277ceab439199a275405b016492b4c9183fab755c02354013e0904a03bc WHIRLPOOL e0ce34f4b73de6e63ba1f01b0df543cd66fecc692af8254acb3dd1147c0cd4e1f42ed7df4b18b26af0114db54c3b8c1bca526ed54146307223ac24a0b3d3502c
-DIST cups-1.7.2-source.tar.bz2 8754601 SHA256 315cdff436924c4efe04cb110b145fb1a6e038e2eed8445359052f86e9e95676 SHA512 441256bdfbe4a720244143d229f12e0a3e2e27e6298baee3ddca9f7f6bd3e3c2818136c90a110bebbbf9b034a48f8bd1af06788c25258e61aa3bc524e492a912 WHIRLPOOL b3c977275a89c6c8b2773bddf615168bcc6f2379bf49f991e0141eb5db482035e0e611d22d6c99351dc1e41e003470322dedabcc37244289c237671bae5f792c
-EBUILD cups-1.7.2-r2.ebuild 10150 SHA256 8019245b4809c11d4156815d4a0fc3654597e95335b22767c2316aa32b722dbf SHA512 eaac20274573b9c0ccfc9f2c00aec29478070b7133fb80d7ba7347508a97ba3cbd796f9d7c08c4a1e74cd19463ecf555bd587a4d70f9def28dec7d192d43409d WHIRLPOOL 8c7ab2c920b57a2f750757457eb8790b3265f7a535f4a77506a47e5a8cce264ca0d2e54e30bc358194dc6bf7fd726e8652e90e254f8f1247e9ea1cca0f4f6b44
-MISC ChangeLog 92616 SHA256 cf7817e887e8059ef2fc2acaf4cb77736c2cc408bd8240b28439f0895fc755c9 SHA512 18ac68979faafdfd29a02862df6c88669cbb8975ad54a498a2ab437372f8fe8ca05b54242fae84eb6f3cf8a3af82a9b6fa0966303fc2c71e5b989f5964017bf7 WHIRLPOOL e457e828a6819d42953b29ab731334dc5cebc26b175f09a5c6af4a9d8687de9c5374a4654a6baf25fcde357e111bcdcb0055c2d254bb83ec21e8d87c75699c55
-MISC metadata.xml 496 SHA256 732bba7ee060b7be5e0b23d06d24c12c2bfc1c6be1440cdfebe6d5d94d145c47 SHA512 713300abb461ad923c4f6e59326fa97b2372181df4ef82bf04dd6f2d68dc0eb7c34e518cbb40ebd535cb9c4bf52d2648512002cc2cb55c6f21406cc973fa4496 WHIRLPOOL 061013ee6ddaf510964589024e39c4a05f18f0a6d2488eb5b121bb962a378348e71261f7e153f34dbb33337a2e49eb7da94e52d0cb7a128d71e9b4466f8a5933
diff --git a/net-print/cups/cups-1.7.2-r2.ebuild b/net-print/cups/cups-1.7.2-r2.ebuild
deleted file mode 100644
index e04f8ba..0000000
--- a/net-print/cups/cups-1.7.2-r2.ebuild
+++ /dev/null
@@ -1,358 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info \
-	multilib multilib-minimal pam python-single-r1 user versionator \
-	java-pkg-opt-2 systemd toolchain-funcs
-
-MY_P=${P/_rc/rc}
-MY_P=${MY_P/_beta/b}
-MY_PV=${PV/_rc/rc}
-MY_PV=${MY_PV/_beta/b}
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-2
-	EGIT_REPO_URI="http://www.cups.org/cups.git"
-	if [[ ${PV} != 9999 ]]; then
-		EGIT_BRANCH=branch-${PV/.9999}
-	fi
-	KEYWORDS=""
-else
-	SRC_URI="http://www.cups.org/software/${MY_PV}/${MY_P}-source.tar.bz2"
-#	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="The Common Unix Printing System"
-HOMEPAGE="http://www.cups.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="acl dbus debug gnutls java kerberos lprng-compat pam
-	python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
-
-LANGS="ca es fr it ja ru"
-for X in ${LANGS} ; do
-	IUSE="${IUSE} +linguas_${X}"
-done
-
-RDEPEND="
-	app-text/libpaper
-	acl? (
-		kernel_linux? (
-			sys-apps/acl
-			sys-apps/attr
-		)
-	)
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.6 )
-	kerberos? ( virtual/krb5 )
-	!lprng-compat? ( !net-print/lprng )
-	pam? ( virtual/pam )
-	python? ( ${PYTHON_DEPS} )
-	selinux? ( sec-policy/selinux-cups )
-	ssl? (
-		gnutls? (
-			dev-libs/libgcrypt:0[${MULTILIB_USEDEP}]
-			net-libs/gnutls[${MULTILIB_USEDEP}]
-		)
-		!gnutls? ( >=dev-libs/openssl-0.9.8g[${MULTILIB_USEDEP}] )
-	)
-	usb? ( virtual/libusb:1 )
-	X? ( x11-misc/xdg-utils )
-	xinetd? ( sys-apps/xinetd )
-	zeroconf? ( net-dns/avahi[${MULTILIB_USEDEP}] )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)
-"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-
-PDEPEND="
-	app-text/ghostscript-gpl[cups]
-	app-text/poppler[utils]
-	>=net-print/cups-filters-1.0.43
-"
-
-REQUIRED_USE="
-	gnutls? ( ssl )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	usb? ( threads )
-"
-
-# upstream includes an interactive test which is a nono for gentoo
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.6.0-dont-compress-manpages.patch"
-	"${FILESDIR}/${PN}-1.6.0-fix-install-perms.patch"
-	"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
-	"${FILESDIR}/${PN}-1.7.2-compile-without-zeroconf.patch"
-)
-
-MULTILIB_WRAPPED_EXECUTABLES=( @/usr/bin/cups-config )
-
-pkg_setup() {
-	enewgroup lp
-	enewuser lp -1 -1 -1 lp
-	enewgroup lpadmin 106
-
-	use python && python-single-r1_pkg_setup
-
-	if use kernel_linux; then
-		linux-info_pkg_setup
-		if  ! linux_config_exists; then
-			ewarn "Can't check the linux kernel configuration."
-			ewarn "You might have some incompatible options enabled."
-		else
-			# recheck that we don't have usblp to collide with libusb
-			if use usb; then
-				if linux_chkconfig_present USB_PRINTER; then
-					eerror "Your usb printers will be managed via libusb. In this case, "
-					eerror "${P} requires the USB_PRINTER support disabled."
-					eerror "Please disable it:"
-					eerror "    CONFIG_USB_PRINTER=n"
-					eerror "in /usr/src/linux/.config or"
-					eerror "    Device Drivers --->"
-					eerror "        USB support  --->"
-					eerror "            [ ] USB Printer support"
-					eerror "Alternatively, just disable the usb useflag for cups (your printer will still work)."
-				fi
-			else
-				#here we should warn user that he should enable it so he can print
-				if ! linux_chkconfig_present USB_PRINTER; then
-					ewarn "If you plan to use USB printers you should enable the USB_PRINTER"
-					ewarn "support in your kernel."
-					ewarn "Please enable it:"
-					ewarn "    CONFIG_USB_PRINTER=y"
-					ewarn "in /usr/src/linux/.config or"
-					ewarn "    Device Drivers --->"
-					ewarn "        USB support  --->"
-					ewarn "            [*] USB Printer support"
-					ewarn "Alternatively, enable the usb useflag for cups and use the libusb code."
-				fi
-			fi
-		fi
-	fi
-}
-
-src_prepare() {
-	base_src_prepare
-	use systemd && epatch "${FILESDIR}/${PN}-1.7.2-systemd-socket-2.patch"
-
-	# Fix install-sh, posix sh does not have 'function'.
-	sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh"
-
-	AT_M4DIR=config-scripts eaclocal
-	eautoconf
-
-	# custom Makefiles
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	export DSOFLAGS="${LDFLAGS}"
-
-	einfo LANGS=\"${LANGS}\"
-	einfo LINGUAS=\"${LINGUAS}\"
-
-	local myconf=()
-	if use ssl ; then
-		myconf+=(
-			$(use_enable gnutls)
-			$(use_enable !gnutls openssl)
-		)
-	else
-		myconf+=(
-			--disable-gnutls
-			--disable-openssl
-		)
-	fi
-
-	if tc-is-static-only; then
-		myconf+=(
-			--disable-shared
-		)
-	fi
-
-	if use systemd; then
-		myconf+=(
-			--with-systemdsystemunitdir="$(systemd_get_unitdir)"
-		)
-	fi
-
-	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--localstatedir="${EPREFIX}"/var \
-		--with-rundir="${EPREFIX}"/run/cups \
-		--with-cups-user=lp \
-		--with-cups-group=lp \
-		--with-docdir="${EPREFIX}"/usr/share/cups/html \
-		--with-languages="${LINGUAS}" \
-		--with-system-groups=lpadmin \
-		$(multilib_native_use_enable acl) \
-		$(use_enable zeroconf avahi) \
-		$(use_enable dbus) \
-		$(use_enable debug) \
-		$(use_enable debug debug-guards) \
-		$(multilib_native_use_enable kerberos gssapi) \
-		$(multilib_native_use_enable pam) \
-		$(use_enable static-libs static) \
-		$(use_enable threads) \
-		$(multilib_native_use_enable usb libusb) \
-		--disable-dnssd \
-		$(multilib_native_use_with java) \
-		--without-perl \
-		--without-php \
-		$(multilib_native_use_with python python "${PYTHON}") \
-		$(multilib_native_use_with xinetd xinetd /etc/xinetd.d) \
-		$(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper) \
-		"${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\)${EPREFIX}/usr/libexec/cups\":" Makedefs || die
-	sed -i -e "s:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN \"${EPREFIX}/usr/libexec/cups\":" config.h || die
-	sed -i -e "s:cups_serverbin=.*:cups_serverbin=\"${EPREFIX}/usr/libexec/cups\":" cups-config || die
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake libs
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && default
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake BUILDROOT="${D}" install
-	else
-		emake BUILDROOT="${D}" install-libs install-headers
-		dobin cups-config
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc {CHANGES,CREDITS,README}.txt
-
-	# move the default config file to docs
-	dodoc "${ED}"/etc/cups/cupsd.conf.default
-	rm -f "${ED}"/etc/cups/cupsd.conf.default
-
-	# clean out cups init scripts
-	rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups}
-
-	# install our init script
-	local neededservices
-	use zeroconf && neededservices+=" avahi-daemon"
-	use dbus && neededservices+=" dbus"
-	[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
-	cp "${FILESDIR}"/cupsd.init.d-r1 "${T}"/cupsd || die
-	sed -i \
-		-e "s/@neededservices@/$neededservices/" \
-		"${T}"/cupsd || die
-	doinitd "${T}"/cupsd
-
-	# install our pam script
-	pamd_mimic_system cups auth account
-
-	if use xinetd ; then
-		# correct path
-		sed -i \
-			-e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \
-			"${ED}"/etc/xinetd.d/cups-lpd || die
-		# it is safer to disable this by default, bug #137130
-		grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \
-			{ sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; }
-		# write permission for file owner (root), bug #296221
-		fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed"
-	else
-		rm -rf "${ED}"/etc/xinetd.d
-	fi
-
-	keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
-		/var/log/cups /var/spool/cups/tmp
-
-	keepdir /etc/cups/{interfaces,ppd,ssl}
-
-	use X || rm -r "${ED}"/usr/share/applications
-
-	# create /etc/cups/client.conf, bug #196967 and #266678
-	echo "ServerName ${EPREFIX}/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf
-
-	# the following files are now provided by cups-filters:
-	rm -r "${ED}"/usr/share/cups/banners || die
-	rm -r "${ED}"/usr/share/cups/data/testprint || die
-
-	# the following are created by the init script
-	rm -r "${ED}"/var/cache/cups || die
-	rm -r "${ED}"/run || die
-
-	# for the special case of running lprng and cups together, bug 467226
-	if use lprng-compat ; then
-		rm -fv "${ED}"/usr/bin/{lp*,cancel}
-		rm -fv "${ED}"/usr/sbin/lp*
-		rm -fv "${ED}"/usr/share/man/man1/{lp*,cancel*}
-		rm -fv "${ED}"/usr/share/man/man8/lp*
-		ewarn "Not installing lp... binaries, since the lprng-compat useflag is set."
-		ewarn "Unless you plan to install an exotic server setup, you most likely"
-		ewarn "do not want this. Disable the useflag then and all will be fine."
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	# Update desktop file database and gtk icon cache (bug 370059)
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-
-	# not slotted - at most one value
-	if ! [[ "${REPLACING_VERSIONS}" ]]; then
-		echo
-		elog "For information about installing a printer and general cups setup"
-		elog "take a look at: http://www.gentoo.org/doc/en/printing-howto.xml"
-		echo
-	fi
-
-	if [[ "${REPLACING_VERSIONS}" ]] && [[ "${REPLACING_VERSIONS}" < "1.6" ]]; then
-		echo
-		elog "CUPS-1.6 no longer supports automatic remote printers or implicit classes"
-		elog "via the CUPS, LDAP, or SLP protocols, i.e. \"network browsing\"."
-		elog "You will have to find printers using zeroconf/avahi instead, enter"
-		elog "the location manually, or run cups-browsed from net-print/cups-filters"
-		elog "which re-adds that functionality as a separate daemon."
-		echo
-	fi
-
-	if [[ "${REPLACING_VERSIONS}" == "1.6.2-r4" ]]; then
-		ewarn
-		ewarn "You are upgrading from the broken version net-print/cups-1.6.2-r4."
-		ewarn "Please rebuild net-print/cups-filters now to make sure everything is OK."
-		ewarn
-	fi
-}
-
-pkg_postrm() {
-	# Update desktop file database and gtk icon cache (bug 370059)
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
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.5.0-systemd-socket-2.patch b/net-print/cups/files/cups-1.5.0-systemd-socket-2.patch
deleted file mode 100644
index dfd5190..0000000
--- a/net-print/cups/files/cups-1.5.0-systemd-socket-2.patch
+++ /dev/null
@@ -1,400 +0,0 @@
-diff -up cups-1.5.0/config.h.in.systemd-socket cups-1.5.0/config.h.in
---- cups-1.5.0/config.h.in.systemd-socket	2011-10-18 15:32:40.741672460 +0100
-+++ cups-1.5.0/config.h.in	2011-10-18 15:32:40.843670530 +0100
-@@ -503,6 +503,13 @@
- 
- 
- /*
-+ * Do we have systemd support?
-+ */
-+
-+#undef HAVE_SYSTEMD
-+
-+
-+/*
-  * Various scripting languages...
-  */
- 
-diff -up cups-1.5.0/config-scripts/cups-systemd.m4.systemd-socket cups-1.5.0/config-scripts/cups-systemd.m4
---- cups-1.5.0/config-scripts/cups-systemd.m4.systemd-socket	2011-10-18 15:32:40.844670511 +0100
-+++ cups-1.5.0/config-scripts/cups-systemd.m4	2011-10-18 15:33:16.861989058 +0100
-@@ -0,0 +1,36 @@
-+dnl
-+dnl "$Id: cups-1.5.0-systemd-socket-2.patch,v 1.2 2013/04/11 11:05:05 lxnay Exp $"
-+dnl
-+dnl   systemd stuff for CUPS.
-+
-+dnl Find whether systemd is available
-+
-+SDLIBS=""
-+AC_ARG_WITH([systemdsystemunitdir],
-+        AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
-+        [], [with_systemdsystemunitdir=$($PKGCONFIG --variable=systemdsystemunitdir systemd)])
-+if test "x$with_systemdsystemunitdir" != xno; then
-+        AC_MSG_CHECKING(for libsystemd-daemon)
-+	AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
-+        if $PKGCONFIG --exists libsystemd-daemon; then
-+		AC_MSG_RESULT(yes)
-+        	SDCFLAGS=`$PKGCONFIG --cflags libsystemd-daemon`
-+        	SDLIBS=`$PKGCONFIG --libs libsystemd-daemon`
-+		AC_DEFINE(HAVE_SYSTEMD)
-+	else
-+		AC_MSG_RESULT(no)
-+	fi
-+fi
-+
-+if test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ; then
-+        SYSTEMD_UNITS="cups.service cups.socket cups.path"
-+else
-+        SYSTEMD_UNITS=""
-+fi
-+
-+AC_SUBST(SYSTEMD_UNITS)
-+AC_SUBST(SDLIBS)
-+
-+dnl
-+dnl "$Id: cups-1.5.0-systemd-socket-2.patch,v 1.2 2013/04/11 11:05:05 lxnay Exp $"
-+dnl
-diff -up cups-1.5.0/configure.in.systemd-socket cups-1.5.0/configure.in
---- cups-1.5.0/configure.in.systemd-socket	2010-11-20 01:03:46.000000000 +0000
-+++ cups-1.5.0/configure.in	2011-10-18 15:32:40.844670511 +0100
-@@ -37,6 +37,7 @@ sinclude(config-scripts/cups-pam.m4)
- sinclude(config-scripts/cups-largefile.m4)
- sinclude(config-scripts/cups-dnssd.m4)
- sinclude(config-scripts/cups-launchd.m4)
-+sinclude(config-scripts/cups-systemd.m4)
- sinclude(config-scripts/cups-defaults.m4)
- sinclude(config-scripts/cups-pdf.m4)
- sinclude(config-scripts/cups-scripting.m4)
-@@ -71,6 +72,9 @@ AC_OUTPUT(Makedefs
- 	  conf/snmp.conf
- 	  cups-config
- 	  data/testprint
-+          data/cups.service
-+          data/cups.socket
-+          data/cups.path
- 	  desktop/cups.desktop
- 	  doc/help/ref-cupsd-conf.html
- 	  doc/help/standard.html
-diff -up cups-1.5.0/cups/usersys.c.systemd-socket cups-1.5.0/cups/usersys.c
---- cups-1.5.0/cups/usersys.c.systemd-socket	2011-10-18 15:32:40.645674277 +0100
-+++ cups-1.5.0/cups/usersys.c	2011-10-18 15:32:40.845670492 +0100
-@@ -770,7 +770,7 @@ cups_read_client_conf(
-     struct stat	sockinfo;		/* Domain socket information */
- 
-     if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) &&
--	(sockinfo.st_mode & S_IRWXO) == S_IRWXO)
-+	(sockinfo.st_mode & (S_IROTH | S_IWOTH)) == (S_IROTH | S_IWOTH))
-       cups_server = CUPS_DEFAULT_DOMAINSOCKET;
-     else
- #endif /* CUPS_DEFAULT_DOMAINSOCKET */
-diff -up cups-1.5.0/data/cups.path.in.systemd-socket cups-1.5.0/data/cups.path.in
---- cups-1.5.0/data/cups.path.in.systemd-socket	2011-10-18 15:32:40.846670473 +0100
-+++ cups-1.5.0/data/cups.path.in	2011-10-18 15:32:40.846670473 +0100
-@@ -0,0 +1,8 @@
-+[Unit]
-+Description=CUPS Printer Service Spool
-+
-+[Path]
-+PathExistsGlob=@CUPS_REQUESTS@/d*
-+
-+[Install]
-+WantedBy=multi-user.target
-diff -up cups-1.5.0/data/cups.service.in.systemd-socket cups-1.5.0/data/cups.service.in
---- cups-1.5.0/data/cups.service.in.systemd-socket	2011-10-18 15:32:40.846670473 +0100
-+++ cups-1.5.0/data/cups.service.in	2011-10-18 15:32:40.846670473 +0100
-@@ -0,0 +1,9 @@
-+[Unit]
-+Description=CUPS Printing Service
-+
-+[Service]
-+ExecStart=@sbindir@/cupsd -f
-+
-+[Install]
-+Also=cups.socket cups.path
-+WantedBy=printer.target
-diff -up cups-1.5.0/data/cups.socket.in.systemd-socket cups-1.5.0/data/cups.socket.in
---- cups-1.5.0/data/cups.socket.in.systemd-socket	2011-10-18 15:32:40.847670454 +0100
-+++ cups-1.5.0/data/cups.socket.in	2011-10-18 15:32:40.847670454 +0100
-@@ -0,0 +1,10 @@
-+[Unit]
-+Description=CUPS Printing Service Sockets
-+
-+[Socket]
-+ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
-+ListenStream=631
-+BindIPv6Only=ipv6-only
-+
-+[Install]
-+WantedBy=sockets.target
-diff -up cups-1.5.0/data/Makefile.systemd-socket cups-1.5.0/data/Makefile
---- cups-1.5.0/data/Makefile.systemd-socket	2011-05-12 06:21:56.000000000 +0100
-+++ cups-1.5.0/data/Makefile	2011-10-18 15:32:40.847670454 +0100
-@@ -112,6 +112,12 @@ install-data:
- 		$(INSTALL_DATA) $$file $(DATADIR)/ppdc; \
- 	done
- 	$(INSTALL_DIR) -m 755 $(DATADIR)/profiles
-+	if test "x$(SYSTEMD_UNITS)" != "x" ; then \
-+		$(INSTALL_DIR) -m 755 $(SYSTEMDUNITDIR); \
-+		for file in $(SYSTEMD_UNITS); do \
-+			$(INSTALL_DATA) $$file $(SYSTEMDUNITDIR); \
-+		done; \
-+	fi
- 
- 
- #
-@@ -159,6 +165,9 @@ uninstall:
- 	-$(RMDIR) $(DATADIR)/charsets
- 	-$(RMDIR) $(DATADIR)/banners
- 	-$(RMDIR) $(DATADIR)
-+	for file in $(SYSTEMD_UNITS); do \
-+		$(RM) $(SYSTEMDUNITDIR)/$$file; \
-+	done
- 
- 
- #
-diff -up cups-1.5.0/Makedefs.in.systemd-socket cups-1.5.0/Makedefs.in
---- cups-1.5.0/Makedefs.in.systemd-socket	2011-10-18 15:32:40.719672876 +0100
-+++ cups-1.5.0/Makedefs.in	2011-10-18 15:32:40.848670435 +0100
-@@ -143,6 +143,7 @@ CXXFLAGS	=	@CPPFLAGS@ @CXXFLAGS@
- CXXLIBS		=	@CXXLIBS@
- DBUS_NOTIFIER	=	@DBUS_NOTIFIER@
- DBUS_NOTIFIERLIBS =	@DBUS_NOTIFIERLIBS@
-+SYSTEMD_UNITS   =       @SYSTEMD_UNITS@
- DNSSD_BACKEND	=	@DNSSD_BACKEND@
- DSOFLAGS	=	-L../cups @DSOFLAGS@
- DSOLIBS		=	@DSOLIBS@ $(COMMONLIBS)
-@@ -151,6 +152,7 @@ FONTS		=	@FONTS@
- IMGLIBS		=	@IMGLIBS@
- IMGFILTERS	=	@IMGFILTERS@
- LAUNCHDLIBS	=	@LAUNCHDLIBS@
-+SDLIBS		=	@SDLIBS@
- LDFLAGS		=	-L../cgi-bin -L../cups -L../filter -L../ppdc \
- 			-L../scheduler @LDARCHFLAGS@ \
- 			@LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
-@@ -267,6 +269,7 @@ PAMFILE		=	@PAMFILE@
- 
- DEFAULT_LAUNCHD_CONF =	@DEFAULT_LAUNCHD_CONF@
- DBUSDIR		=	@DBUSDIR@
-+SYSTEMDUNITDIR  =       $(BUILDROOT)@systemdsystemunitdir@
- 
- 
- #
-diff -up cups-1.5.0/scheduler/client.h.systemd-socket cups-1.5.0/scheduler/client.h
---- cups-1.5.0/scheduler/client.h.systemd-socket	2011-03-25 21:25:38.000000000 +0000
-+++ cups-1.5.0/scheduler/client.h	2011-10-18 15:32:40.848670435 +0100
-@@ -75,6 +75,9 @@ typedef struct
-   int			fd;		/* File descriptor for this server */
-   http_addr_t		address;	/* Bind address of socket */
-   http_encryption_t	encryption;	/* To encrypt or not to encrypt... */
-+#ifdef HAVE_SYSTEMD
-+  int			is_systemd;	/* Is this a systemd socket? */
-+#endif /* HAVE_SYSTEMD */
- } cupsd_listener_t;
- 
- 
-diff -up cups-1.5.0/scheduler/listen.c.systemd-socket cups-1.5.0/scheduler/listen.c
---- cups-1.5.0/scheduler/listen.c.systemd-socket	2011-04-16 00:38:13.000000000 +0100
-+++ cups-1.5.0/scheduler/listen.c	2011-10-18 15:32:40.849670416 +0100
-@@ -401,7 +401,11 @@ cupsdStopListening(void)
-        lis;
-        lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
-   {
--    if (lis->fd != -1)
-+    if (lis->fd != -1
-+#ifdef HAVE_SYSTEMD
-+        && !lis->is_systemd
-+#endif /* HAVE_SYSTEMD */
-+        )
-     {
- #ifdef WIN32
-       closesocket(lis->fd);
-diff -up cups-1.5.0/scheduler/main.c.systemd-socket cups-1.5.0/scheduler/main.c
---- cups-1.5.0/scheduler/main.c.systemd-socket	2011-10-18 15:32:40.802671306 +0100
-+++ cups-1.5.0/scheduler/main.c	2011-10-18 15:32:40.851670379 +0100
-@@ -26,6 +26,8 @@
-  *   launchd_checkin()     - Check-in with launchd and collect the listening
-  *                           fds.
-  *   launchd_checkout()    - Update the launchd KeepAlive file as needed.
-+ *   systemd_checkin()     - Check-in with systemd and collect the
-+ *                           listening fds.
-  *   parent_handler()      - Catch USR1/CHLD signals...
-  *   process_children()    - Process all dead children...
-  *   select_timeout()      - Calculate the select timeout value.
-@@ -62,6 +64,10 @@
- #  endif /* !LAUNCH_JOBKEY_SERVICEIPC */
- #endif /* HAVE_LAUNCH_H */
- 
-+#ifdef HAVE_SYSTEMD
-+#include <systemd/sd-daemon.h>
-+#endif /* HAVE_SYSTEMD */
-+
- #if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
- #  include <malloc.h>
- #endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
-@@ -83,6 +89,9 @@
- static void		launchd_checkin(void);
- static void		launchd_checkout(void);
- #endif /* HAVE_LAUNCHD */
-+#ifdef HAVE_SYSTEMD
-+static int		systemd_checkin(void);
-+#endif /* HAVE_SYSTEMD */
- static void		parent_handler(int sig);
- static void		process_children(void);
- static void		sigchld_handler(int sig);
-@@ -571,6 +580,14 @@ main(int  argc,				/* I - Number of comm
-   }
- #endif /* HAVE_LAUNCHD */
- 
-+#ifdef HAVE_SYSTEMD
-+ /*
-+  * If we were started by systemd get the listen sockets file descriptors...
-+  */
-+  if (systemd_checkin() < 0)
-+    exit(EXIT_FAILURE);
-+#endif /* HAVE_SYSTEMD */
-+
-  /*
-   * Startup the server...
-   */
-@@ -781,6 +798,16 @@ main(int  argc,				/* I - Number of comm
- 	}
- #endif /* HAVE_LAUNCHD */
- 
-+#ifdef HAVE_SYSTEMD
-+       /*
-+	* If we were started by systemd get the listen sockets file
-+	* descriptors...
-+        */
-+
-+        if (systemd_checkin() < 0)
-+	  exit(EXIT_FAILURE);
-+#endif /* HAVE_SYSTEMD */
-+
-        /*
-         * Startup the server...
-         */
-@@ -1542,6 +1569,102 @@ launchd_checkout(void)
- }
- #endif /* HAVE_LAUNCHD */
- 
-+#ifdef HAVE_SYSTEMD
-+static int
-+systemd_checkin(void)
-+{
-+  int n, fd;
-+
-+  n = sd_listen_fds(0);
-+  if (n < 0)
-+  {
-+    cupsdLogMessage(CUPSD_LOG_ERROR,
-+		    "systemd_checkin: Failed to acquire sockets "
-+		    "from systemd - %s -- skipping systemd activation",
-+           strerror(-n));
-+    return (1);
-+  }
-+
-+  if (n == 0)
-+    return (0);
-+
-+  for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + n; fd ++)
-+  {
-+    http_addr_t addr;
-+    socklen_t addrlen = sizeof (addr);
-+    int r;
-+    cupsd_listener_t *lis;
-+    char s[256];
-+
-+    r = sd_is_socket(fd, AF_UNSPEC, SOCK_STREAM, 1);
-+    if (r < 0) {
-+      cupsdLogMessage(CUPSD_LOG_ERROR,
-+             "systemd_checkin: Unable to verify socket type - %s",
-+             strerror(-r));
-+      continue;
-+    }
-+
-+    if (!r) {
-+      cupsdLogMessage(CUPSD_LOG_ERROR,
-+             "systemd_checkin: Socket not of the right type");
-+      continue;
-+    }
-+
-+    if (getsockname(fd, (struct sockaddr*) &addr, &addrlen))
-+    {
-+      cupsdLogMessage(CUPSD_LOG_ERROR,
-+             "systemd_checkin: Unable to get local address - %s",
-+             strerror(errno));
-+      continue;
-+    }
-+
-+     /*
-+    * Try to match the systemd socket address to one of the listeners...
-+    */
-+
-+    for (lis = (cupsd_listener_t *)cupsArrayFirst(Listeners);
-+       lis;
-+       lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
-+      if (httpAddrEqual(&lis->address, &addr))
-+      break;
-+
-+    if (lis)
-+    {
-+      cupsdLogMessage(CUPSD_LOG_DEBUG,
-+                      "systemd_checkin: Matched existing listener %s with fd %d...",
-+                      httpAddrString(&(lis->address), s, sizeof(s)), fd);
-+    }
-+    else
-+    {
-+      cupsdLogMessage(CUPSD_LOG_DEBUG,
-+                      "systemd_checkin: Adding new listener %s with fd %d...",
-+                      httpAddrString(&addr, s, sizeof(s)), fd);
-+
-+      if ((lis = calloc(1, sizeof(cupsd_listener_t))) == NULL)
-+      {
-+        cupsdLogMessage(CUPSD_LOG_ERROR,
-+                        "systemd_checkin: Unable to allocate listener - "
-+                        "%s.", strerror(errno));
-+	return (-ENOMEM);
-+      }
-+
-+      cupsArrayAdd(Listeners, lis);
-+
-+      memcpy(&lis->address, &addr, sizeof(lis->address));
-+    }
-+
-+    lis->fd = fd;
-+    lis->is_systemd = 1;
-+
-+#  ifdef HAVE_SSL
-+    if (_httpAddrPort(&(lis->address)) == 443)
-+      lis->encryption = HTTP_ENCRYPT_ALWAYS;
-+#  endif /* HAVE_SSL */
-+  }
-+
-+  return (0);
-+}
-+#endif /* HAVE_SYSTEMD */
- 
- /*
-  * 'parent_handler()' - Catch USR1/CHLD signals...
-diff -up cups-1.5.0/scheduler/Makefile.systemd-socket cups-1.5.0/scheduler/Makefile
---- cups-1.5.0/scheduler/Makefile.systemd-socket	2011-10-18 15:32:40.817671022 +0100
-+++ cups-1.5.0/scheduler/Makefile	2011-10-18 15:32:40.852670360 +0100
-@@ -382,7 +382,7 @@ cupsd:	$(CUPSDOBJS) $(LIBCUPSMIME) ../cu
- 	$(CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) -L. -lcupsmime \
- 		$(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
- 		$(LIBPAPER) $(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBS) \
--		$(LIBGSSAPI) $(LIBWRAP)
-+		$(LIBGSSAPI) $(LIBWRAP) $(SDLIBS)
- 
- cupsd-static:	$(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPSSTATIC)
- 	echo Linking $@...
-@@ -390,7 +390,7 @@ cupsd-static:	$(CUPSDOBJS) libcupsmime.a
- 		$(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
- 		../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(LIBPAPER) \
- 		$(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBGSSAPI) \
--		$(LIBWRAP)
-+		$(LIBWRAP) $(SDLIBS)
- 
- 
- #
diff --git a/net-print/cups/files/cups-1.6.0-dont-compress-manpages.patch b/net-print/cups/files/cups-1.6.0-dont-compress-manpages.patch
deleted file mode 100644
index 62db46e..0000000
--- a/net-print/cups/files/cups-1.6.0-dont-compress-manpages.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: config-scripts/cups-manpages.m4
-===================================================================
---- config-scripts/cups-manpages.m4	(Revision 10458)
-+++ config-scripts/cups-manpages.m4	(Arbeitskopie)
-@@ -69,10 +69,10 @@
- 		;;
- 	Linux* | GNU* | Darwin*)
- 		# Linux, GNU Hurd, and 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.6.0-fix-install-perms.patch b/net-print/cups/files/cups-1.6.0-fix-install-perms.patch
deleted file mode 100644
index 2d7a77c..0000000
--- a/net-print/cups/files/cups-1.6.0-fix-install-perms.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: Makedefs.in
-===================================================================
---- Makedefs.in	(Revision 10520)
-+++ Makedefs.in	(Arbeitskopie)
-@@ -40,14 +40,14 @@
- # Installation programs...
- #
- 
--INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
--INSTALL_COMPDATA =	$(INSTALL) -c -m 444 @INSTALL_GZIP@
-+INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
-+INSTALL_COMPDATA =	$(INSTALL) -c -m 644 @INSTALL_GZIP@
- INSTALL_CONFIG	=	$(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
--INSTALL_DATA	=	$(INSTALL) -c -m 444
-+INSTALL_DATA	=	$(INSTALL) -c -m 644
- INSTALL_DIR	=	$(INSTALL) -d
--INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
--INSTALL_MAN	=	$(INSTALL) -c -m 444
--INSTALL_SCRIPT	=	$(INSTALL) -c -m 555
-+INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
-+INSTALL_MAN	=	$(INSTALL) -c -m 644
-+INSTALL_SCRIPT	=	$(INSTALL) -c -m 755
- 
- #
- # Default user, group, and system groups for the scheduler...
diff --git a/net-print/cups/files/cups-1.7.1-str4356.patch b/net-print/cups/files/cups-1.7.1-str4356.patch
deleted file mode 100644
index 6a1c8c4..0000000
--- a/net-print/cups/files/cups-1.7.1-str4356.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: scheduler/client.c
-===================================================================
---- scheduler/client.c	(revision 11597)
-+++ scheduler/client.c	(working copy)
-@@ -3316,6 +3316,14 @@
-     return (0);
- 
-  /*
-+  * Check for "<" or quotes in the path and reject since this is probably
-+  * someone trying to inject HTML...
-+  */
-+
-+  if (strchr(path, '<') != NULL || strchr(path, '\"') != NULL || strchr(path, '\'') != NULL)
-+    return (0);
-+
-+ /*
-   * Check for "/.." in the path...
-   */
- 
diff --git a/net-print/cups/files/cups-1.7.2-compile-without-zeroconf.patch b/net-print/cups/files/cups-1.7.2-compile-without-zeroconf.patch
deleted file mode 100644
index ed84af2..0000000
--- a/net-print/cups/files/cups-1.7.2-compile-without-zeroconf.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-XXXXXXXXXXXXX
-commit 8441e27ce4008828cbdd25bdd6249c0019853b92
-Author: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
-Date:   Fri May 9 20:57:11 2014 +0000
-
-    CUPS did not compile when Avahi or mDNSResponder was not present (STR #4402)
-    
-    
-    
-    git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11871 a1ca3aef-8c08-0410-bb20-df032aa958be
-XXXXXXXXXXXXX
-
-This is a modified version of the patch omitting the changelog,
-which otherwise prevents the patch from applying.
-
--gmt
-
-diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
-index 495bf1b..4e417b0 100644
---- a/scheduler/dirsvc.c
-+++ b/scheduler/dirsvc.c
-@@ -237,11 +237,13 @@ cupsdStartBrowsing(void)
-   if (BrowseLocalProtocols & BROWSE_SMB)
-     update_smb(1);
- 
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-  /*
-   * Register the individual printers
-   */
- 
-   dnssdRegisterAllPrinters(0);
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
- }
- 
- 
-@@ -255,6 +257,7 @@ cupsdStopBrowsing(void)
-   if (!Browsing || !BrowseLocalProtocols)
-     return;
- 
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-  /*
-   * De-register the individual printers
-   */
-@@ -265,7 +268,6 @@ cupsdStopBrowsing(void)
-   * Shut down browsing sockets...
-   */
- 
--#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   if ((BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDMaster)
-     dnssdStop();
- #endif /* HAVE_DNSSD || HAVE_AVAHI */
diff --git a/net-print/cups/files/cups-1.7.2-systemd-socket-2.patch b/net-print/cups/files/cups-1.7.2-systemd-socket-2.patch
deleted file mode 100644
index 547f31b..0000000
--- a/net-print/cups/files/cups-1.7.2-systemd-socket-2.patch
+++ /dev/null
@@ -1,391 +0,0 @@
-diff -ruN cups-1.7.2.orig/Makedefs.in cups-1.7.2/Makedefs.in
---- cups-1.7.2.orig/Makedefs.in	2013-07-17 17:21:18.000000000 +0200
-+++ cups-1.7.2/Makedefs.in	2014-04-15 13:24:45.594054459 +0200
-@@ -134,6 +134,7 @@
- CXXLIBS		=	@CXXLIBS@
- DBUS_NOTIFIER	=	@DBUS_NOTIFIER@
- DBUS_NOTIFIERLIBS =	@DBUS_NOTIFIERLIBS@
-+SYSTEMD_UNITS   =       @SYSTEMD_UNITS@
- DNSSD_BACKEND	=	@DNSSD_BACKEND@
- DSOFLAGS	=	-L../cups @DSOFLAGS@
- DSOLIBS		=	@DSOLIBS@ $(COMMONLIBS)
-@@ -141,6 +142,7 @@
- IPPFIND_BIN	=	@IPPFIND_BIN@
- IPPFIND_MAN	=	@IPPFIND_MAN@
- LAUNCHDLIBS	=	@LAUNCHDLIBS@
-+SDLIBS		=	@SDLIBS@
- LDFLAGS		=	-L../cgi-bin -L../cups -L../filter -L../ppdc \
- 			-L../scheduler @LDARCHFLAGS@ \
- 			@LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
-@@ -232,6 +234,7 @@
- 
- DEFAULT_LAUNCHD_CONF =	@DEFAULT_LAUNCHD_CONF@
- DBUSDIR		=	@DBUSDIR@
-+SYSTEMDUNITDIR  =       $(BUILDROOT)@systemdsystemunitdir@
- 
- 
- #
-diff -ruN cups-1.7.2.orig/config-scripts/cups-systemd.m4 cups-1.7.2/config-scripts/cups-systemd.m4
---- cups-1.7.2.orig/config-scripts/cups-systemd.m4	1970-01-01 01:00:00.000000000 +0100
-+++ cups-1.7.2/config-scripts/cups-systemd.m4	2014-04-15 13:24:45.592054459 +0200
-@@ -0,0 +1,36 @@
-+dnl
-+dnl "$Id: cups-1.7.2-systemd-socket-2.patch,v 1.1 2014/04/15 11:34:10 dilfridge Exp $"
-+dnl
-+dnl   systemd stuff for CUPS.
-+
-+dnl Find whether systemd is available
-+
-+SDLIBS=""
-+AC_ARG_WITH([systemdsystemunitdir],
-+        AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
-+        [], [with_systemdsystemunitdir=$($PKGCONFIG --variable=systemdsystemunitdir systemd)])
-+if test "x$with_systemdsystemunitdir" != xno; then
-+        AC_MSG_CHECKING(for libsystemd-daemon)
-+	AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
-+        if $PKGCONFIG --exists libsystemd-daemon; then
-+		AC_MSG_RESULT(yes)
-+        	SDCFLAGS=`$PKGCONFIG --cflags libsystemd-daemon`
-+        	SDLIBS=`$PKGCONFIG --libs libsystemd-daemon`
-+		AC_DEFINE(HAVE_SYSTEMD)
-+	else
-+		AC_MSG_RESULT(no)
-+	fi
-+fi
-+
-+if test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ; then
-+        SYSTEMD_UNITS="cups.service cups.socket cups.path"
-+else
-+        SYSTEMD_UNITS=""
-+fi
-+
-+AC_SUBST(SYSTEMD_UNITS)
-+AC_SUBST(SDLIBS)
-+
-+dnl
-+dnl "$Id: cups-1.7.2-systemd-socket-2.patch,v 1.1 2014/04/15 11:34:10 dilfridge Exp $"
-+dnl
-diff -ruN cups-1.7.2.orig/config.h.in cups-1.7.2/config.h.in
---- cups-1.7.2.orig/config.h.in	2014-02-27 16:57:59.000000000 +0100
-+++ cups-1.7.2/config.h.in	2014-04-15 13:24:45.592054459 +0200
-@@ -451,6 +451,13 @@
- 
- 
- /*
-+ * Do we have systemd support?
-+ */
-+
-+#undef HAVE_SYSTEMD
-+
-+
-+/*
-  * Various scripting languages...
-  */
- 
-diff -ruN cups-1.7.2.orig/configure.in cups-1.7.2/configure.in
---- cups-1.7.2.orig/configure.in	2013-07-08 23:15:13.000000000 +0200
-+++ cups-1.7.2/configure.in	2014-04-15 13:24:45.593054459 +0200
-@@ -33,6 +33,7 @@
- sinclude(config-scripts/cups-largefile.m4)
- sinclude(config-scripts/cups-dnssd.m4)
- sinclude(config-scripts/cups-launchd.m4)
-+sinclude(config-scripts/cups-systemd.m4)
- sinclude(config-scripts/cups-defaults.m4)
- sinclude(config-scripts/cups-scripting.m4)
- 
-@@ -67,6 +68,9 @@
- 	  conf/snmp.conf
- 	  cups-config
- 	  data/testprint
-+          data/cups.service
-+          data/cups.socket
-+          data/cups.path
- 	  desktop/cups.desktop
- 	  doc/help/ref-cups-files-conf.html
- 	  doc/help/ref-cupsd-conf.html
-diff -ruN cups-1.7.2.orig/cups/usersys.c cups-1.7.2/cups/usersys.c
---- cups-1.7.2.orig/cups/usersys.c	2014-03-05 22:22:12.000000000 +0100
-+++ cups-1.7.2/cups/usersys.c	2014-04-15 13:24:45.593054459 +0200
-@@ -1050,7 +1050,7 @@
-     struct stat	sockinfo;		/* Domain socket information */
- 
-     if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) &&
--	(sockinfo.st_mode & S_IRWXO) == S_IRWXO)
-+	(sockinfo.st_mode & (S_IROTH | S_IWOTH)) == (S_IROTH | S_IWOTH))
-       cups_server = CUPS_DEFAULT_DOMAINSOCKET;
-     else
- #endif /* CUPS_DEFAULT_DOMAINSOCKET */
-diff -ruN cups-1.7.2.orig/data/Makefile cups-1.7.2/data/Makefile
---- cups-1.7.2.orig/data/Makefile	2013-05-29 13:51:34.000000000 +0200
-+++ cups-1.7.2/data/Makefile	2014-04-15 13:24:45.594054459 +0200
-@@ -100,6 +100,12 @@
- 		$(INSTALL_DATA) $$file $(DATADIR)/ppdc; \
- 	done
- 	$(INSTALL_DIR) -m 755 $(DATADIR)/profiles
-+	if test "x$(SYSTEMD_UNITS)" != "x" ; then \
-+		$(INSTALL_DIR) -m 755 $(SYSTEMDUNITDIR); \
-+		for file in $(SYSTEMD_UNITS); do \
-+			$(INSTALL_DATA) $$file $(SYSTEMDUNITDIR); \
-+		done; \
-+	fi
- 
- 
- #
-@@ -143,6 +149,9 @@
- 	-$(RMDIR) $(DATADIR)/data
- 	-$(RMDIR) $(DATADIR)/banners
- 	-$(RMDIR) $(DATADIR)
-+	for file in $(SYSTEMD_UNITS); do \
-+		$(RM) $(SYSTEMDUNITDIR)/$$file; \
-+	done
- 
- 
- #
-diff -ruN cups-1.7.2.orig/data/cups.path.in cups-1.7.2/data/cups.path.in
---- cups-1.7.2.orig/data/cups.path.in	1970-01-01 01:00:00.000000000 +0100
-+++ cups-1.7.2/data/cups.path.in	2014-04-15 13:24:45.593054459 +0200
-@@ -0,0 +1,8 @@
-+[Unit]
-+Description=CUPS Printer Service Spool
-+
-+[Path]
-+PathExistsGlob=@CUPS_REQUESTS@/d*
-+
-+[Install]
-+WantedBy=multi-user.target
-diff -ruN cups-1.7.2.orig/data/cups.service.in cups-1.7.2/data/cups.service.in
---- cups-1.7.2.orig/data/cups.service.in	1970-01-01 01:00:00.000000000 +0100
-+++ cups-1.7.2/data/cups.service.in	2014-04-15 13:24:45.594054459 +0200
-@@ -0,0 +1,9 @@
-+[Unit]
-+Description=CUPS Printing Service
-+
-+[Service]
-+ExecStart=@sbindir@/cupsd -f
-+
-+[Install]
-+Also=cups.socket cups.path
-+WantedBy=printer.target
-diff -ruN cups-1.7.2.orig/data/cups.socket.in cups-1.7.2/data/cups.socket.in
---- cups-1.7.2.orig/data/cups.socket.in	1970-01-01 01:00:00.000000000 +0100
-+++ cups-1.7.2/data/cups.socket.in	2014-04-15 13:24:45.594054459 +0200
-@@ -0,0 +1,10 @@
-+[Unit]
-+Description=CUPS Printing Service Sockets
-+
-+[Socket]
-+ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
-+ListenStream=631
-+BindIPv6Only=ipv6-only
-+
-+[Install]
-+WantedBy=sockets.target
-diff -ruN cups-1.7.2.orig/scheduler/Makefile cups-1.7.2/scheduler/Makefile
---- cups-1.7.2.orig/scheduler/Makefile	2013-05-29 13:51:34.000000000 +0200
-+++ cups-1.7.2/scheduler/Makefile	2014-04-15 13:24:45.595054459 +0200
-@@ -381,7 +381,7 @@
- 	$(CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) -L. -lcupsmime \
- 		$(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
- 		$(LIBPAPER) $(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBS) \
--		$(LIBGSSAPI) $(LIBWRAP)
-+		$(LIBGSSAPI) $(LIBWRAP) $(SDLIBS)
- 
- cupsd-static:	$(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPSSTATIC)
- 	echo Linking $@...
-@@ -389,7 +389,7 @@
- 		$(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
- 		../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(LIBPAPER) \
- 		$(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBGSSAPI) \
--		$(LIBWRAP)
-+		$(LIBWRAP) $(SDLIBS)
- 
- tls.o:	tls-darwin.c tls-gnutls.c tls-openssl.c
- 
-diff -ruN cups-1.7.2.orig/scheduler/client.h cups-1.7.2/scheduler/client.h
---- cups-1.7.2.orig/scheduler/client.h	2013-08-02 00:23:18.000000000 +0200
-+++ cups-1.7.2/scheduler/client.h	2014-04-15 13:24:45.594054459 +0200
-@@ -79,6 +79,9 @@
-   int			fd;		/* File descriptor for this server */
-   http_addr_t		address;	/* Bind address of socket */
-   http_encryption_t	encryption;	/* To encrypt or not to encrypt... */
-+#ifdef HAVE_SYSTEMD
-+  int			is_systemd;	/* Is this a systemd socket? */
-+#endif /* HAVE_SYSTEMD */
- } cupsd_listener_t;
- 
- 
-diff -ruN cups-1.7.2.orig/scheduler/listen.c cups-1.7.2/scheduler/listen.c
---- cups-1.7.2.orig/scheduler/listen.c	2013-05-29 13:51:34.000000000 +0200
-+++ cups-1.7.2/scheduler/listen.c	2014-04-15 13:24:45.594054459 +0200
-@@ -401,7 +401,11 @@
-        lis;
-        lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
-   {
--    if (lis->fd != -1)
-+    if (lis->fd != -1
-+#ifdef HAVE_SYSTEMD
-+        && !lis->is_systemd
-+#endif /* HAVE_SYSTEMD */
-+        )
-     {
- #ifdef WIN32
-       closesocket(lis->fd);
-diff -ruN cups-1.7.2.orig/scheduler/main.c cups-1.7.2/scheduler/main.c
---- cups-1.7.2.orig/scheduler/main.c	2014-03-21 19:18:56.000000000 +0100
-+++ cups-1.7.2/scheduler/main.c	2014-04-15 13:24:45.595054459 +0200
-@@ -39,6 +39,10 @@
- #  endif /* !LAUNCH_JOBKEY_SERVICEIPC */
- #endif /* HAVE_LAUNCH_H */
- 
-+#ifdef HAVE_SYSTEMD
-+#include <systemd/sd-daemon.h>
-+#endif /* HAVE_SYSTEMD */
-+
- #if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
- #  include <malloc.h>
- #endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
-@@ -64,6 +68,9 @@
- static void		launchd_checkin(void);
- static void		launchd_checkout(void);
- #endif /* HAVE_LAUNCHD */
-+#ifdef HAVE_SYSTEMD
-+static int		systemd_checkin(void);
-+#endif /* HAVE_SYSTEMD */
- static void		parent_handler(int sig);
- static void		process_children(void);
- static void		sigchld_handler(int sig);
-@@ -553,6 +560,14 @@
-   }
- #endif /* HAVE_LAUNCHD */
- 
-+#ifdef HAVE_SYSTEMD
-+ /*
-+  * If we were started by systemd get the listen sockets file descriptors...
-+  */
-+  if (systemd_checkin() < 0)
-+    exit(EXIT_FAILURE);
-+#endif /* HAVE_SYSTEMD */
-+
-  /*
-   * Startup the server...
-   */
-@@ -741,6 +756,16 @@
- 	}
- #endif /* HAVE_LAUNCHD */
- 
-+#ifdef HAVE_SYSTEMD
-+       /*
-+	* If we were started by systemd get the listen sockets file
-+	* descriptors...
-+        */
-+
-+        if (systemd_checkin() < 0)
-+	  exit(EXIT_FAILURE);
-+#endif /* HAVE_SYSTEMD */
-+
-        /*
-         * Startup the server...
-         */
-@@ -1490,6 +1515,102 @@
- }
- #endif /* HAVE_LAUNCHD */
- 
-+#ifdef HAVE_SYSTEMD
-+static int
-+systemd_checkin(void)
-+{
-+  int n, fd;
-+
-+  n = sd_listen_fds(0);
-+  if (n < 0)
-+  {
-+    cupsdLogMessage(CUPSD_LOG_ERROR,
-+		    "systemd_checkin: Failed to acquire sockets "
-+		    "from systemd - %s -- skipping systemd activation",
-+           strerror(-n));
-+    return (1);
-+  }
-+
-+  if (n == 0)
-+    return (0);
-+
-+  for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + n; fd ++)
-+  {
-+    http_addr_t addr;
-+    socklen_t addrlen = sizeof (addr);
-+    int r;
-+    cupsd_listener_t *lis;
-+    char s[256];
-+
-+    r = sd_is_socket(fd, AF_UNSPEC, SOCK_STREAM, 1);
-+    if (r < 0) {
-+      cupsdLogMessage(CUPSD_LOG_ERROR,
-+             "systemd_checkin: Unable to verify socket type - %s",
-+             strerror(-r));
-+      continue;
-+    }
-+
-+    if (!r) {
-+      cupsdLogMessage(CUPSD_LOG_ERROR,
-+             "systemd_checkin: Socket not of the right type");
-+      continue;
-+    }
-+
-+    if (getsockname(fd, (struct sockaddr*) &addr, &addrlen))
-+    {
-+      cupsdLogMessage(CUPSD_LOG_ERROR,
-+             "systemd_checkin: Unable to get local address - %s",
-+             strerror(errno));
-+      continue;
-+    }
-+
-+     /*
-+    * Try to match the systemd socket address to one of the listeners...
-+    */
-+
-+    for (lis = (cupsd_listener_t *)cupsArrayFirst(Listeners);
-+       lis;
-+       lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
-+      if (httpAddrEqual(&lis->address, &addr))
-+      break;
-+
-+    if (lis)
-+    {
-+      cupsdLogMessage(CUPSD_LOG_DEBUG,
-+                      "systemd_checkin: Matched existing listener %s with fd %d...",
-+                      httpAddrString(&(lis->address), s, sizeof(s)), fd);
-+    }
-+    else
-+    {
-+      cupsdLogMessage(CUPSD_LOG_DEBUG,
-+                      "systemd_checkin: Adding new listener %s with fd %d...",
-+                      httpAddrString(&addr, s, sizeof(s)), fd);
-+
-+      if ((lis = calloc(1, sizeof(cupsd_listener_t))) == NULL)
-+      {
-+        cupsdLogMessage(CUPSD_LOG_ERROR,
-+                        "systemd_checkin: Unable to allocate listener - "
-+                        "%s.", strerror(errno));
-+	return (-ENOMEM);
-+      }
-+
-+      cupsArrayAdd(Listeners, lis);
-+
-+      memcpy(&lis->address, &addr, sizeof(lis->address));
-+    }
-+
-+    lis->fd = fd;
-+    lis->is_systemd = 1;
-+
-+#  ifdef HAVE_SSL
-+    if (_httpAddrPort(&(lis->address)) == 443)
-+      lis->encryption = HTTP_ENCRYPT_ALWAYS;
-+#  endif /* HAVE_SSL */
-+  }
-+
-+  return (0);
-+}
-+#endif /* HAVE_SYSTEMD */
- 
- /*
-  * 'parent_handler()' - Catch USR1/CHLD signals...
diff --git a/net-print/cups/files/cupsd.init.d-r1 b/net-print/cups/files/cupsd.init.d-r1
deleted file mode 100644
index 2f2e9e2..0000000
--- a/net-print/cups/files/cupsd.init.d-r1
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/runscript
-
-depend() {
-	use net
-	@neededservices@
-	before nfs
-	after logger
-}
-
-start() {
-	ebegin "Starting cupsd"
-
-	checkpath -q -d -m 0775 -o root:lp /var/cache/cups
-	checkpath -q -d -m 0775 -o root:lp /var/cache/cups/rss
-	checkpath -q -d -m 0755 -o root:lp /run/cups
-	checkpath -q -d -m 0511 -o lp:lpadmin /run/cups/certs
-
-	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/metadata.xml b/net-print/cups/metadata.xml
deleted file mode 100644
index bc19bfa..0000000
--- a/net-print/cups/metadata.xml
+++ /dev/null
@@ -1,16 +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='lprng-compat'>
-      Do not install lp... binaries so cups and lprng can coexist.
-    </flag>
-    <flag name='python'>
-      Add support for the Python interpeter in the web server CGIs.
-    </flag>
-    <flag name='java'>
-      Add support for the Java interpeter in the web server CGIs.
-    </flag>
-  </use>
-</pkgmetadata>