gentoo resync : 06.04.2022

3 files changed, 2 insertions, 40 deletions

diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index a66a43605635..e90936aa650e 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -7,12 +7,12 @@ AUX bluetooth-conf.d 21 BLAKE2B 7c94e499438f441fc18f0b50178e707982ac91871a74b2e7
 AUX bluetooth-init.d-r5 313 BLAKE2B 6bad1b9a75de5927ab22a229d6ce18247b32a79b994078338eff33df7f74a7dc4a5266212f6d0150101600e3a864a9b64ce6a576208218750bfbe88bc5911baa SHA512 95aff192be6207047fc01b42754bcd34d5cd7f82c16486fdd81bb1d14be040e4f3e9bafd8dc2f4e8b87bf1eb50f6634f526feaf2b38c0c6807f40784d84dac96
 AUX bluez-5.62-fix-disconnecting.patch 2244 BLAKE2B fe2d3b975adda9422ac8bfd41c1cedc70cafd363982e4a415b057498e83feaf989fff7fe78fcbfa9b4fcdb1c1629347bd6380259ef71bf8c5ac78386b7990231 SHA512 2cf7b4929ab2f8f7e68546ba15ab7f74bcb748f741d6d6cc189ead14becd3403d0d6393b0645fccd215da3aee90360db28cd327802cf2ff3212f0487edaa3e95
 AUX bluez-5.63-musl-limits.patch 558 BLAKE2B 2dd66c54aee0bd8bfe3fd530a4e29139d79f6eb153e06e13680df42f2a361274d6a8f0f80989b7962173d693f37d1cac8b16506267a1319e608382511cf4bfe1 SHA512 b752414c8219befb71e0f0a59fa33be5a0d2add2b89a0c8f90de13aef1815307e5f4b8f076d3778778ab3de6656fd50d59f621af50d9ed39695b5f7978660348
-AUX bluez-5.63-use-queue_push_tail.patch 938 BLAKE2B 2fc40087e8b362a331e0df9ba4c364a4f61b282ae8c7e51c6251a5550cc3df7f44b19e57e6ea4d80f536b718c6c5b73a93a385feff7382e9d6f0041827fc8442 SHA512 807a4b340df65b49a6e9ce5a2f7be6d84ec3588d13475f9607706cd8f6f6851ed9752357fd844aab28a18beaf2dd0ededfff05ff64d159613f2395a398de85a1
 AUX bluez-udevadm-path-r1.patch 564 BLAKE2B 0b4dc12f55ab60d254aa3365baf35186a5913026dbfcbc3da41c113b3c423c81189b87016dabcb2c505b684cad376d10d10df9aa17558b8fd022928995931e0e SHA512 d9b0dd452258e425802cf5ad4980a77796be79e94bf6ce641927c5ab7ea1117ce6589063f3a0b96bf25e81303234279a09d58484fec49cfc6aa1db46f245f9c6
 DIST bluez-5.62.tar.xz 2149348 BLAKE2B db99b36a230fc0be15275d2eda9864b686326ba50648f66b19087ea4309a76d234ab4f1dcb6975f1513a898978b1d5b9332542f5dcee22efd898b79658434a70 SHA512 8fb0b81e1d929d3eee3d70f457ce75dbcff4c2a8a728247fc950bbe11e84d83582345bfd433d2e2df7b5588eb0e42f286658a83c7332be84819d9df49a5707e8
 DIST bluez-5.63.tar.xz 2169168 BLAKE2B 5393bb045a3cf05de164417ce7c98e271742ba752a58aa1ac43a758f2ad8608508e24ff59783d97aa6d5aebdc77e66d9aca94a6c8378cd3fd48fd22ce9d3b89d SHA512 1b8ce7b1bd9611873c27a762a60df580edeefe5424e8733a2067b9afb1a47915f9319849bc1eeee148f5b1f33977b7975e05867e8dbdf73d33cd68e6b99ca75b
+DIST bluez-5.64.tar.xz 2175148 BLAKE2B 828c620330d1993d5c5c2a865f2d27a29425e3583aac01a1a782290a805ee0fd6456b6832c804ad323dd8714fa9329487b2616ed08f1f491ea29403ee05dba2d SHA512 f11f9974b29c5c6fce3890d7e42425c1cb02e42c1b8f49c5cc4b249234e67b64317d0e5e82721e2fbf1b53269c8569a9c869d59ce42b5e927f6622f0753e53cd
 EBUILD bluez-5.62-r2.ebuild 9103 BLAKE2B cf83b34b46fcbaecb4d1a2d2e583b34d67534d18bf7ceeacbee589fda4d2d3bb9be4aa6bde8cbbce3311106c55e14d3eb7136c1c86cf4943dc3b8b8e9d161963 SHA512 750e391d3dc10225288037537624bd53aea605581a3a0124979d846e7e54147b72913e2c182a4e571699c33246473a42f5e56e6af578db38e256248954a9ee66
 EBUILD bluez-5.62-r3.ebuild 9518 BLAKE2B 6094902d7b691ee93c3d45b808cd3af6967f870188cbef2dcf509880a53ae08a343255535876af6162eb4cdda610c8f8672e803cb665d015c4c22a2e5e4937ea SHA512 4e552fde3a2350bf26aceea56f79881d8d7b751d723c70e29618cf6b81a0ffe12fa2aa9ecfeebcdda6fe24a322c0425ab232c715e7081eb8a976dbd983d3b133
 EBUILD bluez-5.63-r1.ebuild 9528 BLAKE2B f34f340268f324dc3de2a96acc32c1407d933e5186a2987072bb7afb412ce3fead50378805dc0b27d9c7cd427ce0fe0131fb5101c219c1af4d62db4a98816691 SHA512 5b2ed09edb772f167266f56cec1850d0bd926b3723be88c7dc97d8d5c093aff540324a45fa04252c5b2fd35938ce12947718dae04635b8bef3dcfc2fd1774f08
