From 5bd8521042bfc356fd20c4505a6c6780d9f4510b Mon Sep 17 00:00:00 2001
From: Lars Wendler <polynomial-c@gentoo.org>
Date: Fri, 3 Feb 2017 16:12:23 +0100
Subject: app-emulation/virtualbox: Fixed parallel build issue (bug #413467).

Also attempt to finally fix creation and installation of docs
(bug #554932).

Package-Manager: Portage-2.3.3, Repoman-2.3.1
---
 app-emulation/virtualbox/Manifest                 |  1 +
 app-emulation/virtualbox/virtualbox-5.0.32.ebuild | 11 ++++++-----
 app-emulation/virtualbox/virtualbox-5.1.14.ebuild |  5 +++++
 3 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'app-emulation/virtualbox')

diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index f95a0ce1b8d9..35d554a03544 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -7,4 +7,5 @@ DIST VirtualBox-5.1.12.tar.bz2 114950292 SHA256 e6f10b1b6f3eb1be2c5223f60569f8ce
 DIST VirtualBox-5.1.14.tar.bz2 115042132 SHA256 8267bb026717c6e55237eb798210767d9c703cfcdf01224d9bc26f7dac9f228a SHA512 ab0646c587fa1b573a9332ca0f1959660adc02f2ecf63ac808f4a7e3ceb9b2c58adab8e309aec4630ff7fa447f47d7487e7e8d0a1f718a42d39ce71e96067fae WHIRLPOOL 915b3ac0d50def86e92b662c7fe32e1390c9dab73efb9fc9595465c45818b86b4380be93a7075d17e33f9b70d92dbbbf6063ce0dad6448c9a592648a10f2409b
 DIST virtualbox-4.3.16-patches-01.tar.xz 4288 SHA256 270c4f01b2c13c4133987b3acc073dfbf78840212cf09f083dbf8fc80407ce6f SHA512 595f88c4b388b4807347c15c1750ec73aceba1c82ad993e9a05c7b78dfece7b679aff0338b3a48e2ccee7911fb5ed0dba803052332a270230078551f747052bc WHIRLPOOL 2157ee3fb9beed906cff28647c869e37d62551ad8c93801c0f0ec6893675f11786aa6d92acf11c348d30aa58b6e03a3faa879c664dddac6e5b8525035986c9ca
 DIST virtualbox-5.0.16-patches-01.tar.xz 4024 SHA256 200eb980a12323a61d0fa6dbf61ed64ee1e2bb5e18e16eabdf8668d8fd8be3e4 SHA512 4eed117253754abee9088d4c320b4a6f0b3e1c8313b98f354cb727001156fe68d553a677073d40b921437f4cc073420866d1533aad4e61a79607d8360abbfd4a WHIRLPOOL ab40851873d55ae873ca8ff88670a17476c0d502116f4abda7b766064a2daa71929eb69b4b68c64c3d2d0762134fe85d07044bdedde4bf15924520a604972aaa
+DIST virtualbox-5.0.32-patches-01.tar.xz 4400 SHA256 e5bf5b5b391b3402172b5a30952da50affacaeaf40a75df0430ad623fcd8ed6f SHA512 5df0ecb4f9190375edc62d231aacd381c36a1697cc33df48b2f2d68a05ca1c855d127e466eda62030736dbcee76f5c67a519a2f42b72eacaf7ed65a8cf991e8a WHIRLPOOL 4c11787951848aadacc0772df5a46ce8d54445e0120901be280f493d4cc6333e986d0376f33ac0217dbb23758240c025028ea1d21c360fc2840c8e3003a0ff62
 DIST virtualbox-5.1.6-patches-01.tar.xz 4268 SHA256 5bfae08bc53fee06aea501e77b7998348adba43792149248d217ab03dea8c04f SHA512 2401df42ac8c2fd1f4bbc795713b185d5e65c2a36c763fa1d7274686599808aecdc28aaa6443c9efc9842f7b3eeb928818c95d1e7ad3b86239c2ace441a5e116 WHIRLPOOL 25505eaff2eeb820a09a2c8807c2d5cec48cbfe98fcd30b04daf86c4cd7c506f09c67b80d5ecc221ded08af6e48297e0161bae16862e5a1d3204b27945c511b0
diff --git a/app-emulation/virtualbox/virtualbox-5.0.32.ebuild b/app-emulation/virtualbox/virtualbox-5.0.32.ebuild
index a6ba3f0527af..5870ceb2a4a8 100644
--- a/app-emulation/virtualbox/virtualbox-5.0.32.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.0.32.ebuild
@@ -11,7 +11,7 @@ MY_PV="${PV/beta/BETA}"
 MY_PV="${MY_PV/rc/RC}"
 MY_P=VirtualBox-${MY_PV}
 SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.0.16-patches-01.tar.xz"
+	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.0.32-patches-01.tar.xz"
 S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
@@ -61,6 +61,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	doc? (
+		app-text/docbook-sgml-dtd:4.4
 		dev-texlive/texlive-basic
 		dev-texlive/texlive-latex
 		dev-texlive/texlive-latexrecommended
@@ -216,10 +217,6 @@ src_configure() {
 src_compile() {
 	source ./env.sh || die
 
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	# and strip all flags
-	# strip-flags
-
 	MAKEJOBS=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+')
 	MAKELOAD=$(echo ${MAKEOPTS} | egrep -o '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+') #'
 	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
@@ -384,6 +381,10 @@ src_install() {
 		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
 		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
 	fi
+
+	if use doc ; then
+		dodoc UserManual.pdf
+	fi
 }
 
 pkg_postinst() {
diff --git a/app-emulation/virtualbox/virtualbox-5.1.14.ebuild b/app-emulation/virtualbox/virtualbox-5.1.14.ebuild
index d35c7daed9ae..e9f05dbdd1a2 100644
--- a/app-emulation/virtualbox/virtualbox-5.1.14.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.1.14.ebuild
@@ -64,6 +64,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	doc? (
+		app-text/docbook-sgml-dtd:4.4
 		dev-texlive/texlive-basic
 		dev-texlive/texlive-latex
 		dev-texlive/texlive-latexrecommended
@@ -395,6 +396,10 @@ src_install() {
 		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
 		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
 	fi
+
+	if use doc ; then
+		dodoc UserManual.pdf
+	fi
 }
 
 pkg_postinst() {
-- 
cgit v1.2.3-65-gdbad