gentoo resync : 30.09.2018

3 files changed, 2 insertions, 45 deletions

diff --git a/net-analyzer/nmbscan/Manifest b/net-analyzer/nmbscan/Manifest
index 40058cfa4607..1d4e61d09540 100644
--- a/net-analyzer/nmbscan/Manifest
+++ b/net-analyzer/nmbscan/Manifest
@@ -1,5 +1,4 @@
 AUX nmbscan-1.2.5-head.diff 442 BLAKE2B e97b6359f9479b76eae7cddc837df06a02b5adf886ee142f5e0b6dfe27debda30d49197c0184e802686d00df510ed0f6a47ea90c294ee1e124fb980b379121e9 SHA512 6fd79b7b9462700245df3c91345a197cbadafb30f60737b2426285f9a4bff969c752bd68bdde4f305cdd8079a5c89fa1be75360a2e35caf495489c01081b0ceb
 DIST nmbscan-1.2.5.tar.gz 44749 BLAKE2B be49afa46c6ed1533f3e3d7b5c6fbe54b83802385ed9b670f1cdc0105eae99135000be5e98a693ad2adca54f9948ebacc8cd4fc677828a61a5fa85667d584fcd SHA512 37030c6759cc8b257356274b54ec7474e49ddc523be20180c509064f9238da3350f0f0e73e84f2e89201405e93a350a7a7cdc24ef890e638b62648ee2fc4feb9
-EBUILD nmbscan-1.2.5-r1.ebuild 567 BLAKE2B a3b7757cc183eab88a490c5b988c9dad46f1d200c50ba2a5551a0050afc97f932f3b7fc4dc5eb3e0016174c84a835a7149b80a30c63224aa2e3ce1a195cf7b65 SHA512 bb6787ef6d3fcf1e6b2ec656cf5870b0745f6cf317c2fef39733894d73266601b3362b684ec1fe23e7d6cc9269b069229799b1f84a23af21fcc06691fe73d1f7
-EBUILD nmbscan-1.2.5.ebuild 707 BLAKE2B 95ee73d14528ba7677d919ba46735bcd86e8aa94b4be89825e5fa0ba3fb828e42e6919807c4803abd4001397f8f67daf91fc47294791ae26329e506f192d4bbf SHA512 062ba8f53abd087691a76ba07e1ec71d9c5c2077a801792800ee9971d15f6350eae52ab9108b393c44d64ee014f67e54f48023d389baa86947401870cea1947f
+EBUILD nmbscan-1.2.5-r1.ebuild 560 BLAKE2B 34984ad2f4247700faef22e15f49e78950e40c4c0f6481a95b0b24344ff6e19de9cd0c5d14512c1ac32d837ec5b8f9fe629853d2d5717ceb953d448aec5da04c SHA512 6ac78a6009bbd489436f97776e435ba73e58e477d795a461780b9bb110a7f5c3e81d35aa4578a36b76d0ba77604d7e436cfeeeaf13cf7d25879725a817786616
 MISC metadata.xml 683 BLAKE2B 8a9b8ad3c95bf0889477f9f8bb0a5f150f24e6d1cdc796a870c8f315497c1383c585b51b18c43dbf2f66122cd0db332c4f10da05ec62647573ba02fe2b450f16 SHA512 f0bb01d9be906681f1e7bf349e776b7cfc15a61be7a3e944e7291dac9f42a3fe151b05e20c6a13b98c8bad598d56811699a8365ba9227419bea4e2373de26b19
diff --git a/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild b/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild
index ca165970fada..85b5ba140bc1 100644
--- a/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild
+++ b/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://nmbscan.g76r.eu/down/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ppc64 s390 ~sparc x86"
 
 RDEPEND="net-dns/bind-tools
 	net-fs/samba
diff --git a/net-analyzer/nmbscan/nmbscan-1.2.5.ebuild b/net-analyzer/nmbscan/nmbscan-1.2.5.ebuild
deleted file mode 100644
index 55bcd35032e7..000000000000
--- a/net-analyzer/nmbscan/nmbscan-1.2.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils
-
-DESCRIPTION="Scans the shares of a SMB/NetBIOS network"
-HOMEPAGE="http://nmbscan.g76r.eu/"
-SRC_URI="http://nmbscan.g76r.eu/down/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 s390 sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="app-shells/bash
-	net-dns/bind-tools
-	net-fs/samba
-	net-misc/iputils
-	sys-apps/coreutils
-	virtual/awk
-	sys-apps/grep
-	sys-apps/net-tools
-	sys-apps/sed"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-head.diff || die
-}
-
-src_configure() {
-	return
-}
-
-src_compile() {
-	return
-}
-
-src_install() {
-	dobin nmbscan || die
-}