6 files changed, 52 insertions, 42 deletions
diff --git a/sys-apps/xmbmon/Manifest b/sys-apps/xmbmon/Manifest
index 19ce5281de1a..91b656ce2a47 100644
--- a/sys-apps/xmbmon/Manifest
+++ b/sys-apps/xmbmon/Manifest
@@ -1,9 +1,9 @@
 AUX mbmon.confd 172 BLAKE2B a4ee3d22ca45541534693b64002c849ba3e1ea43c9f73815b30e01c2544dd005787c06250c45334244d76ec82d4fbd55653557519a556ab3dd95ef94bc70843f SHA512 6d48cecc4b2e9f80866a5f1a6a908c91d7ee36b60673ed9ea9e935d26805099ee30c5e205e35f00928b79d9e0fa4d21fe7314ec8b7b8705b508f941460a779f4
 AUX mbmon.rc 385 BLAKE2B 7206f97c43f5fad60c46809800f2af7908f68d62b36fb107f341fdc14caa5496b108799b06ab59880f7e7aa8a7ca3378d0a8e0bc2371ad1634331a5721a36aed SHA512 d3c358c176b18d0314d4bca2c89ed0a0c07f38fb604d6eb450c9c2928a24febf5b871fb29150f6c2567638a5ee66c2ac07b1b0a0130ab0c352e74d4a681d5c7c
