gentoo resync : 13.01.2018

10 files changed, 4 insertions, 1053 deletions

diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest
index defc72762b26..ee65541078b8 100644
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@@ -1,24 +1,10 @@
-AUX pgpool2-3.5.0-path-fix.patch 8540 BLAKE2B 7f384a93c665eb790a2c2638104fc5fba6c818a31ea789c72505fadcd4431837698b799d1fc69d1aaf1b5bbcbf6233806289e152a2b185a57b0f643a1cb8a080 SHA512 b9e5b2c3532fd9a72f19915913b0a9d721a0e714de0215ae3f5f0d978b4effa9662b1eb3cb013fdb4f18160cc7c4ed5733f3085c98770aa6407a2af384065609
 AUX pgpool2.confd 649 BLAKE2B 1c520c4fa954c7411c1b700c03bf4e39196c599eb239cf86412fcf491759ca6f46b1264e7647a8d278ac45da3e20702f6f077dfbcccf83cb3f45575dd3571308 SHA512 5f9a4fa1e68161049ad767d64c764fbf70e84a4239e58119455a45a7e45d86ea2d19b617147cf891053e0dad4420c84704d67015334c7d41bad05b260d70e910
 AUX pgpool2.initd 2174 BLAKE2B 153fa1d756067fd381e599447fb71d780b90bc4c187d0146b1e2806fcc1c19a85d215b59b1931373a3a95fa7e719b9cebd93756276fbeeab087f2a5ba5a1f27b SHA512 3123d2c5e7178fc4b970592fe6908df2860ca3cd5ec54d4609c28145ffc934edf6ddb11f9d2208d89d43bc4252e326b3bc0eed36a28fd2fadbaeb2d635935e40
-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
-DIST pgpool-II-3.5.2.tar.gz 2227075 BLAKE2B 4f40044dc37353a811b2f4ddd4bb6d41604e1fc5c64064603fcee704a92a4e4d3b1baa83314f476dfe32ecbd851208996139a55ffaffb3f1bb9f8ac72685a02f SHA512 dd7268bce0019de30dfad01a8600af798127a4c2cc818e6f85ba30289e97c253d6faa392734d85ccbc97be3f04458c12af1bba541e5b8f3d2ee8268432e01d1a
-DIST pgpool-II-3.5.5.tar.gz 2243184 BLAKE2B 4267991fdf45ddd0e2bf3e253508b9b18ad669d0184bcb13143dddcfe6233e4aa223ba275f9471b2645262e43341fb4c8e5ac9e154ee2fd3de49aa5420de070e SHA512 f77888cbc5e2c15ae1035ee3a1965d4fd3d02cdfd5810c6c656456eaa0d73dae7471906bdf0848607723633da5b8d02145559b767735bcc9b7e4023b1d59efed
-DIST pgpool-II-3.6.1.tar.gz 2539510 BLAKE2B 844f54a2f74251af8af1348c374807e1dce2028eb64d2974c7fb1b904c6518012764c16fdd7fdeea8b9039fcfa13d8c139a9b2e020fffc87e6b90f3d6a489e5c SHA512 9d4f0ecec3cf7478c7c4cd5cb1aa75614edca204d11b145f145d752c24bed7f7f4ea2880f6a3f9833aee0b5f428e8cf36e2f91bdef2f6065fb98019df546469a
-DIST pgpool-II-3.6.4.tar.gz 2623625 BLAKE2B d8ba2a02c0b7e4d4b259dcf87a85d0b3b7dd11d5121907039cb3baad52f2c40bd0ff2457e844922d04c300068f1638d26b0efdc60d828e05a735d3866365ca8c SHA512 a44724b77faca12bc2b46a88e307c10f8099574b5a27720c98f2939fbfa61f41b4c3dc03565412972c351c10d57da4324a483c310b52f624f5ba87c2bd4d006f
-DIST pgpool-II-3.6.5.tar.gz 2651330 BLAKE2B d0ad069b17e1e0fb46590e7dd0dd29feb499a6703056d5ff5d4f218227158f4bca44f8d52209f378d08879a97c7930f85a61dfc22fce0bafa1313ad3c7649d5b SHA512 12247730f202859c76b0a11ccc485de786e53df7b8e08ffd76d7653c25633d79387f027e7c9d804bf19cd89b9db047b7ca0cf1cf5e914ee74c6efc0b6660eb1d
-DIST pgpool-II-3.6.6.tar.gz 3171264 BLAKE2B b519d097366f190c4b6136643ccd839d1854ced0287ec1dc9f058dad1f7ebc18448d97d48338d03a8a7eafee49391381a8aa802fc14b84b757b133d6c97ec94e SHA512 02cfceed761cf6338ce0a33e9afe05194acdf4d5577cf0d920176cb3bacffce6e9c2c1e8a8b89c5b062bc53d54cd012a4ad9582b42df7bc36ee666dcd0ee3e10
-DIST pgpool-II-3.6.7.tar.gz 3188186 BLAKE2B b58561418e4027716614d6a70f5d844b8043312cb2a2b18882e0fdcd466e1f0624e43db7c67685227d808368388c6ee9dd0d5f3ea956d0585444b1e30bc49643 SHA512 4bc80f4b47f4b37e4efe1af137c2af076dc98c438bf094236223bba0facfaea91546a86d7604e67453b67e82a24ac5ee6e4325d81f90358a3a0d7a6c34acd7fc
 DIST pgpool-II-3.7.0.tar.gz 3269076 BLAKE2B f7a396e82022a35e5f46fb644ca4a9007db3abaf97f8249d88bca00abf5d33abe7d47f705e959f7fb910885bf49f68bd5f965aae3085d12076d3100cca2f25f8 SHA512 cf8eef3a2ec761b51f9e6a72b5211810de57ad9b40b1738067616478b6486a813782588bfc92f6f351334d9514b1394551230c486fa0ac2f6c18a0490f22bbe2
