Fix building with -Wl,--as-needed wrt #277794 by Kacper Kowalik.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 56 insertions, 7 deletions

diff --git a/net-analyzer/fe3d/ChangeLog b/net-analyzer/fe3d/ChangeLog
index 62fd703490c2..6f5a940974ec 100644
--- a/net-analyzer/fe3d/ChangeLog
+++ b/net-analyzer/fe3d/ChangeLog
@@ -1,6 +1,10 @@
 # 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.10 2010/03/01 13:37:47 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fe3d/ChangeLog,v 1.11 2010/06/29 15:05:59 ssuominen Exp $
+
+  29 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> fe3d-0.11.2.ebuild,
+  +files/fe3d-0.11.2-asneeded.patch:
+  Fix building with -Wl,--as-needed wrt #277794 by Kacper Kowalik.
 
 *fe3d-0.11.2 (01 Mar 2010)
 
diff --git a/net-analyzer/fe3d/Manifest b/net-analyzer/fe3d/Manifest
index d1002bb52d59..f28af5462591 100644
--- a/net-analyzer/fe3d/Manifest
+++ b/net-analyzer/fe3d/Manifest
@@ -1,6 +1,7 @@
+AUX fe3d-0.11.2-asneeded.patch 1440 RMD160 abafa6cd9c8b4c3e5646b0765512ea53cb870464 SHA1 ea5a999a2ec80037ec1e56adaebd8c3ce03c3bb3 SHA256 2e509aa790fa522d57fbc2aaf8d3ea90b553b9a965a682771a14ee2ffa52c984
 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 1365 RMD160 fc9079e0750867ee0c2043dd2926beaf8a49809b SHA1 f2b9af89a1aeb442df2bb827e3536c6c3baa7d66 SHA256 642df318b724688b571d7bda0e2c68410162a897800611e1a00a127c8c6b679c
+EBUILD fe3d-0.11.2.ebuild 1430 RMD160 93a1f8d2851e00f0d67f87442314113e8d5ec502 SHA1 61ff6d5350c631adb6ed2c4069a8dfba960f3dcf SHA256 a53c53fc6c89c6ead5b3523b48f5ad23b87076bde8bb77a16cd6b922bb0d4df9
 EBUILD fe3d-0.8.3.ebuild 1215 RMD160 4d05ecb754331cb4e5498192573972511cb2aac5 SHA1 cf7639cc68783bc014b2124b961f349b33609b2e SHA256 1d3fba18afa6f958f9164dc34f9c68a90908a1e06abaf561f691b4487b5d332b
-MISC ChangeLog 1575 RMD160 dc39782663db63b08b94dea7b38b4088d5b38607 SHA1 deac35565789a334071175fb96c52a8da151c51b SHA256 b807836542ec0e94970e62856fc06345879090d06a1d9ab25c34bf1ea6a3fa14
+MISC ChangeLog 1756 RMD160 649398d9e9ebfa44d80027277f96167359fcd019 SHA1 cc73e939e4f8510da866451df7b1ee336a547eec SHA256 1e2aaa525394d4ac162cf21d16d3820553c9a5049d6a28fcb02fab320426f9f8
 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 6d6b0745f87c..536135ca505e 100644
--- a/net-analyzer/fe3d/fe3d-0.11.2.ebuild
+++ b/net-analyzer/fe3d/fe3d-0.11.2.ebuild
@@ -1,10 +1,10 @@
 # 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.1 2010/03/01 13:37:47 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fe3d/fe3d-0.11.2.ebuild,v 1.2 2010/06/29 15:05:59 ssuominen Exp $
 
-EAPI=1
+EAPI=2
 WX_GTK_VER="2.8"
-inherit eutils wxwidgets
+inherit autotools eutils wxwidgets
 
 if [[ "${PV}" =~ (_p)([0-9]+) ]] ; then
 	inherit subversion
@@ -34,8 +34,13 @@ pkg_setup() {
 	check_wxuse opengl
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+	eautoreconf
+}
+
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS doc/{ChangeLog,README}.txt
 }
 
diff --git a/net-analyzer/fe3d/files/fe3d-0.11.2-asneeded.patch b/net-analyzer/fe3d/files/fe3d-0.11.2-asneeded.patch
new file mode 100644
index 000000000000..5399da4b8e97
--- /dev/null
+++ b/net-analyzer/fe3d/files/fe3d-0.11.2-asneeded.patch
@@ -0,0 +1,39 @@
+--- configure.ac
++++ configure.ac
+@@ -46,16 +46,15 @@
+ 		])
+ fi
+ 
+-CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
+-CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
+-CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
+-LIBS="$LIBS $WX_LIBS"
++#CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
++#CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
++#CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
++#LIBS="$LIBS $WX_LIBS"
+ 
+ AM_CPPFLAGS="$AM_CPPFLAGS $GL_CFLAGS $GLU_CFLAGS"
+-AM_LDFLAGS="$AM_LDFLAGS $GL_LIBS $GLU_LIBS"
+ AC_SUBST([AM_CPPFLAGS])
+ AC_SUBST([AM_LDFLAGS])
+-AC_SUBST([$PREFIX])
++#AC_SUBST([$PREFIX])
+ 
+ AC_OUTPUT
+ 
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -1,8 +1,10 @@
+-fe3d_CPPFLAGS	= -DFE_DATA_DIR="\"@datadir@/@PACKAGE@/\""
++fe3d_CPPFLAGS	= -DFE_DATA_DIR="\"@datadir@/@PACKAGE@/\"" @WX_CPPFLAGS@
+ INCLUDES		= -I$(top_srcdir)/include -I$(top_srcdir)/src/include
+ bin_PROGRAMS	= fe3d
+ fe3d_SOURCES	= fe_config.cpp fe_core.cpp  fe_draw.cpp fe_events.cpp fe_host.cpp fe_hosts.cpp fe_match.cpp fe_node.cpp fe_os_rgx.cpp fe_port.cpp fe_root_node.cpp fe_tools.cpp geo_cache.cpp gl_util.cpp libfe3d.cpp nmap_parser.cpp tex_cache.cpp wxfe3d_app.cpp wxfe3d_frame.cpp wxfe3d_glcanvas.cpp ui_nmap_ctrl.cpp ./gui/fe3d_ui.cpp ./regexp/Matcher.cpp ./regexp/Pattern.cpp ./regexp/WCMatcher.cpp ./regexp/WCPattern.cpp
+-
++fe3d_CFLAGS 	= @WX_CFLAGS@
++fe3d_CXXFLAGS 	= @WX_CXXFLAGS_ONLY@
++fe3d_LDADD 	= @GLU_LIBS@ @WX_LIBS@
+ fe3ddir		= @datadir@/@PACKAGE@
+ fe3d_imgdir  	= @datadir@/@PACKAGE@/img
+ fe3d_DATA	= $(top_srcdir)/data/*