summaryrefslogtreecommitdiff
path: root/app-admin/consul
diff options
context:
space:
mode:
Diffstat (limited to 'app-admin/consul')
-rw-r--r--app-admin/consul/Manifest8
-rw-r--r--app-admin/consul/consul-1.2.0.ebuild (renamed from app-admin/consul/consul-0.9.3.ebuild)18
-rw-r--r--app-admin/consul/consul-1.2.1.ebuild (renamed from app-admin/consul/consul-1.0.0.ebuild)18
3 files changed, 22 insertions, 22 deletions
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index 99a499081f42..0dd45ae7b8e6 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -5,10 +5,10 @@ AUX consul.logrotated 85 BLAKE2B 8f3212c58295d57e9265dec26b9bfe562c47ca168442180
AUX consul.service 354 BLAKE2B 9996b9d6a1aab360a3b46518e2091e8f30794f3bd3d113a3e9cbff2f4ff8a4cd014475806bd75feb6948c12b60846a403e35630820b814032fadc9a664985b90 SHA512 537d35e5a79d40dc62f6eb04f4631251d1e6dd62f2bd7d5483274903996052705db5fb4026000ef6e768e3dafb02f155c5bc1fd15a32813ecca8b1348a95e92d
AUX data-dir.json.example 36 BLAKE2B dadf9d7350346db73e4db0d98aaa569fe7caa5d695e25606fb97b252be16f2d3f50630092be39be378821f7e17e4914557a55c620156e7d07ced151d1f977689 SHA512 cca94745ddfdcfedcc612da4a14965d4f51f0eaf519d8395e95b8b6cbe7bcb9987b8fdbffd66fb13edda7164a7b0f26e93e5aeab9e631cbf5e0a3a5c05b84b0b
AUX ui.json.example 17 BLAKE2B ecb48d228ee02df0a96b46cd87001742924ee907d7fe05b54c900b6e37e14b8bd7278e5adeaadd164b09129275a804f1014b7fdf64068ba9d9ad957325f9d5fd SHA512 9aebf80a0dd2bc5345285b63c894af8c0d5864f352d97fc3ba7cd6bf22b905ace3bd221cf23092080e9f7d60832384632c2f069d580eef789eb3f81011e9869d
-DIST consul-0.9.3.tar.gz 7278357 BLAKE2B 041164951fe798f51bc79ef4cf322e3c37b583471d66f0d78b0a100b57ee367a5942ef07fc85adafeb6c014b5a6047dae10da42427600de25656614c235dab1a SHA512 a1c9cdd3e197afbf088bd1866af15c1864cb8d042dc65d2fcc0d9070b8bf2f9380cf2ceadaff6d5bba7ecd379d53f4b8191e1ae6832f1b2c82f21c62f07d8b0f
-DIST consul-1.0.0.tar.gz 7354292 BLAKE2B f2e245cec5859e23dd55c991de5c4d68be8526ec7085273660271407d9f1898c803edbffaff3cd4f0d5de114b9d8b2cd205e03002d5685b77f831957b021140c SHA512 8223f79aa1b7bfc5693168b56fbe9a506ca504771c92328afeb99e78dce8699c7532582749a372dfed10dd4b7c440ace0dd248f1ae27247059da3e2f88293a88
DIST consul-1.0.6.tar.gz 8211299 BLAKE2B 7ea5df497f4796e572a86127e0854935f97439504aff82fb697f33700e9d138048772f32f171dbbe4f1fb4d1ceefa7ca96cf3dce2a22cdffd4e1906f6befa55b SHA512 c55f09272859b828816ddf548952769172331c22be8a70a7f73ab9362744fb1f4bc5fdf81955a0dbc4101584cf3660f182620dcdc56bcf94b42dce644be232a8
-EBUILD consul-0.9.3.ebuild 1578 BLAKE2B c32a67c19567b1b601bb6f272f6e435f9600accb4a41a03e774c197bb8f743d67c8fb4cc9e97c4829fb1bfd21eceed9318cc3f8e31217f89d57fe20c78f71054 SHA512 c2abbe3e57e2939832f443b2df5a5c3fad3fae197a5e96f6ed116f2c235a9df882848153f1928be71b5845c38256d99e1cceaf76c88efe30470495f0ef765572
-EBUILD consul-1.0.0.ebuild 1578 BLAKE2B c32a67c19567b1b601bb6f272f6e435f9600accb4a41a03e774c197bb8f743d67c8fb4cc9e97c4829fb1bfd21eceed9318cc3f8e31217f89d57fe20c78f71054 SHA512 c2abbe3e57e2939832f443b2df5a5c3fad3fae197a5e96f6ed116f2c235a9df882848153f1928be71b5845c38256d99e1cceaf76c88efe30470495f0ef765572
+DIST consul-1.2.0.tar.gz 17187054 BLAKE2B 5e8d1151efe1e8ad5932886367d0012774713081aa2725f10d45af1e05751e328d76471ff3cbd85031c252c65cde0137f96c3ef86eca7e3e7f6b28e2d20ed0d5 SHA512 1c018a5f35164a899a086ccdae94cb5e6e2a490e4c788d65b0026dbf448950d0c1038b2d61cb10f5e8c9ad22a1affad64dd4a7086b59dffd115d40aa7b3d0cce
+DIST consul-1.2.1.tar.gz 14819500 BLAKE2B debb7ee5b8016527de0ebc680b228a9749435db4364e8d6e0160b1a20e2896dd4109edc5930dad961ce18f79182dda0c00a52a567ea6ff2d267b17448df2129d SHA512 5b5d8b62056c305f7388db50b54427ed21c41fef6d1b5f67da845a66bece35454e9f538bb0df59bc86788826b6cd20cd6179552060482908fc5cbc4a048c14a8
EBUILD consul-1.0.6.ebuild 1578 BLAKE2B c32a67c19567b1b601bb6f272f6e435f9600accb4a41a03e774c197bb8f743d67c8fb4cc9e97c4829fb1bfd21eceed9318cc3f8e31217f89d57fe20c78f71054 SHA512 c2abbe3e57e2939832f443b2df5a5c3fad3fae197a5e96f6ed116f2c235a9df882848153f1928be71b5845c38256d99e1cceaf76c88efe30470495f0ef765572
+EBUILD consul-1.2.0.ebuild 1531 BLAKE2B 0d3891c096bd5a7b33a0f7b7969c7b27ea8536a1f1b608e1d119c1096734cf232dedf4ec38a011a39676ace9fa44de6ae8a58ad594f3d3fdd3093ee580e8509c SHA512 9ba4ed9ebb5c77b7ebc8daddf4346b8d14fca664eed894ee61c3aab06918d07a6a5156bf9717006009e65ff72c9954fd653630b0a16ab3ade5cbd9a36ef5005e
+EBUILD consul-1.2.1.ebuild 1529 BLAKE2B 5cfc78afbddfa423c8ffbe18e5ef532889de54bcb966dd51601297fc360dcf35e8ada41cfd3c725dbffb0ce52d95c79758a2b847cfe989ed48a4887c568c13ab SHA512 56c00a9377b39338c1735424b23b22b6b9cfcd6edf2d53d738ef57f951a9cce1307161f0a54e1be0b3afe9e792710f31a6dc540021d6684aee7837a8e4f9a032
MISC metadata.xml 391 BLAKE2B c60fccfb61459803d5e9cff21d68525df118fc15b2390e805e3358b4e50e19a6eba6e06c057c5310797a9ba533f0d24746c95d8160a67e285732e7adab9b7fb2 SHA512 74541a7ccabd8ed4cebaec46f8d848d1930e8b50bc1fe5d84a5d37022d307e261d8e5537f942608c019992a2deccf0831a7624447d92dd68fe85128cfabf4ceb
diff --git a/app-admin/consul/consul-0.9.3.ebuild b/app-admin/consul/consul-1.2.0.ebuild
index 05b4622df94f..1f9dd43d9356 100644
--- a/app-admin/consul/consul-0.9.3.ebuild
+++ b/app-admin/consul/consul-1.2.0.ebuild
@@ -4,7 +4,7 @@
EAPI=6
inherit golang-vcs-snapshot systemd user
-
+GIT_COMMIT="2814197"
KEYWORDS="~amd64"
EGO_PN="github.com/hashicorp/consul"
DESCRIPTION="A tool for service discovery, monitoring and configuration"
@@ -30,26 +30,26 @@ pkg_setup() {
src_prepare() {
default
- sed -e 's:^\(GIT_DESCRIBE=\).*:\1v'${PV}':' \
- -e 's:^\(GIT_COMMIT=\).*:\1:' \
- -e 's:^\(GIT_DIRTY=\).*:\1:' \
- -e 's:go get -u -v $(GOTOOLS)::' \
+ sed -e 's:go get -u -v $(GOTOOLS)::' \
-e 's:vendorfmt dev-build:dev-build:' \
- -i "${S}/src/${EGO_PN}/GNUmakefile" || die
+ -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" \
- emake -C "${S}/src/${EGO_PN}" dev
+ GOPATH="${S}" \
+ GIT_DESCRIBE="v${PV}" \
+ GIT_DIRTY="" \
+ GIT_COMMIT="${GIT_COMMIT}" \
+ emake -C "src/${EGO_PN}" dev-build
}
src_install() {
local x
- dobin "${S}/bin/${PN}"
+ newbin bin consul
keepdir /etc/consul.d
insinto /etc/consul.d
diff --git a/app-admin/consul/consul-1.0.0.ebuild b/app-admin/consul/consul-1.2.1.ebuild
index 05b4622df94f..c23a7225e2cc 100644
--- a/app-admin/consul/consul-1.0.0.ebuild
+++ b/app-admin/consul/consul-1.2.1.ebuild
@@ -4,7 +4,7 @@
EAPI=6
inherit golang-vcs-snapshot systemd user
-
+GIT_COMMIT="39f3f0"
KEYWORDS="~amd64"
EGO_PN="github.com/hashicorp/consul"
DESCRIPTION="A tool for service discovery, monitoring and configuration"
@@ -30,26 +30,26 @@ pkg_setup() {
src_prepare() {
default
- sed -e 's:^\(GIT_DESCRIBE=\).*:\1v'${PV}':' \
- -e 's:^\(GIT_COMMIT=\).*:\1:' \
- -e 's:^\(GIT_DIRTY=\).*:\1:' \
- -e 's:go get -u -v $(GOTOOLS)::' \
+ sed -e 's:go get -u -v $(GOTOOLS)::' \
-e 's:vendorfmt dev-build:dev-build:' \
- -i "${S}/src/${EGO_PN}/GNUmakefile" || die
+ -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" \
- emake -C "${S}/src/${EGO_PN}" dev
+ GOPATH="${S}" \
+ GIT_DESCRIBE="v${PV}" \
+ GIT_DIRTY="" \
+ GIT_COMMIT="${GIT_COMMIT}" \
+ emake -C "src/${EGO_PN}" dev-build
}
src_install() {
local x
- dobin "${S}/bin/${PN}"
+ dobin bin/consul
keepdir /etc/consul.d
insinto /etc/consul.d