gentoo resync : 18.11.2019

3 files changed, 39 insertions, 43 deletions

diff --git a/mail-filter/sqlgrey/Manifest b/mail-filter/sqlgrey/Manifest
index 845ad6911dcd..6134b87c1ed0 100644
--- a/mail-filter/sqlgrey/Manifest
+++ b/mail-filter/sqlgrey/Manifest
@@ -1,5 +1,5 @@
-AUX sqlgrey-1.7.6-init.patch 412 BLAKE2B c5d7a1bdf7478911711fc991a9c6cbc8a64ac4b7c9cd013aae14874a34a03df9fe2fa3de9c0715fd7f4b8a05d794d28d5e66e90e2a3685d3f0fa699072e934a6 SHA512 5c6e7f7eb4770cf123cdfb73717d9a50ec0e64e6129dd4c92e3abeb688f9d0b1b1958e298786d852f7341be1448c885c916e7c9086aa8fdf84af154301d0d2a9
+AUX sqlgrey-1.7.6-init.patch 408 BLAKE2B 09ac51cd9c16ebf21261eeae4a405042e57444a1b727dc62a10cb5a073a50e9a774dc19e26fdeed152c86d199a10d862cef224987a27fa165abba03b7c0b5821 SHA512 f22a872651e21bd45aeb22723c7d45f1c637e9227a51636655189e92f9ffa3cd2680d78d43ffc807fd85930110b5052eb74fdc07b5f32522255ae7218e29a2d3
 AUX sqlgrey.service 429 BLAKE2B 330c83bbe4f4ce4aabef28d9eb3c00d9c1659ad899e1c4aa5fe82f99cf2f5e46eb5900c4a0ee0731c27184a60568af14bb78baed3b0053134b121fea0f00a070 SHA512 7e41344e3820537d73a413d728d455de58c5358922a354904cba5a870f61fecbf96f84f91dadad283d406cad05010bc3fd57644f18ba319083af92a1810d9a27
 DIST sqlgrey-1.7.6.tar.bz2 63738 BLAKE2B 7835079f3f220c2894781cb1ba8d1cac66f46e9fad7f17bfc0f1f7e2cfe1b1b05664179abacb873acf1829114093c48764c34e1a0a3128503f8e3f134dd0772d SHA512 62822d808aa5991a8d29f455be933cf782c9d5232b63bd1f357093a06982474018fb7a02dedf29274d8b7e9f12525063e6af744efceecf420cd01e74f561aa81
-EBUILD sqlgrey-1.7.6-r2.ebuild 8524 BLAKE2B 8244348a4b72b756d75b988fb4df98adfa368a168b6615ca8d34be83cc0234283fe36ddba945fe5f5190b89aec6dfc50de3306765d1f2f26f1b0010f910e552d SHA512 16783a5bfd530ea1f9555feddafa0d0ff53af5770f57e9acb54f719c07367e53522ffb411631552c3316f1560ab9bdfe4bcf6096800b38f564cb7661bbbd0a44
+EBUILD sqlgrey-1.7.6-r2.ebuild 8427 BLAKE2B 4cb1fecc4b2817edd41f11459c86afa1e2c3c2572aef7fc50d8668778a2a5d3df3f1d0f06b5b462aad1386c405eb14cd7753c35daf2d8b891cac6e2c0e579b75 SHA512 9a9f5f42e247df21a609afae682ff631c1e60ceba2a508513f4e7d6b34bf187ee8eb6fbb9d915a88ce862ef43b69ae7487ce664fbb3b4cacb6f449e14b0c2447
 MISC metadata.xml 352 BLAKE2B 22d2cabf23b745a432e22edee82b9184fad33a5fe579cdd2b0efe584c9a34d422d16a7552dad88fe9ba93b11bd496920450d7510e627576d08ac9ed4c0df541b SHA512 4681c824087ebac9bd919143cc665481311fd503d58655323bef2d8e8f204a502daf7d0d05ba5aedfb32a67b97d2b942dc1f39eab35df92677a43d77fb1f04cb
diff --git a/mail-filter/sqlgrey/files/sqlgrey-1.7.6-init.patch b/mail-filter/sqlgrey/files/sqlgrey-1.7.6-init.patch
index 48d3a581c5d4..355cb4539248 100644
--- a/mail-filter/sqlgrey/files/sqlgrey-1.7.6-init.patch
+++ b/mail-filter/sqlgrey/files/sqlgrey-1.7.6-init.patch
@@ -1,5 +1,5 @@
---- ./sqlgrey-1.7.6/init/sqlgrey.gentoo.orig	2007-05-12 11:12:12.000000000 +0200
-+++ ./sqlgrey-1.7.6/init/sqlgrey.gentoo		2007-05-12 12:05:52.491468250 +0200
+--- sqlgrey-1.7.6/init/sqlgrey.gentoo.orig	2007-05-12 11:12:12.000000000 +0200
++++ sqlgrey-1.7.6/init/sqlgrey.gentoo		2007-05-12 12:05:52.491468250 +0200
 @@ -14,13 +14,13 @@
  	# SQLite puts files in the working directory
  	cd ~sqlgrey
