Fix build with --as-needed wrt bug 249295. Thanks to Diego for reporting.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 40 insertions, 4 deletions

diff --git a/app-emulation/virtualbox-ose/ChangeLog b/app-emulation/virtualbox-ose/ChangeLog
index 2532cbafa985..49a78bced894 100644
--- a/app-emulation/virtualbox-ose/ChangeLog
+++ b/app-emulation/virtualbox-ose/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/virtualbox-ose
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/ChangeLog,v 1.64 2010/06/27 08:22:22 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/ChangeLog,v 1.65 2010/06/27 16:23:27 xarthisius Exp $
+
+  27 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  virtualbox-ose-3.2.6.ebuild, +files/virtualbox-ose-asneeded.patch:
+  Fix build with --as-needed wrt bug 249295. Thanks to Diego for reporting.
 
 *virtualbox-ose-3.2.6 (27 Jun 2010)
 
diff --git a/app-emulation/virtualbox-ose/Manifest b/app-emulation/virtualbox-ose/Manifest
index 121caae1dfa4..140e94e2bf78 100644
--- a/app-emulation/virtualbox-ose/Manifest
+++ b/app-emulation/virtualbox-ose/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX vboxwebsrv-confd 622 RMD160 98e7ad0a2ce1cca42308f30ae755cc36f08674df SHA1 16978cce1c11b941d5bcce8c143e4026de9daf01 SHA256 245fd8fa217142c4a43e1f0d6b7f25fd72c538d85abc88585450324bbcf6fbb7
 AUX vboxwebsrv-initd 748 RMD160 3750514cea6441b7f6a68057a030bb4f7977e960 SHA1 8682afdab16f3504d5566ef34039124a743eb945 SHA256 3760f1d1737dfc5fef02151dcc6cd5d8359086a81b06905df1dea4b77adfdebd
 AUX virtualbox-ose-2.desktop 205 RMD160 4b12c9f3cfe235f6544116720781562af631bd51 SHA1 edcc5d07ba695a7ec9a5f76fd24481fb15dc2d89 SHA256 d580e956319e5dd0cda8479c7e59622feae3e99b9721ccc3c48a2b012d11a578
@@ -7,6 +10,7 @@ AUX virtualbox-ose-3-wrapper 2931 RMD160 c73f7fca4531dc8023484b860c81c0a5805f022
 AUX virtualbox-ose-3.0.0-mesa-check.patch 692 RMD160 c1b62d987fa941f5455a8fb0c0d6b07377756d0f SHA1 18c987a024fc45778cc2dc55515100150996408d SHA256 88e981ed765b26c11ea9c606a009a9a1b03c67a1de5cb42b18e0088e027fe0c8
 AUX virtualbox-ose-3.1.8-iasl-length-calculation-fix.patch 1190 RMD160 4c1950bf59457edb4e18c6670b49e2096c153bda SHA1 aa93ed7c058c78a1479e2e2c965c64e74031d699 SHA256 6ab56908bdc65f0c81a4f8f8150a83724abe6b31358a6a3550959ff42e9879dc
 AUX virtualbox-ose-3.2.0-mesa-check.patch 640 RMD160 efd18643fba1e7d0f655b8ac287c2643c249f363 SHA1 72d92eef666040c78beaa6a507ee958610ff9c34 SHA256 ddf65adb6a41160bc3fb82265cce3d44105efddfca55d5857175fa3cc584166e
+AUX virtualbox-ose-asneeded.patch 516 RMD160 28adba1239f394e37a3d1955bb07908868e0bd02 SHA1 8698d7b915a00d824426bdb4d28d877580cd28df SHA256 62f289530b6a3baee4eba8c4c32cc6697acc75bb3a413d4d3c25d8b685df5f6c
 AUX virtualbox-ose-interfaces 218 RMD160 4639b9848cf44ac59cd12585a3c56ef53d72a6d9 SHA1 3268e5759286bdff1c5242598266e6c2a5b17e5d SHA256 50ddbfedce3afd41aad45163eb799fce0956d815948ad9da842f09163aaafd52
 AUX virtualbox-ose.desktop 202 RMD160 8b4b5c05743978d71edd4eaba71ae25f1d9d0d82 SHA1 3c10d2f12ea58ef35e785b8727a51fd3a0d66472 SHA256 9bbd26661317b106593d74b84cec3781b24c41bc40a2f98776e23d6b422ee4bb
 DIST VirtualBox-3.0.12-OSE.tar.bz2 52075946 RMD160 4c19f2b945f7288235c8becfc0d1931ddf1bc94e SHA1 7ac46be39db4e51ea38cb6a857d2da544b7a820f SHA256 3c88b6ad1fa5739440485ad8cfd9754dbd17dc23df09a7dcc47b2e91635182b2
@@ -16,7 +20,16 @@ DIST VirtualBox-3.2.6-OSE.tar.bz2 57899455 RMD160 e81e9e29fa6ecece33f74ec69f7f93
 EBUILD virtualbox-ose-3.0.12.ebuild 8142 RMD160 0845d0f746885330d91df63639ab1de87734a80e SHA1 0f6c90a519c87b324215d1e30c68e7b0997ee429 SHA256 8e19d88a143b4928dfa400bc334fa3cde11d92aaa71fd83eb77dc3b95cda8a20
 EBUILD virtualbox-ose-3.1.8.ebuild 8490 RMD160 0bee40650333d72e3eb11afaf39f2219988fee43 SHA1 03707d0bd8809060d82154ca0987e50c9c344a27 SHA256 00571676721a6348e1ee7f15adfe65f3caa4625a40e20b052b186dc249081c74
 EBUILD virtualbox-ose-3.2.4-r1.ebuild 8826 RMD160 18e06bcdb495a00d30a038899e8062b74917c4a7 SHA1 4f405ef163f723b9671fbea75b63e7fd0944e8a5 SHA256 d19b96debd9a8d341b697d63bb0f8f1689c283f38f1d33ce408b118fe5e6b809
