summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-10-27 13:43:37 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-10-27 13:43:37 +0000
commit37e7bef022b4dd0a91dba239de8a8c954e14fdd2 (patch)
treefce5686f491a0bd957f0ac9a1894a2b3317cfb9f
parentCleanup vulnerable versions (diff)
downloadhistorical-37e7bef022b4dd0a91dba239de8a8c954e14fdd2.tar.gz
historical-37e7bef022b4dd0a91dba239de8a8c954e14fdd2.tar.bz2
historical-37e7bef022b4dd0a91dba239de8a8c954e14fdd2.zip
Fix install with recent automake and coreutils wrt #330047 by Diego E. 'Flameeyes' Pettenò.
Package-Manager: portage-2.2.0_alpha1/cvs/Linux x86_64
-rw-r--r--net-analyzer/fe3d/ChangeLog7
-rw-r--r--net-analyzer/fe3d/Manifest5
-rw-r--r--net-analyzer/fe3d/fe3d-0.11.2.ebuild5
-rw-r--r--net-analyzer/fe3d/files/fe3d-0.11.2-coreutils.patch12
4 files changed, 24 insertions, 5 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/Manifest b/net-analyzer/fe3d/Manifest
index 5f9d6a87b659..46557a2b1c64 100644
--- a/net-analyzer/fe3d/Manifest
+++ b/net-analyzer/fe3d/Manifest
@@ -1,7 +1,8 @@
AUX fe3d-0.11.2-asneeded.patch 1440 RMD160 abafa6cd9c8b4c3e5646b0765512ea53cb870464 SHA1 ea5a999a2ec80037ec1e56adaebd8c3ce03c3bb3 SHA256 2e509aa790fa522d57fbc2aaf8d3ea90b553b9a965a682771a14ee2ffa52c984
+AUX fe3d-0.11.2-coreutils.patch 324 RMD160 7d8d07ca3de6831aac840722f1c151ae62ec0d00 SHA1 3f281fe3f40e451759d6c264708aa26cd8b90d9a SHA256 88d438498e68835d2aa67a1b81819350781ff44ca63a3c1b26d9e8d5530fe92b
DIST fe3d-0.8-3.src.zip 1082108 RMD160 eadcc8c7c79472b1795b42c93f99a1fde86d83cb SHA1 fc0b3d3ce443e9547f12599f4dcb46c94eb7eb13 SHA256 66eac0719a6c17245e3db20978d11c325c88f3ea72b38d73309a41e4df87e624
DIST fe3d_0.11.2-src.tar.bz2 322740 RMD160 19ffe8750d6b1ced0091392b1aa315046c268ea2 SHA1 12d9364c900f8721efc7830b474f3612d52de855 SHA256 8aef228d72c17d9dc060de15c751abbf12e1445f938f27c50cd33cb43d76d833
-EBUILD fe3d-0.11.2.ebuild 1428 RMD160 55aca0d626d798856997e307e0881e8b7bb8a761 SHA1 0077bdbbb03ebd822c4f258950bd128e72a20753 SHA256 2b804e705e7816cf5df87e1bca6f0e7814a4d87a4eddb850997a4c6973d6517c
+EBUILD fe3d-0.11.2.ebuild 1467 RMD160 319e38983714f882eec22b8129e6fdb075ab7349 SHA1 c814aa2dabec2fd682cc0ad67fd4cf021fa888ee SHA256 2b511d5a44dd70c2e75fd9b1ab72c4963fe2af98db4b7bb9a2ab4ddad55e4bb8
EBUILD fe3d-0.8.3.ebuild 1215 RMD160 4d05ecb754331cb4e5498192573972511cb2aac5 SHA1 cf7639cc68783bc014b2124b961f349b33609b2e SHA256 1d3fba18afa6f958f9164dc34f9c68a90908a1e06abaf561f691b4487b5d332b
-MISC ChangeLog 1756 RMD160 649398d9e9ebfa44d80027277f96167359fcd019 SHA1 cc73e939e4f8510da866451df7b1ee336a547eec SHA256 1e2aaa525394d4ac162cf21d16d3820553c9a5049d6a28fcb02fab320426f9f8
+MISC ChangeLog 1966 RMD160 0b1092c293471eaeabbe885b43f8597d2115bc9a SHA1 cd3100e231854acf6d89db64173fc2890126bfc1 SHA256 8645f2c7ed8186b559ad17dcd69bcaf84916e80bc3ad1673638c37468115b294
MISC metadata.xml 257 RMD160 31a33f71ad088fc55f06494ce46f4278383bb012 SHA1 909146c787ae6f940d598fa431d6d3c2dbcbf594 SHA256 1cfcb15424f420e1604498f361a397b5f45a29da83a51808a6a0c14a9cabe219
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