gentoo resync : 19.03.2019

3 files changed, 32 insertions, 26 deletions

diff --git a/app-emulation/nemu/Manifest b/app-emulation/nemu/Manifest
index fae3f3bb0a2f..4b556629cbfb 100644
--- a/app-emulation/nemu/Manifest
+++ b/app-emulation/nemu/Manifest
@@ -1,6 +1,6 @@
-DIST nemu-2.0.0.tar.gz 85769 BLAKE2B daadbd5925d56d3747b59a3a8f28ceeeb24a674e57f003cf07c67c24dc0ed73f024d35e2f02836d89c7568b7ac51bfc3c6131afb4864febdd6ac6f86a827bfee SHA512 74c489e35b96699fcc5f9cabdbe4445c1cdad5b06c2a18928e2270e169b76e009463177990c4f4d80b160e06118b0b4e87209132cc0ae0ee3d77e2d811865f5a
 DIST nemu-2.1.0.tar.gz 89117 BLAKE2B a44bf67990d79af0b73caf077266c4775f302ffc81d2394993da45870a72f462d487a92d63abdbe875c382d11b8d691f446a5e0b7270355770838ea86328fb1d SHA512 7e655227e22f5e2dd5ec1f77ef1635f1aaab2e57e417fb33d83d35cc67d7b802c35fa9174cf4282287213a1a825714743773260b96b452a382a8248fbef238bf
-EBUILD nemu-2.0.0.ebuild 1677 BLAKE2B 86cda2a8ea881b7ad662a6a4cde1b167329d42343929556aeb2ed0df639a240e5775e92c6a866843691750a3efb7d1ede1e8d1c53a9ad956cdb1867b0879eaa9 SHA512 328d92af10ace6733a6cba58ede2bfe75fa464fc208fa81faf9a6c6e0d6e56ef7328dc4ec1e8295a6908fd9d438d0931dc84b59091e17d46c057d0e0dc48cb41
+DIST nemu-2.2.0.tar.gz 94061 BLAKE2B 95304e8834f1d5c1e31065728363de5d797ae79554733dd3fecd90388b2766bc8907acfeded36676272967153eed5a7f30baba9ef2384fca67d19f3519461fa6 SHA512 2f427a560ea5ac4112b7d5cdd8524366521ca3d185676a4faa9bc480331c3381b7a362aed20025dc1acc0f576f07fb627b03137e1998926761a169c5be0eaf97
 EBUILD nemu-2.1.0.ebuild 1672 BLAKE2B 7120f2c3a00e22e6ff2e3535b8fbb51d1995e85075386e32782ab98799a9a6de36618493caef92022ef6bcbb1865cd559cc6282e50627256a5136f25b8df8c77 SHA512 f4f0b240a8716757a80564cf4f0cd65b8592a6c45276e4cb2a2c90c6e7a7aa3406fac0b91b7ab98f551b8482390571432063c062880488ffe589bb404b9f2f17
+EBUILD nemu-2.2.0.ebuild 1857 BLAKE2B 221d8ba7d1560fc554a14252d63308da6837a17371ee0efa9b48a8117c9c1ef560c480ed2a5b4d923903f80e6f84e4b3d1238216d43f23e5f4cf49ea5b7e06f2 SHA512 3e9e955c674b0a94e8ea5b5415ee52978ffc929ddfc61270c96dc61acac0f845bcdbc35cb24f1d34fbb58931222345bdeae368c53bbf66164644f35113bf620c
 EBUILD nemu-9999.ebuild 1916 BLAKE2B 232c49c84167c44c6fc3afd2e1b26cb6f820b53d345956c4d92058368f095206e3351ac431728a6f8847a88e53f09af7e39b5ff24874635b231b9a1ca6df7abc SHA512 87b016f6a485c921222428b96b11687cfb906118cfc398318b14f45ebd1c09aeb710b0cdea389a41e5936478e31645925599b32fe203fe07559debb54d7ed9b4
