diff options
Diffstat (limited to 'app-emulation')
17 files changed, 77 insertions, 1107 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz Binary files differindex 50307d1ce71a..81083ea6114b 100644 --- a/app-emulation/Manifest.gz +++ b/app-emulation/Manifest.gz diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest index 3e67eb95e02f..5b879cdb5e85 100644 --- a/app-emulation/virtualbox-additions/Manifest +++ b/app-emulation/virtualbox-additions/Manifest @@ -1,11 +1,11 @@ DIST VBoxGuestAdditions_5.1.32.iso 59512832 BLAKE2B 73fcbb3d1db1056970a86e9c1c1efe1f8ddc3566c327df5bb8e14b22b827fc603dcba580a6db60c75f3dff00f268313ac196d49355e184395793363c6d16df68 SHA512 073b103308f7cab18ca096bbb863d8cdea8efd8aa4896b2ab2a6326f549f1cf6afb70ccb55baa1dab85485879e522584a9f91adb4434c5f8bd649e73dae65900 DIST VBoxGuestAdditions_5.1.34.iso 59619328 BLAKE2B e8e7786a82785c4d58c2206c3ede4119c435c2884eba470128cd12ad968077eea7a7850fb05c20ef18ec01fb27919ae29a706d4b059203a7a55dba94f7680564 SHA512 e8c376a558991d603fbb6554969d27c510621bfd8f53542126f57c3604d68f6da7f7732361369b6144794575f40c22e0df0a9b2b4190d3462d80c035b7f0451f DIST VBoxGuestAdditions_5.1.36.iso 59592704 BLAKE2B eda12e74481c995eb868fdd4d4589bed365cfac1403f97b47947549e602a108297cb4fc22c6115d0496dd82f79291a40833dd29e1a7a0e6b9d08754faa6d01a0 SHA512 af1b97771f6e49a3ec3e917bad2c9386593cd5281371d271cb8fa903eb534c95c9862ce71690fa5ca49c5a2c17cdce80606b572bb7e6fd5f5e3b69f648bb3111 -DIST VBoxGuestAdditions_5.2.10.iso 57978880 BLAKE2B 5278fbd6abc5d8ebf985387c605e4840b50b4f69f858723b62d58e7f1551fa1ea3aa74d1e78bab04e8da9a4f83aac39dbf0866037ddf1f2f22b8b54a3c9094b0 SHA512 4d69e16055763b6f3a92cf0ab1bb6ac4a034cb2c79aea70d29466b6588d7aa900be9055226052d97d4e5b13ae50ebfc2afd247464c1482bf48cedbb716bc7965 +DIST VBoxGuestAdditions_5.2.10.iso 57974784 BLAKE2B 3e56448d46cfdbb264a6c606d548a0db86d40cac1428263de7d7f6e35602dc485138ac3574eab6bba78cccabb7ccd65f8c67ed78938524bc408d9d305949154d SHA512 fd84d41b5953c379b1a14380cb4ec67a8edd42caa4ce11a39f4dc0af77b3bbceeb717d9b9b9d25fd8b2446c2b1aa3bd4393e4a5c661c20bd07059f561d17ad8d DIST VBoxGuestAdditions_5.2.8.iso 57972736 BLAKE2B 4f78b5faa8379777f88be98af1c6e023863395004d5326a698801141ed939edbb04f5109967179e8777bdfae39a77ffa724c9f08f54a14a8898a074512318816 SHA512 29d1bd00e6f5f5ceb7fa50719dde6e05b17111583a0ada16f47cd1e38e9302a3d5d4d7708cef9c8c3f9c4eb2d5ccc276c792700e0733cec2dc611ba1e5bed098 EBUILD virtualbox-additions-5.1.32.ebuild 729 BLAKE2B f792450477b1a6b5689018926bce6a30608b288db6a9f546ea52bbc2dd463ba1c71c5dbe4a4970bce3a7dd3d92d6b9fa1e30ffc288f7a4597214021b6bacbde9 SHA512 3d90155e5c821b4831a31a154cbb7fcc31dd2b88637853b5dc8c3393158f555d1b6c3b5bff1856b363b12cd6e6ee039e08dec1aace2751ad618aa719dfef7074 EBUILD virtualbox-additions-5.1.34.ebuild 731 BLAKE2B 4784dde2f78825df471f012b87a1af33b1de8c1ed38771f9063eaf03fd186b3410c373012044884107fc9645ad97ccabcb80643215a02754d357fb4b58c68309 SHA512 e0b2b41a355e2d46efbc4205bf7721fe0d8647e479200e93ebc1576b5cbfc1609a4dc35b215798006a53e45908908f75366919226b05527b6cad7647d06b03db EBUILD virtualbox-additions-5.1.36.ebuild 731 BLAKE2B 4784dde2f78825df471f012b87a1af33b1de8c1ed38771f9063eaf03fd186b3410c373012044884107fc9645ad97ccabcb80643215a02754d357fb4b58c68309 SHA512 e0b2b41a355e2d46efbc4205bf7721fe0d8647e479200e93ebc1576b5cbfc1609a4dc35b215798006a53e45908908f75366919226b05527b6cad7647d06b03db -EBUILD virtualbox-additions-5.2.10.ebuild 731 BLAKE2B 4784dde2f78825df471f012b87a1af33b1de8c1ed38771f9063eaf03fd186b3410c373012044884107fc9645ad97ccabcb80643215a02754d357fb4b58c68309 SHA512 e0b2b41a355e2d46efbc4205bf7721fe0d8647e479200e93ebc1576b5cbfc1609a4dc35b215798006a53e45908908f75366919226b05527b6cad7647d06b03db +EBUILD virtualbox-additions-5.2.10-r1.ebuild 731 BLAKE2B 4784dde2f78825df471f012b87a1af33b1de8c1ed38771f9063eaf03fd186b3410c373012044884107fc9645ad97ccabcb80643215a02754d357fb4b58c68309 SHA512 e0b2b41a355e2d46efbc4205bf7721fe0d8647e479200e93ebc1576b5cbfc1609a4dc35b215798006a53e45908908f75366919226b05527b6cad7647d06b03db EBUILD virtualbox-additions-5.2.8.ebuild 731 BLAKE2B 4784dde2f78825df471f012b87a1af33b1de8c1ed38771f9063eaf03fd186b3410c373012044884107fc9645ad97ccabcb80643215a02754d357fb4b58c68309 SHA512 e0b2b41a355e2d46efbc4205bf7721fe0d8647e479200e93ebc1576b5cbfc1609a4dc35b215798006a53e45908908f75366919226b05527b6cad7647d06b03db MISC metadata.xml 343 BLAKE2B 9e18764cb3f6a1df7858366112557de847f14dd2d7415612da0ebe28895a92a7714d0295f3551ddc62711bf84d5be253ddda3146f6121d52c4f86c05a20ad835 SHA512 88eabdec952f2eee2490f23050b39127f500765f6f93adecb9cfdb62776d73e9dddcdb56756b41041ed4727375ffb0e5f729c219a7de5620344bbee10bbc06c9 diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-5.2.10.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-5.2.10-r1.ebuild index a28d6005cb4f..a28d6005cb4f 100644 --- a/app-emulation/virtualbox-additions/virtualbox-additions-5.2.10.ebuild +++ b/app-emulation/virtualbox-additions/virtualbox-additions-5.2.10-r1.ebuild diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest index eebbf86f6517..5efc88a1b7f9 100644 --- a/app-emulation/wine-staging/Manifest +++ b/app-emulation/wine-staging/Manifest @@ -1,15 +1,15 @@ DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a06429680b518d7eafb938cefd903f3f8aa71ea3049ac9d8de05af48f9f4f4a1b9172c7ef17784540413e410eb8ec11e8ec4a63858c6 SHA512 5b354a409c7a2b77499aaa593b9248a1d15d755e3687b095755faacc30068bfcdbdd5c2a2a78617cb1a78c46d2931162bd69ec3379b035d81494bea7108263c2 DIST wine-2.0.tar.bz2 23662707 BLAKE2B 1d485c1359ce8a0395a9f6378c1f8be33ea2836b80390d1eb1095057a0acedd21708daab16e1851a315391b9f9b0a360879b9d98c73bcc8371c5023e9a8037f5 SHA512 b0a57ba8202d9fc396e5bfb7a7718d6bababbed8f3351e7fdc36afa37f35a871e04903757618f73427aeb71a52b2d323977d79e48f8b38d636f23fd404441186 -DIST wine-2.19.tar.xz 19549464 BLAKE2B 86d130cc43d7d674d2f478365952962b2792fd585b8d074564108bc7e9f4f7690337e4758b9a24e54fe8fd60187d3a96496a5ffc454ba674b02ecdde68efd3bb SHA512 83558231bdc592b1f69cfedf6c689063df7bd9fecdfafba6fb7f6a2c7fa7783973efb85a6a49305afc18b1aa268209ee5b9c0655756e05d7550468698dfa51ae -DIST wine-2.20.tar.xz 19597556 BLAKE2B 80a9886fa77e5788b143521288f7d83c92754610c9426e58c759d2c33767bd23f7d2a44a17ceeec0bfe9065264393e0aa1087a0827ea7d438ffd938ba2eb2fb5 SHA512 d8d374d1e690ce9d3964fc81054fb7f4cd56cbae6bc44ebbf80b7dc7f04524baa2bd831e0be8f00de4cb0e14c1cb71780d424f5dcb9851fcaed9fb22f5ce5d23 -DIST wine-2.21.tar.xz 19620888 BLAKE2B 26d19c5805db58b53530b80eda3ab229f7961542d398cb0e74155e5341de8b484d301c263653ae50e953588538f6782a9b2200b822ba66f091e65d259e07db8e SHA512 4e33c463debe637827ed65f1118e692832bb5374491f706f9d251b8a2956e20d2df5d90ceba218b9bc9e946de91b8ba1d96b460453f59cdd9d82f070d07e0c43 +DIST wine-3.5.tar.xz 19963436 BLAKE2B 83d7c0719a088f8c705f7a9d8a6df6b9ee5e0a5ffa57c0a921875097be29298bebb9025222039432c65da32359e187a93413e04a5bb73171f0033911595baf9f SHA512 c1e36f3db862fdedd00c3ac20c84c6eb799b53fe32e959b481a6168baf7d9725ed9bd0a97e7f9b651e3ccfba4f8fb623445369be03fde5010ed0fcb0a53e7d3f +DIST wine-3.6.tar.xz 20005240 BLAKE2B 6dd48180b9aed8a3b69c40b3ed7b2ff5adbebfb591860dda6603d2219f9059bc069df000cd2614c80d34911c451388f0124af3dd8a11b806b227ca8e16659d71 SHA512 31d24cc78734bdb743afcec7df05b641ab0625568361401eaf8cd5e217719c8c51a0ef7ed737a560fe42cb9ecd88f10d35e62a98d9df69b966502a5b0dab5a22 +DIST wine-3.7.tar.xz 20454036 BLAKE2B 04ac94d5679377c5d0bb37a6d3e8e3ec7c09faa300f8422a09a22b14ef4244d2bb14c80a47cfca5e11526506a8064f0cfa4e28868d7f04669f85ab743dbbb36d SHA512 a699418574dd8f407c064421cf6cdfe3923562c8adf9a7749e716f3853291eab05358ea64f0217c303c26c0f8f59d2116024b7b6978f9a52a055147e689a8694 DIST wine-staging-2.0.tar.gz 10182575 BLAKE2B 1de645f66fa3e5e0d8ceddf5439fd246510470f63d6331c7029abed7192180b7b8430e43a2e732a30a5fbe0c73ba39b7fafcfc08830c68e679dff90576c3a960 SHA512 51412299259d6e92c8993543d5fdb3239ebe31e0d1d715e0a9e8ce94b3139c0567b08ff1600d41be94f12427cbfccc2f6b6b2ed030535445c95618aaf6578580 -DIST wine-staging-2.19.tar.gz 10241240 BLAKE2B e661e3272328988e9a1aacc22fc02f0773804b58777f208c79c6af866032f31b6140a52e2aa5af954e52437db234712863d1369e960e98e2c212d1efc7f6344f SHA512 90916cb096bbfec35514eff4c1b6e2090b6e68e3e7af1164715f5abb1d255c5cfd6411f53c27cb277adcf0982fa6d6e508a7cdbc1404dcca6c2700b05c2c5483 -DIST wine-staging-2.20.tar.gz 10240761 BLAKE2B 2a212e59c606f4c53e711b0f975a9527cbb930423061eeeb962c3bba7232890f3f4853e1aa98cba11bcb9c9ba6a37c915ef8df7f4f3d3243da96f625e6d45a57 SHA512 16f55130291ca70487a74d01cee9057f95f3eae3e049d30fb2a9aeb8e425b2020289fb805fdbae860708be0615a86da0502c06ff32cc21536d040088cc13605f -DIST wine-staging-2.21.tar.gz 10229454 BLAKE2B a971b9b96e1e57f658b492e3dd5d6daf5410b6bb6a7df9432d14b48e6ca4b21a4ab62ee362addf370ea5940e4f7a6af05ec6c026124cb9e9b6cc790f7fc8e204 SHA512 701c6352c8bc5745b8078947bcc3b6209e4e6c387905395cc81d42276402243522d7fa543bb34293c74786adcde9a3c50a2cf4cd57e05e0f4c68991a49a00b41 +DIST wine-staging-3.5.tar.gz 10024748 BLAKE2B b5399bd22fd1edc1e22ee82e19bb9e54d4d12e771cfa0578dfc69d5cc18c0b6c1dba8e9c522ffddd14c187e012f33196738035dd34b45d71f48eac96997fd8b5 SHA512 39ce4fccac408d69c55fe53376744d218d546d09fc3fcaa5c8e87ba070de5ed52128ebdf0ed76cb5e3a5178a79c8fb25a8786b129e8b3eb59156732d7a4bf15c +DIST wine-staging-3.6.tar.gz 9958882 BLAKE2B 9f7d3d6d748f7bceb08a584bc93a1ce97c09d13cf5448ed1fbe1981494e0009e4686f047d8005a059522ec78749dd120f29f7c6562da8578a95a5dda91c23895 SHA512 839731fa3dba91cefd9e0f036b4d688c4786fe8cb19143819457fb9e45a6c14ef3a70630b585abdd424a00036312114034a2529700012ea1863527e45fbfac2a +DIST wine-staging-3.7.tar.gz 9951654 BLAKE2B 3d6c9a023f3a4f9da6e506a88490365d4f0959231e7f9e375e8ae46006c3cfd82ca4e65af9df79d9c54cf7ee5e53452b10ac5146f2c0de97a7c4946aefac3cd5 SHA512 4a00b7c61121798b6c4e918aadeb71865e359f6471035b9ed33ae242f3fe70f1977b1c0b3628fb244b5ba4942d771d2ee797bcc087d38192fcd9325e1886ed14 EBUILD wine-staging-2.0-r1.ebuild 19947 BLAKE2B 44adc4926d0a93bdcb8ef176d0c058eb2a7ec6896ebc00f253e417f541fdd14e7236e4c1123b8aa93e7b386e15a34b356103e573e2a06ca2be4449073180d2ad SHA512 0d1173b27696344bd491f53fe2e6b11e88ba9d5d1b55869c9907ab292c20e248e48fc05b776c573a6f4dd6a49b8cbc247535e59c39990d80633bcbc55ef7c31c -EBUILD wine-staging-2.19.ebuild 19820 BLAKE2B 7fb11b11879461ffe769db401996d26a94e1273ca0088af283ba206221720859d86f5a5a6680f222d73684b247ab5c20e8a1492f231dcec2383798a956137c5c SHA512 e2dcb1e8bece798e4a45df36102871a10e3a492b8a9d9ceb28fe069c8289735d4307f8665dd0ae5b9449a697543cf6354e35358edf06d75db3aaf059438b95b1 -EBUILD wine-staging-2.20.ebuild 19908 BLAKE2B e992d174bc329d75922a21849c9129259410a028e56d33a851e3b7e02356e7aa4f2d0892c7976312a34dfe869b0a37f376c6e5c3553e67dffc9801853758b840 SHA512 97c0ac13bd8de7c60b1cee2df24616fab781272cd64d5a5a68826b931003a59f7a89ca13362b72b9f884ca6fca8aab98a21dcad8ef7880b7a8ef31ccf788851e -EBUILD wine-staging-2.21.ebuild 19908 BLAKE2B e992d174bc329d75922a21849c9129259410a028e56d33a851e3b7e02356e7aa4f2d0892c7976312a34dfe869b0a37f376c6e5c3553e67dffc9801853758b840 SHA512 97c0ac13bd8de7c60b1cee2df24616fab781272cd64d5a5a68826b931003a59f7a89ca13362b72b9f884ca6fca8aab98a21dcad8ef7880b7a8ef31ccf788851e -EBUILD wine-staging-9999.ebuild 19945 BLAKE2B 0097a0b6d8d64af9dce603cfd4014a658bd8cb400be0394b425f92fd352c9ac07f65347b0f95c08729a24c24b103b608d0e43b96d1993795e88282ec51025d05 SHA512 723ef59d714a848911dd3d92b40e2b75bc5f678db473a4e3b8ebe75cded603170d0717d13048c376a19ce0e58d5b93170b4c732eb1b454fd67b429f76159b599 -MISC metadata.xml 3342 BLAKE2B d1c5c9d03536e473b6373dab5247ee57b9ab875d503a19e20c0b5d3dc0ea7eb121bbb05d4177aeb3c6d97ae7bf831bffe6af9d2589a079cebbabfa69856edb3d SHA512 fb70dd31986faf2eacd4655ae56d7f907ad3c787d59fd230b8315f7495789cb60a768c3491370cbac531c270530488d9e9d148352fe590f14fc7da0f73770cae +EBUILD wine-staging-3.5.ebuild 19893 BLAKE2B a82e6a10ef92b3ce1a79a75e205a8a146815e5a181c668d1278c6ceb0f6a36a6475ab8947bcfa1428cf5a47d48cb1fbed86a97f6b13dee55d36d11cb583c3212 SHA512 4de9bf77bf4f7678a95535b7733266d0ca81bdfabbae8a97424c1520226ae7d7a04a64d33455d45c7e5504248f139142269410854f67dea6b356d8ffbc7a611d +EBUILD wine-staging-3.6.ebuild 19893 BLAKE2B a82e6a10ef92b3ce1a79a75e205a8a146815e5a181c668d1278c6ceb0f6a36a6475ab8947bcfa1428cf5a47d48cb1fbed86a97f6b13dee55d36d11cb583c3212 SHA512 4de9bf77bf4f7678a95535b7733266d0ca81bdfabbae8a97424c1520226ae7d7a04a64d33455d45c7e5504248f139142269410854f67dea6b356d8ffbc7a611d +EBUILD wine-staging-3.7.ebuild 19893 BLAKE2B a82e6a10ef92b3ce1a79a75e205a8a146815e5a181c668d1278c6ceb0f6a36a6475ab8947bcfa1428cf5a47d48cb1fbed86a97f6b13dee55d36d11cb583c3212 SHA512 4de9bf77bf4f7678a95535b7733266d0ca81bdfabbae8a97424c1520226ae7d7a04a64d33455d45c7e5504248f139142269410854f67dea6b356d8ffbc7a611d +EBUILD wine-staging-9999.ebuild 19893 BLAKE2B a82e6a10ef92b3ce1a79a75e205a8a146815e5a181c668d1278c6ceb0f6a36a6475ab8947bcfa1428cf5a47d48cb1fbed86a97f6b13dee55d36d11cb583c3212 SHA512 4de9bf77bf4f7678a95535b7733266d0ca81bdfabbae8a97424c1520226ae7d7a04a64d33455d45c7e5504248f139142269410854f67dea6b356d8ffbc7a611d +MISC metadata.xml 3412 BLAKE2B d140aed88a920d177f7d68afd8a489e01a58d3ead45db7d692c99f0d9040d7f9374168fd35f7e9e46acd6b6742893f597b80593df60ce126e51d7c13a39693b2 SHA512 c8a6b1ddfe466dae83d06ab74ced70da2b8f851568ecd94c8e42cc3e6b37047402d799f3cf76b8dfe7b7a118149c8d2b8ee4ac789592e84e070a4a5614a38ede diff --git a/app-emulation/wine-staging/metadata.xml b/app-emulation/wine-staging/metadata.xml index 1295661b4ce9..de9b63d08677 100644 --- a/app-emulation/wine-staging/metadata.xml +++ b/app-emulation/wine-staging/metadata.xml @@ -38,6 +38,7 @@ This variant of the Wine packaging includes the Wine-Staging patchset. <flag name="samba">Add support for NTLM auth. see http://wiki.winehq.org/NtlmAuthSetupGuide and http://wiki.winehq.org/NtlmSigningAndSealing</flag> + <flag name="sdl">Add support for gamepad detection using SDL</flag> <flag name="staging">Apply Wine-Staging patches for advanced feature support that haven't made it into upstream Wine yet</flag> <flag name="themes">Support GTK+:3 window theming through Wine-Staging</flag> <flag name="udev">Use <pkg>virtual/libudev</pkg> to provide plug and play support</flag> diff --git a/app-emulation/wine-staging/wine-staging-2.20.ebuild b/app-emulation/wine-staging/wine-staging-3.5.ebuild index e3bcca8e5dae..7ba4e022173c 100644 --- a/app-emulation/wine-staging/wine-staging-2.20.ebuild +++ b/app-emulation/wine-staging/wine-staging-3.5.ebuild @@ -36,15 +36,15 @@ SRC_URI="${SRC_URI} " if [[ ${PV} == "9999" ]] ; then - STAGING_EGIT_REPO_URI="https://github.com/wine-compholio/wine-staging.git" + STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git" else SRC_URI="${SRC_URI} - staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )" + staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )" fi LICENSE="LGPL-2.1" SLOT="${PV}" -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi +X +xcomposite xinerama +xml" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vulkan +X +xcomposite xinerama +xml" REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) @@ -74,6 +74,7 @@ COMMON_DEPEND=" fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) + gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] ) gstreamer? ( media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] @@ -98,6 +99,7 @@ COMMON_DEPEND=" png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] ) + sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] ) ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) staging? ( sys-apps/attr[${MULTILIB_USEDEP}] ) themes? ( @@ -110,6 +112,7 @@ COMMON_DEPEND=" udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] ) + vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] ) xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) xml? ( @@ -162,7 +165,6 @@ PATCHES=( "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611 - "${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864 ) PATCHES_BIN=() @@ -348,7 +350,6 @@ src_prepare() { ewarn "Wine bugzilla should explicitly state that staging was used." local STAGING_EXCLUDE="" - STAGING_EXCLUDE="${STAGING_EXCLUDE} -W winhlp32-Flex_Workaround" # Avoid double patching https://bugs.winehq.org/show_bug.cgi?id=42132 use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight" # Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches @@ -384,7 +385,6 @@ src_prepare() { l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS # Fix manpage generation for locales #469418 and abi_x86_64 #617864 - # Requires wine-2.0-rearrange-manpages.patch # Duplicate manpages input files for wine64 local f @@ -442,6 +442,7 @@ multilib_src_configure() { $(use_enable gecko mshtml) $(use_with gphoto2 gphoto) $(use_with gsm) + $(use_with gssapi) $(use_with gstreamer) --without-hal $(use_with jpeg) @@ -461,10 +462,12 @@ multilib_src_configure() { $(use_with pulseaudio pulse) $(use_with threads pthread) $(use_with scanner sane) + $(use_with sdl) $(use_enable test tests) $(use_with truetype freetype) $(use_with udev) $(use_with v4l) + $(use_with vulkan) $(use_with X x) $(use_with X xfixes) $(use_with xcomposite) diff --git a/app-emulation/wine-staging/wine-staging-2.21.ebuild b/app-emulation/wine-staging/wine-staging-3.6.ebuild index e3bcca8e5dae..7ba4e022173c 100644 --- a/app-emulation/wine-staging/wine-staging-2.21.ebuild +++ b/app-emulation/wine-staging/wine-staging-3.6.ebuild @@ -36,15 +36,15 @@ SRC_URI="${SRC_URI} " if [[ ${PV} == "9999" ]] ; then - STAGING_EGIT_REPO_URI="https://github.com/wine-compholio/wine-staging.git" + STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git" else SRC_URI="${SRC_URI} - staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )" + staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )" fi LICENSE="LGPL-2.1" SLOT="${PV}" -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi +X +xcomposite xinerama +xml" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vulkan +X +xcomposite xinerama +xml" REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) @@ -74,6 +74,7 @@ COMMON_DEPEND=" fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) + gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] ) gstreamer? ( media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] @@ -98,6 +99,7 @@ COMMON_DEPEND=" png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] ) + sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] ) ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) staging? ( sys-apps/attr[${MULTILIB_USEDEP}] ) themes? ( @@ -110,6 +112,7 @@ COMMON_DEPEND=" udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] ) + vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] ) xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) xml? ( @@ -162,7 +165,6 @@ PATCHES=( "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611 - "${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864 ) PATCHES_BIN=() @@ -348,7 +350,6 @@ src_prepare() { ewarn "Wine bugzilla should explicitly state that staging was used." local STAGING_EXCLUDE="" - STAGING_EXCLUDE="${STAGING_EXCLUDE} -W winhlp32-Flex_Workaround" # Avoid double patching https://bugs.winehq.org/show_bug.cgi?id=42132 use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight" # Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches @@ -384,7 +385,6 @@ src_prepare() { l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS # Fix manpage generation for locales #469418 and abi_x86_64 #617864 - # Requires wine-2.0-rearrange-manpages.patch # Duplicate manpages input files for wine64 local f @@ -442,6 +442,7 @@ multilib_src_configure() { $(use_enable gecko mshtml) $(use_with gphoto2 gphoto) $(use_with gsm) + $(use_with gssapi) $(use_with gstreamer) --without-hal $(use_with jpeg) @@ -461,10 +462,12 @@ multilib_src_configure() { $(use_with pulseaudio pulse) $(use_with threads pthread) $(use_with scanner sane) + $(use_with sdl) $(use_enable test tests) $(use_with truetype freetype) $(use_with udev) $(use_with v4l) + $(use_with vulkan) $(use_with X x) $(use_with X xfixes) $(use_with xcomposite) diff --git a/app-emulation/wine-staging/wine-staging-2.19.ebuild b/app-emulation/wine-staging/wine-staging-3.7.ebuild index 933b53a87ffc..7ba4e022173c 100644 --- a/app-emulation/wine-staging/wine-staging-2.19.ebuild +++ b/app-emulation/wine-staging/wine-staging-3.7.ebuild @@ -36,15 +36,15 @@ SRC_URI="${SRC_URI} " if [[ ${PV} == "9999" ]] ; then - STAGING_EGIT_REPO_URI="https://github.com/wine-compholio/wine-staging.git" + STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git" else SRC_URI="${SRC_URI} - staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )" + staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )" fi LICENSE="LGPL-2.1" SLOT="${PV}" -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi +X +xcomposite xinerama +xml" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vulkan +X +xcomposite xinerama +xml" REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) @@ -74,11 +74,13 @@ COMMON_DEPEND=" fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) + gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] ) gstreamer? ( media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] ) jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) + kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] ) lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] ) ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] ) @@ -97,6 +99,7 @@ COMMON_DEPEND=" png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] ) + sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] ) ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) staging? ( sys-apps/attr[${MULTILIB_USEDEP}] ) themes? ( @@ -109,6 +112,7 @@ COMMON_DEPEND=" udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] ) + vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] ) xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) xml? ( @@ -161,7 +165,6 @@ PATCHES=( "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611 - "${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864 ) PATCHES_BIN=() @@ -347,7 +350,6 @@ src_prepare() { ewarn "Wine bugzilla should explicitly state that staging was used." local STAGING_EXCLUDE="" - STAGING_EXCLUDE="${STAGING_EXCLUDE} -W winhlp32-Flex_Workaround" # Avoid double patching https://bugs.winehq.org/show_bug.cgi?id=42132 use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight" # Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches @@ -383,7 +385,6 @@ src_prepare() { l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS # Fix manpage generation for locales #469418 and abi_x86_64 #617864 - # Requires wine-2.0-rearrange-manpages.patch # Duplicate manpages input files for wine64 local f @@ -441,9 +442,11 @@ multilib_src_configure() { $(use_enable gecko mshtml) $(use_with gphoto2 gphoto) $(use_with gsm) + $(use_with gssapi) $(use_with gstreamer) --without-hal $(use_with jpeg) + $(use_with kerberos krb5) $(use_with ldap) $(use_enable mono mscoree) $(use_with mp3 mpg123) @@ -459,10 +462,12 @@ multilib_src_configure() { $(use_with pulseaudio pulse) $(use_with threads pthread) $(use_with scanner sane) + $(use_with sdl) $(use_enable test tests) $(use_with truetype freetype) $(use_with udev) $(use_with v4l) + $(use_with vulkan) $(use_with X x) $(use_with X xfixes) $(use_with xcomposite) diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild index fd41d6cfdb22..7ba4e022173c 100644 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild @@ -36,15 +36,15 @@ SRC_URI="${SRC_URI} " if [[ ${PV} == "9999" ]] ; then - STAGING_EGIT_REPO_URI="https://github.com/wine-compholio/wine-staging.git" + STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git" else SRC_URI="${SRC_URI} - staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )" + staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )" fi LICENSE="LGPL-2.1" SLOT="${PV}" -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vulkan +X +xcomposite xinerama +xml" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vulkan +X +xcomposite xinerama +xml" REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) @@ -99,6 +99,7 @@ COMMON_DEPEND=" png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] ) + sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] ) ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) staging? ( sys-apps/attr[${MULTILIB_USEDEP}] ) themes? ( @@ -349,7 +350,6 @@ src_prepare() { ewarn "Wine bugzilla should explicitly state that staging was used." local STAGING_EXCLUDE="" - STAGING_EXCLUDE="${STAGING_EXCLUDE} -W winhlp32-Flex_Workaround" # Avoid double patching https://bugs.winehq.org/show_bug.cgi?id=42132 use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight" # Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches @@ -462,6 +462,7 @@ multilib_src_configure() { $(use_with pulseaudio pulse) $(use_with threads pthread) $(use_with scanner sane) + $(use_with sdl) $(use_enable test tests) $(use_with truetype freetype) $(use_with udev) diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest index 432236ef92b0..f6446693b485 100644 --- a/app-emulation/wine-vanilla/Manifest +++ b/app-emulation/wine-vanilla/Manifest @@ -4,22 +4,18 @@ DIST wine-2.0.2.tar.xz 18854952 BLAKE2B ae55b6a31e4d36b367a84e0e5fa7bea8c39a61ec DIST wine-2.0.3.tar.xz 18864648 BLAKE2B 0503a11e7545d5af805bfc3c2f614b6e35e39b7b532ee45dd9947e1a9a53eb788a304e744c683e42bf84f0e67e2c046ea5f839b6bbad1cf73b9996eaae5c30c1 SHA512 e20dbcb3a48ecb3526eba075d4baebab2529dfc50b7a6d5e18294704470f61db386013f457118c270274b911f9643d203110f46558d23e84e6a6c2d78e237dbb DIST wine-2.0.4.tar.xz 18898148 BLAKE2B a21c920e1cf15e064bc6b37067a11a5568f8d1906783c200236456b73947bbd24212208ab1bcc2ca526ed40d8b2e80a2dc5d95db1a8d356a484213afb6897f59 SHA512 8fccb93e5ebe482ed81e948e3b7f87d4fe5b1f838a10f9cdcafa9561de4ef54b7d5acdc292bf28ad3aaf44be34c5ad8452ebbfc39f49f95fcbe9f9d0fcfc862c DIST wine-2.0.tar.bz2 23662707 BLAKE2B 1d485c1359ce8a0395a9f6378c1f8be33ea2836b80390d1eb1095057a0acedd21708daab16e1851a315391b9f9b0a360879b9d98c73bcc8371c5023e9a8037f5 SHA512 b0a57ba8202d9fc396e5bfb7a7718d6bababbed8f3351e7fdc36afa37f35a871e04903757618f73427aeb71a52b2d323977d79e48f8b38d636f23fd404441186 -DIST wine-2.20.tar.xz 19597556 BLAKE2B 80a9886fa77e5788b143521288f7d83c92754610c9426e58c759d2c33767bd23f7d2a44a17ceeec0bfe9065264393e0aa1087a0827ea7d438ffd938ba2eb2fb5 SHA512 d8d374d1e690ce9d3964fc81054fb7f4cd56cbae6bc44ebbf80b7dc7f04524baa2bd831e0be8f00de4cb0e14c1cb71780d424f5dcb9851fcaed9fb22f5ce5d23 -DIST wine-2.21.tar.xz 19620888 BLAKE2B 26d19c5805db58b53530b80eda3ab229f7961542d398cb0e74155e5341de8b484d301c263653ae50e953588538f6782a9b2200b822ba66f091e65d259e07db8e SHA512 4e33c463debe637827ed65f1118e692832bb5374491f706f9d251b8a2956e20d2df5d90ceba218b9bc9e946de91b8ba1d96b460453f59cdd9d82f070d07e0c43 -DIST wine-2.22.tar.xz 19635032 BLAKE2B 30534fb37ee0fe7b9f20309797240e461f14bc09ef1927e2c03e16cb136b83031ff186d29cc1092600ac53ede9533d0ddad6d4312e501e97201b0c632fedaae5 SHA512 14ecc25c3012c4eb9b1d3207372d0a4187f62593f986caca3196811b8aac0a7b898ae9acd94c707e0d63b6702019cf5051a964ada606b1ff8fb034bb353116bb DIST wine-3.0.tar.xz 19712932 BLAKE2B 4478c6781bb171ecca426d1fdc85e0d0bbe13b62b6c983933de55e2abdd0bda7a01cbf251c021824b00129ea6230d1d4e718a64b7d919bb5c07a106b8771adb6 SHA512 a51f41b66f4805e09b223528eff6670e94b9c0c0c947be647507baf9d8d9afe7c3fdc88684c2c8d3573b4739d9a086ab929a744a8594d3c8f6ceb52070f43f0a -DIST wine-3.1.tar.xz 19730700 BLAKE2B 287cc42474a9cc57eb7f4b5db2ba79ac5ec8742dffb5367c189f19465cc69bcf78b10fe62ffe6f84ae1360f639a899a7f19128e30e1d9a5b8bbd63deb85e7650 SHA512 49c30d820b8f4028935b4d90dd6251c881cb8cd41bde8833db2782f04111a3d111e24605a87b2d70e419d54cfb6bb42d941f4593f9b381812e3602bf1307c545 -DIST wine-3.2.tar.xz 19793180 BLAKE2B 014256734f4c1d70c81115ba6c470f8264746b57be663d81f7e54593fb328a548da00c5e52438af75d923a3c6c5d3997097bd76cf1856b99f0f921f36e5151da SHA512 94b4903d628bf7aacd712a2bf566b53161880bf28311611106776df222222f592edb212d491f02e4c1b0c60d88e4b4a126981d445d1e18018238ff993c6c3092 +DIST wine-3.5.tar.xz 19963436 BLAKE2B 83d7c0719a088f8c705f7a9d8a6df6b9ee5e0a5ffa57c0a921875097be29298bebb9025222039432c65da32359e187a93413e04a5bb73171f0033911595baf9f SHA512 c1e36f3db862fdedd00c3ac20c84c6eb799b53fe32e959b481a6168baf7d9725ed9bd0a97e7f9b651e3ccfba4f8fb623445369be03fde5010ed0fcb0a53e7d3f +DIST wine-3.6.tar.xz 20005240 BLAKE2B 6dd48180b9aed8a3b69c40b3ed7b2ff5adbebfb591860dda6603d2219f9059bc069df000cd2614c80d34911c451388f0124af3dd8a11b806b227ca8e16659d71 SHA512 31d24cc78734bdb743afcec7df05b641ab0625568361401eaf8cd5e217719c8c51a0ef7ed737a560fe42cb9ecd88f10d35e62a98d9df69b966502a5b0dab5a22 +DIST wine-3.7.tar.xz 20454036 BLAKE2B 04ac94d5679377c5d0bb37a6d3e8e3ec7c09faa300f8422a09a22b14ef4244d2bb14c80a47cfca5e11526506a8064f0cfa4e28868d7f04669f85ab743dbbb36d SHA512 a699418574dd8f407c064421cf6cdfe3923562c8adf9a7749e716f3853291eab05358ea64f0217c303c26c0f8f59d2116024b7b6978f9a52a055147e689a8694 EBUILD wine-vanilla-2.0-r1.ebuild 17165 BLAKE2B 355d7a3892b96a92d3f2336e6ae450407ebe8d1b73ad21910459855de6371fd8aca117c162601d0f303265e234c4d06f35339157bdcc0c1f03d5227f3a746777 SHA512 7d6d3d0659100bdd88a294c4728f95f985284e94d4c2e334d3e65ff26f231f33d6a7ab2f34a695683ac51a804a690621cc4d32bc3dec579003526f86ee9e9d69 EBUILD wine-vanilla-2.0.1-r1.ebuild 17164 BLAKE2B 39c1a2facb2c155e5e5f511f6800af9c93c09cf4cd4ff428519448cdbdbc15afb87e58e12d051ddf0b672726841cce3aa7777aec1c72e19bc3e693c3cf53b4b2 SHA512 b6ff0335579045d560d4a30970b3b8150b07a5e2de086fe4b7377a151924fbb9abee62feddce77ab1c69133f70366640bdc43e0f58820fe7b7563c83bca225c1 EBUILD wine-vanilla-2.0.2-r1.ebuild 17164 BLAKE2B 39c1a2facb2c155e5e5f511f6800af9c93c09cf4cd4ff428519448cdbdbc15afb87e58e12d051ddf0b672726841cce3aa7777aec1c72e19bc3e693c3cf53b4b2 SHA512 b6ff0335579045d560d4a30970b3b8150b07a5e2de086fe4b7377a151924fbb9abee62feddce77ab1c69133f70366640bdc43e0f58820fe7b7563c83bca225c1 EBUILD wine-vanilla-2.0.3.ebuild 16974 BLAKE2B 61a9d93162ba22248f95f518026024c7c7844ea00278b0523d94e0e4306eb8fe4a1b22bfe82a08b4be87d97e174d2ef572cbd9d14bb0dc6a560395708a09bb63 SHA512 b3f1897e19623469dcafa4268cf6f57842c9945b15e395a8eeda77f92b63f2035d00d57fcbbb0d9fc5bf937e0b5e7a9b0a7b49a41588c548d4c91ba1f205b562 EBUILD wine-vanilla-2.0.4.ebuild 16976 BLAKE2B a1b0391d257ffd77cf58bfe5c2614e85e421c5c4db3a1b3157b1a3176d47d6f02bf709c866df146b8cb6f17aa929752cbe9731119a32b83d66115860bc0755a6 SHA512 9b692447e013c31db521d4443b1b3f059279e8f5e0c9c17a629af38c5619a2481321a429f76e8543bac833a4483fcf33d085706672c3068f02b638fa12a93c6a -EBUILD wine-vanilla-2.20.ebuild 17125 BLAKE2B 2e0d9e05eb31b3d24096a7cce83733d1b88628b6b85d3acd62fe9d2a28fd028c7155118d6acd1b58c716220e85632dea348c0c150951181150004cb7efeba610 SHA512 74b57bc4d9f102c80d11476405597f57d99ce69c18d15ad07d0e751c7cbc144820c6be387a8e32c3bf1f3f11c03d9e352851a573a86530cdff85e41dad97e40b -EBUILD wine-vanilla-2.21.ebuild 17125 BLAKE2B 2e0d9e05eb31b3d24096a7cce83733d1b88628b6b85d3acd62fe9d2a28fd028c7155118d6acd1b58c716220e85632dea348c0c150951181150004cb7efeba610 SHA512 74b57bc4d9f102c80d11476405597f57d99ce69c18d15ad07d0e751c7cbc144820c6be387a8e32c3bf1f3f11c03d9e352851a573a86530cdff85e41dad97e40b -EBUILD wine-vanilla-2.22.ebuild 17125 BLAKE2B 2e0d9e05eb31b3d24096a7cce83733d1b88628b6b85d3acd62fe9d2a28fd028c7155118d6acd1b58c716220e85632dea348c0c150951181150004cb7efeba610 SHA512 74b57bc4d9f102c80d11476405597f57d99ce69c18d15ad07d0e751c7cbc144820c6be387a8e32c3bf1f3f11c03d9e352851a573a86530cdff85e41dad97e40b EBUILD wine-vanilla-3.0.ebuild 17125 BLAKE2B 51d4eeb0ef880774cfd8ffce30c8482e9c0a847cbfbecb15159e95497c9a56f62a7ecb1c941bda4f31fe4d89bd11fb740d747f28df28275ead43503af994eaf5 SHA512 011941555712a3a02ff08bdab12b467da71a151efdeb0bce060b9c51c02f8ffec5368b70969a36424b9272ad981e2e8a4725f7de35a8d6064e9e8ad00ccb0f35 -EBUILD wine-vanilla-3.1.ebuild 17199 BLAKE2B 496217e2a4cfcee8637f6dc009dccadf4b326f9b31fc2a1ff1ce3850190e70028577c3655bce8d30a9bba49a123c23d653865d0ef6fe1adf103e6cf0e370ab18 SHA512 b6513b0b6443f573eb394bc64b861097977e8066343a77f2e2693f7d9af0689c60d3a77940070ed4bf33c3673bb79ca3a13c424ad144586f147c228e040b6e5f -EBUILD wine-vanilla-3.2.ebuild 17199 BLAKE2B 496217e2a4cfcee8637f6dc009dccadf4b326f9b31fc2a1ff1ce3850190e70028577c3655bce8d30a9bba49a123c23d653865d0ef6fe1adf103e6cf0e370ab18 SHA512 b6513b0b6443f573eb394bc64b861097977e8066343a77f2e2693f7d9af0689c60d3a77940070ed4bf33c3673bb79ca3a13c424ad144586f147c228e040b6e5f -EBUILD wine-vanilla-9999.ebuild 17162 BLAKE2B 72bd12c24d43ed050a87427e939765d3e62d9ed96f63092a43e359ee0704a165741422aa9bc2e38befa67059c38e1b57366c9098c84ae1dd3bba3f0465f6c90e SHA512 c8feb13601699f00ca201aab8e90a1880c9565923909e3298cd32b3ceaf1a99eb40f6aef77ea8928644309f7259ae552a140722f97fa947e9f7c92f3a0255f5f -MISC metadata.xml 2918 BLAKE2B 237909dbae5f6f72cfd1d0fb8500ad13b15d19a68a50cfc156f2b661328313740c10230f005116d85eb4049f75f371da62d4c1b872bf1b1ba6bc13afa341d2be SHA512 4aab5ac1f9190ae6a5f55edc5563f8f245518d8c9546a6ed10f486d53f11c9729c5e08adf4b861192fad144c8170211974a4676242cac188de9d434a3cd0f1e2 +EBUILD wine-vanilla-3.5.ebuild 17251 BLAKE2B 6f86d2c1eba973215361c17201fd31af1567a06e479310246ffa999bc1de381113ecb8f6a7c41ec9580fad3c2ae4e1bd7c2af9d6d408e0763242ce86c1ae3054 SHA512 72e6cc94623fecb0110f0097765accb9561af19831c9faa873a72f59344a8e203a69cc8f517395ae493094a9917e5a469e417a00c8d1f631151f1ae73ca0a8a0 +EBUILD wine-vanilla-3.6.ebuild 17251 BLAKE2B 6f86d2c1eba973215361c17201fd31af1567a06e479310246ffa999bc1de381113ecb8f6a7c41ec9580fad3c2ae4e1bd7c2af9d6d408e0763242ce86c1ae3054 SHA512 72e6cc94623fecb0110f0097765accb9561af19831c9faa873a72f59344a8e203a69cc8f517395ae493094a9917e5a469e417a00c8d1f631151f1ae73ca0a8a0 +EBUILD wine-vanilla-3.7.ebuild 17251 BLAKE2B 6f86d2c1eba973215361c17201fd31af1567a06e479310246ffa999bc1de381113ecb8f6a7c41ec9580fad3c2ae4e1bd7c2af9d6d408e0763242ce86c1ae3054 SHA512 72e6cc94623fecb0110f0097765accb9561af19831c9faa873a72f59344a8e203a69cc8f517395ae493094a9917e5a469e417a00c8d1f631151f1ae73ca0a8a0 +EBUILD wine-vanilla-9999.ebuild 17251 BLAKE2B 6f86d2c1eba973215361c17201fd31af1567a06e479310246ffa999bc1de381113ecb8f6a7c41ec9580fad3c2ae4e1bd7c2af9d6d408e0763242ce86c1ae3054 SHA512 72e6cc94623fecb0110f0097765accb9561af19831c9faa873a72f59344a8e203a69cc8f517395ae493094a9917e5a469e417a00c8d1f631151f1ae73ca0a8a0 +MISC metadata.xml 2988 BLAKE2B d74eb87b6ee8b0ee42c2f6b20d2c3568052c9a5975a14a84182def2702fafe1707358c149fb0b05cd23a153628b08fe74d6b28e29763bbaf573bb979347331f8 SHA512 2ccedcfe2ba76a52cfb7078843d82bae9eab519c250b5f6b8ca38bcf164340cc5b0c1ccfcec7459981e7e2074a4e07ee85d896f27bc42496afa4f77e61cedf0c diff --git a/app-emulation/wine-vanilla/metadata.xml b/app-emulation/wine-vanilla/metadata.xml index f0d3a46c5a72..78e364679ebb 100644 --- a/app-emulation/wine-vanilla/metadata.xml +++ b/app-emulation/wine-vanilla/metadata.xml @@ -36,6 +36,7 @@ This variant of the Wine packaging does not include external patchsets <flag name="samba">Add support for NTLM auth. see http://wiki.winehq.org/NtlmAuthSetupGuide and http://wiki.winehq.org/NtlmSigningAndSealing</flag> + <flag name="sdl">Add support for gamepad detection using SDL</flag> <flag name="udev">Use <pkg>virtual/libudev</pkg> to provide plug and play support</flag> <flag name="vulkan">Enable Vulkan drivers</flag> </use> diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild deleted file mode 100644 index 40d354c58c00..000000000000 --- a/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild +++ /dev/null @@ -1,525 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW" -PLOCALE_BACKUP="en" - -inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils - -MY_PN="${PN%%-*}" -MY_P="${MY_PN}-${PV}" - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://source.winehq.org/git/wine.git" - EGIT_BRANCH="master" - inherit git-r3 - SRC_URI="" - #KEYWORDS="" -else - MAJOR_V=$(get_version_component_range 1) - SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz" - KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" -fi -S="${WORKDIR}/${MY_P}" - -GWP_V="20180120" -PATCHDIR="${WORKDIR}/gentoo-wine-patches" - -DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" -HOMEPAGE="https://www.winehq.org/" -SRC_URI="${SRC_URI} - https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz -" - -LICENSE="LGPL-2.1" -SLOT="${PV}" -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml" -REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) - X? ( truetype ) - elibc_glibc? ( threads ) - osmesa? ( opengl ) - test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124 - -# FIXME: the test suite is unsuitable for us; many tests require net access -# or fail due to Xvfb's opengl limitations. -RESTRICT="test" - -COMMON_DEPEND=" - X? ( - x11-libs/libXcursor[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - x11-libs/libXfixes[${MULTILIB_USEDEP}] - x11-libs/libXrandr[${MULTILIB_USEDEP}] - x11-libs/libXi[${MULTILIB_USEDEP}] - x11-libs/libXxf86vm[${MULTILIB_USEDEP}] - ) - alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) - capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] ) - cups? ( net-print/cups:=[${MULTILIB_USEDEP}] ) - fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) - gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) - gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) - gstreamer? ( - media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] - media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] - ) - jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) - kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) - lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] ) - ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) - mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] ) - ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] ) - netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] ) - nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] ) - odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] ) - openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] ) - opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) - opengl? ( - virtual/glu[${MULTILIB_USEDEP}] - virtual/opengl[${MULTILIB_USEDEP}] - ) - osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] ) - pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] ) - png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) - pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) - scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] ) - ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) - truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] ) - udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) - udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) - v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) - xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) - xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) - xml? ( - dev-libs/libxml2[${MULTILIB_USEDEP}] - dev-libs/libxslt[${MULTILIB_USEDEP}] - )" - -RDEPEND="${COMMON_DEPEND} - app-emulation/wine-desktop-common - >app-eselect/eselect-wine-0.3 - !app-emulation/wine:0 - dos? ( >=games-emulation/dosbox-0.74_p20160629 ) - gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) - mono? ( app-emulation/wine-mono:4.7.1 ) - perl? ( - dev-lang/perl - dev-perl/XML-Simple - ) - pulseaudio? ( - realtime? ( sys-auth/rtkit ) - ) - samba? ( >=net-fs/samba-3.0.25[winbind] ) - selinux? ( sec-policy/selinux-wine ) - udisks? ( sys-fs/udisks:2 )" - -# tools/make_requests requires perl -DEPEND="${COMMON_DEPEND} - sys-devel/flex - >=sys-kernel/linux-headers-2.6 - virtual/pkgconfig - virtual/yacc - X? ( x11-base/xorg-proto ) - prelink? ( sys-devel/prelink ) - xinerama? ( x11-base/xorg-proto )" - -# These use a non-standard "Wine" category, which is provided by -# /etc/xdg/applications-merged/wine.menu -QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop -usr/share/applications/wine-notepad.desktop -usr/share/applications/wine-uninstaller.desktop -usr/share/applications/wine-winecfg.desktop" - -PATCHES=( - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611 - "${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864 -) -PATCHES_BIN=() - -# https://bugs.gentoo.org/show_bug.cgi?id=635222 -if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then - DEPEND+=" dev-util/patchbin" -fi - -wine_compiler_check() { - [[ ${MERGE_TYPE} = "binary" ]] && return 0 - - # GCC-specific bugs - if tc-is-gcc; then - # bug #549768 - if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then - ebegin "Checking for gcc-5 ms_abi compiler bug" - $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die - # Run in subshell to prevent "Aborted" message - ( "${T}"/pr66838 || false ) >/dev/null 2>&1 - if ! eend $?; then - eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" - eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," - eerror "or use gcc-config to select a different compiler version." - eerror "See https://bugs.gentoo.org/549768" - eerror - return 1 - fi - fi - # bug #574044 - if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then - ebegin "Checking for gcc-5-3 stack realignment compiler bug" - # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 - if ! eend $?; then - eerror "Wine cannot be built with this version of gcc-5.3" - eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," - eerror "or use gcc-config to select a different compiler version." - eerror "See https://bugs.gentoo.org/574044" - eerror - return 1 - fi - fi - fi - - # Ensure compiler support - if use abi_x86_64; then - ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" - # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) - if ! eend $?; then - eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" - eerror - eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" - eerror - return 1 - fi - fi -} - -wine_build_environment_check() { - [[ ${MERGE_TYPE} = "binary" ]] && return 0 - - if use abi_x86_64; then - if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then - eerror "You need gcc-4.4+ to compile 64-bit wine" - die - elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then - eerror "You need clang-3.8+ to compile 64-bit wine" - die - fi - fi - if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then - ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by" - ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" - ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" - fi - if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then - if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then - ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" - ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." - ewarn "See package.env in man 5 portage for more information on how to do this." - ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" - fi - fi - - if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then - eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." - eerror "See https://bugs.gentoo.org/487864 for more details." - eerror - return 1 - fi -} - -wine_env_vcs_vars() { - local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT" - local pn_live_val="${pn_live_var}" - eval pn_live_val='$'${pn_live_val} - if [[ ! -z ${EGIT_COMMIT} ]]; then - eerror "Commits must now be specified using the environmental variables" - eerror "WINE_COMMIT" - eerror - return 1 - fi -} - -pkg_pretend() { - wine_build_environment_check || die - - # Verify OSS support - if use oss && ! use kernel_FreeBSD; then - if ! has_version ">=media-sound/oss-4"; then - eerror "You cannot build wine with USE=oss without having support from a" - eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)" - eerror - die - fi - fi -} - -pkg_setup() { - wine_build_environment_check || die - wine_env_vcs_vars || die - - WINE_VARIANT="${PN#wine}-${PV}" - WINE_VARIANT="${WINE_VARIANT#-}" - - MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}" - MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}" - MY_DATADIR="${MY_DATAROOTDIR}" - MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" - MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}" - MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}" - MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}" - MY_MANDIR="${MY_DATADIR}/man" -} - -src_unpack() { - if [[ ${PV} == "9999" ]] ; then - EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack - fi - - default - - l10n_find_plocales_changes "${S}/po" "" ".po" -} - -src_prepare() { - - eapply_bin(){ - local patch - for patch in ${PATCHES_BIN[@]}; do - patchbin --nogit < "${patch}" || die - done - } - - local md5="$(md5sum server/protocol.def)" - - default - eapply_bin - eautoreconf - - # Modification of the server protocol requires regenerating the server requests - if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then - einfo "server/protocol.def was patched; running tools/make_requests" - tools/make_requests || die #432348 - fi - sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die - if ! use run-exes; then - sed -i '/^MimeType/d' loader/wine.desktop || die #117785 - fi - - # Edit wine.desktop to work for specific variant - sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die - - # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 - cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die - - l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS - - # Fix manpage generation for locales #469418 and abi_x86_64 #617864 - # Requires wine-2.0-rearrange-manpages.patch - - # Duplicate manpages input files for wine64 - local f - for f in loader/*.man.in; do - cp ${f} ${f/wine/wine64} || die - done - # Add wine64 manpages to Makefile - if use abi_x86_64; then - sed -i "/wine.man.in/i \ - \\\twine64.man.in \\\\" loader/Makefile.in || die - sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\ -\164\2/' loader/Makefile.in || die - fi - - rm_man_file(){ - local file="${1}" - loc=${2} - sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die - } - - while read f; do - l10n_for_each_disabled_locale_do rm_man_file "${f}" - done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print) -} - -src_configure() { - wine_compiler_check || die - - export LDCONFIG=/bin/true - use custom-cflags || strip-flags - - multilib-minimal_src_configure -} - -multilib_src_configure() { - local myconf=( - --prefix="${MY_PREFIX}" - --datarootdir="${MY_DATAROOTDIR}" - --datadir="${MY_DATADIR}" - --docdir="${MY_DOCDIR}" - --includedir="${MY_INCLUDEDIR}" - --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}" - --libexecdir="${MY_LIBEXECDIR}" - --localstatedir="${MY_LOCALSTATEDIR}" - --mandir="${MY_MANDIR}" - --sysconfdir=/etc/wine - $(use_with alsa) - $(use_with capi) - $(use_with lcms cms) - $(use_with cups) - $(use_with ncurses curses) - $(use_with udisks dbus) - $(use_with fontconfig) - $(use_with ssl gnutls) - $(use_enable gecko mshtml) - $(use_with gphoto2 gphoto) - $(use_with gsm) - $(use_with gstreamer) - --without-hal - $(use_with jpeg) - $(use_with kerberos krb5) - $(use_with ldap) - $(use_enable mono mscoree) - $(use_with mp3 mpg123) - $(use_with netapi) - $(use_with nls gettext) - $(use_with openal) - $(use_with opencl) - $(use_with opengl) - $(use_with osmesa) - $(use_with oss) - $(use_with pcap) - $(use_with png) - $(use_with pulseaudio pulse) - $(use_with threads pthread) - $(use_with scanner sane) - $(use_enable test tests) - $(use_with truetype freetype) - $(use_with udev) - $(use_with v4l) - $(use_with X x) - $(use_with X xfixes) - $(use_with xcomposite) - $(use_with xinerama) - $(use_with xml) - $(use_with xml xslt) - ) - - local PKG_CONFIG AR RANLIB - # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038 - # set AR and RANLIB to make QA scripts happy; #483342 - tc-export PKG_CONFIG AR RANLIB - - if use amd64; then - if [[ ${ABI} == amd64 ]]; then - myconf+=( --enable-win64 ) - else - myconf+=( --disable-win64 ) - fi - - # Note: using --with-wine64 results in problems with multilib.eclass - # CC/LD hackery. We're using separate tools instead. - fi - - ECONF_SOURCE=${S} \ - econf "${myconf[@]}" - emake depend -} - -multilib_src_test() { - # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader" - if [[ ${ABI} == x86 ]]; then - if [[ $(id -u) == 0 ]]; then - ewarn "Skipping tests since they cannot be run under the root user." - ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf" - return - fi - - WINEPREFIX="${T}/.wine-${ABI}" \ - Xemake test - fi -} - -multilib_src_install_all() { - local DOCS=( ANNOUNCE AUTHORS README ) - add_locale_docs() { - local locale_doc="documentation/README.$1" - [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} ) - } - l10n_for_each_locale_do add_locale_docs - - einstalldocs - prune_libtool_files --all - - if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script - rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \ - "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die - fi - - # Remove wineconsole if neither backend is installed #551124 - if ! use X && ! use ncurses; then - rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die - rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die - rm_wineconsole() { - rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die - } - multilib_foreach_abi rm_wineconsole - fi - - use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055 - use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} - - if use abi_x86_64 && ! use abi_x86_32; then - dosym wine64 "${MY_PREFIX}"/bin/wine # 404331 - dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader - fi - - # Failglob for binloops, shouldn't be necessary, but including to stay safe - eshopts_push -s failglob #615218 - # Make wrappers for binaries for handling multiple variants - # Note: wrappers instead of symlinks because some are shell which use basename - local b - for b in "${D%/}${MY_PREFIX}"/bin/*; do - make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}" - done - eshopts_pop -} - -pkg_postinst() { - eselect wine register ${P} - if [[ ${PN} == "wine-vanilla" ]]; then - eselect wine register --vanilla ${P} || die - fi - - eselect wine update --all --if-unset || die - - xdg_desktop_database_update - - if ! use gecko; then - ewarn "Without Wine Gecko, wine prefixes will not have a default" - ewarn "implementation of iexplore. Many older windows applications" - ewarn "rely upon the existence of an iexplore implementation, so" - ewarn "you will likely need to install an external one, like via winetricks" - fi - if ! use mono; then - ewarn "Without Wine Mono, wine prefixes will not have a default" - ewarn "implementation of .NET. Many windows applications rely upon" - ewarn "the existence of a .NET implementation, so you will likely need" - ewarn "to install an external one, like via winetricks" - fi -} - -pkg_prerm() { - eselect wine deregister ${P} - if [[ ${PN} == "wine-vanilla" ]]; then - eselect wine deregister --vanilla ${P} || die - fi - - eselect wine update --all --if-unset || die -} - -pkg_postrm() { - xdg_desktop_database_update -} diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.22.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.22.ebuild deleted file mode 100644 index 40d354c58c00..000000000000 --- a/app-emulation/wine-vanilla/wine-vanilla-2.22.ebuild +++ /dev/null @@ -1,525 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW" -PLOCALE_BACKUP="en" - -inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils - -MY_PN="${PN%%-*}" -MY_P="${MY_PN}-${PV}" - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://source.winehq.org/git/wine.git" - EGIT_BRANCH="master" - inherit git-r3 - SRC_URI="" - #KEYWORDS="" -else - MAJOR_V=$(get_version_component_range 1) - SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz" - KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" -fi -S="${WORKDIR}/${MY_P}" - -GWP_V="20180120" -PATCHDIR="${WORKDIR}/gentoo-wine-patches" - -DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" -HOMEPAGE="https://www.winehq.org/" -SRC_URI="${SRC_URI} - https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz -" - -LICENSE="LGPL-2.1" -SLOT="${PV}" -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml" -REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) - X? ( truetype ) - elibc_glibc? ( threads ) - osmesa? ( opengl ) - test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124 - -# FIXME: the test suite is unsuitable for us; many tests require net access -# or fail due to Xvfb's opengl limitations. -RESTRICT="test" - -COMMON_DEPEND=" - X? ( - x11-libs/libXcursor[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - x11-libs/libXfixes[${MULTILIB_USEDEP}] - x11-libs/libXrandr[${MULTILIB_USEDEP}] - x11-libs/libXi[${MULTILIB_USEDEP}] - x11-libs/libXxf86vm[${MULTILIB_USEDEP}] - ) - alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) - capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] ) - cups? ( net-print/cups:=[${MULTILIB_USEDEP}] ) - fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) - gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) - gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) - gstreamer? ( - media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] - media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] - ) - jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) - kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) - lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] ) - ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) - mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] ) - ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] ) - netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] ) - nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] ) - odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] ) - openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] ) - opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) - opengl? ( - virtual/glu[${MULTILIB_USEDEP}] - virtual/opengl[${MULTILIB_USEDEP}] - ) - osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] ) - pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] ) - png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) - pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) - scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] ) - ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) - truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] ) - udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) - udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) - v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) - xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) - xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) - xml? ( - dev-libs/libxml2[${MULTILIB_USEDEP}] - dev-libs/libxslt[${MULTILIB_USEDEP}] - )" - -RDEPEND="${COMMON_DEPEND} - app-emulation/wine-desktop-common - >app-eselect/eselect-wine-0.3 - !app-emulation/wine:0 - dos? ( >=games-emulation/dosbox-0.74_p20160629 ) - gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) - mono? ( app-emulation/wine-mono:4.7.1 ) - perl? ( - dev-lang/perl - dev-perl/XML-Simple - ) - pulseaudio? ( - realtime? ( sys-auth/rtkit ) - ) - samba? ( >=net-fs/samba-3.0.25[winbind] ) - selinux? ( sec-policy/selinux-wine ) - udisks? ( sys-fs/udisks:2 )" - -# tools/make_requests requires perl -DEPEND="${COMMON_DEPEND} - sys-devel/flex - >=sys-kernel/linux-headers-2.6 - virtual/pkgconfig - virtual/yacc - X? ( x11-base/xorg-proto ) - prelink? ( sys-devel/prelink ) - xinerama? ( x11-base/xorg-proto )" - -# These use a non-standard "Wine" category, which is provided by -# /etc/xdg/applications-merged/wine.menu -QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop -usr/share/applications/wine-notepad.desktop -usr/share/applications/wine-uninstaller.desktop -usr/share/applications/wine-winecfg.desktop" - -PATCHES=( - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611 - "${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864 -) -PATCHES_BIN=() - -# https://bugs.gentoo.org/show_bug.cgi?id=635222 -if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then - DEPEND+=" dev-util/patchbin" -fi - -wine_compiler_check() { - [[ ${MERGE_TYPE} = "binary" ]] && return 0 - - # GCC-specific bugs - if tc-is-gcc; then - # bug #549768 - if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then - ebegin "Checking for gcc-5 ms_abi compiler bug" - $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die - # Run in subshell to prevent "Aborted" message - ( "${T}"/pr66838 || false ) >/dev/null 2>&1 - if ! eend $?; then - eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" - eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," - eerror "or use gcc-config to select a different compiler version." - eerror "See https://bugs.gentoo.org/549768" - eerror - return 1 - fi - fi - # bug #574044 - if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then - ebegin "Checking for gcc-5-3 stack realignment compiler bug" - # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 - if ! eend $?; then - eerror "Wine cannot be built with this version of gcc-5.3" - eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," - eerror "or use gcc-config to select a different compiler version." - eerror "See https://bugs.gentoo.org/574044" - eerror - return 1 - fi - fi - fi - - # Ensure compiler support - if use abi_x86_64; then - ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" - # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) - if ! eend $?; then - eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" - eerror - eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" - eerror - return 1 - fi - fi -} - -wine_build_environment_check() { - [[ ${MERGE_TYPE} = "binary" ]] && return 0 - - if use abi_x86_64; then - if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then - eerror "You need gcc-4.4+ to compile 64-bit wine" - die - elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then - eerror "You need clang-3.8+ to compile 64-bit wine" - die - fi - fi - if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then - ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by" - ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" - ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" - fi - if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then - if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then - ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" - ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." - ewarn "See package.env in man 5 portage for more information on how to do this." - ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" - fi - fi - - if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then - eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." - eerror "See https://bugs.gentoo.org/487864 for more details." - eerror - return 1 - fi -} - -wine_env_vcs_vars() { - local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT" - local pn_live_val="${pn_live_var}" - eval pn_live_val='$'${pn_live_val} - if [[ ! -z ${EGIT_COMMIT} ]]; then - eerror "Commits must now be specified using the environmental variables" - eerror "WINE_COMMIT" - eerror - return 1 - fi -} - -pkg_pretend() { - wine_build_environment_check || die - - # Verify OSS support - if use oss && ! use kernel_FreeBSD; then - if ! has_version ">=media-sound/oss-4"; then - eerror "You cannot build wine with USE=oss without having support from a" - eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)" - eerror - die - fi - fi -} - -pkg_setup() { - wine_build_environment_check || die - wine_env_vcs_vars || die - - WINE_VARIANT="${PN#wine}-${PV}" - WINE_VARIANT="${WINE_VARIANT#-}" - - MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}" - MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}" - MY_DATADIR="${MY_DATAROOTDIR}" - MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" - MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}" - MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}" - MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}" - MY_MANDIR="${MY_DATADIR}/man" -} - -src_unpack() { - if [[ ${PV} == "9999" ]] ; then - EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack - fi - - default - - l10n_find_plocales_changes "${S}/po" "" ".po" -} - -src_prepare() { - - eapply_bin(){ - local patch - for patch in ${PATCHES_BIN[@]}; do - patchbin --nogit < "${patch}" || die - done - } - - local md5="$(md5sum server/protocol.def)" - - default - eapply_bin - eautoreconf - - # Modification of the server protocol requires regenerating the server requests - if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then - einfo "server/protocol.def was patched; running tools/make_requests" - tools/make_requests || die #432348 - fi - sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die - if ! use run-exes; then - sed -i '/^MimeType/d' loader/wine.desktop || die #117785 - fi - - # Edit wine.desktop to work for specific variant - sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die - - # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 - cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die - - l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS - - # Fix manpage generation for locales #469418 and abi_x86_64 #617864 - # Requires wine-2.0-rearrange-manpages.patch - - # Duplicate manpages input files for wine64 - local f - for f in loader/*.man.in; do - cp ${f} ${f/wine/wine64} || die - done - # Add wine64 manpages to Makefile - if use abi_x86_64; then - sed -i "/wine.man.in/i \ - \\\twine64.man.in \\\\" loader/Makefile.in || die - sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\ -\164\2/' loader/Makefile.in || die - fi - - rm_man_file(){ - local file="${1}" - loc=${2} - sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die - } - - while read f; do - l10n_for_each_disabled_locale_do rm_man_file "${f}" - done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print) -} - -src_configure() { - wine_compiler_check || die - - export LDCONFIG=/bin/true - use custom-cflags || strip-flags - - multilib-minimal_src_configure -} - -multilib_src_configure() { - local myconf=( - --prefix="${MY_PREFIX}" - --datarootdir="${MY_DATAROOTDIR}" - --datadir="${MY_DATADIR}" - --docdir="${MY_DOCDIR}" - --includedir="${MY_INCLUDEDIR}" - --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}" - --libexecdir="${MY_LIBEXECDIR}" - --localstatedir="${MY_LOCALSTATEDIR}" - --mandir="${MY_MANDIR}" - --sysconfdir=/etc/wine - $(use_with alsa) - $(use_with capi) - $(use_with lcms cms) - $(use_with cups) - $(use_with ncurses curses) - $(use_with udisks dbus) - $(use_with fontconfig) - $(use_with ssl gnutls) - $(use_enable gecko mshtml) - $(use_with gphoto2 gphoto) - $(use_with gsm) - $(use_with gstreamer) - --without-hal - $(use_with jpeg) - $(use_with kerberos krb5) - $(use_with ldap) - $(use_enable mono mscoree) - $(use_with mp3 mpg123) - $(use_with netapi) - $(use_with nls gettext) - $(use_with openal) - $(use_with opencl) - $(use_with opengl) - $(use_with osmesa) - $(use_with oss) - $(use_with pcap) - $(use_with png) - $(use_with pulseaudio pulse) - $(use_with threads pthread) - $(use_with scanner sane) - $(use_enable test tests) - $(use_with truetype freetype) - $(use_with udev) - $(use_with v4l) - $(use_with X x) - $(use_with X xfixes) - $(use_with xcomposite) - $(use_with xinerama) - $(use_with xml) - $(use_with xml xslt) - ) - - local PKG_CONFIG AR RANLIB - # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038 - # set AR and RANLIB to make QA scripts happy; #483342 - tc-export PKG_CONFIG AR RANLIB - - if use amd64; then - if [[ ${ABI} == amd64 ]]; then - myconf+=( --enable-win64 ) - else - myconf+=( --disable-win64 ) - fi - - # Note: using --with-wine64 results in problems with multilib.eclass - # CC/LD hackery. We're using separate tools instead. - fi - - ECONF_SOURCE=${S} \ - econf "${myconf[@]}" - emake depend -} - -multilib_src_test() { - # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader" - if [[ ${ABI} == x86 ]]; then - if [[ $(id -u) == 0 ]]; then - ewarn "Skipping tests since they cannot be run under the root user." - ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf" - return - fi - - WINEPREFIX="${T}/.wine-${ABI}" \ - Xemake test - fi -} - -multilib_src_install_all() { - local DOCS=( ANNOUNCE AUTHORS README ) - add_locale_docs() { - local locale_doc="documentation/README.$1" - [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} ) - } - l10n_for_each_locale_do add_locale_docs - - einstalldocs - prune_libtool_files --all - - if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script - rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \ - "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die - fi - - # Remove wineconsole if neither backend is installed #551124 - if ! use X && ! use ncurses; then - rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die - rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die - rm_wineconsole() { - rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die - } - multilib_foreach_abi rm_wineconsole - fi - - use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055 - use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} - - if use abi_x86_64 && ! use abi_x86_32; then - dosym wine64 "${MY_PREFIX}"/bin/wine # 404331 - dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader - fi - - # Failglob for binloops, shouldn't be necessary, but including to stay safe - eshopts_push -s failglob #615218 - # Make wrappers for binaries for handling multiple variants - # Note: wrappers instead of symlinks because some are shell which use basename - local b - for b in "${D%/}${MY_PREFIX}"/bin/*; do - make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}" - done - eshopts_pop -} - -pkg_postinst() { - eselect wine register ${P} - if [[ ${PN} == "wine-vanilla" ]]; then - eselect wine register --vanilla ${P} || die - fi - - eselect wine update --all --if-unset || die - - xdg_desktop_database_update - - if ! use gecko; then - ewarn "Without Wine Gecko, wine prefixes will not have a default" - ewarn "implementation of iexplore. Many older windows applications" - ewarn "rely upon the existence of an iexplore implementation, so" - ewarn "you will likely need to install an external one, like via winetricks" - fi - if ! use mono; then - ewarn "Without Wine Mono, wine prefixes will not have a default" - ewarn "implementation of .NET. Many windows applications rely upon" - ewarn "the existence of a .NET implementation, so you will likely need" - ewarn "to install an external one, like via winetricks" - fi -} - -pkg_prerm() { - eselect wine deregister ${P} - if [[ ${PN} == "wine-vanilla" ]]; then - eselect wine deregister --vanilla ${P} || die - fi - - eselect wine update --all --if-unset || die -} - -pkg_postrm() { - xdg_desktop_database_update -} diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.5.ebuild index a7cee7750644..9bebca2da60a 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-3.2.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-3.5.ebuild @@ -35,7 +35,7 @@ SRC_URI="${SRC_URI} LICENSE="LGPL-2.1" SLOT="${PV}" -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vulkan +X +xcomposite xinerama +xml" REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) @@ -86,11 +86,13 @@ COMMON_DEPEND=" png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] ) + sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] ) ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] ) udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) + vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] ) xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) xml? ( @@ -138,7 +140,6 @@ PATCHES=( "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611 - "${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864 ) PATCHES_BIN=() @@ -319,7 +320,6 @@ src_prepare() { l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS # Fix manpage generation for locales #469418 and abi_x86_64 #617864 - # Requires wine-2.0-rearrange-manpages.patch # Duplicate manpages input files for wine64 local f @@ -397,10 +397,12 @@ multilib_src_configure() { $(use_with pulseaudio pulse) $(use_with threads pthread) $(use_with scanner sane) + $(use_with sdl) $(use_enable test tests) $(use_with truetype freetype) $(use_with udev) $(use_with v4l) + $(use_with vulkan) $(use_with X x) $(use_with X xfixes) $(use_with xcomposite) diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.6.ebuild index a7cee7750644..9bebca2da60a 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-3.1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-3.6.ebuild @@ -35,7 +35,7 @@ SRC_URI="${SRC_URI} LICENSE="LGPL-2.1" SLOT="${PV}" -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vulkan +X +xcomposite xinerama +xml" REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) @@ -86,11 +86,13 @@ COMMON_DEPEND=" png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] ) + sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] ) ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] ) udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) + vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] ) xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) xml? ( @@ -138,7 +140,6 @@ PATCHES=( "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611 - "${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864 ) PATCHES_BIN=() @@ -319,7 +320,6 @@ src_prepare() { l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS # Fix manpage generation for locales #469418 and abi_x86_64 #617864 - # Requires wine-2.0-rearrange-manpages.patch # Duplicate manpages input files for wine64 local f @@ -397,10 +397,12 @@ multilib_src_configure() { $(use_with pulseaudio pulse) $(use_with threads pthread) $(use_with scanner sane) + $(use_with sdl) $(use_enable test tests) $(use_with truetype freetype) $(use_with udev) $(use_with v4l) + $(use_with vulkan) $(use_with X x) $(use_with X xfixes) $(use_with xcomposite) diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.21.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.7.ebuild index 40d354c58c00..9bebca2da60a 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.21.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-3.7.ebuild @@ -35,7 +35,7 @@ SRC_URI="${SRC_URI} LICENSE="LGPL-2.1" SLOT="${PV}" -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vulkan +X +xcomposite xinerama +xml" REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) @@ -61,6 +61,7 @@ COMMON_DEPEND=" fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) + gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] ) gstreamer? ( media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] @@ -85,11 +86,13 @@ COMMON_DEPEND=" png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] ) + sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] ) ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] ) udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) + vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] ) xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) xml? ( @@ -137,7 +140,6 @@ PATCHES=( "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611 - "${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864 ) PATCHES_BIN=() @@ -318,7 +320,6 @@ src_prepare() { l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS # Fix manpage generation for locales #469418 and abi_x86_64 #617864 - # Requires wine-2.0-rearrange-manpages.patch # Duplicate manpages input files for wine64 local f @@ -376,6 +377,7 @@ multilib_src_configure() { $(use_enable gecko mshtml) $(use_with gphoto2 gphoto) $(use_with gsm) + $(use_with gssapi) $(use_with gstreamer) --without-hal $(use_with jpeg) @@ -395,10 +397,12 @@ multilib_src_configure() { $(use_with pulseaudio pulse) $(use_with threads pthread) $(use_with scanner sane) + $(use_with sdl) $(use_enable test tests) $(use_with truetype freetype) $(use_with udev) $(use_with v4l) + $(use_with vulkan) $(use_with X x) $(use_with X xfixes) $(use_with xcomposite) diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild index 62ef97c197eb..9bebca2da60a 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild @@ -35,7 +35,7 @@ SRC_URI="${SRC_URI} LICENSE="LGPL-2.1" SLOT="${PV}" -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l vulkan +X +xcomposite xinerama +xml" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vulkan +X +xcomposite xinerama +xml" REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) @@ -86,6 +86,7 @@ COMMON_DEPEND=" png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] ) + sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] ) ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] ) udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) @@ -396,6 +397,7 @@ multilib_src_configure() { $(use_with pulseaudio pulse) $(use_with threads pthread) $(use_with scanner sane) + $(use_with sdl) $(use_enable test tests) $(use_with truetype freetype) $(use_with udev) |