From dfe76d00db52ee023057f66712b93186d5f37e26 Mon Sep 17 00:00:00 2001
From: Xavier Beaudouin <kiwi@oav.net>
Date: Tue, 22 Oct 2024 16:05:02 +0200
Subject: [PATCH] Try this fix

---
 devel/etcd35/Makefile | 43 ++++++++++++++++++++++---------------------
 devel/etcd35/distinfo |  4 +++-
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/devel/etcd35/Makefile b/devel/etcd35/Makefile
index 22abf84..6baadad 100644
--- a/devel/etcd35/Makefile
+++ b/devel/etcd35/Makefile
@@ -13,7 +13,7 @@ WWW=		https://github.com/coreos/etcd
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		cpe go:1.23,modules
+USES=		cpe go:1.21,modules
 USE_GITHUB=	yes
 GH_ACCOUNT=	coreos
 GH_TUPLE=	\
@@ -43,6 +43,7 @@ GH_TUPLE=	\
 		etcd-io:etcd:v3.5.15:etcd_io_etcd_3 \
 		etcd-io:etcd:v3.5.15:etcd_io_etcd_7 \
 		etcd-io:etcd:v3.5.15:etcd_io_etcd_9 \
+		etcd-io:etcd:v3.6.0-alpha.0:etcd_io_etcd_4/go.etcd.io/etcd/client/v2 \
 		go-logr:logr:v1.3.0:go_logr_logr/vendor/github.com/go-logr/logr \
 		go-logr:stdr:v1.2.2:go_logr_stdr/vendor/github.com/go-logr/stdr \
 		go-yaml:yaml:v2.4.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
@@ -114,26 +115,26 @@ DOCS_DESC=	Install etcd README file
 #	${LN} -s ${WRKDIR}/sys-* ${WRKSRC}/vendor/golang.org/x/sys
 
 post-extract:
