gentoo auto-resync : 03:12:2024 - 02:07:18

4 files changed, 22 insertions, 32 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 3fdfea93603a..7cec47f952a0 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/fvwm3/Manifest b/x11-wm/fvwm3/Manifest
index e677abe3db17..a84da6d4393e 100644
--- a/x11-wm/fvwm3/Manifest
+++ b/x11-wm/fvwm3/Manifest
@@ -1,6 +1,6 @@
 AUX fvwm3-1.1.1-desk-init.patch 1237 BLAKE2B f25ed4ba7cf2b5a5bc9bb4973d123d7afdcfc824f7eee64747534d8407f456fec5b2a3ec3f78fb80a0c81718cb11f216ca575b47fee9018d7a5667219c1f7f02 SHA512 c528fd645390bb5caa941a09f0d3fc19a932a332f45d568a00674c8cf4958145689bf05612dcacb0ec3109954ca07882cbbadf7f01610c6b6ac59b3ed74ddbd2
 DIST fvwm3-1.1.1-docs.tar.xz 241608 BLAKE2B fbdc789dce9e36a94a4b6c2541b4474548bd961e333d14507788a70e1e4103f0ae5df8223259670cd2aeaec43d3088f1b600b371d03543c2bbb4bce47c37815c SHA512 92385ff188269f85dfda0f079135d651973b1556ac13112cff087a2294256edd7dc2b99aa2c220f9f361df6a3a4d820c56e061dd5d818e58755b1f94df9b4e03
 DIST fvwm3-1.1.1.tar.gz 4016926 BLAKE2B 5654554d8bd6593f30cb5bdd05e424abd7fd3f298d12073d419d18967f17d2df58de797392af0b15a0bcf05d09c8fe7b3c273734d17cb97b617dcb9a5e7f4091 SHA512 66b044a2c463d56573c68f4cdd222a39a667a4acf3425d448c7e1c105e67a9d00abafff1e94c066f0781b4546d1b2b84bc9c20798a0b9ef4b0f673e743a2d4d0
-EBUILD fvwm3-1.1.1.ebuild 4626 BLAKE2B f45a9c81599a3d4bdf5498e10c72f03b48cdcd93730f4e2fe877fdfdb112436670298a6a363c5f54614d1e0080b67f65704746c1016d5545b8eba20996c6dafd SHA512 991d19d781d2a8f55206e5f99f11997f7626188e562c147e2ed774b9f4380255850154561adae2238d2a128234cc66e3d74c68f4bcc9c7cd50b44749307f42de
-EBUILD fvwm3-9999.ebuild 4577 BLAKE2B aa5e96cb2776be29ba25ddef3b29807fd5f437fdd7fa87970abb4866e56b7e8f1566c5c306a6676bb7cb69ec7da8cbfc4cd6c307dd30f6fd31b6690ce5a70a8e SHA512 b7743ebe4f01cff8047af792c9e55f7b7d71c8b48b5997a33802f9ed051c9bd80ae76865a345f5707d5d142cac3194950ec4df81e64157067c21d435e49126bc
+EBUILD fvwm3-1.1.1-r1.ebuild 4357 BLAKE2B 1573a5d1fcc3c2b5b3aa5a82a852e9c4cf67df81990cf36713721e1ea5d51f881a5cb255fa17194d41c9daed784b9c50b652ecc192dcdcc60587432d6861dcb3 SHA512 19dd83f883542b4a1799449cef3454aadf193bc0fbdbf234a4803a2c83d69e0863aed6c384bd2196d0a392755196c910bd4f6987f260b0aed15711e92028253d
+EBUILD fvwm3-9999.ebuild 4308 BLAKE2B 4e20e5024088dd771c539493fe5a76be6de23eb9c3aad6a0e9b5adf6ece83b6521bd56b2c96f6b4eb926821516ca81334e76d4804984f8f2cdc27f89fed122c5 SHA512 0cc728eecfb4fafd695ae3e56d2e67813e7a10b981f702294e03cc9b834ca66a81f1aa877335b70d486075de3be5c2c0c8348c790b25c83fc934911d8011e8fd
 MISC metadata.xml 829 BLAKE2B 23828052466446a55db8d718ce60120ab06213bd53cd0a0e6d2be3b76d1ae39d629cd49236aeaf5c28b9493ef10854d2845281c88cbe0e7cdec4cce5d9368259 SHA512 f05606a0aaac1b7d7cda86991fc8b49d778d4fbc73c52ab19741e5f51dd62b07cef6bb7d32df7baad025b7654d0fe85c7a337a31fa9f254326f59b6eda7adb64
diff --git a/x11-wm/fvwm3/fvwm3-1.1.1.ebuild b/x11-wm/fvwm3/fvwm3-1.1.1-r1.ebuild
index 227108110a88..748831cac3fd 100644
--- a/x11-wm/fvwm3/fvwm3-1.1.1.ebuild
+++ b/x11-wm/fvwm3/fvwm3-1.1.1-r1.ebuild
@@ -82,7 +82,6 @@ COMMON_DEPEND="
 	x11-libs/libXrandr
 	x11-libs/libXrender
 	x11-libs/xtrans