-EBUILD bluez-5.63.ebuild 9861 BLAKE2B 3e86ee3508fa787d0fc6deb115f50eafd0cebfde6f0685a0a443c318bf43d137a09d5f1d9f055987c646c55c1181145a81fccfcd20e1dd0ec9d8b2062e4e4aa4 SHA512 3a47f1e70463b54c62cbbdbfb100682926728ab950820c90fb41498758570b548202c81a2349e3321b8148ddb75e6a00850b7333e19229279e5450ae4d144a67
+EBUILD bluez-5.64.ebuild 9326 BLAKE2B f5bc3babf4f8fc536cb442a3b3782dc2c142a9405cb14db90ef81c71df374dc5b29dbf0603695b6f1652db891c435bfbc99de38bb0422feaff4c2316e4948e84 SHA512 9839ea395fac81ee4886f784f85e86983c85ef79a531682215d1ae6d336e65e3750e78132dd8ddf2057ef07aeeb550200eab75493f4708dee6bca8f4df4f061e
 MISC metadata.xml 1099 BLAKE2B 75b6db1d43b75f9b22ce5fb6ec640e2e06b2f2575ff75441318a2076b8486ed7d81a62714540c61ab3a35198113538546b9aa71d05ef4cd7106c8a7f09c13029 SHA512 6e4a7bba7102b4850a938ba0f6feec9cd12488d4b440b19982751c2a742b33a565933fae3967080c060e5b5eb51d90268abc87a2c0a2efb7f4c773020c29462a
diff --git a/net-wireless/bluez/bluez-5.63.ebuild b/net-wireless/bluez/bluez-5.64.ebuild
index b2c07f35899e..4a2ade79d8d9 100644
--- a/net-wireless/bluez/bluez-5.63.ebuild
+++ b/net-wireless/bluez/bluez-5.64.ebuild
@@ -72,14 +72,6 @@ PATCHES=(
 	# Fedora patches
 	# http://www.spinics.net/lists/linux-bluetooth/msg40136.html
 	"${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
-
-	# This reverts commit ac2c2e10b3adb432a572b618c6f53cabb6b3c80b. It
-	# causes problems with Logitech MX wireless input devices (see
-	# https://github.com/bluez/bluez/issues/220 )
-	#"${FILESDIR}"/0001-Revert-attrib-Make-use-of-bt_att_resend.patch
-	# Instead of reverting, try another fix that seems to work as
-	# reported in upstream bug
-	"${FILESDIR}"/${PN}-5.63-use-queue_push_tail.patch
 )
 
 pkg_setup() {
@@ -113,9 +105,6 @@ pkg_setup() {
 src_prepare() {
 	default
 
-	# Skip test failing due to fixes for https://github.com/bluez/bluez/issues/220
-	sed -i -e 's:unit_tests += unit/test-hog::' Makefile.am || die
-
 	# http://www.spinics.net/lists/linux-bluetooth/msg38490.html
 	if ! use systemd; then
 		eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch
diff --git a/net-wireless/bluez/files/bluez-5.63-use-queue_push_tail.patch b/net-wireless/bluez/files/bluez-5.63-use-queue_push_tail.patch
deleted file mode 100644
index 6644e250cc48..000000000000
--- a/net-wireless/bluez/files/bluez-5.63-use-queue_push_tail.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 7b41f0c38ab34c9a5eec1a70669d183535e86287 Mon Sep 17 00:00:00 2001
-From: Florian Schmaus <flo@geekplace.eu>
-Date: Fri, 17 Dec 2021 14:05:50 +0100
-Subject: [PATCH] DRAFT shared/att: Use queue_push_tail for
- BT_ATT_OP_READ_BLOB_REQ
-
-As repoorted by Christopher Schramm [1], this is supposed to fix #220.
-
-1: https://github.com/bluez/bluez/issues/220#issuecomment-996669412
-
-Suggested-by: Christopher Schramm <git@cschramm.eu>
----
- src/shared/att.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/shared/att.c b/src/shared/att.c
-index 169f726e4..5ce735a07 100644
---- a/src/shared/att.c
-+++ b/src/shared/att.c
-@@ -1653,7 +1653,6 @@ int bt_att_resend(struct bt_att *att, unsigned int id, uint8_t opcode,
- 
- 	switch (opcode) {
- 	/* Only prepend requests that could be a continuation */
--	case BT_ATT_OP_READ_BLOB_REQ:
- 	case BT_ATT_OP_PREP_WRITE_REQ:
- 	case BT_ATT_OP_EXEC_WRITE_REQ:
- 		result = queue_push_head(att->req_queue, op);