Gentoo Archives: gentoo-commits

From: Nick Sarnie <sarnex@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-gecko/
Date: Sun, 01 Aug 2021 00:09:21
Message-Id: 1627776543.02abd6e406257800d18fe1ac2ae2b199f709051b.sarnex@gentoo
1 commit: 02abd6e406257800d18fe1ac2ae2b199f709051b
2 Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 1 00:08:06 2021 +0000
4 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 1 00:09:03 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02abd6e4
7
8 app-emulation/wine-gecko: Sync with ::wine
9
10 Package-Manager: Portage-3.0.20, Repoman-3.0.3
11 Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>
12
13 app-emulation/wine-gecko/Manifest | 2 ++
14 app-emulation/wine-gecko/metadata.xml | 6 ++++++
15 app-emulation/wine-gecko/wine-gecko-2.47.2.ebuild | 23 +++++++++++++++++------
16 3 files changed, 25 insertions(+), 6 deletions(-)
17
18 diff --git a/app-emulation/wine-gecko/Manifest b/app-emulation/wine-gecko/Manifest
19 index f400f236d7f..02becb02500 100644
20 --- a/app-emulation/wine-gecko/Manifest
21 +++ b/app-emulation/wine-gecko/Manifest
22 @@ -1,2 +1,4 @@
23 DIST wine-gecko-2.47.2-x86.msi 59162112 BLAKE2B 75197c5145dd047d637ea950ed1df918b79446bbb5aae642a90d95af96870cd1756b8469deca105d986ae2dc166ad1b2b89dd7e16c7d13baa4b215b30c3ba909 SHA512 4e6e688fada1edd3d7e0e131246dcae8c6db1a2fde946540b6f8c8b2deee8aa19f210368132f00789d4f49bf2b5e5ac671d4d3699f557e652ece50e55fbcbd43
24 +DIST wine-gecko-2.47.2-x86.tar.xz 45556880 BLAKE2B 43334edd68f22e21347a49bcd7321d90111652fe6143fcb94fa97cee950701f1891b41e8c4ea75854d5232a74c2007534d3fdb190c6abfb96290193f6a4546d2 SHA512 de39bacf9e8b45971e3e675ccbbac0731855b81e148619a98fb126c38ab385f10f1e68e0a52a663fa1a079192b378f4d4e4cdb0a11c5e9dd46221a9604214250
25 DIST wine-gecko-2.47.2-x86_64.msi 55354880 BLAKE2B c234602e29a6597d26e7a78ec85ac66471ecd8fcea5360d6f32323e4cbee4aca2ccd5530706e8779346ff2d08f1c4900fef198763e431ce7cd232ef117933336 SHA512 9bbaf061d5d2035e6df0898a847697bbed071abaf95ccde08b5ace7a2c6fc871db16443596b23a889def82f98591973fe8ca88063021d8779f8faa48973f239c
26 +DIST wine-gecko-2.47.2-x86_64.tar.xz 43025348 BLAKE2B 0c956043d7a49cdd88a3af4b25191087fd638a68b958e13a46bbf4310ecf7cdeb973eb3ea5b254f2d4f90f2a715d35c25a67b1883159a60a0ff6eea70e0f1077 SHA512 cf7af1087823188c3be6665d7662bf1029c58b4b8db271e5f4bfed15df217b905653b034b62ed0fa961f528be40f0325b378669d27c9a18ef5b9d98ef8c63aeb
27
28 diff --git a/app-emulation/wine-gecko/metadata.xml b/app-emulation/wine-gecko/metadata.xml
29 index 921f5a737f8..26d83e5be35 100644
30 --- a/app-emulation/wine-gecko/metadata.xml
31 +++ b/app-emulation/wine-gecko/metadata.xml
32 @@ -5,7 +5,13 @@
33 <email>wine@g.o</email>
34 <name>Wine</name>
35 </maintainer>
36 + <longdescription>
37 + A Mozilla Gecko based version of Internet Explorer for Wine
38 + </longdescription>
39 <upstream>
40 <remote-id type="sourceforge">wine/wine-gecko</remote-id>
41 </upstream>
42 + <use>
43 + <flag name="shared">Install pre-unpacked files which do not need to be copied into the Wine prefix</flag>
44 + </use>
45 </pkgmetadata>
46
47 diff --git a/app-emulation/wine-gecko/wine-gecko-2.47.2.ebuild b/app-emulation/wine-gecko/wine-gecko-2.47.2.ebuild
48 index ef4f3027be5..ad3c90ca3f7 100644
49 --- a/app-emulation/wine-gecko/wine-gecko-2.47.2.ebuild
50 +++ b/app-emulation/wine-gecko/wine-gecko-2.47.2.ebuild
51 @@ -6,14 +6,20 @@ EAPI=6
52 DESCRIPTION="A Mozilla Gecko based version of Internet Explorer for Wine"
53 HOMEPAGE="https://winehq.org"
54 SRC_URI="
55 - abi_x86_32? ( https://dl.winehq.org/wine/${PN}/${PV}/${PN}-${PV}-x86.msi )
56 - abi_x86_64? ( https://dl.winehq.org/wine/${PN}/${PV}/${PN}-${PV}-x86_64.msi )
57 + !shared? (
58 + abi_x86_32? ( https://dl.winehq.org/wine/${PN}/${PV}/${PN}-${PV}-x86.msi )
59 + abi_x86_64? ( https://dl.winehq.org/wine/${PN}/${PV}/${PN}-${PV}-x86_64.msi )
60 + )
61 + shared? (
62 + abi_x86_32? ( https://dl.winehq.org/wine/${PN}/${PV}/${PN}-${PV}-x86.tar.xz )
63 + abi_x86_64? ( https://dl.winehq.org/wine/${PN}/${PV}/${PN}-${PV}-x86_64.tar.xz )
64 + )
65 "
66
67 LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
68 SLOT="${PV}"
69 -KEYWORDS="amd64 x86"
70 -IUSE="abi_x86_32 abi_x86_64"
71 +KEYWORDS="~amd64 ~x86"
72 +IUSE="abi_x86_32 abi_x86_64 +shared"
73
74 DEPEND="!!app-emulation/wine:0"
75
76 @@ -21,6 +27,11 @@ S="${WORKDIR}"
77
78 src_install() {
79 insinto /usr/share/wine/gecko
80 - use abi_x86_32 && doins "${DISTDIR}/${PN}-${PV}-x86.msi"
81 - use abi_x86_64 && doins "${DISTDIR}/${PN}-${PV}-x86_64.msi"
82 + if use shared; then
83 + use abi_x86_32 && doins -r "${P}-x86"
84 + use abi_x86_64 && doins -r "${P}-x86_64"
85 + else
86 + use abi_x86_32 && doins "${DISTDIR}/${PN}-${PV}-x86.msi"
87 + use abi_x86_64 && doins "${DISTDIR}/${PN}-${PV}-x86_64.msi"
88 + fi
89 }