From 7bc9c63c9da678a7e6fceb095d56c634afd22c56 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 15 Dec 2019 18:09:03 +0000
Subject: gentoo resync : 15.12.2019

---
 net-mail/vqadmin/Manifest             |  2 +-
 net-mail/vqadmin/vqadmin-2.3.7.ebuild | 24 ++++++++++--------------
 2 files changed, 11 insertions(+), 15 deletions(-)

(limited to 'net-mail/vqadmin')

diff --git a/net-mail/vqadmin/Manifest b/net-mail/vqadmin/Manifest
index 60d23e8f9755..f91c30918315 100644
--- a/net-mail/vqadmin/Manifest
+++ b/net-mail/vqadmin/Manifest
@@ -1,4 +1,4 @@
 AUX postinstall-en.txt 291 BLAKE2B 2d02039a95ecf734d6dd284fcd65911c9f38db8a2165d1bd4289a9927a3a3c847a99991c1301a5d6d9d485ccd06794dddf73f57dabee47dcb3ed01ff9a0f7f72 SHA512 27c4b4314b29547e3a485340086186c31d0d5ede249631738227ffdecd64c500baf7c3ee6852b02e18176376f0717c35ad3445b5a2bc684e82772eca27be2786
 DIST vqadmin-2.3.7.tar.gz 153678 BLAKE2B 3906c449d89e2747d10b9a4afdce14da7b41fdaca760d41b0374bfdd6a8dd2f756597b4bbdabb4d03b89806936e1550f069b7675dd2ef7486f235e497191bf94 SHA512 c427dc4b1e30926b0d3774bd0d296bf78a98037c566a82fa790f7a25d1fac64a80172498fd6342e93514108e42fdec0ebf1a76029546e43100ebcae5b845ef88
-EBUILD vqadmin-2.3.7.ebuild 1386 BLAKE2B 71a7b6f8fdebf9d97575466a41578dc5910c3261439352dc47f84734a715c892fcfe88c845e4d5face3626cffa38d813e41ae2dcd4ec7ad6c874bd5194b32f62 SHA512 8892ed129d7b5f9354b2686288bef513926275e3a645fc81322802b596eb1796b96185614b055e98ee0c219e5920b2cdd0c215613660ea42bf1e1f59561a7791
+EBUILD vqadmin-2.3.7.ebuild 1284 BLAKE2B f2571d4917460b4cd228f2e017e3be490c95c31d16fcf37ea6f84e04c54e014359c1e9cb9697c70cced17a45f98004ba96f6aa3a0c4fe621e0345ddabc79dde4 SHA512 aa6c5d2549605c30ad235fba49cac03069a95895d540aef11386510fbc70bd77dc4c40cc2880a0bd3d77b966b3028fe0862fb9fb07c72464a9ba441f7f045485
 MISC metadata.xml 357 BLAKE2B f681f656d61cbf1c78616f26f8746b29a5f76234344fc9b79e29b5f83c91829385751301bcde12dbb12e16e476ecc69e28ef4144c531829bc4432ca8e41fd667 SHA512 82473567cbefa523ec0fcee697d7b5d30b184dedc7a73fa6e49a7958a3355ba22118d572908c3ceffecf821b234053310e56e5f2b4f6e7fd66c9a23248974791
diff --git a/net-mail/vqadmin/vqadmin-2.3.7.ebuild b/net-mail/vqadmin/vqadmin-2.3.7.ebuild
index 71d0578aaaac..50516805cf56 100644
--- a/net-mail/vqadmin/vqadmin-2.3.7.ebuild
+++ b/net-mail/vqadmin/vqadmin-2.3.7.ebuild
@@ -1,11 +1,11 @@
-# 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 webapp eutils autotools qmail
+inherit webapp autotools qmail
 
-DESCRIPTION="A web based control pannel to manage Virtual Qmail Domains. Works with qmailadmin"
+DESCRIPTION="A web based control pannel to manage Virtual Qmail Domains"
 HOMEPAGE="http://www.inter7.com/index.php?page=vqadmin"
 SRC_URI="http://www.inter7.com/vqadmin/${P}.tar.gz"
 
@@ -20,9 +20,8 @@ DEPEND="virtual/qmail
 RDEPEND="${DEPEND}
 	net-mail/qmailadmin"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
+	default
 
 	# fixes for sane webapp integration
 	sed -i \
@@ -30,18 +29,15 @@ src_unpack() {
 		-e "s|/images/vqadmin/|/vqadmin/|g" \
 		-e "s|/cgi-bin/vqadmin/|/cgi-bin/|g" \
 		-e "s|vqadmin\.cgi|vqadmin|g" \
-		*.h *.c html/*.html
+		*.h *.c html/*.html || die
 }
 
-src_compile() {
-	econf ${myopts} \
+src_configure() {
+	econf \
 		--enable-qmaildir="${QMAIL_HOME}" \
 		--enable-vpopuser=vpopmail \
 		--enable-vpopgroup=vpopmail \
-		--enable-cgibindir="${MY_CGIBINDIR}" \
-	|| die "econf failed"
-
-	emake || die "make failed"
+		--enable-cgibindir="${MY_CGIBINDIR}"
 }
 
 src_install () {
-- 
cgit v1.2.3