summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2012-11-07 16:56:04 +0000
committerJeroen Roovers <jer@gentoo.org>2012-11-07 16:56:04 +0000
commitd828833640b3efbd67d79f8a04c87001e289178e (patch)
treea5e0c5a3aa30601c8275385803eb6a4cd31248f5 /net-analyzer/cbm
parentadd patch from Julian Ospald to link with gold linker (bug #435826) (diff)
downloadgentoo-2-d828833640b3efbd67d79f8a04c87001e289178e.tar.gz
gentoo-2-d828833640b3efbd67d79f8a04c87001e289178e.tar.bz2
gentoo-2-d828833640b3efbd67d79f8a04c87001e289178e.zip
Clean up patches.
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'net-analyzer/cbm')
-rw-r--r--net-analyzer/cbm/ChangeLog6
-rw-r--r--net-analyzer/cbm/files/cbm-gcc-4.3.patch4
-rw-r--r--net-analyzer/cbm/files/cbm-gcc-4.7.patch4
3 files changed, 9 insertions, 5 deletions
diff --git a/net-analyzer/cbm/ChangeLog b/net-analyzer/cbm/ChangeLog
index c69b4b6f2682..0996ce561d50 100644
--- a/net-analyzer/cbm/ChangeLog
+++ b/net-analyzer/cbm/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-analyzer/cbm
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cbm/ChangeLog,v 1.2 2012/11/03 08:41:23 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cbm/ChangeLog,v 1.3 2012/11/07 16:56:04 jer Exp $
+
+ 07 Nov 2012; Jeroen Roovers <jer@gentoo.org> files/cbm-gcc-4.3.patch,
+ files/cbm-gcc-4.7.patch:
+ Clean up patches.
03 Nov 2012; Sergey Popov <pinkbyte@gentoo.org> cbm-0.1.ebuild,
+files/cbm-gcc-4.7.patch:
diff --git a/net-analyzer/cbm/files/cbm-gcc-4.3.patch b/net-analyzer/cbm/files/cbm-gcc-4.3.patch
index e0399db76b67..ae9b58f6e99b 100644
--- a/net-analyzer/cbm/files/cbm-gcc-4.3.patch
+++ b/net-analyzer/cbm/files/cbm-gcc-4.3.patch
@@ -1,5 +1,5 @@
---- src/statistics.hpp.orig 2008-11-07 19:09:29.000000000 +0100
-+++ src/statistics.hpp 2008-11-07 19:09:45.000000000 +0100
+--- a/src/statistics.hpp
++++ b/src/statistics.hpp
@@ -3,6 +3,7 @@
#include <list>
diff --git a/net-analyzer/cbm/files/cbm-gcc-4.7.patch b/net-analyzer/cbm/files/cbm-gcc-4.7.patch
index 8f3acbed9819..94b50a6877f7 100644
--- a/net-analyzer/cbm/files/cbm-gcc-4.7.patch
+++ b/net-analyzer/cbm/files/cbm-gcc-4.7.patch
@@ -1,5 +1,5 @@
---- src/cbm.cpp.orig 2012-11-03 12:36:00.305615930 +0400
-+++ src/cbm.cpp 2012-11-03 12:36:10.920615253 +0400
+--- a/src/cbm.cpp
++++ b/src/cbm.cpp
@@ -18,6 +18,7 @@
#include <sys/socket.h>
#include <arpa/inet.h>