Merge branch 'srcprepartwork' into 'master'

Some fixes to make pkgcheck ci happy

See uest src_prepare/src_prepare-overlay!420

acct-group/sensu/sensu-1.ebuild

@@ -5,8 +5,7 @@ EAPI=7
 
 inherit acct-group
 
-KEYWORDS="~*"
-
 DESCRIPTION="Sensu program group"
 ACCT_GROUP_ID=499
 SLOT="0"
+KEYWORDS="~*"

acct-user/sensu/sensu-0.ebuild

@@ -5,10 +5,9 @@ EAPI=7
 
 inherit acct-user
 
-KEYWORDS="~*"
-
 DESCRIPTION="Sensu Monitoring Framework"
 ACCT_USER_ID=60
 ACCT_USER_GROUPS=( sensu )
 acct-user_add_deps
 SLOT="0"
+KEYWORDS="~*"

app-admin/cgls/cgls-247.ebuild

@@ -22,12 +22,13 @@ else
 	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz"
 	KEYWORDS="~amd64"
 fi
+S="${WORKDIR}/systemd-${PV}"
 
 # No tests for this one (if I mised them let me know)
-RESTRICT="mirror test"
 LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0"
 IUSE="selinux"
+RESTRICT="mirror test"
 
 BDEPEND="
 	>=dev-util/intltool-0.50
@@ -48,8 +49,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/systemd-${PV}"
-
 PATCHES=(
 	"${FILESDIR}/246-${PN}-libshared-static.patch"
 )

app-admin/cgtop/cgtop-247.ebuild

@@ -22,12 +22,13 @@ else
 	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz"
 	KEYWORDS="~amd64"
 fi
+S="${WORKDIR}/systemd-${PV}"
 
 # No tests for this one (if I mised them let me know)
-RESTRICT="mirror test"
 LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0"
 IUSE="selinux"
+RESTRICT="mirror test"
 
 BDEPEND="
 	>=dev-util/intltool-0.50
@@ -48,8 +49,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/systemd-${PV}"
-
 PATCHES=(
 	"${FILESDIR}/246-${PN}-libshared-static.patch"
 )

app-portage/genlop/genlop-0.30.12-r1.ebuild

@@ -9,6 +9,8 @@ DESCRIPTION="A nice emerge.log parser"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Perl"
 SRC_URI="https://github.com/Ociidii-Works/genlop/archive/genlop-${PV}.tar.gz"
 
+S=${WORKDIR}/genlop-genlop-${PV}
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
@@ -19,7 +21,6 @@ DEPEND="dev-lang/perl
 RDEPEND="${DEPEND}"
 
 # Please send help
