summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-admin/consul-replicate')
-rw-r--r--app-admin/consul-replicate/Manifest14
-rw-r--r--app-admin/consul-replicate/consul-replicate-0.2.0.ebuild92
-rw-r--r--app-admin/consul-replicate/consul-replicate-0.4.0_p20211027.ebuild32
-rw-r--r--app-admin/consul-replicate/metadata.xml2
4 files changed, 35 insertions, 105 deletions
diff --git a/app-admin/consul-replicate/Manifest b/app-admin/consul-replicate/Manifest
index c91b30ef9593..923532f5029f 100644
--- a/app-admin/consul-replicate/Manifest
+++ b/app-admin/consul-replicate/Manifest
@@ -1,12 +1,2 @@
-DIST consul-0.6.3.tar.gz 2224536 BLAKE2B 3c840b6380f16d2b93d8b9ebf003f26f0e8c46d4527083ca261c9c35cc0aa7f38c451806eeb719d6bbc77e98ff69693d38c0fe46686a69c7c060bfc0c753b470 SHA512 c80b96e18c283f8d2dc7542393e9d788c8247200890b1f2ecdf292b545c01c971f1452f6b37b23b92654409a191fbd4608710b1ca31d6c426ff77b53c4840c4b
-DIST consul-replicate-0.2.0.tar.gz 24575 BLAKE2B 61e358078735bcf0c7884441b360af8e755731611bd84c74823e95c72ee4a3d00dc38501b5a55f428937f60964702ede3841ca8165bf639b00feb6af0ee70bbc SHA512 af1bdc0747524996a1cffe989d05a265c0fbcfac9d4d7c4b4bcf94dbd3db6f7635cb013cf542e1cdad049975a8dfad2bca417dd5566c922b7f86e7fd451ea0a2
-DIST consul-template-0.8.0.tar.gz 63281 BLAKE2B f26868d8a1b1b591a58342adfff22860d568152475953b9c48d0ff74df02fb808a3970442d14db3e66a296bf3f110a8dc0b71b3ee5beb65125876bef34c7d752 SHA512 4a738aa70a291df6e7a48e40fd73c70e279bb957d988de1277b1223dfe151867e06de28542fdbd9fd7f816650b150ed53989fc061fc228b930551fcd0b3005fb
-DIST errwrap-7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz 8320 BLAKE2B d73eeb7a4070f300f2c844089b152fe69d5fcfc40687608cb7e1b8b6e3b37c45f9d04428234f357912282831331695aa4d25711987f844c3ac540eab04ab0348 SHA512 da45b1696253bebe012f3d0e624a63dd11ad1a613d81cc302f2ea6f096f29a8d81015b9c00363bd2590c4cacc59de52a27e84435a7b4ad6512485cdd87df11c0
-DIST go-cleanhttp-ce617e79981a8fff618bb643d155133a8f38db96.tar.gz 6595 BLAKE2B aace1fd6671f89275192c39a2a34e151ad35de41657bd6e749928140a23ce5c9a802bceb2dabf3b12e596886524279e1818baab4d7f2b366d62eed89b3fe2b57 SHA512 bfdeea0c0aad4160729bb023c9c908ff56c7faa64a820b16e982efede0389365987343b2a227cac95edaa4c9096f2dfcb1fd3f7d55510328dfdb284cfbf7600a
-DIST go-multierror-d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz 8792 BLAKE2B e63fc6db5a92daaa4b0d6856bffaa60053fe8728616df4e5bf9c764954bddda363d429f744d205023441ab85546155f1d15ead10f80bec968598f3358df057de SHA512 8a3e37ac07bbd571dd8b76bd8c119e5dbc620444e78a6f9fe2c4d28b0171a46704a0b088380ca201a08f7235698f07de4e4881691aef5370739c8bfe2db9e85b
-DIST go-syslog-42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz 4397 BLAKE2B ee049201f02e1565fa6cafecf3cc684239b80461564c5ddfce94d99d940dad03f6d856171dcbcf8a97dd9e88e99da31401aae0b2604d56680d2a47ae5739799c SHA512 42257d0599936bb215f4a9f9189518418f02bc43e4d7417823ea460bfc45c6fd1f9b0bf5a35dd73881b57cd9e892c702b813a68fe6e417e82dd31c6635c1b24e
-DIST hcl-578dd9746824a54637686b51a41bad457a56bcef.tar.gz 54677 BLAKE2B b8a22fbf1fb03a734b52617062be86cf1103c9929e6f0d73e4ae8bb685bc0a113b25e6dd7d73fa2fb3b88a545106e6489be8c61531101347be0dfc177c8efe99 SHA512 a430b7a4be9147e0fad3d932ecaee5970f049991351654682c679ace971e883615f957255d81da3dc2f732b0bfa26d66eb73ec7811957f05c2f72c2c506c23cd
-DIST logutils-0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz 7717 BLAKE2B 083cc3630c8a56aa0c4d230a3767fa8cab34f17a11c178dde5c3cc47d60978d6cd4ba4b7defdc1cef9ec22921bfeb0cb57be08aa68d4d99d1cdec4c438c501bd SHA512 54e55f95808fb68be532e35076ffb04ff844a7d032530b82bbdd87f809bd1b0585538964cc22c7ae1cc039c5c30a02eca9734734c0c01ad76a14bd5a4c386426
-DIST mapstructure-281073eb9eb092240d33ef253c404f1cca550309.tar.gz 13977 BLAKE2B eb7d4e853621798b63ec9806e2fb0d609d33fc7b370276433f055bea4282ab938488272e5a7334a54cf351f4380bc36cb0a0e991d8856e7ed1dc26de76110055 SHA512 f495fe99c8ce752830b3d36db445cdc32baac6e266a0862d13e7e80e04f412ae7ee85e13ba794f1cfae3effb226007874c8ee819a4ef568ce2884077dfba4f9c
-DIST serf-64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz 579000 BLAKE2B 1ae7805273210e02ed1779c29b24f7ea32233e860d3ea324af670547ae85f9ce66a9a98ad2105e59bec222d74ee385bf0051974a38503bff3fb464d68959e8f4 SHA512 eced133c2ba261e4e39d16f2252f555611e90f23f70a746a6f8d60b24e6747e73e619ec74f10a1c0646ec5edfd731cd79f6700d9bc5fb7b100723aac32203a5f
-DIST structs-a924a2250d1033753512e95dce41dca3fd793ad9.tar.gz 12276 BLAKE2B 1e28027d9dc21fafd181ba772ae79049584f803c19dbd9da01ef488a5c9f3998071bb87df0b0a8982b31823e1b4bead2386860ca5309fd4c32aa36941c784445 SHA512 ae2f0bc1f9e1ddbf1bd32d5e50a2ffbc4841c17d451739aee7cbbe359abac982e98a00caaff2aa433d10aad4dc414ce17e94a1d0893610ff53c52beddb21dd4f
+DIST consul-replicate-0.4.0_p20211027-deps.tar.xz 36190528 BLAKE2B 51a48f6e27be2ff1c5e0287fe6def358ec3a360d649eff66cf9a7d9837f80c9742fb899868f65d1a912d2219933ab2885bccb955d1b7be7b3c4babf4741be2cd SHA512 5633d21ba93f9d3fd78e1c26965a663c08e3737aec62c5459b052e3f0c7bc189a3b37ffcf7aaa3a158401e7438765dffc69b7c7289622c7d46ddec24bcf61bb5
+DIST consul-replicate-0.4.0_p20211027.tar.gz 50071 BLAKE2B c287e24628bd1fb25d57ca8f7ba1b1398e652cfacc236c072ac6b86a16c21252715ea9928625c32be380be9721dab36e226f6fb98e5e345117385dc7ea7af2fd SHA512 5fa9a1c7084f6a5078388ec3090d82b16d03e8faaec624e90690308548e92ea712a11d8bab88cc8afbd9d7747cee5c880ff6ac7c41efe9613ede932859e6a141
diff --git a/app-admin/consul-replicate/consul-replicate-0.2.0.ebuild b/app-admin/consul-replicate/consul-replicate-0.2.0.ebuild
deleted file mode 100644
index 1bfc6d258c62..000000000000
--- a/app-admin/consul-replicate/consul-replicate-0.2.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit golang-base
-
-KEYWORDS="~amd64"
-DESCRIPTION="Consul cross-DC KV replication daemon"
-EGO_PN="github.com/hashicorp/${PN}/..."
-HOMEPAGE="https://github.com/hashicorp/consul-replicate"
-LICENSE="MPL-2.0 Apache-2.0 BSD MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT+=" !test? ( test )"
-
-DEPEND=">=dev-lang/go-1.4:="
-RDEPEND=""
-
-SRC_URI="https://${EGO_PN%/*}/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/hashicorp/consul-template/archive/v0.8.0.tar.gz -> consul-template-0.8.0.tar.gz
- https://github.com/fatih/structs/archive/a924a2250d1033753512e95dce41dca3fd793ad9.tar.gz -> structs-a924a2250d1033753512e95dce41dca3fd793ad9.tar.gz
- https://github.com/hashicorp/consul/archive/v0.6.3.tar.gz -> consul-0.6.3.tar.gz
- https://github.com/hashicorp/errwrap/archive/7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz -> errwrap-7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz
- https://github.com/hashicorp/go-cleanhttp/archive/ce617e79981a8fff618bb643d155133a8f38db96.tar.gz -> go-cleanhttp-ce617e79981a8fff618bb643d155133a8f38db96.tar.gz
- https://github.com/hashicorp/go-multierror/archive/d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz -> go-multierror-d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz
- https://github.com/hashicorp/go-syslog/archive/42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz -> go-syslog-42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz
- https://github.com/hashicorp/hcl/archive/578dd9746824a54637686b51a41bad457a56bcef.tar.gz -> hcl-578dd9746824a54637686b51a41bad457a56bcef.tar.gz
- https://github.com/hashicorp/logutils/archive/0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz -> logutils-0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz
- https://github.com/hashicorp/serf/archive/64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz -> serf-64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz
- https://github.com/mitchellh/mapstructure/archive/281073eb9eb092240d33ef253c404f1cca550309.tar.gz -> mapstructure-281073eb9eb092240d33ef253c404f1cca550309.tar.gz"
-
-S="${WORKDIR}/src/${EGO_PN%/*}"
-
-get_archive_go_package() {
- local archive=${1} uri x
- for x in ${SRC_URI}; do
- if [[ ${x} == http* ]]; then
- uri=${x}
- elif [[ ${x} == ${archive} ]]; then
- break
- fi
- done
- uri=${uri#https://}
- echo ${uri%/archive/*}
-}
-
-unpack_go_packages() {
- local go_package x
- # Unpack packages to appropriate locations for GOPATH
- for x in ${A}; do
- unpack ${x}
- go_package=$(get_archive_go_package ${x})
- mkdir -p src/${go_package%/*}
- mv ${go_package##*/}-* src/${go_package} || die
- done
-}
-
-src_unpack() {
- unpack_go_packages
- export GOPATH=${WORKDIR}:$(get_golibdir_gopath)
-}
-
-src_prepare() {
- # Create a writable GOROOT in order to avoid sandbox violations.
- export GOROOT="${WORKDIR}/goroot"
- cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
- rm -rf "${GOROOT}"/{src,pkg/$(go env GOOS)_$(go env GOARCH)}/"${EGO_PN%/*}" || die
-
- # Prune conflicting libraries from GOROOT
- while read -r -d '' x; do
- x=${x#${WORKDIR}/src}
- rm -rf "${GOROOT}/src/${x}" "${GOROOT}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}"{,.a} || die
- done < <(find "${WORKDIR}/src" -maxdepth 3 -mindepth 3 -type d -print0)
-
- sed -e 's:TestParseConfig_parseFileError(:_\0:' -i config_test.go || die
-
- sed -e 's|t.Errorf("expected %q to be %q", config.Prefixes, expected)|t.Errorf("expected %v to be %v", config.Prefixes, expected)|' \
- -e 's|t.Errorf("expected %q to be %q", config.Prefixes\[0\], expected)|t.Errorf("expected %v to be %v", config.Prefixes[0], expected)|' \
- -e 's|t.Errorf("expected %q to be %q", value.Data, data)|t.Errorf("expected %v to be %v", value.Data, data)|' \
- -i cli_test.go runner_test.go || die
-}
-
-src_compile() {
- go build -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
- go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
-}
-
-src_install() {
- dobin "${WORKDIR}/bin/${PN}"
- dodoc CHANGELOG.md README.md
-}
diff --git a/app-admin/consul-replicate/consul-replicate-0.4.0_p20211027.ebuild b/app-admin/consul-replicate/consul-replicate-0.4.0_p20211027.ebuild
new file mode 100644
index 000000000000..ee17b73b197b
--- /dev/null
+++ b/app-admin/consul-replicate/consul-replicate-0.4.0_p20211027.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module
+
+EGIT_COMMIT=aceb253db329a6aefb48ac58dfc231e6947f73b2
+KEYWORDS="~amd64"
+DESCRIPTION="Consul cross-DC KV replication daemon"
+HOMEPAGE="https://github.com/hashicorp/consul-replicate"
+SRC_URI="https://github.com/hashicorp/consul-replicate/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
+
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 ISC MIT"
+SLOT="0"
+
+S=${WORKDIR}/${PN}-${EGIT_COMMIT}
+
+src_compile() {
+ export GOBIN="${S}/bin"
+ go install ./... || die
+}
+
+src_test() {
+ go test -work ./... || die
+}
+
+src_install() {
+ dobin bin/${PN}
+ dodoc CHANGELOG.md README.md
+}
diff --git a/app-admin/consul-replicate/metadata.xml b/app-admin/consul-replicate/metadata.xml
index 387973160cac..1c9617615de6 100644
--- a/app-admin/consul-replicate/metadata.xml
+++ b/app-admin/consul-replicate/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>zmedico@gentoo.org</email>