commit: 90e4b42cc3c6fcc094ffe8b413f338ea96c92517 Author: Alex Xu (Hello71) <alex_y_xu <AT> yahoo <DOT> ca> AuthorDate: Tue Jul 27 13:01:13 2021 +0000 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> CommitDate: Sat Jul 31 23:59:44 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=90e4b42c
app-emulation/wine-gecko: add shared skip 2.47 and 2.47.1, because poor support for shared upstream in those versions, and they are also not used by any current gentoo wines Signed-off-by: Alex Xu (Hello71) <alex_y_xu <AT> yahoo.ca> Closes: https://github.com/gentoo/repo-proj-wine/pull/21 Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org> app-emulation/wine-gecko/Manifest | 2 ++ app-emulation/wine-gecko/metadata.xml | 3 +++ app-emulation/wine-gecko/wine-gecko-2.47.2.ebuild | 25 ++++++++++++++++------- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/app-emulation/wine-gecko/Manifest b/app-emulation/wine-gecko/Manifest index c62e382..1742a2d 100644 --- a/app-emulation/wine-gecko/Manifest +++ b/app-emulation/wine-gecko/Manifest @@ -1,6 +1,8 @@ DIST wine-gecko-2.47.1-x86.msi 50735104 BLAKE2B c082e22fdbf1681e0c38e8822bc1a8f99b47d91f7d32f22bfad716685553d3d10fd4004f90135d90f39f4ff05cba37665455679e08ce3a140ca8ded76cb7a9ea SHA512 ef13838bf7d5bdd74d06bbbdccc6b18cc75b4d0c2b3db8c978b9500cdfeb058bf5532d89b77c164eab52c1f93ae2e2540b37f6694a3e560aace3ebc7da2c7596 DIST wine-gecko-2.47.1-x86_64.msi 52311040 BLAKE2B 2a9aa68461d2b9f69ada1e50925de7ba9804a4992c9d0a717c9c5d1340179e7f10e550c8db170bb33c79e24dcd068e00648c572c6b4e4d836a507ada6e7bbccd SHA512 f875d9a7c68a33abf6dd25d61ff6dd3e5ff246768880e3ee4984ab63b065a7b0ef55411b710e4cb9db48bd2114cbd3fbd97f24e819d7d71c2212dd612abaaf43 DIST wine-gecko-2.47.2-x86.msi 59162112 BLAKE2B 75197c5145dd047d637ea950ed1df918b79446bbb5aae642a90d95af96870cd1756b8469deca105d986ae2dc166ad1b2b89dd7e16c7d13baa4b215b30c3ba909 SHA512 4e6e688fada1edd3d7e0e131246dcae8c6db1a2fde946540b6f8c8b2deee8aa19f210368132f00789d4f49bf2b5e5ac671d4d3699f557e652ece50e55fbcbd43 +DIST wine-gecko-2.47.2-x86.tar.xz 45556880 BLAKE2B 43334edd68f22e21347a49bcd7321d90111652fe6143fcb94fa97cee950701f1891b41e8c4ea75854d5232a74c2007534d3fdb190c6abfb96290193f6a4546d2 SHA512 de39bacf9e8b45971e3e675ccbbac0731855b81e148619a98fb126c38ab385f10f1e68e0a52a663fa1a079192b378f4d4e4cdb0a11c5e9dd46221a9604214250 DIST wine-gecko-2.47.2-x86_64.msi 55354880 BLAKE2B c234602e29a6597d26e7a78ec85ac66471ecd8fcea5360d6f32323e4cbee4aca2ccd5530706e8779346ff2d08f1c4900fef198763e431ce7cd232ef117933336 SHA512 9bbaf061d5d2035e6df0898a847697bbed071abaf95ccde08b5ace7a2c6fc871db16443596b23a889def82f98591973fe8ca88063021d8779f8faa48973f239c +DIST wine-gecko-2.47.2-x86_64.tar.xz 43025348 BLAKE2B 0c956043d7a49cdd88a3af4b25191087fd638a68b958e13a46bbf4310ecf7cdeb973eb3ea5b254f2d4f90f2a715d35c25a67b1883159a60a0ff6eea70e0f1077 SHA512 cf7af1087823188c3be6665d7662bf1029c58b4b8db271e5f4bfed15df217b905653b034b62ed0fa961f528be40f0325b378669d27c9a18ef5b9d98ef8c63aeb DIST wine_gecko-2.47-x86.msi 49266176 BLAKE2B 6b1d4ebf53fac422c2da9ae7f5b6ab9064d2b6cc20d57fe13707395e71305ac1607a440624d3a545fe1e0391bc92bf5b594173549e519eda967bb833b69b2f52 SHA512 e0d06102dcb8ec2d24e8c8c3f5c2ee5cb47c18e203dfb43d85de008d682ff874fb664fef1df909a5a7857de39c7e8ce5175e734a11964ec4cd35f8fbacaea3a4 DIST wine_gecko-2.47-x86_64.msi 50806272 BLAKE2B 6f91d4661a322eca41042cb7a246d5bff76ab72b4bda67183fc36735c923bd6d76624f21fd3e59f63fd872704edcf0116a6e7ab4fa6f074f5098c8fb5307534c SHA512 7c2496b15a06bc6906bc60afb3ac082e3f9931207fa624e60297020211d66aa9b420a61e95730a0dbdcefbe4b26c811d0c896ecd9c363b5107d08c3fa22fef41 diff --git a/app-emulation/wine-gecko/metadata.xml b/app-emulation/wine-gecko/metadata.xml index 41e683d..26d83e5 100644 --- a/app-emulation/wine-gecko/metadata.xml +++ b/app-emulation/wine-gecko/metadata.xml @@ -11,4 +11,7 @@ <upstream> <remote-id type="sourceforge">wine/wine-gecko</remote-id> </upstream> + <use> + <flag name="shared">Install pre-unpacked files which do not need to be copied into the Wine prefix</flag> + </use> </pkgmetadata> 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 6f99f66..ad3c90c 100644 --- a/app-emulation/wine-gecko/wine-gecko-2.47.2.ebuild +++ b/app-emulation/wine-gecko/wine-gecko-2.47.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -6,21 +6,32 @@ EAPI=6 DESCRIPTION="A Mozilla Gecko based version of Internet Explorer for Wine" HOMEPAGE="https://winehq.org"; SRC_URI=" - 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.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 ) + ) " LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0" SLOT="${PV}" KEYWORDS="~amd64 ~x86" -IUSE="abi_x86_32 abi_x86_64" +IUSE="abi_x86_32 abi_x86_64 +shared" DEPEND="!!app-emulation/wine:0" S="${WORKDIR}" -src_install(){ +src_install() { insinto /usr/share/wine/gecko - use abi_x86_32 && doins "${DISTDIR}/${PN}-${PV}-x86.msi" - use abi_x86_64 && doins "${DISTDIR}/${PN}-${PV}-x86_64.msi" + if use shared; then + 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" + fi }
