diff options
Diffstat (limited to 'app-emulation')
26 files changed, 97 insertions, 431 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz Binary files differindex 1ad06bb7ce51..4bf2089590ee 100644 --- a/app-emulation/Manifest.gz +++ b/app-emulation/Manifest.gz diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest index 6622b247cc5f..d268a56c698c 100644 --- a/app-emulation/qemu/Manifest +++ b/app-emulation/qemu/Manifest @@ -24,7 +24,7 @@ DIST qemu-7.1.0.tar.xz 121833004 BLAKE2B e05f91ce4993c7591a2df08b5fb017f8b8ec214 DIST qemu-7.2.0-rc3.tar.xz 122373832 BLAKE2B 6345cd631e3de26974fc0534de9c6b55d0bcab31b440c03066a46c6dd9580b535ed8f4f8117bcfb970bcf2fe51890887a676c8600e6b699a2c053199dfbe6966 SHA512 4f9d1554be22456538ccae1a39673033b088e6c1b4990fa8b57ae71061086d66d3cf33fa84ac19a878d11ee3cbc810f22fb28b03e6305c211a7156549cde6669 DIST qemu-7.2.0_rc3-docs.tar.xz 2001136 BLAKE2B 2f20afbb24abfab580767f65f8ecd681d0b8aaf7f371aa77fca01953648d1414702e74d83f772a810aa893271e42e9b909880deff450405348ed302f0c17f467 SHA512 f9c2dcb993937cdf3ecff79872bd63f7dd5c0a7a8800018819e67b9ee4a6dbca6f731e1462bcdbdfc3b0cff4606bd73057ee0913926db536e886eded66c75c5e EBUILD qemu-7.0.0-r3.ebuild 27290 BLAKE2B 985947dc90817bed2c5e0878158604577b6ac3f7f605fd6372aa5b480851a6c94ea44e73aa301b7c1a5b8fa59f2281e57f99a84e5b10bc07beff0a3096b48a22 SHA512 8cc6ae4e2bde1b458d1682624fb46a56c1837592545638e63907c4067e67c39a609e85941381a33a80013d5e82c202644c6a9c5202091e344eabe3f8f6eb0c5b -EBUILD qemu-7.1.0-r2.ebuild 27366 BLAKE2B 0114dbf1e74068e58a189d2ea9df200b628769e28a6a7cf6df0fd518ffe7a9d58fe6104392d4301f5de19874d614976d143fe8565127ae9409f87f536750eb50 SHA512 500d355472dca97bc1e63e2844dbcd00c8c7d19495e2eccb0018abe3c966451d3ac78b841f1828c427cc6d0cbada6874c5843aaff623a1ff445861b92a0f60d3 +EBUILD qemu-7.1.0-r2.ebuild 27365 BLAKE2B 369500c2c9a0ae3470f2eb193be944411fc8c39c239cff22fc48d25ded805bd23d56bed8efcfeed765a95da5bc1bfb25bae9e034a8dbbea415923316584af60f SHA512 d0f2d87d2fea97351c907969ccf612fbc26200280dc53a2e2bb720f5f0338f9ad4285749f55ec912288043253f67c1832e598a6a4d8e239ec95c7d84eeb1f78d EBUILD qemu-7.1.0.ebuild 28397 BLAKE2B d9348f01501bd60b1dd11a87ec52214a29c2e0fac5e815b3820f12a97390434509537b850646fe62c002aa259d9fa5c802659be430df2e556998b658dd05117c SHA512 a7113edecc8c9fd0d46faff044bb498deb700c1eb8da9b8d38cfcc742fcb9e04e35f5db8b89234cedf93560bd2c5b40229f09440c544f21547caf7931c875ea7 EBUILD qemu-7.2.0_rc3.ebuild 27338 BLAKE2B b2517fbb9474286d9b0e6c4609ee8063e44d0ec57e6975d3807944c9e57b18589d7da9ee6954a6cc5f84b85adba221ec90c937dc61e614105b7755cc6b541daa SHA512 95259a4be936394063b486f9b7864f724f55c486be6b7c2e13566f56f70d57188b529ca45f9767f53a2d5f9eb441e67de422c6d01682550ccefbab4c1e7a4856 EBUILD qemu-9999.ebuild 27328 BLAKE2B 5303cfce62658e6a714a1a274b3597bc37c467244d5d416793c7605eec4f75b9b8a4b81602453e7c60acfd212eeeee80c3867dfffde688db7fc9863b721f5fc6 SHA512 cb9fbcfd18cb1e571ccf81125299d29b66c80611f1758f952de83db63beafbf763775de30b32e2a80bb058b3fadd73085f8c4c30c4e0a4c709dbf3fc1ad442ce diff --git a/app-emulation/qemu/qemu-7.1.0-r2.ebuild b/app-emulation/qemu/qemu-7.1.0-r2.ebuild index 1654336290da..7bbcf963bf82 100644 --- a/app-emulation/qemu/qemu-7.1.0-r2.ebuild +++ b/app-emulation/qemu/qemu-7.1.0-r2.ebuild @@ -41,7 +41,7 @@ else fi S="${WORKDIR}/${MY_P}" - KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86" + KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86" fi DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" diff --git a/app-emulation/vendor-reset/Manifest b/app-emulation/vendor-reset/Manifest index db5a6e5ce6fe..875488c63068 100644 --- a/app-emulation/vendor-reset/Manifest +++ b/app-emulation/vendor-reset/Manifest @@ -1,8 +1,7 @@ AUX Fix-5.11-build.patch 1687 BLAKE2B 04ec945f071a3eca4d4a257340c82e635a1421696dbe538bf4864829ff0e8a7878989fceb63617ffa5b472bfce66ff06b20e57186c79b5477312a2b5c71f6fbb SHA512 5768890607d321a6b23cc13e79f54733d518fc319e1a2953b986113bd79bfeb4076053c8b87bcd9415b889e686945007e30fbd3ce4cc421c9ed30fddc7f4791f +AUX Respect-eselect-kernel.patch 257 BLAKE2B 7ff9942cccd5e637e56efb5eacc4ce11ce1b0ab318e43a77b6f0fa3adf675ec2646de207e37fc269ea88e52228e9688eb3e7a16934d37e470a935d257ebecf4b SHA512 e2081192dd982c1ddf0f8897d24c5ddb93e0e1ce47973a279146a3165f1b6a00aeae5369c9280552f8317f573c57c9125214b775c3b1614d67780476611db14e AUX modload.conf 13 BLAKE2B 1e774873c1bf09ca1f3ec2c006b1938e3aa07187dd5a7f926369d6d1bc2c21bfe52f2cbb632f64174485896c8691ac4cbd10e988b7db7a2a9ada7fdccda1a22d SHA512 7a4bf9c95af41bf11e5a720f6258d62822f553c6f349dbe93cf23743b851d830340d268954252d6f058ea2fa823006a63afd45875e7b9108d5d2a6a1a316ff6d -DIST vendor-reset-0.1.0.tar.gz 12718324 BLAKE2B 762ec8bc289b572ab8f8ecc3fa233e3c78c48c48a261c58ce1be9c10356a55957e0bd8fd01e3143443be74236bf9ed540b84d332788c67aa949599ccc5a564d3 SHA512 ed4dcb1a71fa8901732e729d37b501ac105cc2c93d0666e44c08e311d99a244027339d5709a9305ff992ca2acb2f337793cdb1f9369197911985cd20d6f3139f -DIST vendor-reset-0.1.1_pre20220902.tar.gz 12724563 BLAKE2B 6d1aa45216a4a72981fc766ba7541873902272a27b5eebc08f7b2627f186d6236c3b6f576f997e35a3a9a3bb4b0c5f6a285585522e7c0eb86b446808e2de501b SHA512 27bc02fdbc7d0339c0f706e1ec8406bc47f163fca6d6471dd7ad92272a384ab7319f6180641177f90a38c11aee2def52ae408a2165438980b7fc3aea10f88b4e -EBUILD vendor-reset-0.1.0.ebuild 939 BLAKE2B c414e22d1530b0c5e7b2d2195851d62c8a395ac78dcbcd84f7408d27a6845c6db885ad6b514654c8dedabd3a4dc5486b998308310bf06de17fd511c0bd6d3dce SHA512 1fd1d2bcb0bfa849f62ba9b085d814ea4fa7d6176f83ce06e782721cea2f82d906e351ef87fb9ef9817161ca73426c9441ab61cbe16a9e8c37d11dbdbd768e99 -EBUILD vendor-reset-0.1.1_pre20220902.ebuild 991 BLAKE2B 53a92746673e20acb4a04ab664cfbd2d8e8d58b046766f5f122b3b2ee5d3d8c16896d131de22bed944fdf7e441856e5c2fae14f29c6946085aa7b6261f3550db SHA512 b7a231f5dfee1ca0fbf932e38e141c3b9babddd0e3e2337f654f87eee494353214fc1bdf7a5f1b9f8b24715c10b67371c5d52c72b8021d3d897fbb8457f1b70f -EBUILD vendor-reset-9999.ebuild 891 BLAKE2B b1557551cb1810ea7a605db2edbcf92b25be0b3123707df9b85c1dbf4b6cafb5e130ae923dedefb8c76fc28af31a24a5214682d001aa18849a2644a1e91ee24d SHA512 e566d40f4590878cd10ddb8c3ffd57decc54ed32c6335ae12ab632f8f41baae70a1f444f4fb8693d733df3fa52ba0805d02d62018325381295391f0eb521f6c3 +DIST vendor-reset-0.1.1_pre20221205.tar.gz 12725340 BLAKE2B 5f2e34b74e83c8f48daad8d2c714872ab23f50cb0fad6b5c7920476b43c2fbfcf5543e923c506dfb2d8c33846e8fdd08c7d20b30fcc053f2c191d813872b44c5 SHA512 87a3c64d917e6a44308115480f14956f65a9f84fef70de29feebe3fcd7d522b59a3dbcb5fc9a340ac9b7a3612a29ed696b4f52648f86a0d877b915c97c5a4cc9 +EBUILD vendor-reset-0.1.1_pre20221205.ebuild 1107 BLAKE2B 8563f6eca8974270007b633d71b70e5240d5c0aba4b5d163353d1214d1e60359aa1c44d06069c2aaad6757c8401c58e77257801ce95c468b19f282dc329da99f SHA512 726dadee17a21f11c6d5742ad54e06a81b7503fb6a207ccc84f1019e4d3c7eac7a030c3d34b30a6ffa82d95fc824938855eb7ed92829ba20366eaa61671ec6da +EBUILD vendor-reset-9999.ebuild 1071 BLAKE2B 3842a78f2258c850701ae5bc466643e5751998bc6e7cb06651e92639e441a1f2d8590bc5a9207ac6e1ed9ba7a6f54f1d4e923bfe445c37ee15219df24f551ece SHA512 20cf56ef5031e134e54d110f573790f5c8a9ed855838dddd0124462c98c21cf6dc3ceb4fbc884e5c3eac938d28fd2b93bef167bed514ac4e7f31ef4e7445da77 MISC metadata.xml 327 BLAKE2B 288b1a0df2469ed01bf576308ddc36c5843b4682333d6e42f0c3603d5bf43cbd6dd9b21cb07020476b9de92445611d04b2c1d5dd54624ed096f166607154137e SHA512 4ceef67a10bc25ed93bd76aaf1ac133b92a362ea0cf030bce21a14f921c3afc868e53e876bde2af91615b1142b3113c2e45a0a3c9a0abe1775c553118e5fbc3d diff --git a/app-emulation/vendor-reset/files/Respect-eselect-kernel.patch b/app-emulation/vendor-reset/files/Respect-eselect-kernel.patch new file mode 100644 index 000000000000..9259a3e12bf2 --- /dev/null +++ b/app-emulation/vendor-reset/files/Respect-eselect-kernel.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index b8a0652..79f60e8 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,6 +1,6 @@ + USER := $(shell whoami) +-KVER ?= $(shell uname -r) +-KDIR ?= /lib/modules/$(KVER)/build ++KVER ?= $(KV_FULL) ++KDIR ?= ${KERNEL_DIR} + + all: build + diff --git a/app-emulation/vendor-reset/vendor-reset-0.1.0.ebuild b/app-emulation/vendor-reset/vendor-reset-0.1.0.ebuild deleted file mode 100644 index ec57b37fd6fe..000000000000 --- a/app-emulation/vendor-reset/vendor-reset-0.1.0.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit linux-mod - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="https://github.com/gnif/vendor-reset.git" - EGIT_BRANCH="master" - inherit git-r3 -else - KEYWORDS="~amd64" - SRC_URI="https://github.com/gnif/vendor-reset/archive/v${PV}.tar.gz -> ${P}.tar.gz" -fi - -DESCRIPTION="Linux kernel vendor specific hardware reset module" -HOMEPAGE="https://github.com/gnif/vendor-reset" -LICENSE="GPL-2" -SLOT="0" - -DEPEND="" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/Fix-5.11-build.patch" ) - -pkg_setup() { - local CONFIG_CHECK="FTRACE KPROBES PCI_QUIRKS KALLSYMS FUNCTION_TRACER" - linux-mod_pkg_setup -} - -src_compile() { - set_arch_to_kernel - default -} - -src_install() { - set_arch_to_kernel - emake \ - DESTDIR="${ED}" \ - INSTALL_MOD_PATH="${ED}" \ - install - - insinto /etc/modules-load.d/ - newins "${FILESDIR}"/modload.conf vendor-reset.conf -} diff --git a/app-emulation/vendor-reset/vendor-reset-0.1.1_pre20220902.ebuild b/app-emulation/vendor-reset/vendor-reset-0.1.1_pre20221205.ebuild index d0f34c496d9c..ceaaa99a4a5f 100644 --- a/app-emulation/vendor-reset/vendor-reset-0.1.1_pre20220902.ebuild +++ b/app-emulation/vendor-reset/vendor-reset-0.1.1_pre20221205.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else KEYWORDS="~amd64" - EGIT_COMMIT="7d43285a5054e4b2b18dbba771b57d365943a0f7" + EGIT_COMMIT="4b466e92a2d9f76ce1082cde982c7be0be91e248" SRC_URI="https://github.com/gnif/vendor-reset/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" fi @@ -24,9 +24,13 @@ DEPEND="" RDEPEND="${DEPEND}" S="${WORKDIR}/${PN}-${EGIT_COMMIT}" +PATCHES=( "${FILESDIR}/Respect-eselect-kernel.patch" ) + pkg_setup() { local CONFIG_CHECK="FTRACE KPROBES PCI_QUIRKS KALLSYMS FUNCTION_TRACER" linux-mod_pkg_setup + export KV_FULL=${KV_FULL} + export KERNEL_DIR=${KERNEL_DIR} } src_compile() { diff --git a/app-emulation/vendor-reset/vendor-reset-9999.ebuild b/app-emulation/vendor-reset/vendor-reset-9999.ebuild index 64f307942f3d..a0b2326fc95a 100644 --- a/app-emulation/vendor-reset/vendor-reset-9999.ebuild +++ b/app-emulation/vendor-reset/vendor-reset-9999.ebuild @@ -11,7 +11,8 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else KEYWORDS="~amd64" - SRC_URI="https://github.com/gnif/vendor-reset/archive/v${PV}.tar.gz -> ${P}.tar.gz" + EGIT_COMMIT="4b466e92a2d9f76ce1082cde982c7be0be91e248" + SRC_URI="https://github.com/gnif/vendor-reset/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" fi DESCRIPTION="Linux kernel vendor specific hardware reset module" @@ -22,9 +23,13 @@ SLOT="0" DEPEND="" RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/Respect-eselect-kernel.patch" ) + pkg_setup() { local CONFIG_CHECK="FTRACE KPROBES PCI_QUIRKS KALLSYMS FUNCTION_TRACER" linux-mod_pkg_setup + export KV_FULL=${KV_FULL} + export KERNEL_DIR=${KERNEL_DIR} } src_compile() { diff --git a/app-emulation/wine-proton/Manifest b/app-emulation/wine-proton/Manifest index 2df15e3e4c9c..a55a5cee41ec 100644 --- a/app-emulation/wine-proton/Manifest +++ b/app-emulation/wine-proton/Manifest @@ -5,7 +5,7 @@ AUX wine-proton-7.0.4-restore-menubuilder.patch 572 BLAKE2B 7ace97fb82498d8f1929 AUX wine-proton-7.0.4-unwind.patch 1694 BLAKE2B 954cb0a395c3b45afc7a3f39f33d34cf041b9cf5a6c77d0a217d296c4c8d1f6503322c4f77188c4729b98318913b9bc86d37b7573713643590550297a0ae372a SHA512 f958e811a4754614bc9e7223f727e2c581c18607dccf14c6d7014012ff29107bd850540a40ff7a62e7bae6b87ae1ac28fd104fbbaf9ce954bf3acb38ddbeb7df DIST proton-wine-7.0-4.tar.gz 45561670 BLAKE2B 0bc3432e5aa9ca1655e76b31dcbef08febe263e07d3635d005fbc7798b3a08fa50e2e736f33b18700f187dc755f012d7e8ae3edae6a63fb433cd9b8861b747b0 SHA512 dccdf4115e2a7c92981163783f5705e78fbfa042f06123e4802251bd2c558e8b4de7e3d2e114a5d942f9493eb64fb7fdedff2e6e8b3f21ea1de1156456930d8c DIST proton-wine-7.0-5.tar.gz 45724439 BLAKE2B d5ad4f00ca658b31c562c2ff4eb5ae33707126eee44ccfd9f33084ab5d184743034541efe3f9d18eb2a6941111da4c5134555f93769e8370b118b6f04e00ae1e SHA512 b16ace9c0bfa6d2685ea53617be2bba7e82c5c8da604f9e188bf782219785cfaed4317578c4314f2bde89d363a2e115f3bceeaa69d4a85f078a5fdb1ec64d33b -EBUILD wine-proton-7.0.4.ebuild 10309 BLAKE2B 084ee116c5ba5fbefd89b022fed3b1863b8700a15c40bb9dcdbf5775476286474d66bd3ba25deecfa2156ee23d844962983cc8261ad30820cfc41127c456eaa8 SHA512 d5accffbc3618c9dfd7bcae20b169db43dd633bd5d83d723ccb88eb43a9d01033ba213d278d8efe08210df989aefa7713035b6d53df183e436549da53fe377bd -EBUILD wine-proton-7.0.5.ebuild 10315 BLAKE2B 609db3ca1eaa5041fef6c874ffaee4b1b0913ec904bcb02da822f915bc71e3a8da41cfc4b7ebf36e89db7bda1923614df4e0d5e8080d860a92319f796d305697 SHA512 148cbbee8e077abcd1663958e79086643419e105c1b20cb17b613bb1fcdf1c853b58dbea8ff183d2c1db6ef46a642df5d5f4cd7282931bf4ed12440881525353 -EBUILD wine-proton-7.0.9999.ebuild 10316 BLAKE2B 4a64c83297a590b8cd0c31faaebea248e14cd3d339ed8c8ce45bda954ea7d28a21d5a098312c8840a5b9d115ffb7f30fe91c630a85b986bebb284b68c0659013 SHA512 c0926234e267566ae3099f1c43a3dc5ef30690dd7191c9f5f31c72eb2acf96fbf22d551f672934debb9526ca3d5e20e3b4760e5db0595427329d3736438781ee +EBUILD wine-proton-7.0.4.ebuild 10385 BLAKE2B cf663d2597847dca72b2d352d2a8ad10b979502d85d430a4153a50fced205757036af873a3ec97175de637714a6dcc87b9384c956bec55401b36434328da13e6 SHA512 93b907639cef5627b81d8579bf7a076b67159ef008cdf5774b157525abc7fa3954d4e0ecd8fcd316d11ee2382511825ac903d9e3b81c0ea14ce1151ade6fac8a +EBUILD wine-proton-7.0.5.ebuild 10391 BLAKE2B 68a41bccc38c699a860132554ed5f5b56558bf9f4ea6089d7af7401cd5dd86b45ab994c55e368a9c06d67bc352f2bd8c3a2d7b9923e7c963cce856e52450f82e SHA512 f315bd556d92331493a6a4d3057cfa174f089a66f76d8bb858e7ca3ba0cac0da6f97062ae77b4188039f291474942d899ea40fb5736c49eca33ba76bb81200ff +EBUILD wine-proton-7.0.9999.ebuild 10392 BLAKE2B fbf1112ced81ba8540c6e0cf4729de2632c1d144db06313d0d65b425456b83163cc078d7a97af7fd9c0f7424330df7c1ed2571d4a06892745743cb97a498590c SHA512 ae19cbfe7e51c2f70bf43603f964eff4d5cc1b9461f4b5d28c8479a9da2c7441908010d642141d1e982134bb3c92d999378d075fd73740826651082134f06c16 MISC metadata.xml 1222 BLAKE2B 75e8a33a16e4d718c5299ae719cdd009e9ac6f0d2eafb112c9e38e7d860a51d7f4d5be14912c1c812718b36fd4d71a9d3ddf2c68f5a076fc71f5d47fab120736 SHA512 3fc770b9d6f1e7cb7cba7fc28f90d5f51ad431f38e757dcb47b03543985d0919e29b6648b8c3f6bb6e1c7b172bb164cde35e2fea24564e476088c1a91e6131c8 diff --git a/app-emulation/wine-proton/wine-proton-7.0.4.ebuild b/app-emulation/wine-proton/wine-proton-7.0.4.ebuild index 031a67e02638..5ada081c523d 100644 --- a/app-emulation/wine-proton/wine-proton-7.0.4.ebuild +++ b/app-emulation/wine-proton/wine-proton-7.0.4.ebuild @@ -214,8 +214,9 @@ src_configure() { $(use_with xinerama) ) - tc-ld-force-bfd #867097 - use custom-cflags || strip-flags # can break in obscure ways, also no lto + tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097) + filter-lto # build failure + use custom-cflags || strip-flags # can break in obscure ways at runtime use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} # temporary workaround for tc-ld-force-bfd not yet enforcing with mold diff --git a/app-emulation/wine-proton/wine-proton-7.0.5.ebuild b/app-emulation/wine-proton/wine-proton-7.0.5.ebuild index 82c405523947..1367ead3bafa 100644 --- a/app-emulation/wine-proton/wine-proton-7.0.5.ebuild +++ b/app-emulation/wine-proton/wine-proton-7.0.5.ebuild @@ -214,8 +214,9 @@ src_configure() { $(use_with xinerama) ) - tc-ld-force-bfd #867097 - use custom-cflags || strip-flags # can break in obscure ways, also no lto + tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097) + filter-lto # build failure + use custom-cflags || strip-flags # can break in obscure ways at runtime use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} # temporary workaround for tc-ld-force-bfd not yet enforcing with mold diff --git a/app-emulation/wine-proton/wine-proton-7.0.9999.ebuild b/app-emulation/wine-proton/wine-proton-7.0.9999.ebuild index 7906e159577b..5a543eb8a75b 100644 --- a/app-emulation/wine-proton/wine-proton-7.0.9999.ebuild +++ b/app-emulation/wine-proton/wine-proton-7.0.9999.ebuild @@ -214,8 +214,9 @@ src_configure() { $(use_with xinerama) ) - tc-ld-force-bfd #867097 - use custom-cflags || strip-flags # can break in obscure ways, also no lto + tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097) + filter-lto # build failure + use custom-cflags || strip-flags # can break in obscure ways at runtime use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} # temporary workaround for tc-ld-force-bfd not yet enforcing with mold diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest index 8158d3370637..91be4c4e0bb2 100644 --- a/app-emulation/wine-staging/Manifest +++ b/app-emulation/wine-staging/Manifest @@ -11,9 +11,9 @@ DIST wine-staging-7.19.tar.gz 9523048 BLAKE2B e53fd47af493cbdc4542f908a39557324d DIST wine-staging-7.20.tar.gz 9521481 BLAKE2B 5a264460e72ac96d50d23492100c465eeb0b933306200710aa085bd37bb79df3c6ef03aeb5ba2c4c196befb231938457aa9584b9edf938edfd754d06e7cdb574 SHA512 538bf60e760254f3130fe8b6bf07598287e567c0f34d6be2ed04fde10007283d4c675a6f27a0a13d3ce77e833559d5ef853a89f2f96dc5f8cc818bdc3570474a DIST wine-staging-7.21.tar.gz 9530737 BLAKE2B a80476dbc957a9cda1554262777c63276f9b66a5ccd1389a006327810b0b960a600f78dfabc0d8df4ce816cdd7c4c3c29c26bea9b63219fa90dff60142d41da1 SHA512 1261267fe82a25d74dbf3f8cd1926339356eac3cd432667517c2ca65656c1b733c2866a48c1e4ad116ac8094d9079366a07f6a7814b8bde27246d654a792e9ec DIST wine-staging-7.22.tar.gz 9528424 BLAKE2B e41f24f924117259715505f4f9998ef23a657bca5b0e285feb7f9fd732e6b566a495f48ec59af09b1d4d51db522b051028f6cbba748256e939929fbf978f0e44 SHA512 5fdac19ec290c67767fac71abe07d9350ec431919c67a0f2d2df18ced20f1d3dddb921b3d5586d03add187c6281e1a691cc220e8d2d5ad4eeb94015721479d65 -EBUILD wine-staging-7.19.ebuild 11051 BLAKE2B af17100f7b5b80d5e1f2d342f9603cb5d4886ceb4f864e154be437ee776a74d4638b9ed8f3db24688cb611c92356d82d6e6fc7e7707a0ece51e09a2e67299f9c SHA512 2621ba9b7146dde03e746a24592918ad6842b93fd0d34dc11d620c00f046837de579ff0322e76b43e6ecc77eaefcf11e5e9ec407b3e73dc84123ea8247b17305 -EBUILD wine-staging-7.20.ebuild 11051 BLAKE2B f378f4cefea21783cc5a07f7bf47d6a052a35493010999087bdcafd2265e5e1f904294bc567d488a9f2b822125d19c520c7587963c1c843485c91a9dfdf80145 SHA512 8f5ba147c7445b4f1066ba79d0591182b313291d6a133561099ece5dbda95db3b954ade53438ae08eadb8c60fe7dc937b47b35b2a30a8659d571d3b3a2bf2495 -EBUILD wine-staging-7.21-r1.ebuild 11181 BLAKE2B bdfe3c7515c8f1de44f649a5fa0f26469db295938025c6c98f8691724b1ef955725c559fb2ca9fffec7f6256529c81ccca7c3ee75c43dbeee1ad66c135d7292e SHA512 06d2cf97029b460e63cec04b5b3adf9629b398370be387290e5257fbbb66150af4f2b5029196b45aaca20b0899db13570f8c04e3e42268b6cda4ff76aa32bc20 -EBUILD wine-staging-7.22.ebuild 11153 BLAKE2B 4c47f1d6a805774e2f60d2610acf141ffa9352d6439cb930e47337e27b498c5188b6892cc5282f9269d21c4e33ce3af348082697dd210751a375e3a99bb5be50 SHA512 59667ee9f2d0f91c8bed14011a31d4a8adc28be6a729bd35e64210cb21fd86cc8511331b0b0846b940a9cd1bd55eb5d641aa82c512c5fcffde3a62bff34608b7 -EBUILD wine-staging-9999.ebuild 11153 BLAKE2B 4c47f1d6a805774e2f60d2610acf141ffa9352d6439cb930e47337e27b498c5188b6892cc5282f9269d21c4e33ce3af348082697dd210751a375e3a99bb5be50 SHA512 59667ee9f2d0f91c8bed14011a31d4a8adc28be6a729bd35e64210cb21fd86cc8511331b0b0846b940a9cd1bd55eb5d641aa82c512c5fcffde3a62bff34608b7 +EBUILD wine-staging-7.19.ebuild 11179 BLAKE2B 58982c661d242e8e165d7b1d7083284eedd8cdee1a3aee6ee4a728b2e585772ccd8c93c06b490389dd566a54046cfdf7a092bdd2af3b31c68d60eb1926fe8364 SHA512 5047a1cfdb3480cc9654ea8d879bfbb2779d956dec6776f74f746577b62fa6a3ae6996895bd5acb9948fb74cac3be8eaddda0458abc131a96a83cfbea6452f53 +EBUILD wine-staging-7.20.ebuild 11179 BLAKE2B bc8263893bd226850e1514b5d80e637d251807309f81275a996eee082bde4d36ac2d25acf626b4fb97a1237ac733c4940bcea4376394fad5317e96cd948aa16a SHA512 d5634b0636a391fa14fdfb9fc8795a41f35ab1faf23393f36a1069cc563d6e25709fa6e2175b68239088a30acc7c48b43ca087efb01a3df6a3217bdf57b65c61 +EBUILD wine-staging-7.21-r1.ebuild 11309 BLAKE2B 65b1b79e4efaab8560ae651ab8cfaaa35ee3d98f14cce580a37cd0ab1cfe1df33575b24ef8201d09f1b23ccbaa3b3a740adb7bcf750bb7a1fe6c76f7bc722b65 SHA512 f383fc58365efccfe11abe285e08d60679256cb3ec230c7e5cf52d8084886bcc277f46bd0dd41f26803c90c7e4cc37a978108bd2dca7229d3924c2d94bddc097 +EBUILD wine-staging-7.22.ebuild 11281 BLAKE2B f8be09ce1670d897fcc72d92e816140be8507d92c70a2fe58fbd224e522a74749ef158173f54f09025488a0d5b1a572112410e9774eafc5f684cb8c1b567c9c5 SHA512 58acbe4ddf7045a991f156fb8d70c89fc83e8cb3733884154f263078671e02f6cdf961cdc953709e8da818ab92f8830a5a065acfd17b4f21316b004be0ca112c +EBUILD wine-staging-9999.ebuild 11281 BLAKE2B f8be09ce1670d897fcc72d92e816140be8507d92c70a2fe58fbd224e522a74749ef158173f54f09025488a0d5b1a572112410e9774eafc5f684cb8c1b567c9c5 SHA512 58acbe4ddf7045a991f156fb8d70c89fc83e8cb3733884154f263078671e02f6cdf961cdc953709e8da818ab92f8830a5a065acfd17b4f21316b004be0ca112c MISC metadata.xml 2301 BLAKE2B 9b65253f5a19d8aafc6c9ccd361a0b8cdd14a600ddd51bf163603c7400b2c39bf147f7fe671e3aba68ff8f8f2874eec0b64dd73afe4dabad3667cd23ca99aee0 SHA512 885f7c8e2239733193d16b32bb29a21285ff732092ae0c095056ee311bdf9b7135200a29ede5958d668acf9777640f139ffc5ffe43b1455356ce4bc897621401 diff --git a/app-emulation/wine-staging/wine-staging-7.19.ebuild b/app-emulation/wine-staging/wine-staging-7.19.ebuild index f4d6cc01a97f..649285646ebc 100644 --- a/app-emulation/wine-staging/wine-staging-7.19.ebuild +++ b/app-emulation/wine-staging/wine-staging-7.19.ebuild @@ -246,8 +246,10 @@ src_configure() { $(usev !odbc ac_cv_lib_soname_odbc=) ) - tc-ld-force-bfd #867097 - use custom-cflags || strip-flags # can break in obscure ways, also no lto + tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097) + filter-lto # build failure + use mingw || filter-flags -fno-plt # build failure + use custom-cflags || strip-flags # can break in obscure ways at runtime use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} # temporary workaround for tc-ld-force-bfd not yet enforcing with mold diff --git a/app-emulation/wine-staging/wine-staging-7.20.ebuild b/app-emulation/wine-staging/wine-staging-7.20.ebuild index 1a7b1f25c6f9..4d5a4afb6acc 100644 --- a/app-emulation/wine-staging/wine-staging-7.20.ebuild +++ b/app-emulation/wine-staging/wine-staging-7.20.ebuild @@ -246,8 +246,10 @@ src_configure() { $(usev !odbc ac_cv_lib_soname_odbc=) ) - tc-ld-force-bfd #867097 - use custom-cflags || strip-flags # can break in obscure ways, also no lto + tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097) + filter-lto # build failure + use mingw || filter-flags -fno-plt # build failure + use custom-cflags || strip-flags # can break in obscure ways at runtime use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} # temporary workaround for tc-ld-force-bfd not yet enforcing with mold diff --git a/app-emulation/wine-staging/wine-staging-7.21-r1.ebuild b/app-emulation/wine-staging/wine-staging-7.21-r1.ebuild index 606f5b2e9331..e8506e11fcba 100644 --- a/app-emulation/wine-staging/wine-staging-7.21-r1.ebuild +++ b/app-emulation/wine-staging/wine-staging-7.21-r1.ebuild @@ -248,8 +248,10 @@ src_configure() { $(usev !odbc ac_cv_lib_soname_odbc=) ) - tc-ld-force-bfd #867097 - use custom-cflags || strip-flags # can break in obscure ways, also no lto + tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097) + filter-lto # build failure + use mingw || filter-flags -fno-plt # build failure + use custom-cflags || strip-flags # can break in obscure ways at runtime use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} # temporary workaround for tc-ld-force-bfd not yet enforcing with mold diff --git a/app-emulation/wine-staging/wine-staging-7.22.ebuild b/app-emulation/wine-staging/wine-staging-7.22.ebuild index 1f7740c6c6b6..6e64e8c69828 100644 --- a/app-emulation/wine-staging/wine-staging-7.22.ebuild +++ b/app-emulation/wine-staging/wine-staging-7.22.ebuild @@ -243,8 +243,10 @@ src_configure() { $(usev !odbc ac_cv_lib_soname_odbc=) ) - tc-ld-force-bfd #867097 - use custom-cflags || strip-flags # can break in obscure ways, also no lto + tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097) + filter-lto # build failure + use mingw || filter-flags -fno-plt # build failure + use custom-cflags || strip-flags # can break in obscure ways at runtime use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} # temporary workaround for tc-ld-force-bfd not yet enforcing with mold diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild index 1f7740c6c6b6..6e64e8c69828 100644 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild @@ -243,8 +243,10 @@ src_configure() { $(usev !odbc ac_cv_lib_soname_odbc=) ) - tc-ld-force-bfd #867097 - use custom-cflags || strip-flags # can break in obscure ways, also no lto + tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097) + filter-lto # build failure + use mingw || filter-flags -fno-plt # build failure + use custom-cflags || strip-flags # can break in obscure ways at runtime use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} # temporary workaround for tc-ld-force-bfd not yet enforcing with mold diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest index fd44a66245c4..3dea3593a0a8 100644 --- a/app-emulation/wine-vanilla/Manifest +++ b/app-emulation/wine-vanilla/Manifest @@ -4,16 +4,14 @@ AUX wine-vanilla-7.20-unwind.patch 1450 BLAKE2B 3f90cc131104ad72a11ae30c582b79b3 AUX wine-vanilla-7.21-crossflags.patch 876 BLAKE2B fa0bfd1f5fba242a8a99bf94e5ebb2c9cc07bb452d84d542f64a7f73795646af91283ac98dc2a78199ad6d0652544d7768a602539bd7c083ac5b9cf9fd4472ae SHA512 fe5160233246ac2335bb7f38daa761978544a935238d7b99cccf36fe09efa171bc4addbdeedbb457c28ea3a85377f4615ba68d04544ff887c94ff8341e3a8178 AUX wine-vanilla-7.21-opengl32.patch 2741 BLAKE2B 8bf1a5f55172b3f8310e8c9e1b3a0329281ed32632376d4db4a225ab7f5032215d891d9adbbab0ef9bc6f4b1a1acee162910b1abfe02fb45f201b3697624d513 SHA512 a3727cdefee70060fb08eae246c3fe5f9c7179c3cf471ebc7f414559eed717151216c843adc0145e4cd3781191d2863a71ce2902ca14f46b872be83c48ba5c1c DIST wine-7.0.1.tar.xz 27167768 BLAKE2B 9bf74e7077fe4b77611f8195feeb53fc6475bdaeac97dab5221942115d6108d8786f93d4a96745bad72afb074b15129fec9b0b2f10261d91c9a9b57bd2240ded SHA512 5a5258132fe30bfb5313454598b85e7d97a74d1e0c7ca7af16aa8c486e316ad34ab74a25fd9a403c98ad1f3280385232f7d159bb824f713e920a4a0dae62c944 -DIST wine-7.0.tar.xz 27120912 BLAKE2B 84bfeb28d56f0f40bb93b1b5bf8954c8be2fd90fde5a61608e7c35f48addcce7a4d660e63c3caa3ca2c365d1e83b55a1c3485872b2d6bfa8941e2bce44c4aca6 SHA512 eec17b046ed5447eb540f421c9b2748d9419ce087496c2743a9914fd27bbe5ff9da0cfe47d3cd76fa97323bd1188a1d82b1eef4968d86ed1957dc1a95e28529c DIST wine-7.19.tar.xz 28502612 BLAKE2B b7b270656955c7a1e1d84e8bbc7e3e8abff5aedadb5e8a458f0b1109d746875a359f3d2f53b1c9c6caae65d17fd1d205466cd3a884034a8bad6afe9456f13b5d SHA512 f76dbda97cccad4c0f249b5dd4e8d48afa832134f1704ae228650bb73ee82823e628b23bd53a3f8729e06a8933597ff2fffa5551f156fc9c9181b67c066747d5 DIST wine-7.20.tar.xz 28534920 BLAKE2B 2e0cd49a7820f0c885a2a6dbcded6ebbdb5e1ea5576b03dedb7ee066f74f8c675193450cdd45bf5e0224bd588a890138e47a15f513edbfde1eabf1b65c9abe31 SHA512 6e2e65fba2336985df93165050f0f46b752d6aa94fc1581451c58969e2003748378be4b9e16b647ca2922fbdff77920311b12a17bda630a7bccfc7ee8f03b453 DIST wine-7.21.tar.xz 28703308 BLAKE2B 8902ded32b9e635f8ccf659ca4055e9ad45d3659f3ad48d0c218dc5a7a334df456ea0e9441dcaff58e8cac0bbd65140b20e61180acaa06230bc70e28a8382c7e SHA512 15c0c9efda972b84890886fd4b1fb18dd462373ba490f5e607004a5436caba9823f643369ceb5abbc2d2d0e26d7ce002e00136299d9984c0a27f729f3ac129c1 DIST wine-7.22.tar.xz 28974052 BLAKE2B c86466964817b916ee8f7b687f193eda8bdd3fb17152ab1565971e36f43b12b540033ac1c5fa5d15576041febd32cf1ea2955732c5386debcbda46fb3acca0f1 SHA512 bf58a5b98bef5b291aff1eca3f94c28da95990e4c8da9af5e9e28b9480d57163d088b501b0c1bca5b568bf586dd9933cdc1ea1f371b78d95c94e2d25d0a65efc -EBUILD wine-vanilla-7.0-r3.ebuild 10596 BLAKE2B 9e62fe7db88a8e8e8232b4cd2cea88bdbaffcf3c95d023b280f50094f32fbbb95cf118be16470054e0560cef7db6a21ae780ac3dcdf205bce2e4e91059651f8d SHA512 ac951ccd3c00b52ad174c52f5b82b3295e5a1fe025865148d9b6a286f3af3181c43a6f8f2d37e211c45ef94b21b286ad2aed64f4c7faedfec7c78ceb6c284e90 -EBUILD wine-vanilla-7.0.1.ebuild 10270 BLAKE2B c4f0e913e525149e043e14597ef78ea26fb060cb5eafaa6d6678f6e493e50594134780bd472c8c66152c472461891380f776301cb067d552edd8c5737c5ccd35 SHA512 edfd32b54ec5ac60e6a8edf1d6c1a002fc270dd24d21775819ec325757de7892b098d0a463c6f98bf6fd44092798d2cf2335b0d4303adaf57eee0dc275b79b62 -EBUILD wine-vanilla-7.19.ebuild 10187 BLAKE2B 9008395c2c412674f26b5273ae83cdaad211eadfa70de7d75a7a336b0c3ed189ae0d2c60cd957c8c10f1bcdb22fe9c59a48f034b9e597ccf36c55540a374301c SHA512 9d0ae015c3a171768d01d769df742f66741e2d5fa14cfcbcd458e7ccabb7f7b98cabdcf1eff55b88a8b927c85e14aea7319e0edeac1ca57e60335144768f752e -EBUILD wine-vanilla-7.20.ebuild 10188 BLAKE2B 77c7365ec9c58166b07a13e4204bb0a0e2251816c502dbea050877cc19b7864b16e7c4513cac8ad2225137f70137808d58eec17469af09f1278263a87f5aba10 SHA512 db487e83f4bfded1b71a0d4b3ba1608cc46a9f5a767a78d2efb9bbd545038fba041c92234f851156fee5e637c13b3e76286a88139d250131320b45af4106fc8f -EBUILD wine-vanilla-7.21-r1.ebuild 10318 BLAKE2B 0b6c50edab0c79d522c20d2f59e062f9b01b51fe3aafd21f2adc4150156ba060029020c09f7d6a1c59b1ea0d22725beab85bdb908b447f9630d8951a3ef39025 SHA512 16fc2e67425af712f00bb8b952a03a717bff142461c29c6fde4df79e6ff97e9b6cf44a81521568e666638382efdaac53e0067b8fde8b867d92f69a256e0dcc83 -EBUILD wine-vanilla-7.22.ebuild 10290 BLAKE2B 5520ca47cd05a6ce11837819857cee2fc4d718ee8d7a2c14273f64d8d2f5280b4d063bf12b2462e8b38ba3010dc51859fbf0193e34a8bc6194759e0186bf36fd SHA512 ac5154d780d37c350f7078704efe4914bc733a6a1f72aa9ad74106e73b32c7580fbe54687e30f70754eca05f96eeed2b21083db10692bb67f799e2f64fdc9cd8 -EBUILD wine-vanilla-9999.ebuild 10290 BLAKE2B 5520ca47cd05a6ce11837819857cee2fc4d718ee8d7a2c14273f64d8d2f5280b4d063bf12b2462e8b38ba3010dc51859fbf0193e34a8bc6194759e0186bf36fd SHA512 ac5154d780d37c350f7078704efe4914bc733a6a1f72aa9ad74106e73b32c7580fbe54687e30f70754eca05f96eeed2b21083db10692bb67f799e2f64fdc9cd8 +EBUILD wine-vanilla-7.0.1.ebuild 10398 BLAKE2B 2325de4a59845efc0f10c7844f8a75494ed8d8cce7044bd1ac8047e0d84f72ff996cdac6f704e9b8b4577bd9d08c21da98a6a52cc13868ff80d833a0f8d2ed03 SHA512 256b737f5feffb260c625c4f06997576b38963f2e2a9ced73173a2973937cb097811556e42c7efcbbe58dd7b7244716193ca36fc9e13f1fe65846446691579e4 +EBUILD wine-vanilla-7.19.ebuild 10315 BLAKE2B 247a6f527c4751f59405dbc16a2d1da00c15d714ce730e2f05226f860867da63915a8d6b09b5dfddbec2b1cb5559eb406d9630a3941eba968307e2d1c7e08584 SHA512 f94993a24382d5e9263459fd2f35944b0d0ec0f8ccfdb18ac961b2a51bfe70d87c9d2542bb5db9339d3d3dcda308a29fba4a6cb8b9feb43083fcb12b3d04dbc5 +EBUILD wine-vanilla-7.20.ebuild 10316 BLAKE2B 7e8919a834ff05aeeb5f5e4543544113444c0cd7d158a6c98c8c4e3318ba280ae0ab46051d603087d9692ce03ffedca0c4a30d476d32e1398ff27835ad9314c4 SHA512 85159f62a306c34b41988bf3b738036758128060e3e21aca2b9c31a14d265ab69982a371c2c860ba8eabc443a94f305afc9109b1baf2a650a3455dac5b000582 +EBUILD wine-vanilla-7.21-r1.ebuild 10446 BLAKE2B 92aa8c07719e01d2ed4f8d0c94e702c684489ad8a24cd9035143e392e13fa551bd1f61979018ac46798e59724c80e48d9f00e8864c02b18ebb6c919d926a649c SHA512 1eeca0cf07cc202216a1846266cae31a562c9e0811dd29db739a8c05354a5f920d14e62094c54eb73da5b8301d7ce37a0f5a0857063e6f9576cfdb9c88a05ba6 +EBUILD wine-vanilla-7.22.ebuild 10418 BLAKE2B 67a75c5abd4d286f925993f3ff39dbb0eaabb80bb9ac4a5f8ac2f3264bd09e6461e8ae22cdceb7b0a338b0785dc36acc2f635328fea1ed554bf9d184265854c8 SHA512 8fabf1e573c35dbfc2766e78f5f012c659528e75188c680b55e73b90a44aedb366285f632e332d1d48c0788584c882663a00f3663273ac784d5b3f4292a02391 +EBUILD wine-vanilla-9999.ebuild 10418 BLAKE2B 67a75c5abd4d286f925993f3ff39dbb0eaabb80bb9ac4a5f8ac2f3264bd09e6461e8ae22cdceb7b0a338b0785dc36acc2f635328fea1ed554bf9d184265854c8 SHA512 8fabf1e573c35dbfc2766e78f5f012c659528e75188c680b55e73b90a44aedb366285f632e332d1d48c0788584c882663a00f3663273ac784d5b3f4292a02391 MISC metadata.xml 2376 BLAKE2B c37d5b769ce6ea0fd6ac0cde1084a332e34c13d31633d5c60970f89a932f621c0332b97b0667bbc42098a01c979919ac9d8d30487f2ad6691259270641b85485 SHA512 2968f0df88d5d95c0c649ae15cbc9088061c915046b2014448dad782a4abfa8cb173b6ec8ac15575329e5ce882342dfd1f5076a0ea8a2e89800fdc9628dc05f9 diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0-r3.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.0-r3.ebuild deleted file mode 100644 index 653e8809117b..000000000000 --- a/app-emulation/wine-vanilla/wine-vanilla-7.0-r3.ebuild +++ /dev/null @@ -1,332 +0,0 @@ -# Copyright 2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MULTILIB_COMPAT=( abi_x86_{32,64} ) -inherit autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper - -WINE_GECKO=2.47.2 -WINE_MONO=7.0.0 - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git" -else - (( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 1).0 - SRC_URI="https://dl.winehq.org/wine/source/${WINE_SDIR}/wine-${PV}.tar.xz" - S="${WORKDIR}/wine-${PV}" - KEYWORDS="-* amd64 x86" -fi - -DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" -HOMEPAGE=" - https://www.winehq.org/ - https://gitlab.winehq.org/wine/wine/" - -LICENSE="LGPL-2.1+ BSD-2 IJG MIT ZLIB gsm libpng2 libtiff" -SLOT="${PV}" -IUSE=" - +X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos - llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2 - +gstreamer kerberos ldap +mingw +mono netapi nls odbc openal - opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl - selinux +ssl +truetype udev udisks +unwind usb v4l +vkd3d +vulkan - +xcomposite xinerama" -REQUIRED_USE=" - X? ( truetype ) - crossdev-mingw? ( mingw )" # bug #551124 for truetype - -# tests are non-trivial to run, can hang easily, don't play well with -# sandbox, and several need real opengl/vulkan or network access -RESTRICT="test" - -# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked -WINE_DLOPEN_DEPEND=" - X? ( - x11-libs/libXcursor[${MULTILIB_USEDEP}] - x11-libs/libXfixes[${MULTILIB_USEDEP}] - x11-libs/libXi[${MULTILIB_USEDEP}] - x11-libs/libXrandr[${MULTILIB_USEDEP}] - x11-libs/libXrender[${MULTILIB_USEDEP}] - x11-libs/libXxf86vm[${MULTILIB_USEDEP}] - opengl? ( - media-libs/libglvnd[X,${MULTILIB_USEDEP}] - osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] ) - ) - xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) - xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) - ) - cups? ( net-print/cups[${MULTILIB_USEDEP}] ) - fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] ) - kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) - netapi? ( net-fs/samba[${MULTILIB_USEDEP}] ) - odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] ) - sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] ) - ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) - truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] ) - udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) - v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) - vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )" -WINE_COMMON_DEPEND=" - ${WINE_DLOPEN_DEPEND} - X? ( - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - ) - alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) - capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] ) - gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) - gstreamer? ( - dev-libs/glib:2[${MULTILIB_USEDEP}] - media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] - media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] - ) - ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) - openal? ( media-libs/openal[${MULTILIB_USEDEP}] ) - opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) - pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] ) - pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] ) - scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] ) - udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) - unwind? ( - llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] ) - !llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] ) - ) - usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] ) - vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )" -RDEPEND=" - ${WINE_COMMON_DEPEND} - app-emulation/wine-desktop-common - dos? ( games-emulation/dosbox ) - gecko? ( app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}] ) - gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] ) - mono? ( app-emulation/wine-mono:${WINE_MONO} ) - perl? ( - dev-lang/perl - dev-perl/XML-LibXML - ) - samba? ( net-fs/samba[winbind] ) - selinux? ( sec-policy/selinux-wine ) - udisks? ( sys-fs/udisks:2 )" -DEPEND=" - ${WINE_COMMON_DEPEND} - sys-kernel/linux-headers - X? ( x11-base/xorg-proto )" -BDEPEND=" - dev-lang/perl - sys-devel/binutils - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) ) - nls? ( sys-devel/gettext )" -IDEPEND="app-eselect/eselect-wine" - -QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext - -PATCHES=( - "${FILESDIR}"/${PN}-7.0-noexecstack.patch - "${FILESDIR}"/${PN}-7.0-unwind.patch -) - -pkg_pretend() { - [[ ${MERGE_TYPE} == binary ]] && return - - if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then - local mingw=-w64-mingw32 - for mingw in $(usev abi_x86_64 x86_64${mingw}) $(usev abi_x86_32 i686${mingw}); do - if ! type -P ${mingw}-gcc >/dev/null; then - eerror "With USE=crossdev-mingw, you must prepare the MinGW toolchain" - eerror "yourself by installing sys-devel/crossdev then running:" - eerror - eerror " crossdev --target ${mingw}" - eerror - eerror "For more information, please see: https://wiki.gentoo.org/wiki/Mingw" - die "USE=crossdev-mingw is enabled, but ${mingw}-gcc was not found" - fi - done - fi -} - -src_prepare() { - # sanity check, bumping these has a history of oversights - local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \ - dlls/appwiz.cpl/addons.c || die) - if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then - local gmfatal= - [[ ${PV} == *9999 ]] && gmfatal=nonfatal - ${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " ${geckomono} " (please file a bug)" - fi - - default - - # ensure .desktop calls this variant + slot - sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die - - # always update for patches (including user's wrt #432348) - eautoreconf - tools/make_requests || die # perl -} - -src_configure() { - WINE_PREFIX=/usr/lib/${P} - WINE_DATADIR=/usr/share/${P} - - local conf=( - --prefix="${EPREFIX}"${WINE_PREFIX} - --datadir="${EPREFIX}"${WINE_DATADIR} - --includedir="${EPREFIX}"/usr/include/${P} - --libdir="${EPREFIX}"${WINE_PREFIX} - --mandir="${EPREFIX}"${WINE_DATADIR}/man - $(use_enable gecko mshtml) - $(use_enable mono mscoree) - --disable-tests - $(use_with X x) - $(use_with alsa) - $(use_with capi) - $(use_with cups) - $(use_with fontconfig) - $(use_with gphoto2 gphoto) - $(use_with gstreamer) - $(use_with kerberos gssapi) - $(use_with kerberos krb5) - $(use_with ldap) - $(use_with mingw) - $(use_with netapi) - $(use_with nls gettext) - $(use_with openal) - $(use_with opencl) - $(use_with opengl) - $(use_with osmesa) - --without-oss # media-sound/oss is not packaged (OSSv4) - $(use_with pcap) - $(use_with pulseaudio pulse) - $(use_with scanner sane) - $(use_with sdl) - $(use_with ssl gnutls) - $(use_with truetype freetype) - $(use_with udev) - $(use_with udisks dbus) # dbus is only used for udisks - $(use_with unwind) - $(use_with usb) - $(use_with v4l v4l2) - $(use_with vkd3d) - $(use_with vulkan) - $(use_with xcomposite) - $(use_with xinerama) - $(usev !odbc ac_cv_lib_soname_odbc=) - ) - - tc-ld-force-bfd #867097 - use custom-cflags || strip-flags # can break in obscure ways, also no lto - use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} - - # temporary workaround for tc-ld-force-bfd not yet enforcing with mold - # https://github.com/gentoo/gentoo/pull/28355 - [[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] && - append-ldflags -fuse-ld=bfd - - # build using upstream's way (--with-wine64) - # order matters: configure+compile 64->32, install 32->64 - local -i bits - for bits in $(usev abi_x86_64 64) $(usev abi_x86_32 32); do - ( - einfo "Configuring ${PN} for ${bits}bits in ${WORKDIR}/build${bits} ..." - - mkdir ../build${bits} || die - cd ../build${bits} || die - - # CROSSCC_amd64/x86 are unused by Wine, but recognized here for users - if (( bits == 64 )); then - : "${CROSSCC:=${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}" - conf+=( --enable-win64 ) - elif use amd64; then - conf+=( - $(usev abi_x86_64 --with-wine64=../build64) - TARGETFLAGS=-m32 # for widl - ) - # _setup is optional, but use over Wine's auto-detect (+#472038) - multilib_toolchain_setup x86 - fi - : "${CROSSCC:=${CROSSCC_x86:-i686-w64-mingw32-gcc}}" - - # use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu) - if use mingw; then - : "${CROSSCFLAGS:=$( - filter-flags '-fstack-clash-protection' #758914 - filter-flags '-fstack-protector*' #870136 - filter-flags '-mfunction-return=thunk*' #878849 - CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}" - : "${CROSSLDFLAGS:=$( - filter-flags '-fuse-ld=*' - CC=${CROSSCC} test-flags-CCLD ${LDFLAGS})}" - export CROSS{CC,{C,LD}FLAGS} - fi - - ECONF_SOURCE=${S} econf "${conf[@]}" - ) - done -} - -src_compile() { - use abi_x86_64 && emake -C ../build64 # do first - use abi_x86_32 && emake -C ../build32 -} - -src_install() { - use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install - use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last - - # symlink for plain 'wine' and install its man pages if 64bit-only #404331 - if use abi_x86_64 && use !abi_x86_32; then - dosym wine64 ${WINE_PREFIX}/bin/wine - dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader - local man - for man in ../build64/loader/wine.*man; do - : "${man##*/wine}" - : "${_%.*}" - insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1 - newins ${man} wine.1 - done - fi - - use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \ - "${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} || die - - # create variant wrappers for eselect-wine - local bin - for bin in "${ED}"${WINE_PREFIX}/bin/*; do - make_wrapper "${bin##*/}-${P#wine-}" "${bin#"${ED}"}" - done - - # don't let portage try to strip PE files with the wrong - # strip executable and instead handle it here (saves ~120MB) - if use mingw; then - dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows - use debug || - find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \ - -exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} + || die - fi - - 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 -} - -pkg_prerm() { - if [[ ${REPLACED_BY_VERSION%-r*} != ${PV} ]]; then #881035 - nonfatal wine-eselect deregister - fi -} 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 c0992e01230c..e17d6a292d1b 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild @@ -218,8 +218,10 @@ src_configure() { $(usev !odbc ac_cv_lib_soname_odbc=) ) - tc-ld-force-bfd #867097 - use custom-cflags || strip-flags # can break in obscure ways, also no lto + tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097) + filter-lto # build failure + use mingw || filter-flags -fno-plt # build failure + use custom-cflags || strip-flags # can break in obscure ways at runtime use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} # temporary workaround for tc-ld-force-bfd not yet enforcing with mold diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.19.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.19.ebuild index 69628d775f7e..5619b8ebd018 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-7.19.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-7.19.ebuild @@ -216,8 +216,10 @@ src_configure() { $(usev !odbc ac_cv_lib_soname_odbc=) ) - tc-ld-force-bfd #867097 - use custom-cflags || strip-flags # can break in obscure ways, also no lto + tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097) + filter-lto # build failure + use mingw || filter-flags -fno-plt # build failure + use custom-cflags || strip-flags # can break in obscure ways at runtime use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} # temporary workaround for tc-ld-force-bfd not yet enforcing with mold diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.20.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.20.ebuild index e1d2da19d47b..883a0f427034 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-7.20.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-7.20.ebuild @@ -216,8 +216,10 @@ src_configure() { $(usev !odbc ac_cv_lib_soname_odbc=) ) - tc-ld-force-bfd #867097 - use custom-cflags || strip-flags # can break in obscure ways, also no lto + tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097) + filter-lto # build failure + use mingw || filter-flags -fno-plt # build failure + use custom-cflags || strip-flags # can break in obscure ways at runtime use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} # temporary workaround for tc-ld-force-bfd not yet enforcing with mold diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.21-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.21-r1.ebuild index 38fe963828ae..ed18a224f6b5 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-7.21-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-7.21-r1.ebuild @@ -218,8 +218,10 @@ src_configure() { $(usev !odbc ac_cv_lib_soname_odbc=) ) - tc-ld-force-bfd #867097 - use custom-cflags || strip-flags # can break in obscure ways, also no lto + tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097) + filter-lto # build failure + use mingw || filter-flags -fno-plt # build failure + use custom-cflags || strip-flags # can break in obscure ways at runtime use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} # temporary workaround for tc-ld-force-bfd not yet enforcing with mold diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.22.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.22.ebuild index b73eb356b435..02df0a4439ca 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-7.22.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-7.22.ebuild @@ -213,8 +213,10 @@ src_configure() { $(usev !odbc ac_cv_lib_soname_odbc=) ) - tc-ld-force-bfd #867097 - use custom-cflags || strip-flags # can break in obscure ways, also no lto + tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097) + filter-lto # build failure + use mingw || filter-flags -fno-plt # build failure + use custom-cflags || strip-flags # can break in obscure ways at runtime use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} # temporary workaround for tc-ld-force-bfd not yet enforcing with mold diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild index b73eb356b435..02df0a4439ca 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild @@ -213,8 +213,10 @@ src_configure() { $(usev !odbc ac_cv_lib_soname_odbc=) ) - tc-ld-force-bfd #867097 - use custom-cflags || strip-flags # can break in obscure ways, also no lto + tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097) + filter-lto # build failure + use mingw || filter-flags -fno-plt # build failure + use custom-cflags || strip-flags # can break in obscure ways at runtime use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} # temporary workaround for tc-ld-force-bfd not yet enforcing with mold |