-	@${RLN} ${WRKSRC_etcd_io_etcd_1} ${WRKSRC}/api
-	@${RLN} ${WRKSRC_etcd_io_etcd} ${WRKSRC}/api
-	@${RLN} ${WRKSRC_etcd_io_etcd_3} ${WRKSRC}/client/pkg
-	@${RLN} ${WRKSRC_etcd_io_etcd_2} ${WRKSRC}/client/pkg
-	@${RLN} ${WRKSRC_etcd_io_etcd_4} ${WRKSRC}/client/v2
-	@${RLN} ${WRKSRC_etcd_io_etcd_5} ${WRKSRC}/client/v2
-	@${RLN} ${WRKSRC_etcd_io_etcd_7} ${WRKSRC}/client/v3
-	@${RLN} ${WRKSRC_etcd_io_etcd_6} ${WRKSRC}/client/v3
-	@${RLN} ${WRKSRC_etcd_io_etcd_9} ${WRKSRC}/etcdctl
-	@${RLN} ${WRKSRC_etcd_io_etcd_8} ${WRKSRC}/etcdctl
-	@${RLN} ${WRKSRC_etcd_io_etcd_11} ${WRKSRC}/etcdutl
-	@${RLN} ${WRKSRC_etcd_io_etcd_10} ${WRKSRC}/etcdutl
-	@${RLN} ${WRKSRC_etcd_io_etcd_13} ${WRKSRC}/pkg
-	@${RLN} ${WRKSRC_etcd_io_etcd_12} ${WRKSRC}/pkg
-	@${RLN} ${WRKSRC_etcd_io_etcd_15} ${WRKSRC}/raft
-	@${RLN} ${WRKSRC_etcd_io_etcd_14} ${WRKSRC}/raft
-	@${RLN} ${WRKSRC_etcd_io_etcd_16} ${WRKSRC}/server
-	@${RLN} ${WRKSRC_etcd_io_etcd_17} ${WRKSRC}/server
-	@${RLN} ${WRKSRC_etcd_io_etcd_18} ${WRKSRC}/tests
-	@${RLN} ${WRKSRC_etcd_io_etcd_19} ${WRKSRC}/tests
+	${RLN} ${WRKSRC_etcd_io_etcd_1} ${WRKSRC}/api
+	#${RLN} ${WRKSRC_etcd_io_etcd} ${WRKSRC}/api
+	${RLN} ${WRKSRC_etcd_io_etcd_3} ${WRKSRC}/client/pkg
+	#${RLN} ${WRKSRC_etcd_io_etcd_2} ${WRKSRC}/client/pkg
+	#${RLN} ${WRKSRC_etcd_io_etcd_4} ${WRKSRC}/client/v2
+	#${RLN} ${WRKSRC_etcd_io_etcd_5} ${WRKSRC}/client/v2
+	${RLN} ${WRKSRC_etcd_io_etcd_7} ${WRKSRC}/client/v3
+	#${RLN} ${WRKSRC_etcd_io_etcd_6} ${WRKSRC}/client/v3
+	${RLN} ${WRKSRC_etcd_io_etcd_9} ${WRKSRC}/etcdctl
+	#${RLN} ${WRKSRC_etcd_io_etcd_8} ${WRKSRC}/etcdctl
+	#${RLN} ${WRKSRC_etcd_io_etcd_11} ${WRKSRC}/etcdutl
+	${RLN} ${WRKSRC_etcd_io_etcd_10} ${WRKSRC}/etcdutl
+	${RLN} ${WRKSRC_etcd_io_etcd_13} ${WRKSRC}/pkg
+	#${RLN} ${WRKSRC_etcd_io_etcd_12} ${WRKSRC}/pkg
+	${RLN} ${WRKSRC_etcd_io_etcd_15} ${WRKSRC}/raft
+	#${RLN} ${WRKSRC_etcd_io_etcd_14} ${WRKSRC}/raft
+	${RLN} ${WRKSRC_etcd_io_etcd_16} ${WRKSRC}/server
+	#${RLN} ${WRKSRC_etcd_io_etcd_17} ${WRKSRC}/server
+	#${RLN} ${WRKSRC_etcd_io_etcd_18} ${WRKSRC}/tests
+	${RLN} ${WRKSRC_etcd_io_etcd_19} ${WRKSRC}/tests
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/devel/etcd35/distinfo b/devel/etcd35/distinfo
index 97be694..0fb8f31 100644
--- a/devel/etcd35/distinfo
+++ b/devel/etcd35/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1729604076
+TIMESTAMP = 1729604976
 SHA256 (coreos-etcd-v3.5.15_GH0.tar.gz) = bfc9c90f103acd47b0dca2840d4b69af68cb39f22893bef0f4fb5c5351314b84
 SIZE (coreos-etcd-v3.5.15_GH0.tar.gz) = 4113649
 SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825
@@ -53,6 +53,8 @@ SHA256 (etcd-io-etcd-v3.5.15_GH0.tar.gz) = bfc9c90f103acd47b0dca2840d4b69af68cb3
 SIZE (etcd-io-etcd-v3.5.15_GH0.tar.gz) = 4113649
 SHA256 (etcd-io-etcd-v3.5.15_GH0.tar.gz) = bfc9c90f103acd47b0dca2840d4b69af68cb39f22893bef0f4fb5c5351314b84
 SIZE (etcd-io-etcd-v3.5.15_GH0.tar.gz) = 4113649
+SHA256 (etcd-io-etcd-v3.6.0-alpha.0_GH0.tar.gz) = c101da7821e89ab59f47606b083407462e3ff67fa5d37e161574a1c42b688254
+SIZE (etcd-io-etcd-v3.6.0-alpha.0_GH0.tar.gz) = 4161362
 SHA256 (go-logr-logr-v1.3.0_GH0.tar.gz) = a0ceb13b9611e19ebe3cba015e2e6dbbf3125be9cd7f1d975d4d334da688839a
 SIZE (go-logr-logr-v1.3.0_GH0.tar.gz) = 51225
 SHA256 (go-logr-stdr-v1.2.2_GH0.tar.gz) = 37d975b280d884ca0d55a800bc6e47314b6e86268e56254f9d15d19ca9404eb8