[gentoo-commits] repo/gentoo:master commit in: net-mail/qmrtg/

[gentoo-commits] repo/gentoo:master commit in: net-mail/qmrtg/

[Jeroen Roovers]

commit:     b3d511b5278832091491e7136440cbdb0cb5a13f
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  8 06:57:21 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Jan  8 07:02:14 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3d511b5

net-mail/qmrtg: EAPI=7

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 .../{qmrtg-2.1-r1.ebuild => qmrtg-2.1-r2.ebuild}   | 31 ++++++++--------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/net-mail/qmrtg/qmrtg-2.1-r1.ebuild b/net-mail/qmrtg/qmrtg-2.1-r2.ebuild
similarity index 56%
rename from net-mail/qmrtg/qmrtg-2.1-r1.ebuild
rename to net-mail/qmrtg/qmrtg-2.1-r2.ebuild
index dad4124cce5..2eab8ca0cd2 100644
--- a/net-mail/qmrtg/qmrtg-2.1-r1.ebuild
+++ b/net-mail/qmrtg/qmrtg-2.1-r2.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils
+EAPI=7
 
 DESCRIPTION="A tool to analyze qmail activity with the goal to graph everything through MRTG"
 HOMEPAGE="http://dev.publicshout.org/qmrtg"
@@ -12,41 +11,33 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
-
-RDEPEND="net-analyzer/mrtg"
+PATCHES=(
+	"${FILESDIR}"/mrtg.cfg.patch
+	"${FILESDIR}"/qmrtg.conf.sample.patch
+	"${FILESDIR}"/${P}-TAI_STR_LEN.patch
+)
 
 src_prepare() {
+	default
 	sed -i \
 		-e 's|^CFLAGS =|CFLAGS ?=|g' \
 		analyzers/Makefile.in filters/Makefile.in || die
-
-	epatch "${FILESDIR}"/mrtg.cfg.patch
-	epatch "${FILESDIR}"/qmrtg.conf.sample.patch
-	epatch "${FILESDIR}"/${P}-TAI_STR_LEN.patch
 }
 
 DOCS=( INSTALL.txt )
 
 src_install () {
 	default
+
 	keepdir /var/lib/qmrtg
+
 	if use doc ; then
 		docinto txt
 		dodoc doc/*.txt
 		docinto html
-		dohtml -r html/*
+		dodoc -r html/*
 	fi
 
 	insinto /usr/share/qmrtg2
 	doins examples/*
-
-}
-
-pkg_postinst () {
-	elog
-	elog "You need to configure manually qmrtg in order to run it."
-	elog "The configuration templates in /usr/share/qmrtg2/ and"
-	elog "the INSTALL file in /usr/share/doc/qmrtg-2.1/"
-	elog "will be useful."
-	elog
 }