Added a patch by mkay to fix bug 202388. Removed obsolete versions.

Package-Manager: portage-2.1.4_rc9

8 files changed, 47 insertions, 69 deletions

diff --git a/net-misc/kbandwidth/ChangeLog b/net-misc/kbandwidth/ChangeLog
index e74929de30ed..4736d677732a 100644
--- a/net-misc/kbandwidth/ChangeLog
+++ b/net-misc/kbandwidth/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/kbandwidth
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/kbandwidth/ChangeLog,v 1.9 2007/10/09 15:13:59 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/kbandwidth/ChangeLog,v 1.10 2007/12/16 23:08:39 philantrop Exp $
+
+*kbandwidth-1.0.4-r1 (16 Dec 2007)
+
+  16 Dec 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  -kbandwidth-1.0.2.ebuild, -kbandwidth-1.0.3.ebuild,
+  +kbandwidth-1.0.4-r1.ebuild:
+  Added a patch by mkay to fix bug 202388. Removed obsolete versions.
 
   09 Oct 2007; Christoph Mende <angelos@gentoo.org> kbandwidth-1.0.4.ebuild:
   Stable on amd64 wrt bug #194451
diff --git a/net-misc/kbandwidth/Manifest b/net-misc/kbandwidth/Manifest
index d262066c6ca2..4adc0491b049 100644
--- a/net-misc/kbandwidth/Manifest
+++ b/net-misc/kbandwidth/Manifest
@@ -1,42 +1,23 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST kbandwidth-1.0.2.tar.gz 690185 RMD160 d9a99c5b09fec8087e1221c0e02ca1b72f1a78eb SHA1 541cf81301157f943d93ab61bdac2ff5eb5d5ac1 SHA256 d13fb23c3fc688d625479509127a664e169396e4ed8e20672e5b2f342ad402d5
-DIST kbandwidth-1.0.3.tar.gz 762883 RMD160 58b0210dcb06166fcc3f7dfa5a7a2b712bd333c0 SHA1 d351befa1316397c236456d17ef60b049f3d63d7 SHA256 66662df6101326d440df882d813f78c862a894a44c29ac007fb70b6e3ecb6835
 DIST kbandwidth-1.0.4.tar.gz 611681 RMD160 cae8123a383f8009e688678fa0a3f96af4deb86f SHA1 663d0335a9b7576e175180518187eb72bb4e5268 SHA256 8d4810f767b5f352ff71a8a25629ed9e466d1f4d8517901f6f23ba0ac55b5e54
-EBUILD kbandwidth-1.0.2.ebuild 519 RMD160 06cc61b21dd6d67561ee9ebf7f4df79b050fc967 SHA1 5b1b3dfcb0987d81e198e82a2534dc5087b66b93 SHA256 e658a01994aad2a01b8b662eb9375f3ae55efc92924a7400df4ed6fcc60d8005
-MD5 11b30980ff5c731e52b7a9973588a815 kbandwidth-1.0.2.ebuild 519
-RMD160 06cc61b21dd6d67561ee9ebf7f4df79b050fc967 kbandwidth-1.0.2.ebuild 519
-SHA256 e658a01994aad2a01b8b662eb9375f3ae55efc92924a7400df4ed6fcc60d8005 kbandwidth-1.0.2.ebuild 519
-EBUILD kbandwidth-1.0.3.ebuild 537 RMD160 ce2119780251d3e7d6eb005f10d0d80e675ac53d SHA1 be73eb5d694856125a9be9104fdee52f33ca13c1 SHA256 f6806e9bbe0d8f1b5f9a8af9f6cbbaeffc725bae4be92adfcf87087d4c742dee
-MD5 abab69b4697ba261e0cb9adaf1b68f96 kbandwidth-1.0.3.ebuild 537
-RMD160 ce2119780251d3e7d6eb005f10d0d80e675ac53d kbandwidth-1.0.3.ebuild 537
-SHA256 f6806e9bbe0d8f1b5f9a8af9f6cbbaeffc725bae4be92adfcf87087d4c742dee kbandwidth-1.0.3.ebuild 537
+EBUILD kbandwidth-1.0.4-r1.ebuild 764 RMD160 f1a10f20bc8c1647acf68f1ead5fa19c35959f03 SHA1 e0679227e8b958cc91cfb7a9b11a97463d577864 SHA256 1179681bc658c1f1bb4f9f729b62cb3630243c04d0b8d87e454dd232ed5e0316
+MD5 0ae7c82f6d819a8f1c586e15ca7170ea kbandwidth-1.0.4-r1.ebuild 764
+RMD160 f1a10f20bc8c1647acf68f1ead5fa19c35959f03 kbandwidth-1.0.4-r1.ebuild 764
+SHA256 1179681bc658c1f1bb4f9f729b62cb3630243c04d0b8d87e454dd232ed5e0316 kbandwidth-1.0.4-r1.ebuild 764
 EBUILD kbandwidth-1.0.4.ebuild 566 RMD160 db4f23762135b03a4ef0799d8f84f275a49a3ac4 SHA1 1a54212583c58573ba50a2729b3abd13f05a450d SHA256 7694f721b6ea5cd7e68e9af2009f98d01e627c0142ab47e1f80569cc61d60c30
 MD5 077f9bfce20bb9ca7dcf5774e51f9c80 kbandwidth-1.0.4.ebuild 566
 RMD160 db4f23762135b03a4ef0799d8f84f275a49a3ac4 kbandwidth-1.0.4.ebuild 566
 SHA256 7694f721b6ea5cd7e68e9af2009f98d01e627c0142ab47e1f80569cc61d60c30 kbandwidth-1.0.4.ebuild 566
