gentoo auto-resync : 19:11:2022 - 13:00:31

15 files changed, 46 insertions, 38 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index cfc1aff78273..cfee28a0bd7f 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 4641105a6871..673f86ee87f0 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -10,9 +10,9 @@ DIST wine-staging-7.18.tar.gz 9535819 BLAKE2B b7157493c8362bce4683f0cd8847e41b81
 DIST wine-staging-7.19.tar.gz 9523048 BLAKE2B e53fd47af493cbdc4542f908a39557324d70ad67ff2e06c80296c006a63518e43988750cab2f4d3d9197fc9c8a1e61ed4d96bcc310b82b6cfc8ec12b941f1c5c SHA512 c51cb18c4ae00eccf414f5edda18ebf363674ba7cfa95da135b3a43b7c012c086d454d6ac32b22d98e611bb87e55c3e1ee95571a4a0c9713028b5ac38e8aed3f
 DIST wine-staging-7.20.tar.gz 9521481 BLAKE2B 5a264460e72ac96d50d23492100c465eeb0b933306200710aa085bd37bb79df3c6ef03aeb5ba2c4c196befb231938457aa9584b9edf938edfd754d06e7cdb574 SHA512 538bf60e760254f3130fe8b6bf07598287e567c0f34d6be2ed04fde10007283d4c675a6f27a0a13d3ce77e833559d5ef853a89f2f96dc5f8cc818bdc3570474a
 DIST wine-staging-7.21.tar.gz 9530737 BLAKE2B a80476dbc957a9cda1554262777c63276f9b66a5ccd1389a006327810b0b960a600f78dfabc0d8df4ce816cdd7c4c3c29c26bea9b63219fa90dff60142d41da1 SHA512 1261267fe82a25d74dbf3f8cd1926339356eac3cd432667517c2ca65656c1b733c2866a48c1e4ad116ac8094d9079366a07f6a7814b8bde27246d654a792e9ec
