From 7bc9c63c9da678a7e6fceb095d56c634afd22c56 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 15 Dec 2019 18:09:03 +0000 Subject: gentoo resync : 15.12.2019 --- app-admin/consul/Manifest | 6 +-- app-admin/consul/consul-1.4.4-r1.ebuild | 69 ------------------------------ app-admin/consul/consul-1.6.0.ebuild | 74 --------------------------------- app-admin/consul/consul-1.6.2.ebuild | 74 +++++++++++++++++++++++++++++++++ 4 files changed, 76 insertions(+), 147 deletions(-) delete mode 100644 app-admin/consul/consul-1.4.4-r1.ebuild delete mode 100644 app-admin/consul/consul-1.6.0.ebuild create mode 100644 app-admin/consul/consul-1.6.2.ebuild (limited to 'app-admin/consul') diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest index 017a9b0aecae..31f50ad8f922 100644 --- a/app-admin/consul/Manifest +++ b/app-admin/consul/Manifest @@ -5,12 +5,10 @@ AUX consul.logrotated 85 BLAKE2B 8f3212c58295d57e9265dec26b9bfe562c47ca168442180 AUX consul.service 359 BLAKE2B 04a42a1546d2e4dbf57b9d75b32feddd4d0f4f8b6f750b1b4a8c19cd51fdb3cedce2cbe2a1680dcbb407890aa3e75ab9ffc5c88566b3c1e44158b1b480e5119f SHA512 d0f73304d644cf26e609a2136f1107efe36afe54721cbbd6208cfe279629ef5603a94ecd786e83ad37d7828c038f01baa4482872fa65c625646fa73684e3e477 AUX data-dir.json.example 36 BLAKE2B dadf9d7350346db73e4db0d98aaa569fe7caa5d695e25606fb97b252be16f2d3f50630092be39be378821f7e17e4914557a55c620156e7d07ced151d1f977689 SHA512 cca94745ddfdcfedcc612da4a14965d4f51f0eaf519d8395e95b8b6cbe7bcb9987b8fdbffd66fb13edda7164a7b0f26e93e5aeab9e631cbf5e0a3a5c05b84b0b AUX ui.json.example 17 BLAKE2B ecb48d228ee02df0a96b46cd87001742924ee907d7fe05b54c900b6e37e14b8bd7278e5adeaadd164b09129275a804f1014b7fdf64068ba9d9ad957325f9d5fd SHA512 9aebf80a0dd2bc5345285b63c894af8c0d5864f352d97fc3ba7cd6bf22b905ace3bd221cf23092080e9f7d60832384632c2f069d580eef789eb3f81011e9869d -DIST consul-1.4.4.tar.gz 22736827 BLAKE2B a1b973a303f77d84993e4879aa92072d4f2d36353683cf9a2c6cdeaded8587e8464f066168f190f7347f6038df28b3cba1d8b8a3ca0b700ee085019af5014966 SHA512 d3e5dd536726976b705fe4c78c67eaf345b8f47225919c0ca1609d75e74343d9a16d893ef4cd5140998f23b3149cfa60f5b432ed9a7251bb3b232be9b65e7241 DIST consul-1.5.3.tar.gz 21743194 BLAKE2B c797b04457c5f0b12f06732a94038b25367b53a9e6088d725eea61786a0e18bd905ad680bc12c4bfa30b44292d2676689dd6f18e9e2143bf6e1b02c2c55f678f SHA512 3f275ec160b9e583b81ba8d463fdb05e9fc9058db2453d9393a56b67337ea04df98a89225323192230938e1abfb48fa60fe0a32b4d8980573b749217b69933e9 -DIST consul-1.6.0.tar.gz 22465984 BLAKE2B 3a030619786e8dabdf8b778012a80ff4b0e76ede6c313b688bf04bfd1a8488bff1bbd4a36c1dd11496bd1942f7bba2a9bb22ae3b364fee4335adfb741756dd67 SHA512 a122892693e3bee0fc0e0b5c0945e4a8dddb890228c091112e0db11a8afd33430611c20ff9bc13d2b3a2ac0d3b560be2d9c4e03a9cc425983fbd8f7edb699658 DIST consul-1.6.1.tar.gz 22621651 BLAKE2B b696823d3f7f3ef135ba578f3c4ae76f78a1f172e083a3bb5cd07212b3907aefbac3fc0a1d68c5d494e7781cb84c686e2cfb1e5f7cd2d34f8bf671be84b3ca00 SHA512 c96855f3a344699580e34d6f45efe863ba4e6b23ef0889a22ee89bad8ffa807b3cec1a9d14604a340b16b0a8df8227c9eeacd507f94e4a19b25e0385ca5155ac -EBUILD consul-1.4.4-r1.ebuild 1585 BLAKE2B 1b776c067bfc59576f8c55a158fc39d3e661f51dec78c7551ad9eb3b8f11997f6a2240c7fdb9fdd15ab1e30199d23ed96b69510f9673ea036950cfc26ff82388 SHA512 1c49555ce01c0452d42c0d19f0d22438bc5f861584070d8d0d094c243d96e79a44530cb1a966d4684c3702140530614298ae4cd665fe87f392c2d92b057856a2 +DIST consul-1.6.2.tar.gz 22041280 BLAKE2B 0b2edcd68fa166c178587a1ed3ca0445847d34510cd4e341f85a370257958a155ef6f976b045fc8e87af39107a3930ccb6d7a798ad142e87362f82d68ece4c3c SHA512 2df67854b85fa27600bf2cd57c913669f784019ee5a25b20a950ab00a403ca0562d74cb73c3402ebcec6cd951d7b9b4eb80c926746bcc27050db85f31192f826 EBUILD consul-1.5.3.ebuild 1830 BLAKE2B 5d0354957f3f52c00f7f63f02e2d0d05528e11a39a5ef32f1c3cb1fb98f18c93d06c49e97a3fa828bb106ce54a6eb1b3106ca9060b31f5a9cd8ae552f3a89104 SHA512 e5039260bdda283f5d7f577cf69e454fe10351ac211bf88bc6681258950bc212a7d3ec014a748f0fa9ac5d8d10b12ae693f015f0c72b6666b8eef4a83df23ea4 -EBUILD consul-1.6.0.ebuild 1830 BLAKE2B 1ee09c1896bebc44692a598e35deed9bc796b6c8a02190a98a6cb57a67e78eae2f487d23f39086459252747a537e49aace74275b011be48a374e512c404489db SHA512 a095c2487cf823c4f776d7b15610b819675a359ccabd3920b6a07715f1c0a2a61779f1488fbac55d171ac7581b397c0a09a9a7c257c7c591812742d79a68357b EBUILD consul-1.6.1.ebuild 1830 BLAKE2B 4592f85e488843fab9ec66ff4bc2b81e384a66fd523283332cc047e931aa18cb8b2dd91707a412656d4dadda9ba7664f502e369fd0d846524e347d971ff2b23b SHA512 43b1fc4d2ebb3b88e92217820899a3f4bc5586b953cb5fdc3f5282194d0e0398638ddaa08428dc6964a8bc2aaab6e55d80c3613e814469cdb204b4346ab324c9 +EBUILD consul-1.6.2.ebuild 1830 BLAKE2B 22f8170ae1aaa139dae769623f382632f1a3b29571691ee7b15d82235a75a5c133d930afcc780bda766a91b93859072a108ea97b9da9a5e469d2a7a0c8f80c99 SHA512 7fa573a22d42f9cac2b8696a3b9fc9e84e59a3e6f489cf6fab7a04b043f1d4702a4bddc52ac9f81c86b24d4df9ca0a5086e4586f9d45a5c65d0c31c9f9d064cc MISC metadata.xml 391 BLAKE2B c60fccfb61459803d5e9cff21d68525df118fc15b2390e805e3358b4e50e19a6eba6e06c057c5310797a9ba533f0d24746c95d8160a67e285732e7adab9b7fb2 SHA512 74541a7ccabd8ed4cebaec46f8d848d1930e8b50bc1fe5d84a5d37022d307e261d8e5537f942608c019992a2deccf0831a7624447d92dd68fe85128cfabf4ceb diff --git a/app-admin/consul/consul-1.4.4-r1.ebuild b/app-admin/consul/consul-1.4.4-r1.ebuild deleted file mode 100644 index d2c2ea9df0ba..000000000000 --- a/app-admin/consul/consul-1.4.4-r1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit golang-vcs-snapshot systemd user -GIT_COMMIT="ea5210a" -KEYWORDS="~amd64" -EGO_PN="github.com/hashicorp/consul" -DESCRIPTION="A tool for service discovery, monitoring and configuration" -HOMEPAGE="https://www.consul.io" -SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0" -LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT" -IUSE="" - -RESTRICT="test" - -DEPEND="dev-go/gox - >=dev-lang/go-1.11:= - >=dev-go/go-tools-0_pre20160121" -RDEPEND="" - -pkg_setup() { - enewgroup consul - enewuser consul -1 -1 /var/lib/${PN} consul -} - -src_prepare() { - default - - sed -e 's:go get -u -v $(GOTOOLS)::' \ - -e 's:vendorfmt dev-build:dev-build:' \ - -i "src/${EGO_PN}/GNUmakefile" || die -} - -src_compile() { - # The dev target sets causes build.sh to set appropriate XC_OS - # and XC_ARCH, and skips generation of an unused zip file, - # avoiding a dependency on app-arch/zip. - GOPATH="${S}" \ - GOBIN="${S}/bin" \ - GIT_DESCRIBE="v${PV}" \ - GIT_DIRTY="" \ - GIT_COMMIT="${GIT_COMMIT}" \ - emake -C "src/${EGO_PN}" dev-build -} - -src_install() { - local x - - dobin bin/consul - - keepdir /etc/consul.d - insinto /etc/consul.d - doins "${FILESDIR}/"*.json.example - - for x in /var/{lib,log}/${PN}; do - keepdir "${x}" - fowners consul:consul "${x}" - done - - newinitd "${FILESDIR}/consul.initd" "${PN}" - newconfd "${FILESDIR}/consul.confd" "${PN}" - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}.logrotated" "${PN}" - systemd_dounit "${FILESDIR}/consul.service" -} diff --git a/app-admin/consul/consul-1.6.0.ebuild b/app-admin/consul/consul-1.6.0.ebuild deleted file mode 100644 index 91013647ce8f..000000000000 --- a/app-admin/consul/consul-1.6.0.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit golang-vcs-snapshot systemd user -GIT_COMMIT="944cc71" -KEYWORDS="~amd64" -EGO_PN="github.com/hashicorp/consul" -DESCRIPTION="A tool for service discovery, monitoring and configuration" -HOMEPAGE="https://www.consul.io" -SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0" -LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT" -IUSE="" - -RESTRICT="test" - -DEPEND="dev-go/gox - >=dev-lang/go-1.11:= - >=dev-go/go-tools-0_pre20160121" -RDEPEND="" - -pkg_setup() { - enewgroup consul - enewuser consul -1 -1 /var/lib/${PN} consul -} - -src_prepare() { - default - - # avoid network-sandbox violations since go-1.13 - rm src/${EGO_PN}/go.mod || die - grep -rlZ '_ "github.com/envoyproxy/protoc-gen-validate/validate"' . | \ - xargs -0 sed -i '/_ "github.com\/envoyproxy\/protoc-gen-validate\/validate"/d' || die - - sed -e 's:go get -u -v $(GOTOOLS)::' \ - -e 's:vendorfmt dev-build:dev-build:' \ - -i "src/${EGO_PN}/GNUmakefile" || die -} - -src_compile() { - # The dev target sets causes build.sh to set appropriate XC_OS - # and XC_ARCH, and skips generation of an unused zip file, - # avoiding a dependency on app-arch/zip. - GOPATH="${S}" \ - GOBIN="${S}/bin" \ - GIT_DESCRIBE="v${PV}" \ - GIT_DIRTY="" \ - GIT_COMMIT="${GIT_COMMIT}" \ - emake -C "src/${EGO_PN}" dev-build -} - -src_install() { - local x - - dobin bin/consul - - keepdir /etc/consul.d - insinto /etc/consul.d - doins "${FILESDIR}/"*.json.example - - for x in /var/{lib,log}/${PN}; do - keepdir "${x}" - fowners consul:consul "${x}" - done - - newinitd "${FILESDIR}/consul.initd" "${PN}" - newconfd "${FILESDIR}/consul.confd" "${PN}" - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}.logrotated" "${PN}" - systemd_dounit "${FILESDIR}/consul.service" -} diff --git a/app-admin/consul/consul-1.6.2.ebuild b/app-admin/consul/consul-1.6.2.ebuild new file mode 100644 index 000000000000..59342179c2de --- /dev/null +++ b/app-admin/consul/consul-1.6.2.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit golang-vcs-snapshot systemd user +GIT_COMMIT="1200f25" +KEYWORDS="~amd64" +EGO_PN="github.com/hashicorp/consul" +DESCRIPTION="A tool for service discovery, monitoring and configuration" +HOMEPAGE="https://www.consul.io" +SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +SLOT="0" +LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT" +IUSE="" + +RESTRICT="test" + +DEPEND="dev-go/gox + >=dev-lang/go-1.11:= + >=dev-go/go-tools-0_pre20160121" +RDEPEND="" + +pkg_setup() { + enewgroup consul + enewuser consul -1 -1 /var/lib/${PN} consul +} + +src_prepare() { + default + + # avoid network-sandbox violations since go-1.13 + rm src/${EGO_PN}/go.mod || die + grep -rlZ '_ "github.com/envoyproxy/protoc-gen-validate/validate"' . | \ + xargs -0 sed -i '/_ "github.com\/envoyproxy\/protoc-gen-validate\/validate"/d' || die + + sed -e 's:go get -u -v $(GOTOOLS)::' \ + -e 's:vendorfmt dev-build:dev-build:' \ + -i "src/${EGO_PN}/GNUmakefile" || die +} + +src_compile() { + # The dev target sets causes build.sh to set appropriate XC_OS + # and XC_ARCH, and skips generation of an unused zip file, + # avoiding a dependency on app-arch/zip. + GOPATH="${S}" \ + GOBIN="${S}/bin" \ + GIT_DESCRIBE="v${PV}" \ + GIT_DIRTY="" \ + GIT_COMMIT="${GIT_COMMIT}" \ + emake -C "src/${EGO_PN}" dev-build +} + +src_install() { + local x + + dobin bin/consul + + keepdir /etc/consul.d + insinto /etc/consul.d + doins "${FILESDIR}/"*.json.example + + for x in /var/{lib,log}/${PN}; do + keepdir "${x}" + fowners consul:consul "${x}" + done + + newinitd "${FILESDIR}/consul.initd" "${PN}" + newconfd "${FILESDIR}/consul.confd" "${PN}" + insinto /etc/logrotate.d + newins "${FILESDIR}/${PN}.logrotated" "${PN}" + systemd_dounit "${FILESDIR}/consul.service" +} -- cgit v1.2.3