Gentoo Archives: gentoo-commits

From: Guilherme Amadio <amadio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-physics/root/files/
Date: Mon, 19 Nov 2018 16:25:34
Message-Id: 1542644714.f56c1087d27bbebf7ce65121d49a97dbf2e3dc73.amadio@gentoo
1 commit: f56c1087d27bbebf7ce65121d49a97dbf2e3dc73
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Fri Sep 21 17:57:41 2018 +0000
4 Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 19 16:25:14 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f56c1087
7
8 sci-physics/root: remove unused patch/files
9
10 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
11 Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
12 Closes: https://bugs.gentoo.org/667872
13
14 sci-physics/root/files/proofd.confd | 12 -----------
15 sci-physics/root/files/proofd.initd | 25 -----------------------
16 sci-physics/root/files/root-6.14.00-http.patch | 28 --------------------------
17 sci-physics/root/files/rootd.confd | 8 --------
18 sci-physics/root/files/rootd.initd | 27 -------------------------
19 5 files changed, 100 deletions(-)
20
21 diff --git a/sci-physics/root/files/proofd.confd b/sci-physics/root/files/proofd.confd
22 deleted file mode 100644
23 index 81720a7eb33..00000000000
24 --- a/sci-physics/root/files/proofd.confd
25 +++ /dev/null
26 @@ -1,12 +0,0 @@
27 -# conf.d file for proof daemon
28 -#
29 -# Please refer to the proofd(1) man(1) page for more information on
30 -# command line parameters.
31 -#
32 -PROOFD_OPTS=
33 -
34 -# Specify your base of your PROOF directory here. If left blank, it
35 -# will use the system default (e.g., /usr/share/root/proof).
36 -# Note, however, that ROOT recommends that this directory is shared (via
37 -# NFS or similar) among all the nodes of the cluster.
38 -PROOF_DIR=
39
40 diff --git a/sci-physics/root/files/proofd.initd b/sci-physics/root/files/proofd.initd
41 deleted file mode 100644
42 index ee865133cb2..00000000000
43 --- a/sci-physics/root/files/proofd.initd
44 +++ /dev/null
45 @@ -1,25 +0,0 @@
46 -#!/sbin/openrc-run
47 -# Copyright 1999-2012 Gentoo Foundation
48 -# Distributed under the terms of the GNU General Public License v2
49 -
50 -depend() {
51 - need root-file-server
52 - use logger
53 -}
54 -
55 -start() {
56 - ebegin "Starting parallel ROOT facility server"
57 - start-stop-daemon --start --quiet \
58 - --pidfile /var/run/proofd.pid \
59 - --exec /usr/bin/proofd -- ${PROOFD_OPTS} ${PROOF_DIR}
60 - pidof /usr/bin/proofd > /var/run/proofd.pid
61 - eend $?
62 -}
63 -
64 -stop() {
65 - ebegin "Stopping parallel ROOT facility server"
66 - start-stop-daemon --stop --quiet \
67 - --pidfile /var/run/proofd.pid \
68 - --exec /usr/bin/proofd
69 - eend $?
70 -}
71
72 diff --git a/sci-physics/root/files/root-6.14.00-http.patch b/sci-physics/root/files/root-6.14.00-http.patch
73 deleted file mode 100644
74 index 04ec4bea567..00000000000
75 --- a/sci-physics/root/files/root-6.14.00-http.patch
76 +++ /dev/null
77 @@ -1,28 +0,0 @@
78 -From bed1568548d7a47785d8fe24ec7a9ce5799040ff Mon Sep 17 00:00:00 2001
79 -From: Guilherme Amadio <amadio@××××.ch>
80 -Date: Wed, 27 Jun 2018 15:08:07 +0200
81 -Subject: [PATCH] Do not exclude etc/http directory from installation
82 -
83 -This was an unintended side-effect of a previous commit:
84 -9b4d0d8dccbd48d21b0f7c79b6eaf94428f691b1.
85 ----
86 - CMakeLists.txt | 3 +--
87 - 1 file changed, 1 insertion(+), 2 deletions(-)
88 -
89 -diff --git a/CMakeLists.txt b/CMakeLists.txt
90 -index 4c760d0fdb..a3a0f59925 100644
91 ---- a/CMakeLists.txt
92 -+++ b/CMakeLists.txt
93 -@@ -426,8 +426,7 @@ if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_INSTALL_PREFIX)
94 - PATTERN "rootd.xinetd" EXCLUDE
95 - PATTERN "proofd.xinetd" EXCLUDE
96 - PATTERN "root.mimes" EXCLUDE
97 -- PATTERN "cmake" EXCLUDE
98 -- PATTERN "http" EXCLUDE )
99 -+ PATTERN "cmake" EXCLUDE )
100 - install(DIRECTORY fonts/ DESTINATION ${CMAKE_INSTALL_FONTDIR})
101 - install(DIRECTORY icons/ DESTINATION ${CMAKE_INSTALL_ICONDIR})
102 - install(DIRECTORY macros/ DESTINATION ${CMAKE_INSTALL_MACRODIR})
103 ---
104 -2.18.0
105 -
106
107 diff --git a/sci-physics/root/files/rootd.confd b/sci-physics/root/files/rootd.confd
108 deleted file mode 100644
109 index 7516b8c9b6d..00000000000
110 --- a/sci-physics/root/files/rootd.confd
111 +++ /dev/null
112 @@ -1,8 +0,0 @@
113 -# conf.d file for root daemon
114 -
115 -# User to run as (default is `rootd')
116 -ROOTD_USER="rootd"
117 -
118 -# Please refer to the rootd(1) man(1) page for more information on
119 -# command line parameters.
120 -ROOTD_OPTS=""
121
122 diff --git a/sci-physics/root/files/rootd.initd b/sci-physics/root/files/rootd.initd
123 deleted file mode 100644
124 index f808259c367..00000000000
125 --- a/sci-physics/root/files/rootd.initd
126 +++ /dev/null
127 @@ -1,27 +0,0 @@
128 -#!/sbin/openrc-run
129 -# Copyright 1999-2012 Gentoo Foundation
130 -# Distributed under the terms of the GNU General Public License v2
131 -
132 -depend() {
133 - need net
134 - use logger
135 - provide root-file-server
136 -}
137 -
138 -start() {
139 - ebegin "Starting ROOT file server"
140 - pid=$(start-stop-daemon --start --quiet --user ${ROOTD_USER} \
141 - --pidfile /var/run/rootd.pid \
142 - --exec /usr/bin/rootd -- ${ROOTD_OPTS})
143 - retval=$?
144 - echo ${ROOTD_PID} > /var/run/rootd.pid
145 - eend ${retval}
146 -}
147 -
148 -stop() {
149 - ebegin "Stopping ROOT file server"
150 - start-stop-daemon --stop --quiet \
151 - --pidfile /var/run/rootd.pid \
152 - --exec /usr/bin/rootd
153 - eend $?
154 -}