Cleanup, DEPEND fixed (bug 84007), stable on sparc and amd64.

(Portage version: 2.0.51.19)

8 files changed, 15 insertions, 114 deletions

diff --git a/net-misc/multiimonc/ChangeLog b/net-misc/multiimonc/ChangeLog
index 7158a31df2d5..0ce6f653fb8c 100644
--- a/net-misc/multiimonc/ChangeLog
+++ b/net-misc/multiimonc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/multiimonc
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/multiimonc/ChangeLog,v 1.12 2004/11/14 22:44:03 hansmi Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/multiimonc/ChangeLog,v 1.13 2005/03/06 16:12:15 hansmi Exp $
+
+  06 Mar 2005; Michael Hanselmann <hansmi@gentoo.org>
+  -files/UsagePlot-0.3.2.diff, -multiimonc-0.3.2.ebuild,
+  -multiimonc-0.3.3.ebuild, multiimonc-0.3.4.ebuild,
+  multiimonc-0.3.5.ebuild:
+  Cleanup, DEPEND fixed (bug 84007), stable on sparc and amd64.
 
   14 Nov 2004; Michael Hanselmann <hansmi@gentoo.org> multiimonc-0.3.5.ebuild:
   Added to ~sparc.
diff --git a/net-misc/multiimonc/files/UsagePlot-0.3.2.diff b/net-misc/multiimonc/files/UsagePlot-0.3.2.diff
deleted file mode 100644
index 9b4d3393a0e7..000000000000
--- a/net-misc/multiimonc/files/UsagePlot-0.3.2.diff
+++ /dev/null
@@ -1,41 +0,0 @@
-Fix a divide-by-zero-error in UsagePlot.cpp. Will be
-fixed in MultiImonC 0.3.3.
-
---- UsagePlot.cpp.orig	2004-06-02 21:59:34.973014648 +0200
-+++ UsagePlot.cpp	2004-06-02 22:03:14.151694424 +0200
-@@ -123,18 +123,23 @@
-         int iOldYOut = 0;
-         ChannelUsageData::const_iterator itData((*cli).begin());
-         while(itData != (*cli).end()) {
--            wxCoord x(iElement * iHorizSpace);
--            wxCoord iYIn(((iHeight - 6) * (*itData).in / (*cli).MaxRateIn) + 1);
--            wxCoord iYOut(((iHeight - 6) * (*itData).out / (*cli).MaxRateOut) + 1);
--            
--            dc.SetPen((*cli).PenColorOut());
--            dc.DrawLine(x - iHorizSpace, iOldYOut, x, iYOut);
--            
--            dc.SetPen((*cli).PenColorIn());
--            dc.DrawLine(x - iHorizSpace, iOldYIn, x, iYIn);
--            
--            iOldYIn = iYIn;
--            iOldYOut = iYOut;
-+            ChannelUsageData const& oUsage(*cli);
-+
-+            if(oUsage.MaxRateIn && oUsage.MaxRateOut) {
-+                wxCoord x(iElement * iHorizSpace);
-+                wxCoord iYIn(((iHeight - 6) * (*itData).in / oUsage.MaxRateIn) + 1);
-+                wxCoord iYOut(((iHeight - 6) * (*itData).out / oUsage.MaxRateOut) + 1);
-+
-+                dc.SetPen(oUsage.PenColorOut());
-+                dc.DrawLine(x - iHorizSpace, iOldYOut, x, iYOut);
-+
-+                dc.SetPen(oUsage.PenColorIn());
-+                dc.DrawLine(x - iHorizSpace, iOldYIn, x, iYIn);
-+
-+                iOldYIn = iYIn;
-+                iOldYOut = iYOut;
-+            }
-+			
-             iElement++;
-             itData++;
-         }
diff --git a/net-misc/multiimonc/files/digest-multiimonc-0.3.2 b/net-misc/multiimonc/files/digest-multiimonc-0.3.2
deleted file mode 100644
index 85a3878f9610..000000000000
--- a/net-misc/multiimonc/files/digest-multiimonc-0.3.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3b6c5324fdb5471303eeba5bf28f7cfc MultiImonC-0.3.2.tar.bz2 117314
diff --git a/net-misc/multiimonc/files/digest-multiimonc-0.3.3 b/net-misc/multiimonc/files/digest-multiimonc-0.3.3
deleted file mode 100644
index ce58abaaa5b6..000000000000
--- a/net-misc/multiimonc/files/digest-multiimonc-0.3.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c7eaf2cc4d6402f03706622cc5112c08 MultiImonC-0.3.3.tar.bz2 152076
diff --git a/net-misc/multiimonc/multiimonc-0.3.2.ebuild b/net-misc/multiimonc/multiimonc-0.3.2.ebuild
deleted file mode 100644
index 883ac97f8efb..000000000000
--- a/net-misc/multiimonc/multiimonc-0.3.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/multiimonc/multiimonc-0.3.2.ebuild,v 1.5 2004/07/02 07:44:41 eradicator Exp $
-
-inherit eutils
-
-DESCRIPTION="A wxWidgets-based client for fli4l"
-SRC_URI="http://www.fli4l.de/german/extern/multiimonc/MultiImonC-${PV}.tar.bz2"
-HOMEPAGE="http://www.hansmi.ch/software/multiimonc"
-
-S="${WORKDIR}/MultiImonC-${PV}"
-
-KEYWORDS="x86 ppc"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND=">=x11-libs/wxGTK-2.4.1
-		virtual/libc
-		virtual/x11"
-
-src_compile() {
-	# Fix a divide-by-zero-error in UsagePlot.cpp
-	( cd "${S}/src" && epatch "${FILESDIR}/UsagePlot-0.3.2.diff" )
-	econf || die "could not configure"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "install problem"
-}
-
diff --git a/net-misc/multiimonc/multiimonc-0.3.3.ebuild b/net-misc/multiimonc/multiimonc-0.3.3.ebuild
deleted file mode 100644
index 88657f0b2a29..000000000000
--- a/net-misc/multiimonc/multiimonc-0.3.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/multiimonc/multiimonc-0.3.3.ebuild,v 1.4 2004/07/11 11:19:37 hansmi Exp $
-
-inherit eutils
-
-DESCRIPTION="A wxWidgets-based client for fli4l"
-SRC_URI="http://www.fli4l.de/german/extern/multiimonc/MultiImonC-${PV}.tar.bz2"
-HOMEPAGE="http://www.hansmi.ch/software/multiimonc"
-
-S="${WORKDIR}/MultiImonC-${PV}"
-
-KEYWORDS="x86 ppc"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND=">=x11-libs/wxGTK-2.4.1
-		virtual/libc
-		virtual/x11"
-
-src_compile() {
-	econf || die "could not configure"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "install problem"
-}
-
diff --git a/net-misc/multiimonc/multiimonc-0.3.4.ebuild b/net-misc/multiimonc/multiimonc-0.3.4.ebuild
index 715e37824654..26fc5dffdb02 100644
--- a/net-misc/multiimonc/multiimonc-0.3.4.ebuild
+++ b/net-misc/multiimonc/multiimonc-0.3.4.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/net-misc/multiimonc/multiimonc-0.3.4.ebuild,v 1.2 2004/08/21 08:56:12 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/multiimonc/multiimonc-0.3.4.ebuild,v 1.3 2005/03/06 16:12:15 hansmi Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
 
