diff --git a/dev-go/cascadia/Manifest b/dev-go/cascadia/Manifest
index 92db89c4a..22686c806 100644
--- a/dev-go/cascadia/Manifest
+++ b/dev-go/cascadia/Manifest
@@ -1 +1,2 @@
 DIST cascadia-1.0.0.tar.gz 13232 BLAKE2B 54b0d1f649cd6f9b1ac4178df75f59e5eedcd11d060bd011e64c4753e1f044dd023b1f763f0b180ea3ef2ce6a3e3fbb841342cff45475f441831798446b5a6b4 SHA512 fc6cc6a97d7581a4e9d36f64bb2e7fa674e7b3aa00743e6464fe2280a7bd175fb404fb56c610368158206726bf195ebd7c01f8fe351e8009c909f32b7cee3e31
+DIST github.com-golang-net-cbe0f9307d01.tar.gz 936963 BLAKE2B 19f9996d10bd9f5aecd2bba512301519c65acd6d1c11e97617e69c4fe810f3558b05e1a3d546d3ee75c6eda96d310f63906a9217505d16d35438ca8544de4f68 SHA512 48e12282dc20ee3c614a7622ea10d986071976e3c3ea04eae01469d5e50495f9b22ccc70f0dc1ac00a5a8fda86ecb350acc6708d9467fc588a0aafc9e3641f7c
diff --git a/dev-go/cascadia/cascadia-1.0.0.ebuild b/dev-go/cascadia/cascadia-1.0.0-r1.ebuild
similarity index 76%
rename from dev-go/cascadia/cascadia-1.0.0.ebuild
rename to dev-go/cascadia/cascadia-1.0.0-r1.ebuild
index 9d0fcc3c2..09cbb826c 100644
--- a/dev-go/cascadia/cascadia-1.0.0.ebuild
+++ b/dev-go/cascadia/cascadia-1.0.0-r1.ebuild
@@ -1,17 +1,22 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 EGO_PN="github.com/andybalholm/${PN}"
 
+EGO_VENDOR=(
+	"golang.org/x/net cbe0f9307d01 github.com/golang/net"
+)
+
 if [[ ${PV} = *9999* ]]; then
 	inherit golang-vcs
 else
+	inherit golang-vcs-snapshot
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	EGIT_COMMIT="v${PV}"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
 fi
 inherit golang-build
 
@@ -21,5 +26,5 @@ LICENSE="BSD-2"
 SLOT="0"
 IUSE=""
 
-DEPEND="dev-go/go-net:="
+DEPEND=""
 RDEPEND=""
diff --git a/dev-go/goquery/Manifest b/dev-go/goquery/Manifest
index f89334569..f1623c309 100644
--- a/dev-go/goquery/Manifest
+++ b/dev-go/goquery/Manifest
@@ -1,2 +1,3 @@
-DIST goquery-1.4.1.tar.gz 100484 BLAKE2B 6c32197dd1bceb2f13a07b22710cdb5ba0bd800c345a0523fe2167ad132e8af7f75e3778b8fb26482c7a26a9189759140eda8ac23c013c886e5c0213c0764ae8 SHA512 76a78107cce9acbb637108e26bd30e52b55db51ccd042b8231c676fb6a3f6d7f923cce34922f4e2d42457023ad143d6605795d5ac9470ea85569abf5792614cf
+DIST github.com-andybalholm-cascadia-v1.0.0.tar.gz 13232 BLAKE2B 54b0d1f649cd6f9b1ac4178df75f59e5eedcd11d060bd011e64c4753e1f044dd023b1f763f0b180ea3ef2ce6a3e3fbb841342cff45475f441831798446b5a6b4 SHA512 fc6cc6a97d7581a4e9d36f64bb2e7fa674e7b3aa00743e6464fe2280a7bd175fb404fb56c610368158206726bf195ebd7c01f8fe351e8009c909f32b7cee3e31
+DIST github.com-golang-net-adae6a3d119a.tar.gz 967436 BLAKE2B 408acec685eb1c3125434555733c6db80ce4d95897b78b73554db4e0a8f1af82e6cd3e43a42486352eed183cda049c1d25aea441cced841256d650f908276124 SHA512 8b997e24a583a5598a555c864d9350683be275b403ccf7acae7de451fe0934f55d2dfdde0785fb2e138162cb5b4f9f63170d2bb9ef87a3c45f6d5edd2b04d5c8
 DIST goquery-1.5.0.tar.gz 100975 BLAKE2B 8749b082f7ff43be3a758dd96680ffe7e6a0e445fa9331926501e92053f39171b9f491e65a23932d7ea82d9fa16820b7f26196efb0b36d728f5f3912508ca817 SHA512 40a51ec17bb465d4fafd9173c44fa655f48e5ba47608b2e52282fa885aa98332e2c96459be38a911f38294aa4f322939fe86751359deca529b7a25036917bd1a
diff --git a/dev-go/goquery/goquery-1.4.1.ebuild b/dev-go/goquery/goquery-1.5.0-r1.ebuild
similarity index 53%
rename from dev-go/goquery/goquery-1.4.1.ebuild
rename to dev-go/goquery/goquery-1.5.0-r1.ebuild
index 5125a51cf..db9313d86 100644
--- a/dev-go/goquery/goquery-1.4.1.ebuild
+++ b/dev-go/goquery/goquery-1.5.0-r1.ebuild
@@ -1,17 +1,23 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 EGO_PN=github.com/PuerkitoBio/${PN}
 
+EGO_VENDOR=(
+	"golang.org/x/net adae6a3d119a github.com/golang/net"
+	"github.com/andybalholm/cascadia v1.0.0"
+)
+
 if [[ ${PV} = *9999* ]]; then
 	inherit golang-vcs
 else
+	inherit golang-vcs-snapshot
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	EGIT_COMMIT="v${PV}"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
 fi
 inherit golang-build
 
@@ -21,6 +27,13 @@ LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
-DEPEND="dev-go/cascadia:=
-	dev-go/go-net:="
+#FIXME: use external
+#RDEPEND="dev-go/cascadia:="
 RDEPEND=""
+DEPEND="${RDEPEND}"
+
+#src_compile() {
+#	GOPATH="${S}:$(get_golibdir_gopath)" \
+#		GOCACHE="${T}/go-cache" \
+#		go build -v -work -x -ldflags="-s -w" ./... "${EGO_PN}" || die
+#}
diff --git a/dev-go/goquery/goquery-1.5.0.ebuild b/dev-go/goquery/goquery-1.5.0.ebuild
deleted file mode 100644
index 5125a51cf..000000000
--- a/dev-go/goquery/goquery-1.5.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN=github.com/PuerkitoBio/${PN}
-
-if [[ ${PV} = *9999* ]]; then
-	inherit golang-vcs
-else
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	EGIT_COMMIT="v${PV}"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
-fi
-inherit golang-build
-
-DESCRIPTION="A little like that j-thing"
-HOMEPAGE="https://github.com/PuerkitoBio/goquery"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-go/cascadia:=
-	dev-go/go-net:="
-RDEPEND=""