[gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-wine/

[Ionen Wolkens]

commit:     ac00dfecda10fa71c1181703173c0a8e9eda3a86
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 19 07:49:06 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Dec 29 20:28:53 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac00dfec

app-eselect/eselect-wine: cleanup collision messages

The new app-alternatives/* cause similar issues and eselect-wine isn't
unusual enough to need this special handling, portage-3.0.41 is also
now stable and gives nicer messages.

Majority of people will have migrated by now too.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 app-eselect/eselect-wine/eselect-wine-2.0.2.ebuild | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/app-eselect/eselect-wine/eselect-wine-2.0.2.ebuild b/app-eselect/eselect-wine/eselect-wine-2.0.2.ebuild
index 87e5f10d2eaf..953f7e1c910d 100644
--- a/app-eselect/eselect-wine/eselect-wine-2.0.2.ebuild
+++ b/app-eselect/eselect-wine/eselect-wine-2.0.2.ebuild
@@ -17,20 +17,6 @@ RDEPEND="
 	app-admin/eselect
 	xdg? ( x11-misc/xdg-utils )"
 
-pkg_pretend() {
-	# /usr/bin/wine and /usr/include/wine are removed by pkg_preinst's unset,
-	# but portage currently checks collisions and errors out /before/ preinst
-	if has_version '<app-eselect/eselect-wine-2' &&
-		has collision-protect ${FEATURES}
-	then
-		eerror
-		eerror "!Warning! will likely need to either disable FEATURES=collision-protect or"
-		eerror "delete ${EROOT}/usr/bin/wine and ${EROOT}/usr/include/wine to merge ${P}"
-		eerror "(these files should be orphaned, so default FEATURES=protect-owned is fine)"
-		eerror
-	fi
-}
-
 src_install() {
 	insinto /usr/share/eselect/modules
 	doins wine.eselect
@@ -83,10 +69,8 @@ pkg_postinst() {
 	if [[ ! ${REPLACING_VERSIONS##* } ]] ||
 		ver_test ${REPLACING_VERSIONS##* } -lt 2; then
 		elog
-		if [[ ${REPLACING_VERSIONS} ]]; then
+		[[ ${REPLACING_VERSIONS} ]] &&
 			elog "${PN} changed a bit, suggest reviewing 'eselect wine help' (and list)."
-			elog "Note: if seen bin/wine or include/wine merge collisions, they are harmless."
-		fi
 		elog "Please run '. ${EROOT}/etc/profile' to update PATH in current shells."
 	fi
 }