diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2010-10-27 13:43:37 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-10-27 13:43:37 +0000 |
commit | dc4d1e7871c4e9c2b3d12cd3316f0168e25bc7a8 (patch) | |
tree | 0c14b841a92286d635babe71cbef3cbe54b05c82 | |
parent | Cleanup vulnerable versions (diff) | |
download | gentoo-2-dc4d1e7871c4e9c2b3d12cd3316f0168e25bc7a8.tar.gz gentoo-2-dc4d1e7871c4e9c2b3d12cd3316f0168e25bc7a8.tar.bz2 gentoo-2-dc4d1e7871c4e9c2b3d12cd3316f0168e25bc7a8.zip |
Fix install with recent automake and coreutils wrt #330047 by Diego E. 'Flameeyes' Pettenò.
(Portage version: 2.2.0_alpha1/cvs/Linux x86_64)
-rw-r--r-- | net-analyzer/fe3d/ChangeLog | 7 | ||||
-rw-r--r-- | net-analyzer/fe3d/fe3d-0.11.2.ebuild | 5 | ||||
-rw-r--r-- | net-analyzer/fe3d/files/fe3d-0.11.2-coreutils.patch | 12 |
3 files changed, 21 insertions, 3 deletions
diff --git a/net-analyzer/fe3d/ChangeLog b/net-analyzer/fe3d/ChangeLog index 6f5a940974ec..d7780730c662 100644 --- a/net-analyzer/fe3d/ChangeLog +++ b/net-analyzer/fe3d/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-analyzer/fe3d # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fe3d/ChangeLog,v 1.11 2010/06/29 15:05:59 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fe3d/ChangeLog,v 1.12 2010/10/27 13:43:37 ssuominen Exp $ + + 27 Oct 2010; Samuli Suominen <ssuominen@gentoo.org> fe3d-0.11.2.ebuild, + +files/fe3d-0.11.2-coreutils.patch: + Fix install with recent automake and coreutils wrt #330047 by Diego E. + 'Flameeyes' Pettenò. 29 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> fe3d-0.11.2.ebuild, +files/fe3d-0.11.2-asneeded.patch: diff --git a/net-analyzer/fe3d/fe3d-0.11.2.ebuild b/net-analyzer/fe3d/fe3d-0.11.2.ebuild index b345a459f930..0de5012cdf7b 100644 --- a/net-analyzer/fe3d/fe3d-0.11.2.ebuild +++ b/net-analyzer/fe3d/fe3d-0.11.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fe3d/fe3d-0.11.2.ebuild,v 1.3 2010/06/29 15:06:47 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fe3d/fe3d-0.11.2.ebuild,v 1.4 2010/10/27 13:43:37 ssuominen Exp $ EAPI=2 WX_GTK_VER="2.8" @@ -35,7 +35,8 @@ pkg_setup() { } src_prepare() { - epatch "${FILESDIR}"/${P}-asneeded.patch + epatch "${FILESDIR}"/${P}-asneeded.patch \ + "${FILESDIR}"/${P}-coreutils.patch eautoreconf } diff --git a/net-analyzer/fe3d/files/fe3d-0.11.2-coreutils.patch b/net-analyzer/fe3d/files/fe3d-0.11.2-coreutils.patch new file mode 100644 index 000000000000..bcc0db6893e1 --- /dev/null +++ b/net-analyzer/fe3d/files/fe3d-0.11.2-coreutils.patch @@ -0,0 +1,12 @@ +http://bugs.gentoo.org/330047 + +--- src/Makefile.am ++++ src/Makefile.am +@@ -5,5 +5,5 @@ + + fe3ddir = @datadir@/@PACKAGE@ + fe3d_imgdir = @datadir@/@PACKAGE@/img +-fe3d_DATA = $(top_srcdir)/data/* +-fe3d_img_DATA = $(top_srcdir)/data/img/* ++fe3d_DATA = $(top_srcdir)/data/*.xml ++fe3d_img_DATA = $(top_srcdir)/data/img/*.png |