Fixed compilation with vboxwebsrv USE flag being enabled (bug #436246)

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

3 files changed, 24 insertions, 18 deletions

diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog
index fc205790cfd0..679d9f650389 100644
--- a/app-emulation/virtualbox/ChangeLog
+++ b/app-emulation/virtualbox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/virtualbox
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.139 2012/12/13 18:47:39 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.140 2012/12/18 22:40:37 polynomial-c Exp $
+
+  18 Dec 2012; Lars Wendler <polynomial-c@gentoo.org>
+  virtualbox-4.2.4-r1.ebuild:
+  Fixed compilation with vboxwebsrv USE flag being enabled. Thanks to Joachim
+  Breuer for providing a working patch in bug #436246.
 
 *virtualbox-4.1.22-r1 (13 Dec 2012)
 
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index d0debbc2fe8c..800f5a456328 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -16,26 +16,27 @@ DIST VirtualBox_fa_IR.ts 424578 SHA256 4934fa27a2be76ee432a333b29a4ed8c0106821b8
 DIST qt_fa_IR.ts 191494 SHA256 b2651c0329e53d3eecc78923905b9a7b68e3121b7b04fa3fd86499c940a5eb43 SHA512 3c6fdf2dac487bf72d4d85364e02c98f8366cecb85f46872aae689e02a83a22c99078c0296811e3f680275a10c8f30ba58ce52cc6d452d0b2d9b515163883aa7 WHIRLPOOL 50e8d14769f1659e9da51884f2475683ad6470a4b82d2a6f900f00e5e2643e11dfcb5b27f6188c75f25b51d8201da987b276f89eb1299ef7ac5c26cdfd97940c
 DIST virtualbox-4.1.22-patches-01.tar.xz 3752 SHA256 2ff58f8d2bdfdcbf1ae4bbe9f68ad1256f1ae37091fd4b392582a062d206962f SHA512 9bba2a4352d52cddd27f55b4ad0e9de250c1d29359a8859f61fc413e53ac62206321c5e347391ca478b942967bd7974a3a469eb3bb133c79d7033692afe559dd WHIRLPOOL 1aa98913e7d4e1ddf5f775db200cddc18a7ed4d7dd915dda0dab6bffbf33bfd63a785cc7381bca74e4780e7dce21f18314dc093b9c6ba02addfd1330f3b61aa9
 DIST virtualbox-4.2.2-patches-01.tar.xz 3612 SHA256 5b844b3740bebfa0e7652cb6c5c89d94a333c7aa0873aa8a0aa653f7c9f3c06b SHA512 d12da10898c5bd440b6fd2211385bc223ff832fdce11b118cc56562903c8c87abcb1eeec3bbc2d4b5b22b1aa4a652e978277af7096a65276469be9e704a1aa69 WHIRLPOOL 58d43f0d2eeb30800b285c307871be64765301f7037d72752eb063286589fcccd12e6d8fd26610164701178fd497ca65127e91eb8f8d53db0889ccd7d7b988a9
+DIST virtualbox-4.2.4-patches-01.tar.xz 5388 SHA256 f69935ee8014af2d0badec799d2a9c3dea7db54bffeab00ac372cffe1ee84000 SHA512 6f339771e3fe3260ccabb3692999260cce71b30230a13bf637b11d08fe0ef5adca10402655a4b9ad44d8e89cc2621f8a491fdbb0bba9fe152719dc9176c2824d WHIRLPOOL 36ae0888cf9cdec4e85d5cd99d4741c58bfc7fbe024776f7ece4fa62d96b42053818b672bba56ea0ea4c6e24b1023b9f45510813287399282e506f73f0cc1c20
 EBUILD virtualbox-4.1.22-r1.ebuild 12028 SHA256 3876818ced43fdfecff361ab5875085b809a7afb66da03be9432b6d70ad48858 SHA512 08fd5663462e45fd65668e92bc0a14a9ba7145c552a7709026edfdfa61b204e70487fc5840e35bcdf7ee118d81fe9fa88a6a9d36bed8797401fe0be1da6533b9 WHIRLPOOL 545d0b76a0da0a7222312ceefeee32daf4763a12968d02ec0dca5536fdcad181e1b10afc09422aa40c1365547ea4cd2bdc77806950fa47cbb250dc0a3a6bab93
 EBUILD virtualbox-4.2.2-r1.ebuild 12375 SHA256 4ca6c99829de3aae5d50d476c147028429b1b07132eaae789bb98f4a39253cc7 SHA512 f14040e20c41b4ac067b3aa58ae53662db0a4988393515f04a542199ff775e1563e0b41bbdbde5f3c62a65a98eb5e398f4ed923d943f6929729d371ab9fb4bb4 WHIRLPOOL 0cfaae14871a2e70e209444c1283cea5123fe5fe2722edbaddc780204d3a9a2fa529a04a319baed93c2ad5ec43023790465caf0040913835267f51ab26eb4fc9
-EBUILD virtualbox-4.2.4-r1.ebuild 12105 SHA256 93c56c1a931bbbd66fe05f384d11028486899b78539c5e64e3f8c8dfeab7080b SHA512 4b57fb8f231155ee91b91480998487d96182703266abba728e0d09c078cae242b49858505fce64a805f75c2be8254e52f2423bd30d584b54b9e2d7840f8dde06 WHIRLPOOL 62028567c4e22f7aff59b8f518cee2dc559b6c779d6941937a9a3b1f6dbbebc61dacacc9df525e6e3f1d93cd3d6e581bbc131ceca84b4a74114003c121d0dd84
+EBUILD virtualbox-4.2.4-r1.ebuild 12108 SHA256 dee8664ac2e7478944454372c1509154d265aa648bb8482ef9f054fa8870006a SHA512 99cf53b2d56bcfebc64e8c25319f22d3bc428ccdf2f28d5d8ed7534f1cb87288f80106d32cd3a258ff1a3b4bb3a2fec82005ff6105d7881ad1d71f29a0c0af8e WHIRLPOOL 64b81cffd8ea1772f53ec8f76529eb462fe220a3a264e056396148ccffc717da6f0faf0cd0139c470a68f73838d6a332c0e09042cbdf062e3aaab7e0c38e676d
 EBUILD virtualbox-9999.ebuild 5132 SHA256 220b4a0d0f7eeaa50a5904fa9effe75a8fdc8390555f18e5d762797d22e446a5 SHA512 be8f41729b8579ddba88134450937babfe1a2a95b115f5ca2cf9a8b7a31f0ae2f418ff43347adad85e1ea5989e2ad14551b3e65ebac92bbc9f4e9c05b2ab781e WHIRLPOOL 882c5c3e0949ffc375607f280384decaf7cb5910ff50757fbfb1a4f7671bb42a3bef7666305086f1a10514d949f79e60033e5f6630154b7d7e67f10108d48cf7
-MISC ChangeLog 19324 SHA256 ad9352f8e3f6109edb68bdbdd8f77ff120d954168512f3a9d3db68f1f803aa1d SHA512 c0b3ef40f3d13dff87a4211efea736923b81742e6a31ebd26f928987ecc8d519b0900264b74b2ab2e56e6f1fb73504138b25a1c1df3fc957bdb71d44007af0d0 WHIRLPOOL eb97ab9990e135c59ffeb1238b3b0e09c3779fe1a3cf700c5bba907c5ac2ea21fcac4b512f429b58e58858aae5aee807ac5c8bde8e96050e82554abe263fe3e6
+MISC ChangeLog 19542 SHA256 36daee0030c6cf25258a73d511f8cdd2183fa7cd71f24c798f5783d5efa30b52 SHA512 17013323b3c702ec6346d3951c7385a0ead86d047d8b03fb30b972578758fef2ef78098d2cffb7f977dbb73b754863aa72126867a6b8e6a13d8a6794b63dbe08 WHIRLPOOL 55f39bec9215538c3e65ece3e08e0433fa73e0a838ccfcfd3c82bf4cc3bd495031f9ff5aa9b3416559c0a90dce69c09b9f8f63592eb5006a9ee4350b9e83fefc
 MISC metadata.xml 766 SHA256 54cc5df43fbe674f4f04674566dfec523c0c912f8c94db26f4215727ab6850e5 SHA512 60fca14fc1e69c4385145e5390f202c57fe270537db31e5e7ca86ea77a1a6b30053dcdecb09dfa8386abd4e3776137028832fa188cda2d78ee42bed3189f2499 WHIRLPOOL ce722dc1c7248f0230bd298f4079945dba4271c6209c2d0c2cd9269748422b21bd69ae284354085120c6f6309d28c16dac4e35eb19cae64b2d49da3bb574c9ee
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQyiLMAAoJEPiazRVxLXTFlmAQANvRCIcMrFXcgQ8IXMVaMrh3
-+Mvg6qBdJdQBGRjtvUhKGGK7ChwRJxA49aGWm7Nba+6rIWSibfgqeUbYcOlWtUvz
-r7Gmi6fto+qKm63uRcHJoC4TYDX18mn3DUzfJxulOnkLEJCoPid+sa9NGNJe066x
-ZlfIpQMDuSMNFySni2vh+DNIk9j/oD9nrmR1aY8Mb/AS56k58dhMPnhCh3TDcmBK
-cWNTxw1kUmSKbKwBjOtrT++knX7HujaLq93CmHbagbrpAXG1EgQ3XHxKPCSm8RRu
-/eqMpSBWhYc9iYvPrg6QTM/6DV4hYQfKEDcS4+5ZKnfhuMohQOhN95lOqIzodoO0
-19tePyfoFtzHlVdJRxHazHpyyiW6jSSuensRVbd/HQBtIqM/3/qtsRz397ahFTFI
-nw8oDEKWJA0a6x7aZxlU2migPEt7QDLYjKzCGAeFRXtyFDHDbFVNkTk7mbQ+HiCt
-13S9wMheXJlaWNFY74KAcZ86VBqAs1Kdm2YFtHS/EQvysPiPX7IW/s/EZjv6PRBh
-KDcbSBXOeB7Ct/pe8s0NENq070nzLRY74b5mDXkMhEH6J+oBzl6DgkY8uu1+bZ16
-ZwsK1SRslJCM1Z9S+ffY0jQqz+hO/es+B9hfLD+JqVaF+RZfDq/w2Oi5EKSmINFD
-/Feb04ZpEOYoIlmWakCU
-=CvHP
+iQIcBAEBCAAGBQJQ0PDmAAoJEPiazRVxLXTF0eQP+wVO5ynqdtlVBcGLzmCa2OFq
+72g8wZWBJRk5MDOerP9WVQDOWUQcLxpcpVCgFZofEe7WXVWvKLANiFIeV/hq2Ogq
+uoiaj6FMvFAuFtGWDiiP3v+i6JX/Q9Tsk4vqgbXLYye7w3WZvpM5ta7o1grWNEPf
+aY5syktvCGjxCjAkhvsaAHca6SQpIJjmkMWHScboAQUMChhi+Lzk4EHWaCqFOpet
+up4QBCORghvV4yxMz843P5Y0Bavoojewq/6fyTz2GVbatXvqMACQE3hiEMr3FwMC
+hFj4mDm2lgfh01uhKrzXoI6qVzpeXREV6f8RbaT19n1JGlf2pIhK9XqAUvfDzDVs
+qe/comWkc3oxq4jSNzoL1M/6f7fbmfqzafHVjjFu9115bY/HM2Jdgz4rCzYPoXGZ
+EWppULWzcdm5sLXq3+OvYfpCO+7sHQjqXT1+PVhKgo4yS281G373M38f2MGPz51v
+Rcm3jl4hFrKXS+ieRzULLI4G+SEwqbC1Q43LAv3Qh7uIVijyY7uGIcECVMyvrW7t
+tmo/gFJViDUG15gNI6y0D8yPA+OSvUxwmd3jkKuHvGheCQGiL6MIp1TpAS3FT11S
+n3p96b7GfBkrYvwHP4zOxs0klPyl7xMFouATw2CJhtT8lvh4S7iMeBHJ+DUQCjoC
+NZ0JEIfdAdxvlvBNnYoz
+=NuPe
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/virtualbox/virtualbox-4.2.4-r1.ebuild b/app-emulation/virtualbox/virtualbox-4.2.4-r1.ebuild
index a332f168afb2..45cf625e3ac3 100644
--- a/app-emulation/virtualbox/virtualbox-4.2.4-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.2.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.4-r1.ebuild,v 1.3 2012/12/02 22:48:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.4-r1.ebuild,v 1.4 2012/12/18 22:40:37 polynomial-c Exp $
 
 EAPI=4
 
@@ -21,7 +21,7 @@ fi
 DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
 HOMEPAGE="http://www.virtualbox.org/"
 SRC_URI="${SRC_URI}
-	http://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-4.2.2-patches-01.tar.xz"
+	http://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-4.2.4-patches-01.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"