gentoo auto-resync : 20:07:2024 - 12:29:37

5 files changed, 11 insertions, 140 deletions

diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index cf1c41b71b1d..afc11dcf6de7 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -7,11 +7,9 @@ AUX kexec-tools-2.0.4-out-of-source.patch 816 BLAKE2B 88dc0a8f01c65a32b6ae081ea2
 AUX kexec.conf 340 BLAKE2B a65aa0f402c712c10f6095b37b620dacfe883ad621f5403d8190febf582f3ab7e8b821091321036bff104ee5cebab21062830c774778ca17a34a2df76065cfb8 SHA512 66beb57ee13dba70f75f12326643270a0c888e178fdfca8ba7a566a874707aebe2afebb6ceae976dfb0aaf3135048daad6277e70580e4c7911b9ddbf74e4f00a
 AUX kexec.conf-2.0.4 1013 BLAKE2B 7594bf8c150d1165f30449526b658c78feab82526e649aa8cce35b6a47b2abd5a208b7ae4376f0330ea2194ae63f786bf0c30682f734f1b604be131e6e63570e SHA512 96db2834454aa4d038061e9b1f918932da3d3054021487425d0f70c6ad32096b9433ae2f3921e83196b23af901c32e591df3d6a84a6d14e064608d8ad895a599
 AUX kexec.service 407 BLAKE2B 7854172c36f550fece58b6cb351a6bd8b4ab8b5a11da0fd629048f8cc2866baa11ee7311424f998360f02dc2c1210be32222283c2bd2f93e1bf4bf65ec903203 SHA512 9f0fa6d39c67048fe774fee0f2e8ed10e9e12a2468e7dda193cd8c5bd8b4cf49819d14703efad35c91265cd4e03c6f5460934b5fe92efd06eab8dc619920b1e3
-DIST kexec-tools-2.0.22.tar.xz 303564 BLAKE2B 977c741eabf9b6b882550713ba59b18289b4f997fb382e96338efce6d04a9390fea952fc46ca72fd0a0b782261841ab2002da84b1819f955e63996eac900b0f7 SHA512 7580860f272eee5af52139809f12961e5a5d3a65f4e191183ca9c845410425d25818945ac14ed04a60e6ce474dc2656fc6a14041177b0bf703f450820c7d6aba
-DIST kexec-tools-2.0.24.tar.xz 303808 BLAKE2B 8188602f1b843c1dccc0307131f8c9ec0426c6cb3de898040352c1fed5f6d4bd7c58a0c2bf54290b91c8fe3401180df682959ee6c41693d07acc199c087c7db2 SHA512 ef7cf78246e2d729d81a3649791a5a23c385353cc75cbe8ef279616329fdaccc876d614c7f51e1456822a13a11520296070d9897467d24310399909e049c3822
 DIST kexec-tools-2.0.28.tar.xz 312524 BLAKE2B b2ab25c632cd2bad21751940acee1816f9cd930e1bb5af1052f9f6c4979dcd62d82c487a88fa8015e3ce7c843de9f47a3f6ccf7efa9270b5f24c79ba30a82a91 SHA512 889a7bf1d26bb309e4ff7ce1c8dbcf48c01e47221ea3acf1c4ef2a98a652c496e31bddcdb627d3adebd85f7541d1fb9122c60e741e10b3726e31a9733cadc753
