commit: d4b3ba03339d6a70aae2cc7cf933f76a07392db9
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 17 07:50:14 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Nov 17 07:52:58 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4b3ba03
app-eselect/eselect-wine: bigger warning for collision-protect
Easy to miss with the wall of text portage gives.
Note users typically don't have this enabled, it's primarily Gentoo
devs that may use this more aggressive version of protect-owned.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
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() {
