VariableOrderWrong: Enforce skel.ebuild variable order

Gentoo developers are rejecting routine version bumps for ebuild variables being defined in a different order than skel.ebuild. This new lint ensures pkgcheck identifies these problems before we waste developer time. The following pkgcore pull request was submitted as a prerequisite: pkgcore/pkgcore#425 Specifically to address false positives in the following tests: tests/scripts/test_pkgcheck_scan.py::TestPkgcheckScan::test_filter_latest FAILED tests/scripts/test_pkgcheck_scan.py::TestPkgcheckScan::test_scan_quiet FAILED Regarding tests, in spite of the massive diff, all that's been done is re-ordering the variables to avoid introducing new style warnings into existing tests.
pkgcore · Jan 13, 2024 · db7fc90 · db7fc90
1 parent 4776408
commit db7fc90
Show file tree

Hide file tree

Showing 350 changed files with 507 additions and 425 deletions.
diff --git a/src/pkgcheck/checks/codingstyle.py b/src/pkgcheck/checks/codingstyle.py
@@ -1539,3 +1539,53 @@ def feed(self, pkg: bash.ParseTree):
             if len(nodes) > 1:
                 lines = sorted(node.start_point[0] + 1 for node in nodes)
                 yield DuplicateFunctionDefinition(func_name, lines=lines, 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,40 +1,40 @@
 --- standalone/DependencyCheck/MisplacedWeakBlocker/MisplacedWeakBlocker-6.ebuild
 +++ fixed/DependencyCheck/MisplacedWeakBlocker/MisplacedWeakBlocker-6.ebuild
-@@ -6,7 +6,7 @@ SLOT="0"
- LICENSE="BSD"
+@@ -6,7 +6,7 @@ LICENSE="BSD"
+ SLOT="0"
 
- BDEPEND="!DependencyCheck/InvalidRdepend"
+ RDEPEND="!DependencyCheck/BadDependency"
 -DEPEND="!DependencyCheck/BadDependency"
 +DEPEND="!!DependencyCheck/BadDependency"
- RDEPEND="!DependencyCheck/BadDependency"
+ BDEPEND="!DependencyCheck/InvalidRdepend"
 -PDEPEND="!DependencyCheck/BadDependency"
 +PDEPEND="!!DependencyCheck/BadDependency"
  IDEPEND="!DependencyCheck/BadDependency"
 --- 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"
+ RDEPEND="!DependencyCheck/BadDependency"
 -DEPEND="!DependencyCheck/InvalidRdepend"
-+BDEPEND="!!DependencyCheck/InvalidRdepend"
+-BDEPEND="!DependencyCheck/InvalidRdepend"
 +DEPEND="!!DependencyCheck/InvalidRdepend"
- RDEPEND="!DependencyCheck/BadDependency"
++BDEPEND="!!DependencyCheck/InvalidRdepend"
 -PDEPEND="!DependencyCheck/BadDependency"
 +PDEPEND="!!DependencyCheck/BadDependency"
  IDEPEND="!DependencyCheck/BadDependency"
 --- 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"
+ RDEPEND="!DependencyCheck/BadDependency"
 -DEPEND="!DependencyCheck/InvalidRdepend"
-+BDEPEND="!!DependencyCheck/InvalidRdepend"
+-BDEPEND="!DependencyCheck/InvalidRdepend"
 +DEPEND="!!DependencyCheck/InvalidRdepend"
- RDEPEND="!DependencyCheck/BadDependency"
++BDEPEND="!!DependencyCheck/InvalidRdepend"
 -PDEPEND="!DependencyCheck/BadDependency"
 +PDEPEND="!!DependencyCheck/BadDependency"
  IDEPEND="!DependencyCheck/BadDependency"
diff --git 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
@@ -3,13 +3,13 @@ diff -Naur standalone/DependencyCheck/MissingUseDepDefault/MissingUseDepDefault-
 +++ fixed/DependencyCheck/MissingUseDepDefault/MissingUseDepDefault-0.ebuild	2019-12-02 21:52:56.547749364 -0700
 @@ -3,7 +3,7 @@
  HOMEPAGE="https://github.com/pkgcore/pkgcheck"
- SLOT="0"
  LICENSE="BSD"
--DEPEND="stub/stub1[foo]"
+ SLOT="0"
 -RDEPEND="|| ( stub/stub2[used] stub/stub2[-foo] )"
+-DEPEND="stub/stub1[foo]"
 -BDEPEND="stub/stub3[foo?]"
 -PDEPEND="stub/stub4[!foo?]"
-+DEPEND="stub/stub1[foo(+)]"
 +RDEPEND="|| ( stub/stub2[used] stub/stub2[-foo(-)] )"
++DEPEND="stub/stub1[foo(+)]"
 +BDEPEND="stub/stub3[foo(+)?]"
 +PDEPEND="stub/stub4[!foo(-)?]"
diff --git 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
@@ -4,41 +4,41 @@ 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
 @@ -1,4 +1,4 @@
 -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
 @@ -1,4 +1,4 @@
 -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
 @@ -1,4 +1,4 @@
 -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
 @@ -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."
 +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
@@ -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
@@ -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
@@ -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": "BDEPEND", "lineno": 10, "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/...a/data/repos/standalone/EbuildUnquotedVariablesCheck/EbuildUnquotedVariable/expected.json b/...a/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
@@ -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
@@ -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
@@ -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"