-EBUILD wine-staging-7.18.ebuild 11195 BLAKE2B 96902242f3a26b3b6629247f89d4673ede219737d0a879825b33c069b3ab8c539ada527252581727cf04554a0339cb16b4aa70616c7142863833179898ae1204 SHA512 d3f357c9b204ed852160bf51a1a23700db6ac8bc383dbfce40564e4b2ff92677d991ba343d25be02be61b4d8447fee26137ccc636f171a7a856206d97f2a7080
-EBUILD wine-staging-7.19.ebuild 11123 BLAKE2B c5de757465bb7033ebc20796b6a4319eb115bc60f6c1512f3b9eaf3e9cc2a23e63900a4aafb379fb27f30642c698902759808aea9c76883c05f7bc30ff723912 SHA512 43321290cc12244b7a917885d9f3574362864d34f1360a500e17de15bc0a6cba34493fb986aff9168abb91d0cc1d57ded684b92bd31ae9a9b3ed6fa10ff8ad92
-EBUILD wine-staging-7.20.ebuild 11123 BLAKE2B 269c3156f5b190e358a498830930c6a26c09c6a5be5a7db899572496a95e739f8508115c007832ff568a31b984a66584149b408c8d38552931fb9e04e2136be8 SHA512 3b1fb7c272f27b4cced6112655f38270c95ed95fa844bc861489413070e8921438be57afe6138a8674ca67c97ef09a92d4d1ba8ebcaa26069b4857b2b7b60de3
-EBUILD wine-staging-7.21.ebuild 11224 BLAKE2B bf13e52b8c69cce318a89c8d2e88a3a52131fc7b56147206c4ffd04457af17c7f8f4574334eff2067115787d94adeea5d656a68640dc4ecc8ca185176da1c11c SHA512 6814a3750f3b58ac7c894c14113cd2f9520094e2c7f788270b5a432ffacbd985e8001a12f9fad6e6d28cd467de608c5e80561b2984865b67a674078d1e30d670
-EBUILD wine-staging-9999.ebuild 11291 BLAKE2B da78b56c05f8af7c979dac56b4fa109dff1a7268147ecda1312cee6161b401f45b3fb02c971b1a6a0a46908ab1b6f8d7684c7d248dd677e6049c2639efb75167 SHA512 cf468f51a3dd8ac12841436bfb277d5c433ef39ba74a5931180f8c3e387adabbdae99644497c40eba780f7004f654c069b41a97ac8171bb87e34eb773db4f8f0
+EBUILD wine-staging-7.18.ebuild 11208 BLAKE2B 10ed5cc64b97630217ac2afc68282d684eb4f741e0c74af41d966cc7f7cd3c803804999e4f19fe3df28ba1b72a952931d56d3ab71e3548a2642f3e718adb80cc SHA512 3e37d7f6e825f2b500acdcadcc1c435fb847692c7c5cc356ce96b2823a012accbb183ca446b4947f90af474dbb1a673fe13c4c069f688dee04692bc7f8f87b5f
+EBUILD wine-staging-7.19.ebuild 11136 BLAKE2B 5921466e380c7a2fe53a4ccf66e3a1ee8d1638fefc298b880c285899d5fefb39ed7c891fe22a8c25f726df1bfe26be3915aa5d8cf9bda47d211154c3cd103e56 SHA512 b54621f4d6bf0931787856453db5f42599108eab738a335891008c2ed4a066857aa981c114a5b95ae00327f27e606e3de52237e4b852c1ac69cfcbcb4efe686f
+EBUILD wine-staging-7.20.ebuild 11136 BLAKE2B cb43b2a447e74aa51e5989df08d3919c5ed0e22ea31c981aec7b68542e85dfd422806b007cdc6e58e321f4b33f6e51606c50b5d693432adc505d151d58cd47e6 SHA512 a17c65dd21fcc034537d0b70226fea3fa36c000fa9ce49579b1568ad009b5f3c845582091509244fb5ce8028c3f19b41f7b350c1cfc7dad5a64f3f40ca6066ec
+EBUILD wine-staging-7.21.ebuild 11237 BLAKE2B 9fd42e64b8059d368797cc0819295f0c19a71c0f6819cfaece27854a755babfbd427eb18ad41996813e71cd88c74c8614cc2584328166d7cbf85b50513cfb597 SHA512 4a736178afbd4593b3eef5d8c4becd4144b41fd241285acde2248cf5090b22a3e85e51628dbf559101f4aeef5bf6329cd4b8a3d3cf28c9acd3e07163961de578
+EBUILD wine-staging-9999.ebuild 11238 BLAKE2B ad781e976b13feee5dc33774e5de036e2959e9a37a99420bcaf9542d4bca8c46da7976ebd7e346b9875463c6214fe75da072d1912ee39afcc4a3ea7575039a3e SHA512 6c6b02809308df506d1368227d001cd7b563484999eebd177c695502ed70a2abd315dd183ef1e7041b674b4fa6bd571ea27e62c2515eb23dbf04a3dd1c2c4d1e
 MISC metadata.xml 2352 BLAKE2B c3bc247559ce143b4c8497b17dbeccf283ecb70463ca8230ba46d949c0def97f15c0b676149524111f7d151722d7c6343dc16dddaba5093fba60c62389da778d SHA512 a05a2b4bdaa01b7f097cf824f2b949b2e5ece864c7307dfca42a384711c9db09f486c3d398c9c1f187daadfcc646bb14fe7c488140fea2a3f7092a5e3a8011d1
diff --git a/app-emulation/wine-staging/wine-staging-7.18.ebuild b/app-emulation/wine-staging/wine-staging-7.18.ebuild
index 7ef3acb6f10f..b310ca62f7cc 100644
--- a/app-emulation/wine-staging/wine-staging-7.18.ebuild
+++ b/app-emulation/wine-staging/wine-staging-7.18.ebuild
@@ -23,7 +23,7 @@ fi
 S="${WORKDIR}/wine-${PV}"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
-HOMEPAGE="https://www.winehq.org/"
+HOMEPAGE="https://wiki.winehq.org/Wine-Staging"
 
 LICENSE="LGPL-2.1+ BSD-2 IJG MIT ZLIB gsm libpng2 libtiff"
 SLOT="${PV}"
diff --git a/app-emulation/wine-staging/wine-staging-7.19.ebuild b/app-emulation/wine-staging/wine-staging-7.19.ebuild
index a344346392b7..8f5c2fb8b316 100644
--- a/app-emulation/wine-staging/wine-staging-7.19.ebuild
+++ b/app-emulation/wine-staging/wine-staging-7.19.ebuild
@@ -23,7 +23,7 @@ fi
 S="${WORKDIR}/wine-${PV}"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
