From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2CE2A138350 for ; Tue, 3 Mar 2020 00:29:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 356A4E08AB; Tue, 3 Mar 2020 00:29:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 025EAE08AB for ; Tue, 3 Mar 2020 00:29:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 964E434F052 for ; Tue, 3 Mar 2020 00:29:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 26009151 for ; Tue, 3 Mar 2020 00:29:07 +0000 (UTC) From: "Nick Sarnie" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nick Sarnie" Message-ID: <1583195318.ed89a0a0d8d0af7d89fa190431e9ab00df328d14.sarnex@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-staging/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/wine-staging/metadata.xml app-emulation/wine-staging/wine-staging-5.3-r1.ebuild app-emulation/wine-staging/wine-staging-9999.ebuild X-VCS-Directories: app-emulation/wine-staging/ X-VCS-Committer: sarnex X-VCS-Committer-Name: Nick Sarnie X-VCS-Revision: ed89a0a0d8d0af7d89fa190431e9ab00df328d14 X-VCS-Branch: master Date: Tue, 3 Mar 2020 00:29:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f68dca7a-f608-4ac7-91d7-617c06c6c474 X-Archives-Hash: e25a131a5500ae04a7796cd81bbf001a commit: ed89a0a0d8d0af7d89fa190431e9ab00df328d14 Author: Nick Sarnie gentoo org> AuthorDate: Tue Mar 3 00:26:50 2020 +0000 Commit: Nick Sarnie gentoo org> CommitDate: Tue Mar 3 00:28:38 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed89a0a0 app-emulation/wine-staging: Sync with ::wine Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Nick Sarnie gentoo.org> app-emulation/wine-staging/metadata.xml | 1 + .../{wine-staging-9999.ebuild => wine-staging-5.3-r1.ebuild} | 8 ++++++-- app-emulation/wine-staging/wine-staging-9999.ebuild | 8 ++++++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/app-emulation/wine-staging/metadata.xml b/app-emulation/wine-staging/metadata.xml index 8a734247ae2..ebbe6f23153 100644 --- a/app-emulation/wine-staging/metadata.xml +++ b/app-emulation/wine-staging/metadata.xml @@ -21,6 +21,7 @@ This variant of the Wine packaging includes the Wine-Staging patchset. Bypass strip-flags; use at your own peril Pull in games-emulation/dosbox to run DOS applications Pull in app-emulation/faudio to provide XAudio2 functionality + Add support for the Diffie-Hellman key exchanges using dev-libs/libgcrypt Add support for the Gecko engine when using iexplore Use GSSAPI (Kerberos SSP support) Use media-libs/gstreamer to provide DirectShow functionality; diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-5.3-r1.ebuild similarity index 96% copy from app-emulation/wine-staging/wine-staging-9999.ebuild copy to app-emulation/wine-staging/wine-staging-5.3-r1.ebuild index 2213437b7d5..81084a55cb3 100644 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild +++ b/app-emulation/wine-staging/wine-staging-5.3-r1.ebuild @@ -6,7 +6,7 @@ EAPI=6 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 l10n ltprune multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils +inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils MY_PN="${PN%%-*}" MY_P="${MY_PN}-${PV}" @@ -44,7 +44,7 @@ fi 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 +mono mp3 ncurses 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 v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +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 samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml" REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) @@ -73,6 +73,7 @@ COMMON_DEPEND=" 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}] ) gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] ) @@ -307,6 +308,7 @@ pkg_setup() { 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}" @@ -426,6 +428,7 @@ multilib_src_configure() { --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}" @@ -442,6 +445,7 @@ multilib_src_configure() { $(use_with fontconfig) $(use_with ssl gnutls) $(use_enable gecko mshtml) + $(use_with gcrypt) $(use_with gphoto2 gphoto) $(use_with gsm) $(use_with gssapi) diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild index 2213437b7d5..81084a55cb3 100644 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild @@ -6,7 +6,7 @@ EAPI=6 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 l10n ltprune multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils +inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils MY_PN="${PN%%-*}" MY_P="${MY_PN}-${PV}" @@ -44,7 +44,7 @@ fi 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 +mono mp3 ncurses 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 v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +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 samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml" REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) @@ -73,6 +73,7 @@ COMMON_DEPEND=" 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}] ) gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] ) @@ -307,6 +308,7 @@ pkg_setup() { 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}" @@ -426,6 +428,7 @@ multilib_src_configure() { --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}" @@ -442,6 +445,7 @@ multilib_src_configure() { $(use_with fontconfig) $(use_with ssl gnutls) $(use_enable gecko mshtml) + $(use_with gcrypt) $(use_with gphoto2 gphoto) $(use_with gsm) $(use_with gssapi)