-AUX xmbmon-2.0.5-amd64.patch 674 BLAKE2B 91a04c2228cd2b87cdfc6b1600c3f0b9010bd9f9bef1f50e285ff4f824021f4f5e7d6b630e1fdc9f27743a92219d14b02580b03d9c7feff101c40338cfb863a5 SHA512 a024b87f841fcb8813b241c3ce9fcaba06bd42ce69241fd9f080feb92402b413200d6adbb644ae46b9e8fde76b2fcaec46dcb4be736bde3c8386ca34e55a7f83
-AUX xmbmon-2.0.5-loopback.patch 1181 BLAKE2B 2c9c6183adced2f16f46168bfbe22de935edda8150f2dadda23b62ffb7c03e7cf1ac7a5512dc2e931e7579154776c6fd476a3af12d8c005c2ebafeda09bbb68d SHA512 11104d1c46da9f3a01d4e49a010294feb94696d9a262340ebec3a7acd661089f70d5af3c0d93a8fa89c022275bfdf4becd4c24f6a0544ec2261fdc62d65fce5a
-AUX xmbmon-2.0.5-pid.patch 505 BLAKE2B 389b189a2fd0baa7d3b94c6b8c10d23485064644fdf259e9951d5cc923fca979ba180c278532c305d9a45515136639f12344808c530ae9ed9a829cf30a02c0eb SHA512 9c6a569b0d1350715597cf582a558fe311e3eac00f088eb29890741ba814eb18cb934a49ad02532d4d0836ce147b07671f3cbdd45afb9842fc4bfbb8a3a229dc
-DIST xmbmon205.tar.gz 142987 SHA256 65b10ebfe53585ac22d6a31d8ef3fea552cb266cf2c124c00421dec1df5a4a4f SHA512 0ee2f3616976af6edc3777391f657d12670be1557f726f67f51edc23866d96d5cd4cfa9ac8aaad52cce2bdd2b9c616efd6edba1a019e4360a0fcaae0aef99a9c WHIRLPOOL f4a77e88315cb86fb6aa61566804cb22b382a6a18d56c96a09dd991033be005ec638361a03cfde21a95e6ef316ed65bbf15d72d03b10810e4dee59e1790e3d7b
-DIST xmbmon205_fflush.patch 242 SHA256 f837f465861ce46e4a90d1d3c7a680c1904f7fb91e14efcbad22313c90e2cdc7 SHA512 4ebd6f3870f3b35aafe9424da9e007b269bbdd6944a012e45a6bb18871a1df649245a0992862a2346dd92026e36430130b2061d8308286b93e13571e028684b5 WHIRLPOOL 3bb1a83e9e753642fe6a9bf0deea8743829fe3e27759786f049e03b3fb862adb5c7ed2d69a045d682e1e7afbb207d5f496dbff9d938625d1292583271a804b69
-EBUILD xmbmon-2.0.5-r1.ebuild 1851 BLAKE2B 0ba986fe77dd9bbec00e039cb755812c16c7a4471b2b659bd98d1aba131b0903cd737fafab9396cac2c8735cee4d8e2db0c16630933068df078d08739da95fad SHA512 39508420cec49fa5a724312431188639094cf75aa94ec683b6176d0d2ebb5853ef2031197d659615387bc26bbf9bc4a403e5d68740718db8777d8810d6e6ecdc
+AUX xmbmon-2.0.5-amd64.patch 370 BLAKE2B ba44981a10c63298d0b7338bfc03cfd8f0a3cd9eb7aa1f5121f685226c6a1dbbb0d4bf67aabd45b3c37e475e322712f366e482f2f971e5cd4c312402a866d14e SHA512 498f8771cf6d902cfd28da1229f3c73d55e69f44c93aa5904b7e3c2646e0735690723bedd251dff10c4efe614822a28127e7376f9dd19f4b6d6298d3412a7e5c
+AUX xmbmon-2.0.5-fflush.patch 191 BLAKE2B 38c8a858a89c5c915252be88e81bdf549f47276e7e121f2d0b90d01497728fb061272d16bdd79c7381b8685dd7894869bdb8a02b24b6f3765bff67a876eaf826 SHA512 9b6c9c6c2ab0a389aa6e200341ee9053c8da307f1863020fa7efe1696ef8d65816bbef3096fd4376ceced5ab3b8ae867ee07810715fa76197cc585192117d8a8
+AUX xmbmon-2.0.5-loopback.patch 1185 BLAKE2B 6f5378afac536131daf02173b2330ed29de2003d467d2d55ce6b2908dd8a828fa1355d43a9f4a1a88c3e08c02770920643f8cfa50ff0e7c41ede6741374bb196 SHA512 9f19fa6ea36f12a7d6dcf9a2c87167b612d8cb5d3d81cba7158e92173feb146fff3b2cb02ff30aef328ffb83a6998842a5ded4e1297482d26862e629fec5b37e
+AUX xmbmon-2.0.5-pid.patch 508 BLAKE2B e52468a3a92f051efc6574af4ff124f3f04ba817248b6564bfa633ccb64eb597b3be28f6404185927288119a3d75609e0cfc62317b7faa6a435f652f53eada90 SHA512 caa1a23cd21c33546acbcb703bec778367abde739eed03ab30ffa7051cb2455a9a2fcf776dcbc29109e28a58d2aa2d588b04464d114c083738be45124056515d
+DIST xmbmon205.tar.gz 142987 BLAKE2B 7c39c78068106c828273c077a2a375bfd4dbfa686a4f6b592a986b6cebec6b3e2ae7c9318ecd1b1d91c0757fe7ebb023ac135aa8167b5c86c3e42c1c173cdb72 SHA512 0ee2f3616976af6edc3777391f657d12670be1557f726f67f51edc23866d96d5cd4cfa9ac8aaad52cce2bdd2b9c616efd6edba1a019e4360a0fcaae0aef99a9c
+EBUILD xmbmon-2.0.5-r1.ebuild 1597 BLAKE2B 70352f472e49439334fc59aeab8391d9957c09ec393fa1cba5dea8534ed5f0c54ab17c165bcb682e100e87799e1118e7594eeb9a5ea3b3ec37911379937082a5 SHA512 e9f3e4957a1fd81f495d11b9dcf3c549c945fe68a873fb682d8101f91595c7a21bdd3e3edc5f470732d1c270f4ed63723db08a81cda7a54d7156b675f09a489e
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/xmbmon/files/xmbmon-2.0.5-amd64.patch b/sys-apps/xmbmon/files/xmbmon-2.0.5-amd64.patch
index 27b150e9b0ba..bac206905107 100644
--- a/sys-apps/xmbmon/files/xmbmon-2.0.5-amd64.patch
+++ b/sys-apps/xmbmon/files/xmbmon-2.0.5-amd64.patch
@@ -1,6 +1,5 @@
-diff -Naur xmbmon205.orig/configure xmbmon205/configure
---- xmbmon205.orig/configure	2004-08-13 16:22:18.000000000 +0900
-+++ xmbmon205/configure	2005-02-05 11:02:02.496163477 +0900
+--- a/configure
++++ b/configure
 @@ -3489,7 +3489,7 @@
  	i?86-*-freebsd*)
    		CC=cc
@@ -10,9 +9,8 @@ diff -Naur xmbmon205.orig/configure xmbmon205/configure
    		CC=gcc
  		HOSTDEF="-DLINUX"
  		;;
-diff -Naur xmbmon205.orig/configure.in xmbmon205/configure.in
---- xmbmon205.orig/configure.in	2004-08-13 16:06:31.000000000 +0900
-+++ xmbmon205/configure.in	2005-02-05 11:01:35.414957216 +0900
+--- a/configure.in
++++ b/configure.in
 @@ -19,7 +19,7 @@
  	i?86-*-freebsd*)
    		CC=cc
