gentoo resync : 20.03.2022

6 files changed, 211 insertions, 20 deletions

diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest
index f8b4fc987385..edfc221ff5f0 100644
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@@ -1,12 +1,15 @@
 AUX pgpool-4.2.0-configure-memcached.patch 2023 BLAKE2B 6216bb0e83f2e66ab3b46d6fca08ec151ad18821b2ca3dba1f5444c553874ded5d839c11efe5031979c3f4d11aa8c2db0e68c35b77c415daf2b622fe332821dd SHA512 34de23f441a8b0ad4cc727ac450132c43b91d015ac4488f243b86305749a8cf1df967c19ddf9e6a5e3beb6dafff7680c7273dac316ee2d10b97b6c340b5cd5eb
 AUX pgpool-4.2.0-configure-pthread.patch 471 BLAKE2B 789cbcb435d64ef87d12379dc4d4e66b38e253286321d4994480c04635713bc272f0e70b25493189cea891f8a33be86a882c682cf7394c75cadf6c5ab5919e10 SHA512 3ba36eec9c2d22c4abc18aaa5a60a7713ed807f5d7d69c129ba16875082553875ab0ee9f03f59b490ac1973a1cf7c7adafabac8d2e3788c356a84eb399532fb6
 AUX pgpool-4.2.0-run_paths.patch 19114 BLAKE2B 1a3f545774b9389cdb16a09741e39d6b470580aa7e26d17ed32bcaf0d83e83e6772a3e6bbfbb4ec894088347d05d06f59a8ebacea6a1fe9ded4bd0d0ac184359 SHA512 65a4c32d2061608dea10f0a38dd6043a3f95ad087aea3867c3501bc56babb739c9f71ed3d9138fd7343a4d27049224eb4828ebb2aa79c8205bab3052be117ada
+AUX pgpool-4.3.1-run_paths.patch 4009 BLAKE2B bb9f4ce01af465b826559312d73c0bdb60fb1433a7e5bfc1db9bc5608a4408866e657a9e35c2b19ffb5ffebd7e1fa0b813c4da1754fd3e2449fd7d57fdeed54b SHA512 426da4fd0904fab31ebedbddab226d50b7fe173dd76524c7c515f92c8a348c186f1285c8e164f72aa2023499b993087b2c1b4f5c79cbfc1ed1e537de00be44b8
 AUX pgpool-configure-pam.patch 1077 BLAKE2B 4dad8c20faf2ecb1c65e95b87d394d1c17c363d0337e830ea25efb88b1cb07d1a19fc1169ed9fbf69807347eba59296c276b33e0f786d32300e6c518b7a8c4ea SHA512 7c3b3f02977c7d9b1dbf7fb8905cca3a405ab856b8884bb9016dccb70650ed074af76ee81ee6cf2c1d4c366283af07ddb5c473960d81f7528d9d7afe762f9d4e
 AUX pgpool2.confd 649 BLAKE2B 1c520c4fa954c7411c1b700c03bf4e39196c599eb239cf86412fcf491759ca6f46b1264e7647a8d278ac45da3e20702f6f077dfbcccf83cb3f45575dd3571308 SHA512 5f9a4fa1e68161049ad767d64c764fbf70e84a4239e58119455a45a7e45d86ea2d19b617147cf891053e0dad4420c84704d67015334c7d41bad05b260d70e910
 AUX pgpool2.initd 2162 BLAKE2B b04f6b952507b8e4815c7b27f09b59ffe64f6262719c5490377fdbc5f8490cdead18fdbeb0ce8379d9cbd4bbb1aa21221d61853ff49a456a5ef6a8d78f3f5129 SHA512 05dd358d20bae60cfdefd7116b1111288b5a2be6d68a9dc40eaf6ba641524d422f2faac79bd3c629cee4f8b1ca601a9b6e303d4228e538d742ea407b6190ee53
 DIST pgpool-II-4.2.1.tar.gz 4713114 BLAKE2B 207cb3c43e47d40385d6808195561117293e5acec6bc34664ec7a1d8754bf9beb8c5350252a4274d4c50520254089f0e5a5fdfc0faf778186fa8000db6124df2 SHA512 b859a3952f69dd98a3df60b33b801d3bc96b9a11757593795a89751abe558c6baab10a37701d69d415c9da26a16abcdc72e0209e74c62204facfb25cdbc512f8
 DIST pgpool-II-4.2.2.tar.gz 4734840 BLAKE2B 2b4d26991732293e1411d1219f85a8c9ad1dca72c63069381ae1377a02ae215e813356172f3b89b42b9140549c92c76d443b125bb65cbc6abf03d2b99cf18dab SHA512 a147c810cc691fb27b823a813cbd2eaad66822c7c9f5c0f829cc70d4ac65911bbe827640f2dbd8060913276ed97340b52167e4332e9cdf013b6c9bc144c7b5d8
