From edf0423d3dbb315b838c9cc678ac20984526b651 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Sat, 30 Apr 2022 23:53:45 +0200 Subject: [PATCH] app-metrics/apache_exporter: Fix build. Package-Manager: Portage-3.0.30, Repoman-3.0.3 --- app-metrics/apache_exporter/ChangeLog | 3 ++ app-metrics/apache_exporter/Manifest | 5 +- .../apache_exporter-0.11.0.ebuild | 47 +++++++------------ 3 files changed, 23 insertions(+), 32 deletions(-) diff --git a/app-metrics/apache_exporter/ChangeLog b/app-metrics/apache_exporter/ChangeLog index 4f3cae5..b329865 100644 --- a/app-metrics/apache_exporter/ChangeLog +++ b/app-metrics/apache_exporter/ChangeLog @@ -1,3 +1,6 @@ + 30 Apr 2022; Manuel Friedli apache_exporter-0.11.0.ebuild: + app-metrics/apache_exporter: Fix build. + *apache_exporter-0.11.0 (30 Apr 2022) 30 Apr 2022; Manuel Friedli diff --git a/app-metrics/apache_exporter/Manifest b/app-metrics/apache_exporter/Manifest index fc75df3..7a44e2a 100644 --- a/app-metrics/apache_exporter/Manifest +++ b/app-metrics/apache_exporter/Manifest @@ -2,9 +2,10 @@ AUX apache_exporter.confd 59 BLAKE2B 4466ae408352adc136fa882cf382c1562e8e0b6401e AUX apache_exporter.initd 650 BLAKE2B 86d014a2bb4f98a54a5e98060884bb99d1ec4011ce028a981d9d39cc5a5292c39018a80df2a3f0ad4b97aa1a0da059e89ad151f0a0b3d13d6ba6386aa4a9d6d4 SHA512 42367bb35b79cb3c4946ae57e81fa918d94b9b5613469e1e070797ffc9ab7ae74aaa3ad244be35cef8fe5df043fb5e1a604449c3a416e01da7cb11ad95c2b5b1 AUX apache_exporter.service 196 BLAKE2B b7429d240256bdbe594741900bd1715d7806f604d420b668c83ed2b4f66b32ba1ff142a54e04687182c0b24f43d58c6d74f5b319d69aaa4619d4b561a9567913 SHA512 a93847eb9407e94388a606972373a2e9c51ca46f16b8a87365d8544b680d1d0fbf47a6eb86865621375015a58c8b6480aeefa247f37c31fa0a84383a27a915f7 AUX sysconfig.apache_exporter 11 BLAKE2B e83c8a1c6cf0d2269d032d80bfb5f37969adce8655298d49f942e19318e1fcabe7f618514ce65d9e0209959d5ccb38141e81fcccd65a754584eaf2db3b4fbd03 SHA512 f4d982f86de30c5b52b04c201cd38fffa87f860bef18af6ab85e856ae2081b919256b918b5f4821ee2fc4da0548d1a95c2522b29cddca57f694e2f26c1b1b2b9 +DIST apache_exporter-0.11.0-deps.tar.xz 23603784 BLAKE2B b2e8f25b73dfc84a7108c42780ebb38412925218d11b18ce26f83c504d937b7ac026152e78913d71b92247d4514e0bf06f7d52267bbd5861e5fb1585e2651008 SHA512 8e1ece3be69284c0a0513c3aa18411f0ab9ff2f300b03ff0fea527413c4f4ae3a88287973fef2140497ad4298a2fb4f88c5476b0ef35870730c7e6ebc329d154 DIST apache_exporter-0.11.0.tar.gz 41172 BLAKE2B 7c03a62ad8d7c76c80fcd7bac6c73079ef6caf7d0924c00559d788cdab98d89342e453056e52ad7d5f908521fdebaf99b8103c69fa46e0da15789cca0e74e5e9 SHA512 98ba30804bbd9a46ff0728e8bd8b02f6820492e0e44a60122acc9727c4e3fbabefb135f66ee36820e90cf6322b5e7335578eb8568a8f1fe6aead279a050e8208 DIST apache_exporter-0.8.0.tar.gz 1687423 BLAKE2B 8ffe1edd6549c6129ec82852ee7134ba3ceb22f6ab6c678e0c28e6ed58c43d0243184efed013e11e3062b4359beb43914059bc35a31f242c93ef210616248fc7 SHA512 1e885687a8a2d5abfbf16f11d1940688b65404e76fa620ef397eb85733ab0fa9ec9ba4143728466d3036266a6f3ef03409000a7c69d85e2be6eda2075bc8a113 -EBUILD apache_exporter-0.11.0.ebuild 1339 BLAKE2B c97ac2c7cfd00bdec8cdb085edb4e0f89b098764e75462180c5596f98f1a1cedd78c443128902502458581b45c855e7648c243dc481bef08fa5ff41ec76e2d95 SHA512 fd8e9ab47b27bc813b9c71f64ced9ccdecc1e8d68c51449a7d2581e0d726d357dfb9c9eda1e2656a091c8328d7f4d094e03185f5516b3f917c1da10aa032b2be +EBUILD apache_exporter-0.11.0.ebuild 999 BLAKE2B a47143595acd55d6437b5ae0afe4e079604f637b7f631d136fb8034ffeec0af42e805d9975c8eb587f9f09049be25c7e6d5bdd54fc4c1fdf3a3f29c16b6637c4 SHA512 1dc2d8ad914727c8c7246153f42657f5dc5efd025a30edf10961ff1a1ef056769fb8f07fa185b251af86137f98f24e3c1c8940a354536a8ea4f9cc2a91b1dc51 EBUILD apache_exporter-0.8.0-r1.ebuild 1339 BLAKE2B d1fd6596f842ba122c57dc59cbf7f23b49aade25df361734e214eca3ae9924a74c2f253b741238da06091a9f102953e7e7a68bbd86b4080d9c7372d1e854225f SHA512 df27ff9f4fa0ecf4a8011d0a5f5a42339fde421742794a89a425eaa34640aff86340fa4f65e108b4b0c225bd7862551b04e4c4cf160b3acaee1be8bd271a5dce -MISC ChangeLog 1523 BLAKE2B 97fba905e5b228dffea9027d7fb787d6b51d6653e96d79522d8f3c7d4b9910172f82f4e91f3f0ca5dd23936e1792fe6ab9968c1e94e19c8ce279593ed551efd2 SHA512 be1633aec623701f7311868fc9d63f3a07080a0016e84b5b4904ab41efb9ba4b3c2ccfada75b128b5a203ec4429a56cac62892e4bf747e05e72bce3b758ce3ad +MISC ChangeLog 1647 BLAKE2B a501f35d077b654fa59b37e4e2aad1c02528831ac9679e3bbca1442f9acf003eeb95e12239a301a20e5ef66f02f8ce15a25386efbd734581b7ec88d0aac188e2 SHA512 849533db53b4ae81568363380b7c27918c3b5b24249b67be46eaadbb8839665f819644d3af67613068823cec43d42ccf97d33454fa7cdab32a58f6b6b90a9700 MISC metadata.xml 337 BLAKE2B bd72b6097fead5eaf80082790d3712ae0893b118140b62f58639f0e5c56bebf57dbd0ccd0ea19af82b2dce88c88c494d88290f98df4818e4fad3f4386398d171 SHA512 aee4825d8b90a8fd84fb558b9af4b7eb889fcf81bae6c7b317a9d69f62b06dd0f0bc2aa91aa2c32f10ff91fdbf64b341d7e5adc3c65a5225c7e0e92d7a6b7816 diff --git a/app-metrics/apache_exporter/apache_exporter-0.11.0.ebuild b/app-metrics/apache_exporter/apache_exporter-0.11.0.ebuild index 35dfa95..55a71a5 100644 --- a/app-metrics/apache_exporter/apache_exporter-0.11.0.ebuild +++ b/app-metrics/apache_exporter/apache_exporter-0.11.0.ebuild @@ -1,49 +1,36 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -inherit golang-build golang-vcs-snapshot systemd - -EGO_PN="github.com/Lusitaniae/apache_exporter" -EGIT_COMMIT="v${PV/_rc/-rc.}" -APACHE_EXPORTER_COMMIT="f4fd9dd" -ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64" +EAPI=8 +inherit go-module systemd DESCRIPTION="Prometheus exporter for apache metrics" HOMEPAGE="https://github.com/Lusitaniae/apache_exporter" -SRC_URI="${ARCHIVE_URI}" +SRC_URI="https://github.com/Lusitaniae/apache_exporter/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://manuel.friedli.info/gentoo-overlay/apache_exporter-0.11.0-deps.tar.xz" + LICENSE="MIT" SLOT="0" -IUSE="" +KEYWORDS="~amd64" -DEPEND=">=dev-lang/go-1.14 - >=dev-util/promu-0.3.0" - -RDEPEND="acct-user/apache_exporter" - -src_prepare() { - default - sed -i -e "s/{{.Revision}}/${APACHE_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die -} +DEPEND="acct-group/apache_exporter + acct-user/apache_exporter" + RDEPEND="${DEPEND}" src_compile() { - pushd src/${EGO_PN} || die - mkdir -p bin || die - GOPATH="${S}" GOCACHE="${T}"/go-cache promu build -v --prefix apache_exporter || die - popd || die + ego build } src_install() { - pushd src/${EGO_PN} || die - dobin apache_exporter/apache_exporter + dobin apache_exporter dodoc README.md - systemd_dounit "${FILESDIR}/${PN}.service" + newinitd "${FILESDIR}"/apache_exporter.initd apache_exporter + newconfd "${FILESDIR}"/apache_exporter.confd apache_exporter + + systemd_dounit "${FILESDIR}"/apache_exporter.service insinto /etc/sysconfig newins "${FILESDIR}/sysconfig.apache_exporter" apache_exporter - popd || die + keepdir /var/log/apache_exporter - fowners apache_exporter:apache_exporter /var/log/apache_exporter - newinitd "${FILESDIR}"/${PN}.initd ${PN} - newconfd "${FILESDIR}"/${PN}.confd ${PN} + fowners -R ${PN}:${PN} /var/log/apache_exporter }