Fix build with --as-needed

Package-Manager: portage-2.1.2-r2

diff --git a/dev-libs/tvision/ChangeLog b/dev-libs/tvision/ChangeLog
index 99250f9f33bcb98cea3d8149e3f4df18c6b0751c..9496948aa76466eb266f3667f41e28fd29cef736 100644 (file)
--- 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/Manifest b/dev-libs/tvision/Manifest
index 5d18d7d34129bcc3be090bad7cce7ca696b8dc20..b0b4d83f6c5d2f9b560c6bb7b57d773364f5b603 100644 (file)
--- a/dev-libs/tvision/Manifest
+++ b/dev-libs/tvision/Manifest
@@ -5,6 +5,10 @@ AUX tvision-2.1.0_pre1-gcc41.patch 1158 RMD160 fccfc47e6eda64dcc5437d8c4c5100ad1
 MD5 e1de3b725e60b065cd198a47ebb0b477 files/tvision-2.1.0_pre1-gcc41.patch 1158
 RMD160 fccfc47e6eda64dcc5437d8c4c5100ad179fe0f3 files/tvision-2.1.0_pre1-gcc41.patch 1158
 SHA256 bd90ca3e6e0dbfa656c605f31e274d3aec03f08feb8c96428b2665c3698f9ff9 files/tvision-2.1.0_pre1-gcc41.patch 1158
+AUX tvision-2.1.0_pre2-asneeded.patch 1889 RMD160 5947a6bd6673e485fde454a89e59a5ce650466b2 SHA1 d98b6322f961494c092e93efa082df650d8eb9a4 SHA256 85e8822faa9ca14ecb05cacc0a9adc3ae8a9b7fc015858cc4b95e82e898f8383
+MD5 eece4a4d68cf7552c57182e2282a51b5 files/tvision-2.1.0_pre2-asneeded.patch 1889
+RMD160 5947a6bd6673e485fde454a89e59a5ce650466b2 files/tvision-2.1.0_pre2-asneeded.patch 1889
+SHA256 85e8822faa9ca14ecb05cacc0a9adc3ae8a9b7fc015858cc4b95e82e898f8383 files/tvision-2.1.0_pre2-asneeded.patch 1889
 AUX tvision-2.1.0_pre2-gcc41.patch 265 RMD160 019f11f30b1c05d1db25047bf57f260755562873 SHA1 20d7858ef1f78c8664db763410f1be76a728bf41 SHA256 793a9468a9dfaa6f5361c840fd251dc8b3b021af3a8d30b3c2468dc63c3d99f8
 MD5 fe70dc530bc3f0a8057dd8d33833627f files/tvision-2.1.0_pre2-gcc41.patch 265
 RMD160 019f11f30b1c05d1db25047bf57f260755562873 files/tvision-2.1.0_pre2-gcc41.patch 265
@@ -23,14 +27,14 @@ EBUILD tvision-2.1.0_pre1.ebuild 845 RMD160 287bacc551b1aea0ec8ea829f6bfc087f380
 MD5 ff87dda54b88e7e3dbbf4eb394280710 tvision-2.1.0_pre1.ebuild 845
 RMD160 287bacc551b1aea0ec8ea829f6bfc087f380a38c tvision-2.1.0_pre1.ebuild 845
 SHA256 6f1f0d88e2680dcd7e8abeece7037cda230d0e145256f6d26095792798a0fa37 tvision-2.1.0_pre1.ebuild 845
