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 6038E138334 for ; Sun, 1 Dec 2019 13:18:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 82F10E0819; Sun, 1 Dec 2019 13:18:43 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 5A46BE0819 for ; Sun, 1 Dec 2019 13:18:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 A1A8434D646 for ; Sun, 1 Dec 2019 13:18:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 18213778 for ; Sun, 1 Dec 2019 13:18:39 +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: <1575206301.e50baa314243cde515281fe51502abb8bec04996.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-4.18.ebuild app-emulation/wine-staging/wine-staging-4.19.ebuild app-emulation/wine-staging/wine-staging-4.20.ebuild app-emulation/wine-staging/wine-staging-4.21.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: e50baa314243cde515281fe51502abb8bec04996 X-VCS-Branch: master Date: Sun, 1 Dec 2019 13:18:39 +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: bdaa7e5a-aafa-4d88-8fbc-bf92f43b2cac X-Archives-Hash: c7290a09f199a94f7bf4aa564162ce42 commit: e50baa314243cde515281fe51502abb8bec04996 Author: Nick Sarnie gentoo org> AuthorDate: Sun Dec 1 13:18:21 2019 +0000 Commit: Nick Sarnie gentoo org> CommitDate: Sun Dec 1 13:18:21 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e50baa31 app-emulation/wine-staging: Sync with ::wine app-emulation/wine-staging: remove ffmpeg USE-flag from v4.13+ Package-Manager: Portage-2.3.80, Repoman-2.3.19 Signed-off-by: Nick Sarnie gentoo.org> app-emulation/wine-staging/metadata.xml | 1 - app-emulation/wine-staging/wine-staging-4.18.ebuild | 5 +---- app-emulation/wine-staging/wine-staging-4.19.ebuild | 5 +---- app-emulation/wine-staging/wine-staging-4.20.ebuild | 5 +---- app-emulation/wine-staging/wine-staging-4.21.ebuild | 5 +---- app-emulation/wine-staging/wine-staging-9999.ebuild | 5 +---- 6 files changed, 5 insertions(+), 21 deletions(-) diff --git a/app-emulation/wine-staging/metadata.xml b/app-emulation/wine-staging/metadata.xml index 2021448c473..8a734247ae2 100644 --- a/app-emulation/wine-staging/metadata.xml +++ b/app-emulation/wine-staging/metadata.xml @@ -21,7 +21,6 @@ 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 - Use media-video/ffmpeg to decode WMA formats 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-4.18.ebuild b/app-emulation/wine-staging/wine-staging-4.18.ebuild index 2d1bd8b5970..4376738049f 100644 --- a/app-emulation/wine-staging/wine-staging-4.18.ebuild +++ b/app-emulation/wine-staging/wine-staging-4.18.ebuild @@ -44,11 +44,10 @@ fi LICENSE="LGPL-2.1" SLOT="${PV}" -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio ffmpeg +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 +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 ) - ffmpeg? ( staging ) osmesa? ( opengl ) pipelight? ( staging ) test? ( abi_x86_32 ) @@ -73,7 +72,6 @@ COMMON_DEPEND=" capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] ) cups? ( net-print/cups:=[${MULTILIB_USEDEP}] ) faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] ) - ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] ) fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) @@ -443,7 +441,6 @@ multilib_src_configure() { $(use_with ncurses curses) $(use_with udisks dbus) $(use_with faudio) - $(use_with ffmpeg) $(use_with fontconfig) $(use_with ssl gnutls) $(use_enable gecko mshtml) diff --git a/app-emulation/wine-staging/wine-staging-4.19.ebuild b/app-emulation/wine-staging/wine-staging-4.19.ebuild index 2d1bd8b5970..4376738049f 100644 --- a/app-emulation/wine-staging/wine-staging-4.19.ebuild +++ b/app-emulation/wine-staging/wine-staging-4.19.ebuild @@ -44,11 +44,10 @@ fi LICENSE="LGPL-2.1" SLOT="${PV}" -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio ffmpeg +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 +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 ) - ffmpeg? ( staging ) osmesa? ( opengl ) pipelight? ( staging ) test? ( abi_x86_32 ) @@ -73,7 +72,6 @@ COMMON_DEPEND=" capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] ) cups? ( net-print/cups:=[${MULTILIB_USEDEP}] ) faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] ) - ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] ) fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) @@ -443,7 +441,6 @@ multilib_src_configure() { $(use_with ncurses curses) $(use_with udisks dbus) $(use_with faudio) - $(use_with ffmpeg) $(use_with fontconfig) $(use_with ssl gnutls) $(use_enable gecko mshtml) diff --git a/app-emulation/wine-staging/wine-staging-4.20.ebuild b/app-emulation/wine-staging/wine-staging-4.20.ebuild index a2a1c5872a7..018e0d7d63f 100644 --- a/app-emulation/wine-staging/wine-staging-4.20.ebuild +++ b/app-emulation/wine-staging/wine-staging-4.20.ebuild @@ -44,11 +44,10 @@ fi LICENSE="LGPL-2.1" SLOT="${PV}" -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio ffmpeg +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 +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 ) - ffmpeg? ( staging ) osmesa? ( opengl ) pipelight? ( staging ) test? ( abi_x86_32 ) @@ -73,7 +72,6 @@ COMMON_DEPEND=" capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] ) cups? ( net-print/cups:=[${MULTILIB_USEDEP}] ) faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] ) - ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] ) fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) @@ -443,7 +441,6 @@ multilib_src_configure() { $(use_with ncurses curses) $(use_with udisks dbus) $(use_with faudio) - $(use_with ffmpeg) $(use_with fontconfig) $(use_with ssl gnutls) $(use_enable gecko mshtml) diff --git a/app-emulation/wine-staging/wine-staging-4.21.ebuild b/app-emulation/wine-staging/wine-staging-4.21.ebuild index a2a1c5872a7..018e0d7d63f 100644 --- a/app-emulation/wine-staging/wine-staging-4.21.ebuild +++ b/app-emulation/wine-staging/wine-staging-4.21.ebuild @@ -44,11 +44,10 @@ fi LICENSE="LGPL-2.1" SLOT="${PV}" -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio ffmpeg +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 +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 ) - ffmpeg? ( staging ) osmesa? ( opengl ) pipelight? ( staging ) test? ( abi_x86_32 ) @@ -73,7 +72,6 @@ COMMON_DEPEND=" capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] ) cups? ( net-print/cups:=[${MULTILIB_USEDEP}] ) faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] ) - ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] ) fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) @@ -443,7 +441,6 @@ multilib_src_configure() { $(use_with ncurses curses) $(use_with udisks dbus) $(use_with faudio) - $(use_with ffmpeg) $(use_with fontconfig) $(use_with ssl gnutls) $(use_enable gecko mshtml) diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild index a2a1c5872a7..018e0d7d63f 100644 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild @@ -44,11 +44,10 @@ fi LICENSE="LGPL-2.1" SLOT="${PV}" -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio ffmpeg +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 +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 ) - ffmpeg? ( staging ) osmesa? ( opengl ) pipelight? ( staging ) test? ( abi_x86_32 ) @@ -73,7 +72,6 @@ COMMON_DEPEND=" capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] ) cups? ( net-print/cups:=[${MULTILIB_USEDEP}] ) faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] ) - ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] ) fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) @@ -443,7 +441,6 @@ multilib_src_configure() { $(use_with ncurses curses) $(use_with udisks dbus) $(use_with faudio) - $(use_with ffmpeg) $(use_with fontconfig) $(use_with ssl gnutls) $(use_enable gecko mshtml)