From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9BE67138334 for ; Mon, 20 Aug 2018 00:21:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6939BE0882; Mon, 20 Aug 2018 00:21:04 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2843BE0882 for ; Mon, 20 Aug 2018 00:21:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 94EB73412C5 for ; Mon, 20 Aug 2018 00:21:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 85BAF3AD for ; Mon, 20 Aug 2018 00:20:58 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1534724439.8879bac8a4cce89f6a5583ed8076e0ae770e71c6.zmedico@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-go/go-text/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-go/go-text/go-text-9999.ebuild X-VCS-Directories: dev-go/go-text/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 8879bac8a4cce89f6a5583ed8076e0ae770e71c6 X-VCS-Branch: master Date: Mon, 20 Aug 2018 00:20:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: eccb9849-9e23-4410-afb7-81f64bd7f4ad X-Archives-Hash: 5532ef7f3c929df9689dd4194457ac12 commit: 8879bac8a4cce89f6a5583ed8076e0ae770e71c6 Author: Zac Medico gentoo org> AuthorDate: Sun Aug 19 23:05:36 2018 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Aug 20 00:20:39 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8879bac8 dev-go/go-text: update 9999 ebuild Package-Manager: Portage-2.3.47, Repoman-2.3.10 dev-go/go-text/go-text-9999.ebuild | 46 +++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dev-go/go-text/go-text-9999.ebuild b/dev-go/go-text/go-text-9999.ebuild index 5768c80ac6f..4d851787c26 100644 --- a/dev-go/go-text/go-text-9999.ebuild +++ b/dev-go/go-text/go-text-9999.ebuild @@ -1,16 +1,16 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 -EGO_PN=golang.org/x/text/... EGO_SRC=golang.org/x/text +EGO_PN=${EGO_SRC}/... if [[ ${PV} = *9999* ]]; then inherit golang-vcs else - KEYWORDS="~amd64" - EGIT_COMMIT="df923bbb63f8ea3a26bb743e2a497abd0ab585f7" + KEYWORDS="~amd64 ~arm ~x86" + EGIT_COMMIT="v${PV}" SRC_URI="https://github.com/golang/text/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" inherit golang-vcs-snapshot fi @@ -21,28 +21,28 @@ HOMEPAGE="https://godoc.org/golang.org/x/text" LICENSE="BSD" SLOT="0/${PVR}" IUSE="" -DEPEND="" +DEPEND=">=dev-go/go-tools-0_pre20180817" RDEPEND="" -src_test() { - # Create a writable GOROOT in order to avoid sandbox violations. - cp -sR "$(go env GOROOT)" "${T}/goroot" || die - if [ -d "${T}/goroot/src/${EGO_SRC}" ]; then - rm -rf "${T}/goroot/src/${EGO_SRC}" || die - fi - if [ -d "${T}/goroot/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_SRC}" ]; then - rm -rf "${T}/goroot/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_SRC}" || - die - fi - - # Create go symlink for TestLinking in display/dict_test.go - mkdir -p "${T}/goroot/bin" - ln -s /usr/bin/go "${T}/goroot/bin/go" || die - - GOROOT="${T}/goroot" golang-build_src_test +src_compile() { + # Create an isolated golibdir in order to avoid an + # "use of internal package not allowed" error when + # and older version is installed. + mkdir -p "${T}/golibdir/src/golang.org/x" || die + ln -s "$(get_golibdir_gopath)/src/golang.org/x/tools" "${T}/golibdir/src/golang.org/x/tools" || die + GOPATH="${S}:${T}/golibdir" GOBIN="${S}/bin" \ + go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die } src_install() { - golang-build_src_install - dobin bin/* + rm -rf "${S}/src/${EGO_SRC}/.git"* || die + golang_install_pkgs + exeopts -m0755 -p # preserve timestamps for bug 551486 + exeinto "$(go env GOROOT)/bin" + doexe bin/* +} + +src_test() { + GOPATH="${S}:${T}/golibdir" GOBIN="${S}/bin" \ + go test -v -work -x "${EGO_PN}" || die }