From 9452a6e87b6c2c70513bc47a2470bf9f1168920e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Jun 2020 10:39:22 +0100 Subject: gentoo resync : 13.06.2020 --- app-emulation/nemu/Manifest | 8 +--- app-emulation/nemu/nemu-2.1.0.ebuild | 69 ---------------------------------- app-emulation/nemu/nemu-2.2.0.ebuild | 73 ------------------------------------ app-emulation/nemu/nemu-2.2.1.ebuild | 4 +- app-emulation/nemu/nemu-9999.ebuild | 21 +++++------ 5 files changed, 13 insertions(+), 162 deletions(-) delete mode 100644 app-emulation/nemu/nemu-2.1.0.ebuild delete mode 100644 app-emulation/nemu/nemu-2.2.0.ebuild (limited to 'app-emulation/nemu') diff --git a/app-emulation/nemu/Manifest b/app-emulation/nemu/Manifest index dcd74b075adc..ceea8f1c46b3 100644 --- a/app-emulation/nemu/Manifest +++ b/app-emulation/nemu/Manifest @@ -1,8 +1,4 @@ -DIST nemu-2.1.0.tar.gz 89117 BLAKE2B a44bf67990d79af0b73caf077266c4775f302ffc81d2394993da45870a72f462d487a92d63abdbe875c382d11b8d691f446a5e0b7270355770838ea86328fb1d SHA512 7e655227e22f5e2dd5ec1f77ef1635f1aaab2e57e417fb33d83d35cc67d7b802c35fa9174cf4282287213a1a825714743773260b96b452a382a8248fbef238bf -DIST nemu-2.2.0.tar.gz 94061 BLAKE2B 95304e8834f1d5c1e31065728363de5d797ae79554733dd3fecd90388b2766bc8907acfeded36676272967153eed5a7f30baba9ef2384fca67d19f3519461fa6 SHA512 2f427a560ea5ac4112b7d5cdd8524366521ca3d185676a4faa9bc480331c3381b7a362aed20025dc1acc0f576f07fb627b03137e1998926761a169c5be0eaf97 DIST nemu-2.2.1.tar.gz 94600 BLAKE2B 16060ee1ed00f97a442d9f6b9a3f940d9777d24dea70336e382071ce7e9f7e077d58827110f4b0d64091c5777d516e95968ed0e1d4886b9fe2a3709fb466229d SHA512 e6f244c01582351f9e0f61a0a6848937a68b8d077500d0f8095784b871e9c9809bf5830c27918e84a77a64fcee3d6f81d8a06a031160f0beddc48614eb86624a -EBUILD nemu-2.1.0.ebuild 1672 BLAKE2B 7120f2c3a00e22e6ff2e3535b8fbb51d1995e85075386e32782ab98799a9a6de36618493caef92022ef6bcbb1865cd559cc6282e50627256a5136f25b8df8c77 SHA512 f4f0b240a8716757a80564cf4f0cd65b8592a6c45276e4cb2a2c90c6e7a7aa3406fac0b91b7ab98f551b8482390571432063c062880488ffe589bb404b9f2f17 -EBUILD nemu-2.2.0.ebuild 1857 BLAKE2B 221d8ba7d1560fc554a14252d63308da6837a17371ee0efa9b48a8117c9c1ef560c480ed2a5b4d923903f80e6f84e4b3d1238216d43f23e5f4cf49ea5b7e06f2 SHA512 3e9e955c674b0a94e8ea5b5415ee52978ffc929ddfc61270c96dc61acac0f845bcdbc35cb24f1d34fbb58931222345bdeae368c53bbf66164644f35113bf620c -EBUILD nemu-2.2.1.ebuild 1857 BLAKE2B 221d8ba7d1560fc554a14252d63308da6837a17371ee0efa9b48a8117c9c1ef560c480ed2a5b4d923903f80e6f84e4b3d1238216d43f23e5f4cf49ea5b7e06f2 SHA512 3e9e955c674b0a94e8ea5b5415ee52978ffc929ddfc61270c96dc61acac0f845bcdbc35cb24f1d34fbb58931222345bdeae368c53bbf66164644f35113bf620c -EBUILD nemu-9999.ebuild 1916 BLAKE2B 232c49c84167c44c6fc3afd2e1b26cb6f820b53d345956c4d92058368f095206e3351ac431728a6f8847a88e53f09af7e39b5ff24874635b231b9a1ca6df7abc SHA512 87b016f6a485c921222428b96b11687cfb906118cfc398318b14f45ebd1c09aeb710b0cdea389a41e5936478e31645925599b32fe203fe07559debb54d7ed9b4 +EBUILD nemu-2.2.1.ebuild 1860 BLAKE2B ebf283bb548989ac7ce577f795af1989ca0153c36e93a0f26089c51e730f4db118d9e88fd13d46c6df5b21f431fbfa421f89f6a6ad0d0ca259bdd70e1e3a9259 SHA512 408fd8685a06b5d4f0d384d4115bb66825ec540370152f39a14545415dd798605839426ebd3292ff3516ec6e5422bb6e7744c88b8195b59dc1f8e47670c246ba +EBUILD nemu-9999.ebuild 1807 BLAKE2B 184913b0d41c88acc6861ca2cd1f1dca5d82c6646ae7066465e82782eb610712e75a0ddfb1431fdf414e4aa57f66438a80e61fc5f266d3204be08bd0e3fb7a21 SHA512 c36e0f8285d7131ae2d72b9ec9c061f2f32749565537f7863ffce35eb7f52a7d438b33ce06d451e15e4490f7cc188c382641e4b21fc4a2bbb946f7fafa70aa8d MISC metadata.xml 638 BLAKE2B a90b3636fe59b93525c49d40bd9875d068f11b10dfb582e64aecefcfd77d3d87dfc0b4d0621038e3075219b0e0bcc0add96aa2b6eb840b6fec1240962824419d SHA512 663fbac22b8df6daecda876b76105da92c985bf3f767f4f3477ce71d74e8ada3ef93e84072fd845b07622ea76860a1f3af0cbf67081e6e9e68d192caf4c81315 diff --git a/app-emulation/nemu/nemu-2.1.0.ebuild b/app-emulation/nemu/nemu-2.1.0.ebuild deleted file mode 100644 index 2f7326437e33..000000000000 --- a/app-emulation/nemu/nemu-2.1.0.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -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" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="+vnc-client +ovf savevm debug" - -RDEPEND=" - virtual/udev:= - dev-db/sqlite:3= - virtual/libusb:1 - app-emulation/qemu[vnc,virtfs] - sys-libs/ncurses:0=[unicode] - ovf? ( - dev-libs/libxml2 - app-arch/libarchive - ) - vnc-client? ( net-misc/tigervnc )" - -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) - ) - 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 " - 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 -} diff --git a/app-emulation/nemu/nemu-2.2.0.ebuild b/app-emulation/nemu/nemu-2.2.0.ebuild deleted file mode 100644 index 7b885f4f50c6..000000000000 --- a/app-emulation/nemu/nemu-2.2.0.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils linux-info - -DESCRIPTION="ncurses interface for QEMU" -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="debug network-map +ovf savevm spice +vnc-client" - -RDEPEND="app-emulation/qemu[vnc,virtfs,spice?] - dev-db/sqlite:3= - sys-libs/ncurses:0=[unicode] - virtual/libusb:1 - virtual/libudev:= - network-map? ( media-gfx/graphviz ) - ovf? ( - - dev-libs/libxml2:2 - app-arch/libarchive - - ) - vnc-client? ( net-misc/tigervnc )" - -DEPEND="${RDEPEND}" - -BDEPEND="sys-devel/gettext" - -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 -} - -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 " - 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 -} diff --git a/app-emulation/nemu/nemu-2.2.1.ebuild b/app-emulation/nemu/nemu-2.2.1.ebuild index 7b885f4f50c6..7b191e31dc57 100644 --- a/app-emulation/nemu/nemu-2.2.1.ebuild +++ b/app-emulation/nemu/nemu-2.2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019 Gentoo Authors +# Copyright 2019-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://lib.void.so/src/${P}.tar.gz" LICENSE="BSD-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="debug network-map +ovf savevm spice +vnc-client" RDEPEND="app-emulation/qemu[vnc,virtfs,spice?] diff --git a/app-emulation/nemu/nemu-9999.ebuild b/app-emulation/nemu/nemu-9999.ebuild index fe30968437c7..b171fc8f123e 100644 --- a/app-emulation/nemu/nemu-9999.ebuild +++ b/app-emulation/nemu/nemu-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -6,25 +6,25 @@ EAPI=6 inherit cmake-utils linux-info git-r3 DESCRIPTION="ncurses interface for QEMU" -HOMEPAGE="https://lib.void.so/nemu" -EGIT_REPO_URI="https://bitbucket.org/PascalRD/nemu.git" +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 savevm debug" +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 ) - app-emulation/qemu[vnc,virtfs] + || ( 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 ) - vnc-client? ( net-misc/tigervnc )" + svg? ( media-gfx/graphviz[svg] )" DEPEND=" ${RDEPEND} @@ -36,6 +36,8 @@ src_configure() { -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 } @@ -57,11 +59,6 @@ pkg_pretend() { } pkg_postinst() { - elog "Old database is not supported (nEMU versions < 1.0.0)." - elog "You will need to delete current database." - elog "If upgraded from 1.0.0, execute script:" - elog "/usr/share/nemu/scripts/upgrade_db.sh" - elog "" elog "For non-root usage execute script:" elog "/usr/share/nemu/scripts/setup_nemu_nonroot.sh linux " elog "and add udev rule:" -- cgit v1.2.3