From 064af661d0c9a31cecdf348632bc5603333a9149 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Tue, 10 Dec 2019 23:02:54 +0100 Subject: */*: [QA] Fix trivial cases of MissingTestRestrict MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The result was achieved via the following pipeline: pkgcheck scan -c RestrictTestCheck -R FormatReporter \ --format '{category}/{package}/{package}-{version}.ebuild' | xargs -n32 grep -L RESTRICT | xargs -n32 sed -i -e '/^IUSE=.*test/aRESTRICT="!test? ( test )"' The resulting metadata was compared before and after the change. Few Go ebuilds had to be fixed manually due to implicit RESTRICT=strip added by the eclass. Two ebuilds have to be fixed because of multiline IUSE. Suggested-by: Robin H. Johnson Closes: https://github.com/gentoo/gentoo/pull/13942 Signed-off-by: Michał Górny --- sys-libs/libblockdev/libblockdev-2.20-r2.ebuild | 1 + sys-libs/libblockdev/libblockdev-2.22.ebuild | 1 + sys-libs/libblockdev/libblockdev-2.23.ebuild | 1 + sys-libs/libblockdev/libblockdev-9999.ebuild | 1 + sys-libs/libcxxrt/libcxxrt-0.0_p20180311.ebuild | 1 + sys-libs/libcxxrt/libcxxrt-9999.ebuild | 1 + sys-libs/libhugetlbfs/libhugetlbfs-2.21.ebuild | 3 ++- sys-libs/libhugetlbfs/libhugetlbfs-2.22.ebuild | 1 + sys-libs/libosinfo/libosinfo-1.2.0.ebuild | 3 ++- sys-libs/libosinfo/libosinfo-1.3.0.ebuild | 1 + sys-libs/libosinfo/libosinfo-1.4.0.ebuild | 1 + sys-libs/ncurses/ncurses-6.1_p20181020.ebuild | 1 + sys-libs/ncurses/ncurses-6.1_p20190609.ebuild | 1 + sys-libs/nss_wrapper/nss_wrapper-1.1.3.ebuild | 3 ++- sys-libs/nss_wrapper/nss_wrapper-1.1.5.ebuild | 3 ++- sys-libs/nss_wrapper/nss_wrapper-1.1.6.ebuild | 1 + sys-libs/pam/pam-1.2.1-r2.ebuild | 1 + sys-libs/pam/pam-1.3.0-r2.ebuild | 1 + sys-libs/uid_wrapper/uid_wrapper-1.2.1.ebuild | 3 ++- sys-libs/uid_wrapper/uid_wrapper-1.2.4.ebuild | 3 ++- sys-libs/uid_wrapper/uid_wrapper-1.2.7.ebuild | 1 + 21 files changed, 27 insertions(+), 6 deletions(-) (limited to 'sys-libs') diff --git a/sys-libs/libblockdev/libblockdev-2.20-r2.ebuild b/sys-libs/libblockdev/libblockdev-2.20-r2.ebuild index 86f99e4dd7cd..6779b714db4f 100644 --- a/sys-libs/libblockdev/libblockdev-2.20-r2.ebuild +++ b/sys-libs/libblockdev/libblockdev-2.20-r2.ebuild @@ -16,6 +16,7 @@ LICENSE="LGPL-2+" SLOT="0" KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86" IUSE="bcache +cryptsetup device-mapper dmraid doc escrow lvm kbd test vdo" +RESTRICT="!test? ( test )" RDEPEND=" >=dev-libs/glib-2.42.2 diff --git a/sys-libs/libblockdev/libblockdev-2.22.ebuild b/sys-libs/libblockdev/libblockdev-2.22.ebuild index cf78fd034653..382f79323601 100644 --- a/sys-libs/libblockdev/libblockdev-2.22.ebuild +++ b/sys-libs/libblockdev/libblockdev-2.22.ebuild @@ -25,6 +25,7 @@ fi LICENSE="LGPL-2+" SLOT="0" IUSE="bcache +cryptsetup device-mapper dmraid escrow gtk-doc lvm kbd test +tools vdo" +RESTRICT="!test? ( test )" RDEPEND=" >=dev-libs/glib-2.42.2 diff --git a/sys-libs/libblockdev/libblockdev-2.23.ebuild b/sys-libs/libblockdev/libblockdev-2.23.ebuild index cd986a9091b1..ed091987aff4 100644 --- a/sys-libs/libblockdev/libblockdev-2.23.ebuild +++ b/sys-libs/libblockdev/libblockdev-2.23.ebuild @@ -25,6 +25,7 @@ fi LICENSE="LGPL-2+" SLOT="0" IUSE="bcache +cryptsetup device-mapper dmraid escrow gtk-doc introspection lvm kbd test +tools vdo" +RESTRICT="!test? ( test )" RDEPEND=" >=dev-libs/glib-2.42.2 diff --git a/sys-libs/libblockdev/libblockdev-9999.ebuild b/sys-libs/libblockdev/libblockdev-9999.ebuild index cd986a9091b1..ed091987aff4 100644 --- a/sys-libs/libblockdev/libblockdev-9999.ebuild +++ b/sys-libs/libblockdev/libblockdev-9999.ebuild @@ -25,6 +25,7 @@ fi LICENSE="LGPL-2+" SLOT="0" IUSE="bcache +cryptsetup device-mapper dmraid escrow gtk-doc introspection lvm kbd test +tools vdo" +RESTRICT="!test? ( test )" RDEPEND=" >=dev-libs/glib-2.42.2 diff --git a/sys-libs/libcxxrt/libcxxrt-0.0_p20180311.ebuild b/sys-libs/libcxxrt/libcxxrt-0.0_p20180311.ebuild index bb89489c09da..5f6ec8f7caaa 100644 --- a/sys-libs/libcxxrt/libcxxrt-0.0_p20180311.ebuild +++ b/sys-libs/libcxxrt/libcxxrt-0.0_p20180311.ebuild @@ -26,6 +26,7 @@ else KEYWORDS="amd64 arm arm64 x86" fi IUSE="+libunwind +static-libs test" +RESTRICT="!test? ( test )" RDEPEND="libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}] sys-libs/llvm-libunwind[static-libs?,${MULTILIB_USEDEP}] ) )" diff --git a/sys-libs/libcxxrt/libcxxrt-9999.ebuild b/sys-libs/libcxxrt/libcxxrt-9999.ebuild index 5374e99ec390..2fdf7d613327 100644 --- a/sys-libs/libcxxrt/libcxxrt-9999.ebuild +++ b/sys-libs/libcxxrt/libcxxrt-9999.ebuild @@ -26,6 +26,7 @@ else KEYWORDS="" fi IUSE="+libunwind +static-libs test" +RESTRICT="!test? ( test )" RDEPEND="libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}] sys-libs/llvm-libunwind[static-libs?,${MULTILIB_USEDEP}] ) )" diff --git a/sys-libs/libhugetlbfs/libhugetlbfs-2.21.ebuild b/sys-libs/libhugetlbfs/libhugetlbfs-2.21.ebuild index e7aae65f6050..117d74e685b8 100644 --- a/sys-libs/libhugetlbfs/libhugetlbfs-2.21.ebuild +++ b/sys-libs/libhugetlbfs/libhugetlbfs-2.21.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -15,6 +15,7 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~x86" IUSE="static-libs test" +RESTRICT="!test? ( test )" DEPEND="test? ( ${PYTHON_DEPS} )" diff --git a/sys-libs/libhugetlbfs/libhugetlbfs-2.22.ebuild b/sys-libs/libhugetlbfs/libhugetlbfs-2.22.ebuild index 34b969c3fe3d..e9ace7861409 100644 --- a/sys-libs/libhugetlbfs/libhugetlbfs-2.22.ebuild +++ b/sys-libs/libhugetlbfs/libhugetlbfs-2.22.ebuild @@ -15,6 +15,7 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~x86" IUSE="static-libs test" +RESTRICT="!test? ( test )" DEPEND="test? ( ${PYTHON_DEPS} )" diff --git a/sys-libs/libosinfo/libosinfo-1.2.0.ebuild b/sys-libs/libosinfo/libosinfo-1.2.0.ebuild index 72e0867bd9fc..b2aa0c7a03d2 100644 --- a/sys-libs/libosinfo/libosinfo-1.2.0.ebuild +++ b/sys-libs/libosinfo/libosinfo-1.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -14,6 +14,7 @@ LICENSE="GPL-2+ LGPL-2.1+" SLOT="0" IUSE="+introspection +vala test" +RESTRICT="!test? ( test )" REQUIRED_USE="vala? ( introspection )" KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" diff --git a/sys-libs/libosinfo/libosinfo-1.3.0.ebuild b/sys-libs/libosinfo/libosinfo-1.3.0.ebuild index 064e8e0d469b..81405fe9b0d1 100644 --- a/sys-libs/libosinfo/libosinfo-1.3.0.ebuild +++ b/sys-libs/libosinfo/libosinfo-1.3.0.ebuild @@ -14,6 +14,7 @@ LICENSE="GPL-2+ LGPL-2.1+" SLOT="0" IUSE="+introspection +vala test" +RESTRICT="!test? ( test )" REQUIRED_USE="vala? ( introspection )" KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" diff --git a/sys-libs/libosinfo/libosinfo-1.4.0.ebuild b/sys-libs/libosinfo/libosinfo-1.4.0.ebuild index e47e49b0539c..93cbfec3fe17 100644 --- a/sys-libs/libosinfo/libosinfo-1.4.0.ebuild +++ b/sys-libs/libosinfo/libosinfo-1.4.0.ebuild @@ -14,6 +14,7 @@ LICENSE="GPL-2+ LGPL-2.1+" SLOT="0" IUSE="+introspection +vala test" +RESTRICT="!test? ( test )" REQUIRED_USE="vala? ( introspection )" KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" diff --git a/sys-libs/ncurses/ncurses-6.1_p20181020.ebuild b/sys-libs/ncurses/ncurses-6.1_p20181020.ebuild index 1b10aae31358..a3663edeedbf 100644 --- a/sys-libs/ncurses/ncurses-6.1_p20181020.ebuild +++ b/sys-libs/ncurses/ncurses-6.1_p20181020.ebuild @@ -21,6 +21,7 @@ LICENSE="MIT" SLOT="0/6" KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86" IUSE="ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode" +RESTRICT="!test? ( test )" DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )" # berkdb? ( sys-libs/db )" diff --git a/sys-libs/ncurses/ncurses-6.1_p20190609.ebuild b/sys-libs/ncurses/ncurses-6.1_p20190609.ebuild index e654cb4dc623..1d219963c3f5 100644 --- a/sys-libs/ncurses/ncurses-6.1_p20190609.ebuild +++ b/sys-libs/ncurses/ncurses-6.1_p20190609.ebuild @@ -21,6 +21,7 @@ LICENSE="MIT" SLOT="0/6" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" IUSE="ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode" +RESTRICT="!test? ( test )" DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )" # berkdb? ( sys-libs/db )" diff --git a/sys-libs/nss_wrapper/nss_wrapper-1.1.3.ebuild b/sys-libs/nss_wrapper/nss_wrapper-1.1.3.ebuild index 9c850eb8eab2..113b084510a5 100644 --- a/sys-libs/nss_wrapper/nss_wrapper-1.1.3.ebuild +++ b/sys-libs/nss_wrapper/nss_wrapper-1.1.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,6 +12,7 @@ LICENSE="BSD" SLOT="0" KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86" IUSE="test" +RESTRICT="!test? ( test )" DEPEND="" RDEPEND="${DEPEND}" diff --git a/sys-libs/nss_wrapper/nss_wrapper-1.1.5.ebuild b/sys-libs/nss_wrapper/nss_wrapper-1.1.5.ebuild index 097699cc431f..f1c972d5283a 100644 --- a/sys-libs/nss_wrapper/nss_wrapper-1.1.5.ebuild +++ b/sys-libs/nss_wrapper/nss_wrapper-1.1.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,6 +12,7 @@ LICENSE="BSD" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="test" +RESTRICT="!test? ( test )" DEPEND="" RDEPEND="${DEPEND}" diff --git a/sys-libs/nss_wrapper/nss_wrapper-1.1.6.ebuild b/sys-libs/nss_wrapper/nss_wrapper-1.1.6.ebuild index b4ad7aae9cfb..f1c972d5283a 100644 --- a/sys-libs/nss_wrapper/nss_wrapper-1.1.6.ebuild +++ b/sys-libs/nss_wrapper/nss_wrapper-1.1.6.ebuild @@ -12,6 +12,7 @@ LICENSE="BSD" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="test" +RESTRICT="!test? ( test )" DEPEND="" RDEPEND="${DEPEND}" diff --git a/sys-libs/pam/pam-1.2.1-r2.ebuild b/sys-libs/pam/pam-1.2.1-r2.ebuild index 2cb117abc88e..b6e3fee2e960 100644 --- a/sys-libs/pam/pam-1.2.1-r2.ebuild +++ b/sys-libs/pam/pam-1.2.1-r2.ebuild @@ -17,6 +17,7 @@ LICENSE="|| ( BSD GPL-2 )" SLOT="0" KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux" IUSE="audit berkdb +cracklib debug nis nls +pie selinux test" +RESTRICT="!test? ( test )" RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] ) cracklib? ( >=sys-libs/cracklib-2.9.1-r1[${MULTILIB_USEDEP}] ) diff --git a/sys-libs/pam/pam-1.3.0-r2.ebuild b/sys-libs/pam/pam-1.3.0-r2.ebuild index 2eb2d287da65..85b67e363e5a 100644 --- a/sys-libs/pam/pam-1.3.0-r2.ebuild +++ b/sys-libs/pam/pam-1.3.0-r2.ebuild @@ -17,6 +17,7 @@ LICENSE="|| ( BSD GPL-2 )" SLOT="0" KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux" IUSE="audit berkdb +cracklib debug nis nls +pie selinux test vim-syntax" +RESTRICT="!test? ( test )" RDEPEND=" nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] ) diff --git a/sys-libs/uid_wrapper/uid_wrapper-1.2.1.ebuild b/sys-libs/uid_wrapper/uid_wrapper-1.2.1.ebuild index de4446358d9b..3e097e619161 100644 --- a/sys-libs/uid_wrapper/uid_wrapper-1.2.1.ebuild +++ b/sys-libs/uid_wrapper/uid_wrapper-1.2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,6 +13,7 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86" IUSE="test" +RESTRICT="!test? ( test )" DEPEND="" RDEPEND="${DEPEND}" diff --git a/sys-libs/uid_wrapper/uid_wrapper-1.2.4.ebuild b/sys-libs/uid_wrapper/uid_wrapper-1.2.4.ebuild index b24e1db33e5d..1fe72649c615 100644 --- a/sys-libs/uid_wrapper/uid_wrapper-1.2.4.ebuild +++ b/sys-libs/uid_wrapper/uid_wrapper-1.2.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,6 +13,7 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="test" +RESTRICT="!test? ( test )" DEPEND="" RDEPEND="${DEPEND}" diff --git a/sys-libs/uid_wrapper/uid_wrapper-1.2.7.ebuild b/sys-libs/uid_wrapper/uid_wrapper-1.2.7.ebuild index 09f31700e472..cfc62eddb7f6 100644 --- a/sys-libs/uid_wrapper/uid_wrapper-1.2.7.ebuild +++ b/sys-libs/uid_wrapper/uid_wrapper-1.2.7.ebuild @@ -13,6 +13,7 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="test" +RESTRICT="!test? ( test )" DEPEND="" RDEPEND="${DEPEND}" -- cgit v1.2.3-65-gdbad