Fix build with --as-needed

(Portage version: 2.1.2-r2)

4 files changed, 55 insertions, 2 deletions

diff --git a/dev-libs/tvision/ChangeLog b/dev-libs/tvision/ChangeLog
index 99250f9f33bc..9496948aa764 100644
--- a/dev-libs/tvision/ChangeLog
+++ b/dev-libs/tvision/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/tvision
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tvision/ChangeLog,v 1.17 2007/01/12 15:37:32 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tvision/ChangeLog,v 1.18 2007/01/23 16:03:49 truedfx Exp $
+
+*tvision-2.1.0_pre2-r1 (23 Jan 2007)
+
+  23 Jan 2007; Harald van Dijk <truedfx@gentoo.org>
+  +files/tvision-2.1.0_pre2-asneeded.patch, -tvision-2.1.0_pre2.ebuild,
+  +tvision-2.1.0_pre2-r1.ebuild:
+  Fix building with --as-needed flag
 
 *tvision-2.1.0_pre2 (12 Jan 2007)
 
diff --git a/dev-libs/tvision/files/digest-tvision-2.1.0_pre2 b/dev-libs/tvision/files/digest-tvision-2.1.0_pre2-r1
index c78d52745067..c78d52745067 100644
--- a/dev-libs/tvision/files/digest-tvision-2.1.0_pre2
+++ b/dev-libs/tvision/files/digest-tvision-2.1.0_pre2-r1
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-asneeded.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-asneeded.patch
new file mode 100644
index 000000000000..bc8474a83a77
--- /dev/null
+++ b/dev-libs/tvision/files/tvision-2.1.0_pre2-asneeded.patch
@@ -0,0 +1,45 @@
+--- tvision/config.pl
++++ tvision/config.pl
+@@ -206,6 +206,7 @@
+   }
+ # Flags to link as a dynamic lib
+ $MakeDefsRHIDE[6]='RHIDE_LDFLAGS=';
++$MakeDefsRHIDE[7]='RHIDE_LIBS=';
+ if ($OS eq 'UNIX')
+   {
+    if ($OSf ne 'Darwin')
+@@ -229,15 +230,15 @@
+      }
+    $libs=$conf{'X11Lib'};
+    $libs=~s/(\S+)/-l$1/g;
+-   $MakeDefsRHIDE[6].=" -L".$conf{'X11LibPath'}." $libs" if @conf{'HAVE_X11'} eq 'yes';
++   $MakeDefsRHIDE[7].=" -L".$conf{'X11LibPath'}." $libs" if @conf{'HAVE_X11'} eq 'yes';
+-   $MakeDefsRHIDE[6].=' -lgpm' if @conf{'HAVE_GPM'} eq 'yes';
++   $MakeDefsRHIDE[7].=' -lgpm' if @conf{'HAVE_GPM'} eq 'yes';
+-   $MakeDefsRHIDE[6].=(($OSf eq 'QNXRtP') ? ' -lncursesS' : ' -lncurses') unless $conf{'ncurses'} eq 'no';
++   $MakeDefsRHIDE[7].=(($OSf eq 'QNXRtP') ? ' -lncursesS' : ' -lncurses') unless $conf{'ncurses'} eq 'no';
+-   $MakeDefsRHIDE[6].=" $stdcxx -lm -lc";
++   $MakeDefsRHIDE[7].=" $stdcxx -lm -lc";
+-   $MakeDefsRHIDE[6].=' -lpthread' if $conf{'HAVE_LINUX_PTHREAD'} eq 'yes';
++   $MakeDefsRHIDE[7].=' -lpthread' if $conf{'HAVE_LINUX_PTHREAD'} eq 'yes';
+-   $MakeDefsRHIDE[6].=' libtvfintl.a' if ($OSf eq 'Darwin') && $UseDummyIntl;
++   $MakeDefsRHIDE[7].=' libtvfintl.a' if ($OSf eq 'Darwin') && $UseDummyIntl;
+   }
+-$MakeDefsRHIDE[7]="LIB_VER=$Version";
++$MakeDefsRHIDE[8]="LIB_VER=$Version";
+-$MakeDefsRHIDE[8]="LIB_VER_MAJOR=$VersionMajor";
++$MakeDefsRHIDE[9]="LIB_VER_MAJOR=$VersionMajor";
+ 
+ ModifyMakefiles('intl/dummy/Makefile');
+ CreateRHIDEenvs('examples/rhide.env','makes/rhide.env','compat/rhide.env');
+--- tvision/makes/common.imk
++++ tvision/makes/common.imk
+@@ -54,7 +54,7 @@
+ C_EXTRA_FLAGS=$(SHARED_CODE_OPTION)
+ RHIDE_COMPILE_ARCHIVE=$(RHIDE_LD) $(RHIDE_LIBDIRS) $(LDFLAGS) \
+ 	$(RHIDE_LDFLAGS) $(C_EXTRA_FLAGS) -o $(OUTFILE)  \
+-	$(OBJFILES)
++	$(OBJFILES) $(RHIDE_LIBS)
+ else
+ RHIDE_COMPILE_ARCHIVE=$(RHIDE_AR) $(RHIDE_ARFLAGS) $(OUTFILE)\
+ 	$(ALL_PREREQ)
diff --git a/dev-libs/tvision/tvision-2.1.0_pre2.ebuild b/dev-libs/tvision/tvision-2.1.0_pre2-r1.ebuild
index 15c5f306c180..e21305c240e5 100644
--- a/dev-libs/tvision/tvision-2.1.0_pre2.ebuild
+++ b/dev-libs/tvision/tvision-2.1.0_pre2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tvision/tvision-2.1.0_pre2.ebuild,v 1.1 2007/01/12 15:37:32 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tvision/tvision-2.1.0_pre2-r1.ebuild,v 1.1 2007/01/23 16:03:49 truedfx Exp $
 
 inherit eutils multilib
 
@@ -21,6 +21,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-gcc41.patch
 	epatch "${FILESDIR}"/${P}-outb.patch
 	epatch "${FILESDIR}"/${P}-underflow.patch
+	epatch "${FILESDIR}"/${P}-asneeded.patch
 }
 
 src_compile() {