Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/freewrl/PKGBUILD
	community-testing/gambas2/PKGBUILD
	community-testing/gambas3/PKGBUILD
	community-testing/gnash/PKGBUILD
	community-testing/gource/PKGBUILD
	community-testing/gpac/PKGBUILD
	community-testing/rss-glx/PKGBUILD
	community-testing/smc/PKGBUILD
	community/blobby2/PKGBUILD
	community/jack2/PKGBUILD
	community/kleansweep/PKGBUILD
	core/gcc/PKGBUILD
	extra/at/PKGBUILD
	extra/maxima/PKGBUILD
	extra/nicotine/PKGBUILD
	extra/python-geoip/PKGBUILD
	extra/sqlite/PKGBUILD
	gnome-unstable/gnome-control-center/PKGBUILD
	gnome-unstable/gnome-settings-daemon/PKGBUILD
	gnome-unstable/gst-plugins-base/PKGBUILD
	gnome-unstable/gstreamer/PKGBUILD
	multilib-testing/gcc-multilib/PKGBUILD
	multilib-testing/libtool-multilib/PKGBUILD
	multilib/jack2-multilib/PKGBUILD
	staging/mesa/PKGBUILD
	testing/bzflag/PKGBUILD
	testing/cabal-install/PKGBUILD
	testing/cairo/PKGBUILD
	testing/gcc/PKGBUILD
	testing/glew/PKGBUILD
	testing/kdebase-workspace/PKGBUILD
	testing/libreoffice/PKGBUILD
	testing/libtool/PKGBUILD
	testing/mesa/PKGBUILD
	testing/nx/PKGBUILD
	testing/xf86-video-ati/PKGBUILD
	testing/xf86-video-intel/PKGBUILD
	testing/xf86-video-intel/xf86-video-intel.install
	testing/xf86-video-nouveau/PKGBUILD
	testing/xine-lib/PKGBUILD
	testing/xorg-server/PKGBUILD

2 files changed, 24 insertions, 6 deletions

diff --git a/community/mcelog/PKGBUILD b/community/mcelog/PKGBUILD
index 27302f56d..9d60906c3 100644
--- a/community/mcelog/PKGBUILD
+++ b/community/mcelog/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 57954 2011-11-04 21:05:32Z lcarlier $
+# $Id: PKGBUILD 77126 2012-10-05 11:04:13Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Thomas Mudrunka <harvie@@email..cz>
 # Maintainer: Thomas Mudrunka <harvie@@email..cz>
 
 pkgname=mcelog
 pkgver=1.0pre3
-pkgrel=3
+pkgrel=4
 pkgdesc="Print machine check event log from x86-64 kernel"
 url="http://freshmeat.net/projects/mcelog/"
 license=("GPL")
@@ -13,23 +13,24 @@ arch=('i686' 'x86_64' 'mips64el')
 options=('docs')
 #source=("ftp://ftp.kernel.org/pub/linux/utils/cpu/mce/${pkgname}-${pkgver}.tar.gz"
 source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        "${pkgname}.rc")
+	"${pkgname}.rc"
+	"mcelog.service")
 md5sums=('b42f2214de6f4feb992556149edc67fa'
-         'f039a77d7bde3518d3d695b144816e8a')
+         'f039a77d7bde3518d3d695b144816e8a'
+         '4e563f1124c09b3368532d37f9f4bba3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-
   make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-
   mkdir -p $pkgdir/usr/share/doc/mcelog
   make install prefix=$pkgdir/usr etcprefix=$pkgdir DOCDIR=$pkgdir/usr/share/doc/mcelog
   install -Dm0755 mcelog.cron "${pkgdir}/usr/sbin/mcelog.cron"
   install -Dm0755 "${srcdir}/mcelog.rc" "${pkgdir}/etc/rc.d/mcelog"
   install -Dm0644 mcelog.logrotate "${pkgdir}/etc/logrotate.d/mcelog.logrotate"
   install -Dm0644 README "${pkgdir}/usr/share/doc/mcelog/README"
+  install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
 }
diff --git a/community/mcelog/mcelog.service b/community/mcelog/mcelog.service
new file mode 100644
index 000000000..62d8cbed0
--- /dev/null
+++ b/community/mcelog/mcelog.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=Machine Check Exception Logging Daemon
+After=syslog.target
+
+# FIXME - due to upstream kernel bug always start the mcelog process
+# twice using the following ExecStartPre hack. This needs fixing.
+# There is a bug filed against systemd for the ExecStartPre bit
+# since it is not possible to specify that the ExecStarPre bit
+# is allowed and expected to fail without aborting the daemon.
+
+[Service]
+ExecStartPre=/etc/mcelog/mcelog.setup
+ExecStart=/usr/sbin/mcelog --ignorenodev --daemon --foreground
+StandardOutput=syslog
+
+[Install]
+WantedBy=multi-user.target