gentoo resync : 25.03.2022

6 files changed, 41 insertions, 202 deletions

diff --git a/app-metrics/elasticsearch_exporter/Manifest b/app-metrics/elasticsearch_exporter/Manifest
index fd486445cf55..8d38f95b1680 100644
--- a/app-metrics/elasticsearch_exporter/Manifest
+++ b/app-metrics/elasticsearch_exporter/Manifest
@@ -1,11 +1,6 @@
 AUX elasticsearch_exporter.confd 96 BLAKE2B 4a65204509588b3bc93dfc5aa8f32c68a78b9dad05a3d8f95ba1095ee8bce8a2b3e94eb9b1b7d912b4d5953d99317233715e8c25e9ec1ee79809f0cdea09cf23 SHA512 f50fda8691d50ff59ba0679641d8211c117ba24b00b3ad4035ad5fdd144fdea909e26a9474e640049e778c256327642437d4b178aaa9f652b840420875ff152a
 AUX elasticsearch_exporter.initd 616 BLAKE2B ea0a311d6cf94063375a2369868ff258fe1f1e1335ccb664f032de975d7e2824c4d1d78716e706828e5a83efa91435ff225570eb68c18f330e3c46dc9e505aad SHA512 9780cc87adaca2be90e94baad679685781112de02e2eb68ff3270162ea38b228bc8960e670e80e20015855f6256d772208898e43f5924a1633ffdef98d2b4621
