From 42fe645eaee7ded9e0109cb9fbaae76b6fb9e2a3 Mon Sep 17 00:00:00 2001 From: blshkv Date: Sat, 11 Apr 2020 10:28:18 +0800 Subject: [PATCH] bettercap: more system deps --- dev-go/go-sys/Manifest | 1 + dev-go/go-sys/go-sys-0_pre20200409.ebuild | 37 +++++++++++++++++++ dev-go/go-sys/metadata.xml | 10 +++++ dev-go/gopkg-sourcemap/Manifest | 3 +- .../gopkg-sourcemap-1.0.5.ebuild | 27 ++++++++++++++ .../gopkg-sourcemap-2.1.2.ebuild | 37 ------------------- .../gopkg-sourcemap-2.1.3.ebuild | 27 ++++++++++++++ .../bettercap/bettercap-2.27-r1.ebuild | 11 +++--- .../base/package.accept_keywords/dev-go | 8 +++- 9 files changed, 116 insertions(+), 45 deletions(-) create mode 100644 dev-go/go-sys/Manifest create mode 100644 dev-go/go-sys/go-sys-0_pre20200409.ebuild create mode 100644 dev-go/go-sys/metadata.xml create mode 100644 dev-go/gopkg-sourcemap/gopkg-sourcemap-1.0.5.ebuild delete mode 100644 dev-go/gopkg-sourcemap/gopkg-sourcemap-2.1.2.ebuild create mode 100644 dev-go/gopkg-sourcemap/gopkg-sourcemap-2.1.3.ebuild diff --git a/dev-go/go-sys/Manifest b/dev-go/go-sys/Manifest new file mode 100644 index 000000000..2578b647c --- /dev/null +++ b/dev-go/go-sys/Manifest @@ -0,0 +1 @@ +DIST go-sys-0_pre20200409.tar.gz 1052339 BLAKE2B 503d9b1a539a8e2b06b8cdf0e64ccb467d8769b8dbadc3f14d08195d017d07248622ce87c73ee573669040be2bbb80d158bd224f67464b18e3951275e98e7a2b SHA512 b94433c0841daf8983305d9988b3bf99a665b4a3a5c66fd3d07460999c6856628f4eab3615313a06aba03040aa2e93be8f5bca03222913c4cd40b348fa50e03e diff --git a/dev-go/go-sys/go-sys-0_pre20200409.ebuild b/dev-go/go-sys/go-sys-0_pre20200409.ebuild new file mode 100644 index 000000000..8f285160b --- /dev/null +++ b/dev-go/go-sys/go-sys-0_pre20200409.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +EGO_PN=golang.org/x/sys/... + +if [[ ${PV} = *9999* ]]; then + inherit golang-vcs +else + KEYWORDS="~amd64 ~arm ~x86" + EGIT_COMMIT="59c9f1ba88faf592b225274f69c5ef1e4ebacf82" + SRC_URI="https://github.com/golang/sys/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" + inherit golang-vcs-snapshot +fi +inherit golang-build + +DESCRIPTION="Go packages for low-level interaction with the operating system" +HOMEPAGE="https://godoc.org/golang.org/x/sys" +LICENSE="BSD" +SLOT="0/${PVR}" +IUSE="" +DEPEND="" +RDEPEND="" + +src_compile() { + GOPATH="${S}" \ + go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die +} + +src_test() { + GOPATH="${S}" \ + go test -v -work -x "${EGO_PN}" || die +} + +src_install() { + golang_install_pkgs +} diff --git a/dev-go/go-sys/metadata.xml b/dev-go/go-sys/metadata.xml new file mode 100644 index 000000000..d5d380f02 --- /dev/null +++ b/dev-go/go-sys/metadata.xml @@ -0,0 +1,10 @@ + + + + + zmedico@gentoo.org + + + golang/sys + + diff --git a/dev-go/gopkg-sourcemap/Manifest b/dev-go/gopkg-sourcemap/Manifest index 93944228e..f6f4fc7e9 100644 --- a/dev-go/gopkg-sourcemap/Manifest +++ b/dev-go/gopkg-sourcemap/Manifest @@ -1 +1,2 @@ -DIST gopkg-sourcemap-2.1.2.tar.gz 6378 BLAKE2B 3dfeaf2c16ffd271bb2811601cd2dee0f551e8db0fca65b58327177e92125cfa90f1b75aa68b0f78acb9b2d06fbf66aeceb14ef9606d4447745bc754d6f298eb SHA512 b4548b7e634a0039d63443a831c9dce44adc7a1f340fe58516bfa79db8793e4f8f901e79dbea8b56c3f7158074081ea92407fe6bafca2b7a5b4d0d53dedb4700 +DIST gopkg-sourcemap-1.0.5.tar.gz 5368 BLAKE2B bbcd956bd9cb16aa61416d0c4ff097029602ebb96b5c66c9102978fe048f63c1b3fb39e960ba0be36ebe3dab9544bf53936c8e1b184dbb1d72e8e86b1ad35d3d SHA512 5e6a6dd7a4cc60b59fb4db571ec0b2167df6180492d2787c69d4cf669373beca6a448f282e529a8d8a3f1a2c5c12595e73975c598a796af8c030f32b6ddd92bb +DIST gopkg-sourcemap-2.1.3.tar.gz 6479 BLAKE2B 0ea31f41082bedb4b770a3af749544d91c6d9755e20a3680e257b7652e9c3cef3413cba0be2b2becca8ee989ec1f38eefd0089c51d1e30b78a05b33a318bfa00 SHA512 657e93971a56f42606c295fb67f7ffd516155b20ce4f5cee9d36d0decbb82929cb457bf5973a8dbb4558699c5dbcbe9be44d464160364d595315aa3d288a01c8 diff --git a/dev-go/gopkg-sourcemap/gopkg-sourcemap-1.0.5.ebuild b/dev-go/gopkg-sourcemap/gopkg-sourcemap-1.0.5.ebuild new file mode 100644 index 000000000..e32b343f1 --- /dev/null +++ b/dev-go/gopkg-sourcemap/gopkg-sourcemap-1.0.5.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +EGO_PN="gopkg.in/sourcemap.v1" + +if [[ ${PV} = *9999* ]]; then + inherit golang-vcs + KEYWORDS="" +else + KEYWORDS="~amd64 ~x86 ~arm ~arm64" + SRC_URI="https://github.com/go-sourcemap/sourcemap/archive/v${PV}.tar.gz -> ${P}.tar.gz" + inherit golang-vcs-snapshot +fi + +inherit golang-build + +DESCRIPTION="Source maps consumer for Golang" +HOMEPAGE="https://godoc.org/github.com/go-sourcemap/sourcemap" + +LICENSE="BSD-2" +SLOT="0" +IUSE="" + +RDEPEND=">=dev-lang/go-1.10" +DEPEND="${RDEPEND}" diff --git a/dev-go/gopkg-sourcemap/gopkg-sourcemap-2.1.2.ebuild b/dev-go/gopkg-sourcemap/gopkg-sourcemap-2.1.2.ebuild deleted file mode 100644 index c06bfed34..000000000 --- a/dev-go/gopkg-sourcemap/gopkg-sourcemap-2.1.2.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/go-sourcemap/sourcemap gopkg.in/sourcemap.v1" - -#EGO_PN="gopkg.in/sourcemap.v1 github.com/go-sourcemap/sourcemap" - -#EGO_VENDOR=( -# "gopkg.in/sourcemap.v1" -# "gopkg.in/sourcemap.v1 6e83acea0053641eff084973fee085f0c193c61a github.com/go-sourcemap/sourcemap" -# "github.com/go-sourcemap/sourcemap" -#) - -if [[ ${PV} = *9999* ]]; then - inherit golang-vcs -else -#https://bugs.gentoo.org/673704 -# KEYWORDS="~amd64 ~x86 ~arm ~arm64" -# SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - SRC_URI="https://github.com/go-sourcemap/sourcemap/archive/v${PV}.tar.gz -> ${P}.tar.gz" - inherit golang-vcs-snapshot -fi - -inherit golang-build - -DESCRIPTION="Source maps consumer for Golang" -HOMEPAGE="https://godoc.org/github.com/go-sourcemap/sourcemap" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=dev-lang/go-1.10" -DEPEND="${RDEPEND}" diff --git a/dev-go/gopkg-sourcemap/gopkg-sourcemap-2.1.3.ebuild b/dev-go/gopkg-sourcemap/gopkg-sourcemap-2.1.3.ebuild new file mode 100644 index 000000000..c64a7720b --- /dev/null +++ b/dev-go/gopkg-sourcemap/gopkg-sourcemap-2.1.3.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +EGO_PN="github.com/go-sourcemap/sourcemap" + +if [[ ${PV} = *9999* ]]; then + inherit golang-vcs + KEYWORDS="" +else + KEYWORDS="~amd64 ~x86 ~arm ~arm64" + SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + inherit golang-vcs-snapshot +fi + +inherit golang-build + +DESCRIPTION="Source maps consumer for Golang" +HOMEPAGE="https://godoc.org/github.com/go-sourcemap/sourcemap" + +LICENSE="BSD-2" +SLOT="0" +IUSE="" + +RDEPEND=">=dev-lang/go-1.10" +DEPEND="${RDEPEND}" diff --git a/net-analyzer/bettercap/bettercap-2.27-r1.ebuild b/net-analyzer/bettercap/bettercap-2.27-r1.ebuild index 8b0124940..c259ac68b 100644 --- a/net-analyzer/bettercap/bettercap-2.27-r1.ebuild +++ b/net-analyzer/bettercap/bettercap-2.27-r1.ebuild @@ -41,8 +41,8 @@ EGO_VENDOR=( "github.com/tarm/serial 98f6abe2eb07" # "golang.org/x/crypto 87dc89f01550 github.com/golang/crypto" # "golang.org/x/net da9a3fd4c582 github.com/golang/net" - "golang.org/x/sys 727590c5006e github.com/golang/sys" - "gopkg.in/sourcemap.v1 v1.0.5 github.com/go-sourcemap/sourcemap" +# "golang.org/x/sys 727590c5006e github.com/golang/sys" +# "gopkg.in/sourcemap.v1 v1.0.5 github.com/go-sourcemap/sourcemap" ) inherit golang-vcs-snapshot @@ -66,9 +66,10 @@ RDEPEND=" virtual/libusb:*" DEPEND="${RDEPEND} dev-go/go-crypto:= - dev-go/go-net:0=" -#requires a newer version -# dev-go/go-sys:= + dev-go/go-net:0= + dev-go/go-sys:= + dev-go/gopkg-sourcemap + " BDEPEND="virtual/pkgconfig" diff --git a/profiles/pentoo/base/package.accept_keywords/dev-go b/profiles/pentoo/base/package.accept_keywords/dev-go index c631069ed..b4b3911d0 100644 --- a/profiles/pentoo/base/package.accept_keywords/dev-go +++ b/profiles/pentoo/base/package.accept_keywords/dev-go @@ -1,6 +1,9 @@ +#pentoo +dev-go/go-sys + #net-analyzer/amass =dev-go/go-crypto-0_pre* -dev-go/gopkg-sourcemap +=dev-go/gopkg-sourcemap-1* dev-go/goquery =dev-go/go-protobuf-1.2* =dev-go/gogo-protobuf-0.4* @@ -22,7 +25,8 @@ dev-go/go-multierror ~dev-go/go-tools-0_pre20190911 ~dev-go/go-net-0_pre20180816 ~dev-go/go-text-0.3.0 -~dev-go/go-sys-0_pre20180816 + + dev-go/robotstxt-go ~dev-go/fetchbot-1.1.2