-EBUILD pgpool2-3.5.2.ebuild 2465 BLAKE2B 4e7d19f6ebdb02735cd58c00def5fa0b451e2878085235c5258952e18ee93e7ff21b4ba71441e100bb583530a424cd1094078cab5ac6a4c689c857b8e2c24fd9 SHA512 5f1d18669f16acdccda9eedb0a24d61705f9b9ea23130c95428ba1143ca337815e724047b9b41ee48ae7ae0599e329edd4a45ecc3ac428b95868d9990b4542bb
-EBUILD pgpool2-3.5.5.ebuild 2465 BLAKE2B d2c3ac6f7be204def3c7a7c9be6cf3aee43af6c340342197023f4001d078bdacbb0476195154989eeeb8cfa5d547d9e0a2a301bf553fbd08407a5a00bef07b49 SHA512 8cbe17265f1b698eca9386d1268dd3e07cc305efb0b4bd8cecd995656827bcb1db573094514d7f1e0b51a9a80effb70bffdc7c3c62f14fe974c468e2e3090926
-EBUILD pgpool2-3.6.1.ebuild 2396 BLAKE2B 5695231ccae6d373539da8fd54228ad1dcea17cae390a8b2b75d037fa26a5d02cfa0210a715deb2b2209daab1196f8ed574d832617adbe7c540113322021a574 SHA512 27b23a48947221074fee372c3c1708492796f1d0671d0f98272aa279c8021e491be182b7cf5f74e7ab7fa8a683a76539e60ad28ea89a79ed06984bc2e3920386
-EBUILD pgpool2-3.6.4.ebuild 2502 BLAKE2B 14ca82a4af57366f226004f2956c9a1e23798622aad40e76c76bd15cfb93e54864fda1f90f04a9bda3323eab0e1fc04a2b6e7afd272c0e375029daf421fff9d3 SHA512 2c2ebf35fd59e3d6103f7416a4f0cf2b16858773d9e12ac2d8d146af2103008792bb2c49927772e44e4558775299ab268b822f3ffa44a4e279cdd8214d47bc27
-EBUILD pgpool2-3.6.5.ebuild 2488 BLAKE2B 221e4f4353405ed3027303429d9c2934bb42259d080fcabf7d1c764dbaf4f0ac2e8479426ff76b7d49bd00f4ca7ef107f9b297df55190b9ea830c8926ddc2b38 SHA512 84f54eadcc0500659d4b38314183eacfa3fa0a7e518cd354368beb96a6b1a6d6e5c9bf47abb601f2df33ccbe7f924dc51c5a20e1550090f09f625d6f59181630
-EBUILD pgpool2-3.6.6.ebuild 2488 BLAKE2B 221e4f4353405ed3027303429d9c2934bb42259d080fcabf7d1c764dbaf4f0ac2e8479426ff76b7d49bd00f4ca7ef107f9b297df55190b9ea830c8926ddc2b38 SHA512 84f54eadcc0500659d4b38314183eacfa3fa0a7e518cd354368beb96a6b1a6d6e5c9bf47abb601f2df33ccbe7f924dc51c5a20e1550090f09f625d6f59181630
-EBUILD pgpool2-3.6.7.ebuild 2488 BLAKE2B 221e4f4353405ed3027303429d9c2934bb42259d080fcabf7d1c764dbaf4f0ac2e8479426ff76b7d49bd00f4ca7ef107f9b297df55190b9ea830c8926ddc2b38 SHA512 84f54eadcc0500659d4b38314183eacfa3fa0a7e518cd354368beb96a6b1a6d6e5c9bf47abb601f2df33ccbe7f924dc51c5a20e1550090f09f625d6f59181630
+DIST pgpool-II-3.7.1.tar.gz 3237755 BLAKE2B ec196e384c9c4c03a28081fbb74b820c7480e2a98427441572142bd80bff6d2adbbda9bc19df1c70f4699af28fcac5f09161a5938df633bb9eba52c0d9dc24ac SHA512 2a83f573ca2a720ee7beb75d8d1380747e29b2bb3c809f51bd0f8e4423d67f882ce2acb7d9ea118c55313e969aba3bf94a0d5b190eb905123d43c09df25e00ef
 EBUILD pgpool2-3.7.0.ebuild 2489 BLAKE2B 1b2fd9bcb5c00ae160e80220e22aded619d7e769de630372c13ec1d8a3bb073b76a7aaac66861af6ea41242a35ccd8ac2ed2048cdb0ab0df884063e2a574f1f1 SHA512 8733a16433afcd1684c0ac5e38a3623ff1cea9a1fe4925f80d36e9cc0a4d45ddfe8ddd9edfd0695661a2cb0ed56c7ac917fb09dc4983a4f82351626f611bb4fb