-HOMEPAGE="https://www.winehq.org/"
+HOMEPAGE="https://wiki.winehq.org/Wine-Staging"
 
 LICENSE="LGPL-2.1+ BSD-2 IJG MIT ZLIB gsm libpng2 libtiff"
 SLOT="${PV}"
diff --git a/app-emulation/wine-staging/wine-staging-7.20.ebuild b/app-emulation/wine-staging/wine-staging-7.20.ebuild
index 9ac0bc6e5297..9e74efd3fe3a 100644
--- a/app-emulation/wine-staging/wine-staging-7.20.ebuild
+++ b/app-emulation/wine-staging/wine-staging-7.20.ebuild
@@ -23,7 +23,7 @@ fi
 S="${WORKDIR}/wine-${PV}"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
-HOMEPAGE="https://www.winehq.org/"
+HOMEPAGE="https://wiki.winehq.org/Wine-Staging"
 
 LICENSE="LGPL-2.1+ BSD-2 IJG MIT ZLIB gsm libpng2 libtiff"
 SLOT="${PV}"
diff --git a/app-emulation/wine-staging/wine-staging-7.21.ebuild b/app-emulation/wine-staging/wine-staging-7.21.ebuild
index a2cb290f769f..8a8cd11bbbce 100644
--- a/app-emulation/wine-staging/wine-staging-7.21.ebuild
+++ b/app-emulation/wine-staging/wine-staging-7.21.ebuild
@@ -23,7 +23,7 @@ fi
 S="${WORKDIR}/wine-${PV}"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
-HOMEPAGE="https://www.winehq.org/"
+HOMEPAGE="https://wiki.winehq.org/Wine-Staging"
 
 LICENSE="LGPL-2.1+ BSD-2 IJG MIT ZLIB gsm libpng2 libtiff"
 SLOT="${PV}"
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index 37968fe103e5..365abdfc568e 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -23,17 +23,16 @@ fi
 S="${WORKDIR}/wine-${PV}"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
-HOMEPAGE="https://www.winehq.org/"
+HOMEPAGE="https://wiki.winehq.org/Wine-Staging"
 
-LICENSE="LGPL-2.1+ BSD-2 IJG MIT ZLIB gsm libpng2 libtiff"
+LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
 SLOT="${PV}"
 IUSE="
 	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
 	llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2
-	+gstreamer kerberos ldap +mingw +mono netapi nls odbc opencl
-	+opengl osmesa pcap perl pulseaudio samba scanner +sdl selinux
-	+ssl +truetype udev udisks +unwind usb v4l +vulkan +xcomposite
-	xinerama"
+	+gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl
+	osmesa pcap perl pulseaudio samba scanner +sdl selinux +ssl
+	+truetype udev udisks +unwind usb v4l +vulkan +xcomposite xinerama"
 REQUIRED_USE="
 	X? ( truetype )
 	crossdev-mingw? ( mingw )" # bug #551124 for truetype
@@ -83,7 +82,6 @@ WINE_COMMON_DEPEND="
 		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
 		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
 	)
-	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
 	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
 	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
 	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
