Fixed compilation with dev-lang/yasm-1.2.0 (bug #391189)

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

4 files changed, 54 insertions, 17 deletions

diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog
index ee3da58a69f1..bc2098cf5031 100644
--- 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.92 2011/11/11 09:07:30 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.93 2011/11/25 10:25:23 polynomial-c Exp $
+
+  25 Nov 2011; Lars Wendler <polynomial-c@gentoo.org>
+  virtualbox-4.1.6-r1.ebuild, +files/virtualbox-4.1.6-yasm120-fix.patch:
+  Fixed compilation with dev-lang/yasm-1.2.0 (bug #391189).
 
   11 Nov 2011; Lars Wendler <polynomial-c@gentoo.org>
   -files/virtualbox-4.1.0-vboxpci-build.patch:
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index c13d10677332..1f4c66d66fee 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -12,6 +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.2-vboxpci-build.patch 568 RMD160 be50bcdc1b938d396a8a51355d71a8aa2e4e6692 SHA1 bbe1dd470dbc2c07a4defd523c5331954f5d3291 SHA256 5451a946acba9ebee24d0337cab36f1ec55d1a97f80d380f7ea13bfb2d944e6e
 AUX virtualbox-4.1.4-asneeded.patch 490 RMD160 5cad31e37f4287e944e63c4725faf3d245ff3f54 SHA1 63f90270ad40586ce90fd503c381cce5d865b733 SHA256 9a932f4a50c8f520429f632f83b8c1cf740e14ee12d9348c1bbee95e52998e35
+AUX virtualbox-4.1.6-yasm120-fix.patch 707 RMD160 350df5f405220c993b5fd438a60c8ac5addc4cba SHA1 3b26e709e3ac21e45e1b795fa91f4f547b9a91ac SHA256 2f073b45e796d7145c755ad7d92d58ce7255ede1d895e2f9f43d89687af0ce88
 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
@@ -21,24 +22,24 @@ DIST VirtualBox-4.1.4.tar.bz2 73837275 RMD160 475a68dc6beebdb588688743b3652bbb9a
 DIST VirtualBox-4.1.6.tar.bz2 73793713 RMD160 1bf368464ac0d431ac799e4710835f3426a9a5f6 SHA1 19a801444102a10d2b62ab35daacb7ddc415bab0 SHA256 554137cb33a806bf0dd74dc0de0c3008dd9bb20d483cdcebaf8a929720c0ab7e
 EBUILD virtualbox-4.0.12.ebuild 12310 RMD160 b7a2a9407565d70832130db17b698a5c4c4a268d SHA1 67131c5476b8035e90ef72c389d5c73f3b38c404 SHA256 0ef0360d3252531e68a6c24c1369e9335f57c4dbeb8fa6ed8066ada4af9ae2c5
 EBUILD virtualbox-4.1.4.ebuild 12408 RMD160 2d1e924a31b384b009603732122255d3a08691ea SHA1 bc152039e8e572960e600652b947f655590d32f6 SHA256 ef62e21c9f0f9b1029c733192dbd2a72c2230f5f7b3dd2d88f0307ef379e75f1
-EBUILD virtualbox-4.1.6-r1.ebuild 12416 RMD160 f2e7d453a709418e7100334f63dae934f42fdf33 SHA1 299667a84b71c3ca50bfcc2840f4df6c739ab827 SHA256 352461f9a43666ac860a040baf91fc1f4b0b9a96161d0677539acd5f864a4932
+EBUILD virtualbox-4.1.6-r1.ebuild 12513 RMD160 3e4dca9509f95074300e669690a478eb71651f0a SHA1 9d64eec3f5409b73a62d64c86cf5ee2d4bd32424 SHA256 cf8bd15d7ab551478dbdbfe88a4ad1202fac57662d1c4ad9e4474b6050f980cb
 EBUILD virtualbox-9999.ebuild 5702 RMD160 5910c24c277af2bac4f50c57ca97253994a16734 SHA1 782323a9c9a40ed52f350836f379a958b72a490b SHA256 1b2ab1d308157fa4adfb7827cdf8e4f6b643200876f02f96bd0b7bd9a6e45fb4
-MISC ChangeLog 9909 RMD160 5cdddd687846d304c4798e7745e41efc96428bfa SHA1 be2bb0bd740cd8b74cc88c757f39570c41f51af5 SHA256 463dab2aa7e78cbaa91447474949fdd2a3e29381930d97368455d0b5e185e22b
+MISC ChangeLog 10097 RMD160 5127fe1a4a4e5d0f253883b8fed740aa419d462a SHA1 c52502340c5acf0bb365f4692f79b1c7322d1e28 SHA256 c814b2dde980eec7b52795d14c7d7e51f87f646a9e97d579471a468c632e3fb8
 MISC metadata.xml 766 RMD160 1c69e37183d073f82b9fd2c8761b758cc33ccce8 SHA1 31295f3715624ada590d13fdc80c076380415ba0 SHA256 54cc5df43fbe674f4f04674566dfec523c0c912f8c94db26f4215727ab6850e5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOvOXXAAoJEPiazRVxLXTFEtgQAJwTcQAySLnZlRtfm7mO/p15
-tGUTUKEcmr6RQGhaLGOvttBRWA+0tToNM02qxdl9TPCfj16/Cw96y/tcsqBM9wFj
-B/lbU1sJbCzoRJ8EMMtw+j++nK7depCiq0jj14sOWhK7mXLCkHPPXjG34EG4lIvB
-cEo53yaw1L0b7aZrsUNNYCsDOVPooCHDmOsjWF/9BS85SJfOCF+bTJrlCEPRjlJd
-BGfIw7QSAuCFD/b0kkXfjPRHyt15Gc1Pjc6Ay/0eKOkIWZhatZ8pDT5wjZ5m93BY
-8Qqw6heHD7uodj6jwI0rrp97b1Vc8jllHehl2/ggNhI+3vBJfweYMEvO7qKgMyGi
-IWoO9RZTrIkKb88Zx4dgUhSI8JkfK2DfiZPHAhf7pWRFnsXHv7htNCMrlFUPUmJR
-nkg78WpqQIS4AT58lhbjAgduHAAOmrYc+d/zw3kJpchv/iSUWgLiexCFvdsA7Yng
-FHmi3hJeIRSJPNh3vML4/oJmN9OmtqBriVJ9x0MY7KwNPX3vXOBwpMMAGC13MLev
-Ueu3GZ9PeL/fJMANwjqwIidK3PWRnzP9jK0Yqfsf9/I4CBlL2WuoGIQbRTlvmSR7
-6n8mce6538SDlDdI3BAxa+A5zHTswR6WNOwkLTsu+6XoQDQlp+C5nif6PC6jd09t
-aSQgM7epqiOBkM7Ifrp4
-=OtwI
+iQIcBAEBCgAGBQJOz20YAAoJEPiazRVxLXTF/tYP/3v6BB+FwwWL6kSddc/YMBDO
+ZJQ3MQTXlwycvowejQ3OgEt+wKan4SW/rw0aiq6qEPcoYz5hJN40rLwOQpjMLXEt
+77bnJzmbQeqm3JXdq8AtiaiPmrDV+eJkuG/5uHj5/E4cWoHFrpeJYQw+AjwpVjiO
+X37oU+er1OLFt9FtN7PPRaZpL9n4GjWJ20LqD+elUFGep0ZtG7FHjsUp75DdH67Z
+SP9FojoQf6l+odE4l65Cg02kV2AxOJkJFxEAtWTLnlKiAW+UdOLigd6FOynZTGv7
+ZJr1XETX6//7PrTkrxRGfF9CGUX0cfRKFU8OinJWlIrf0PX7OA5lhaoJ800Zd8lc
+pAr25gH50gIbUhe9Yg3zErSNjh4vfWLTNA6tSTClxMi8bYTawzJ7nzSGa4hkRupB
+6vK6cT8XWoduXZHw67UjrWxzyLS9aiFQ+psFbtvspZM67JQpSNPxzY6h+wEcqgbU
+6VF6fNMGVMsjVMg1b5rOTL+UQI0cihR0CTzbQc5WxHHTmcB7x473rvwfADBmEzmf
+mvHCSmvKjlgmxAaqn2L572/6Is3zUjZrByg25cU4vWwtFv31sccnbPLCtV0P/7qa
+mQHboEMdZ4GIlKNxycrcx1No38KxxEgQmuXrj2sRG2gkOgDjcBee9mqI3FO8LUF6
+RXUhXFm1ahlbhgi1Vhub
+=nWOr
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/virtualbox/files/virtualbox-4.1.6-yasm120-fix.patch b/app-emulation/virtualbox/files/virtualbox-4.1.6-yasm120-fix.patch
new file mode 100644
index 000000000000..d43809a0f98b
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox-4.1.6-yasm120-fix.patch
@@ -0,0 +1,29 @@
+# https://bugs.gentoo.org/391189
+# https://www.virtualbox.org/ticket/9932
+# https://www.virtualbox.org/changeset/39398
+
+--- VirtualBox-4.1.6_OSE/src/VBox/VMM/testcase/tstAsmStructsAsm-lst.sed
++++ VirtualBox-4.1.6_OSE/src/VBox/VMM/testcase/tstAsmStructsAsm-lst.sed
+@@ -13,11 +13,13 @@
+ /^\.text$/d
+ /^\.data$/d
+ /^\.bss$/d
++s/[[:space:]][[:space:]]*/ /g
+ 
+ #
+ # Figure which type of line this is and process it accordingly.
+ #
+ /^[[:alpha:]_][[:alnum:]_]*:/b struct
++/^[[:alpha:]_][[:alnum:]_]*_size EQU \$ - .*$/b struct_equ
+ /<gap>/b member
+ /^\.[[:alpha:]_][[:alnum:]_.:]* res.*$/b member_two
+ b error
+@@ -27,6 +29,8 @@
+ #
+ # Struct start / end.
+ #
++:struct_equ
++s/_size EQU.*$/_size/
+ :struct
+ s/:$//
+ h
diff --git a/app-emulation/virtualbox/virtualbox-4.1.6-r1.ebuild b/app-emulation/virtualbox/virtualbox-4.1.6-r1.ebuild
index 5ab7fa91d175..e3673d025f86 100644
--- a/app-emulation/virtualbox/virtualbox-4.1.6-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.1.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.6-r1.ebuild,v 1.1 2011/11/06 23:39:53 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.6-r1.ebuild,v 1.2 2011/11/25 10:25:23 polynomial-c Exp $
 
 EAPI=4
 
@@ -168,6 +168,9 @@ src_prepare() {
 	# Don't build vboxpci.ko module (D'oh!)
 	epatch "${FILESDIR}"/${PN}-4.1.2-vboxpci-build.patch
 
+	# Fixed compilation with yasm-1.2.0 (bug #391189)
+	epatch "${FILESDIR}"/${P}-yasm120-fix.patch
+
 	# Use PAM only when pam USE flag is enbaled (bug #376531)
 	if ! use pam ; then
 		elog "Disabling PAM removes the possibility to use the VRDP features."