-EBUILD tvision-2.1.0_pre2.ebuild 926 RMD160 bee500c4eebcd8282e09f749a06985a84938311e SHA1 aab3729015d74b94df1a01a6a2ee14fe221d0576 SHA256 9b97c22e75b112c9d6295b152eef18aa4f4037bf60300735e5068d7199f587c5
-MD5 e7ecbda194734e67d1e25622f662cab4 tvision-2.1.0_pre2.ebuild 926
-RMD160 bee500c4eebcd8282e09f749a06985a84938311e tvision-2.1.0_pre2.ebuild 926
-SHA256 9b97c22e75b112c9d6295b152eef18aa4f4037bf60300735e5068d7199f587c5 tvision-2.1.0_pre2.ebuild 926
-MISC ChangeLog 2563 RMD160 4c4ca87060d7f6db6f1fa351d6700604b4917bf8 SHA1 2b1213c07018d1abafaa940f53fc3c2514e97050 SHA256 e5a05580e1f7e9282fb49fa70b1dddeb8fb650441722c4390289ecf00b8a823c
-MD5 ec833410d6761ec197a999b9113be64d ChangeLog 2563
-RMD160 4c4ca87060d7f6db6f1fa351d6700604b4917bf8 ChangeLog 2563
-SHA256 e5a05580e1f7e9282fb49fa70b1dddeb8fb650441722c4390289ecf00b8a823c ChangeLog 2563
+EBUILD tvision-2.1.0_pre2-r1.ebuild 971 RMD160 82e8719148589bb44eb48ee80ac37b30b27beb5a SHA1 a6a213e7284ab32b1a5c7d5f7ff117102a90a649 SHA256 dd6b7ffc49fa126d038e741893af54b376148a559b7dc1626d0f2a943fee6e50
+MD5 5d5e01fa3170084df0f11b7795d6caed tvision-2.1.0_pre2-r1.ebuild 971
+RMD160 82e8719148589bb44eb48ee80ac37b30b27beb5a tvision-2.1.0_pre2-r1.ebuild 971
+SHA256 dd6b7ffc49fa126d038e741893af54b376148a559b7dc1626d0f2a943fee6e50 tvision-2.1.0_pre2-r1.ebuild 971
+MISC ChangeLog 2796 RMD160 9dbb0f0bb142db1e570a03ac2bab77193e969785 SHA1 469815658fedf7a5a1b648ee49a1f47e16dae411 SHA256 83242198fe92ee8ca8b04fec67b13673ad2482cc3504aaed19aa2264354f78af
+MD5 c1bb390f5e32d82f3cbeb00d6f688efd ChangeLog 2796
+RMD160 9dbb0f0bb142db1e570a03ac2bab77193e969785 ChangeLog 2796
+SHA256 83242198fe92ee8ca8b04fec67b13673ad2482cc3504aaed19aa2264354f78af ChangeLog 2796
 MISC metadata.xml 210 RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 SHA1 efa00493ddec7289a21bc4cbcc6e95ec4de749d5 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39
 MD5 c667f921ee8d48ce17ebef0f8d601ea4 metadata.xml 210
 RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 metadata.xml 210
@@ -38,13 +42,13 @@ SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39 metadata
 MD5 0fc2e0b98561e0c0e508ebcac244c234 files/digest-tvision-2.1.0_pre1 256
 RMD160 c2a7cdc3383de7518daea162a3b840d02770c350 files/digest-tvision-2.1.0_pre1 256
 SHA256 c9ec689ee768636b09a7160148febd999045b7fdf5226875986d56eed1cec52d files/digest-tvision-2.1.0_pre1 256
-MD5 4b209e67c0a3b92ad03f7e30e1f4ef96 files/digest-tvision-2.1.0_pre2 256
-RMD160 46a1a23635f5ef4a7ace6c473c37452b879f38f8 files/digest-tvision-2.1.0_pre2 256
-SHA256 bae56e31c4c02abcd8fb1dfadb0906bc839fe2d3007f5959cbed32cf62e5ecfd files/digest-tvision-2.1.0_pre2 256
+MD5 4b209e67c0a3b92ad03f7e30e1f4ef96 files/digest-tvision-2.1.0_pre2-r1 256
+RMD160 46a1a23635f5ef4a7ace6c473c37452b879f38f8 files/digest-tvision-2.1.0_pre2-r1 256
+SHA256 bae56e31c4c02abcd8fb1dfadb0906bc839fe2d3007f5959cbed32cf62e5ecfd files/digest-tvision-2.1.0_pre2-r1 256
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFp6mIwnQyISwouHwRAh5OAJ9qdtsOA2JYmkZMKSN2v9R0z6dwzQCeM7am
-7FCKUvrkN5SSnsL+pbVripA=
-=75+7
+iD8DBQFFtjG7wnQyISwouHwRAg4PAJ9a3OqWdddg0mElfPyrkYg32BtGugCgj5Qj
+m4JWenM6TcfcK30XFT5cwfE=
+=MvhS
 -----END PGP SIGNATURE-----

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
similarity index 100%
rename from dev-libs/tvision/files/digest-tvision-2.1.0_pre2
rename to 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 (file)
index 0000000..bc8474a
--- /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
similarity index 89%
rename from dev-libs/tvision/tvision-2.1.0_pre2.ebuild
rename to dev-libs/tvision/tvision-2.1.0_pre2-r1.ebuild
index 15c5f306c180d77fcc824cb1e3775350c13acec2..e21305c240e545a97bfa911db323dd62a729a564 100644 (file)
--- 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() {