gentoo resync : 09.12.2017

2 files changed, 0 insertions, 181 deletions

diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest
index 58c39e10c9f8..cde66a9e37b5 100644
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@@ -4,7 +4,6 @@ AUX pgpool2.initd 2174 BLAKE2B 153fa1d756067fd381e599447fb71d780b90bc4c187d0146b
 AUX pgpool_run_paths-3.6.4.patch 10760 BLAKE2B a5aab30ba1d0a478f4efb119117770c5713ca2ae4276637805144754f0188a7dabe70cf24338887dd6712652048e9eb3a9872d3bc3fe828f2d767fbaf07d960c SHA512 ba3bdd19e6ea9178da3eb178f72981b337c9746ddf9f27d6de51d0d3c41d3a4b6f52ed88bbbbbcc6004693ee630172649ab316d69658b25521f438c44f72b3c5
 AUX pgpool_run_paths-3.6.5.patch 11626 BLAKE2B 5d0b7a49b3c8bf2f2d69d369894e9976037025b289b0ec0f2cf11ed9862347dc4cb166af2cbd65637de40fdae09809a9232b0638cf69339901d6f3f67e9ddcd5 SHA512 ea718378d0ea14fa48975a899df26bc8aafa1e61b0d3f264ead81031a21d68284f4af5ce065c5534d113faf36724c880ce280665e148ec623e9fea9c8f91c77c
 AUX pgpool_run_paths-9999.patch 11759 BLAKE2B 35df553f704846cc4ff8d67e5e6b54ca8ed0a5817a148c359b47cae7ff388fe2bb57600113d7f8ac9afe760ea75e3ddd410d111c2ef87aea3c3fb38671d59260 SHA512 109be0f3bcda49db14ebb86d6e9347aa0a47d582ac1a1438b07719f9fa503045cc5b65a27964c3c0b1690ef489f752a497e3b050b816569d0ce01193dc007259
-AUX pgpool_run_paths.patch 7443 BLAKE2B 456080ad743df95703c4cfd38b20d5ff2944d8848d617babe3cb8d63ea2fb3307828f448609298ab08db902dc60eb5780c0f6466d99eb1bad9485402ded8c42c SHA512 227716daf9d93d1ca0c749faedca3d1c9e35b64eebe4c61db2e37f94ed2dcc2e97e34118d853b3dbc848e395329c05c026f819a9e5350b4f0e32b269932d68b1
 DIST pgpool-II-3.5.2.tar.gz 2227075 BLAKE2B 4f40044dc37353a811b2f4ddd4bb6d41604e1fc5c64064603fcee704a92a4e4d3b1baa83314f476dfe32ecbd851208996139a55ffaffb3f1bb9f8ac72685a02f SHA512 dd7268bce0019de30dfad01a8600af798127a4c2cc818e6f85ba30289e97c253d6faa392734d85ccbc97be3f04458c12af1bba541e5b8f3d2ee8268432e01d1a
 DIST pgpool-II-3.5.5.tar.gz 2243184 SHA256 8fa1ccf13ff4f7c1ab0f6d523090444f65d78923de11061b5027eb5d58318491 SHA512 f77888cbc5e2c15ae1035ee3a1965d4fd3d02cdfd5810c6c656456eaa0d73dae7471906bdf0848607723633da5b8d02145559b767735bcc9b7e4023b1d59efed WHIRLPOOL 5f4d4d9c3f6478b9b3ecda311c571e1f54805a07aa505acd32fbfb8fb2790183b732d6f86843a2b6614c74565efad7f9b3d962281cd2b1d23b54515448a1c84a
 DIST pgpool-II-3.6.1.tar.gz 2539510 BLAKE2B 844f54a2f74251af8af1348c374807e1dce2028eb64d2974c7fb1b904c6518012764c16fdd7fdeea8b9039fcfa13d8c139a9b2e020fffc87e6b90f3d6a489e5c SHA512 9d4f0ecec3cf7478c7c4cd5cb1aa75614edca204d11b145f145d752c24bed7f7f4ea2880f6a3f9833aee0b5f428e8cf36e2f91bdef2f6065fb98019df546469a