-	x11-libs/libXfixes
 	bidi? ( dev-libs/fribidi )
 	readline? (
 		sys-libs/readline:=
@@ -106,9 +105,6 @@ PATCHES=(
 )
 
 src_configure() {
-	# Recommended by upstream for release. Doesn't really matter for live ebuilds.
-	append-flags -fno-strict-aliasing
-
 	# Signed chars are required.
 	for arch in arm arm64 ppc ppc64; do
 		use $arch && append-flags -fsigned-chars
@@ -161,22 +157,21 @@ src_install() {
 
 	meson_src_install
 
-	if ! use go; then
-		python_scriptinto "/usr/bin"
-		python_doscript "${ED}/usr/bin/FvwmCommand" "${ED}/usr/bin/fvwm-menu-desktop"
-	fi
+	python_scriptinto "/usr/bin"
+	python_doscript "${ED}/usr/bin/FvwmCommand" "${ED}/usr/bin/fvwm-menu-desktop"
 }
 
 pkg_postinst() {
+
+	einfo "For compatibility with existing fvwm2 configurations, the ebuild will install a FvwmCommand wrapper."
+
 	if use go; then
-		ewarn "FvwmPrompt has been installed, it provides the functionality of both FvwmCommand and FvwmConsole."
-		ewarn "For compatibility with the existing fvwm2 configurations, the ebuild will install a FvwmCommand wrapper."
-		ewarn "If you need FvwmConsole, install ${PN} with USE=\"-go\";"
-		ewarn "however FvwmPrompt and FvwmCommand will not be installed."
+		einfo "FvwmPrompt has been installed, it provides the functionality of both FvwmCommand and FvwmConsole."
+		einfo "If you need FvwmConsole, install ${PN} with USE=\"-go\"; however FvwmPrompt will not be installed."
 	else
-		ewarn "FvwmConsole has been installed, but FvwmCommand and FvwmPrompt are no longer included in this ebuild."
-		ewarn "If you need FvwmPrompt or FvwmCommand, install ${PN} with USE=\"go\"."
-		ewarn "In that case, FvwmPrompt will replace FvwmConsole and provide the same functionality in a more flexible way."
+		einfo "FvwmConsole has been installed, hovever it is a legacy tool."
+		einfo "Consider installing with USE=\"go\" which will have FvwmPrompt replace FvwmConsole to"
+		einfo "provide the same functionality in a more flexible way."
 	fi
 
 	optfeature_header "Useful optional features:"
diff --git a/x11-wm/fvwm3/fvwm3-9999.ebuild b/x11-wm/fvwm3/fvwm3-9999.ebuild
index 20ea4b1d2fd7..ba5aca1aeb1f 100644
--- a/x11-wm/fvwm3/fvwm3-9999.ebuild
+++ b/x11-wm/fvwm3/fvwm3-9999.ebuild
@@ -82,7 +82,6 @@ COMMON_DEPEND="
 	x11-libs/libXrandr
 	x11-libs/libXrender
 	x11-libs/xtrans
-	x11-libs/libXfixes
 	bidi? ( dev-libs/fribidi )
 	readline? (
 		sys-libs/readline:=
@@ -102,9 +101,6 @@ RDEPEND="
 DEPEND="${COMMON_DEPEND}"
 
 src_configure() {
-	# Recommended by upstream for release. Doesn't really matter for live ebuilds.
-	append-flags -fno-strict-aliasing
-
 	# Signed chars are required.
 	for arch in arm arm64 ppc ppc64; do
 		use $arch && append-flags -fsigned-chars
@@ -157,22 +153,21 @@ src_install() {
 
 	meson_src_install
 
-	if ! use go; then
-		python_scriptinto "/usr/bin"
-		python_doscript "${ED}/usr/bin/FvwmCommand" "${ED}/usr/bin/fvwm-menu-desktop"
-	fi
+	python_scriptinto "/usr/bin"
+	python_doscript "${ED}/usr/bin/FvwmCommand" "${ED}/usr/bin/fvwm-menu-desktop"
 }
 
 pkg_postinst() {
+
+	einfo "For compatibility with existing fvwm2 configurations, the ebuild will install a FvwmCommand wrapper."
+
 	if use go; then
-		ewarn "FvwmPrompt has been installed, it provides the functionality of both FvwmCommand and FvwmConsole."
-		ewarn "For compatibility with the existing fvwm2 configurations, the ebuild will install a FvwmCommand wrapper."
-		ewarn "If you need FvwmConsole, install ${PN} with USE=\"-go\";"
-		ewarn "however FvwmPrompt and FvwmCommand will not be installed."
+		einfo "FvwmPrompt has been installed, it provides the functionality of both FvwmCommand and FvwmConsole."
+		einfo "If you need FvwmConsole, install ${PN} with USE=\"-go\"; however FvwmPrompt will not be installed."
 	else
-		ewarn "FvwmConsole has been installed, but FvwmCommand and FvwmPrompt are no longer included in this ebuild."
-		ewarn "If you need FvwmPrompt or FvwmCommand, install ${PN} with USE=\"go\"."
-		ewarn "In that case, FvwmPrompt will replace FvwmConsole and provide the same functionality in a more flexible way."
+		einfo "FvwmConsole has been installed, hovever it is a legacy tool."
+		einfo "Consider installing with USE=\"go\" which will have FvwmPrompt replace FvwmConsole to"
+		einfo "provide the same functionality in a more flexible way."
 	fi
 
 	optfeature_header "Useful optional features:"