gentoo resync : 28.04.2021

3 files changed, 28 insertions, 11 deletions

diff --git a/net-wireless/gnome-bluetooth/Manifest b/net-wireless/gnome-bluetooth/Manifest
index 4cb6cc946c6f..4f3a717586d7 100644
--- a/net-wireless/gnome-bluetooth/Manifest
+++ b/net-wireless/gnome-bluetooth/Manifest
@@ -1,6 +1,6 @@
 AUX 61-gnome-bluetooth.rules 399 BLAKE2B ba3dd9fdc3834ce6a3460d8abff179d08c1258f7ba43e2350ed2c7e88aaf6fef4b06c51b6212650523c4de577cb3a85946bae9b955cf6c17a0c984431abd5d2b SHA512 74fd95e2afb3d3f13df72bb593ae6644a3a4975e43f5f50c622f14f756861596ef92aa331200d9fce6ff3976e8a1ed57e4053186b7a9716039ace971a6dfed0d
-DIST gnome-bluetooth-3.34.1.tar.xz 354568 BLAKE2B 53e0f4d172e12ba1fec8dae476929fadaab2fd0a8e8ac063debbe516f925a3bb04c9000012fc2e143baf00c7bbdd4f2bd31bd64e674c1851e4ec544ab9c058a5 SHA512 3e0080bbeeddc144fdcf6b4f0d59b0885fd5881aee670d2e5dffd4ede9b0f988358ad0e815ba86add8b7fd5e93e1f8fc7bfacd10b8d69606aa569fd67356be08
 DIST gnome-bluetooth-3.34.3.tar.xz 353032 BLAKE2B fbf75328780d54307ebf6f8d9d58080060d05b3d76665e3c09f3d2bbc033dbda87a7d4eb43d8fe751955f8240febc13d0446cab1bac085c4a73e9c4e9ff25033 SHA512 a20985576fbc0594a198c8f58e6098db24c73454a9dfc0f5f47581a1bfc0a72e3f0d2592f4a01593c5ed132e4924d934d4d65fd501d274f3b032e1e548794272
-EBUILD gnome-bluetooth-3.34.1.ebuild 1416 BLAKE2B 41cdc757dd5c02b43f6966adc9bb5d783f9991463a86be613df87db1ab15d3c958ab5a2984cccc3b6b41d9e81bb11daf31fc27455fb22e6fe523ad0e3e4f70f7 SHA512 60951a8e75b57c2efb3afee9b99495431f8b8f4468a46d0a5fb54049e528007058735fae3914a7875731c86901a40197ec9d57af6fb8d5308c0fad2de578c301
-EBUILD gnome-bluetooth-3.34.3.ebuild 1391 BLAKE2B eeb8b0ab3c80b669b6cad439f01e12048ac8186f72a3088e986f2548f8136f3d67e4278960d387bc524836bc30d0830089a8f65844f7180fdc831d081646818f SHA512 cfa4c0d416a55232cdeb36f131e7eef071acadf1865704ec32aac9182456a4898d17ce18c380705e421ff47318b9b4da4202fda6fba919ae9278388d3d0a1ea3
+DIST gnome-bluetooth-3.34.5.tar.xz 353936 BLAKE2B 40300752830f71d436591e22a64a282745d8419ee46de534f76c4871a86a4c8f7b2203e3ddc4ca08d26348b97bf4a68315802ffa09c69265c55001e4806c7f1e SHA512 48431b3d19083705a6623442c5cd2d6c14962cdf30fc599ba47dceb6612b80142af77e1b6df142b530cb1015638081a06de38a3034177e0d05a354c40f19d9e5
+EBUILD gnome-bluetooth-3.34.3.ebuild 1389 BLAKE2B 8cf7ca17538dc4bcdfaeea83219dcbbe317a6826cd395c9b7d1416032a71b0a3b9561c31e901d594d6bc3692b53533321718061fe1fdb29f85c50b9e0fb5aeef SHA512 e56c680a991c1062635cfb2a7560094b8d162b330d209b2ca593ac6aa613397022475b680608c2b7ae1e9cc5ea2d8a80c2cbdd7ee73b04ac896869ac03d21b74
+EBUILD gnome-bluetooth-3.34.5.ebuild 1753 BLAKE2B adb6e1645553587e050fa8e715e65b2f73404f35c611f0c0912c6dac06482d89a23e7145f35b3e8c1a2c0f6742e9003dd4fe72de99e50b6ef0714b10afaca8fa SHA512 dac40b54a3047dbe107a5a1265c773c63fb75c357515c26f41a5fb8a63317b32ab4b36b40c2b46d2943975b886a859ceb77970125667c6cac0a7b297c4d11de4
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.3.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.3.ebuild
index 7c54fde9613e..c110c74dd13b 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.3.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeBluetooth"
 LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
 SLOT="2/13" # subslot = libgnome-bluetooth soname version
 IUSE="gtk-doc +introspection"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 
 DEPEND="
 	>=dev-libs/glib-2.38:2
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.1.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.5.ebuild
index e74ac095196b..645a2ed658b7 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.1.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.5.ebuild
@@ -2,18 +2,20 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit gnome.org gnome2-utils meson udev xdg
+PYTHON_COMPAT=( python3_{7..9} )
+inherit gnome.org gnome2-utils meson python-any-r1 udev xdg
 
 DESCRIPTION="Bluetooth graphical utilities integrated with GNOME"
 HOMEPAGE="https://wiki.gnome.org/Projects/GnomeBluetooth"
 
 LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
 SLOT="2/13" # subslot = libgnome-bluetooth soname version
-IUSE="gtk-doc +introspection"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
+IUSE="gtk-doc +introspection test"
+RESTRICT="!test? ( test )"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 DEPEND="
-	>=dev-libs/glib-2.38:2
+	>=dev-libs/glib-2.44:2
 	>=x11-libs/gtk+-3.12:3[introspection?]
 	media-libs/libcanberra[gtk3]
 	>=x11-libs/libnotify-0.7.0
@@ -26,15 +28,30 @@ RDEPEND="${DEPEND}
 	>=net-wireless/bluez-5
 "
 BDEPEND="
-	>=dev-util/meson-0.49.0
-	!net-wireless/bluez-gnome
 	dev-libs/libxml2:2
 	dev-util/gdbus-codegen
 	dev-util/glib-utils
 	gtk-doc? ( >=dev-util/gtk-doc-1.9 )
 	virtual/pkgconfig
+	test? (
+		$(python_gen_any_dep '
+			dev-python/dbusmock[${PYTHON_USEDEP}]
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+		')
+	)
 "
 
+python_check_deps() {
+	if use test; then
+		has_version -b "dev-python/dbusmock[${PYTHON_USEDEP}]" && \
+		has_version -b "dev-python/dbus-python[${PYTHON_USEDEP}]"
+	fi
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
 src_configure() {
 	local emesonargs=(
 		-Dicon_update=false
@@ -51,7 +68,7 @@ src_install() {
 
 pkg_postinst() {
 	xdg_pkg_postinst
-	if ! has_version 'sys-auth/consolekit[acl]' && ! has_version 'sys-apps/systemd[acl]' ; then
+	if ! has_version 'sys-apps/systemd[acl]' ; then
 		elog "Don't forget to add yourself to the plugdev group "
 		elog "if you want to be able to control bluetooth transmitter."
 	fi