commit: 22ec3b46ef4d1726325c8ad6ff80a95789ca6899
Author: Matt Jolly <kangie <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 4 10:09:04 2025 +0000
Commit: Matt Jolly <kangie <AT> gentoo <DOT> org>
CommitDate: Wed Jun 4 10:13:25 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22ec3b46
x11-wm/fvwm3: add 1.1.3; sync keywords for live
This commit comes with actually reproducible documentation tarballs!
Signed-off-by: Matt Jolly <kangie <AT> gentoo.org>
x11-wm/fvwm3/Manifest | 2 ++
.../files/fvwm3-1.1.3-reproducible-docs.patch | 26 ++++++++++++++++++++++
.../{fvwm3-9999.ebuild => fvwm3-1.1.3.ebuild} | 8 +++++--
x11-wm/fvwm3/fvwm3-9999.ebuild | 4 ++--
4 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/x11-wm/fvwm3/Manifest b/x11-wm/fvwm3/Manifest
index 55257cf39004..78b08c7cd337 100644
--- a/x11-wm/fvwm3/Manifest
+++ b/x11-wm/fvwm3/Manifest
@@ -2,3 +2,5 @@ DIST fvwm3-1.1.1-docs.tar.xz 241608 BLAKE2B
fbdc789dce9e36a94a4b6c2541b4474548bd
DIST fvwm3-1.1.1.tar.gz 4016926 BLAKE2B
5654554d8bd6593f30cb5bdd05e424abd7fd3f298d12073d419d18967f17d2df58de797392af0b15a0bcf05d09c8fe7b3c273734d17cb97b617dcb9a5e7f4091
SHA512
66b044a2c463d56573c68f4cdd222a39a667a4acf3425d448c7e1c105e67a9d00abafff1e94c066f0781b4546d1b2b84bc9c20798a0b9ef4b0f673e743a2d4d0
DIST fvwm3-1.1.2-docs.tar.xz 248024 BLAKE2B
fbc182f3a5ea38135f487f75c9b4e399855faf46807da1cce9b3a7ccc163268a3e60349ac22e34615c9bc804a1e44b6fdbf39e1c73542103da94c8deabf9c788
SHA512
5a62cc11fa04dec958dc0b8ea899f20e4db5af2d69e8da311d7b9c9bf2286980396ed94ab7d9bd0b9158b3b7d7de4a74d59be3f11651f0c85fb4c683887d7565
DIST fvwm3-1.1.2.tar.gz 4019330 BLAKE2B
1bf8b82c060e6724375758838dd4b91b189cb1263c510b323a673ea3eb83c8b5e3eb358965a89c3c205ed04c8a90e50a07e4690d9746d54abcafd4cf15a879bd
SHA512
1b9473ebde6e9a6399fd185f83c0fc403e84f6e7d3648d141f6418e4b6489d0955d384bb2249b85b8372b8731ab205a99dcd64b0aeb697129b1164fb33090f56
+DIST fvwm3-1.1.3-docs.tar.xz 249336 BLAKE2B
5279c29960dfc335af11f70f3c4af70bd106121116bafd501f7b5c53cc6fc390e9f41444a2062a8189cd1465f4c25aad2e016c5a0450b8d4faadaba5b7afe14f
SHA512
7a781b639b735d0cc83f536221143a1cb0a33f2ca0782c10eaace96012cc820b8dc7bf2fa886399e712fc9c31bc039517c5e9c8c21070bea096a989f4e55ef51
+DIST fvwm3-1.1.3.tar.gz 3981597 BLAKE2B
6faa6d332660858b25e3da7ecbf712a5c69e00ccaa0bb22a2e10a5dad1ef26cd42b86a9eb96a5a29b9d7f39c0199fed42142a7aae8eb40c012666eaf130bad38
SHA512
0f774e282ea86d93f20fedd9ca91e9d7c3e94d01160631ff87e331f8a48923949b965624546557c1d9fdbe3b3dd81d51bd90137a21b60c7b0960ae137476b48d
diff --git a/x11-wm/fvwm3/files/fvwm3-1.1.3-reproducible-docs.patch
b/x11-wm/fvwm3/files/fvwm3-1.1.3-reproducible-docs.patch
new file mode 100644
index 000000000000..1d55bca3efa0
--- /dev/null
+++ b/x11-wm/fvwm3/files/fvwm3-1.1.3-reproducible-docs.patch
@@ -0,0 +1,26 @@
+From 75b9d0d7578a713643954efe4337c2fa4a92a3d5 Mon Sep 17 00:00:00 2001
+From: Matt Jolly <[email protected]>
+Date: Wed, 4 Jun 2025 19:24:18 +1000
+Subject: [PATCH] asciidoc: add reproducible attribute
+
+This attribute suppresses the `Last updated` text in the footer,
+enabling reproducible documentation generation output.
+
+Signed-off-by: Matt Jolly <[email protected]>
+---
+ doc/index.adoc.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/doc/index.adoc.in b/doc/index.adoc.in
+index e0396260e..7e5976c96 100644
+--- a/doc/index.adoc.in
++++ b/doc/index.adoc.in
+@@ -1,4 +1,5 @@
+ = Fvwm3 Manual Pages
++:reproducible:
+
+ == Fvwm3
+
+--
+2.49.0
+
diff --git a/x11-wm/fvwm3/fvwm3-9999.ebuild b/x11-wm/fvwm3/fvwm3-1.1.3.ebuild
similarity index 96%
copy from x11-wm/fvwm3/fvwm3-9999.ebuild
copy to x11-wm/fvwm3/fvwm3-1.1.3.ebuild
index 0d6939978835..b38c0de62ba9 100644
--- a/x11-wm/fvwm3/fvwm3-9999.ebuild
+++ b/x11-wm/fvwm3/fvwm3-1.1.3.ebuild
@@ -8,7 +8,7 @@ EAPI=8
# Scripting for this is in sam-gentoo-scripts.
: ${FVWM3_DOCS_PREBUILT:=1}
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{11..13} )
GO_OPTIONAL=1
inherit go-module meson optfeature python-single-r1
@@ -25,7 +25,7 @@ else
if [[ ${FVWM3_DOCS_PREBUILT} == 1 ]]; then
SRC_URI+="
https://deps.gentoo.zip/x11-wm/fvwm3/${P}-docs.tar.xz";
fi
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
fi
LICENSE="GPL-2+ FVWM
@@ -100,6 +100,10 @@ RDEPEND="
DEPEND="${COMMON_DEPEND}"
+PATCHES=(
+ "${FILESDIR}/${PN}-1.1.3-reproducible-docs.patch"
+)
+
src_configure() {
local emesonargs=(
"-Dpng=enabled"
diff --git a/x11-wm/fvwm3/fvwm3-9999.ebuild b/x11-wm/fvwm3/fvwm3-9999.ebuild
index 0d6939978835..6e42fc78b796 100644
--- a/x11-wm/fvwm3/fvwm3-9999.ebuild
+++ b/x11-wm/fvwm3/fvwm3-9999.ebuild
@@ -8,7 +8,7 @@ EAPI=8
# Scripting for this is in sam-gentoo-scripts.
: ${FVWM3_DOCS_PREBUILT:=1}
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{11..13} )
GO_OPTIONAL=1
inherit go-module meson optfeature python-single-r1
@@ -25,7 +25,7 @@ else
if [[ ${FVWM3_DOCS_PREBUILT} == 1 ]]; then
SRC_URI+="
https://deps.gentoo.zip/x11-wm/fvwm3/${P}-docs.tar.xz";
fi
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
fi
LICENSE="GPL-2+ FVWM
