From 4566ecefe9a886b1f7972b1b59e2008c1762f5ee Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Wed, 21 Mar 2018 17:59:04 +0100 Subject: [PATCH] app-admin/webapp-config: Support sys-apps/portage-mgorny --- ...config-1.55.ebuild => webapp-config-1.55-r1.ebuild} | 10 ++++++++-- app-admin/webapp-config/webapp-config-9999.ebuild | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) rename app-admin/webapp-config/{webapp-config-1.55.ebuild => webapp-config-1.55-r1.ebuild} (90%) diff --git a/app-admin/webapp-config/webapp-config-1.55.ebuild b/app-admin/webapp-config/webapp-config-1.55-r1.ebuild similarity index 90% rename from app-admin/webapp-config/webapp-config-1.55.ebuild rename to 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 -- 2.26.2