From 34fb4543abc1dae6f74171ad8dc80fa64636a941 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Thu, 17 Nov 2022 12:56:42 +0000
Subject: gentoo auto-resync : 17:11:2022 - 12:56:42

---
 app-eselect/eselect-wine/Manifest                  |  2 +-
 app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

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

diff --git a/app-eselect/eselect-wine/Manifest b/app-eselect/eselect-wine/Manifest
index fa7baa0a7864..98136fe5f431 100644
--- a/app-eselect/eselect-wine/Manifest
+++ b/app-eselect/eselect-wine/Manifest
@@ -2,5 +2,5 @@ AUX eselect-wine-1.2.2-proton.patch 160 BLAKE2B 6385b15daf83e1ee1cd8fa3a16fcf075
 DIST eselect-wine-1.2.2.tar.gz 4712 BLAKE2B 6ce92654cf2a5197c18bc84f8db52a11f198f81f0a8116f1986e74a1795ad475d22ff5a7cb9e9e31ce8ca813059b33cfbc52763110238cb378b15bebeb4b4271 SHA512 39f4d91461f72aeb07292dc7479c5cb7fc080b843bac57dec85c43d8751227e6953d32d52d4a14387d398b73120a32b79370d686c823f230dfd1d8b32ac8113a
 DIST eselect-wine-2.0.0.tar.xz 7440 BLAKE2B f889465985566c3cdb9035ec1eca79c506a39f6c3f05f7b20e3a2af70ab3202a6efdc2dc28468ee5b484aa037ebf034bf7ae881a5694459f37702291e8c14850 SHA512 7d5bf0d8abb0634adcbdcd1201eb8c69745e419dc484319e6af9446439b9595b00c6d1bb813390179e5e65843ec3a45079dd38ef7d92c1c97f86fd0aca095607
 EBUILD eselect-wine-1.2.2-r1.ebuild 1282 BLAKE2B 3eeba89fe219b352d6b0ce155910aaa4aa36a831e0cb40650c8ffe5b5f26e1cacd3a9661f8c91be7c751e9e76554180eb69d0fd0a176f0a7b251998ecb2f3880 SHA512 13e7d32212515398ac9d00488a10d2b51568135dbb5bcae18c52706a373c08ce5c11196d8703d28ef94e4b74aa1a50d5d758ffb177950de29e5d4a0c59906479
-EBUILD eselect-wine-2.0.0.ebuild 3010 BLAKE2B 0b30d4d3cfd8c472045042223a0d3a1069dd208ad96859335a1c9e5182e36a0667a93472d9e0fda548d852925b40a428ddb1ab5d0ee075201d8576082ed1bd3f SHA512 b6b742adb0eff37506c679d5346938fbbaebe5ab79a0cac191e04f6e8b6ca3b3d7fa5f7a413266111b1b1d1abedc69fa8e674934bd2915f964068810b5b1cf13
+EBUILD eselect-wine-2.0.0.ebuild 3217 BLAKE2B b0297d9c46d01771781b02708fbe3d8f880d312031b91d489db3d5a2e30b1cfe27431704e211eb31e43770a4e02203dd57375bee1e9530c5aee202a197bb39d3 SHA512 14c117dae2c19b6f1f304a389af8859b41ccb510bed2cf817359564c3e43f4328b869927cdddbf2ab2e70105f530e12449d4e429752aab9c03ed9f1f42aafdd4
 MISC metadata.xml 343 BLAKE2B bc82c6a6549e8fa152586c247467e3f107920426b0be2758ad20ea1da273afd894aa4a9581f7520942092399c62d877117ceefd67b26b8e5778d832241e8a20f SHA512 9c9905ce98e2c43a285b8995d1e16016151416fc622a3f927751207c6820d661ea73a55c812fee6fbf7cd4e474f382f7a3ab277b4f06bb3f2e519bc3b9f876e1
diff --git a/app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild b/app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild
index 50b4a4c56409..5129be25c9b1 100644
--- a/app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild
+++ b/app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild
@@ -16,11 +16,17 @@ SLOT="0"
 RDEPEND="app-admin/eselect"
 
 pkg_pretend() {
-	# not-owned {bin,include}/wine is removed by pkg_preinst's unset, but
-	# portage currently checks collisions and errors out /before/ pkg_preinst
-	has_version '<app-eselect/eselect-wine-2' &&
-		has collision-protect ${FEATURES} &&
-		eerror "!Warning! may need to disable FEATURES=collision-protect to merge ${P}"
+	# /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() {
-- 
cgit v1.2.3