gentoo auto-resync : 03:04:2024 - 02:14:03

5 files changed, 5 insertions, 30 deletions

diff --git a/x11-wm/fvwm3/Manifest b/x11-wm/fvwm3/Manifest
index c3884b4c66b9..454dba7ea747 100644
--- a/x11-wm/fvwm3/Manifest
+++ b/x11-wm/fvwm3/Manifest
@@ -1,10 +1,9 @@
-AUX fvwm3-1.0.8-implicit-function-decl-configure.patch 471 BLAKE2B eb0eb437a35497f0d7584bc66c5969189fa2f75b48b7acf730656c0ecfce78f456a9771094431dc7e06e8b0d3d65fde473581660822406315a7491fd8288c21b SHA512 8164aa4fd4307a962d6030f44667789523a383e1eb83aae15aace762e6594351f00e368d2474cd86e39a637825c2696e773c9952bb65de934a624e726ec61069
-AUX fvwm3-1.1.0-fix-go-detection.patch 1821 BLAKE2B d67caf926a62c5473a43975c0272a6a8459b2484f4e42b02b7a9f66dd09da3e67252b353b935a498386086469d6e4840c48c8deb0bb6350801d5070e70760d8b SHA512 e22ed6d49ebd3c35fce43e99c49ab33d1a377df27799f516e4b28bdbf86920d6a02624b3042c68af9ca187f3a5bee9a55136e02c45478e8671c33ecd3ec2b1cb
+AUX fvwm3-1.1.0-fix-go-detection-v2.patch 1807 BLAKE2B e34c3110b0fe64a392a8c2a9369780e55bee4f043f6c403e8e0b9f216e657580125a7b1fe0481017fc41de89866e099ead38f4779bec5737f30fe52c63ae6dab SHA512 cb2716f0ec085c75cceb73c0f6d3ba838c162162c0c3e6ae83bcf93c099d7f15d6d29bad59bd5522e24f1f4305d36f70fe91150536d239d3e1a1abb8fc9b6a33
 DIST fvwm3-1.0.9-docs.tar.xz 234884 BLAKE2B f52da9eb2486f7a212ead77ccc190c57076e1d3c73a3997c3a94edcf60dbc72ec5d410a8df1d621ff18b346741b1c94b3f87170db68c3067caa3295782a9bb61 SHA512 e6c33b09b7bac32bd61f1bd2c0216e2c99fef3f0b51b52b229093c25a437828e4bece382284d0c1f0bbbaf5b7459f2c391dfc1d2fa4ba80be22f09094e976b03
 DIST fvwm3-1.0.9.tar.gz 4525552 BLAKE2B cb58181adb42f5b8d491c6413277eb1f4a5d89637d9c6bb323223925c719d808e84ed0f72a1d0ffc822ddb8295ebf2bb89c2351ebd591916b50ebc69728e59fa SHA512 de71d74b76da8e0cf1560d51ef916857e3f825b272d786d9b6b93aef9a82c399f580b9b941a47aff1f327b097d12e1ce05860924e792206e4150ff19a5c39ee3
 DIST fvwm3-1.1.0-docs.tar.xz 230964 BLAKE2B f431011a63a8d190e01e34301e74fd40750deb51c947b055474888379b7364910351c923ac637968948a094b89f49d8be5758429a85cd66107b8696b526b0004 SHA512 629794d0aef9ef2d9ce9a8e1ff3bc63fe2ef30f9f593938e2892e4e04bd960f51d2a90aaf5c95328495bccea6b1dbfd6fdeb76f18bb9a8bc6eb2649359023df8
 DIST fvwm3-1.1.0.tar.gz 4527424 BLAKE2B ee9a3f190ae7fa1f1dd703e17b0e12f04da63212cade30facdbc8339ded7f598de143d18f17dde39d3af8e24ff2b34855ad3e5b2b6c5ffe466072a7353895cd8 SHA512 47eea05cbdecf4da3313b9183fa938544b451b9f133d7a68062feb222c3c1af3873402f80b60485d603afe8cd23a03f3e86a503fc1f2070e1ad2e6e64d012341
 EBUILD fvwm3-1.0.9-r1.ebuild 4808 BLAKE2B 522e96330ee3730704e2544ab34a71816b5616e8565790cabacbb3a0ccfbebcf09d7b0e74acd289b1d092c9e828e58d995d6986257d32db55b58310b6aea866e SHA512 9a10669c760d02ac45339259c8d4c836dcb3cfcfaf368363838ba16bf415afc83bb20db326999d4a45c237771b0c617691d3639292517475b45961fe37174380