-DEPEND=">=x11-libs/wxGTK-2.4.1
+DEPEND="=x11-libs/wxGTK-2.4*
 		virtual/libc
 		virtual/x11"
 
diff --git a/net-misc/multiimonc/multiimonc-0.3.5.ebuild b/net-misc/multiimonc/multiimonc-0.3.5.ebuild
index f7fff8d5853e..eee35567f592 100644
--- a/net-misc/multiimonc/multiimonc-0.3.5.ebuild
+++ b/net-misc/multiimonc/multiimonc-0.3.5.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/net-misc/multiimonc/multiimonc-0.3.5.ebuild,v 1.4 2004/11/14 22:44:03 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/multiimonc/multiimonc-0.3.5.ebuild,v 1.5 2005/03/06 16:12:15 hansmi Exp $
 
 inherit eutils
 
@@ -10,12 +10,12 @@ HOMEPAGE="http://www.hansmi.ch/software/multiimonc"
 
 S="${WORKDIR}/MultiImonC-${PV}"
 
-KEYWORDS="x86 ppc ~amd64 ~sparc"
+KEYWORDS="x86 ppc amd64 sparc"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
 
-DEPEND=">=x11-libs/wxGTK-2.4.1
+DEPEND="=x11-libs/wxGTK-2.4*
 		virtual/libc
 		virtual/x11"