summaryrefslogtreecommitdiff
path: root/app-emulation/wine-vanilla
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-09-01 19:24:10 +0100
committerV3n3RiX <venerix@koprulu.sector>2022-09-01 19:24:10 +0100
commitb052fbf151106a4f47cac7fdf0ffff983decb773 (patch)
tree5d21279a4eeaf4076caee87654b610a0fe8a4051 /app-emulation/wine-vanilla
parentc3b55a6be7da027d97d8aef00ef88c3011121a42 (diff)
gentoo auto-resync : 01:09:2022 - 19:24:10
Diffstat (limited to 'app-emulation/wine-vanilla')
-rw-r--r--app-emulation/wine-vanilla/Manifest14
-rw-r--r--app-emulation/wine-vanilla/wine-vanilla-7.13-r1.ebuild2
-rw-r--r--app-emulation/wine-vanilla/wine-vanilla-7.13.ebuild2
-rw-r--r--app-emulation/wine-vanilla/wine-vanilla-7.14.ebuild2
-rw-r--r--app-emulation/wine-vanilla/wine-vanilla-7.15.ebuild2
-rw-r--r--app-emulation/wine-vanilla/wine-vanilla-7.16.ebuild (renamed from app-emulation/wine-vanilla/wine-vanilla-7.12.ebuild)15
-rw-r--r--app-emulation/wine-vanilla/wine-vanilla-9999.ebuild10
7 files changed, 31 insertions, 16 deletions
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 1c34771094f0..ce37a9913fd7 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -1,14 +1,14 @@
DIST gentoo-wine-patches-20211122.tar.xz 59796 BLAKE2B 21460e6adf4934a52f8841f76f234a764c2dc1ac77eeed1cee10adafec3aa723640ebd4b51559e9ef433070ac731c4648620bd9e75e99f31b2e2f494cf01f02d SHA512 a18cb320617e2157977032c38c322177a2d248f14e43051d38de595af171495546c93d5e71e0dbe1a4f326a2dc819bb03dcfd04454ac85bbcd6b1975ae5d9d96
DIST wine-7.0.tar.xz 27120912 BLAKE2B 84bfeb28d56f0f40bb93b1b5bf8954c8be2fd90fde5a61608e7c35f48addcce7a4d660e63c3caa3ca2c365d1e83b55a1c3485872b2d6bfa8941e2bce44c4aca6 SHA512 eec17b046ed5447eb540f421c9b2748d9419ce087496c2743a9914fd27bbe5ff9da0cfe47d3cd76fa97323bd1188a1d82b1eef4968d86ed1957dc1a95e28529c
-DIST wine-7.12.tar.xz 28221024 BLAKE2B 551f37360a6dd2c535b5b1a9896cd9c9c091d56c4d2f3d2988092d48d54aa447fc0dad18034bad7b7beaa9c6587071e8d32bd08092a9ba93acb39dac9ddfc391 SHA512 4746fb1c3d0ec7f20e22d821f8e88e5415b85cb60f53e9ad61b89e8321b6a6b2999eb2b70c7ac46477f633bccb6c2aba49ce2655c380cb85cd5c71dbe4af50b4
DIST wine-7.13.tar.xz 28237664 BLAKE2B f65f6ab2ec159d0a25b44e6bcbc83db2c5ada6b0c39dd0e3fe86db74bb964d0b1bcba85e5300d5140e24c305b7e30a58953e7582df8a2117ce5d8127538f484b SHA512 2eca3aa80afa19dd0cc3cfeb8b58b78d22d2925b8201e0b7278638084a529870c1468ffc300e6a1bb343d0f0c7e28c2b3bb6c59af15dec43b8f6c1eb78b46c1e
DIST wine-7.14.tar.xz 28274396 BLAKE2B 632c4c77a5b93597b8b217a04e34a4867d9e34497322cbcdf89d3bd2c98ee2ce27983582e1aa6737ec6bf5e080f64bcb4813f3e5c83b67cebd36895251a07e2f SHA512 6727be4a23b1911b36c44ac8d347be1c98bb53e67101355d6ae829d14a3a0867ba83f77a52f4dbc02a35c3b513291dd4800148a31d28f50069d199fdee04b6e9
DIST wine-7.15.tar.xz 28324772 BLAKE2B 2ae7f693acfa3477c5b925cb6bfc6e2c3094cf56049aae9a310206dce3ef26d32af74ab414f06020dc0e9cf782b8e3cf6b65739ae10b71e783415498b7339618 SHA512 9edf9f6169c26fd829255d323ebdda4fd606f9cf9dfebae2c0823c32a2ca40741e10acba6938e0d49a99dd15276795506887ab582fed296beb0202f77b2db1b4
+DIST wine-7.16.tar.xz 28345428 BLAKE2B 6540dd196639c5b3e01af801439e4ca8d3d17ce6b9832c3ab7d0263909e0a963a5901b8baad00537242c32599af92d04ad58c9f51660583e28693b4ec1bdd803 SHA512 5085c7c1b0e762c508f33775f7f0aa41e94cb75805bb649093addad25f90f7f57d5101ba96227f58a6f18b3ae228bd004df11ec1c033692ad130e9b5279ea19e
EBUILD wine-vanilla-7.0-r2.ebuild 14466 BLAKE2B a7b622f29ca878bfbff5658914bcd8d2814d898ca86c799fad97fb1f53829bac279234f13f4db929e8e473268365a58fa5aab6776b2cec56c823d0a2f90dd6df SHA512 ef878396f004a06975e2530ad3ef0cceb1ad0ee7d398824de0d18997ebed9953c5121dae043e95e6a960af8e733a8558db5504cd803c9bd9678eabd14c279c42
-EBUILD wine-vanilla-7.12.ebuild 14367 BLAKE2B 8b8ca9b87119dd7cf9d79a77032e9e0ec13634f1474008bdcb90af417d70a2cf065d85da91de67b3fbf27682d91c6681487e83537d91b75c184fffd337239310 SHA512 ad600faa3dc58096658244c13a75784b2783267695d8f2d960ddbb837b40263dec839ddb68006315702badfd04db63ea5b9c3821a3045221c29ab7c12dfa896b
-EBUILD wine-vanilla-7.13-r1.ebuild 14323 BLAKE2B ca06c67151533f9aa25f67d73eeb3e190e6fb6738521f0cb06ef2add75cd5a105e892e58b85733a29d792741df383aecbd5a398c8d32ee5afa7b8edb050c1ddb SHA512 23eded09d9aac4cb21e84ac1be836a896596fc449d6468efb80750ead5fcb84f172133d751b2320f5e0125edefb57197ebb4ea3b651c55c8ee4b7aef35f0bc4d
-EBUILD wine-vanilla-7.13.ebuild 14367 BLAKE2B 8b8ca9b87119dd7cf9d79a77032e9e0ec13634f1474008bdcb90af417d70a2cf065d85da91de67b3fbf27682d91c6681487e83537d91b75c184fffd337239310 SHA512 ad600faa3dc58096658244c13a75784b2783267695d8f2d960ddbb837b40263dec839ddb68006315702badfd04db63ea5b9c3821a3045221c29ab7c12dfa896b
-EBUILD wine-vanilla-7.14.ebuild 14323 BLAKE2B ca06c67151533f9aa25f67d73eeb3e190e6fb6738521f0cb06ef2add75cd5a105e892e58b85733a29d792741df383aecbd5a398c8d32ee5afa7b8edb050c1ddb SHA512 23eded09d9aac4cb21e84ac1be836a896596fc449d6468efb80750ead5fcb84f172133d751b2320f5e0125edefb57197ebb4ea3b651c55c8ee4b7aef35f0bc4d
-EBUILD wine-vanilla-7.15.ebuild 14323 BLAKE2B ca06c67151533f9aa25f67d73eeb3e190e6fb6738521f0cb06ef2add75cd5a105e892e58b85733a29d792741df383aecbd5a398c8d32ee5afa7b8edb050c1ddb SHA512 23eded09d9aac4cb21e84ac1be836a896596fc449d6468efb80750ead5fcb84f172133d751b2320f5e0125edefb57197ebb4ea3b651c55c8ee4b7aef35f0bc4d
-EBUILD wine-vanilla-9999.ebuild 14323 BLAKE2B ca06c67151533f9aa25f67d73eeb3e190e6fb6738521f0cb06ef2add75cd5a105e892e58b85733a29d792741df383aecbd5a398c8d32ee5afa7b8edb050c1ddb SHA512 23eded09d9aac4cb21e84ac1be836a896596fc449d6468efb80750ead5fcb84f172133d751b2320f5e0125edefb57197ebb4ea3b651c55c8ee4b7aef35f0bc4d
+EBUILD wine-vanilla-7.13-r1.ebuild 14323 BLAKE2B 87bdff9edfd5303cbff14539ab3aa6fa361f291ebb7787b471eaeb9dc57ce089ddd2f808e7da3ced1b38a0a5cc923292ddfa3d91551b480eb3c7e643f0b67060 SHA512 81875f2e309df9d80444e1c41bb2ab0055eebd5983a917b313bf1d9865bc60d00cfd57e48bec587e30b2e8ed039264d575a9a11653681c7f104b7ee90e320b26
+EBUILD wine-vanilla-7.13.ebuild 14367 BLAKE2B 611787c3cdd5d4123dae23b6b42491f88f70f1f4c0d2be5e7fd2042a01edc6c3217695755ac17163086a0472d31aebb3a0e65a7a1c06290067a1ad8fc0a6118c SHA512 d76550d2e6888b723a4fda530fde33eb28ab2071e6fff66aa49fdbeb15099a5df001b4800725f1e025fa57bd20dca81d5492da091b1f1253e52f381ca943efa2
+EBUILD wine-vanilla-7.14.ebuild 14323 BLAKE2B 87bdff9edfd5303cbff14539ab3aa6fa361f291ebb7787b471eaeb9dc57ce089ddd2f808e7da3ced1b38a0a5cc923292ddfa3d91551b480eb3c7e643f0b67060 SHA512 81875f2e309df9d80444e1c41bb2ab0055eebd5983a917b313bf1d9865bc60d00cfd57e48bec587e30b2e8ed039264d575a9a11653681c7f104b7ee90e320b26
+EBUILD wine-vanilla-7.15.ebuild 14323 BLAKE2B 87bdff9edfd5303cbff14539ab3aa6fa361f291ebb7787b471eaeb9dc57ce089ddd2f808e7da3ced1b38a0a5cc923292ddfa3d91551b480eb3c7e643f0b67060 SHA512 81875f2e309df9d80444e1c41bb2ab0055eebd5983a917b313bf1d9865bc60d00cfd57e48bec587e30b2e8ed039264d575a9a11653681c7f104b7ee90e320b26
+EBUILD wine-vanilla-7.16.ebuild 14648 BLAKE2B 3c5e700a282337b1cf11aaffa76ff9b1e4be33d92e1eae834f64d9e85819aaf4a477ab02e19839c8e7d5ae937b372b65416cb264d198412f5580f60811992414 SHA512 263c916ac2d88a68bf703f0af7b91e969cebad8bde9f31b9bd59166a84c5d90f0d7566a9b3de6e531af156d38323cef05f01e3d3e446cdde8f205b2a3884e4aa
+EBUILD wine-vanilla-9999.ebuild 14648 BLAKE2B 3c5e700a282337b1cf11aaffa76ff9b1e4be33d92e1eae834f64d9e85819aaf4a477ab02e19839c8e7d5ae937b372b65416cb264d198412f5580f60811992414 SHA512 263c916ac2d88a68bf703f0af7b91e969cebad8bde9f31b9bd59166a84c5d90f0d7566a9b3de6e531af156d38323cef05f01e3d3e446cdde8f205b2a3884e4aa
MISC metadata.xml 3197 BLAKE2B 97ffc90d829a9275b64d02e3428118ff3c65d415ec0ef03995a0170cf428d20cfa010d324421fa119007c033ca78c9008fae6b9b088c7c1deaf87082a6a4c3eb SHA512 82b59cb9e82c585c2c1232f49ca706dcdf270d223863f35d46af678ceb30f40cbbadef519c71ce80418934b2e4ffc5e96a37d1db0c3fb22ab6c119593e3be761
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.13-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.13-r1.ebuild
index d776771e041b..acf26429424f 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.13-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.13-r1.ebuild
@@ -103,7 +103,7 @@ RDEPEND="${COMMON_DEPEND}
app-emulation/wine-desktop-common
>app-eselect/eselect-wine-0.3
dos? ( >=games-emulation/dosbox-0.74_p20160629 )
- gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
+ gecko? ( app-emulation/wine-gecko:2.47.3[abi_x86_32?,abi_x86_64?] )
mono? ( app-emulation/wine-mono:7.3.0 )
perl? (
dev-lang/perl
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.13.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.13.ebuild
index ddd54410ad78..66f83e3746d6 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.13.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.13.ebuild
@@ -104,7 +104,7 @@ RDEPEND="${COMMON_DEPEND}
app-emulation/wine-desktop-common
>app-eselect/eselect-wine-0.3
dos? ( >=games-emulation/dosbox-0.74_p20160629 )
- gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
+ gecko? ( app-emulation/wine-gecko:2.47.3[abi_x86_32?,abi_x86_64?] )
mono? ( app-emulation/wine-mono:7.3.0 )
perl? (
dev-lang/perl
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.14.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.14.ebuild
index d776771e041b..acf26429424f 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.14.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.14.ebuild
@@ -103,7 +103,7 @@ RDEPEND="${COMMON_DEPEND}
app-emulation/wine-desktop-common
>app-eselect/eselect-wine-0.3
dos? ( >=games-emulation/dosbox-0.74_p20160629 )
- gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
+ gecko? ( app-emulation/wine-gecko:2.47.3[abi_x86_32?,abi_x86_64?] )
mono? ( app-emulation/wine-mono:7.3.0 )
perl? (
dev-lang/perl
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.15.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.15.ebuild
index d776771e041b..acf26429424f 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.15.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.15.ebuild
@@ -103,7 +103,7 @@ RDEPEND="${COMMON_DEPEND}
app-emulation/wine-desktop-common
>app-eselect/eselect-wine-0.3
dos? ( >=games-emulation/dosbox-0.74_p20160629 )
- gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
+ gecko? ( app-emulation/wine-gecko:2.47.3[abi_x86_32?,abi_x86_64?] )
mono? ( app-emulation/wine-mono:7.3.0 )
perl? (
dev-lang/perl
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.12.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.16.ebuild
index ddd54410ad78..1bb18ebe2ce5 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.12.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.16.ebuild
@@ -10,6 +10,7 @@ inherit autotools estack flag-o-matic multilib-minimal pax-utils plocale toolcha
MY_PN="${PN%%-*}"
MY_P="${MY_PN}-${PV}"
+GECKO_VERSION="2.47.3"
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
@@ -35,7 +36,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw 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 vulkan +X +xcomposite xinerama"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups custom-cflags dos +fontconfig +gecko gphoto2 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 vulkan +X +xcomposite xinerama"
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
X? ( truetype )
crossdev-mingw? ( mingw )
@@ -69,7 +70,6 @@ COMMON_DEPEND="
media-libs/libgphoto2:=[${MULTILIB_USEDEP}]
media-libs/libjpeg-turbo:0=[${MULTILIB_USEDEP}]
)
- gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
gstreamer? (
media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
@@ -104,7 +104,7 @@ RDEPEND="${COMMON_DEPEND}
app-emulation/wine-desktop-common
>app-eselect/eselect-wine-0.3
dos? ( >=games-emulation/dosbox-0.74_p20160629 )
- gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
+ gecko? ( app-emulation/wine-gecko:${GECKO_VERSION}[abi_x86_32?,abi_x86_64?] )
mono? ( app-emulation/wine-mono:7.3.0 )
perl? (
dev-lang/perl
@@ -236,6 +236,13 @@ src_prepare() {
done
}
+ if use gecko; then
+ local source_gecko_version=$( sed -n -e '/^#define GECKO_VERSION/p' dlls/appwiz.cpl/addons.c | grep -Eo -m 1 '[0-9.]+' )
+ if [[ ${source_gecko_version} != ${GECKO_VERSION} ]] ; then
+ die "app-emulation/wine-gecko version is not correct! Please file a bug."
+ fi
+ fi
+
local md5="$(md5sum server/protocol.def)"
default
@@ -326,9 +333,9 @@ multilib_src_configure() {
$(use_with ssl gnutls)
$(use_enable gecko mshtml)
$(use_with gphoto2 gphoto)
- $(use_with gssapi)
$(use_with gstreamer)
--enable-hal
+ $(use_with kerberos gssapi)
$(use_with kerberos krb5)
$(use_with ldap)
# TODO: Will bug 685172 still need special handling?
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index d776771e041b..1bb18ebe2ce5 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -10,6 +10,7 @@ inherit autotools estack flag-o-matic multilib-minimal pax-utils plocale toolcha
MY_PN="${PN%%-*}"
MY_P="${MY_PN}-${PV}"
+GECKO_VERSION="2.47.3"
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
@@ -103,7 +104,7 @@ RDEPEND="${COMMON_DEPEND}
app-emulation/wine-desktop-common
>app-eselect/eselect-wine-0.3
dos? ( >=games-emulation/dosbox-0.74_p20160629 )
- gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
+ gecko? ( app-emulation/wine-gecko:${GECKO_VERSION}[abi_x86_32?,abi_x86_64?] )
mono? ( app-emulation/wine-mono:7.3.0 )
perl? (
dev-lang/perl
@@ -235,6 +236,13 @@ src_prepare() {
done
}
+ if use gecko; then
+ local source_gecko_version=$( sed -n -e '/^#define GECKO_VERSION/p' dlls/appwiz.cpl/addons.c | grep -Eo -m 1 '[0-9.]+' )
+ if [[ ${source_gecko_version} != ${GECKO_VERSION} ]] ; then
+ die "app-emulation/wine-gecko version is not correct! Please file a bug."
+ fi
+ fi
+
local md5="$(md5sum server/protocol.def)"
default