Simplified asneeded patch

Package-Manager: portage-2.2.0_alpha60/cvs/Linux x86_64

diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog
index 823d3add376231ab90b8563f78cfe8d602960a16..be30570100d12762ef92d2b3016c8531d084815d 100644 (file)
--- a/app-emulation/virtualbox/ChangeLog
+++ b/app-emulation/virtualbox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/virtualbox
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.85 2011/10/04 18:00:30 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.86 2011/10/05 09:40:17 polynomial-c Exp $
+
+  05 Oct 2011; Lars Wendler <polynomial-c@gentoo.org>
+  files/virtualbox-4.1.4-asneeded.patch:
+  Simplified asneeded patch. Thanks to xarthisius for reviewing the patch.
 
 *virtualbox-4.1.4 (04 Oct 2011)
 

diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 2f5c32982ef26d750392ce4ca983b508e43b559c..f2c3c3319bee7fd1e0ebfa85a4dcd2dd88dbda21 100644 (file)
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -12,7 +12,7 @@ AUX virtualbox-4-mkisofs-check.patch 356 RMD160 2562cee4530976224ae128a732ae99d7
 AUX virtualbox-4.0.2-restore_old_machines_dir.patch 528 RMD160 41dde2f1b062a42b0f54488ce70c7c40693b0c9d SHA1 699f43f729bf64adf32647b5d9664864fcd0634d SHA256 0867e42e671245b5f9851a3221ffc321cd660a382d0df02878fe57898087cac0
 AUX virtualbox-4.1.0-vboxpci-build.patch 488 RMD160 443389ca2e55bb27b6309b9fc396617649fcac7a SHA1 f27090bc38401908591ee436ba4639fad6c430da SHA256 fdfd26d94bc2a239fa129016bd746664c832c30c1d9b42e2fb554827bb17fb19
 AUX virtualbox-4.1.2-vboxpci-build.patch 568 RMD160 be50bcdc1b938d396a8a51355d71a8aa2e4e6692 SHA1 bbe1dd470dbc2c07a4defd523c5331954f5d3291 SHA256 5451a946acba9ebee24d0337cab36f1ec55d1a97f80d380f7ea13bfb2d944e6e
-AUX virtualbox-4.1.4-asneeded.patch 1054 RMD160 c1c55f0767a12a2ee7124af7bc2bb3d6e917fb75 SHA1 5fe43f3b2380b42f1da9b6723fdfe3c985778f05 SHA256 9894ebf4d8e3b171978f059436068c9e08eb24ca1c2e667f3d8bba291948405f
+AUX virtualbox-4.1.4-asneeded.patch 490 RMD160 5cad31e37f4287e944e63c4725faf3d245ff3f54 SHA1 63f90270ad40586ce90fd503c381cce5d865b733 SHA256 9a932f4a50c8f520429f632f83b8c1cf740e14ee12d9348c1bbee95e52998e35
 AUX virtualbox-ose-3-config 38 RMD160 44974362ca28f2762c0501b4d4c18de2634aa063 SHA1 d475cbdbf469dd3a178fa9a4a8580859aacd7c37 SHA256 cc3cd896be49a421b06665683a22edb0fe17d6588fc259140b139c3d8a8581b5
 AUX virtualbox-ose-3-wrapper 2931 RMD160 c73f7fca4531dc8023484b860c81c0a5805f022c SHA1 1d51680f1dc67394b0bf2c0533305e54c68ef177 SHA256 7ed4834ece201cb6a9da57e36a1a9b47bd054057d2ac4a46343a9966ff460644
 AUX virtualbox-ose-3.2.8-mesa-check.patch 701 RMD160 061b6eaf0b3cdbcaac7258d85909d1e9d89cdeb3 SHA1 7e5cf6d11421d392d4f2a7bf9846cc71d9688d03 SHA256 6b4ce64673cda33631e7a60ac94f23ab2d020d52b6160bb072ad8d6f9547c251
@@ -24,22 +24,22 @@ EBUILD virtualbox-4.0.12.ebuild 11911 RMD160 2687ae805daf246f41ba5b356f7a5b60490
 EBUILD virtualbox-4.1.2.ebuild 12003 RMD160 e628640dd88309798715cdb19b431f73773f6c41 SHA1 b95510f7f34fdbdb1cb8fb771a1d82685b97b4d3 SHA256 768ff2fd26cea39ddf196864103c7614fea8aeba06350702155bb6a4b94c7a0d
 EBUILD virtualbox-4.1.4.ebuild 12014 RMD160 5d8d7a0c3385c5583d6d5694e7a4536b84588824 SHA1 20a66e4038df19ce338e569624faead65590d9c7 SHA256 dcc00f85b34fe93c82a42995f0dcc1e7844d038d3319c159149a845ed3e9aa93
 EBUILD virtualbox-9999.ebuild 5623 RMD160 3e3eeabc7dfcddc0583974335494f51b23c8327b SHA1 fcc07a44770a14802e337c9ff2a87f19b2d149f3 SHA256 301e900d619a1fd9c9e38793671fb0ab843c2d973bda2612e64e34c1fdbf3c8d
-MISC ChangeLog 8436 RMD160 8ff5596b425f136289282fcdcbabb740d0196f05 SHA1 1f77dc29891d634918ee6e456502ec8dcb21c899 SHA256 6d1579b0a638a23b248e8e35e9b3edd3d6eb21533a06266048b6de9763ec3159
+MISC ChangeLog 8607 RMD160 df183447d3bd9f590afd2d039fca81d457622342 SHA1 ed1212429ca448409a754cfa70232f24fe202b5f SHA256 dcdb9af75fd1bfdf78c9630b317a08f550c5b8bf1822a8d22b76f3baeccb41b5
 MISC metadata.xml 766 RMD160 1c69e37183d073f82b9fd2c8761b758cc33ccce8 SHA1 31295f3715624ada590d13fdc80c076380415ba0 SHA256 54cc5df43fbe674f4f04674566dfec523c0c912f8c94db26f4215727ab6850e5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOi0nEAAoJEPiazRVxLXTFPyYP+gIig0dx1Q+0Jt6vIKU9WXue
