summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIonen Wolkens <ionen@gentoo.org>2022-12-19 02:49:06 -0500
committerIonen Wolkens <ionen@gentoo.org>2022-12-29 15:28:53 -0500
commitac00dfecda10fa71c1181703173c0a8e9eda3a86 (patch)
tree2e433de65f4e86b8a9a8962024cc7d95696f0249 /app-eselect
parentdev-util/maturin: drop 0.14.6 (diff)
downloadgentoo-ac00dfecda10fa71c1181703173c0a8e9eda3a86.tar.gz
gentoo-ac00dfecda10fa71c1181703173c0a8e9eda3a86.tar.bz2
gentoo-ac00dfecda10fa71c1181703173c0a8e9eda3a86.zip
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@gentoo.org>
Diffstat (limited to 'app-eselect')
-rw-r--r--app-eselect/eselect-wine/eselect-wine-2.0.2.ebuild18
1 files changed, 1 insertions, 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
}