Version bumped. Removed setuid. Fixed amd64 compile problem.

(Portage version: 2.0.51-r15)

6 files changed, 104 insertions, 5 deletions

diff --git a/sys-apps/xmbmon/ChangeLog b/sys-apps/xmbmon/ChangeLog
index 53822d0dbf28..a7d869556b91 100644
--- a/sys-apps/xmbmon/ChangeLog
+++ b/sys-apps/xmbmon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/xmbmon
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/xmbmon/ChangeLog,v 1.8 2004/07/21 22:31:58 lv Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xmbmon/ChangeLog,v 1.9 2005/02/05 03:32:54 matsuu Exp $
+
+*xmbmon-2.0.5 (05 Feb 2005)
+
+  05 Feb 2005; MATSUU Takuto <matsuu@gentoo.org>
+  +files/xmbmon-2.0.5-amd64.patch, +xmbmon-2.0.5.ebuild:
+  Version bumped. Removed setuid. Fixed amd64 compile problem.
 
   21 Jul 2004; Travis Tilley <lv@gentoo.org> +files/xmbmon-2.0.3-gcc34.patch,
   xmbmon-2.0.3.ebuild:
diff --git a/sys-apps/xmbmon/Manifest b/sys-apps/xmbmon/Manifest
index 23b3dacb35d1..11b744556fc2 100644
--- a/sys-apps/xmbmon/Manifest
+++ b/sys-apps/xmbmon/Manifest
@@ -1,5 +1,8 @@
 MD5 1f4332f75e6eba70d6deae94c0921438 xmbmon-2.0.3.ebuild 1506
+MD5 04c8ca38e83913688e144be9992d91c4 xmbmon-2.0.5.ebuild 1627
 MD5 81d857c59c7a2e2979e3f3875f217c97 ChangeLog 1020
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 bcbf7a71b0097dda70c0ca258cf00c84 files/digest-xmbmon-2.0.3 61
+MD5 7cd8051a9606fc6b11bdb465b0e676b2 files/xmbmon-2.0.5-amd64.patch 674
 MD5 9c27e9d00e4c46cdac30f402fc3092c0 files/xmbmon-2.0.3-gcc34.patch 702
+MD5 bcbf7a71b0097dda70c0ca258cf00c84 files/digest-xmbmon-2.0.3 61
+MD5 0c353771c30cbc519c6e0691ff79a0ad files/digest-xmbmon-2.0.5 125
diff --git a/sys-apps/xmbmon/files/digest-xmbmon-2.0.5 b/sys-apps/xmbmon/files/digest-xmbmon-2.0.5
new file mode 100644
index 000000000000..d931610527c2
--- /dev/null
+++ b/sys-apps/xmbmon/files/digest-xmbmon-2.0.5
@@ -0,0 +1,2 @@
+MD5 ab6614c785f5b653fcc69fb9c02058f0 xmbmon205.tar.gz 142987
+MD5 cab271a816ed2aeb3f898f2dee493456 xmbmon205_fflush.patch 242
diff --git a/sys-apps/xmbmon/files/xmbmon-2.0.5-amd64.patch b/sys-apps/xmbmon/files/xmbmon-2.0.5-amd64.patch
new file mode 100644
index 000000000000..27b150e9b0ba
--- /dev/null
+++ b/sys-apps/xmbmon/files/xmbmon-2.0.5-amd64.patch
@@ -0,0 +1,24 @@
+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
+@@ -3489,7 +3489,7 @@
+ 	i?86-*-freebsd*)
+   		CC=cc
+ 		;;
+-	i?86-*-linux-*)
++	i?86-*-linux-* | x86_64-*-linux-*)
+   		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
+@@ -19,7 +19,7 @@
+ 	i?86-*-freebsd*)
+   		CC=cc
+ 		;;
+-	i?86-*-linux-*)
++	i?86-*-linux-* | x86_64-*-linux-*)
+   		CC=gcc
+ 		HOSTDEF="-DLINUX"
+ 		;;
diff --git a/sys-apps/xmbmon/xmbmon-2.0.3.ebuild b/sys-apps/xmbmon/xmbmon-2.0.3.ebuild
index 06d5cf0f2689..eeb7311d5fb1 100644
--- a/sys-apps/xmbmon/xmbmon-2.0.3.ebuild
+++ b/sys-apps/xmbmon/xmbmon-2.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/xmbmon/xmbmon-2.0.3.ebuild,v 1.8 2004/07/21 22:31:58 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xmbmon/xmbmon-2.0.3.ebuild,v 1.9 2005/02/05 03:32:54 matsuu Exp $
 
 inherit gnuconfig eutils
 
diff --git a/sys-apps/xmbmon/xmbmon-2.0.5.ebuild b/sys-apps/xmbmon/xmbmon-2.0.5.ebuild
new file mode 100644
index 000000000000..7ba09fb15390
--- /dev/null
+++ b/sys-apps/xmbmon/xmbmon-2.0.5.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xmbmon/xmbmon-2.0.5.ebuild,v 1.1 2005/02/05 03:32:54 matsuu Exp $
+
+inherit gnuconfig eutils
+
+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"
+#	http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/xmbmon/${MY_P}_A7N8X-VM.patch
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="X"
+
+DEPEND="virtual/libc
+	X? ( virtual/x11 )"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# epatch ${DISTDIR}/${MY_P}_A7N8X-VM.patch
+	epatch ${DISTDIR}/${MY_P}_fflush.patch
+	epatch ${FILESDIR}/${P}-amd64.patch
+	sed -i -e "/^CFLAGS=/s/-O3/${CFLAGS}/" Makefile.in || die
+}
+
+src_compile() {
+	gnuconfig_update
+
+	econf || die "Configure failed"
+	emake mbmon || die "Make mbmon failed"
+	if use X ; then
+		emake xmbmon || die "Make xmbmon failed"
+	fi
+}
+
+src_install() {
+	dosbin mbmon
+	doman mbmon.1
+
+	if use X ; then
+		dosbin xmbmon
+		doman xmbmon.1x
+		insinto /etc/X11/app-defaults/
+		newins xmbmon.resources XMBmon
+	fi
+
+	dodoc ChangeLog* ReadMe* mbmon-rrd.pl
+}
+
+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
+}