@@ -220,7 +218,6 @@ src_configure() {
 		$(use_with gstreamer)
 		$(use_with kerberos gssapi)
 		$(use_with kerberos krb5)
-		$(use_with ldap)
 		$(use_with mingw)
 		$(use_with netapi)
 		$(use_with nls gettext)
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index e5ba10b9741e..1848633541c9 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -8,11 +8,11 @@ DIST wine-7.18.tar.xz 28412876 BLAKE2B 1f25c8669a2afbead142923a39913b3f21df641e4
 DIST wine-7.19.tar.xz 28502612 BLAKE2B b7b270656955c7a1e1d84e8bbc7e3e8abff5aedadb5e8a458f0b1109d746875a359f3d2f53b1c9c6caae65d17fd1d205466cd3a884034a8bad6afe9456f13b5d SHA512 f76dbda97cccad4c0f249b5dd4e8d48afa832134f1704ae228650bb73ee82823e628b23bd53a3f8729e06a8933597ff2fffa5551f156fc9c9181b67c066747d5
 DIST wine-7.20.tar.xz 28534920 BLAKE2B 2e0cd49a7820f0c885a2a6dbcded6ebbdb5e1ea5576b03dedb7ee066f74f8c675193450cdd45bf5e0224bd588a890138e47a15f513edbfde1eabf1b65c9abe31 SHA512 6e2e65fba2336985df93165050f0f46b752d6aa94fc1581451c58969e2003748378be4b9e16b647ca2922fbdff77920311b12a17bda630a7bccfc7ee8f03b453
 DIST wine-7.21.tar.xz 28703308 BLAKE2B 8902ded32b9e635f8ccf659ca4055e9ad45d3659f3ad48d0c218dc5a7a334df456ea0e9441dcaff58e8cac0bbd65140b20e61180acaa06230bc70e28a8382c7e SHA512 15c0c9efda972b84890886fd4b1fb18dd462373ba490f5e607004a5436caba9823f643369ceb5abbc2d2d0e26d7ce002e00136299d9984c0a27f729f3ac129c1
-EBUILD wine-vanilla-7.0-r3.ebuild 10315 BLAKE2B f0b32f2d1b7033451e7b34ff77fefd868e3c6e8e70274f8c1c50933e46c94f2371a009d0147d7355e0810fb1eb0ba2db59d2793ad5d4c68114f8944c55f5ed6c SHA512 78ec137805d817d64a84898f19894c3a0220fafd56679cd29f056a7cc16ada4a3ca08a9b1d8ef21adf78399094d0f747a98df3fc6216e45fbc0037dcb72196f3
-EBUILD wine-vanilla-7.0.1.ebuild 10317 BLAKE2B 7a6ca6cbe6c4a2013b513d703d23821e8415f3b757ee2552d85de15e480084fd9e0e9030d18b2c938f2edaa6c3d950b0fa6e2a22898d7fd95e6ec3e357924d59 SHA512 5e9311158340a607bf6acb99eecdce893d6bd8772bd271da379e8192fc17dcdffec7af1399f61828c1909d315d2e0360b0372ceafce5e2fc5365a5d25d21534f
-EBUILD wine-vanilla-7.18.ebuild 10232 BLAKE2B e8c105a4b6a3d40bc162311d1c31c16d77ab04868b744d3681e8ccaee4191581920d59df57ee96d50959d75f7cb57ae98584cfa84ba30264e744e613bc88fe64 SHA512 a257e4eb3e0456a95c9b9305b9ba4af1f875300a69df57ba4fba11db9c4c170b9d12569c2cfd3555259225e250cb8409b5fbee9b199d218e45601ba7572e3a75
-EBUILD wine-vanilla-7.19.ebuild 10232 BLAKE2B e8c105a4b6a3d40bc162311d1c31c16d77ab04868b744d3681e8ccaee4191581920d59df57ee96d50959d75f7cb57ae98584cfa84ba30264e744e613bc88fe64 SHA512 a257e4eb3e0456a95c9b9305b9ba4af1f875300a69df57ba4fba11db9c4c170b9d12569c2cfd3555259225e250cb8409b5fbee9b199d218e45601ba7572e3a75
-EBUILD wine-vanilla-7.20.ebuild 10233 BLAKE2B 6013fb4f81e9dfd926ae56846f651d6f784e76e7011d84d08e7d6334304868d627ec95f956a5521432de50fc97e3329a497a1d9e73cc5d6814e72edd2e66f248 SHA512 2b253e06a33470d544f1fac9568e7117eb3688e712dc6d0315e182116cb07b699eafdbffb9c37d85d902457b25a1c10db60aca517a81de1f1bd2cd06ed57a184
-EBUILD wine-vanilla-7.21.ebuild 10334 BLAKE2B 9b731f7b9b1802f94c5c06b374eae9d6f3867d407d9ceacec19b52ab5b23e26f8569d475aa10d961b948742094940336109c5664398f6ff0e82851d1c6fec7af SHA512 2d3ea9a457d650260fdb19e186327c5b78ce5fad178d5155813a83707548cc582905837ada8a34cd07f22afa39661f77c622a7ca3c861c91b3ba3b668fecc274
-EBUILD wine-vanilla-9999.ebuild 10401 BLAKE2B bdf428f36099f673065d81c0d8cb4026e45f85c4c68563f2228fe389d32c83add15df1ced604fbbef2eadf001f6ca3754adbd85bac570223c6e1b59feb82c886 SHA512 6d2ba7beab462964363620164574b605ecd834eaaab6c21aa374cfa98058b39f1b21bf6cfed059bb4c44827361fa149d530e732b2bb6a9e9d6c5495c8be33f56
+EBUILD wine-vanilla-7.0-r3.ebuild 10355 BLAKE2B f2d9e56ebb09de68dba8f2d0bb7c0384060185478e38acee7b076a0093a73f16283255a7ee5b9db584d4f850caa585af05792b37a248d2a5315707a938847877 SHA512 4a622689aaa1f589c3aab1790b75a8194bb50c46d695f17476a7c3fb4c41362327c1826a6869029abee33a48220e10a4accb11038f8a36ffd88ef4c4c3c0dd64
+EBUILD wine-vanilla-7.0.1.ebuild 10357 BLAKE2B 7ca11786d54fb5ff0a595e803feda0ab0848e72b403fef0a94c2eacf777e5af1ebb53487267c26d120450802ebe9d58b6b2b3d82e88e39d9f6072fa4ce16e0fb SHA512 2492f80869cce835701068a9f1f1ec5c8a6cf1d0cc2fba79f00bdb9d1a8b437ae76115d708e9741a94abb21e505dec39c3657df73a1595582e51d62e25450cf7
+EBUILD wine-vanilla-7.18.ebuild 10272 BLAKE2B 7e2b1f285f03e25d4b919326939b589e7ac6b4b10f6acfb4892c71a73bcd216f66fa00059fc10cefafc2f6ffb139f9263282eea35c0ca674a1f13714ae71e577 SHA512 d5db49c2a58b31f24fc3ff3ba5ce03f0d6a52efd0017b2b627a69173fc718c2307744191bd6a088aa7fa693ee0b52583cfddab8880d443d544ba252436ddf06c
+EBUILD wine-vanilla-7.19.ebuild 10272 BLAKE2B 7e2b1f285f03e25d4b919326939b589e7ac6b4b10f6acfb4892c71a73bcd216f66fa00059fc10cefafc2f6ffb139f9263282eea35c0ca674a1f13714ae71e577 SHA512 d5db49c2a58b31f24fc3ff3ba5ce03f0d6a52efd0017b2b627a69173fc718c2307744191bd6a088aa7fa693ee0b52583cfddab8880d443d544ba252436ddf06c
+EBUILD wine-vanilla-7.20.ebuild 10273 BLAKE2B fa8af5ca85bacdc748f36a7fb218cbc8fafb12ee49b53d63ccf2145f370f9a502016c392227ddcdb99ac2d488bf825b2f2671a2dbea0d867aad663b684e824ac SHA512 688724287c2ec191730789aeff258ca4e8af9e81bee01c522df31d39b66a20bebe928dec8f8075bd5ca230b6e759fb18cd34889eb6c358129b54e221ee918f24
+EBUILD wine-vanilla-7.21.ebuild 10374 BLAKE2B 915087bea2a7b6116f802c8fb29f3fe41a8249b2a69f501e97025fe0c63c99466f3b89bd769300ed2f968c1170683a4ddfb24c0cd9fa40dd18fae2807eff0b88 SHA512 71800fac0ff6f747da2701df52137777f8888ec6eff38950ce0eb37725d6fc5fcce1c5639cdfc3c37b934d9cc5732e78fd4c110ce3d0fa6565e627ae29154e0a
+EBUILD wine-vanilla-9999.ebuild 10375 BLAKE2B c185a517f3e7a1cd4512406ef93e2c1b55549479d0a91e0744cfbc06cf1972e5f60764b80939c8c57443b089e0dcb1ee5bbd18c9e7630b4355c139df3bd4f699 SHA512 a722662b6af9f04c0339fb9a30b2ae626b0852b57726890ec715ef3b319b8271ae80b92c30124f5b5231c492ee2426766a158f355769a7c09ba2555dd68616af
 MISC metadata.xml 2376 BLAKE2B c37d5b769ce6ea0fd6ac0cde1084a332e34c13d31633d5c60970f89a932f621c0332b97b0667bbc42098a01c979919ac9d8d30487f2ad6691259270641b85485 SHA512 2968f0df88d5d95c0c649ae15cbc9088061c915046b2014448dad782a4abfa8cb173b6ec8ac15575329e5ce882342dfd1f5076a0ea8a2e89800fdc9628dc05f9
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0-r3.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.0-r3.ebuild
index d01a63bc08c4..67946b35d11a 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.0-r3.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0-r3.ebuild
@@ -20,7 +20,9 @@ else
 fi
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
+HOMEPAGE="
+	https://www.winehq.org/
+	https://gitlab.winehq.org/wine/wine/"
 
 LICENSE="LGPL-2.1+ BSD-2 IJG MIT ZLIB gsm libpng2 libtiff"
 SLOT="${PV}"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild
index 31166690705f..ac4d2d7ec0d3 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild
@@ -20,7 +20,9 @@ else
 fi
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
+HOMEPAGE="
+	https://www.winehq.org/
+	https://gitlab.winehq.org/wine/wine/"
 
 LICENSE="LGPL-2.1+ BSD-2 IJG MIT ZLIB gsm libpng2 libtiff"
 SLOT="${PV}"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.18.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.18.ebuild
index 461aaf73995f..9b551b53e450 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.18.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.18.ebuild
@@ -20,7 +20,9 @@ else
 fi
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
+HOMEPAGE="
+	https://www.winehq.org/
+	https://gitlab.winehq.org/wine/wine/"
 
 LICENSE="LGPL-2.1+ BSD-2 IJG MIT ZLIB gsm libpng2 libtiff"
 SLOT="${PV}"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.19.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.19.ebuild
index 461aaf73995f..9b551b53e450 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.19.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.19.ebuild
@@ -20,7 +20,9 @@ else
 fi
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
+HOMEPAGE="
+	https://www.winehq.org/
+	https://gitlab.winehq.org/wine/wine/"
 
 LICENSE="LGPL-2.1+ BSD-2 IJG MIT ZLIB gsm libpng2 libtiff"
 SLOT="${PV}"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.20.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.20.ebuild
index 3ac3d5488908..f7300657747d 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.20.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.20.ebuild
@@ -20,7 +20,9 @@ else
 fi
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
+HOMEPAGE="
+	https://www.winehq.org/
+	https://gitlab.winehq.org/wine/wine/"
 
 LICENSE="LGPL-2.1+ BSD-2 IJG MIT ZLIB gsm libpng2 libtiff"
 SLOT="${PV}"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.21.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.21.ebuild
index 5b5c6577712d..71f603995e8a 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.21.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.21.ebuild
@@ -20,7 +20,9 @@ else
 fi
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
+HOMEPAGE="
+	https://www.winehq.org/
+	https://gitlab.winehq.org/wine/wine/"
 
 LICENSE="LGPL-2.1+ BSD-2 IJG MIT ZLIB gsm libpng2 libtiff"
 SLOT="${PV}"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index 19bde159c386..df7e750e1587 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -20,17 +20,18 @@ else
 fi
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
+HOMEPAGE="
+	https://www.winehq.org/
+	https://gitlab.winehq.org/wine/wine/"
 
-LICENSE="LGPL-2.1+ BSD-2 IJG MIT ZLIB gsm libpng2 libtiff"
+LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
 SLOT="${PV}"
 IUSE="
 	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
 	llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2
-	+gstreamer kerberos ldap +mingw +mono netapi nls odbc opencl
-	+opengl osmesa pcap perl pulseaudio samba scanner +sdl selinux
-	+ssl +truetype udev udisks +unwind usb v4l +vulkan +xcomposite
-	xinerama"
+	+gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl
+	osmesa pcap perl pulseaudio samba scanner +sdl selinux +ssl
+	+truetype udev udisks +unwind usb v4l +vulkan +xcomposite xinerama"
 REQUIRED_USE="
 	X? ( truetype )
 	crossdev-mingw? ( mingw )" # bug #551124 for truetype
@@ -80,7 +81,6 @@ WINE_COMMON_DEPEND="
 		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
 		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
 	)
-	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
 	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
 	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
 	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
@@ -188,7 +188,6 @@ src_configure() {
 		$(use_with gstreamer)
 		$(use_with kerberos gssapi)
 		$(use_with kerberos krb5)
-		$(use_with ldap)
 		$(use_with mingw)
 		$(use_with netapi)
 		$(use_with nls gettext)