gentoo auto-resync : 12:10:2023 - 18:15:24

3 files changed, 2 insertions, 59 deletions

diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
index b4af6ab99721..03b361a4c810 100644
--- a/app-admin/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@@ -2,8 +2,6 @@ AUX mcelog-0.8_pre1-timestamp-mcelog.patch 425 BLAKE2B 5952e26c668fb71f712fc70b3
 AUX mcelog-129-debugflags.patch 416 BLAKE2B 97aa6da3146380b40013966bb109de41215890cb4b6431ad694c2684f498d13287e385119304a816270f470ff26529967701c92bfc845a8aac698a0aa0f67271 SHA512 cda86c3e74f56fcd9d8771b26ca91c32ccc33e6bcd6dd0fcf856c14096daa619257d237e1e187e7820d6a0a0553ae6fd9ec160ea59e237b4e05ebca4e6656e20
 AUX mcelog-194-musl-fix.patch 531 BLAKE2B 011d06596a0f74078547701bfe0215ed96a027b4f3450b6bd14d2ddb29444f81c1776e1c968a56b1b7d64999a9ea6185d44d17cd876db9f64595d1b22337bfb9 SHA512 aff5916df652c33489c2af9631fcc3441554e64cf053d1d9b8e456fb6e2d5b5b6e3814e57518fe19963a0be65b3a38679343b7e620eb1c91a3ea0bfe3033747e
 AUX mcelog.init-r1 349 BLAKE2B 17f8a28dc1174fa62d50cb0d6dcae7bf4755ea99ff380d42a5beb16ab6ca07f1dbfcf7783ecb3b8f85f714357c39b0a333630c69e0bef5af32ba602686117cfd SHA512 a43f0efe7eb5007e9422ca2eba43b666d5110696c8b049b74990849e200b89b99e3d22707803e21e4452b0e75bbacdec0526ed933b234301ebbbb19d700df0d4
-DIST mcelog-194.tar.gz 317449 BLAKE2B 68124209247ab0545d2f33c703bc6c10a6225275b929fe035cdad49f30d0ed2e8e5b30968b29f95c537a406b6aaca322adeaa22f1dc33c5f6dc92526f707b003 SHA512 b253b96bac2b6abe6c112f26b0b2d7cfc7720235fa0eec85bd60b1670d36d4032c8c9b27b9e0e22d77b4247ac661bf9278cf0bd43f196fd446ca3e04a41b65ed
 DIST mcelog-195.tar.gz 318965 BLAKE2B aebfcac2a5e5aab43cf3b08d169c75469c81d8724d2e907890bb5b947e1dbea8e418fdf4c00512112ddc67d1ddcc3a014409c7a546bd60c8e36b2e7af72480c7 SHA512 45436f5859a3ffd1c0eaf998282910ad317b85d03f15130a66a2d4e32e2653dbd86b2033db7f6b321a4b9692354adb92773c26958eb5d474954e12c9ab4a9cda
-EBUILD mcelog-194-r1.ebuild 1168 BLAKE2B ee2a38c3fdaa257a8638f2149c9876517b9c837349912da0df94ca27f63d755140d080ced6df6ef8b8e1fc77214877380e8966c41655a625f1d96612b449f35f SHA512 143798de0b1db65be5ba81c5b5b8715ee257b8a43b50aa0d68a2152ba51aa5169357c634b6b3b1a393f6fb41593d673f6658494ad968cdf6bfae713b9b3c770c
-EBUILD mcelog-195.ebuild 1130 BLAKE2B 2c5ba913d5aae88ad4aba6ae01e2c1649067c03450d1f752b8f314444fc39848cd54e52b95748313118b31e88500199790f5e6ca14ded5b5ea7d687b5b11927a SHA512 8b7d7edb24129f73ccd8c9dca9b0ff3bcce1ae82c32dc436a7283656afda42351bf70a8c1a74ee748f0ef9ddeea9fbc5d47a5b5687b121fb34d9256061b9eebe
+EBUILD mcelog-195.ebuild 1128 BLAKE2B f68d0ab92db7f01fa8ae10b583e65a9a720b70e2bd8aa5dcc6ee9a1bb4baaa918390bc32b86fd8434c60d058d16e034d14896c6b2e6029fa1ec82aed8d0f4584 SHA512 7203aa8fd67d61cb324d622af8d9b0c58719d55f30d7929645f46fdc320e4573554e53a81d1476cd4b5e5cc36e77b1fba722fc6916988d8ab25dfb7a219150cf
 MISC metadata.xml 538 BLAKE2B 02cb85b3717b287e5e6a02db8c5485d52d1a5f7c9f927fad728ea8c313a93ebdb1aac5ac070cb852f18aae2cfebf5096ddb2c298948bc60180e4093c532aa899 SHA512 865e9e806a9fcf1d21ae7cd15c0e65196b3ccf7f866dc69237594908f020e224eca35d2d49fe70bef1e4d38b084ec8558e849148e470d3e22959f85177545bdc
diff --git a/app-admin/mcelog/mcelog-194-r1.ebuild b/app-admin/mcelog/mcelog-194-r1.ebuild
deleted file mode 100644
index e96d0cf45856..000000000000
--- a/app-admin/mcelog/mcelog-194-r1.ebuild
+++ /dev/null
@@ -1,55 +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}-194-musl-fix.patch
-	"${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-195.ebuild b/app-admin/mcelog/mcelog-195.ebuild
index 88e6cd7ea15e..02b752831ace 100644
--- a/app-admin/mcelog/mcelog-195.ebuild
+++ b/app-admin/mcelog/mcelog-195.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-mcelog )"