gentoo resync : 30.05.2020

3 files changed, 39 insertions, 51 deletions

diff --git a/net-analyzer/nmapsi/Manifest b/net-analyzer/nmapsi/Manifest
index 4ab52abf1702..ffc76ee250fb 100644
--- a/net-analyzer/nmapsi/Manifest
+++ b/net-analyzer/nmapsi/Manifest
@@ -1,3 +1,3 @@
-DIST nmapsi4-0.5-alpha1.tar.xz 3163140 BLAKE2B 3ad390057c0d0c465c8b361a4c64f7682a596201a3e26f5b8c873e76cf5cdfeb327f961a72cfa921d666bce3dc5dd8feb44e67e277c6d982b930054e6620d97e SHA512 fa4e604aeb6b342dec7e3fc85d83eda04385bd49a8d53b88e1eec2878c2c3410575a3ae59c59e6cd8e2b9f83de204f895a128d1cf3e7cccbd6bd7b78abd7dcfb
-EBUILD nmapsi-0.5_alpha1.ebuild 915 BLAKE2B fca29e069894e44150e3d18ae710ba2a0c3daae9d7c1a77f9a3f59188218c44ab388a8c6c4c20ad811e3d189cdfde21fd94adbf2db147e8a04a137dc2555b60b SHA512 6475b2da58818b8091ae771bfb6df665c9889a858baba6be74c33a914a43527bf91c586b1f8a8892ab227a4c4f25a3d4c79dd32a0ef6ad4772a4648e72217b2a
+DIST nmapsi-0.5_alpha2.tar.gz 3547174 BLAKE2B a02d60c9be2d99e46104a81502bc98a0be9892a1cd1efbb5768b420a4275ea235e89c0e331797ec4ce733631cb763f6299a7d6079055bbaec17674107c4cf768 SHA512 29f6dd383808b253fa50fe0ca25c5189e106e79a0c6aac9351b8969eec2fd0aca7a329c49acf07c04ccd079a2ae66ad0b218a066762abe21165f1c25622a50f2
+EBUILD nmapsi-0.5_alpha2.ebuild 710 BLAKE2B d358cacd74a33fd5c94b072e4daba6c8397a0a1e1a66b5789f88f275b3aedd49125639b0f088ae1e87bb71d780bcd012921ba8d4efe1854dce21333729a73549 SHA512 699eccb5325dac4df0b90e20defcef737902b03e67a5dfb747e3706cce4ff38d336efa21d9162f5b04353ad412185345233d623f8bd85c6df9f85c3f56314fd9
 MISC metadata.xml 378 BLAKE2B 51e2f5ddeec658ab6599f6bfb4297ab132c03d4f560933aa875b95cf5be8506ba8c0ce2a6950a2ccd8d0ebf41a69a8685577846a4199658b9a91e14ccb6ad489 SHA512 c467eeeaab8c2b8e44271a5eba698d0c515782b1d8e863d62022c8d7b7ce2491193f3753e5eaf4b5dee025ea842e6c6fea83838dce69a97ce35d50a40ebbcd11
diff --git a/net-analyzer/nmapsi/nmapsi-0.5_alpha1.ebuild b/net-analyzer/nmapsi/nmapsi-0.5_alpha1.ebuild
deleted file mode 100644
index 0da2c99b83b4..000000000000
--- a/net-analyzer/nmapsi/nmapsi-0.5_alpha1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PLOCALES="ca cs de es fr it ru"
-
-inherit cmake-utils l10n
-
-MY_P=${PN}4-${PV/_/-}
-
-DESCRIPTION="A Qt frontend to nmap"
-HOMEPAGE="http://www.nmapsi4.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtscript:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${CDEPEND}
-	dev-qt/linguist-tools:5
-"
-RDEPEND="${CDEPEND}
-	net-analyzer/nmap
-	net-dns/bind-tools
-"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS HACKING README.md TODO Translation )
-
-nmapsi_disable_locale() {
-	sed -i -e "/ts\/${PN}4_${1}\.ts/d" src/CMakeLists.txt || die
-}
-
-src_prepare() {
-	l10n_for_each_disabled_locale_do nmapsi_disable_locale
-	cmake-utils_src_prepare
-}
diff --git a/net-analyzer/nmapsi/nmapsi-0.5_alpha2.ebuild b/net-analyzer/nmapsi/nmapsi-0.5_alpha2.ebuild
new file mode 100644
index 000000000000..07d77fb3b796
--- /dev/null
+++ b/net-analyzer/nmapsi/nmapsi-0.5_alpha2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Qt frontend to nmap"
+HOMEPAGE="https://github.com/nmapsi4/nmapsi4"
+SRC_URI="https://github.com/nmapsi4/nmapsi4/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtscript:5
+	dev-qt/qtwebengine:5[widgets]
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}
+	net-analyzer/nmap
+	net-dns/bind-tools
+"
+
+S="${WORKDIR}/${PN}4-${PV/_/-}"
+
+DOCS=( AUTHORS HACKING README.md TODO Translation )