-EBUILD pgpool2-4.2.1-r1.ebuild 2370 BLAKE2B a3dc7b05d938fb765b77efa0f4f015484d91e0081b16ee8cd3b8a245d82c94e77862d3d085b1c3934328a1831c81afb3591ce3fdd9c0cc9d00f2f2b1d70d2dd2 SHA512 9347ebb00dd294aa55c35674224bdc64e288d9e35058fdeb3c92b1691de89418dd31e72a0f0c2a3bbca16d1d2c1b8636eb6c1e1678e14d46060cd59809be3c2e
-EBUILD pgpool2-4.2.2-r1.ebuild 2372 BLAKE2B a084a6d0ea275779d28803646c498d2a963a79fd5fe9f02145a07e50bbba7442ee3e52e201b656fcc4b612ce950e44fb56360d308c7c263d543ca9366fcc3a5c SHA512 cf7846ec0b75921c72b839061fa6bf211b299c8b5a6239e984ff439d861f1ca33ef91005d813bdf762145bdceff95e93919a0b6aab52ece103d66d81358c84fc
-EBUILD pgpool2-9999.ebuild 2415 BLAKE2B fed7c759accfe5dc506e2eedd772c90fccfca9a599952298aa81b45a0f645d5a0a0b92765c2eb27a8bb0ee1394585c24bb20b4551ca316dda0bd98d647eb75ec SHA512 6576298c11fae80eafa136f3cfa0942cf9c029526baffc25a1eb19626ec1354752c3bec22f48418ec516bd5d2c1671c792ef4e6239e01c706525ec05eaa52e5c
+DIST pgpool-II-4.3.1.tar.gz 6034811 BLAKE2B 6ca2a27eefc2b20186d0e5cbdfd838f429d9996e299ab177e655ed69aa214e676029db728b16020dbdc49d9036fe7aad71d6abb12b486a4cf8fb8348bb201c6c SHA512 a5417d9f5baa1b39e3645f7d44accf0a2f04d5fc5cb4d28089169aaebbd15c20b4cd280d09f15fa764c3b793117086fc03f5d7be584c0c5ff9c5f8e11ddb9ef8
+EBUILD pgpool2-4.2.1-r2.ebuild 2383 BLAKE2B a90c4d3e66b39e2d9fc3b2a2c459cf803fdda286a229f7d56b1b1a73ee4b56350a445c82478a9fa418a3a8051e160d76b38c57722b6c61905200bfa064a5e5a0 SHA512 3737cf37b2d0bc21593e730c5d6a39cd3480905535e68eb5d9edfad7cf65a5382d7532af45ae37e6789d7213d863746ace65e73e6323ce9aff13033447d80e00
+EBUILD pgpool2-4.2.2-r2.ebuild 2384 BLAKE2B 2748df59a291c03e24533c69655c3415a769c6c901f68909581e190de6dc1d69b1687a9fb5e48978d427eb612d81eac9c04f0773ea037393d0c37ba39cc4935e SHA512 e3b4219bebe71e3c8d8458f1ebc9f811928014bdd202484abf5e4713682bb8d50a26ae87ba81cccff2f8743f2cb7f77e903e73774e0c7eabe00141a76d43ba95
+EBUILD pgpool2-4.3.1.ebuild 2319 BLAKE2B 3c5663663db3a4e5dc87ea1c522ae79ee07bb217fd6720f9eed2bcc53c22f99e69c0eb5e2361b1b37e54c9013c2d10ac5f258a2507607f430d5ec1f98397f593 SHA512 d62c1383ac31af5db62e72415de448e464471f4b133c8de26c12b03f2ebc72090fe241113d3dc84faafb416c97b45a1ac1642aaa73bb3a3aae8a9108ec2d4585
+EBUILD pgpool2-9999.ebuild 2427 BLAKE2B 7d5b7934db65ee25d2977c26cba86ad8d55b061aea162917afcc9df64b68bf57d56a0cbeafe7f4730d4e4ec24445f5af8ace10d9da61179a874c16545d8ef23f SHA512 3817053648c0bea88cb525a4c3a51a78755269fca76e4a6b7fa8f32239ddb9cb9eb7f32c9df86d05724e84c24fe7cb43dda268a51b60d3e38c230b683f08e9ec
 MISC metadata.xml 391 BLAKE2B c5855fde95e138709d778b50b897ea0dd75267547e89faf60988d1dfe78740c313291a226c30fdd618ef2893ad3dc11000b33026e04369fe294ca9ed1e18efb1 SHA512 374bd70841f1f13e2f8265f972e2debc7fb79a3f463efb897a75fd8ddc3163edf82c888d3d8d5bfede6c509fc27f67e74592599b8da8640035a5d4241cad98c1
