sys-apps/xmbmon: Port to EAPI 6

Package-Manager: Portage-2.3.16, Repoman-2.3.6

6 files changed, 47 insertions, 38 deletions

diff --git a/sys-apps/xmbmon/Manifest b/sys-apps/xmbmon/Manifest
index c1b6979699ed..2107a452de12 100644
--- a/sys-apps/xmbmon/Manifest
+++ b/sys-apps/xmbmon/Manifest
@@ -1,2 +1 @@
-DIST xmbmon205.tar.gz 142987 SHA256 65b10ebfe53585ac22d6a31d8ef3fea552cb266cf2c124c00421dec1df5a4a4f SHA512 0ee2f3616976af6edc3777391f657d12670be1557f726f67f51edc23866d96d5cd4cfa9ac8aaad52cce2bdd2b9c616efd6edba1a019e4360a0fcaae0aef99a9c WHIRLPOOL f4a77e88315cb86fb6aa61566804cb22b382a6a18d56c96a09dd991033be005ec638361a03cfde21a95e6ef316ed65bbf15d72d03b10810e4dee59e1790e3d7b
-DIST xmbmon205_fflush.patch 242 SHA256 f837f465861ce46e4a90d1d3c7a680c1904f7fb91e14efcbad22313c90e2cdc7 SHA512 4ebd6f3870f3b35aafe9424da9e007b269bbdd6944a012e45a6bb18871a1df649245a0992862a2346dd92026e36430130b2061d8308286b93e13571e028684b5 WHIRLPOOL 3bb1a83e9e753642fe6a9bf0deea8743829fe3e27759786f049e03b3fb862adb5c7ed2d69a045d682e1e7afbb207d5f496dbff9d938625d1292583271a804b69
+DIST xmbmon205.tar.gz 142987 BLAKE2B 7c39c78068106c828273c077a2a375bfd4dbfa686a4f6b592a986b6cebec6b3e2ae7c9318ecd1b1d91c0757fe7ebb023ac135aa8167b5c86c3e42c1c173cdb72 SHA512 0ee2f3616976af6edc3777391f657d12670be1557f726f67f51edc23866d96d5cd4cfa9ac8aaad52cce2bdd2b9c616efd6edba1a019e4360a0fcaae0aef99a9c
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
 }