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 61359158020 for ; Wed, 23 Nov 2022 20:39:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 410B1E09F5; Wed, 23 Nov 2022 20:39:13 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 22D23E09F5 for ; Wed, 23 Nov 2022 20:39:13 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2185134101B for ; Wed, 23 Nov 2022 20:39:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 85475760 for ; Wed, 23 Nov 2022 20:39:10 +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: <1669235901.753969555a78cefd40cabf357dc34b12c1a248de.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.1.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-7.21.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: 753969555a78cefd40cabf357dc34b12c1a248de X-VCS-Branch: master Date: Wed, 23 Nov 2022 20:39:10 +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: 525ac837-019e-44b7-8400-1a31fc34db88 X-Archives-Hash: e1fde5d48022a445cf5d99e98c562edf commit: 753969555a78cefd40cabf357dc34b12c1a248de Author: Ionen Wolkens gentoo org> AuthorDate: Wed Nov 23 16:48:57 2022 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Wed Nov 23 20:38:21 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75396955 app-emulation/wine-vanilla: migrate ~arch to eselect-wine-2 While >=eselect-wine-2 does not need ebuild modifications to work thanks to compat code, downgrading it does not work nicely given Wine slots won't be "registered" anymore (requires doing it manually, or re-emerging wine). So cleanup now and force IDEPEND on newer to help prevent mishaps. The replace check, nonfatal, registering, etc... is no longer necessary. prerm -> postrm is intended, prerm still works but relies on hacks to do so and should be avoided. Signed-off-by: Ionen Wolkens gentoo.org> app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild | 19 ++++--------------- app-emulation/wine-vanilla/wine-vanilla-7.19.ebuild | 19 ++++--------------- app-emulation/wine-vanilla/wine-vanilla-7.20.ebuild | 19 ++++--------------- app-emulation/wine-vanilla/wine-vanilla-7.21.ebuild | 19 ++++--------------- app-emulation/wine-vanilla/wine-vanilla-9999.ebuild | 19 ++++--------------- 5 files changed, 20 insertions(+), 75 deletions(-) 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 ac4d2d7ec0d3..4bc0593c00be 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild @@ -120,7 +120,7 @@ BDEPEND=" virtual/pkgconfig mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) ) nls? ( sys-devel/gettext )" -IDEPEND="app-eselect/eselect-wine" +IDEPEND=">=app-eselect/eselect-wine-2" QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext @@ -306,21 +306,10 @@ src_install() { dodoc ANNOUNCE AUTHORS README* documentation/README* } -wine-eselect() { - ebegin "${1^}ing ${P} using eselect-wine" - eselect wine ${1} ${P} && - eselect wine ${1} --${PN#wine-} ${P} && - eselect wine update --if-unset && - eselect wine update --${PN#wine-} --if-unset - eend ${?} || die -n "eselect failed, may need to manually handle ${P}" -} - pkg_postinst() { - wine-eselect register + eselect wine update --if-unset || die } -pkg_prerm() { - if [[ ${REPLACED_BY_VERSION%-r*} != ${PV} ]]; then #881035 - nonfatal wine-eselect deregister - fi +pkg_postrm() { + eselect wine update --if-unset || die } diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.19.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.19.ebuild index 9b551b53e450..178a34cd9455 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-7.19.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-7.19.ebuild @@ -119,7 +119,7 @@ BDEPEND=" virtual/pkgconfig mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) ) nls? ( sys-devel/gettext )" -IDEPEND="app-eselect/eselect-wine" +IDEPEND=">=app-eselect/eselect-wine-2" QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext @@ -304,21 +304,10 @@ src_install() { dodoc ANNOUNCE AUTHORS README* documentation/README* } -wine-eselect() { - ebegin "${1^}ing ${P} using eselect-wine" - eselect wine ${1} ${P} && - eselect wine ${1} --${PN#wine-} ${P} && - eselect wine update --if-unset && - eselect wine update --${PN#wine-} --if-unset - eend ${?} || die -n "eselect failed, may need to manually handle ${P}" -} - pkg_postinst() { - wine-eselect register + eselect wine update --if-unset || die } -pkg_prerm() { - if [[ ${REPLACED_BY_VERSION%-r*} != ${PV} ]]; then #881035 - nonfatal wine-eselect deregister - fi +pkg_postrm() { + eselect wine update --if-unset || die } diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.20.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.20.ebuild index f7300657747d..56a23ede3a3c 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-7.20.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-7.20.ebuild @@ -119,7 +119,7 @@ BDEPEND=" virtual/pkgconfig mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) ) nls? ( sys-devel/gettext )" -IDEPEND="app-eselect/eselect-wine" +IDEPEND=">=app-eselect/eselect-wine-2" QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext @@ -304,21 +304,10 @@ src_install() { dodoc ANNOUNCE AUTHORS README* documentation/README* } -wine-eselect() { - ebegin "${1^}ing ${P} using eselect-wine" - eselect wine ${1} ${P} && - eselect wine ${1} --${PN#wine-} ${P} && - eselect wine update --if-unset && - eselect wine update --${PN#wine-} --if-unset - eend ${?} || die -n "eselect failed, may need to manually handle ${P}" -} - pkg_postinst() { - wine-eselect register + eselect wine update --if-unset || die } -pkg_prerm() { - if [[ ${REPLACED_BY_VERSION%-r*} != ${PV} ]]; then #881035 - nonfatal wine-eselect deregister - fi +pkg_postrm() { + eselect wine update --if-unset || die } diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.21.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.21.ebuild index 71f603995e8a..71f509821dfb 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-7.21.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-7.21.ebuild @@ -120,7 +120,7 @@ BDEPEND=" >=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}] ) ) nls? ( sys-devel/gettext )" -IDEPEND="app-eselect/eselect-wine" +IDEPEND=">=app-eselect/eselect-wine-2" QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext @@ -310,21 +310,10 @@ src_install() { dodoc ANNOUNCE AUTHORS README* documentation/README* } -wine-eselect() { - ebegin "${1^}ing ${P} using eselect-wine" - eselect wine ${1} ${P} && - eselect wine ${1} --${PN#wine-} ${P} && - eselect wine update --if-unset && - eselect wine update --${PN#wine-} --if-unset - eend ${?} || die -n "eselect failed, may need to manually handle ${P}" -} - pkg_postinst() { - wine-eselect register + eselect wine update --if-unset || die } -pkg_prerm() { - if [[ ${REPLACED_BY_VERSION%-r*} != ${PV} ]]; then #881035 - nonfatal wine-eselect deregister - fi +pkg_postrm() { + eselect wine update --if-unset || die } diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild index df7e750e1587..c6c60f4f7f08 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild @@ -118,7 +118,7 @@ BDEPEND=" >=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}] ) ) nls? ( sys-devel/gettext )" -IDEPEND="app-eselect/eselect-wine" +IDEPEND=">=app-eselect/eselect-wine-2" QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext @@ -308,21 +308,10 @@ src_install() { dodoc ANNOUNCE AUTHORS README* documentation/README* } -wine-eselect() { - ebegin "${1^}ing ${P} using eselect-wine" - eselect wine ${1} ${P} && - eselect wine ${1} --${PN#wine-} ${P} && - eselect wine update --if-unset && - eselect wine update --${PN#wine-} --if-unset - eend ${?} || die -n "eselect failed, may need to manually handle ${P}" -} - pkg_postinst() { - wine-eselect register + eselect wine update --if-unset || die } -pkg_prerm() { - if [[ ${REPLACED_BY_VERSION%-r*} != ${PV} ]]; then #881035 - nonfatal wine-eselect deregister - fi +pkg_postrm() { + eselect wine update --if-unset || die }