Replace chezmoi-bin with chezmoi

2024-05-31 21:13:50 -07:00 · 2024-05-31 21:13:50 -07:00 · 1723e59ed6
commit 1723e59ed6
parent 75eabe53ab
8 changed files with 85 additions and 87 deletions
--- a/app-admin/chezmoi-bin/Manifest
+++ b/app-admin/chezmoi-bin/Manifest
@ -1,20 +0,0 @@
-DIST chezmoi_2.47.4_linux_amd64.deb 11567484 BLAKE2B 50971fee9cd0d2454d6dafdd37a7487515642891e19679aee6dc51a7305c8f22880f1690e9f0adca480565da4e5661aa55208a9186b54b11f86aa9afd7eb42f7 SHA512 e097eec3d7a0d111563655f5cd52fcc9e68c744cb015cb399b88a5e1166115185e898f93ab7aa264c336b13b6182ce843f121dce7803d0a110b800c960858bc6
-DIST chezmoi_2.47.4_linux_arm64.deb 10575070 BLAKE2B 643360387a79b62855ceb04d12a1e79ca227ee3511882ba0aa9192b13eac50fb670c44a65d273b109388c9ae2c4c61cb055ec77d12c6374b6e90bc7c16431d1c SHA512 57c035fa769ad7229fe7c346877f3a711cdcd407df29c9ae3f40ef600bea939ea54574f760a4a02fc086ef50ea38886df377234865a8df71b2b07b29dfb3fbeb
-DIST chezmoi_2.47.4_linux_armel.deb 10804406 BLAKE2B beb686bb36872a2253581691983b49ab11ee11cece6de03e0a436ef71286a25ff01361d35a29370932cd60ab95ef49618f763b4e4f4cbd2b47bb04f25c3999e9 SHA512 0f42cb8fdeb7981b15c59630371b2248ba782134b0272c7d488eb00ec07d46b7c2ff1b1f9c672c4a6c93dd3a340e5c838fcd5e378c8d7728c074010dc89910d8
-DIST chezmoi_2.47.4_linux_i386.deb 10727504 BLAKE2B 1e9f885b776f39c83af8f3c4794ea79bb8d156fe22599c7f5d3db77414e7308e854bfcac99d7a157e1a3a3b3988d90a45dab683c79b86d195a2f894895521881 SHA512 ba61b4f70305b0dc7c6c70746f70befdeb81850767ebc769fca4b476ab4558c672e5c6a10704e837e95163e800cfcf2f2abcd406d0ca0ef61569ac8bc705d5bd
-DIST chezmoi_2.47.4_linux_ppc64.deb 10345436 BLAKE2B 7ae5c7b94c9df17e8a9c710c1cb3d7c72960d2cfd73233a52d84d060c9c9145292412f6796d0c8a74beccd6d7247f5348008470684ec3b53822f6f85cd4876de SHA512 621145afc776e8ec1b982f948b530fa4f82779e8604e8355017dfab663951d84d8bda0d68faeca4f71f5816120914dd0314c5faa8e9cb2f6570e6ed0808ef6df
-DIST chezmoi_2.48.0_linux_amd64.deb 11571680 BLAKE2B 4d918c3f084f015b104afa9ae6d1411f5b293ca2b607cf3f5f1d1711008bdf5089f50d45ee197d40bb3b72c99c527ce6428d2820c78c2d079d7b4664266e56b0 SHA512 4f231d5ea3cb003c641a95c30ca38046b04ac495776fa9b7b7336fe071f81f25b73c2fe4a2916bc8f9839989b79d6623b53dbd47c65751cd69ebcf97a7b14bfe
-DIST chezmoi_2.48.0_linux_arm64.deb 10586656 BLAKE2B 8e835f077a8307988d2303adabacbe88b22787c2ca8b743f64132de0900da5e9c9973e289b0e76e56f9c0ac423d1ff97c94b57944b25bfa685ffb3fb05675d46 SHA512 7c5ff49ad82b09d14610e7e9a7858c3e35a84dbccf378398188bf75679d1b6eef22a32b41bde9321afee7b7dee3ab21453479e1d2c642fcd605dda6d4c4e35d7
-DIST chezmoi_2.48.0_linux_armel.deb 10811620 BLAKE2B 1622485a554e6931f0d29178663457c0de7926fe0f6c7e1099c8387e62821687ede791572095c0b273b8762ce979b1353120e5b5d272bc04bf9bc28a3db32e91 SHA512 92d08df3bd5d1794f3e91a60e7e32967003328d3ce91a7268f5b7e52f26af024d1e4415b3fbb081b6d89ab6fca882f98fa89d73a27cf36a5f9c8cfc60ca40aa0
-DIST chezmoi_2.48.0_linux_i386.deb 10728042 BLAKE2B a1d63d7b7ccc522f6a6950b663523b808b52d08b0702ebdaa75972b4b15f144b5abc5733dde2c7454385f643cea9a4afd9a22984c971051a5bc30baa80db57d8 SHA512 65391c8fee0ce7f44fbec3db99ad8585dc01c02becc56d4e722c98a61973023bb402b5341036553cccf6a125ab2d16bc73cd867eabdd413b55571378d7aee36e
-DIST chezmoi_2.48.0_linux_ppc64.deb 10349118 BLAKE2B 26c55ebb4f40942d72196e81b3c60682b7ef4f51bf2d14a3d089d2ea4084ec019f6edd293d1566b1cff3da7670465a377a2bd26cebab21b8c212935fb08fa2c2 SHA512 1de83e55a13952d12882b227d685b9b9ff765751b1b37a0c884db87b436ef14b87a016b82eb51445eb723011d692b7c600489d7f4198afa02aa51142bbe8fd4c
-DIST chezmoi_2.48.1_linux_amd64.deb 11574056 BLAKE2B 429070f4cbc4cc00974445ad7db96600ba152f03abae03fa9eeba900e462947f6c12f4722adb13982e16978abee11fbcb906a9838ac1ec96802fe30fcbaab6d4 SHA512 a69d30f49ff117d39865c67682c481fc6a935284cd5b514a5e8d4ee5fb0115642c90d561438e7e0ed6fb3b2388f164862810b3fd91dc6a33f901a7614b9cc685
-DIST chezmoi_2.48.1_linux_arm64.deb 10589648 BLAKE2B c98fafe1c4eb8366859910483c8aa14a589844855827b601d3f48f5ba9b7123c190a88e716817bf8b8d53dd520d96c6bb3d63152bf92da4044e40ad42d03313a SHA512 d2290dc9e126a6a4a4ef1204471160a4649d7afce09b4ce223828e815b130a3f0650fda37b8d91a9bc034d1128bfcf85cdf27e16af136bc62334f0ab6cd06c3f
-DIST chezmoi_2.48.1_linux_armel.deb 10813766 BLAKE2B e75d29759c0f8d87740b6e8870442db555eecb830d8fb7bc7e262c5f837b75fa179b22b52fe6c229e0022ba9cbdfd8870f02d045570baa1cb8b8afc3beb5f417 SHA512 02c63d0f14a1401dccb4daaa599446bed2f5d212e34e412da3405b051c7937c303b59c44de6bf376a8e5a40dff8682b56b31833bd01f4afbd5b8774fbc1d05c5
-DIST chezmoi_2.48.1_linux_i386.deb 10729630 BLAKE2B 24d5316e8c17529b6cf5c814308e4b89a74bcf205b9c2a814d660c87dc8fac57fea96d564f9581136f478776628f8e6d614c608a18f10dd6036b911475ffeb71 SHA512 7b7583e8a3a88f63e4d334fee9f87d4d2ed8cc168825f8634cec50e0b50e05f018aa94cec09c76a356b84e0a2d11681e2c2ca2e9e2f111594b6c57810e85df90
-DIST chezmoi_2.48.1_linux_ppc64.deb 10353932 BLAKE2B ec20d52db5ab4201aff11bccbb666fc86dc0887bdf81ce8ec6cc16f87f914828c36a11ea1945e52edbabda6a08e6f4f7804f1bee0c85bd4e3b95a085418f667e SHA512 f1e8dbf041c2ced9b6d05bfd73d16e6a5c7e8744f2a70dc550575d4fb9b551ca7a69f8dad909e18a23c47d6eaf1c52a432bf6875dae8f01117627a60bd06cbe1
-DIST chezmoi_2.48.2_linux_amd64.deb 11580406 BLAKE2B c99e25e0faee69e31460b0a28f82568aaa19ea434d01a170ebe75ef82e598c3ffe59dfe0532c4af2152324061e48fd422ea1d744bf265a8106866680be854af8 SHA512 2e14f1ebca8c72bbbb0a83e73991a5aa70d0516ca3d6e489250bb2639d18821f20dd95fb974125f4dfaaab0b5657b7f4b756c5fad42f153bce613f1d70b84ba2
-DIST chezmoi_2.48.2_linux_arm64.deb 10599414 BLAKE2B 3cc404e15f8eb11da2ce8057203f6dea275c4a17909bc3398fe1f7e84823e7c2ad1060a5a16505637a82035843cf09f5712f6f6f0aba51dc4f14e89014aacfc0 SHA512 f309455401d9c08a578b566426a1bc15c1f8e4e5cd7647026922e3bacc20e824613468491c95d7d21bb38c75160fdafd173e8b02e48708ef411cd9e1fcec76ef
-DIST chezmoi_2.48.2_linux_armel.deb 10829220 BLAKE2B 606715a3bbad0bb6ca4389c0bbb0a5be00088fc03534aecb74b72d9932f70ee81a1526d93e589e9d5808564c1dfa492ddf6fc77c28149b996b7bd8142427bdf4 SHA512 6ef25f271a74848b0bb80f5ef57f028c01921a5292488501a07c3774cba5c6c3b1510d383f66de6171735988e2cf0f542e8d700e57abd2fb86807b06c6f0a067
-DIST chezmoi_2.48.2_linux_i386.deb 10746404 BLAKE2B 461353847233b27b5b690fa3f92b884078505e343e32ecc0d29420655ab0db4dfad187b321f62a7e8e4ca0a3b630ea76fa87c3f6689d030c7f7fef8da9360ff8 SHA512 3e070d33dd96735b965fe8f0dabb69369c8b54d56eacca262f6a7ad78dbf09c6d061ba9a9028a89e18f550ef6e544880a1e2e6269dcafa712cbae537f508a41b
-DIST chezmoi_2.48.2_linux_ppc64.deb 10362690 BLAKE2B 839374225bcec3d30687f97fbc432c0aa6304f442864a9787e09a43cf540f814aa5ef239869a81f4b98996aca12638cc0b31c2d6c74619557a83c4fbad5c7bc3 SHA512 297e0d54a0d5de37267f6e0aab8291d8ff9f158c1624ae84351a845ef00da9ef9366ee36e9099f8aaa9a05ff018cb9d3201fd429cf9839fb5e193cee269bbef2
--- a/app-admin/chezmoi-bin/chezmoi-bin-2.48.2.ebuild
+++ b/app-admin/chezmoi-bin/chezmoi-bin-2.48.2.ebuild
@ -1,40 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-# shellcheck shell=bash
-
-EAPI=8
-
-inherit unpacker
-
-MY_PN="${PN%-bin}"
-
-DESCRIPTION="Manage your dotfiles across multiple machines, securely."
-HOMEPAGE="https://github.com/twpayne/chezmoi"
-SRC_URI="
-	amd64? ( https://github.com/twpayne/${MY_PN}/releases/download/v${PV}/${MY_PN}_${PV}_linux_amd64.deb )
-	arm? ( https://github.com/twpayne/${MY_PN}/releases/download/v${PV}/${MY_PN}_${PV}_linux_armel.deb )
-	arm64? ( https://github.com/twpayne/${MY_PN}/releases/download/v${PV}/${MY_PN}_${PV}_linux_arm64.deb )
-	ppc64? ( https://github.com/twpayne/${MY_PN}/releases/download/v${PV}/${MY_PN}_${PV}_linux_ppc64.deb )
-	x86? ( https://github.com/twpayne/${MY_PN}/releases/download/v${PV}/${MY_PN}_${PV}_linux_i386.deb )"
-
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
-RDEPEND="dev-vcs/git"
-SLOT="0"
-
-RESTRICT="mirror"
-
-QA_PREBUILT="usr/bin/${MY_PN}"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack_deb "${A}"
-}
-
-src_install() {
-	insinto /
-	doins -r ./*
-
-	fperms +x "/usr/bin/${MY_PN}"
-}
--- a/app-admin/chezmoi-bin/metadata.xml
+++ b/app-admin/chezmoi-bin/metadata.xml
@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>jared@rgst.io</email>
-		<name>Jared Allard</name>
-		</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<longdescription lang="en">
-			Dotfile management application which provides a configuration
-			and encryption interface ontop of traditional version control
-			functionality. This simplifies synchronization of dotfiles
-			between multiple machines, operating systems, and environments
-			with differing requirements.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">twpane/chezmoi</remote-id>
-	</upstream>
-</pkgmetadata>
--- a/app-admin/chezmoi/Manifest
+++ b/app-admin/chezmoi/Manifest
@ -0,0 +1,2 @@
+DIST chezmoi-2.48.2.tar.gz 2455889 BLAKE2B f7ffcb059335f7fdaf06f8693a5837c8a1a2f9a157a2b6ded819d77cd602c35a937ae4090a476e483915d281443e71000cd662588b26caa1f5cfc5677c7fb6ef SHA512 080d45df25d4bd6305d2124e436dd75f57f1de85fddfa9956c6f2ebe664f8ec153a5c52130de9808b83061ef2641e97688defb366ed185ec8cd12e3618370995
+DIST deps.tar.xz 275510268 BLAKE2B d2bc8d0deb3a41d20f6366d4299a0e337b7b6050c0de76019d54de97e098dd886a297d3e130d60ff3c0667a6dd7645d1940ec317e0a8408b787bb80ff6430c09 SHA512 5c5251dcfa8c70aa176d70e1c935d4e26879cbe9afad53bb6a1bac08acacdbcc0ea67e2fdb50cf8fcef820f0a582a78a4ad3aa82099def863abf668f49f7d269
--- a/app-admin/chezmoi/chezmoi-2.48.2.ebuild
+++ b/app-admin/chezmoi/chezmoi-2.48.2.ebuild
@ -0,0 +1,42 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+VERSION_GIT_HASH="80d7918630f17a5a0827ffb218e16dbb596f3bac"
+
+DESCRIPTION="Manage your dotfiles across multiple diverse machines, securely"
+HOMEPAGE="https://www.chezmoi.io/"
+SRC_URI="https://github.com/twpayne/chezmoi/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://gentoo.rgst.io/updater_artifacts/${CATEGORY}/${PN}/${PV}/deps.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm arm64 ~riscv ~x86"
+
+BDEPEND=">=dev-lang/go-1.21"
+
+RESTRICT="test"
+
+# This was added based on the .goreleaser.yml file in the upstream
+# repository.
+build_dist() {
+  ego build \
+    -ldflags \
+    "-s -w -X main.version=v${PV} -X main.commit=${VERSION_GIT_HASH} -X main.date=$(date "+%Y-%m-%dT%H:%M:%SZ") -X main.builtBy=ebuild" "$@"
+}
+
+src_prepare() {
+  # Replaces generate-commit.go step.
+  echo -n "$VERSION_GIT_HASH" >COMMIT
+  default
+}
+
+src_compile() {
+  build_dist ./
+}
+
+src_install() {
+  dobin chezmoi
+}
--- a/metadata/news/2024-05-31-chezmoi-replaces-chezmoi-bin/2024-05-31-chezmoi-replaces-chezmoi-bin.en.txt
+++ b/metadata/news/2024-05-31-chezmoi-replaces-chezmoi-bin/2024-05-31-chezmoi-replaces-chezmoi-bin.en.txt
@ -0,0 +1,10 @@
+Title: chezmoi replaces chezmoi-bin
+Author: Jared Allard <jaredallard@users.noreply.github.com>
+Posted: 2024-05-31
+Revision: 1
+News-Item-Format: 2.0
+
+Now that we have a system for automatically updating Go ebuilds, I've
+removed chezmoi-bin in favor of using a from source ebuild, which is now
+called 'app-admin/chezmoi'. Emerge should automatically handle the
+rename, but if not, please remove 'chezmoi-bin' and install 'chezmoi'.
--- a/packages.yml
+++ b/packages.yml
@ -1,8 +1,4 @@
 # Configure automatic updates for ebuilds.
-app-admin/chezmoi-bin:
-  resolver: git
-  options:
-    url: https://github.com/twpayne/chezmoi
 app-admin/1password:
  resolver: apt
  options:
@ -67,6 +63,35 @@ net-vpn/tailscale:
        sed -i 's/VERSION_LONG=".*"/VERSION_LONG="'"${VERSION_LONG}"'"/' new.ebuild
        sed -i 's/VERSION_GIT_HASH=".*"/VERSION_GIT_HASH="'"${VERSION_GIT_HASH}"'"/' new.ebuild

-        sed -i 's|dev-lang/golang-.*|dev-lang/golang-${GO_VERSION}|' new.ebuild
+        sed -i 's|dev-lang\/go-.*|dev-lang\/go-'"${GO_VERSION}"'"|' new.ebuild
+    - upload_artifact: deps.tar.xz
+    - ebuild: new.ebuild
+app-admin/chezmoi:
+  resolver: git
+  options:
+    url: https://github.com/twpayne/chezmoi
+
+  # We have to generate a Go dependency archive and upload it to a
+  # stable location, so we do that during this process.
+  steps:
+    - checkout: https://github.com/twpayne/chezmoi
+    - original_ebuild: new.ebuild
+    - command: |-
+        set -euxo pipefail
+
+        GO_VERSION=$(grep "^go" go.mod | awk '{ print $2 }' | awk -F '.' '{ print $1"."$2}')
+        mise use -g golang@"${GO_VERSION}"
+
+        # Create the dependency tar.
+        GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
+        tar --create --file deps.tar go-mod
+        xz --threads 0 deps.tar
+
+        # Get the shell variables and rewrite the ebuild to contain
+        # them.
+        VERSION_GIT_HASH=$(go run assets/scripts/generate-commit.go)
+        sed -i 's/VERSION_GIT_HASH=".*"/VERSION_GIT_HASH="'"${VERSION_GIT_HASH}"'"/' new.ebuild
+
+        sed -i 's|dev-lang\/go-.*|dev-lang\/go-'"${GO_VERSION}"'"|' new.ebuild
    - upload_artifact: deps.tar.xz
    - ebuild: new.ebuild
--- a/profiles/updates/2Q-2024
+++ b/profiles/updates/2Q-2024
@ -0,0 +1 @@
+move app-admin/chezmoi-bin app-admin/chezmoi
				`@ -0,0 +1 @@`
				`move app-admin/chezmoi-bin app-admin/chezmoi`