commit: 8bf05271ccf42be4bf75b40f9ec75c809fd9965b Author: William Hubbs <williamh <AT> gentoo <DOT> org> AuthorDate: Sun Jan 23 20:15:35 2022 +0000 Commit: William Hubbs <williamh <AT> gentoo <DOT> org> CommitDate: Sun Jan 23 20:16:03 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bf05271
www-apps/trickster-1.1.5: build fixes - drop the vendor tarball - fix installation of systemd service Closes: https://bugs.gentoo.org/830478 Closes: https://bugs.gentoo.org/830488 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: William Hubbs <williamh <AT> gentoo.org> www-apps/trickster/Manifest | 1 - www-apps/trickster/trickster-1.1.5.ebuild | 13 +++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/www-apps/trickster/Manifest b/www-apps/trickster/Manifest index b01d6348cf9f..ddb482078015 100644 --- a/www-apps/trickster/Manifest +++ b/www-apps/trickster/Manifest @@ -1,4 +1,3 @@ DIST trickster-0.1.9-vendor.tar.gz 1748976 BLAKE2B 77ad4a91a889a8241399fe6b4199d25c0ba52e818fbe1df8186dadea0f69c1d04f9c268fc376820592465ed36104a6195ce9a9985f8a9c02636ee1b8f80114b7 SHA512 6427cb3417ae7d62e5e144cb5a1962f2175ab063c2267abd838560db00acc4c161666df4ea2065a02172b50240f17a6ad09d76973e59d9bea91ecf4a9327466f DIST trickster-0.1.9.tar.gz 1739869 BLAKE2B dc50d12acfe27f68054bbafdeada0bd1847ebb1e03847f9173c7e9b772218ce2e7ceffe25db282912f88c005c0d590e3effece6483bdd80830438a8d114f859f SHA512 82fa837d2b18143a65e22a06d2821d7a1da298fb3e9389854f8e6ad4de68f35d40d6aec2d23cca877032227d12818063953244a01b42f09bd724677d1080e84f -DIST trickster-1.1.5-vendor.tar.xz 1310612 BLAKE2B ffe97d000ca53c1f1fea8b15eb20ba63c18cd9cd79c187d831b225abe7a472b75070fa516b04bcec44ed8b37ee600d6506b0d3241eebdbe1c5e91da935893127 SHA512 b804f3d520639fe873289ee92f0a920c6a8cde32abdfdb17c76d59858812b8416dcb3581d0f42ea5c219f5b892e57d6f3187a41edf0b9ef03179906837b2a6f9 DIST trickster-1.1.5.tar.gz 5170485 BLAKE2B e0f0df7bf6c810d6cedfc6175dd8413adfeccdeca3329dbf1bf0f38d612ecb4c9692fa1b5560cf91fda9213c57c268f5fbe16608a8eb5932219abe026cd581ef SHA512 da06e05436f6019b677b2d5d04e6b8aa1cd15a7ba1962b64101569c64e17f3132e71528f3925a3772d2ad7faf9435c987ffaacffd07961ab8526b68fbfd58135 diff --git a/www-apps/trickster/trickster-1.1.5.ebuild b/www-apps/trickster/trickster-1.1.5.ebuild index 8f4e9be4ae1f..94496cb5ca4d 100644 --- a/www-apps/trickster/trickster-1.1.5.ebuild +++ b/www-apps/trickster/trickster-1.1.5.ebuild @@ -7,9 +7,7 @@ inherit go-module systemd DESCRIPTION="Dashboard Accelerator for Prometheus" HOMEPAGE="https://github.com/tricksterproxy/trickster"; -VENDOR_URI="https://dev.gentoo.org/~williamh/dist/${P}-vendor.tar.xz"; -SRC_URI="https://github.com/tricksterproxy/trickster/archive/v${PV}.tar.gz -> ${P}.tar.gz - ${VENDOR_URI}" +SRC_URI="https://github.com/tricksterproxy/trickster/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" @@ -21,11 +19,6 @@ COMMON_DEPEND=" DEPEND="${COMMON_DEPEND}" RDEPEND="${COMMON_DEPEND}" -src_prepare() { - default - mv ../vendor . -} - src_compile() { set -- go build -mod vendor ./cmd/trickster echo $@ @@ -34,8 +27,8 @@ src_compile() { src_install() { dobin ${PN} -dodoc -r conf docs/* - systemd_dounit conf/trickster.service +dodoc -r docs/* + systemd_dounit deploy/systemd/trickster.service insinto /etc/trickster doins "${FILESDIR}"/${PN}.conf newinitd "${FILESDIR}"/${PN}.initd ${PN}
