From 43793fab84041cfc5c60c0151d1591b8a69fb24a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Aug 2018 07:36:27 +0100 Subject: gentoo resync : 25.08.2018 --- dev-go/go-text/Manifest | 6 ++-- dev-go/go-text/go-text-0.3.0.ebuild | 46 +++++++++++++++++++++++++++ dev-go/go-text/go-text-0_pre20150806.ebuild | 49 ----------------------------- dev-go/go-text/go-text-9999.ebuild | 46 +++++++++++++-------------- 4 files changed, 72 insertions(+), 75 deletions(-) create mode 100644 dev-go/go-text/go-text-0.3.0.ebuild delete mode 100644 dev-go/go-text/go-text-0_pre20150806.ebuild (limited to 'dev-go/go-text') diff --git a/dev-go/go-text/Manifest b/dev-go/go-text/Manifest index 7c8ed026b362..b967b9452c56 100644 --- a/dev-go/go-text/Manifest +++ b/dev-go/go-text/Manifest @@ -1,6 +1,6 @@ -DIST go-text-0_pre20150806.tar.gz 3736536 BLAKE2B afc6a95116426f9b981432c772c374cb3c84d300e81af1599383be74d00830556d36ff614d88e8952b89974ecb238b77725a3d1a83dc65a0f85dafa3d29a2dff SHA512 dd0fc8b5abdfa6f005316bb7828c03a081485e0bd33cbf86c0b83f8bf9240973a7b0a2e6f52ef75f48ec00fc922be21a6c65ff9eb4080f28cb3f280bd4c4f5c6 +DIST go-text-0.3.0.tar.gz 6102619 BLAKE2B c92e68014a8c157d76741c02acd708771d66bd3dda5b19285f5aa3e073e0fe3fccb9054744d35ea62b681ae4421bb7489238d6868f9314fb26f88e002287abe8 SHA512 bd60dfaa7d9dbfca171a3ba40b51f5663c01257cf3b12b618d35689a97ab2212d316d5716ff09681bf40b099f7e20a0e0df8cfc065699cb6a07ad1dc2e2bc189 DIST go-text-0_pre20160211.tar.gz 4015547 BLAKE2B ad85f27761e2fd91a6acff497fe9b720484d51c6d75032c02fe21784dff78b4b900ac95aab394a6db1f7b2c9fb5a3d1cbde8db2aaa4c099b19357d82f747eb89 SHA512 066e53f6e094a6cf3effe1a9376f7bde41c3059099381bb5adf8c84589de4dab9115ce3c8cb7f89f90e2601422f79e3906f8f498d66e364da9f830ede1f7f05f -EBUILD go-text-0_pre20150806.ebuild 1234 BLAKE2B d61eeacd7b8f6af3bc9b3957d350d52d103169cb49e9dc1ead669dbd1669a683d7792e67a52a19af57b5a15b79cc30a4b85bef7bd47501ea6495565d07503c8c SHA512 d058c7b320013440f938b91a1ac9cd2224d2bf329d8aab45dfd57db319cffdbb3a8e709d1b3fe240b7ee64e9788fb2ac0bc0b0698750fc6bee8885e72c334180 +EBUILD go-text-0.3.0.ebuild 1203 BLAKE2B fb46358f1c2958e26531aa73c3cede5ac768b3a14cbdaeeb046bc881e906edb0094eef22732912e0b0aec40dd7ffa3f9650b585ab728282243785b1bdc59d962 SHA512 65eb11a8f0c51fa1b7f574d0e8fa9724c2aaa15c485e426e872c6b6e580e81364075cf8523dcce0671b73ecc19924dde9ced64e9835691bb11ab5cf6d3ff96a5 EBUILD go-text-0_pre20160211.ebuild 1372 BLAKE2B 79842e705e299769a14b12735ae09eec6788cfdbdb0a29050356575ce0706f9e4bc34c0d1b0e957161f2ea9cff7d62fd653780d507621b426b0df8894afd7d18 SHA512 09a680a57e682d51a5929b7c08680c14aea25bbb816e61865942166c8ff30230d36143bd11174f8d0c84170e3020a06c5a9a8a9973d50d90c7e53bda763f3fb9 -EBUILD go-text-9999.ebuild 1218 BLAKE2B 2a2e2e29d6779d523b3baa05a3ec36532b29d79ba1459117580185ab1d9633d636288f1385fd8e615ab933ef2820d9006acaa36e0db5585dc1b1579e6f96d4df SHA512 8042d1fe75b9064c2e24ec36d13b1204d6b4f2710cfc2be231bc0ca435568b1c83afc2623cc9f5d37d36c8f7ab364d8242500c444a9a327ed85c05bc6274dc29 +EBUILD go-text-9999.ebuild 1299 BLAKE2B f2d9eb98d3955ff9660b1b42e73feb24c7068645d74537a61fc61c07dd379622b96d5a3e089728356d575eff62360a213c2b1d67fc6352e0429fc42972150ca5 SHA512 b7aac61eceb419a1834345476ca98d000942073f30e4bf93bcba27b419dfd3684684cbb306259d9046709574e007384655d71c2cda542cea31e886c4ee368cbc MISC metadata.xml 302 BLAKE2B a05f70c06783ee19acede14cc45403fc3c66b6ba9d9d60a46ff406187bc3d0b4d60a37896b8d5099c3a883442ee11700c2692397dd9f86606807c4f3ea69ec1c SHA512 d6011dea76488098287ce6c436fd8c8b2b3607153611121b2ebd0b67be11629e8eb1318d460474c355fe8828c0bb0836db4fbae351f49bbbd7448c37f5a572ca diff --git a/dev-go/go-text/go-text-0.3.0.ebuild b/dev-go/go-text/go-text-0.3.0.ebuild new file mode 100644 index 000000000000..84a3b008c103 --- /dev/null +++ b/dev-go/go-text/go-text-0.3.0.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +EGO_PN=golang.org/x/text/... + +if [[ ${PV} = *9999* ]]; then + inherit golang-vcs +else + 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 +inherit golang-build + +DESCRIPTION="Go text processing support" +HOMEPAGE="https://godoc.org/golang.org/x/text" +LICENSE="BSD" +SLOT="0/${PVR}" +IUSE="" +DEPEND=">=dev-go/go-tools-0_pre20180817" +RDEPEND="" + +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" \ + go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die +} + +src_install() { + golang_install_pkgs + exeopts -m0755 -p # preserve timestamps for bug 551486 + exeinto "$(go env GOROOT)/bin" + doexe bin/* +} + +src_test() { + GOPATH="${S}:${T}/golibdir" \ + go test -v -work -x "${EGO_PN}" || die +} diff --git a/dev-go/go-text/go-text-0_pre20150806.ebuild b/dev-go/go-text/go-text-0_pre20150806.ebuild deleted file mode 100644 index 3fb9794a126a..000000000000 --- a/dev-go/go-text/go-text-0_pre20150806.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -EGO_PN=golang.org/x/text/... -EGO_SRC=golang.org/x/text - -if [[ ${PV} = *9999* ]]; then - inherit golang-vcs -else - KEYWORDS="~amd64" - EGIT_COMMIT="1309a1875a4368c12688b9383c6bcac738c17c29" - SRC_URI="https://github.com/golang/text/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - inherit golang-vcs-snapshot -fi -inherit golang-build - -DESCRIPTION="Go text processing support" -HOMEPAGE="https://godoc.org/golang.org/x/text" -LICENSE="BSD" -SLOT="0/${PVR}" -IUSE="" -DEPEND="" -RDEPEND="" - -src_compile() { - # Create a writable GOROOT in order to avoid sandbox violations. - cp -sR "$(go env GOROOT)" "${T}/goroot" || die - rm -rf "${T}/goroot/src/${EGO_SRC}" || die - rm -rf "${T}/goroot/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_SRC}" || die - export GOROOT="${T}/goroot" - golang-build_src_compile -} - -src_test() { - # Create go symlink for TestLinking in display/dict_test.go - mkdir -p "${GOROOT}/bin" - ln -s /usr/bin/go "${GOROOT}/bin/go" || die - golang-build_src_test -} - -src_install() { - golang-build_src_install - export -n GOROOT - exeopts -m0755 -p # preserve timestamps for bug 551486 - exeinto "$(go env GOROOT)/bin" - doexe bin/* -} diff --git a/dev-go/go-text/go-text-9999.ebuild b/dev-go/go-text/go-text-9999.ebuild index 5768c80ac6f4..4d851787c267 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 } -- cgit v1.2.3