gentoo resync : 08.01.2021

6 files changed, 77 insertions, 103 deletions

diff --git a/dev-db/repmgr/Manifest b/dev-db/repmgr/Manifest
index 0dd46e67ede7..d3659da7c498 100644
--- a/dev-db/repmgr/Manifest
+++ b/dev-db/repmgr/Manifest
@@ -1,7 +1,4 @@
-DIST repmgr-3.0.1.tar.gz 91724 BLAKE2B be0ac2d54dbaae7a45abaa90ed1a851e22f05a1bb0969a1c5d95e58d7c3f89513cc47555b77cc57bb5cd5baf60c21c9c44375363a757510f07b111ec78f87441 SHA512 5655745df18132ee53ff36f80b3a2bb8caa6cedd8091350464cf343386baa31c47d46b25c171dda0fd1f4c3402babea9864f4557a10659111449a2eb2e1fa2b9
-DIST repmgr-3.3.2.tar.gz 162107 BLAKE2B b1029297fa548241dc5d58bcdcffc0a6f749725eba2d3c7d2cb70b1f46a96b491dc27deb7baf8459e91eae9663df000a1713e80f05e7e0e39afc020b4136c9a4 SHA512 98fba8fc0d9074e496c66762dbec45734fe279f39c9c51adb3e66dca929ac37f66a609789c8c658545856fd81f5afc5b35f6b5e389e52bce8c04ce8c52acd8dd
+AUX repmgr-5.1.0-fno-common.patch 1400 BLAKE2B 268594514ebd8f995e15a78792a130f612bdd3144c4e1b0d883599990f25202fcec5122ea2bae9ef2fa3b796033d804fe765f5455cc9e83412b63ab714539f9a SHA512 2de347a9e2df871db3eb7c1e921cb369dcee62400d595be733f32e015a753eebf1429129b40f79134e8c0cfe8a2f8587bb629df9dd705f0dd7401fda1d40af28
 DIST repmgr-5.1.0.tar.gz 426487 BLAKE2B 25157923f94b8bd27a2b57796f701e89e7d9acfc8dabc4368640068d5926934e5688b27147ae94b4bee7bad54d59353927b5b70cf5590c554c4eef35fadf29b9 SHA512 9fa8a43ee3920269d1c1d2e619939eb68cb7ba79effe11e87dd67c594bacfcde609949322ce968df328f3913111f27d0ebe2f7742a72e21f3df97b0e05c56cc7
