gentoo resync : 22.05.2021

3 files changed, 32 insertions, 1 deletions

diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index a96a9f1dda42..42f04394678c 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -4,6 +4,7 @@ AUX default.pa 328 BLAKE2B 558dbedcb5a0f31e0bdc01ce21deaeacb4740dee998f8b2f94736
 AUX gdm-2.32.0-xinitrc-ssh-agent.patch 842 BLAKE2B 98233eaf06fbe0950aa36bbc8bee2ac7ffa3cdebe75e32b8ef9a5035c383135bfc77e201d2ee07e7ec6b53770bef20484a3fba93b1cd7f434253704b70563e38 SHA512 40630ec2e7bee66102e141a0ba4d02e4202d052bb829606f684b6c23c9f3dbc2d43cea71d7eba163398251af2d7c7b34d0abafee76ccd6400521551de1c385bd
 AUX gdm-3.30.3-logo.patch 846 BLAKE2B e99b6621191c509545bc36fe838bc467c3762f2726e247aea1b3cad2a86c0b0e95c5f9953b680a072d244140615c38becbc605998a2be0ed3332d7b5ef802f55 SHA512 63428d4605d9f4f35445f364657c1d92818125a737add7bc5e5acab424beaf8ae5895368111cd2d1c03c75f5fd8b9538d8750ea732a0990b5b82507735850e4c
 AUX gdm-3.8.4-fingerprint-auth.patch 923 BLAKE2B e681da8518ed1d002c1205658bb35e472e9d130df5d70dfd9eef55f5361cffeee716ebe0eea23f4c19f9f6ec2f4118729616f7f4e2c758990cf7cde3271cc8b2 SHA512 3cf5f9c0eabdae3f767d9b9db6052d760e879c14b9304753cdda56a4f643a9ed97f3ea83f642bfe96d220c8e9e4f99fbbd47c6e99ddfebeb6322a3a033c296d5
+AUX gdm-40.0-meson-Fix-libwrap-detection.patch 772 BLAKE2B 7910f76af46d7541da9547182fe14202f3bff0e771fcb248a7f16718b675532d2b24fa109aa8ad68936c008e680717efe9ed1b785e46a520132d745ce3c85fae SHA512 cb690b9c07d61b610705454d676d5b0f9c544d299d2b890c7ae7c4b9b7cb061c02be1805d61e845d2415677333040f2ffd10f48a60725fdb149dacf8ea36dc92
 AUX gdm-40.0-meson-allow-building-with-elogind.patch 8801 BLAKE2B 358abc6b4a81523f53f6551af3c976916492c6c80fcacf8ec7c6fd90683558f1e7d898b749bdb458b2379e8a96f08293bbbebee3b8fc9126ebf249a95c514b41 SHA512 6116047fe51f0daf99de7e369028629fff88890c9627407648f2bec312df9b8b94f1ccb9b7015347258444f8193da16c6209a41de9441c848097670a13b4a7ef
 AUX gdm-CanGraphical-wait.patch 5534 BLAKE2B 3be217b156ab6d486d7df98885934c5d1bedd6219a25a83cba687aa1ed59f6d0f2a16694a47050313e601355696095ccc738ac639f5958d9619db81d34efe068 SHA512 2152e800051473b8fd230c4b325d72229cfe91dce3e90ad6d8ace8e3278483ab05ce683e61c183f7c83e293873f69715740b1eccfdb34d6775140c635c73b5dd
 AUX pam-elogind.patch 835 BLAKE2B 1db26b690d631c152ae7fd84149c7ff3222e8bd258bff78e09cd6f00fe34a8bfdb2499b252a1f15e17d9e4ed315e02260357b57cd31cf8ada5a2705ba1ef4ee0 SHA512 4d2d65741a5bfd1dc686dc986708526161d15ace2d5396bef281a2192d95458a072764483e1422ed1f6eb594fc0caa6baa381371618f907a97f75566209fab7b