-EBUILD virtualbox-ose-3.2.6.ebuild 8840 RMD160 357d147a6127469c106bb0d5f299570a316b520a SHA1 6f97f3cd3452828e2dd78eb817a77fe882787d8e SHA256 3e41f3045c250ccf0ac96903b3ab7ffd992d4707071990738b64f6a921d13857
+EBUILD virtualbox-ose-3.2.6.ebuild 8926 RMD160 7cf8c44cacb801dfa1ef31ccd10cb5b2bc19428d SHA1 1230d4a0793a105426df5c1e2c07f4b54ecdf1d7 SHA256 2020cc7059138f98adecf8511a5680443973637413ca9e41045ba6b780c6cf31
 EBUILD virtualbox-ose-9999.ebuild 5456 RMD160 4b1a6587e4764ff573af1e86c2a9a0449483f3d8 SHA1 b908704bd4517b89322049ce788db0f7885fd053 SHA256 f2b90a209afdece4891fa34dc9306b07e592ccf211c241099389f316380e7a54
-MISC ChangeLog 25124 RMD160 76cfb18b7b2db538984c6763bdb022814b49877a SHA1 5bb4a72763635c4c709e4ab55928cc904b9f4b98 SHA256 b6b31a146df95073122f25cba2e47611660d22eec91d590ddb06a6321146485c
+MISC ChangeLog 25322 RMD160 bed86c2775bcf28140686567477a5fecab24dbc2 SHA1 4801bd030403c208a70ec32715a27c3eeb85a34d SHA256 47b76b5ad4c9fddd199e235ec7382d0949bf3bc712c1a26b983f541a04163ff7
 MISC metadata.xml 721 RMD160 1be9eee129d3def7177854ca114258cf3a0e4760 SHA1 3d3873117be3c1f5ffda9f5c32dbba8c702d5e8c SHA256 17ecae028a8ebed919032580b2f04dcfc1178c9a35267346dae682820e0eb204
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iJwEAQECAAYFAkwnewgACgkQIiMqcbOVdxQHyAP/SGeJ5S9o6sutQC8/euXZQ150
+PyXUCD/Yg+DWXYmV0Hw8QcKqBR6CyfvOWcufe9jyHFejZQLJFcuas8zTgRjiW3pJ
+7NtlseVs7TGvk1UkH3ysoKfYto5ZYDJ5HAT3zd7+7BQC/gf5MK1/8dqsMV4criGk
+IOlsPh4uXMkGWNd/W3c=
+=4Zxi
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/virtualbox-ose/files/virtualbox-ose-asneeded.patch b/app-emulation/virtualbox-ose/files/virtualbox-ose-asneeded.patch
new file mode 100644
index 000000000000..2eee12598042
--- /dev/null
+++ b/app-emulation/virtualbox-ose/files/virtualbox-ose-asneeded.patch
@@ -0,0 +1,16 @@
+--- src/libs/xpcom18a4/Makefile.kmk
++++ src/libs/xpcom18a4/Makefile.kmk
+@@ -469,9 +469,10 @@
+  libIDL_config_cflags := $(shell $(VBOX_LIBIDL_CONFIG) --cflags)
+  libIDL_config_libs   := $(shell $(VBOX_LIBIDL_CONFIG) --libs)
+  xpidl_CFLAGS = \
+-	$(libIDL_config_cflags)
+- xpidl_LDFLAGS = \
+-	$(libIDL_config_libs)
++	$(shell pkg-config --cflags libIDL-2.0)
++ xpidl_LDFLAGS = $(shell pkg-config --libs-only-L libIDL-2.0)
++ xpidl_LIBS.linux = $(shell pkg-config --libs-only-l libIDL-2.0 | sed -e 's/-l//g')
++
+ endif
+ 
+ #
diff --git a/app-emulation/virtualbox-ose/virtualbox-ose-3.2.6.ebuild b/app-emulation/virtualbox-ose/virtualbox-ose-3.2.6.ebuild
index 865899920472..130368443eee 100644
--- a/app-emulation/virtualbox-ose/virtualbox-ose-3.2.6.ebuild
+++ b/app-emulation/virtualbox-ose/virtualbox-ose-3.2.6.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/app-emulation/virtualbox-ose/virtualbox-ose-3.2.6.ebuild,v 1.1 2010/06/27 08:22:22 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/virtualbox-ose-3.2.6.ebuild,v 1.2 2010/06/27 16:23:27 xarthisius Exp $
 
 EAPI=2
 
@@ -116,6 +116,9 @@ src_prepare() {
 
 	# fix with newer iasl (bug #319127)
 	epatch "${FILESDIR}/${PN}-3.1.8-iasl-length-calculation-fix.patch"
+
+	# fix build with --as-needed (bug #249295)
+	epatch "${FILESDIR}/${PN}-asneeded.patch"
 }
 
 src_configure() {