-EBUILD repmgr-3.0.1.ebuild 1093 BLAKE2B b1bea77367d0485c85243730480fb97acc476606aa0db0587f1e3f2c70557456a489b84c88b70c17d14fb781bd27d505bd416ad57172ee0f56c2f47a67280105 SHA512 20196fa1f8819d40fb9eb2d72b76e4fe152ed1ac4ee4c35fd6b052af19ad8f3704888ffcae008869635661880a9e81076b012a2ecbd271e4553f74db1904930f
-EBUILD repmgr-3.3.2.ebuild 1093 BLAKE2B 8cce7fa79f044e9f5c5d459ee443f4d49b1dedb36e42e62670a39bb824d6e654dfd7c9c072a64dc40fa3ec9b89ea2c18d8f0e55954277877aabc89de781157db SHA512 6412c5cc1a9bde4fc6cac191146c0a529a67016690353b733547270198515b13ac56f9ecc081fb58eebe93b4afd03095001a9b4986e5f2ce55e3175c6893955b
-EBUILD repmgr-5.1.0.ebuild 1028 BLAKE2B 960b1318d3c2fab555eb50c20dda76bd848f5b2efb8fab82c2d186a2e68967c5a28aaa6d61926457cc7dc3c80dc35a36943e12a809e2fba402c6b0736725c0cf SHA512 8a4ea35e3cbbed088366ece031cea2e095b68b51786f0c753745eb7dd438f95e9f0a8eef660fae57d3d446e45608e8ae3eb69449f5ec403b5fd9c6b1d472be37
-MISC metadata.xml 224 BLAKE2B e14c5e39ad6d95b550997301c1ff5fe7b690fc3a146c1b0811fd4d0441c09622fb029728028b464152abd3bb36b467dd4299fccd03d666a8755070b90e99d107 SHA512 823068733b2edd6bd6d3d211f2ec383dbc3571bb4f9a57fd0dd0f48633a99e90e4ee979cc82e9a8aca6667b0ebe6a66c1c76551dce88ed25f163ce9a25a9cd41
+EBUILD repmgr-5.1.0.ebuild 1098 BLAKE2B c8dba92a0d6a8fc2eb4e3a8ac4eeb1ee33c92a6fba73b07c74b8c5904cedd8468101158419f833415213b28d588cbf259646fbe20ca2fa07865b1554d9e223d1 SHA512 2333e65af23c1009708bada5e61b934ada82f55bac3a25c005b7f71ba334fbb1311232dbb8fc603258bb05dbc59a27eefd29255c94e3f3f2d5fd4cc01c15f6f6
+MISC metadata.xml 218 BLAKE2B b41a68a6fbb0095baf4fbd659a8a59cb564884cca64856fc3b0f0e29cc861b56d33da4e61313bb8304b4d46057df9dd32798d4a89dbbfab2c12ff828e0490a9c SHA512 0638775f9972e2fef88460010f6942f90d793a15cce4d8561953438f87b7189dac11fa010eee616d1b900f84cb0761b9633690429ec018bf81030a27a73357d8
diff --git a/dev-db/repmgr/files/repmgr-5.1.0-fno-common.patch b/dev-db/repmgr/files/repmgr-5.1.0-fno-common.patch
new file mode 100644
index 000000000000..c5450291dbb4
--- /dev/null
+++ b/dev-db/repmgr/files/repmgr-5.1.0-fno-common.patch
@@ -0,0 +1,51 @@
+--- a/repmgr-action-cluster.c
++++ b/repmgr-action-cluster.c
+@@ -26,6 +26,7 @@
+ 
+ #define SHOW_HEADER_COUNT 9
+ 
++extern t_conninfo_param_list source_conninfo;
+ typedef enum
+ {
+ 	SHOW_ID = 0,
+--- a/repmgr-action-node.c
++++ b/repmgr-action-node.c
+@@ -32,6 +32,7 @@
+ #include "repmgr-action-node.h"
+ #include "repmgr-action-standby.h"
+ 
++extern t_conninfo_param_list source_conninfo;
+ static bool copy_file(const char *src_file, const char *dest_file);
+ static void format_archive_dir(PQExpBufferData *archive_dir);
+ static t_server_action parse_server_action(const char *action);
+--- a/repmgr-action-service.c
++++ b/repmgr-action-service.c
+@@ -26,6 +26,7 @@
+ #include "repmgr-client-global.h"
+ #include "repmgr-action-service.h"
+ 
++extern t_conninfo_param_list source_conninfo;
+ 
+ /*
+  * Possibly also show:
+--- a/repmgr-action-witness.c
++++ b/repmgr-action-witness.c
+@@ -28,6 +28,7 @@
+ #include "repmgr-client-global.h"
+ #include "repmgr-action-witness.h"
+ 
++extern t_conninfo_param_list source_conninfo;
+ static char		repmgr_user[MAXLEN];
+ static char		repmgr_db[MAXLEN];
+ 
+--- a/repmgr-client-global.h
++++ b/repmgr-client-global.h
+@@ -236,7 +236,7 @@ typedef struct ColHeader
+ extern t_runtime_options runtime_options;
+ extern t_configuration_options config_file_options;
+ 
+-t_conninfo_param_list source_conninfo;
++extern t_conninfo_param_list source_conninfo;
+ 
+ 
+ extern bool config_file_required;
diff --git a/dev-db/repmgr/metadata.xml b/dev-db/repmgr/metadata.xml
index d8c0e2f2db10..1291c4cfa4db 100644
--- a/dev-db/repmgr/metadata.xml
+++ b/dev-db/repmgr/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>robbat2@gentoo.org</email>
-  </maintainer>
-  </pkgmetadata>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-db/repmgr/repmgr-3.0.1.ebuild b/dev-db/repmgr/repmgr-3.0.1.ebuild
deleted file mode 100644
index 7a82e8739f28..000000000000
--- a/dev-db/repmgr/repmgr-3.0.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib
-DESCRIPTION="PostgreSQL Replication Manager"
-HOMEPAGE="http://www.repmgr.org/"
-SRC_URI="http://www.repmgr.org/download/${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-DEPEND=">=dev-db/postgresql-9.3[server,static-libs]"
-RDEPEND="${DEPEND}
-	net-misc/rsync"
-
-src_compile() {
-	emake USE_PGXS=1
-}
-
-src_install() {
-	emake DESTDIR="${D}" USE_PGXS=1 install
-	export PGSLOT="$(postgresql-config show)"
-	einfo "PGSLOT: ${PGSLOT}"
-	PGBASEDIR=/usr/$(get_libdir)/postgresql-${PGSLOT}
-	PGBINDIR=${PGBASEDIR}/bin/
-	PGCONTRIB=/usr/share/postgresql-${PGSLOT}/contrib/
-	dodir $PGCONTRIB $PGBINDIR
-	insinto $PGCONTRIB
-	doins sql/repmgr2_repmgr3.sql
-	dosym $PGBINDIR/repmgr /usr/bin/repmgr${PGSLOT//.}
-	dosym $PGBINDIR/repmgrd /usr/bin/repmgrd${PGSLOT//.}
-	dodoc  CREDITS HISTORY COPYRIGHT TODO *.md *.rst
-	insinto /etc
-	newins repmgr.conf.sample repmgr.conf
-	fowners postgres:postgres /etc/repmgr.conf
-	ewarn "Remember to modify /etc/repmgr.conf"
-}
diff --git a/dev-db/repmgr/repmgr-3.3.2.ebuild b/dev-db/repmgr/repmgr-3.3.2.ebuild
deleted file mode 100644
index 8aa275358e43..000000000000
--- a/dev-db/repmgr/repmgr-3.3.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib
-DESCRIPTION="PostgreSQL Replication Manager"
-HOMEPAGE="http://www.repmgr.org/"
-SRC_URI="http://www.repmgr.org/download/${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-DEPEND=">=dev-db/postgresql-9.3[server,static-libs]"
-RDEPEND="${DEPEND}
-	net-misc/rsync"
-
-src_compile() {
-	emake USE_PGXS=1
-}
-
-src_install() {
-	emake DESTDIR="${D}" USE_PGXS=1 install
-	export PGSLOT="$(postgresql-config show)"
-	einfo "PGSLOT: ${PGSLOT}"
-	PGBASEDIR=/usr/$(get_libdir)/postgresql-${PGSLOT}
-	PGBINDIR=${PGBASEDIR}/bin/
-	PGCONTRIB=/usr/share/postgresql-${PGSLOT}/contrib/
-	dodir $PGCONTRIB $PGBINDIR
-	insinto $PGCONTRIB
-	doins sql/repmgr2_repmgr3.sql
-	dosym $PGBINDIR/repmgr /usr/bin/repmgr${PGSLOT//.}
-	dosym $PGBINDIR/repmgrd /usr/bin/repmgrd${PGSLOT//.}
-	dodoc  CREDITS HISTORY COPYRIGHT TODO *.md *.rst
-	insinto /etc
-	newins repmgr.conf.sample repmgr.conf
-	fowners postgres:postgres /etc/repmgr.conf
-	ewarn "Remember to modify /etc/repmgr.conf"
-}
diff --git a/dev-db/repmgr/repmgr-5.1.0.ebuild b/dev-db/repmgr/repmgr-5.1.0.ebuild
index 06a26ac1e9b5..2691cff57149 100644
--- a/dev-db/repmgr/repmgr-5.1.0.ebuild
+++ b/dev-db/repmgr/repmgr-5.1.0.ebuild
@@ -1,38 +1,44 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit eutils multilib
+
 DESCRIPTION="PostgreSQL Replication Manager"
 HOMEPAGE="http://www.repmgr.org/"
 SRC_URI="http://www.repmgr.org/download/${P}.tar.gz"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE=""
-
-DEPEND=">=dev-db/postgresql-9.3[server,static-libs]"
+DEPEND="dev-db/postgresql:*[server,static-libs]"
 RDEPEND="${DEPEND}
 	net-misc/rsync"
 
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
 src_compile() {
 	emake USE_PGXS=1
 }
 
 src_install() {
 	emake DESTDIR="${D}" USE_PGXS=1 install
-	export PGSLOT="$(postgresql-config show)"
+	dodoc CREDITS HISTORY COPYRIGHT *.md
+
+	local PGSLOT="$(postgresql-config show)"
 	einfo "PGSLOT: ${PGSLOT}"
-	PGBASEDIR=/usr/$(get_libdir)/postgresql-${PGSLOT}
-	PGBINDIR=${PGBASEDIR}/bin/
-	PGCONTRIB=/usr/share/postgresql-${PGSLOT}/contrib/
-	dodir $PGCONTRIB $PGBINDIR
-	dosym $PGBINDIR/repmgr /usr/bin/repmgr${PGSLOT//.}
-	dosym $PGBINDIR/repmgrd /usr/bin/repmgrd${PGSLOT//.}
-	dodoc  CREDITS HISTORY COPYRIGHT *.md
+
+	dodir /usr/share/postgresql-${PGSLOT}/contrib
+	dodir /usr/$(get_libdir)/postgresql-${PGSLOT}
+
+	local repmgr="/usr/bin/repmgr${PGSLOT//.}"
+	local repmgrd="/usr/bin/repmgrd${PGSLOT//.}"
+	dosym ../$(get_libdir)/postgresql-${PGSLOT}/bin/repmgr ${repmgr}
+	dosym ../$(get_libdir)/postgresql-${PGSLOT}/bin/repmgrd ${repmgrd}
+
 	insinto /etc
 	newins repmgr.conf.sample repmgr.conf
+
 	fowners postgres:postgres /etc/repmgr.conf
 	ewarn "Remember to modify /etc/repmgr.conf"
 }