commit: c23364e17e393930a21c29db8b3b713aa300d98a Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Sat Nov 12 01:59:10 2022 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Sat Nov 12 02:49:50 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c23364e1
app-emulation/wine-staging: skip deregister for rebuilds Not ideal given still doesn't handle the issue where variant can be switched rather than pick same-variant+new-version. Not to mention it further increase chances of register mismatch as it cannot update itself into a clean state (requires eselect-wine rewrite). Bug: https://bugs.gentoo.org/881035 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> app-emulation/wine-staging/wine-staging-7.17.ebuild | 4 +++- app-emulation/wine-staging/wine-staging-7.18.ebuild | 4 +++- app-emulation/wine-staging/wine-staging-7.19.ebuild | 4 +++- app-emulation/wine-staging/wine-staging-7.20.ebuild | 4 +++- app-emulation/wine-staging/wine-staging-9999.ebuild | 4 +++- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/app-emulation/wine-staging/wine-staging-7.17.ebuild b/app-emulation/wine-staging/wine-staging-7.17.ebuild index 58e588d7423e..7ef3acb6f10f 100644 --- a/app-emulation/wine-staging/wine-staging-7.17.ebuild +++ b/app-emulation/wine-staging/wine-staging-7.17.ebuild @@ -350,5 +350,7 @@ pkg_postinst() { } pkg_prerm() { - nonfatal wine-eselect deregister + if [[ ${REPLACED_BY_VERSION%-r*} != ${PV} ]]; then #881035 + nonfatal wine-eselect deregister + fi } diff --git a/app-emulation/wine-staging/wine-staging-7.18.ebuild b/app-emulation/wine-staging/wine-staging-7.18.ebuild index 58e588d7423e..7ef3acb6f10f 100644 --- a/app-emulation/wine-staging/wine-staging-7.18.ebuild +++ b/app-emulation/wine-staging/wine-staging-7.18.ebuild @@ -350,5 +350,7 @@ pkg_postinst() { } pkg_prerm() { - nonfatal wine-eselect deregister + if [[ ${REPLACED_BY_VERSION%-r*} != ${PV} ]]; then #881035 + nonfatal wine-eselect deregister + fi } diff --git a/app-emulation/wine-staging/wine-staging-7.19.ebuild b/app-emulation/wine-staging/wine-staging-7.19.ebuild index a037d09d30ac..a344346392b7 100644 --- a/app-emulation/wine-staging/wine-staging-7.19.ebuild +++ b/app-emulation/wine-staging/wine-staging-7.19.ebuild @@ -348,5 +348,7 @@ pkg_postinst() { } pkg_prerm() { - nonfatal wine-eselect deregister + if [[ ${REPLACED_BY_VERSION%-r*} != ${PV} ]]; then #881035 + nonfatal wine-eselect deregister + fi } diff --git a/app-emulation/wine-staging/wine-staging-7.20.ebuild b/app-emulation/wine-staging/wine-staging-7.20.ebuild index e2826938342d..9ac0bc6e5297 100644 --- a/app-emulation/wine-staging/wine-staging-7.20.ebuild +++ b/app-emulation/wine-staging/wine-staging-7.20.ebuild @@ -348,5 +348,7 @@ pkg_postinst() { } pkg_prerm() { - nonfatal wine-eselect deregister + if [[ ${REPLACED_BY_VERSION%-r*} != ${PV} ]]; then #881035 + nonfatal wine-eselect deregister + fi } diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild index e2826938342d..9ac0bc6e5297 100644 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild @@ -348,5 +348,7 @@ pkg_postinst() { } pkg_prerm() { - nonfatal wine-eselect deregister + if [[ ${REPLACED_BY_VERSION%-r*} != ${PV} ]]; then #881035 + nonfatal wine-eselect deregister + fi }