-1cNn1hONJPNyKicEcPX7EKhgb6EW+9No3Up3XEcd1pm02G1gp7S0R89kXDCIZ4hA
-dlbs9ENu3beSWFekygxXmtutDpwclQLFH9wOwup/6rYKdxtDuJ+XFpvlzZLdkv3W
-xEotyPCbvbwv8u0IhL/xx8tQv/sd5H5a75nSpGFoWOO0wOdgudXW5f7sYFpZ5Kx5
-aRvbVvKhI/KyTGkFMdO1EowhP7f0X0ac8z9a7g2bY+pMwcQ/f5zPZp1bZi5H57Wl
-yex5j93FhcC/CefyqiihqJ1DOAZ6MHS8vI13rh+GYFZ0ncYDJn32hl3957HVRVyT
-wYuD2HDcXdCEHLH7PJ/Bzk1Xp21L7J8lu797r/C7Ffzk9cVVJsBgiMeWEWzSYSQU
-oNaH61Fyc/f6SE7252hzG4X12pLarsVxwra66VzqQ+IbJdDuNQDg1PlKriHH1EFA
-jDuq7JEEkWkd+tloZUbbBsLH17gA8vIpFhdIKqe4KJKgoRhH9Nh/V6TA95YoKa18
-AVZsxd4d/4Ex/oRo9XnMFexioj4myFB0I+m7BIvQxtM/MYEU0dQgDQVV3Z/i+2mV
-8axN7Zvx2PnJ02w1eSKrCUvtcX5rzDkqXNphmnxIQd6AhB3TobJmSixnTelBNKdR
-xHOXz+L0Yz9fT5wV9azd
-=WQaE
+iQIcBAEBCgAGBQJOjCYGAAoJEPiazRVxLXTFEloP/30RA5j5BFqUv0XbnR3y/SZW
+IEyUbhz0tBNPw7AQY8SPynx7izqjCrNSmEuktKOtcN0sym+NGOUAy3jzjsfqF5JR
+WRmcUx/yfY8S5klz76RXtaqR3Bb1qQN86usYEAA0cyI2xGZXI33qrpA6ZywY8EhE
+ge8Yro0eAVWVha5NvbvOTU4R2aHXFyDL/JHUZVaLKrBtqOpP3PCqiqzosWbPiAEl
+/oTY9PjTNWgK4U/0kQeOxnDQ2V+ZrfkDZujo8PgffTA3DIgk2FZ5rqsLzB6Mv3gT
+nEFlEmUc36vOZCdIuuk5pPxU7LZkdThRHCRsfkW3MilG2J6ys74bLrGDJy2QuiFk
+0VuuOuSgRdBVRCd6oQhamtujTiM4HkMB6MlVBUKEMP70HH6IV9dG+uiywRJSDD9F
+tjLsRAONvCIoRByG97Bqtt8kvoYMcZex0O+xvRw8c5uOWYbjwXwPiupml+h6KcVr
+RI6r4iGzcUsYLyr/11rIbW3oZC/X9cJT0uaghTGoVdBNIkQ7kilxAT6B2SNehAVV
+akVhTNc8ivGk9cbdQ10J/BAo0XV92JyqZZmxA/cLA/LNMayA9ZcXOjC085c/w2zw
+Fgwu8lMeEV4rtcK9Ln0QbVfUmRlE5c8daq3BZOWsVayjFn7CLZnidIyaKzfdwAVC
+3Rbngsk0TPbm6TGBvm1v
+=oZxv
 -----END PGP SIGNATURE-----

diff --git a/app-emulation/virtualbox/files/virtualbox-4.1.4-asneeded.patch b/app-emulation/virtualbox/files/virtualbox-4.1.4-asneeded.patch
index 003dc5db697884b723d811b91ab4d22e401e2b42..6135aa38bcff1d6a1124d91e9ab5764aa8a8719e 100644 (file)
--- a/app-emulation/virtualbox/files/virtualbox-4.1.4-asneeded.patch
+++ b/app-emulation/virtualbox/files/virtualbox-4.1.4-asneeded.patch
@@ -9,18 +9,3 @@
   else ifeq ($(KBUILD_HOST),os2)
  TEMPLATE_VBOXBLDPROG_TOOL                = GXX3OMF
  TEMPLATE_VBOXBLDPROG_LIBS                = socket iconv
---- VirtualBox-4.1.4_OSE/src/libs/xpcom18a4/Makefile.kmk
-+++ VirtualBox-4.1.4_OSE/src/libs/xpcom18a4/Makefile.kmk
-@@ -469,10 +469,10 @@
-  libIDL_config_cflags := $(shell $(VBOX_LIBIDL_CONFIG) --cflags)
-  libIDL_config_libs   := $(shell $(VBOX_LIBIDL_CONFIG) --libs)
-  xpidl_CFLAGS = \
--      $(libIDL_config_cflags)
-+      $(shell pkg-config --cflags libIDL-2.0)
-  ifeq ($(BUILD_PLATFORM),linux)
-  xpidl_LDFLAGS = \
--      $(filter-out -l%,$(libIDL_config_libs))
-+      $(filter-out -l%,$(shell pkg-config --libs-only-L libIDL-2.0))
-  else
-  xpidl_LDFLAGS = \
-       $(libIDL_config_libs)