mail-filter/spamassassin: Address VariableScope warnings

[Philippe23]

• Removed 4.0.0-r3 because it's moot now that -r4 is stable
• Bumped revs instead of fixing in place because all existing ebuilds have the VariableScope warning. If I fixed them in place, users would have no easy way to fallback if an issue is found.
• Plan is to remove the pre-existing revs once these new revs have been stabilized.
• I also re-ordered some ebuild variables in 3.4.6-r3 to avoid ordering warnings.
• Note: git's wrong about the -r3 -> -r5 rename.

Bug: https://bugs.gentoo.org/836067
Closes: #36644

---

Please check all the boxes that apply:

• I can submit this contribution in agreement with the Copyright Policy.
• I have certified the above via adding a Signed-off-by line to every commit in the pull request.
• This contribution has not been created with the assistance of Natural Language Processing artificial intelligence tools, in accordance with the AI policy.
• I have run pkgcheck scan --commits --net to check for issues with my commits.

Please note that all boxes must be checked for the pull request to be merged.

---

--- spamassassin-3.4.6-r2.ebuild        2024-05-11 14:07:42.718165359 -0400
+++ spamassassin-3.4.6-r3.ebuild        2024-05-11 14:21:34.774092497 -0400
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@@ -6,14 +6,14 @@
 inherit perl-functions systemd toolchain-funcs

 MY_P="Mail-SpamAssassin-${PV//_/-}"
-S="${WORKDIR}/${MY_P}"
 DESCRIPTION="An extensible mail filter which can identify and tag spam"
 HOMEPAGE="https://spamassassin.apache.org/"
 SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"

 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="berkdb cron ipv6 ldap mysql postgres qmail sqlite ssl test"
 RESTRICT="!test? ( test )"

@@ -137,7 +137,6 @@
                DATADIR="${EPREFIX}/usr/share/spamassassin" \
                PERL_BIN="${EPREFIX}/usr/bin/perl" \
                ENABLE_SSL="$(usex ssl)" \
-               DESTDIR="${D}" \
                || die 'failed to create a Makefile using Makefile.PL'

        # Now configure spamc.

--- spamassassin-4.0.0-r4.ebuild        2024-05-11 14:07:42.718165359 -0400
+++ spamassassin-4.0.0-r5.ebuild        2024-05-11 14:21:34.775092506 -0400
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@@ -17,7 +17,7 @@

 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="berkdb cron ipv6 ldap mysql postgres qmail sqlite ssl test"
 RESTRICT="!test? ( test )"

@@ -148,7 +148,6 @@
                DATADIR="${EPREFIX}/usr/share/spamassassin" \
                PERL_BIN="${EPREFIX}/usr/bin/perl" \
                ENABLE_SSL="$(usex ssl)" \
-               DESTDIR="${D}" \
                || die 'failed to create a Makefile using Makefile.PL'

        # Now configure spamc.

[gentoo-bot]

Pull Request assignment

Submitter: @Philippe23
Areas affected: ebuilds
Packages affected: mail-filter/spamassassin

mail-filter/spamassassin: @Philippe23, @gentoo/proxy-maint

Linked bugs

Bugs linked: 836067

---

In order to force reassignment and/or bug reference scan, please append [please reassign] to the pull request title.

Docs: Code of Conduct ● Copyright policy (expl.) ● Devmanual ● GitHub PRs ● Proxy-maint guide

[gentoo-repo-qa-bot]

Pull request CI report

Report generated at: 2024-05-11 18:50 UTC
Newest commit scanned: 83c2a25
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/30257f1316/output.html