[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_qos/

[Thomas Deutschmann]

commit:     f25832515153dcad71b42a635a27590f339846ee
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 26 22:51:08 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Jun 26 22:59:43 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2583251

www-apache/mod_qos: migrate EAPI to EAPI=6

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 www-apache/mod_qos/mod_qos-11.65.ebuild | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/www-apache/mod_qos/mod_qos-11.65.ebuild 
b/www-apache/mod_qos/mod_qos-11.65.ebuild
index b98be2bbb58..765632d044a 100644
--- a/www-apache/mod_qos/mod_qos-11.65.ebuild
+++ b/www-apache/mod_qos/mod_qos-11.65.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 inherit autotools apache-module
 
 DESCRIPTION="A QOS module for the apache webserver"
@@ -29,26 +29,33 @@ DOCFILES="${S}/doc/*.txt ${S}/README.TXT"
 need_apache2
 
 src_prepare() {
-       cd "${S}/tools" && eautoreconf
+       default
+
+       pushd "${S}"/tools &>/dev/null || die
+       eautoreconf
+       popd &>/dev/null || die
 }
 
 src_configure() {
-       cd "${S}/tools" && econf
+       pushd "${S}"/tools &>/dev/null || die
+       econf
+       popd &>/dev/null || die
 }
 
 src_compile() {
        apache-module_src_compile
-       emake -C "${S}/tools"
+       emake -C "${S}"/tools
 }
 
 src_install() {
        einfo "Installing Apache module ..."
-       cd "${S}/tools"
+       pushd "${S}"/tools &>/dev/null || die
        apache-module_src_install
+       popd &>/dev/null || die
 
        einfo "Installing module utilities ..."
-       emake -C "${S}/tools" install DESTDIR="${D}"
+       emake -C "${S}"/tools install DESTDIR="${D}"
 
        # installing html documentation
-       dohtml -r -x *.txt "${S}/doc/"
+       dohtml -r -x *.txt "${S}"/doc/
 }