-EBUILD kexec-tools-2.0.22.ebuild 3399 BLAKE2B 78d97fe476cf153fbdc75eb7fc28472abd9e56404a0164bc5ce570ec68f4e679dc703d88440c79495ac2c55e58210d401bb5fcf9db2c655f26978ebd097c95b8 SHA512 6740b6434d2bf1399d9045cd1b93258cb9b48c8b486ee2543601874632f07b22692c7d7e95af1920819dad1b8ae6768ae47a1c9aca2acb37a6cb7e5fc92fa924
-EBUILD kexec-tools-2.0.24.ebuild 3450 BLAKE2B fc87c2d3950f9599c8460875074a110e4db86e3e5a3632743ee4597c64acd9d7747d2e85931fe81ccbf0ad52b536a6bfe1830f3314f0f6c9785c402f1000d16d SHA512 0d96aeae8646c6a74809e14491c298a8ef18ec82c50edd1c55162c81b4e7c8c4125714aefd1c80310edaa2a1a45b47ccab318dad5ef0cf87548bc9d623d3fb4e
-EBUILD kexec-tools-2.0.28.ebuild 3518 BLAKE2B 8f00ee950e429717a5254973e152e43d90e95360fa616f637085c807dd9c0762df42b1187da2c905cbeaf9906ead6f759c645380663594c226ce01f8b0fc6072 SHA512 f013c21fdacde62b38877a6a26fb282f70f5134ffb23a83dd88380c9fe0c32af6c1fa83d74237cf86ff7d8b5fa7c7b99cdae9b971e5f89d3e491213bb3b2376f
-EBUILD kexec-tools-9999.ebuild 3452 BLAKE2B f15144729531ac36ac4614b7c10a1077f05b12ae4cb3421cc173710dcd2d8c7096c5dcf3c779813c44a841270ecf91cf5d2f6a6d71349b1898efc6db6fe794a0 SHA512 982e577ea98aa8fca8b4b56051851ba0b35311187a978fef87bd53bd0c5b14f333b4c033ca1b7b719f06e5713cbc78d18aafe2d4b53713554889a56b6b959ec1
+DIST kexec-tools-2.0.29.tar.xz 314576 BLAKE2B 3cb94015d0bcd8ab13f25e23835758fc305093c4d1a81c590830ced852e61da66321617f04bda847e26c95ec44bd101eb235fa1d34f397e22ed4e80426efa162 SHA512 4c9e0b3df47b240f0eac2c31e8b515465f626ce043f64daa32b0b032d7132e54dada5d70875dab256345f66cf94a25dc3c160a9009ba60addd8dcb1e5205f5ca
+EBUILD kexec-tools-2.0.28.ebuild 3518 BLAKE2B eb7f52ad884eb38b72a710c8602bd7b006fb18a331aed5a755fe0365a3620750950ccbaea30780220f0017f0e9f5648dfa25f1f21eac2c837a2fc32f5dcf411a SHA512 dff2e7b8a8d3c8d907b8eaafe07dc7945d9b82e0b4c14e1d5f04b02984eefeebed934037b0d4f0ebb97d33c6340e08c7eb0fe91ec352a00da5728c17e58fe4c7
+EBUILD kexec-tools-2.0.29.ebuild 3452 BLAKE2B 28b70b151f561b1938c85cb7547e2308a4fdf909ac6c887ac142d30d5749312b328852c6687e3ba367858df7f134950775a2b421559ac31de96605d36a83ae92 SHA512 6509525f7497809b7efc67e9c635d9d2dcb8c482878f0b4eaca642a91475a06bfe334171bb241a914309ced7fd88fc2203cb481ae8fa4b101ad42b2ca5dd08dc
+EBUILD kexec-tools-9999.ebuild 3452 BLAKE2B 28b70b151f561b1938c85cb7547e2308a4fdf909ac6c887ac142d30d5749312b328852c6687e3ba367858df7f134950775a2b421559ac31de96605d36a83ae92 SHA512 6509525f7497809b7efc67e9c635d9d2dcb8c482878f0b4eaca642a91475a06bfe334171bb241a914309ced7fd88fc2203cb481ae8fa4b101ad42b2ca5dd08dc
 MISC metadata.xml 845 BLAKE2B c2e80468e673bd35bbe6c6dd63d6c95941d15e8671c29b9bee1be84b4735b89db861a17e2c7e2b80790e49a6586f9fe791e42523a25011a8074de0ef22b33070 SHA512 4a5165c6456d53f56855b4d701d6e4f8697995d66f4aa0c88ef03bc62432897e6261626b408d146f684c59bc1f619fa5a4f543e4d4ea6c3a93cdf3f9ff0915e8
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.22.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.22.ebuild
deleted file mode 100644
index 2f8eea8c0dee..000000000000
--- a/sys-apps/kexec-tools/kexec-tools-2.0.22.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool linux-info optfeature systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3 autotools
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git"
-else
-	SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kexec/${P/_/-}.tar.xz"
-	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-fi
-
-DESCRIPTION="Load another kernel from the currently executing Linux kernel"
-HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="booke lzma xen zlib"
-
-REQUIRED_USE="lzma? ( zlib )"
-
-DEPEND="
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P/_/-}"
-
-CONFIG_CHECK="~KEXEC"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch
-	"${FILESDIR}"/${PN}-2.0.4-out-of-source.patch
-)
-
-pkg_setup() {
-	# GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC)
-	export ASFLAGS="${CCASFLAGS}"
-}
-
-src_prepare() {
-	default
-
-	# Append PURGATORY_EXTRA_CFLAGS flags set by configure, instead of overriding them completely.
-	sed -e "/^PURGATORY_EXTRA_CFLAGS =/s/=/+=/" -i Makefile.in || die
-
-	if [[ "${PV}" == 9999 ]] ; then
-		eautoreconf
-	else
-		elibtoolize
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with booke)
-		$(use_with lzma)
-		$(use_with xen)
-		$(use_with zlib)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# Respect CFLAGS for purgatory.
-	# purgatory/Makefile uses PURGATORY_EXTRA_CFLAGS variable.
-	# -mfunction-return=thunk and -mindirect-branch=thunk conflict with
-	# -mcmodel=large which is added by build system.
-	# Replace them with -mfunction-return=thunk-inline and -mindirect-branch=thunk-inline.
-	local flag flags=()
-	for flag in ${CFLAGS}; do
-		[[ ${flag} == -mfunction-return=thunk ]] && flag="-mfunction-return=thunk-inline"
-		[[ ${flag} == -mindirect-branch=thunk ]] && flag="-mindirect-branch=thunk-inline"
-		flags+=("${flag}")
-	done
-	local -x PURGATORY_EXTRA_CFLAGS="${flags[*]}"
-
-	default
-}
-
-src_install() {
-	default
-
-	dodoc "${FILESDIR}"/README.Gentoo
-
-	newinitd "${FILESDIR}"/kexec-r2.init kexec
-	newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec
-
-	insinto /etc
-	doins "${FILESDIR}"/kexec.conf
-
-	insinto /etc/kernel/postinst.d
-	doins "${FILESDIR}"/90_kexec
-
-	systemd_dounit "${FILESDIR}"/kexec.service
-}
-
-pkg_postinst() {
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		elog "For systemd support the new config file is"
-		elog "   /etc/kexec.conf"
-		elog "Please adopt it to your needs as there is no autoconfig anymore"
-	fi
-
-	local n_root_args=$(grep -o -- '\<root=' /proc/cmdline 2>/dev/null | wc -l)
-	local has_rootpart_set=no
-	if [[ -f "${EROOT}/etc/conf.d/kexec" ]]; then
-		if grep -q -E -- '^ROOTPART=' "${EROOT}/etc/conf.d/kexec" 2>/dev/null; then
-			has_rootpart_set=yes
-		fi
-	fi
-
-	if [[ ${n_root_args} -gt 1 && "${has_rootpart_set}" == "no"  ]]; then
-		ewarn "WARNING: Multiple root arguments (root=) on kernel command-line detected!"
-		ewarn "This was probably caused by a previous version of ${PN}."
-		ewarn "Please reboot system once *without* kexec to avoid boot problems"
-		ewarn "in case running system and initramfs do not agree on detected"
-		ewarn "root device name!"
-	fi
-
-	optfeature "automatically updating /etc/kexec.conf on each kernel installation" \
-		"sys-kernel/installkernel[-systemd]"
-}
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.28.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.28.ebuild
index e87b00d0d986..c559e6328f31 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.28.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.28.ebuild
@@ -17,6 +17,8 @@ fi
 DESCRIPTION="Load another kernel from the currently executing Linux kernel"
 HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/"
 
