5 files changed, 14 insertions, 11 deletions
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index d3995cb7d441..de063100bdb6 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/stumpwm-contrib/Manifest b/x11-wm/stumpwm-contrib/Manifest
index a91943cde0e2..b4c8b7c41bcd 100644
--- a/x11-wm/stumpwm-contrib/Manifest
+++ b/x11-wm/stumpwm-contrib/Manifest
@@ -1,3 +1,3 @@
 DIST stumpwm-contrib-20180128.tar.bz2 575171 BLAKE2B 57f5cab26ecfd0721ae3c167ad09922920b171fc95250eb6e98936033623837d50d70179a2262093b4db978477da3ae0bc5e920ac0cfc1e291f60ef6b7c0c260 SHA512 76bc7bf0b5a752264f3719d38773362cf134edb8ce128d2213a0d636485d12ae86b52d111d07688ce0b2a97e1e4282b391491a738e77946d225ddc22c84e8156
-EBUILD stumpwm-contrib-20180128.ebuild 710 BLAKE2B 641abe779f09f27824fe13f509c4829b874155ad52bd1002447b038148feaad9b5973c800f41ce4ac7c1b3a1eea22fd24f8fd3e1622309bea63c64b966bb28c6 SHA512 7799e013eec065456ab40c9c4689d66d6baccbfe19468ef29f2336b3c295d4792d5272beec9ba3f443ab30a690a8d8b3fdad2d23e4c28d9edb1d0edb034f6b5e
+EBUILD stumpwm-contrib-20180128-r1.ebuild 705 BLAKE2B afd8953bdde55dbc37f27eccf920573203680e48ba7e99ceea7f91c43bb5fb035a8ca9bda0a7545834aea0db0f61028e21229e92fe49e408fc0f5aebb95e2015 SHA512 b584a4fe1a69e1574e6883d4bae25eedb9ab721503a5c7efcb0b22a2e4292c176b7db7b8d616fcaa1fd7a6d005b89b2943bbcc10bb4a2094e066c2a1957644d0
 MISC metadata.xml 256 BLAKE2B 5c5d443b476338ddb29a04d85b6fbd0638098ca2661b3851140cc0da7ec234d28d996cb2f8333307b1992b20ad3a0d100ed8bee13132399d614336d64af3cd5b SHA512 fc6331e5344eb96c1ef8bee63401af3600b95c2a3d0ed36d922f9da23afefb97dfb146fceb491e1e62b6bf5d4875d3d098cbb9d8eb5fb366bd071f96846e59e7
diff --git a/x11-wm/stumpwm-contrib/stumpwm-contrib-20180128.ebuild b/x11-wm/stumpwm-contrib/stumpwm-contrib-20180128-r1.ebuild
index 3277f2bf98cf..e8182170ab0b 100644
--- a/x11-wm/stumpwm-contrib/stumpwm-contrib-20180128.ebuild
+++ b/x11-wm/stumpwm-contrib/stumpwm-contrib-20180128-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit common-lisp-3
 
@@ -12,13 +12,12 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/stumpwm/stumpwm-contrib/"
 else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	SRC_URI="mirror://gentoo/f8/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-2 GPL-3 BSD-2"
 SLOT="0"
-IUSE=""
 
 RDEPEND=">=x11-wm/stumpwm-1.0.0"
 
diff --git a/x11-wm/stumpwm/Manifest b/x11-wm/stumpwm/Manifest
index d3860146bc63..6eac0f21e144 100644
--- a/x11-wm/stumpwm/Manifest
+++ b/x11-wm/stumpwm/Manifest
@@ -1,5 +1,5 @@
 AUX 70stumpwm-gentoo.el 84 BLAKE2B 12ce0e9a1b53a1c1c84a9f350484b9620a2db9a30eaefb11bb409b89aae7f1226173930c52d018ec8a845c8e6ff69efd5570a369444537d070d21427a6960c09 SHA512 2e67f51dd6840f850aa1c0e3f2e8c2453203603f174f3ce97feacd2658cf6168bf557eb6ee83499b8c60fb107fdd527caccdda7ab5692646a33f96ad1350bcd1
 AUX README.Gentoo 1894 BLAKE2B 23dd829621f92b2e5ab22bd3d54d9338d1034bd55d4adcfde24f6c0a780e41dddd747ee2baecdfd9b03a54de7e4acf08d903205dcdc68851afea5317401681aa SHA512 c187fcc12bbb4c10718e708a4b17a9adc89f1268270f231e8b5feeea881149482d8b70ac0f5eb78b7e0b93700d6cd5133bf7d844f97736bee793405de9a25a09
 DIST stumpwm-740e945d742d85aef36e0ed9467de9bbbf5eafd2.tar.gz 273172 BLAKE2B 00756081aed915af18af4534414659e29856bc1a98df2cd35b48bb5bf4f06fe2dc76c4016cbc39e296ff19d51b3e959ef84dbc57972da0a634bc6cb3ca0b881e SHA512 313f430da8ecb7919940b37f2353969c8bf3a3be6a1d380e1655a7a6aebb83a3890cbd99a292a414f71f934adcae1350c24650fe5d5d35cf30788ff392feaac0
