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/Manifest                  |  2 +-
 app-eselect/eselect-wine/eselect-wine-2.0.2.ebuild | 18 +-----------------
 2 files changed, 2 insertions(+), 18 deletions(-)

(limited to 'app-eselect/eselect-wine')

diff --git a/app-eselect/eselect-wine/Manifest b/app-eselect/eselect-wine/Manifest
index c972b3ed296f..935770444ff7 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.ebuild 3166 BLAKE2B fd69dbee9588c89c70843057a720e876bdb058bf928286c257630a64e40f8ae38619daf0ee6b2385c2312b3417ce56d0627079de4edcfc4819e6b7e4532a9a75 SHA512 caa6d45e30b0cac18631a2b291c70d25b6615dc1250cb3922e8e48cde15054e9d00265b096d81b54d9c048468390d2034c7f9eb58895b8b06ba24ff6a33d62e8
+EBUILD eselect-wine-2.0.2.ebuild 2530 BLAKE2B 7def69985760f5350df3020703adf685f782f011a545a96e811a66f7324d2cf0b68c920c09c6ef72e8bbd4562652cf0a23a3e669ecf7de7bfd72e3d00abb48a7 SHA512 a4b52e30a7b323276ced27de5fb373e5e6ab35a4b437613f2ef68ac7a4427088ef11642779514a317040dd17e9946445a89d90663d7381fa40af7b4ee6b29e91
 MISC metadata.xml 494 BLAKE2B 8b6b0225e0825473ffab8dd707a6ebfa1f491da865a8975eeeab8062537650e06d4703201af59bd775870f04f7422e6da1eab6e2a874faa24776a26c1bb48d19 SHA512 22a330313d9f4408b89dde624ce9e94601257d3650e25df6bc803ca10c52a7fb7c6723fc6b9527429eaea528431e89e985b16249252a0298b6f76c77ce3feb33
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