commit: 005e18046ae9298a816b88729875e862c5b8ed66 Author: Konstantin Podshumok <kpp.live+signed <AT> gmail <DOT> com> AuthorDate: Fri May 15 11:22:30 2020 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Sun May 17 11:28:41 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=005e1804
dev-go/go-licenses: bump 0_pre20200511 Fixes build with new defaults from go-module eclass Closes: https://bugs.gentoo.org/722914 Signed-off-by: Konstantin Podshumok <kpp.live+signed <AT> gmail.com> Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> dev-go/go-licenses/Manifest | 7 +++++++ ...es-9999.ebuild => go-licenses-0_pre20200511.ebuild} | 18 +++++++++--------- dev-go/go-licenses/go-licenses-9999.ebuild | 18 +++++++++--------- 3 files changed, 25 insertions(+), 18 deletions(-) diff --git a/dev-go/go-licenses/Manifest b/dev-go/go-licenses/Manifest index 1b9c2cb6750..f539327ec6b 100644 --- a/dev-go/go-licenses/Manifest +++ b/dev-go/go-licenses/Manifest @@ -49,10 +49,16 @@ DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip 4163 BLAKE2B 7e003600 DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e DIST github.com%2Fotiai10%2Fcopy%2F@v%2Fv1.0.2.mod 80 BLAKE2B 5a419c2474d8e694c8831b1df3a678629e9d7f796124fa2fb098371a0c56b78ce0acd0b585cb6bb4a838c70e697abb3c39b3b0df6fdca0af002dd9258b343bfe SHA512 b5471c0a96c49c3f690cd606b41422e2b555d2b088f17d0d12e0ae11b4d400e5ffd958b09e6bdc8d1fcb97d68cf4b08b00343d92414aaceec86f444e41ed9070 DIST github.com%2Fotiai10%2Fcopy%2F@v%2Fv1.0.2.zip 6363 BLAKE2B 857b896ef8d28a249199ea75ab1bdce2dc75af065d3a83c0193b1fc93ad6e6724dbe54cd221d3deabe7f4a00f9a64776dc48703f047ac7228bc50b0d28ab7cf9 SHA512 289bc424f9cfab11aca847b66719411e280369bd64a5d09a7e5c28df74404581304fa748df543e0e95b5d86e37be23ecf5cda80e165d28d7c65d927695f55b95 +DIST github.com%2Fotiai10%2Fcopy%2F@v%2Fv1.1.1.mod 80 BLAKE2B 04718a62a0874dff2d0a305cd3cc4160048fc38b45316e9453279d2437e817884bdd666fd1af6031f7e3b9e782a00248e6e98d0f0eb28c7b5c436ca6bdd1134b SHA512 9528e3b28299cc17b8e93c9314f457c1f0350313db0919ea57ed3124e80ddc5f1348eede9e8f199758d2cc256905d43e38a476d4d4f7fb7a03fbd85282abf57c +DIST github.com%2Fotiai10%2Fcopy%2F@v%2Fv1.1.1.zip 8431 BLAKE2B 78eefce8f753ce63df23b0c8ced71b316b018961fa55ae6461530815e308791ca35f2b4142fa178e57e625cdd1e65ba19c5df4af7eb62ab4ba9f09d39f228f47 SHA512 0a724628c0dae585f305a5222e3b9cc21a7f5ca7f41a066ba3bfd3a50b6600b36d02c4ca527ac5cea8d088638d4a9bcc2374f92169f35ab484e265392f0ea51b DIST github.com%2Fotiai10%2Fcurr%2F@v%2Fv0.0.0-20150429015615-9b4961190c95.mod 31 BLAKE2B 2672a50a0d2433b86cac9329ec96a520f2d426b5e04356056bd1173a3e297696c4bb6d2ba30efe34b557afa6c7c973af7267ea8d1a9d939860fb8c438863b6a7 SHA512 851f7cc28e17fbb5889fb46b71283312b4e66755e6bb6093b2170348352a68ed0c7855fdeb576160ed659563f79bf9d5af843a8c47c07c8239d4edb75e07f498 DIST github.com%2Fotiai10%2Fcurr%2F@v%2Fv0.0.0-20150429015615-9b4961190c95.zip 1626 BLAKE2B ca05b4d972d8d06a6e105f5acafd914c5a01ce99f4b0f9fdbbb3c96d0f88d2c9a32106e87eb1aabce00a71a70f3e51b511494d7616c48541a8f1ef8602fc89bf SHA512 1984a63109549737b730daf40ed08fe42066c6edc572ab27709a6b20a3ed203d16315f2bacc45e83860e9601d89fe6dca086af021c33bd2e796f43db3bd2b76b +DIST github.com%2Fotiai10%2Fcurr%2F@v%2Fv1.0.0.mod 80 BLAKE2B fb379c2984a53bfcc4c14a0a86655a7ea6a12d148aa2ce239c8c3497f6098b2f05af27cd1f8fdd8d5a04283b3b8a4234415c1472ae48ab6e65b5277fba9adcb2 SHA512 a8fb3d74f219262401918603b1944ce1d64a51f7e9cf89f4ea4aa58f9a2758637fe007741a1ca057ceecd59ebf2ad147082d00596fa35c8e4bb65f52906c0101 +DIST github.com%2Fotiai10%2Fcurr%2F@v%2Fv1.0.0.zip 3702 BLAKE2B 27380c5d62b0eae66290ef73076c73c1561c27950e48923a6156fa29119a7c2c28edd695ce1cef10de8dfaeb64f4409b3655fd7b5e404885f09d3abe9b228bda SHA512 09b0df5e622e14a79b579da7e9b1dafe05e02002b6021dfda8f6b928ebb03addd7755443ef2b2cdf42cf207d819d56e6aabed551a17e48f245b6a0f2d70a422f DIST github.com%2Fotiai10%2Fmint%2F@v%2Fv1.3.0.mod 108 BLAKE2B 474e77997e73380c030b4809c8f282b643cb0da9bcd1e0b0a231aac20e8f3ec463df76824372300b199a1453ee90995e3d682ae1ac12bad05f1dbba4fc2ef517 SHA512 13789a725161311e33af6ced4e07d7b548ddaa069e34791d8c6b4f1bf29ca1653ea723f5da79953f2e2314a3d81239985882dfeb1700c3bab4a3579cf972eb4e DIST github.com%2Fotiai10%2Fmint%2F@v%2Fv1.3.0.zip 9765 BLAKE2B 0282cc6aa3c30bb7268d464271bf866cda78fe373aea7671207f1ad26b30ec3360f7e64f3432b32c6376980700c612dc121bd415226f3f5a4457f905b9275d36 SHA512 43122b457bba1c630432585202650c41393041f16b0703dd4e46a4ac3ee1d4eac71f406de8d33fed50f72ea171bfdeb23a328c45459868d464c4c94a002acef6 +DIST github.com%2Fotiai10%2Fmint%2F@v%2Fv1.3.1.mod 80 BLAKE2B 7dde564f562e2e049893762d2ddc6653434fb32cee6c9aeb6f298e90d534bde43b79814d95a9a38070c6291184e590c144433b39f4c1f27a11e3211e3e7b81a6 SHA512 0291055b9568f02df1eaa6c5d3a4cf31447e864a89a25e741471a9c2aa34cc686535bc1987e3e827934f412f2892997f9336159f13bb8c3c915b940fee8c2e6c +DIST github.com%2Fotiai10%2Fmint%2F@v%2Fv1.3.1.zip 9837 BLAKE2B 8a6545a58eea36974c18a22430b408a81b52b038b950ab15eafd1dbea3ab6c1a96c809e551e0992177b0196b9a022f87aa3398b07d93abad8a527aef8008cb13 SHA512 ed11e504b8ed5b55396a1b05384d471f713fe5a845bc0d74d8690d6bebe94996014043802d0a78976f4e9e0bb5c0cdc6d9582dd168d5fb233c95b55fe5724aac DIST github.com%2Fpelletier%2Fgo-buffruneio%2F@v%2Fv0.2.0.mod 42 BLAKE2B 26e88451ad5d521cc8f48a08c91f2fd3fe6dc2e2ea084cb0012f25d8399f0e43329de5e96fd741255d910cf5a2146d3568718249980876c816a67f79e8b3290e SHA512 9f82f0d4d467420830ab8fb80ff97215e5fb47653b48d88304a6effdecabfc735f55dba9959319014ba943b2cbd27394ce86ebfba8a6d068c9c3d368f6b0cdfe DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod 36 BLAKE2B a388b7d0db7c8b9a589164ac639887f1e54d3f5d59ed9bfdbb427b88d381d95455cec1f3474d6dadf847925b7b0e9944a3713656f4870db4fadaa1774595c3f1 SHA512 b74e16c113ace53ce6b7a4df1fc73f21a5acdcf3d2343a4c4f1ad7a2cd8d2282ef7ede98de8c1c46f7d35feae28c9f49ba4a2dff1071357cb4e88e93f25b521d DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0 @@ -83,6 +89,7 @@ DIST github.com%2Fxanzy%2Fssh-agent%2F@v%2Fv0.2.1.mod 168 BLAKE2B 61409485b5a15b DIST github.com%2Fxanzy%2Fssh-agent%2F@v%2Fv0.2.1.zip 10353 BLAKE2B 386f5fcd209b8a2f2428e8460dae57d3f5a41649f8a42ba7c5c0f2037fa3b858e949ad3b526d99d71a4f5b094d5b409788dd398a8daacf8e28166be7f290c936 SHA512 8feb5dc97b7c8acbcb7989f7ee6d87b1b3b1074163482438c609418b0dd02135238f80edd968ef7a730aced473d18ea08f5c23ab8b0f7a5e63e76d39d7d8cc96 DIST github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod 40 BLAKE2B 844d63d9c10c55eb74504d88d5e6e85641f2c4bdbbc9b4f6728cd6b1e750d1eb333e91b6eadac635a80abf328c9423fa106b18337e89dc592876cd3f04a803e2 SHA512 daffe8f4148becee3a32c90ad21454cd48255409f3edff8681ea2074623c8aa02cbb4620b7ba52aabe4ac3c24a5f256b56fd71de1da45dcd7e4e8376699a422a DIST go-licenses-0_pre20200227.tar.gz 29035 BLAKE2B d19a7750ff78c68da7f9d9bd1f0a463ff40129688622bcd85829b6b2034fad9ad03f569eaf61b6e6b39196b1a2bdd22bfdc9ca580523e5039d244f069db7b62a SHA512 d278f1156bac707ea6b744049a6a9e558abde8d96335f97bc2c041b96cd05e17885c2a816035e964652039861947df793ae2a5fb32d12fecd0bb978a2a4f2593 +DIST go-licenses-0_pre20200511.tar.gz 29202 BLAKE2B d5e999c83789ae09c4c41373498bd33af8c361b0f229093eeeb4bdfa56679f9b8e47d125b65b1cc79cd2e5c53b4de72fb12cf01126d8a3921e19d6ea3aa72a0c SHA512 747c81a9db9a0c4d703c40d38418f3985a79439d65eac7446f294c2cf075aef5fbc359be1b69d8e1a96d25b752760b4cf41954422a8d18b0cddef876e431459b DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190219172222-a4c6cb3142f2.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e diff --git a/dev-go/go-licenses/go-licenses-9999.ebuild b/dev-go/go-licenses/go-licenses-0_pre20200511.ebuild similarity index 95% copy from dev-go/go-licenses/go-licenses-9999.ebuild copy to dev-go/go-licenses/go-licenses-0_pre20200511.ebuild index 1b54c5dc18f..9dadfccb67c 100644 --- a/dev-go/go-licenses/go-licenses-9999.ebuild +++ b/dev-go/go-licenses/go-licenses-0_pre20200511.ebuild @@ -22,7 +22,7 @@ if [[ ${PV} == *9999* ]]; then } else KEYWORDS="~amd64" - EGIT_COMMIT="0fa8c766a59182ce9fd94169ddb52abe568b7f4e" + EGIT_COMMIT="e4cf7a36ee79ac1f69725aa13111ae9383447ba3" SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" EGO_SUM=( @@ -42,9 +42,9 @@ else "github.com/kr/pretty v0.1.0" "github.com/kr/text v0.1.0" "github.com/mitchellh/go-homedir v1.1.0" - "github.com/otiai10/copy v1.0.2" - "github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95" - "github.com/otiai10/mint v1.3.0" + "github.com/otiai10/copy v1.1.1" + "github.com/otiai10/curr v1.0.0" + "github.com/otiai10/mint v1.3.1" "github.com/pkg/errors v0.8.1" "github.com/pmezard/go-difflib v1.0.0" "github.com/sergi/go-diff v1.0.0" @@ -100,9 +100,11 @@ else "github.com/magiconair/properties v1.8.0/go.mod" "github.com/mitchellh/go-homedir v1.1.0/go.mod" "github.com/mitchellh/mapstructure v1.1.2/go.mod" - "github.com/otiai10/copy v1.0.2/go.mod" + "github.com/otiai10/copy v1.1.1/go.mod" "github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod" + "github.com/otiai10/curr v1.0.0/go.mod" "github.com/otiai10/mint v1.3.0/go.mod" + "github.com/otiai10/mint v1.3.1/go.mod" "github.com/pelletier/go-buffruneio v0.2.0/go.mod" "github.com/pelletier/go-toml v1.2.0/go.mod" "github.com/pkg/errors v0.8.1/go.mod" @@ -173,9 +175,7 @@ src_prepare() { local share="${EROOT}/usr/share/licenseclassifier" local vendored_const_path="vendor/github.com/google/licenseclassifier" - if [[ ${PV} != *9999* ]]; then - go mod vendor || die - fi + go mod vendor || die sed -i "s@= lcRoot()@= \"${share}\", error(nil)@" \ "${vendored_const_path}"*/file_system_resources.go || die @@ -183,7 +183,7 @@ src_prepare() { src_compile() { mkdir build || die - go build -o build ./... || die + GOFLAGS="-mod=vendor -v -x" go build -o build ./... || die } src_test() { diff --git a/dev-go/go-licenses/go-licenses-9999.ebuild b/dev-go/go-licenses/go-licenses-9999.ebuild index 1b54c5dc18f..9dadfccb67c 100644 --- a/dev-go/go-licenses/go-licenses-9999.ebuild +++ b/dev-go/go-licenses/go-licenses-9999.ebuild @@ -22,7 +22,7 @@ if [[ ${PV} == *9999* ]]; then } else KEYWORDS="~amd64" - EGIT_COMMIT="0fa8c766a59182ce9fd94169ddb52abe568b7f4e" + EGIT_COMMIT="e4cf7a36ee79ac1f69725aa13111ae9383447ba3" SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" EGO_SUM=( @@ -42,9 +42,9 @@ else "github.com/kr/pretty v0.1.0" "github.com/kr/text v0.1.0" "github.com/mitchellh/go-homedir v1.1.0" - "github.com/otiai10/copy v1.0.2" - "github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95" - "github.com/otiai10/mint v1.3.0" + "github.com/otiai10/copy v1.1.1" + "github.com/otiai10/curr v1.0.0" + "github.com/otiai10/mint v1.3.1" "github.com/pkg/errors v0.8.1" "github.com/pmezard/go-difflib v1.0.0" "github.com/sergi/go-diff v1.0.0" @@ -100,9 +100,11 @@ else "github.com/magiconair/properties v1.8.0/go.mod" "github.com/mitchellh/go-homedir v1.1.0/go.mod" "github.com/mitchellh/mapstructure v1.1.2/go.mod" - "github.com/otiai10/copy v1.0.2/go.mod" + "github.com/otiai10/copy v1.1.1/go.mod" "github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod" + "github.com/otiai10/curr v1.0.0/go.mod" "github.com/otiai10/mint v1.3.0/go.mod" + "github.com/otiai10/mint v1.3.1/go.mod" "github.com/pelletier/go-buffruneio v0.2.0/go.mod" "github.com/pelletier/go-toml v1.2.0/go.mod" "github.com/pkg/errors v0.8.1/go.mod" @@ -173,9 +175,7 @@ src_prepare() { local share="${EROOT}/usr/share/licenseclassifier" local vendored_const_path="vendor/github.com/google/licenseclassifier" - if [[ ${PV} != *9999* ]]; then - go mod vendor || die - fi + go mod vendor || die sed -i "s@= lcRoot()@= \"${share}\", error(nil)@" \ "${vendored_const_path}"*/file_system_resources.go || die @@ -183,7 +183,7 @@ src_prepare() { src_compile() { mkdir build || die - go build -o build ./... || die + GOFLAGS="-mod=vendor -v -x" go build -o build ./... || die } src_test() {
