From b7cf34e541f10778605d8740e2690d8459908ac5 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Fri, 30 Dec 2022 02:16:21 +0000
Subject: gentoo auto-resync : 30:12:2022 - 02:16:21

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

(limited to 'app-eselect/eselect-wine/eselect-wine-2.0.2.ebuild')

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
 }
-- 
cgit v1.2.3