-MISC ChangeLog 1238 RMD160 2addcc56868b9a9f5246e74b9f1fb5d5cf8a561e SHA1 295c559c09d5bc884cef2d6f26e290dca971784b SHA256 97c385846d85433aa49090267b710f61c53d8215b7879b03406d2b82eb2fbbec
-MD5 99b6e2f94e30c4f652fc49c18e7a4972 ChangeLog 1238
-RMD160 2addcc56868b9a9f5246e74b9f1fb5d5cf8a561e ChangeLog 1238
-SHA256 97c385846d85433aa49090267b710f61c53d8215b7879b03406d2b82eb2fbbec ChangeLog 1238
+MISC ChangeLog 1489 RMD160 8a7707af78d824599e895626e198307e2a84960d SHA1 443560f7a944a284797287b9346edbd1df22a6a6 SHA256 991c1036364095d2832261809b9c00c2d23fe597ed17c039dfa0f63b104f6240
+MD5 0e4e01fdcb0f04e1208d6bbe615d8db5 ChangeLog 1489
+RMD160 8a7707af78d824599e895626e198307e2a84960d ChangeLog 1489
+SHA256 991c1036364095d2832261809b9c00c2d23fe597ed17c039dfa0f63b104f6240 ChangeLog 1489
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156
-MD5 7e611465d9dd6a30139e174eb8704b80 files/digest-kbandwidth-1.0.2 250
-RMD160 bf898e5d1fb1ebf55b895302052b408a3cca0c7d files/digest-kbandwidth-1.0.2 250
-SHA256 c08b5daa8de7a849451616bd6c3d766a29bcaf4acfe42b4c6d16105a9a0edad9 files/digest-kbandwidth-1.0.2 250
-MD5 380a7730e862f083c528e2fc6da52ea2 files/digest-kbandwidth-1.0.3 250
-RMD160 bf1f4cea97b56144f5a3ea00ca4e6a795b2736eb files/digest-kbandwidth-1.0.3 250
-SHA256 9cd60525175ee144d884c9eb14254e51bb2c23bd349ffa55fa8fbc071c11b62f files/digest-kbandwidth-1.0.3 250
 MD5 a280838f6b21c040fe78d8a5fa342c86 files/digest-kbandwidth-1.0.4 250
 RMD160 de1834b0c3983baba7cc67de4510dfb2f1075ec3 files/digest-kbandwidth-1.0.4 250
 SHA256 36fd81bce71487539286e910ab2ee74f7a4daacf8ceb02333fcc5d9efd98aa0b files/digest-kbandwidth-1.0.4 250
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHC5q+KhnDs22gwa8RAv58AJ0QAsy4VpkCtMBoGZ6gOJrz7Ud4mgCffN+b
-dHQagjSKpCoqg5brH9SlktY=
-=6fjV
------END PGP SIGNATURE-----
+MD5 a280838f6b21c040fe78d8a5fa342c86 files/digest-kbandwidth-1.0.4-r1 250
+RMD160 de1834b0c3983baba7cc67de4510dfb2f1075ec3 files/digest-kbandwidth-1.0.4-r1 250
+SHA256 36fd81bce71487539286e910ab2ee74f7a4daacf8ceb02333fcc5d9efd98aa0b files/digest-kbandwidth-1.0.4-r1 250
diff --git a/net-misc/kbandwidth/files/digest-kbandwidth-1.0.2 b/net-misc/kbandwidth/files/digest-kbandwidth-1.0.2
deleted file mode 100644
index 2091fa164856..000000000000
--- a/net-misc/kbandwidth/files/digest-kbandwidth-1.0.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b3f7cfc1cbecfde8342276476dac16fe kbandwidth-1.0.2.tar.gz 690185
-RMD160 d9a99c5b09fec8087e1221c0e02ca1b72f1a78eb kbandwidth-1.0.2.tar.gz 690185
-SHA256 d13fb23c3fc688d625479509127a664e169396e4ed8e20672e5b2f342ad402d5 kbandwidth-1.0.2.tar.gz 690185
diff --git a/net-misc/kbandwidth/files/digest-kbandwidth-1.0.3 b/net-misc/kbandwidth/files/digest-kbandwidth-1.0.3
deleted file mode 100644
index b50dd0c48d04..000000000000
--- a/net-misc/kbandwidth/files/digest-kbandwidth-1.0.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6d9623517dadc17b5a800be60df38bdc kbandwidth-1.0.3.tar.gz 762883
-RMD160 58b0210dcb06166fcc3f7dfa5a7a2b712bd333c0 kbandwidth-1.0.3.tar.gz 762883
-SHA256 66662df6101326d440df882d813f78c862a894a44c29ac007fb70b6e3ecb6835 kbandwidth-1.0.3.tar.gz 762883
diff --git a/net-misc/kbandwidth/files/digest-kbandwidth-1.0.4-r1 b/net-misc/kbandwidth/files/digest-kbandwidth-1.0.4-r1
new file mode 100644
index 000000000000..4062f43699df
--- /dev/null
+++ b/net-misc/kbandwidth/files/digest-kbandwidth-1.0.4-r1
@@ -0,0 +1,3 @@
+MD5 112f915fa802bda7d23d4be160dc8a83 kbandwidth-1.0.4.tar.gz 611681
+RMD160 cae8123a383f8009e688678fa0a3f96af4deb86f kbandwidth-1.0.4.tar.gz 611681
+SHA256 8d4810f767b5f352ff71a8a25629ed9e466d1f4d8517901f6f23ba0ac55b5e54 kbandwidth-1.0.4.tar.gz 611681
diff --git a/net-misc/kbandwidth/kbandwidth-1.0.2.ebuild b/net-misc/kbandwidth/kbandwidth-1.0.2.ebuild
deleted file mode 100644
index 2e992b70e645..000000000000
--- a/net-misc/kbandwidth/kbandwidth-1.0.2.ebuild
+++ /dev/null
@@ -1,15 +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/kbandwidth/kbandwidth-1.0.2.ebuild,v 1.2 2007/07/12 02:52:15 mr_bones_ Exp $
-
-inherit kde
-need-kde 3
-
-DESCRIPTION="Network monitoring Kicker-applet for KDE 3.x"
-HOMEPAGE="http://www.kde-apps.org/content/show.php?content=18939"
-SRC_URI="http://people.freenet.de/stealth/kbandwidth/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~sparc ~amd64 ~ppc ~alpha"
-IUSE=""
diff --git a/net-misc/kbandwidth/kbandwidth-1.0.3.ebuild b/net-misc/kbandwidth/kbandwidth-1.0.3.ebuild
deleted file mode 100644
index f0ec4d9e0ab0..000000000000
--- a/net-misc/kbandwidth/kbandwidth-1.0.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/kbandwidth/kbandwidth-1.0.3.ebuild,v 1.3 2005/09/16 03:07:16 agriffis Exp $
-
-inherit kde
-need-kde 3
-
-DESCRIPTION="Network monitoring Kicker-applet for KDE 3.x"
-HOMEPAGE="http://www.kde-apps.org/content/show.php?content=18939"
-SRC_URI="http://people.freenet.de/stealth/kbandwidth/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha ~amd64 ~ppc ~sparc x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}
diff --git a/net-misc/kbandwidth/kbandwidth-1.0.4-r1.ebuild b/net-misc/kbandwidth/kbandwidth-1.0.4-r1.ebuild
new file mode 100644
index 000000000000..349befbb2059
--- /dev/null
+++ b/net-misc/kbandwidth/kbandwidth-1.0.4-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/kbandwidth/kbandwidth-1.0.4-r1.ebuild,v 1.1 2007/12/16 23:08:39 philantrop Exp $
+
+inherit kde
+
+DESCRIPTION="Network monitoring Kicker-applet for KDE 3.x"
+HOMEPAGE="http://www.kde-apps.org/content/show.php?content=18939"
+SRC_URI="http://people.freenet.de/stealth/kbandwidth/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="|| ( kde-base/kdebase kde-base/kicker )"
+
+need-kde 3.5
+
+src_unpack() {
+	kde_src_unpack
+
+	# Fixes bug 202388. Upstream is dead so this hack will have to suffice.
+	sed -i -e 's:p\.begin://p.begin:' "${S}"/src/fenster.cpp || die "sed failed"
+}