gentoo resync : 25.11.2020

2 files changed, 38 insertions, 42 deletions

diff --git a/net-mail/popa3d/Manifest b/net-mail/popa3d/Manifest
index c5bb6a3ba7e7..c7e309a6465d 100644
--- a/net-mail/popa3d/Manifest
+++ b/net-mail/popa3d/Manifest
@@ -2,5 +2,5 @@ AUX popa3d-initrc 368 BLAKE2B ff43e20de31313409b7e9930c397cc4585a500ea6d2372206b
 DIST popa3d-0.5.9-maildir-2.diff.gz 3227 BLAKE2B 09cffef1280cd038c1953c0b14dc7b701231fdff0f18f9cfec4c732e2c2b1b857a01c12671afc510e24860554157bd990be917662ab5dadb9512683da831b4c6 SHA512 7d2ab786e6249acfaadaa544adf49dca42b5628f50aa9f52fd1caa80127adc83afa4623824170c9f3b761a39949fcf3c90edbdbb9fdfbf4e06afaa67cdfbaac3
 DIST popa3d-0.6.3-vname-2.diff.gz 947 BLAKE2B 1a64b8de2cbda4757a670aee61e4665bd394f4128763119feacacbdc4921c7a0c128050b3f15f369c4fdea68cc4c595ab1eb48e729a119e1078d4cfd6f874092 SHA512 eba7df6d03d2745272505b62053d0db56ea326a716e43a9133257465f78fc5030cb09b48d79e86f6a982f7d8e9d18ee64aadf261e60a4f0a56357a4a2517a30a
 DIST popa3d-1.0.2.tar.gz 32848 BLAKE2B 1f0af2f1f12ec255f3f42eb54087f7c4859beee49d55cae60f32b4f5a58a0062c7cd5eae3690d778f3d7f7bea6678fe937b4864a2a7586c12837edf19df57fdf SHA512 e577297b4dafb4091110886a5db07184707475651a8ee3b6369f4cab5676852d7286a3729da46fff9161bc3cd46bdc0d032205dc5609bfb38be69eaeab068906
