5 files changed, 24 insertions, 83 deletions
diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
index 37b98f024ab2..a14181dcd744 100644
--- a/app-admin/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@@ -1,2 +1,2 @@
-DIST mcelog-179.tar.gz 315590 BLAKE2B 14de21330af412847ba627fccd41d20bdeb0f2f926ca81e7a564c4915cedccb8a2fe7c97227527a73ee0bfcc14757c30f67df47f26890319f4f6dae44551df4f SHA512 f9384abba55d5e6b181786feb28c72ba813d1d7b672b948f2e5c6cd6eaa11dd2ae6597301cd812f45a162f12fdabf7cb670daa325e5ab0cd072d99a880917981
-DIST mcelog-180.tar.gz 314605 BLAKE2B 0cf4f25dc26901bee56ddd437ad3d56874ba70f2323d9d6821432bf744b78392e871c9632e44a7bef7a1954eb6605cf72f6d9268397741cecd5066b6bcafe54a SHA512 89b2b1c2f7ab03bb358926f10fa2c3e8f048bb5cf2d6f4453de63ecfd44daebe771087522c69ade5638248ab79c80122448efef798e4ea8d1a5f88308e8bfd32
+DIST mcelog-197.tar.gz 319167 BLAKE2B cbeac1b29ab0b9b7d23470213f5b186f1c1c2a1095617436ccb9a29824fbf6d461642df32e69f7d743a2b3dfce5e06fcffbe5af3cc90a99c00bf9ba4796514b7 SHA512 4975f533fa6546b956190a33f51974614911aa8b707e07f73abf1e0055cd13997eeacaeedaf84762debcea9fd9b95e7d537befc0f818ba29873dd72be4ceed1a
+DIST mcelog-198.tar.gz 319372 BLAKE2B c1a6eed5b77843cd3963ac82d20270ed915562b3e2940ee685f4aa827b6e05c656eb55b57e380d582c8fda2f3d1ee3d13ff40c0771fd410d504d03e62f71eaeb SHA512 5168a1d1d83c7fa69438412db4b5f559528439f84ad65348b147117c7fdfe689c9ab3273350ff5321ed351ef0fe17065ee9073aac5115e87cf27878b8e2ff7df
diff --git a/app-admin/mcelog/files/mcelog-179-fix-logrotate.patch b/app-admin/mcelog/files/mcelog-179-fix-logrotate.patch
deleted file mode 100644
index 66978d022475..000000000000
--- a/app-admin/mcelog/files/mcelog-179-fix-logrotate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Should be in the next release:
-https://github.com/andikleen/mcelog/commit/2261c74a88f9bc9e87c9ffaae5a98261087730ae.patch
-
-From: Andi Kleen <andi@firstfloor.org>
-Date: Sat, 6 Nov 2021 07:22:24 -0700
-Subject: [PATCH] Fix logrotate syntax
-
-Fixes #102
-
-Signed-off-by: Andi Kleen <andi@firstfloor.org>
---- a/mcelog.logrotate
-+++ b/mcelog.logrotate
-@@ -3,7 +3,7 @@
-     dateext
-     maxage 365
-     rotate 99
--    size=+2048k
-+    size +2048k
-     notifempty
-     missingok
-     copytruncate
diff --git a/app-admin/mcelog/mcelog-180.ebuild b/app-admin/mcelog/mcelog-180.ebuild
deleted file mode 100644
index ec0ee80a3eff..000000000000
--- a/app-admin/mcelog/mcelog-180.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info systemd toolchain-funcs
-
-DESCRIPTION="A tool to log and decode Machine Check Exceptions"
-HOMEPAGE="http://mcelog.org/"
-SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
-
-# TODO: add mce-inject to the tree to support test phase
-RESTRICT="test"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		local CONFIG_CHECK="~X86_MCE"
-		kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
-		check_extra_config
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
-		"${FILESDIR}"/${PN}-129-debugflags.patch
-	eapply_user
-	tc-export CC
-}
-
-src_install() {
-	default
-
-	insinto /etc/logrotate.d/
-	newins ${PN}.logrotate ${PN}
-
-	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
-	systemd_dounit ${PN}.service
-
-	dodoc *.pdf
-}
diff --git a/app-admin/mcelog/mcelog-179-r1.ebuild b/app-admin/mcelog/mcelog-197.ebuild
index 147b65e40b9d..b689f7a70a9c 100644
--- a/app-admin/mcelog/mcelog-179-r1.ebuild
+++ b/app-admin/mcelog/mcelog-197.ebuild
@@ -1,13 +1,15 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit linux-info systemd toolchain-funcs
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit linux-info python-any-r1 systemd toolchain-funcs
 
 DESCRIPTION="A tool to log and decode Machine Check Exceptions"
 HOMEPAGE="http://mcelog.org/"
-SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -15,10 +17,16 @@ KEYWORDS="amd64 x86"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
+DEPEND="${PYTHON_DEPS}"
 
 # TODO: add mce-inject to the tree to support test phase
 RESTRICT="test"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch
+	"${FILESDIR}"/${PN}-129-debugflags.patch
+)
+
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != buildonly ]]; then
 		local CONFIG_CHECK="~X86_MCE"
@@ -28,11 +36,9 @@ pkg_pretend() {
 }
 
 src_prepare() {
-	eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
-		"${FILESDIR}"/${PN}-129-debugflags.patch \
-		"${FILESDIR}"/${PN}-179-fix-logrotate.patch
-	eapply_user
+	default
 	tc-export CC
+	python_fix_shebang genconfig.py
 }
 
 src_install() {
diff --git a/app-admin/mcelog/mcelog-180-r1.ebuild b/app-admin/mcelog/mcelog-198.ebuild
index b52399135375..07d93a66d81f 100644
--- a/app-admin/mcelog/mcelog-180-r1.ebuild
+++ b/app-admin/mcelog/mcelog-198.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=(python3_9 python3_10)
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit linux-info python-any-r1 systemd toolchain-funcs
 
 DESCRIPTION="A tool to log and decode Machine Check Exceptions"
 HOMEPAGE="http://mcelog.org/"
-SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -22,6 +22,11 @@ DEPEND="${PYTHON_DEPS}"
 # TODO: add mce-inject to the tree to support test phase
 RESTRICT="test"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch
+	"${FILESDIR}"/${PN}-129-debugflags.patch
+)
+
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != buildonly ]]; then
 		local CONFIG_CHECK="~X86_MCE"
@@ -31,9 +36,7 @@ pkg_pretend() {
 }
 
 src_prepare() {
-	eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
-		"${FILESDIR}"/${PN}-129-debugflags.patch
-	eapply_user
+	default
 	tc-export CC
 	python_fix_shebang genconfig.py
 }