diff --git a/net-analyzer/amass/amass-3.0.16.ebuild b/net-analyzer/amass/amass-3.0.16.ebuild
deleted file mode 100644
index 20bb4f206..000000000
--- a/net-analyzer/amass/amass-3.0.16.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_VENDOR=(
-
-	"github.com/boltdb/bolt v1.3.1"
-	"github.com/caffix/cloudflare-roundtripper 4c29d231c9cb6ed0381bd10db5502610a2f59df9"
-	"github.com/cayleygraph/cayley v0.7.5"
-	"github.com/cenkalti/backoff v2.1.1" #indirect
-	"github.com/dghubble/go-twitter 53f972dc4b06"
-	"github.com/dghubble/sling v1.2.0"
-	"github.com/fatih/color v1.7.0"
-	"github.com/go-ini/ini v1.42.0"
-	"github.com/gogo/protobuf v1.2.1"
-	"github.com/google/go-querystring v1.0.0" #indirect
-
-	"github.com/gorilla/websocket v1.4.0" #indirect
-	"github.com/irfansharif/cfilter v0.1.1"
-	"github.com/jmoiron/sqlx v1.2.0"
-	"github.com/johnnadratowski/golang-neo4j-bolt-driver 6b24c0085aae"
-	"github.com/lib/pq v1.1.1"
-	"github.com/mattn/go-colorable v0.1.2" #indirect
-	"github.com/miekg/dns v1.1.14"
-	"github.com/mitchellh/go-homedir v1.1.0"
-	"github.com/qasaur/gremgo fa23ada7c5da27801a4c57e83ca1df451139a2f0"
-	"github.com/robertkrimen/otto 15f95af6e78dcd2030d8195a138bd88d4f403546" # indirect
-	"github.com/satori/go.uuid v1.2.0"
-
-	"github.com/tylertreat/BoomFilters 611b3dbe80e8"
-
-	"gopkg.in/sourcemap.v1 v1.0.5 github.com/go-sourcemap/sourcemap" #indirect
-
-)
-
-EGO_PN=github.com/OWASP/Amass
-
-inherit golang-vcs-snapshot
-
-EGIT_COMMIT="${PV}"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz ${EGO_VENDOR_URI}"
-SRC_URI="${ARCHIVE_URI} ${EGO_VENDOR_URI}"
-
-DESCRIPTION="Subdomain OSINT Enumeration"
-HOMEPAGE="https://github.com/OWASP/Amass"
-LICENSE="Apache-2.0"
-SLOT=0
-IUSE=""
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-#extracted from go.mod
-DEPEND=">=dev-lang/go-1.11.6
-	>=dev-go/fetchbot-1.1.2
-	>=dev-go/goquery-1.5.0
-	>=dev-go/uuid-1.1.1
-	>=dev-go/cascadia-1.0.0
-	>=dev-go/robotstxt-go-20180810
-	dev-go/go-crypto
-	dev-go/go-oauth2
-	dev-go/go-sys"
-
-#https://bugs.gentoo.org/673704
-#	dev-go/gopkg-sourcemap
-
-RDEPEND="${DEPEND}"
-
-#https://github.com/golang/go/issues/27348
-#src_prepare() {
-#	cd src/${EGO_PN}
-#	go mod verify
-#	eapply_user
-#}
-
-src_compile() {
-	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
-	go install -v -work -x ${EGO_BUILD_FLAGS} ./...
-}
-
-src_install(){
-	dobin bin/amass*
-}
diff --git a/net-analyzer/amass/amass-3.0.18.ebuild b/net-analyzer/amass/amass-3.0.18-r1.ebuild
similarity index 99%
rename from net-analyzer/amass/amass-3.0.18.ebuild
rename to net-analyzer/amass/amass-3.0.18-r1.ebuild
index d08068bcb..e58cd889e 100644
--- a/net-analyzer/amass/amass-3.0.18.ebuild
+++ b/net-analyzer/amass/amass-3.0.18-r1.ebuild
@@ -110,7 +110,7 @@ DEPEND=">=dev-lang/go-1.11.6
 #https://bugs.gentoo.org/673704
 #	dev-go/gopkg-sourcemap
 
-RDEPEND="${DEPEND}"
+RDEPEND=""
 
 #https://github.com/golang/go/issues/27348
 #src_prepare() {
diff --git a/net-analyzer/gobuster/gobuster-3.0.0.ebuild b/net-analyzer/gobuster/gobuster-3.0.1-r1.ebuild
similarity index 97%
rename from net-analyzer/gobuster/gobuster-3.0.0.ebuild
rename to net-analyzer/gobuster/gobuster-3.0.1-r1.ebuild
index a94529f5f..9f7642b63 100644
--- a/net-analyzer/gobuster/gobuster-3.0.0.ebuild
+++ b/net-analyzer/gobuster/gobuster-3.0.1-r1.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	>=dev-lang/go-1.10
 	dev-go/go-crypto
 "
-DEPEND="${RDEPEND}"
+DEPEND=""
 
 src_install(){
 	dobin gobuster
diff --git a/net-analyzer/gobuster/gobuster-3.0.1.ebuild b/net-analyzer/gobuster/gobuster-3.0.1.ebuild
deleted file mode 100644
index a94529f5f..000000000
--- a/net-analyzer/gobuster/gobuster-3.0.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN=github.com/OJ/${PN}
-
-inherit golang-build
-
-if [[ ${PV} = *9999* ]]; then
-	inherit golang-vcs
-else
-	KEYWORDS="~amd64 ~x86 ~arm ~arm64"
-	EGIT_COMMIT="v${PV}"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
-fi
-
-DESCRIPTION="A tool to brute-force URIs and DNS subdomains"
-HOMEPAGE="https://github.com/OJ/gobuster"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-go/cobra-0.0.4
-	>=dev-go/uuid-1.1.1
-	>=dev-lang/go-1.10
-	dev-go/go-crypto
-"
-DEPEND="${RDEPEND}"
-
-src_install(){
-	dobin gobuster
-}
diff --git a/net-analyzer/subfinder/subfinder-1.2_p20190226.ebuild b/net-analyzer/subfinder/subfinder-1.2_p20190226-r1.ebuild
similarity index 97%
rename from net-analyzer/subfinder/subfinder-1.2_p20190226.ebuild
rename to net-analyzer/subfinder/subfinder-1.2_p20190226-r1.ebuild
index 10d6e6b78..3918bf095 100644
--- a/net-analyzer/subfinder/subfinder-1.2_p20190226.ebuild
+++ b/net-analyzer/subfinder/subfinder-1.2_p20190226-r1.ebuild
@@ -29,7 +29,7 @@ DEPEND=">=dev-lang/go-1.10
 	dev-go/go-crypto
 	dev-go/go-net
 "
-RDEPEND="${DEPEND}"
+RDEPEND=""
 
 src_install(){
 	dobin subfinder