| 1 |
commit: ba7463bc581fa454f1803b4b828b746d25a4d639 |
| 2 |
Author: Aaron W. Swenson <titanofold <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jul 10 02:24:33 2017 +0000 |
| 4 |
Commit: Aaron Swenson <titanofold <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 10 02:24:33 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba7463bc |
| 7 |
|
| 8 |
dev-db/pgpool2: Bump, new repo, postgres-multi |
| 9 |
|
| 10 |
Now installs to all selected slots via use flags. |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
| 13 |
|
| 14 |
dev-db/pgpool2/Manifest | 1 + |
| 15 |
dev-db/pgpool2/files/pgpool_run_paths-3.6.4.patch | 255 ++++++++++++++++++++ |
| 16 |
dev-db/pgpool2/files/pgpool_run_paths-9999.patch | 274 ++++++++++++++++++++++ |
| 17 |
dev-db/pgpool2/pgpool2-3.6.4.ebuild | 98 ++++++++ |
| 18 |
dev-db/pgpool2/pgpool2-9999.ebuild | 98 +++----- |
| 19 |
5 files changed, 667 insertions(+), 59 deletions(-) |
| 20 |
|
| 21 |
diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest |
| 22 |
index f3281d182e8..88999227ef2 100644 |
| 23 |
--- a/dev-db/pgpool2/Manifest |
| 24 |
+++ b/dev-db/pgpool2/Manifest |
| 25 |
@@ -1,3 +1,4 @@ |
| 26 |
DIST pgpool-II-3.5.2.tar.gz 2227075 SHA256 5d29fd9c30141bfdaf15b51c7878766178e5df42fa5e160d0f7df2824d26104f SHA512 dd7268bce0019de30dfad01a8600af798127a4c2cc818e6f85ba30289e97c253d6faa392734d85ccbc97be3f04458c12af1bba541e5b8f3d2ee8268432e01d1a WHIRLPOOL 22939c855919b8399c1129ff4622eae159141e9bf05cc36aca456bfd582c7ab0dc7ec87df5ea96d7101f438e89bf4e06f46a5f63cfde22e505d0a3965c0496fc |
| 27 |
DIST pgpool-II-3.5.5.tar.gz 2243184 SHA256 8fa1ccf13ff4f7c1ab0f6d523090444f65d78923de11061b5027eb5d58318491 SHA512 f77888cbc5e2c15ae1035ee3a1965d4fd3d02cdfd5810c6c656456eaa0d73dae7471906bdf0848607723633da5b8d02145559b767735bcc9b7e4023b1d59efed WHIRLPOOL 5f4d4d9c3f6478b9b3ecda311c571e1f54805a07aa505acd32fbfb8fb2790183b732d6f86843a2b6614c74565efad7f9b3d962281cd2b1d23b54515448a1c84a |
| 28 |
DIST pgpool-II-3.6.1.tar.gz 2539510 SHA256 244f99a70198b5861a63b2fe3e44ac39d2819f6aa6497f62958c6afa2750d94c SHA512 9d4f0ecec3cf7478c7c4cd5cb1aa75614edca204d11b145f145d752c24bed7f7f4ea2880f6a3f9833aee0b5f428e8cf36e2f91bdef2f6065fb98019df546469a WHIRLPOOL 9a307a63e9179ecfc7a52d1f056d47f09543bf4e378fa0090cdaf90d141c70e89323b4cfcbc9bbd9fa2422ff76bea592f189bea78915445fb1779ce9089ef6e1 |
| 29 |
+DIST pgpool-II-3.6.4.tar.gz 2623625 SHA256 6ad78b9878d126e8da1e03e8edf3c8d56bb0754fe6432f633e81f6faaf8e6dbf SHA512 a44724b77faca12bc2b46a88e307c10f8099574b5a27720c98f2939fbfa61f41b4c3dc03565412972c351c10d57da4324a483c310b52f624f5ba87c2bd4d006f WHIRLPOOL 410136d359baa369f3d19136da54ba202c8b250bf364fc2f9b91a66190266ae523647cc89313211b63effbedd97168d026a2574be059dd0da7c8768b2d9714e7 |
| 30 |
|
| 31 |
diff --git a/dev-db/pgpool2/files/pgpool_run_paths-3.6.4.patch b/dev-db/pgpool2/files/pgpool_run_paths-3.6.4.patch |
| 32 |
new file mode 100644 |
| 33 |
index 00000000000..d6943d7502e |
| 34 |
--- /dev/null |
| 35 |
+++ b/dev-db/pgpool2/files/pgpool_run_paths-3.6.4.patch |
| 36 |
@@ -0,0 +1,255 @@ |
| 37 |
+diff -ru a/src/include/parser/pg_config_manual.h b/src/include/parser/pg_config_manual.h |
| 38 |
+--- a/src/include/parser/pg_config_manual.h 2017-05-11 05:53:04.000000000 -0400 |
| 39 |
++++ b/src/include/parser/pg_config_manual.h 2017-07-08 20:28:47.733745889 -0400 |
| 40 |
+@@ -184,7 +184,7 @@ |
| 41 |
+ * here's where to twiddle it. You can also override this at runtime |
| 42 |
+ * with the postmaster's -k switch. |
| 43 |
+ */ |
| 44 |
+-#define DEFAULT_PGSOCKET_DIR "/tmp" |
| 45 |
++#define DEFAULT_PGSOCKET_DIR "/run/postgresql" |
| 46 |
+ |
| 47 |
+ /* |
| 48 |
+ * This is the default event source for Windows event log. |
| 49 |
+diff -ru a/src/include/pcp/pcp_stream.h b/src/include/pcp/pcp_stream.h |
| 50 |
+--- a/src/include/pcp/pcp_stream.h 2017-05-11 05:36:01.000000000 -0400 |
| 51 |
++++ b/src/include/pcp/pcp_stream.h 2017-07-08 20:29:28.613506800 -0400 |
| 52 |
+@@ -48,6 +48,6 @@ |
| 53 |
+ extern int pcp_write(PCP_CONNECTION *pc, void *buf, int len); |
| 54 |
+ extern int pcp_flush(PCP_CONNECTION *pc); |
| 55 |
+ |
| 56 |
+-#define UNIX_DOMAIN_PATH "/tmp" |
| 57 |
++#define UNIX_DOMAIN_PATH "/run/pgpool" |
| 58 |
+ |
| 59 |
+ #endif /* PCP_STREAM_H */ |
| 60 |
+diff -ru a/src/include/pool.h b/src/include/pool.h |
| 61 |
+--- a/src/include/pool.h 2017-05-11 05:53:04.000000000 -0400 |
| 62 |
++++ b/src/include/pool.h 2017-07-08 20:27:09.330984074 -0400 |
| 63 |
+@@ -73,16 +73,16 @@ |
| 64 |
+ #define HBA_CONF_FILE_NAME "pool_hba.conf" |
| 65 |
+ |
| 66 |
+ /* pid file directory */ |
| 67 |
+-#define DEFAULT_LOGDIR "/tmp" |
| 68 |
++#define DEFAULT_LOGDIR "/run/pgpool" |
| 69 |
+ |
| 70 |
+ /* Unix domain socket directory */ |
| 71 |
+-#define DEFAULT_SOCKET_DIR "/tmp" |
| 72 |
++#define DEFAULT_SOCKET_DIR "/run/postgresql" |
| 73 |
+ |
| 74 |
+ /* Unix domain socket directory for watchdog IPC */ |
| 75 |
+-#define DEFAULT_WD_IPC_SOCKET_DIR "/tmp" |
| 76 |
++#define DEFAULT_WD_IPC_SOCKET_DIR "/run/pgpool" |
| 77 |
+ |
| 78 |
+ /* pid file name */ |
| 79 |
+-#define DEFAULT_PID_FILE_NAME "/var/run/pgpool/pgpool.pid" |
| 80 |
++#define DEFAULT_PID_FILE_NAME "/run/pgpool/pgpool.pid" |
| 81 |
+ |
| 82 |
+ /* status file name */ |
| 83 |
+ #define STATUS_FILE_NAME "pgpool_status" |
| 84 |
+diff -ru a/src/sample/pgpool.conf.sample b/src/sample/pgpool.conf.sample |
| 85 |
+--- a/src/sample/pgpool.conf.sample 2017-05-11 05:53:04.000000000 -0400 |
| 86 |
++++ b/src/sample/pgpool.conf.sample 2017-07-08 20:36:28.477717849 -0400 |
| 87 |
+@@ -31,10 +31,8 @@ |
| 88 |
+ port = 9999 |
| 89 |
+ # Port number |
| 90 |
+ # (change requires restart) |
| 91 |
+-socket_dir = '/tmp' |
| 92 |
++socket_dir = '/run/postgresql' |
| 93 |
+ # Unix domain socket path |
| 94 |
+- # The Debian package defaults to |
| 95 |
+- # /var/run/postgresql |
| 96 |
+ # (change requires restart) |
| 97 |
+ listen_backlog_multiplier = 2 |
| 98 |
+ # Set the backlog parameter of listen(2) to |
| 99 |
+@@ -53,10 +51,8 @@ |
| 100 |
+ pcp_port = 9898 |
| 101 |
+ # Port number for pcp |
| 102 |
+ # (change requires restart) |
| 103 |
+-pcp_socket_dir = '/tmp' |
| 104 |
++pcp_socket_dir = '/run/pgpool' |
| 105 |
+ # Unix domain socket path for pcp |
| 106 |
+- # The Debian package defaults to |
| 107 |
+- # /var/run/postgresql |
| 108 |
+ # (change requires restart) |
| 109 |
+ |
| 110 |
+ # - Backend Connection Settings - |
| 111 |
+@@ -210,10 +206,10 @@ |
| 112 |
+ # FILE LOCATIONS |
| 113 |
+ #------------------------------------------------------------------------------ |
| 114 |
+ |
| 115 |
+-pid_file_name = '/var/run/pgpool/pgpool.pid' |
| 116 |
++pid_file_name = '/run/pgpool/pgpool.pid' |
| 117 |
+ # PID file name |
| 118 |
+ # (change requires restart) |
| 119 |
+-logdir = '/var/log/pgpool' |
| 120 |
++logdir = '/run/pgpool' |
| 121 |
+ # Directory of pgPool status file |
| 122 |
+ # (change requires restart) |
| 123 |
+ |
| 124 |
+@@ -490,10 +486,8 @@ |
| 125 |
+ # Authentication key for watchdog communication |
| 126 |
+ # (change requires restart) |
| 127 |
+ |
| 128 |
+-wd_ipc_socket_dir = '/tmp' |
| 129 |
++wd_ipc_socket_dir = '/run/pgpool' |
| 130 |
+ # Unix domain socket path for watchdog IPC socket |
| 131 |
+- # The Debian package defaults to |
| 132 |
+- # /var/run/postgresql |
| 133 |
+ # (change requires restart) |
| 134 |
+ |
| 135 |
+ |
| 136 |
+diff -ru a/src/sample/pgpool.conf.sample-master-slave b/src/sample/pgpool.conf.sample-master-slave |
| 137 |
+--- a/src/sample/pgpool.conf.sample-master-slave 2017-05-11 05:53:04.000000000 -0400 |
| 138 |
++++ b/src/sample/pgpool.conf.sample-master-slave 2017-07-08 20:37:17.914095382 -0400 |
| 139 |
+@@ -31,10 +31,8 @@ |
| 140 |
+ port = 9999 |
| 141 |
+ # Port number |
| 142 |
+ # (change requires restart) |
| 143 |
+-socket_dir = '/tmp' |
| 144 |
++socket_dir = '/run/postgresql' |
| 145 |
+ # Unix domain socket path |
| 146 |
+- # The Debian package defaults to |
| 147 |
+- # /var/run/postgresql |
| 148 |
+ # (change requires restart) |
| 149 |
+ listen_backlog_multiplier = 2 |
| 150 |
+ # Set the backlog parameter of listen(2) to |
| 151 |
+@@ -53,10 +51,8 @@ |
| 152 |
+ pcp_port = 9898 |
| 153 |
+ # Port number for pcp |
| 154 |
+ # (change requires restart) |
| 155 |
+-pcp_socket_dir = '/tmp' |
| 156 |
++pcp_socket_dir = '/run/pgpool' |
| 157 |
+ # Unix domain socket path for pcp |
| 158 |
+- # The Debian package defaults to |
| 159 |
+- # /var/run/postgresql |
| 160 |
+ # (change requires restart) |
| 161 |
+ |
| 162 |
+ # - Backend Connection Settings - |
| 163 |
+@@ -210,10 +206,10 @@ |
| 164 |
+ # FILE LOCATIONS |
| 165 |
+ #------------------------------------------------------------------------------ |
| 166 |
+ |
| 167 |
+-pid_file_name = '/var/run/pgpool/pgpool.pid' |
| 168 |
++pid_file_name = '/run/pgpool/pgpool.pid' |
| 169 |
+ # PID file name |
| 170 |
+ # (change requires restart) |
| 171 |
+-logdir = '/tmp' |
| 172 |
++logdir = '/run/pgpool' |
| 173 |
+ # Directory of pgPool status file |
| 174 |
+ # (change requires restart) |
| 175 |
+ |
| 176 |
+@@ -489,10 +485,8 @@ |
| 177 |
+ # Authentication key for watchdog communication |
| 178 |
+ # (change requires restart) |
| 179 |
+ |
| 180 |
+-wd_ipc_socket_dir = '/tmp' |
| 181 |
++wd_ipc_socket_dir = '/run/pgpool' |
| 182 |
+ # Unix domain socket path for watchdog IPC socket |
| 183 |
+- # The Debian package defaults to |
| 184 |
+- # /var/run/postgresql |
| 185 |
+ # (change requires restart) |
| 186 |
+ |
| 187 |
+ # - Virtual IP control Setting - |
| 188 |
+diff -ru a/src/sample/pgpool.conf.sample-replication b/src/sample/pgpool.conf.sample-replication |
| 189 |
+--- a/src/sample/pgpool.conf.sample-replication 2017-05-11 05:53:04.000000000 -0400 |
| 190 |
++++ b/src/sample/pgpool.conf.sample-replication 2017-07-08 20:37:30.384022450 -0400 |
| 191 |
+@@ -31,10 +31,8 @@ |
| 192 |
+ port = 9999 |
| 193 |
+ # Port number |
| 194 |
+ # (change requires restart) |
| 195 |
+-socket_dir = '/tmp' |
| 196 |
++socket_dir = '/run/postgresql' |
| 197 |
+ # Unix domain socket path |
| 198 |
+- # The Debian package defaults to |
| 199 |
+- # /var/run/postgresql |
| 200 |
+ # (change requires restart) |
| 201 |
+ listen_backlog_multiplier = 2 |
| 202 |
+ # Set the backlog parameter of listen(2) to |
| 203 |
+@@ -53,10 +51,8 @@ |
| 204 |
+ pcp_port = 9898 |
| 205 |
+ # Port number for pcp |
| 206 |
+ # (change requires restart) |
| 207 |
+-pcp_socket_dir = '/tmp' |
| 208 |
++pcp_socket_dir = '/run/pgpool' |
| 209 |
+ # Unix domain socket path for pcp |
| 210 |
+- # The Debian package defaults to |
| 211 |
+- # /var/run/postgresql |
| 212 |
+ # (change requires restart) |
| 213 |
+ |
| 214 |
+ # - Backend Connection Settings - |
| 215 |
+@@ -210,10 +206,10 @@ |
| 216 |
+ # FILE LOCATIONS |
| 217 |
+ #------------------------------------------------------------------------------ |
| 218 |
+ |
| 219 |
+-pid_file_name = '/var/run/pgpool/pgpool.pid' |
| 220 |
++pid_file_name = '/run/pgpool/pgpool.pid' |
| 221 |
+ # PID file name |
| 222 |
+ # (change requires restart) |
| 223 |
+-logdir = '/tmp' |
| 224 |
++logdir = '/run/pgpool' |
| 225 |
+ # Directory of pgPool status file |
| 226 |
+ # (change requires restart) |
| 227 |
+ |
| 228 |
+@@ -489,10 +485,8 @@ |
| 229 |
+ # Authentication key for watchdog communication |
| 230 |
+ # (change requires restart) |
| 231 |
+ |
| 232 |
+-wd_ipc_socket_dir = '/tmp' |
| 233 |
++wd_ipc_socket_dir = '/run/pgpool' |
| 234 |
+ # Unix domain socket path for watchdog IPC socket |
| 235 |
+- # The Debian package defaults to |
| 236 |
+- # /var/run/postgresql |
| 237 |
+ # (change requires restart) |
| 238 |
+ |
| 239 |
+ |
| 240 |
+diff -ru a/src/sample/pgpool.conf.sample-stream b/src/sample/pgpool.conf.sample-stream |
| 241 |
+--- a/src/sample/pgpool.conf.sample-stream 2017-05-11 05:53:04.000000000 -0400 |
| 242 |
++++ b/src/sample/pgpool.conf.sample-stream 2017-07-08 20:37:44.060609128 -0400 |
| 243 |
+@@ -31,10 +31,8 @@ |
| 244 |
+ port = 9999 |
| 245 |
+ # Port number |
| 246 |
+ # (change requires restart) |
| 247 |
+-socket_dir = '/tmp' |
| 248 |
++socket_dir = '/run/postgresql' |
| 249 |
+ # Unix domain socket path |
| 250 |
+- # The Debian package defaults to |
| 251 |
+- # /var/run/postgresql |
| 252 |
+ # (change requires restart) |
| 253 |
+ |
| 254 |
+ |
| 255 |
+@@ -47,10 +45,8 @@ |
| 256 |
+ pcp_port = 9898 |
| 257 |
+ # Port number for pcp |
| 258 |
+ # (change requires restart) |
| 259 |
+-pcp_socket_dir = '/tmp' |
| 260 |
++pcp_socket_dir = '/run/pgpool' |
| 261 |
+ # Unix domain socket path for pcp |
| 262 |
+- # The Debian package defaults to |
| 263 |
+- # /var/run/postgresql |
| 264 |
+ # (change requires restart) |
| 265 |
+ listen_backlog_multiplier = 2 |
| 266 |
+ # Set the backlog parameter of listen(2) to |
| 267 |
+@@ -211,10 +207,10 @@ |
| 268 |
+ # FILE LOCATIONS |
| 269 |
+ #------------------------------------------------------------------------------ |
| 270 |
+ |
| 271 |
+-pid_file_name = '/var/run/pgpool/pgpool.pid' |
| 272 |
++pid_file_name = '/run/pgpool/pgpool.pid' |
| 273 |
+ # PID file name |
| 274 |
+ # (change requires restart) |
| 275 |
+-logdir = '/tmp' |
| 276 |
++logdir = '/run/pgpool' |
| 277 |
+ # Directory of pgPool status file |
| 278 |
+ # (change requires restart) |
| 279 |
+ |
| 280 |
+@@ -489,10 +485,8 @@ |
| 281 |
+ # Authentication key for watchdog communication |
| 282 |
+ # (change requires restart) |
| 283 |
+ |
| 284 |
+-wd_ipc_socket_dir = '/tmp' |
| 285 |
++wd_ipc_socket_dir = '/run/pgpool' |
| 286 |
+ # Unix domain socket path for watchdog IPC socket |
| 287 |
+- # The Debian package defaults to |
| 288 |
+- # /var/run/postgresql |
| 289 |
+ # (change requires restart) |
| 290 |
+ |
| 291 |
+ |
| 292 |
|
| 293 |
diff --git a/dev-db/pgpool2/files/pgpool_run_paths-9999.patch b/dev-db/pgpool2/files/pgpool_run_paths-9999.patch |
| 294 |
new file mode 100644 |
| 295 |
index 00000000000..691d6e867ef |
| 296 |
--- /dev/null |
| 297 |
+++ b/dev-db/pgpool2/files/pgpool_run_paths-9999.patch |
| 298 |
@@ -0,0 +1,274 @@ |
| 299 |
+diff --git a/src/include/parser/pg_config_manual.h b/src/include/parser/pg_config_manual.h |
| 300 |
+index d7e153b2..a4c9e87a 100644 |
| 301 |
+--- a/src/include/parser/pg_config_manual.h |
| 302 |
++++ b/src/include/parser/pg_config_manual.h |
| 303 |
+@@ -193,7 +193,7 @@ |
| 304 |
+ * here's where to twiddle it. You can also override this at runtime |
| 305 |
+ * with the postmaster's -k switch. |
| 306 |
+ */ |
| 307 |
+-#define DEFAULT_PGSOCKET_DIR "/tmp" |
| 308 |
++#define DEFAULT_PGSOCKET_DIR "/run/postgresql" |
| 309 |
+ |
| 310 |
+ /* |
| 311 |
+ * This is the default event source for Windows event log. |
| 312 |
+diff --git a/src/include/pcp/pcp_stream.h b/src/include/pcp/pcp_stream.h |
| 313 |
+index 254b98cb..5883ad31 100644 |
| 314 |
+--- a/src/include/pcp/pcp_stream.h |
| 315 |
++++ b/src/include/pcp/pcp_stream.h |
| 316 |
+@@ -48,6 +48,6 @@ extern int pcp_read(PCP_CONNECTION *pc, void *buf, int len); |
| 317 |
+ extern int pcp_write(PCP_CONNECTION *pc, void *buf, int len); |
| 318 |
+ extern int pcp_flush(PCP_CONNECTION *pc); |
| 319 |
+ |
| 320 |
+-#define UNIX_DOMAIN_PATH "/tmp" |
| 321 |
++#define UNIX_DOMAIN_PATH "/run/pgpool" |
| 322 |
+ |
| 323 |
+ #endif /* PCP_STREAM_H */ |
| 324 |
+diff --git a/src/include/pool.h b/src/include/pool.h |
| 325 |
+index d5dd63aa..a3ae197f 100644 |
| 326 |
+--- a/src/include/pool.h |
| 327 |
++++ b/src/include/pool.h |
| 328 |
+@@ -73,16 +73,16 @@ |
| 329 |
+ #define HBA_CONF_FILE_NAME "pool_hba.conf" |
| 330 |
+ |
| 331 |
+ /* pid file directory */ |
| 332 |
+-#define DEFAULT_LOGDIR "/tmp" |
| 333 |
++#define DEFAULT_LOGDIR "/run/pgpool" |
| 334 |
+ |
| 335 |
+ /* Unix domain socket directory */ |
| 336 |
+-#define DEFAULT_SOCKET_DIR "/tmp" |
| 337 |
++#define DEFAULT_SOCKET_DIR "/run/postgresql" |
| 338 |
+ |
| 339 |
+ /* Unix domain socket directory for watchdog IPC */ |
| 340 |
+-#define DEFAULT_WD_IPC_SOCKET_DIR "/tmp" |
| 341 |
++#define DEFAULT_WD_IPC_SOCKET_DIR "/run/pgpool" |
| 342 |
+ |
| 343 |
+ /* pid file name */ |
| 344 |
+-#define DEFAULT_PID_FILE_NAME "/var/run/pgpool/pgpool.pid" |
| 345 |
++#define DEFAULT_PID_FILE_NAME "/run/pgpool/pgpool.pid" |
| 346 |
+ |
| 347 |
+ /* status file name */ |
| 348 |
+ #define STATUS_FILE_NAME "pgpool_status" |
| 349 |
+diff --git a/src/sample/pgpool.conf.sample b/src/sample/pgpool.conf.sample |
| 350 |
+index d73c9bca..e95815ba 100644 |
| 351 |
+--- a/src/sample/pgpool.conf.sample |
| 352 |
++++ b/src/sample/pgpool.conf.sample |
| 353 |
+@@ -31,10 +31,8 @@ listen_addresses = 'localhost' |
| 354 |
+ port = 9999 |
| 355 |
+ # Port number |
| 356 |
+ # (change requires restart) |
| 357 |
+-socket_dir = '/tmp' |
| 358 |
++socket_dir = '/run/postgresql' |
| 359 |
+ # Unix domain socket path |
| 360 |
+- # The Debian package defaults to |
| 361 |
+- # /var/run/postgresql |
| 362 |
+ # (change requires restart) |
| 363 |
+ listen_backlog_multiplier = 2 |
| 364 |
+ # Set the backlog parameter of listen(2) to |
| 365 |
+@@ -53,10 +51,8 @@ pcp_listen_addresses = '*' |
| 366 |
+ pcp_port = 9898 |
| 367 |
+ # Port number for pcp |
| 368 |
+ # (change requires restart) |
| 369 |
+-pcp_socket_dir = '/tmp' |
| 370 |
++pcp_socket_dir = '/run/pgpool' |
| 371 |
+ # Unix domain socket path for pcp |
| 372 |
+- # The Debian package defaults to |
| 373 |
+- # /var/run/postgresql |
| 374 |
+ # (change requires restart) |
| 375 |
+ |
| 376 |
+ # - Backend Connection Settings - |
| 377 |
+@@ -210,13 +206,13 @@ syslog_ident = 'pgpool' |
| 378 |
+ # FILE LOCATIONS |
| 379 |
+ #------------------------------------------------------------------------------ |
| 380 |
+ |
| 381 |
+-pid_file_name = '/var/run/pgpool/pgpool.pid' |
| 382 |
++pid_file_name = '/run/pgpool/pgpool.pid' |
| 383 |
+ # PID file name |
| 384 |
+ # Can be specified as relative to the" |
| 385 |
+ # location of pgpool.conf file or |
| 386 |
+ # as an absolute path |
| 387 |
+ # (change requires restart) |
| 388 |
+-logdir = '/var/log/pgpool' |
| 389 |
++logdir = '/run/pgpool' |
| 390 |
+ # Directory of pgPool status file |
| 391 |
+ # (change requires restart) |
| 392 |
+ |
| 393 |
+@@ -505,10 +501,8 @@ wd_authkey = '' |
| 394 |
+ # Authentication key for watchdog communication |
| 395 |
+ # (change requires restart) |
| 396 |
+ |
| 397 |
+-wd_ipc_socket_dir = '/tmp' |
| 398 |
++wd_ipc_socket_dir = '/run/pgpool' |
| 399 |
+ # Unix domain socket path for watchdog IPC socket |
| 400 |
+- # The Debian package defaults to |
| 401 |
+- # /var/run/postgresql |
| 402 |
+ # (change requires restart) |
| 403 |
+ |
| 404 |
+ |
| 405 |
+diff --git a/src/sample/pgpool.conf.sample-master-slave b/src/sample/pgpool.conf.sample-master-slave |
| 406 |
+index 612c10a7..ad385ba6 100644 |
| 407 |
+--- a/src/sample/pgpool.conf.sample-master-slave |
| 408 |
++++ b/src/sample/pgpool.conf.sample-master-slave |
| 409 |
+@@ -31,10 +31,8 @@ listen_addresses = 'localhost' |
| 410 |
+ port = 9999 |
| 411 |
+ # Port number |
| 412 |
+ # (change requires restart) |
| 413 |
+-socket_dir = '/tmp' |
| 414 |
++socket_dir = '/run/postgresql' |
| 415 |
+ # Unix domain socket path |
| 416 |
+- # The Debian package defaults to |
| 417 |
+- # /var/run/postgresql |
| 418 |
+ # (change requires restart) |
| 419 |
+ listen_backlog_multiplier = 2 |
| 420 |
+ # Set the backlog parameter of listen(2) to |
| 421 |
+@@ -53,10 +51,8 @@ pcp_listen_addresses = '*' |
| 422 |
+ pcp_port = 9898 |
| 423 |
+ # Port number for pcp |
| 424 |
+ # (change requires restart) |
| 425 |
+-pcp_socket_dir = '/tmp' |
| 426 |
++pcp_socket_dir = '/run/pgpool' |
| 427 |
+ # Unix domain socket path for pcp |
| 428 |
+- # The Debian package defaults to |
| 429 |
+- # /var/run/postgresql |
| 430 |
+ # (change requires restart) |
| 431 |
+ |
| 432 |
+ # - Backend Connection Settings - |
| 433 |
+@@ -210,13 +206,13 @@ syslog_ident = 'pgpool' |
| 434 |
+ # FILE LOCATIONS |
| 435 |
+ #------------------------------------------------------------------------------ |
| 436 |
+ |
| 437 |
+-pid_file_name = '/var/run/pgpool/pgpool.pid' |
| 438 |
++pid_file_name = '/run/pgpool/pgpool.pid' |
| 439 |
+ # PID file name |
| 440 |
+ # Can be specified as relative to the" |
| 441 |
+ # location of pgpool.conf file or |
| 442 |
+ # as an absolute path |
| 443 |
+ # (change requires restart) |
| 444 |
+-logdir = '/tmp' |
| 445 |
++logdir = '/run/pgpool' |
| 446 |
+ # Directory of pgPool status file |
| 447 |
+ # (change requires restart) |
| 448 |
+ |
| 449 |
+@@ -504,10 +500,8 @@ wd_authkey = '' |
| 450 |
+ # Authentication key for watchdog communication |
| 451 |
+ # (change requires restart) |
| 452 |
+ |
| 453 |
+-wd_ipc_socket_dir = '/tmp' |
| 454 |
++wd_ipc_socket_dir = '/run/pgpool' |
| 455 |
+ # Unix domain socket path for watchdog IPC socket |
| 456 |
+- # The Debian package defaults to |
| 457 |
+- # /var/run/postgresql |
| 458 |
+ # (change requires restart) |
| 459 |
+ |
| 460 |
+ # - Virtual IP control Setting - |
| 461 |
+diff --git a/src/sample/pgpool.conf.sample-replication b/src/sample/pgpool.conf.sample-replication |
| 462 |
+index f47a7957..bd7ce73e 100644 |
| 463 |
+--- a/src/sample/pgpool.conf.sample-replication |
| 464 |
++++ b/src/sample/pgpool.conf.sample-replication |
| 465 |
+@@ -31,10 +31,8 @@ listen_addresses = 'localhost' |
| 466 |
+ port = 9999 |
| 467 |
+ # Port number |
| 468 |
+ # (change requires restart) |
| 469 |
+-socket_dir = '/tmp' |
| 470 |
++socket_dir = '/run/postgresql' |
| 471 |
+ # Unix domain socket path |
| 472 |
+- # The Debian package defaults to |
| 473 |
+- # /var/run/postgresql |
| 474 |
+ # (change requires restart) |
| 475 |
+ listen_backlog_multiplier = 2 |
| 476 |
+ # Set the backlog parameter of listen(2) to |
| 477 |
+@@ -53,10 +51,8 @@ pcp_listen_addresses = '*' |
| 478 |
+ pcp_port = 9898 |
| 479 |
+ # Port number for pcp |
| 480 |
+ # (change requires restart) |
| 481 |
+-pcp_socket_dir = '/tmp' |
| 482 |
++pcp_socket_dir = '/run/pgpool' |
| 483 |
+ # Unix domain socket path for pcp |
| 484 |
+- # The Debian package defaults to |
| 485 |
+- # /var/run/postgresql |
| 486 |
+ # (change requires restart) |
| 487 |
+ |
| 488 |
+ # - Backend Connection Settings - |
| 489 |
+@@ -210,13 +206,13 @@ syslog_ident = 'pgpool' |
| 490 |
+ # FILE LOCATIONS |
| 491 |
+ #------------------------------------------------------------------------------ |
| 492 |
+ |
| 493 |
+-pid_file_name = '/var/run/pgpool/pgpool.pid' |
| 494 |
++pid_file_name = '/run/pgpool/pgpool.pid' |
| 495 |
+ # PID file name |
| 496 |
+ # Can be specified as relative to the" |
| 497 |
+ # location of pgpool.conf file or |
| 498 |
+ # as an absolute path |
| 499 |
+ # (change requires restart) |
| 500 |
+-logdir = '/tmp' |
| 501 |
++logdir = '/run/pgpool' |
| 502 |
+ # Directory of pgPool status file |
| 503 |
+ # (change requires restart) |
| 504 |
+ |
| 505 |
+@@ -504,10 +500,8 @@ wd_authkey = '' |
| 506 |
+ # Authentication key for watchdog communication |
| 507 |
+ # (change requires restart) |
| 508 |
+ |
| 509 |
+-wd_ipc_socket_dir = '/tmp' |
| 510 |
++wd_ipc_socket_dir = '/run/pgpool' |
| 511 |
+ # Unix domain socket path for watchdog IPC socket |
| 512 |
+- # The Debian package defaults to |
| 513 |
+- # /var/run/postgresql |
| 514 |
+ # (change requires restart) |
| 515 |
+ |
| 516 |
+ |
| 517 |
+diff --git a/src/sample/pgpool.conf.sample-stream b/src/sample/pgpool.conf.sample-stream |
| 518 |
+index d57226b0..669a31d4 100644 |
| 519 |
+--- a/src/sample/pgpool.conf.sample-stream |
| 520 |
++++ b/src/sample/pgpool.conf.sample-stream |
| 521 |
+@@ -31,10 +31,8 @@ listen_addresses = 'localhost' |
| 522 |
+ port = 9999 |
| 523 |
+ # Port number |
| 524 |
+ # (change requires restart) |
| 525 |
+-socket_dir = '/tmp' |
| 526 |
++socket_dir = '/run/postgresql' |
| 527 |
+ # Unix domain socket path |
| 528 |
+- # The Debian package defaults to |
| 529 |
+- # /var/run/postgresql |
| 530 |
+ # (change requires restart) |
| 531 |
+ |
| 532 |
+ |
| 533 |
+@@ -47,10 +45,8 @@ pcp_listen_addresses = '*' |
| 534 |
+ pcp_port = 9898 |
| 535 |
+ # Port number for pcp |
| 536 |
+ # (change requires restart) |
| 537 |
+-pcp_socket_dir = '/tmp' |
| 538 |
++pcp_socket_dir = '/run/pgpool' |
| 539 |
+ # Unix domain socket path for pcp |
| 540 |
+- # The Debian package defaults to |
| 541 |
+- # /var/run/postgresql |
| 542 |
+ # (change requires restart) |
| 543 |
+ listen_backlog_multiplier = 2 |
| 544 |
+ # Set the backlog parameter of listen(2) to |
| 545 |
+@@ -211,13 +207,13 @@ syslog_ident = 'pgpool' |
| 546 |
+ # FILE LOCATIONS |
| 547 |
+ #------------------------------------------------------------------------------ |
| 548 |
+ |
| 549 |
+-pid_file_name = '/var/run/pgpool/pgpool.pid' |
| 550 |
++pid_file_name = '/run/pgpool/pgpool.pid' |
| 551 |
+ # PID file name |
| 552 |
+ # Can be specified as relative to the" |
| 553 |
+ # location of pgpool.conf file or |
| 554 |
+ # as an absolute path |
| 555 |
+ # (change requires restart) |
| 556 |
+-logdir = '/tmp' |
| 557 |
++logdir = '/run/pgpool' |
| 558 |
+ # Directory of pgPool status file |
| 559 |
+ # (change requires restart) |
| 560 |
+ |
| 561 |
+@@ -504,10 +500,8 @@ wd_authkey = '' |
| 562 |
+ # Authentication key for watchdog communication |
| 563 |
+ # (change requires restart) |
| 564 |
+ |
| 565 |
+-wd_ipc_socket_dir = '/tmp' |
| 566 |
++wd_ipc_socket_dir = '/run/pgpool' |
| 567 |
+ # Unix domain socket path for watchdog IPC socket |
| 568 |
+- # The Debian package defaults to |
| 569 |
+- # /var/run/postgresql |
| 570 |
+ # (change requires restart) |
| 571 |
+ |
| 572 |
+ |
| 573 |
|
| 574 |
diff --git a/dev-db/pgpool2/pgpool2-3.6.4.ebuild b/dev-db/pgpool2/pgpool2-3.6.4.ebuild |
| 575 |
new file mode 100644 |
| 576 |
index 00000000000..cf9cd0abf25 |
| 577 |
--- /dev/null |
| 578 |
+++ b/dev-db/pgpool2/pgpool2-3.6.4.ebuild |
| 579 |
@@ -0,0 +1,98 @@ |
| 580 |
+# Copyright 1999-2017 Gentoo Foundation |
| 581 |
+# Distributed under the terms of the GNU General Public License v2 |
| 582 |
+ |
| 583 |
+EAPI=6 |
| 584 |
+ |
| 585 |
+POSTGRES_COMPAT=( 9.{2..6} ) |
| 586 |
+ |
| 587 |
+inherit postgres-multi |
| 588 |
+ |
| 589 |
+MY_P="${PN/2/-II}-${PV}" |
| 590 |
+ |
| 591 |
+DESCRIPTION="Connection pool server for PostgreSQL" |
| 592 |
+HOMEPAGE="http://www.pgpool.net/" |
| 593 |
+SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz" |
| 594 |
+LICENSE="BSD" |
| 595 |
+SLOT="0" |
| 596 |
+ |
| 597 |
+KEYWORDS="~amd64 ~x86" |
| 598 |
+ |
| 599 |
+IUSE="doc memcached pam ssl static-libs" |
| 600 |
+ |
| 601 |
+RDEPEND=" |
| 602 |
+ ${POSTGRES_DEP} |
| 603 |
+ memcached? ( dev-libs/libmemcached ) |
| 604 |
+ pam? ( sys-auth/pambase ) |
| 605 |
+ ssl? ( dev-libs/openssl:* ) |
| 606 |
+" |
| 607 |
+DEPEND="${RDEPEND} |
| 608 |
+ sys-devel/bison |
| 609 |
+ !!dev-db/pgpool |
| 610 |
+" |
| 611 |
+ |
| 612 |
+S=${WORKDIR}/${MY_P} |
| 613 |
+ |
| 614 |
+pkg_setup() { |
| 615 |
+ postgres_new_user pgpool |
| 616 |
+ |
| 617 |
+ postgres-multi_pkg_setup |
| 618 |
+} |
| 619 |
+ |
| 620 |
+src_prepare() { |
| 621 |
+ eapply "${FILESDIR}/pgpool_run_paths-3.6.4.patch" |
| 622 |
+ |
| 623 |
+ postgres-multi_src_prepare |
| 624 |
+} |
| 625 |
+ |
| 626 |
+src_configure() { |
| 627 |
+ local myconf |
| 628 |
+ use memcached && \ |
| 629 |
+ myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\"" |
| 630 |
+ use pam && myconf+=' --with-pam' |
| 631 |
+ |
| 632 |
+ postgres-multi_foreach econf \ |
| 633 |
+ --disable-rpath \ |
| 634 |
+ --sysconfdir="${EROOT%/}/etc/${PN}" \ |
| 635 |
+ --with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \ |
| 636 |
+ --with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \ |
| 637 |
+ $(use_with ssl openssl) \ |
| 638 |
+ $(use_enable static-libs static) \ |
| 639 |
+ ${myconf} |
| 640 |
+} |
| 641 |
+ |
| 642 |
+src_compile() { |
| 643 |
+ # Even though we're only going to do an install for the best slot |
| 644 |
+ # available, the extension bits in src/sql need some things outside |
| 645 |
+ # of that directory built, too. |
| 646 |
+ postgres-multi_foreach emake |
| 647 |
+ postgres-multi_foreach emake -C src/sql |
| 648 |
+} |
| 649 |
+ |
| 650 |
+src_install() { |
| 651 |
+ # We only need the best stuff installed |
| 652 |
+ postgres-multi_forbest emake DESTDIR="${D}" install |
| 653 |
+ |
| 654 |
+ # Except for the extension and .so files that each PostgreSQL slot needs |
| 655 |
+ postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install |
| 656 |
+ |
| 657 |
+ newinitd "${FILESDIR}/${PN}.initd" ${PN} |
| 658 |
+ newconfd "${FILESDIR}/${PN}.confd" ${PN} |
| 659 |
+ |
| 660 |
+ # Documentation! |
| 661 |
+ dodoc NEWS TODO |
| 662 |
+ if use doc ; then |
| 663 |
+ postgres-multi_forbest emake DESTDIR="${D}" -C doc install |
| 664 |
+ fi |
| 665 |
+ |
| 666 |
+ # Examples and extras |
| 667 |
+ # mv some files that get installed to /usr/share/pgpool-II so that |
| 668 |
+ # they all wind up in the same place |
| 669 |
+ mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die |
| 670 |
+ into "/usr/share/${PN}" |
| 671 |
+ dobin src/sample/{pgpool_recovery,pgpool_recovery_pitr,pgpool_remote_start} |
| 672 |
+ insinto "/usr/share/${PN}" |
| 673 |
+ doins src/sample/{{pcp,pgpool,pool_hba}.conf.sample*,pgpool.pam} |
| 674 |
+ |
| 675 |
+ # One more thing: Evil la files! |
| 676 |
+ find "${ED}" -name '*.la' -exec rm -f {} + |
| 677 |
+} |
| 678 |
|
| 679 |
diff --git a/dev-db/pgpool2/pgpool2-9999.ebuild b/dev-db/pgpool2/pgpool2-9999.ebuild |
| 680 |
index b351db267e3..031166c54b9 100644 |
| 681 |
--- a/dev-db/pgpool2/pgpool2-9999.ebuild |
| 682 |
+++ b/dev-db/pgpool2/pgpool2-9999.ebuild |
| 683 |
@@ -1,66 +1,45 @@ |
| 684 |
-# Copyright 1999-2014 Gentoo Foundation |
| 685 |
+# Copyright 1999-2017 Gentoo Foundation |
| 686 |
# Distributed under the terms of the GNU General Public License v2 |
| 687 |
|
| 688 |
-EAPI=4 |
| 689 |
+EAPI=6 |
| 690 |
|
| 691 |
-[[ ${PV} == 9999 ]] && MY_P=${PN/2/-II} || MY_P="${PN/2/-II}-${PV}" |
| 692 |
+EGIT_REPO_URI="https://git.postgresql.org/git/pgpool2.git" |
| 693 |
|
| 694 |
-ECVS_SERVER="cvs.pgfoundry.org:/cvsroot/pgpool" |
| 695 |
-ECVS_MODULE="pgpool-II" |
| 696 |
-[[ ${PV} == 9999 ]] && SCM_ECLASS="cvs" |
| 697 |
-inherit base user ${SCM_ECLASS} |
| 698 |
-unset SCM_ECLASS |
| 699 |
+POSTGRES_COMPAT=( 9.{2..6} ) |
| 700 |
+ |
| 701 |
+inherit git-r3 postgres-multi |
| 702 |
|
| 703 |
DESCRIPTION="Connection pool server for PostgreSQL" |
| 704 |
HOMEPAGE="http://www.pgpool.net/" |
| 705 |
-[[ ${PV} == 9999 ]] || SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz" |
| 706 |
+SRC_URI="" |
| 707 |
LICENSE="BSD" |
| 708 |
SLOT="0" |
| 709 |
|
| 710 |
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061 |
| 711 |
-[[ ${PV} == 9999 ]] || \ |
| 712 |
-KEYWORDS="~amd64 ~x86" |
| 713 |
+KEYWORDS="" |
| 714 |
|
| 715 |
-IUSE="memcached pam ssl static-libs" |
| 716 |
+IUSE="doc memcached pam ssl static-libs" |
| 717 |
|
| 718 |
RDEPEND=" |
| 719 |
- dev-db/postgresql |
| 720 |
+ ${POSTGRES_DEP} |
| 721 |
memcached? ( dev-libs/libmemcached ) |
| 722 |
pam? ( sys-auth/pambase ) |
| 723 |
- ssl? ( dev-libs/openssl ) |
| 724 |
+ ssl? ( dev-libs/openssl:* ) |
| 725 |
" |
| 726 |
DEPEND="${RDEPEND} |
| 727 |
sys-devel/bison |
| 728 |
!!dev-db/pgpool |
| 729 |
" |
| 730 |
|
| 731 |
-AUTOTOOLS_IN_SOURCE_BUILD="1" |
| 732 |
- |
| 733 |
-S=${WORKDIR}/${MY_P} |
| 734 |
- |
| 735 |
pkg_setup() { |
| 736 |
- enewgroup postgres 70 |
| 737 |
- enewuser pgpool -1 -1 -1 postgres |
| 738 |
+ postgres_new_user pgpool |
| 739 |
|
| 740 |
- # We need the postgres user as well so we can set the proper |
| 741 |
- # permissions on the sockets without getting into fights with |
| 742 |
- # PostgreSQL's initialization scripts. |
| 743 |
- enewuser postgres 70 /bin/bash /var/lib/postgresql postgres |
| 744 |
+ postgres-multi_pkg_setup |
| 745 |
} |
| 746 |
|
| 747 |
src_prepare() { |
| 748 |
- epatch "${FILESDIR}/pgpool_run_paths.patch" |
| 749 |
+ eapply "${FILESDIR}/pgpool_run_paths-9999.patch" |
| 750 |
|
| 751 |
- local pg_config_manual="$(pg_config --includedir)/pg_config_manual.h" |
| 752 |
- local pgsql_socket_dir=$(grep DEFAULT_PGSOCKET_DIR "${pg_config_manual}" | \ |
| 753 |
- sed 's|.*\"\(.*\)\"|\1|g') |
| 754 |
- local pgpool_socket_dir="$(dirname $pgsql_socket_dir)/pgpool" |
| 755 |
- |
| 756 |
- sed "s|@PGSQL_SOCKETDIR@|${pgsql_socket_dir}|g" \ |
| 757 |
- -i *.conf.sample* pool.h || die |
| 758 |
- |
| 759 |
- sed "s|@PGPOOL_SOCKETDIR@|${pgpool_socket_dir}|g" \ |
| 760 |
- -i *.conf.sample* pool.h || die |
| 761 |
+ postgres-multi_src_prepare |
| 762 |
} |
| 763 |
|
| 764 |
src_configure() { |
| 765 |
@@ -69,47 +48,48 @@ src_configure() { |
| 766 |
myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\"" |
| 767 |
use pam && myconf+=' --with-pam' |
| 768 |
|
| 769 |
- econf \ |
| 770 |
+ postgres-multi_foreach econf \ |
| 771 |
--disable-rpath \ |
| 772 |
--sysconfdir="${EROOT%/}/etc/${PN}" \ |
| 773 |
+ --with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \ |
| 774 |
+ --with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \ |
| 775 |
$(use_with ssl openssl) \ |
| 776 |
$(use_enable static-libs static) \ |
| 777 |
${myconf} |
| 778 |
} |
| 779 |
|
| 780 |
src_compile() { |
| 781 |
- emake |
| 782 |
- |
| 783 |
- cd sql |
| 784 |
- emake |
| 785 |
+ # Even though we're only going to do an install for the best slot |
| 786 |
+ # available, the extension bits in src/sql need some things outside |
| 787 |
+ # of that directory built, too. |
| 788 |
+ postgres-multi_foreach emake |
| 789 |
+ postgres-multi_foreach emake -C src/sql |
| 790 |
} |
| 791 |
|
| 792 |
src_install() { |
| 793 |
- emake DESTDIR="${D}" install |
| 794 |
- |
| 795 |
- cd sql |
| 796 |
- emake DESTDIR="${D}" install |
| 797 |
- cd "${S}" |
| 798 |
- |
| 799 |
- # `contrib' moved to `extension' with PostgreSQL 9.1 |
| 800 |
- local pgslot=$(postgresql-config show) |
| 801 |
- if [[ ${pgslot//.} > 90 ]] ; then |
| 802 |
- cd "${ED%/}$(pg_config --sharedir)" |
| 803 |
- mv contrib extension || die |
| 804 |
- cd "${S}" |
| 805 |
- fi |
| 806 |
+ # We only need the best stuff installed |
| 807 |
+ postgres-multi_forbest emake DESTDIR="${D}" install |
| 808 |
+ |
| 809 |
+ # Except for the extension and .so files that each PostgreSQL slot needs |
| 810 |
+ postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install |
| 811 |
|
| 812 |
newinitd "${FILESDIR}/${PN}.initd" ${PN} |
| 813 |
newconfd "${FILESDIR}/${PN}.confd" ${PN} |
| 814 |
|
| 815 |
- # Documentation |
| 816 |
- dodoc NEWS TODO doc/where_to_send_queries.{pdf,odg} |
| 817 |
- dohtml -r doc |
| 818 |
+ # Documentation! |
| 819 |
+ dodoc NEWS TODO |
| 820 |
+ if use doc ; then |
| 821 |
+ postgres-multi_forbest emake DESTDIR="${D}" -C doc install |
| 822 |
+ fi |
| 823 |
|
| 824 |
# Examples and extras |
| 825 |
- insinto "/usr/share/${PN}" |
| 826 |
- doins doc/{pgpool_remote_start,basebackup.sh,recovery.conf.sample} |
| 827 |
+ # mv some files that get installed to /usr/share/pgpool-II so that |
| 828 |
+ # they all wind up in the same place |
| 829 |
mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die |
| 830 |
+ into "/usr/share/${PN}" |
| 831 |
+ dobin src/sample/{pgpool_recovery,pgpool_recovery_pitr,pgpool_remote_start} |
| 832 |
+ insinto "/usr/share/${PN}" |
| 833 |
+ doins src/sample/{{pcp,pgpool,pool_hba}.conf.sample*,pgpool.pam} |
| 834 |
|
| 835 |
# One more thing: Evil la files! |
| 836 |
find "${ED}" -name '*.la' -exec rm -f {} + |
Archives