+S="${WORKDIR}/${P/_/-}"
+
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="booke lzma selinux xen zlib"
@@ -32,8 +34,6 @@ RDEPEND="
 	selinux? ( sec-policy/selinux-kdump )
 "
 
-S="${WORKDIR}/${P/_/-}"
-
 CONFIG_CHECK="~KEXEC"
 
 PATCHES=(
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.24.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.29.ebuild
index 924cf21eef4a..bedde55d9615 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.24.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.29.ebuild
@@ -11,12 +11,14 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kexec/${P/_/-}.tar.xz"
 	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Load another kernel from the currently executing Linux kernel"
 HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/"
 
+S="${WORKDIR}/${P/_/-}"
+
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="booke lzma selinux xen zlib"
@@ -32,8 +34,6 @@ RDEPEND="
 	selinux? ( sec-policy/selinux-kdump )
 "
 
-S="${WORKDIR}/${P/_/-}"
-
 CONFIG_CHECK="~KEXEC"
 
 PATCHES=(
diff --git a/sys-apps/kexec-tools/kexec-tools-9999.ebuild b/sys-apps/kexec-tools/kexec-tools-9999.ebuild
index c107633e4b71..bedde55d9615 100644
--- a/sys-apps/kexec-tools/kexec-tools-9999.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-9999.ebuild
@@ -17,6 +17,8 @@ fi
 DESCRIPTION="Load another kernel from the currently executing Linux kernel"
 HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/"
 
+S="${WORKDIR}/${P/_/-}"
+
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="booke lzma selinux xen zlib"
@@ -32,8 +34,6 @@ RDEPEND="
 	selinux? ( sec-policy/selinux-kdump )
 "
 
-S="${WORKDIR}/${P/_/-}"
-
 CONFIG_CHECK="~KEXEC"
 
 PATCHES=(