gentoo auto-resync : 07:08:2024 - 12:37:20

3 files changed, 16 insertions, 13 deletions

diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 9e5e36a90d15..1a01f2a3ae3b 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-wine/Manifest b/app-eselect/eselect-wine/Manifest
index a8cfed31fd18..75e51dd73209 100644
--- a/app-eselect/eselect-wine/Manifest
+++ b/app-eselect/eselect-wine/Manifest
@@ -1,3 +1,3 @@
 DIST eselect-wine-2.0.2.tar.bz2 7449 BLAKE2B ce933920a7b6d1df0c0e5f5ae27b1ad1c7467489bd2d35c977b1d9894012b6bcb52d2830c3ebcef9228de40c6f31650e78d40051c82badf959c51339fe6bfa10 SHA512 c49c08e25d7e15c04205608118ea38e970db31f394534efd44070eec5c2148463c09d2b2787a9bb9c1b5f29010e99b4769d3f219b3ae826ceae56757aab596d1
-EBUILD eselect-wine-2.0.2-r2.ebuild 3214 BLAKE2B a47050014cb1170bc20a9a2f9095bca167766b9d39697a601fd9364ce06c6157a62e70b47918cd857a3baf15bd9f54cd3ef3ea3ddf6a4b0a5aff6332089a12bc SHA512 28efa58a65218a0961785abd872b7c2e2045d34f82d7b986a0aef78f1c39b3dcd1dff80550476974a304d0637b0ba2da2dac6ae840c82d13bafc6c39ad7b7fac
+EBUILD eselect-wine-2.0.2-r2.ebuild 3358 BLAKE2B bd80a4fea4b2726163ff655c814b3bd294873612f568d45451a6bd92a3a62f7356cfbbe2b342a1143a55a8778b719bfb61160d131ce565ec850add2c4a1fba9e SHA512 aa4176985dc433d2a246b41e70ad5c5b84cb258d3375cc615b2c4a92199148ce92e082135d0555f0f2d9f5c1bcb98bb2d9db96426e6d0e97806727b7a897aa9c
 MISC metadata.xml 494 BLAKE2B 8b6b0225e0825473ffab8dd707a6ebfa1f491da865a8975eeeab8062537650e06d4703201af59bd775870f04f7422e6da1eab6e2a874faa24776a26c1bb48d19 SHA512 22a330313d9f4408b89dde624ce9e94601257d3650e25df6bc803ca10c52a7fb7c6723fc6b9527429eaea528431e89e985b16249252a0298b6f76c77ce3feb33
diff --git a/app-eselect/eselect-wine/eselect-wine-2.0.2-r2.ebuild b/app-eselect/eselect-wine/eselect-wine-2.0.2-r2.ebuild
index da39532a82a4..3c19a046d3b2 100644
--- a/app-eselect/eselect-wine/eselect-wine-2.0.2-r2.ebuild
+++ b/app-eselect/eselect-wine/eselect-wine-2.0.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -69,23 +69,26 @@ pkg_postinst() {
 	if [[ ! ${REPLACING_VERSIONS##* } ]] ||
 		ver_test ${REPLACING_VERSIONS##* } -lt 2; then
 		elog
-		[[ ${REPLACING_VERSIONS} ]] &&
-			elog "${PN} changed a bit, suggest reviewing 'eselect wine help' (and list)."
-		elog "Please run '. ${EROOT}/etc/profile' to update PATH in current shells"
-		elog "(PATH should have ':${EPREFIX}/etc/eselect/wine/bin'). Wine can otherwise"
-		elog "be executed directly from '${EPREFIX}/etc/eselect/wine/bin/wine'."
+		elog "Warning:"
+		elog
+		elog "Please either run '. ${EPREFIX}/etc/profile' to update PATH in current shells"
+		elog "or re-login, otherwise running e.g. 'wine' without the full path will fail."
+		elog "(PATH should have ':${EPREFIX}/etc/eselect/wine/bin'). If needed, selected"
+		elog "'wine' can be executed using '${EPREFIX}/etc/eselect/wine/bin/wine'."
+		elog
+		elog "If still have issues, verify that shell configurations in \$HOME are not"
+		elog "overriding PATH, also non-POSIX shells (e.g. fish) may need manual handling."
+		elog
+		# note: not using EROOT given it wouldn't make much sense to update configs
+		# using that path or source profile outside the ROOT
 	fi
 
 	if [[ ${REPLACING_VERSIONS##* } ]] &&
 		ver_test ${REPLACING_VERSIONS##* } -lt 2.0.2-r1; then
-		elog
-		elog "Be warned that >=${PN}-2.0.2-r1 no longer installs the"
-		elog "'${EPREFIX}/usr/bin/wine' symbolic link. wine(1) can still be found"
+		elog "Note that >=${PN}-2.0.2-r1 no longer installs the"
+		elog "'${EPREFIX}/usr/bin/wine' symbolic link. 'wine' can still be found"
 		elog "in PATH but, if using the direct location for scripts and/or binfmt,"
 		elog "then please update these to use: '${EPREFIX}/etc/eselect/wine/bin/wine'"
-		elog
-		elog "If wine is not found in PATH, please ensure that not overriding the"
-		elog "default PATH value that should include ':${EPREFIX}/etc/eselect/wine/bin'"
 	fi
 }