diff --git a/dev-db/pgpool2/files/pgpool-4.3.1-run_paths.patch b/dev-db/pgpool2/files/pgpool-4.3.1-run_paths.patch
new file mode 100644
index 000000000000..2b9090fb2dce
--- /dev/null
+++ b/dev-db/pgpool2/files/pgpool-4.3.1-run_paths.patch
@@ -0,0 +1,100 @@
+diff -Naruw a/src/include/parser/pg_config_manual.h b/src/include/parser/pg_config_manual.h
+--- a/src/include/parser/pg_config_manual.h
++++ b/src/include/parser/pg_config_manual.h
+@@ -227,7 +227,7 @@
+  * support them yet.
+  */
+ #ifndef WIN32
+-#define DEFAULT_PGSOCKET_DIR  "/tmp"
++#define DEFAULT_PGSOCKET_DIR  "/run/postgresql"
+ #else
+ #define DEFAULT_PGSOCKET_DIR ""
+ #endif
+diff -Naruw a/src/include/pcp/pcp_stream.h b/src/include/pcp/pcp_stream.h
+--- a/src/include/pcp/pcp_stream.h
++++ b/src/include/pcp/pcp_stream.h
+@@ -49,6 +49,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 -Naruw a/src/include/pool.h b/src/include/pool.h
+--- a/src/include/pool.h
++++ b/src/include/pool.h
+@@ -69,16 +69,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 -Naruw a/src/sample/pgpool.conf.sample b/src/sample/pgpool.conf.sample
+--- a/src/sample/pgpool.conf.sample
++++ b/src/sample/pgpool.conf.sample
+@@ -39,10 +39,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)
+ #reserved_connections = 0
+                                    # Number of reserved connections.
+@@ -59,10 +57,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
+@@ -292,13 +288,13 @@
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+ 
+-#pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '/run/pgpool/pgpool.pid'
+                                    # PID file name
+                                    # Can be specified as relative to the"
+                                    # location of pgpool.conf file or
+                                    # as an absolute path
+                                    # (change requires restart)
+-#logdir = '/tmp'
++logdir = '/run/pgpool'
+                                    # Directory of pgPool status file
+                                    # (change requires restart)
+ 
+@@ -676,8 +672,6 @@
+                                     # 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-4.2.1-r1.ebuild b/dev-db/pgpool2/pgpool2-4.2.1-r2.ebuild
index 7e2ba70df24b..d34913fcacc3 100644
--- a/dev-db/pgpool2/pgpool2-4.2.1-r1.ebuild
+++ b/dev-db/pgpool2/pgpool2-4.2.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,15 +12,17 @@ MY_P="${PN/2/-II}-${PV}"
 DESCRIPTION="Connection pool server for PostgreSQL"
 HOMEPAGE="https://www.pgpool.net/"
 SRC_URI="https://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="BSD"
 SLOT="0"
-
 KEYWORDS="amd64 x86"
-
 IUSE="doc memcached pam ssl static-libs"
 
 RDEPEND="
 	${POSTGRES_DEP}
+	acct-group/postgres
+	acct-user/pgpool
 	net-libs/libnsl:0=
 	virtual/libcrypt:=
 	memcached? ( dev-libs/libmemcached )