+EBUILD pgpool2-3.7.1.ebuild 2491 BLAKE2B 0b2d0df464b71f63a9ab7a794a37eb0fb5a9617748ef149225552bdee4af01ae586a4a42276d93b5667f794c5f4c595b75c2f2fd9b26ce1f6ded370b02295adc SHA512 4a15fbb5fb53908a5a61c0649b8838ccaa4ca4f1f78ff411b9e30d8b2109b2069c3a430e58c849bfe4496c4894011e53350a3d5f8095f0bb138b7453b3f8c441
 EBUILD pgpool2-9999.ebuild 2440 BLAKE2B fcc37575bc095fe15b6176f351e86b97f5c5ea8385a3cd6100f3ebb4031e429b026b850c5c8b78770900e1d7fdee95e2e99190755c1b2a0204d2f37009d20bda SHA512 b2fd29cf9643d0cf093c64db9283dadcaa39fec6cca1ca8f1cb1cdd85265cbcca2fc30a52a041d2683328235c8717cead2083813f8b6365ad3465c620f0ec0a1
 MISC metadata.xml 390 BLAKE2B d6a0560051449e95bb43e81589eee966a477a75d7ec8211ae96b15f2d51ce9555181b8640d9d830f2b42f8159989e9126423c6ccbbc2bf2dd8121f4920a87a16 SHA512 ce26ee116c3c7ff77a771294ed07f38d8f940dc380915c339eb4c543d86fa5bde025ba83e70af2b7bf4a1bef1e51957f151131836855e0dae2e1daed73ffae8d
