diff options
Diffstat (limited to 'testdata/data/repos')
83 files changed, 135 insertions, 132 deletions
diff --git a/testdata/data/repos/eclass/EclassUsageCheck/DeprecatedEclass/fix.patch b/testdata/data/repos/eclass/EclassUsageCheck/DeprecatedEclass/fix.patch index 8ec4ec4d..f6935a1a 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 3fb192ea..c6378111 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 2849dfe2..59306fb1 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 5ff1a880..84f16a60 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 894f69c5..57966765 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 2c184ed9..8c56bb2b 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 488c9797..6fb382fe 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 226c6083..c30c52ac 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 e0592e6b..77340051 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 208d2504..bdb72ca6 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 dc16a950..e32b811b 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 c7383f0a..3d74cb60 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 d7d86ab2..2a745c6b 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 c1cd3750..c3949776 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 c319c54e..c0b2a171 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 b67a84ae..9500e2b1 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 36c27324..00e612b7 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 3ce2b36a..10b19055 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 c5916b53..1e1aa53e 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 5f4daa15..058841f2 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 768a77a5..943b4926 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 40c816d3..e6efe5b6 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 a62eb390..08394782 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 9e658841..a4741601 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 9dc14faa..1d048cbd 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 a05b05ff..e452e92f 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 ebac0b50..c3b73a10 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 79eb3e8a..74e4fa40 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 b7160bbc..f7960d9c 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 1ddd357d..acee9abe 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 f091350c..6ecc3201 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 2235caf8..a843dc08 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 b8033ef6..a71b857f 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 48408029..2af636db 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 69f223b1..3ed7a4e3 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 8608b1a2..0bf02f66 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 10fd2954..a8d1e005 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 9a1f246d..5d09bf5f 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 5b9c08e6..1f8b1e85 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 2e861fc0..7cab9376 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 b0d745c6..673358fe 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 8e776064..be40e512 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 dc5a9702..dae2ec39 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 acab6f44..37122ed3 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 6f405e60..d6143856 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 fd050c85..96d9af28 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 c01e9028..0a1e1963 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 793433a6..070de8d4 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 78e2a084..1085425e 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 6732953f..b032c431 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 e2ba60d5..cc730e3a 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 d4f644b5..c5f1a4ea 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 763c55c2..84389909 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 cdfec099..21259107 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 d55c65f9..1fb9f15a 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 3fa53f63..0aa5bbbf 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 1d304793..a62eb261 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 4c1147cd..31a0d9ec 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 1f0d4507..233cc0c9 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 a5b21618..8a3c74a7 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 6e200a51..4f06cb42 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 ea37e699..72e615f3 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 a7b93071..233baf66 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 75f4c98d..4daa76da 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 48d53012..e9cae6ae 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 0734ccce..7daefc7e 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 3ac84e02..925f0fe9 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 557f3c87..72cd1636 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 233616f6..736c4e82 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 1f8b1974..2d690a73 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 81b47c66..e48f3ecb 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 143a78f9..ab8da08a 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 00000000..165df092 --- /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 f19a76d8..3e77afbe 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 f3789566..831368ef 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 65af748c..d2500a8c 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 2bcb990d..9e2b51fa 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 285acc90..c14146bf 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 ee485851..10ae1081 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 f7fabb76..e60c6097 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 da3dae53..ddbc3197 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 2972545f..af528066 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 94226661..06bc5666 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" |