5 files changed, 12 insertions, 113 deletions
diff --git a/sys-auth/libnss-pgsql/Manifest b/sys-auth/libnss-pgsql/Manifest
index d2aefbdb7ff7..03d5131bead2 100644
--- a/sys-auth/libnss-pgsql/Manifest
+++ b/sys-auth/libnss-pgsql/Manifest
@@ -1,8 +1,4 @@
-AUX libnss-pgsql-1.4.0-gentoo.patch 398 BLAKE2B 653bc77470c93a281e991c7c518364c1aa7cf26cdb1edcf4027558646bde7c96ecf73276253a88f20490831500c5ebef8a99d3ab0f841ac175a9028c8af62131 SHA512 a9865c1d5325937d02f5684f1e69238a3e6b5a2234a36d60c1825285fbe6ea2612a9254d3d5312f6c804b488ecefc9425745ce4ca2ca333fc874dc1ba6e7ad05
-AUX libnss-pgsql-1.4.0-schema.patch 811 BLAKE2B 1dd879e4d7350ed48e5d823dff5ed8ff1192df90bfddac8035a0df3dea9953185eeae89779b80514b1bc059d1cdeac487a5a599e39bf067a8d224bea30da5c9a SHA512 07f08fdec30b46426a27a01dccc0d01dbe90a1d535333b6260fdf515e3159325b48994a98e12d9eee7fcbe6b3f63c71a187a327e0dab26a91208ff5531daf346
 AUX libnss-pgsql-1.5.0_beta-gentoo.patch 1479 BLAKE2B 12b62fa0402b595f2507af7b4a3a7f50341610439fccc773f7ad8a82a7cf40f255fa41ef01d1bf35422f9d5d09a1f831db58e1942dbd4cfa23f3894a3afd089d SHA512 b02b7cdfb711bf1b857c313df73c89544338917c0cccae2bedce43e85c0d6bfd3d15128c6024dad23f1ce23f9041e36f8c1644e3b5b24cbae9677b12c63e506b
-DIST libnss-pgsql-1.4.0.tgz 244076 BLAKE2B 9bdfbc7d4a6af547e033d6217a0241ace3520e7eab501187d65a69783ec329632821385863f2f544d057d895e1ee2ae84b4bc1d38521608fce77ba1fc849e1f0 SHA512 e7d0ea5198e44c1cad2c22f8346ff7198c028bf664fe5dbd23ec4d4a0ade32ba4aa5174eae071982a2cc385782d3d7e1a804650e4ed25c2b2b2fb5187bc8f5f8
 DIST libnss-pgsql-1.5.0-beta.tgz 305543 BLAKE2B a902315ba17539ac64caaad31cae68859bab3fff2df77ae23f4486ea6ab25db14e5d5787f4d5fcfb1ddebf0d6c58acbf66052b6d5ad4017aff810ba1bcb9f98b SHA512 cabc09337841aadb27790fb66bb55f7da70b52d4e28c717d83ad63b440ac65d8e72505e602b1324d8091ace8b9fe90510492ce0dec17148b74288a2524726cc8
-EBUILD libnss-pgsql-1.4.0.ebuild 1496 BLAKE2B 9fe460605a5aaedc76b1b5a159b4031ba581cccabf8a0af2615ecc134d64d4720f8e3d4ef233a9a0caac4bdbd239b2dfc0fdca4f1015d1b2d7ba42a2d7f4fd60 SHA512 14a152f5d7d35011fec80a152aa665e40b490d18029eb0716a22cca36b479d9d615194da116c93f6f8379822863e5ab7ca21f936a77748724b819008bdb0ab7c
-EBUILD libnss-pgsql-1.5.0_beta.ebuild 1379 BLAKE2B ffe7730ec36ecac30b3e510bad23c05695b814981ee00924df3b64f2b32bc38bae96f9f9b6ed63c8d1a5eaa3e744538d1ab0d39ce09bf860709dbe90c6098855 SHA512 3af67f8eec6894b46251586cf1e5b63751173d178e465097f570ef507d4a06dc4c447197396d9d58f69c650ad69cf63041b2ca01d28d37bdd338187f9704900a
+EBUILD libnss-pgsql-1.5.0_beta-r1.ebuild 1193 BLAKE2B 4396171cc79df8ae3fbd297a091f4bd867d6e7b3264bf7178ec8981cb0dc3458aa3edb935b900d2f90018d93064d068e12f7d81ee12fff58dfdea7f235fb0110 SHA512 0f8e69ac409249cfbadeaffc87fb6dd7122cae9a125a5312a81f9fad2fc5e615f70ff5c80f7345afbb4844ffac867ea116b9e11c7dffa2c35d897ad295761e78
 MISC metadata.xml 276 BLAKE2B a63605b4adfd773881595ba9e106b9a8c2d5591bbd49972039720418d7718d30d3b3a3675959e84259d0508c6adbfb8cf721561dcacedab2735028ad8113ab6a SHA512 9baebf6fa9794fac7cdd2157f9bddcf341cf8cbddcc63f24db64322a662eddb6ff9940d85b2f9fc7809af0554ae6a038b7916c5ccea7ccce30ff7bf6aca33db1