-S=${WORKDIR}/genlop-genlop-${PV}
 
 src_install() {
 	echo "S=${S}"

games-fps/quake15/quake15-0_beta2.ebuild

@@ -9,6 +9,7 @@ SRC_URI="
 	https://www.moddb.com/downloads/mirror/173517/114/5090a373c5249e55e509808983481a04 -> Q15_PublicBeta1.7z
 	https://www.moddb.com/downloads/mirror/173707/114/f7627345043efdfcd9e27d4906a382ac -> Q15_patch2.7z
 "
+S="${WORKDIR}"
 
 LICENSE="HPND"
 SLOT="0"
@@ -17,8 +18,6 @@ KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 RDEPEND=">=games-fps/darkplaces-20170829_beta1"
 DEPEND="app-arch/p7zip"
 
-S="${WORKDIR}"
-
 src_install() {
 	insinto "/usr/share/quake1"
 	doins -r quake15

games-misc/lolcat-jaseg/lolcat-jaseg-1.0.ebuild

@@ -18,9 +18,9 @@ else
 	S="${WORKDIR}/${MY_P}"
 fi
 
-RESTRICT="mirror"
 LICENSE="WTFPL-2"
 SLOT="0"
+RESTRICT="mirror"
 
 src_install() {
 	einstalldocs

games-misc/lolcat-jaseg/lolcat-jaseg-9999.ebuild

@@ -18,9 +18,9 @@ else
 	S="${WORKDIR}/${MY_P}"
 fi
 
-RESTRICT="mirror"
 LICENSE="WTFPL-2"
 SLOT="0"
+RESTRICT="mirror"
 
 src_install() {
 	einstalldocs

games-rpg/fallout1/fallout1-1.1.ebuild

@@ -7,18 +7,18 @@ inherit gog
 
 DESCRIPTION="Post-apocalyptic GURPS-like role-playing game."
 HOMEPAGE="https://www.gog.com/game/fallout"
-
-LICENSE+=" FALLOUT1_EULA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-
 SRC_URI="
 	dos? (	https://archive.org/download/fallout1_dos/fallup1d.zip
 		https://archive.org/download/fallout1_dos/HMIDET.386
 		https://archive.org/download/fallout1_dos/HMIDRV.386 )
 "
+S=${WORKDIR}
 
-IUSE="-dos -wine"
+LICENSE+=" FALLOUT1_EULA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+
+IUSE="dos wine"
 
 GOG_GAME_NAME="fallout_classic"
 GOG_GAME_L10N="en"
@@ -39,8 +39,6 @@ RDEPEND+="
 
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}
-
 src_unpack() {
 	gog_initialize
 	FALLOUT_EXE="fallout1_wine"

mail-client/heirloom-mailx/heirloom-mailx-12.5.ebuild

@@ -3,10 +3,12 @@
 
 EAPI=7
 
-LICENSE="BSD"
 DESCRIPTION="The mailx utility from CentOS"
 HOMEPAGE="https://www.debian.org/"
 SRC_URI="https://yorune.pl/gentoo/${CATEGORY}/${PN}/${PN}_${PVR}.orig.tar.gz http://ftp.debian.org/debian/pool/main/h/${PN}/${PN}_${PVR}.orig.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
 KEYWORDS="~amd64"
 
 DEPEND="net-libs/liblockfile
@@ -20,8 +22,6 @@ RDEPEND="${DEPEND}
 		!net-mail/mailutils
 		!mail-client/mailx"
 
-SLOT="0"
-
 src_prepare() {
 	eapply -p1 "${FILESDIR}/${PN}-${PVR}-fixes-1.patch"
 	eapply_user

media-fonts/siji/siji-9999.ebuild

@@ -8,11 +8,11 @@ inherit git-r3 font
 DESCRIPTION="An iconic bitmap font based on Stlarch with additional glyphs"
 HOMEPAGE="https://github.com/stark/siji"
 EGIT_REPO_URI="https://github.com/stark/siji.git"
-RESTRICT="mirror"
 
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="+pcf"
+RESTRICT="mirror"
 
 DEPEND="
 	x11-apps/bdftopcf

media-video/olive/olive-9999.ebuild

@@ -16,11 +16,10 @@ else
 	KEYWORDS="~amd64"
 fi
 
-RESTRICT="!test? ( test )"
-
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 # TODO: qt6
 DEPEND="

net-firewall/hblock/hblock-3.2.0.ebuild

@@ -16,9 +16,9 @@ else
 	KEYWORDS="~amd64"
 fi
 
-RESTRICT="binchecks mirror strip test"
 LICENSE="MIT"
 SLOT="0"
+RESTRICT="binchecks mirror strip test"
 
 RDEPEND="
 	|| (

net-firewall/hblock/hblock-9999.ebuild

@@ -16,9 +16,9 @@ else
 	KEYWORDS="~amd64"
 fi
 
-RESTRICT="binchecks mirror strip test"
 LICENSE="MIT"
 SLOT="0"
+RESTRICT="binchecks mirror strip test"
 
 RDEPEND="
 	|| (

net-misc/jftui/jftui-0.4.0.ebuild

@@ -7,10 +7,10 @@ DESCRIPTION="minimalistic, lightweight command line client for Jellyfin"
 HOMEPAGE="https://github.com/Aanok/jftui"
 SRC_URI="https://github.com/Aanok/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-RESTRICT="mirror"
 LICENSE="Unlicense"
 SLOT="0"
 KEYWORDS="~amd64"
+RESTRICT="mirror"
 
 RDEPEND="
 	net-misc/curl

sys-apps/xbps/xbps-0.58.ebuild

@@ -14,10 +14,10 @@ else
 	KEYWORDS="~amd64"
 fi
 
-RESTRICT="!test? ( test ) mirror"
 LICENSE="BSD"
 SLOT="0"
 IUSE="debug doc lto static test"
+RESTRICT="!test? ( test ) mirror"
 
 COMMON_DEPEND="
 	>=app-arch/libarchive-3.3.3[lz4,zstd]

sys-apps/xbps/xbps-9999.ebuild

@@ -14,10 +14,10 @@ else
 	KEYWORDS="~amd64"
 fi
 
-RESTRICT="!test? ( test ) mirror"
 LICENSE="BSD"
 SLOT="0"
 IUSE="debug doc lto static test"
+RESTRICT="!test? ( test ) mirror"
 
 COMMON_DEPEND="
 	>=app-arch/libarchive-3.3.3[lz4,zstd]

x11-misc/mjwm/mjwm-4.0.0.ebuild

@@ -16,9 +16,9 @@ else
 	KEYWORDS="~amd64"
 fi
 
-RESTRICT="mirror"
 LICENSE="GPL-2"
 SLOT="0"
+RESTRICT="mirror"
 
 src_prepare() {
 	default

x11-misc/mjwm/mjwm-9999.ebuild

@@ -16,9 +16,9 @@ else
 	KEYWORDS="~amd64"
 fi
 
-RESTRICT="mirror"
 LICENSE="GPL-2"
 SLOT="0"
+RESTRICT="mirror"
 
 src_prepare() {
 	default

x11-plugins/enlightenment-clipboard/enlightenment-clipboard-0.1.0_alpha6.ebuild

@@ -19,9 +19,9 @@ else
 	S="${WORKDIR}"/"${MY_PN}-${PV}"
 fi
 
-RESTRICT="mirror"
 LICENSE="GPL-3"
 SLOT="0"
+RESTRICT="mirror"
 
 DEPEND="
 	x11-wm/enlightenment

x11-plugins/enlightenment-clipboard/enlightenment-clipboard-9999.ebuild

@@ -19,9 +19,9 @@ else
 	S="${WORKDIR}"/"${MY_PN}-${PV}"
 fi
 
-RESTRICT="mirror"
 LICENSE="GPL-3"
 SLOT="0"
+RESTRICT="mirror"
 
 DEPEND="
 	x11-wm/enlightenment

x11-terms/xst/xst-9999.ebuild

@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit git-r3 multilib savedconfig toolchain-funcs
+inherit desktop git-r3 savedconfig
 
 DESCRIPTION="Simple terminal implementation for X with Xresources support and other patches"
 HOMEPAGE="https://github.com/gnotclub/xst"
 EGIT_REPO_URI="${HOMEPAGE}"
 
-SLOT="0"
 LICENSE="MIT-with-advertising"
+SLOT="0"
 
 IUSE="savedconfig"
 

x11-themes/src_prepare-artwork/src_prepare-artwork-9999.ebuild

@@ -9,9 +9,9 @@ DESCRIPTION="Miscellaneous logos, wallpapers and other artwork from src_prepare
 HOMEPAGE="https://gitlab.com/src_prepare/artwork"
 EGIT_REPO_URI="https://gitlab.com/src_prepare/artwork"
 
-RESTRICT="binchecks mirror strip test"
 LICENSE="CC0-1.0"
 SLOT="0"
+RESTRICT="binchecks mirror strip test"
 
 arr_install() {
 	local IFS=$'\n'