gentoo auto-resync : 28:03:2024 - 19:13:18

4 files changed, 7 insertions, 63 deletions

diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
index a0cedf5b202f..de9f56afd97b 100644
--- a/app-admin/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@@ -1,10 +1,8 @@
 AUX mcelog-0.8_pre1-timestamp-mcelog.patch 425 BLAKE2B 5952e26c668fb71f712fc70b3419dbb7b3e418f8903f3104fcf8d525cb117ce278f4669551a6cbeadd7f03d3bd022781a88c335c6ac84600d3bdf02a3d8277d3 SHA512 77312f9346c7e16141a57a5e44964d0b2cab77a428403d19cfc9558af55b250be7c9fadaecf87c8d78075251a7fc3ab309e0cbbdbb30ddc4423717cb3979a1db
 AUX mcelog-129-debugflags.patch 416 BLAKE2B 97aa6da3146380b40013966bb109de41215890cb4b6431ad694c2684f498d13287e385119304a816270f470ff26529967701c92bfc845a8aac698a0aa0f67271 SHA512 cda86c3e74f56fcd9d8771b26ca91c32ccc33e6bcd6dd0fcf856c14096daa619257d237e1e187e7820d6a0a0553ae6fd9ec160ea59e237b4e05ebca4e6656e20
 AUX mcelog.init-r1 349 BLAKE2B 17f8a28dc1174fa62d50cb0d6dcae7bf4755ea99ff380d42a5beb16ab6ca07f1dbfcf7783ecb3b8f85f714357c39b0a333630c69e0bef5af32ba602686117cfd SHA512 a43f0efe7eb5007e9422ca2eba43b666d5110696c8b049b74990849e200b89b99e3d22707803e21e4452b0e75bbacdec0526ed933b234301ebbbb19d700df0d4
-DIST mcelog-195.tar.gz 318965 BLAKE2B aebfcac2a5e5aab43cf3b08d169c75469c81d8724d2e907890bb5b947e1dbea8e418fdf4c00512112ddc67d1ddcc3a014409c7a546bd60c8e36b2e7af72480c7 SHA512 45436f5859a3ffd1c0eaf998282910ad317b85d03f15130a66a2d4e32e2653dbd86b2033db7f6b321a4b9692354adb92773c26958eb5d474954e12c9ab4a9cda
-DIST mcelog-196.tar.gz 318951 BLAKE2B 50871cd7a3c4dd6f4c4d613c7db4528d972ca37ba17b0a5aa4876d8fc92d4478c2247ea65748310ad6d4b950d1abc9bd0ea40193e72b36d38334547382477849 SHA512 37d14dac84792b4668cb38883cd59b7642c37abc89b783cf19c20b2664a13334372370c9a3718f26d7baf5a02344f80de9e6c6e3ff7386b9585c9dc5f332c011
 DIST mcelog-197.tar.gz 319167 BLAKE2B cbeac1b29ab0b9b7d23470213f5b186f1c1c2a1095617436ccb9a29824fbf6d461642df32e69f7d743a2b3dfce5e06fcffbe5af3cc90a99c00bf9ba4796514b7 SHA512 4975f533fa6546b956190a33f51974614911aa8b707e07f73abf1e0055cd13997eeacaeedaf84762debcea9fd9b95e7d537befc0f818ba29873dd72be4ceed1a
