qemu-nvmm: Unbreak build

[Hauke Fath <hauke%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Hauke Fath <hauke%NetBSD.org@localhost>
Pushed By:	hauke
Date:		Tue Oct 22 15:03:39 2019 +0200
Changeset:	8e4247a6fcd34fbb9aa8d93e71a692d571030b53

Modified Files:
	qemu-nvmm/Makefile
	qemu-nvmm/PLIST
	qemu-nvmm/distinfo

Log Message:
qemu-nvmm: Unbreak build

From emul/qemu:
Make sure the package finds its tools for building docs
Patch bashism
Add dependencies
Re-gen PLIST

-- Still fails for me, though, with

% qemu-system-x86_64 -accel nvmm ./debian8_64
WARNING: Image format was not specified for './debian8_64' and probing guessed raw.
         Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.
         Specify the 'raw' format explicitly to remove the restrictions.
qemu-system-x86_64: NVMM: No accelerator found, error=2
qemu-system-x86_64: failed to initialize NVMM: No space left on device
%

% config -x | grep nvmm
pseudo-device   nvmm                    # NetBSD Virtual Machine Monitor
%

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8e4247a6fcd34fbb9aa8d93e71a692d571030b53

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 qemu-nvmm/Makefile |  7 ++++---
 qemu-nvmm/PLIST    | 22 ++--------------------
 qemu-nvmm/distinfo |  1 +
 3 files changed, 7 insertions(+), 23 deletions(-)

diffs:
diff --git a/qemu-nvmm/Makefile b/qemu-nvmm/Makefile
index 8b96a9ad28..93d3091de8 100644
--- a/qemu-nvmm/Makefile
+++ b/qemu-nvmm/Makefile
@@ -19,9 +19,8 @@ UNLIMIT_RESOURCES=	datasize
 HAS_CONFIGURE=		yes
 
 GMAKE_REQD=		4.1 # needed for docs
-TOOL_DEPENDS+=		${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
 
-CHECK_PORTABILITY_SKIP+=	roms/u-boot/tools/imx8m_image.sh
+PYTHON_VERSIONED_DEPENDENCIES=	sphinx:tool
 
 SUBST_CLASSES+=			prefix
 SUBST_STAGE.prefix=		pre-configure
@@ -35,7 +34,7 @@ SUBST_MESSAGE.sphinx-build=	Fix hardcoded sphinx-build
 SUBST_FILES.sphinx-build+=	Makefile configure
 SUBST_FILES.sphinx-build+=	roms/skiboot/doc/Makefile
 SUBST_FILES.sphinx-build+=	roms/u-boot/Documentation/Makefile
-SUBST_SED.sphinx-build+=	-e 's/sphinx-build/sphinx-build${PYVERSSUFFIX}/g'
+SUBST_SED.sphinx-build+=	-e 's/sphinx-build/sphinx-build-${PYVERSSUFFIX}/g'
 
 .include "options.mk"
 
@@ -115,8 +114,10 @@ post-install:
 .include "../../devel/jemalloc/buildlink3.mk"
 .include "../../devel/snappy/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../lang/python/extension.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../x11/pixman/buildlink3.mk"
diff --git a/qemu-nvmm/PLIST b/qemu-nvmm/PLIST
index de4a8bf04f..afed0769c3 100644
--- a/qemu-nvmm/PLIST
+++ b/qemu-nvmm/PLIST
@@ -17,19 +17,13 @@ man/man8/qemu-nbd.8
 share/applications/qemu.desktop
 share/doc/qemu/Makefile.multinode-NetBSD
 share/doc/qemu/interop/.buildinfo
-share/doc/qemu/interop/_static/ajax-loader.gif
 share/doc/qemu/interop/_static/alabaster.css
 share/doc/qemu/interop/_static/basic.css
-share/doc/qemu/interop/_static/comment-bright.png
-share/doc/qemu/interop/_static/comment-close.png
-share/doc/qemu/interop/_static/comment.png
 share/doc/qemu/interop/_static/custom.css
 share/doc/qemu/interop/_static/doctools.js
 share/doc/qemu/interop/_static/documentation_options.js
-share/doc/qemu/interop/_static/down-pressed.png
-share/doc/qemu/interop/_static/down.png
 share/doc/qemu/interop/_static/file.png
-share/doc/qemu/interop/_static/jquery-3.2.1.js
+share/doc/qemu/interop/_static/jquery-3.4.1.js
 share/doc/qemu/interop/_static/jquery.js
 share/doc/qemu/interop/_static/language_data.js
 share/doc/qemu/interop/_static/minus.png
@@ -38,9 +32,6 @@ share/doc/qemu/interop/_static/pygments.css
 share/doc/qemu/interop/_static/searchtools.js
 share/doc/qemu/interop/_static/underscore-1.3.1.js
 share/doc/qemu/interop/_static/underscore.js
-share/doc/qemu/interop/_static/up-pressed.png
-share/doc/qemu/interop/_static/up.png
-share/doc/qemu/interop/_static/websupport.js
 share/doc/qemu/interop/bitmaps.html
 share/doc/qemu/interop/genindex.html
 share/doc/qemu/interop/index.html
@@ -58,19 +49,13 @@ share/doc/qemu/qemu-ga-ref.txt
 share/doc/qemu/qemu-qmp-ref.html
 share/doc/qemu/qemu-qmp-ref.txt
 share/doc/qemu/specs/.buildinfo
-share/doc/qemu/specs/_static/ajax-loader.gif
 share/doc/qemu/specs/_static/alabaster.css
 share/doc/qemu/specs/_static/basic.css
-share/doc/qemu/specs/_static/comment-bright.png
-share/doc/qemu/specs/_static/comment-close.png
-share/doc/qemu/specs/_static/comment.png
 share/doc/qemu/specs/_static/custom.css
 share/doc/qemu/specs/_static/doctools.js
 share/doc/qemu/specs/_static/documentation_options.js
-share/doc/qemu/specs/_static/down-pressed.png
-share/doc/qemu/specs/_static/down.png
 share/doc/qemu/specs/_static/file.png
-share/doc/qemu/specs/_static/jquery-3.2.1.js
+share/doc/qemu/specs/_static/jquery-3.4.1.js
 share/doc/qemu/specs/_static/jquery.js
 share/doc/qemu/specs/_static/language_data.js
 share/doc/qemu/specs/_static/minus.png
@@ -79,9 +64,6 @@ share/doc/qemu/specs/_static/pygments.css
 share/doc/qemu/specs/_static/searchtools.js
 share/doc/qemu/specs/_static/underscore-1.3.1.js
 share/doc/qemu/specs/_static/underscore.js
-share/doc/qemu/specs/_static/up-pressed.png
-share/doc/qemu/specs/_static/up.png
-share/doc/qemu/specs/_static/websupport.js
 share/doc/qemu/specs/genindex.html
 share/doc/qemu/specs/index.html
 share/doc/qemu/specs/objects.inv
diff --git a/qemu-nvmm/distinfo b/qemu-nvmm/distinfo
index 033bd4e038..54c1797573 100644
--- a/qemu-nvmm/distinfo
+++ b/qemu-nvmm/distinfo
@@ -14,3 +14,4 @@ SHA1 (patch-hw_net_etraxfs__eth.c) = e5dd1661d60dbcd27b332403e0843500ba9544bc
 SHA1 (patch-hw_net_xilinx__axienet.c) = ebcd2676d64ce6f31e4a8c976d4fdf530ad5e8b7
 SHA1 (patch-hw_usb_dev-mtp.c) = 0f9034fb3904e5d5e3b98d24b94e054181687d95
 SHA1 (patch-nvmm-support) = f164c48a25367d751d77faa87962321b0b086862
+SHA1 (patch-roms_u-boot_tools_imx8m__image.sh) = e4c452062f40569e33aa93eec4a65bd3af2e74fc