3 files changed, 2 insertions, 32 deletions
diff --git a/net-analyzer/pbnj/Manifest b/net-analyzer/pbnj/Manifest
index c1081b148282..115f30c09d38 100644
--- a/net-analyzer/pbnj/Manifest
+++ b/net-analyzer/pbnj/Manifest
@@ -1,5 +1,4 @@
 AUX pbnj-2.04-ipv4_sort.patch 355 BLAKE2B 86081918c4077cefb114e75009c18d43e16e1debdd27032d4baec9cf5408df8b99377714e154fc4274feca019438e5635736309a69c4d14e94908b737963c198 SHA512 cecdc0ad7348682614ffb22a53a804000a2004dcef2d1c9d172b3fd9a684348dd07134ad1de6c421009d4c67b9571f8ca6dc6eb3095a604e2def39401cdf365e
 DIST pbnj-2.04.tar.bz2 57438 BLAKE2B 43b057fb95e74cd7f4d8d11e905fb6c3734971295db13116e94250a7665d28f5a9bb288b5ba07f50c7426a9a90664ea90bb790ad0aea87c24838398faa3ec0f8 SHA512 7f486c4e16a891d90ff10fa80b85ba68346f37152c5f932832c3760985f0dff5c58e0f23309ed395f0c06ff4287bf4af66d1b39de7f2838a868e6b8335afe206
-EBUILD pbnj-2.04-r1.ebuild 732 BLAKE2B 58eff20a310ae7362cd058b62922722a4dfa45efdc9d038890ad74d94a6c44898fe430932ce59b913ddbf892e0748b261a9023960201891a7e1459567bebff1c SHA512 2030ef6ce558c502ef15f092f1cf16c9b91a957dbce59dfa456be71eb962c2f2fe42c0d155d0817024e487d40fa1be65e323a446bc4eaa09c7075ec61c0b56fa
-EBUILD pbnj-2.04.ebuild 560 BLAKE2B bc62b1c436dcd802cb418520ab05d4ab48249a1eea68ed833da533305728ef403972c6fe969e586513c7b28b3ea34c8118cac6805835747310dd76bbbbbe5afe SHA512 74a9321c4118429e2014596f3802d0840d100440495f5a1a657d4d870d76cde1172fcedbdff6f080f2e5baf3a4f3c2407f5a7b70145cb221b8144cc90f460248
+EBUILD pbnj-2.04-r1.ebuild 730 BLAKE2B 10d048392169c6eeeca733edcadb8628cbe8e0e3efd0017ed6329f0479879cdbc46d12e2d85859100e2401d7263c977e0bc7bcf10d9876c819e46972a8077cde SHA512 333e51a6e9d062c2a69057c2f36e544b55099c02374b86c725c13782d33276bddb2b6211d2c1d8da5e18db5fa40ecfb72c5725fbd87fc139ca92c010652944bb
 MISC metadata.xml 364 BLAKE2B 807335b7d101c779cd839046363f44b2d208636286b4e7013efcc7c2fe257d82391fd5151c098d9bba49bfb371a9cb78759b5280948331ba9b598416fbf17c93 SHA512 cbd77dbb09b911704cd44e430b7513254998eb0fd1853d2c6a158d8c72145df56e71a54229a8c540769bb2cd502195249e23cf3fc38f80268643389617e42b2b
diff --git a/net-analyzer/pbnj/pbnj-2.04-r1.ebuild b/net-analyzer/pbnj/pbnj-2.04-r1.ebuild
index 22d8615ff550..e62cc418dda4 100644
--- a/net-analyzer/pbnj/pbnj-2.04-r1.ebuild
+++ b/net-analyzer/pbnj/pbnj-2.04-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/pbnj/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	dev-perl/DBD-SQLite
diff --git a/net-analyzer/pbnj/pbnj-2.04.ebuild b/net-analyzer/pbnj/pbnj-2.04.ebuild
deleted file mode 100644
index 1c04a49c3a0b..000000000000
--- a/net-analyzer/pbnj/pbnj-2.04.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit perl-module
-
-DESCRIPTION="A tool for running Nmap scans and diff'ing the results"
-HOMEPAGE="http://pbnj.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pbnj/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	dev-perl/DBD-SQLite
-	dev-perl/DBI
-	dev-perl/File-HomeDir
-	dev-perl/File-Which
-	dev-perl/Nmap-Parser
-	dev-perl/Text-CSV_XS
-	dev-perl/XML-Twig
-	dev-perl/YAML
-"
-RDEPEND="
-	${DEPEND}
-	net-analyzer/nmap
-"