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 DB42115808B for ; Sun, 10 Apr 2022 19:54:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C2FD7E0992; Sun, 10 Apr 2022 19:54:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 5A0D9E0992 for ; Sun, 10 Apr 2022 19:54:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 B9CBC3410BD 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 ED6881BD for ; Sun, 10 Apr 2022 19:54:40 +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: <1649619933.6c145ac5c512f5a7c8cf846c414b6f593fbc39e6.sarnex@gentoo> Subject: [gentoo-commits] repo/proj/wine:master commit in: app-emulation/wine-vanilla/ X-VCS-Repository: repo/proj/wine X-VCS-Files: app-emulation/wine-vanilla/wine-vanilla-7.0-r1.ebuild app-emulation/wine-vanilla/wine-vanilla-7.3.ebuild app-emulation/wine-vanilla/wine-vanilla-7.4.ebuild app-emulation/wine-vanilla/wine-vanilla-7.5.ebuild app-emulation/wine-vanilla/wine-vanilla-7.6.ebuild app-emulation/wine-vanilla/wine-vanilla-9999.ebuild X-VCS-Directories: app-emulation/wine-vanilla/ X-VCS-Committer: sarnex X-VCS-Committer-Name: Nick Sarnie X-VCS-Revision: 6c145ac5c512f5a7c8cf846c414b6f593fbc39e6 X-VCS-Branch: master Date: Sun, 10 Apr 2022 19:54:40 +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: cd9dadd3-4de8-4fda-841f-dcff850898c7 X-Archives-Hash: 42713ae2ff8fbd071352751391d6682f commit: 6c145ac5c512f5a7c8cf846c414b6f593fbc39e6 Author: Nick Sarnie gentoo org> AuthorDate: Sun Apr 10 19:14:30 2022 +0000 Commit: Nick Sarnie gentoo org> CommitDate: Sun Apr 10 19:45:33 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=6c145ac5 app-emulation/wine-vanilla: EAPI 8 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Nick Sarnie gentoo.org> ...vanilla-9999.ebuild => wine-vanilla-7.0-r1.ebuild} | 18 ++++++++++-------- app-emulation/wine-vanilla/wine-vanilla-7.3.ebuild | 17 ++++++++++------- app-emulation/wine-vanilla/wine-vanilla-7.4.ebuild | 19 +++++++++++-------- app-emulation/wine-vanilla/wine-vanilla-7.5.ebuild | 14 ++++++++------ app-emulation/wine-vanilla/wine-vanilla-7.6.ebuild | 14 ++++++++------ app-emulation/wine-vanilla/wine-vanilla-9999.ebuild | 14 ++++++++------ 6 files changed, 55 insertions(+), 41 deletions(-) diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.0-r1.ebuild similarity index 97% copy from app-emulation/wine-vanilla/wine-vanilla-9999.ebuild copy to app-emulation/wine-vanilla/wine-vanilla-7.0-r1.ebuild index 79e935b..aea7d77 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-7.0-r1.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_P="${MY_PN}-${PV}" @@ -19,7 +19,7 @@ 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}" @@ -47,7 +47,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}] @@ -102,8 +108,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?] ) - mingw? ( !!>=cross-i686-w64-mingw32/binutils-2.38 !!>=cross-x86_64-w64-mingw32/binutils-2.38 ) - mono? ( app-emulation/wine-mono:7.2.0 ) + mono? ( app-emulation/wine-mono:7.0.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple @@ -117,10 +122,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 ) xinerama? ( x11-base/xorg-proto )" diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.3.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.3.ebuild index bc60492..65b5fd0 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-7.3.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-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_P="${MY_PN}-${PV}" @@ -47,7 +47,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}] @@ -116,10 +122,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 ) xinerama? ( x11-base/xorg-proto )" @@ -243,8 +246,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-vanilla/wine-vanilla-7.4.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.4.ebuild index 0912070..65b5fd0 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-7.4.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-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_P="${MY_PN}-${PV}" @@ -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 +fontconfig +gecko gphoto2 gssapi gstreamer kerberos ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl 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 pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl 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 ) @@ -47,7 +47,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}] @@ -116,10 +122,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 ) xinerama? ( x11-base/xorg-proto )" @@ -243,8 +246,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-vanilla/wine-vanilla-7.5.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.5.ebuild index b0d32d1..65b5fd0 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-7.5.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-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_P="${MY_PN}-${PV}" @@ -47,7 +47,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}] @@ -102,7 +108,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 @@ -117,10 +122,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 ) xinerama? ( x11-base/xorg-proto )" diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.6.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.6.ebuild index 79e935b..a249f1b 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-7.6.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-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_P="${MY_PN}-${PV}" @@ -47,7 +47,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}] @@ -102,7 +108,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 @@ -117,10 +122,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 ) xinerama? ( x11-base/xorg-proto )" diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild index 79e935b..a249f1b 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-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_P="${MY_PN}-${PV}" @@ -47,7 +47,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}] @@ -102,7 +108,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 @@ -117,10 +122,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 ) xinerama? ( x11-base/xorg-proto )"