commit: ab585d5fa736afc05a77b6ba51f2ec6e1ea262c1 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Thu Dec 1 16:46:57 2022 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Fri Dec 2 03:13:59 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab585d5f
app-emulation/wine-gecko: EAPI6->8, set req use, default abi_x86_32 Doing both versions given will be keeping both for a long time. abi_x86_32 default is meant to match wine's default Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> app-emulation/wine-gecko/wine-gecko-2.47.2.ebuild | 36 +++++++++++------------ app-emulation/wine-gecko/wine-gecko-2.47.3.ebuild | 34 ++++++++++----------- 2 files changed, 33 insertions(+), 37 deletions(-) diff --git a/app-emulation/wine-gecko/wine-gecko-2.47.2.ebuild b/app-emulation/wine-gecko/wine-gecko-2.47.2.ebuild index e5a5a8df49a9..19a6f076b27f 100644 --- a/app-emulation/wine-gecko/wine-gecko-2.47.2.ebuild +++ b/app-emulation/wine-gecko/wine-gecko-2.47.2.ebuild @@ -1,37 +1,35 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -DESCRIPTION="A Mozilla Gecko based version of Internet Explorer for Wine" +DESCRIPTION="Mozilla Gecko based version of Internet Explorer for Wine" HOMEPAGE="https://winehq.org"; SRC_URI=" - !shared? ( - abi_x86_32? ( https://dl.winehq.org/wine/${PN}/${PV}/${PN}-${PV}-x86.msi ) - abi_x86_64? ( https://dl.winehq.org/wine/${PN}/${PV}/${PN}-${PV}-x86_64.msi ) - ) shared? ( - abi_x86_32? ( https://dl.winehq.org/wine/${PN}/${PV}/${PN}-${PV}-x86.tar.xz ) - abi_x86_64? ( https://dl.winehq.org/wine/${PN}/${PV}/${PN}-${PV}-x86_64.tar.xz ) + abi_x86_32? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.tar.xz ) + abi_x86_64? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86_64.tar.xz ) ) -" + !shared? ( + abi_x86_32? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.msi ) + abi_x86_64? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86_64.msi ) + )" +S="${WORKDIR}" LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0" SLOT="${PV}" KEYWORDS="amd64 x86" -IUSE="abi_x86_32 abi_x86_64 +shared" - -DEPEND="!!app-emulation/wine:0" - -S="${WORKDIR}" +IUSE="+abi_x86_32 abi_x86_64 +shared" +REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )" src_install() { insinto /usr/share/wine/gecko + if use shared; then - use abi_x86_32 && doins -r "${P}-x86" - use abi_x86_64 && doins -r "${P}-x86_64" + use abi_x86_32 && doins -r ${P}-x86 + use abi_x86_64 && doins -r ${P}-x86_64 else - use abi_x86_32 && doins "${DISTDIR}/${PN}-${PV}-x86.msi" - use abi_x86_64 && doins "${DISTDIR}/${PN}-${PV}-x86_64.msi" + use abi_x86_32 && doins "${DISTDIR}"/${P}-x86.msi + use abi_x86_64 && doins "${DISTDIR}"/${P}-x86_64.msi fi } diff --git a/app-emulation/wine-gecko/wine-gecko-2.47.3.ebuild b/app-emulation/wine-gecko/wine-gecko-2.47.3.ebuild index 08acbaed7440..0377ae3bc710 100644 --- a/app-emulation/wine-gecko/wine-gecko-2.47.3.ebuild +++ b/app-emulation/wine-gecko/wine-gecko-2.47.3.ebuild @@ -1,37 +1,35 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -DESCRIPTION="A Mozilla Gecko based version of Internet Explorer for Wine" +DESCRIPTION="Mozilla Gecko based version of Internet Explorer for Wine" HOMEPAGE="https://winehq.org"; SRC_URI=" - !shared? ( - abi_x86_32? ( https://dl.winehq.org/wine/${PN}/${PV}/${PN}-${PV}-x86.msi ) - abi_x86_64? ( https://dl.winehq.org/wine/${PN}/${PV}/${PN}-${PV}-x86_64.msi ) - ) shared? ( - abi_x86_32? ( https://dl.winehq.org/wine/${PN}/${PV}/${PN}-${PV}-x86.tar.xz ) - abi_x86_64? ( https://dl.winehq.org/wine/${PN}/${PV}/${PN}-${PV}-x86_64.tar.xz ) + abi_x86_32? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.tar.xz ) + abi_x86_64? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86_64.tar.xz ) ) -" + !shared? ( + abi_x86_32? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.msi ) + abi_x86_64? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86_64.msi ) + )" +S="${WORKDIR}" LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0" SLOT="${PV}" KEYWORDS="~amd64 ~x86" -IUSE="abi_x86_32 abi_x86_64 +shared" - -DEPEND="!!app-emulation/wine:0" - -S="${WORKDIR}" +IUSE="+abi_x86_32 abi_x86_64 +shared" +REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )" src_install() { insinto /usr/share/wine/gecko + if use shared; then - use abi_x86_32 && doins -r "${P}-x86" - use abi_x86_64 && doins -r "${P}-x86_64" + use abi_x86_32 && doins -r ${P}-x86 + use abi_x86_64 && doins -r ${P}-x86_64 else - use abi_x86_32 && doins "${DISTDIR}/${PN}-${PV}-x86.msi" - use abi_x86_64 && doins "${DISTDIR}/${PN}-${PV}-x86_64.msi" + use abi_x86_32 && doins "${DISTDIR}"/${P}-x86.msi + use abi_x86_64 && doins "${DISTDIR}"/${P}-x86_64.msi fi }
