commit: 66d85fcfc1333d05701e3938b0858cd22e36f2a7 Author: David Michael <fedora.dm0 <AT> gmail <DOT> com> AuthorDate: Mon Dec 21 23:53:26 2020 +0000 Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org> CommitDate: Sun Jan 3 08:19:51 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66d85fcf
sys-apps/policycoreutils: drop obsolete deps There are no references to ipy, libcap, libcgroup, inotify, or dbus in the code. This drops the unused dbus USE flag. Also add python3_9 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: David Michael <fedora.dm0 <AT> gmail.com> Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org> ...ls-9999.ebuild => policycoreutils-3.1-r2.ebuild} | 19 ++++--------------- .../policycoreutils/policycoreutils-9999.ebuild | 21 +++++---------------- 2 files changed, 9 insertions(+), 31 deletions(-) diff --git a/sys-apps/policycoreutils/policycoreutils-9999.ebuild b/sys-apps/policycoreutils/policycoreutils-3.1-r2.ebuild similarity index 93% copy from sys-apps/policycoreutils/policycoreutils-9999.ebuild copy to sys-apps/policycoreutils/policycoreutils-3.1-r2.ebuild index 8f15a3bee23..d93a1a53636 100644 --- a/sys-apps/policycoreutils/policycoreutils-9999.ebuild +++ b/sys-apps/policycoreutils/policycoreutils-3.1-r2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -PYTHON_COMPAT=( python{3_6,3_7,3_8} ) +PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} ) PYTHON_REQ_USE="xml" inherit multilib python-r1 toolchain-funcs bash-completion-r1 @@ -15,7 +15,7 @@ SEMNG_VER="${PV}" SELNX_VER="${PV}" SEPOL_VER="${PV}" -IUSE="audit dbus pam split-usr" +IUSE="audit pam split-usr" REQUIRED_USE="${PYTHON_REQUIRED_USE}" DESCRIPTION="SELinux core utilities" @@ -41,16 +41,10 @@ LICENSE="GPL-2" SLOT="0" DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python,${PYTHON_USEDEP}] - >=sys-libs/libcap-1.10-r10:= >=sys-libs/libsemanage-${SEMNG_VER}:=[python(+),${PYTHON_USEDEP}] - sys-libs/libcap-ng:= >=sys-libs/libsepol-${SEPOL_VER}:= + sys-libs/libcap-ng:= >=app-admin/setools-4.2.0[${PYTHON_USEDEP}] - dev-python/ipy[${PYTHON_USEDEP}] - dbus? ( - sys-apps/dbus - dev-libs/dbus-glib:= - ) audit? ( >=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}] ) pam? ( sys-libs/pam:= ) ${PYTHON_DEPS}" @@ -59,9 +53,6 @@ DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python,${PYTHON_USEDEP}] # (Still exists in native) BDEPEND="sys-devel/gettext" -### libcgroup -> seunshare -### dbus -> restorecond - # pax-utils for scanelf used by rlpkg RDEPEND="${DEPEND} app-misc/pax-utils" @@ -110,7 +101,6 @@ src_compile() { AUDIT_LOG_PRIVS="y" \ AUDITH="$(usex audit y n)" \ PAMH="$(usex pam y n)" \ - INOTIFYH="$(usex dbus y n)" \ SESANDBOX="n" \ CC="$(tc-getCC)" \ LIBDIR="\$(PREFIX)/$(get_libdir)" @@ -129,7 +119,6 @@ src_install() { AUDIT_LOG_PRIVS="y" \ AUDITH="$(usex audit y n)" \ PAMH="$(usex pam y n)" \ - INOTIFYH="$(usex dbus y n)" \ SESANDBOX="n" \ CC="$(tc-getCC)" \ LIBDIR="\$(PREFIX)/$(get_libdir)" \ diff --git a/sys-apps/policycoreutils/policycoreutils-9999.ebuild b/sys-apps/policycoreutils/policycoreutils-9999.ebuild index 8f15a3bee23..aed7968c418 100644 --- a/sys-apps/policycoreutils/policycoreutils-9999.ebuild +++ b/sys-apps/policycoreutils/policycoreutils-9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" -PYTHON_COMPAT=( python{3_6,3_7,3_8} ) +EAPI=7 +PYTHON_COMPAT=( python3_{6..9} ) PYTHON_REQ_USE="xml" inherit multilib python-r1 toolchain-funcs bash-completion-r1 @@ -15,7 +15,7 @@ SEMNG_VER="${PV}" SELNX_VER="${PV}" SEPOL_VER="${PV}" -IUSE="audit dbus pam split-usr" +IUSE="audit pam split-usr" REQUIRED_USE="${PYTHON_REQUIRED_USE}" DESCRIPTION="SELinux core utilities" @@ -41,16 +41,10 @@ LICENSE="GPL-2" SLOT="0" DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python,${PYTHON_USEDEP}] - >=sys-libs/libcap-1.10-r10:= >=sys-libs/libsemanage-${SEMNG_VER}:=[python(+),${PYTHON_USEDEP}] - sys-libs/libcap-ng:= >=sys-libs/libsepol-${SEPOL_VER}:= + sys-libs/libcap-ng:= >=app-admin/setools-4.2.0[${PYTHON_USEDEP}] - dev-python/ipy[${PYTHON_USEDEP}] - dbus? ( - sys-apps/dbus - dev-libs/dbus-glib:= - ) audit? ( >=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}] ) pam? ( sys-libs/pam:= ) ${PYTHON_DEPS}" @@ -59,9 +53,6 @@ DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python,${PYTHON_USEDEP}] # (Still exists in native) BDEPEND="sys-devel/gettext" -### libcgroup -> seunshare -### dbus -> restorecond - # pax-utils for scanelf used by rlpkg RDEPEND="${DEPEND} app-misc/pax-utils" @@ -110,7 +101,6 @@ src_compile() { AUDIT_LOG_PRIVS="y" \ AUDITH="$(usex audit y n)" \ PAMH="$(usex pam y n)" \ - INOTIFYH="$(usex dbus y n)" \ SESANDBOX="n" \ CC="$(tc-getCC)" \ LIBDIR="\$(PREFIX)/$(get_libdir)" @@ -129,7 +119,6 @@ src_install() { AUDIT_LOG_PRIVS="y" \ AUDITH="$(usex audit y n)" \ PAMH="$(usex pam y n)" \ - INOTIFYH="$(usex dbus y n)" \ SESANDBOX="n" \ CC="$(tc-getCC)" \ LIBDIR="\$(PREFIX)/$(get_libdir)" \