gentoo resync : 04.01.2022

3 files changed, 4 insertions, 36 deletions

diff --git a/net-wireless/bluez-tools/Manifest b/net-wireless/bluez-tools/Manifest
index d3cc83d36ed8..7f8319c3f4c6 100644
--- a/net-wireless/bluez-tools/Manifest
+++ b/net-wireless/bluez-tools/Manifest
@@ -1,4 +1,3 @@
-AUX bluez-tools-0_p20161212-gcc-10.patch 2377 BLAKE2B 80aeefa71c6096f6c6e61e326f67b5f727c4d262ab9daa9c501069bbb2caf89c651850fcf3ab226a026a9b079135ac99dac3e5b9f3056556dba9fc549abe07a4 SHA512 2b91be22769660c57d50a1269e03c05e5489550f5dcdce5b29bada4074f6ffeeb9ee3074ce4935b6684ab37ec132f2dbf6ecba056d1e860eebc586f65573c208
-DIST bluez-tools-0_p20161212.tar.gz 126613 BLAKE2B 474393862049a893280eeb0b7f466a1b1165a14d0ab33cbd9d3ca805a15eef237761aa3038423de85280bcaaf1385c3c7ab313d4cc3199f284aba86d8e5ed16e SHA512 ab5dd4a223348aab29fae22f552afae989b74d56c3fa46fd5587c100d63309649a10a87591bc040082545f45b7bb95360fcf6a48812012edbdb93570b0e166f7
-EBUILD bluez-tools-0_p20161212.ebuild 714 BLAKE2B b66ac5ba6aa24a2c6d66933bf34a48b7e3e58a1d23f6bc46677cdfe2c06bc2cf9bfe79d837e5bf122e0aadb3ac7a615757f3a97680323dc2a1580e846551d2c7 SHA512 48837e2acff844920fec856a41ba7c7ac1646fcb616577488354fb5cd684f6672445179cd78c80dfee887fb74f08381cf4ef0bcf2b8a88f554f4c3d9e0c71704
+DIST bluez-tools-0_p20201025.tar.gz 126646 BLAKE2B 6deea6a12ee1050cbe12592fe202be60f032a7ee9a8f790537ef24c3a2562d90abf88f69690e6dd53f16841a256fc82dcfb078b2d708531ca6c50f63b6e84274 SHA512 631dfa7ee7e1bfe487db90f9df692c4136d6258ddd34cda269e3a9538a3c8fe8bad3bac595e57d74789df2da4e15fa0ca7b83374e7f6457695701852b3744b12
+EBUILD bluez-tools-0_p20201025.ebuild 669 BLAKE2B 3129acab9b87af904bd0736e57795c5572cef063272b7fbea1892698c0c31b11383bb3b313377fd651d0b74c85241ef1db6d16c5e2492810a1bd3cd29b65dc73 SHA512 496d4592bd005435a1aa299e958fcc6ba588998545750d38b51c94516d912d4c2ab51f6a12ea6cb19bb4f678539e4787035ce6742dfccc64f2f9d8a8c2a851ad
 MISC metadata.xml 493 BLAKE2B ccf8502521d6170754ffb9c8948120335df657d264fa50cf93b3fe59367d8911b5fdf147b35d9220d88e3b1ca1e27dfee66aca988a8bdd02a13a1ff008b706e8 SHA512 84d552eed7402229cabbd469cd4bf415676eec9556ed49f093958f2b617bf340db86b79dcb36765edd6fa9197b01190439b655b1812222773d322ac5534373f4
diff --git a/net-wireless/bluez-tools/bluez-tools-0_p20161212.ebuild b/net-wireless/bluez-tools/bluez-tools-0_p20201025.ebuild
index 6585af370e24..755069585081 100644
--- a/net-wireless/bluez-tools/bluez-tools-0_p20161212.ebuild
+++ b/net-wireless/bluez-tools/bluez-tools-0_p20201025.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit autotools
 
 DESCRIPTION="A set of tools to manage bluetooth devices for linux"
 HOMEPAGE="https://github.com/khvzak/bluez-tools"
-COMMIT="97efd293491ad7ec96a655665339908f2478b3d1"
+COMMIT="f65321736475429316f07ee94ec0deac8e46ec4a"
 SRC_URI="https://github.com/khvzak/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
@@ -23,8 +23,6 @@ DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS README )
 
-PATCHES=( "${FILESDIR}/${P}-gcc-10.patch" )
-
 S="${WORKDIR}/${PN}-${COMMIT}"
 
 src_prepare() {
diff --git a/net-wireless/bluez-tools/files/bluez-tools-0_p20161212-gcc-10.patch b/net-wireless/bluez-tools/files/bluez-tools-0_p20161212-gcc-10.patch
deleted file mode 100644
index 6bfaa57fa19a..000000000000
--- a/net-wireless/bluez-tools/files/bluez-tools-0_p20161212-gcc-10.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/src/lib/agent-helper.c	2016-12-12 09:18:08.000000000 +0100
-+++ b/src/lib/agent-helper.c	2020-01-30 22:23:27.555951515 +0100
-@@ -33,6 +33,8 @@
- 
- #include "agent-helper.h"
- 
-+gboolean agent_need_unregister;
-+
- static const gchar *_bt_agent_introspect_xml = "<node name=\"/org/blueztools\">\n\t<interface name=\"org.bluez.Agent1\">\n\t\t<method name=\"Release\">\n\t\t</method>\n\t\t<method name=\"RequestPinCode\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"pincode\" direction=\"out\" type=\"s\"/>\n\t\t</method>\n\t\t<method name=\"DisplayPinCode\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"pincode\" direction=\"in\" type=\"s\"/>\n\t\t</method>\n\t\t<method name=\"RequestPasskey\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"passkey\" direction=\"out\" type=\"u\"/>\n\t\t</method>\n\t\t<method name=\"DisplayPasskey\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"passkey\" direction=\"in\" type=\"u\"/>\n\t\t\t<arg name=\"entered\" direction=\"in\" type=\"q\"/>\n\t\t</method>\n\t\t<method name=\"RequestConfirmation\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"passkey\" direction=\"in\" type=\"u\"/>\n\t\t</method>\n\t\t<method name=\"RequestAuthorization\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t</method>\n\t\t<method name=\"AuthorizeService\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"uuid\" direction=\"in\" type=\"s\"/>\n\t\t</method>\n\t\t<method name=\"Cancel\">\n\t\t</method>\n\t</interface>\n</node>\n";
- static guint _bt_agent_registration_id = 0;
- static GHashTable *_pin_hash_table = NULL;
---- a/src/lib/agent-helper.h	2016-12-12 09:18:08.000000000 +0100
-+++ b/src/lib/agent-helper.h	2020-01-30 22:22:15.463751152 +0100
-@@ -35,7 +35,7 @@
- #define AGENT_DBUS_INTERFACE "org.bluez.Agent1"
- #define AGENT_PATH "/org/blueztools"
- 
--gboolean agent_need_unregister;
-+extern gboolean agent_need_unregister;
- 
- void register_agent_callbacks(gboolean interactive_console, GHashTable *pin_dictonary, gpointer main_loop_object, GError **error);
- void unregister_agent_callbacks(GError **error);
-@@ -44,4 +44,4 @@
- }
- #endif
- 
--#endif /* __AGENT_HELPER_H */
-\ Pas de fin de ligne à la fin du fichier
-+#endif /* __AGENT_HELPER_H */