[gentoo-commits] repo/gentoo:master commit in: app-admin/setools/

[Jason Zaman]

commit:     b1332232a8ab363dc037ecb591552e4e9b9a3ebe
Author:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 12 01:29:50 2022 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Tue Apr 12 01:32:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1332232

app-admin/setools: Add missing PYTHON_USEDEP

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org>

 .../{setools-9999.ebuild => setools-4.4.0-r3.ebuild}       | 14 +++++++-------
 app-admin/setools/setools-9999.ebuild                      |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app-admin/setools/setools-9999.ebuild 
b/app-admin/setools/setools-4.4.0-r3.ebuild
similarity index 77%
copy from app-admin/setools/setools-9999.ebuild
copy to app-admin/setools/setools-4.4.0-r3.ebuild
index 82b8e1bd9964..82ee339e0806 100644
--- a/app-admin/setools/setools-9999.ebuild
+++ b/app-admin/setools/setools-4.4.0-r3.ebuild
@@ -13,20 +13,19 @@ HOMEPAGE="https://github.com/SELinuxProject/setools/wiki";
 if [[ ${PV} == 9999 ]] ; then
        inherit git-r3
        EGIT_REPO_URI="https://github.com/SELinuxProject/setools.git";
-       S="${WORKDIR}/${P}"
 else
        
SRC_URI="https://github.com/SELinuxProject/setools/releases/download/${PV}/${P}.tar.bz2";
-       KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-       S="${WORKDIR}/${PN}"
+       KEYWORDS="amd64 arm arm64 x86"
 fi
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 IUSE="test infoflow X"
 RESTRICT="!test? ( test )"
+S="${WORKDIR}/${PN}"
 
 RDEPEND="${PYTHON_DEPS}
-       dev-python/setuptools
+       dev-python/setuptools[${PYTHON_USEDEP}]
        >=sys-libs/libsepol-3.2:=
        >=sys-libs/libselinux-3.2:=
        infoflow? ( >=dev-python/networkx-2.0[${PYTHON_USEDEP}] )
@@ -34,8 +33,8 @@ RDEPEND="${PYTHON_DEPS}
                dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
        )"
 DEPEND="${RDEPEND}"
-BDEPEND=">=dev-python/cython-0.27
-       dev-python/setuptools
+BDEPEND=">=dev-python/cython-0.27[${PYTHON_USEDEP}]
+       dev-python/setuptools[${PYTHON_USEDEP}]
        test? (
                >=dev-python/networkx-2.0[${PYTHON_USEDEP}]
                sys-apps/checkpolicy
@@ -46,7 +45,8 @@ python_prepare_all() {
        sed -i "s@^lib_dirs = .*@lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@" 
"${S}"/setup.py || \
                die "failed to set lib_dirs"
 
-       use X || local PATCHES=( "${FILESDIR}"/setools-4.4.0-remove-gui.patch )
+       local PATCHES=( 
"${FILESDIR}"/0001-__init__.py-Make-NetworkX-dep-optional.patch )
+       use X || PATCHES+=( "${FILESDIR}"/setools-4.4.0-remove-gui.patch )
        distutils-r1_python_prepare_all
 }
 

diff --git a/app-admin/setools/setools-9999.ebuild 
b/app-admin/setools/setools-9999.ebuild
index 82b8e1bd9964..965896ee5a44 100644
--- a/app-admin/setools/setools-9999.ebuild
+++ b/app-admin/setools/setools-9999.ebuild
@@ -26,7 +26,7 @@ IUSE="test infoflow X"
 RESTRICT="!test? ( test )"
 
 RDEPEND="${PYTHON_DEPS}
-       dev-python/setuptools
+       dev-python/setuptools[${PYTHON_USEDEP}]
        >=sys-libs/libsepol-3.2:=
        >=sys-libs/libselinux-3.2:=
        infoflow? ( >=dev-python/networkx-2.0[${PYTHON_USEDEP}] )
@@ -34,8 +34,8 @@ RDEPEND="${PYTHON_DEPS}
                dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
        )"
 DEPEND="${RDEPEND}"
-BDEPEND=">=dev-python/cython-0.27
-       dev-python/setuptools
+BDEPEND=">=dev-python/cython-0.27[${PYTHON_USEDEP}]
+       dev-python/setuptools[${PYTHON_USEDEP}]
        test? (
                >=dev-python/networkx-2.0[${PYTHON_USEDEP}]
                sys-apps/checkpolicy