summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2018-03-21 17:59:04 +0100
committerMichał Górny <mgorny@gentoo.org>2018-03-21 19:12:31 +0100
commit4566ecefe9a886b1f7972b1b59e2008c1762f5ee (patch)
tree3075c7c1e277f0d7fce3c866630bcdb75b3b9940 /app-admin
parentapp-admin/salt: Support sys-apps/portage-mgorny (diff)
downloadgentoo-4566ecefe9a886b1f7972b1b59e2008c1762f5ee.tar.gz
gentoo-4566ecefe9a886b1f7972b1b59e2008c1762f5ee.tar.bz2
gentoo-4566ecefe9a886b1f7972b1b59e2008c1762f5ee.zip
app-admin/webapp-config: Support sys-apps/portage-mgorny
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/webapp-config/webapp-config-1.55-r1.ebuild (renamed from app-admin/webapp-config/webapp-config-1.55.ebuild)10
-rw-r--r--app-admin/webapp-config/webapp-config-9999.ebuild10
2 files changed, 16 insertions, 4 deletions
diff --git a/app-admin/webapp-config/webapp-config-1.55.ebuild b/app-admin/webapp-config/webapp-config-1.55-r1.ebuild
index b83d9fcd994a..871ffb75c6a7 100644
--- a/app-admin/webapp-config/webapp-config-1.55.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.55-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -19,7 +19,13 @@ IUSE="+portage"
DEPEND="app-text/xmlto
sys-apps/gentoo-functions"
-RDEPEND="portage? ( sys-apps/portage[${PYTHON_USEDEP}] )"
+RDEPEND="
+ portage? (
+ || (
+ sys-apps/portage[${PYTHON_USEDEP}]
+ sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+ )
+ )"
python_prepare_all() {
distutils-r1_python_prepare_all
diff --git a/app-admin/webapp-config/webapp-config-9999.ebuild b/app-admin/webapp-config/webapp-config-9999.ebuild
index 409c9b0d9b1b..08cda6204783 100644
--- a/app-admin/webapp-config/webapp-config-9999.ebuild
+++ b/app-admin/webapp-config/webapp-config-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -26,7 +26,13 @@ IUSE="+portage"
DEPEND="app-text/xmlto
sys-apps/gentoo-functions"
-RDEPEND="portage? ( sys-apps/portage[${PYTHON_USEDEP}] )"
+RDEPEND="
+ portage? (
+ || (
+ sys-apps/portage[${PYTHON_USEDEP}]
+ sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+ )
+ )"
python_prepare_all() {
distutils-r1_python_prepare_all