commit:     34299070de6d45cbfd9af1c133899b7f4a3fb11c
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 14 23:26:19 2021 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Thu Jan 14 23:39:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=34299070

app-emulation/wine-vanilla: Bump to 6.0

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>

 app-emulation/wine-vanilla/Manifest                               | 1 +
 app-emulation/wine-vanilla/metadata.xml                           | 1 +
 .../{wine-vanilla-9999.ebuild => wine-vanilla-6.0.ebuild}         | 8 +++++---
 app-emulation/wine-vanilla/wine-vanilla-9999.ebuild               | 8 +++++---
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index 787221e..ee06dad 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -54,3 +54,4 @@ DIST wine-5.6.tar.xz 23678216 BLAKE2B 
7aee9a46c037d46d07a551a839056783c020d2e5c6
 DIST wine-5.7.tar.xz 23723624 BLAKE2B 
fbea8f753dee57368f7532eef6fe6bf366ba52e9c2b970147207cf879858b86a74d0dfb1f813cfd31058462aaa09f74dd07924370b4c3f032f0dcd0015eab90b
 SHA512 
46a8050cb21edf1116c93fd73fdc3bbbc1a19e18d77c38bc192f13e55954d3e503122c780ca9c1a50005b0bca6f3b0c640f3de05267f25289e08660321e27407
 DIST wine-5.8.tar.xz 23753648 BLAKE2B 
086f37ce469f6d176eab8daa2d124b1774526727e2f6fe4ecdd39862c13ed493ac4164cf98848d5bc8cba3675e13365f6ea2b34591d518c40c34d09556851578
 SHA512 
7b9df380655a72e8b9e95ca271a62308262d8efabbeb2ad459071afc9ed51518b42b1f75b019fe8d6b53cf5185e9cfc45ac1b8a7092f118fa2aff14f99c012de
 DIST wine-5.9.tar.xz 23802356 BLAKE2B 
1879c164c647a5b849056e4149a809c390814ae832773a44347cf1902fd49cb6619b4add5ea2d421c189d92b5c907daa0d6f62c37c48a8bd68d0eaa9eb465433
 SHA512 
edc6d55a275cf37430a62dc6d6d86bff6d5a434e708dbd99d245018db7f6a0abe39581a1d91eb947f204a45ac94cc5c931745169a3b63a2aecf8db277553b74b
+DIST wine-6.0.tar.xz 24192280 BLAKE2B 
baf0eee582190ede8d210390b51d330c1879cb442100bc2e957052898fbd84bcc047a885065f9bf96ac4f072f92eee44f0e1c3baddc68937286e7cc6f976bd4e
 SHA512 
c0732fbab1da8737d595a876b28ce87eef1440c317746e798642b59b44b34e890de562e0c0cc674e97096f39db82f8e9c3b1cc1ba9edc246b7266a0f7cb00057

diff --git a/app-emulation/wine-vanilla/metadata.xml 
b/app-emulation/wine-vanilla/metadata.xml
index 7467ea2..a57d62f 100644
--- a/app-emulation/wine-vanilla/metadata.xml
+++ b/app-emulation/wine-vanilla/metadata.xml
@@ -42,6 +42,7 @@ This variant of the Wine packaging does not include external 
patchsets
                <flag name="sdl">Add support for gamepad detection using 
SDL</flag>
                <flag name="udev">Use <pkg>virtual/libudev</pkg> to provide 
plug and play support</flag>
                <flag name="unwind">Use <pkg>sys-libs/libunwind</pkg> to unwind 
the stack</flag>
+               <flag name="usb">Use <pkg>virtual/libusb</pkg> to provide USB 
support</flag>
                <flag name="vkd3d">Use <pkg>app-emulation/vkd3d</pkg> to 
provide Direct3D 12 support</flag>
                <flag name="vulkan">Enable Vulkan drivers</flag>
        </use>

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-6.0.ebuild
similarity index 98%
copy from app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
copy to app-emulation/wine-vanilla/wine-vanilla-6.0.ebuild
index 97ea901..2658cee 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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}"
@@ -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 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 usb v4l vkd3d 
vulkan +X +xcomposite xinerama +xml"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
        X? ( truetype )
        elibc_glibc? ( threads )
@@ -93,6 +93,7 @@ COMMON_DEPEND="
        udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
        udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
        unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+       usb? ( virtual/libusb[${MULTILIB_USEDEP}]  )
        v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
        vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
        vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
@@ -438,6 +439,7 @@ multilib_src_configure() {
                $(use_with truetype freetype)
                $(use_with udev)
                $(use_with unwind)
+               $(use_with usb)
                $(use_with v4l v4l2)
                $(use_with vkd3d)
                $(use_with vulkan)

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index 97ea901..2658cee 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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}"
@@ -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 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 usb v4l vkd3d 
vulkan +X +xcomposite xinerama +xml"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
        X? ( truetype )
        elibc_glibc? ( threads )
@@ -93,6 +93,7 @@ COMMON_DEPEND="
        udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
        udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
        unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+       usb? ( virtual/libusb[${MULTILIB_USEDEP}]  )
        v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
        vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
        vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
@@ -438,6 +439,7 @@ multilib_src_configure() {
                $(use_with truetype freetype)
                $(use_with udev)
                $(use_with unwind)
+               $(use_with usb)
                $(use_with v4l v4l2)
                $(use_with vkd3d)
                $(use_with vulkan)

Reply via email to