diff --git a/.tools/internal/steps/embed/generate-go-deps.sh b/.tools/internal/steps/embed/generate-go-deps.sh index bbfb313..813cc04 100644 --- a/.tools/internal/steps/embed/generate-go-deps.sh +++ b/.tools/internal/steps/embed/generate-go-deps.sh @@ -24,7 +24,7 @@ mise use -g golang@"${GO_VERSION}" echo "Creating dependency tarball" if [[ "$MODE" == "full" ]]; then tarDir="go-mod" - GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw + GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw -x else go mod vendor tarDir="vendor" diff --git a/net-vpn/tailscale/Manifest b/net-vpn/tailscale/Manifest index 7a170f8..94b03a6 100644 --- a/net-vpn/tailscale/Manifest +++ b/net-vpn/tailscale/Manifest @@ -2,5 +2,3 @@ DIST tailscale-1.68.0-deps.tar.xz 475022544 BLAKE2B 9bc68ff79c11457387c0f665eca9 DIST tailscale-1.68.0.tar.gz 2721807 BLAKE2B ffb6b4cc36473195587a8fc7a3142e1e7c73a5ccd50dc1fe8b26f3d0b69feb476e339a9bb66b2836823090c48a12b79e5bdbf54af96e4603464d70837ae0e7d0 SHA512 b63ee338e2a75d5be3b3c9c7446db178c66f326aea074bb1cdd18d7f1aa5fa720b0cafd5ff07a3665bb403d05d22c8f4cf0fa9638a5a87b08b6b617bd5795ee8 DIST tailscale-1.68.1-deps.tar.xz 475973944 BLAKE2B 9cb7cf0e8d608eaec21dda674c37b3f52a9b31a41b9676fbfced24d3dbe51cbdec8af9accdb1a83d104a5f3e73e43903567168aa19467517d6445f27e0bd3b63 SHA512 849c81b39b563c88a69e2e74d7d7e57aa3c2f1b1bd50cb5801765c0c4a211116692224a0a925c7c89a905fbe5c90a28657259170e44c7166b55f543db2a6f243 DIST tailscale-1.68.1.tar.gz 2722164 BLAKE2B 36339615d1490db20c3d35ebdd6aa934516bc745e274860e5a25526a7517cffba4a2a75965cab7637c769c49db61f34ac49a012c5eae0b5c1d2b788137d7395e SHA512 b9177107fffc0768c4c682df916ecce27a80659876e628659bc73ce5ff7697a108982c4c49e47eeef1f84f02315443f1a29ff22d1afc07d6c1da699d84bbd2d9 -DIST tailscale-1.68.2-deps.tar.xz 14190912 BLAKE2B 3548e223c1719b33008dbab03d8003ca0c03c7a19dcb78162079ab66d7ca5075ddbdb03c456aab81cdcfc2956cdd529d8e3f5822dac85e7fc1e6a2e2daa1ad42 SHA512 f09d24e4fc8814c0e82ec8a782fae1131386b458b12da8c77b11ff15720669b0070fd9810b85af14bd1676663c6be1d94f616916cf8eb3d3a9c66e0f1a92eebc -DIST tailscale-1.68.2.tar.gz 2724045 BLAKE2B 45e02c50a9edb106ee777fae0b00d099fc3a60ec1e794b6267c3e3fb285b2ed63b00bd62d260562c1f45b0c14f06080da9ff4696e9209b91cc8175d8728d2d56 SHA512 d512e051cc05507f75de07c75ffa9f91b5a6c340facf3c15797950668570319d2dbbc9fa078788cff261c964ef5da64d9a4b7c6d46591c07b63131c2f39f3add diff --git a/net-vpn/tailscale/tailscale-1.68.2.ebuild b/net-vpn/tailscale/tailscale-1.68.2.ebuild deleted file mode 100644 index b0f9295..0000000 --- a/net-vpn/tailscale/tailscale-1.68.2.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 2020-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit go-module systemd tmpfiles - -# These settings are obtained by running ./build_dist.sh shellvars in -# the upstream repo. -VERSION_MINOR="68" -VERSION_SHORT="1.68.2" -VERSION_LONG="1.68.2-tc79c500c7" -VERSION_GIT_HASH="c79c500c7e93c8e416c77f85d106b04a4aab23ab" - -DESCRIPTION="Tailscale vpn client" -HOMEPAGE="https://tailscale.com" -SRC_URI="https://github.com/tailscale/tailscale/archive/v${PV}.tar.gz -> ${P}.tar.gz" -SRC_URI+=" https://gentoo.rgst.io/updater_artifacts/${CATEGORY}/${PN}/${PV}/deps.tar.xz -> ${P}-deps.tar.xz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm arm64 ~riscv ~x86" - -RDEPEND="net-firewall/iptables" -BDEPEND=">=dev-lang/go-1.22" - -RESTRICT="test" - -# This translates the build command from upstream's build_dist.sh to an -# ebuild equivalent. -build_dist() { - ego build -tags xversion -ldflags " - -X tailscale.com/version.Long=${VERSION_LONG} - -X tailscale.com/version.Short=${VERSION_SHORT} - -X tailscale.com/version.GitCommit=${VERSION_GIT_HASH}" "$@" -} - -src_compile() { - build_dist ./cmd/tailscale - build_dist ./cmd/tailscaled -} - -src_install() { - dosbin tailscaled - dobin tailscale - - systemd_dounit cmd/tailscaled/tailscaled.service - insinto /etc/default - newins cmd/tailscaled/tailscaled.defaults tailscaled - keepdir /var/lib/${PN} - fperms 0750 /var/lib/${PN} - - newtmpfiles "${FILESDIR}/${PN}.tmpfiles" ${PN}.conf - - newinitd "${FILESDIR}/${PN}d.initd" ${PN} - newconfd "${FILESDIR}/${PN}d.confd" ${PN} -} - -pkg_postinst() { - tmpfiles_process ${PN}.conf -} diff --git a/packages.yml b/packages.yml index 06ed2e5..0f4f77d 100644 --- a/packages.yml +++ b/packages.yml @@ -41,7 +41,7 @@ net-vpn/tailscale: steps: - checkout: https://github.com/tailscale/tailscale - original_ebuild: new.ebuild - - generate_go_deps + - generate_go_deps: full - command: |- set -euxo pipefail @@ -64,7 +64,7 @@ app-admin/chezmoi: steps: - checkout: https://github.com/twpayne/chezmoi - original_ebuild: new.ebuild - - generate_go_deps + - generate_go_deps: full - command: |- set -euxo pipefail @@ -85,7 +85,7 @@ dev-util/glab: steps: - checkout: https://gitlab.com/gitlab-org/cli - original_ebuild: new.ebuild - - generate_go_deps + - generate_go_deps: full - upload_artifact: deps.tar.xz - ebuild: new.ebuild @@ -99,6 +99,6 @@ dev-util/doppler: steps: - checkout: https://github.com/DopplerHQ/cli - original_ebuild: new.ebuild - - generate_go_deps + - generate_go_deps: full - upload_artifact: deps.tar.xz - ebuild: new.ebuild