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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0B87015808C for ; Sun, 10 Apr 2022 19:54:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D1214E0993; Sun, 10 Apr 2022 19:54:44 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EE352E0992 for ; Sun, 10 Apr 2022 19:54:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E2EEB3412E9 for ; Sun, 10 Apr 2022 19:54:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0DFF438D for ; Sun, 10 Apr 2022 19:54:41 +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: <1649620456.01a5bb0950c9319331c6a3153378da642aadaa58.sarnex@gentoo> Subject: [gentoo-commits] repo/proj/wine:master commit in: app-emulation/wine-staging/ X-VCS-Repository: repo/proj/wine X-VCS-Files: app-emulation/wine-staging/wine-staging-7.3.ebuild app-emulation/wine-staging/wine-staging-7.4.ebuild app-emulation/wine-staging/wine-staging-7.5.ebuild app-emulation/wine-staging/wine-staging-7.6.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: 01a5bb0950c9319331c6a3153378da642aadaa58 X-VCS-Branch: master Date: Sun, 10 Apr 2022 19:54:41 +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: b663af03-102a-49a1-805e-fe0bec139d75 X-Archives-Hash: 23faa255c68b89e83d194a732f1ad10f commit: 01a5bb0950c9319331c6a3153378da642aadaa58 Author: Nick Sarnie gentoo org> AuthorDate: Sun Apr 10 19:42:54 2022 +0000 Commit: Nick Sarnie gentoo org> CommitDate: Sun Apr 10 19:54:16 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=01a5bb09 app-emulation/wine-staging: EAPI 8 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Nick Sarnie gentoo.org> app-emulation/wine-staging/wine-staging-7.3.ebuild | 17 ++++++++++------- app-emulation/wine-staging/wine-staging-7.4.ebuild | 19 +++++++++++-------- app-emulation/wine-staging/wine-staging-7.5.ebuild | 14 ++++++++------ app-emulation/wine-staging/wine-staging-7.6.ebuild | 14 ++++++++------ app-emulation/wine-staging/wine-staging-9999.ebuild | 14 ++++++++------ 5 files changed, 45 insertions(+), 33 deletions(-) diff --git a/app-emulation/wine-staging/wine-staging-7.3.ebuild b/app-emulation/wine-staging/wine-staging-7.3.ebuild index 5c6ad86..35870f8 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,7 +61,13 @@ 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=" + ${BDEPEND} X? ( x11-libs/libXcursor[${MULTILIB_USEDEP}] x11-libs/libXext[${MULTILIB_USEDEP}] @@ -131,10 +137,7 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - sys-devel/flex >=sys-kernel/linux-headers-2.6 - virtual/pkgconfig - virtual/yacc X? ( x11-base/xorg-proto ) staging? ( dev-lang/perl @@ -275,8 +278,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 diff --git a/app-emulation/wine-staging/wine-staging-7.4.ebuild b/app-emulation/wine-staging/wine-staging-7.4.ebuild index cf584a4..35870f8 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,7 +61,13 @@ 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=" + ${BDEPEND} X? ( x11-libs/libXcursor[${MULTILIB_USEDEP}] x11-libs/libXext[${MULTILIB_USEDEP}] @@ -131,10 +137,7 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - sys-devel/flex >=sys-kernel/linux-headers-2.6 - virtual/pkgconfig - virtual/yacc X? ( x11-base/xorg-proto ) staging? ( dev-lang/perl @@ -275,8 +278,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 diff --git a/app-emulation/wine-staging/wine-staging-7.5.ebuild b/app-emulation/wine-staging/wine-staging-7.5.ebuild index 1ad582f..35870f8 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,7 +61,13 @@ 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=" + ${BDEPEND} X? ( x11-libs/libXcursor[${MULTILIB_USEDEP}] x11-libs/libXext[${MULTILIB_USEDEP}] @@ -117,7 +123,6 @@ 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?] ) - 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 +137,7 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - sys-devel/flex >=sys-kernel/linux-headers-2.6 - virtual/pkgconfig - virtual/yacc X? ( x11-base/xorg-proto ) staging? ( dev-lang/perl diff --git a/app-emulation/wine-staging/wine-staging-7.6.ebuild b/app-emulation/wine-staging/wine-staging-7.6.ebuild index d5b2574..db459b0 100644 --- a/app-emulation/wine-staging/wine-staging-7.6.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,7 +61,13 @@ 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=" + ${BDEPEND} X? ( x11-libs/libXcursor[${MULTILIB_USEDEP}] x11-libs/libXext[${MULTILIB_USEDEP}] @@ -117,7 +123,6 @@ 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?] ) - mingw? ( !!>=cross-i686-w64-mingw32/binutils-2.38 !!>=cross-x86_64-w64-mingw32/binutils-2.38 ) mono? ( app-emulation/wine-mono:7.2.0 ) perl? ( dev-lang/perl @@ -132,10 +137,7 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - sys-devel/flex >=sys-kernel/linux-headers-2.6 - virtual/pkgconfig - virtual/yacc X? ( x11-base/xorg-proto ) staging? ( dev-lang/perl diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild index d5b2574..db459b0 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,7 +61,13 @@ 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=" + ${BDEPEND} X? ( x11-libs/libXcursor[${MULTILIB_USEDEP}] x11-libs/libXext[${MULTILIB_USEDEP}] @@ -117,7 +123,6 @@ 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?] ) - mingw? ( !!>=cross-i686-w64-mingw32/binutils-2.38 !!>=cross-x86_64-w64-mingw32/binutils-2.38 ) mono? ( app-emulation/wine-mono:7.2.0 ) perl? ( dev-lang/perl @@ -132,10 +137,7 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - sys-devel/flex >=sys-kernel/linux-headers-2.6 - virtual/pkgconfig - virtual/yacc X? ( x11-base/xorg-proto ) staging? ( dev-lang/perl