commit:     1afbb8d69a3ec6684893f064f3a7e05ab4c2df85
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 13 22:02:14 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Mar 15 15:43:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1afbb8d6

dev-db/pgpool2: migrate to glep-81

Closes: https://github.com/gentoo/gentoo/pull/24185
Bug: https://bugs.gentoo.org/802498
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../{pgpool2-4.2.1-r1.ebuild => pgpool2-4.2.1-r2.ebuild}    | 13 ++++++-------
 .../{pgpool2-4.2.2-r1.ebuild => pgpool2-4.2.2-r2.ebuild}    | 12 +++++-------
 dev-db/pgpool2/pgpool2-9999.ebuild                          |  6 +++---
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/dev-db/pgpool2/pgpool2-4.2.1-r1.ebuild 
b/dev-db/pgpool2/pgpool2-4.2.1-r2.ebuild
similarity index 95%
rename from dev-db/pgpool2/pgpool2-4.2.1-r1.ebuild
rename to 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
similarity index 95%
rename from dev-db/pgpool2/pgpool2-4.2.2-r1.ebuild
rename to 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-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
 }
 

Reply via email to