diff --git a/mail-filter/sqlgrey/sqlgrey-1.7.6-r2.ebuild b/mail-filter/sqlgrey/sqlgrey-1.7.6-r2.ebuild
index a6f49463e7b7..4b26a8203a60 100644
--- a/mail-filter/sqlgrey/sqlgrey-1.7.6-r2.ebuild
+++ b/mail-filter/sqlgrey/sqlgrey-1.7.6-r2.ebuild
@@ -1,41 +1,42 @@
-# 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 eutils systemd user
+inherit systemd user
 
-DESCRIPTION="SQLgrey is a postfix policy service implementing a grey-listing policy"
-SRC_URI="mirror://sourceforge/sqlgrey/${P}.tar.bz2"
+DESCRIPTION="A postfix policy service implementing a grey-listing policy"
 HOMEPAGE="http://sqlgrey.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sqlgrey/${P}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="mysql postgres sqlite"
+KEYWORDS="amd64 ~arm ~sparc x86"
+IUSE="mysql +postgres sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
 RDEPEND="dev-lang/perl
 	dev-perl/DBI
-	dev-perl/Net-Server
 	dev-perl/Date-Calc
+	dev-perl/Net-Server
 	virtual/mailx
-	postgres? ( dev-perl/DBD-Pg )
-	sqlite? ( dev-perl/DBD-SQLite )
 	mysql? ( dev-perl/DBD-mysql )
-	!postgres? ( !mysql? ( !sqlite? ( dev-perl/DBD-Pg ) ) )"
-DEPEND="$RDEPEND
+	postgres? ( dev-perl/DBD-Pg )
+	sqlite? ( dev-perl/DBD-SQLite )"
+DEPEND="${RDEPEND}
 	sys-apps/sed"
-KEYWORDS="amd64 ~arm ~sparc x86"
+
+PATCHES=(
+	"${FILESDIR}/${P}-init.patch"
+)
 
 pkg_setup() {
 	enewgroup sqlgrey
 	enewuser sqlgrey -1 -1 /var/spool/sqlgrey sqlgrey
 }
 
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}/${P}-init.patch"
-}
-
 src_install () {
-	make gentoo-install ROOTDIR="${D}"
+	emake gentoo-install ROOTDIR="${D}"
 	dodoc HOWTO FAQ README README.OPTINOUT README.PERF TODO Changelog
 
 	# keeps SQLgrey data in /var/spool/sqlgrey
@@ -46,34 +47,29 @@ src_install () {
 }
 
 pkg_postinst() {
-	echo
-	einfo "To make use of greylisting, please update your postfix config."
-	einfo
-	einfo "Put something like this in /etc/postfix/main.cf:"
-	einfo "    smtpd_recipient_restrictions ="
-	einfo "           ..."
-	einfo "           check_policy_service inet:127.0.0.1:2501"
-	einfo
-	einfo "Remember to restart Postfix after that change. Also remember"
-	einfo "to make the daemon start durig boot:"
-	einfo "  rc-update add sqlgrey default"
-	einfo
-	echo
-	einfo "To setup SQLgrey to run out-of-the-box on your system, run:"
-	einfo "emerge --config ${PN}"
-	echo
+	elog "To make use of greylisting, please update your postfix config."
+	elog
+	elog "Put something like this in /etc/postfix/main.cf:"
+	elog "    smtpd_recipient_restrictions ="
+	elog "           ..."
+	elog "           check_policy_service inet:127.0.0.1:2501"
+	elog
+	elog "Remember to restart Postfix after that change. Also remember"
+	elog "to make the daemon start durig boot:"
+	elog "  rc-update add sqlgrey default"
+	elog
+	elog
+	elog "To setup SQLgrey to run out-of-the-box on your system, run:"
+	elog "emerge --config ${PN}"
+	elog
 	ewarn "Read the documentation for more info (perldoc sqlgrey) or the"
 	ewarn "included howto /usr/share/doc/${PF}/HOWTO.gz"
-	echo
+	ewarn
 	ewarn "If you are using MySQL >= 4.1 use \"latin1\" as charset for"
 	ewarn "the SQLgrey db"
-	echo
-	ebeep 2
-	epause 5
 }
 
 pkg_config () {
-
 	# SQLgrey configuration file
 	local SQLgrey_CONFIG="/etc/sqlgrey/sqlgrey.conf"
 	local SQLgrey_DB_USER_NAME="sqlgrey"