gentoo resync : 13.11.2021

4 files changed, 26 insertions, 57 deletions

diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
index 4df4f319c0dd..65bb02efe7d3 100644
--- a/app-admin/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@@ -1,8 +1,7 @@
 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-179-fix-logrotate.patch 486 BLAKE2B 9eebf0b3f374b052637457c4e85a91f67efdf2debe260aa412f97a8cc84bd000f6ce25499dbc14ea9e11d7210a1424ae1295e572bbdc07dfa2be245825b4ea0e SHA512 af4d76c1f52cca40a766c5cad8a93ddaaa942336acf6e7a20a638d0982ed1444cca52e332d1a72a9ae2b8d538039e911cd2226f3ee143f0f867db77fd5fdc82f
 AUX mcelog.init-r1 349 BLAKE2B 17f8a28dc1174fa62d50cb0d6dcae7bf4755ea99ff380d42a5beb16ab6ca07f1dbfcf7783ecb3b8f85f714357c39b0a333630c69e0bef5af32ba602686117cfd SHA512 a43f0efe7eb5007e9422ca2eba43b666d5110696c8b049b74990849e200b89b99e3d22707803e21e4452b0e75bbacdec0526ed933b234301ebbbb19d700df0d4
-DIST mcelog-178.tar.gz 315460 BLAKE2B 65d424f70c615a694dfb18a0d7049965280141858a2c527fbe1db806d675785a0edba161dd6ac4bf6660e1bb2334d394f98bc85058c17d79b2c25106297ae95e SHA512 f024908c877b489148e23bbb8b34d587d1b88e13e43bb401b4594eafb577a24a4b478fd4aa7e221d2d9e633b509b641123418dc36a52425193083d26d2ca60bb
 DIST mcelog-179.tar.gz 315590 BLAKE2B 14de21330af412847ba627fccd41d20bdeb0f2f926ca81e7a564c4915cedccb8a2fe7c97227527a73ee0bfcc14757c30f67df47f26890319f4f6dae44551df4f SHA512 f9384abba55d5e6b181786feb28c72ba813d1d7b672b948f2e5c6cd6eaa11dd2ae6597301cd812f45a162f12fdabf7cb670daa325e5ab0cd072d99a880917981
-EBUILD mcelog-178.ebuild 1158 BLAKE2B 53f1e2970510f1d2116667853a9b7636a70c1a67a98abea18d5281190859c5b09f7560ec4e692f658073eac6bfc24422b168e7f0a7684939ebb93136a26e1970 SHA512 79dc07e4c74e5f13e8d757b66c340a8ac42393d119ddc7017c3ea69cee1d67d7fd5d617c2801f41b05b7ebee0895ebbd73e5206df92fd583f2d734eb7dc6540a
-EBUILD mcelog-179.ebuild 1025 BLAKE2B f1e19ea3d4cdc3b4279c2921fddb541ac1a687fefb4697db0a989b88acbec1aec03b5adbbbd8b2cf373f31e54b1f7199176a55b8600707977b3a36a60f63270e SHA512 39c7a5ec294a1b6223d78f0793ee23398d3d2cd782522614dbb70e70a22c7d65d4c3d522d67c1ff40fe14181815cfe1e81302174964f088fb8855989d8f2fb96
+EBUILD mcelog-179-r1.ebuild 1071 BLAKE2B 773e4dceea91edcf4db65ee62b0359eeb3f84d75fd8d0867675b87d2e85ef3297277dc9750110e295e9f971268b58db6cfe3d08268a68c87b9b88836e52e7e36 SHA512 d08ef8c11b10d1945a04bbe081b35aa006352d095ba7919f6256eb0c299cc450dedc96d705fe64938f4fce4fda5369cbe1db14aa964909fe360278aeba4ed7ad
 MISC metadata.xml 538 BLAKE2B 02cb85b3717b287e5e6a02db8c5485d52d1a5f7c9f927fad728ea8c313a93ebdb1aac5ac070cb852f18aae2cfebf5096ddb2c298948bc60180e4093c532aa899 SHA512 865e9e806a9fcf1d21ae7cd15c0e65196b3ccf7f866dc69237594908f020e224eca35d2d49fe70bef1e4d38b084ec8558e849148e470d3e22959f85177545bdc
diff --git a/app-admin/mcelog/files/mcelog-179-fix-logrotate.patch b/app-admin/mcelog/files/mcelog-179-fix-logrotate.patch
new file mode 100644
index 000000000000..66978d022475
--- /dev/null
+++ b/app-admin/mcelog/files/mcelog-179-fix-logrotate.patch
@@ -0,0 +1,21 @@
+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-178.ebuild b/app-admin/mcelog/mcelog-178.ebuild
deleted file mode 100644
index c802f25e6c25..000000000000
--- a/app-admin/mcelog/mcelog-178.ebuild
+++ /dev/null
@@ -1,52 +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
-}
-
-pkg_postinst() {
-	einfo "The default configuration set is now installed in /etc/${PN}"
-	einfo "you might want to edit those files."
-}
diff --git a/app-admin/mcelog/mcelog-179.ebuild b/app-admin/mcelog/mcelog-179-r1.ebuild
index ec0ee80a3eff..147b65e40b9d 100644
--- a/app-admin/mcelog/mcelog-179.ebuild
+++ b/app-admin/mcelog/mcelog-179-r1.ebuild
@@ -11,7 +11,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 )"
@@ -29,7 +29,8 @@ pkg_pretend() {
 
 src_prepare() {
 	eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
-		"${FILESDIR}"/${PN}-129-debugflags.patch
+		"${FILESDIR}"/${PN}-129-debugflags.patch \
+		"${FILESDIR}"/${PN}-179-fix-logrotate.patch
 	eapply_user
 	tc-export CC
 }