diff --git a/dev-db/pgpool2/files/pgpool_run_paths.patch b/dev-db/pgpool2/files/pgpool_run_paths.patch
deleted file mode 100644
index a1912af15e4c..000000000000
--- a/dev-db/pgpool2/files/pgpool_run_paths.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-diff -Naurw a/pgpool.conf.sample b/pgpool.conf.sample
---- a/pgpool.conf.sample	2012-07-19 03:06:21.000000000 -0400
-+++ b/pgpool.conf.sample	2012-08-14 07:33:39.200695855 -0400
-@@ -31,10 +31,8 @@
- port = 9999
-                                    # Port number
-                                    # (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '@PGSQL_SOCKETDIR@'
-                                    # Unix domain socket path
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- 
- 
-@@ -43,10 +41,8 @@
- pcp_port = 9898
-                                    # Port number for pcp
-                                    # (change requires restart)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '@PGSQL_SOCKETDIR@'
-                                    # Unix domain socket path for pcp
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- 
- # - Backend Connection Settings -
-@@ -176,10 +172,10 @@
- # FILE LOCATIONS
- #------------------------------------------------------------------------------
- 
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '@PGPOOL_SOCKETDIR@/pgpool.pid'
-                                    # PID file name
-                                    # (change requires restart)
--logdir = '/tmp'
-+logdir = '@PGPOOL_SOCKETDIR@'
-                                    # Directory of pgPool status file
-                                    # (change requires restart)
- 
-diff -Naurw a/pgpool.conf.sample-master-slave b/pgpool.conf.sample-master-slave
---- a/pgpool.conf.sample-master-slave	2012-07-16 22:56:37.000000000 -0400
-+++ b/pgpool.conf.sample-master-slave	2012-08-14 07:33:39.201695842 -0400
-@@ -31,10 +31,8 @@
- port = 9999
-                                    # Port number
-                                    # (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '@PGSQL_SOCKETDIR@'
-                                    # Unix domain socket path
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- 
- 
-@@ -43,10 +41,8 @@
- pcp_port = 9898
-                                    # Port number for pcp
-                                    # (change requires restart)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '@PGSQL_SOCKETDIR@'
-                                    # Unix domain socket path for pcp
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- 
- # - Backend Connection Settings -
-@@ -176,10 +172,10 @@
- # FILE LOCATIONS
- #------------------------------------------------------------------------------
- 
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '@PGPOOL_SOCKETDIR@/pgpool.pid'
-                                    # PID file name
-                                    # (change requires restart)
--logdir = '/tmp'
-+logdir = '@PGPOOL_SOCKETDIR@'
-                                    # Directory of pgPool status file
-                                    # (change requires restart)
- 
-diff -Naurw a/pgpool.conf.sample-replication b/pgpool.conf.sample-replication
---- a/pgpool.conf.sample-replication	2012-07-16 22:56:37.000000000 -0400
-+++ b/pgpool.conf.sample-replication	2012-08-14 07:33:39.202695830 -0400
-@@ -31,10 +31,8 @@
- port = 9999
-                                    # Port number
-                                    # (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '@PGSQL_SOCKETDIR@'
-                                    # Unix domain socket path
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- 
- 
-@@ -43,10 +41,8 @@
- pcp_port = 9898
-                                    # Port number for pcp
-                                    # (change requires restart)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '@PGSQL_SOCKETDIR@'
-                                    # Unix domain socket path for pcp
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- 
- # - Backend Connection Settings -
-@@ -176,10 +172,10 @@
- # FILE LOCATIONS
- #------------------------------------------------------------------------------
- 
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '@PGPOOL_SOCKETDIR@/pgpool.pid'
-                                    # PID file name
-                                    # (change requires restart)
--logdir = '/tmp'
-+logdir = '@PGPOOL_SOCKETDIR@'
-                                    # Directory of pgPool status file
-                                    # (change requires restart)
- 
-diff -Naurw a/pgpool.conf.sample-stream b/pgpool.conf.sample-stream
---- a/pgpool.conf.sample-stream	2012-07-16 22:56:37.000000000 -0400
-+++ b/pgpool.conf.sample-stream	2012-08-14 07:33:39.203695818 -0400
-@@ -31,10 +31,8 @@
- port = 9999
-                                    # Port number
-                                    # (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '@PGSQL_SOCKETDIR@'
-                                    # Unix domain socket path
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- 
- 
-@@ -43,10 +41,8 @@
- pcp_port = 9898
-                                    # Port number for pcp
-                                    # (change requires restart)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '@PGSQL_SOCKETDIR@'
-                                    # Unix domain socket path for pcp
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- 
- # - Backend Connection Settings -
-@@ -176,10 +172,10 @@
- # FILE LOCATIONS
- #------------------------------------------------------------------------------
- 
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '@PGPOOL_SOCKETDIR@/pgpool.pid'
-                                    # PID file name
-                                    # (change requires restart)
--logdir = '/tmp'
-+logdir = '@PGPOOL_SOCKETDIR@'
-                                    # Directory of pgPool status file
-                                    # (change requires restart)
- 
-diff -Naurw a/pool.h b/pool.h
---- a/pool.h	2012-07-02 00:09:18.000000000 -0400
-+++ b/pool.h	2012-08-14 07:26:56.005764702 -0400
-@@ -61,13 +61,13 @@
- #define HBA_CONF_FILE_NAME "pool_hba.conf"
- 
- /* pid file directory */
--#define DEFAULT_LOGDIR "/tmp"
-+#define DEFAULT_LOGDIR "@PGPOOL_SOCKETDIR@"
- 
- /* Unix domain socket directory */
--#define DEFAULT_SOCKET_DIR "/tmp"
-+#define DEFAULT_SOCKET_DIR "@PGSQL_SOCKETDIR@"
- 
- /* pid file name */
--#define DEFAULT_PID_FILE_NAME "/var/run/pgpool/pgpool.pid"
-+#define DEFAULT_PID_FILE_NAME "@PGPOOL_SOCKETDIR@/pgpool.pid"
- 
- /* status file name */
- #define STATUS_FILE_NAME "pgpool_status"