diff --git a/dev-db/pgpool2/files/pgpool2-3.5.0-path-fix.patch b/dev-db/pgpool2/files/pgpool2-3.5.0-path-fix.patch
deleted file mode 100644
index b2c5d554e561..000000000000
--- a/dev-db/pgpool2/files/pgpool2-3.5.0-path-fix.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-diff -aruw pgpool-II-3.5.0.orig/src/include/pool.h pgpool-II-3.5.0/src/include/pool.h
---- pgpool-II-3.5.0.orig/src/include/pool.h	2016-02-10 03:53:31.000000000 -0500
-+++ pgpool-II-3.5.0/src/include/pool.h	2016-03-12 06:47:15.297966248 -0500
-@@ -72,16 +72,16 @@
- #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 "@PGPOOL_SOCKETDIR@"
- 
- /* Unix domain socket directory for watchdog IPC */
--#define DEFAULT_WD_IPC_SOCKET_DIR "/tmp"
-+#define DEFAULT_WD_IPC_SOCKET_DIR "@PGPOOL_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"
-diff -aruw pgpool-II-3.5.0.orig/src/sample/pgpool.conf.sample pgpool-II-3.5.0/src/sample/pgpool.conf.sample
---- pgpool-II-3.5.0.orig/src/sample/pgpool.conf.sample	2016-02-10 03:53:31.000000000 -0500
-+++ pgpool-II-3.5.0/src/sample/pgpool.conf.sample	2016-03-12 08:55:22.318087007 -0500
-@@ -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)
- listen_backlog_multiplier = 2
-                                    # Set the backlog parameter of listen(2) to
-@@ -53,10 +51,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 -
-@@ -214,10 +210,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 = '/var/log/pgpool'
-+logdir = '/var/lib/pgpool'
-                                    # Directory of pgPool status file
-                                    # (change requires restart)
- 
-diff -aruw pgpool-II-3.5.0.orig/src/sample/pgpool.conf.sample-master-slave pgpool-II-3.5.0/src/sample/pgpool.conf.sample-master-slave
---- pgpool-II-3.5.0.orig/src/sample/pgpool.conf.sample-master-slave	2016-02-10 03:53:31.000000000 -0500
-+++ pgpool-II-3.5.0/src/sample/pgpool.conf.sample-master-slave	2016-03-12 08:55:45.284665542 -0500
-@@ -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)
- listen_backlog_multiplier = 2
-                                    # Set the backlog parameter of listen(2) to
-@@ -53,10 +51,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 -
-@@ -214,10 +210,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 = '/var/lib/pgpool'
-                                    # Directory of pgPool status file
-                                    # (change requires restart)
- 
-diff -aruw pgpool-II-3.5.0.orig/src/sample/pgpool.conf.sample-replication pgpool-II-3.5.0/src/sample/pgpool.conf.sample-replication
---- pgpool-II-3.5.0.orig/src/sample/pgpool.conf.sample-replication	2016-02-10 03:53:31.000000000 -0500
-+++ pgpool-II-3.5.0/src/sample/pgpool.conf.sample-replication	2016-03-12 08:56:55.004397999 -0500
-@@ -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)
- listen_backlog_multiplier = 2
-                                    # Set the backlog parameter of listen(2) to
-@@ -53,10 +51,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 -
-@@ -214,10 +210,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 = '/var/lib/pgpool'
-                                    # Directory of pgPool status file
-                                    # (change requires restart)
- 
-diff -aruw pgpool-II-3.5.0.orig/src/sample/pgpool.conf.sample-stream pgpool-II-3.5.0/src/sample/pgpool.conf.sample-stream
---- pgpool-II-3.5.0.orig/src/sample/pgpool.conf.sample-stream	2016-02-10 03:53:31.000000000 -0500
-+++ pgpool-II-3.5.0/src/sample/pgpool.conf.sample-stream	2016-03-12 08:58:23.820723842 -0500
-@@ -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)
- 
- 
-@@ -47,10 +45,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)
- listen_backlog_multiplier = 2
-                                    # Set the backlog parameter of listen(2) to
-@@ -215,10 +211,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 = '/var/lib/pgpool'
-                                    # Directory of pgPool status file
-                                    # (change requires restart)
- 
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
deleted file mode 100644
index d6943d7502e2..000000000000
--- a/dev-db/pgpool2/files/pgpool_run_paths-3.6.4.patch
+++ /dev/null
@@ -1,255 +0,0 @@
-diff -ru a/src/include/parser/pg_config_manual.h b/src/include/parser/pg_config_manual.h
---- a/src/include/parser/pg_config_manual.h	2017-05-11 05:53:04.000000000 -0400
-+++ b/src/include/parser/pg_config_manual.h	2017-07-08 20:28:47.733745889 -0400
-@@ -184,7 +184,7 @@
-  * here's where to twiddle it.  You can also override this at runtime
-  * with the postmaster's -k switch.
-  */
--#define DEFAULT_PGSOCKET_DIR  "/tmp"
-+#define DEFAULT_PGSOCKET_DIR  "/run/postgresql"
- 
- /*
-  * This is the default event source for Windows event log.
-diff -ru a/src/include/pcp/pcp_stream.h b/src/include/pcp/pcp_stream.h
---- a/src/include/pcp/pcp_stream.h	2017-05-11 05:36:01.000000000 -0400
-+++ b/src/include/pcp/pcp_stream.h	2017-07-08 20:29:28.613506800 -0400
-@@ -48,6 +48,6 @@
- extern int pcp_write(PCP_CONNECTION *pc, void *buf, int len);
- extern int pcp_flush(PCP_CONNECTION *pc);
- 
--#define UNIX_DOMAIN_PATH "/tmp"
-+#define UNIX_DOMAIN_PATH "/run/pgpool"
- 
- #endif /* PCP_STREAM_H */
-diff -ru a/src/include/pool.h b/src/include/pool.h
---- a/src/include/pool.h	2017-05-11 05:53:04.000000000 -0400
-+++ b/src/include/pool.h	2017-07-08 20:27:09.330984074 -0400
-@@ -73,16 +73,16 @@
- #define HBA_CONF_FILE_NAME "pool_hba.conf"
- 
- /* pid file directory */
--#define DEFAULT_LOGDIR "/tmp"
-+#define DEFAULT_LOGDIR "/run/pgpool"
- 
- /* Unix domain socket directory */
--#define DEFAULT_SOCKET_DIR "/tmp"
-+#define DEFAULT_SOCKET_DIR "/run/postgresql"
- 
- /* Unix domain socket directory for watchdog IPC */
--#define DEFAULT_WD_IPC_SOCKET_DIR "/tmp"
-+#define DEFAULT_WD_IPC_SOCKET_DIR "/run/pgpool"
- 
- /* pid file name */
--#define DEFAULT_PID_FILE_NAME "/var/run/pgpool/pgpool.pid"
-+#define DEFAULT_PID_FILE_NAME "/run/pgpool/pgpool.pid"
- 
- /* status file name */
- #define STATUS_FILE_NAME "pgpool_status"
-diff -ru a/src/sample/pgpool.conf.sample b/src/sample/pgpool.conf.sample
---- a/src/sample/pgpool.conf.sample	2017-05-11 05:53:04.000000000 -0400
-+++ b/src/sample/pgpool.conf.sample	2017-07-08 20:36:28.477717849 -0400
-@@ -31,10 +31,8 @@
- port = 9999
-                                    # Port number
-                                    # (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '/run/postgresql'
-                                    # Unix domain socket path
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- listen_backlog_multiplier = 2
-                                    # Set the backlog parameter of listen(2) to
-@@ -53,10 +51,8 @@
- pcp_port = 9898
-                                    # Port number for pcp
-                                    # (change requires restart)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '/run/pgpool'
-                                    # Unix domain socket path for pcp
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- 
- # - Backend Connection Settings -
-@@ -210,10 +206,10 @@
- # FILE LOCATIONS
- #------------------------------------------------------------------------------
- 
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '/run/pgpool/pgpool.pid'
-                                    # PID file name
-                                    # (change requires restart)
--logdir = '/var/log/pgpool'
-+logdir = '/run/pgpool'
-                                    # Directory of pgPool status file
-                                    # (change requires restart)
- 
-@@ -490,10 +486,8 @@
-                                     # Authentication key for watchdog communication
-                                     # (change requires restart)
- 
--wd_ipc_socket_dir = '/tmp'
-+wd_ipc_socket_dir = '/run/pgpool'
- 									# Unix domain socket path for watchdog IPC socket
--									# The Debian package defaults to
--									# /var/run/postgresql
- 									# (change requires restart)
- 
- 
-diff -ru a/src/sample/pgpool.conf.sample-master-slave b/src/sample/pgpool.conf.sample-master-slave
---- a/src/sample/pgpool.conf.sample-master-slave	2017-05-11 05:53:04.000000000 -0400
-+++ b/src/sample/pgpool.conf.sample-master-slave	2017-07-08 20:37:17.914095382 -0400
-@@ -31,10 +31,8 @@
- port = 9999
-                                    # Port number
-                                    # (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '/run/postgresql'
-                                    # Unix domain socket path
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- listen_backlog_multiplier = 2
-                                    # Set the backlog parameter of listen(2) to
-@@ -53,10 +51,8 @@
- pcp_port = 9898
-                                    # Port number for pcp
-                                    # (change requires restart)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '/run/pgpool'
-                                    # Unix domain socket path for pcp
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- 
- # - Backend Connection Settings -
-@@ -210,10 +206,10 @@
- # FILE LOCATIONS
- #------------------------------------------------------------------------------
- 
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '/run/pgpool/pgpool.pid'
-                                    # PID file name
-                                    # (change requires restart)
--logdir = '/tmp'
-+logdir = '/run/pgpool'
-                                    # Directory of pgPool status file
-                                    # (change requires restart)
- 
-@@ -489,10 +485,8 @@
-                                     # Authentication key for watchdog communication
-                                     # (change requires restart)
- 
--wd_ipc_socket_dir = '/tmp'
-+wd_ipc_socket_dir = '/run/pgpool'
- 									# Unix domain socket path for watchdog IPC socket
--									# The Debian package defaults to
--									# /var/run/postgresql
- 									# (change requires restart)
- 
- # - Virtual IP control Setting -
-diff -ru a/src/sample/pgpool.conf.sample-replication b/src/sample/pgpool.conf.sample-replication
---- a/src/sample/pgpool.conf.sample-replication	2017-05-11 05:53:04.000000000 -0400
-+++ b/src/sample/pgpool.conf.sample-replication	2017-07-08 20:37:30.384022450 -0400
-@@ -31,10 +31,8 @@
- port = 9999
-                                    # Port number
-                                    # (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '/run/postgresql'
-                                    # Unix domain socket path
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- listen_backlog_multiplier = 2
-                                    # Set the backlog parameter of listen(2) to
-@@ -53,10 +51,8 @@
- pcp_port = 9898
-                                    # Port number for pcp
-                                    # (change requires restart)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '/run/pgpool'
-                                    # Unix domain socket path for pcp
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- 
- # - Backend Connection Settings -
-@@ -210,10 +206,10 @@
- # FILE LOCATIONS
- #------------------------------------------------------------------------------
- 
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '/run/pgpool/pgpool.pid'
-                                    # PID file name
-                                    # (change requires restart)
--logdir = '/tmp'
-+logdir = '/run/pgpool'
-                                    # Directory of pgPool status file
-                                    # (change requires restart)
- 
-@@ -489,10 +485,8 @@
-                                     # Authentication key for watchdog communication
-                                     # (change requires restart)
- 
--wd_ipc_socket_dir = '/tmp'
-+wd_ipc_socket_dir = '/run/pgpool'
- 									# Unix domain socket path for watchdog IPC socket
--									# The Debian package defaults to
--									# /var/run/postgresql
- 									# (change requires restart)
- 
- 
-diff -ru a/src/sample/pgpool.conf.sample-stream b/src/sample/pgpool.conf.sample-stream
---- a/src/sample/pgpool.conf.sample-stream	2017-05-11 05:53:04.000000000 -0400
-+++ b/src/sample/pgpool.conf.sample-stream	2017-07-08 20:37:44.060609128 -0400
-@@ -31,10 +31,8 @@
- port = 9999
-                                    # Port number
-                                    # (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '/run/postgresql'
-                                    # Unix domain socket path
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- 
- 
-@@ -47,10 +45,8 @@
- pcp_port = 9898
-                                    # Port number for pcp
-                                    # (change requires restart)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '/run/pgpool'
-                                    # Unix domain socket path for pcp
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- listen_backlog_multiplier = 2
-                                    # Set the backlog parameter of listen(2) to
-@@ -211,10 +207,10 @@
- # FILE LOCATIONS
- #------------------------------------------------------------------------------
- 
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '/run/pgpool/pgpool.pid'
-                                    # PID file name
-                                    # (change requires restart)
--logdir = '/tmp'
-+logdir = '/run/pgpool'
-                                    # Directory of pgPool status file
-                                    # (change requires restart)
- 
-@@ -489,10 +485,8 @@
-                                     # Authentication key for watchdog communication
-                                     # (change requires restart)
- 
--wd_ipc_socket_dir = '/tmp'
-+wd_ipc_socket_dir = '/run/pgpool'
- 									# Unix domain socket path for watchdog IPC socket
--									# The Debian package defaults to
--									# /var/run/postgresql
- 									# (change requires restart)
- 
- 
diff --git a/dev-db/pgpool2/pgpool2-3.5.2.ebuild b/dev-db/pgpool2/pgpool2-3.5.2.ebuild
deleted file mode 100644
index f5c656a3a1aa..000000000000
--- a/dev-db/pgpool2/pgpool2-3.5.2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${PN/2/-II}-${PV}"
-
-inherit eutils user
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="http://www.pgpool.net/"
-SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc memcached pam ssl static-libs"
-
-RDEPEND="
-	dev-db/postgresql:=
-	memcached? ( dev-libs/libmemcached )
-	pam? ( sys-auth/pambase )
-	ssl? ( dev-libs/openssl:= )
-"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	!!dev-db/pgpool
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser pgpool -1 -1 -1 postgres
-
-	# We need the postgres user as well so we can set the proper
-	# permissions on the sockets without getting into fights with
-	# PostgreSQL's initialization scripts.
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/pgpool2-3.5.0-path-fix.patch"
-
-	local pg_config_manual="$(pg_config --includedir)/pg_config_manual.h"
-	local pgsql_socket_dir=$(grep DEFAULT_PGSOCKET_DIR "${pg_config_manual}" | \
-		sed 's|.*\"\(.*\)\"|\1|g')
-	local pgpool_socket_dir="$(dirname $pgsql_socket_dir)/pgpool"
-
-	sed "s|@PGSQL_SOCKETDIR@|${pgsql_socket_dir}|g" \
-		-i src/sample/pgpool.conf.sample* src/include/pool.h || die
-
-	sed "s|@PGPOOL_SOCKETDIR@|${pgpool_socket_dir}|g" \
-		-i src/sample/pgpool.conf.sample* src/include/pool.h || die
-}
-
-src_configure() {
-	local myconf
-	use memcached && \
-		myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
-	use pam && myconf+=' --with-pam'
-
-	econf \
-		--disable-rpath \
-		--sysconfdir="${EROOT%/}/etc/${PN}" \
-		$(use_with ssl openssl) \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-src_compile() {
-	emake
-
-	emake -C src/sql
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	emake DESTDIR="${D}" -C src/sql install
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	# Documentation
-	dodoc NEWS TODO
-	use doc && dohtml -r doc/*
-
-	# Examples and extras
-	# mv some files that get installed to /usr/share/pgpool-II so that
-	# they all wind up in the same place
-	mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
-	into "/usr/share/${PN}"
-	dobin doc/{pgpool_remote_start,basebackup.sh}
-	insinto "/usr/share/${PN}"
-	doins doc/recovery.conf.sample
-
-	# One more thing: Evil la files!
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/dev-db/pgpool2/pgpool2-3.5.5.ebuild b/dev-db/pgpool2/pgpool2-3.5.5.ebuild
deleted file mode 100644
index 206325ee553c..000000000000
--- a/dev-db/pgpool2/pgpool2-3.5.5.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${PN/2/-II}-${PV}"
-
-inherit eutils user
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="http://www.pgpool.net/"
-SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc memcached pam ssl static-libs"
-
-RDEPEND="
-	dev-db/postgresql:=
-	memcached? ( dev-libs/libmemcached )
-	pam? ( sys-auth/pambase )
-	ssl? ( dev-libs/openssl:= )
-"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	!!dev-db/pgpool
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser pgpool -1 -1 -1 postgres
-
-	# We need the postgres user as well so we can set the proper
-	# permissions on the sockets without getting into fights with
-	# PostgreSQL's initialization scripts.
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/pgpool2-3.5.0-path-fix.patch"
-
-	local pg_config_manual="$(pg_config --includedir)/pg_config_manual.h"
-	local pgsql_socket_dir=$(grep DEFAULT_PGSOCKET_DIR "${pg_config_manual}" | \
-		sed 's|.*\"\(.*\)\"|\1|g')
-	local pgpool_socket_dir="$(dirname $pgsql_socket_dir)/pgpool"
-
-	sed "s|@PGSQL_SOCKETDIR@|${pgsql_socket_dir}|g" \
-		-i src/sample/pgpool.conf.sample* src/include/pool.h || die
-
-	sed "s|@PGPOOL_SOCKETDIR@|${pgpool_socket_dir}|g" \
-		-i src/sample/pgpool.conf.sample* src/include/pool.h || die
-}
-
-src_configure() {
-	local myconf
-	use memcached && \
-		myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
-	use pam && myconf+=' --with-pam'
-
-	econf \
-		--disable-rpath \
-		--sysconfdir="${EROOT%/}/etc/${PN}" \
-		$(use_with ssl openssl) \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-src_compile() {
-	emake
-
-	emake -C src/sql
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	emake DESTDIR="${D}" -C src/sql install
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	# Documentation
-	dodoc NEWS TODO
-	use doc && dohtml -r doc/*
-
-	# Examples and extras
-	# mv some files that get installed to /usr/share/pgpool-II so that
-	# they all wind up in the same place
-	mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
-	into "/usr/share/${PN}"
-	dobin doc/{pgpool_remote_start,basebackup.sh}
-	insinto "/usr/share/${PN}"
-	doins doc/recovery.conf.sample
-
-	# One more thing: Evil la files!
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/dev-db/pgpool2/pgpool2-3.6.1.ebuild b/dev-db/pgpool2/pgpool2-3.6.1.ebuild
deleted file mode 100644
index 644dc65245e6..000000000000
--- a/dev-db/pgpool2/pgpool2-3.6.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${PN/2/-II}-${PV}"
-
-inherit eutils user
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="http://www.pgpool.net/"
-SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc memcached pam ssl static-libs"
-
-RDEPEND="
-	dev-db/postgresql:=
-	memcached? ( dev-libs/libmemcached )
-	pam? ( sys-auth/pambase )
-	ssl? ( dev-libs/openssl:= )
-"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	!!dev-db/pgpool
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser pgpool -1 -1 -1 postgres
-
-	# We need the postgres user as well so we can set the proper
-	# permissions on the sockets without getting into fights with
-	# PostgreSQL's initialization scripts.
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/pgpool2-3.5.0-path-fix.patch"
-
-	local pg_config_manual="$(pg_config --includedir)/pg_config_manual.h"
-	local pgsql_socket_dir=$(grep DEFAULT_PGSOCKET_DIR "${pg_config_manual}" | \
-		sed 's|.*\"\(.*\)\"|\1|g')
-	local pgpool_socket_dir="$(dirname $pgsql_socket_dir)/pgpool"
-
-	sed "s|@PGSQL_SOCKETDIR@|${pgsql_socket_dir}|g" \
-		-i src/sample/pgpool.conf.sample* src/include/pool.h || die
-
-	sed "s|@PGPOOL_SOCKETDIR@|${pgpool_socket_dir}|g" \
-		-i src/sample/pgpool.conf.sample* src/include/pool.h || die
-}
-
-src_configure() {
-	local myconf
-	use memcached && \
-		myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
-	use pam && myconf+=' --with-pam'
-
-	econf \
-		--disable-rpath \
-		--sysconfdir="${EROOT%/}/etc/${PN}" \
-		$(use_with ssl openssl) \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-src_compile() {
-	emake
-
-	emake -C src/sql
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	emake DESTDIR="${D}" -C src/sql install
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	# Documentation
-	dodoc NEWS TODO
-	use doc && dohtml -r doc/*
-
-	# Examples and extras
-	# mv some files that get installed to /usr/share/pgpool-II so that
-	# they all wind up in the same place
-	mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
-	into "/usr/share/${PN}"
-	dobin src/sample/pgpool_remote_start
-
-	# One more thing: Evil la files!
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/dev-db/pgpool2/pgpool2-3.6.4.ebuild b/dev-db/pgpool2/pgpool2-3.6.4.ebuild
deleted file mode 100644
index e3a92f81d557..000000000000
--- a/dev-db/pgpool2/pgpool2-3.6.4.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-POSTGRES_COMPAT=( 9.{2..6} )
-
-inherit postgres-multi
-
-MY_P="${PN/2/-II}-${PV}"
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="http://www.pgpool.net/"
-SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc memcached pam ssl static-libs"
-
-RDEPEND="
-	${POSTGRES_DEP}
-	net-libs/libnsl:0=
-	memcached? ( dev-libs/libmemcached )
-	pam? ( sys-auth/pambase )
-	ssl? ( dev-libs/openssl:* )
-"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	!!dev-db/pgpool
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	postgres_new_user pgpool
-
-	postgres-multi_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/pgpool_run_paths-3.6.4.patch"
-
-	postgres-multi_src_prepare
-}
-
-src_configure() {
-	local myconf
-	use memcached && \
-		myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
-	use pam && myconf+=' --with-pam'
-
-	postgres-multi_foreach econf \
-		--disable-rpath \
-		--sysconfdir="${EROOT%/}/etc/${PN}" \
-		--with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
-		--with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
-		$(use_with ssl openssl) \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-src_compile() {
-	# Even though we're only going to do an install for the best slot
-	# available, the extension bits in src/sql need some things outside
-	# of that directory built, too.
-	postgres-multi_foreach emake
-	postgres-multi_foreach emake -C src/sql
-}
-
-src_install() {
-	# We only need the best stuff installed
-	postgres-multi_forbest emake DESTDIR="${D}" install
-
-	# Except for the extension and .so files that each PostgreSQL slot needs
-	postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	# Documentation!
-	dodoc NEWS TODO
-	if use doc ; then
-		postgres-multi_forbest emake DESTDIR="${D}" -C doc install
-	fi
-
-	# Examples and extras
-	# mv some files that get installed to /usr/share/pgpool-II so that
-	# they all wind up in the same place
-	mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
-	into "/usr/share/${PN}"
-	dobin src/sample/{pgpool_recovery,pgpool_recovery_pitr,pgpool_remote_start}
-	insinto "/usr/share/${PN}"
-	doins src/sample/{{pcp,pgpool,pool_hba}.conf.sample*,pgpool.pam}
-
-	# One more thing: Evil la files!
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/dev-db/pgpool2/pgpool2-3.6.6.ebuild b/dev-db/pgpool2/pgpool2-3.6.6.ebuild
deleted file mode 100644
index 830743a0c780..000000000000
--- a/dev-db/pgpool2/pgpool2-3.6.6.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-POSTGRES_COMPAT=( 9.{2..6} )
-
-inherit postgres-multi
-
-MY_P="${PN/2/-II}-${PV}"
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="http://www.pgpool.net/"
-SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc memcached pam ssl static-libs"
-
-RDEPEND="
-	${POSTGRES_DEP}
-	net-libs/libnsl:0=
-	memcached? ( dev-libs/libmemcached )
-	pam? ( sys-auth/pambase )
-	ssl? ( dev-libs/openssl:* )
-"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	!!dev-db/pgpool
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	postgres_new_user pgpool
-
-	postgres-multi_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/pgpool_run_paths-3.6.5.patch"
-
-	postgres-multi_src_prepare
-}
-
-src_configure() {
-	local myconf
-	use memcached && \
-		myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
-	use pam && myconf+=' --with-pam'
-
-	postgres-multi_foreach econf \
-		--disable-rpath \
-		--sysconfdir="${EROOT%/}/etc/${PN}" \
-		--with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
-		--with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
-		$(use_with ssl openssl) \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-src_compile() {
-	# Even though we're only going to do an install for the best slot
-	# available, the extension bits in src/sql need some things outside
-	# of that directory built, too.
-	postgres-multi_foreach emake
-	postgres-multi_foreach emake -C src/sql
-}
-
-src_install() {
-	# We only need the best stuff installed
-	postgres-multi_forbest emake DESTDIR="${D}" install
-
-	# Except for the extension and .so files that each PostgreSQL slot needs
-	postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	# Documentation!
-	dodoc NEWS TODO
-	doman doc/src/sgml/man{1,8}/*
-	use doc && dodoc -r doc/src/sgml/html
-
-	# Examples and extras
-	# mv some files that get installed to /usr/share/pgpool-II so that
-	# they all wind up in the same place
-	mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
-	into "/usr/share/${PN}"
-	dobin src/sample/{pgpool_recovery,pgpool_recovery_pitr,pgpool_remote_start}
-	insinto "/usr/share/${PN}"
-	doins src/sample/{{pcp,pgpool,pool_hba}.conf.sample*,pgpool.pam}
-
-	# One more thing: Evil la files!
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/dev-db/pgpool2/pgpool2-3.6.7.ebuild b/dev-db/pgpool2/pgpool2-3.6.7.ebuild
deleted file mode 100644
index 830743a0c780..000000000000
--- a/dev-db/pgpool2/pgpool2-3.6.7.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-POSTGRES_COMPAT=( 9.{2..6} )
-
-inherit postgres-multi
-
-MY_P="${PN/2/-II}-${PV}"
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="http://www.pgpool.net/"
-SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc memcached pam ssl static-libs"
-
-RDEPEND="
-	${POSTGRES_DEP}
-	net-libs/libnsl:0=
-	memcached? ( dev-libs/libmemcached )
-	pam? ( sys-auth/pambase )
-	ssl? ( dev-libs/openssl:* )
-"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	!!dev-db/pgpool
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	postgres_new_user pgpool
-
-	postgres-multi_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/pgpool_run_paths-3.6.5.patch"
-
-	postgres-multi_src_prepare
-}
-
-src_configure() {
-	local myconf
-	use memcached && \
-		myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
-	use pam && myconf+=' --with-pam'
-
-	postgres-multi_foreach econf \
-		--disable-rpath \
-		--sysconfdir="${EROOT%/}/etc/${PN}" \
-		--with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
-		--with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
-		$(use_with ssl openssl) \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-src_compile() {
-	# Even though we're only going to do an install for the best slot
-	# available, the extension bits in src/sql need some things outside
-	# of that directory built, too.
-	postgres-multi_foreach emake
-	postgres-multi_foreach emake -C src/sql
-}
-
-src_install() {
-	# We only need the best stuff installed
-	postgres-multi_forbest emake DESTDIR="${D}" install
-
-	# Except for the extension and .so files that each PostgreSQL slot needs
-	postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	# Documentation!
-	dodoc NEWS TODO
-	doman doc/src/sgml/man{1,8}/*
-	use doc && dodoc -r doc/src/sgml/html
-
-	# Examples and extras
-	# mv some files that get installed to /usr/share/pgpool-II so that
-	# they all wind up in the same place
-	mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
-	into "/usr/share/${PN}"
-	dobin src/sample/{pgpool_recovery,pgpool_recovery_pitr,pgpool_remote_start}
-	insinto "/usr/share/${PN}"
-	doins src/sample/{{pcp,pgpool,pool_hba}.conf.sample*,pgpool.pam}
-
-	# One more thing: Evil la files!
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/dev-db/pgpool2/pgpool2-3.6.5.ebuild b/dev-db/pgpool2/pgpool2-3.7.1.ebuild
index 830743a0c780..4a6fed48f203 100644
--- a/dev-db/pgpool2/pgpool2-3.6.5.ebuild
+++ b/dev-db/pgpool2/pgpool2-3.7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-POSTGRES_COMPAT=( 9.{2..6} )
+POSTGRES_COMPAT=( 9.{2..6} 10 )
 
 inherit postgres-multi