-EBUILD stumpwm-22.05_p20220818.ebuild 1740 BLAKE2B 5f47a5f705dc8fa9f617d74059f0fdaf5a3f48461a8507a65ea5af529561b3435e830ea8be3fb6703865e1425786bcf9ad3dd3da28b65f6ed088e81b2e244a3b SHA512 9515ea217df0e9ee04f790fa275ffe25cec7e4a6156b2e2dba80e533bd3a56681a7bbbb281dac868bd15b5c1754baf2568b8f4801b07275781ccd646181fe543
+EBUILD stumpwm-22.05_p20220818.ebuild 1900 BLAKE2B 4c8cb1a49e54b4720ba086097618454329212d9c595cfb043d132cbee35d3b2397759979f6dd65461434180a0ab7039e6d3163ec00002f783198a2fc45c3f029 SHA512 cea2c993e3721bd2f31c1bf83663082812abbf5341207707d3c752b064634d136490788efbcfd67e3df5a807c8001bf85bd76b845db2d74882ea5e7b09923534
 MISC metadata.xml 2165 BLAKE2B 11cb1d12cc85d157776d6f67019adb7174653ae39f5dd1411f944c9f17ea6efc084803041ee9a994ac4f3c3fc8ca07f130f4fcb83cd947fdfbcc5e5f8d6eb977 SHA512 46757ef2bc9375990b304cef5591f39d8d72b465f8f55766a5f9707afe4db0876eba58be10e15f21cfb5a1860164a671b9a762ab40235743c96d7a8d7ba42cee
diff --git a/x11-wm/stumpwm/stumpwm-22.05_p20220818.ebuild b/x11-wm/stumpwm/stumpwm-22.05_p20220818.ebuild
index ec421ca8a134..17d1ace013a9 100644
--- a/x11-wm/stumpwm/stumpwm-22.05_p20220818.ebuild
+++ b/x11-wm/stumpwm/stumpwm-22.05_p20220818.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,15 +10,15 @@ MY_COMMIT="740e945d742d85aef36e0ed9467de9bbbf5eafd2"
 DESCRIPTION="A Window Manager written entirely in Common Lisp"
 HOMEPAGE="https://stumpwm.github.io/"
 SRC_URI="https://github.com/stumpwm/stumpwm/archive/${MY_COMMIT}.tar.gz -> ${PN}-${MY_COMMIT}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc emacs"
 
-S="${WORKDIR}/${PN}-${MY_COMMIT}"
-
-RESTRICT="strip"
+# Test restriction because of missing "fiasco" tool which is not yet packaged
+RESTRICT="strip test"
 
 RDEPEND="dev-lisp/alexandria
 		dev-lisp/cl-ppcre
@@ -27,13 +27,17 @@ RDEPEND="dev-lisp/alexandria
 		emacs? ( >=app-editors/emacs-23.1:* )"
 DEPEND="${RDEPEND}"
 BDEPEND="sys-apps/texinfo
-		doc? ( virtual/texi2dvi )"
+		doc? (
+			virtual/texi2dvi
+			dev-texlive/texlive-fontsrecommended
+		)"
 
 SITEFILE=70${PN}-gentoo.el
 CLPKGDIR="${CLSOURCEROOT}/${CLPACKAGE}"
 
 install_docs() {
 	local pdffile="${PN}.pdf"
+	export VARTEXFONTS="${T}/fonts"
 
 	texi2pdf -o "${pdffile}" "${PN}.texi.in" && dodoc "${pdffile}" || die
 	cp "${FILESDIR}/README.Gentoo" . && sed -i "s:@VERSION@:${PV}:" README.Gentoo || die