-EBUILD mcelog-195.ebuild 1128 BLAKE2B f68d0ab92db7f01fa8ae10b583e65a9a720b70e2bd8aa5dcc6ee9a1bb4baaa918390bc32b86fd8434c60d058d16e034d14896c6b2e6029fa1ec82aed8d0f4584 SHA512 7203aa8fd67d61cb324d622af8d9b0c58719d55f30d7929645f46fdc320e4573554e53a81d1476cd4b5e5cc36e77b1fba722fc6916988d8ab25dfb7a219150cf
-EBUILD mcelog-196.ebuild 1130 BLAKE2B 2c5ba913d5aae88ad4aba6ae01e2c1649067c03450d1f752b8f314444fc39848cd54e52b95748313118b31e88500199790f5e6ca14ded5b5ea7d687b5b11927a SHA512 8b7d7edb24129f73ccd8c9dca9b0ff3bcce1ae82c32dc436a7283656afda42351bf70a8c1a74ee748f0ef9ddeea9fbc5d47a5b5687b121fb34d9256061b9eebe
-EBUILD mcelog-197.ebuild 1136 BLAKE2B 739f6d8bd55c6db402aab6750aed9ed2b80ac17424f7961b2cc9c366a0a932143c1c90d3c91dbda1179970c0a21a75326705f3f4ca8dcc86c9587b533c6fbfce SHA512 f8cc9551e7deed1fde45c4a0c49722b9cf802fbc7c911e31489cef76401b79d258f84971eb127a14f95ae88a13c0523fbd1b36e398dd78862592a07eb862422a
+DIST mcelog-198.tar.gz 319372 BLAKE2B c1a6eed5b77843cd3963ac82d20270ed915562b3e2940ee685f4aa827b6e05c656eb55b57e380d582c8fda2f3d1ee3d13ff40c0771fd410d504d03e62f71eaeb SHA512 5168a1d1d83c7fa69438412db4b5f559528439f84ad65348b147117c7fdfe689c9ab3273350ff5321ed351ef0fe17065ee9073aac5115e87cf27878b8e2ff7df
+EBUILD mcelog-197.ebuild 1134 BLAKE2B b898257049311155048b0cbc0d1ef36b0aa0fd969db4f2cea532ea8a6c79a5ec82ab51884c294aa550719c4dee7e3684c34893ed793d7a08c07a78b5dc4f06df SHA512 ac7b0085f9cb7030933ca4986510352620ef16025b68c275106eac7bc3d51a34dc06784665e8d2b1a8d039b0d8a31b6a72a170d3d39512dbe5f6a01d3f4285df
+EBUILD mcelog-198.ebuild 1136 BLAKE2B 739f6d8bd55c6db402aab6750aed9ed2b80ac17424f7961b2cc9c366a0a932143c1c90d3c91dbda1179970c0a21a75326705f3f4ca8dcc86c9587b533c6fbfce SHA512 f8cc9551e7deed1fde45c4a0c49722b9cf802fbc7c911e31489cef76401b79d258f84971eb127a14f95ae88a13c0523fbd1b36e398dd78862592a07eb862422a
 MISC metadata.xml 538 BLAKE2B 02cb85b3717b287e5e6a02db8c5485d52d1a5f7c9f927fad728ea8c313a93ebdb1aac5ac070cb852f18aae2cfebf5096ddb2c298948bc60180e4093c532aa899 SHA512 865e9e806a9fcf1d21ae7cd15c0e65196b3ccf7f866dc69237594908f020e224eca35d2d49fe70bef1e4d38b084ec8558e849148e470d3e22959f85177545bdc
diff --git a/app-admin/mcelog/mcelog-195.ebuild b/app-admin/mcelog/mcelog-195.ebuild
deleted file mode 100644
index 02b752831ace..000000000000
--- a/app-admin/mcelog/mcelog-195.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-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"
-		kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
-		check_extra_config
-	fi
-}
-
-src_prepare() {
-	default
-	tc-export CC
-	python_fix_shebang genconfig.py
-}
-
-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-197.ebuild b/app-admin/mcelog/mcelog-197.ebuild
index 07d93a66d81f..b689f7a70a9c 100644
--- a/app-admin/mcelog/mcelog-197.ebuild
+++ b/app-admin/mcelog/mcelog-197.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git/snapshot/${P}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
diff --git a/app-admin/mcelog/mcelog-196.ebuild b/app-admin/mcelog/mcelog-198.ebuild
index 88e6cd7ea15e..07d93a66d81f 100644
--- a/app-admin/mcelog/mcelog-196.ebuild
+++ b/app-admin/mcelog/mcelog-198.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+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"