diff --git a/sys-auth/libnss-pgsql/files/libnss-pgsql-1.4.0-gentoo.patch b/sys-auth/libnss-pgsql/files/libnss-pgsql-1.4.0-gentoo.patch
deleted file mode 100644
index 7a2a938b5c78..000000000000
--- a/sys-auth/libnss-pgsql/files/libnss-pgsql-1.4.0-gentoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur libnss-pgsql-1.4.0.orig/src/backend.c libnss-pgsql-1.4.0/src/backend.c
---- libnss-pgsql-1.4.0.orig/src/backend.c	2001-10-18 13:32:52.000000000 +0200
-+++ libnss-pgsql-1.4.0/src/backend.c	2003-11-28 16:14:38.000000000 +0100
-@@ -9,7 +9,7 @@
-  */
- 
- #include "nss-pgsql.h"
--#include <postgresql/libpq-fe.h>
-+#include <libpq-fe.h>
- #include <stdlib.h>
- #include <string.h>
- #include <stdio.h>
diff --git a/sys-auth/libnss-pgsql/files/libnss-pgsql-1.4.0-schema.patch b/sys-auth/libnss-pgsql/files/libnss-pgsql-1.4.0-schema.patch
deleted file mode 100644
index 6d2b338f45cf..000000000000
--- a/sys-auth/libnss-pgsql/files/libnss-pgsql-1.4.0-schema.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- conf/dbschema.sql.orig	2005-05-04 04:27:51.000000000 +0200
-+++ conf/dbschema.sql	2006-11-11 22:37:01.000000000 +0100
-@@ -19,15 +19,16 @@
- 	"gecos" character varying(128),
- 	"homedir" character varying(256) NOT NULL,
- 	"shell" character varying DEFAULT '/bin/bash' NOT NULL,
--	PRIMARY KEY ("username")
-+	PRIMARY KEY ("username"),
-+	UNIQUE ("uid")
- );
- 
- CREATE TABLE "usergroups" (
- 	"gid" int4 NOT NULL,
- 	"uid" int4 NOT NULL,
- 	PRIMARY KEY ("gid", "uid"),
--	CONSTRAINT "ug_gid_fkey" FOREIGN KEY ("gid") REFERENCES "groups"("gid"),
--	CONSTRAINT "ug_uid_fkey" FOREIGN KEY ("uid") REFERENCES "accounts"("uid")
-+	CONSTRAINT "ug_gid_fkey" FOREIGN KEY ("gid") REFERENCES "group_table"("gid"),
-+	CONSTRAINT "ug_uid_fkey" FOREIGN KEY ("uid") REFERENCES "passwd_table"("uid")
- );
-   
- CREATE TABLE "shadow_table" (
diff --git a/sys-auth/libnss-pgsql/libnss-pgsql-1.4.0.ebuild b/sys-auth/libnss-pgsql/libnss-pgsql-1.4.0.ebuild
deleted file mode 100644
index 8a9ab45b8768..000000000000
--- a/sys-auth/libnss-pgsql/libnss-pgsql-1.4.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit autotools eutils multilib
-
-KEYWORDS="~x86"
-
-DESCRIPTION="Name Service Switch module for use with PostgreSQL"
-HOMEPAGE="http://pgfoundry.org/projects/sysauth/"
-SRC_URI="http://pgfoundry.org/frs/download.php/605/${P}.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-db/postgresql
-		app-text/xmlto"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	epatch "${FILESDIR}/${P}-schema.patch"
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-		--libdir=/lib \
-		--with-docdir=/usr/share/doc/${PF}/html || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	insinto /$(get_libdir)
-	doins src/.libs/libnss_pgsql.so.2.0.0
-	dosym libnss_pgsql.so.2.0.0 /lib/libnss_pgsql.so.2
-	dosym libnss_pgsql.so.2.0.0 /lib/libnss_pgsql.so
-
-	dodoc AUTHORS ChangeLog NEWS README
-	dohtml doc/*.{png,html}
-	insinto /usr/share/doc/${PF}/examples
-	doins conf/*
-}
-
-pkg_postinst() {
-	elog "Next steps:"
-	elog "1. Create the required tables in the database:"
-	elog "   $ psql a_database -f ${ROOT}usr/share/${PN}/conf/dbschema.sql"
-	elog "2. Create the configuration file '/etc/nss-pgsql.conf'"
-	elog "   You can copy the example from ${ROOT}usr/share/doc/${PF}/examples/nss-pgsql.conf"
-	elog "3. Edit /etc/nsswitch.conf to use the NSS service 'pgsql'"
-	elog "   An example is available here: ${ROOT}usr/share/doc/${PF}/examples/nsswitch.conf"
-}
diff --git a/sys-auth/libnss-pgsql/libnss-pgsql-1.5.0_beta.ebuild b/sys-auth/libnss-pgsql/libnss-pgsql-1.5.0_beta-r1.ebuild
index a2176e41eb8f..cbf21a095fd5 100644
--- a/sys-auth/libnss-pgsql/libnss-pgsql-1.5.0_beta.ebuild
+++ b/sys-auth/libnss-pgsql/libnss-pgsql-1.5.0_beta-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit autotools eutils multilib
+inherit autotools
 
 KEYWORDS="~amd64 ~x86"
 
@@ -18,30 +18,23 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-RDEPEND="dev-db/postgresql"
+RDEPEND="dev-db/postgresql:*"
 DEPEND="${RDEPEND}
 		app-text/xmlto"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
+src_prepare() {
+	eapply "${FILESDIR}/${P}-gentoo.patch"
+	eapply_user
 	eautoreconf
 }
 
-src_compile() {
-	econf \
-		--htmldir=/usr/share/doc/${PF}/html || die "econf failed"
-	emake || die "emake failed"
-}
-
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 	find "${D}" -name '*.la' -delete || die
 
-	dodoc AUTHORS ChangeLog NEWS README || die
-	insinto /usr/share/doc/${PF}/examples
-	doins conf/* || die
+	dodoc AUTHORS ChangeLog NEWS README
+	docinto examples
+	dodoc conf/*
 }
 
 pkg_postinst() {