net-print/cups: Removed old.

Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>

6 files changed, 0 insertions, 738 deletions

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 f4e8640bda7e..000000000000
--- 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$"
-+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$"
-+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/cups-2.0.0-rename-systemd-service-files.patch b/net-print/cups/files/cups-2.0.0-rename-systemd-service-files.patch
deleted file mode 100644
index c93f3228e186..000000000000
--- a/net-print/cups/files/cups-2.0.0-rename-systemd-service-files.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-From caebb5eb5194b89da1ff08cca8d35ddfe6b293d3 Mon Sep 17 00:00:00 2001
-From: Matthias Maier <tamiko@kyomu.43-1.org>
-Date: Thu, 16 Oct 2014 01:25:23 +0200
-Subject: [PATCH] change systemd service files to gentoo naming scheme
-
----
- configure.ac                        |  6 +++---
- scheduler/Makefile                  | 14 +++++++-------
- scheduler/cups.path.in              |  8 ++++++++
- scheduler/cups.service.in           | 10 ++++++++++
- scheduler/cups.socket.in            | 12 ++++++++++++
- scheduler/org.cups.cupsd.path.in    |  8 --------
- scheduler/org.cups.cupsd.service.in | 10 ----------
- scheduler/org.cups.cupsd.socket.in  | 12 ------------
- 8 files changed, 40 insertions(+), 40 deletions(-)
- create mode 100644 scheduler/cups.path.in
- create mode 100644 scheduler/cups.service.in
- create mode 100644 scheduler/cups.socket.in
- delete mode 100644 scheduler/org.cups.cupsd.path.in
- delete mode 100644 scheduler/org.cups.cupsd.service.in
- delete mode 100644 scheduler/org.cups.cupsd.socket.in
-
-diff --git a/configure.ac b/configure.ac
-index 21d7f93..cb5db92 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -81,9 +81,9 @@ AC_OUTPUT(Makedefs
- 	  scheduler/cups.sh
- 	  scheduler/cups.xml
- 	  scheduler/org.cups.cups-lpd.plist
--	  scheduler/org.cups.cupsd.path
--	  scheduler/org.cups.cupsd.service
--	  scheduler/org.cups.cupsd.socket
-+	  scheduler/cups.path
-+	  scheduler/cups.service
-+	  scheduler/cups.socket
-  	  templates/header.tmpl
-           packaging/cups.list
- 	  $LANGFILES)
-diff --git a/scheduler/Makefile b/scheduler/Makefile
-index c0c54a4..bf1ae32 100644
---- a/scheduler/Makefile
-+++ b/scheduler/Makefile
-@@ -192,7 +192,7 @@ install-data:
- 	if test "x$(LAUNCHD_DIR)" != x; then \
- 		echo Installing launchd configuration files...; \
- 		$(INSTALL_DIR) $(BUILDROOT)$(LAUNCHD_DIR); \
--		$(INSTALL_DATA) org.cups.cupsd.plist $(BUILDROOT)$(LAUNCHD_DIR); \
-+		$(INSTALL_DATA) cups.plist $(BUILDROOT)$(LAUNCHD_DIR); \
- 		$(INSTALL_DATA) org.cups.cups-lpd.plist $(BUILDROOT)$(LAUNCHD_DIR); \
- 	fi
- 	if test "x$(SMFMANIFESTDIR)" != x; then \
-@@ -203,9 +203,9 @@ install-data:
- 	if test "x$(SYSTEMD_DIR)" != x; then \
- 		echo Installing systemd configuration files...; \
- 		$(INSTALL_DIR) $(BUILDROOT)$(SYSTEMD_DIR); \
--		$(INSTALL_DATA) org.cups.cupsd.path $(BUILDROOT)$(SYSTEMD_DIR); \
--		$(INSTALL_DATA) org.cups.cupsd.service $(BUILDROOT)$(SYSTEMD_DIR); \
--		$(INSTALL_DATA) org.cups.cupsd.socket $(BUILDROOT)$(SYSTEMD_DIR); \
-+		$(INSTALL_DATA) cups.path $(BUILDROOT)$(SYSTEMD_DIR); \
-+		$(INSTALL_DATA) cups.service $(BUILDROOT)$(SYSTEMD_DIR); \
-+		$(INSTALL_DATA) cups.socket $(BUILDROOT)$(SYSTEMD_DIR); \
- 	fi
- 	if test "x$(XINETD)" != x; then \
- 		echo Installing xinetd configuration file for cups-lpd...; \
-@@ -335,9 +335,9 @@ uninstall:
- 	fi
- 	if test "x$SYSTEMD_DIR" != x; then \
- 		echo Uninstalling systemd files...; \
--		$(RM) $(BUILDROOT)$(SYSTEMD_DIR)/org.cups.cupsd.path; \
--		$(RM) $(BUILDROOT)$(SYSTEMD_DIR)/org.cups.cupsd.service; \
--		$(RM) $(BUILDROOT)$(SYSTEMD_DIR)/org.cups.cupsd.socket; \
-+		$(RM) $(BUILDROOT)$(SYSTEMD_DIR)/cups.path; \
-+		$(RM) $(BUILDROOT)$(SYSTEMD_DIR)/cups.service; \
-+		$(RM) $(BUILDROOT)$(SYSTEMD_DIR)/cups.socket; \
- 	fi
- 	if test "x$(SMFMANIFESTDIR)" != x; then \
- 		echo Uninstalling SMF manifest file...;\
-diff --git a/scheduler/cups.path.in b/scheduler/cups.path.in
-new file mode 100644
-index 0000000..4281d6a
---- /dev/null
-+++ b/scheduler/cups.path.in
-@@ -0,0 +1,8 @@
-+[Unit]
-+Description=CUPS Scheduler
-+
-+[Path]
-+PathExistsGlob=@CUPS_CACHEDIR@/d*
-+
-+[Install]
-+WantedBy=multi-user.target
-diff --git a/scheduler/cups.service.in b/scheduler/cups.service.in
-new file mode 100644
-index 0000000..f8912eb
---- /dev/null
-+++ b/scheduler/cups.service.in
-@@ -0,0 +1,10 @@
-+[Unit]
-+Description=CUPS Scheduler
-+
-+[Service]
-+ExecStart=@sbindir@/cupsd -l
-+Type=simple
-+
-+[Install]
-+Also=cups.socket cups.path
-+WantedBy=printer.target
-diff --git a/scheduler/cups.socket.in b/scheduler/cups.socket.in
-new file mode 100644
-index 0000000..cd98aa5
---- /dev/null
-+++ b/scheduler/cups.socket.in
-@@ -0,0 +1,12 @@
-+[Unit]
-+Description=CUPS Scheduler
-+
-+[Socket]
-+ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
-+ListenStream=[::1]:631
-+ListenStream=127.0.0.1:631
-+BindIPv6Only=ipv6-only
-+ReusePort=true
-+
-+[Install]
-+WantedBy=sockets.target
-diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in
-deleted file mode 100644
-index 1bccc6f..0000000
---- a/scheduler/org.cups.cupsd.path.in
-+++ /dev/null
-@@ -1,8 +0,0 @@
--[Unit]
--Description=CUPS Scheduler
--
--[Path]
--PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
--
--[Install]
--WantedBy=multi-user.target
-diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
-deleted file mode 100644
-index 4390016..0000000
---- a/scheduler/org.cups.cupsd.service.in
-+++ /dev/null
-@@ -1,10 +0,0 @@
--[Unit]
--Description=CUPS Scheduler
--
--[Service]
--ExecStart=@sbindir@/cupsd -l
--Type=simple
--
--[Install]
--Also=org.cups.cupsd.socket org.cups.cupsd.path
--WantedBy=printer.target
-diff --git a/scheduler/org.cups.cupsd.socket.in b/scheduler/org.cups.cupsd.socket.in
-deleted file mode 100644
-index cd98aa5..0000000
---- a/scheduler/org.cups.cupsd.socket.in
-+++ /dev/null
-@@ -1,12 +0,0 @@
--[Unit]
--Description=CUPS Scheduler
--
--[Socket]
--ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
--ListenStream=[::1]:631
--ListenStream=127.0.0.1:631
--BindIPv6Only=ipv6-only
--ReusePort=true
--
--[Install]
--WantedBy=sockets.target
--- 
-2.0.4
-
diff --git a/net-print/cups/files/cups-2.0.1-fix-compilation.patch b/net-print/cups/files/cups-2.0.1-fix-compilation.patch
deleted file mode 100644
index 5828b6801306..000000000000
--- a/net-print/cups/files/cups-2.0.1-fix-compilation.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7bb9184b40bea3c4b9f46362642e5d40053a3ae1 Mon Sep 17 00:00:00 2001
-From: Matthias Maier <tamiko@kyomu.43-1.org>
-Date: Wed, 19 Nov 2014 18:44:33 +0100
-Subject: [PATCH] fix compilation
-
----
- test/ippserver.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/ippserver.c b/test/ippserver.c
-index c785e5f..1c64668 100644
---- a/test/ippserver.c
-+++ b/test/ippserver.c
-@@ -421,7 +421,7 @@ static int		valid_job_attributes(_ipp_client_t *client);
- 
- #  ifdef HAVE_DNSSD
- static DNSServiceRef	DNSSDMaster = NULL;
--#  else /* HAVE_AVAHI */
-+#  elif defined(HAVE_AVAHI)
- static AvahiThreadedPoll *DNSSDMaster = NULL;
- static AvahiClient	*DNSSDClient = NULL;
- #  endif /* HAVE_DNSSD */
--- 
-2.0.4
-
diff --git a/net-print/cups/files/cups-2.0.1-fix-linkage-to-gnutls.patch b/net-print/cups/files/cups-2.0.1-fix-linkage-to-gnutls.patch
deleted file mode 100644
index dafb6e14b0e6..000000000000
--- a/net-print/cups/files/cups-2.0.1-fix-linkage-to-gnutls.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/cups/usersys.c
-+++ b/cups/usersys.c
-@@ -1044,7 +1044,9 @@
- 	  options = 0;
-       }
- 
-+#ifdef HAVE_SSL
-       _httpTLSSetOptions(options);
-+#endif /* HAVE_SSL */
-     }
-   }
- 
---- a/scheduler/conf.c
-+++ b/scheduler/conf.c
-@@ -2975,7 +2975,9 @@
-         }
-       }
- 
-+#ifdef HAVE_SSL
-       _httpTLSSetOptions(options);
-+#endif /* HAVE_SSL */
-     }
-     else if ((!_cups_strcasecmp(line, "Port") || !_cups_strcasecmp(line, "Listen")
- #ifdef HAVE_SSL
diff --git a/net-print/cups/files/cups-2.0.1-rename-systemd-service-files.patch b/net-print/cups/files/cups-2.0.1-rename-systemd-service-files.patch
deleted file mode 100644
index c77997d7fec4..000000000000
--- a/net-print/cups/files/cups-2.0.1-rename-systemd-service-files.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 33e0d4c8e450fe69b195422c0880aaa96ca9478d Mon Sep 17 00:00:00 2001
-From: Matthias Maier <tamiko@kyomu.43-1.org>
-Date: Wed, 19 Nov 2014 18:00:06 +0100
-Subject: [PATCH] change systemd service files to gentoo naming scheme
-
----
- scheduler/Makefile                  | 10 +++++-----
- scheduler/org.cups.cupsd.path.in    |  2 +-
- scheduler/org.cups.cupsd.service.in |  2 +-
- 3 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/scheduler/Makefile b/scheduler/Makefile
-index 3e0884a..b354420 100644
---- a/scheduler/Makefile
-+++ b/scheduler/Makefile
-@@ -203,11 +203,11 @@ install-data:
- 	if test "x$(SYSTEMD_DIR)" != x; then \
- 		echo Installing systemd configuration files...; \
- 		$(INSTALL_DIR) $(BUILDROOT)$(SYSTEMD_DIR); \
--		$(INSTALL_DATA) org.cups.cupsd.path $(BUILDROOT)$(SYSTEMD_DIR); \
--		$(INSTALL_DATA) org.cups.cupsd.service $(BUILDROOT)$(SYSTEMD_DIR); \
--		$(INSTALL_DATA) org.cups.cupsd.socket $(BUILDROOT)$(SYSTEMD_DIR); \
--		$(INSTALL_DATA) org.cups.cups-lpdAT.service $(BUILDROOT)$(SYSTEMD_DIR)/org.cups.cups-lpd@.service; \
--		$(INSTALL_DATA) org.cups.cups-lpd.socket $(BUILDROOT)$(SYSTEMD_DIR); \
-+		$(INSTALL_DATA) org.cups.cupsd.path $(BUILDROOT)$(SYSTEMD_DIR)/cups.path; \
-+		$(INSTALL_DATA) org.cups.cupsd.service $(BUILDROOT)$(SYSTEMD_DIR)/cups.service; \
-+		$(INSTALL_DATA) org.cups.cupsd.socket $(BUILDROOT)$(SYSTEMD_DIR)/cups.socket; \
-+		$(INSTALL_DATA) org.cups.cups-lpdAT.service $(BUILDROOT)$(SYSTEMD_DIR)/cups-lpd@.service; \
-+		$(INSTALL_DATA) org.cups.cups-lpd.socket $(BUILDROOT)$(SYSTEMD_DIR)/cups-lpd.socket; \
- 	elif test "x$(XINETD)" != x; then \
- 		echo Installing xinetd configuration file for cups-lpd...; \
- 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(XINETD); \
-diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in
-index 1bccc6f..90c8576 100644
---- a/scheduler/org.cups.cupsd.path.in
-+++ b/scheduler/org.cups.cupsd.path.in
-@@ -2,7 +2,7 @@
- Description=CUPS Scheduler
- 
- [Path]
--PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
-+PathExists=@CUPS_CACHEDIR@/d*
- 
- [Install]
- WantedBy=multi-user.target
-diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
-index 0a27c76..7a04248 100644
---- a/scheduler/org.cups.cupsd.service.in
-+++ b/scheduler/org.cups.cupsd.service.in
-@@ -7,5 +7,5 @@ ExecStart=@sbindir@/cupsd -l
- Type=simple
- 
- [Install]
--Also=org.cups.cupsd.socket org.cups.cupsd.path
-+Also=cups.socket cups.path
- WantedBy=printer.target
-diff --git a/scheduler/org.cups.cupsd.socket.in b/scheduler/org.cups.cupsd.socket.in
---- a/scheduler/org.cups.cupsd.socket.in
-+++ a/scheduler/org.cups.cupsd.socket.in
-@@ -3,6 +3,10 @@
- 
- [Socket]
- ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
-+ListenStream=[::1]:631
-+ListenStream=127.0.0.1:631
-+BindIPv6Only=ipv6-only
-+ReusePort=true
- 
- [Install]
- WantedBy=sockets.target
--- 
-2.0.4
-
diff --git a/net-print/cups/files/cups-2.0.2-poll-CPU-loop-STR-4605.patch b/net-print/cups/files/cups-2.0.2-poll-CPU-loop-STR-4605.patch
deleted file mode 100644
index 86114ea650fb..000000000000
--- a/net-print/cups/files/cups-2.0.2-poll-CPU-loop-STR-4605.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-http://cups.org/str.php?L4605+P-1+S-2+C0+I0+E0+Q100%25
-https://bugs.gentoo.org/show_bug.cgi?id=549732
-
-commit bb00c43fccb5aa2dec8e03bd9783e1ee267266a7
-Author: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
-Date:   Wed May 6 18:01:04 2015 +0000
-
-    The scheduler could get caught in a busy loop (STR #4605)
-    
-    
-    
-    git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12613 a1ca3aef-8c08-0410-bb20-df032aa958be
-
-diff --git a/scheduler/client.c b/scheduler/client.c
-index c5a9960..50464a5 100644
---- a/scheduler/client.c
-+++ b/scheduler/client.c
-@@ -585,6 +585,17 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
-     * connection and we need to shut it down...
-     */
- 
-+    if (!httpGetReady(con->http) && recv(httpGetFd(con->http), buf, 1, MSG_PEEK) < 1)
-+    {
-+     /*
-+      * Connection closed...
-+      */
-+
-+      cupsdLogClient(con, CUPSD_LOG_DEBUG, "Closing on EOF.");
-+      cupsdCloseClient(con);
-+      return;
-+    }
-+
-     cupsdLogClient(con, CUPSD_LOG_DEBUG, "Closing on unexpected HTTP read state %s.",
- 		   httpStateString(httpGetState(con->http)));
-     cupsdCloseClient(con);
-@@ -1979,12 +1990,6 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
- 
- 	if (httpGetState(con->http) == HTTP_STATE_POST_SEND)
- 	{
--	 /*
--	  * Don't listen for activity until we decide to do something with this...
--	  */
--
--          cupsdAddSelect(httpGetFd(con->http), NULL, NULL, con);
--
- 	  if (con->file >= 0)
- 	  {
- 	    fstat(con->file, &filestats);