diff --git a/src/pkgcheck/checks/codingstyle.py b/src/pkgcheck/checks/codingstyle.py
index 67dbe6c1b..63704e473 100644
--- a/src/pkgcheck/checks/codingstyle.py
+++ b/src/pkgcheck/checks/codingstyle.py
@@ -1572,3 +1572,53 @@ def feed(self, pkg: bash.ParseTree):
if len(args) != 1 or ":" in pkg.node_str(args[0]):
lineno, _ = node.start_point
yield InvalidSandboxCall(line=pkg.node_str(node), lineno=lineno + 1, pkg=pkg)
+
+
+class VariableOrderWrong(results.VersionResult, results.Style):
+ """Variable were defined in an unexpected error."""
+
+ def __init__(self, first_var, second_var, *args, **kwargs):
+ super().__init__(*args, **kwargs)
+ self.first_var = first_var
+ self.second_var = second_var
+
+ @property
+ def desc(self):
+ return f"variable {self.first_var} should occur before {self.second_var}"
+
+
+class VariableOrderCheck(Check):
+ """Scan ebuilds for variables defined in a different order than skel.ebuild dictates."""
+
+ _source = sources.EbuildParseRepoSource
+ known_results = frozenset({VariableOrderWrong})
+
+ # Order from skel.ebuild
+ variable_order = (
+ "DESCRIPTION",
+ "HOMEPAGE",
+ "SRC_URI",
+ "S",
+ "LICENSE",
+ "SLOT",
+ "KEYWORDS",
+ "IUSE",
+ "RESTRICT",
+ )
+
+ def feed(self, pkg: bash.ParseTree):
+ var_assigns = []
+
+ for node in pkg.tree.root_node.children:
+ if node.type == "variable_assignment":
+ used_name = pkg.node_str(node.child_by_field_name("name"))
+ if used_name in self.variable_order:
+ var_assigns.append(used_name)
+
+ index = 0
+ for first_var in var_assigns:
+ if first_var in self.variable_order:
+ new_index = self.variable_order.index(first_var)
+ if new_index < index:
+ yield VariableOrderWrong(first_var, self.variable_order[index], pkg=pkg)
+ index = new_index
diff --git a/testdata/data/repos/eclass/EclassUsageCheck/DeprecatedEclass/fix.patch b/testdata/data/repos/eclass/EclassUsageCheck/DeprecatedEclass/fix.patch
index 8ec4ec4de..f6935a1ab 100644
--- a/testdata/data/repos/eclass/EclassUsageCheck/DeprecatedEclass/fix.patch
+++ b/testdata/data/repos/eclass/EclassUsageCheck/DeprecatedEclass/fix.patch
@@ -6,8 +6,8 @@ diff -Naur eclass/EclassUsageCheck/DeprecatedEclass/DeprecatedEclass-0.ebuild fi
-inherit deprecated
DESCRIPTION="Ebuild with deprecated eclass usage"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
-
-src_prepare() {
- deprecated_public_func
@@ -21,8 +21,8 @@ diff -Naur eclass/EclassUsageCheck/DeprecatedEclass/DeprecatedEclass-1.ebuild fi
+inherit replacement
DESCRIPTION="Ebuild with deprecated eclass usage"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
src_prepare() {
- deprecated2_public_func
diff --git a/testdata/data/repos/gentoo/UnstableOnlyCheck/UnstableOnly/fix.patch b/testdata/data/repos/gentoo/UnstableOnlyCheck/UnstableOnly/fix.patch
index 3fb192ea5..c63781112 100644
--- a/testdata/data/repos/gentoo/UnstableOnlyCheck/UnstableOnly/fix.patch
+++ b/testdata/data/repos/gentoo/UnstableOnlyCheck/UnstableOnly/fix.patch
@@ -3,7 +3,7 @@ diff -Naur gentoo/UnstableOnlyCheck/UnstableOnly/UnstableOnly-0.ebuild fixed/Uns
+++ fixed/UnstableOnlyCheck/UnstableOnly/UnstableOnly-0.ebuild 2019-11-27 14:14:14.889324176 -0700
@@ -5,4 +5,4 @@
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
diff --git a/testdata/data/repos/gentoo/UseFlagsWithoutEffectsCheck/UseFlagWithoutDeps/fix.patch b/testdata/data/repos/gentoo/UseFlagsWithoutEffectsCheck/UseFlagWithoutDeps/fix.patch
index 2849dfe29..59306fb11 100644
--- a/testdata/data/repos/gentoo/UseFlagsWithoutEffectsCheck/UseFlagWithoutDeps/fix.patch
+++ b/testdata/data/repos/gentoo/UseFlagsWithoutEffectsCheck/UseFlagWithoutDeps/fix.patch
@@ -2,8 +2,8 @@
+++ fixed/UseFlagsWithoutEffectsCheck/UseFlagWithoutDeps/UseFlagWithoutDeps-2.ebuild
@@ -8,8 +8,8 @@ HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
-IUSE="bash-completion ipv6"
+IUSE="ipv6"
diff --git a/testdata/data/repos/standalone/BadCommandsCheck/BannedEapiCommand/fix.patch b/testdata/data/repos/standalone/BadCommandsCheck/BannedEapiCommand/fix.patch
index 5ff1a880c..84f16a60a 100644
--- a/testdata/data/repos/standalone/BadCommandsCheck/BannedEapiCommand/fix.patch
+++ b/testdata/data/repos/standalone/BadCommandsCheck/BannedEapiCommand/fix.patch
@@ -2,7 +2,7 @@ diff -Naur standalone/BadCommandsCheck/BannedEapiCommand/BannedEapiCommand-0.ebu
--- standalone/BadCommandsCheck/BannedEapiCommand/BannedEapiCommand-0.ebuild
+++ fixed/BadCommandsCheck/BannedEapiCommand/BannedEapiCommand-0.ebuild
@@ -6,5 +6,6 @@
- LICENSE="BSD"
+ SLOT="0"
src_install() {
- dohtml doc/*
@@ -14,7 +14,7 @@ diff -Naur standalone/BadCommandsCheck/BannedEapiCommand/BannedEapiCommand-1.ebu
--- standalone/BadCommandsCheck/BannedEapiCommand/BannedEapiCommand-1.ebuild
+++ fixed/BadCommandsCheck/BannedEapiCommand/BannedEapiCommand-1.ebuild
@@ -6,8 +6,8 @@ SLOT="0"
- LICENSE="BSD"
+ SLOT="0"
src_install() {
- if has_version --host-root stub/stub1; then
@@ -30,7 +30,7 @@ diff -Naur standalone/BadCommandsCheck/BannedEapiCommand/BannedEapiCommand-2.ebu
@@ -4,11 +4,3 @@ DESCRIPTION="Ebuild using banned commands"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
SLOT="0"
- LICENSE="BSD"
+ SLOT="0"
-
-pkg_preinst() {
- usermod -s /bin/bash uucp || die
diff --git a/testdata/data/repos/standalone/BadCommandsCheck/DeprecatedEapiCommand/fix.patch b/testdata/data/repos/standalone/BadCommandsCheck/DeprecatedEapiCommand/fix.patch
index 894f69c53..57966765a 100644
--- a/testdata/data/repos/standalone/BadCommandsCheck/DeprecatedEapiCommand/fix.patch
+++ b/testdata/data/repos/standalone/BadCommandsCheck/DeprecatedEapiCommand/fix.patch
@@ -2,7 +2,7 @@ diff -Naur standalone/BadCommandsCheck/DeprecatedEapiCommand/DeprecatedEapiComma
--- standalone/BadCommandsCheck/DeprecatedEapiCommand/DeprecatedEapiCommand-0.ebuild 2019-10-01 15:50:01.517881845 -0600
+++ fixed/BadCommandsCheck/DeprecatedEapiCommand/DeprecatedEapiCommand-0.ebuild 2019-10-01 15:51:40.877292175 -0600
@@ -6,5 +6,6 @@
- LICENSE="BSD"
+ SLOT="0"
src_install() {
- dohtml doc/*
diff --git a/testdata/data/repos/standalone/DeclarationShadowedCheck/VariableShadowed/fix.patch b/testdata/data/repos/standalone/DeclarationShadowedCheck/VariableShadowed/fix.patch
index 2c184ed91..8c56bb2ba 100644
--- a/testdata/data/repos/standalone/DeclarationShadowedCheck/VariableShadowed/fix.patch
+++ b/testdata/data/repos/standalone/DeclarationShadowedCheck/VariableShadowed/fix.patch
@@ -2,13 +2,13 @@ diff -Naur standalone/DeclarationShadowedCheck/VariableShadowed/VariableShadowed
--- standalone/DeclarationShadowedCheck/VariableShadowed/VariableShadowed-0.ebuild
+++ fixed/DeclarationShadowedCheck/VariableShadowed/VariableShadowed-0.ebuild
@@ -2,15 +2,12 @@ HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- DESCRIPTION="ebuild with shadowed variables"
+ HOMEPAGE="https://github.com/pkgcore/pkgcheck"
S=${WORKDIR}
-VAL=
-
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
-RESTRICT="!test? ( test )"
+RESTRICT="test"
diff --git a/testdata/data/repos/standalone/DependencyCheck/BadDependency/fix.patch b/testdata/data/repos/standalone/DependencyCheck/BadDependency/fix.patch
index 488c9797f..6fb382fe8 100644
--- a/testdata/data/repos/standalone/DependencyCheck/BadDependency/fix.patch
+++ b/testdata/data/repos/standalone/DependencyCheck/BadDependency/fix.patch
@@ -2,8 +2,8 @@ diff -Naur standalone/DependencyCheck/BadDependency/BadDependency-0.ebuild fixed
--- standalone/DependencyCheck/BadDependency/BadDependency-0.ebuild 2019-09-17 10:51:41.687925138 -0600
+++ fixed/DependencyCheck/BadDependency/BadDependency-0.ebuild 2019-09-17 10:52:16.737103819 -0600
@@ -4,7 +4,6 @@
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
DEPEND="
- !DependencyCheck/BadDependency
- || ( stub/stub1:= stub/stub2:= )
diff --git a/testdata/data/repos/standalone/DependencyCheck/InvalidBdepend/fix.patch b/testdata/data/repos/standalone/DependencyCheck/InvalidBdepend/fix.patch
index 226c60833..c30c52acd 100644
--- a/testdata/data/repos/standalone/DependencyCheck/InvalidBdepend/fix.patch
+++ b/testdata/data/repos/standalone/DependencyCheck/InvalidBdepend/fix.patch
@@ -3,7 +3,7 @@ diff -Naur standalone/DependencyCheck/InvalidBdepend/InvalidBdepend-0.ebuild fix
+++ fixed/DependencyCheck/InvalidBdepend/InvalidBdepend-0.ebuild 2019-11-23 21:20:25.987054123 -0700
@@ -3,4 +3,4 @@
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
-BDEPEND="stub1"
+BDEPEND="stub/stub1"
diff --git a/testdata/data/repos/standalone/DependencyCheck/InvalidDepend/fix.patch b/testdata/data/repos/standalone/DependencyCheck/InvalidDepend/fix.patch
index e0592e6b1..77340051f 100644
--- a/testdata/data/repos/standalone/DependencyCheck/InvalidDepend/fix.patch
+++ b/testdata/data/repos/standalone/DependencyCheck/InvalidDepend/fix.patch
@@ -3,7 +3,7 @@ diff -Naur standalone/DependencyCheck/InvalidDepend/InvalidDepend-0.ebuild fixed
+++ fixed/DependencyCheck/InvalidDepend/InvalidDepend-0.ebuild 2019-11-23 21:20:54.450177796 -0700
@@ -3,4 +3,4 @@
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
-DEPEND="stub1"
+DEPEND="stub/stub1"
diff --git a/testdata/data/repos/standalone/DependencyCheck/InvalidPdepend/fix.patch b/testdata/data/repos/standalone/DependencyCheck/InvalidPdepend/fix.patch
index 208d25041..bdb72ca6c 100644
--- a/testdata/data/repos/standalone/DependencyCheck/InvalidPdepend/fix.patch
+++ b/testdata/data/repos/standalone/DependencyCheck/InvalidPdepend/fix.patch
@@ -3,7 +3,7 @@ diff -Naur standalone/DependencyCheck/InvalidPdepend/InvalidPdepend-0.ebuild fix
+++ fixed/DependencyCheck/InvalidPdepend/InvalidPdepend-0.ebuild 2019-11-23 21:21:15.924271099 -0700
@@ -3,4 +3,4 @@
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
-PDEPEND="stub1"
+PDEPEND="stub/stub1"
diff --git a/testdata/data/repos/standalone/DependencyCheck/InvalidRdepend/fix.patch b/testdata/data/repos/standalone/DependencyCheck/InvalidRdepend/fix.patch
index dc16a9506..e32b811b1 100644
--- a/testdata/data/repos/standalone/DependencyCheck/InvalidRdepend/fix.patch
+++ b/testdata/data/repos/standalone/DependencyCheck/InvalidRdepend/fix.patch
@@ -3,7 +3,7 @@ diff -Naur standalone/DependencyCheck/InvalidRdepend/InvalidRdepend-0.ebuild fix
+++ fixed/DependencyCheck/InvalidRdepend/InvalidRdepend-0.ebuild 2019-11-23 21:21:39.973375585 -0700
@@ -3,4 +3,4 @@
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
-RDEPEND="stub1"
+RDEPEND="stub/stub1"
diff --git a/testdata/data/repos/standalone/DependencyCheck/MisplacedWeakBlocker/fix.patch b/testdata/data/repos/standalone/DependencyCheck/MisplacedWeakBlocker/fix.patch
index c7383f0ad..3d74cb601 100644
--- a/testdata/data/repos/standalone/DependencyCheck/MisplacedWeakBlocker/fix.patch
+++ b/testdata/data/repos/standalone/DependencyCheck/MisplacedWeakBlocker/fix.patch
@@ -1,7 +1,7 @@
--- standalone/DependencyCheck/MisplacedWeakBlocker/MisplacedWeakBlocker-6.ebuild
+++ fixed/DependencyCheck/MisplacedWeakBlocker/MisplacedWeakBlocker-6.ebuild
@@ -6,7 +6,7 @@ SLOT="0"
- LICENSE="BSD"
+ SLOT="0"
BDEPEND="!DependencyCheck/InvalidRdepend"
-DEPEND="!DependencyCheck/BadDependency"
@@ -13,8 +13,8 @@
--- standalone/DependencyCheck/MisplacedWeakBlocker/MisplacedWeakBlocker-7.ebuild
+++ fixed/DependencyCheck/MisplacedWeakBlocker/MisplacedWeakBlocker-7.ebuild
@@ -5,8 +5,8 @@ HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
-BDEPEND="!DependencyCheck/InvalidRdepend"
-DEPEND="!DependencyCheck/InvalidRdepend"
@@ -27,8 +27,8 @@
--- standalone/DependencyCheck/MisplacedWeakBlocker/MisplacedWeakBlocker-8.ebuild
+++ fixed/DependencyCheck/MisplacedWeakBlocker/MisplacedWeakBlocker-8.ebuild
@@ -5,8 +5,8 @@ HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
-BDEPEND="!DependencyCheck/InvalidRdepend"
-DEPEND="!DependencyCheck/InvalidRdepend"
@@ -38,3 +38,4 @@
-PDEPEND="!DependencyCheck/BadDependency"
+PDEPEND="!!DependencyCheck/BadDependency"
IDEPEND="!DependencyCheck/BadDependency"
+
\ No newline at end of file
diff --git a/testdata/data/repos/standalone/DependencyCheck/MissingPackageRevision/fix.patch b/testdata/data/repos/standalone/DependencyCheck/MissingPackageRevision/fix.patch
index d7d86ab21..2a745c6b2 100644
--- a/testdata/data/repos/standalone/DependencyCheck/MissingPackageRevision/fix.patch
+++ b/testdata/data/repos/standalone/DependencyCheck/MissingPackageRevision/fix.patch
@@ -3,7 +3,7 @@ diff -Naur standalone/DependencyCheck/MissingPackageRevision/MissingPackageRevis
+++ fixed/DependencyCheck/MissingPackageRevision/MissingPackageRevision-0.ebuild 2019-09-17 11:01:44.129474002 -0600
@@ -2,4 +2,4 @@
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
-RDEPEND="=stub/stub1-0"
+RDEPEND="=stub/stub1-0-r0"
diff --git a/testdata/data/repos/standalone/DependencyCheck/MissingUseDepDefault/fix.patch b/testdata/data/repos/standalone/DependencyCheck/MissingUseDepDefault/fix.patch
index c1cd37503..c3949776f 100644
--- a/testdata/data/repos/standalone/DependencyCheck/MissingUseDepDefault/fix.patch
+++ b/testdata/data/repos/standalone/DependencyCheck/MissingUseDepDefault/fix.patch
@@ -2,8 +2,8 @@ diff -Naur standalone/DependencyCheck/MissingUseDepDefault/MissingUseDepDefault-
--- standalone/DependencyCheck/MissingUseDepDefault/MissingUseDepDefault-0.ebuild 2019-12-02 21:50:34.617257001 -0700
+++ fixed/DependencyCheck/MissingUseDepDefault/MissingUseDepDefault-0.ebuild 2019-12-02 21:52:56.547749364 -0700
@@ -4,7 +4,7 @@
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
IUSE="foo"
-DEPEND="stub/stub1[foo]"
-RDEPEND="|| ( stub/stub2[used] stub/stub2[-foo] )"
diff --git a/testdata/data/repos/standalone/DependencyCheck/UnstatedIuse/fix.patch b/testdata/data/repos/standalone/DependencyCheck/UnstatedIuse/fix.patch
index c319c54eb..c0b2a1710 100644
--- a/testdata/data/repos/standalone/DependencyCheck/UnstatedIuse/fix.patch
+++ b/testdata/data/repos/standalone/DependencyCheck/UnstatedIuse/fix.patch
@@ -3,7 +3,7 @@ diff -Naur standalone/DependencyCheck/UnstatedIuse/UnstatedIuse-0.ebuild fixed/D
+++ fixed/DependencyCheck/UnstatedIuse/UnstatedIuse-0.ebuild 2019-09-17 11:00:18.196116334 -0600
@@ -2,4 +2,5 @@
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
+IUSE="used"
RDEPEND="used? ( stub/stub1 )"
diff --git a/testdata/data/repos/standalone/DescriptionCheck/BadDescription/fix.patch b/testdata/data/repos/standalone/DescriptionCheck/BadDescription/fix.patch
index b67a84aef..9500e2b12 100644
--- a/testdata/data/repos/standalone/DescriptionCheck/BadDescription/fix.patch
+++ b/testdata/data/repos/standalone/DescriptionCheck/BadDescription/fix.patch
@@ -4,8 +4,8 @@ diff -Naur standalone/DescriptionCheck/BadDescription/BadDescription-0.ebuild fi
@@ -1,3 +1,4 @@
+DESCRIPTION="Ebuild with a sane DESCRIPTION"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
diff -Naur standalone/DescriptionCheck/BadDescription/BadDescription-1.ebuild fixed/DescriptionCheck/BadDescription/BadDescription-1.ebuild
--- standalone/DescriptionCheck/BadDescription/BadDescription-1.ebuild 2019-11-28 00:33:38.457040594 -0700
+++ fixed/DescriptionCheck/BadDescription/BadDescription-1.ebuild 2019-11-28 00:34:39.109397112 -0700
@@ -13,8 +13,8 @@ diff -Naur standalone/DescriptionCheck/BadDescription/BadDescription-1.ebuild fi
-DESCRIPTION=""
+DESCRIPTION="Ebuild with a sane DESCRIPTION"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
diff -Naur standalone/DescriptionCheck/BadDescription/BadDescription-2.ebuild fixed/DescriptionCheck/BadDescription/BadDescription-2.ebuild
--- standalone/DescriptionCheck/BadDescription/BadDescription-2.ebuild 2019-11-28 00:33:38.457040594 -0700
+++ fixed/DescriptionCheck/BadDescription/BadDescription-2.ebuild 2019-11-28 00:34:47.788448129 -0700
@@ -22,8 +22,8 @@ diff -Naur standalone/DescriptionCheck/BadDescription/BadDescription-2.ebuild fi
-DESCRIPTION="bad desc"
+DESCRIPTION="Ebuild with a sane DESCRIPTION"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
diff -Naur standalone/DescriptionCheck/BadDescription/BadDescription-3.ebuild fixed/DescriptionCheck/BadDescription/BadDescription-3.ebuild
--- standalone/DescriptionCheck/BadDescription/BadDescription-3.ebuild 2019-11-28 00:33:38.457040594 -0700
+++ fixed/DescriptionCheck/BadDescription/BadDescription-3.ebuild 2019-11-28 00:34:53.796483445 -0700
@@ -31,8 +31,8 @@ diff -Naur standalone/DescriptionCheck/BadDescription/BadDescription-3.ebuild fi
-DESCRIPTION="BadDescription"
+DESCRIPTION="Ebuild with a sane DESCRIPTION"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
diff -Naur standalone/DescriptionCheck/BadDescription/BadDescription-4.ebuild fixed/DescriptionCheck/BadDescription/BadDescription-4.ebuild
--- standalone/DescriptionCheck/BadDescription/BadDescription-4.ebuild 2019-11-28 00:33:38.457040594 -0700
+++ fixed/DescriptionCheck/BadDescription/BadDescription-4.ebuild 2019-11-28 00:34:59.065514420 -0700
@@ -40,5 +40,5 @@ diff -Naur standalone/DescriptionCheck/BadDescription/BadDescription-4.ebuild fi
-DESCRIPTION="Ebuild with DESCRIPTION that is far too long and will be flagged by the BadDescription result since the check triggers at greater than 150 characters long."
+DESCRIPTION="Ebuild with a sane DESCRIPTION"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
diff --git a/testdata/data/repos/standalone/DroppedKeywordsCheck/DroppedKeywords/fix.patch b/testdata/data/repos/standalone/DroppedKeywordsCheck/DroppedKeywords/fix.patch
index 36c273242..00e612b70 100644
--- a/testdata/data/repos/standalone/DroppedKeywordsCheck/DroppedKeywords/fix.patch
+++ b/testdata/data/repos/standalone/DroppedKeywordsCheck/DroppedKeywords/fix.patch
@@ -4,15 +4,15 @@ diff -Naur standalone/DroppedKeywordsCheck/DroppedKeywords/DroppedKeywords-0.ebu
@@ -1,5 +0,0 @@
-DESCRIPTION="Ebuild with dropped keywords"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
--SLOT="0"
-LICENSE="BSD"
+-SLOT="0"
-KEYWORDS="~amd64 ~x86"
diff -Naur standalone/DroppedKeywordsCheck/DroppedKeywords/DroppedKeywords-1.ebuild fixed/DroppedKeywordsCheck/DroppedKeywords/DroppedKeywords-1.ebuild
--- standalone/DroppedKeywordsCheck/DroppedKeywords/DroppedKeywords-1.ebuild 2019-10-09 06:27:06.151870892 -0600
+++ fixed/DroppedKeywordsCheck/DroppedKeywords/DroppedKeywords-1.ebuild 2019-10-09 06:27:27.411971799 -0600
@@ -2,4 +2,4 @@
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
diff --git a/testdata/data/repos/standalone/EbuildReservedCheck/EbuildReservedName/fix.patch b/testdata/data/repos/standalone/EbuildReservedCheck/EbuildReservedName/fix.patch
index 3ce2b36ae..10b190559 100644
--- a/testdata/data/repos/standalone/EbuildReservedCheck/EbuildReservedName/fix.patch
+++ b/testdata/data/repos/standalone/EbuildReservedCheck/EbuildReservedName/fix.patch
@@ -2,8 +2,8 @@ diff -Naur standalone/EbuildReservedCheck/EbuildReservedName/EbuildReservedName-
--- standalone/EbuildReservedCheck/EbuildReservedName/EbuildReservedName-0.ebuild
+++ fixed/EbuildReservedCheck/EbuildReservedName/EbuildReservedName-0.ebuild
@@ -3,20 +3,19 @@ HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
-prepare_locale() {
- DYNAMIC_DEPS="2"
diff --git a/testdata/data/repos/standalone/EbuildReservedCheck/EbuildSemiReservedName/expected.json b/testdata/data/repos/standalone/EbuildReservedCheck/EbuildSemiReservedName/expected.json
index c5916b534..1e1aa53e8 100644
--- a/testdata/data/repos/standalone/EbuildReservedCheck/EbuildSemiReservedName/expected.json
+++ b/testdata/data/repos/standalone/EbuildReservedCheck/EbuildSemiReservedName/expected.json
@@ -1,5 +1,5 @@
{"__class__": "EbuildSemiReservedName", "category": "DependencyCheck", "package": "MisplacedWeakBlocker", "version": "6", "line": "BDEPEND", "lineno": 8, "used_type": "variable"}
{"__class__": "EbuildSemiReservedName", "category": "DependencyCheck", "package": "MisplacedWeakBlocker", "version": "6", "line": "IDEPEND", "lineno": 12, "used_type": "variable"}
{"__class__": "EbuildSemiReservedName", "category": "DependencyCheck", "package": "MisplacedWeakBlocker", "version": "7", "line": "IDEPEND", "lineno": 12, "used_type": "variable"}
-{"__class__": "EbuildSemiReservedName", "category": "EbuildReservedCheck", "package": "EbuildSemiReservedName", "version": "0", "line": "B", "lineno": 9, "used_type": "variable"}
-{"__class__": "EbuildSemiReservedName", "category": "EbuildReservedCheck", "package": "EbuildSemiReservedName", "version": "0", "line": "TDEPEND", "lineno": 13, "used_type": "variable"}
+{"__class__": "EbuildSemiReservedName", "category": "EbuildReservedCheck", "package": "EbuildSemiReservedName", "version": "0", "line": "B", "lineno": 7, "used_type": "variable"}
+{"__class__": "EbuildSemiReservedName", "category": "EbuildReservedCheck", "package": "EbuildSemiReservedName", "version": "0", "line": "TDEPEND", "lineno": 15, "used_type": "variable"}
diff --git a/testdata/data/repos/standalone/EbuildUnquotedVariablesCheck/EbuildUnquotedVariable/expected.json b/testdata/data/repos/standalone/EbuildUnquotedVariablesCheck/EbuildUnquotedVariable/expected.json
index 5f4daa158..058841f2a 100644
--- a/testdata/data/repos/standalone/EbuildUnquotedVariablesCheck/EbuildUnquotedVariable/expected.json
+++ b/testdata/data/repos/standalone/EbuildUnquotedVariablesCheck/EbuildUnquotedVariable/expected.json
@@ -1,3 +1,3 @@
-{"__class__": "EbuildUnquotedVariable", "category": "EbuildUnquotedVariablesCheck", "package": "EbuildUnquotedVariable", "version": "0", "variable": "FILESDIR", "lines": [10, 20]}
-{"__class__": "EbuildUnquotedVariable", "category": "EbuildUnquotedVariablesCheck", "package": "EbuildUnquotedVariable", "version": "0", "variable": "T", "lines": [26, 28, 42, 43]}
-{"__class__": "EbuildUnquotedVariable", "category": "EbuildUnquotedVariablesCheck", "package": "EbuildUnquotedVariable", "version": "0", "variable": "WORKDIR", "lines": [35]}
+{"__class__": "EbuildUnquotedVariable", "category": "EbuildUnquotedVariablesCheck", "package": "EbuildUnquotedVariable", "version": "0", "variable": "FILESDIR", "lines": [12, 22]}
+{"__class__": "EbuildUnquotedVariable", "category": "EbuildUnquotedVariablesCheck", "package": "EbuildUnquotedVariable", "version": "0", "variable": "T", "lines": [28, 30, 44, 45]}
+{"__class__": "EbuildUnquotedVariable", "category": "EbuildUnquotedVariablesCheck", "package": "EbuildUnquotedVariable", "version": "0", "variable": "WORKDIR", "lines": [37]}
diff --git a/testdata/data/repos/standalone/EbuildUnquotedVariablesCheck/EbuildUnquotedVariable/fix.patch b/testdata/data/repos/standalone/EbuildUnquotedVariablesCheck/EbuildUnquotedVariable/fix.patch
index 768a77a50..943b49263 100644
--- a/testdata/data/repos/standalone/EbuildUnquotedVariablesCheck/EbuildUnquotedVariable/fix.patch
+++ b/testdata/data/repos/standalone/EbuildUnquotedVariablesCheck/EbuildUnquotedVariable/fix.patch
@@ -1,7 +1,7 @@
--- standalone/EbuildUnquotedVariablesCheck/EbuildUnquotedVariable/EbuildUnquotedVariable-0.ebuild 2022-05-18 20:27:34.657647175 +0200
+++ fixed/EbuildUnquotedVariablesCheck/EbuildUnquotedVariable/EbuildUnquotedVariable-0.ebuild 2022-05-18 20:50:00.271294657 +0200
-@@ -7,7 +7,7 @@
- S=${WORKDIR}/${PV} # ok
+@@ -9,7 +9,7 @@
+ SLOT="0"
PATCHES=(
- ${FILESDIR}/foo.patch # FAIL
diff --git a/testdata/data/repos/standalone/EclassManualDepsCheck/RubyMissingDeps/fix.patch b/testdata/data/repos/standalone/EclassManualDepsCheck/RubyMissingDeps/fix.patch
index 40c816d37..e6efe5b67 100644
--- a/testdata/data/repos/standalone/EclassManualDepsCheck/RubyMissingDeps/fix.patch
+++ b/testdata/data/repos/standalone/EclassManualDepsCheck/RubyMissingDeps/fix.patch
@@ -3,7 +3,7 @@ diff -Naur standalone/EclassManualDepsCheck/RubyMissingDeps/RubyMissingDeps-1.eb
+++ fixed/EclassManualDepsCheck/RubyMissingDeps/RubyMissingDeps-1.ebuild
@@ -6,3 +6,5 @@ DESCRIPTION="Optional inherit without dep"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
+
+DEPEND="virtual/rubygems"
diff --git a/testdata/data/repos/standalone/EclassManualDepsCheck/RustMissingDeps/fix.patch b/testdata/data/repos/standalone/EclassManualDepsCheck/RustMissingDeps/fix.patch
index a62eb390d..08394782e 100644
--- a/testdata/data/repos/standalone/EclassManualDepsCheck/RustMissingDeps/fix.patch
+++ b/testdata/data/repos/standalone/EclassManualDepsCheck/RustMissingDeps/fix.patch
@@ -3,7 +3,7 @@ diff -Naur standalone/EclassManualDepsCheck/RustMissingDeps/RustMissingDeps-1.eb
+++ fixed/EclassManualDepsCheck/RustMissingDeps/RustMissingDeps-1.ebuild
@@ -8,3 +8,5 @@ DESCRIPTION="Optional inherit without deps"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
+
+BDEPEND="virtual/rust"
diff --git a/testdata/data/repos/standalone/EqualVersionsCheck/EqualVersions/fix.patch b/testdata/data/repos/standalone/EqualVersionsCheck/EqualVersions/fix.patch
index 9e6588417..a4741601d 100644
--- a/testdata/data/repos/standalone/EqualVersionsCheck/EqualVersions/fix.patch
+++ b/testdata/data/repos/standalone/EqualVersionsCheck/EqualVersions/fix.patch
@@ -4,13 +4,13 @@ diff -Naur standalone/EqualVersionsCheck/EqualVersions/EqualVersions-0-r0.ebuild
@@ -1,4 +0,0 @@
-DESCRIPTION="Ebuilds that have equal versions"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
--SLOT="0"
-LICENSE="BSD"
+-SLOT="0"
diff -Naur standalone/EqualVersionsCheck/EqualVersions/EqualVersions-0-r01.ebuild fixed/EqualVersionsCheck/EqualVersions/EqualVersions-0-r01.ebuild
--- standalone/EqualVersionsCheck/EqualVersions/EqualVersions-0-r01.ebuild 2019-08-20 18:54:59.099260828 -0600
+++ fixed/EqualVersionsCheck/EqualVersions/EqualVersions-0-r01.ebuild 1969-12-31 17:00:00.000000000 -0700
@@ -1,4 +0,0 @@
-DESCRIPTION="Ebuilds that have equal versions"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
--SLOT="0"
-LICENSE="BSD"
+-SLOT="0"
diff --git a/testdata/data/repos/standalone/HomepageCheck/BadHomepage/fix.patch b/testdata/data/repos/standalone/HomepageCheck/BadHomepage/fix.patch
index 9dc14faa2..1d048cbd5 100644
--- a/testdata/data/repos/standalone/HomepageCheck/BadHomepage/fix.patch
+++ b/testdata/data/repos/standalone/HomepageCheck/BadHomepage/fix.patch
@@ -4,8 +4,8 @@ diff -Naur standalone/HomepageCheck/BadHomepage/BadHomepage-0.ebuild fixed/Homep
@@ -1,3 +1,4 @@
DESCRIPTION="Ebuild with missing HOMEPAGE"
+HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
diff -Naur standalone/HomepageCheck/BadHomepage/BadHomepage-1.ebuild fixed/HomepageCheck/BadHomepage/BadHomepage-1.ebuild
--- standalone/HomepageCheck/BadHomepage/BadHomepage-1.ebuild 2019-11-19 01:36:57.401383105 -0700
+++ fixed/HomepageCheck/BadHomepage/BadHomepage-1.ebuild 2019-11-20 02:35:16.031740120 -0700
@@ -13,8 +13,8 @@ diff -Naur standalone/HomepageCheck/BadHomepage/BadHomepage-1.ebuild fixed/Homep
DESCRIPTION="Ebuild HOMEPAGE with missing protocol"
-HOMEPAGE="github.com/pkgcore/pkgcheck"
+HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
diff -Naur standalone/HomepageCheck/BadHomepage/BadHomepage-2.ebuild fixed/HomepageCheck/BadHomepage/BadHomepage-2.ebuild
--- standalone/HomepageCheck/BadHomepage/BadHomepage-2.ebuild 2019-11-19 01:36:57.401383105 -0700
+++ fixed/HomepageCheck/BadHomepage/BadHomepage-2.ebuild 2019-11-20 02:35:16.032740124 -0700
@@ -22,8 +22,8 @@ diff -Naur standalone/HomepageCheck/BadHomepage/BadHomepage-2.ebuild fixed/Homep
DESCRIPTION="Ebuild HOMEPAGE with unsupported protocol"
-HOMEPAGE="gopher://github.com/pkgcore/pkgcheck"
+HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
diff -Naur standalone/HomepageCheck/BadHomepage/BadHomepage-3.ebuild fixed/HomepageCheck/BadHomepage/BadHomepage-3.ebuild
--- standalone/HomepageCheck/BadHomepage/BadHomepage-3.ebuild 2019-11-20 02:34:43.541618896 -0700
+++ fixed/HomepageCheck/BadHomepage/BadHomepage-3.ebuild 2019-11-20 02:35:36.691817189 -0700
@@ -31,5 +31,5 @@ diff -Naur standalone/HomepageCheck/BadHomepage/BadHomepage-3.ebuild fixed/Homep
DESCRIPTION="Ebuild uses unspecific HOMEPAGE"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
diff --git a/testdata/data/repos/standalone/IuseCheck/InvalidUseFlags/fix.patch b/testdata/data/repos/standalone/IuseCheck/InvalidUseFlags/fix.patch
index a05b05ff6..e452e92f6 100644
--- a/testdata/data/repos/standalone/IuseCheck/InvalidUseFlags/fix.patch
+++ b/testdata/data/repos/standalone/IuseCheck/InvalidUseFlags/fix.patch
@@ -3,8 +3,8 @@ diff -Naur standalone/IuseCheck/InvalidUseFlags/InvalidUseFlags-0.ebuild fixed/I
+++ fixed/IuseCheck/InvalidUseFlags/InvalidUseFlags-0.ebuild 2021-05-24 04:26:29.092543549 -0600
@@ -2,4 +2,4 @@
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
-IUSE="used +flag1 -flag2 + -"
+IUSE="used flag1 flag2"
diff -Naur standalone/IuseCheck/InvalidUseFlags/InvalidUseFlags-4.ebuild fixed/IuseCheck/InvalidUseFlags/InvalidUseFlags-4.ebuild
@@ -12,7 +12,7 @@ diff -Naur standalone/IuseCheck/InvalidUseFlags/InvalidUseFlags-4.ebuild fixed/I
+++ fixed/IuseCheck/InvalidUseFlags/InvalidUseFlags-4.ebuild 2021-05-24 04:26:36.519704480 -0600
@@ -4,4 +4,4 @@
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
-IUSE="used +flag1 +flag2 + -"
+IUSE="used +flag1 +flag2"
diff --git a/testdata/data/repos/standalone/IuseCheck/UnknownUseFlags/fix.patch b/testdata/data/repos/standalone/IuseCheck/UnknownUseFlags/fix.patch
index ebac0b50c..c3b73a10f 100644
--- a/testdata/data/repos/standalone/IuseCheck/UnknownUseFlags/fix.patch
+++ b/testdata/data/repos/standalone/IuseCheck/UnknownUseFlags/fix.patch
@@ -13,7 +13,7 @@ diff -Naur standalone/IuseCheck/UnknownUseFlags/UnknownUseFlags-0.ebuild fixed/I
+++ fixed/IuseCheck/UnknownUseFlags/UnknownUseFlags-0.ebuild 2021-05-24 04:22:44.096668337 -0600
@@ -4,4 +4,4 @@
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
-IUSE="amd64 used flag1 +flag2 +flag3"
+IUSE="used flag1 +flag2 +flag3"
diff --git a/testdata/data/repos/standalone/KeywordsCheck/BadKeywords/fix.patch b/testdata/data/repos/standalone/KeywordsCheck/BadKeywords/fix.patch
index 79eb3e8ab..74e4fa405 100644
--- a/testdata/data/repos/standalone/KeywordsCheck/BadKeywords/fix.patch
+++ b/testdata/data/repos/standalone/KeywordsCheck/BadKeywords/fix.patch
@@ -3,6 +3,6 @@ diff -Naur standalone/KeywordsCheck/BadKeywords/BadKeywords-0.ebuild fixed/Keywo
+++ fixed/KeywordsCheck/BadKeywords/BadKeywords-0.ebuild 2019-11-22 22:52:08.321813744 -0700
@@ -2,4 +2,3 @@
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
-KEYWORDS="-*"
diff --git a/testdata/data/repos/standalone/KeywordsCheck/DuplicateKeywords/fix.patch b/testdata/data/repos/standalone/KeywordsCheck/DuplicateKeywords/fix.patch
index b7160bbcd..f7960d9c6 100644
--- a/testdata/data/repos/standalone/KeywordsCheck/DuplicateKeywords/fix.patch
+++ b/testdata/data/repos/standalone/KeywordsCheck/DuplicateKeywords/fix.patch
@@ -3,7 +3,7 @@ diff -Naur standalone/KeywordsCheck/DuplicateKeywords/DuplicateKeywords-0.ebuild
+++ fixed/KeywordsCheck/DuplicateKeywords/DuplicateKeywords-0.ebuild 2019-08-24 22:19:39.517063654 -0600
@@ -2,4 +2,4 @@
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
-KEYWORDS="~amd64 ~amd64"
+KEYWORDS="~amd64"
diff --git a/testdata/data/repos/standalone/KeywordsCheck/OverlappingKeywords/fix.patch b/testdata/data/repos/standalone/KeywordsCheck/OverlappingKeywords/fix.patch
index 1ddd357d3..acee9abe5 100644
--- a/testdata/data/repos/standalone/KeywordsCheck/OverlappingKeywords/fix.patch
+++ b/testdata/data/repos/standalone/KeywordsCheck/OverlappingKeywords/fix.patch
@@ -3,7 +3,7 @@ diff -Naur standalone/KeywordsCheck/OverlappingKeywords/OverlappingKeywords-0.eb
+++ fixed/KeywordsCheck/OverlappingKeywords/OverlappingKeywords-0.ebuild 2019-08-24 22:18:35.615601787 -0600
@@ -2,4 +2,4 @@
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
-KEYWORDS="amd64 ~amd64"
+KEYWORDS="amd64"
diff --git a/testdata/data/repos/standalone/KeywordsCheck/UnknownKeywords/fix.patch b/testdata/data/repos/standalone/KeywordsCheck/UnknownKeywords/fix.patch
index f091350c7..6ecc3201a 100644
--- a/testdata/data/repos/standalone/KeywordsCheck/UnknownKeywords/fix.patch
+++ b/testdata/data/repos/standalone/KeywordsCheck/UnknownKeywords/fix.patch
@@ -3,7 +3,7 @@ diff -Naur standalone/KeywordsCheck/UnknownKeywords/UnknownKeywords-0.ebuild fix
+++ fixed/KeywordsCheck/UnknownKeywords/UnknownKeywords-0.ebuild 2019-08-24 21:41:29.197995350 -0600
@@ -2,4 +2,4 @@
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
-KEYWORDS="amd64 unknown"
+KEYWORDS="amd64"
diff --git a/testdata/data/repos/standalone/KeywordsCheck/UnsortedKeywords/fix.patch b/testdata/data/repos/standalone/KeywordsCheck/UnsortedKeywords/fix.patch
index 2235caf81..a843dc083 100644
--- a/testdata/data/repos/standalone/KeywordsCheck/UnsortedKeywords/fix.patch
+++ b/testdata/data/repos/standalone/KeywordsCheck/UnsortedKeywords/fix.patch
@@ -3,7 +3,7 @@ diff -Naur standalone/KeywordsCheck/UnsortedKeywords/UnsortedKeywords-0.ebuild f
+++ fixed/KeywordsCheck/UnsortedKeywords/UnsortedKeywords-0.ebuild 2019-10-08 02:22:09.068381302 -0600
@@ -2,4 +2,4 @@
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
diff --git a/testdata/data/repos/standalone/LicenseCheck/InvalidLicense/fix.patch b/testdata/data/repos/standalone/LicenseCheck/InvalidLicense/fix.patch
index b8033ef6a..a71b857f2 100644
--- a/testdata/data/repos/standalone/LicenseCheck/InvalidLicense/fix.patch
+++ b/testdata/data/repos/standalone/LicenseCheck/InvalidLicense/fix.patch
@@ -4,24 +4,24 @@ diff -Naur standalone/LicenseCheck/InvalidLicense/InvalidLicense-0.ebuild fixed/
@@ -1,4 +1,4 @@
DESCRIPTION="Ebuild with invalid LICENSE"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
-LICENSE="( )"
+LICENSE="BSD"
+ SLOT="0"
diff -Naur standalone/LicenseCheck/InvalidLicense/InvalidLicense-1.ebuild fixed/LicenseCheck/InvalidLicense/InvalidLicense-1.ebuild
--- standalone/LicenseCheck/InvalidLicense/InvalidLicense-1.ebuild 2019-11-23 00:28:02.437681816 -0700
+++ fixed/LicenseCheck/InvalidLicense/InvalidLicense-1.ebuild 2019-11-23 00:30:37.192283283 -0700
@@ -1,4 +1,4 @@
DESCRIPTION="Ebuild with invalid LICENSE"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
-LICENSE="?"
+LICENSE="BSD"
+ SLOT="0"
diff -Naur standalone/LicenseCheck/InvalidLicense/InvalidLicense-2.ebuild fixed/LicenseCheck/InvalidLicense/InvalidLicense-2.ebuild
--- standalone/LicenseCheck/InvalidLicense/InvalidLicense-2.ebuild 2019-11-23 00:29:11.103946140 -0700
+++ fixed/LicenseCheck/InvalidLicense/InvalidLicense-2.ebuild 2019-11-23 00:30:47.739324583 -0700
@@ -2,4 +2,4 @@
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
- IUSE="used"
-LICENSE="used?"
+LICENSE="used? ( BSD )"
+ SLOT="0"
+ IUSE="used"
diff --git a/testdata/data/repos/standalone/LicenseCheck/MissingLicenseRestricts/fix.patch b/testdata/data/repos/standalone/LicenseCheck/MissingLicenseRestricts/fix.patch
index 48408029c..2af636db1 100644
--- a/testdata/data/repos/standalone/LicenseCheck/MissingLicenseRestricts/fix.patch
+++ b/testdata/data/repos/standalone/LicenseCheck/MissingLicenseRestricts/fix.patch
@@ -3,14 +3,14 @@ diff -Naur standalone/LicenseCheck/MissingLicenseRestricts/MissingLicenseRestric
+++ fixed/LicenseCheck/MissingLicenseRestricts/MissingLicenseRestricts-0.ebuild 2020-11-23 16:13:05.534435811 -0700
@@ -2,3 +2,4 @@
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="eula"
+ SLOT="0"
+RESTRICT="bindist"
diff -Naur standalone/LicenseCheck/MissingLicenseRestricts/MissingLicenseRestricts-1.ebuild fixed/LicenseCheck/MissingLicenseRestricts/MissingLicenseRestricts-1.ebuild
--- standalone/LicenseCheck/MissingLicenseRestricts/MissingLicenseRestricts-1.ebuild 2020-11-23 16:08:03.779832055 -0700
+++ fixed/LicenseCheck/MissingLicenseRestricts/MissingLicenseRestricts-1.ebuild 2020-11-23 16:13:14.194625333 -0700
@@ -3,3 +3,4 @@
SRC_URI="https://github.com/pkgcore/pkgcheck/${P}.tar.gz"
- SLOT="0"
LICENSE="eula"
+ SLOT="0"
+RESTRICT="bindist mirror"
diff --git a/testdata/data/repos/standalone/LicenseCheck/UnnecessaryLicense/fix.patch b/testdata/data/repos/standalone/LicenseCheck/UnnecessaryLicense/fix.patch
index 69f223b18..3ed7a4e31 100644
--- a/testdata/data/repos/standalone/LicenseCheck/UnnecessaryLicense/fix.patch
+++ b/testdata/data/repos/standalone/LicenseCheck/UnnecessaryLicense/fix.patch
@@ -3,5 +3,5 @@ diff -Naur standalone/virtual/UnnecessaryLicense/UnnecessaryLicense-0.ebuild fix
+++ fixed/virtual/UnnecessaryLicense/UnnecessaryLicense-0.ebuild 2019-08-21 21:58:31.162854871 -0600
@@ -1,3 +1,2 @@
DESCRIPTION="Ebuild with unnecessary LICENSE"""
- SLOT="0"
-LICENSE="BSD"
+ SLOT="0"
diff --git a/testdata/data/repos/standalone/LicenseCheck/UnstatedIuse/fix.patch b/testdata/data/repos/standalone/LicenseCheck/UnstatedIuse/fix.patch
index 8608b1a27..0bf02f66b 100644
--- a/testdata/data/repos/standalone/LicenseCheck/UnstatedIuse/fix.patch
+++ b/testdata/data/repos/standalone/LicenseCheck/UnstatedIuse/fix.patch
@@ -4,6 +4,6 @@ diff -Naur standalone/LicenseCheck/UnstatedIuse/UnstatedIuse-0.ebuild fixed/Lice
@@ -1,4 +1,5 @@
DESCRIPTION="Ebuild with unstated USE flags in LICENSE"""
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
+IUSE="used"
LICENSE="used? ( BSD )"
+ SLOT="0"
diff --git a/testdata/data/repos/standalone/LocalUseCheck/UnderscoreInUseFlag/fix.patch b/testdata/data/repos/standalone/LocalUseCheck/UnderscoreInUseFlag/fix.patch
index 10fd29544..a8d1e0053 100644
--- a/testdata/data/repos/standalone/LocalUseCheck/UnderscoreInUseFlag/fix.patch
+++ b/testdata/data/repos/standalone/LocalUseCheck/UnderscoreInUseFlag/fix.patch
@@ -14,7 +14,7 @@ diff -Naur standalone/LocalUseCheck/UnderscoreInUseFlag/UnderscoreInUseFlag-0.eb
+++ fixed/LocalUseCheck/UnderscoreInUseFlag/UnderscoreInUseFlag-0.ebuild 2019-09-04 11:07:32.300826502 +0200
@@ -2,4 +2,4 @@
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
-IUSE="foo_bar"
+IUSE="foo-bar"
diff --git a/testdata/data/repos/standalone/ManifestCollisionCheck/ConflictingChksums/fix.patch b/testdata/data/repos/standalone/ManifestCollisionCheck/ConflictingChksums/fix.patch
index 9a1f246d4..5d09bf5fb 100644
--- a/testdata/data/repos/standalone/ManifestCollisionCheck/ConflictingChksums/fix.patch
+++ b/testdata/data/repos/standalone/ManifestCollisionCheck/ConflictingChksums/fix.patch
@@ -7,8 +7,8 @@ diff -Naur standalone/ManifestCollisionCheck/ConflictingChksums/ConflictingChksu
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SRC_URI="https://github.com/pkgcore/pkgcheck/foo.tar.gz"
+SRC_URI="https://github.com/pkgcore/pkgcheck/foo.tar.gz -> ${P}-foo.tar.gz"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
diff -Naur standalone/ManifestCollisionCheck/ConflictingChksums/Manifest fixed/ManifestCollisionCheck/ConflictingChksums/Manifest
--- standalone/ManifestCollisionCheck/ConflictingChksums/Manifest 2019-10-02 01:55:58.600631675 -0600
+++ fixed/ManifestCollisionCheck/ConflictingChksums/Manifest 2019-10-02 01:59:57.189601733 -0600
diff --git a/testdata/data/repos/standalone/ManifestCollisionCheck/MatchingChksums/fix.patch b/testdata/data/repos/standalone/ManifestCollisionCheck/MatchingChksums/fix.patch
index 5b9c08e6b..1f8b1e85a 100644
--- a/testdata/data/repos/standalone/ManifestCollisionCheck/MatchingChksums/fix.patch
+++ b/testdata/data/repos/standalone/ManifestCollisionCheck/MatchingChksums/fix.patch
@@ -12,5 +12,5 @@ diff -Naur standalone/test/MatchingChksums/MatchingChksums-0.ebuild fixed/test/M
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SRC_URI="https://github.com/pkgcore/pkgcheck/foo2.tar.gz"
+SRC_URI="https://github.com/pkgcore/pkgcheck/foo1.tar.gz"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
diff --git a/testdata/data/repos/standalone/MetadataVarCheck/EmptyGlobalAssignment/expected.json b/testdata/data/repos/standalone/MetadataVarCheck/EmptyGlobalAssignment/expected.json
index 2e861fc01..7cab93763 100644
--- a/testdata/data/repos/standalone/MetadataVarCheck/EmptyGlobalAssignment/expected.json
+++ b/testdata/data/repos/standalone/MetadataVarCheck/EmptyGlobalAssignment/expected.json
@@ -1,3 +1,3 @@
{"__class__": "EmptyGlobalAssignment", "category": "DescriptionCheck", "package": "BadDescription", "version": "1", "line": "DESCRIPTION=\"\"", "lineno": 1}
{"__class__": "EmptyGlobalAssignment", "category": "MetadataVarCheck", "package": "MultipleKeywordsLines", "version": "0", "line": "KEYWORDS=\"\"", "lineno": 8}
-{"__class__": "EmptyGlobalAssignment", "category": "MetadataVarCheck", "package": "ReferenceInMetadataVar", "version": "3", "line": "LICENSE=\"\"", "lineno": 5}
+{"__class__": "EmptyGlobalAssignment", "category": "MetadataVarCheck", "package": "ReferenceInMetadataVar", "version": "3", "line": "LICENSE=\"\"", "lineno": 4}
diff --git a/testdata/data/repos/standalone/MetadataVarCheck/HomepageInSrcUri/fix.patch b/testdata/data/repos/standalone/MetadataVarCheck/HomepageInSrcUri/fix.patch
index b0d745c68..673358feb 100644
--- a/testdata/data/repos/standalone/MetadataVarCheck/HomepageInSrcUri/fix.patch
+++ b/testdata/data/repos/standalone/MetadataVarCheck/HomepageInSrcUri/fix.patch
@@ -6,5 +6,5 @@ diff -Naur standalone/MetadataVarCheck/HomepageInSrcUri/HomepageInSrcUri-0.ebuil
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SRC_URI="${HOMEPAGE}/${P}.tar.gz"
+SRC_URI="https://github.com/pkgcore/pkgcheck/${P}.tar.gz"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
diff --git a/testdata/data/repos/standalone/MetadataVarCheck/MultipleKeywordsLines/fix.patch b/testdata/data/repos/standalone/MetadataVarCheck/MultipleKeywordsLines/fix.patch
index 8e7760646..be40e512f 100644
--- a/testdata/data/repos/standalone/MetadataVarCheck/MultipleKeywordsLines/fix.patch
+++ b/testdata/data/repos/standalone/MetadataVarCheck/MultipleKeywordsLines/fix.patch
@@ -14,8 +14,8 @@ diff -Naur standalone/MetadataVarCheck/MultipleKeywordsLines/MultipleKeywordsLin
+++ fixed/MetadataVarCheck/MultipleKeywordsLines/MultipleKeywordsLines-1.ebuild 2021-03-18 16:18:57.268011946 -0600
@@ -2,7 +2,4 @@
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
-KEYWORDS="
-~amd64
-~x86
diff --git a/testdata/data/repos/standalone/MetadataVarCheck/ReferenceInMetadataVar/fix.patch b/testdata/data/repos/standalone/MetadataVarCheck/ReferenceInMetadataVar/fix.patch
index dc5a9702e..dae2ec391 100644
--- a/testdata/data/repos/standalone/MetadataVarCheck/ReferenceInMetadataVar/fix.patch
+++ b/testdata/data/repos/standalone/MetadataVarCheck/ReferenceInMetadataVar/fix.patch
@@ -13,8 +13,8 @@ diff -Naur standalone/MetadataVarCheck/ReferenceInMetadataVar/ReferenceInMetadat
+++ fixed/MetadataVarCheck/ReferenceInMetadataVar/ReferenceInMetadataVar-1.ebuild 2021-03-18 16:09:08.487136344 -0600
@@ -2,5 +2,4 @@
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
-ARCH="~x86"
-KEYWORDS="~amd64 ${ARCH}"
+KEYWORDS="~amd64 ~x86"
@@ -24,11 +24,11 @@ diff -Naur standalone/MetadataVarCheck/ReferenceInMetadataVar/ReferenceInMetadat
@@ -1,7 +1,6 @@
DESCRIPTION="Ebuild with variable in LICENSE"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
-MY_LICENSE="BSD"
-LICENSE="${MY_LICENSE}"
+LICENSE="BSD"
LICENSE="${LICENSE} BSD"
+ SLOT="0"
KEYWORDS="~amd64 ~x86"
diff -Naur standalone/MetadataVarCheck/ReferenceInMetadataVar/ReferenceInMetadataVar-3.ebuild fixed/MetadataVarCheck/ReferenceInMetadataVar/ReferenceInMetadataVar-3.ebuild
--- standalone/MetadataVarCheck/ReferenceInMetadataVar/ReferenceInMetadataVar-3.ebuild 2022-04-30 20:58:05.075839682 +0200
@@ -36,18 +36,18 @@ diff -Naur standalone/MetadataVarCheck/ReferenceInMetadataVar/ReferenceInMetadat
@@ -1,7 +1,6 @@
DESCRIPTION="Ebuild with variable in LICENSE"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
-MY_LICENSE="BSD"
LICENSE=""
-LICENSE+="${MY_LICENSE}"
+LICENSE+="BSD"
+ SLOT="0"
KEYWORDS="~amd64 ~x86"
diff -Naur standalone/MetadataVarCheck/ReferenceInMetadataVar/ReferenceInMetadataVar-4.ebuild fixed/MetadataVarCheck/ReferenceInMetadataVar/ReferenceInMetadataVar-4.ebuild
--- standalone/MetadataVarCheck/ReferenceInMetadataVar/ReferenceInMetadataVar-4.ebuild 2022-04-30 20:58:05.075839682 +0200
+++ fixed/MetadataVarCheck/ReferenceInMetadataVar/ReferenceInMetadataVar-4.ebuild.fixed 2022-04-30 20:57:57.498766323 +0200
@@ -2,5 +2,4 @@
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
-LICENSE="${LICENSE} ${LICENSE/B/B}"
+ SLOT="0"
KEYWORDS="~amd64 ~x86"
diff --git a/testdata/data/repos/standalone/MetadataVarCheck/StaticSrcUri/fix.patch b/testdata/data/repos/standalone/MetadataVarCheck/StaticSrcUri/fix.patch
index acab6f443..37122ed36 100644
--- a/testdata/data/repos/standalone/MetadataVarCheck/StaticSrcUri/fix.patch
+++ b/testdata/data/repos/standalone/MetadataVarCheck/StaticSrcUri/fix.patch
@@ -6,5 +6,5 @@ diff -Naur standalone/MetadataVarCheck/StaticSrcUri/StaticSrcUri-0.ebuild fixed/
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SRC_URI="https://github.com/pkgcore/pkgcheck/StaticSrcUri-0.tar.gz"
+SRC_URI="https://github.com/pkgcore/pkgcheck/${P}.tar.gz"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
diff --git a/testdata/data/repos/standalone/MissingSlotDepCheck/MissingSlotDep/fix.patch b/testdata/data/repos/standalone/MissingSlotDepCheck/MissingSlotDep/fix.patch
index 6f405e608..d61438569 100644
--- a/testdata/data/repos/standalone/MissingSlotDepCheck/MissingSlotDep/fix.patch
+++ b/testdata/data/repos/standalone/MissingSlotDepCheck/MissingSlotDep/fix.patch
@@ -3,8 +3,8 @@ diff -Naur standalone/MissingSlotDepCheck/MissingSlotDep/MissingSlotDep-0.ebuild
+++ fixed/MissingSlotDepCheck/MissingSlotDep/MissingSlotDep-0.ebuild 2019-11-28 01:50:03.520400413 -0700
@@ -4,5 +4,5 @@
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
-RDEPEND="stub/slotted"
+RDEPEND="stub/slotted:1="
DEPEND="${RDEPEND}"
diff --git a/testdata/data/repos/standalone/MissingUnpackerDepCheck/MissingUnpackerDep/fix.patch b/testdata/data/repos/standalone/MissingUnpackerDepCheck/MissingUnpackerDep/fix.patch
index fd050c85d..96d9af289 100644
--- a/testdata/data/repos/standalone/MissingUnpackerDepCheck/MissingUnpackerDep/fix.patch
+++ b/testdata/data/repos/standalone/MissingUnpackerDepCheck/MissingUnpackerDep/fix.patch
@@ -3,6 +3,6 @@ diff -Naur standalone/MissingUnpackerDepCheck/MissingUnpackerDep/MissingUnpacker
+++ fixed/MissingUnpackerDepCheck/MissingUnpackerDep/MissingUnpackerDep-0.ebuild 2019-10-08 02:56:42.103506456 -0600
@@ -3,3 +3,4 @@
SRC_URI="https://github.com/pkgcore/pkgcheck/${P}.zip"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
+DEPEND="app-arch/unzip"
diff --git a/testdata/data/repos/standalone/NonPosixCheck/NonPosixHeadTailUsage/fix.patch b/testdata/data/repos/standalone/NonPosixCheck/NonPosixHeadTailUsage/fix.patch
index c01e9028b..0a1e1963c 100644
--- a/testdata/data/repos/standalone/NonPosixCheck/NonPosixHeadTailUsage/fix.patch
+++ b/testdata/data/repos/standalone/NonPosixCheck/NonPosixHeadTailUsage/fix.patch
@@ -1,7 +1,7 @@
--- standalone/NonPosixCheck/NonPosixHeadTailUsage/NonPosixHeadTailUsage-0.ebuild
+++ fixed/NonPosixCheck/NonPosixHeadTailUsage/NonPosixHeadTailUsage-0.ebuild
-@@ -4,7 +4,7 @@ SLOT="0"
- LICENSE="BSD"
+@@ -4,7 +4,7 @@ LICENSE="BSD"
+ SLOT="0"
src_prepare() {
- head -1 file > another || die
@@ -12,8 +12,8 @@
}
--- standalone/NonPosixCheck/NonPosixHeadTailUsage/NonPosixHeadTailUsage-1.ebuild
+++ fixed/NonPosixCheck/NonPosixHeadTailUsage/NonPosixHeadTailUsage-1.ebuild
-@@ -4,8 +4,8 @@ SLOT="0"
- LICENSE="BSD"
+@@ -4,8 +4,8 @@ LICENSE="BSD"
+ SLOT="0"
src_prepare() {
- tail -1 file > another || die
diff --git a/testdata/data/repos/standalone/PkgDirCheck/InvalidPN/fix.patch b/testdata/data/repos/standalone/PkgDirCheck/InvalidPN/fix.patch
index 793433a6c..070de8d48 100644
--- a/testdata/data/repos/standalone/PkgDirCheck/InvalidPN/fix.patch
+++ b/testdata/data/repos/standalone/PkgDirCheck/InvalidPN/fix.patch
@@ -4,13 +4,13 @@ diff -Naur standalone/PkgDirCheck/InvalidPN/InvalidPN-0.ebuild fixed/PkgDirCheck
@@ -0,0 +1,4 @@
+DESCRIPTION="Ebuilds that have invalid package names"
+HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-+SLOT="0"
+LICENSE="BSD"
++SLOT="0"
diff -Naur standalone/PkgDirCheck/InvalidPN/InvalidPN.ebuild fixed/PkgDirCheck/InvalidPN/InvalidPN.ebuild
--- standalone/PkgDirCheck/InvalidPN/InvalidPN.ebuild 2019-08-20 18:54:59.098260825 -0600
+++ fixed/PkgDirCheck/InvalidPN/InvalidPN.ebuild 1969-12-31 17:00:00.000000000 -0700
@@ -1,4 +0,0 @@
-DESCRIPTION="Ebuilds that have invalid package names"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
--SLOT="0"
-LICENSE="BSD"
+-SLOT="0"
diff --git a/testdata/data/repos/standalone/PkgDirCheck/MismatchedPN/fix.patch b/testdata/data/repos/standalone/PkgDirCheck/MismatchedPN/fix.patch
index 78e2a0844..1085425e9 100644
--- a/testdata/data/repos/standalone/PkgDirCheck/MismatchedPN/fix.patch
+++ b/testdata/data/repos/standalone/PkgDirCheck/MismatchedPN/fix.patch
@@ -4,13 +4,13 @@ diff -Naur standalone/PkgDirCheck/MismatchedPN/MismatchedPN-1.ebuild fixed/PkgDi
@@ -0,0 +1,4 @@
+DESCRIPTION="Ebuilds that have different names than their parent directory"
+HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-+SLOT="0"
+LICENSE="BSD"
++SLOT="0"
diff -Naur standalone/PkgDirCheck/MismatchedPN/Mismatched-1.ebuild fixed/PkgDirCheck/MismatchedPN/Mismatched-1.ebuild
--- standalone/PkgDirCheck/MismatchedPN/Mismatched-1.ebuild 2019-08-20 18:54:59.098260825 -0600
+++ fixed/PkgDirCheck/MismatchedPN/Mismatched-1.ebuild 1969-12-31 17:00:00.000000000 -0700
@@ -1,4 +0,0 @@
-DESCRIPTION="Ebuilds that have different names than their parent directory"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
--SLOT="0"
-LICENSE="BSD"
+-SLOT="0"
diff --git a/testdata/data/repos/standalone/PropertiesCheck/InvalidProperties/fix.patch b/testdata/data/repos/standalone/PropertiesCheck/InvalidProperties/fix.patch
index 6732953f0..b032c4311 100644
--- a/testdata/data/repos/standalone/PropertiesCheck/InvalidProperties/fix.patch
+++ b/testdata/data/repos/standalone/PropertiesCheck/InvalidProperties/fix.patch
@@ -2,8 +2,8 @@ diff -Naur standalone/PropertiesCheck/InvalidProperties/InvalidProperties-0.ebui
--- standalone/PropertiesCheck/InvalidProperties/InvalidProperties-0.ebuild 2019-11-23 17:07:16.294940718 -0700
+++ fixed/PropertiesCheck/InvalidProperties/InvalidProperties-0.ebuild 2019-11-23 17:09:39.252447491 -0700
@@ -3,4 +3,4 @@
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
IUSE="used"
-PROPERTIES="!used ( interactive )"
+PROPERTIES="!used? ( interactive )"
diff --git a/testdata/data/repos/standalone/PropertiesCheck/UnknownProperties/fix.patch b/testdata/data/repos/standalone/PropertiesCheck/UnknownProperties/fix.patch
index e2ba60d51..cc730e3ab 100644
--- a/testdata/data/repos/standalone/PropertiesCheck/UnknownProperties/fix.patch
+++ b/testdata/data/repos/standalone/PropertiesCheck/UnknownProperties/fix.patch
@@ -3,7 +3,7 @@ diff -Naur standalone/PropertiesCheck/UnknownProperties/UnknownProperties-0.ebui
+++ fixed/PropertiesCheck/UnknownProperties/UnknownProperties-0.ebuild 2019-10-08 02:43:25.224678356 -0600
@@ -2,4 +2,4 @@
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
-PROPERTIES="foo"
+PROPERTIES="live"
diff --git a/testdata/data/repos/standalone/PropertiesCheck/UnstatedIuse/fix.patch b/testdata/data/repos/standalone/PropertiesCheck/UnstatedIuse/fix.patch
index d4f644b52..c5f1a4ea2 100644
--- a/testdata/data/repos/standalone/PropertiesCheck/UnstatedIuse/fix.patch
+++ b/testdata/data/repos/standalone/PropertiesCheck/UnstatedIuse/fix.patch
@@ -3,7 +3,7 @@ diff -Naur standalone/PropertiesCheck/UnstatedIuse/UnstatedIuse-0.ebuild fixed/P
+++ fixed/PropertiesCheck/UnstatedIuse/UnstatedIuse-0.ebuild 2019-11-23 17:12:59.316962880 -0700
@@ -2,4 +2,5 @@
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
+IUSE="used"
PROPERTIES="used? ( interactive )"
diff --git a/testdata/data/repos/standalone/RequiredUseCheck/InvalidRequiredUse/fix.patch b/testdata/data/repos/standalone/RequiredUseCheck/InvalidRequiredUse/fix.patch
index 763c55c22..84389909e 100644
--- a/testdata/data/repos/standalone/RequiredUseCheck/InvalidRequiredUse/fix.patch
+++ b/testdata/data/repos/standalone/RequiredUseCheck/InvalidRequiredUse/fix.patch
@@ -3,8 +3,8 @@ diff -Naur standalone/RequiredUseCheck/InvalidRequiredUse/InvalidRequiredUse-0.e
+++ fixed/RequiredUseCheck/InvalidRequiredUse/InvalidRequiredUse-0.ebuild 2019-11-23 13:40:55.077141263 -0700
@@ -3,4 +3,5 @@
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
-REQUIRED_USE="|| ( )"
+IUSE="required used"
+REQUIRED_USE="|| ( required used )"
@@ -13,8 +13,8 @@ diff -Naur standalone/RequiredUseCheck/InvalidRequiredUse/InvalidRequiredUse-1.e
+++ fixed/RequiredUseCheck/InvalidRequiredUse/InvalidRequiredUse-1.ebuild 2019-11-23 13:41:17.866239168 -0700
@@ -3,4 +3,5 @@
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
-REQUIRED_USE="?"
+IUSE="required used"
+REQUIRED_USE="used? ( required )"
@@ -23,8 +23,8 @@ diff -Naur standalone/RequiredUseCheck/InvalidRequiredUse/InvalidRequiredUse-2.e
+++ fixed/RequiredUseCheck/InvalidRequiredUse/InvalidRequiredUse-2.ebuild 2019-11-23 13:41:31.418297387 -0700
@@ -3,5 +3,5 @@
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
-IUSE="required"
-REQUIRED_USE="required?"
+IUSE="required used"
diff --git a/testdata/data/repos/standalone/RequiredUseCheck/RequiredUseDefaults/fix.patch b/testdata/data/repos/standalone/RequiredUseCheck/RequiredUseDefaults/fix.patch
index cdfec099c..212591071 100644
--- a/testdata/data/repos/standalone/RequiredUseCheck/RequiredUseDefaults/fix.patch
+++ b/testdata/data/repos/standalone/RequiredUseCheck/RequiredUseDefaults/fix.patch
@@ -2,8 +2,8 @@ diff -Naur standalone/RequiredUseCheck/RequiredUseDefaults/RequiredUseDefaults-0
--- standalone/RequiredUseCheck/RequiredUseDefaults/RequiredUseDefaults-0.ebuild 2019-11-23 13:59:36.895606367 -0700
+++ fixed/RequiredUseCheck/RequiredUseDefaults/RequiredUseDefaults-0.ebuild 2019-11-23 14:00:49.199924482 -0700
@@ -5,5 +5,5 @@
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
KEYWORDS="~amd64"
-IUSE="required used"
+IUSE="+required used"
diff --git a/testdata/data/repos/standalone/RequiredUseCheck/UnstatedIuse/fix.patch b/testdata/data/repos/standalone/RequiredUseCheck/UnstatedIuse/fix.patch
index d55c65f90..1fb9f15a6 100644
--- a/testdata/data/repos/standalone/RequiredUseCheck/UnstatedIuse/fix.patch
+++ b/testdata/data/repos/standalone/RequiredUseCheck/UnstatedIuse/fix.patch
@@ -3,8 +3,8 @@ diff -Naur standalone/RequiredUseCheck/UnstatedIuse/UnstatedIuse-0.ebuild fixed/
+++ fixed/RequiredUseCheck/UnstatedIuse/UnstatedIuse-0.ebuild 2019-11-23 13:51:47.992485035 -0700
@@ -4,5 +4,5 @@
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
-IUSE="required"
+IUSE="required used"
REQUIRED_USE="|| ( required used )"
diff --git a/testdata/data/repos/standalone/RestrictCheck/InvalidRestrict/fix.patch b/testdata/data/repos/standalone/RestrictCheck/InvalidRestrict/fix.patch
index 3fa53f631..0aa5bbbfd 100644
--- a/testdata/data/repos/standalone/RestrictCheck/InvalidRestrict/fix.patch
+++ b/testdata/data/repos/standalone/RestrictCheck/InvalidRestrict/fix.patch
@@ -2,8 +2,8 @@ diff -Naur standalone/RestrictCheck/InvalidRestrict/InvalidRestrict-0.ebuild fix
--- standalone/RestrictCheck/InvalidRestrict/InvalidRestrict-0.ebuild 2019-11-23 15:19:40.247982566 -0700
+++ fixed/RestrictCheck/InvalidRestrict/InvalidRestrict-0.ebuild 2019-11-23 15:20:02.882083351 -0700
@@ -3,4 +3,4 @@
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
IUSE="used"
-RESTRICT="!used ( test )"
+RESTRICT="!used? ( test )"
diff --git a/testdata/data/repos/standalone/RestrictCheck/UnknownRestrict/fix.patch b/testdata/data/repos/standalone/RestrictCheck/UnknownRestrict/fix.patch
index 1d3047934..a62eb261a 100644
--- a/testdata/data/repos/standalone/RestrictCheck/UnknownRestrict/fix.patch
+++ b/testdata/data/repos/standalone/RestrictCheck/UnknownRestrict/fix.patch
@@ -3,7 +3,7 @@ diff -Naur standalone/RestrictCheck/UnknownRestrict/UnknownRestrict-0.ebuild fix
+++ fixed/RestrictCheck/UnknownRestrict/UnknownRestrict-0.ebuild 2019-10-08 02:42:33.587430292 -0600
@@ -2,4 +2,4 @@
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
-RESTRICT="foo"
+RESTRICT="mirror"
diff --git a/testdata/data/repos/standalone/RestrictCheck/UnstatedIuse/fix.patch b/testdata/data/repos/standalone/RestrictCheck/UnstatedIuse/fix.patch
index 4c1147cd9..31a0d9ece 100644
--- a/testdata/data/repos/standalone/RestrictCheck/UnstatedIuse/fix.patch
+++ b/testdata/data/repos/standalone/RestrictCheck/UnstatedIuse/fix.patch
@@ -3,7 +3,7 @@ diff -Naur standalone/RestrictCheck/UnstatedIuse/UnstatedIuse-0.ebuild fixed/Res
+++ fixed/RestrictCheck/UnstatedIuse/UnstatedIuse-0.ebuild 2019-10-08 02:43:59.439842722 -0600
@@ -2,4 +2,5 @@
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
+IUSE="used"
RESTRICT="used? ( mirror )"
diff --git a/testdata/data/repos/standalone/RestrictTestCheck/MissingTestRestrict/fix.patch b/testdata/data/repos/standalone/RestrictTestCheck/MissingTestRestrict/fix.patch
index 1f0d4507a..233cc0c96 100644
--- a/testdata/data/repos/standalone/RestrictTestCheck/MissingTestRestrict/fix.patch
+++ b/testdata/data/repos/standalone/RestrictTestCheck/MissingTestRestrict/fix.patch
@@ -2,7 +2,7 @@ diff -Naur standalone/RestrictTestCheck/MissingTestRestrict/MissingTestRestrict-
--- standalone/RestrictTestCheck/MissingTestRestrict/MissingTestRestrict-0.ebuild 2019-11-23 14:07:17.053630938 -0700
+++ fixed/RestrictTestCheck/MissingTestRestrict/MissingTestRestrict-0.ebuild 2019-11-23 14:09:17.952162861 -0700
@@ -3,3 +3,4 @@
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
IUSE="test"
+RESTRICT="!test? ( test )"
diff --git a/testdata/data/repos/standalone/RustCheck/SuboptimalCratesURICall/expected.json b/testdata/data/repos/standalone/RustCheck/SuboptimalCratesURICall/expected.json
index a5b216187..8a3c74a76 100644
--- a/testdata/data/repos/standalone/RustCheck/SuboptimalCratesURICall/expected.json
+++ b/testdata/data/repos/standalone/RustCheck/SuboptimalCratesURICall/expected.json
@@ -1,2 +1,2 @@
-{"__class__": "SuboptimalCratesURICall", "category": "RustCheck", "package": "SuboptimalCratesURICall", "version": "0", "line": "$(cargo_crate_uris)", "lineno": 13}
-{"__class__": "SuboptimalCratesURICall", "category": "RustCheck", "package": "SuboptimalCratesURICall", "version": "1", "line": "$(cargo_crate_uris ${CRATES})", "lineno": 13}
+{"__class__": "SuboptimalCratesURICall", "category": "RustCheck", "package": "SuboptimalCratesURICall", "version": "0", "line": "$(cargo_crate_uris)", "lineno": 11}
+{"__class__": "SuboptimalCratesURICall", "category": "RustCheck", "package": "SuboptimalCratesURICall", "version": "1", "line": "$(cargo_crate_uris ${CRATES})", "lineno": 11}
diff --git a/testdata/data/repos/standalone/RustCheck/SuboptimalCratesURICall/fix.patch b/testdata/data/repos/standalone/RustCheck/SuboptimalCratesURICall/fix.patch
index 6e200a511..4f06cb420 100644
--- a/testdata/data/repos/standalone/RustCheck/SuboptimalCratesURICall/fix.patch
+++ b/testdata/data/repos/standalone/RustCheck/SuboptimalCratesURICall/fix.patch
@@ -3,16 +3,16 @@ diff -Naur standalone/RustCheck/SuboptimalCratesURICall/SuboptimalCratesURICall-
+++ fixed/RustCheck/SuboptimalCratesURICall/SuboptimalCratesURICall-0.ebuild
@@ -10,4 +10,4 @@ DESCRIPTION="Ebuild with suboptimal cargo_crate_uris"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
- LICENSE="BSD"
-SRC_URI="$(cargo_crate_uris)"
+SRC_URI="${CARGO_CRATE_URIS}"
+ LICENSE="BSD"
+ SLOT="0"
diff -Naur standalone/RustCheck/SuboptimalCratesURICall/SuboptimalCratesURICall-1.ebuild fixed/RustCheck/SuboptimalCratesURICall/SuboptimalCratesURICall-1.ebuild
--- standalone/RustCheck/SuboptimalCratesURICall/SuboptimalCratesURICall-1.ebuild
+++ fixed/RustCheck/SuboptimalCratesURICall/SuboptimalCratesURICall-1.ebuild
@@ -10,4 +10,4 @@ DESCRIPTION="Ebuild with suboptimal cargo_crate_uris"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
- LICENSE="BSD"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
+SRC_URI="${CARGO_CRATE_URIS}"
+ LICENSE="BSD"
+ SLOT="0"
diff --git a/testdata/data/repos/standalone/SourcingCheck/InvalidSlot/fix.patch b/testdata/data/repos/standalone/SourcingCheck/InvalidSlot/fix.patch
index ea37e6997..72e615f34 100644
--- a/testdata/data/repos/standalone/SourcingCheck/InvalidSlot/fix.patch
+++ b/testdata/data/repos/standalone/SourcingCheck/InvalidSlot/fix.patch
@@ -4,9 +4,9 @@ diff -Naur standalone/SourcingCheck/InvalidSlot/InvalidSlot-0.ebuild fixed/Sourc
@@ -1,4 +1,4 @@
DESCRIPTION="Ebuild with invalid SLOT"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
+ LICENSE="BSD"
-SLOT="?"
+SLOT="0"
- LICENSE="BSD"
diff -Naur standalone/SourcingCheck/InvalidSlot/InvalidSlot-1.ebuild fixed/SourcingCheck/InvalidSlot/InvalidSlot-1.ebuild
--- standalone/SourcingCheck/InvalidSlot/InvalidSlot-1.ebuild 2020-12-22 23:11:01.614953942 -0700
+++ fixed/SourcingCheck/InvalidSlot/InvalidSlot-1.ebuild 2021-01-21 15:11:28.009423864 -0700
@@ -14,7 +14,7 @@ diff -Naur standalone/SourcingCheck/InvalidSlot/InvalidSlot-1.ebuild fixed/Sourc
+EAPI=7
DESCRIPTION="Ebuild with invalid SLOT"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0/1"
+ LICENSE="BSD"
diff -Naur standalone/SourcingCheck/InvalidSlot/InvalidSlot-2.ebuild fixed/SourcingCheck/InvalidSlot/InvalidSlot-2.ebuild
--- standalone/SourcingCheck/InvalidSlot/InvalidSlot-2.ebuild 2020-12-22 23:11:01.614953942 -0700
+++ fixed/SourcingCheck/InvalidSlot/InvalidSlot-2.ebuild 2021-01-21 15:11:28.009423864 -0700
@@ -22,9 +22,9 @@ diff -Naur standalone/SourcingCheck/InvalidSlot/InvalidSlot-2.ebuild fixed/Sourc
EAPI=7
DESCRIPTION="Ebuild with invalid SLOT"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
+ LICENSE="BSD"
-SLOT="0/-1"
+SLOT="0/1"
- LICENSE="BSD"
diff -Naur standalone/SourcingCheck/InvalidSlot/InvalidSlot-3.ebuild fixed/SourcingCheck/InvalidSlot/InvalidSlot-3.ebuild
--- standalone/SourcingCheck/InvalidSlot/InvalidSlot-3.ebuild 2020-12-22 23:11:01.614953942 -0700
+++ fixed/SourcingCheck/InvalidSlot/InvalidSlot-3.ebuild 2021-01-21 15:11:28.009423864 -0700
@@ -32,9 +32,9 @@ diff -Naur standalone/SourcingCheck/InvalidSlot/InvalidSlot-3.ebuild fixed/Sourc
EAPI=7
DESCRIPTION="Ebuild with invalid SLOT"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
+ LICENSE="BSD"
-SLOT="0/foo?"
+SLOT="0/foo"
- LICENSE="BSD"
diff -Naur standalone/SourcingCheck/InvalidSlot/InvalidSlot-4.ebuild fixed/SourcingCheck/InvalidSlot/InvalidSlot-4.ebuild
--- standalone/SourcingCheck/InvalidSlot/InvalidSlot-4.ebuild 2021-01-21 15:07:23.383092793 -0700
+++ fixed/SourcingCheck/InvalidSlot/InvalidSlot-4.ebuild 2021-01-21 15:11:36.714613571 -0700
@@ -42,9 +42,9 @@ diff -Naur standalone/SourcingCheck/InvalidSlot/InvalidSlot-4.ebuild fixed/Sourc
EAPI=7
DESCRIPTION="Ebuild with empty SLOT"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
+ LICENSE="BSD"
-SLOT=""
+SLOT="0"
- LICENSE="BSD"
diff -Naur standalone/SourcingCheck/InvalidSlot/InvalidSlot-5.ebuild fixed/SourcingCheck/InvalidSlot/InvalidSlot-5.ebuild
--- standalone/SourcingCheck/InvalidSlot/InvalidSlot-5.ebuild 2021-01-21 15:07:05.581704850 -0700
+++ fixed/SourcingCheck/InvalidSlot/InvalidSlot-5.ebuild 2021-01-21 15:11:42.733744744 -0700
@@ -52,5 +52,5 @@ diff -Naur standalone/SourcingCheck/InvalidSlot/InvalidSlot-5.ebuild fixed/Sourc
EAPI=7
DESCRIPTION="Ebuild with missing SLOT"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-+SLOT="0"
LICENSE="BSD"
++SLOT="0"
diff --git a/testdata/data/repos/standalone/SourcingCheck/SourcingError/fix.patch b/testdata/data/repos/standalone/SourcingCheck/SourcingError/fix.patch
index a7b930716..233baf66c 100644
--- a/testdata/data/repos/standalone/SourcingCheck/SourcingError/fix.patch
+++ b/testdata/data/repos/standalone/SourcingCheck/SourcingError/fix.patch
@@ -3,6 +3,6 @@ diff -Naur standalone/SourcingCheck/SourcingError/SourcingError-0.ebuild fixed/S
+++ fixed/SourcingCheck/SourcingError/SourcingError-0.ebuild 2019-11-23 13:25:58.559311296 -0700
@@ -2,4 +2,3 @@
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
-foo
diff --git a/testdata/data/repos/standalone/SrcUriCheck/BadFilename/fix.patch b/testdata/data/repos/standalone/SrcUriCheck/BadFilename/fix.patch
index 75f4c98d8..4daa76da8 100644
--- a/testdata/data/repos/standalone/SrcUriCheck/BadFilename/fix.patch
+++ b/testdata/data/repos/standalone/SrcUriCheck/BadFilename/fix.patch
@@ -13,8 +13,8 @@ diff -Naur standalone/SrcUriCheck/BadFilename/BadFilename-0.ebuild fixed/SrcUriC
+ https://github.com/pkgcore/pkgcheck/${PV}.tar.gz -> ${P}.tar.gz
+ https://github.com/pkgcore/pkgcheck/v${PV}.tar.gz -> ${P}.tar.gz
"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
diff -Naur standalone/SrcUriCheck/BadFilename/Manifest fixed/SrcUriCheck/BadFilename/Manifest
--- standalone/SrcUriCheck/BadFilename/Manifest 2019-09-07 06:29:08.537163522 -0600
+++ fixed/SrcUriCheck/BadFilename/Manifest 2019-09-07 06:33:35.393236829 -0600
diff --git a/testdata/data/repos/standalone/SrcUriCheck/BadProtocol/fix.patch b/testdata/data/repos/standalone/SrcUriCheck/BadProtocol/fix.patch
index 48d53012b..e9cae6ae5 100644
--- a/testdata/data/repos/standalone/SrcUriCheck/BadProtocol/fix.patch
+++ b/testdata/data/repos/standalone/SrcUriCheck/BadProtocol/fix.patch
@@ -9,5 +9,5 @@ diff -Naur standalone/SrcUriCheck/BadProtocol/BadProtocol-0.ebuild fixed/SrcUriC
- gopher://github.com/pkgcore/pkgcheck/${P}.tar.gz
-"
+SRC_URI="https://github.com/pkgcore/pkgcheck/${P}.tar.gz"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
diff --git a/testdata/data/repos/standalone/SrcUriCheck/InvalidSrcUri/fix.patch b/testdata/data/repos/standalone/SrcUriCheck/InvalidSrcUri/fix.patch
index 0734ccce3..7daefc7e6 100644
--- a/testdata/data/repos/standalone/SrcUriCheck/InvalidSrcUri/fix.patch
+++ b/testdata/data/repos/standalone/SrcUriCheck/InvalidSrcUri/fix.patch
@@ -5,8 +5,8 @@ diff -Naur standalone/SrcUriCheck/InvalidSrcUri/InvalidSrcUri-0.ebuild fixed/Src
DESCRIPTION="Ebuild with invalid SRC_URI"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SRC_URI="?"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
diff -Naur standalone/SrcUriCheck/InvalidSrcUri/InvalidSrcUri-1.ebuild fixed/SrcUriCheck/InvalidSrcUri/InvalidSrcUri-1.ebuild
--- standalone/SrcUriCheck/InvalidSrcUri/InvalidSrcUri-1.ebuild 2019-11-14 15:53:18.481394769 -0700
+++ fixed/SrcUriCheck/InvalidSrcUri/InvalidSrcUri-1.ebuild 2019-11-14 15:56:32.897105805 -0700
@@ -14,8 +14,8 @@ diff -Naur standalone/SrcUriCheck/InvalidSrcUri/InvalidSrcUri-1.ebuild fixed/Src
DESCRIPTION="Ebuild with invalid SRC_URI"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SRC_URI="( )"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
diff -Naur standalone/SrcUriCheck/InvalidSrcUri/InvalidSrcUri-2.ebuild fixed/SrcUriCheck/InvalidSrcUri/InvalidSrcUri-2.ebuild
--- standalone/SrcUriCheck/InvalidSrcUri/InvalidSrcUri-2.ebuild 2019-11-14 15:56:03.873999657 -0700
+++ fixed/SrcUriCheck/InvalidSrcUri/InvalidSrcUri-2.ebuild 2019-11-14 15:56:36.366118491 -0700
@@ -24,8 +24,8 @@ diff -Naur standalone/SrcUriCheck/InvalidSrcUri/InvalidSrcUri-2.ebuild fixed/Src
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SRC_URI="https://github.com/pkgcore/pkgcheck/${P}.tar.gz/"
+SRC_URI="https://github.com/pkgcore/pkgcheck/${P}.tar.gz"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
diff -Naur standalone/SrcUriCheck/InvalidSrcUri/Manifest fixed/SrcUriCheck/InvalidSrcUri/Manifest
--- standalone/SrcUriCheck/InvalidSrcUri/Manifest 1969-12-31 17:00:00.000000000 -0700
+++ fixed/SrcUriCheck/InvalidSrcUri/Manifest 2019-11-14 15:57:52.611397338 -0700
diff --git a/testdata/data/repos/standalone/SrcUriCheck/MissingUri/fix.patch b/testdata/data/repos/standalone/SrcUriCheck/MissingUri/fix.patch
index 3ac84e02a..925f0fe90 100644
--- a/testdata/data/repos/standalone/SrcUriCheck/MissingUri/fix.patch
+++ b/testdata/data/repos/standalone/SrcUriCheck/MissingUri/fix.patch
@@ -3,6 +3,6 @@ diff -Naur standalone/SrcUriCheck/MissingUri/MissingUri-0.ebuild fixed/SrcUriChe
+++ fixed/SrcUriCheck/MissingUri/MissingUri-0.ebuild 2019-08-23 16:35:07.699403413 -0600
@@ -3,3 +3,4 @@
SRC_URI="${P}.tar.gz"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
+RESTRICT="fetch"
diff --git a/testdata/data/repos/standalone/SrcUriCheck/RedundantUriRename/fix.patch b/testdata/data/repos/standalone/SrcUriCheck/RedundantUriRename/fix.patch
index 557f3c87b..72cd16368 100644
--- a/testdata/data/repos/standalone/SrcUriCheck/RedundantUriRename/fix.patch
+++ b/testdata/data/repos/standalone/SrcUriCheck/RedundantUriRename/fix.patch
@@ -8,8 +8,8 @@ diff -Naur standalone/SrcUriCheck/RedundantUriRename/RedundantUriRename-0.ebuild
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SRC_URI="https://github.com/pkgcore/pkgcheck/${P}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/pkgcore/pkgcheck/${P}.tar.gz"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
diff -Naur standalone/SrcUriCheck/RedundantUriRename/RedundantUriRename-1.ebuild fixed/SrcUriCheck/RedundantUriRename/RedundantUriRename-1.ebuild
--- standalone/SrcUriCheck/RedundantUriRename/RedundantUriRename-1.ebuild 2020-01-13 19:05:11.310754211 -0700
+++ fixed/SrcUriCheck/RedundantUriRename/RedundantUriRename-1.ebuild 2020-01-13 19:07:22.031371966 -0700
@@ -20,5 +20,5 @@ diff -Naur standalone/SrcUriCheck/RedundantUriRename/RedundantUriRename-1.ebuild
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SRC_URI="mirror://used/pkgcore/pkgcheck/${P}.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://used/pkgcore/pkgcheck/${P}.tar.gz"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
diff --git a/testdata/data/repos/standalone/SrcUriCheck/SrcUriFilenameDotPrefix/fix.patch b/testdata/data/repos/standalone/SrcUriCheck/SrcUriFilenameDotPrefix/fix.patch
index 233616f69..736c4e825 100644
--- a/testdata/data/repos/standalone/SrcUriCheck/SrcUriFilenameDotPrefix/fix.patch
+++ b/testdata/data/repos/standalone/SrcUriCheck/SrcUriFilenameDotPrefix/fix.patch
@@ -13,5 +13,5 @@ diff --git standalone/SrcUriCheck/SrcUriFilenameDotPrefix/SrcUriFilenameDotPrefi
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SRC_URI="https://github.com/pkgcore/pkgcheck/${MY_P}.tar.gz -> ${MYP}.gh.tar.gz"
+SRC_URI="https://github.com/pkgcore/pkgcheck/${MY_P}.tar.gz -> ${MY_P}.gh.tar.gz"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
diff --git a/testdata/data/repos/standalone/SrcUriCheck/TarballAvailable/fix.patch b/testdata/data/repos/standalone/SrcUriCheck/TarballAvailable/fix.patch
index 1f8b1974d..2d690a73d 100644
--- a/testdata/data/repos/standalone/SrcUriCheck/TarballAvailable/fix.patch
+++ b/testdata/data/repos/standalone/SrcUriCheck/TarballAvailable/fix.patch
@@ -16,6 +16,6 @@ diff -Naur standalone/SrcUriCheck/TarballAvailable/TarballAvailable-0.ebuild fix
+ https://github.com/pkgcore/pkgcheck/archive/${PV}.tar.gz -> ${P}.tar.gz
+ https://gitlab.com/pkgcore/pkgcheck/-/archive/${PV}.tar.gz -> ${P}.tar.gz
"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
-DEPEND="app-arch/unzip"
diff --git a/testdata/data/repos/standalone/SrcUriCheck/UnknownMirror/fix.patch b/testdata/data/repos/standalone/SrcUriCheck/UnknownMirror/fix.patch
index 81b47c66c..e48f3ecb3 100644
--- a/testdata/data/repos/standalone/SrcUriCheck/UnknownMirror/fix.patch
+++ b/testdata/data/repos/standalone/SrcUriCheck/UnknownMirror/fix.patch
@@ -9,5 +9,5 @@ diff -Naur standalone/SrcUriCheck/UnknownMirror/UnknownMirror-0.ebuild fixed/Src
- mirror://unknown/pkgcore/pkgcheck/${P}.tar.gz
-"
+SRC_URI="mirror://used/pkgcore/pkgcheck/${P}.tar.gz"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
diff --git a/testdata/data/repos/standalone/SrcUriCheck/UnstatedIuse/fix.patch b/testdata/data/repos/standalone/SrcUriCheck/UnstatedIuse/fix.patch
index 143a78f94..ab8da08a8 100644
--- a/testdata/data/repos/standalone/SrcUriCheck/UnstatedIuse/fix.patch
+++ b/testdata/data/repos/standalone/SrcUriCheck/UnstatedIuse/fix.patch
@@ -3,6 +3,6 @@ diff -Naur standalone/SrcUriCheck/UnstatedIuse/UnstatedIuse-0.ebuild fixed/SrcUr
+++ fixed/SrcUriCheck/UnstatedIuse/UnstatedIuse-0.ebuild 2019-08-23 16:31:11.854468001 -0600
@@ -3,3 +3,4 @@
SRC_URI="used? ( https://github.com/pkgcore/pkgcheck/${P}.tar.gz )"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
+IUSE="used"
diff --git a/testdata/data/repos/standalone/VariableOrderCheck/VariableOrderWrong/expected.json b/testdata/data/repos/standalone/VariableOrderCheck/VariableOrderWrong/expected.json
new file mode 100644
index 000000000..165df0923
--- /dev/null
+++ b/testdata/data/repos/standalone/VariableOrderCheck/VariableOrderWrong/expected.json
@@ -0,0 +1,2 @@
+{"__class__": "VariableOrderWrong", "category": "VariableOrderCheck", "package": "VariableOrderWrong", "version": "0", "first_var": "DESCRIPTION", "second_var": "HOMEPAGE"}
+{"__class__": "VariableOrderWrong", "category": "VariableOrderCheck", "package": "VariableOrderWrong", "version": "0", "first_var": "HOMEPAGE", "second_var": "KEYWORDS" }
diff --git a/testdata/data/repos/standalone/VariableScopeCheck/EbuildVariableScope/fix.patch b/testdata/data/repos/standalone/VariableScopeCheck/EbuildVariableScope/fix.patch
index f19a76d8f..3e77afbea 100644
--- a/testdata/data/repos/standalone/VariableScopeCheck/EbuildVariableScope/fix.patch
+++ b/testdata/data/repos/standalone/VariableScopeCheck/EbuildVariableScope/fix.patch
@@ -2,8 +2,8 @@ diff -Naur standalone/VariableScopeCheck/EbuildVariableScope/EbuildVariableScope
--- standalone/VariableScopeCheck/EbuildVariableScope/EbuildVariableScope-0.ebuild 2021-03-17 01:20:05.423678951 -0600
+++ fixed/VariableScopeCheck/EbuildVariableScope/EbuildVariableScope-0.ebuild 2021-03-17 01:21:57.421132212 -0600
@@ -5,11 +5,9 @@ HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
-DOC_CONTENTS="Hello ${ROOT}"
-
diff --git a/testdata/data/repos/standalone/VisibilityCheck/NonexistentDeps/fix.patch b/testdata/data/repos/standalone/VisibilityCheck/NonexistentDeps/fix.patch
index f37895666..831368ef6 100644
--- a/testdata/data/repos/standalone/VisibilityCheck/NonexistentDeps/fix.patch
+++ b/testdata/data/repos/standalone/VisibilityCheck/NonexistentDeps/fix.patch
@@ -3,7 +3,7 @@ diff -Naur standalone/VisibilityCheck/NonexistentDeps/NonexistentDeps-0.ebuild f
+++ fixed/VisibilityCheck/NonexistentDeps/NonexistentDeps-0.ebuild 2019-10-30 18:31:12.925907712 -0600
@@ -2,4 +2,4 @@
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
-DEPEND="|| ( stub/stub1 stub/stub2 cat/nonexistent )"
+DEPEND="|| ( stub/stub1 stub/stub2 )"
diff --git a/testdata/data/repos/standalone/VisibilityCheck/VisibleVcsPkg/fix.patch b/testdata/data/repos/standalone/VisibilityCheck/VisibleVcsPkg/fix.patch
index 65af748ce..d2500a8c4 100644
--- a/testdata/data/repos/standalone/VisibilityCheck/VisibleVcsPkg/fix.patch
+++ b/testdata/data/repos/standalone/VisibilityCheck/VisibleVcsPkg/fix.patch
@@ -3,14 +3,14 @@ diff -Naur standalone/VisibilityCheck/VisibleVcsPkg/VisibleVcsPkg-0.ebuild fixed
+++ fixed/VisibilityCheck/VisibleVcsPkg/VisibleVcsPkg-0.ebuild 2019-10-30 18:49:40.551199117 -0600
@@ -4,4 +4,3 @@
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
-KEYWORDS="amd64"
diff -Naur standalone/VisibilityCheck/VisibleVcsPkg/VisibleVcsPkg-1.ebuild fixed/VisibilityCheck/VisibleVcsPkg/VisibleVcsPkg-1.ebuild
--- standalone/VisibilityCheck/VisibleVcsPkg/VisibleVcsPkg-1.ebuild 2019-10-30 18:49:01.334094722 -0600
+++ fixed/VisibilityCheck/VisibleVcsPkg/VisibleVcsPkg-1.ebuild 2019-10-30 18:49:46.594215205 -0600
@@ -4,4 +4,3 @@
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
-KEYWORDS="~x86"
diff --git a/testdata/data/repos/standalone/WhitespaceCheck/DoubleEmptyLine/fix.patch b/testdata/data/repos/standalone/WhitespaceCheck/DoubleEmptyLine/fix.patch
index 2bcb990de..9e2b51fa0 100644
--- a/testdata/data/repos/standalone/WhitespaceCheck/DoubleEmptyLine/fix.patch
+++ b/testdata/data/repos/standalone/WhitespaceCheck/DoubleEmptyLine/fix.patch
@@ -5,5 +5,5 @@
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
diff --git a/testdata/data/repos/standalone/WhitespaceCheck/NoFinalNewline/fix.patch b/testdata/data/repos/standalone/WhitespaceCheck/NoFinalNewline/fix.patch
index 285acc905..c14146bf4 100644
--- a/testdata/data/repos/standalone/WhitespaceCheck/NoFinalNewline/fix.patch
+++ b/testdata/data/repos/standalone/WhitespaceCheck/NoFinalNewline/fix.patch
@@ -3,7 +3,7 @@
@@ -1,4 +1,4 @@
DESCRIPTION="Ebuild lacks an ending newline"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
--LICENSE="BSD"
+ LICENSE="BSD"
+-SLOT="0"
\ No newline at end of file
-+LICENSE="BSD"
++SLOT="0"
diff --git a/testdata/data/repos/standalone/WhitespaceCheck/TrailingEmptyLine/fix.patch b/testdata/data/repos/standalone/WhitespaceCheck/TrailingEmptyLine/fix.patch
index ee4858516..10ae10814 100644
--- a/testdata/data/repos/standalone/WhitespaceCheck/TrailingEmptyLine/fix.patch
+++ b/testdata/data/repos/standalone/WhitespaceCheck/TrailingEmptyLine/fix.patch
@@ -2,6 +2,6 @@
+++ fixed/WhitespaceCheck/TrailingEmptyLine/TrailingEmptyLine-0.ebuild
@@ -2,4 +2,3 @@
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
-
diff --git a/testdata/data/repos/visibility/DependencyCheck/DeprecatedDep/fix.patch b/testdata/data/repos/visibility/DependencyCheck/DeprecatedDep/fix.patch
index f7fabb766..e60c60973 100644
--- a/testdata/data/repos/visibility/DependencyCheck/DeprecatedDep/fix.patch
+++ b/testdata/data/repos/visibility/DependencyCheck/DeprecatedDep/fix.patch
@@ -2,8 +2,8 @@ diff -Naur visibility/DeprecatedDep/nonoptional/nonoptional-0.ebuild fixed/Depre
--- visibility/DeprecatedDep/nonoptional/nonoptional-0.ebuild 2019-12-04 01:58:11.110158861 -0700
+++ fixed/DeprecatedDep/nonoptional/nonoptional-0.ebuild 2019-12-26 20:39:32.575678628 -0700
@@ -4,4 +4,4 @@
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
KEYWORDS="~amd64"
-RDEPEND="stub/deprecated:0"
+RDEPEND="stub/unstable"
diff --git a/testdata/data/repos/visibility/VisibilityCheck/NonsolvableDepsInDev/fix.patch b/testdata/data/repos/visibility/VisibilityCheck/NonsolvableDepsInDev/fix.patch
index da3dae539..ddbc3197a 100644
--- a/testdata/data/repos/visibility/VisibilityCheck/NonsolvableDepsInDev/fix.patch
+++ b/testdata/data/repos/visibility/VisibilityCheck/NonsolvableDepsInDev/fix.patch
@@ -2,8 +2,8 @@ diff -Naur visibility/NonsolvableDepsInDev/masked/masked-0.ebuild fixed/Nonsolva
--- visibility/NonsolvableDepsInDev/masked/masked-0.ebuild 2019-11-27 18:23:39.530850730 -0700
+++ fixed/NonsolvableDepsInDev/masked/masked-0.ebuild 2019-11-27 18:38:01.414214409 -0700
@@ -4,4 +4,4 @@
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
KEYWORDS="~amd64"
-DEPEND="stub/masked"
+DEPEND="stub/unstable"
diff --git a/testdata/data/repos/visibility/VisibilityCheck/NonsolvableDepsInExp/fix.patch b/testdata/data/repos/visibility/VisibilityCheck/NonsolvableDepsInExp/fix.patch
index 2972545f8..af528066c 100644
--- a/testdata/data/repos/visibility/VisibilityCheck/NonsolvableDepsInExp/fix.patch
+++ b/testdata/data/repos/visibility/VisibilityCheck/NonsolvableDepsInExp/fix.patch
@@ -2,8 +2,8 @@ diff -Naur visibility/NonsolvableDepsInExp/masked/masked-0.ebuild fixed/Nonsolva
--- visibility/NonsolvableDepsInExp/masked/masked-0.ebuild 2019-11-27 18:23:39.530850730 -0700
+++ fixed/NonsolvableDepsInExp/masked/masked-0.ebuild 2019-11-27 18:38:54.209440054 -0700
@@ -4,4 +4,4 @@
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
KEYWORDS="~amd64"
-DEPEND="stub/masked"
+DEPEND="stub/unstable"
diff --git a/testdata/data/repos/visibility/VisibilityCheck/NonsolvableDepsInStable/fix.patch b/testdata/data/repos/visibility/VisibilityCheck/NonsolvableDepsInStable/fix.patch
index 942266615..06bc56669 100644
--- a/testdata/data/repos/visibility/VisibilityCheck/NonsolvableDepsInStable/fix.patch
+++ b/testdata/data/repos/visibility/VisibilityCheck/NonsolvableDepsInStable/fix.patch
@@ -2,8 +2,8 @@ diff -Naur visibility/NonsolvableDepsInStable/masked/masked-0.ebuild fixed/Nonso
--- visibility/NonsolvableDepsInStable/masked/masked-0.ebuild 2019-11-27 18:19:04.793488335 -0700
+++ fixed/NonsolvableDepsInStable/masked/masked-0.ebuild 2019-11-27 18:39:14.864528333 -0700
@@ -4,4 +4,4 @@
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
KEYWORDS="amd64"
-DEPEND="stub/masked"
+DEPEND="stub/stable"
@@ -11,8 +11,8 @@ diff -Naur visibility/NonsolvableDepsInStable/unstable/unstable-0.ebuild fixed/N
--- visibility/NonsolvableDepsInStable/unstable/unstable-0.ebuild 2019-11-27 18:19:37.794651982 -0700
+++ fixed/NonsolvableDepsInStable/unstable/unstable-0.ebuild 2019-11-27 18:39:23.950567166 -0700
@@ -4,4 +4,4 @@
- SLOT="0"
LICENSE="BSD"
+ SLOT="0"
KEYWORDS="amd64"
-DEPEND="stub/unstable"
+DEPEND="stub/stable"
diff --git a/testdata/repos/eclass/EapiCheck/UnsupportedEclassEapi/UnsupportedEclassEapi-0.ebuild b/testdata/repos/eclass/EapiCheck/UnsupportedEclassEapi/UnsupportedEclassEapi-0.ebuild
index ef8ee3fc4..e73ee6aaa 100644
--- a/testdata/repos/eclass/EapiCheck/UnsupportedEclassEapi/UnsupportedEclassEapi-0.ebuild
+++ b/testdata/repos/eclass/EapiCheck/UnsupportedEclassEapi/UnsupportedEclassEapi-0.ebuild
@@ -4,5 +4,5 @@ inherit stub
DESCRIPTION="Ebuild using an unsupported eclass"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/eclass/EclassParseCheck/EclassExportFuncsBeforeInherit/EclassExportFuncsBeforeInherit-1.ebuild b/testdata/repos/eclass/EclassParseCheck/EclassExportFuncsBeforeInherit/EclassExportFuncsBeforeInherit-1.ebuild
index afa54ffaa..11396ce1a 100644
--- a/testdata/repos/eclass/EclassParseCheck/EclassExportFuncsBeforeInherit/EclassExportFuncsBeforeInherit-1.ebuild
+++ b/testdata/repos/eclass/EclassParseCheck/EclassExportFuncsBeforeInherit/EclassExportFuncsBeforeInherit-1.ebuild
@@ -4,5 +4,5 @@ inherit export-funcs-before-inherit
DESCRIPTION="Ebuild using an eclass calling EXPORT_FUNCTIONS before inherit"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/eclass/EclassUsageCheck/DeprecatedEclass/DeprecatedEclass-0.ebuild b/testdata/repos/eclass/EclassUsageCheck/DeprecatedEclass/DeprecatedEclass-0.ebuild
index 889e45d1d..fb0e7f21e 100644
--- a/testdata/repos/eclass/EclassUsageCheck/DeprecatedEclass/DeprecatedEclass-0.ebuild
+++ b/testdata/repos/eclass/EclassUsageCheck/DeprecatedEclass/DeprecatedEclass-0.ebuild
@@ -2,8 +2,8 @@ EAPI=7
inherit deprecated
DESCRIPTION="Ebuild with deprecated eclass usage"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
src_prepare() {
deprecated_public_func
diff --git a/testdata/repos/eclass/EclassUsageCheck/DeprecatedEclass/DeprecatedEclass-1.ebuild b/testdata/repos/eclass/EclassUsageCheck/DeprecatedEclass/DeprecatedEclass-1.ebuild
index 02ab2b053..d3428242f 100644
--- a/testdata/repos/eclass/EclassUsageCheck/DeprecatedEclass/DeprecatedEclass-1.ebuild
+++ b/testdata/repos/eclass/EclassUsageCheck/DeprecatedEclass/DeprecatedEclass-1.ebuild
@@ -2,8 +2,8 @@ EAPI=7
inherit deprecated2
DESCRIPTION="Ebuild with deprecated eclass usage"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
src_prepare() {
deprecated2_public_func
diff --git a/testdata/repos/eclass/EclassUsageCheck/EclassUserVariableUsage/EclassUserVariableUsage-0.ebuild b/testdata/repos/eclass/EclassUsageCheck/EclassUserVariableUsage/EclassUserVariableUsage-0.ebuild
index dae4c7d19..02a9eae18 100644
--- a/testdata/repos/eclass/EclassUsageCheck/EclassUserVariableUsage/EclassUserVariableUsage-0.ebuild
+++ b/testdata/repos/eclass/EclassUsageCheck/EclassUserVariableUsage/EclassUserVariableUsage-0.ebuild
@@ -2,8 +2,8 @@ EAPI=8
inherit unquotedvariable
DESCRIPTION="Ebuild with user variable override"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
EBZR_STORE_DIR="/var/tmp/portage" # FAIL
diff --git a/testdata/repos/eclass/EclassUsageCheck/MisplacedEclassVar/MisplacedEclassVar-0.ebuild b/testdata/repos/eclass/EclassUsageCheck/MisplacedEclassVar/MisplacedEclassVar-0.ebuild
index 0bbb873c1..9d480d8ec 100644
--- a/testdata/repos/eclass/EclassUsageCheck/MisplacedEclassVar/MisplacedEclassVar-0.ebuild
+++ b/testdata/repos/eclass/EclassUsageCheck/MisplacedEclassVar/MisplacedEclassVar-0.ebuild
@@ -9,8 +9,8 @@ PRE_INHERIT_VAR="foo"
DESCRIPTION="Ebuild with misplaced pre-inherit eclass variable"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
src_prepare() {
default
diff --git a/testdata/repos/eclass/EclassUsageCheck/MisplacedEclassVar/MisplacedEclassVar-9999.ebuild b/testdata/repos/eclass/EclassUsageCheck/MisplacedEclassVar/MisplacedEclassVar-9999.ebuild
index f79596af1..b9954425b 100644
--- a/testdata/repos/eclass/EclassUsageCheck/MisplacedEclassVar/MisplacedEclassVar-9999.ebuild
+++ b/testdata/repos/eclass/EclassUsageCheck/MisplacedEclassVar/MisplacedEclassVar-9999.ebuild
@@ -9,8 +9,8 @@ inherit pre-inherit
DESCRIPTION="Ebuild with properly set pre-inherit eclass variable"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
src_prepare() {
default
diff --git a/testdata/repos/eclass/EclassUsageCheck/ProvidedEclassInherit/ProvidedEclassInherit-0.ebuild b/testdata/repos/eclass/EclassUsageCheck/ProvidedEclassInherit/ProvidedEclassInherit-0.ebuild
index cd8585ea8..b90abac7f 100644
--- a/testdata/repos/eclass/EclassUsageCheck/ProvidedEclassInherit/ProvidedEclassInherit-0.ebuild
+++ b/testdata/repos/eclass/EclassUsageCheck/ProvidedEclassInherit/ProvidedEclassInherit-0.ebuild
@@ -2,8 +2,8 @@ EAPI=7
inherit inherit deep-provided-inherit
DESCRIPTION="Ebuild inheriting provided eclass"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
src_prepare() {
inherit_public_func
diff --git a/testdata/repos/eclass/InheritsCheck/IndirectInherits/IndirectInherits-0.ebuild b/testdata/repos/eclass/InheritsCheck/IndirectInherits/IndirectInherits-0.ebuild
index 8c5e44d9a..1ffd74df9 100644
--- a/testdata/repos/eclass/InheritsCheck/IndirectInherits/IndirectInherits-0.ebuild
+++ b/testdata/repos/eclass/InheritsCheck/IndirectInherits/IndirectInherits-0.ebuild
@@ -4,8 +4,8 @@ inherit indirect-inherit
DESCRIPTION="Ebuild relying on indirect inherit"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
src_prepare() {
inherit_public_func
diff --git a/testdata/repos/eclass/InheritsCheck/IndirectInherits/IndirectInherits-1.ebuild b/testdata/repos/eclass/InheritsCheck/IndirectInherits/IndirectInherits-1.ebuild
index ea0ed36e2..6aa5948b4 100644
--- a/testdata/repos/eclass/InheritsCheck/IndirectInherits/IndirectInherits-1.ebuild
+++ b/testdata/repos/eclass/InheritsCheck/IndirectInherits/IndirectInherits-1.ebuild
@@ -4,8 +4,8 @@ inherit deep-provided-inherit
DESCRIPTION="Ebuild relying on indirect inherit"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
src_prepare() {
inherit_public_func
diff --git a/testdata/repos/eclass/InheritsCheck/InternalEclassUsage/InternalEclassUsage-0.ebuild b/testdata/repos/eclass/InheritsCheck/InternalEclassUsage/InternalEclassUsage-0.ebuild
index 6fc6c3c1b..ed6942a62 100644
--- a/testdata/repos/eclass/InheritsCheck/InternalEclassUsage/InternalEclassUsage-0.ebuild
+++ b/testdata/repos/eclass/InheritsCheck/InternalEclassUsage/InternalEclassUsage-0.ebuild
@@ -4,8 +4,8 @@ inherit inherit
DESCRIPTION="Ebuild using an internal eclass function"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
src_prepare() {
inherit_public_func
diff --git a/testdata/repos/eclass/InheritsCheck/MissingInherits/MissingInherits-0.ebuild b/testdata/repos/eclass/InheritsCheck/MissingInherits/MissingInherits-0.ebuild
index 13df6ad75..ac217fc15 100644
--- a/testdata/repos/eclass/InheritsCheck/MissingInherits/MissingInherits-0.ebuild
+++ b/testdata/repos/eclass/InheritsCheck/MissingInherits/MissingInherits-0.ebuild
@@ -2,8 +2,8 @@ EAPI=7
DESCRIPTION="Ebuild missing an eclass inherit"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
src_prepare() {
inherit_public_func
diff --git a/testdata/repos/eclass/InheritsCheck/MissingInherits/MissingInherits-1.ebuild b/testdata/repos/eclass/InheritsCheck/MissingInherits/MissingInherits-1.ebuild
index 6a8cfe0ad..b318d8c11 100644
--- a/testdata/repos/eclass/InheritsCheck/MissingInherits/MissingInherits-1.ebuild
+++ b/testdata/repos/eclass/InheritsCheck/MissingInherits/MissingInherits-1.ebuild
@@ -6,8 +6,8 @@ fi
DESCRIPTION="Ebuild with conditional eclass usage"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
src_prepare() {
[[ ${PV} == "9999" ]] && vcs_public_function
diff --git a/testdata/repos/eclass/InheritsCheck/MissingInherits/MissingInherits-2.ebuild b/testdata/repos/eclass/InheritsCheck/MissingInherits/MissingInherits-2.ebuild
index 025d284c2..c57c2e386 100644
--- a/testdata/repos/eclass/InheritsCheck/MissingInherits/MissingInherits-2.ebuild
+++ b/testdata/repos/eclass/InheritsCheck/MissingInherits/MissingInherits-2.ebuild
@@ -2,8 +2,8 @@ EAPI=7
DESCRIPTION="Ebuild missing an eclass inherit"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
src_prepare() {
inherit_public_func
diff --git a/testdata/repos/eclass/InheritsCheck/UnusedInherits/UnusedInherits-0.ebuild b/testdata/repos/eclass/InheritsCheck/UnusedInherits/UnusedInherits-0.ebuild
index 93140ac56..2257ca595 100644
--- a/testdata/repos/eclass/InheritsCheck/UnusedInherits/UnusedInherits-0.ebuild
+++ b/testdata/repos/eclass/InheritsCheck/UnusedInherits/UnusedInherits-0.ebuild
@@ -4,8 +4,8 @@ inherit inherit unused
DESCRIPTION="Ebuild inheriting an unused eclass"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
src_prepare() {
inherit_public_func
diff --git a/testdata/repos/eclass/InheritsCheck/UnusedInherits/UnusedInherits-1.ebuild b/testdata/repos/eclass/InheritsCheck/UnusedInherits/UnusedInherits-1.ebuild
index d3aaef8aa..1e417c4c8 100644
--- a/testdata/repos/eclass/InheritsCheck/UnusedInherits/UnusedInherits-1.ebuild
+++ b/testdata/repos/eclass/InheritsCheck/UnusedInherits/UnusedInherits-1.ebuild
@@ -4,8 +4,8 @@ inherit inherit unused
DESCRIPTION="Ebuild using inherited function indirectly"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
src_prepare() {
inherit_public_func
diff --git a/testdata/repos/eclass/InheritsCheck/UnusedInherits/UnusedInherits-2.ebuild b/testdata/repos/eclass/InheritsCheck/UnusedInherits/UnusedInherits-2.ebuild
index 320a61bd3..fda8d6bcd 100644
--- a/testdata/repos/eclass/InheritsCheck/UnusedInherits/UnusedInherits-2.ebuild
+++ b/testdata/repos/eclass/InheritsCheck/UnusedInherits/UnusedInherits-2.ebuild
@@ -4,5 +4,5 @@ inherit elisp readme.gentoo-r1
DESCRIPTION="Ebuild with weak usage inheritance"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/eclass/stub/stub1/stub1-0.ebuild b/testdata/repos/eclass/stub/stub1/stub1-0.ebuild
index b4a3f4602..a54462b65 100644
--- a/testdata/repos/eclass/stub/stub1/stub1-0.ebuild
+++ b/testdata/repos/eclass/stub/stub1/stub1-0.ebuild
@@ -4,8 +4,8 @@ inherit missing no-maintainer replacement vcs
DESCRIPTION="Stub ebuild used to suppress unwanted results"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
src_prepare() {
missing-docs_documented_func
diff --git a/testdata/repos/gentoo/CatMissingMetadataXml/stub1/stub1-0.ebuild b/testdata/repos/gentoo/CatMissingMetadataXml/stub1/stub1-0.ebuild
index c29f208f1..171a7e066 100644
--- a/testdata/repos/gentoo/CatMissingMetadataXml/stub1/stub1-0.ebuild
+++ b/testdata/repos/gentoo/CatMissingMetadataXml/stub1/stub1-0.ebuild
@@ -3,5 +3,5 @@
DESCRIPTION="Stub package to populate category"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/gentoo/CatMissingMetadataXml/stub2/stub2-0.ebuild b/testdata/repos/gentoo/CatMissingMetadataXml/stub2/stub2-0.ebuild
index c29f208f1..171a7e066 100644
--- a/testdata/repos/gentoo/CatMissingMetadataXml/stub2/stub2-0.ebuild
+++ b/testdata/repos/gentoo/CatMissingMetadataXml/stub2/stub2-0.ebuild
@@ -3,5 +3,5 @@
DESCRIPTION="Stub package to populate category"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/gentoo/EbuildHeaderCheck/EbuildInvalidCopyright/EbuildInvalidCopyright-0.ebuild b/testdata/repos/gentoo/EbuildHeaderCheck/EbuildInvalidCopyright/EbuildInvalidCopyright-0.ebuild
index 2b145c356..a7044f4d8 100644
--- a/testdata/repos/gentoo/EbuildHeaderCheck/EbuildInvalidCopyright/EbuildInvalidCopyright-0.ebuild
+++ b/testdata/repos/gentoo/EbuildHeaderCheck/EbuildInvalidCopyright/EbuildInvalidCopyright-0.ebuild
@@ -3,5 +3,5 @@
DESCRIPTION="Ebuild with an invalid copyright header"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/gentoo/EbuildHeaderCheck/EbuildInvalidLicenseHeader/EbuildInvalidLicenseHeader-0.ebuild b/testdata/repos/gentoo/EbuildHeaderCheck/EbuildInvalidLicenseHeader/EbuildInvalidLicenseHeader-0.ebuild
index d3b7fc563..d5bb9773a 100644
--- a/testdata/repos/gentoo/EbuildHeaderCheck/EbuildInvalidLicenseHeader/EbuildInvalidLicenseHeader-0.ebuild
+++ b/testdata/repos/gentoo/EbuildHeaderCheck/EbuildInvalidLicenseHeader/EbuildInvalidLicenseHeader-0.ebuild
@@ -3,5 +3,5 @@
DESCRIPTION="Ebuild with invalid license header"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/gentoo/EbuildHeaderCheck/EbuildInvalidLicenseHeader/EbuildInvalidLicenseHeader-1.ebuild b/testdata/repos/gentoo/EbuildHeaderCheck/EbuildInvalidLicenseHeader/EbuildInvalidLicenseHeader-1.ebuild
index 8fac74d49..831ced6d0 100644
--- a/testdata/repos/gentoo/EbuildHeaderCheck/EbuildInvalidLicenseHeader/EbuildInvalidLicenseHeader-1.ebuild
+++ b/testdata/repos/gentoo/EbuildHeaderCheck/EbuildInvalidLicenseHeader/EbuildInvalidLicenseHeader-1.ebuild
@@ -2,5 +2,5 @@
DESCRIPTION="Ebuild with invalid license header"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/gentoo/EbuildHeaderCheck/EbuildNonGentooAuthorsCopyright/EbuildNonGentooAuthorsCopyright-0.ebuild b/testdata/repos/gentoo/EbuildHeaderCheck/EbuildNonGentooAuthorsCopyright/EbuildNonGentooAuthorsCopyright-0.ebuild
index 78b166786..3d5d05d27 100644
--- a/testdata/repos/gentoo/EbuildHeaderCheck/EbuildNonGentooAuthorsCopyright/EbuildNonGentooAuthorsCopyright-0.ebuild
+++ b/testdata/repos/gentoo/EbuildHeaderCheck/EbuildNonGentooAuthorsCopyright/EbuildNonGentooAuthorsCopyright-0.ebuild
@@ -3,5 +3,5 @@
DESCRIPTION="Ebuild with non-Gentoo copyright header"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/gentoo/EbuildHeaderCheck/EbuildOldGentooCopyright/EbuildOldGentooCopyright-0.ebuild b/testdata/repos/gentoo/EbuildHeaderCheck/EbuildOldGentooCopyright/EbuildOldGentooCopyright-0.ebuild
index 38f2917f2..8424aefb2 100644
--- a/testdata/repos/gentoo/EbuildHeaderCheck/EbuildOldGentooCopyright/EbuildOldGentooCopyright-0.ebuild
+++ b/testdata/repos/gentoo/EbuildHeaderCheck/EbuildOldGentooCopyright/EbuildOldGentooCopyright-0.ebuild
@@ -3,5 +3,5 @@
DESCRIPTION="Ebuild with old copyright header"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/gentoo/PackageMetadataXmlCheck/InvalidMetadataRestrict/InvalidMetadataRestrict-0.ebuild b/testdata/repos/gentoo/PackageMetadataXmlCheck/InvalidMetadataRestrict/InvalidMetadataRestrict-0.ebuild
index eb5d8297e..7ca72a01a 100644
--- a/testdata/repos/gentoo/PackageMetadataXmlCheck/InvalidMetadataRestrict/InvalidMetadataRestrict-0.ebuild
+++ b/testdata/repos/gentoo/PackageMetadataXmlCheck/InvalidMetadataRestrict/InvalidMetadataRestrict-0.ebuild
@@ -3,6 +3,6 @@
DESCRIPTION="Package metadata.xml with invalid restrict"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
IUSE="flag1"
diff --git a/testdata/repos/gentoo/PackageMetadataXmlCheck/MaintainerNeeded/MaintainerNeeded-0.ebuild b/testdata/repos/gentoo/PackageMetadataXmlCheck/MaintainerNeeded/MaintainerNeeded-0.ebuild
index ffeaf2f70..a193115b1 100644
--- a/testdata/repos/gentoo/PackageMetadataXmlCheck/MaintainerNeeded/MaintainerNeeded-0.ebuild
+++ b/testdata/repos/gentoo/PackageMetadataXmlCheck/MaintainerNeeded/MaintainerNeeded-0.ebuild
@@ -3,5 +3,5 @@
DESCRIPTION="Package metadata.xml with missing maintainer-needed comment"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/gentoo/PackageMetadataXmlCheck/MaintainerNeeded2/MaintainerNeeded2-0.ebuild b/testdata/repos/gentoo/PackageMetadataXmlCheck/MaintainerNeeded2/MaintainerNeeded2-0.ebuild
index 11fa88b96..e7d22476e 100644
--- a/testdata/repos/gentoo/PackageMetadataXmlCheck/MaintainerNeeded2/MaintainerNeeded2-0.ebuild
+++ b/testdata/repos/gentoo/PackageMetadataXmlCheck/MaintainerNeeded2/MaintainerNeeded2-0.ebuild
@@ -3,5 +3,5 @@
DESCRIPTION="Package metadata.xml with invalid missing maintainer-needed comment"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/gentoo/PackageMetadataXmlCheck/MaintainerWithoutProxy/MaintainerWithoutProxy-0.ebuild b/testdata/repos/gentoo/PackageMetadataXmlCheck/MaintainerWithoutProxy/MaintainerWithoutProxy-0.ebuild
index 41bdcd2ee..4e06b2c73 100644
--- a/testdata/repos/gentoo/PackageMetadataXmlCheck/MaintainerWithoutProxy/MaintainerWithoutProxy-0.ebuild
+++ b/testdata/repos/gentoo/PackageMetadataXmlCheck/MaintainerWithoutProxy/MaintainerWithoutProxy-0.ebuild
@@ -3,5 +3,5 @@
DESCRIPTION="Ebuild with non gentoo maintainer without proxy in metadata.xml"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/gentoo/PackageMetadataXmlCheck/MaintainerWithoutProxy2/MaintainerWithoutProxy2-0.ebuild b/testdata/repos/gentoo/PackageMetadataXmlCheck/MaintainerWithoutProxy2/MaintainerWithoutProxy2-0.ebuild
index 41bdcd2ee..4e06b2c73 100644
--- a/testdata/repos/gentoo/PackageMetadataXmlCheck/MaintainerWithoutProxy2/MaintainerWithoutProxy2-0.ebuild
+++ b/testdata/repos/gentoo/PackageMetadataXmlCheck/MaintainerWithoutProxy2/MaintainerWithoutProxy2-0.ebuild
@@ -3,5 +3,5 @@
DESCRIPTION="Ebuild with non gentoo maintainer without proxy in metadata.xml"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/gentoo/PackageMetadataXmlCheck/NonexistentProjectMaintainer/NonexistentProjectMaintainer-0.ebuild b/testdata/repos/gentoo/PackageMetadataXmlCheck/NonexistentProjectMaintainer/NonexistentProjectMaintainer-0.ebuild
index d01a05d53..adc712677 100644
--- a/testdata/repos/gentoo/PackageMetadataXmlCheck/NonexistentProjectMaintainer/NonexistentProjectMaintainer-0.ebuild
+++ b/testdata/repos/gentoo/PackageMetadataXmlCheck/NonexistentProjectMaintainer/NonexistentProjectMaintainer-0.ebuild
@@ -3,5 +3,5 @@
DESCRIPTION="Package metadata.xml with nonexistent project"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/gentoo/PackageMetadataXmlCheck/PkgMissingMetadataXml/PkgMissingMetadataXml-0.ebuild b/testdata/repos/gentoo/PackageMetadataXmlCheck/PkgMissingMetadataXml/PkgMissingMetadataXml-0.ebuild
index e7a993f2b..c3a7b12c7 100644
--- a/testdata/repos/gentoo/PackageMetadataXmlCheck/PkgMissingMetadataXml/PkgMissingMetadataXml-0.ebuild
+++ b/testdata/repos/gentoo/PackageMetadataXmlCheck/PkgMissingMetadataXml/PkgMissingMetadataXml-0.ebuild
@@ -3,5 +3,5 @@
DESCRIPTION="Ebuild with missing metadata.xml"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/gentoo/PackageMetadataXmlCheck/ProxyWithoutProxied/ProxyWithoutProxied-0.ebuild b/testdata/repos/gentoo/PackageMetadataXmlCheck/ProxyWithoutProxied/ProxyWithoutProxied-0.ebuild
index f8fa8a0ae..e58d7dfb1 100644
--- a/testdata/repos/gentoo/PackageMetadataXmlCheck/ProxyWithoutProxied/ProxyWithoutProxied-0.ebuild
+++ b/testdata/repos/gentoo/PackageMetadataXmlCheck/ProxyWithoutProxied/ProxyWithoutProxied-0.ebuild
@@ -3,5 +3,5 @@
DESCRIPTION="Ebuild with proxy-maint in metadata.xml without proxied non-dev"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/gentoo/PackageMetadataXmlCheck/ProxyWithoutProxied2/ProxyWithoutProxied2-0.ebuild b/testdata/repos/gentoo/PackageMetadataXmlCheck/ProxyWithoutProxied2/ProxyWithoutProxied2-0.ebuild
index f8fa8a0ae..e58d7dfb1 100644
--- a/testdata/repos/gentoo/PackageMetadataXmlCheck/ProxyWithoutProxied2/ProxyWithoutProxied2-0.ebuild
+++ b/testdata/repos/gentoo/PackageMetadataXmlCheck/ProxyWithoutProxied2/ProxyWithoutProxied2-0.ebuild
@@ -3,5 +3,5 @@
DESCRIPTION="Ebuild with proxy-maint in metadata.xml without proxied non-dev"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/gentoo/PackageMetadataXmlCheck/ProxyWithoutProxied3/ProxyWithoutProxied3-0.ebuild b/testdata/repos/gentoo/PackageMetadataXmlCheck/ProxyWithoutProxied3/ProxyWithoutProxied3-0.ebuild
index f8fa8a0ae..e58d7dfb1 100644
--- a/testdata/repos/gentoo/PackageMetadataXmlCheck/ProxyWithoutProxied3/ProxyWithoutProxied3-0.ebuild
+++ b/testdata/repos/gentoo/PackageMetadataXmlCheck/ProxyWithoutProxied3/ProxyWithoutProxied3-0.ebuild
@@ -3,5 +3,5 @@
DESCRIPTION="Ebuild with proxy-maint in metadata.xml without proxied non-dev"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/gentoo/PackageMetadataXmlCheck/RedundantLongDescription/RedundantLongDescription-0.ebuild b/testdata/repos/gentoo/PackageMetadataXmlCheck/RedundantLongDescription/RedundantLongDescription-0.ebuild
index aed8880da..fab93b7b0 100644
--- a/testdata/repos/gentoo/PackageMetadataXmlCheck/RedundantLongDescription/RedundantLongDescription-0.ebuild
+++ b/testdata/repos/gentoo/PackageMetadataXmlCheck/RedundantLongDescription/RedundantLongDescription-0.ebuild
@@ -3,5 +3,5 @@
DESCRIPTION="Package metadata.xml with missing maintainer and maintainer-needed commit"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/gentoo/PackageMetadataXmlCheck/WrongMaintainerType/WrongMaintainerType-0.ebuild b/testdata/repos/gentoo/PackageMetadataXmlCheck/WrongMaintainerType/WrongMaintainerType-0.ebuild
index 1b1deb401..955b2d17d 100644
--- a/testdata/repos/gentoo/PackageMetadataXmlCheck/WrongMaintainerType/WrongMaintainerType-0.ebuild
+++ b/testdata/repos/gentoo/PackageMetadataXmlCheck/WrongMaintainerType/WrongMaintainerType-0.ebuild
@@ -3,5 +3,5 @@
DESCRIPTION="Package metadata.xml with wrong maintainer type"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/gentoo/PkgDirCheck/UnknownPkgDirEntry/UnknownPkgDirEntry-0.ebuild b/testdata/repos/gentoo/PkgDirCheck/UnknownPkgDirEntry/UnknownPkgDirEntry-0.ebuild
index 240bf6260..a1b610b74 100644
--- a/testdata/repos/gentoo/PkgDirCheck/UnknownPkgDirEntry/UnknownPkgDirEntry-0.ebuild
+++ b/testdata/repos/gentoo/PkgDirCheck/UnknownPkgDirEntry/UnknownPkgDirEntry-0.ebuild
@@ -3,5 +3,5 @@
DESCRIPTION="File in package dir is unknown"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/gentoo/UnstableOnlyCheck/UnstableOnly/UnstableOnly-0.ebuild b/testdata/repos/gentoo/UnstableOnlyCheck/UnstableOnly/UnstableOnly-0.ebuild
index 73db33372..8f78f2783 100644
--- a/testdata/repos/gentoo/UnstableOnlyCheck/UnstableOnly/UnstableOnly-0.ebuild
+++ b/testdata/repos/gentoo/UnstableOnlyCheck/UnstableOnly/UnstableOnly-0.ebuild
@@ -3,6 +3,6 @@
DESCRIPTION="Ebuild with only unstable keywords"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
KEYWORDS="~amd64"
diff --git a/testdata/repos/gentoo/UseFlagsWithoutEffectsCheck/UseFlagWithoutDeps/UseFlagWithoutDeps-0.ebuild b/testdata/repos/gentoo/UseFlagsWithoutEffectsCheck/UseFlagWithoutDeps/UseFlagWithoutDeps-0.ebuild
index f69263a32..a452ecbc8 100644
--- a/testdata/repos/gentoo/UseFlagsWithoutEffectsCheck/UseFlagWithoutDeps/UseFlagWithoutDeps-0.ebuild
+++ b/testdata/repos/gentoo/UseFlagsWithoutEffectsCheck/UseFlagWithoutDeps/UseFlagWithoutDeps-0.ebuild
@@ -6,6 +6,6 @@ EAPI=8
DESCRIPTION="Ebuild with valid USE flags"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
IUSE="used"
diff --git a/testdata/repos/gentoo/UseFlagsWithoutEffectsCheck/UseFlagWithoutDeps/UseFlagWithoutDeps-1.ebuild b/testdata/repos/gentoo/UseFlagsWithoutEffectsCheck/UseFlagWithoutDeps/UseFlagWithoutDeps-1.ebuild
index 8fbe27cd5..ffd79d183 100644
--- a/testdata/repos/gentoo/UseFlagsWithoutEffectsCheck/UseFlagWithoutDeps/UseFlagWithoutDeps-1.ebuild
+++ b/testdata/repos/gentoo/UseFlagsWithoutEffectsCheck/UseFlagWithoutDeps/UseFlagWithoutDeps-1.ebuild
@@ -6,8 +6,8 @@ EAPI=8
DESCRIPTION="Ebuild with valid USE flags"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
IUSE="ipv6"
src_compile() {
diff --git a/testdata/repos/gentoo/UseFlagsWithoutEffectsCheck/UseFlagWithoutDeps/UseFlagWithoutDeps-2.ebuild b/testdata/repos/gentoo/UseFlagsWithoutEffectsCheck/UseFlagWithoutDeps/UseFlagWithoutDeps-2.ebuild
index 92c6c6a89..232023d85 100644
--- a/testdata/repos/gentoo/UseFlagsWithoutEffectsCheck/UseFlagWithoutDeps/UseFlagWithoutDeps-2.ebuild
+++ b/testdata/repos/gentoo/UseFlagsWithoutEffectsCheck/UseFlagWithoutDeps/UseFlagWithoutDeps-2.ebuild
@@ -6,8 +6,8 @@ EAPI=8
DESCRIPTION="Ebuild with unnecessary USE flags"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
IUSE="bash-completion ipv6"
src_compile() {
diff --git a/testdata/repos/gentoo/UseFlagsWithoutEffectsCheck/UseFlagWithoutDeps/UseFlagWithoutDeps-3.ebuild b/testdata/repos/gentoo/UseFlagsWithoutEffectsCheck/UseFlagWithoutDeps/UseFlagWithoutDeps-3.ebuild
index d6d6abd63..4ed38e540 100644
--- a/testdata/repos/gentoo/UseFlagsWithoutEffectsCheck/UseFlagWithoutDeps/UseFlagWithoutDeps-3.ebuild
+++ b/testdata/repos/gentoo/UseFlagsWithoutEffectsCheck/UseFlagWithoutDeps/UseFlagWithoutDeps-3.ebuild
@@ -6,8 +6,8 @@ EAPI=8
DESCRIPTION="Ebuild with valid USE flags"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
IUSE="bash-completion ipv6"
BDEPEND="
diff --git a/testdata/repos/gentoo/UseFlagsWithoutEffectsCheck/UseFlagWithoutDeps/UseFlagWithoutDeps-4.ebuild b/testdata/repos/gentoo/UseFlagsWithoutEffectsCheck/UseFlagWithoutDeps/UseFlagWithoutDeps-4.ebuild
index 388637170..3b83b424d 100644
--- a/testdata/repos/gentoo/UseFlagsWithoutEffectsCheck/UseFlagWithoutDeps/UseFlagWithoutDeps-4.ebuild
+++ b/testdata/repos/gentoo/UseFlagsWithoutEffectsCheck/UseFlagWithoutDeps/UseFlagWithoutDeps-4.ebuild
@@ -6,8 +6,8 @@ EAPI=8
DESCRIPTION="Ebuild with valid USE flags"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
IUSE="bash-completion ipv6"
BDEPEND="
diff --git a/testdata/repos/overlay/UnusedInMastersCheck/UnusedInMastersEclasses/UnusedInMastersEclasses-0.ebuild b/testdata/repos/overlay/UnusedInMastersCheck/UnusedInMastersEclasses/UnusedInMastersEclasses-0.ebuild
index 67f031ee6..9190ab8bd 100644
--- a/testdata/repos/overlay/UnusedInMastersCheck/UnusedInMastersEclasses/UnusedInMastersEclasses-0.ebuild
+++ b/testdata/repos/overlay/UnusedInMastersCheck/UnusedInMastersEclasses/UnusedInMastersEclasses-0.ebuild
@@ -2,5 +2,5 @@ inherit unused
DESCRIPTION="Ebuild using eclass from master repo"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/overlay/UnusedInMastersCheck/UnusedInMastersGlobalUse/UnusedInMastersGlobalUse-0.ebuild b/testdata/repos/overlay/UnusedInMastersCheck/UnusedInMastersGlobalUse/UnusedInMastersGlobalUse-0.ebuild
index 5f7be6873..ac904605c 100644
--- a/testdata/repos/overlay/UnusedInMastersCheck/UnusedInMastersGlobalUse/UnusedInMastersGlobalUse-0.ebuild
+++ b/testdata/repos/overlay/UnusedInMastersCheck/UnusedInMastersGlobalUse/UnusedInMastersGlobalUse-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild using global USE flag from master repo"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
IUSE="unused"
diff --git a/testdata/repos/overlay/UnusedInMastersCheck/UnusedInMastersLicenses/UnusedInMastersLicenses-0.ebuild b/testdata/repos/overlay/UnusedInMastersCheck/UnusedInMastersLicenses/UnusedInMastersLicenses-0.ebuild
index 6d4c85949..22f0ce529 100644
--- a/testdata/repos/overlay/UnusedInMastersCheck/UnusedInMastersLicenses/UnusedInMastersLicenses-0.ebuild
+++ b/testdata/repos/overlay/UnusedInMastersCheck/UnusedInMastersLicenses/UnusedInMastersLicenses-0.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Ebuild using LICENSE from master repo"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="unused"
+SLOT="0"
diff --git a/testdata/repos/overlay/UnusedInMastersCheck/UnusedInMastersMirrors/UnusedInMastersMirrors-0.ebuild b/testdata/repos/overlay/UnusedInMastersCheck/UnusedInMastersMirrors/UnusedInMastersMirrors-0.ebuild
index 017c9e41e..d2b7dabfc 100644
--- a/testdata/repos/overlay/UnusedInMastersCheck/UnusedInMastersMirrors/UnusedInMastersMirrors-0.ebuild
+++ b/testdata/repos/overlay/UnusedInMastersCheck/UnusedInMastersMirrors/UnusedInMastersMirrors-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild using mirror from master repo"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
SRC_URI="mirror://overlayed/${P}.tar.gz"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/overlayed/stub/stub1/stub1-0.ebuild b/testdata/repos/overlayed/stub/stub1/stub1-0.ebuild
index 303edbd88..54922dd18 100644
--- a/testdata/repos/overlayed/stub/stub1/stub1-0.ebuild
+++ b/testdata/repos/overlayed/stub/stub1/stub1-0.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Stub ebuild used to suppress other repo-level keyword output"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/profiledir/RedundantVersionCheck/RedundantVersion/RedundantVersion-1.ebuild b/testdata/repos/profiledir/RedundantVersionCheck/RedundantVersion/RedundantVersion-1.ebuild
index 2e970b4aa..35650de26 100644
--- a/testdata/repos/profiledir/RedundantVersionCheck/RedundantVersion/RedundantVersion-1.ebuild
+++ b/testdata/repos/profiledir/RedundantVersionCheck/RedundantVersion/RedundantVersion-1.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Stub ebuild used for RedundantVersion checks"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
KEYWORDS="amd64 x86"
diff --git a/testdata/repos/profiledir/RedundantVersionCheck/RedundantVersion/RedundantVersion-2.ebuild b/testdata/repos/profiledir/RedundantVersionCheck/RedundantVersion/RedundantVersion-2.ebuild
index 2e970b4aa..35650de26 100644
--- a/testdata/repos/profiledir/RedundantVersionCheck/RedundantVersion/RedundantVersion-2.ebuild
+++ b/testdata/repos/profiledir/RedundantVersionCheck/RedundantVersion/RedundantVersion-2.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Stub ebuild used for RedundantVersion checks"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
KEYWORDS="amd64 x86"
diff --git a/testdata/repos/profiledir/RedundantVersionCheck/RedundantVersion/RedundantVersion-3.ebuild b/testdata/repos/profiledir/RedundantVersionCheck/RedundantVersion/RedundantVersion-3.ebuild
index 407949a60..e8f337223 100644
--- a/testdata/repos/profiledir/RedundantVersionCheck/RedundantVersion/RedundantVersion-3.ebuild
+++ b/testdata/repos/profiledir/RedundantVersionCheck/RedundantVersion/RedundantVersion-3.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Stub ebuild used for RedundantVersion checks"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
KEYWORDS="~amd64 ~x86"
diff --git a/testdata/repos/profiledir/RedundantVersionCheck/RedundantVersion/RedundantVersion-4.ebuild b/testdata/repos/profiledir/RedundantVersionCheck/RedundantVersion/RedundantVersion-4.ebuild
index 407949a60..e8f337223 100644
--- a/testdata/repos/profiledir/RedundantVersionCheck/RedundantVersion/RedundantVersion-4.ebuild
+++ b/testdata/repos/profiledir/RedundantVersionCheck/RedundantVersion/RedundantVersion-4.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Stub ebuild used for RedundantVersion checks"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
KEYWORDS="~amd64 ~x86"
diff --git a/testdata/repos/profiledir/RedundantVersionCheck/RedundantVersion/RedundantVersion-5.ebuild b/testdata/repos/profiledir/RedundantVersionCheck/RedundantVersion/RedundantVersion-5.ebuild
index 407949a60..e8f337223 100644
--- a/testdata/repos/profiledir/RedundantVersionCheck/RedundantVersion/RedundantVersion-5.ebuild
+++ b/testdata/repos/profiledir/RedundantVersionCheck/RedundantVersion/RedundantVersion-5.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Stub ebuild used for RedundantVersion checks"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
KEYWORDS="~amd64 ~x86"
diff --git a/testdata/repos/profiledir/RedundantVersionCheck/RedundantVersion/RedundantVersion-6.ebuild b/testdata/repos/profiledir/RedundantVersionCheck/RedundantVersion/RedundantVersion-6.ebuild
index 407949a60..e8f337223 100644
--- a/testdata/repos/profiledir/RedundantVersionCheck/RedundantVersion/RedundantVersion-6.ebuild
+++ b/testdata/repos/profiledir/RedundantVersionCheck/RedundantVersion/RedundantVersion-6.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Stub ebuild used for RedundantVersion checks"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
KEYWORDS="~amd64 ~x86"
diff --git a/testdata/repos/profiledir/cat/pkg1/pkg1-0.ebuild b/testdata/repos/profiledir/cat/pkg1/pkg1-0.ebuild
index 2ba786ea6..8671e1c40 100644
--- a/testdata/repos/profiledir/cat/pkg1/pkg1-0.ebuild
+++ b/testdata/repos/profiledir/cat/pkg1/pkg1-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Stub ebuild used for various profile pkg entries"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
IUSE="used"
diff --git a/testdata/repos/profiledir/cat/pkg2/pkg2-0.ebuild b/testdata/repos/profiledir/cat/pkg2/pkg2-0.ebuild
index 2ba786ea6..8671e1c40 100644
--- a/testdata/repos/profiledir/cat/pkg2/pkg2-0.ebuild
+++ b/testdata/repos/profiledir/cat/pkg2/pkg2-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Stub ebuild used for various profile pkg entries"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
IUSE="used"
diff --git a/testdata/repos/profiledir/cat/pkg3/pkg3-0.ebuild b/testdata/repos/profiledir/cat/pkg3/pkg3-0.ebuild
index 16971ee78..1265dc954 100644
--- a/testdata/repos/profiledir/cat/pkg3/pkg3-0.ebuild
+++ b/testdata/repos/profiledir/cat/pkg3/pkg3-0.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Stub ebuild used for various profile pkg entries"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/profiledir/cat/pkg4/pkg4-0.ebuild b/testdata/repos/profiledir/cat/pkg4/pkg4-0.ebuild
index 16971ee78..1265dc954 100644
--- a/testdata/repos/profiledir/cat/pkg4/pkg4-0.ebuild
+++ b/testdata/repos/profiledir/cat/pkg4/pkg4-0.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Stub ebuild used for various profile pkg entries"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/python/app-arch/unzip/unzip-0.ebuild b/testdata/repos/python/app-arch/unzip/unzip-0.ebuild
index 0b7766f5f..347f8371c 100644
--- a/testdata/repos/python/app-arch/unzip/unzip-0.ebuild
+++ b/testdata/repos/python/app-arch/unzip/unzip-0.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Stub unzip package to suppress NonexistentDeps results"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/python/stub/stub1/stub1-0.ebuild b/testdata/repos/python/stub/stub1/stub1-0.ebuild
index 227a3fc80..5287f89eb 100644
--- a/testdata/repos/python/stub/stub1/stub1-0.ebuild
+++ b/testdata/repos/python/stub/stub1/stub1-0.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Stub ebuild used for various ebuild deps"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/python/stub/stub2/stub2-0.ebuild b/testdata/repos/python/stub/stub2/stub2-0.ebuild
index 64311f026..b55455365 100644
--- a/testdata/repos/python/stub/stub2/stub2-0.ebuild
+++ b/testdata/repos/python/stub/stub2/stub2-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Stub ebuild used for various ebuild deps"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
IUSE="disabled exists"
diff --git a/testdata/repos/standalone/BadCommandsCheck/BannedEapiCommand/BannedEapiCommand-0.ebuild b/testdata/repos/standalone/BadCommandsCheck/BannedEapiCommand/BannedEapiCommand-0.ebuild
index 304308b5e..cf444c78a 100644
--- a/testdata/repos/standalone/BadCommandsCheck/BannedEapiCommand/BannedEapiCommand-0.ebuild
+++ b/testdata/repos/standalone/BadCommandsCheck/BannedEapiCommand/BannedEapiCommand-0.ebuild
@@ -2,8 +2,8 @@ EAPI=7
DESCRIPTION="Ebuild using banned EAPI command"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
src_install() {
dohtml doc/*
diff --git a/testdata/repos/standalone/BadCommandsCheck/BannedEapiCommand/BannedEapiCommand-1.ebuild b/testdata/repos/standalone/BadCommandsCheck/BannedEapiCommand/BannedEapiCommand-1.ebuild
index ea4fb45b5..fed7303c2 100644
--- a/testdata/repos/standalone/BadCommandsCheck/BannedEapiCommand/BannedEapiCommand-1.ebuild
+++ b/testdata/repos/standalone/BadCommandsCheck/BannedEapiCommand/BannedEapiCommand-1.ebuild
@@ -2,8 +2,8 @@ EAPI=7
DESCRIPTION="Ebuild using banned has_version"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
src_install() {
if has_version --host-root stub/stub1; then
diff --git a/testdata/repos/standalone/BadCommandsCheck/BannedEapiCommand/BannedEapiCommand-2.ebuild b/testdata/repos/standalone/BadCommandsCheck/BannedEapiCommand/BannedEapiCommand-2.ebuild
index 1282287f0..fdffeb83b 100644
--- a/testdata/repos/standalone/BadCommandsCheck/BannedEapiCommand/BannedEapiCommand-2.ebuild
+++ b/testdata/repos/standalone/BadCommandsCheck/BannedEapiCommand/BannedEapiCommand-2.ebuild
@@ -2,8 +2,8 @@ EAPI=6
DESCRIPTION="Ebuild using banned commands"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
pkg_preinst() {
usermod -s /bin/bash uucp || die
diff --git a/testdata/repos/standalone/BadCommandsCheck/BannedPhaseCall/BannedPhaseCall-0.ebuild b/testdata/repos/standalone/BadCommandsCheck/BannedPhaseCall/BannedPhaseCall-0.ebuild
index c7177c07b..04b882b0f 100644
--- a/testdata/repos/standalone/BadCommandsCheck/BannedPhaseCall/BannedPhaseCall-0.ebuild
+++ b/testdata/repos/standalone/BadCommandsCheck/BannedPhaseCall/BannedPhaseCall-0.ebuild
@@ -2,8 +2,8 @@ EAPI=8
DESCRIPTION="Ebuild calls phase function directly"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
pkg_postinst() {
echo "something"
diff --git a/testdata/repos/standalone/BadCommandsCheck/DeprecatedEapiCommand/DeprecatedEapiCommand-0.ebuild b/testdata/repos/standalone/BadCommandsCheck/DeprecatedEapiCommand/DeprecatedEapiCommand-0.ebuild
index 1ef4813ee..a0b58294a 100644
--- a/testdata/repos/standalone/BadCommandsCheck/DeprecatedEapiCommand/DeprecatedEapiCommand-0.ebuild
+++ b/testdata/repos/standalone/BadCommandsCheck/DeprecatedEapiCommand/DeprecatedEapiCommand-0.ebuild
@@ -2,8 +2,8 @@ EAPI=6
DESCRIPTION="Ebuild using deprecated EAPI command"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
src_install() {
dohtml doc/*
diff --git a/testdata/repos/standalone/CatBadlyFormedXml/stub/stub-0.ebuild b/testdata/repos/standalone/CatBadlyFormedXml/stub/stub-0.ebuild
index f0703588b..b550809b8 100644
--- a/testdata/repos/standalone/CatBadlyFormedXml/stub/stub-0.ebuild
+++ b/testdata/repos/standalone/CatBadlyFormedXml/stub/stub-0.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Stub package to populate category"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/CatInvalidXml/stub/stub-0.ebuild b/testdata/repos/standalone/CatInvalidXml/stub/stub-0.ebuild
index f0703588b..b550809b8 100644
--- a/testdata/repos/standalone/CatInvalidXml/stub/stub-0.ebuild
+++ b/testdata/repos/standalone/CatInvalidXml/stub/stub-0.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Stub package to populate category"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/CatMetadataXmlEmptyElement/stub/stub-0.ebuild b/testdata/repos/standalone/CatMetadataXmlEmptyElement/stub/stub-0.ebuild
index f0703588b..b550809b8 100644
--- a/testdata/repos/standalone/CatMetadataXmlEmptyElement/stub/stub-0.ebuild
+++ b/testdata/repos/standalone/CatMetadataXmlEmptyElement/stub/stub-0.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Stub package to populate category"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/CatMetadataXmlIndentation/stub/stub-0.ebuild b/testdata/repos/standalone/CatMetadataXmlIndentation/stub/stub-0.ebuild
index f0703588b..b550809b8 100644
--- a/testdata/repos/standalone/CatMetadataXmlIndentation/stub/stub-0.ebuild
+++ b/testdata/repos/standalone/CatMetadataXmlIndentation/stub/stub-0.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Stub package to populate category"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/CatMetadataXmlInvalidCatRef/stub/stub-0.ebuild b/testdata/repos/standalone/CatMetadataXmlInvalidCatRef/stub/stub-0.ebuild
index f0703588b..b550809b8 100644
--- a/testdata/repos/standalone/CatMetadataXmlInvalidCatRef/stub/stub-0.ebuild
+++ b/testdata/repos/standalone/CatMetadataXmlInvalidCatRef/stub/stub-0.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Stub package to populate category"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/CatMetadataXmlInvalidPkgRef/stub/stub-0.ebuild b/testdata/repos/standalone/CatMetadataXmlInvalidPkgRef/stub/stub-0.ebuild
index f0703588b..b550809b8 100644
--- a/testdata/repos/standalone/CatMetadataXmlInvalidPkgRef/stub/stub-0.ebuild
+++ b/testdata/repos/standalone/CatMetadataXmlInvalidPkgRef/stub/stub-0.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Stub package to populate category"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/DeclarationShadowedCheck/DuplicateFunctionDefinition/DuplicateFunctionDefinition-0.ebuild b/testdata/repos/standalone/DeclarationShadowedCheck/DuplicateFunctionDefinition/DuplicateFunctionDefinition-0.ebuild
index ad8ec8b71..461b6062b 100644
--- a/testdata/repos/standalone/DeclarationShadowedCheck/DuplicateFunctionDefinition/DuplicateFunctionDefinition-0.ebuild
+++ b/testdata/repos/standalone/DeclarationShadowedCheck/DuplicateFunctionDefinition/DuplicateFunctionDefinition-0.ebuild
@@ -1,8 +1,8 @@
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
DESCRIPTION="ebuild with shadowed variables"
-SLOT="0"
+HOMEPAGE="https://github.com/pkgcore/pkgcheck"
LICENSE="BSD"
+SLOT="0"
pkg_preinst() {
:
diff --git a/testdata/repos/standalone/DeclarationShadowedCheck/VariableShadowed/VariableShadowed-0.ebuild b/testdata/repos/standalone/DeclarationShadowedCheck/VariableShadowed/VariableShadowed-0.ebuild
index 11dd30ce7..c39dad839 100644
--- a/testdata/repos/standalone/DeclarationShadowedCheck/VariableShadowed/VariableShadowed-0.ebuild
+++ b/testdata/repos/standalone/DeclarationShadowedCheck/VariableShadowed/VariableShadowed-0.ebuild
@@ -1,11 +1,11 @@
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
DESCRIPTION="ebuild with shadowed variables"
+HOMEPAGE="https://github.com/pkgcore/pkgcheck"
S=${WORKDIR}
VAL=
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
RESTRICT="!test? ( test )"
RDEPEND="dev-lang/ruby"
diff --git a/testdata/repos/standalone/DependencyCheck/BadDependency/BadDependency-0.ebuild b/testdata/repos/standalone/DependencyCheck/BadDependency/BadDependency-0.ebuild
index 4fcffaa81..f01aae440 100644
--- a/testdata/repos/standalone/DependencyCheck/BadDependency/BadDependency-0.ebuild
+++ b/testdata/repos/standalone/DependencyCheck/BadDependency/BadDependency-0.ebuild
@@ -2,8 +2,8 @@ EAPI=7
DESCRIPTION="Ebuild with bad dependencies"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
DEPEND="
!DependencyCheck/BadDependency
|| ( stub/stub1:= stub/stub2:= )
diff --git a/testdata/repos/standalone/DependencyCheck/InvalidBdepend/InvalidBdepend-0.ebuild b/testdata/repos/standalone/DependencyCheck/InvalidBdepend/InvalidBdepend-0.ebuild
index 71cdda2d6..4c840a4a4 100644
--- a/testdata/repos/standalone/DependencyCheck/InvalidBdepend/InvalidBdepend-0.ebuild
+++ b/testdata/repos/standalone/DependencyCheck/InvalidBdepend/InvalidBdepend-0.ebuild
@@ -2,6 +2,6 @@ EAPI=7
DESCRIPTION="Ebuild with invalid BDEPEND"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
BDEPEND="stub1"
diff --git a/testdata/repos/standalone/DependencyCheck/InvalidDepend/InvalidDepend-0.ebuild b/testdata/repos/standalone/DependencyCheck/InvalidDepend/InvalidDepend-0.ebuild
index d25a1168e..6f37907d0 100644
--- a/testdata/repos/standalone/DependencyCheck/InvalidDepend/InvalidDepend-0.ebuild
+++ b/testdata/repos/standalone/DependencyCheck/InvalidDepend/InvalidDepend-0.ebuild
@@ -2,6 +2,6 @@ EAPI=7
DESCRIPTION="Ebuild with invalid DEPEND"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
DEPEND="stub1"
diff --git a/testdata/repos/standalone/DependencyCheck/InvalidPdepend/InvalidPdepend-0.ebuild b/testdata/repos/standalone/DependencyCheck/InvalidPdepend/InvalidPdepend-0.ebuild
index e9c512027..2da304c1d 100644
--- a/testdata/repos/standalone/DependencyCheck/InvalidPdepend/InvalidPdepend-0.ebuild
+++ b/testdata/repos/standalone/DependencyCheck/InvalidPdepend/InvalidPdepend-0.ebuild
@@ -2,6 +2,6 @@ EAPI=7
DESCRIPTION="Ebuild with invalid PDEPEND"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
PDEPEND="stub1"
diff --git a/testdata/repos/standalone/DependencyCheck/InvalidRdepend/InvalidRdepend-0.ebuild b/testdata/repos/standalone/DependencyCheck/InvalidRdepend/InvalidRdepend-0.ebuild
index 4c876488d..30e51aa38 100644
--- a/testdata/repos/standalone/DependencyCheck/InvalidRdepend/InvalidRdepend-0.ebuild
+++ b/testdata/repos/standalone/DependencyCheck/InvalidRdepend/InvalidRdepend-0.ebuild
@@ -2,6 +2,6 @@ EAPI=7
DESCRIPTION="Ebuild with invalid RDEPEND"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
RDEPEND="stub1"
diff --git a/testdata/repos/standalone/DependencyCheck/MisplacedWeakBlocker/MisplacedWeakBlocker-6.ebuild b/testdata/repos/standalone/DependencyCheck/MisplacedWeakBlocker/MisplacedWeakBlocker-6.ebuild
index 8c9b6863c..4d0c01993 100644
--- a/testdata/repos/standalone/DependencyCheck/MisplacedWeakBlocker/MisplacedWeakBlocker-6.ebuild
+++ b/testdata/repos/standalone/DependencyCheck/MisplacedWeakBlocker/MisplacedWeakBlocker-6.ebuild
@@ -2,8 +2,8 @@ EAPI=6
DESCRIPTION="Ebuild with misplaced weak blocker"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
BDEPEND="!DependencyCheck/InvalidRdepend"
DEPEND="!DependencyCheck/BadDependency"
diff --git a/testdata/repos/standalone/DependencyCheck/MisplacedWeakBlocker/MisplacedWeakBlocker-7.ebuild b/testdata/repos/standalone/DependencyCheck/MisplacedWeakBlocker/MisplacedWeakBlocker-7.ebuild
index cfe263543..07cc18bea 100644
--- a/testdata/repos/standalone/DependencyCheck/MisplacedWeakBlocker/MisplacedWeakBlocker-7.ebuild
+++ b/testdata/repos/standalone/DependencyCheck/MisplacedWeakBlocker/MisplacedWeakBlocker-7.ebuild
@@ -2,8 +2,8 @@ EAPI=7
DESCRIPTION="Ebuild with invalid BDEPEND"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
BDEPEND="!DependencyCheck/InvalidRdepend"
DEPEND="!DependencyCheck/InvalidRdepend"
diff --git a/testdata/repos/standalone/DependencyCheck/MisplacedWeakBlocker/MisplacedWeakBlocker-8.ebuild b/testdata/repos/standalone/DependencyCheck/MisplacedWeakBlocker/MisplacedWeakBlocker-8.ebuild
index 5ebda58f6..3ae6b8da8 100644
--- a/testdata/repos/standalone/DependencyCheck/MisplacedWeakBlocker/MisplacedWeakBlocker-8.ebuild
+++ b/testdata/repos/standalone/DependencyCheck/MisplacedWeakBlocker/MisplacedWeakBlocker-8.ebuild
@@ -2,8 +2,8 @@ EAPI=8
DESCRIPTION="Ebuild with invalid BDEPEND"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
BDEPEND="!DependencyCheck/InvalidRdepend"
DEPEND="!DependencyCheck/InvalidRdepend"
diff --git a/testdata/repos/standalone/DependencyCheck/MissingPackageRevision/MissingPackageRevision-0.ebuild b/testdata/repos/standalone/DependencyCheck/MissingPackageRevision/MissingPackageRevision-0.ebuild
index f8453106d..ae4a12bd8 100644
--- a/testdata/repos/standalone/DependencyCheck/MissingPackageRevision/MissingPackageRevision-0.ebuild
+++ b/testdata/repos/standalone/DependencyCheck/MissingPackageRevision/MissingPackageRevision-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild with missing package revision in dependency"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
RDEPEND="=stub/stub1-0"
diff --git a/testdata/repos/standalone/DependencyCheck/MissingUseDepDefault/MissingUseDepDefault-0.ebuild b/testdata/repos/standalone/DependencyCheck/MissingUseDepDefault/MissingUseDepDefault-0.ebuild
index f03b475b9..5af96f3f6 100644
--- a/testdata/repos/standalone/DependencyCheck/MissingUseDepDefault/MissingUseDepDefault-0.ebuild
+++ b/testdata/repos/standalone/DependencyCheck/MissingUseDepDefault/MissingUseDepDefault-0.ebuild
@@ -2,8 +2,8 @@ EAPI=7
DESCRIPTION="Ebuild missing USE dependency default"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
IUSE="foo"
DEPEND="stub/stub1[foo]"
RDEPEND="|| ( stub/stub2[used] stub/stub2[-foo] )"
diff --git a/testdata/repos/standalone/DependencyCheck/UnstatedIuse/UnstatedIuse-0.ebuild b/testdata/repos/standalone/DependencyCheck/UnstatedIuse/UnstatedIuse-0.ebuild
index 1179764bd..3898a8138 100644
--- a/testdata/repos/standalone/DependencyCheck/UnstatedIuse/UnstatedIuse-0.ebuild
+++ b/testdata/repos/standalone/DependencyCheck/UnstatedIuse/UnstatedIuse-0.ebuild
@@ -2,7 +2,7 @@ EAPI=7
DESCRIPTION="Ebuild with unstated IUSE in depsets"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
RDEPEND="used? ( stub/stub1 )"
DEPEND="stub/stub4[used?]"
diff --git a/testdata/repos/standalone/DescriptionCheck/BadDescription/BadDescription-0.ebuild b/testdata/repos/standalone/DescriptionCheck/BadDescription/BadDescription-0.ebuild
index 7a5092513..280cc8367 100644
--- a/testdata/repos/standalone/DescriptionCheck/BadDescription/BadDescription-0.ebuild
+++ b/testdata/repos/standalone/DescriptionCheck/BadDescription/BadDescription-0.ebuild
@@ -1,3 +1,3 @@
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/DescriptionCheck/BadDescription/BadDescription-1.ebuild b/testdata/repos/standalone/DescriptionCheck/BadDescription/BadDescription-1.ebuild
index 35df9be1e..360b0c92d 100644
--- a/testdata/repos/standalone/DescriptionCheck/BadDescription/BadDescription-1.ebuild
+++ b/testdata/repos/standalone/DescriptionCheck/BadDescription/BadDescription-1.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION=""
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/DescriptionCheck/BadDescription/BadDescription-2.ebuild b/testdata/repos/standalone/DescriptionCheck/BadDescription/BadDescription-2.ebuild
index 70308c38a..2be9a43a1 100644
--- a/testdata/repos/standalone/DescriptionCheck/BadDescription/BadDescription-2.ebuild
+++ b/testdata/repos/standalone/DescriptionCheck/BadDescription/BadDescription-2.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="bad desc"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/DescriptionCheck/BadDescription/BadDescription-3.ebuild b/testdata/repos/standalone/DescriptionCheck/BadDescription/BadDescription-3.ebuild
index 8d08d7c72..0dae4487c 100644
--- a/testdata/repos/standalone/DescriptionCheck/BadDescription/BadDescription-3.ebuild
+++ b/testdata/repos/standalone/DescriptionCheck/BadDescription/BadDescription-3.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="BadDescription"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/DescriptionCheck/BadDescription/BadDescription-4.ebuild b/testdata/repos/standalone/DescriptionCheck/BadDescription/BadDescription-4.ebuild
index a8d1b7276..f4d9a2296 100644
--- a/testdata/repos/standalone/DescriptionCheck/BadDescription/BadDescription-4.ebuild
+++ b/testdata/repos/standalone/DescriptionCheck/BadDescription/BadDescription-4.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Ebuild with DESCRIPTION that is far too long and will be flagged by the BadDescription result since the check triggers at greater than 150 characters long."
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/DoCompressedFilesCheck/InstallCompressedInfo/InstallCompressedInfo-0.ebuild b/testdata/repos/standalone/DoCompressedFilesCheck/InstallCompressedInfo/InstallCompressedInfo-0.ebuild
index d82c952a9..767c0e200 100644
--- a/testdata/repos/standalone/DoCompressedFilesCheck/InstallCompressedInfo/InstallCompressedInfo-0.ebuild
+++ b/testdata/repos/standalone/DoCompressedFilesCheck/InstallCompressedInfo/InstallCompressedInfo-0.ebuild
@@ -2,8 +2,8 @@ EAPI=7
DESCRIPTION="Ebuild installing compressed info"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
src_install() {
doinfo 'test.gz' "${PN}.bz2"
diff --git a/testdata/repos/standalone/DoCompressedFilesCheck/InstallCompressedManpage/InstallCompressedManpage-0.ebuild b/testdata/repos/standalone/DoCompressedFilesCheck/InstallCompressedManpage/InstallCompressedManpage-0.ebuild
index 7248d16a9..1c6d4a592 100644
--- a/testdata/repos/standalone/DoCompressedFilesCheck/InstallCompressedManpage/InstallCompressedManpage-0.ebuild
+++ b/testdata/repos/standalone/DoCompressedFilesCheck/InstallCompressedManpage/InstallCompressedManpage-0.ebuild
@@ -2,8 +2,8 @@ EAPI=7
DESCRIPTION="Ebuild installing compressed man pages"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
src_install() {
doman 'test.gz' "${PN}.2.bz2"
diff --git a/testdata/repos/standalone/DroppedKeywordsCheck/DroppedKeywords/DroppedKeywords-0.ebuild b/testdata/repos/standalone/DroppedKeywordsCheck/DroppedKeywords/DroppedKeywords-0.ebuild
index 1b9d4a44f..f472ed611 100644
--- a/testdata/repos/standalone/DroppedKeywordsCheck/DroppedKeywords/DroppedKeywords-0.ebuild
+++ b/testdata/repos/standalone/DroppedKeywordsCheck/DroppedKeywords/DroppedKeywords-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild with dropped keywords"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
KEYWORDS="~amd64 ~x86"
diff --git a/testdata/repos/standalone/DroppedKeywordsCheck/DroppedKeywords/DroppedKeywords-1.ebuild b/testdata/repos/standalone/DroppedKeywordsCheck/DroppedKeywords/DroppedKeywords-1.ebuild
index 8c87b7bb2..1f818e6fb 100644
--- a/testdata/repos/standalone/DroppedKeywordsCheck/DroppedKeywords/DroppedKeywords-1.ebuild
+++ b/testdata/repos/standalone/DroppedKeywordsCheck/DroppedKeywords/DroppedKeywords-1.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild with dropped keywords"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
KEYWORDS="~amd64"
diff --git a/testdata/repos/standalone/EapiCheck/BannedEapi/BannedEapi-0.ebuild b/testdata/repos/standalone/EapiCheck/BannedEapi/BannedEapi-0.ebuild
index 04dbdbd8f..d5a2f3c40 100644
--- a/testdata/repos/standalone/EapiCheck/BannedEapi/BannedEapi-0.ebuild
+++ b/testdata/repos/standalone/EapiCheck/BannedEapi/BannedEapi-0.ebuild
@@ -2,5 +2,5 @@ EAPI=1
DESCRIPTION="Ebuild using banned EAPI"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/EapiCheck/DeprecatedEapi/DeprecatedEapi-0.ebuild b/testdata/repos/standalone/EapiCheck/DeprecatedEapi/DeprecatedEapi-0.ebuild
index c05b58ea5..8e88138dc 100644
--- a/testdata/repos/standalone/EapiCheck/DeprecatedEapi/DeprecatedEapi-0.ebuild
+++ b/testdata/repos/standalone/EapiCheck/DeprecatedEapi/DeprecatedEapi-0.ebuild
@@ -2,5 +2,5 @@ EAPI=5
DESCRIPTION="Ebuild using deprecated EAPI"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/EbuildReservedCheck/EbuildReservedName/EbuildReservedName-0.ebuild b/testdata/repos/standalone/EbuildReservedCheck/EbuildReservedName/EbuildReservedName-0.ebuild
index a0c8e2016..dac02f2d1 100644
--- a/testdata/repos/standalone/EbuildReservedCheck/EbuildReservedName/EbuildReservedName-0.ebuild
+++ b/testdata/repos/standalone/EbuildReservedCheck/EbuildReservedName/EbuildReservedName-0.ebuild
@@ -1,7 +1,7 @@
DESCRIPTION="Ebuild with reserved names"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
prepare_locale() {
DYNAMIC_DEPS="2"
diff --git a/testdata/repos/standalone/EbuildReservedCheck/EbuildSemiReservedName/EbuildSemiReservedName-0.ebuild b/testdata/repos/standalone/EbuildReservedCheck/EbuildSemiReservedName/EbuildSemiReservedName-0.ebuild
index 846fbb039..a4321f5d3 100644
--- a/testdata/repos/standalone/EbuildReservedCheck/EbuildSemiReservedName/EbuildSemiReservedName-0.ebuild
+++ b/testdata/repos/standalone/EbuildReservedCheck/EbuildSemiReservedName/EbuildSemiReservedName-0.ebuild
@@ -2,12 +2,14 @@ EAPI=8
DESCRIPTION="Ebuild with semi-reserved names"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
-LICENSE="BSD"
S=${WORKDIR} # ok
B=${WORKDIR} # fail
-BDEPEND="app-arch/unzip" # ok
+
+LICENSE="BSD"
+SLOT="0"
+
CDEPEND="app-arch/unzip" # ok
RDEPEND="${CDEPEND}" # ok
+BDEPEND="app-arch/unzip" # ok
TDEPEND="app-arch/unzip" # fail
diff --git a/testdata/repos/standalone/EbuildUnquotedVariablesCheck/EbuildUnquotedVariable/EbuildUnquotedVariable-0.ebuild b/testdata/repos/standalone/EbuildUnquotedVariablesCheck/EbuildUnquotedVariable/EbuildUnquotedVariable-0.ebuild
index 4a475d719..84f8ee588 100644
--- a/testdata/repos/standalone/EbuildUnquotedVariablesCheck/EbuildUnquotedVariable/EbuildUnquotedVariable-0.ebuild
+++ b/testdata/repos/standalone/EbuildUnquotedVariablesCheck/EbuildUnquotedVariable/EbuildUnquotedVariable-0.ebuild
@@ -2,10 +2,12 @@ EAPI=8
DESCRIPTION="Ebuild with variables that must be quoted"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
-LICENSE="BSD"
+
S=${WORKDIR}/${PV} # ok
+LICENSE="BSD"
+SLOT="0"
+
PATCHES=(
${FILESDIR}/foo.patch # FAIL
"${FILESDIR}"/foo.patch # ok
diff --git a/testdata/repos/standalone/EclassManualDepsCheck/RubyMissingDeps/RubyMissingDeps-0.ebuild b/testdata/repos/standalone/EclassManualDepsCheck/RubyMissingDeps/RubyMissingDeps-0.ebuild
index aaf1acd04..d0cb453f9 100644
--- a/testdata/repos/standalone/EclassManualDepsCheck/RubyMissingDeps/RubyMissingDeps-0.ebuild
+++ b/testdata/repos/standalone/EclassManualDepsCheck/RubyMissingDeps/RubyMissingDeps-0.ebuild
@@ -6,7 +6,7 @@ inherit ruby-ng
DESCRIPTION="Optional inherit with one dep"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
IDEPEND="dev-lang/ruby"
diff --git a/testdata/repos/standalone/EclassManualDepsCheck/RubyMissingDeps/RubyMissingDeps-1.ebuild b/testdata/repos/standalone/EclassManualDepsCheck/RubyMissingDeps/RubyMissingDeps-1.ebuild
index aba69b0b5..443e491d7 100644
--- a/testdata/repos/standalone/EclassManualDepsCheck/RubyMissingDeps/RubyMissingDeps-1.ebuild
+++ b/testdata/repos/standalone/EclassManualDepsCheck/RubyMissingDeps/RubyMissingDeps-1.ebuild
@@ -4,5 +4,5 @@ inherit ruby-ng
DESCRIPTION="Optional inherit without dep"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/EclassManualDepsCheck/RubyMissingDeps/RubyMissingDeps-2.ebuild b/testdata/repos/standalone/EclassManualDepsCheck/RubyMissingDeps/RubyMissingDeps-2.ebuild
index 04bab5d83..204c9f6ac 100644
--- a/testdata/repos/standalone/EclassManualDepsCheck/RubyMissingDeps/RubyMissingDeps-2.ebuild
+++ b/testdata/repos/standalone/EclassManualDepsCheck/RubyMissingDeps/RubyMissingDeps-2.ebuild
@@ -6,8 +6,8 @@ inherit ruby-ng
DESCRIPTION="Optional inherit with category whitelist"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/testdata/repos/standalone/EclassManualDepsCheck/RustMissingDeps/RustMissingDeps-0.ebuild b/testdata/repos/standalone/EclassManualDepsCheck/RustMissingDeps/RustMissingDeps-0.ebuild
index 2b4530308..8a2ddc741 100644
--- a/testdata/repos/standalone/EclassManualDepsCheck/RustMissingDeps/RustMissingDeps-0.ebuild
+++ b/testdata/repos/standalone/EclassManualDepsCheck/RustMissingDeps/RustMissingDeps-0.ebuild
@@ -2,5 +2,5 @@ inherit cargo
DESCRIPTION="Normal non-optional inherit"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/EclassManualDepsCheck/RustMissingDeps/RustMissingDeps-1.ebuild b/testdata/repos/standalone/EclassManualDepsCheck/RustMissingDeps/RustMissingDeps-1.ebuild
index b43ff1b49..f5a827ccb 100644
--- a/testdata/repos/standalone/EclassManualDepsCheck/RustMissingDeps/RustMissingDeps-1.ebuild
+++ b/testdata/repos/standalone/EclassManualDepsCheck/RustMissingDeps/RustMissingDeps-1.ebuild
@@ -6,5 +6,5 @@ inherit cargo
DESCRIPTION="Optional inherit without deps"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/EclassUsageCheck/DeprecatedEclassFunction/DeprecatedEclassFunction-0.ebuild b/testdata/repos/standalone/EclassUsageCheck/DeprecatedEclassFunction/DeprecatedEclassFunction-0.ebuild
index ff16d9f05..77419765a 100644
--- a/testdata/repos/standalone/EclassUsageCheck/DeprecatedEclassFunction/DeprecatedEclassFunction-0.ebuild
+++ b/testdata/repos/standalone/EclassUsageCheck/DeprecatedEclassFunction/DeprecatedEclassFunction-0.ebuild
@@ -4,8 +4,8 @@ inherit go-module
DESCRIPTION="Ebuild with deprecated function calls"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
go-module_set_globals
go-module_setup_proxy
diff --git a/testdata/repos/standalone/EclassUsageCheck/DeprecatedEclassVariable/DeprecatedEclassVariable-0.ebuild b/testdata/repos/standalone/EclassUsageCheck/DeprecatedEclassVariable/DeprecatedEclassVariable-0.ebuild
index af07da249..38ef8aaa3 100644
--- a/testdata/repos/standalone/EclassUsageCheck/DeprecatedEclassVariable/DeprecatedEclassVariable-0.ebuild
+++ b/testdata/repos/standalone/EclassUsageCheck/DeprecatedEclassVariable/DeprecatedEclassVariable-0.ebuild
@@ -4,8 +4,8 @@ inherit go-module
DESCRIPTION="Ebuild with deprecated variable usage"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
EGO_SUM="stub"
_GOMODULE_GOPROXY_BASEURI="stub"
diff --git a/testdata/repos/standalone/EclassUsageCheck/DuplicateEclassInherit/DuplicateEclassInherit-0.ebuild b/testdata/repos/standalone/EclassUsageCheck/DuplicateEclassInherit/DuplicateEclassInherit-0.ebuild
index cc22637be..59a81a97b 100644
--- a/testdata/repos/standalone/EclassUsageCheck/DuplicateEclassInherit/DuplicateEclassInherit-0.ebuild
+++ b/testdata/repos/standalone/EclassUsageCheck/DuplicateEclassInherit/DuplicateEclassInherit-0.ebuild
@@ -2,5 +2,5 @@ inherit stub vcs stub
DESCRIPTION="Ebuild with duplicate eclass inherit"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/EclassUsageCheck/DuplicateEclassInherit/DuplicateEclassInherit-1.ebuild b/testdata/repos/standalone/EclassUsageCheck/DuplicateEclassInherit/DuplicateEclassInherit-1.ebuild
index 933f055cc..6930f8298 100644
--- a/testdata/repos/standalone/EclassUsageCheck/DuplicateEclassInherit/DuplicateEclassInherit-1.ebuild
+++ b/testdata/repos/standalone/EclassUsageCheck/DuplicateEclassInherit/DuplicateEclassInherit-1.ebuild
@@ -10,5 +10,5 @@ fi
DESCRIPTION="Ebuild with conditional, duplicate eclass inherit"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/EqualVersionsCheck/EqualVersions/EqualVersions-0-r0.ebuild b/testdata/repos/standalone/EqualVersionsCheck/EqualVersions/EqualVersions-0-r0.ebuild
index 4496614d9..16381467c 100644
--- a/testdata/repos/standalone/EqualVersionsCheck/EqualVersions/EqualVersions-0-r0.ebuild
+++ b/testdata/repos/standalone/EqualVersionsCheck/EqualVersions/EqualVersions-0-r0.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Ebuilds that have equal versions"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/EqualVersionsCheck/EqualVersions/EqualVersions-0-r01.ebuild b/testdata/repos/standalone/EqualVersionsCheck/EqualVersions/EqualVersions-0-r01.ebuild
index 4496614d9..16381467c 100644
--- a/testdata/repos/standalone/EqualVersionsCheck/EqualVersions/EqualVersions-0-r01.ebuild
+++ b/testdata/repos/standalone/EqualVersionsCheck/EqualVersions/EqualVersions-0-r01.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Ebuilds that have equal versions"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/EqualVersionsCheck/EqualVersions/EqualVersions-0-r1.ebuild b/testdata/repos/standalone/EqualVersionsCheck/EqualVersions/EqualVersions-0-r1.ebuild
index 4496614d9..16381467c 100644
--- a/testdata/repos/standalone/EqualVersionsCheck/EqualVersions/EqualVersions-0-r1.ebuild
+++ b/testdata/repos/standalone/EqualVersionsCheck/EqualVersions/EqualVersions-0-r1.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Ebuilds that have equal versions"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/EqualVersionsCheck/EqualVersions/EqualVersions-0.ebuild b/testdata/repos/standalone/EqualVersionsCheck/EqualVersions/EqualVersions-0.ebuild
index 4496614d9..16381467c 100644
--- a/testdata/repos/standalone/EqualVersionsCheck/EqualVersions/EqualVersions-0.ebuild
+++ b/testdata/repos/standalone/EqualVersionsCheck/EqualVersions/EqualVersions-0.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Ebuilds that have equal versions"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/GlobCheck/GlobDistdir/GlobDistdir-0.ebuild b/testdata/repos/standalone/GlobCheck/GlobDistdir/GlobDistdir-0.ebuild
index a0480fa75..f4293ee54 100644
--- a/testdata/repos/standalone/GlobCheck/GlobDistdir/GlobDistdir-0.ebuild
+++ b/testdata/repos/standalone/GlobCheck/GlobDistdir/GlobDistdir-0.ebuild
@@ -1,7 +1,7 @@
DESCRIPTION="Ebuild with unsafe glob around DISTDIR"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
src_install() {
doins "${DISTDIR}"/foo-*.bar # bad
diff --git a/testdata/repos/standalone/GlobalUseCheck/PotentialGlobalUse/PotentialGlobalUse-0.ebuild b/testdata/repos/standalone/GlobalUseCheck/PotentialGlobalUse/PotentialGlobalUse-0.ebuild
index 5841da85c..bc01487a2 100644
--- a/testdata/repos/standalone/GlobalUseCheck/PotentialGlobalUse/PotentialGlobalUse-0.ebuild
+++ b/testdata/repos/standalone/GlobalUseCheck/PotentialGlobalUse/PotentialGlobalUse-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild with potential global USE flag"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-IUSE="potential-global"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
+IUSE="potential-global"
diff --git a/testdata/repos/standalone/GlobalUseCheck/PotentialLocalUse/PotentialLocalUse-0.ebuild b/testdata/repos/standalone/GlobalUseCheck/PotentialLocalUse/PotentialLocalUse-0.ebuild
index faa9ad1d9..0700dc0d6 100644
--- a/testdata/repos/standalone/GlobalUseCheck/PotentialLocalUse/PotentialLocalUse-0.ebuild
+++ b/testdata/repos/standalone/GlobalUseCheck/PotentialLocalUse/PotentialLocalUse-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild with potential local USE flag"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-IUSE="potential-local"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
+IUSE="potential-local"
diff --git a/testdata/repos/standalone/HomepageCheck/BadHomepage/BadHomepage-0.ebuild b/testdata/repos/standalone/HomepageCheck/BadHomepage/BadHomepage-0.ebuild
index 6f674c03d..eeead316b 100644
--- a/testdata/repos/standalone/HomepageCheck/BadHomepage/BadHomepage-0.ebuild
+++ b/testdata/repos/standalone/HomepageCheck/BadHomepage/BadHomepage-0.ebuild
@@ -1,3 +1,3 @@
DESCRIPTION="Ebuild with missing HOMEPAGE"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/HomepageCheck/BadHomepage/BadHomepage-1.ebuild b/testdata/repos/standalone/HomepageCheck/BadHomepage/BadHomepage-1.ebuild
index 6fe0323d5..a1176fbb1 100644
--- a/testdata/repos/standalone/HomepageCheck/BadHomepage/BadHomepage-1.ebuild
+++ b/testdata/repos/standalone/HomepageCheck/BadHomepage/BadHomepage-1.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Ebuild HOMEPAGE with missing protocol"
HOMEPAGE="github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/HomepageCheck/BadHomepage/BadHomepage-2.ebuild b/testdata/repos/standalone/HomepageCheck/BadHomepage/BadHomepage-2.ebuild
index 297781865..b45db9bc4 100644
--- a/testdata/repos/standalone/HomepageCheck/BadHomepage/BadHomepage-2.ebuild
+++ b/testdata/repos/standalone/HomepageCheck/BadHomepage/BadHomepage-2.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Ebuild HOMEPAGE with unsupported protocol"
HOMEPAGE="gopher://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/HomepageCheck/BadHomepage/BadHomepage-3.ebuild b/testdata/repos/standalone/HomepageCheck/BadHomepage/BadHomepage-3.ebuild
index 1bed84a8e..1e8365fc5 100644
--- a/testdata/repos/standalone/HomepageCheck/BadHomepage/BadHomepage-3.ebuild
+++ b/testdata/repos/standalone/HomepageCheck/BadHomepage/BadHomepage-3.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Ebuild uses unspecific HOMEPAGE"
HOMEPAGE="https://www.gentoo.org"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/InsintoCheck/DeprecatedInsinto/DeprecatedInsinto-0.ebuild b/testdata/repos/standalone/InsintoCheck/DeprecatedInsinto/DeprecatedInsinto-0.ebuild
index 9569c1769..4321cb1eb 100644
--- a/testdata/repos/standalone/InsintoCheck/DeprecatedInsinto/DeprecatedInsinto-0.ebuild
+++ b/testdata/repos/standalone/InsintoCheck/DeprecatedInsinto/DeprecatedInsinto-0.ebuild
@@ -1,7 +1,7 @@
DESCRIPTION="Ebuild with deprecated insinto usage"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
src_install() {
insinto /etc/conf.d
diff --git a/testdata/repos/standalone/InsintoCheck/DeprecatedInsinto/DeprecatedInsinto-1.ebuild b/testdata/repos/standalone/InsintoCheck/DeprecatedInsinto/DeprecatedInsinto-1.ebuild
index 2967624d1..43a6e0a99 100644
--- a/testdata/repos/standalone/InsintoCheck/DeprecatedInsinto/DeprecatedInsinto-1.ebuild
+++ b/testdata/repos/standalone/InsintoCheck/DeprecatedInsinto/DeprecatedInsinto-1.ebuild
@@ -2,8 +2,8 @@ EAPI=4
DESCRIPTION="Ebuild with deprecated insinto usage"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
src_install() {
insinto /usr/share/doc/${PF}
diff --git a/testdata/repos/standalone/IuseCheck/InvalidUseFlags/InvalidUseFlags-0.ebuild b/testdata/repos/standalone/IuseCheck/InvalidUseFlags/InvalidUseFlags-0.ebuild
index 30c1ca316..d00387f3f 100644
--- a/testdata/repos/standalone/IuseCheck/InvalidUseFlags/InvalidUseFlags-0.ebuild
+++ b/testdata/repos/standalone/IuseCheck/InvalidUseFlags/InvalidUseFlags-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild with invalid USE flags"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
IUSE="used +flag1 -flag2 + -"
diff --git a/testdata/repos/standalone/IuseCheck/InvalidUseFlags/InvalidUseFlags-4.ebuild b/testdata/repos/standalone/IuseCheck/InvalidUseFlags/InvalidUseFlags-4.ebuild
index 4cda2928b..6b3258f1b 100644
--- a/testdata/repos/standalone/IuseCheck/InvalidUseFlags/InvalidUseFlags-4.ebuild
+++ b/testdata/repos/standalone/IuseCheck/InvalidUseFlags/InvalidUseFlags-4.ebuild
@@ -2,6 +2,6 @@ EAPI=4
DESCRIPTION="Ebuild with invalid USE flags"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
IUSE="used +flag1 +flag2 + -"
diff --git a/testdata/repos/standalone/IuseCheck/UnknownUseFlags/UnknownUseFlags-0.ebuild b/testdata/repos/standalone/IuseCheck/UnknownUseFlags/UnknownUseFlags-0.ebuild
index 9fb834ca0..ba0cb6458 100644
--- a/testdata/repos/standalone/IuseCheck/UnknownUseFlags/UnknownUseFlags-0.ebuild
+++ b/testdata/repos/standalone/IuseCheck/UnknownUseFlags/UnknownUseFlags-0.ebuild
@@ -2,6 +2,6 @@ EAPI=4
DESCRIPTION="Ebuild with unknown USE flags"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
IUSE="amd64 used flag1 +flag2 +flag3"
diff --git a/testdata/repos/standalone/KeywordsCheck/BadKeywords/BadKeywords-0.ebuild b/testdata/repos/standalone/KeywordsCheck/BadKeywords/BadKeywords-0.ebuild
index 771afb50f..958a2a3c3 100644
--- a/testdata/repos/standalone/KeywordsCheck/BadKeywords/BadKeywords-0.ebuild
+++ b/testdata/repos/standalone/KeywordsCheck/BadKeywords/BadKeywords-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild with bad KEYWORDS"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
KEYWORDS="-*"
diff --git a/testdata/repos/standalone/KeywordsCheck/DuplicateKeywords/DuplicateKeywords-0.ebuild b/testdata/repos/standalone/KeywordsCheck/DuplicateKeywords/DuplicateKeywords-0.ebuild
index 7a1f9d149..9fe14a6e3 100644
--- a/testdata/repos/standalone/KeywordsCheck/DuplicateKeywords/DuplicateKeywords-0.ebuild
+++ b/testdata/repos/standalone/KeywordsCheck/DuplicateKeywords/DuplicateKeywords-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild with duplicate KEYWORDS"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
KEYWORDS="~amd64 ~amd64"
diff --git a/testdata/repos/standalone/KeywordsCheck/OverlappingKeywords/OverlappingKeywords-0.ebuild b/testdata/repos/standalone/KeywordsCheck/OverlappingKeywords/OverlappingKeywords-0.ebuild
index 2cd1aa781..2e2ca3c21 100644
--- a/testdata/repos/standalone/KeywordsCheck/OverlappingKeywords/OverlappingKeywords-0.ebuild
+++ b/testdata/repos/standalone/KeywordsCheck/OverlappingKeywords/OverlappingKeywords-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild with overlapping KEYWORDS"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
KEYWORDS="amd64 ~amd64"
diff --git a/testdata/repos/standalone/KeywordsCheck/UnknownKeywords/UnknownKeywords-0.ebuild b/testdata/repos/standalone/KeywordsCheck/UnknownKeywords/UnknownKeywords-0.ebuild
index ce0b28b58..d960e8f04 100644
--- a/testdata/repos/standalone/KeywordsCheck/UnknownKeywords/UnknownKeywords-0.ebuild
+++ b/testdata/repos/standalone/KeywordsCheck/UnknownKeywords/UnknownKeywords-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild with unknown KEYWORDS"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
KEYWORDS="amd64 unknown"
diff --git a/testdata/repos/standalone/KeywordsCheck/UnsortedKeywords/UnsortedKeywords-0.ebuild b/testdata/repos/standalone/KeywordsCheck/UnsortedKeywords/UnsortedKeywords-0.ebuild
index 275c6d58a..6f88ac0a2 100644
--- a/testdata/repos/standalone/KeywordsCheck/UnsortedKeywords/UnsortedKeywords-0.ebuild
+++ b/testdata/repos/standalone/KeywordsCheck/UnsortedKeywords/UnsortedKeywords-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild with unsorted KEYWORDS"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
KEYWORDS="~x86 ~amd64"
diff --git a/testdata/repos/standalone/LicenseCheck/InvalidLicense/InvalidLicense-0.ebuild b/testdata/repos/standalone/LicenseCheck/InvalidLicense/InvalidLicense-0.ebuild
index c53849c40..032993067 100644
--- a/testdata/repos/standalone/LicenseCheck/InvalidLicense/InvalidLicense-0.ebuild
+++ b/testdata/repos/standalone/LicenseCheck/InvalidLicense/InvalidLicense-0.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Ebuild with invalid LICENSE"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="( )"
+SLOT="0"
diff --git a/testdata/repos/standalone/LicenseCheck/InvalidLicense/InvalidLicense-1.ebuild b/testdata/repos/standalone/LicenseCheck/InvalidLicense/InvalidLicense-1.ebuild
index b5dd3a6dc..1a9442b45 100644
--- a/testdata/repos/standalone/LicenseCheck/InvalidLicense/InvalidLicense-1.ebuild
+++ b/testdata/repos/standalone/LicenseCheck/InvalidLicense/InvalidLicense-1.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Ebuild with invalid LICENSE"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="?"
+SLOT="0"
diff --git a/testdata/repos/standalone/LicenseCheck/InvalidLicense/InvalidLicense-2.ebuild b/testdata/repos/standalone/LicenseCheck/InvalidLicense/InvalidLicense-2.ebuild
index f2cf3b767..0e417f77a 100644
--- a/testdata/repos/standalone/LicenseCheck/InvalidLicense/InvalidLicense-2.ebuild
+++ b/testdata/repos/standalone/LicenseCheck/InvalidLicense/InvalidLicense-2.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild with invalid LICENSE"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
+LICENSE="used?"
SLOT="0"
IUSE="used"
-LICENSE="used?"
diff --git a/testdata/repos/standalone/LicenseCheck/MissingLicenseRestricts/MissingLicenseRestricts-0.ebuild b/testdata/repos/standalone/LicenseCheck/MissingLicenseRestricts/MissingLicenseRestricts-0.ebuild
index 035a9ef76..0b6a57271 100644
--- a/testdata/repos/standalone/LicenseCheck/MissingLicenseRestricts/MissingLicenseRestricts-0.ebuild
+++ b/testdata/repos/standalone/LicenseCheck/MissingLicenseRestricts/MissingLicenseRestricts-0.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Ebuild with missing license restricts"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="eula"
+SLOT="0"
diff --git a/testdata/repos/standalone/LicenseCheck/MissingLicenseRestricts/MissingLicenseRestricts-1.ebuild b/testdata/repos/standalone/LicenseCheck/MissingLicenseRestricts/MissingLicenseRestricts-1.ebuild
index 85d3dc20f..976febc20 100644
--- a/testdata/repos/standalone/LicenseCheck/MissingLicenseRestricts/MissingLicenseRestricts-1.ebuild
+++ b/testdata/repos/standalone/LicenseCheck/MissingLicenseRestricts/MissingLicenseRestricts-1.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild with missing license restricts"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
SRC_URI="https://github.com/pkgcore/pkgcheck/${P}.tar.gz"
-SLOT="0"
LICENSE="eula"
+SLOT="0"
diff --git a/testdata/repos/standalone/LicenseCheck/UnknownLicense/UnknownLicense-0.ebuild b/testdata/repos/standalone/LicenseCheck/UnknownLicense/UnknownLicense-0.ebuild
index 7c05135a0..290bfdfb1 100644
--- a/testdata/repos/standalone/LicenseCheck/UnknownLicense/UnknownLicense-0.ebuild
+++ b/testdata/repos/standalone/LicenseCheck/UnknownLicense/UnknownLicense-0.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Ebuild with unknown license"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="unknown"
+SLOT="0"
diff --git a/testdata/repos/standalone/LicenseCheck/UnstatedIuse/UnstatedIuse-0.ebuild b/testdata/repos/standalone/LicenseCheck/UnstatedIuse/UnstatedIuse-0.ebuild
index 009259ec6..ecff9d509 100644
--- a/testdata/repos/standalone/LicenseCheck/UnstatedIuse/UnstatedIuse-0.ebuild
+++ b/testdata/repos/standalone/LicenseCheck/UnstatedIuse/UnstatedIuse-0.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Ebuild with unstated USE flags in LICENSE"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="used? ( BSD )"
+SLOT="0"
diff --git a/testdata/repos/standalone/LocalUseCheck/MatchingGlobalUse/MatchingGlobalUse-0.ebuild b/testdata/repos/standalone/LocalUseCheck/MatchingGlobalUse/MatchingGlobalUse-0.ebuild
index bc44c177b..1781fd5e0 100644
--- a/testdata/repos/standalone/LocalUseCheck/MatchingGlobalUse/MatchingGlobalUse-0.ebuild
+++ b/testdata/repos/standalone/LocalUseCheck/MatchingGlobalUse/MatchingGlobalUse-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild has local USE flag matching a global"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
IUSE="matching probable used"
diff --git a/testdata/repos/standalone/LocalUseCheck/MissingLocalUseDesc/MissingLocalUseDesc-0.ebuild b/testdata/repos/standalone/LocalUseCheck/MissingLocalUseDesc/MissingLocalUseDesc-0.ebuild
index fe92bd398..2e2f85ce3 100644
--- a/testdata/repos/standalone/LocalUseCheck/MissingLocalUseDesc/MissingLocalUseDesc-0.ebuild
+++ b/testdata/repos/standalone/LocalUseCheck/MissingLocalUseDesc/MissingLocalUseDesc-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild with local USE flags missing descriptions in metadata.xml"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
IUSE="empty whitespace"
diff --git a/testdata/repos/standalone/LocalUseCheck/ProbableGlobalUse/ProbableGlobalUse-0.ebuild b/testdata/repos/standalone/LocalUseCheck/ProbableGlobalUse/ProbableGlobalUse-0.ebuild
index afe854c63..ebf8ff93c 100644
--- a/testdata/repos/standalone/LocalUseCheck/ProbableGlobalUse/ProbableGlobalUse-0.ebuild
+++ b/testdata/repos/standalone/LocalUseCheck/ProbableGlobalUse/ProbableGlobalUse-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild has local USE flag closely matching a global"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
IUSE="used matching probable"
diff --git a/testdata/repos/standalone/LocalUseCheck/ProbableUseExpand/ProbableUseExpand-0.ebuild b/testdata/repos/standalone/LocalUseCheck/ProbableUseExpand/ProbableUseExpand-0.ebuild
index 574ec4548..f341f3aae 100644
--- a/testdata/repos/standalone/LocalUseCheck/ProbableUseExpand/ProbableUseExpand-0.ebuild
+++ b/testdata/repos/standalone/LocalUseCheck/ProbableUseExpand/ProbableUseExpand-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild has local USE flag closely matching USE_EXPAND"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
IUSE="local use_expand_probable"
diff --git a/testdata/repos/standalone/LocalUseCheck/UnderscoreInUseFlag/UnderscoreInUseFlag-0.ebuild b/testdata/repos/standalone/LocalUseCheck/UnderscoreInUseFlag/UnderscoreInUseFlag-0.ebuild
index 056c3c120..e4cfb932a 100644
--- a/testdata/repos/standalone/LocalUseCheck/UnderscoreInUseFlag/UnderscoreInUseFlag-0.ebuild
+++ b/testdata/repos/standalone/LocalUseCheck/UnderscoreInUseFlag/UnderscoreInUseFlag-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild has underscore in local USE flag"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
IUSE="foo_bar"
diff --git a/testdata/repos/standalone/LocalUseCheck/UnusedLocalUse/UnusedLocalUse-0.ebuild b/testdata/repos/standalone/LocalUseCheck/UnusedLocalUse/UnusedLocalUse-0.ebuild
index 4151aae00..abe9258d6 100644
--- a/testdata/repos/standalone/LocalUseCheck/UnusedLocalUse/UnusedLocalUse-0.ebuild
+++ b/testdata/repos/standalone/LocalUseCheck/UnusedLocalUse/UnusedLocalUse-0.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Ebuild has unused local USE flag in metadata.xml"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/ManifestCheck/DeprecatedChksum/DeprecatedChksum-0.ebuild b/testdata/repos/standalone/ManifestCheck/DeprecatedChksum/DeprecatedChksum-0.ebuild
index b19d90adb..86f1e8e3b 100644
--- a/testdata/repos/standalone/ManifestCheck/DeprecatedChksum/DeprecatedChksum-0.ebuild
+++ b/testdata/repos/standalone/ManifestCheck/DeprecatedChksum/DeprecatedChksum-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild with manifest entry using deprecated checksums"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
SRC_URI="https://github.com/pkgcore/pkgcheck/${P}.tar.gz"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/ManifestCheck/InvalidManifest/InvalidManifest-0.ebuild b/testdata/repos/standalone/ManifestCheck/InvalidManifest/InvalidManifest-0.ebuild
index d3a73e34e..63d027883 100644
--- a/testdata/repos/standalone/ManifestCheck/InvalidManifest/InvalidManifest-0.ebuild
+++ b/testdata/repos/standalone/ManifestCheck/InvalidManifest/InvalidManifest-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild with invalid manifest"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
SRC_URI="https://github.com/pkgcore/pkgcheck/${P}.tar.gz"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/ManifestCheck/MissingChksum/MissingChksum-0.ebuild b/testdata/repos/standalone/ManifestCheck/MissingChksum/MissingChksum-0.ebuild
index 9bf15fd1b..5ebcfe0ea 100644
--- a/testdata/repos/standalone/ManifestCheck/MissingChksum/MissingChksum-0.ebuild
+++ b/testdata/repos/standalone/ManifestCheck/MissingChksum/MissingChksum-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild with manifest entry using missing required checksums"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
SRC_URI="https://github.com/pkgcore/pkgcheck/${P}.tar.gz"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/ManifestCheck/MissingManifest/MissingManifest-0.ebuild b/testdata/repos/standalone/ManifestCheck/MissingManifest/MissingManifest-0.ebuild
index 9786f4c38..64397ffcc 100644
--- a/testdata/repos/standalone/ManifestCheck/MissingManifest/MissingManifest-0.ebuild
+++ b/testdata/repos/standalone/ManifestCheck/MissingManifest/MissingManifest-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild with missing manifest for a fetchable"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
SRC_URI="https://github.com/pkgcore/pkgcheck/${P}.tar.gz"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/ManifestCheck/UnknownManifest/UnknownManifest-0.ebuild b/testdata/repos/standalone/ManifestCheck/UnknownManifest/UnknownManifest-0.ebuild
index 3686e7a1e..f9d4e1c3d 100644
--- a/testdata/repos/standalone/ManifestCheck/UnknownManifest/UnknownManifest-0.ebuild
+++ b/testdata/repos/standalone/ManifestCheck/UnknownManifest/UnknownManifest-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild with manifest entry for unknown fetchable"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
SRC_URI="https://github.com/pkgcore/pkgcheck/${P}.tar.gz"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/ManifestCheck/UnnecessaryManifest/UnnecessaryManifest-0.ebuild b/testdata/repos/standalone/ManifestCheck/UnnecessaryManifest/UnnecessaryManifest-0.ebuild
index 100767c13..d51bbea0e 100644
--- a/testdata/repos/standalone/ManifestCheck/UnnecessaryManifest/UnnecessaryManifest-0.ebuild
+++ b/testdata/repos/standalone/ManifestCheck/UnnecessaryManifest/UnnecessaryManifest-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild with unnecessary manifest entry"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
SRC_URI="https://github.com/pkgcore/pkgcheck/${P}.tar.gz"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/ManifestCollisionCheck/ConflictingChksums/ConflictingChksums-0.ebuild b/testdata/repos/standalone/ManifestCollisionCheck/ConflictingChksums/ConflictingChksums-0.ebuild
index a0f4bd999..1d836e2f1 100644
--- a/testdata/repos/standalone/ManifestCollisionCheck/ConflictingChksums/ConflictingChksums-0.ebuild
+++ b/testdata/repos/standalone/ManifestCollisionCheck/ConflictingChksums/ConflictingChksums-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild with manifest entry colliding with another package"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
SRC_URI="https://github.com/pkgcore/pkgcheck/foo.tar.gz"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/ManifestCollisionCheck/MatchingChksums/MatchingChksums-0.ebuild b/testdata/repos/standalone/ManifestCollisionCheck/MatchingChksums/MatchingChksums-0.ebuild
index 38971444e..f7cc3fab0 100644
--- a/testdata/repos/standalone/ManifestCollisionCheck/MatchingChksums/MatchingChksums-0.ebuild
+++ b/testdata/repos/standalone/ManifestCollisionCheck/MatchingChksums/MatchingChksums-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild with manifest entry colliding with another package"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
SRC_URI="https://github.com/pkgcore/pkgcheck/foo1.tar.gz"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/MetadataVarCheck/HomepageInSrcUri/HomepageInSrcUri-0.ebuild b/testdata/repos/standalone/MetadataVarCheck/HomepageInSrcUri/HomepageInSrcUri-0.ebuild
index 436b6da24..f1359cbf2 100644
--- a/testdata/repos/standalone/MetadataVarCheck/HomepageInSrcUri/HomepageInSrcUri-0.ebuild
+++ b/testdata/repos/standalone/MetadataVarCheck/HomepageInSrcUri/HomepageInSrcUri-0.ebuild
@@ -3,5 +3,5 @@ HOMEPAGE="https://github.com/pkgcore/pkgcheck"
SRC_URI="${HOMEPAGE}/${P}.tar.gz"
# commented lines that would otherwise be flagged are ignored
#SRC_URI="${HOMEPAGE}/${PV}/${P}.tar.gz"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/MetadataVarCheck/MultipleKeywordsLines/MultipleKeywordsLines-0.ebuild b/testdata/repos/standalone/MetadataVarCheck/MultipleKeywordsLines/MultipleKeywordsLines-0.ebuild
index 0d92481f6..5e456b69f 100644
--- a/testdata/repos/standalone/MetadataVarCheck/MultipleKeywordsLines/MultipleKeywordsLines-0.ebuild
+++ b/testdata/repos/standalone/MetadataVarCheck/MultipleKeywordsLines/MultipleKeywordsLines-0.ebuild
@@ -1,7 +1,7 @@
DESCRIPTION="Ebuild specifying KEYWORDS across multiple lines in global scope"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
if [[ ${PV} == "9999" ]] ; then
inherit vcs
diff --git a/testdata/repos/standalone/MetadataVarCheck/MultipleKeywordsLines/MultipleKeywordsLines-1.ebuild b/testdata/repos/standalone/MetadataVarCheck/MultipleKeywordsLines/MultipleKeywordsLines-1.ebuild
index 9959070bc..61a59ac51 100644
--- a/testdata/repos/standalone/MetadataVarCheck/MultipleKeywordsLines/MultipleKeywordsLines-1.ebuild
+++ b/testdata/repos/standalone/MetadataVarCheck/MultipleKeywordsLines/MultipleKeywordsLines-1.ebuild
@@ -1,7 +1,7 @@
DESCRIPTION="Ebuild specifying KEYWORDS across multiple lines in global scope"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
KEYWORDS="
~amd64
~x86
diff --git a/testdata/repos/standalone/MetadataVarCheck/ReferenceInMetadataVar/ReferenceInMetadataVar-0.ebuild b/testdata/repos/standalone/MetadataVarCheck/ReferenceInMetadataVar/ReferenceInMetadataVar-0.ebuild
index b117d8586..9402ef7ad 100644
--- a/testdata/repos/standalone/MetadataVarCheck/ReferenceInMetadataVar/ReferenceInMetadataVar-0.ebuild
+++ b/testdata/repos/standalone/MetadataVarCheck/ReferenceInMetadataVar/ReferenceInMetadataVar-0.ebuild
@@ -2,5 +2,5 @@ DESCRIPTION="Ebuild with variable in HOMEPAGE"
HOMEPAGE="https://github.com/pkgcore/${PN}"
# commented lines that would otherwise be flagged are ignored
#HOMEPAGE="https://github.com/${P}"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/MetadataVarCheck/ReferenceInMetadataVar/ReferenceInMetadataVar-1.ebuild b/testdata/repos/standalone/MetadataVarCheck/ReferenceInMetadataVar/ReferenceInMetadataVar-1.ebuild
index 772df949d..46f95f556 100644
--- a/testdata/repos/standalone/MetadataVarCheck/ReferenceInMetadataVar/ReferenceInMetadataVar-1.ebuild
+++ b/testdata/repos/standalone/MetadataVarCheck/ReferenceInMetadataVar/ReferenceInMetadataVar-1.ebuild
@@ -1,6 +1,6 @@
DESCRIPTION="Ebuild with variable in KEYWORDS"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
ARCH="~x86"
KEYWORDS="~amd64 ${ARCH}"
diff --git a/testdata/repos/standalone/MetadataVarCheck/ReferenceInMetadataVar/ReferenceInMetadataVar-2.ebuild b/testdata/repos/standalone/MetadataVarCheck/ReferenceInMetadataVar/ReferenceInMetadataVar-2.ebuild
index dc3b42435..0e0119ba1 100644
--- a/testdata/repos/standalone/MetadataVarCheck/ReferenceInMetadataVar/ReferenceInMetadataVar-2.ebuild
+++ b/testdata/repos/standalone/MetadataVarCheck/ReferenceInMetadataVar/ReferenceInMetadataVar-2.ebuild
@@ -1,7 +1,7 @@
DESCRIPTION="Ebuild with variable in LICENSE"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
MY_LICENSE="BSD"
LICENSE="${MY_LICENSE}"
LICENSE="${LICENSE} BSD"
+SLOT="0"
KEYWORDS="~amd64 ~x86"
diff --git a/testdata/repos/standalone/MetadataVarCheck/ReferenceInMetadataVar/ReferenceInMetadataVar-3.ebuild b/testdata/repos/standalone/MetadataVarCheck/ReferenceInMetadataVar/ReferenceInMetadataVar-3.ebuild
index ffe27b267..b5d7caf57 100644
--- a/testdata/repos/standalone/MetadataVarCheck/ReferenceInMetadataVar/ReferenceInMetadataVar-3.ebuild
+++ b/testdata/repos/standalone/MetadataVarCheck/ReferenceInMetadataVar/ReferenceInMetadataVar-3.ebuild
@@ -1,7 +1,7 @@
DESCRIPTION="Ebuild with variable in LICENSE"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
MY_LICENSE="BSD"
LICENSE=""
LICENSE+="${MY_LICENSE}"
+SLOT="0"
KEYWORDS="~amd64 ~x86"
diff --git a/testdata/repos/standalone/MetadataVarCheck/ReferenceInMetadataVar/ReferenceInMetadataVar-4.ebuild b/testdata/repos/standalone/MetadataVarCheck/ReferenceInMetadataVar/ReferenceInMetadataVar-4.ebuild
index 6f6724dd5..e4cc73753 100644
--- a/testdata/repos/standalone/MetadataVarCheck/ReferenceInMetadataVar/ReferenceInMetadataVar-4.ebuild
+++ b/testdata/repos/standalone/MetadataVarCheck/ReferenceInMetadataVar/ReferenceInMetadataVar-4.ebuild
@@ -1,6 +1,6 @@
DESCRIPTION="Ebuild with variable in LICENSE"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
LICENSE="${LICENSE} ${LICENSE/B/B}"
+SLOT="0"
KEYWORDS="~amd64 ~x86"
diff --git a/testdata/repos/standalone/MetadataVarCheck/SelfAssignment/SelfAssignment-0.ebuild b/testdata/repos/standalone/MetadataVarCheck/SelfAssignment/SelfAssignment-0.ebuild
index 1abcf8b02..2aabc13f0 100644
--- a/testdata/repos/standalone/MetadataVarCheck/SelfAssignment/SelfAssignment-0.ebuild
+++ b/testdata/repos/standalone/MetadataVarCheck/SelfAssignment/SelfAssignment-0.ebuild
@@ -1,7 +1,7 @@
DESCRIPTION="Ebuild with various self assignments"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
RDEPEND="${RDEPEND}" # FAIL
RDEPEND="$RDEPEND" # FAIL
diff --git a/testdata/repos/standalone/MetadataVarCheck/StaticSrcUri/StaticSrcUri-0.ebuild b/testdata/repos/standalone/MetadataVarCheck/StaticSrcUri/StaticSrcUri-0.ebuild
index 7b5eee59b..5d10653ae 100644
--- a/testdata/repos/standalone/MetadataVarCheck/StaticSrcUri/StaticSrcUri-0.ebuild
+++ b/testdata/repos/standalone/MetadataVarCheck/StaticSrcUri/StaticSrcUri-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild with static values of dynamica variables in SRC_URI"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
SRC_URI="https://github.com/pkgcore/pkgcheck/StaticSrcUri-0.tar.gz"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/MissingSlotDepCheck/MissingSlotDep/MissingSlotDep-0.ebuild b/testdata/repos/standalone/MissingSlotDepCheck/MissingSlotDep/MissingSlotDep-0.ebuild
index 4a4a4d409..9e55d36ed 100644
--- a/testdata/repos/standalone/MissingSlotDepCheck/MissingSlotDep/MissingSlotDep-0.ebuild
+++ b/testdata/repos/standalone/MissingSlotDepCheck/MissingSlotDep/MissingSlotDep-0.ebuild
@@ -2,7 +2,7 @@ EAPI=7
DESCRIPTION="Ebuild with dependency missing a slot dep"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
RDEPEND="stub/slotted"
DEPEND="${RDEPEND}"
diff --git a/testdata/repos/standalone/MissingUnpackerDepCheck/MissingUnpackerDep/MissingUnpackerDep-0.ebuild b/testdata/repos/standalone/MissingUnpackerDepCheck/MissingUnpackerDep/MissingUnpackerDep-0.ebuild
index c4785c15d..5be0ebf5b 100644
--- a/testdata/repos/standalone/MissingUnpackerDepCheck/MissingUnpackerDep/MissingUnpackerDep-0.ebuild
+++ b/testdata/repos/standalone/MissingUnpackerDepCheck/MissingUnpackerDep/MissingUnpackerDep-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild missing unpacker dependency"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
SRC_URI="https://github.com/pkgcore/pkgcheck/${P}.zip"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/NonPosixCheck/NonPosixHeadTailUsage/NonPosixHeadTailUsage-0.ebuild b/testdata/repos/standalone/NonPosixCheck/NonPosixHeadTailUsage/NonPosixHeadTailUsage-0.ebuild
index 6ee3b8fcf..9f3512251 100644
--- a/testdata/repos/standalone/NonPosixCheck/NonPosixHeadTailUsage/NonPosixHeadTailUsage-0.ebuild
+++ b/testdata/repos/standalone/NonPosixCheck/NonPosixHeadTailUsage/NonPosixHeadTailUsage-0.ebuild
@@ -1,7 +1,7 @@
DESCRIPTION="Ebuild with non posix head usage"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
src_prepare() {
head -1 file > another || die
diff --git a/testdata/repos/standalone/NonPosixCheck/NonPosixHeadTailUsage/NonPosixHeadTailUsage-1.ebuild b/testdata/repos/standalone/NonPosixCheck/NonPosixHeadTailUsage/NonPosixHeadTailUsage-1.ebuild
index 6e926ae86..e3e335fe7 100644
--- a/testdata/repos/standalone/NonPosixCheck/NonPosixHeadTailUsage/NonPosixHeadTailUsage-1.ebuild
+++ b/testdata/repos/standalone/NonPosixCheck/NonPosixHeadTailUsage/NonPosixHeadTailUsage-1.ebuild
@@ -1,7 +1,7 @@
DESCRIPTION="Ebuild with non posix head usage"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
src_prepare() {
tail -1 file > another || die
diff --git a/testdata/repos/standalone/PackageMetadataXmlCheck/InvalidRemoteID/InvalidRemoteID-0.ebuild b/testdata/repos/standalone/PackageMetadataXmlCheck/InvalidRemoteID/InvalidRemoteID-0.ebuild
index 158a2e389..dbdf4ab23 100644
--- a/testdata/repos/standalone/PackageMetadataXmlCheck/InvalidRemoteID/InvalidRemoteID-0.ebuild
+++ b/testdata/repos/standalone/PackageMetadataXmlCheck/InvalidRemoteID/InvalidRemoteID-0.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Ebuild with metadata.xml failing remote-id validation"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/PackageMetadataXmlCheck/PkgBadlyFormedXml/PkgBadlyFormedXml-0.ebuild b/testdata/repos/standalone/PackageMetadataXmlCheck/PkgBadlyFormedXml/PkgBadlyFormedXml-0.ebuild
index 9d649530f..cc011c762 100644
--- a/testdata/repos/standalone/PackageMetadataXmlCheck/PkgBadlyFormedXml/PkgBadlyFormedXml-0.ebuild
+++ b/testdata/repos/standalone/PackageMetadataXmlCheck/PkgBadlyFormedXml/PkgBadlyFormedXml-0.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Ebuild with invalid XML in metadata.xml"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/PackageMetadataXmlCheck/PkgInvalidXml/PkgInvalidXml-0.ebuild b/testdata/repos/standalone/PackageMetadataXmlCheck/PkgInvalidXml/PkgInvalidXml-0.ebuild
index 8898d1390..d7efa329c 100644
--- a/testdata/repos/standalone/PackageMetadataXmlCheck/PkgInvalidXml/PkgInvalidXml-0.ebuild
+++ b/testdata/repos/standalone/PackageMetadataXmlCheck/PkgInvalidXml/PkgInvalidXml-0.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Ebuild with metadata.xml failing schema validation"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/PackageMetadataXmlCheck/PkgMetadataXmlEmptyElement/PkgMetadataXmlEmptyElement-0.ebuild b/testdata/repos/standalone/PackageMetadataXmlCheck/PkgMetadataXmlEmptyElement/PkgMetadataXmlEmptyElement-0.ebuild
index 578f1f5a7..950e85c3b 100644
--- a/testdata/repos/standalone/PackageMetadataXmlCheck/PkgMetadataXmlEmptyElement/PkgMetadataXmlEmptyElement-0.ebuild
+++ b/testdata/repos/standalone/PackageMetadataXmlCheck/PkgMetadataXmlEmptyElement/PkgMetadataXmlEmptyElement-0.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Ebuild with metadata.xml that has an empty element"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/PackageMetadataXmlCheck/PkgMetadataXmlIndentation/PkgMetadataXmlIndentation-0.ebuild b/testdata/repos/standalone/PackageMetadataXmlCheck/PkgMetadataXmlIndentation/PkgMetadataXmlIndentation-0.ebuild
index 2b8f23701..db2f4b98f 100644
--- a/testdata/repos/standalone/PackageMetadataXmlCheck/PkgMetadataXmlIndentation/PkgMetadataXmlIndentation-0.ebuild
+++ b/testdata/repos/standalone/PackageMetadataXmlCheck/PkgMetadataXmlIndentation/PkgMetadataXmlIndentation-0.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Ebuild has with inconsistent indentation in metadata.xml"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/PackageMetadataXmlCheck/PkgMetadataXmlInvalidCatRef/PkgMetadataXmlInvalidCatRef-0.ebuild b/testdata/repos/standalone/PackageMetadataXmlCheck/PkgMetadataXmlInvalidCatRef/PkgMetadataXmlInvalidCatRef-0.ebuild
index 67ab32dd4..235ac2dd8 100644
--- a/testdata/repos/standalone/PackageMetadataXmlCheck/PkgMetadataXmlInvalidCatRef/PkgMetadataXmlInvalidCatRef-0.ebuild
+++ b/testdata/repos/standalone/PackageMetadataXmlCheck/PkgMetadataXmlInvalidCatRef/PkgMetadataXmlInvalidCatRef-0.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Ebuild with metadata.xml using an invalid category reference"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/PackageMetadataXmlCheck/PkgMetadataXmlInvalidPkgRef/PkgMetadataXmlInvalidPkgRef-0.ebuild b/testdata/repos/standalone/PackageMetadataXmlCheck/PkgMetadataXmlInvalidPkgRef/PkgMetadataXmlInvalidPkgRef-0.ebuild
index 00d3058ab..d95ead0e4 100644
--- a/testdata/repos/standalone/PackageMetadataXmlCheck/PkgMetadataXmlInvalidPkgRef/PkgMetadataXmlInvalidPkgRef-0.ebuild
+++ b/testdata/repos/standalone/PackageMetadataXmlCheck/PkgMetadataXmlInvalidPkgRef/PkgMetadataXmlInvalidPkgRef-0.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Ebuild with metadata.xml using an invalid pkg reference"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/PackageMetadataXmlCheck/RedundantLongDescription/RedundantLongDescription-0.ebuild b/testdata/repos/standalone/PackageMetadataXmlCheck/RedundantLongDescription/RedundantLongDescription-0.ebuild
index fa48d8d33..18cbd71fa 100644
--- a/testdata/repos/standalone/PackageMetadataXmlCheck/RedundantLongDescription/RedundantLongDescription-0.ebuild
+++ b/testdata/repos/standalone/PackageMetadataXmlCheck/RedundantLongDescription/RedundantLongDescription-0.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Ebuild with redundant metadata.xml longdescription"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/PkgDirCheck/DuplicateFiles/DuplicateFiles-0.ebuild b/testdata/repos/standalone/PkgDirCheck/DuplicateFiles/DuplicateFiles-0.ebuild
index 802afd9cc..d40e9a010 100644
--- a/testdata/repos/standalone/PkgDirCheck/DuplicateFiles/DuplicateFiles-0.ebuild
+++ b/testdata/repos/standalone/PkgDirCheck/DuplicateFiles/DuplicateFiles-0.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Two or more identical files in FILESDIR"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/PkgDirCheck/EmptyFile/EmptyFile-0.ebuild b/testdata/repos/standalone/PkgDirCheck/EmptyFile/EmptyFile-0.ebuild
index a042ae81b..0816b34bd 100644
--- a/testdata/repos/standalone/PkgDirCheck/EmptyFile/EmptyFile-0.ebuild
+++ b/testdata/repos/standalone/PkgDirCheck/EmptyFile/EmptyFile-0.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="File in FILESDIR is empty"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/PkgDirCheck/ExecutableFile/ExecutableFile-0.ebuild b/testdata/repos/standalone/PkgDirCheck/ExecutableFile/ExecutableFile-0.ebuild
index 3be52a415..d9f3de71a 100644
--- a/testdata/repos/standalone/PkgDirCheck/ExecutableFile/ExecutableFile-0.ebuild
+++ b/testdata/repos/standalone/PkgDirCheck/ExecutableFile/ExecutableFile-0.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="File has executable bit, but doesn't need it"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/PkgDirCheck/InvalidPN/InvalidPN.ebuild b/testdata/repos/standalone/PkgDirCheck/InvalidPN/InvalidPN.ebuild
index 026b9fd9f..b2f4cc13a 100644
--- a/testdata/repos/standalone/PkgDirCheck/InvalidPN/InvalidPN.ebuild
+++ b/testdata/repos/standalone/PkgDirCheck/InvalidPN/InvalidPN.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Ebuilds that have invalid package names"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/PkgDirCheck/MismatchedPN/Mismatched-1.ebuild b/testdata/repos/standalone/PkgDirCheck/MismatchedPN/Mismatched-1.ebuild
index f7a976359..99daf738b 100644
--- a/testdata/repos/standalone/PkgDirCheck/MismatchedPN/Mismatched-1.ebuild
+++ b/testdata/repos/standalone/PkgDirCheck/MismatchedPN/Mismatched-1.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Ebuilds that have different names than their parent directory"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/PkgDirCheck/UnknownPkgDirEntry/UnknownPkgDirEntry-0.ebuild b/testdata/repos/standalone/PkgDirCheck/UnknownPkgDirEntry/UnknownPkgDirEntry-0.ebuild
index ee2cfac79..2e37e0a66 100644
--- a/testdata/repos/standalone/PkgDirCheck/UnknownPkgDirEntry/UnknownPkgDirEntry-0.ebuild
+++ b/testdata/repos/standalone/PkgDirCheck/UnknownPkgDirEntry/UnknownPkgDirEntry-0.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Unknown file in package dir is ignored"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/PropertiesCheck/InvalidProperties/InvalidProperties-0.ebuild b/testdata/repos/standalone/PropertiesCheck/InvalidProperties/InvalidProperties-0.ebuild
index 683c5c232..03f1785fe 100644
--- a/testdata/repos/standalone/PropertiesCheck/InvalidProperties/InvalidProperties-0.ebuild
+++ b/testdata/repos/standalone/PropertiesCheck/InvalidProperties/InvalidProperties-0.ebuild
@@ -1,6 +1,6 @@
DESCRIPTION="Ebuild with invalid PROPERTIES"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
IUSE="used"
PROPERTIES="!used ( interactive )"
diff --git a/testdata/repos/standalone/PropertiesCheck/UnknownProperties/UnknownProperties-0.ebuild b/testdata/repos/standalone/PropertiesCheck/UnknownProperties/UnknownProperties-0.ebuild
index e6b7058b9..82339115c 100644
--- a/testdata/repos/standalone/PropertiesCheck/UnknownProperties/UnknownProperties-0.ebuild
+++ b/testdata/repos/standalone/PropertiesCheck/UnknownProperties/UnknownProperties-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild with unknown PROPERTIES"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
PROPERTIES="foo"
diff --git a/testdata/repos/standalone/PropertiesCheck/UnstatedIuse/UnstatedIuse-0.ebuild b/testdata/repos/standalone/PropertiesCheck/UnstatedIuse/UnstatedIuse-0.ebuild
index c92c2433e..a4d8cc449 100644
--- a/testdata/repos/standalone/PropertiesCheck/UnstatedIuse/UnstatedIuse-0.ebuild
+++ b/testdata/repos/standalone/PropertiesCheck/UnstatedIuse/UnstatedIuse-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild with unstated USE flags in PROPERTIES"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
PROPERTIES="used? ( interactive )"
diff --git a/testdata/repos/standalone/ReadonlyVariableCheck/ReadonlyVariable/ReadonlyVariable-0.ebuild b/testdata/repos/standalone/ReadonlyVariableCheck/ReadonlyVariable/ReadonlyVariable-0.ebuild
index 809752cec..f13806e2c 100644
--- a/testdata/repos/standalone/ReadonlyVariableCheck/ReadonlyVariable/ReadonlyVariable-0.ebuild
+++ b/testdata/repos/standalone/ReadonlyVariableCheck/ReadonlyVariable/ReadonlyVariable-0.ebuild
@@ -3,8 +3,8 @@ EAPI=7
PV="5"
DESCRIPTION="Ebuild that assigns read-only variable in global scope"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
pkg_pretend() {
# assignments in function scope are ignored
diff --git a/testdata/repos/standalone/RedundantDodirCheck/RedundantDodir/RedundantDodir-0.ebuild b/testdata/repos/standalone/RedundantDodirCheck/RedundantDodir/RedundantDodir-0.ebuild
index bcf00a6bd..8b4c33dd4 100644
--- a/testdata/repos/standalone/RedundantDodirCheck/RedundantDodir/RedundantDodir-0.ebuild
+++ b/testdata/repos/standalone/RedundantDodirCheck/RedundantDodir/RedundantDodir-0.ebuild
@@ -2,8 +2,8 @@ EAPI=7
DESCRIPTION="Ebuild with redundant dodir calls"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
src_install() {
touch blah
diff --git a/testdata/repos/standalone/RequiredUseCheck/InvalidRequiredUse/InvalidRequiredUse-0.ebuild b/testdata/repos/standalone/RequiredUseCheck/InvalidRequiredUse/InvalidRequiredUse-0.ebuild
index c25febd10..7cc5cfc07 100644
--- a/testdata/repos/standalone/RequiredUseCheck/InvalidRequiredUse/InvalidRequiredUse-0.ebuild
+++ b/testdata/repos/standalone/RequiredUseCheck/InvalidRequiredUse/InvalidRequiredUse-0.ebuild
@@ -1,6 +1,6 @@
EAPI=4
DESCRIPTION="Ebuild with invalid REQUIRED_USE"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
REQUIRED_USE="|| ( )"
diff --git a/testdata/repos/standalone/RequiredUseCheck/InvalidRequiredUse/InvalidRequiredUse-1.ebuild b/testdata/repos/standalone/RequiredUseCheck/InvalidRequiredUse/InvalidRequiredUse-1.ebuild
index 80636c5ff..e2e3d719f 100644
--- a/testdata/repos/standalone/RequiredUseCheck/InvalidRequiredUse/InvalidRequiredUse-1.ebuild
+++ b/testdata/repos/standalone/RequiredUseCheck/InvalidRequiredUse/InvalidRequiredUse-1.ebuild
@@ -1,6 +1,6 @@
EAPI=4
DESCRIPTION="Ebuild with invalid REQUIRED_USE"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
REQUIRED_USE="?"
diff --git a/testdata/repos/standalone/RequiredUseCheck/InvalidRequiredUse/InvalidRequiredUse-2.ebuild b/testdata/repos/standalone/RequiredUseCheck/InvalidRequiredUse/InvalidRequiredUse-2.ebuild
index 56867ef56..246f9330d 100644
--- a/testdata/repos/standalone/RequiredUseCheck/InvalidRequiredUse/InvalidRequiredUse-2.ebuild
+++ b/testdata/repos/standalone/RequiredUseCheck/InvalidRequiredUse/InvalidRequiredUse-2.ebuild
@@ -1,7 +1,7 @@
EAPI=4
DESCRIPTION="Ebuild with invalid REQUIRED_USE"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
IUSE="required"
REQUIRED_USE="required?"
diff --git a/testdata/repos/standalone/RequiredUseCheck/RequiredUseDefaults/RequiredUseDefaults-0.ebuild b/testdata/repos/standalone/RequiredUseCheck/RequiredUseDefaults/RequiredUseDefaults-0.ebuild
index 31494b504..a66f7e5d3 100644
--- a/testdata/repos/standalone/RequiredUseCheck/RequiredUseDefaults/RequiredUseDefaults-0.ebuild
+++ b/testdata/repos/standalone/RequiredUseCheck/RequiredUseDefaults/RequiredUseDefaults-0.ebuild
@@ -2,8 +2,8 @@ EAPI=4
DESCRIPTION="Ebuild with REQUIRED_USE failing by default"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
KEYWORDS="~amd64"
IUSE="required used"
REQUIRED_USE="^^ ( required used )"
diff --git a/testdata/repos/standalone/RequiredUseCheck/UnstatedIuse/UnstatedIuse-0.ebuild b/testdata/repos/standalone/RequiredUseCheck/UnstatedIuse/UnstatedIuse-0.ebuild
index 2b407f8bb..5edf7ae92 100644
--- a/testdata/repos/standalone/RequiredUseCheck/UnstatedIuse/UnstatedIuse-0.ebuild
+++ b/testdata/repos/standalone/RequiredUseCheck/UnstatedIuse/UnstatedIuse-0.ebuild
@@ -2,7 +2,7 @@ EAPI=4
DESCRIPTION="Ebuild with unstated USE flag in REQUIRED_USE"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
IUSE="required"
REQUIRED_USE="|| ( required used )"
diff --git a/testdata/repos/standalone/RestrictCheck/InvalidRestrict/InvalidRestrict-0.ebuild b/testdata/repos/standalone/RestrictCheck/InvalidRestrict/InvalidRestrict-0.ebuild
index 0a46c2c98..664cd4198 100644
--- a/testdata/repos/standalone/RestrictCheck/InvalidRestrict/InvalidRestrict-0.ebuild
+++ b/testdata/repos/standalone/RestrictCheck/InvalidRestrict/InvalidRestrict-0.ebuild
@@ -1,6 +1,6 @@
DESCRIPTION="Ebuild with invalid RESTRICT"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
IUSE="used"
RESTRICT="!used ( test )"
diff --git a/testdata/repos/standalone/RestrictCheck/UnknownRestrict/UnknownRestrict-0.ebuild b/testdata/repos/standalone/RestrictCheck/UnknownRestrict/UnknownRestrict-0.ebuild
index 8dc8a7d7f..97f283a3b 100644
--- a/testdata/repos/standalone/RestrictCheck/UnknownRestrict/UnknownRestrict-0.ebuild
+++ b/testdata/repos/standalone/RestrictCheck/UnknownRestrict/UnknownRestrict-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild with unknown RESTRICT"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
RESTRICT="foo"
diff --git a/testdata/repos/standalone/RestrictCheck/UnstatedIuse/UnstatedIuse-0.ebuild b/testdata/repos/standalone/RestrictCheck/UnstatedIuse/UnstatedIuse-0.ebuild
index 0caed4ac4..d9abf8a38 100644
--- a/testdata/repos/standalone/RestrictCheck/UnstatedIuse/UnstatedIuse-0.ebuild
+++ b/testdata/repos/standalone/RestrictCheck/UnstatedIuse/UnstatedIuse-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild with unstated USE flags in RESTRICT"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
RESTRICT="used? ( mirror )"
diff --git a/testdata/repos/standalone/RestrictTestCheck/MissingTestRestrict/MissingTestRestrict-0.ebuild b/testdata/repos/standalone/RestrictTestCheck/MissingTestRestrict/MissingTestRestrict-0.ebuild
index bac99c432..dd82340a8 100644
--- a/testdata/repos/standalone/RestrictTestCheck/MissingTestRestrict/MissingTestRestrict-0.ebuild
+++ b/testdata/repos/standalone/RestrictTestCheck/MissingTestRestrict/MissingTestRestrict-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild with missing conditional test RESTRICT"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
IUSE="test"
diff --git a/testdata/repos/standalone/RustCheck/SuboptimalCratesSeparator/SuboptimalCratesSeparator-0.ebuild b/testdata/repos/standalone/RustCheck/SuboptimalCratesSeparator/SuboptimalCratesSeparator-0.ebuild
index d1da3ecc8..d8df1cf28 100644
--- a/testdata/repos/standalone/RustCheck/SuboptimalCratesSeparator/SuboptimalCratesSeparator-0.ebuild
+++ b/testdata/repos/standalone/RustCheck/SuboptimalCratesSeparator/SuboptimalCratesSeparator-0.ebuild
@@ -8,5 +8,5 @@ inherit cargo
DESCRIPTION="Ebuild with suboptimal CRATES separator"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/RustCheck/SuboptimalCratesURICall/SuboptimalCratesURICall-0.ebuild b/testdata/repos/standalone/RustCheck/SuboptimalCratesURICall/SuboptimalCratesURICall-0.ebuild
index 8a8b79d0d..cc7770405 100644
--- a/testdata/repos/standalone/RustCheck/SuboptimalCratesURICall/SuboptimalCratesURICall-0.ebuild
+++ b/testdata/repos/standalone/RustCheck/SuboptimalCratesURICall/SuboptimalCratesURICall-0.ebuild
@@ -8,6 +8,6 @@ inherit cargo
DESCRIPTION="Ebuild with suboptimal cargo_crate_uris"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
-LICENSE="BSD"
SRC_URI="$(cargo_crate_uris)"
+LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/RustCheck/SuboptimalCratesURICall/SuboptimalCratesURICall-1.ebuild b/testdata/repos/standalone/RustCheck/SuboptimalCratesURICall/SuboptimalCratesURICall-1.ebuild
index 1aa95b8f4..d6316bcc4 100644
--- a/testdata/repos/standalone/RustCheck/SuboptimalCratesURICall/SuboptimalCratesURICall-1.ebuild
+++ b/testdata/repos/standalone/RustCheck/SuboptimalCratesURICall/SuboptimalCratesURICall-1.ebuild
@@ -8,6 +8,6 @@ inherit cargo
DESCRIPTION="Ebuild with suboptimal cargo_crate_uris"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
-LICENSE="BSD"
SRC_URI="$(cargo_crate_uris ${CRATES})"
+LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/RustCheck/SuboptimalCratesURICall/SuboptimalCratesURICall-2.ebuild b/testdata/repos/standalone/RustCheck/SuboptimalCratesURICall/SuboptimalCratesURICall-2.ebuild
index 72ef8a24f..5d68aec90 100644
--- a/testdata/repos/standalone/RustCheck/SuboptimalCratesURICall/SuboptimalCratesURICall-2.ebuild
+++ b/testdata/repos/standalone/RustCheck/SuboptimalCratesURICall/SuboptimalCratesURICall-2.ebuild
@@ -8,6 +8,6 @@ inherit cargo
DESCRIPTION="Ebuild with suboptimal cargo_crate_uris"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
-LICENSE="BSD"
SRC_URI="$(cargo_crate_uris ${CRATES} something)"
+LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/SandboxCallCheck/InvalidSandboxCall/InvalidSandboxCall-0.ebuild b/testdata/repos/standalone/SandboxCallCheck/InvalidSandboxCall/InvalidSandboxCall-0.ebuild
index 97062656a..831841f3a 100644
--- a/testdata/repos/standalone/SandboxCallCheck/InvalidSandboxCall/InvalidSandboxCall-0.ebuild
+++ b/testdata/repos/standalone/SandboxCallCheck/InvalidSandboxCall/InvalidSandboxCall-0.ebuild
@@ -1,7 +1,7 @@
DESCRIPTION="Ebuild with invalid sandbox calls"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
src_compile() {
addpredict /etc/dfs:/dev/zfs
diff --git a/testdata/repos/standalone/SourcingCheck/InvalidEapi/InvalidEapi-0.ebuild b/testdata/repos/standalone/SourcingCheck/InvalidEapi/InvalidEapi-0.ebuild
index 496b3f049..97fcdf14c 100644
--- a/testdata/repos/standalone/SourcingCheck/InvalidEapi/InvalidEapi-0.ebuild
+++ b/testdata/repos/standalone/SourcingCheck/InvalidEapi/InvalidEapi-0.ebuild
@@ -1,5 +1,5 @@
EAPI=9999
DESCRIPTION="Ebuild using unsupported EAPI"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/SourcingCheck/InvalidEapi/InvalidEapi-1.ebuild b/testdata/repos/standalone/SourcingCheck/InvalidEapi/InvalidEapi-1.ebuild
index 00dd7a6a8..af5321e4a 100644
--- a/testdata/repos/standalone/SourcingCheck/InvalidEapi/InvalidEapi-1.ebuild
+++ b/testdata/repos/standalone/SourcingCheck/InvalidEapi/InvalidEapi-1.ebuild
@@ -1,5 +1,5 @@
EAPI="invalid!"
DESCRIPTION="Ebuild using invalid EAPI"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/SourcingCheck/InvalidSlot/InvalidSlot-0.ebuild b/testdata/repos/standalone/SourcingCheck/InvalidSlot/InvalidSlot-0.ebuild
index bf2a36ca5..e8b41177f 100644
--- a/testdata/repos/standalone/SourcingCheck/InvalidSlot/InvalidSlot-0.ebuild
+++ b/testdata/repos/standalone/SourcingCheck/InvalidSlot/InvalidSlot-0.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Ebuild with invalid SLOT"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="?"
LICENSE="BSD"
+SLOT="?"
diff --git a/testdata/repos/standalone/SourcingCheck/InvalidSlot/InvalidSlot-1.ebuild b/testdata/repos/standalone/SourcingCheck/InvalidSlot/InvalidSlot-1.ebuild
index 66a11b857..37344faeb 100644
--- a/testdata/repos/standalone/SourcingCheck/InvalidSlot/InvalidSlot-1.ebuild
+++ b/testdata/repos/standalone/SourcingCheck/InvalidSlot/InvalidSlot-1.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Ebuild with invalid SLOT"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0/1"
LICENSE="BSD"
+SLOT="0/1"
diff --git a/testdata/repos/standalone/SourcingCheck/InvalidSlot/InvalidSlot-2.ebuild b/testdata/repos/standalone/SourcingCheck/InvalidSlot/InvalidSlot-2.ebuild
index 55374b860..590777906 100644
--- a/testdata/repos/standalone/SourcingCheck/InvalidSlot/InvalidSlot-2.ebuild
+++ b/testdata/repos/standalone/SourcingCheck/InvalidSlot/InvalidSlot-2.ebuild
@@ -1,5 +1,5 @@
EAPI=7
DESCRIPTION="Ebuild with invalid SLOT"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0/-1"
LICENSE="BSD"
+SLOT="0/-1"
diff --git a/testdata/repos/standalone/SourcingCheck/InvalidSlot/InvalidSlot-3.ebuild b/testdata/repos/standalone/SourcingCheck/InvalidSlot/InvalidSlot-3.ebuild
index ce7c530c1..a0ccb4719 100644
--- a/testdata/repos/standalone/SourcingCheck/InvalidSlot/InvalidSlot-3.ebuild
+++ b/testdata/repos/standalone/SourcingCheck/InvalidSlot/InvalidSlot-3.ebuild
@@ -1,5 +1,5 @@
EAPI=7
DESCRIPTION="Ebuild with invalid SLOT"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0/foo?"
LICENSE="BSD"
+SLOT="0/foo?"
diff --git a/testdata/repos/standalone/SourcingCheck/InvalidSlot/InvalidSlot-4.ebuild b/testdata/repos/standalone/SourcingCheck/InvalidSlot/InvalidSlot-4.ebuild
index 15672c9df..534129ea5 100644
--- a/testdata/repos/standalone/SourcingCheck/InvalidSlot/InvalidSlot-4.ebuild
+++ b/testdata/repos/standalone/SourcingCheck/InvalidSlot/InvalidSlot-4.ebuild
@@ -1,5 +1,5 @@
EAPI=7
DESCRIPTION="Ebuild with empty SLOT"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT=""
LICENSE="BSD"
+SLOT=""
diff --git a/testdata/repos/standalone/SourcingCheck/SourcingError/SourcingError-0.ebuild b/testdata/repos/standalone/SourcingCheck/SourcingError/SourcingError-0.ebuild
index 3fed4ab4b..5200822bb 100644
--- a/testdata/repos/standalone/SourcingCheck/SourcingError/SourcingError-0.ebuild
+++ b/testdata/repos/standalone/SourcingCheck/SourcingError/SourcingError-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild with bash sourcing error"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
foo
diff --git a/testdata/repos/standalone/SrcUriCheck/BadFilename/BadFilename-0.ebuild b/testdata/repos/standalone/SrcUriCheck/BadFilename/BadFilename-0.ebuild
index 648127a6a..b849c6445 100644
--- a/testdata/repos/standalone/SrcUriCheck/BadFilename/BadFilename-0.ebuild
+++ b/testdata/repos/standalone/SrcUriCheck/BadFilename/BadFilename-0.ebuild
@@ -5,5 +5,5 @@ SRC_URI="
https://github.com/pkgcore/pkgcheck/${PV}.tar.gz
https://github.com/pkgcore/pkgcheck/v${PV}.tar.gz
"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/SrcUriCheck/BadProtocol/BadProtocol-0.ebuild b/testdata/repos/standalone/SrcUriCheck/BadProtocol/BadProtocol-0.ebuild
index c6115493f..ad245806f 100644
--- a/testdata/repos/standalone/SrcUriCheck/BadProtocol/BadProtocol-0.ebuild
+++ b/testdata/repos/standalone/SrcUriCheck/BadProtocol/BadProtocol-0.ebuild
@@ -4,5 +4,5 @@ SRC_URI="
htps://github.com/pkgcore/pkgcheck/${P}.tar.gz
gopher://github.com/pkgcore/pkgcheck/${P}.tar.gz
"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/SrcUriCheck/InvalidSrcUri/InvalidSrcUri-0.ebuild b/testdata/repos/standalone/SrcUriCheck/InvalidSrcUri/InvalidSrcUri-0.ebuild
index cb9091671..99652039d 100644
--- a/testdata/repos/standalone/SrcUriCheck/InvalidSrcUri/InvalidSrcUri-0.ebuild
+++ b/testdata/repos/standalone/SrcUriCheck/InvalidSrcUri/InvalidSrcUri-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild with invalid SRC_URI"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
SRC_URI="?"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/SrcUriCheck/InvalidSrcUri/InvalidSrcUri-1.ebuild b/testdata/repos/standalone/SrcUriCheck/InvalidSrcUri/InvalidSrcUri-1.ebuild
index 6d10b69d1..0b79c1ae3 100644
--- a/testdata/repos/standalone/SrcUriCheck/InvalidSrcUri/InvalidSrcUri-1.ebuild
+++ b/testdata/repos/standalone/SrcUriCheck/InvalidSrcUri/InvalidSrcUri-1.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild with invalid SRC_URI"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
SRC_URI="( )"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/SrcUriCheck/InvalidSrcUri/InvalidSrcUri-2.ebuild b/testdata/repos/standalone/SrcUriCheck/InvalidSrcUri/InvalidSrcUri-2.ebuild
index 718aef6b3..508a6e6db 100644
--- a/testdata/repos/standalone/SrcUriCheck/InvalidSrcUri/InvalidSrcUri-2.ebuild
+++ b/testdata/repos/standalone/SrcUriCheck/InvalidSrcUri/InvalidSrcUri-2.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild with invalid SRC_URI"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
SRC_URI="https://github.com/pkgcore/pkgcheck/${P}.tar.gz/"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/SrcUriCheck/MissingUri/MissingUri-0.ebuild b/testdata/repos/standalone/SrcUriCheck/MissingUri/MissingUri-0.ebuild
index e6a36257b..1b7634c4c 100644
--- a/testdata/repos/standalone/SrcUriCheck/MissingUri/MissingUri-0.ebuild
+++ b/testdata/repos/standalone/SrcUriCheck/MissingUri/MissingUri-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild lacking full URI without RESTRICT=fetch set"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
SRC_URI="${P}.tar.gz"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/SrcUriCheck/RedundantUriRename/RedundantUriRename-0.ebuild b/testdata/repos/standalone/SrcUriCheck/RedundantUriRename/RedundantUriRename-0.ebuild
index d0fce630b..0fbca8cc3 100644
--- a/testdata/repos/standalone/SrcUriCheck/RedundantUriRename/RedundantUriRename-0.ebuild
+++ b/testdata/repos/standalone/SrcUriCheck/RedundantUriRename/RedundantUriRename-0.ebuild
@@ -3,5 +3,5 @@ EAPI=7
DESCRIPTION="Ebuild with reundant rename in SRC_URI"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
SRC_URI="https://github.com/pkgcore/pkgcheck/${P}.tar.gz -> ${P}.tar.gz"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/SrcUriCheck/RedundantUriRename/RedundantUriRename-1.ebuild b/testdata/repos/standalone/SrcUriCheck/RedundantUriRename/RedundantUriRename-1.ebuild
index 7ee2f8cd1..9bc7cd560 100644
--- a/testdata/repos/standalone/SrcUriCheck/RedundantUriRename/RedundantUriRename-1.ebuild
+++ b/testdata/repos/standalone/SrcUriCheck/RedundantUriRename/RedundantUriRename-1.ebuild
@@ -3,5 +3,5 @@ EAPI=7
DESCRIPTION="Ebuild with reundant rename in SRC_URI"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
SRC_URI="mirror://used/pkgcore/pkgcheck/${P}.tar.gz -> ${P}.tar.gz"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/SrcUriCheck/SrcUriFilenameDotPrefix/SrcUriFilenameDotPrefix-0.ebuild b/testdata/repos/standalone/SrcUriCheck/SrcUriFilenameDotPrefix/SrcUriFilenameDotPrefix-0.ebuild
index f961c3ad4..52cdab19c 100644
--- a/testdata/repos/standalone/SrcUriCheck/SrcUriFilenameDotPrefix/SrcUriFilenameDotPrefix-0.ebuild
+++ b/testdata/repos/standalone/SrcUriCheck/SrcUriFilenameDotPrefix/SrcUriFilenameDotPrefix-0.ebuild
@@ -5,5 +5,5 @@ MY_P="${PN}-v${PV}"
DESCRIPTION="Ebuild with empty var in SRC_URI"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
SRC_URI="https://github.com/pkgcore/pkgcheck/${MY_P}.tar.gz -> ${MYP}.gh.tar.gz"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/SrcUriCheck/TarballAvailable/TarballAvailable-0.ebuild b/testdata/repos/standalone/SrcUriCheck/TarballAvailable/TarballAvailable-0.ebuild
index 93e37de2a..c9ecee7af 100644
--- a/testdata/repos/standalone/SrcUriCheck/TarballAvailable/TarballAvailable-0.ebuild
+++ b/testdata/repos/standalone/SrcUriCheck/TarballAvailable/TarballAvailable-0.ebuild
@@ -6,6 +6,6 @@ SRC_URI="
https://github.com/pkgcore/pkgcheck/archive/${PV}.zip -> ${P}.zip
https://gitlab.com/pkgcore/pkgcheck/-/archive/${PV}.zip -> ${P}.zip
"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
DEPEND="app-arch/unzip"
diff --git a/testdata/repos/standalone/SrcUriCheck/UnknownMirror/UnknownMirror-0.ebuild b/testdata/repos/standalone/SrcUriCheck/UnknownMirror/UnknownMirror-0.ebuild
index e8228ea20..54fe7e856 100644
--- a/testdata/repos/standalone/SrcUriCheck/UnknownMirror/UnknownMirror-0.ebuild
+++ b/testdata/repos/standalone/SrcUriCheck/UnknownMirror/UnknownMirror-0.ebuild
@@ -4,5 +4,5 @@ SRC_URI="
mirror://used/pkgcore/pkgcheck/${P}.tar.gz
mirror://unknown/pkgcore/pkgcheck/${P}.tar.gz
"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/SrcUriCheck/UnstableSrcUri/UnstableSrcUri-0.ebuild b/testdata/repos/standalone/SrcUriCheck/UnstableSrcUri/UnstableSrcUri-0.ebuild
index e62cc89cd..fed18ce61 100644
--- a/testdata/repos/standalone/SrcUriCheck/UnstableSrcUri/UnstableSrcUri-0.ebuild
+++ b/testdata/repos/standalone/SrcUriCheck/UnstableSrcUri/UnstableSrcUri-0.ebuild
@@ -4,5 +4,5 @@ SRC_URI="
https://patch-diff.githubusercontent.com/raw/pkgcore/pkgcheck/pull/599.patch
https://github.com/pkgcore/pkgcheck/pull/1234.patch
"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/SrcUriCheck/UnstatedIuse/UnstatedIuse-0.ebuild b/testdata/repos/standalone/SrcUriCheck/UnstatedIuse/UnstatedIuse-0.ebuild
index 2f40073bf..80a204498 100644
--- a/testdata/repos/standalone/SrcUriCheck/UnstatedIuse/UnstatedIuse-0.ebuild
+++ b/testdata/repos/standalone/SrcUriCheck/UnstatedIuse/UnstatedIuse-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild with unstated USE flags in SRC_URI"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
SRC_URI="used? ( https://github.com/pkgcore/pkgcheck/${P}.tar.gz )"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/StaleLiveCheck/StaleLiveEAPI/StaleLiveEAPI-0.ebuild b/testdata/repos/standalone/StaleLiveCheck/StaleLiveEAPI/StaleLiveEAPI-0.ebuild
index dd44344e9..24cff5272 100644
--- a/testdata/repos/standalone/StaleLiveCheck/StaleLiveEAPI/StaleLiveEAPI-0.ebuild
+++ b/testdata/repos/standalone/StaleLiveCheck/StaleLiveEAPI/StaleLiveEAPI-0.ebuild
@@ -2,5 +2,5 @@ EAPI=7
DESCRIPTION="SLOT 0 is release only"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/StaleLiveCheck/StaleLiveEAPI/StaleLiveEAPI-1.9999.ebuild b/testdata/repos/standalone/StaleLiveCheck/StaleLiveEAPI/StaleLiveEAPI-1.9999.ebuild
index 4badbd0d5..616dc9943 100644
--- a/testdata/repos/standalone/StaleLiveCheck/StaleLiveEAPI/StaleLiveEAPI-1.9999.ebuild
+++ b/testdata/repos/standalone/StaleLiveCheck/StaleLiveEAPI/StaleLiveEAPI-1.9999.ebuild
@@ -2,6 +2,6 @@ EAPI=8
DESCRIPTION="SLOT 1 is fine"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="1"
LICENSE="BSD"
+SLOT="1"
PROPERTIES="live"
diff --git a/testdata/repos/standalone/StaleLiveCheck/StaleLiveEAPI/StaleLiveEAPI-1.ebuild b/testdata/repos/standalone/StaleLiveCheck/StaleLiveEAPI/StaleLiveEAPI-1.ebuild
index 5b79a3209..9861017c6 100644
--- a/testdata/repos/standalone/StaleLiveCheck/StaleLiveEAPI/StaleLiveEAPI-1.ebuild
+++ b/testdata/repos/standalone/StaleLiveCheck/StaleLiveEAPI/StaleLiveEAPI-1.ebuild
@@ -2,5 +2,5 @@ EAPI=8
DESCRIPTION="SLOT 1 is fine"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="1"
LICENSE="BSD"
+SLOT="1"
diff --git a/testdata/repos/standalone/StaleLiveCheck/StaleLiveEAPI/StaleLiveEAPI-2.1.ebuild b/testdata/repos/standalone/StaleLiveCheck/StaleLiveEAPI/StaleLiveEAPI-2.1.ebuild
index 34aba958f..5031f42f9 100644
--- a/testdata/repos/standalone/StaleLiveCheck/StaleLiveEAPI/StaleLiveEAPI-2.1.ebuild
+++ b/testdata/repos/standalone/StaleLiveCheck/StaleLiveEAPI/StaleLiveEAPI-2.1.ebuild
@@ -2,5 +2,5 @@ EAPI=8
DESCRIPTION="SLOT 2 is not fine"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="2"
LICENSE="BSD"
+SLOT="2"
diff --git a/testdata/repos/standalone/StaleLiveCheck/StaleLiveEAPI/StaleLiveEAPI-2.9999.ebuild b/testdata/repos/standalone/StaleLiveCheck/StaleLiveEAPI/StaleLiveEAPI-2.9999.ebuild
index 555702965..3cc9e7fcc 100644
--- a/testdata/repos/standalone/StaleLiveCheck/StaleLiveEAPI/StaleLiveEAPI-2.9999.ebuild
+++ b/testdata/repos/standalone/StaleLiveCheck/StaleLiveEAPI/StaleLiveEAPI-2.9999.ebuild
@@ -2,6 +2,6 @@ EAPI=7
DESCRIPTION="SLOT 2 is not fine"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="2"
LICENSE="BSD"
+SLOT="2"
PROPERTIES="live"
diff --git a/testdata/repos/standalone/StaleLiveCheck/StaleLiveEAPI/StaleLiveEAPI-2.ebuild b/testdata/repos/standalone/StaleLiveCheck/StaleLiveEAPI/StaleLiveEAPI-2.ebuild
index 1f1fe229e..d54ab4dff 100644
--- a/testdata/repos/standalone/StaleLiveCheck/StaleLiveEAPI/StaleLiveEAPI-2.ebuild
+++ b/testdata/repos/standalone/StaleLiveCheck/StaleLiveEAPI/StaleLiveEAPI-2.ebuild
@@ -2,5 +2,5 @@ EAPI=7
DESCRIPTION="SLOT 2 is not fine"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="2"
LICENSE="BSD"
+SLOT="2"
diff --git a/testdata/repos/standalone/StaleLiveCheck/StaleLiveEAPI/StaleLiveEAPI-3.1.ebuild b/testdata/repos/standalone/StaleLiveCheck/StaleLiveEAPI/StaleLiveEAPI-3.1.ebuild
index ddb5f28e9..d61677d0a 100644
--- a/testdata/repos/standalone/StaleLiveCheck/StaleLiveEAPI/StaleLiveEAPI-3.1.ebuild
+++ b/testdata/repos/standalone/StaleLiveCheck/StaleLiveEAPI/StaleLiveEAPI-3.1.ebuild
@@ -2,5 +2,5 @@ EAPI=7
DESCRIPTION="SLOT 3 is not fine"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="3"
LICENSE="BSD"
+SLOT="3"
diff --git a/testdata/repos/standalone/StaleLiveCheck/StaleLiveEAPI/StaleLiveEAPI-3.9999.ebuild b/testdata/repos/standalone/StaleLiveCheck/StaleLiveEAPI/StaleLiveEAPI-3.9999.ebuild
index d4a646ba4..8df5e8ce6 100644
--- a/testdata/repos/standalone/StaleLiveCheck/StaleLiveEAPI/StaleLiveEAPI-3.9999.ebuild
+++ b/testdata/repos/standalone/StaleLiveCheck/StaleLiveEAPI/StaleLiveEAPI-3.9999.ebuild
@@ -2,6 +2,6 @@ EAPI=7
DESCRIPTION="SLOT 3 is not fine"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="3"
LICENSE="BSD"
+SLOT="3"
PROPERTIES="live"
diff --git a/testdata/repos/standalone/StaleLiveCheck/StaleLiveEAPI/StaleLiveEAPI-3.ebuild b/testdata/repos/standalone/StaleLiveCheck/StaleLiveEAPI/StaleLiveEAPI-3.ebuild
index a9add0036..9209f0c68 100644
--- a/testdata/repos/standalone/StaleLiveCheck/StaleLiveEAPI/StaleLiveEAPI-3.ebuild
+++ b/testdata/repos/standalone/StaleLiveCheck/StaleLiveEAPI/StaleLiveEAPI-3.ebuild
@@ -2,5 +2,5 @@ EAPI=8
DESCRIPTION="SLOT 3 is not fine"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="3"
LICENSE="BSD"
+SLOT="3"
diff --git a/testdata/repos/standalone/StaleLiveCheck/StaleLiveEAPI/StaleLiveEAPI-4.9999.ebuild b/testdata/repos/standalone/StaleLiveCheck/StaleLiveEAPI/StaleLiveEAPI-4.9999.ebuild
index 8c102d1a6..238964e6a 100644
--- a/testdata/repos/standalone/StaleLiveCheck/StaleLiveEAPI/StaleLiveEAPI-4.9999.ebuild
+++ b/testdata/repos/standalone/StaleLiveCheck/StaleLiveEAPI/StaleLiveEAPI-4.9999.ebuild
@@ -2,6 +2,6 @@ EAPI=8
DESCRIPTION="SLOT 4 is live only"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="4"
LICENSE="BSD"
+SLOT="4"
PROPERTIES="live"
diff --git a/testdata/repos/standalone/VariableOrderCheck/VariableOrderWrong/VariableOrderWrong-0.ebuild b/testdata/repos/standalone/VariableOrderCheck/VariableOrderWrong/VariableOrderWrong-0.ebuild
new file mode 100644
index 000000000..a0aab060e
--- /dev/null
+++ b/testdata/repos/standalone/VariableOrderCheck/VariableOrderWrong/VariableOrderWrong-0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PHP_EXT_S="${S}/extension"
+PHP_EXT_ECONF_ARGS=""
+USE_PHP="php8-0 php8-1"
+
+KEYWORDS="~amd64 ~x86"
+
+HOMEPAGE="https://github.com/pkgcore/pkgcheck"
+DESCRIPTION="An Ebuild with variables defined in an uncommon order"
+LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/VariableOrderCheck/VariableOrderWrong/metadata.xml b/testdata/repos/standalone/VariableOrderCheck/VariableOrderWrong/metadata.xml
new file mode 100644
index 000000000..6c9187734
--- /dev/null
+++ b/testdata/repos/standalone/VariableOrderCheck/VariableOrderWrong/metadata.xml
@@ -0,0 +1,7 @@
+
+
+
+
+ random.gentoo.dev@gentoo.org
+
+
diff --git a/testdata/repos/standalone/VariableOrderCheck/metadata.xml b/testdata/repos/standalone/VariableOrderCheck/metadata.xml
new file mode 100644
index 000000000..ef647294c
--- /dev/null
+++ b/testdata/repos/standalone/VariableOrderCheck/metadata.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/testdata/repos/standalone/VariableScopeCheck/EbuildVariableScope/EbuildVariableScope-0.ebuild b/testdata/repos/standalone/VariableScopeCheck/EbuildVariableScope/EbuildVariableScope-0.ebuild
index a27c41221..50bc6d25d 100644
--- a/testdata/repos/standalone/VariableScopeCheck/EbuildVariableScope/EbuildVariableScope-0.ebuild
+++ b/testdata/repos/standalone/VariableScopeCheck/EbuildVariableScope/EbuildVariableScope-0.ebuild
@@ -2,8 +2,8 @@ EAPI=7
DESCRIPTION="Ebuild using a variable outside its defined scope"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
DOC_CONTENTS="Hello ${ROOT}"
diff --git a/testdata/repos/standalone/VisibilityCheck/NonexistentDeps/NonexistentDeps-0.ebuild b/testdata/repos/standalone/VisibilityCheck/NonexistentDeps/NonexistentDeps-0.ebuild
index 2aa33d948..2d860e7ce 100644
--- a/testdata/repos/standalone/VisibilityCheck/NonexistentDeps/NonexistentDeps-0.ebuild
+++ b/testdata/repos/standalone/VisibilityCheck/NonexistentDeps/NonexistentDeps-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild with nonexistent conditional dep"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
DEPEND="|| ( stub/stub1 stub/stub2 cat/nonexistent )"
diff --git a/testdata/repos/standalone/VisibilityCheck/VisibleVcsPkg/VisibleVcsPkg-0.ebuild b/testdata/repos/standalone/VisibilityCheck/VisibleVcsPkg/VisibleVcsPkg-0.ebuild
index ee737c90c..40d52195a 100644
--- a/testdata/repos/standalone/VisibilityCheck/VisibleVcsPkg/VisibleVcsPkg-0.ebuild
+++ b/testdata/repos/standalone/VisibilityCheck/VisibleVcsPkg/VisibleVcsPkg-0.ebuild
@@ -2,6 +2,6 @@ inherit vcs
DESCRIPTION="VCS ebuild with keywords"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
KEYWORDS="amd64"
diff --git a/testdata/repos/standalone/VisibilityCheck/VisibleVcsPkg/VisibleVcsPkg-1.ebuild b/testdata/repos/standalone/VisibilityCheck/VisibleVcsPkg/VisibleVcsPkg-1.ebuild
index 9f0fb1730..746110a98 100644
--- a/testdata/repos/standalone/VisibilityCheck/VisibleVcsPkg/VisibleVcsPkg-1.ebuild
+++ b/testdata/repos/standalone/VisibilityCheck/VisibleVcsPkg/VisibleVcsPkg-1.ebuild
@@ -2,6 +2,6 @@ inherit vcs
DESCRIPTION="VCS ebuild with keywords"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
KEYWORDS="~x86"
diff --git a/testdata/repos/standalone/WhitespaceCheck/BadWhitespaceCharacter/BadWhitespaceCharacter-0.ebuild b/testdata/repos/standalone/WhitespaceCheck/BadWhitespaceCharacter/BadWhitespaceCharacter-0.ebuild
index d245eef26..60f22a383 100644
--- a/testdata/repos/standalone/WhitespaceCheck/BadWhitespaceCharacter/BadWhitespaceCharacter-0.ebuild
+++ b/testdata/repos/standalone/WhitespaceCheck/BadWhitespaceCharacter/BadWhitespaceCharacter-0.ebuild
@@ -2,8 +2,8 @@ EAPI=7
DESCRIPTION="Ebuild uses bad whitespace character"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
src_test() {
# bad chars aren't ignored in comments
diff --git a/testdata/repos/standalone/WhitespaceCheck/DoubleEmptyLine/DoubleEmptyLine-0.ebuild b/testdata/repos/standalone/WhitespaceCheck/DoubleEmptyLine/DoubleEmptyLine-0.ebuild
index d072bdab0..4a83a70b3 100644
--- a/testdata/repos/standalone/WhitespaceCheck/DoubleEmptyLine/DoubleEmptyLine-0.ebuild
+++ b/testdata/repos/standalone/WhitespaceCheck/DoubleEmptyLine/DoubleEmptyLine-0.ebuild
@@ -2,5 +2,5 @@ DESCRIPTION="Ebuild has unneeded empty lines"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/WhitespaceCheck/NoFinalNewline/NoFinalNewline-0.ebuild b/testdata/repos/standalone/WhitespaceCheck/NoFinalNewline/NoFinalNewline-0.ebuild
index ad429e28d..1d8dcced3 100644
--- a/testdata/repos/standalone/WhitespaceCheck/NoFinalNewline/NoFinalNewline-0.ebuild
+++ b/testdata/repos/standalone/WhitespaceCheck/NoFinalNewline/NoFinalNewline-0.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Ebuild lacks an ending newline"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
-LICENSE="BSD"
\ No newline at end of file
+LICENSE="BSD"
+SLOT="0"
\ No newline at end of file
diff --git a/testdata/repos/standalone/WhitespaceCheck/TrailingEmptyLine/TrailingEmptyLine-0.ebuild b/testdata/repos/standalone/WhitespaceCheck/TrailingEmptyLine/TrailingEmptyLine-0.ebuild
index a61f2c341..e07398bfe 100644
--- a/testdata/repos/standalone/WhitespaceCheck/TrailingEmptyLine/TrailingEmptyLine-0.ebuild
+++ b/testdata/repos/standalone/WhitespaceCheck/TrailingEmptyLine/TrailingEmptyLine-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild has a trailing empty line"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/app-arch/unzip/unzip-0.ebuild b/testdata/repos/standalone/app-arch/unzip/unzip-0.ebuild
index 0b7766f5f..347f8371c 100644
--- a/testdata/repos/standalone/app-arch/unzip/unzip-0.ebuild
+++ b/testdata/repos/standalone/app-arch/unzip/unzip-0.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Stub unzip package to suppress NonexistentDeps results"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/dev-lang/ruby/ruby-0.ebuild b/testdata/repos/standalone/dev-lang/ruby/ruby-0.ebuild
index ba6aebb4a..c6d63e826 100644
--- a/testdata/repos/standalone/dev-lang/ruby/ruby-0.ebuild
+++ b/testdata/repos/standalone/dev-lang/ruby/ruby-0.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Stub ebuild"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/dev-ruby/stub/stub-0.ebuild b/testdata/repos/standalone/dev-ruby/stub/stub-0.ebuild
index ba6aebb4a..c6d63e826 100644
--- a/testdata/repos/standalone/dev-ruby/stub/stub-0.ebuild
+++ b/testdata/repos/standalone/dev-ruby/stub/stub-0.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Stub ebuild"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/profiles/categories b/testdata/repos/standalone/profiles/categories
index 9a5bd29c9..3466f4ccf 100644
--- a/testdata/repos/standalone/profiles/categories
+++ b/testdata/repos/standalone/profiles/categories
@@ -49,6 +49,7 @@ SrcUriCheck
StaleLiveCheck
stub
test
+VariableOrderCheck
VariableScopeCheck
virtual
VisibilityCheck
diff --git a/testdata/repos/standalone/stub/potential-global1/potential-global1-0.ebuild b/testdata/repos/standalone/stub/potential-global1/potential-global1-0.ebuild
index b0dddec2d..6ea8e6e50 100644
--- a/testdata/repos/standalone/stub/potential-global1/potential-global1-0.ebuild
+++ b/testdata/repos/standalone/stub/potential-global1/potential-global1-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Stub ebuild used to trigger PotentialGlobalUse"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
IUSE="potential-global"
diff --git a/testdata/repos/standalone/stub/potential-global2/potential-global2-0.ebuild b/testdata/repos/standalone/stub/potential-global2/potential-global2-0.ebuild
index b0dddec2d..6ea8e6e50 100644
--- a/testdata/repos/standalone/stub/potential-global2/potential-global2-0.ebuild
+++ b/testdata/repos/standalone/stub/potential-global2/potential-global2-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Stub ebuild used to trigger PotentialGlobalUse"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
IUSE="potential-global"
diff --git a/testdata/repos/standalone/stub/potential-global3/potential-global3-0.ebuild b/testdata/repos/standalone/stub/potential-global3/potential-global3-0.ebuild
index b0dddec2d..6ea8e6e50 100644
--- a/testdata/repos/standalone/stub/potential-global3/potential-global3-0.ebuild
+++ b/testdata/repos/standalone/stub/potential-global3/potential-global3-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Stub ebuild used to trigger PotentialGlobalUse"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
IUSE="potential-global"
diff --git a/testdata/repos/standalone/stub/potential-global4/potential-global4-0.ebuild b/testdata/repos/standalone/stub/potential-global4/potential-global4-0.ebuild
index b0dddec2d..6ea8e6e50 100644
--- a/testdata/repos/standalone/stub/potential-global4/potential-global4-0.ebuild
+++ b/testdata/repos/standalone/stub/potential-global4/potential-global4-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Stub ebuild used to trigger PotentialGlobalUse"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
IUSE="potential-global"
diff --git a/testdata/repos/standalone/stub/slotted/slotted-0.ebuild b/testdata/repos/standalone/stub/slotted/slotted-0.ebuild
index bfd02b4c8..2abbd5e19 100644
--- a/testdata/repos/standalone/stub/slotted/slotted-0.ebuild
+++ b/testdata/repos/standalone/stub/slotted/slotted-0.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Stub ebuild with different SLOTs"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/stub/slotted/slotted-1.ebuild b/testdata/repos/standalone/stub/slotted/slotted-1.ebuild
index a2949e5d2..c9b7c3937 100644
--- a/testdata/repos/standalone/stub/slotted/slotted-1.ebuild
+++ b/testdata/repos/standalone/stub/slotted/slotted-1.ebuild
@@ -1,4 +1,4 @@
DESCRIPTION="Stub ebuild with different SLOTs"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="1"
LICENSE="BSD"
+SLOT="1"
diff --git a/testdata/repos/standalone/stub/stub1/stub1-0.ebuild b/testdata/repos/standalone/stub/stub1/stub1-0.ebuild
index 3babfb6d4..1101fad82 100644
--- a/testdata/repos/standalone/stub/stub1/stub1-0.ebuild
+++ b/testdata/repos/standalone/stub/stub1/stub1-0.ebuild
@@ -1,6 +1,6 @@
DESCRIPTION="Stub ebuild used to suppress other repo-level keyword output"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
IUSE="matching probable test used use_expand_used"
RESTRICT="!test? ( test )"
diff --git a/testdata/repos/standalone/stub/stub2/stub2-0.ebuild b/testdata/repos/standalone/stub/stub2/stub2-0.ebuild
index 5c1de8693..47f77cfd3 100644
--- a/testdata/repos/standalone/stub/stub2/stub2-0.ebuild
+++ b/testdata/repos/standalone/stub/stub2/stub2-0.ebuild
@@ -1,6 +1,6 @@
DESCRIPTION="Stub ebuild used to suppress other repo-level keyword output"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
IUSE="matching probable test used"
RESTRICT="!test? ( test )"
diff --git a/testdata/repos/standalone/stub/stub3/stub3-0.ebuild b/testdata/repos/standalone/stub/stub3/stub3-0.ebuild
index 5c1de8693..47f77cfd3 100644
--- a/testdata/repos/standalone/stub/stub3/stub3-0.ebuild
+++ b/testdata/repos/standalone/stub/stub3/stub3-0.ebuild
@@ -1,6 +1,6 @@
DESCRIPTION="Stub ebuild used to suppress other repo-level keyword output"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
IUSE="matching probable test used"
RESTRICT="!test? ( test )"
diff --git a/testdata/repos/standalone/stub/stub4/stub4-0.ebuild b/testdata/repos/standalone/stub/stub4/stub4-0.ebuild
index 5c1de8693..47f77cfd3 100644
--- a/testdata/repos/standalone/stub/stub4/stub4-0.ebuild
+++ b/testdata/repos/standalone/stub/stub4/stub4-0.ebuild
@@ -1,6 +1,6 @@
DESCRIPTION="Stub ebuild used to suppress other repo-level keyword output"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
IUSE="matching probable test used"
RESTRICT="!test? ( test )"
diff --git a/testdata/repos/standalone/test/ConflictingChksums/ConflictingChksums-0.ebuild b/testdata/repos/standalone/test/ConflictingChksums/ConflictingChksums-0.ebuild
index a0f4bd999..1d836e2f1 100644
--- a/testdata/repos/standalone/test/ConflictingChksums/ConflictingChksums-0.ebuild
+++ b/testdata/repos/standalone/test/ConflictingChksums/ConflictingChksums-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild with manifest entry colliding with another package"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
SRC_URI="https://github.com/pkgcore/pkgcheck/foo.tar.gz"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/test/MatchingChksums/MatchingChksums-0.ebuild b/testdata/repos/standalone/test/MatchingChksums/MatchingChksums-0.ebuild
index e85191e26..f3645a525 100644
--- a/testdata/repos/standalone/test/MatchingChksums/MatchingChksums-0.ebuild
+++ b/testdata/repos/standalone/test/MatchingChksums/MatchingChksums-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Ebuild with manifest entry colliding with another package"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
SRC_URI="https://github.com/pkgcore/pkgcheck/foo2.tar.gz"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/standalone/virtual/UnnecessaryLicense/UnnecessaryLicense-0.ebuild b/testdata/repos/standalone/virtual/UnnecessaryLicense/UnnecessaryLicense-0.ebuild
index d763be127..0b3a014be 100644
--- a/testdata/repos/standalone/virtual/UnnecessaryLicense/UnnecessaryLicense-0.ebuild
+++ b/testdata/repos/standalone/virtual/UnnecessaryLicense/UnnecessaryLicense-0.ebuild
@@ -1,3 +1,3 @@
DESCRIPTION="Ebuild with unnecessary LICENSE"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
diff --git a/testdata/repos/visibility/DeprecatedDep/nonoptional/nonoptional-0.ebuild b/testdata/repos/visibility/DeprecatedDep/nonoptional/nonoptional-0.ebuild
index 5e5aa2b79..e6e50ec3f 100644
--- a/testdata/repos/visibility/DeprecatedDep/nonoptional/nonoptional-0.ebuild
+++ b/testdata/repos/visibility/DeprecatedDep/nonoptional/nonoptional-0.ebuild
@@ -1,7 +1,7 @@
EAPI=7
DESCRIPTION="Ebuild with deprecated dep"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
KEYWORDS="~amd64"
RDEPEND="stub/deprecated:0"
diff --git a/testdata/repos/visibility/DeprecatedDep/optional/optional-0.ebuild b/testdata/repos/visibility/DeprecatedDep/optional/optional-0.ebuild
index 9be9564eb..f9db482c6 100644
--- a/testdata/repos/visibility/DeprecatedDep/optional/optional-0.ebuild
+++ b/testdata/repos/visibility/DeprecatedDep/optional/optional-0.ebuild
@@ -1,8 +1,8 @@
EAPI=7
DESCRIPTION="Ebuild with optional and blocker deprecated deps"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
KEYWORDS="~amd64"
RDEPEND="
!stub/deprecated:0
diff --git a/testdata/repos/visibility/NonsolvableDepsInDev/masked/masked-0.ebuild b/testdata/repos/visibility/NonsolvableDepsInDev/masked/masked-0.ebuild
index 8e22f09f4..42794f65b 100644
--- a/testdata/repos/visibility/NonsolvableDepsInDev/masked/masked-0.ebuild
+++ b/testdata/repos/visibility/NonsolvableDepsInDev/masked/masked-0.ebuild
@@ -1,7 +1,7 @@
EAPI=7
DESCRIPTION="Ebuild with masked nonsolvable dep"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
KEYWORDS="~amd64"
DEPEND="stub/masked"
diff --git a/testdata/repos/visibility/NonsolvableDepsInExp/masked/masked-0.ebuild b/testdata/repos/visibility/NonsolvableDepsInExp/masked/masked-0.ebuild
index 8e22f09f4..42794f65b 100644
--- a/testdata/repos/visibility/NonsolvableDepsInExp/masked/masked-0.ebuild
+++ b/testdata/repos/visibility/NonsolvableDepsInExp/masked/masked-0.ebuild
@@ -1,7 +1,7 @@
EAPI=7
DESCRIPTION="Ebuild with masked nonsolvable dep"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
KEYWORDS="~amd64"
DEPEND="stub/masked"
diff --git a/testdata/repos/visibility/NonsolvableDepsInStable/masked/masked-0.ebuild b/testdata/repos/visibility/NonsolvableDepsInStable/masked/masked-0.ebuild
index 7d0ddb1fb..287398a70 100644
--- a/testdata/repos/visibility/NonsolvableDepsInStable/masked/masked-0.ebuild
+++ b/testdata/repos/visibility/NonsolvableDepsInStable/masked/masked-0.ebuild
@@ -1,7 +1,7 @@
EAPI=7
DESCRIPTION="Ebuild with masked nonsolvable dep"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
KEYWORDS="amd64"
DEPEND="stub/masked"
diff --git a/testdata/repos/visibility/NonsolvableDepsInStable/unstable/unstable-0.ebuild b/testdata/repos/visibility/NonsolvableDepsInStable/unstable/unstable-0.ebuild
index 55fa6dc2f..e5ed7dc56 100644
--- a/testdata/repos/visibility/NonsolvableDepsInStable/unstable/unstable-0.ebuild
+++ b/testdata/repos/visibility/NonsolvableDepsInStable/unstable/unstable-0.ebuild
@@ -1,7 +1,7 @@
EAPI=7
DESCRIPTION="Ebuild with unstable nonsolvable dep"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
KEYWORDS="amd64"
DEPEND="stub/unstable"
diff --git a/testdata/repos/visibility/UncheckableDep/UncheckableDep/UncheckableDep-0.ebuild b/testdata/repos/visibility/UncheckableDep/UncheckableDep/UncheckableDep-0.ebuild
index 53bfd8bd7..e55755f50 100644
--- a/testdata/repos/visibility/UncheckableDep/UncheckableDep/UncheckableDep-0.ebuild
+++ b/testdata/repos/visibility/UncheckableDep/UncheckableDep/UncheckableDep-0.ebuild
@@ -1,8 +1,8 @@
EAPI=7
DESCRIPTION="Ebuild with uncheckable large amount of USE deps"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
# This example is pulled out of dev-lang/rust:
# https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-lang/rust/rust-1.62.1.ebuild?id=60de1a24bbd551cb852f54ebf2b1aa5620c2aa2c#n55
diff --git a/testdata/repos/visibility/stub/deprecated/deprecated-0.ebuild b/testdata/repos/visibility/stub/deprecated/deprecated-0.ebuild
index d161bbfc5..0ba2c3ec3 100644
--- a/testdata/repos/visibility/stub/deprecated/deprecated-0.ebuild
+++ b/testdata/repos/visibility/stub/deprecated/deprecated-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Stub ebuild that is deprecated"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
KEYWORDS="amd64 x86"
diff --git a/testdata/repos/visibility/stub/masked/masked-0.ebuild b/testdata/repos/visibility/stub/masked/masked-0.ebuild
index 069c3b4ca..8a0b7dbe8 100644
--- a/testdata/repos/visibility/stub/masked/masked-0.ebuild
+++ b/testdata/repos/visibility/stub/masked/masked-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Stub ebuild that is package.mask-ed"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
KEYWORDS="amd64 x86"
diff --git a/testdata/repos/visibility/stub/stable/stable-0.ebuild b/testdata/repos/visibility/stub/stable/stable-0.ebuild
index 42a612d12..607eb7659 100644
--- a/testdata/repos/visibility/stub/stable/stable-0.ebuild
+++ b/testdata/repos/visibility/stub/stable/stable-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Stub ebuild that is stable"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
KEYWORDS="amd64 x86"
diff --git a/testdata/repos/visibility/stub/unstable/unstable-0.ebuild b/testdata/repos/visibility/stub/unstable/unstable-0.ebuild
index acdf63ccb..368530459 100644
--- a/testdata/repos/visibility/stub/unstable/unstable-0.ebuild
+++ b/testdata/repos/visibility/stub/unstable/unstable-0.ebuild
@@ -1,5 +1,5 @@
DESCRIPTION="Stub ebuild that is unstable"
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-SLOT="0"
LICENSE="BSD"
+SLOT="0"
KEYWORDS="~amd64 ~x86"