diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-02-02 01:39:05 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-02-02 01:39:05 +0000 |
commit | fcc5224904648a8e6eb528d7603154160a20022f (patch) | |
tree | 3bfce096b38a9cea8eed13fc70c1526c456e9abd /app-emulation/wine-staging | |
parent | 2fd57282f0262ca084e05b0f2c63fbada395d02b (diff) |
gentoo resync : 02.02.2022
Diffstat (limited to 'app-emulation/wine-staging')
-rw-r--r-- | app-emulation/wine-staging/Manifest | 15 | ||||
-rw-r--r-- | app-emulation/wine-staging/metadata.xml | 3 | ||||
-rw-r--r-- | app-emulation/wine-staging/wine-staging-7.0.ebuild (renamed from app-emulation/wine-staging/wine-staging-6.21.ebuild) | 13 | ||||
-rw-r--r-- | app-emulation/wine-staging/wine-staging-7.1.ebuild (renamed from app-emulation/wine-staging/wine-staging-6.20.ebuild) | 50 |
4 files changed, 24 insertions, 57 deletions
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest index dec8024e93e9..0b3f1f70f718 100644 --- a/app-emulation/wine-staging/Manifest +++ b/app-emulation/wine-staging/Manifest @@ -1,16 +1,15 @@ -DIST gentoo-wine-patches-20210925.tar.xz 59836 BLAKE2B c6d41db309bf0470d0e8ef771d791240209f77d967031943232218e8e737987a4a74847d89d6bf8739ff0698b28b656a8b9ac830ee1da457be2aab27ededb123 SHA512 721d4d7b6a2c4336555a7faed7202a8ad6872ee37e4daea6fab2b5ff5bf5d73ce41f25d0bd4fd9b45e2c522cb19c1349144a40be32ccdd7ded7f61055d6d85c8 DIST gentoo-wine-patches-20211122.tar.xz 59796 BLAKE2B 21460e6adf4934a52f8841f76f234a764c2dc1ac77eeed1cee10adafec3aa723640ebd4b51559e9ef433070ac731c4648620bd9e75e99f31b2e2f494cf01f02d SHA512 a18cb320617e2157977032c38c322177a2d248f14e43051d38de595af171495546c93d5e71e0dbe1a4f326a2dc819bb03dcfd04454ac85bbcd6b1975ae5d9d96 -DIST wine-6.20.tar.xz 26921644 BLAKE2B 2db2bdd0b0c65855d96bc407ea54aa289dd0324715eb7fc068dd57b6b90ee7b331997fd9f68942f02ef45ef9f6eb10e7efaad79d0f97721626fc50ef2e47cc49 SHA512 dc0c29194ffd0ddcc2e34d8f7ac236f039e21cdde8cb959ddf16b4b67eb1d6332c9d1a780d0872669a1083db55e105eebaf3d7a6cc5aa749e91efab88bd1f958 -DIST wine-6.21.tar.xz 26973172 BLAKE2B 7e73e04419d50b12269c281b68b002fb7ef29519c63e6c45074fa919b067ee145d328aad6507578db84940c3ac379c0469758d1a211d7d213d1833ee8c15c096 SHA512 2c6d58c8c5c37497b2b3935f71afd636c274d1d4ad3f9ca2fd9982a9ed5910888cc20841bd9175446aab2fef7813d7700458edbaad6028ad34e7444a887a9220 DIST wine-6.22.tar.xz 27031604 BLAKE2B ed1cf0499f8f827e88a1a899db3c5243d016696fdb1189b321cac398749f9360956f0cd473b2ee04052f0db750550a983b089c4f151edac535b7d440c9a2e048 SHA512 5326d500a2c5884e3ff004557a0360f8ff5c29ae42fdc256a13012ab746371dd403c87715efa00e43bf181fbc6d0647372e3e40944e5673b069f6e4f4cc700b5 DIST wine-6.23.tar.xz 27057236 BLAKE2B 9e438a1f2200c59517b05eb4ea6d6c26594b3fd442caa11d9ccabd8e0c016d1a721f2579c36fcfb18bb1185edfb11480d65d732d435d44f5dea0bcb345fa1476 SHA512 3e459b305f472ece00cbf467e14e6cfa7422381cb9242d05e9624487d559f438039aa8c780986469591c9d0f05e384380133dc6fb4ed694355ae42744a78d9b7 -DIST wine-staging-6.20.tar.gz 9643278 BLAKE2B b5f0a74c575541303eaf12e9706f8917b795fc0d5f065e7292329cec7da145f9c7db25bebfcf4d703bf561206f22c9a49a95e8471629009dac4679c6f028b918 SHA512 9b5650d065976ab5b0bcb2f65895bf7b6bf139d376fc5cff421d493a6f6a849cb57e33243d1fad9ca1943cfbfdee8d8a3a4d530722163b15a0830d616f06e1e3 -DIST wine-staging-6.21.tar.gz 9627829 BLAKE2B b743b67c6f26871894b16d8cd9e7ed39a1d1dd6204516453628435ee23df7644433508edc7c7dd2881686926427e683c36a29acdc744c89d2c2bd4c5f50a13ea SHA512 b74ad7f96f2831b2635557c16cb616754e31c490b5b935d1d197d6cc8e61ca75805f801e22223b936a3794af57be94344d3a06dcfce92db7e036b6c3751ef294 +DIST wine-7.0.tar.xz 27120912 BLAKE2B 84bfeb28d56f0f40bb93b1b5bf8954c8be2fd90fde5a61608e7c35f48addcce7a4d660e63c3caa3ca2c365d1e83b55a1c3485872b2d6bfa8941e2bce44c4aca6 SHA512 eec17b046ed5447eb540f421c9b2748d9419ce087496c2743a9914fd27bbe5ff9da0cfe47d3cd76fa97323bd1188a1d82b1eef4968d86ed1957dc1a95e28529c +DIST wine-7.1.tar.xz 27149156 BLAKE2B a97b408a73b5cee52ac5e91b03a0e1850f5567e818d0383e4a546482b5f383eb185ed3ee2cf26377600d6963736b27180d2a87d79c58c053d37ead8d488e5268 SHA512 4b226ecab92a0462fb579602549cb4b96e0baa353fd320a0bc8d1ce134eff5a434600fcf748e93ecde06624f78b8c0d70b39737d97a7e2327a61df9750ae30b5 DIST wine-staging-6.22.tar.gz 9608891 BLAKE2B b1fb62e82ea746a4872c4dcb8e243a44248732e4d3512e8c489e230422fc51861b5a8f1996ae12e432c5ef7eeb8cae693f9afe862d2bde150f1d6eab46534f6a SHA512 3839cdcd7ffead2cf933b59eb038856eccde7b28e599b61e10e2745ff4d2bfeefcc43262bbc96c97510560584de759ef0616b0f5e391de608fb08176502cb830 DIST wine-staging-6.23.tar.gz 9609149 BLAKE2B abc9f4134293c91759311fbc91230f3a7f41455cc35a70bda4bf61f088520cb520b139b1c92bf2f18c6f885caf9397835a01f6bfa9d46c1d1bd49a4918ba330d SHA512 32bee187b9c7bdd026e64263083f3d92eb01c72f2d29a7d006616fb0713a0668c3d5ce3b5d523e09b650cfe77c1080e0478113afabd02352d66af53e60e0b31e -EBUILD wine-staging-6.20.ebuild 21326 BLAKE2B aeb40c04ceab39e4e92ab277fb7d2f58f5a9a81a8582d73ccea42d9959f3bbc37e001eb70ecc6b6e006bedb1b2e770422d72eea97aa0ea86ae055135be6dd22f SHA512 f2b329fc5b03c560ed65662ee4f263fa29893b684cc34d2376e01579399e6d6874e3e1c39c39a1a34162c4581a517fb5bde92f47f0ea2b545a3a2aff2956c4ab -EBUILD wine-staging-6.21.ebuild 20408 BLAKE2B 9e14f93ce1771a3b319f3e78ed0ade9b6e541f4197315dcbe3bdc608307010d5621466f378df64bc29f4d89d601c2a19273454747a1c07d8d6308a1d9338b788 SHA512 73ba4f111fa2d05d945239a45f5df37e93bcbd623e4c41a54620d62d1dd9e13eb1fe8cd43b0655621229e20b18f86ff10fbeebf128a412785acd9008543e6488 +DIST wine-staging-7.0.tar.gz 9614226 BLAKE2B f1263abde0fcb83f1784805df13e32db18758167f58e2370f3bbc16fdd6c0ad9b158c6e106e75183a42e42c29ef2971f2f297b2a733090727c1249a4914b45af SHA512 fbec2de7a13c7e59a041d8102d69b803d4475b743068d215cce510af905b81903aa028604068af0d309fe1708eb1ab62aad42887ac079af5206635bee0045952 +DIST wine-staging-7.1.tar.gz 9623294 BLAKE2B a76aae22b93d8e56000998dcd4300af5a60d4648a459ca21da5bc122d0c8c0d57c2e7140c01c1eea4c0c8a808e7a98db72fa91c58663ec3fd60a1c7cc8504ddc SHA512 cae234a3874c8bd3a4514c81ee311871c79c6c631145497e279ae86ceb6fef8e324d622d8b9974dbe7cbffacef09d8a6cb47a042096bf1a5ba737fed017e4038 EBUILD wine-staging-6.22.ebuild 20314 BLAKE2B 65273e30e5ae144c745a839db2ddfb4e5c0919198f7e4ae119ebc80d68ccfa191eface4630b275491aa39d35cc94489805633d37c9cb1b62fe4afdfd59a18ed6 SHA512 8074760ebff6bc898b15b14a937c539800d770376432fe20b6bcb23e4e48a894c2578aacdd989a154a3d0aa2d6a92b4d6d86d7c4bcdaf2139b6cd0a90a14ba47 EBUILD wine-staging-6.23.ebuild 20314 BLAKE2B 65273e30e5ae144c745a839db2ddfb4e5c0919198f7e4ae119ebc80d68ccfa191eface4630b275491aa39d35cc94489805633d37c9cb1b62fe4afdfd59a18ed6 SHA512 8074760ebff6bc898b15b14a937c539800d770376432fe20b6bcb23e4e48a894c2578aacdd989a154a3d0aa2d6a92b4d6d86d7c4bcdaf2139b6cd0a90a14ba47 +EBUILD wine-staging-7.0.ebuild 20346 BLAKE2B 3ebf236ca04d21591f290ff178ba18803da78e582a6b91765d1d885ee3ff0716b986d6af35e3ac48157ee6febc5c41305bf24b4ecc0621556281e6ce30c2058d SHA512 ef335a584fb27ccd07349c1bedb26fd48ca1a9ec3ceae09215e1cee253387c8cc9e10cc60904e4cb9a1ae57495c56a580c9552aacbb2ddc33b18c52819c8cea3 +EBUILD wine-staging-7.1.ebuild 20346 BLAKE2B 3ebf236ca04d21591f290ff178ba18803da78e582a6b91765d1d885ee3ff0716b986d6af35e3ac48157ee6febc5c41305bf24b4ecc0621556281e6ce30c2058d SHA512 ef335a584fb27ccd07349c1bedb26fd48ca1a9ec3ceae09215e1cee253387c8cc9e10cc60904e4cb9a1ae57495c56a580c9552aacbb2ddc33b18c52819c8cea3 EBUILD wine-staging-9999.ebuild 20314 BLAKE2B 65273e30e5ae144c745a839db2ddfb4e5c0919198f7e4ae119ebc80d68ccfa191eface4630b275491aa39d35cc94489805633d37c9cb1b62fe4afdfd59a18ed6 SHA512 8074760ebff6bc898b15b14a937c539800d770376432fe20b6bcb23e4e48a894c2578aacdd989a154a3d0aa2d6a92b4d6d86d7c4bcdaf2139b6cd0a90a14ba47 -MISC metadata.xml 3967 BLAKE2B bc3c9d997d843fea2119ca489dcc61624e29d86d83ed0cd2934a0f15137037b4625be02ad0e04088cf6658318a6256d6e27e91b0b64b8d1c905aa20366598185 SHA512 2106df5a805fc9800a51c0a511f9f2fc283283f1e927ae0ac904976222e97f878f874a8b9e0b00af05f8d3a59e8e367bcf451338144169f478354cace01d1c83 +MISC metadata.xml 3680 BLAKE2B 08f0d9f91f9859453c41f7c56efd465ffb322277d68784cc0e9ca9e65b3cb650dd46079aed1ca14f43e727342c44b84ed2cd411d56b7df077ccd11c6002df66e SHA512 1510d593b339f5310b0bb85011c4e074997523412d77604cfb4afa0bb9336857a9d557c875335f463538d71aa0d6ebd16b0c8e37cc99ee9d94a9b3a3b3e7de58 diff --git a/app-emulation/wine-staging/metadata.xml b/app-emulation/wine-staging/metadata.xml index 4504cc77dc88..fed93400772b 100644 --- a/app-emulation/wine-staging/metadata.xml +++ b/app-emulation/wine-staging/metadata.xml @@ -20,8 +20,6 @@ This variant of the Wine packaging includes the Wine-Staging patchset. <flag name="capi">Enable ISDN support via CAPI</flag> <flag name="custom-cflags">Bypass strip-flags; use at your own peril</flag> <flag name="dos">Pull in <pkg>games-emulation/dosbox</pkg> to run DOS applications</flag> - <flag name="faudio">Pull in <pkg>app-emulation/faudio</pkg> to provide XAudio2 functionality</flag> - <flag name="gcrypt">Add support for the Diffie-Hellman key exchanges using dev-libs/libgcrypt</flag> <flag name="gecko">Add support for the Gecko engine when using iexplore</flag> <flag name="gssapi">Use GSSAPI (Kerberos SSP support)</flag> <flag name="gstreamer">Use <pkg>media-libs/gstreamer</pkg> to provide DirectShow functionality;</flag> @@ -43,7 +41,6 @@ This variant of the Wine packaging includes the Wine-Staging patchset. (these pages are not currently in the updated WineHQ Wiki).</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> <flag name="unwind">Use <pkg>sys-libs/libunwind</pkg> to unwind the stack</flag> <flag name="usb">Use <pkg>virtual/libusb</pkg> to provide USB support</flag> diff --git a/app-emulation/wine-staging/wine-staging-6.21.ebuild b/app-emulation/wine-staging/wine-staging-7.0.ebuild index c6fe8ec19ef7..4a96ff084ab7 100644 --- a/app-emulation/wine-staging/wine-staging-6.21.ebuild +++ b/app-emulation/wine-staging/wine-staging-7.0.ebuild @@ -30,7 +30,7 @@ S="${WORKDIR}/${MY_P}" STAGING_P="wine-staging-${MY_PV}" STAGING_DIR="${WORKDIR}/${STAGING_P}" -GWP_V="20210925" +GWP_V="20211122" PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset" @@ -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 +fontconfig +gecko gphoto2 gssapi gstreamer kerberos ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight prelink 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 elibc_glibc +fontconfig +gecko gphoto2 gssapi gstreamer kerberos ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight prelink 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 ) @@ -117,7 +117,7 @@ RDEPEND="${COMMON_DEPEND} !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:6.4.0 ) + mono? ( app-emulation/wine-mono:7.0.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple @@ -151,10 +151,9 @@ usr/share/applications/wine-uninstaller.desktop usr/share/applications/wine-winecfg.desktop" PATCHES=( - "${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-6.22-winegcc.patch" #260726 "${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615 "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611 - "${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch" ) PATCHES_BIN=() @@ -277,8 +276,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" - eerror ">=media-sound/oss-4 (only available through external repos)" + 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 diff --git a/app-emulation/wine-staging/wine-staging-6.20.ebuild b/app-emulation/wine-staging/wine-staging-7.1.ebuild index 2ea6388aea6d..4a96ff084ab7 100644 --- a/app-emulation/wine-staging/wine-staging-6.20.ebuild +++ b/app-emulation/wine-staging/wine-staging-7.1.ebuild @@ -30,7 +30,7 @@ S="${WORKDIR}/${MY_P}" STAGING_P="wine-staging-${MY_PV}" STAGING_DIR="${WORKDIR}/${STAGING_P}" -GWP_V="20210925" +GWP_V="20211122" PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset" @@ -48,15 +48,13 @@ fi LICENSE="LGPL-2.1" SLOT="${MY_PV}" -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind usb v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml" +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 prelink 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 ) osmesa? ( opengl ) pipelight? ( staging ) test? ( abi_x86_32 ) - themes? ( staging ) - vaapi? ( staging ) vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124 # FIXME: the test suite is unsuitable for us; many tests require net access @@ -75,21 +73,18 @@ COMMON_DEPEND=" alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] ) cups? ( net-print/cups:=[${MULTILIB_USEDEP}] ) - faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] ) fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) - gcrypt? ( dev-libs/libgcrypt:=[${MULTILIB_USEDEP}] ) - gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) - gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) + gphoto2? ( + media-libs/libgphoto2:=[${MULTILIB_USEDEP}] + virtual/jpeg:0=[${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}] ) netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] ) nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] ) odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] ) @@ -100,32 +95,21 @@ COMMON_DEPEND=" ) 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}] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] ) ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) staging? ( sys-apps/attr[${MULTILIB_USEDEP}] ) - themes? ( - dev-libs/glib:2[${MULTILIB_USEDEP}] - x11-libs/cairo[${MULTILIB_USEDEP}] - x11-libs/gtk+:3[${MULTILIB_USEDEP}] - ) truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] ) udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] ) v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) - vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] ) vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] ) vulkan? ( media-libs/vulkan-loader[${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}] - )" + xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )" RDEPEND="${COMMON_DEPEND} app-emulation/wine-desktop-common @@ -133,7 +117,7 @@ RDEPEND="${COMMON_DEPEND} !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:6.4.0 ) + mono? ( app-emulation/wine-mono:7.0.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple @@ -167,10 +151,9 @@ usr/share/applications/wine-uninstaller.desktop usr/share/applications/wine-winecfg.desktop" PATCHES=( - "${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-6.22-winegcc.patch" #260726 "${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615 "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611 - "${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch" ) PATCHES_BIN=() @@ -293,8 +276,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" - eerror ">=media-sound/oss-4 (only available through external repos)" + 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 @@ -472,26 +455,20 @@ multilib_src_configure() { --sysconfdir="${EPREFIX}/etc/wine" $(use_with alsa) $(use_with capi) - $(use_with lcms cms) $(use_with cups) $(use_with udisks dbus) - $(use_with faudio) $(use_with fontconfig) $(use_with ssl gnutls) $(use_enable gecko mshtml) - $(use_with gcrypt) $(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) # TODO: Will bug 685172 still need special handling? $(use_with mingw) $(use_enable mono mscoree) - $(use_with mp3 mpg123) $(use_with netapi) $(use_with nls gettext) $(use_with openal) @@ -500,7 +477,6 @@ multilib_src_configure() { $(use_with osmesa) $(use_with oss) $(use_with pcap) - $(use_with png) $(use_with pulseaudio pulse) $(use_with threads pthread) $(use_with scanner sane) @@ -517,14 +493,10 @@ multilib_src_configure() { $(use_with X xfixes) $(use_with xcomposite) $(use_with xinerama) - $(use_with xml) - $(use_with xml xslt) ) use staging && myconf+=( --with-xattr - $(use_with themes gtk3) - $(use_with vaapi va) ) local PKG_CONFIG |