gentoo resync : 15.12.2019

3 files changed, 41 insertions, 47 deletions

diff --git a/net-mail/qmailadmin/Manifest b/net-mail/qmailadmin/Manifest
index 0524615e9c75..893e231d3315 100644
--- a/net-mail/qmailadmin/Manifest
+++ b/net-mail/qmailadmin/Manifest
@@ -3,6 +3,6 @@ AUX qmailadmin-1.2.15-quota-security.patch 1820 BLAKE2B 59ffe36de71e5c02bba8a93d
 AUX qmailadmin-1.2.9-maildir.patch 253 BLAKE2B 6da2fb45531cc88a98960b9443ca7dff84bbd9385042bbba7a9e5f09bb59bc2b8e5543fb9f4792ab447ee259948f11f3244e37822b331150fb7aeef76f97d4f8 SHA512 e6d617db023af69d96e5d7d85ba7bbf24886b7b947feab333e4bd219c719351076396bf27b4de97e78a4888cdeabb0d989107133fe3dfcdcfbe92079c2f86045
 DIST qmailadmin-1.2.15.tar.gz 385529 BLAKE2B 2bd4f86d157c577f410e44ec8c8c7df25d654b1dbf0621e52c167067bf72ce04bc7b03230c2517e97c14bd4f5bb3354da23d9794faafc7d3d007476c7b98dfdb SHA512 0cf32916bd6ef47fce091d4a92203fb8b80e0c3349cf8af826c047ba778e7992bcb98002023219648c7aa1ab60fbb052d4726f12f44d68647e657fb3760b8347
 DIST qmailadmin-1.2.16.tar.gz 388689 BLAKE2B 713fbf862eb19940801394b85371f7249ab31528891356b226ba88b55ecd3027f0cdcd08b10a1eb1a4b93355b4bf948dae96d34dbfb3a1df3c3291fe5a8ddb8d SHA512 4afa18461d8bb91e7075f08f00f3e1ef030a01381d049e122d4c234f2b6db9884d4426e9f4c61d5257e55786228741a3b8ded1fbfb925611f536cedb9d61de91
-EBUILD qmailadmin-1.2.15-r1.ebuild 2341 BLAKE2B f79f4ab948b150e15b21a9e40b5537cf24dab2069d6616a3be2258e55d830cafe7648c085bc78c8e5ab8fb3b6ad48e5f3aec630d4ce0180e3531d8b26251b23d SHA512 8e00182cac1a77768d6eff31ebde4ce59e3d199f788bb6e59eeed181f63e515625ea12ea7bcaa3d2dc6f3ce0e8ef9405d0e1361f03accdfbea0e7c28e07e9a57
-EBUILD qmailadmin-1.2.16.ebuild 2759 BLAKE2B 73689e59456e0f63e6d1cf1c58159883061f851ce392f19e9a6bf3640b80c3d00789e5e328ec774b08de2b722f7f5e567277d6889787ac5a9ad4dfb248952c68 SHA512 606397c31e347fbec59dc3be0199b4b67e5e7b985f0dc3fbeea0bd86b477464286d12a2ea8accd3e5aa7db69f5a5256112d80d726dff8161aa12b2a1e19cb806
+EBUILD qmailadmin-1.2.15-r1.ebuild 2246 BLAKE2B f9222d5410b26e1364bb03998df08fed2a044f2379ad6439f9d6184d87c46d685ad392166867662db6820ddf6257f796f41c0fb682673e8a5d516babd691e64e SHA512 a0eabd6ddfd93a28e23c3058bb3c96e179ca57e766140538c0f98af29406a7c03810dbe4c34b5988377f0040860cd8b32d6abf64ee0dbf791a6ad4a272780ffc
+EBUILD qmailadmin-1.2.16.ebuild 2667 BLAKE2B 9df98d6418ba6e6f378a36954c2c5683f2c2528439771cf4ebc6bae839f50798e4e5515a8df78a3ab729d4fb2201b3dfe194d997a1e01610cdf2a10db47b6d3f SHA512 8ed4fbba0e38a639573746cc4382d4b3156252c7a3f16bf97d9082624934f8776549ae2532c399cf31eb093eae808dad98a53b9d43166bf40f88bf7fe1436a51
 MISC metadata.xml 383 BLAKE2B 7d5f44a77875376d051d96c84e1f33146807299931154722ee05202eb93b31fdac420707de49870fe8e7b94075a82bb70d25c1c3a11c947f4e0de41d01a9c432 SHA512 ee861bd6d5cecd32a6f5dbbacc51d13d0105c83bd9b44f63fe9ec21937b17bb6cbcf27ae202e2b31f60e7e0e79c8810f3c6e63752ee2bef6423520395efa00fa
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild
index ddd66ac34bfb..3e99cdd3a1a7 100644
--- a/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild
+++ b/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild
@@ -1,13 +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 qmail eutils webapp autotools
-
-# the RESTRICT is because the vpopmail lib directory is locked down
-# and non-root can't access them.
-RESTRICT="userpriv"
+inherit qmail webapp autotools
 
 MY_P=${P/_rc/-rc}
 
