diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-12-14 13:26:14 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-12-14 13:26:14 +0000 |
commit | 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch) | |
tree | 25413d1cb3a0cbfe36029db32398c0f333609215 /app-emulation/wine-vanilla | |
parent | 9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff) |
gentoo resync : 14.12.2020
Diffstat (limited to 'app-emulation/wine-vanilla')
-rw-r--r-- | app-emulation/wine-vanilla/Manifest | 6 | ||||
-rw-r--r-- | app-emulation/wine-vanilla/wine-vanilla-5.0.3-r1.ebuild (renamed from app-emulation/wine-vanilla/wine-vanilla-5.22.ebuild) | 15 | ||||
-rw-r--r-- | app-emulation/wine-vanilla/wine-vanilla-5.22-r2.ebuild (renamed from app-emulation/wine-vanilla/wine-vanilla-5.22-r1.ebuild) | 23 | ||||
-rw-r--r-- | app-emulation/wine-vanilla/wine-vanilla-9999.ebuild | 23 |
4 files changed, 43 insertions, 24 deletions
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest index 3d0d8a199fa0..9b7dddb7d415 100644 --- a/app-emulation/wine-vanilla/Manifest +++ b/app-emulation/wine-vanilla/Manifest @@ -12,11 +12,11 @@ DIST wine-5.22.tar.xz 24214812 BLAKE2B 7bc093501cb20fbe52e277aadb867e4f55abc9898 EBUILD wine-vanilla-4.0.3.ebuild 17273 BLAKE2B 31f49631a2eb96a0d20c98891c3ace1874bab916e8c75d6b6a003b7cf35b84f2014891c99defb1da6a77d2ce56353566e212282c4c4f607312245c6ec7e66803 SHA512 341f4e04041395f2b4a46dde9e46854e783936a4dbf0859946d4f7cb4b25072fb28f397b61c1916bb3aa9708d2e6a7a1e04ac157bd36f03be63b4d6180b9fb05 EBUILD wine-vanilla-5.0.1.ebuild 17552 BLAKE2B 45440982bf2bfd3f6a2788af10b3a1712f4a4d82a0d4d0d139e9b9eb8f6c4af2b4a516e23a17ace87a6c6cf0e4cf9f3d1a0738b380203a77798b3fae437f1ed9 SHA512 2a92a7f78ac86289439a6bc507ec48a6f6a44a1d666f8a2b0705c4bb6fbd6b5d1f667347db96ea98ead1b5473b1cb7b0cb396446c84182165145842648795d5a EBUILD wine-vanilla-5.0.2.ebuild 17552 BLAKE2B 45440982bf2bfd3f6a2788af10b3a1712f4a4d82a0d4d0d139e9b9eb8f6c4af2b4a516e23a17ace87a6c6cf0e4cf9f3d1a0738b380203a77798b3fae437f1ed9 SHA512 2a92a7f78ac86289439a6bc507ec48a6f6a44a1d666f8a2b0705c4bb6fbd6b5d1f667347db96ea98ead1b5473b1cb7b0cb396446c84182165145842648795d5a +EBUILD wine-vanilla-5.0.3-r1.ebuild 17635 BLAKE2B 05faf2469f3c1645e6839d5be2f710b3cf544ad513bfd3699f5afd7390c64d31233e499d68d372908e5f43118c67d7396fce9978b35545086208de51b942a6ba SHA512 1ef21017980fd5ae253fcb9b2521c639f8069fe5dc3cd08a42b091da22948739f02b04cd8e68eafa809afef19616bb1ecffbfa6fb86000087ee9a61d7a1917c8 EBUILD wine-vanilla-5.0.3.ebuild 17554 BLAKE2B 4fb5c237a16645195516f980e6a0bb96a9a263423b7489b8f425326a65ab5b06a75fc705862940220bc762dbaba5816eb340ef9f8427f08a2a6678fdb05b9429 SHA512 33011fd9ba031978b4351f8ff5b8eeffa692062df4a511fb105231e493742d55c0430a256551cc08cc8caf9c546de38eb0a4e1fe1ee98db0a391233b231a5d1c EBUILD wine-vanilla-5.19.ebuild 17601 BLAKE2B 38d18a7743bbc9a229928001dbf598224a76df8d56af2ff5f314dd14961483ae8b9470a6adcfd80bef6b1848420f8bf069545c615858c97dd45d752bc2fc252d SHA512 e4a5252018b1c5cb8b99a05a6a209c0c43e9e973dd305388fa5fe1ae9eb1653f37c1cee617161f5f1ada8085b1e660ae217707d4f0329f39d04f41e788ce2cf4 EBUILD wine-vanilla-5.20.ebuild 17601 BLAKE2B 38d18a7743bbc9a229928001dbf598224a76df8d56af2ff5f314dd14961483ae8b9470a6adcfd80bef6b1848420f8bf069545c615858c97dd45d752bc2fc252d SHA512 e4a5252018b1c5cb8b99a05a6a209c0c43e9e973dd305388fa5fe1ae9eb1653f37c1cee617161f5f1ada8085b1e660ae217707d4f0329f39d04f41e788ce2cf4 EBUILD wine-vanilla-5.21.ebuild 17601 BLAKE2B 38d18a7743bbc9a229928001dbf598224a76df8d56af2ff5f314dd14961483ae8b9470a6adcfd80bef6b1848420f8bf069545c615858c97dd45d752bc2fc252d SHA512 e4a5252018b1c5cb8b99a05a6a209c0c43e9e973dd305388fa5fe1ae9eb1653f37c1cee617161f5f1ada8085b1e660ae217707d4f0329f39d04f41e788ce2cf4 -EBUILD wine-vanilla-5.22-r1.ebuild 18747 BLAKE2B 07a0e23a9f700ff7eea5b51526e6dc7b491e3d3638c9f717b92252ba23dada7922793be960a84474c21706e10694206dfa6540d47450fe3b7afd9360cd299063 SHA512 d62fb59a9ce96cf3e49635e853c4c922614091090ac4252ad16b11622b5450b379ff7eb8975e0ba13f5e6cb1aa95b7d0d750c428593cb5d7703bc02d329f082b -EBUILD wine-vanilla-5.22.ebuild 17601 BLAKE2B 38d18a7743bbc9a229928001dbf598224a76df8d56af2ff5f314dd14961483ae8b9470a6adcfd80bef6b1848420f8bf069545c615858c97dd45d752bc2fc252d SHA512 e4a5252018b1c5cb8b99a05a6a209c0c43e9e973dd305388fa5fe1ae9eb1653f37c1cee617161f5f1ada8085b1e660ae217707d4f0329f39d04f41e788ce2cf4 -EBUILD wine-vanilla-9999.ebuild 18747 BLAKE2B 07a0e23a9f700ff7eea5b51526e6dc7b491e3d3638c9f717b92252ba23dada7922793be960a84474c21706e10694206dfa6540d47450fe3b7afd9360cd299063 SHA512 d62fb59a9ce96cf3e49635e853c4c922614091090ac4252ad16b11622b5450b379ff7eb8975e0ba13f5e6cb1aa95b7d0d750c428593cb5d7703bc02d329f082b +EBUILD wine-vanilla-5.22-r2.ebuild 18854 BLAKE2B c45f3e3f4431910be09d1951dee0e35726dcbe5506896c0c66be037e1dca123f81d9306d635efa94f0e8c1b93011b0f04b9ad3880e955126cc9de3481fbd9ee8 SHA512 a68c0937ba3bbfcfb171c8ad997a630531a5b68c5f08d5936c6fd5a7e63a94a80c4030b9bb186a7667c51bd7e488fd498ad1225ea499ed49e87dc6fe909a79da +EBUILD wine-vanilla-9999.ebuild 18854 BLAKE2B c45f3e3f4431910be09d1951dee0e35726dcbe5506896c0c66be037e1dca123f81d9306d635efa94f0e8c1b93011b0f04b9ad3880e955126cc9de3481fbd9ee8 SHA512 a68c0937ba3bbfcfb171c8ad997a630531a5b68c5f08d5936c6fd5a7e63a94a80c4030b9bb186a7667c51bd7e488fd498ad1225ea499ed49e87dc6fe909a79da MISC metadata.xml 3414 BLAKE2B 29136302781a2a0979948e0da37cf9d34bf728b3dd7c6973f19d69d61a59804cf13c8e7f21e01ad892bd3b8d028d9f7a0cdab6d092de861e8fc5c73e178dc2da SHA512 5e3b375d5ed3c31556441d7d71e99a862e57c3f8d07adffcfb7ed0c6c9f3dc888c6a17474ddc5c62897149000d6ccebcb5866b3ac6dace781774ab7f1b48e46b diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.22.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.0.3-r1.ebuild index 226b93efb90f..5f25770ac604 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-5.22.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-5.0.3-r1.ebuild @@ -19,12 +19,12 @@ if [[ ${PV} == "9999" ]] ; then #KEYWORDS="" else MAJOR_V=$(ver_cut 1) - SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz" + SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz" KEYWORDS="-* ~amd64 ~x86" fi S="${WORKDIR}/${MY_P}" -GWP_V="20200523" +GWP_V="20191222" PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" @@ -95,7 +95,7 @@ COMMON_DEPEND=" udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) - vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] ) + vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] ) vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] ) xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) @@ -110,7 +110,7 @@ RDEPEND="${COMMON_DEPEND} !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.1[abi_x86_32?,abi_x86_64?] ) - mono? ( app-emulation/wine-mono:5.1.1 ) + mono? ( app-emulation/wine-mono:4.9.4 ) perl? ( dev-lang/perl dev-perl/XML-Simple @@ -142,8 +142,8 @@ usr/share/applications/wine-winecfg.desktop" PATCHES=( "${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726 "${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-5.0-memset-O3.patch" #480508 "${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=() @@ -419,9 +419,10 @@ multilib_src_configure() { $(use_with xml xslt) ) - local PKG_CONFIG + local PKG_CONFIG AR RANLIB # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038 - tc-export PKG_CONFIG + # set AR and RANLIB to make QA scripts happy; #483342 + tc-export PKG_CONFIG AR RANLIB if use amd64; then if [[ ${ABI} == amd64 ]]; then diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.22-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.22-r2.ebuild index a422ff77cdc0..97ea9019cb11 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-5.22-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-5.22-r2.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 +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +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 +unwind v4l vkd3d vulkan +X +xcomposite xinerama +xml" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 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 +unwind v4l vkd3d vulkan +X +xcomposite xinerama +xml" REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) @@ -73,7 +73,6 @@ COMMON_DEPEND=" 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}] ) @@ -382,6 +381,9 @@ src_configure() { export LDCONFIG=/bin/true use custom-cflags || strip-flags + if use mingw; then + export CROSSCFLAGS="${CFLAGS}" + fi multilib-minimal_src_configure } @@ -402,7 +404,6 @@ multilib_src_configure() { $(use_with capi) $(use_with lcms cms) $(use_with cups) - $(use_with ncurses curses) $(use_with udisks dbus) $(use_with faudio) $(use_with fontconfig) @@ -499,12 +500,20 @@ multilib_src_install_all() { fi # Remove wineconsole if neither backend is installed #551124 - if ! use X && ! use ncurses; then + if ! use X; 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 - } + + if ! use mingw; then + rm_wineconsole() { + rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/{,fakedlls/}wineconsole.exe* || die + } + else + rm_wineconsole() { + rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/wineconsole.exe* || die + } + fi + multilib_foreach_abi rm_wineconsole fi diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild index a422ff77cdc0..97ea9019cb11 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 +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +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 +unwind v4l vkd3d vulkan +X +xcomposite xinerama +xml" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 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 +unwind v4l vkd3d vulkan +X +xcomposite xinerama +xml" REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) @@ -73,7 +73,6 @@ COMMON_DEPEND=" 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}] ) @@ -382,6 +381,9 @@ src_configure() { export LDCONFIG=/bin/true use custom-cflags || strip-flags + if use mingw; then + export CROSSCFLAGS="${CFLAGS}" + fi multilib-minimal_src_configure } @@ -402,7 +404,6 @@ multilib_src_configure() { $(use_with capi) $(use_with lcms cms) $(use_with cups) - $(use_with ncurses curses) $(use_with udisks dbus) $(use_with faudio) $(use_with fontconfig) @@ -499,12 +500,20 @@ multilib_src_install_all() { fi # Remove wineconsole if neither backend is installed #551124 - if ! use X && ! use ncurses; then + if ! use X; 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 - } + + if ! use mingw; then + rm_wineconsole() { + rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/{,fakedlls/}wineconsole.exe* || die + } + else + rm_wineconsole() { + rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/wineconsole.exe* || die + } + fi + multilib_foreach_abi rm_wineconsole fi |