@@ -29,16 +31,13 @@ RDEPEND="
 		dev-libs/openssl:0=
 	)
 "
+
 DEPEND="${RDEPEND}
 	sys-devel/bison
 	virtual/pkgconfig
 "
 
-S=${WORKDIR}/${MY_P}
-
 pkg_setup() {
-	postgres_new_user pgpool
-
 	postgres-multi_pkg_setup
 }
 
diff --git a/dev-db/pgpool2/pgpool2-4.2.2-r1.ebuild b/dev-db/pgpool2/pgpool2-4.2.2-r2.ebuild
index 45d450412b69..d05f5c5dea0f 100644
--- a/dev-db/pgpool2/pgpool2-4.2.2-r1.ebuild
+++ b/dev-db/pgpool2/pgpool2-4.2.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,15 +12,17 @@ MY_P="${PN/2/-II}-${PV}"
 DESCRIPTION="Connection pool server for PostgreSQL"
 HOMEPAGE="https://www.pgpool.net/"
 SRC_URI="https://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="BSD"
 SLOT="0"
-
 KEYWORDS="~amd64 ~x86"
-
 IUSE="doc memcached pam ssl static-libs"
 
 RDEPEND="
 	${POSTGRES_DEP}
+	acct-group/postgres
+	acct-user/pgpool
 	net-libs/libnsl:0=
 	virtual/libcrypt:=
 	memcached? ( dev-libs/libmemcached )
@@ -34,11 +36,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-S=${WORKDIR}/${MY_P}
-
 pkg_setup() {
-	postgres_new_user pgpool
-
 	postgres-multi_pkg_setup
 }
 
diff --git a/dev-db/pgpool2/pgpool2-4.3.1.ebuild b/dev-db/pgpool2/pgpool2-4.3.1.ebuild
new file mode 100644
index 000000000000..f78d11206305
--- /dev/null
+++ b/dev-db/pgpool2/pgpool2-4.3.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( 9.6 {10..14} )
+
+inherit autotools postgres-multi
+
+MY_P="${PN/2/-II}-${PV}"
+
+DESCRIPTION="Connection pool server for PostgreSQL"
+HOMEPAGE="https://www.pgpool.net/"
+SRC_URI="https://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}
+	acct-user/pgpool
+	net-libs/libnsl:0=
+	virtual/libcrypt:=
+	memcached? ( dev-libs/libmemcached )
+	pam? ( sys-auth/pambase )
+	ssl? ( dev-libs/openssl:0= )
+"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	eapply \
+		"${FILESDIR}/pgpool-4.2.0-configure-memcached.patch" \
+		"${FILESDIR}/pgpool-configure-pam.patch" \
+		"${FILESDIR}/pgpool-4.2.0-configure-pthread.patch" \
+		"${FILESDIR}/pgpool-4.3.1-run_paths.patch"
+
+	eautoreconf
+
+	postgres-multi_src_prepare
+}
+
+src_configure() {
+	postgres-multi_foreach econf \
+		--disable-rpath \
+		--sysconfdir="${EPREFIX}/etc/${PN}" \
+		--with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
+		--with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
+		$(use_enable static-libs static) \
+		$(use_with memcached) \
+		$(use_with pam) \
+		$(use_with ssl openssl)
+}
+
+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
+
+	# 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
+
+	# One more thing: Evil la files!
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/dev-db/pgpool2/pgpool2-9999.ebuild b/dev-db/pgpool2/pgpool2-9999.ebuild
index 364ed807be0f..2c9d504b504e 100644
--- a/dev-db/pgpool2/pgpool2-9999.ebuild
+++ b/dev-db/pgpool2/pgpool2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,6 +18,8 @@ IUSE="doc memcached pam ssl static-libs"
 
 RDEPEND="
 	${POSTGRES_DEP}
+	acct-group/postgres
+	acct-user/pgpool
 	net-libs/libnsl:0=
 	virtual/libcrypt:=
 	memcached? ( dev-libs/libmemcached )
@@ -35,8 +37,6 @@ DEPEND="${RDEPEND}
 "
 
 pkg_setup() {
-	postgres_new_user pgpool
-
 	postgres-multi_pkg_setup
 }