gentoo resync : 15.09.2019

3 files changed, 57 insertions, 2 deletions

diff --git a/dev-go/go-tour/Manifest b/dev-go/go-tour/Manifest
index cf57581fc627..687111268119 100644
--- a/dev-go/go-tour/Manifest
+++ b/dev-go/go-tour/Manifest
@@ -1,3 +1,7 @@
+DIST github.com-golang-net-3b0461eec859c4b73bb64fdc8285971fd33e3938.tar.gz 1099680 BLAKE2B 989a8d6c9166696bef1aff398acc8cd1e41e1240c5c113be030c80355cdf96eaa6d5f231c99f2c44d8eacf199579804c59fc45f999862bc4bf057b694841c8dc SHA512 5e42e26ac17f52d6408b63eebd740bedc5a78b8023b675688d7b39b20afa53b34ffde764b693828143483c8f5450180f6a00e9eb28b8f3f6e14303cc4cd7c62b
+DIST github.com-golang-tools-7b79afddac434519a8ca775cc575fddb0d162aab.tar.gz 2682003 BLAKE2B 60d9981b9fcc47077bc0dc1179e518ba2f2373595d5798eb6aa37a832ce72f475b0808b2030919f141cd978533792294fdd8528e1d52b4eeec6e9f1a3b6e772d SHA512 5b7af03d138567edaa70e1b3555b8a9c4822f33c3fb14e8ec435499d21f46d61f44b62fddcec3ecc6f75d4e9a6dfb6b2a7526ddf8785d933941d64e646dc1b9b
 DIST go-tour-0_p20180810.tar.gz 319048 BLAKE2B 43c4ca53d939cf7590c8e3607e2089974f1b40dc9268ccbf9100e36d258d76a828c5512e662f20d125c07d0a35d48d3004c8f06d6f80a6a1645099d4ca592c57 SHA512 73eb1b7a228d046d572b2c781cdd7b43ef57de982987ab5808cbb2775c34c9805fac3c52fd68edd34ccadec5169ce5d61234eee553daf0b9ef2d2529e2817b44
-EBUILD go-tour-0_p20180810.ebuild 1412 BLAKE2B 19c7e43de92c5a852e5516ff83bfbfc1e1f34adffd3d67094e38e9e602f273dc72f897db547dfd9c3d8b853d33aae1018bd0f2a64c39ed932bd9bfc369aeb2c4 SHA512 dbfa7d6c2151374cff74bc6623d8253042797c5429d5e2b039d896db0b06348ecb8f6940758b94e815cc45e62741d86c16e9f14511b3fef1290a65cefb6d9ae8
+DIST go-tour-0_p20190829.tar.gz 321179 BLAKE2B 56fad2c3608aec9653e31a59e8696aa445375de88f17e72a95620b4b375c88b8e45838360c09a1c53184e5a20c1a5ca044f6ad055de3736e675d3faf3fd52a91 SHA512 2701234788810a8fdb932faae666ec89796664e078b3170344b8c219a2247a510df66bff825bdc458ba062bd4b3f5dccd07dbf88a092053b1ea791c2f50248f4
+EBUILD go-tour-0_p20180810.ebuild 1416 BLAKE2B 4b7489f4f5d75c938d7db973d762fea713e1252bcc12122e438612ff297375bf4aa87d05aa248d429ccdb02aeda83fd99a0aeef63a9fc311cd6e781c7d016041 SHA512 c558e8af603f1e0db65abb9dfdbf86c8fb1e160d88d9596004ee7d8fc4d2a2ebb62fb63660bab16a14e46a357d0628f92c453943024128de2ef474ce53be61a6
+EBUILD go-tour-0_p20190829.ebuild 1440 BLAKE2B 8602d74811b11602274951e1d13e6dd9e38bc6a3daebda71d00783da56d875aaa4ec49e47cac2fe2fa793300a8f356af6a1d3f0d7d269183ef43f6c2c2afbe38 SHA512 6d1919a717afa7db767271a98dae0157e02d37b5286c87c0cde442994ce70e3734eed3a78caaacc00d5848402dcc8878894fe1255d14042738fbc11451d495b8
 MISC metadata.xml 302 BLAKE2B b47fb7e4329ee56fd11c666f3493a1ad78c816390b7f1748c6bccb780aaf2440fc18f6d75352f80c481b40bdd9a060c192ed2fd1d6076bedf45aa57d67c6a2f0 SHA512 c49a4e57f4cc812eb4412bd71b02ac70785afd6d1793b09212f15a72a83d92a5c5f769ac569b7fe1e9f31b49b5abae913c647c75e82c3e7c3405e20819ff3b37
diff --git a/dev-go/go-tour/go-tour-0_p20180810.ebuild b/dev-go/go-tour/go-tour-0_p20180810.ebuild
index c5967f041fa4..331a91b1bb01 100644
--- a/dev-go/go-tour/go-tour-0_p20180810.ebuild
+++ b/dev-go/go-tour/go-tour-0_p20180810.ebuild
@@ -12,7 +12,7 @@ inherit golang-vcs-snapshot golang-build
 DESCRIPTION="A Tour of Go"
 HOMEPAGE="https://tour.golang.org"
 SRC_URI="${ARCHIVE_URI}"
-LICENSE="BSD"
+LICENSE="BSD MIT"
 SLOT="0"
 IUSE=""
 DEPEND="dev-go/go-net:=
diff --git a/dev-go/go-tour/go-tour-0_p20190829.ebuild b/dev-go/go-tour/go-tour-0_p20190829.ebuild
new file mode 100644
index 000000000000..0581e076b790
--- /dev/null
+++ b/dev-go/go-tour/go-tour-0_p20190829.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+EGO_PN="golang.org/x/tour"
+
+EGO_VENDOR=(
+	"golang.org/x/tools 7b79afddac434519a8ca775cc575fddb0d162aab github.com/golang/tools"
+	"golang.org/x/net 3b0461eec859c4b73bb64fdc8285971fd33e3938 github.com/golang/net"
+)
+
+EGIT_COMMIT="3c9f1af8b2da3b3661a39ee550190917c0cf5208"
+ARCHIVE_URI="https://github.com/golang/tour/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+inherit golang-vcs-snapshot golang-build
+
+DESCRIPTION="A Tour of Go"
+HOMEPAGE="https://tour.golang.org"
+SRC_URI="${ARCHIVE_URI}
+	${EGO_VENDOR_URI}"
+LICENSE="BSD Apache-2.0 MIT"
+SLOT="0"
+IUSE=""
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+src_compile() {
+	# Create a temporary GOROOT, since otherwise the executable is not
+	# built if it happens to be installed already.
+	cp -rs "$(go env GOROOT)" "${T}/goroot" || die
+	rm -rf "${T}/goroot/"{pkg/tool/$(go env GOOS)_$(go env GOARCH)/tour,src/${EGO_PN}} || die
+	export -n GOCACHE XDG_CACHE_HOME #567192
+	export GOPATH="${WORKDIR}/${P}" \
+		GO111MODULE=on \
+		GOFLAGS="-mod=vendor -v -x" \
+		GOBIN="${WORKDIR}/${P}/bin"
+	GOROOT=${T}/goroot \
+		go install -work ${EGO_BUILD_FLAGS} "${EGO_PN}/..." || die
+}
+
+src_install() {
+	exeinto "$(go env GOTOOLDIR)"
+	doexe "${GOBIN}/tour"
+
+	rm -rf vendor || die
+	insinto "$(go env GOROOT)"
+	doins -r "${WORKDIR}/${P}/src"
+}
+
+src_test() {
+	go test -work "${EGO_PN}/..." || die
+}