-EBUILD popa3d-1.0.2-r1.ebuild 4983 BLAKE2B b3ea49f848ca15431a95b310d90abe748da6f515c100ce80446eda738c20b936634b9bee77a04d297b5e88b8958db1052764689bd5dfa82f3a6506365ae84ad8 SHA512 30f4c2f68b089612ab014a9904c7e26a055496b7b4443b92c55fc442601a20ca0553662d3dd81c334afeb4eb485b3fa64e41d361b053d2ad511db768af58ba11
+EBUILD popa3d-1.0.2-r1.ebuild 4923 BLAKE2B 1171c9a00ef7093036bd9a5da62510bac62244b9eb5d9c0841776426fdcbdf46e24abe956e93bf25b87e9da21196cbb4a4ff07bfea34db3cae5c506647c27244 SHA512 16fcd58001b5ab6cffcdae8848f9202628bc8d7ef3e1691205f24d87aa6097bd2444f2f2b4f235f9ff9d68389e810b552c4cc4f4b624233b0c83410a61e48334
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-mail/popa3d/popa3d-1.0.2-r1.ebuild b/net-mail/popa3d/popa3d-1.0.2-r1.ebuild
index a668854c980e..3211b59858e1 100644
--- a/net-mail/popa3d/popa3d-1.0.2-r1.ebuild
+++ b/net-mail/popa3d/popa3d-1.0.2-r1.ebuild
@@ -1,10 +1,32 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit eutils toolchain-funcs user
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="A security oriented POP3 server"
+HOMEPAGE="http://www.openwall.com/popa3d/"
+SRC_URI="
+	http://www.openwall.com/popa3d/${P}.tar.gz
+	mirror://gentoo/popa3d-0.6.3-vname-2.diff.gz
+	maildir? ( mirror://gentoo/popa3d-0.5.9-maildir-2.diff.gz )"
+
+LICENSE="Openwall"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE="pam mbox +maildir"
+REQUIRED_USE="^^ ( maildir mbox )"
+
+DEPEND="
+	acct-group/popa3d
+	acct-user/popa3d
+	pam? (
+		>=sys-libs/pam-0.72
+		>=net-mail/mailbase-0.00-r8[pam]
+	)"
+RDEPEND="${DEPEND}"
 
-#
 # Mailbox format is determined by the 'mbox' and 'maildir'
 # system USE flags.
 #
@@ -49,46 +71,20 @@ MAX_MAILBOX_OPEN_BYTES=100000000 # Default is 2147483647
 MAX_MAILBOX_WORK_BYTES=150000000 # Default is 2147483647
 ######
 
-IUSE="pam mbox +maildir"
-
-DESCRIPTION="A security oriented POP3 server"
-HOMEPAGE="http://www.openwall.com/popa3d/"
-
-SRC_URI="http://www.openwall.com/popa3d/${P}.tar.gz
-	mirror://gentoo/popa3d-0.6.3-vname-2.diff.gz
-	maildir? ( mirror://gentoo/popa3d-0.5.9-maildir-2.diff.gz )"
-
-LICENSE="Openwall"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-
-DEPEND=">=sys-apps/sed-4
-	pam? ( >=sys-libs/pam-0.72
-	       >=net-mail/mailbase-0.00-r8[pam] )"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="^^ ( maildir mbox )"
-
 pkg_setup() {
-	echo
-	ewarn
-	ewarn "You can customize this ebuild with environmental variables."
-	ewarn "If you don't set any I'll assume sensible defaults."
-	ewarn
-	ewarn "See inside this ebuild for details."
-	ewarn
-	echo
-
-	enewgroup popa3d
-	enewuser popa3d -1 -1 -1 popa3d
+	einfo "You can customize this ebuild with environmental variables."
+	einfo "If you don't set any I'll assume sensible defaults."
+	einfo
+	einfo "See inside this ebuild for details."
 }
 
 src_prepare() {
-	epatch "${DISTDIR}"/popa3d-0.6.3-vname-2.diff.gz
-	use maildir && epatch "${DISTDIR}"/popa3d-0.5.9-maildir-2.diff.gz
+	eapply "${WORKDIR}"/popa3d-0.6.3-vname-2.diff
+	use maildir && eapply "${WORKDIR}"/popa3d-0.5.9-maildir-2.diff
+	eapply_user
 }
 
-src_compile() {
+src_configure() {
 	sed -i \
 		-e "s:^\(#define MAX_SESSIONS\) .*$:\1 ${MAX_SESSIONS}:" \
 		-e "s:^\(#define MAX_SESSIONS_PER_SOURCE\).*$:\1 ${MAX_SESSIONS_PER_SOURCE}:" \
@@ -133,7 +129,7 @@ src_compile() {
 		einfo "Authentication method: Virtual."
 	elif use pam ; then
 		einfo "Authentication method: PAM."
-		LIBS="${LIBS} -lpam"
+		append-libs -lpam
 		sed -i \
 			-e "s:^\(#define AUTH_SHADOW\)[[:blank:]].*$:\1 0:" \
 			-e "s:^\(#define AUTH_PAM\)[[:blank:]].*$:\1 1:" \
@@ -153,7 +149,9 @@ src_compile() {
 		-e '/^CFLAGS =/d' \
 		-e '/^LDFLAGS =/d' \
 			Makefile || die "Makefile cleaning failed"
+}
 
+src_compile() {
 	emake LIBS="${LIBS} -lcrypt" \
 		CFLAGS="${CFLAGS}" \
 		LDFLAGS="${LDFLAGS}" \
@@ -161,8 +159,6 @@ src_compile() {
 }
 
 src_install() {
-	into /usr
-
 	dosbin popa3d
 	doman popa3d.8
 	dodoc DESIGN INSTALL CHANGES VIRTUAL CONTACT
@@ -175,6 +171,6 @@ src_install() {
 
 	if use pam ; then
 		dodir /etc/pam.d/
-		dosym /etc/pam.d/pop /etc/pam.d/popa3d
+		dosym pop /etc/pam.d/popa3d
 	fi
 }