@@ -11,5 +12,5 @@ DIST gdm-3.36.4.tar.xz 1235796 BLAKE2B eeac6c3c95993d7a75eecd03b51f0519b2f899eae
 DIST gdm-40.0.tar.xz 800296 BLAKE2B 9c2038758cec09f13c18bd79d431e82a29fb1a2b8ab099498a0b8d920cb93896abceab9157edae8cc15312e03d21eb36b649c2cc8761f9af5fec387c5f28a261 SHA512 b20d02f8a80f6aff8909a69c6c621c20c5aa1b25cfedd68bf95faaaa56d5f7cd5d607d1a7388b97aa06510684f1e9e474248042a00203f496c39930e001bb64c
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
 EBUILD gdm-3.36.4-r1.ebuild 7221 BLAKE2B f7f2be3915981750964e0152c486be3bf327aea4d6cbc0ecab787f2f8bc4e9237d75397af7dfee8ab599d14e07edb50a67fc3127bd4f93291e18e55acb1372f8 SHA512 1263adc59538cea24da345c80ea3e3caf90c7840a7ec0ae85d665b9d0018570578845967e16793f2ca28792669ef57a19c62bcadf4611c2fe95f8a4803149244
-EBUILD gdm-40.0.ebuild 5838 BLAKE2B c5efed804182cc6ca15e829313871c5381336cb64b2ad7e59ad1a8035af1b242ea3fea241a7f627e1ee737d1109c7a37ac91832a06b82c9f41439d0f1cf2bf47 SHA512 0c50832e8f385987e52e6c8b710529976a4dc86c52bf2c0ce52d405048f0f36c6e7eb19e9aa78dfa5172b1ad00baf67a2493008107dda43cfd747983f848ba9a
+EBUILD gdm-40.0.ebuild 5893 BLAKE2B 5c9ffc89742c04e29c9e08fb18a291172a1d1ed93e4ccf5bea5572a48df974d194625c8f74e04aa88f4cc92db613e05987224235c4e895e23a0791dcb1d61ff6 SHA512 730634dff1cbe52e693aa6dfc9216418fe8edf2b8bda90a160fef141c13ea63a52ad98ae0abe1e2648ec1dca1b439db93d651fb11e701be3fb384728f4c3d4f7
 MISC metadata.xml 759 BLAKE2B 13de28afc8fe81580a2aa28c5fdc17c77266595ffe95218cfbb5cbee4cbd6edab21e8cd06698e4a5feeb696fd9530ef8bf14209ecf3d03039b4e0562bb757375 SHA512 68cec6972bcabcb873fb314babbf9bdfacc7eaae40d662d11662fccd6cbf6630cd93b7322baa271081244c77fd1458c89ad785a0eb2a58b448ddff663381d98d
diff --git a/gnome-base/gdm/files/gdm-40.0-meson-Fix-libwrap-detection.patch b/gnome-base/gdm/files/gdm-40.0-meson-Fix-libwrap-detection.patch
new file mode 100644
index 000000000000..2742cf276413
--- /dev/null
+++ b/gnome-base/gdm/files/gdm-40.0-meson-Fix-libwrap-detection.patch
@@ -0,0 +1,28 @@
+https://gitlab.gnome.org/GNOME/gdm/-/merge_requests/142
+
+From c713ace4c71a6804734ba5b1bca4abde11ab90d1 Mon Sep 17 00:00:00 2001
+From: Bernd Feige <Bernd.Feige@gmx.net>
+Date: Wed, 19 May 2021 11:28:07 -0700
+Subject: [PATCH] meson: Fix libwrap detection
+
+Bug: https://bugs.gentoo.org/790671
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 0266a938..a490a725 100644
+--- a/meson.build
++++ b/meson.build
+@@ -90,7 +90,7 @@ else
+ endif
+ xdmcp_dep = cc.find_library('Xdmcp', required: get_option('xdmcp'))
+ if xdmcp_dep.found() and get_option('tcp-wrappers')
+-  libwrap_dep = cc.find_library('libwrap')
++  libwrap_dep = cc.find_library('wrap')
+ endif
+ # systemd
+ systemd_dep = dependency('systemd')
+-- 
+2.26.3
+
diff --git a/gnome-base/gdm/gdm-40.0.ebuild b/gnome-base/gdm/gdm-40.0.ebuild
index 7be1ee83162e..9d7deda12a19 100644
--- a/gnome-base/gdm/gdm-40.0.ebuild
+++ b/gnome-base/gdm/gdm-40.0.ebuild
@@ -117,6 +117,8 @@ PATCHES=(
 
 	# Support pam_elogind.so in gdm-launch-environment.pam
 	"${FILESDIR}/pam-elogind.patch"
+
+	"${FILESDIR}"/${P}-meson-Fix-libwrap-detection.patch
 )
 
 src_prepare() {