gentoo resync : 08.07.2021

7 files changed, 4 insertions, 179 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 7fe93e7d63b0..0ed8af909a5c 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest
index 30eff76cc44d..74a6b6f188b9 100644
--- a/net-wireless/blueman/Manifest
+++ b/net-wireless/blueman/Manifest
@@ -1,7 +1,5 @@
 AUX 01-org.blueman.rules 432 BLAKE2B c81ec47bc68be911b44056e4f0f4dd4e2939d8d5db78fbca9f4ddceb7c8ed0108bff1bc12d83ebfa9ed67f8939fdd0aea712aec4ae964f10d84a4a6077479a37 SHA512 5cea5f5e9f43e9778dd671ecfdf59e79d740abf278cd9a7250efcf790f632d9ff6b08bf82dff96292c45c3424be9dc290bb39c3bf329c853e02e0ae3f7bb213b
-DIST blueman-2.1.4.tar.xz 983816 BLAKE2B de8d475b0aec5b037df43fdb76ebbf4fdb05367f166c14cda818badf49376f2a91de246f991167a57ecaa82a84ac84b4e91f600237c35d86e27431a760192996 SHA512 b8b54942092c1984cfac0cf73e2ac23f7693cb3ee0aa4cfaab1fa0282de4afd539f6860d5541523b542956b2efa31da3ec012dcc39d92fd699d0b8479df641ff
 DIST blueman-2.2.1.tar.xz 1570992 BLAKE2B b6d2296b68990c25e6d8077b513ebd3915152522fdf66bb5d887a90cf98e8835d993caf89a93089947ff1f6470075b9b6643ee0169ba86e46d190c09fbc6942a SHA512 7668a68470e7b5ab8e5cd774c89a7ae347de4193e293b5f2a467407fcb625e07a482f986fd7b672b763c297a0c0692c1da53dcc4ae75ec7fa118b180be623104
-EBUILD blueman-2.1.4.ebuild 2911 BLAKE2B 0466450ab9b1dd3e505e6b016b63b5ddce1b54db4c0611adece1dbd0c6c6cf5a638290eaed22e450852b65d0f1cdef652b6c4ca4bbadca49fa5986800d2b5ad9 SHA512 27dac66a0403dd54b179b721b623703ccffb6b5d840d48dda11ab63d503318fb316e1858b743dee31639d921a651d872b053185f5c5ce570ca7de028c543da98
-EBUILD blueman-2.2.1.ebuild 2913 BLAKE2B c47be507556a9a6bce365107ccc5f178f0040d9f08858c9f92137d49019c6ab828fa047465c0fc225d5c1339a28e6c0d000f78da4816bed684054c76388f5e65 SHA512 2f4bbf5b8ff1df13c3779c6abca440dcc00c332abe5634012600eb9c784ef0f1e1c0bcad5906da7248ad943fbd140cc8a88ea1f071a29bf262f73cca3249e7d1
+EBUILD blueman-2.2.1.ebuild 2911 BLAKE2B 0466450ab9b1dd3e505e6b016b63b5ddce1b54db4c0611adece1dbd0c6c6cf5a638290eaed22e450852b65d0f1cdef652b6c4ca4bbadca49fa5986800d2b5ad9 SHA512 27dac66a0403dd54b179b721b623703ccffb6b5d840d48dda11ab63d503318fb316e1858b743dee31639d921a651d872b053185f5c5ce570ca7de028c543da98
 EBUILD blueman-9999.ebuild 2905 BLAKE2B 3d80557bbad6913616edbb090de49c365a99b139487acd324a07d1f781f0c0ddc776b2e6a11ebc1c118198f8e112b8b8545891bf3c2e97d2ea9c39ce9c40618e SHA512 8c344268760aacebcbe34df0e3423a11db515550f44bb54622f1c06f4249ea5a3492cb4cd83d31d47d6d9637a6c72a4f72c57d47154863d8b6fb67e9d05c1ec0
 MISC metadata.xml 498 BLAKE2B 09bb34c58c2be38b24d8fa0512f2dc2c0456b220d70d7a26a1df335dfa4320f5d4048294f4d0da96756f0456d4f1fd66f5d9d17f0f2856f0f23a02198d9a9956 SHA512 841624c8939029603a24fc35db8d1b4d0559eb499c37cd1601b55f6c28f192a736b1199f33710b0028013b5fcf83310456dd42e3ded7896592f54d72cc04dba5