@@ -20,24 +16,27 @@ SLOT="0"
 WEBAPP_MANUAL_SLOT="yes"
 KEYWORDS="amd64 arm ~hppa ia64 ppc s390 sh sparc x86"
 IUSE="maildrop"
+# the RESTRICT is because the vpopmail lib directory is locked down
+# and non-root can't access them.
+RESTRICT="userpriv"
 
-DEPEND="virtual/qmail
+RDEPEND="virtual/qmail
 	>=net-mail/vpopmail-5.4.33
 	net-mail/autorespond
 	maildrop? ( >=mail-filter/maildrop-2.0.1 )"
+DEPEND=${RDEPEND}
 
 S="${WORKDIR}"/${MY_P}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.2.9-maildir.patch
-	epatch "${FILESDIR}"/${PN}-1.2.12-quota-overflow.patch
-	epatch "${FILESDIR}"/${PN}-1.2.15-quota-security.patch
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-1.2.9-maildir.patch
+	eapply "${FILESDIR}"/${PN}-1.2.12-quota-overflow.patch
+	eapply "${FILESDIR}"/${PN}-1.2.15-quota-security.patch
+	eapply_user
 	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	# Pass spam stuff through $@ so we get the quoting right
 	if use maildrop ; then
 		set -- --enable-modify-spam \
@@ -68,19 +67,17 @@ src_compile() {
 		--enable-maxaliasesperpage=50 \
 		--enable-vpopuser=vpopmail \
 		--enable-vpopgroup=vpopmail \
-		"$@" \
-		|| die "econf failed"
-
-	emake || die "make failed"
+		"$@"
 }
 
 src_install() {
 	webapp_src_preinst
 
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS INSTALL README.hooks BUGS TODO ChangeLog \
-		TRANSLATORS NEWS FAQ README contrib/*
+	local DOCS=(
+		AUTHORS INSTALL README.hooks BUGS TODO ChangeLog TRANSLATORS
+		NEWS FAQ README contrib/*
+	)
+	default
 
 	webapp_src_install
 }
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild
index c3001ee6b8eb..95b5cf72f3a2 100644
--- a/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild
+++ b/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild
@@ -1,13 +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 qmail eutils webapp autotools
-
-# the RESTRICT is because the vpopmail lib directory is locked down
-# and non-root can't access them.
-RESTRICT="userpriv"
+inherit qmail webapp autotools
 
 MY_P=${P/_rc/-rc}
 
@@ -20,22 +16,25 @@ SLOT="0"
 WEBAPP_MANUAL_SLOT="yes"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~s390 ~sh ~sparc ~x86"
 IUSE="maildrop"
+# the RESTRICT is because the vpopmail lib directory is locked down
+# and non-root can't access them.
+RESTRICT="userpriv"
 
 DEPEND="virtual/qmail
 	>=net-mail/vpopmail-5.4.33
 	net-mail/autorespond
 	maildrop? ( >=mail-filter/maildrop-2.0.1 )"
+DEPEND=${RDEPEND}
 
 S="${WORKDIR}"/${MY_P}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.2.9-maildir.patch
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-1.2.9-maildir.patch
+	eapply_user
 	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	# Pass spam stuff through $@ so we get the quoting right
 	if use maildrop ; then
 		set -- --enable-modify-spam \
@@ -66,27 +65,25 @@ src_compile() {
 		--enable-maxaliasesperpage=50 \
 		--enable-vpopuser=vpopmail \
 		--enable-vpopgroup=vpopmail \
-		"$@" \
-		|| die "econf failed"
-
-	emake || die "make failed"
+		"$@"
 }
 
 src_install() {
 	webapp_src_preinst
 
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS INSTALL README.hooks BUGS TODO ChangeLog \
-		TRANSLATORS NEWS FAQ README contrib/*
+	local DOCS=(
+		AUTHORS INSTALL README.hooks BUGS TODO ChangeLog TRANSLATORS
+		NEWS FAQ README contrib/*
+	)
+	default
 
 	webapp_src_install
 
 	# CGI needs to be able to read /etc/vpopmail.conf
 	# Which is 0640 root:vpopmail, as it contains passwords
 	cgi=/usr/share/webapps/${PN}/${PV}/hostroot/cgi-bin/qmailadmin
-	fowners root:vpopmail $cgi
-	fperms g+s $cgi
+	fowners root:vpopmail ${cgi}
+	fperms g+s ${cgi}
 }
 
 pkg_postinst() {