summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2015-04-03 05:44:07 +0000
committerJeroen Roovers <jer@gentoo.org>2015-04-03 05:44:07 +0000
commitb2bc215b20217cf405b88e0f143ba6b9269334b5 (patch)
tree30a5d02146f80ac64855720a4e2ea8d2e2626e0a /net-analyzer
parentSplit parallel build patch up a bit to match how they've been sent upstream. (diff)
downloadgentoo-2-b2bc215b20217cf405b88e0f143ba6b9269334b5.tar.gz
gentoo-2-b2bc215b20217cf405b88e0f143ba6b9269334b5.tar.bz2
gentoo-2-b2bc215b20217cf405b88e0f143ba6b9269334b5.zip
Clean up patches.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/fe3d/ChangeLog6
-rw-r--r--net-analyzer/fe3d/files/fe3d-0.11.2-asneeded.patch8
-rw-r--r--net-analyzer/fe3d/files/fe3d-0.11.2-coreutils.patch4
3 files changed, 11 insertions, 7 deletions
diff --git a/net-analyzer/fe3d/ChangeLog b/net-analyzer/fe3d/ChangeLog
index 8db2c4a02d18..faed739a3541 100644
--- a/net-analyzer/fe3d/ChangeLog
+++ b/net-analyzer/fe3d/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-analyzer/fe3d
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fe3d/ChangeLog,v 1.17 2015/04/03 05:42:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fe3d/ChangeLog,v 1.18 2015/04/03 05:44:07 jer Exp $
+
+ 03 Apr 2015; Jeroen Roovers <jer@gentoo.org>
+ files/fe3d-0.11.2-asneeded.patch, files/fe3d-0.11.2-coreutils.patch:
+ Clean up patches.
03 Apr 2015; Jeroen Roovers <jer@gentoo.org> fe3d-0.11.2.ebuild:
Use wxwidgets.eclass (bug #544992 by Toralf Förster).
diff --git a/net-analyzer/fe3d/files/fe3d-0.11.2-asneeded.patch b/net-analyzer/fe3d/files/fe3d-0.11.2-asneeded.patch
index 5399da4b8e97..63d475194162 100644
--- a/net-analyzer/fe3d/files/fe3d-0.11.2-asneeded.patch
+++ b/net-analyzer/fe3d/files/fe3d-0.11.2-asneeded.patch
@@ -1,5 +1,5 @@
---- configure.ac
-+++ configure.ac
+--- a/configure.ac
++++ b/configure.ac
@@ -46,16 +46,15 @@
])
fi
@@ -22,8 +22,8 @@
AC_OUTPUT
---- src/Makefile.am
-+++ src/Makefile.am
+--- a/src/Makefile.am
++++ b/src/Makefile.am
@@ -1,8 +1,10 @@
-fe3d_CPPFLAGS = -DFE_DATA_DIR="\"@datadir@/@PACKAGE@/\""
+fe3d_CPPFLAGS = -DFE_DATA_DIR="\"@datadir@/@PACKAGE@/\"" @WX_CPPFLAGS@
diff --git a/net-analyzer/fe3d/files/fe3d-0.11.2-coreutils.patch b/net-analyzer/fe3d/files/fe3d-0.11.2-coreutils.patch
index bcc0db6893e1..547d86fb5cab 100644
--- a/net-analyzer/fe3d/files/fe3d-0.11.2-coreutils.patch
+++ b/net-analyzer/fe3d/files/fe3d-0.11.2-coreutils.patch
@@ -1,7 +1,7 @@
http://bugs.gentoo.org/330047
---- src/Makefile.am
-+++ src/Makefile.am
+--- a/src/Makefile.am
++++ b/src/Makefile.am
@@ -5,5 +5,5 @@
fe3ddir = @datadir@/@PACKAGE@