-MISC metadata.xml 499 BLAKE2B 2d190da58be258c1e5e997128bc65e9f928c9ec86e9be23d43cc881c92d9cd65e9cdee6db7afb92abf799aaa552ad5ddcf6dbdafd26d12c2521e8724f7f98471 SHA512 42e56aaad5eff7d180c6af0ef571f5fca4e101e934fc7506387456d89068ab8446e861dcd1124d85d962bf05b48a26833d0883b7c152c7214c79c324c18d236f
+MISC metadata.xml 638 BLAKE2B a90b3636fe59b93525c49d40bd9875d068f11b10dfb582e64aecefcfd77d3d87dfc0b4d0621038e3075219b0e0bcc0add96aa2b6eb840b6fec1240962824419d SHA512 663fbac22b8df6daecda876b76105da92c985bf3f767f4f3477ce71d74e8ada3ef93e84072fd845b07622ea76860a1f3af0cbf67081e6e9e68d192caf4c81315
diff --git a/app-emulation/nemu/metadata.xml b/app-emulation/nemu/metadata.xml
index ad75c6dc879c..b2ce9edb9146 100644
--- a/app-emulation/nemu/metadata.xml
+++ b/app-emulation/nemu/metadata.xml
@@ -8,6 +8,8 @@
 	<use>
 		<flag name="vnc-client">Adds support for external VNC client</flag>
 		<flag name="savevm">Adds support for QEMU savevm snapshots (experimental, QEMU must be patched)</flag>
+		<flag name="spice">Adds Spice protocol support</flag>
 		<flag name="ovf">Adds support for OVA/OVF import</flag>
+		<flag name="network-map">Adds possibility of exporting network map to SVG</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-emulation/nemu/nemu-2.0.0.ebuild b/app-emulation/nemu/nemu-2.2.0.ebuild
index fad6abdf3786..7b885f4f50c6 100644
--- a/app-emulation/nemu/nemu-2.0.0.ebuild
+++ b/app-emulation/nemu/nemu-2.2.0.ebuild
@@ -1,44 +1,36 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils linux-info
 
 DESCRIPTION="ncurses interface for QEMU"
-HOMEPAGE="https://lib.void.so/nemu"
-SRC_URI="http://lib.void.so/src/${P}.tar.gz"
+HOMEPAGE="https://lib.void.so/nemu/ https://bitbucket.org/PascalRD/nemu/"
+SRC_URI="https://lib.void.so/src/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+vnc-client +ovf savevm debug"
+IUSE="debug network-map +ovf savevm spice +vnc-client"
 
-RDEPEND="
-	virtual/udev:=
+RDEPEND="app-emulation/qemu[vnc,virtfs,spice?]
 	dev-db/sqlite:3=
-	virtual/libusb:1
-	app-emulation/qemu[vnc,virtfs]
 	sys-libs/ncurses:0=[unicode]
+	virtual/libusb:1
+	virtual/libudev:=
+	network-map? ( media-gfx/graphviz )
 	ovf? (
-		dev-libs/libxml2
-		app-arch/libarchive
+
+	dev-libs/libxml2:2
+	app-arch/libarchive
+
 	)
 	vnc-client? ( net-misc/tigervnc )"
 
-DEPEND="
-	${RDEPEND}
-	sys-devel/gettext"
+DEPEND="${RDEPEND}"
 
-src_configure() {
-	local mycmakeargs=(
-		-DNM_WITH_VNC_CLIENT=$(usex vnc-client)
-		-DNM_DEBUG=$(usex debug)
-		-DNM_SAVEVM_SNAPSHOTS=$(usex savevm)
-		-DNM_WITH_OVF_SUPPORT=$(usex ovf)
-	)
-	cmake-utils_src_configure
-}
+BDEPEND="sys-devel/gettext"
 
 pkg_pretend() {
 	if use kernel_linux; then
@@ -56,6 +48,18 @@ pkg_pretend() {
 	fi
 }
 
+src_configure() {
+	local mycmakeargs=(
+		-DNM_DEBUG=$(usex debug)
+		-DNM_WITH_NETWORK_MAP=$(usex network-map)
+		-DNM_WITH_OVF_SUPPORT=$(usex ovf)
+		-DNM_SAVEVM_SNAPSHOTS=$(usex savevm)
+		-DNM_WITH_SPICE=$(usex spice)
+		-DNM_WITH_VNC_CLIENT=$(usex vnc-client)
+	)
+	cmake-utils_src_configure
+}
+
 pkg_postinst() {
 	elog "For non-root usage execute script:"
 	elog "/usr/share/nemu/scripts/setup_nemu_nonroot.sh linux <username>"