gentoo auto-resync : 22:04:2024 - 23:59:31

3 files changed, 24 insertions, 9 deletions

diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index 0fc6e45a5b27..5a8cbaad349e 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -5,10 +5,11 @@ AUX fvwm-2.6.5-mouse-buttons.patch 519 BLAKE2B 23b31933e9dcc456d73be15573226017f
 AUX fvwm-2.6.8-perl528.patch 515 BLAKE2B 44df7b8aef71d85c3aefefb40ab45b9e6227ef6a13aaab60cec8956db669013b4ee4dc869216972e1a443d1f69e6550e7f80dc81cdf8b7642d6c49ae46793b2a SHA512 ab35b8aef3c6d8a07f1e03290c209736ee892729d98fece3d0134fd9994f8c57bdd5703492b405a6eb52cfcd67cd9cd72c16bc25a729a46560eb6e21f2d7918f
 AUX fvwm-2.7.0-c99.patch 3294 BLAKE2B 930615bfde3168ca47c865badab133de33ad127c648f1a29424076b61e194a6dcf2b411e5198185acc057d49fc7fd4539397270f6610a7d80abb929dd50547cc SHA512 affc46823a1e2756b72819a08976496319a10fa43eb1089f57ac0630d3d919ba9f3a8c86c62a932be989b4f7b17dbbb3712da55d188af806396c2c18175b8cdb
 AUX fvwm-2.7.0-clang16.patch 1821 BLAKE2B b8acc1740eb820128625a1aab94c00faf9ba22a911e1a570b61cfe5d59e63479a5555ae22c16c2f2ec0189b8c8f195f36447fec12fc64f73fbc7c4efa0d62410 SHA512 dfe16531733986b42600b682d9e7ea17db5e546f196476d0fdf97cbfb05733c9c37d36f51a0a77d0754c0b55374be15b8dd39966bf1e454bb338245c63235a5f
+AUX fvwm-2.7.0-fix-docdir.patch 361 BLAKE2B aefce92389f7ba8b8a85d67c9144e0ae6c4df6eb7ea9195ae1683a0be453e9eeaff1ad64fd1e4de174ee419c9636897639863d5d0f3f8e7fde8ade84b05358e4 SHA512 c21d5ded3ee488efc0595f44a09c9833189c5159494e96cf3c4f310aa5dfc9aba3f78452d4e9105e839e57a8a2361c9dc5840bc89e8ae67f5cf2209b6a3ab142
 DIST fvwm-2.6.9.tar.gz 3942859 BLAKE2B 8faf2d420d96049ab0528a6c6a5dc6ed8ee9449f8e533b9ad9bb526faea86030684fc0aa8ed0d307cb64575457676611298adf582b1249c37a3db35a72b43bf1 SHA512 a9c2214ad19edd17da81446a6d4250284cc50b59b53c233212f2a9354c01143dbb870521392752f272f00af50bee2dd8f0b6bf6176b0d4b3075694d2a61a623e
 DIST fvwm-2.7.0.tar.gz 3933529 BLAKE2B b4be7083c2946cb2a0c48673271d490a49aba5aec8407169bedc5a35f55fe8cd2724a9f6570c5e7ea110652c04956570c874256f96fa5d920a2a1ede152c0c25 SHA512 fc9076c3f07f36b0b2c7c4d2bdf7bb1a711000e39316e327173548bc99dc2b8a29b591e3644e1492f87603b576cd4a3f58ecbdd84a4384d294417b3c56c81808
 EBUILD fvwm-2.6.9.ebuild 4034 BLAKE2B 603b739468c0c94f41348b62014245fd465da01622079f0bbaa68f4f3c736bce79b716ad8a3d7d6787bcbf3245340827e6308f7a5e0948afaffc0c2566676a5b SHA512 2e30f69354c6070e8b47992435a8368bc636d50498cb90f4413328703b79c9f69d5e633df9c6056c2ef7e019db1d9e020e14bf0d2e6f254c1a96c94912a440f5
 EBUILD fvwm-2.7.0-r1.ebuild 4207 BLAKE2B 9e5688558de8d59148f64192efb7af939b57196573fae988288aea1c7d083e9192e8abd659d580cf919166531218be5d1ad228501cefa347d808b0b0820341bd SHA512 45917c0c96c62574f88e8f8a95084a81df67360432e16a1f6edae99b297895108bf3b6ff42bdd350bf934a01d55e919ec3ecfc8254b94e769d0ccd8052fbcc79
