Gentoo Archives: gentoo-commits

From: Ben Kohler <bkohler@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/mcelog/files/, app-admin/mcelog/
Date: Tue, 18 Jan 2022 13:09:16
Message-Id: 1642511338.fe2e227e970f4dff60f32183b292bfdce905baae.bkohler@gentoo
1 commit: fe2e227e970f4dff60f32183b292bfdce905baae
2 Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 14 12:13:07 2022 +0000
4 Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 18 13:08:58 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe2e227e
7
8 app-admin/mcelog: drop old
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
12
13 app-admin/mcelog/Manifest | 1 -
14 .../mcelog/files/mcelog-179-fix-logrotate.patch | 21 ----------
15 app-admin/mcelog/mcelog-179-r1.ebuild | 48 ----------------------
16 app-admin/mcelog/mcelog-180.ebuild | 47 ---------------------
17 4 files changed, 117 deletions(-)
18
19 diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
20 index 37b98f024ab2..28c0348e1f9f 100644
21 --- a/app-admin/mcelog/Manifest
22 +++ b/app-admin/mcelog/Manifest
23 @@ -1,2 +1 @@
24 -DIST mcelog-179.tar.gz 315590 BLAKE2B 14de21330af412847ba627fccd41d20bdeb0f2f926ca81e7a564c4915cedccb8a2fe7c97227527a73ee0bfcc14757c30f67df47f26890319f4f6dae44551df4f SHA512 f9384abba55d5e6b181786feb28c72ba813d1d7b672b948f2e5c6cd6eaa11dd2ae6597301cd812f45a162f12fdabf7cb670daa325e5ab0cd072d99a880917981
25 DIST mcelog-180.tar.gz 314605 BLAKE2B 0cf4f25dc26901bee56ddd437ad3d56874ba70f2323d9d6821432bf744b78392e871c9632e44a7bef7a1954eb6605cf72f6d9268397741cecd5066b6bcafe54a SHA512 89b2b1c2f7ab03bb358926f10fa2c3e8f048bb5cf2d6f4453de63ecfd44daebe771087522c69ade5638248ab79c80122448efef798e4ea8d1a5f88308e8bfd32
26
27 diff --git a/app-admin/mcelog/files/mcelog-179-fix-logrotate.patch b/app-admin/mcelog/files/mcelog-179-fix-logrotate.patch
28 deleted file mode 100644
29 index 66978d022475..000000000000
30 --- a/app-admin/mcelog/files/mcelog-179-fix-logrotate.patch
31 +++ /dev/null
32 @@ -1,21 +0,0 @@
33 -Should be in the next release:
34 -https://github.com/andikleen/mcelog/commit/2261c74a88f9bc9e87c9ffaae5a98261087730ae.patch
35 -
36 -From: Andi Kleen <andi@××××××××××.org>
37 -Date: Sat, 6 Nov 2021 07:22:24 -0700
38 -Subject: [PATCH] Fix logrotate syntax
39 -
40 -Fixes #102
41 -
42 -Signed-off-by: Andi Kleen <andi@××××××××××.org>
43 ---- a/mcelog.logrotate
44 -+++ b/mcelog.logrotate
45 -@@ -3,7 +3,7 @@
46 - dateext
47 - maxage 365
48 - rotate 99
49 -- size=+2048k
50 -+ size +2048k
51 - notifempty
52 - missingok
53 - copytruncate
54
55 diff --git a/app-admin/mcelog/mcelog-179-r1.ebuild b/app-admin/mcelog/mcelog-179-r1.ebuild
56 deleted file mode 100644
57 index 147b65e40b9d..000000000000
58 --- a/app-admin/mcelog/mcelog-179-r1.ebuild
59 +++ /dev/null
60 @@ -1,48 +0,0 @@
61 -# Copyright 1999-2021 Gentoo Authors
62 -# Distributed under the terms of the GNU General Public License v2
63 -
64 -EAPI=8
65 -
66 -inherit linux-info systemd toolchain-funcs
67 -
68 -DESCRIPTION="A tool to log and decode Machine Check Exceptions"
69 -HOMEPAGE="http://mcelog.org/"
70 -SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
71 -
72 -LICENSE="GPL-2"
73 -SLOT="0"
74 -KEYWORDS="amd64 x86"
75 -IUSE="selinux"
76 -
77 -RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
78 -
79 -# TODO: add mce-inject to the tree to support test phase
80 -RESTRICT="test"
81 -
82 -pkg_pretend() {
83 - if [[ ${MERGE_TYPE} != buildonly ]]; then
84 - local CONFIG_CHECK="~X86_MCE"
85 - kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
86 - check_extra_config
87 - fi
88 -}
89 -
90 -src_prepare() {
91 - eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
92 - "${FILESDIR}"/${PN}-129-debugflags.patch \
93 - "${FILESDIR}"/${PN}-179-fix-logrotate.patch
94 - eapply_user
95 - tc-export CC
96 -}
97 -
98 -src_install() {
99 - default
100 -
101 - insinto /etc/logrotate.d/
102 - newins ${PN}.logrotate ${PN}
103 -
104 - newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
105 - systemd_dounit ${PN}.service
106 -
107 - dodoc *.pdf
108 -}
109
110 diff --git a/app-admin/mcelog/mcelog-180.ebuild b/app-admin/mcelog/mcelog-180.ebuild
111 deleted file mode 100644
112 index ec0ee80a3eff..000000000000
113 --- a/app-admin/mcelog/mcelog-180.ebuild
114 +++ /dev/null
115 @@ -1,47 +0,0 @@
116 -# Copyright 1999-2021 Gentoo Authors
117 -# Distributed under the terms of the GNU General Public License v2
118 -
119 -EAPI=8
120 -
121 -inherit linux-info systemd toolchain-funcs
122 -
123 -DESCRIPTION="A tool to log and decode Machine Check Exceptions"
124 -HOMEPAGE="http://mcelog.org/"
125 -SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
126 -
127 -LICENSE="GPL-2"
128 -SLOT="0"
129 -KEYWORDS="~amd64 ~x86"
130 -IUSE="selinux"
131 -
132 -RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
133 -
134 -# TODO: add mce-inject to the tree to support test phase
135 -RESTRICT="test"
136 -
137 -pkg_pretend() {
138 - if [[ ${MERGE_TYPE} != buildonly ]]; then
139 - local CONFIG_CHECK="~X86_MCE"
140 - kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
141 - check_extra_config
142 - fi
143 -}
144 -
145 -src_prepare() {
146 - eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
147 - "${FILESDIR}"/${PN}-129-debugflags.patch
148 - eapply_user
149 - tc-export CC
150 -}
151 -
152 -src_install() {
153 - default
154 -
155 - insinto /etc/logrotate.d/
156 - newins ${PN}.logrotate ${PN}
157 -
158 - newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
159 - systemd_dounit ${PN}.service
160 -
161 - dodoc *.pdf
162 -}