summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcelo Góes <vanquirius@gentoo.org>2005-09-09 21:10:21 +0000
committerMarcelo Góes <vanquirius@gentoo.org>2005-09-09 21:10:21 +0000
commit630ca11d0c01dd07f44daf4cb08a9af4c76cdf82 (patch)
treec042bbb4ce6bb65bfe5f2d5eb705c06ab1ae483e /net-analyzer
parentKeywording stable x86; Keywording stable ppc (anything older than dev-lisp/sb... (diff)
downloadhistorical-630ca11d0c01dd07f44daf4cb08a9af4c76cdf82.tar.gz
historical-630ca11d0c01dd07f44daf4cb08a9af4c76cdf82.tar.bz2
historical-630ca11d0c01dd07f44daf4cb08a9af4c76cdf82.zip
gcc4 patch, bug 105343
Package-Manager: portage-2.0.51.22-r2
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/bmon/ChangeLog7
-rw-r--r--net-analyzer/bmon/Manifest5
-rw-r--r--net-analyzer/bmon/bmon-2.1.0-r1.ebuild4
-rw-r--r--net-analyzer/bmon/files/bmon-2.1.0-gcc4.diff22
4 files changed, 34 insertions, 4 deletions
diff --git a/net-analyzer/bmon/ChangeLog b/net-analyzer/bmon/ChangeLog
index d069fd2c5d19..a94ac7c39c20 100644
--- a/net-analyzer/bmon/ChangeLog
+++ b/net-analyzer/bmon/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-analyzer/bmon
# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/ChangeLog,v 1.19 2005/09/09 02:00:57 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/ChangeLog,v 1.20 2005/09/09 21:10:20 vanquirius Exp $
+
+ 09 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+ +files/bmon-2.1.0-gcc4.diff, bmon-2.1.0-r1.ebuild:
+ Add gcc4 patch for bug 105343. Thanks to Anatoly Kamchatnov <rev@male.ru>
+ for reporting.
*bmon-2.1.0-r1 (09 Sep 2005)
diff --git a/net-analyzer/bmon/Manifest b/net-analyzer/bmon/Manifest
index f85693b5e6e0..2ad2cc446afb 100644
--- a/net-analyzer/bmon/Manifest
+++ b/net-analyzer/bmon/Manifest
@@ -1,7 +1,8 @@
-MD5 994f6dd392bbbc07487b3b3ae922fbd3 bmon-2.1.0-r1.ebuild 1134
+MD5 e09b00435db430b777ecadc679d6fb9a bmon-2.1.0-r1.ebuild 1193
MD5 ff6ae62ffc745b5597d36133b06b6a46 bmon-2.1.0.ebuild 1071
-MD5 657c93210520f9257a25b7890bb3e4a5 ChangeLog 2325
+MD5 3d7c0035118f53c95535932d8881d967 ChangeLog 2524
MD5 5fbd67ef2e49ca1d630675f7c46fae5c metadata.xml 233
+MD5 6b5f014b7739049db269b0d04eddcb63 files/bmon-2.1.0-gcc4.diff 732
MD5 0eecf3acdb3d426c16ddfd7a398ed1a7 files/libnl-0.5.0-include.diff 364
MD5 66dfb9b26097d1b2c2e2fe8c9a5ea4c2 files/digest-bmon-2.1.0-r1 125
MD5 66dfb9b26097d1b2c2e2fe8c9a5ea4c2 files/digest-bmon-2.1.0 125
diff --git a/net-analyzer/bmon/bmon-2.1.0-r1.ebuild b/net-analyzer/bmon/bmon-2.1.0-r1.ebuild
index cb8a7fc2fa31..73b649369719 100644
--- a/net-analyzer/bmon/bmon-2.1.0-r1.ebuild
+++ b/net-analyzer/bmon/bmon-2.1.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/bmon-2.1.0-r1.ebuild,v 1.1 2005/09/09 02:00:57 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/bmon-2.1.0-r1.ebuild,v 1.2 2005/09/09 21:10:20 vanquirius Exp $
inherit toolchain-funcs eutils
@@ -20,6 +20,8 @@ DEPEND=">=sys-libs/ncurses-5.3-r2"
src_unpack() {
unpack ${A}
epatch ${FILESDIR}/libnl-${NLVER}-include.diff
+ # gcc4 fix, bug 105343
+ epatch ${FILESDIR}/${P}-gcc4.diff
sed -i -e "s:LIBNL=\":LIBNL=\"-L${WORKDIR}/libnl-${NLVER}/lib :" \
-e "s:LIBS=\"-lnl:LIBS=\"-L${WORKDIR}/libnl-${NLVER}/lib -lnl:" \
${S}/configure
diff --git a/net-analyzer/bmon/files/bmon-2.1.0-gcc4.diff b/net-analyzer/bmon/files/bmon-2.1.0-gcc4.diff
new file mode 100644
index 000000000000..433edf5090de
--- /dev/null
+++ b/net-analyzer/bmon/files/bmon-2.1.0-gcc4.diff
@@ -0,0 +1,22 @@
+--- bmon-2.1.0.orig/src/out_xml_event.c 2005-04-05 12:01:33.000000000 -0300
++++ bmon-2.1.0/src/out_xml_event.c 2005-09-09 17:56:07.000000000 -0300
+@@ -127,7 +127,7 @@
+ .om_draw = xml_event_draw,
+ .om_set_opts = xml_event_set_opts,
+ .om_probe = xml_event_probe,
+- .om_shutdown xml_event_shutdown,
++ .om_shutdown = xml_event_shutdown
+ };
+
+ static void __init xml_event_init(void)
+--- bmon-2.1.0.orig/src/out_audio.c 2005-04-05 12:01:33.000000000 -0300
++++ bmon-2.1.0/src/out_audio.c 2005-09-09 17:58:20.000000000 -0300
+@@ -141,7 +141,7 @@
+ .om_draw = audio_draw,
+ .om_set_opts = audio_set_opts,
+ .om_probe = audio_probe,
+- .om_shutdown audio_shutdown,
++ .om_shutdown = audio_shutdown
+ };
+
+ static void __init audio_init(void)