-EBUILD fvwm-2.7.0-r3.ebuild 4184 BLAKE2B 690924c7dcf481213605972cd6f49093524a80a47f7ddd9823753fb0321c385bc9c428800101c9c89286c93f480430ae518484afe8ff44b45a01359c7a1a55a2 SHA512 5e0138ba5ed8c09cc2c0f29c8b2135ed2a19de8a1dbf1051ec9d9790bd27c692385ef3f1cb183cc2654da3715f7af91210ada97b269bb9f3542fa882e6d9da9a
+EBUILD fvwm-2.7.0-r4.ebuild 4212 BLAKE2B 73a82ecbfdd8597b40182c4832cfdacd11b9c1dd1dd6ed482716ea4b4c6fdc6ca90de6a3003f9c955a0b259ac57a8af0902b12b5b5744472ece94c1c00314f1f SHA512 02756d5f8e942e76cfd21fec70247af88f289c1b238497e08ae7f9575dfb05fb7f9b5767e5bcfa1ebe71a5edf28f4564e88bf5de85532186ce5ea076afa36499
 EBUILD fvwm-2.7.0.ebuild 4256 BLAKE2B b88389581da14df1c3328b439068d619ce071d1a847d7259babe787e65a9e2851b310795aa1c93b6ecec766f515ad0792b33747358fb04979b82a2a2a60c87d1 SHA512 3f5956ae078e98839a50f09aa70a43e6f732a7fb7a3749032a43166fd57405f7f9363e12315d3c03ce81d3098495906f8f8ba1b72b2089a9e3201b4a02c8645a
 MISC metadata.xml 736 BLAKE2B c9ff0661b5a87747a83a9d0f88f2a994e23e9e741e669fab4bd42351f74eb9dd8d55ae7d9a56d3a865eef344484a489f08359cc0e44874787fed0538f977c159 SHA512 5b06fe1d24d811fe7c408f38849c06360a5e59d98e5076214cdf041f95f5ed5ae4b625331337ce7c0d00db62fd4db6ca78f6cb2902409f340ba47d8204ab5692
diff --git a/x11-wm/fvwm/files/fvwm-2.7.0-fix-docdir.patch b/x11-wm/fvwm/files/fvwm-2.7.0-fix-docdir.patch
new file mode 100644
index 000000000000..b1f5a1db7ea2
--- /dev/null
+++ b/x11-wm/fvwm/files/fvwm-2.7.0-fix-docdir.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/927863
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -102,7 +102,7 @@
+ PPACKAGE=`echo "${PACKAGE}" | "$SED" -e "${transform}"`
+ FVWM_MODULESUBDIR=/${PPACKAGE}/${VERSION}
+ FVWM_DATASUBDIR=/${PPACKAGE}
+-FVWM_DOCSUBDIR=/doc/${PPACKAGE}
++FVWM_DOCSUBDIR=/doc/${PF}
+ 
+ AC_ARG_ENABLE(package-subdirs,
+   AS_HELP_STRING([--disable-package-subdirs],
diff --git a/x11-wm/fvwm/fvwm-2.7.0-r3.ebuild b/x11-wm/fvwm/fvwm-2.7.0-r4.ebuild
index db5ff1d5566a..349ad4960c6c 100644
--- a/x11-wm/fvwm/fvwm-2.7.0-r3.ebuild
+++ b/x11-wm/fvwm/fvwm-2.7.0-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit autotools flag-o-matic python-single-r1 desktop
 
 DESCRIPTION="An extremely powerful ICCCM-compliant multiple virtual desktop window manager"
@@ -82,6 +82,7 @@ src_prepare() {
 	eapply -p0 "${FILESDIR}/${PN}-2.6.5-ar.patch" #474528
 
 	eapply "${FILESDIR}"/fvwm-2.7.0-c99.patch
+	eapply "${FILESDIR}"/fvwm-2.7.0-fix-docdir.patch
 
 	default
 
@@ -131,25 +132,25 @@ src_install() {
 	make_session_desktop fvwm /usr/bin/fvwm
 
 	if ! use lock; then
-		find "${D}" -name '*fvwm-menu-xlock' -exec rm -f '{}' \; 2>/dev/null
+		find "${ED}" -name '*fvwm-menu-xlock' -delete || die
 	fi
 
 	if use perl; then
 		if ! use tk; then
-			rm "${D}"/usr/share/fvwm/perllib/FVWM/Module/Tk.pm || die
-			rm "${D}"/usr/share/fvwm/perllib/FVWM/Module/Toolkit.pm || die
-			find "${D}"/usr/share/fvwm/perllib -depth -type d -exec rmdir '{}' \; 2>/dev/null
+			rm "${ED}"/usr/share/fvwm/perllib/FVWM/Module/Tk.pm || die
+			rm "${ED}"/usr/share/fvwm/perllib/FVWM/Module/Toolkit.pm || die
+			find "${ED}"/usr/share/fvwm/perllib -depth -type d -exec rmdir '{}' \; || die
 		fi
 	else
 		# Completely wipe it if ! use perl
-		rm -r "${D}"/usr/bin/fvwm-perllib "${D}"/usr/share/man/man1/fvwm-perllib.1
+		rm -r "${ED}"/usr/bin/fvwm-perllib "${ED}"/usr/share/man/man1/fvwm-perllib.1 || die
 	fi
 
 	# Utility for testing FVWM behaviour by creating a simple window with
 	# configurable hints.
 	if use debug; then
-		dobin "${S}"/tests/hints/hints_test
-		newdoc "${S}"/tests/hints/README README.hints
+		dobin tests/hints/hints_test
+		newdoc tests/hints/README README.hints
 	fi
 
 	exeinto /etc/X11/Sessions