diff --git a/net-wireless/blueman/blueman-2.1.4.ebuild b/net-wireless/blueman/blueman-2.1.4.ebuild
deleted file mode 100644
index 34209ec79cbc..000000000000
--- a/net-wireless/blueman/blueman-2.1.4.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit autotools gnome2-utils linux-info python-single-r1 systemd xdg-utils
-
-DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager"
-HOMEPAGE="https://github.com/blueman-project/blueman"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/blueman-project/blueman.git"
-else
-	SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV/_/.}/${P/_/.}.tar.xz"
-	S=${WORKDIR}/${P/_/.}
-	KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-fi
-
-# icons are GPL-2
-# source files are mixed GPL-3+ and GPL-2+
-LICENSE="GPL-3+ GPL-2"
-SLOT="0"
-IUSE="appindicator network nls policykit pulseaudio"
-
-DEPEND="
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-	')
-	>=net-wireless/bluez-5:=
-	${PYTHON_DEPS}"
-BDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/cython[${PYTHON_MULTI_USEDEP}]
-	')
-	virtual/pkgconfig
-	nls? ( dev-util/intltool sys-devel/gettext )"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-	')
-	sys-apps/dbus
-	x11-libs/gtk+:3[introspection]
-	x11-libs/libnotify[introspection]
-	|| (
-		x11-themes/adwaita-icon-theme
-		x11-themes/faenza-icon-theme
-		x11-themes/mate-icon-theme
-	)
-	appindicator? ( dev-libs/libappindicator:3[introspection] )
-	network? (
-		net-firewall/iptables
-		|| (
-			sys-apps/net-tools
-			sys-apps/iproute2
-		)
-		|| (
-			net-dns/dnsmasq
-			net-misc/dhcp
-			>=net-misc/networkmanager-0.8
-		)
-	)
-	policykit? ( sys-auth/polkit )
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio[bluetooth]
-			media-sound/pulseaudio-modules-bt
-		)
-	)
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-pkg_pretend() {
-	if use network; then
-		local CONFIG_CHECK="~BRIDGE ~IP_NF_IPTABLES
-			~IP_NF_NAT ~IP_NF_TARGET_MASQUERADE"
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	# replace py-compile to fix py3
-	[[ ${PV} == 9999 ]] && eautoreconf || eautomake
-}
-
-src_configure() {
-	local myconf=(
-		--disable-runtime-deps-check
-		--disable-static
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-systemduserunitdir="$(systemd_get_userunitdir)"
-		--with-dhcp-config="/etc/dhcp/dhcpd.conf"
-		$(use_enable appindicator)
-		$(use_enable policykit polkit)
-		$(use_enable nls)
-		$(use_enable pulseaudio)
-		# thunar integration is a single data file with no extra deps
-		# so install it unconditionally
-		--enable-thunar-sendto
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	if use policykit; then
-		# Allow users in plugdev group to modify connections
-		insinto /usr/share/polkit-1/rules.d
-		doins "${FILESDIR}/01-org.blueman.rules"
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/net-wireless/blueman/blueman-2.2.1.ebuild b/net-wireless/blueman/blueman-2.2.1.ebuild
index 98700e5aa44f..34209ec79cbc 100644
--- a/net-wireless/blueman/blueman-2.2.1.ebuild
+++ b/net-wireless/blueman/blueman-2.2.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV/_/.}/${P/_/.}.tar.xz"
 	S=${WORKDIR}/${P/_/.}
-	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 fi
 
 # icons are GPL-2
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 3c0233a78843..bac54313da3d 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -5,13 +5,12 @@ AUX bluetooth-conf.d 21 BLAKE2B 7c94e499438f441fc18f0b50178e707982ac91871a74b2e7
 AUX bluetooth-init.d-r4 280 BLAKE2B ecb807dec050b7c754e87b43848292ffd68afb36465739462208d1564c59d59b3c8801dca5f9ba8547efc982d972cdaeef340403c82c9fa1ad8922b0396d29bd SHA512 05fd235483c65decc8badeca1b3ec60ae59f4881cc9125f6b148afe2cbc269a636df620b6bab72ce20b6b265c73074b1afef1029aecd884dc1dbb2694c0d16d9
 AUX bluetooth-init.d-r5 313 BLAKE2B 6bad1b9a75de5927ab22a229d6ce18247b32a79b994078338eff33df7f74a7dc4a5266212f6d0150101600e3a864a9b64ce6a576208218750bfbe88bc5911baa SHA512 95aff192be6207047fc01b42754bcd34d5cd7f82c16486fdd81bb1d14be040e4f3e9bafd8dc2f4e8b87bf1eb50f6634f526feaf2b38c0c6807f40784d84dac96
 AUX bluez-5.58-rfkill.patch 2475 BLAKE2B 0f4cfd4aa97a2e4479c4b109533b4ca39cd6155a1f0a1ee854e2e972dbf294eb870a3371dfebc6fde53cfb2f45d05e0721a3d137511e8822d8628a37570713fd SHA512 094858b34c2f60dafc70ccf0aec5971c47c656c9f74dce54a68e59ca0d3a8fb2902f597588b4f64fc47a6377ef9f3198a194f09c018c9881d1df70a9f652b531
-AUX bluez-5.59-a2dp-parsing.patch 1160 BLAKE2B 9cdf83cf09bc8975429a5210726aa47b191e88cc81d838f5e51abc32a32046df20261f80cdcafb2aa35a0e1855a8159bc9585680e160178e94efa061cb78ff27 SHA512 f50fddcc1b29bdf651b7539e7dbb46da75e1917f41baa4264c4a149dfaa4b3a9a6af44b8de15a130e0f5dfed587d93a8ee8f0647cc64d83f7b8d66534fc2eba9
 AUX bluez-udevadm-path-r1.patch 564 BLAKE2B 0b4dc12f55ab60d254aa3365baf35186a5913026dbfcbc3da41c113b3c423c81189b87016dabcb2c505b684cad376d10d10df9aa17558b8fd022928995931e0e SHA512 d9b0dd452258e425802cf5ad4980a77796be79e94bf6ce641927c5ab7ea1117ce6589063f3a0b96bf25e81303234279a09d58484fec49cfc6aa1db46f245f9c6
 AUX btattach-bcm-service.sh 935 BLAKE2B cae7d78269b56038883ff74ddc7c5a3238fe4399a37cbba5c414d0396f2aff7c2a4965b56a1125dc8568e7bc848011106ab993e4c1211e704f485259373ab65a SHA512 259d10df16f4b23364da971063345b25cbf7c6a1b9f2576d3ecbd48620675392601cba017a591af1f44fe8eff8ea0c8cabeafa8adbddeb3e1014f428d37d1690
 AUX btattach-bcm_at.service 132 BLAKE2B 0af9a066a8d08d917fe80676f460297e244152d88ee02774b1e30c50febdb3fa9838c3818b80fbbf9248020dce4e1e33e2babf15a18609fddc1fd61465ecb6ed SHA512 ca6c89a676386cdaad6bfdd8a80062abe217ebd2b4484a125e4b5d0832b2c03ebed986f1806ff785664c99e1244bc164f1d152e5015fc87e46f2f6d847567b29
 DIST bluez-5.58.tar.xz 2060368 BLAKE2B 157780f83181d89fb126face5e9794bc0de8196f43d57d079fc09ae7e45e7ef21bf404e834d844da28d06f9a29cb92f11c310dbbcb7f60e845a335a558d7190c SHA512 159b554e0afd56af5da6f8333383f2fdf96d77a0e82d762bf4b37786e7312b7e61fbbae0f18b26442a606e0a232f48e0f45a4b38b95de36c7daf384f582315a3
-DIST bluez-5.59.tar.xz 2123104 BLAKE2B 59e063ffc0cd810a151f49c2d8b3e1dca46eef038dfe112bfc0524e111e00cfea78557f3d1ccf657882b76158ee9249291f9fc6e6a4cce851e0e6dc43f707398 SHA512 506ce28459a82614e5f6c55235b84e5780a9bfa821904fd40ee2928a503978248368069c57a283db9dd81f48d78f45e00d95a7c52d1538d3f5c858a29424304f
+DIST bluez-5.60.tar.xz 2124312 BLAKE2B 52cd08192cbfb7adc2e11f270442af62307dbf3cb940554f77e1ec4c30036ca1c05970d7d48719d3036173135f2b14123f2d0aad8147f0a919773d211238a11e SHA512 069e054360b4ab72f1daa033572f0fd822fb0f47e52069f4f3dcdfecfa312b9a5366cc04967e639aef39b980c0e1007389f1ee757e7c3bae43a5e66f8ed21a6b
 EBUILD bluez-5.58-r1.ebuild 9366 BLAKE2B 0645527d864c7702553e11920056c6ba4853072bdcaa86b1923f2af2ec9d19dfcccfec82e01415934c59be3ff134e0bb4628441cbad87c18bc791c8c270faa2f SHA512 cda0e4fcc9c8575d0ce0f6980ef298a121c2b535f58975b7641949a2ec225a2b2aade3f9f864ce32a24b19df6242fa69ef31e17d565935c5627101139fa172c4
 EBUILD bluez-5.58.ebuild 9421 BLAKE2B 1f0dfb997e628516a64113539e77bb545eda978bb12ce4579c05bcd8300f15c81ba84e00145018bf15837e46955d243310be80b16e320312330927183d9b709e SHA512 ac32dd551cc508a44ff9e3a045f5535bdcae4279f2da7529208a390f4e247de6c253252aed3fc3114967a3ea576de16858f40b091bf0479a8b7a961fede43804
-EBUILD bluez-5.59-r1.ebuild 9381 BLAKE2B 76b9e0e0dac6378eaa53a5888db70b4bb1548878d870cbb703a80b0a7a7795ddce99714d30f2c37288473b41565b634dfb0dcac12eb18b3fd94be8ea9fa6fca2 SHA512 ac67d314bfdce3ceeef92c2bc72932ae32587b602e3ceff3a5842ef8a32b1533bf59c46ff3b0d257b1e53d72b974fbe199427a2b0ae28d891c8be0f05e953c5c
+EBUILD bluez-5.60.ebuild 9290 BLAKE2B 39092d23738b7292373d1fbb82122159d85d9be1ffcd4cb65e09d125537dcfe43c0ffd859fd33c0d515d46dd7261a0394ec715e570e1802cc126bd14dbb3569c SHA512 c8873673fde7237d870dc58ce3f8d18edcde46c2b8f69b1828c1971a3d4fc46a4c2a3a8fb15ce944e6f3f003af80ac07be5740847e46e9adb441382ee3fced42
 MISC metadata.xml 1211 BLAKE2B 5e605af395041afd8b790d21b33b816ce3b960458375d51243e8a763302ce1fdc69da2ffd119966c88c261f3e13fd9b48241c2955eebc78d64da887599bb9830 SHA512 c35cd78b8f49fe1142f2ae203571e558a8d45d435eeb7a5e57260192869658d5c39c4f671f99225cdb1530309a7bdea37d572522d8fe9d5354b1e25f5ffd556f
diff --git a/net-wireless/bluez/bluez-5.59-r1.ebuild b/net-wireless/bluez/bluez-5.60.ebuild
index 898115e910a6..9f2c32a2449b 100644
--- a/net-wireless/bluez/bluez-5.59-r1.ebuild
+++ b/net-wireless/bluez/bluez-5.60.ebuild
@@ -63,9 +63,6 @@ RDEPEND="${DEPEND}
 RESTRICT="!test? ( test )"
 
 PATCHES=(
-	# avdtp: Fix parsing capabilities (from 'master')
-	"${FILESDIR}"/${P}-a2dp-parsing.patch
-
 	# Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844)
 	# http://www.spinics.net/lists/linux-bluetooth/msg58739.html
 	# https://bugs.gentoo.org/539844
diff --git a/net-wireless/bluez/files/bluez-5.59-a2dp-parsing.patch b/net-wireless/bluez/files/bluez-5.59-a2dp-parsing.patch
deleted file mode 100644
index 40569ec9805c..000000000000
--- a/net-wireless/bluez/files/bluez-5.59-a2dp-parsing.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 0388794dc5fdb73a4ea88bcf148de0a12b4364d4 Mon Sep 17 00:00:00 2001
-From: Archie Pusaka <apusaka@chromium.org>
-Date: Thu, 17 Jun 2021 08:53:34 +0800
-Subject: avdtp: Fix parsing capabilities
-
-This patch fixes size comparison and variable misassignment.
-
-Reviewed-by: Alain Michaud <alainm@chromium.org>
-Reviewed-by: Michael Sun <michaelfsun@google.com>
----
- profiles/audio/avdtp.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/profiles/audio/avdtp.c b/profiles/audio/avdtp.c
-index c7bf99f42..5d13104c1 100644
---- a/profiles/audio/avdtp.c
-+++ b/profiles/audio/avdtp.c
-@@ -1323,7 +1323,7 @@ static GSList *caps_to_list(uint8_t *data, size_t size,
- 
- 		cap = (struct avdtp_service_capability *)data;
- 
--		if (sizeof(*cap) + cap->length >= size) {
-+		if (sizeof(*cap) + cap->length > size) {
- 			error("Invalid capability data in getcap resp");
- 			break;
- 		}
-@@ -1345,7 +1345,7 @@ static GSList *caps_to_list(uint8_t *data, size_t size,
- 		switch (cap->category) {
- 		case AVDTP_MEDIA_CODEC:
- 			if (codec)
--				*codec = cap;
-+				*codec = cpy;
- 			break;
- 		case AVDTP_DELAY_REPORTING:
- 			if (delay_reporting)
--- 
-cgit 1.2.3-1.el7
-