diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-04-16 13:07:24 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-04-16 13:07:24 +0100 |
commit | 0c100b7dd2b30e75b799d806df4ef899fd98e1ea (patch) | |
tree | 464c922e949c7e4d5d891fb2cdda5daee5612537 /app-emulation/wine-staging | |
parent | e68d405c5d712af4387159df07e226217bdda049 (diff) |
gentoo resync : 16.04.2022
Diffstat (limited to 'app-emulation/wine-staging')
-rw-r--r-- | app-emulation/wine-staging/Manifest | 14 | ||||
-rw-r--r-- | app-emulation/wine-staging/wine-staging-7.3.ebuild | 28 | ||||
-rw-r--r-- | app-emulation/wine-staging/wine-staging-7.4.ebuild | 30 | ||||
-rw-r--r-- | app-emulation/wine-staging/wine-staging-7.5.ebuild | 25 | ||||
-rw-r--r-- | app-emulation/wine-staging/wine-staging-7.6.ebuild (renamed from app-emulation/wine-staging/wine-staging-7.2.ebuild) | 30 | ||||
-rw-r--r-- | app-emulation/wine-staging/wine-staging-9999.ebuild | 27 |
6 files changed, 81 insertions, 73 deletions
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest index c74c3278a428..733bf9775022 100644 --- a/app-emulation/wine-staging/Manifest +++ b/app-emulation/wine-staging/Manifest @@ -1,15 +1,15 @@ DIST gentoo-wine-patches-20211122.tar.xz 59796 BLAKE2B 21460e6adf4934a52f8841f76f234a764c2dc1ac77eeed1cee10adafec3aa723640ebd4b51559e9ef433070ac731c4648620bd9e75e99f31b2e2f494cf01f02d SHA512 a18cb320617e2157977032c38c322177a2d248f14e43051d38de595af171495546c93d5e71e0dbe1a4f326a2dc819bb03dcfd04454ac85bbcd6b1975ae5d9d96 -DIST wine-7.2.tar.xz 27191032 BLAKE2B 5fae75e99ba57cff9e6e5d1ff125413f2779eb786da47305d4bdfda2ac35fa80b72f9157f82ac39291f294d892bb8c3d8add869d738ca3e9ef3d1530c6d647af SHA512 13db73950218bc743803b2c60cee2534f38804a940e9666aad0f0f91e26bd5d432ca2f0cd8134ff6c43bb8dae253098d2e3db0a3621aa38fac9a1574152b8729 DIST wine-7.3.tar.xz 27221860 BLAKE2B f6841f12f23bc9afb47f797ebf538e87a2453d76acfcd707942313be09e4259959c29c12188a7d70825957ef8a067efd0f5148c9f080c862bf51b87d0ee30857 SHA512 afadf96311e08fe5427276030ccad6b8decccc9727a3522711c237a9595318b05757d7390218b8614ded415b7b8c483f6501040efd8a7376e9909fa6e0e5140a DIST wine-7.4.tar.xz 27538164 BLAKE2B bad6abb8d6aa5a0f08c64e4a96b5a6f81b129e4c3e9ef0b5df624e2f2475c29060551ccca444444ce9bdd52158710e819f505e1eb824692b107c99f7808bb6d1 SHA512 ed3e08e27ea2dbec1e317aad37bd7e3a501363dc8a5d823f9db29039006aaac6b9bfb2552aa85ae3f5678ff721e2dacb534d3b7d6ed0b959b0e5431192d03736 DIST wine-7.5.tar.xz 27702532 BLAKE2B e0490d5ca8ef8dc6de807eea9f06e0dd09512dfa34aebf3a2ccbf610ad78fd09c94e3368f92966a92d80e39cd86da71bcd4a7803e1af9f7f3c8ba4cc33b72447 SHA512 70458d702e04075915a97a12c5ebd33ec50cbb094f5f837e6bb498e24ee48630359d819d9689e84d29708398162ca7b8f7737216fb31c350701b66733da98616 -DIST wine-staging-7.2.tar.gz 9625920 BLAKE2B 4bda1fda8aa39bb49f8808ca91020ef8a4ccdd74878085d8c7d31d68b9f622a936a72dcbca5cd2a9f990dae95c6d5e9b1a55c83f062cdd5ca4e88116d685affa SHA512 d8e0779b143424d5677ec556140db8698e414c240b9107a62ed3364e57e1e9d1c7115d141a71997ed4d436154b5254b061bac5071dd99b0d4729053e73304c38 +DIST wine-7.6.tar.xz 27674208 BLAKE2B 9c1abafca0e489876500e4640e6087456f0f93f544fba547541bc454aae5a8cb757454b1c863edc6f70cbd5a8ef848a8bdb3d6f9aaae471b97891a0a188ec640 SHA512 7eabae6e40df187da977ff412adda23697f8cd5f6c4e565d3fff74770f13f7c93ca3d81e77a72a1b929d7af675499e72925e4ab2225b5ca13ef0d88baf1f9646 DIST wine-staging-7.3.tar.gz 9668058 BLAKE2B 9721fac9728f883309d430fa51221de31d67476640590a211a1b8047adeec4f0ad2b11a250bdc5d71e48e1e47868ed1aea3722dc7794c46bc0ed3b24219e9b14 SHA512 8f574bf89968d3c30944f9ba365b1ec4c4c9a662b3a54cf153d5a18be6957d8a5c2597c241ddd8a3e62cce866902e1df36594db6342b7432074e28c0e918935b DIST wine-staging-7.4.tar.gz 9669176 BLAKE2B b689ace69e9599aada78dacf7f64cc126d0c488d8cbeb6b874d4fa0ba92dfdace88d3a6fd84aceb76a39749fb872d6d23f57044d406944634a24fc77577cc593 SHA512 15e1cbb121b9dfb19ef3754e51f21cb42925daae6e8bf09d192cb46139bee3c3c3fcbb9172e88695a0afaf9f788751d5f8d2055f316972e3efc536570d4401ba DIST wine-staging-7.5.tar.gz 9669503 BLAKE2B dbc307bebd50f67ea7718d1409734cc724551f1ca5ea359dd0eeb050bb5a74deb1f5732cff74dd07526f719a1ab342ae821d5ecba850f2e1c684256586205668 SHA512 138456d1fd76fa433afe01cd1d2cadb88c631277f69734641f1136795f0761a68fdfc564b9da90a342ff42e82f04436b70bb57913f92417b14e24cd7720a7b90 -EBUILD wine-staging-7.2.ebuild 20294 BLAKE2B 4ce326c41a7f3c12e506b21d76eaa93c3f946f8afba7d3ab72335eeacec33feea55c098949c0ca5e442baeb7ccf3713f480f6a132fa5bdb986b9f71316e5d165 SHA512 02a5ee87fc0a5c986099daca10c4adf1bfe3f92055bd67809927e3a0ad9a886271504d82a24e9df44855b116cccf4e0b0df848784cb55997e360ea853ce94100 -EBUILD wine-staging-7.3.ebuild 20294 BLAKE2B 4ce326c41a7f3c12e506b21d76eaa93c3f946f8afba7d3ab72335eeacec33feea55c098949c0ca5e442baeb7ccf3713f480f6a132fa5bdb986b9f71316e5d165 SHA512 02a5ee87fc0a5c986099daca10c4adf1bfe3f92055bd67809927e3a0ad9a886271504d82a24e9df44855b116cccf4e0b0df848784cb55997e360ea853ce94100 -EBUILD wine-staging-7.4.ebuild 20306 BLAKE2B bd60ae94644f733e1f25669f4a1c34026f12debe77a5350f815d238e1e5679b9e234b202913069a3cc5f21655ba4bf0a1f66754d73df400d4bd7afc668f06a64 SHA512 45b1fc5d4322e7e44d5c6e94b98bb4f09eb5b3ad6e1668c97f25557437d1254990bfc2074041455b641f5d5f8c96a9fcc23627704205904f9069c35c4752e4cc -EBUILD wine-staging-7.5.ebuild 20370 BLAKE2B bb1dfb9f4325e2218fb219c3554509ddbc3353055d981a031e519a9e559c9e6651c45cd5b5aa34e7d82b7667417aa6aae8ed231403cb9cc891340cccf161ea30 SHA512 c705de7e455d038b30d6829fb2500ad994bbc7e7be03f18d35daa446c25a7750614d165abb268769b56dd27bdc190d621cf07f753726bbb8dc5752fd8fa1c92b -EBUILD wine-staging-9999.ebuild 20370 BLAKE2B bb1dfb9f4325e2218fb219c3554509ddbc3353055d981a031e519a9e559c9e6651c45cd5b5aa34e7d82b7667417aa6aae8ed231403cb9cc891340cccf161ea30 SHA512 c705de7e455d038b30d6829fb2500ad994bbc7e7be03f18d35daa446c25a7750614d165abb268769b56dd27bdc190d621cf07f753726bbb8dc5752fd8fa1c92b +DIST wine-staging-7.6.tar.gz 9668909 BLAKE2B aa7860c22b10cf7aa29fa5903e5628cd36bf8b8488fc5909b92a462ddfa134a44cd2f85e2396266127d442dc38e172b94dac145507a4f84e0867436b112a16a4 SHA512 83bc03e7f8ee4bf21465d05de22449f26480675129b6b533865c31505e09144554c2d14cfa5c9b867d3ba4273e5acd4589d32231f79a15f3f0e8b3493d32b50d +EBUILD wine-staging-7.3.ebuild 20333 BLAKE2B fd6e05c036a2fb3e918fb75b74ae06c69dafae82b64ef2282e1eb131c8fcfc4f2db6f5f3d13a890cc39cdc6500286c0f22ceadecf268db4eee80400a2f1d4041 SHA512 111450cd7c2184b71cbabac9474a90b84cd9cb696142b5c1854b20ca7928b0157cd8d963f6ea0766423d2218ce6b2f8d48b01f31dc06d4645984cd592f28f15a +EBUILD wine-staging-7.4.ebuild 20333 BLAKE2B fd6e05c036a2fb3e918fb75b74ae06c69dafae82b64ef2282e1eb131c8fcfc4f2db6f5f3d13a890cc39cdc6500286c0f22ceadecf268db4eee80400a2f1d4041 SHA512 111450cd7c2184b71cbabac9474a90b84cd9cb696142b5c1854b20ca7928b0157cd8d963f6ea0766423d2218ce6b2f8d48b01f31dc06d4645984cd592f28f15a +EBUILD wine-staging-7.5.ebuild 20333 BLAKE2B fd6e05c036a2fb3e918fb75b74ae06c69dafae82b64ef2282e1eb131c8fcfc4f2db6f5f3d13a890cc39cdc6500286c0f22ceadecf268db4eee80400a2f1d4041 SHA512 111450cd7c2184b71cbabac9474a90b84cd9cb696142b5c1854b20ca7928b0157cd8d963f6ea0766423d2218ce6b2f8d48b01f31dc06d4645984cd592f28f15a +EBUILD wine-staging-7.6.ebuild 20333 BLAKE2B f2cbe68c19306b348d2a258532f9836736fbc446c26794d2f9824c227c22f679cee133ebc106c035d11d56244c2e95768156ea0d3d63e3cc7784a2c1fbcd2929 SHA512 fbd886a1de728497e3c83fe48cd20174fe40ea339dcde9501fe088dccd17fb5ebdadace71b0a21905f5893d352c5e378268fe50a469ef336164c6463436e4c41 +EBUILD wine-staging-9999.ebuild 20333 BLAKE2B f2cbe68c19306b348d2a258532f9836736fbc446c26794d2f9824c227c22f679cee133ebc106c035d11d56244c2e95768156ea0d3d63e3cc7784a2c1fbcd2929 SHA512 fbd886a1de728497e3c83fe48cd20174fe40ea339dcde9501fe088dccd17fb5ebdadace71b0a21905f5893d352c5e378268fe50a469ef336164c6463436e4c41 MISC metadata.xml 3508 BLAKE2B 9746414e926a61c411904701eb90034e1e883bf69079057d3dcd22e939677afa8b79845e27e319b80ecff3ff64bb900f3a87b64644e8eb93665e8e3e9d6a4a98 SHA512 a903a74c39cbf2788c54af794b8b235e8477b2af9637d9a774bce073181264eb60aae15dfda4009e913fe24831d20c0f8e40a43b61d1e7853a2282315aef98ff diff --git a/app-emulation/wine-staging/wine-staging-7.3.ebuild b/app-emulation/wine-staging/wine-staging-7.3.ebuild index 5c6ad86fddc9..700f6788f5a7 100644 --- a/app-emulation/wine-staging/wine-staging-7.3.ebuild +++ b/app-emulation/wine-staging/wine-staging-7.3.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 PLOCALES="ar ast 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 si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW" PLOCALE_BACKUP="en" -inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils +inherit autotools estack flag-o-matic multilib-minimal pax-utils plocale toolchain-funcs virtualx wrapper xdg-utils MY_PN="${PN%%-*}" MY_PV="${PV/_/-}" MY_P="${MY_PN}-${MY_PV}" @@ -61,6 +61,11 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) # or fail due to Xvfb's opengl limitations. RESTRICT="test" +BDEPEND="mingw? ( !!>=cross-i686-w64-mingw32/binutils-2.38 !!>=cross-x86_64-w64-mingw32/binutils-2.38 ) + sys-devel/flex + virtual/yacc + virtual/pkgconfig" + COMMON_DEPEND=" X? ( x11-libs/libXcursor[${MULTILIB_USEDEP}] @@ -114,7 +119,6 @@ COMMON_DEPEND=" 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.2[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:7.1.1 ) @@ -131,10 +135,8 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - sys-devel/flex + ${BDEPEND} >=sys-kernel/linux-headers-2.6 - virtual/pkgconfig - virtual/yacc X? ( x11-base/xorg-proto ) staging? ( dev-lang/perl @@ -275,8 +277,8 @@ pkg_pretend() { # Verify OSS support if use oss; 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 "You cannot build wine with USE=oss without having support from" + eerror ">=media-sound/oss-4 (only available through external repos)" eerror die fi @@ -544,12 +546,12 @@ multilib_src_install_all() { find "${ED}" -name *.la -delete || die 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 + rm "${D%}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \ + "${D%}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die 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} + 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} # Avoid double prefix from dosym and make_wrapper MY_PREFIX=${MY_PREFIX#${EPREFIX}} @@ -564,7 +566,7 @@ multilib_src_install_all() { # 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 "${ED%/}${MY_PREFIX}"/bin/*; do + for b in "${ED%}${MY_PREFIX}"/bin/*; do make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}" done eshopts_pop diff --git a/app-emulation/wine-staging/wine-staging-7.4.ebuild b/app-emulation/wine-staging/wine-staging-7.4.ebuild index cf584a42b185..700f6788f5a7 100644 --- a/app-emulation/wine-staging/wine-staging-7.4.ebuild +++ b/app-emulation/wine-staging/wine-staging-7.4.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 PLOCALES="ar ast 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 si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW" PLOCALE_BACKUP="en" -inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils +inherit autotools estack flag-o-matic multilib-minimal pax-utils plocale toolchain-funcs virtualx wrapper xdg-utils MY_PN="${PN%%-*}" MY_PV="${PV/_/-}" MY_P="${MY_PN}-${MY_PV}" @@ -48,7 +48,7 @@ fi LICENSE="LGPL-2.1" SLOT="${MY_PV}" -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gssapi gstreamer kerberos ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos +fontconfig +gecko gphoto2 gssapi gstreamer kerberos ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama" REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) @@ -61,6 +61,11 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) # or fail due to Xvfb's opengl limitations. RESTRICT="test" +BDEPEND="mingw? ( !!>=cross-i686-w64-mingw32/binutils-2.38 !!>=cross-x86_64-w64-mingw32/binutils-2.38 ) + sys-devel/flex + virtual/yacc + virtual/pkgconfig" + COMMON_DEPEND=" X? ( x11-libs/libXcursor[${MULTILIB_USEDEP}] @@ -114,7 +119,6 @@ COMMON_DEPEND=" 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.2[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:7.1.1 ) @@ -131,10 +135,8 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - sys-devel/flex + ${BDEPEND} >=sys-kernel/linux-headers-2.6 - virtual/pkgconfig - virtual/yacc X? ( x11-base/xorg-proto ) staging? ( dev-lang/perl @@ -275,8 +277,8 @@ pkg_pretend() { # Verify OSS support if use oss; 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 "You cannot build wine with USE=oss without having support from" + eerror ">=media-sound/oss-4 (only available through external repos)" eerror die fi @@ -544,12 +546,12 @@ multilib_src_install_all() { find "${ED}" -name *.la -delete || die 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 + rm "${D%}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \ + "${D%}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die 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} + 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} # Avoid double prefix from dosym and make_wrapper MY_PREFIX=${MY_PREFIX#${EPREFIX}} @@ -564,7 +566,7 @@ multilib_src_install_all() { # 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 "${ED%/}${MY_PREFIX}"/bin/*; do + for b in "${ED%}${MY_PREFIX}"/bin/*; do make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}" done eshopts_pop diff --git a/app-emulation/wine-staging/wine-staging-7.5.ebuild b/app-emulation/wine-staging/wine-staging-7.5.ebuild index 1ad582f1f5d0..700f6788f5a7 100644 --- a/app-emulation/wine-staging/wine-staging-7.5.ebuild +++ b/app-emulation/wine-staging/wine-staging-7.5.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 PLOCALES="ar ast 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 si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW" PLOCALE_BACKUP="en" -inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils +inherit autotools estack flag-o-matic multilib-minimal pax-utils plocale toolchain-funcs virtualx wrapper xdg-utils MY_PN="${PN%%-*}" MY_PV="${PV/_/-}" MY_P="${MY_PN}-${MY_PV}" @@ -61,6 +61,11 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) # or fail due to Xvfb's opengl limitations. RESTRICT="test" +BDEPEND="mingw? ( !!>=cross-i686-w64-mingw32/binutils-2.38 !!>=cross-x86_64-w64-mingw32/binutils-2.38 ) + sys-devel/flex + virtual/yacc + virtual/pkgconfig" + COMMON_DEPEND=" X? ( x11-libs/libXcursor[${MULTILIB_USEDEP}] @@ -114,10 +119,8 @@ COMMON_DEPEND=" 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.2[abi_x86_32?,abi_x86_64?] ) - mingw? ( !!>=cross-i686-w64-mingw32/binutils-2.38 !!>=cross-x86_64-w64-mingw32/binutils-2.38 ) mono? ( app-emulation/wine-mono:7.1.1 ) perl? ( dev-lang/perl @@ -132,10 +135,8 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - sys-devel/flex + ${BDEPEND} >=sys-kernel/linux-headers-2.6 - virtual/pkgconfig - virtual/yacc X? ( x11-base/xorg-proto ) staging? ( dev-lang/perl @@ -545,12 +546,12 @@ multilib_src_install_all() { find "${ED}" -name *.la -delete || die 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 + rm "${D%}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \ + "${D%}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die 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} + 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} # Avoid double prefix from dosym and make_wrapper MY_PREFIX=${MY_PREFIX#${EPREFIX}} @@ -565,7 +566,7 @@ multilib_src_install_all() { # 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 "${ED%/}${MY_PREFIX}"/bin/*; do + for b in "${ED%}${MY_PREFIX}"/bin/*; do make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}" done eshopts_pop diff --git a/app-emulation/wine-staging/wine-staging-7.2.ebuild b/app-emulation/wine-staging/wine-staging-7.6.ebuild index 5c6ad86fddc9..247c7d6f1c35 100644 --- a/app-emulation/wine-staging/wine-staging-7.2.ebuild +++ b/app-emulation/wine-staging/wine-staging-7.6.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 PLOCALES="ar ast 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 si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW" PLOCALE_BACKUP="en" -inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils +inherit autotools estack flag-o-matic multilib-minimal pax-utils plocale toolchain-funcs virtualx wrapper xdg-utils MY_PN="${PN%%-*}" MY_PV="${PV/_/-}" MY_P="${MY_PN}-${MY_PV}" @@ -61,6 +61,11 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) # or fail due to Xvfb's opengl limitations. RESTRICT="test" +BDEPEND="mingw? ( !!>=cross-i686-w64-mingw32/binutils-2.38 !!>=cross-x86_64-w64-mingw32/binutils-2.38 ) + sys-devel/flex + virtual/yacc + virtual/pkgconfig" + COMMON_DEPEND=" X? ( x11-libs/libXcursor[${MULTILIB_USEDEP}] @@ -114,10 +119,9 @@ COMMON_DEPEND=" 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.2[abi_x86_32?,abi_x86_64?] ) - mono? ( app-emulation/wine-mono:7.1.1 ) + mono? ( app-emulation/wine-mono:7.2.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple @@ -131,10 +135,8 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - sys-devel/flex + ${BDEPEND} >=sys-kernel/linux-headers-2.6 - virtual/pkgconfig - virtual/yacc X? ( x11-base/xorg-proto ) staging? ( dev-lang/perl @@ -275,8 +277,8 @@ pkg_pretend() { # Verify OSS support if use oss; 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 "You cannot build wine with USE=oss without having support from" + eerror ">=media-sound/oss-4 (only available through external repos)" eerror die fi @@ -544,12 +546,12 @@ multilib_src_install_all() { find "${ED}" -name *.la -delete || die 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 + rm "${D%}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \ + "${D%}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die 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} + 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} # Avoid double prefix from dosym and make_wrapper MY_PREFIX=${MY_PREFIX#${EPREFIX}} @@ -564,7 +566,7 @@ multilib_src_install_all() { # 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 "${ED%/}${MY_PREFIX}"/bin/*; do + for b in "${ED%}${MY_PREFIX}"/bin/*; do make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}" done eshopts_pop diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild index 1ad582f1f5d0..247c7d6f1c35 100644 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 PLOCALES="ar ast 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 si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW" PLOCALE_BACKUP="en" -inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils +inherit autotools estack flag-o-matic multilib-minimal pax-utils plocale toolchain-funcs virtualx wrapper xdg-utils MY_PN="${PN%%-*}" MY_PV="${PV/_/-}" MY_P="${MY_PN}-${MY_PV}" @@ -61,6 +61,11 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) # or fail due to Xvfb's opengl limitations. RESTRICT="test" +BDEPEND="mingw? ( !!>=cross-i686-w64-mingw32/binutils-2.38 !!>=cross-x86_64-w64-mingw32/binutils-2.38 ) + sys-devel/flex + virtual/yacc + virtual/pkgconfig" + COMMON_DEPEND=" X? ( x11-libs/libXcursor[${MULTILIB_USEDEP}] @@ -114,11 +119,9 @@ COMMON_DEPEND=" 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.2[abi_x86_32?,abi_x86_64?] ) - mingw? ( !!>=cross-i686-w64-mingw32/binutils-2.38 !!>=cross-x86_64-w64-mingw32/binutils-2.38 ) - mono? ( app-emulation/wine-mono:7.1.1 ) + mono? ( app-emulation/wine-mono:7.2.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple @@ -132,10 +135,8 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - sys-devel/flex + ${BDEPEND} >=sys-kernel/linux-headers-2.6 - virtual/pkgconfig - virtual/yacc X? ( x11-base/xorg-proto ) staging? ( dev-lang/perl @@ -545,12 +546,12 @@ multilib_src_install_all() { find "${ED}" -name *.la -delete || die 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 + rm "${D%}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \ + "${D%}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die 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} + 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} # Avoid double prefix from dosym and make_wrapper MY_PREFIX=${MY_PREFIX#${EPREFIX}} @@ -565,7 +566,7 @@ multilib_src_install_all() { # 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 "${ED%/}${MY_PREFIX}"/bin/*; do + for b in "${ED%}${MY_PREFIX}"/bin/*; do make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}" done eshopts_pop |