diff --git a/sys-apps/xmbmon/files/xmbmon-2.0.5-fflush.patch b/sys-apps/xmbmon/files/xmbmon-2.0.5-fflush.patch
new file mode 100644
index 000000000000..655b30f75517
--- /dev/null
+++ b/sys-apps/xmbmon/files/xmbmon-2.0.5-fflush.patch
@@ -0,0 +1,10 @@
+--- a/mbmon.c
++++ b/mbmon.c
+@@ -640,6 +640,7 @@
+ 		else if (fanspeed == 7)
+ 			fprintf(out, "%4d\n%4d\n%4d\n", rot1, rot2, rot3);
+ 	}
++	fflush(out);
+ 	if (port) {
+ #ifdef LOGGING
+ 		if (nfd)
diff --git a/sys-apps/xmbmon/files/xmbmon-2.0.5-loopback.patch b/sys-apps/xmbmon/files/xmbmon-2.0.5-loopback.patch
index 5a28b52f9ea2..e501f448dcfa 100644
--- a/sys-apps/xmbmon/files/xmbmon-2.0.5-loopback.patch
+++ b/sys-apps/xmbmon/files/xmbmon-2.0.5-loopback.patch
@@ -2,8 +2,8 @@ Listen on loopback only with the -l option
 
 patch by Mike Frysinger
 
---- mbmon.c
-+++ mbmon.c
+--- a/mbmon.c
++++ b/mbmon.c
 @@ -41,4 +41,5 @@
  static const char *MyName = "mbmon";
  int port = 0;
diff --git a/sys-apps/xmbmon/files/xmbmon-2.0.5-pid.patch b/sys-apps/xmbmon/files/xmbmon-2.0.5-pid.patch
index aecb5e7a9b7c..1ca30657c230 100644
--- a/sys-apps/xmbmon/files/xmbmon-2.0.5-pid.patch
+++ b/sys-apps/xmbmon/files/xmbmon-2.0.5-pid.patch
@@ -2,8 +2,8 @@ Write a pid when we daemonize
 
 patch by Mike Frysinger
 
---- mbmon.c
-+++ mbmon.c
+--- a/bmon.c
++++ b/mbmon.c
 @@ -229,4 +229,5 @@
  static void daemonize()
  {
diff --git a/sys-apps/xmbmon/xmbmon-2.0.5-r1.ebuild b/sys-apps/xmbmon/xmbmon-2.0.5-r1.ebuild
index da5cef958ffd..2b128239d11e 100644
--- a/sys-apps/xmbmon/xmbmon-2.0.5-r1.ebuild
+++ b/sys-apps/xmbmon/xmbmon-2.0.5-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-inherit eutils
+EAPI=6
 
 MY_P=${PN}${PV//.}
+
 DESCRIPTION="Mother Board Monitor Program for X Window System"
 HOMEPAGE="http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/download.html"
-SRC_URI="http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/xmbmon/${MY_P}.tar.gz
-	http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/xmbmon/${MY_P}_fflush.patch"
+SRC_URI="http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/xmbmon/${MY_P}.tar.gz"
 #	http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/xmbmon/${MY_P}_A7N8X-VM.patch
 
 LICENSE="BSD"
@@ -15,21 +15,27 @@ SLOT="0"
 KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE="X"
 
-DEPEND="X? ( x11-libs/libXt
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libICE )"
+RDEPEND="
+	X? (
+		x11-libs/libXt
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libICE
+	)"
+DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
+PATCHES=(
+	# "${DISTDIR}"/${MY_P}_A7N8X-VM.patch
+	"${FILESDIR}"/${P}-fflush.patch
+	"${FILESDIR}"/${P}-amd64.patch
+	"${FILESDIR}"/${P}-pid.patch
+	"${FILESDIR}"/${P}-loopback.patch
+)
+
+src_prepare() {
+	default
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# epatch "${DISTDIR}"/${MY_P}_A7N8X-VM.patch
-	epatch "${DISTDIR}"/${MY_P}_fflush.patch
-	epatch "${FILESDIR}"/${P}-amd64.patch
-	epatch "${FILESDIR}"/${P}-pid.patch
-	epatch "${FILESDIR}"/${P}-loopback.patch
 	sed -i \
 		-e "/^CFLAGS=/s/-O3/${CFLAGS}/" \
 		-e '/^LDFLAGS=-s$/d' \
@@ -40,21 +46,19 @@ src_unpack() {
 }
 
 src_compile() {
-	econf || die "Configure failed"
-	emake mbmon || die "Make mbmon failed"
-	if use X ; then
-		emake xmbmon || die "Make xmbmon failed"
-	fi
+	emake mbmon
+	use X && emake xmbmon
 }
 
 src_install() {
-	dosbin mbmon || die "mbmon failed"
+	dosbin mbmon
 	doman mbmon.1
 	dodoc ChangeLog* ReadMe* mbmon-rrd.pl
 
-	if use X ; then
-		dosbin xmbmon || die "xmbmon failed"
+	if use X; then
+		dosbin xmbmon
 		doman xmbmon.1x
+
 		insinto /etc/X11/app-defaults/
 		newins xmbmon.resources XMBmon
 	fi
@@ -64,10 +68,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	echo
 	einfo "These programs access SMBus/ISA-IO ports without any kind"
 	einfo "of checking.  It is, therefore, very dangerous and may cause"
 	einfo "a system-crash. Make sure you read ReadMe,"
 	einfo "section 4, 'How to use!'"
-	echo
 }