From a246b9fbfe17eb44679265869aebaa88b3eb2369 Mon Sep 17 00:00:00 2001 From: Vladimir Pavljuchenkov Date: Sun, 12 Jan 2025 23:15:50 +0200 Subject: [PATCH] fix(app-admin/yaml-vault): rewrite ebuild --- README.md | 3 +-- app-admin/yaml-vault/Manifest | 2 +- app-admin/yaml-vault/metadata.xml | 2 +- app-admin/yaml-vault/yaml-vault-1.1.1_p1.ebuild | 15 +++++++-------- app-admin/yaml-vault/yaml-vault-9999.ebuild | 14 +++++--------- 5 files changed, 15 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 5deae660f..36d26fa1a 100644 --- a/README.md +++ b/README.md @@ -98,7 +98,7 @@ This overlay consists of an [Gentoo Portage](https://www.gentoo.org/) ebuilds fo * app-admin/[vcd-cli](https://github.com/vmware/vcd-cli) | Utility to check AWS resource limits and usage * app-admin/[vector-bin](https://github.com/vectordotdev/vector) | High performance logs, metrics, and events router * app-admin/[whatfiles](https://github.com/spieglt/whatfiles) | Log what files are accessed by any Linux process -* app-admin/[yaml-vault](https://github.com/Jimdo/yaml-vault) | Utility to import/export data from HashiCorp Vault +* app-admin/[yaml-vault](https://github.com/jimdo/yaml-vault) | Utility to import/export data from HashiCorp Vault * app-backup/[clickhouse-backup](https://github.com/AlexAkulov/clickhouse-backup) | Tool for easy ClickHouse backup and restore * app-backup/[hashget](https://github.com/yaroslaff/hashget) | Deduplication tool for archiving data with extremely high ratio * app-backup/[pgbackrest](https://pgbackrest.org) | Reliable PostgreSQL Backup & Restore @@ -1246,4 +1246,3 @@ This overlay consists of an [Gentoo Portage](https://www.gentoo.org/) ebuilds fo * x11-themes/[WhiteSur-icon-theme](https://github.com/vinceliuice/WhiteSur-icon-theme) | comes in both light and dark variants - diff --git a/app-admin/yaml-vault/Manifest b/app-admin/yaml-vault/Manifest index 02d5870ac..2e0997684 100644 --- a/app-admin/yaml-vault/Manifest +++ b/app-admin/yaml-vault/Manifest @@ -1 +1 @@ -DIST yaml-vault-1.1.1_p1.tar.gz 174674 BLAKE2B c68aa4d3dd2e98212c8694b2a8637161df5eca753ad5ffbde603a358366550efe0ba5ef48e07bf61dd5d071c7ffc8923352ca6e175552ea3a103a55b3031d87b SHA512 66f87ed43e3913b7eb6b290cd9358b5aa7d50ad13bb10f9e396d5dd78c96eced2f10ba9c256ea9544059c91a9e5269316dcefb5c3cfd53bf7e68c683ba4b37d7 +DIST yaml-vault-1.1.1_p1.gh.tar.gz 174739 BLAKE2B 9eabcb2f26a2fe36f927e103574f281ca50349c60139d3c2f51244048d43a23b3da5cce6e87f6c182514efebdc22e9b9b3780e4cb2da80d2a3c7ea912afa2a70 SHA512 2b56f0bb44b4cac73a9a54bfd3322809f630ed62d773bc06d648b4e6a8f0362c036700abca03af6adeef016b07ff8f7f6935537905675a427c3047e03b8f6628 diff --git a/app-admin/yaml-vault/metadata.xml b/app-admin/yaml-vault/metadata.xml index eed1302d8..64dbe2f00 100644 --- a/app-admin/yaml-vault/metadata.xml +++ b/app-admin/yaml-vault/metadata.xml @@ -15,6 +15,6 @@ a YAML file. - Jimdo/yaml-vault + jimdo/yaml-vault diff --git a/app-admin/yaml-vault/yaml-vault-1.1.1_p1.ebuild b/app-admin/yaml-vault/yaml-vault-1.1.1_p1.ebuild index ed0a02755..91c86101f 100644 --- a/app-admin/yaml-vault/yaml-vault-1.1.1_p1.ebuild +++ b/app-admin/yaml-vault/yaml-vault-1.1.1_p1.ebuild @@ -1,31 +1,30 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit go-module +COMMIT="a696961003ab9bca89129f08f56dd02541065a16" + DESCRIPTION="Utility to import/export data from HashiCorp Vault" HOMEPAGE="https://github.com/Jimdo/yaml-vault" -SRC_URI="https://api.github.com/repos/Jimdo/${PN}/tarball/a696961 -> ${P}.tar.gz" +SRC_URI="https://github.com/Jimdo/${PN}/archive/${COMMIT}.tar.gz -> ${P}.gh.tar.gz" +S="${WORKDIR}/${PN}-${COMMIT}" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~x86" -S="${WORKDIR}/Jimdo-${PN}-a696961" - DOCS=( {README,History}.md ) src_compile() { LDFLAGS="-X main.version=${PV}" - GOFLAGS="-v -x -mod=vendor" \ - go build -ldflags "$LDFLAGS" || die "build failed" + GOFLAGS="-v -x -mod=vendor" ego build -ldflags "$LDFLAGS" } src_test() { - GOFLAGS="-v -x -mod=vendor" \ - go test -work || die "test failed" + GOFLAGS="-v -x -mod=vendor" ego test -work } src_install() { diff --git a/app-admin/yaml-vault/yaml-vault-9999.ebuild b/app-admin/yaml-vault/yaml-vault-9999.ebuild index b75b5209c..acf6ea3ef 100644 --- a/app-admin/yaml-vault/yaml-vault-9999.ebuild +++ b/app-admin/yaml-vault/yaml-vault-9999.ebuild @@ -1,19 +1,17 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -EGIT_REPO_URI="https://github.com/luhring/${PN}.git" +EGIT_REPO_URI="https://github.com/jimdo/${PN}.git" inherit git-r3 go-module DESCRIPTION="Utility to import/export data from HashiCorp Vault" -HOMEPAGE="https://github.com/Jimdo/yaml-vault" -SRC_URI="" +HOMEPAGE="https://github.com/jimdo/yaml-vault" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="" DOCS=( {README,History}.md ) @@ -24,13 +22,11 @@ src_unpack() { src_compile() { LDFLAGS="-X main.version=${PV}" - GOFLAGS="-v -x -mod=vendor" \ - go build -ldflags "$LDFLAGS" || die "build failed" + GOFLAGS="-v -x -mod=vendor" ego build -ldflags "$LDFLAGS" } src_test() { - GOFLAGS="-v -x -mod=vendor" \ - go test -work || die "test failed" + GOFLAGS="-v -x -mod=vendor" ego test -work || die "test failed" } src_install() {