From afe5695672c66a8722593222ed21d98d6ec02959 Mon Sep 17 00:00:00 2001
From: Nils Freydank <nils.freydank@posteo.de>
Date: Sun, 19 Jan 2025 09:57:36 +0100
Subject: [PATCH] app-crypt/gocryptfs: Bump to 2.5.0

Do some house-keeping, partly inspired by the ebuild in-tree.

Signed-off-by: Nils Freydank <nils.freydank@posteo.de>
---
 app-crypt/gocryptfs/Manifest                  |  2 +-
 ...2.4.0-r1.ebuild => gocryptfs-2.5.0.ebuild} | 30 ++++---------------
 2 files changed, 6 insertions(+), 26 deletions(-)
 rename app-crypt/gocryptfs/{gocryptfs-2.4.0-r1.ebuild => gocryptfs-2.5.0.ebuild} (73%)

diff --git a/app-crypt/gocryptfs/Manifest b/app-crypt/gocryptfs/Manifest
index 1d93aaf..99b7d18 100644
--- a/app-crypt/gocryptfs/Manifest
+++ b/app-crypt/gocryptfs/Manifest
@@ -1 +1 @@
-DIST gocryptfs-2.4.0.tar.gz 2927929 BLAKE2B e66e91506c5a7abb5413e8797f786145c436ca760e3c7157590ccb1c8430b2ac240b8ba1fd0ed3401ee4277a2e9ef6b8f3a9b3c52c22bac8e6b27b56350d9eec SHA512 b46d6eee21a0194022a042d6ae2a737f221a0932bb899123438f2cf929ecb50635fcfc90012d6a04928fd4b2856d6e24d19392ce5aa87eea573fb58cf5a5d4e1
+DIST gocryptfs-2.5.0.tar.gz 3142915 BLAKE2B 07cf202175f643fdd7d1417116858531481a8930a611561a6b982d5440e31e50740e57de876021c9a67eb9d25f01684851573d6613956848d96ee22c696419dc SHA512 02fc89d97b06f2c49125f3437dbfdc00a39caeecd18172ff3645e6c574d76efd20d16ead4ff9004e9a64ae912ffafa6141598bb0edfb7ca966b4fe38203b2b29
diff --git a/app-crypt/gocryptfs/gocryptfs-2.4.0-r1.ebuild b/app-crypt/gocryptfs/gocryptfs-2.5.0.ebuild
similarity index 73%
rename from app-crypt/gocryptfs/gocryptfs-2.4.0-r1.ebuild
rename to app-crypt/gocryptfs/gocryptfs-2.5.0.ebuild
index 6b02b55..623d2c5 100644
--- a/app-crypt/gocryptfs/gocryptfs-2.4.0-r1.ebuild
+++ b/app-crypt/gocryptfs/gocryptfs-2.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2024 Gentoo Authors
+# Copyright 2019-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Note: For distfiles verification see https://nuetzlich.net/gocryptfs/releases.
@@ -13,25 +13,14 @@ MY_PV="${PV/_/-}"
 DESCRIPTION="Encrypted overlay filesystem written in Go"
 HOMEPAGE="https://nuetzlich.net/gocryptfs/ https://github.com/rfjakob/gocryptfs/"
 
-S="${WORKDIR}/${PN}_v${MY_PV}_src-deps"
-
 if [[ "${PV}" = 9999* ]]; then
 	EGIT_REPO_URI="https://${EGO_PN}"
 	inherit git-r3
 else
 	SRC_URI="https://${EGO_PN}/releases/download/v${MY_PV}/${PN}_v${MY_PV}_src-deps.tar.gz -> ${P}.tar.gz"
 fi
-
-# in detail:
-# BSD           vendor/golang.org/x/sys/LICENSE
-# BSD           vendor/golang.org/x/crypto/LICENSE
-# BSD           vendor/github.com/hanwen/go-fuse/v2/LICENSE
-# Apache-2.0    vendor/github.com/jacobsa/crypto/LICENSE
-# BSD-2         vendor/github.com/pkg/xattr/LICENSE
-# MIT           vendor/github.com/rfjakob/eme/LICENSE
-# MIT           vendor/github.com/sabhiram/go-gitignore/LICENSE
+S="${WORKDIR}/${PN}_v${MY_PV}_src-deps"
 LICENSE="Apache-2.0 BSD BSD-2 MIT"
-
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="debug +man pie +ssl"
@@ -43,17 +32,8 @@ RDEPEND="
 	sys-fs/fuse
 	ssl? ( dev-libs/openssl:0= )
 "
-
-# We omit debug symbols which looks like pre-stripping to portage.
-QA_PRESTRIPPED="
-	/usr/bin/gocryptfs-atomicrename
-	/usr/bin/gocryptfs-findholes
-	/usr/bin/gocryptfs-statfs
-	/usr/bin/gocryptfs-xray
-	/usr/bin/gocryptfs
-"
-
 src_compile() {
+	export CGO_ENABLED=1
 	export GOPATH="${G}"
 	export CGO_CFLAGS="${CFLAGS}"
 	export CGO_LDFLAGS="${LDFLAGS}"
@@ -61,7 +41,7 @@ src_compile() {
 		"$(usex !debug '-s -w' '')"
 		-X "main.GitVersion=v${PV}"
 		-X "'main.GitVersionFuse=[vendored]'"
-		-X "main.BuildDate=$(date -u '+%Y-%m-%d')"
+		-X "main.BuildDate=$(date --utc '+%Y-%m-%d')"
 	)
 	local mygoargs=(
 		-v -work -x
@@ -76,7 +56,7 @@ src_compile() {
 	# loop over all helper tools
 	for dir in gocryptfs-xray contrib/statfs contrib/findholes contrib/atomicrename; do
 		cd "${S}/${dir}" || die
-		go build "${mygoargs[@]}" || die
+		ego build "${mygoargs[@]}"
 	done
 	cd "${S}"