1 |
commit: aae030c730e0e64d9015183e376ce3bfdc683f84 |
2 |
Author: Aaron W. Swenson <titanofold <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Aug 29 10:53:55 2018 +0000 |
4 |
Commit: Aaron Swenson <titanofold <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 29 10:54:11 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aae030c7 |
7 |
|
8 |
dev-db/postgresql: Work on minimizing FILESDIR |
9 |
|
10 |
Work towards addressing some minor QA complaints. |
11 |
|
12 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
13 |
|
14 |
.../postgresql/files/postgresql-10.2-no-server.patch | 4 ---- |
15 |
.../files/postgresql-11_beta1-no-server.patch | 4 ---- |
16 |
.../postgresql/files/postgresql-9.3-no-server.patch | 20 ++++++++------------ |
17 |
.../files/postgresql-9.4.10-no-server.patch | 20 ++++++++------------ |
18 |
.../files/postgresql-9.5.5-no-server.patch | 20 ++++++++------------ |
19 |
.../files/postgresql-9.6.3-no-server.patch | 20 ++++++++------------ |
20 |
dev-db/postgresql/files/postgresql.init-9.3-r1 | 2 +- |
21 |
7 files changed, 33 insertions(+), 57 deletions(-) |
22 |
|
23 |
diff --git a/dev-db/postgresql/files/postgresql-10.2-no-server.patch b/dev-db/postgresql/files/postgresql-10.2-no-server.patch |
24 |
index 02ab4d712ff..c0694451d99 100644 |
25 |
--- a/dev-db/postgresql/files/postgresql-10.2-no-server.patch |
26 |
+++ b/dev-db/postgresql/files/postgresql-10.2-no-server.patch |
27 |
@@ -1,4 +1,3 @@ |
28 |
-diff -Naruw a/contrib/Makefile b/contrib/Makefile |
29 |
--- a/contrib/Makefile |
30 |
+++ b/contrib/Makefile |
31 |
@@ -5,57 +5,9 @@ |
32 |
@@ -59,7 +58,6 @@ diff -Naruw a/contrib/Makefile b/contrib/Makefile |
33 |
|
34 |
ifneq ($(with_uuid),no) |
35 |
SUBDIRS += uuid-ossp |
36 |
-diff -Naruw a/src/backend/Makefile b/src/backend/Makefile |
37 |
--- a/src/backend/Makefile |
38 |
+++ b/src/backend/Makefile |
39 |
@@ -51,7 +51,7 @@ |
40 |
@@ -96,7 +94,6 @@ diff -Naruw a/src/backend/Makefile b/src/backend/Makefile |
41 |
|
42 |
install-bin: postgres $(POSTGRES_IMP) installdirs |
43 |
$(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)' |
44 |
-diff -Naruw a/src/bin/Makefile b/src/bin/Makefile |
45 |
--- a/src/bin/Makefile |
46 |
+++ b/src/bin/Makefile |
47 |
@@ -14,19 +14,8 @@ |
48 |
@@ -119,7 +116,6 @@ diff -Naruw a/src/bin/Makefile b/src/bin/Makefile |
49 |
pgbench \ |
50 |
psql \ |
51 |
scripts |
52 |
-diff -Naruw a/src/Makefile b/src/Makefile |
53 |
--- a/src/Makefile |
54 |
+++ b/src/Makefile |
55 |
@@ -15,21 +15,12 @@ |
56 |
|
57 |
diff --git a/dev-db/postgresql/files/postgresql-11_beta1-no-server.patch b/dev-db/postgresql/files/postgresql-11_beta1-no-server.patch |
58 |
index 005a550f3cd..26e7832c121 100644 |
59 |
--- a/dev-db/postgresql/files/postgresql-11_beta1-no-server.patch |
60 |
+++ b/dev-db/postgresql/files/postgresql-11_beta1-no-server.patch |
61 |
@@ -1,4 +1,3 @@ |
62 |
-diff -Naruw a/contrib/Makefile b/contrib/Makefile |
63 |
--- a/contrib/Makefile |
64 |
+++ b/contrib/Makefile |
65 |
@@ -5,56 +5,9 @@ |
66 |
@@ -58,7 +57,6 @@ diff -Naruw a/contrib/Makefile b/contrib/Makefile |
67 |
|
68 |
ifneq ($(with_uuid),no) |
69 |
SUBDIRS += uuid-ossp |
70 |
-diff -Naruw a/src/backend/Makefile b/src/backend/Makefile |
71 |
--- a/src/backend/Makefile |
72 |
+++ b/src/backend/Makefile |
73 |
@@ -53,7 +53,7 @@ |
74 |
@@ -96,7 +94,6 @@ diff -Naruw a/src/backend/Makefile b/src/backend/Makefile |
75 |
|
76 |
ifeq ($(with_llvm), yes) |
77 |
install-bin: install-postgres-bitcode |
78 |
-diff -Naruw a/src/bin/Makefile b/src/bin/Makefile |
79 |
--- a/src/bin/Makefile |
80 |
+++ b/src/bin/Makefile |
81 |
@@ -14,20 +14,8 @@ |
82 |
@@ -120,7 +117,6 @@ diff -Naruw a/src/bin/Makefile b/src/bin/Makefile |
83 |
pgbench \ |
84 |
psql \ |
85 |
scripts |
86 |
-diff -Naruw a/src/Makefile b/src/Makefile |
87 |
--- a/src/Makefile |
88 |
+++ b/src/Makefile |
89 |
@@ -15,21 +15,12 @@ |
90 |
|
91 |
diff --git a/dev-db/postgresql/files/postgresql-9.3-no-server.patch b/dev-db/postgresql/files/postgresql-9.3-no-server.patch |
92 |
index 3ce90d60ae7..48e5377f2b1 100644 |
93 |
--- a/dev-db/postgresql/files/postgresql-9.3-no-server.patch |
94 |
+++ b/dev-db/postgresql/files/postgresql-9.3-no-server.patch |
95 |
@@ -1,6 +1,5 @@ |
96 |
-diff -Naur a/contrib/Makefile b/contrib/Makefile |
97 |
---- a/contrib/Makefile 2013-05-06 20:57:06.000000000 +0000 |
98 |
-+++ b/contrib/Makefile 2013-06-09 01:48:22.351874929 +0000 |
99 |
+--- a/contrib/Makefile |
100 |
++++ b/contrib/Makefile |
101 |
@@ -5,61 +5,10 @@ |
102 |
include $(top_builddir)/src/Makefile.global |
103 |
|
104 |
@@ -64,9 +63,8 @@ diff -Naur a/contrib/Makefile b/contrib/Makefile |
105 |
|
106 |
ifeq ($(with_ossp_uuid),yes) |
107 |
SUBDIRS += uuid-ossp |
108 |
-diff -Naur a/src/backend/Makefile b/src/backend/Makefile |
109 |
---- a/src/backend/Makefile 2013-05-06 20:57:06.000000000 +0000 |
110 |
-+++ b/src/backend/Makefile 2013-06-09 01:50:19.655864258 +0000 |
111 |
+--- a/src/backend/Makefile |
112 |
++++ b/src/backend/Makefile |
113 |
@@ -47,7 +47,7 @@ |
114 |
|
115 |
########################################################################## |
116 |
@@ -111,9 +109,8 @@ diff -Naur a/src/backend/Makefile b/src/backend/Makefile |
117 |
|
118 |
install-bin: postgres $(POSTGRES_IMP) installdirs |
119 |
$(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)' |
120 |
-diff -Naur a/src/bin/Makefile b/src/bin/Makefile |
121 |
---- a/src/bin/Makefile 2013-05-06 20:57:06.000000000 +0000 |
122 |
-+++ b/src/bin/Makefile 2013-06-09 01:51:56.143824442 +0000 |
123 |
+--- a/src/bin/Makefile |
124 |
++++ b/src/bin/Makefile |
125 |
@@ -13,8 +13,7 @@ |
126 |
top_builddir = ../.. |
127 |
include $(top_builddir)/src/Makefile.global |
128 |
@@ -124,9 +121,8 @@ diff -Naur a/src/bin/Makefile b/src/bin/Makefile |
129 |
|
130 |
ifeq ($(PORTNAME), win32) |
131 |
SUBDIRS += pgevent |
132 |
-diff -Naur a/src/Makefile b/src/Makefile |
133 |
---- a/src/Makefile 2013-05-06 20:57:06.000000000 +0000 |
134 |
-+++ b/src/Makefile 2013-06-09 01:54:30.479704228 +0000 |
135 |
+--- a/src/Makefile |
136 |
++++ b/src/Makefile |
137 |
@@ -15,17 +15,11 @@ |
138 |
SUBDIRS = \ |
139 |
common \ |
140 |
|
141 |
diff --git a/dev-db/postgresql/files/postgresql-9.4.10-no-server.patch b/dev-db/postgresql/files/postgresql-9.4.10-no-server.patch |
142 |
index 81fc3837bed..0eb750847cf 100644 |
143 |
--- a/dev-db/postgresql/files/postgresql-9.4.10-no-server.patch |
144 |
+++ b/dev-db/postgresql/files/postgresql-9.4.10-no-server.patch |
145 |
@@ -1,6 +1,5 @@ |
146 |
-diff -Naruw a/contrib/Makefile b/contrib/Makefile |
147 |
---- a/contrib/Makefile 2016-10-24 16:12:53.000000000 -0400 |
148 |
-+++ b/contrib/Makefile 2016-10-27 13:38:23.361545396 -0400 |
149 |
+--- a/contrib/Makefile |
150 |
++++ b/contrib/Makefile |
151 |
@@ -5,64 +5,10 @@ |
152 |
include $(top_builddir)/src/Makefile.global |
153 |
|
154 |
@@ -67,9 +66,8 @@ diff -Naruw a/contrib/Makefile b/contrib/Makefile |
155 |
|
156 |
ifneq ($(with_uuid),no) |
157 |
SUBDIRS += uuid-ossp |
158 |
-diff -Naruw a/src/backend/Makefile b/src/backend/Makefile |
159 |
---- a/src/backend/Makefile 2016-10-24 16:12:53.000000000 -0400 |
160 |
-+++ b/src/backend/Makefile 2016-10-27 14:04:47.617000374 -0400 |
161 |
+--- a/src/backend/Makefile |
162 |
++++ b/src/backend/Makefile |
163 |
@@ -47,7 +47,7 @@ |
164 |
|
165 |
########################################################################## |
166 |
@@ -113,9 +111,8 @@ diff -Naruw a/src/backend/Makefile b/src/backend/Makefile |
167 |
|
168 |
install-bin: postgres $(POSTGRES_IMP) installdirs |
169 |
$(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)' |
170 |
-diff -Naruw a/src/bin/Makefile b/src/bin/Makefile |
171 |
---- a/src/bin/Makefile 2016-10-24 16:12:53.000000000 -0400 |
172 |
-+++ b/src/bin/Makefile 2016-10-27 13:41:34.443930143 -0400 |
173 |
+--- a/src/bin/Makefile |
174 |
++++ b/src/bin/Makefile |
175 |
@@ -13,8 +13,7 @@ |
176 |
top_builddir = ../.. |
177 |
include $(top_builddir)/src/Makefile.global |
178 |
@@ -126,9 +123,8 @@ diff -Naruw a/src/bin/Makefile b/src/bin/Makefile |
179 |
|
180 |
ifeq ($(PORTNAME), win32) |
181 |
SUBDIRS += pgevent |
182 |
-diff -Naruw a/src/Makefile b/src/Makefile |
183 |
---- a/src/Makefile 2016-10-24 16:12:53.000000000 -0400 |
184 |
-+++ b/src/Makefile 2016-10-27 13:43:09.296792018 -0400 |
185 |
+--- a/src/Makefile |
186 |
++++ b/src/Makefile |
187 |
@@ -15,18 +15,11 @@ |
188 |
SUBDIRS = \ |
189 |
common \ |
190 |
|
191 |
diff --git a/dev-db/postgresql/files/postgresql-9.5.5-no-server.patch b/dev-db/postgresql/files/postgresql-9.5.5-no-server.patch |
192 |
index 285667801a6..a31bbe9af0c 100644 |
193 |
--- a/dev-db/postgresql/files/postgresql-9.5.5-no-server.patch |
194 |
+++ b/dev-db/postgresql/files/postgresql-9.5.5-no-server.patch |
195 |
@@ -1,6 +1,5 @@ |
196 |
-diff -Naruw postgresql-9.5.5.orig/contrib/Makefile postgresql-9.5.5/contrib/Makefile |
197 |
---- postgresql-9.5.5.orig/contrib/Makefile 2016-10-24 16:10:50.000000000 -0400 |
198 |
-+++ postgresql-9.5.5/contrib/Makefile 2016-10-27 13:49:19.418285694 -0400 |
199 |
+--- postgresql-9.5.5.orig/contrib/Makefile |
200 |
++++ postgresql-9.5.5/contrib/Makefile |
201 |
@@ -5,55 +5,9 @@ |
202 |
include $(top_builddir)/src/Makefile.global |
203 |
|
204 |
@@ -57,9 +56,8 @@ diff -Naruw postgresql-9.5.5.orig/contrib/Makefile postgresql-9.5.5/contrib/Make |
205 |
|
206 |
ifneq ($(with_uuid),no) |
207 |
SUBDIRS += uuid-ossp |
208 |
-diff -Naruw postgresql-9.5.5.orig/src/backend/Makefile postgresql-9.5.5/src/backend/Makefile |
209 |
---- postgresql-9.5.5.orig/src/backend/Makefile 2016-10-24 16:10:50.000000000 -0400 |
210 |
-+++ postgresql-9.5.5/src/backend/Makefile 2016-10-27 13:51:16.027706097 -0400 |
211 |
+--- postgresql-9.5.5.orig/src/backend/Makefile |
212 |
++++ postgresql-9.5.5/src/backend/Makefile |
213 |
@@ -47,7 +47,7 @@ |
214 |
|
215 |
########################################################################## |
216 |
@@ -103,9 +101,8 @@ diff -Naruw postgresql-9.5.5.orig/src/backend/Makefile postgresql-9.5.5/src/back |
217 |
|
218 |
install-bin: postgres $(POSTGRES_IMP) installdirs |
219 |
$(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)' |
220 |
-diff -Naruw postgresql-9.5.5.orig/src/bin/Makefile postgresql-9.5.5/src/bin/Makefile |
221 |
---- postgresql-9.5.5.orig/src/bin/Makefile 2016-10-24 16:10:50.000000000 -0400 |
222 |
-+++ postgresql-9.5.5/src/bin/Makefile 2016-10-27 14:26:26.397161219 -0400 |
223 |
+--- postgresql-9.5.5.orig/src/bin/Makefile |
224 |
++++ postgresql-9.5.5/src/bin/Makefile |
225 |
@@ -14,19 +14,8 @@ |
226 |
include $(top_builddir)/src/Makefile.global |
227 |
|
228 |
@@ -126,9 +123,8 @@ diff -Naruw postgresql-9.5.5.orig/src/bin/Makefile postgresql-9.5.5/src/bin/Make |
229 |
pgbench \ |
230 |
psql \ |
231 |
scripts |
232 |
-diff -Naruw postgresql-9.5.5.orig/src/Makefile postgresql-9.5.5/src/Makefile |
233 |
---- postgresql-9.5.5.orig/src/Makefile 2016-10-24 16:10:50.000000000 -0400 |
234 |
-+++ postgresql-9.5.5/src/Makefile 2016-10-27 14:03:49.513956432 -0400 |
235 |
+--- postgresql-9.5.5.orig/src/Makefile |
236 |
++++ postgresql-9.5.5/src/Makefile |
237 |
@@ -15,18 +15,11 @@ |
238 |
SUBDIRS = \ |
239 |
common \ |
240 |
|
241 |
diff --git a/dev-db/postgresql/files/postgresql-9.6.3-no-server.patch b/dev-db/postgresql/files/postgresql-9.6.3-no-server.patch |
242 |
index db662d4630e..aa7cf773a39 100644 |
243 |
--- a/dev-db/postgresql/files/postgresql-9.6.3-no-server.patch |
244 |
+++ b/dev-db/postgresql/files/postgresql-9.6.3-no-server.patch |
245 |
@@ -1,6 +1,5 @@ |
246 |
-diff -Naruw a/contrib/Makefile b/contrib/Makefile |
247 |
---- a/contrib/Makefile 2017-05-08 17:15:12.000000000 -0400 |
248 |
-+++ b/contrib/Makefile 2017-07-13 20:20:26.926646151 -0400 |
249 |
+--- a/contrib/Makefile |
250 |
++++ b/contrib/Makefile |
251 |
@@ -5,57 +5,9 @@ |
252 |
include $(top_builddir)/src/Makefile.global |
253 |
|
254 |
@@ -59,9 +58,8 @@ diff -Naruw a/contrib/Makefile b/contrib/Makefile |
255 |
|
256 |
ifneq ($(with_uuid),no) |
257 |
SUBDIRS += uuid-ossp |
258 |
-diff -Naruw a/src/backend/Makefile b/src/backend/Makefile |
259 |
---- a/src/backend/Makefile 2017-05-08 17:15:12.000000000 -0400 |
260 |
-+++ b/src/backend/Makefile 2017-07-13 20:18:08.590323095 -0400 |
261 |
+--- a/src/backend/Makefile |
262 |
++++ b/src/backend/Makefile |
263 |
@@ -51,7 +51,7 @@ |
264 |
|
265 |
########################################################################## |
266 |
@@ -96,9 +94,8 @@ diff -Naruw a/src/backend/Makefile b/src/backend/Makefile |
267 |
|
268 |
install-bin: postgres $(POSTGRES_IMP) installdirs |
269 |
$(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)' |
270 |
-diff -Naruw a/src/bin/Makefile b/src/bin/Makefile |
271 |
---- a/src/bin/Makefile 2017-05-08 17:15:12.000000000 -0400 |
272 |
-+++ b/src/bin/Makefile 2017-07-13 20:23:51.419471550 -0400 |
273 |
+--- a/src/bin/Makefile |
274 |
++++ b/src/bin/Makefile |
275 |
@@ -14,19 +14,8 @@ |
276 |
include $(top_builddir)/src/Makefile.global |
277 |
|
278 |
@@ -119,9 +116,8 @@ diff -Naruw a/src/bin/Makefile b/src/bin/Makefile |
279 |
pgbench \ |
280 |
psql \ |
281 |
scripts |
282 |
-diff -Naruw a/src/Makefile b/src/Makefile |
283 |
---- a/src/Makefile 2017-05-08 17:15:12.000000000 -0400 |
284 |
-+++ b/src/Makefile 2017-07-13 20:25:57.539158282 -0400 |
285 |
+--- a/src/Makefile |
286 |
++++ b/src/Makefile |
287 |
@@ -15,19 +15,12 @@ |
288 |
SUBDIRS = \ |
289 |
common \ |
290 |
|
291 |
diff --git a/dev-db/postgresql/files/postgresql.init-9.3-r1 b/dev-db/postgresql/files/postgresql.init-9.3-r1 |
292 |
old mode 100755 |
293 |
new mode 100644 |
294 |
index 256ee7e6fd3..d3d3ea13be6 |
295 |
--- a/dev-db/postgresql/files/postgresql.init-9.3-r1 |
296 |
+++ b/dev-db/postgresql/files/postgresql.init-9.3-r1 |
297 |
@@ -1,5 +1,5 @@ |
298 |
#!/sbin/openrc-run |
299 |
-# Copyright 1999-2017 Gentoo Foundation |
300 |
+# Copyright 1999-2018 Gentoo Foundation |
301 |
# Distributed under the terms of the GNU General Public License v2 |
302 |
|
303 |
extra_started_commands="reload promote" |