commit:     b98629e8da336b3c9a8bf40b6d1868c0349b8864
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  7 08:04:45 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Apr  7 08:06:32 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b98629e8

app-admin/webapp-config: Bump to EAPI 7

Closes: https://bugs.gentoo.org/756874
Closes: https://bugs.gentoo.org/745879
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 ...{webapp-config-1.55-r1.ebuild => webapp-config-1.55-r2.ebuild} | 8 ++++----
 app-admin/webapp-config/webapp-config-9999.ebuild                 | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app-admin/webapp-config/webapp-config-1.55-r1.ebuild 
b/app-admin/webapp-config/webapp-config-1.55-r2.ebuild
similarity index 91%
rename from app-admin/webapp-config/webapp-config-1.55-r1.ebuild
rename to app-admin/webapp-config/webapp-config-1.55-r2.ebuild
index 49c4a106875..08e686f810c 100644
--- a/app-admin/webapp-config/webapp-config-1.55-r1.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.55-r2.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1 prefix
@@ -51,12 +52,11 @@ python_install_all() {
 
        dodoc AUTHORS
        doman doc/*.[58]
-       dohtml doc/*.[58].html
 }
 
 python_test() {
-       PYTHONPATH="." "${PYTHON}" WebappConfig/tests/external.py \
-               || die "Testing failed with ${EPYTHON}"
+       PYTHONPATH="." "${EPYTHON}" WebappConfig/tests/external.py -v ||
+               die "Testing failed with ${EPYTHON}"
 }
 
 pkg_postinst() {

diff --git a/app-admin/webapp-config/webapp-config-9999.ebuild 
b/app-admin/webapp-config/webapp-config-9999.ebuild
index 37cef6a134c..611a6da21ac 100644
--- a/app-admin/webapp-config/webapp-config-9999.ebuild
+++ b/app-admin/webapp-config/webapp-config-9999.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1 prefix
@@ -57,12 +58,11 @@ python_install_all() {
 
        dodoc AUTHORS
        doman doc/*.[58]
-       dohtml doc/*.[58].html
 }
 
 python_test() {
-       PYTHONPATH="." "${PYTHON}" WebappConfig/tests/external.py \
-               || die "Testing failed with ${EPYTHON}"
+       PYTHONPATH="." "${EPYTHON}" WebappConfig/tests/external.py -v ||
+               die "Testing failed with ${EPYTHON}"
 }
 
 pkg_postinst() {

Reply via email to