commit: 21ee375a5505b2c953d46eeac85980be0b995636 Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> AuthorDate: Tue Feb 9 15:09:19 2021 +0000 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> CommitDate: Tue Feb 9 15:42:31 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21ee375a
sys-apps/usbguard: Fix required use for tests, fix umockdev automagic Closes: https://bugs.gentoo.org/769692 Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org> Package-Manager: Portage-3.0.14, Repoman-3.0.2 sys-apps/usbguard/metadata.xml | 3 +++ .../{usbguard-1.0.0.ebuild => usbguard-1.0.0-r1.ebuild} | 10 +++++++++- sys-apps/usbguard/usbguard-1.0.0.ebuild | 8 +++++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/sys-apps/usbguard/metadata.xml b/sys-apps/usbguard/metadata.xml index 6d2298876fa..2335eab4d86 100644 --- a/sys-apps/usbguard/metadata.xml +++ b/sys-apps/usbguard/metadata.xml @@ -5,4 +5,7 @@ <email>[email protected]</email> <name>Sebastian Pipping</name> </maintainer> + <use> + <flag name="umockdev">Enables support for <pkg>dev-util/umockdev</pkg></flag> + </use> </pkgmetadata> diff --git a/sys-apps/usbguard/usbguard-1.0.0.ebuild b/sys-apps/usbguard/usbguard-1.0.0-r1.ebuild similarity index 87% copy from sys-apps/usbguard/usbguard-1.0.0.ebuild copy to sys-apps/usbguard/usbguard-1.0.0-r1.ebuild index 1f69b3df6b4..45cb81c1a51 100644 --- a/sys-apps/usbguard/usbguard-1.0.0.ebuild +++ b/sys-apps/usbguard/usbguard-1.0.0-r1.ebuild @@ -12,10 +12,14 @@ SRC_URI="https://github.com/USBGuard/usbguard/releases/download/${P}/${P}.tar.gz LICENSE="GPL-2+" SLOT="0/1" # due to libusbguard.so.<1>.0.0 KEYWORDS="~amd64 ~x86" -IUSE="bash-completion dbus ldap policykit static-libs systemd" +IUSE="bash-completion dbus ldap policykit static-libs systemd test umockdev" REQUIRED_USE="policykit? ( dbus )" +# https://github.com/USBGuard/usbguard/issues/449 +# https://bugs.gentoo.org/769692 +REQUIRED_USE+=" test? ( static-libs )" + CDEPEND=" <dev-libs/pegtl-3 >=dev-libs/libsodium-0.4.5:= @@ -33,6 +37,7 @@ CDEPEND=" ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd ) + umockdev? ( dev-util/umockdev ) " RDEPEND="${CDEPEND} virtual/udev @@ -47,6 +52,8 @@ DEPEND="${CDEPEND} ) " +RESTRICT="!test? ( test )" + PATCHES=( "${FILESDIR}"/${PN}-1.0.0-pthreads-link.patch ) @@ -63,6 +70,7 @@ src_configure() { $(use_with policykit polkit) $(use_enable static-libs static) $(use_enable systemd) + $(use_enable umockdev) ) econf "${myargs[@]}" diff --git a/sys-apps/usbguard/usbguard-1.0.0.ebuild b/sys-apps/usbguard/usbguard-1.0.0.ebuild index 1f69b3df6b4..f93887630a2 100644 --- a/sys-apps/usbguard/usbguard-1.0.0.ebuild +++ b/sys-apps/usbguard/usbguard-1.0.0.ebuild @@ -12,10 +12,14 @@ SRC_URI="https://github.com/USBGuard/usbguard/releases/download/${P}/${P}.tar.gz LICENSE="GPL-2+" SLOT="0/1" # due to libusbguard.so.<1>.0.0 KEYWORDS="~amd64 ~x86" -IUSE="bash-completion dbus ldap policykit static-libs systemd" +IUSE="bash-completion dbus ldap policykit static-libs systemd test" REQUIRED_USE="policykit? ( dbus )" +# https://github.com/USBGuard/usbguard/issues/449 +# https://bugs.gentoo.org/769692 +REQUIRED_USE+=" test? ( static-libs )" + CDEPEND=" <dev-libs/pegtl-3 >=dev-libs/libsodium-0.4.5:= @@ -47,6 +51,8 @@ DEPEND="${CDEPEND} ) " +RESTRICT="!test? ( test )" + PATCHES=( "${FILESDIR}"/${PN}-1.0.0-pthreads-link.patch )