-DIST elasticsearch_exporter-1.0.2.tar.gz 207764 BLAKE2B f626c53d04e05912d1db480d6078b44fb6a05e42ec1751bfc2ddd45ff2f0bc0550517e16b10064adcf8c2ab2db175011543a2953fff1624cd575318e6fad943b SHA512 f610660761d761a26b840a969008763ecb19bdc07ab4a076cec7fc40f7d00a68e863fb72b0ea3b56446621a99fa31384ab79789a2e6526fc5b12dcc20df3c684
-DIST elasticsearch_exporter-1.0.4_rc1.tar.gz 212553 BLAKE2B 9f6f8f0117af4e59a483eda378df8a2ac5419a5319a02f69210250be952dc6cd401f0c20dbc3d416446d3af183750919f190112795652180d64ea3f6c62f5a56 SHA512 073fcce3417ae2147076b0fbbe3387494f9e2e8613284f03c6761d5e81d50aba648c6b47d423d79209d0b9221963951c21b2fa44aabe29c1eb0c36546dd140eb
-DIST elasticsearch_exporter-1.1.0.tar.gz 316279 BLAKE2B 86e994ea0765a231b8ebaeaf495fa160ce53795e191e25cf82994214b53c62f03030b27040e95b770dc526ed2b772961b12ac73700b0da9f8994d532a0958789 SHA512 81cd7a44a2cd07bde7e716eac688c06ca93059de5ba7e1d3e009683b133f8c84c91a09a9e4775a558a3856389e165ce8ec2f04bd856b7b39b8f4a6072623b103
-DIST elasticsearch_exporter-1.1.0_rc1.tar.gz 314275 BLAKE2B 1548cbecb6f5a0ae70ffb7a1ccceedbc5e9f980841b9ddb47f56c522a0f0fdc4f9c0613ec95c6a8705f1affd8d713e70d6cfaeacd84cd552a21466a490cac387 SHA512 ba571fec3cdbc32279008ddfc6b72b093fef4ba4ee0eaed98000cecadf81f61adcce24989f36c8dc6abde51129ed638473267e2636ec669ac30440338001930e
-EBUILD elasticsearch_exporter-1.0.2.ebuild 1170 BLAKE2B 0c4d4f884255a96c24aa5639af0cbbe4be19cb412c41feb182858d8b4aef1782033c7ea486194dc3b8c92abbb481e8ef2fc6ddc3beb6df7752677ec2853024ef SHA512 a3a6d2d52c12bf0d1494147e89e03d37a202d9e311e6bc6cff508fee519be8ecf62b80f9caa8bf73628d710758c588a1e5b37e188389f0489c526689248295ea
-EBUILD elasticsearch_exporter-1.0.4_rc1.ebuild 1189 BLAKE2B dfee20a2d0c5e9cb4941148a45585508aa0ecab57665cffea2e25730d9cd5afdafbce1c992c9aaab35fe1592c1beac9775d5bd79d54ff5d7d53976d609d964ca SHA512 dbb8aaebc071629bd5c8c356a9edfb10876755116ab8d488f63c860ec0f513b9e277e2bbf7acccbe5787bfd005a08e0d6c20bdcb41e85a85de5428eaeb8d763f
-EBUILD elasticsearch_exporter-1.1.0.ebuild 1186 BLAKE2B 9ec84f9289ea5d930c4f22b6192667060177590617aa311a784c13adc1ae8e7401d4ba5a0e6f9405b3c283557a1ce205eaad09b990f2c615b79f5cedf8205f27 SHA512 33f5b40c584de7421f06e69db5dbb49eebacd7e18079a0fbe0b922f861947c6c66f868e2884260a9f41ee3dc0ef9f9d56e65dab6d2acbf1e423dbdfd8fdd853f
-EBUILD elasticsearch_exporter-1.1.0_rc1.ebuild 1186 BLAKE2B d071fec2ae82368c6771c6a69adf8061997058f5d24e17c11ddb5f676e0cced84780b48cb07a4eb325fce21428a494f0be6f52df5bcdfb6fbbc3a364f31a6eca SHA512 4f1ee8deec35959ab73a64101f5e236f2bf2380d2f42454b374583f698c9c4cf6665fbdd0f9ca9e733963eeee53144c6eb4602ab2e16674f225c3c5d746db3f2
+DIST elasticsearch_exporter-1.3.0-deps.tar.xz 106387304 BLAKE2B d67e8b746ecf9f05310194485ac99b95768b813a7265b3ec445261d52708551c37bc14718021ee67306c84fedc323f5ef4e87cba043354b3b49c9ba0764e5575 SHA512 0374030189927deb14c8bd34b6472e9be8f7025aea525394a5eca5d6899311296e7eeefb7d05a2b4a75549c4590b9590dd592ab3c0aaf008c311922a01ea81d5
+DIST elasticsearch_exporter-1.3.0.tar.gz 93489 BLAKE2B 33e2dbe9608bd052bc4f31fc2a38774981d96f30fd54465bd2b10d075f0fade29fe6c40d2e32370a38edc41d04b3772100c39f5670c302a0a334e2a7d5ee6463 SHA512 a88ec20cd7f2f9859d2e169f7813b84c3286b65dfc3a625545608416dbee5f96d4e223e7d2ea2f2b788be766ead1abb11b795d3059a628d0c3c56f567eebea00
+EBUILD elasticsearch_exporter-1.3.0.ebuild 1055 BLAKE2B 29da25e0921b20ee9e7f9012567de13d5de3407d0e09c7f2da785fb4ee2a539771be8e6b0aecb17976893218b715bc7d5f45ac2d7b55a1c644b015db1407ecc1 SHA512 1aa9b47c50d8c86d4f7a839557534313c02c63858a291a07b41af478a90b5b7a13ddcba70e4c79590e3339d456fe4fbc3bce171ee4018c16177383b2710c7685
 MISC metadata.xml 349 BLAKE2B 4044bc0be243da6bd421f354c01862cd04347f996222ef4a7648510eae36516ab79260ef0e48ff1555702bb9a26715e9cbaedaa7c47bb6f1f55c16ef6941933a SHA512 b310261a85a2d5bb23ad4ee1c08c5678f348392f57cae3ffe442087f596b75e63a0fe279495642950d108d3b68398f30b9063ed23571c61b081c947a0b4a60de
