[gentoo-commits] repo/gentoo:master commit in: app-admin/mcelog/, app-admin/mcelog/files/

[Matt Turner]

commit:     1c87fc4663268b5dddb1c933cdbd249d0ef4460a
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  8 01:58:13 2017 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Mar  8 02:04:13 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c87fc46

app-admin/mcelog: Version bump to 148.

Bug: https://bugs.gentoo.org/571002

 app-admin/mcelog/Manifest                          |  1 +
 .../files/mcelog-1.0_pre3_p20120918-bashism.patch  |  4 +-
 app-admin/mcelog/files/mcelog-129-debugflags.patch | 22 +++++++++
 app-admin/mcelog/mcelog-148.ebuild                 | 53 ++++++++++++++++++++++
 4 files changed, 78 insertions(+), 2 deletions(-)

diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
index 0d3a11cd9b5..0ae99df7c4e 100644
--- a/app-admin/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@@ -1,3 +1,4 @@
 DIST mcelog-100.tar.gz 288423 SHA256 b18f029ec9f498b6249b3a3dfef7753ac9d45ebf3382af452cb3e14d49274bab SHA512 efd7864daaafe5d149fc27259d4fa72221372842d41ad57c046c967fd1eb710ef921f45111e95bfe76df119276b3b9af1bf1094a9411037eb1f5ac06e319e87d WHIRLPOOL 9f2f7fdbb3c94b7740f486005641a90529e240c34f3709989e6e0d448c96369f4562408aa678ea992f47f396cdfb60c71eadf75475c52ff0cd6318a99c4ad2eb
 DIST mcelog-117.tar.gz 296068 SHA256 0e0422e8693e4592a85ed344738004dcedcd930234ab862b0bdcb6ae7aa44f2b SHA512 664e4d9224ec1878153561bebdf4f6c58ea44cf0d494a04eb38cdd73cc8158fabdb0b4823f2303e39818f104298208206dfb9ff64ef13654dadfb5e7a4f5e723 WHIRLPOOL 1919bb2069f216d6a649c883bb9a9417edc9b51d639a73a81f5d5a8d06d874447dc839401858b1d402bbed588077dab93273d012768cb5d1b3fff3ec378d662e
 DIST mcelog-122.tar.gz 296366 SHA256 bfdffa82044a4e712ee9570b737169d900bbf53b0a1ea4c9a244b327f8987107 SHA512 895c5263d5632db446edb871d5ec84df75604572c1522f5d457eadaa05edc9a46c761708344a744b460bac5a82f2e52802280c0e6369f34ecd7f50abc6d15c70 WHIRLPOOL e43194b836623fbc268b51494ed3abe9e9cf67e5bd5c1134427f7ae67a30ccb321b971f211b68718a00e85c0c2382b462d59cc598b8c290685708f05b1c631f7
+DIST mcelog-148.tar.gz 296927 SHA256 3de7312ee13b0968ae8e1aa0a77acaaee89a0ed7de45f7ce557939723df3dc04 SHA512 67b793a6446fdba7cbb5b0e9cd6ce7aa6545e6e42395b4731d0431200525960cb8c9c3a10e7e5710836ae9759092235ef817f0ca1cdcc0a441afc402cc0a12bf WHIRLPOOL 638f556dcd4e4ec1b5fd9d8b31522cbbd919ec39b201dfeebf887f55d3f15e0dafd1ebb6fb350f5ecdd21f8e70d5845f36698b39e2d8360ef6f36731f288f10d

diff --git a/app-admin/mcelog/files/mcelog-1.0_pre3_p20120918-bashism.patch b/app-admin/mcelog/files/mcelog-1.0_pre3_p20120918-bashism.patch
index c6cba7d83ba..335a429ab04 100644
--- a/app-admin/mcelog/files/mcelog-1.0_pre3_p20120918-bashism.patch
+++ b/app-admin/mcelog/files/mcelog-1.0_pre3_p20120918-bashism.patch
@@ -2,8 +2,8 @@ From: Julian Ospald <hasufell@g.o>
 Date: Sat Jan 26 17:40:22 UTC 2013
 Subject: remove bashisms
 
---- triggers/cache-error-trigger
-+++ triggers/cache-error-trigger
+--- a/triggers/cache-error-trigger
++++ b/triggers/cache-error-trigger
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh

diff --git a/app-admin/mcelog/files/mcelog-129-debugflags.patch b/app-admin/mcelog/files/mcelog-129-debugflags.patch
new file mode 100644
index 00000000000..eb46439a62d
--- /dev/null
+++ b/app-admin/mcelog/files/mcelog-129-debugflags.patch
@@ -0,0 +1,22 @@
+From: Julian Ospald <hasufell@g.o>
+Date: Wed Oct 24 15:41:33 UTC 2012
+Subject: build system
+
+don't overwrite system CFLAGS, only append "-g -Os" if DEBUG=1 is passed
+as argument
+
+--- a/Makefile
++++ b/Makefile
+@@ -1,4 +1,11 @@
+-CFLAGS := -g -Os
++CC ?= gcc
++
++# set to 1 to enable debug flags
++DEBUG = 0
++ifeq ($(DEBUG),1)
++CFLAGS += -g -Os
++endif
++
+ prefix := /usr
+ etcprefix :=
+ MANDIR := ${prefix}/share/man

diff --git a/app-admin/mcelog/mcelog-148.ebuild b/app-admin/mcelog/mcelog-148.ebuild
new file mode 100644
index 00000000000..a3753af90a6
--- /dev/null
+++ b/app-admin/mcelog/mcelog-148.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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 )"
+
+CONFIG_CHECK="~X86_MCE"
+
+# TODO: add mce-inject to the tree to support test phase
+RESTRICT="test"
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
+		"${FILESDIR}"/${PN}-129-debugflags.patch \
+		"${FILESDIR}"/${PN}-1.0_pre3_p20120918-bashism.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)"
+}