gentoo resync : 15.06.2021

3 files changed, 2 insertions, 74 deletions

diff --git a/app-emulation/nemu/Manifest b/app-emulation/nemu/Manifest
index e6ffdc184363..34a211ada923 100644
--- a/app-emulation/nemu/Manifest
+++ b/app-emulation/nemu/Manifest
@@ -1,6 +1,5 @@
 DIST nemu-2.2.1.tar.gz 94600 BLAKE2B 16060ee1ed00f97a442d9f6b9a3f940d9777d24dea70336e382071ce7e9f7e077d58827110f4b0d64091c5777d516e95968ed0e1d4886b9fe2a3709fb466229d SHA512 e6f244c01582351f9e0f61a0a6848937a68b8d077500d0f8095784b871e9c9809bf5830c27918e84a77a64fcee3d6f81d8a06a031160f0beddc48614eb86624a
 DIST nemu-2.5.0.tar.gz 108742 BLAKE2B e68cbf50d56983873656d8e3428cb3ffaa09cafc9cbc8e545d72bf9dfb61e64a06bdc41c3f50011c4c488017efe33afe9fa1d634aae6e9151c45a7d3971c60db SHA512 081199413c41e545d23704091760c4a10b8dcdb21d9d0e6add1e549fa33bdd988490034767e08dee681eee6d06899104b8282cafc4578e06a0eabc505325bbdc
 EBUILD nemu-2.2.1.ebuild 1860 BLAKE2B ebf283bb548989ac7ce577f795af1989ca0153c36e93a0f26089c51e730f4db118d9e88fd13d46c6df5b21f431fbfa421f89f6a6ad0d0ca259bdd70e1e3a9259 SHA512 408fd8685a06b5d4f0d384d4115bb66825ec540370152f39a14545415dd798605839426ebd3292ff3516ec6e5422bb6e7744c88b8195b59dc1f8e47670c246ba
-EBUILD nemu-2.5.0.ebuild 2126 BLAKE2B 9b44d87d92e59ad7a660e5eb28d06678ee1771a4cdee5d3054f4806e32c98d07b9348a248528e9c3b8bfda7c6a682989c44e20fd64c37326e9406748d285f1fb SHA512 d6687a6d6f4ecbc9b8f3eb892b2e92a9f9cfc34e9d707bae7560f6a4c6e9203061108ce9e083914d72451f6817b23b232b77ab40f2c866d5f9678964bb30af75
-EBUILD nemu-9999.ebuild 1807 BLAKE2B 184913b0d41c88acc6861ca2cd1f1dca5d82c6646ae7066465e82782eb610712e75a0ddfb1431fdf414e4aa57f66438a80e61fc5f266d3204be08bd0e3fb7a21 SHA512 c36e0f8285d7131ae2d72b9ec9c061f2f32749565537f7863ffce35eb7f52a7d438b33ce06d451e15e4490f7cc188c382641e4b21fc4a2bbb946f7fafa70aa8d
+EBUILD nemu-2.5.0.ebuild 2124 BLAKE2B 5d6cfc96e820326c333fd9a32c157325d9ee3795248e04bb1978d452e5ad681e0725ff5e62d7eb92eae1c297e8b0f299b80fd7616ef2ebb3d58ca07aef2782c8 SHA512 4aaf9cfa65661c3755f164857e47687e72e0524c73bf5ac06fd16856d9cfc9dd3325971de9aeffcbd69c666be198a74f86a177144bd74999769b4639a9aaa9c4
 MISC metadata.xml 638 BLAKE2B a90b3636fe59b93525c49d40bd9875d068f11b10dfb582e64aecefcfd77d3d87dfc0b4d0621038e3075219b0e0bcc0add96aa2b6eb840b6fec1240962824419d SHA512 663fbac22b8df6daecda876b76105da92c985bf3f767f4f3477ce71d74e8ada3ef93e84072fd845b07622ea76860a1f3af0cbf67081e6e9e68d192caf4c81315
diff --git a/app-emulation/nemu/nemu-2.5.0.ebuild b/app-emulation/nemu/nemu-2.5.0.ebuild
index 799186bb4b86..a9bc2ac75bbe 100644
--- a/app-emulation/nemu/nemu-2.5.0.ebuild
+++ b/app-emulation/nemu/nemu-2.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/nemuTUI/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="dbus network-map +ovf +savevm spice +vnc-client"
 
 RDEPEND="
diff --git a/app-emulation/nemu/nemu-9999.ebuild b/app-emulation/nemu/nemu-9999.ebuild
deleted file mode 100644
index b171fc8f123e..000000000000
--- a/app-emulation/nemu/nemu-9999.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils linux-info git-r3
-
-DESCRIPTION="ncurses interface for QEMU"
-HOMEPAGE="https://github.com/nemuTUI/nemu"
-EGIT_REPO_URI="https://github.com/nemuTUI/nemu"
-SRC_URI=""
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="+vnc-client +ovf +spice savevm svg debug"
-
-RDEPEND="
-	sys-libs/ncurses:0=[unicode]
-	dev-db/sqlite:3=
-	virtual/libusb:1
-	|| ( sys-fs/eudev sys-fs/udev sys-apps/systemd )
-	>=app-emulation/qemu-2.12.0[vnc,virtfs,spice?]
-	ovf? (
-		dev-libs/libxml2
-		app-arch/libarchive
-	)
-	svg? ( media-gfx/graphviz[svg] )"
-
-DEPEND="
-	${RDEPEND}
-	sys-devel/gettext"
-
-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)
-		-DNM_WITH_NETWORK_MAP=$(usex svg)
-		-DNM_WITH_SPICE=$(usex spice)
-	)
-	cmake-utils_src_configure
-}
-
-pkg_pretend() {
-	if use kernel_linux; then
-		if ! linux_config_exists; then
-			eerror "Unable to check your kernel"
-		else
-			CONFIG_CHECK="~VETH ~MACVTAP"
-			ERROR_VETH="You will need the Virtual ethernet pair device driver compiled"
-			ERROR_VETH+=" into your kernel or loaded as a module to use the"
-			ERROR_VETH+=" local network settings feature."
-			ERROR_MACVTAP="You will also need support for MAC-VLAN based tap driver."
-
-			check_extra_config
-		fi
-	fi
-}
-
-pkg_postinst() {
-	elog "For non-root usage execute script:"
-	elog "/usr/share/nemu/scripts/setup_nemu_nonroot.sh linux <username>"
-	elog "and add udev rule:"
-	elog "cp /usr/share/nemu/scripts/42-net-macvtap-perm.rules /lib/udev/rules.d"
-	if use savevm; then
-		elog ""
-		elog "QEMU must be patched with qemu-qmp-savevm-VERSION.patch"
-		elog "Get this patch from nEMU repository"
-	fi
-}