diff --git a/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.0.2.ebuild b/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.0.2.ebuild
deleted file mode 100644
index 7b98a004a46d..000000000000
--- a/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.0.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/justwatchcom/elasticsearch_exporter"
-EXPORTER_COMMIT="92dcbf3"
-ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Elasticsearch stats exporter for Prometheus"
-HOMEPAGE="https://github.com/justwatchcom/elasticsearch_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0 BSD MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-util/promu"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "/-s$/d" -e "s/{{.Revision}}/${EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	mkdir -p bin || die
-	GOPATH="${S}" promu build -v --prefix bin || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin bin/elasticsearch_exporter
-	dodoc {README,CHANGELOG}.md
-	popd || die
-	keepdir /var/log/elasticsearch_exporter
-	fowners ${PN}:${PN} /var/log/elasticsearch_exporter
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.0.4_rc1.ebuild b/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.0.4_rc1.ebuild
deleted file mode 100644
index b238ed08aed5..000000000000
--- a/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.0.4_rc1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-MY_PV=${PV/_/}
-
-EGO_PN="github.com/justwatchcom/elasticsearch_exporter"
-EXPORTER_COMMIT="68340fd"
-ARCHIVE_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Elasticsearch stats exporter for Prometheus"
-HOMEPAGE="https://github.com/justwatchcom/elasticsearch_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0 BSD MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-util/promu"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "/-s$/d" -e "s/{{.Revision}}/${EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	mkdir -p bin || die
-	GOPATH="${S}" promu build -v --prefix bin || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin bin/elasticsearch_exporter
-	dodoc {README,CHANGELOG}.md
-	popd || die
-	keepdir /var/log/elasticsearch_exporter
-	fowners ${PN}:${PN} /var/log/elasticsearch_exporter
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.1.0.ebuild b/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.1.0.ebuild
deleted file mode 100644
index 50bebfc26e14..000000000000
--- a/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.1.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-MY_PV=${PV/_/}
-
-EGO_PN="github.com/justwatchcom/elasticsearch_exporter"
-EXPORTER_COMMIT="fe20e49"
-ARCHIVE_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Elasticsearch stats exporter for Prometheus"
-HOMEPAGE="https://github.com/justwatchcom/elasticsearch_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0 BSD MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-util/promu"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "/-s$/d" -e "s/{{.Revision}}/${EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	mkdir -p bin || die
-	GOPATH="${S}" promu build -v --prefix bin || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin bin/elasticsearch_exporter
-	dodoc {README,CHANGELOG}.md
-	popd || die
-	keepdir /var/log/elasticsearch_exporter
-	fowners ${PN}:${PN} /var/log/elasticsearch_exporter
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.1.0_rc1.ebuild b/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.1.0_rc1.ebuild
deleted file mode 100644
index ba5fb81cb6fa..000000000000
--- a/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.1.0_rc1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-MY_PV=${PV/_/}
-
-EGO_PN="github.com/justwatchcom/elasticsearch_exporter"
-EXPORTER_COMMIT="c0ec042"
-ARCHIVE_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Elasticsearch stats exporter for Prometheus"
-HOMEPAGE="https://github.com/justwatchcom/elasticsearch_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0 BSD MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-util/promu"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "/-s$/d" -e "s/{{.Revision}}/${EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	mkdir -p bin || die
-	GOPATH="${S}" promu build -v --prefix bin || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin bin/elasticsearch_exporter
-	dodoc {README,CHANGELOG}.md
-	popd || die
-	keepdir /var/log/elasticsearch_exporter
-	fowners ${PN}:${PN} /var/log/elasticsearch_exporter
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.3.0.ebuild b/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.3.0.ebuild
new file mode 100644
index 000000000000..77d0612e73c4
--- /dev/null
+++ b/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.3.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GIT_COMMIT=fe20e49
+MY_PV=${PV/_/}
+inherit go-module
+DESCRIPTION="Elasticsearch stats exporter for Prometheus"
+HOMEPAGE="https://github.com/justwatchcom/elasticsearch_exporter"
+SRC_URI="https://github.com/justwatchcom/elasticsearch_exporter/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="acct-group/elasticsearch_exporter
+	acct-user/elasticsearch_exporter"
+	RDEPEND="${DEPEND}"
+BDEPEND="dev-util/promu"
+
+src_prepare() {
+	default
+	sed -i -e "/-s$/d" -e "s/{{.Revision}}/${GIT_COMMIT}/" .promu.yml || die
+}
+
+src_compile() {
+	promu build --prefix bin || die
+}
+
+src_install() {
+	dobin bin/elasticsearch_exporter
+	dodoc {README,CHANGELOG}.md
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	keepdir /var/log/elasticsearch_exporter
+	fowners ${PN}:${PN} /var/log/elasticsearch_exporter
+}