commit: 22d30be85512fc4f3964668077f8e4c544c241a6 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Sat Nov 12 00:56:01 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=22d30be8
app-emulation/wine-vanilla: 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-vanilla/wine-vanilla-7.0-r3.ebuild | 4 +++- app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild | 4 +++- app-emulation/wine-vanilla/wine-vanilla-7.17.ebuild | 4 +++- app-emulation/wine-vanilla/wine-vanilla-7.18.ebuild | 4 +++- app-emulation/wine-vanilla/wine-vanilla-7.19.ebuild | 4 +++- app-emulation/wine-vanilla/wine-vanilla-7.20.ebuild | 4 +++- app-emulation/wine-vanilla/wine-vanilla-9999.ebuild | 4 +++- 7 files changed, 21 insertions(+), 7 deletions(-) diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0-r3.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.0-r3.ebuild index 400fb26b9bf0..d01a63bc08c4 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-7.0-r3.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-7.0-r3.ebuild @@ -318,5 +318,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-vanilla/wine-vanilla-7.0.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild index 18188f1ea195..31166690705f 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild @@ -318,5 +318,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-vanilla/wine-vanilla-7.17.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.17.ebuild index 2543258da0e2..461aaf73995f 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-7.17.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-7.17.ebuild @@ -316,5 +316,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-vanilla/wine-vanilla-7.18.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.18.ebuild index 2543258da0e2..461aaf73995f 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-7.18.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-7.18.ebuild @@ -316,5 +316,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-vanilla/wine-vanilla-7.19.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.19.ebuild index 2543258da0e2..461aaf73995f 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-7.19.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-7.19.ebuild @@ -316,5 +316,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-vanilla/wine-vanilla-7.20.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.20.ebuild index ddfe07cbf57d..3ac3d5488908 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-7.20.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-7.20.ebuild @@ -316,5 +316,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-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild index ddfe07cbf57d..3ac3d5488908 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild @@ -316,5 +316,7 @@ pkg_postinst() { } pkg_prerm() { - nonfatal wine-eselect deregister + if [[ ${REPLACED_BY_VERSION%-r*} != ${PV} ]]; then #881035 + nonfatal wine-eselect deregister + fi }
