From e77801e9aff9fb8dc1aded981135dc6d1d92f55d Mon Sep 17 00:00:00 2001
From: Haochen Tong <i@hexchain.org>
Date: Mon, 16 Sep 2024 11:58:38 +0800
Subject: net-vpn/tailscale: fix version reporting

Closes: https://bugs.gentoo.org/923621
Closes: https://github.com/gentoo/gentoo/pull/37721
Signed-off-by: Sam James <sam@gentoo.org>
---
 net-vpn/tailscale/tailscale-1.72.0-r1.ebuild | 62 ++++++++++++++++++++++++++++
 net-vpn/tailscale/tailscale-1.72.0.ebuild    | 62 ----------------------------
 2 files changed, 62 insertions(+), 62 deletions(-)
 create mode 100644 net-vpn/tailscale/tailscale-1.72.0-r1.ebuild
 delete mode 100644 net-vpn/tailscale/tailscale-1.72.0.ebuild

(limited to 'net-vpn')

diff --git a/net-vpn/tailscale/tailscale-1.72.0-r1.ebuild b/net-vpn/tailscale/tailscale-1.72.0-r1.ebuild
new file mode 100644
index 000000000000..76c2c6be34d8
--- /dev/null
+++ b/net-vpn/tailscale/tailscale-1.72.0-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module linux-info systemd tmpfiles
+
+# These settings are obtained by running ./build_dist.sh shellvars` in
+# the upstream repo.
+VERSION_MINOR="72"
+VERSION_SHORT="1.72.0"
+VERSION_LONG="1.72.0-taa448d5a9"
+VERSION_GIT_HASH="aa448d5a9985378af04966c6d7aec8d9f4a166ca"
+
+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://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+CONFIG_CHECK="~TUN"
+
+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.longStamp=${VERSION_LONG}
+		-X tailscale.com/version.shortStamp=${VERSION_SHORT}
+		-X tailscale.com/version.gitCommitStamp=${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/net-vpn/tailscale/tailscale-1.72.0.ebuild b/net-vpn/tailscale/tailscale-1.72.0.ebuild
deleted file mode 100644
index 9d16265c6af9..000000000000
--- a/net-vpn/tailscale/tailscale-1.72.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module linux-info systemd tmpfiles
-
-# These settings are obtained by running ./build_dist.sh shellvars` in
-# the upstream repo.
-VERSION_MINOR="72"
-VERSION_SHORT="1.72.0"
-VERSION_LONG="1.72.0-taa448d5a9"
-VERSION_GIT_HASH="aa448d5a9985378af04966c6d7aec8d9f4a166ca"
-
-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://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-CONFIG_CHECK="~TUN"
-
-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
-}
-- 
cgit v1.2.3-65-gdbad