From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2017A158020 for ; Sat, 12 Nov 2022 02:50:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4C536E0A0B; Sat, 12 Nov 2022 02:50:33 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3353EE0A02 for ; Sat, 12 Nov 2022 02:50:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3F9E3340DA4 for ; Sat, 12 Nov 2022 02:50:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7AF655F7 for ; Sat, 12 Nov 2022 02:50:30 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1668221390.22d30be85512fc4f3964668077f8e4c544c241a6.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-vanilla/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/wine-vanilla/wine-vanilla-7.0-r3.ebuild app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild app-emulation/wine-vanilla/wine-vanilla-7.17.ebuild app-emulation/wine-vanilla/wine-vanilla-7.18.ebuild app-emulation/wine-vanilla/wine-vanilla-7.19.ebuild app-emulation/wine-vanilla/wine-vanilla-7.20.ebuild app-emulation/wine-vanilla/wine-vanilla-9999.ebuild X-VCS-Directories: app-emulation/wine-vanilla/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 22d30be85512fc4f3964668077f8e4c544c241a6 X-VCS-Branch: master Date: Sat, 12 Nov 2022 02:50:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c7c6af5e-46f7-47b3-bd63-32c9259d016d X-Archives-Hash: a084a74e34832aa1f62c02d05f3ee397 commit: 22d30be85512fc4f3964668077f8e4c544c241a6 Author: Ionen Wolkens gentoo org> AuthorDate: Sat Nov 12 00:56:01 2022 +0000 Commit: Ionen Wolkens gentoo 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 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 }