make patch compatible with patch-2.6.1

(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key BD3A97A3)

2 files changed, 115 insertions, 43 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 4dc2c552fb27..1304f062c6c3 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,10 @@
 # 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.644 2014/10/15 23:08:45 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.645 2014/10/15 23:30:31 tamiko Exp $
+
+  15 Oct 2014; Matthias Maier <tamiko@gentoo.org>
+  files/cups-2.0.0-rename-systemd-service-files.patch:
+  make patch compatible with patch-2.6.1
 
 *cups-2.0.0-r1 (15 Oct 2014)
 
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
index ed3cbdeb17b2..c93f3228e186 100644
--- 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
@@ -1,18 +1,24 @@
-From 9e366c19179b9e103b0775463dd2e16c62e9c0b5 Mon Sep 17 00:00:00 2001
+From caebb5eb5194b89da1ff08cca8d35ddfe6b293d3 Mon Sep 17 00:00:00 2001
 From: Matthias Maier <tamiko@kyomu.43-1.org>
-Date: Thu, 16 Oct 2014 00:52:06 +0200
-Subject: [PATCH] change service files to gentoo naming scheme
+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/{org.cups.cupsd.path.in => cups.path.in}       |  2 +-
- scheduler/{org.cups.cupsd.service.in => cups.service.in} |  2 +-
- scheduler/{org.cups.cupsd.socket.in => cups.socket.in}   |  0
- 5 files changed, 12 insertions(+), 12 deletions(-)
- rename scheduler/{org.cups.cupsd.path.in => cups.path.in} (65%)
- rename scheduler/{org.cups.cupsd.service.in => cups.service.in} (72%)
- rename scheduler/{org.cups.cupsd.socket.in => cups.socket.in} (100%)
+ 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
@@ -70,40 +76,102 @@ index c0c54a4..bf1ae32 100644
  	fi
  	if test "x$(SMFMANIFESTDIR)" != x; then \
  		echo Uninstalling SMF manifest file...;\
-diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/cups.path.in
-similarity index 65%
-rename from scheduler/org.cups.cupsd.path.in
-rename to scheduler/cups.path.in
-index 1bccc6f..4281d6a 100644
---- a/scheduler/org.cups.cupsd.path.in
+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
-@@ -2,7 +2,7 @@
- Description=CUPS Scheduler
- 
- [Path]
--PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
+@@ -0,0 +1,8 @@
++[Unit]
++Description=CUPS Scheduler
++
++[Path]
 +PathExistsGlob=@CUPS_CACHEDIR@/d*
- 
- [Install]
- WantedBy=multi-user.target
-diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/cups.service.in
-similarity index 72%
-rename from scheduler/org.cups.cupsd.service.in
-rename to scheduler/cups.service.in
-index 4390016..f8912eb 100644
---- a/scheduler/org.cups.cupsd.service.in
++
++[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
-@@ -6,5 +6,5 @@ ExecStart=@sbindir@/cupsd -l
- Type=simple
- 
- [Install]
--Also=org.cups.cupsd.socket org.cups.cupsd.path
+@@ -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/org.cups.cupsd.socket.in b/scheduler/cups.socket.in
-similarity index 100%
-rename from scheduler/org.cups.cupsd.socket.in
-rename to scheduler/cups.socket.in
++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