-EBUILD fvwm3-1.1.0.ebuild 4871 BLAKE2B bd06eab9b8273bc7ab36b2998acd4593fa7d48965ab28b79ba8d897f109a5992602e8d0626955e8484ebbcf51b68a65db5fff8188f8f094a793643a196262291 SHA512 00f01f6317af4c9724e71761af42892a9618c9a9e8dbc8b9d3dfb1c1bf9e8b67d22578962bdac2920cc0446626d2aa80db05417cbcb8c1647507375c06e604fd
-EBUILD fvwm3-9999.ebuild 4831 BLAKE2B 56523fea4709d1472435de0020c8b79e6ff40c48e98077f03732cb6d0457bab3abbfc2d70efa8ddf6b7c7983796202852d62b32d5779eeb99e9dc0e1ce8edcc4 SHA512 59f40c3451d667e547767904ccbd9da4723fc61f20f7789904d083f4068f042489ff80d482202362550e3c8ccb800d54c4ff9590a2dc389ca0cab2f68998f084
+EBUILD fvwm3-1.1.0-r1.ebuild 4759 BLAKE2B 562730695d29ac3f1d587ad37803719614107e8332ac96b8faab71e20186d961bd39155057875346aca7bf2c2588db6c104f2b4c84fda52752ef75c85f933176 SHA512 8740a4d2bc9a67d9f1b190f846ab07ce5fc0fb210348450bd9f120ae224d79fb6a1a9e7bb04dc6787dcb25779c760902f90416f9afa7355b01e77668eb01e0c7
+EBUILD fvwm3-9999.ebuild 4716 BLAKE2B f7a1be00bfeb6e7fc6ed8e2dea7d55a25ba9a57998dea8e2b6a95477412b301c1f9d236609217b74f822807b834e808e80aef7777e5081d4a16144182f3c2ecf SHA512 ac53c1eb13bf03a68a0a9f2103cda7928a01939798c553d0eed8050966da8286c4abab617cee31eda8248698d7affc7383de86c7ac209e42ffe91eded5a18317
 MISC metadata.xml 1012 BLAKE2B 5c5d08f16521594e1425ca8efbe5162c72ce6aff0557c0c79f1e2717dfc77ba855f90c493b45ff361d2e75f00b17e549b6853ee660c77c57cdeadce1df223f32 SHA512 a53bdde33366823f867bcff8b6c90e3cae6e0808945278fd02928502fd38df9d699fa4ace2fe66c1524e74d256242202a2b3139deb1331b67ac72f2fd0e9608f
diff --git a/x11-wm/fvwm3/files/fvwm3-1.0.8-implicit-function-decl-configure.patch b/x11-wm/fvwm3/files/fvwm3-1.0.8-implicit-function-decl-configure.patch
deleted file mode 100644
index 374afddcd6e4..000000000000
--- a/x11-wm/fvwm3/files/fvwm3-1.0.8-implicit-function-decl-configure.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://github.com/fvwmorg/fvwm3/pull/914
-From: Matt Jolly <Matt.Jolly@footclan.ninja>
-Date: Tue, 17 Oct 2023 16:01:33 +1000
-Subject: [PATCH] Fix implicit function declaration in configure
-
-Missing unistd.h include for `close` and `unlink`
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -996,6 +996,7 @@ AC_DEFUN([AM_SAFETY_CHECK_MKSTEMP],[
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <unistd.h>
- int main(void)
- {
-   char template[128];
--- 
-2.42.0
diff --git a/x11-wm/fvwm3/files/fvwm3-1.1.0-fix-go-detection.patch b/x11-wm/fvwm3/files/fvwm3-1.1.0-fix-go-detection-v2.patch
index 6c38f51ce932..5c17193728cc 100644
--- a/x11-wm/fvwm3/files/fvwm3-1.1.0-fix-go-detection.patch
+++ b/x11-wm/fvwm3/files/fvwm3-1.1.0-fix-go-detection-v2.patch
@@ -35,7 +35,7 @@ Reported-by: Denny Rivetti <denny.rivetti.me@gmail.com>
 +		GOVERSIONOPTION=version
 +		go_version=$($GO $GOVERSIONOPTION | sed -e 's/go version go//' | sed -e 's/ .*$//')
 +		AX_COMPARE_VERSION([$go_version], [ge], ["1.14.0"],
-+							[with_golang="yes ($go_version)"; GO=],
++							[with_golang="yes"; GO=],
 +							[with_golang="no";
 +							AC_MSG_ERROR([Go version ($go_version) is lower than the minimum required version ($REQUIRED_GO_VERSION)])])
  	fi
diff --git a/x11-wm/fvwm3/fvwm3-1.1.0.ebuild b/x11-wm/fvwm3/fvwm3-1.1.0-r1.ebuild
index ab2f1f11a22e..9fe8d41f042d 100644
--- a/x11-wm/fvwm3/fvwm3-1.1.0.ebuild
+++ b/x11-wm/fvwm3/fvwm3-1.1.0-r1.ebuild
@@ -105,7 +105,7 @@ DEPEND="${COMMON_DEPEND}
 	x11-base/xorg-proto"
 
 PATCHES=(
-	"${FILESDIR}"/fvwm3-1.1.0-fix-go-detection.patch
+	"${FILESDIR}"/fvwm3-1.1.0-fix-go-detection-v2.patch
 )
 
 src_prepare() {
@@ -117,9 +117,6 @@ src_prepare() {
 }
 
 src_configure() {
-	# Non-upstream email where bugs should be sent; used in fvwm-bug.
-	export FVWM_BUGADDR="desktop-wm@nogentoo.org"
-
 	# Recommended by upstream for release. Doesn't really matter for live ebuilds.
 	append-flags -fno-strict-aliasing
 
diff --git a/x11-wm/fvwm3/fvwm3-9999.ebuild b/x11-wm/fvwm3/fvwm3-9999.ebuild
index d076b13c7a75..9a9eba17220d 100644
--- a/x11-wm/fvwm3/fvwm3-9999.ebuild
+++ b/x11-wm/fvwm3/fvwm3-9999.ebuild
@@ -114,9 +114,6 @@ src_prepare() {
 }
 
 src_configure() {
-	# Non-upstream email where bugs should be sent; used in fvwm-bug.
-	export FVWM_BUGADDR="desktop-wm@nogentoo.org"
-
 	# Recommended by upstream for release. Doesn't really matter for live ebuilds.
 	append-flags -fno-strict-aliasing