summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2018-06-06 12:07:40 +0200
committerLars Wendler <polynomial-c@gentoo.org>2018-06-06 12:51:28 +0200
commit533b777243fff02705e8e850894dd6cf972b6a1b (patch)
tree190b8aa7cb0c81bc5651c75bdec8120d8a904a8e /net-print/cups/files
parentx11-misc/sddm: Drop 0.17.0-r2 (diff)
downloadgentoo-533b777243fff02705e8e850894dd6cf972b6a1b.tar.gz
gentoo-533b777243fff02705e8e850894dd6cf972b6a1b.tar.bz2
gentoo-533b777243fff02705e8e850894dd6cf972b6a1b.zip
net-print/cups: Removed old.
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Diffstat (limited to 'net-print/cups/files')
-rw-r--r--net-print/cups/files/cups-1.6.0-dont-compress-manpages.patch17
-rw-r--r--net-print/cups/files/cups-1.6.0-fix-install-perms.patch23
-rw-r--r--net-print/cups/files/cups-2.0.3-cross-compile.patch30
-rw-r--r--net-print/cups/files/cups-2.1.2-systemd-socket.patch51
-rw-r--r--net-print/cups/files/cupsd.init.d-r219
5 files changed, 0 insertions, 140 deletions
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 a388b4d5e021..000000000000
--- a/net-print/cups/files/cups-1.6.0-dont-compress-manpages.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/config-scripts/cups-manpages.m4
-+++ b/config-scripts/cups-manpages.m4
-@@ -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 e71934b7d49f..000000000000
--- a/net-print/cups/files/cups-1.6.0-fix-install-perms.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/Makedefs.in
-+++ b/Makedefs.in
-@@ -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-2.0.3-cross-compile.patch b/net-print/cups/files/cups-2.0.3-cross-compile.patch
deleted file mode 100644
index d0893c31fa7b..000000000000
--- a/net-print/cups/files/cups-2.0.3-cross-compile.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-we don't actually install the generated html output, so no point in building
-them. this also helps cross-compiling because the tool to create the html
-uses $CC and has no logic for $BUILD_CC. simpler to disable than fix.
-
---- a/man/Makefile
-+++ b/man/Makefile
-@@ -73,7 +73,7 @@ MAN8 = cupsaccept.$(MAN8EXT) \
- # Make everything...
- #
-
--all: $(MAN1) $(MAN5) $(MAN7) $(MAN8) html
-+all: $(MAN1) $(MAN5) $(MAN7) $(MAN8)
-
-
- #
-
-similarly, the genstrings tool is used to gather all the translatable strings
-in the code base for passing to gettext. in our builds, those strings already
-exist, so no point in running this tool.
-
---- a/ppdc/Makefile
-+++ b/ppdc/Makefile
-@@ -70,7 +70,6 @@ EXECTARGETS = \
- TARGETS = \
- $(LIBTARGETS) \
- $(EXECTARGETS) \
-- genstrings
-
-
- #
diff --git a/net-print/cups/files/cups-2.1.2-systemd-socket.patch b/net-print/cups/files/cups-2.1.2-systemd-socket.patch
deleted file mode 100644
index 2f88924ee2d5..000000000000
--- a/net-print/cups/files/cups-2.1.2-systemd-socket.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/scheduler/main.c b/scheduler/main.c
-index b1aa503..2f0f5fe 100644
---- a/scheduler/main.c
-+++ b/scheduler/main.c
-@@ -656,8 +656,15 @@ main(int argc, /* I - Number of command-line args */
-
- #if defined(HAVE_LAUNCHD) || defined(HAVE_SYSTEMD)
- if (OnDemand)
-+ {
- cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started on demand.");
-- else
-+# ifdef HAVE_SYSTEMD
-+ sd_notifyf(0, "READY=1\n"
-+ "STATUS=Scheduler is running...\n"
-+ "MAINPID=%lu",
-+ (unsigned long) getpid());
-+# endif /* HAVE_SYSTEMD */
-+ } else
- #endif /* HAVE_LAUNCHD || HAVE_SYSTEMD */
- if (fg)
- cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground.");
-diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in
-index 1bccc6f..4564164 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
-+PathExistsGlob=@CUPS_REQUESTS@/d*
-
- [Install]
- WantedBy=multi-user.target
-diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
-index 0a27c76..0a841a2 100644
---- a/scheduler/org.cups.cupsd.service.in
-+++ b/scheduler/org.cups.cupsd.service.in
-@@ -1,10 +1,11 @@
- [Unit]
- Description=CUPS Scheduler
- Documentation=man:cupsd(8)
-+After=network.target
-
- [Service]
- ExecStart=@sbindir@/cupsd -l
--Type=simple
-+Type=notify
-
- [Install]
- Also=org.cups.cupsd.socket org.cups.cupsd.path
diff --git a/net-print/cups/files/cupsd.init.d-r2 b/net-print/cups/files/cupsd.init.d-r2
deleted file mode 100644
index f89263077593..000000000000
--- a/net-print/cups/files/cupsd.init.d-r2
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-
-description="The Common Unix Printing System daemon"
-command="/usr/sbin/cupsd"
-
-depend() {
- use net
- @neededservices@
- before nfs
- after logger
-}
-
-start_pre() {
- 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
-}