gentoo auto-resync : 02:12:2022 - 08:55:37

4 files changed, 43 insertions, 46 deletions

diff --git a/app-emulation/wine-gecko/Manifest b/app-emulation/wine-gecko/Manifest
index c239010c7a85..54bfa6a2fd3c 100644
--- a/app-emulation/wine-gecko/Manifest
+++ b/app-emulation/wine-gecko/Manifest
@@ -6,6 +6,6 @@ DIST wine-gecko-2.47.3-x86.msi 55686144 BLAKE2B ce428b35ce70968c12141832aab6044a
 DIST wine-gecko-2.47.3-x86.tar.xz 43291212 BLAKE2B 441659dd002c14b7774b0c2dc4bbc8d29f16bda7b9d1b5ff7d75dca53a6b01366c62270fa617f8bcd7ac07871de72c016d66e557b4d4f734227c0c4ec0b74013 SHA512 c1530c4aec4743b5acb14cecac909ece6e140eec2171ad4b154513de9aead7a323789251e27f4f1c3ff0d6af9cd2590193db99380e2c91a1640dcff49f78b84e
 DIST wine-gecko-2.47.3-x86_64.msi 54623744 BLAKE2B 2783e060e2277925ca4b1193f4c13d7af88c7605d48d4bdd118826340e293547edc83fa185e2c64fddb629c632480062bedf995b6f65b07360cf9496bbd21f9a SHA512 c8d617695426c19bdb8a415fb0f00dc3ff9aa6c023599d24313f1c6ac50bbf36bc42dc0cdd58dee93c5ad4998468000d123080cbea09efe1bca3d8f7bfa2bd1d
 DIST wine-gecko-2.47.3-x86_64.tar.xz 42325312 BLAKE2B dd7b8516ce38c2baa5fc6c73d7292a78c03136a9bffe50ceb4bd32df0754e7f8d6adbc7689e2d00e0a5fb9806d6da736b5d15acc2fca3f2210015ac55892ed6b SHA512 3d4ff51e0dede5b52929b3babc91b16c06fdd89e75f0d6911e2262142c7422405676238d0d6cb90b6705a18b975de21dd58036a78f856523bab28c5bf52879f9
-EBUILD wine-gecko-2.47.2.ebuild 1027 BLAKE2B f9148675665fa0e6d0f4f8e00a58b282ad489ee4bbd8ca9ee6aad69d2dbd7b096f3bb39e16acbd3254bac1b2775f68d00b4a2e66c0725707d62c63824e906c85 SHA512 ea1371d7805c0ffa6c68f5030549ce051cc4cd2f000eebf193f371f8bc5174d76b09c10ec9fc59f50b0cd032c51d0f3ae8464e8df4cca385b498d6f0127c059d
-EBUILD wine-gecko-2.47.3.ebuild 1029 BLAKE2B a64f968eb0a9b25376b683355699639fce47598352110a626cfe5365eb02b90e9963e060e71ea5319dd91f536a47dccfd139302c9eef1593b66508dfbceeee81 SHA512 8ade14076e070a40184679d0d9e20fc7ea17164a059d077cbc5c6c31ebcadca070428ea31fdb3f5e47faacaabd81c52b00e2f1a66b8135993c0a47419172b7ba
-MISC metadata.xml 434 BLAKE2B a825bbdeb70a3e8b86a167a2902a5b5a7dbe7d7268bab4452e4d61699dc3449bf2441cba42baa321d4e86d83f16ffffa7597acf82664da4d822b6f14a407a55b SHA512 56b110d425e78e375897bf4adafbe785fe9fe7181181e3e74a317365afb43e391df36e75a673e994c4ad5eae990c8f8f7045302be5e7cecc8a35bf87a569c872
+EBUILD wine-gecko-2.47.2.ebuild 1047 BLAKE2B c651d13e8c8cc713f9eb12d1b345bc8f76f9fd0d675789105390feed3376c2db8f388f8b826ffdf59692bf5e8f8f498fd9306a6b3f808726d40bc89d04f4303c SHA512 ee618b17ed645e654ed8bcf000293f7a633719e05b9af1efd04e83736dd778e21d431b1475bc35791f8b6d4394c592ea6f6529119cf14b54ca888e7150738cc5
+EBUILD wine-gecko-2.47.3.ebuild 1047 BLAKE2B c651d13e8c8cc713f9eb12d1b345bc8f76f9fd0d675789105390feed3376c2db8f388f8b826ffdf59692bf5e8f8f498fd9306a6b3f808726d40bc89d04f4303c SHA512 ee618b17ed645e654ed8bcf000293f7a633719e05b9af1efd04e83736dd778e21d431b1475bc35791f8b6d4394c592ea6f6529119cf14b54ca888e7150738cc5
+MISC metadata.xml 360 BLAKE2B 0ba4f28c9fb2b313f332b56122c9293d60094c1d7c8bc76928818003bc7e3e07385b370759a676ecd5714dc74bf1bba66680c9ceb4655bc4d10767e9483d947e SHA512 feb28080c619be3fa965d7ebdcdb01587ba9dac001737a485d5746b97951638aff49493e9b5ae22ddc29b37a1b09a9f1b1703b979d3531d8e10ea331d0e12085
diff --git a/app-emulation/wine-gecko/metadata.xml b/app-emulation/wine-gecko/metadata.xml
index e1932b4ddc74..8b46426a7860 100644
--- a/app-emulation/wine-gecko/metadata.xml
+++ b/app-emulation/wine-gecko/metadata.xml
@@ -5,9 +5,6 @@
 		<email>wine@gentoo.org</email>
 		<name>Wine</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">wine</remote-id>
-	</upstream>
 	<use>
 		<flag name="shared">Install pre-unpacked files which do not need to be copied into the Wine prefix</flag>
 	</use>
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..fd2e621718a3 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,37 @@
-# 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"
-HOMEPAGE="https://winehq.org"
+DESCRIPTION="Mozilla Gecko based version of Internet Explorer for Wine"
+HOMEPAGE="
+	https://wiki.winehq.org/Gecko
+	https://gitlab.winehq.org/wine/wine-gecko/"
 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..fd2e621718a3 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,37 @@
 # 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"
-HOMEPAGE="https://winehq.org"
+DESCRIPTION="Mozilla Gecko based version of Internet Explorer for Wine"
+HOMEPAGE="
+	https://wiki.winehq.org/Gecko
+	https://gitlab.winehq.org/wine/wine-gecko/"
 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}"
+KEYWORDS="amd64 x86"
+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
 }