gentoo resync : 04.07.2020

4 files changed, 2 insertions, 122 deletions

diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
index 545738c1fdc3..a0ca1956407c 100644
--- a/app-admin/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@@ -2,10 +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.init-r1 349 BLAKE2B 17f8a28dc1174fa62d50cb0d6dcae7bf4755ea99ff380d42a5beb16ab6ca07f1dbfcf7783ecb3b8f85f714357c39b0a333630c69e0bef5af32ba602686117cfd SHA512 a43f0efe7eb5007e9422ca2eba43b666d5110696c8b049b74990849e200b89b99e3d22707803e21e4452b0e75bbacdec0526ed933b234301ebbbb19d700df0d4
 AUX mcelog.service 213 BLAKE2B 08da6eac0afe17a04948f5ff958aba5c64ff491f6842a0b84e914a82cce16782b2c9dfdc83123d609cabd4e9e60eb38a9e43fe7a22a2afca8f53c3dc8e65ac87 SHA512 8317d9310d58663bb28f2528e0872520e30475439b9ce69ebb2452d7dc3583d2aecab80d9f6ef895ac8a17f666c3229d7cd768026ea16cc5403fb05d8bdc5c75
-DIST mcelog-168.tar.gz 312580 BLAKE2B 1a97869cc183c4263bf9868ccdc24b15658de0e863bd03ecdf61b0c6a03f5737dceec1b5237a8dfdf2f889cab9d55d3b5274bde5533841fc1aa56ed2189f5ffc SHA512 81f4ccb2632e5c34c52aea430a682e44d6b9850fbee2e9180a493025bbea660a7a4eaff3ee1e2f6e3d3700d3c951c09c4534b733cca5c809ad9c5a1ff8b07295
-DIST mcelog-169.tar.gz 312584 BLAKE2B 2c24f5db6178d3d3929fe18e8ee130ff827920bff4478cefc244893a68e7ec2e470cb39d1a044009f3c7ac280dbd41088f1716a3db17e23ca4979c554ae39d7a SHA512 df1bf5a3dd2cf4d8fa4fb454f4837841a832beff5c5521db404dbcee600ff7d492853e67323b00aeb3365d6734fa2ea879b13b942e8d431eaff15d31dfb1a1c8
 DIST mcelog-170.tar.gz 312911 BLAKE2B bab27c60fca937442a0f07929eaedd392c3e8de3e5f705f717d787652b6c0fa91e42169b835ea2527729c487773c7baabfceeebd3fd58d64a853ff17d8fdd8a8 SHA512 f5d29bde88cd3925c0e629850adce7f1040ecc4703c45427424f5d56f28a0add1fb24538e5c4e0749743c92479d3ea6da583c23bb41eb6a8d899626d818cb6a4
-EBUILD mcelog-168.ebuild 1367 BLAKE2B 420ec47206fdc6484a7aafc47005ff34a82bd689da636958c99df79fd884fc25f353aee6a63a3673c4357d0f6e5716309251704a26865766d0ea8d135cbc2c15 SHA512 7f980c2058ea1a07c2934a2cc49b8bdb083b6a4fd3a6c1eaf2a9889fbc845f36a6f6c3b27a6b69162badf71824d219bcad047265f77b064a15cb3ad8ffd4a6cb
-EBUILD mcelog-169.ebuild 1367 BLAKE2B 420ec47206fdc6484a7aafc47005ff34a82bd689da636958c99df79fd884fc25f353aee6a63a3673c4357d0f6e5716309251704a26865766d0ea8d135cbc2c15 SHA512 7f980c2058ea1a07c2934a2cc49b8bdb083b6a4fd3a6c1eaf2a9889fbc845f36a6f6c3b27a6b69162badf71824d219bcad047265f77b064a15cb3ad8ffd4a6cb
-EBUILD mcelog-170.ebuild 1369 BLAKE2B 28898352135feee6b52597bc287a9662dedcda130127b27d504641117f102422da9c41cc6dbdc70bebbe50f8c43f63ef997199406c4618e9ac1a58a985d74e33 SHA512 ed1b2bc475a69db7772e5ee18b56766ca7cb4776f09fa14ff7baefd369127be5167ccf56e038d6e793277a0928b1f8b25437ab7b6aa103ef1608acc15450dc21
+EBUILD mcelog-170.ebuild 1367 BLAKE2B 420ec47206fdc6484a7aafc47005ff34a82bd689da636958c99df79fd884fc25f353aee6a63a3673c4357d0f6e5716309251704a26865766d0ea8d135cbc2c15 SHA512 7f980c2058ea1a07c2934a2cc49b8bdb083b6a4fd3a6c1eaf2a9889fbc845f36a6f6c3b27a6b69162badf71824d219bcad047265f77b064a15cb3ad8ffd4a6cb
 MISC metadata.xml 644 BLAKE2B b5d4ef8c5541a2ead6cf23b47cf4adfcdd6607a1911411afef41f53e08db548e8606cb50d52e8c7caee29f574838157484e96878fc205467c53bfc6951eca3e6 SHA512 26990a9c8ef8333f6fe292e465cb8aaaafb6436af48cee7840d932fbde92e8396cdfa9d2718eca2a6284c8ba87a8c6a47506c57b0af8c9fe1894673b2e98a1a6
diff --git a/app-admin/mcelog/mcelog-168.ebuild b/app-admin/mcelog/mcelog-168.ebuild
deleted file mode 100644
index c298cf562247..000000000000
--- a/app-admin/mcelog/mcelog-168.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/cron.daily
-	newins ${PN}.cron ${PN}
-
-	insinto /etc/logrotate.d/
-	newins ${PN}.logrotate ${PN}
-
-	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
-	systemd_dounit "${FILESDIR}"/${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."
-	einfo
-	einfo "A sample cronjob is installed into /etc/cron.daily"
-	einfo "without executable bit (system service is the preferred method now)"
-}
diff --git a/app-admin/mcelog/mcelog-169.ebuild b/app-admin/mcelog/mcelog-169.ebuild
deleted file mode 100644
index c298cf562247..000000000000
--- a/app-admin/mcelog/mcelog-169.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/cron.daily
-	newins ${PN}.cron ${PN}
-
-	insinto /etc/logrotate.d/
-	newins ${PN}.logrotate ${PN}
-
-	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
-	systemd_dounit "${FILESDIR}"/${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."
-	einfo
-	einfo "A sample cronjob is installed into /etc/cron.daily"
-	einfo "without executable bit (system service is the preferred method now)"
-}
diff --git a/app-admin/mcelog/mcelog-170.ebuild b/app-admin/mcelog/mcelog-170.ebuild
index e0b67a2d755e..c298cf562247 100644
--- a/app-admin/mcelog/mcelog-170.ebuild
+++ b/app-admin/mcelog/mcelog-170.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 )"