gentoo resync : 05.02.2020

3 files changed, 8 insertions, 67 deletions

diff --git a/net-wireless/blueberry/Manifest b/net-wireless/blueberry/Manifest
index c26659134bcd..3574072c85d5 100644
--- a/net-wireless/blueberry/Manifest
+++ b/net-wireless/blueberry/Manifest
@@ -1,5 +1,3 @@
-DIST blueberry-1.1.13.tar.gz 1382261 BLAKE2B 5b23429243bc63d864f7176139a577cb5c8aea1f00906c218c66e92b9d679ad793f6429d01f9e49f960674b1ad5100d642075a730db49dd568282ea00089d8a3 SHA512 587165b33f087720f9ae72dfb37feda9c6c3e4c4ad166a5a410c078a63bea0d33182b781f8f0c7840575917d06faec752866009c9b3664241b7ca23ab1586b94
-DIST blueberry-1.2.9.tar.gz 1402410 BLAKE2B 0b816d4ca812b18e00a88d0d5b9cd1d44086a29f656d56cb23eede9b7f5cf7380ecf802ebc04369d39cbff56912292bff10bf31724389ab4a33731d2ce61c822 SHA512 6119cc9a7e1c18db2110f568f9fc8717ff0cc1db5fa8794f95734229cc4ebbc658b9b19c9b545dabdcbfa56c4fe2c5631c5fe2e8675860645790bb1c67aaa8f6
-EBUILD blueberry-1.1.13-r1.ebuild 1337 BLAKE2B cacdc37bd1749bd5796f92f1203d9d43580e2fe2325db1ee3eeaa4e57badff81e44a03bfdec6d25145cfd502fc90735b828538003252a3fdeab02d6896bf035f SHA512 a3e0fd5df76c02c9cb920120a0b5a57dfe777d5cbdfe870d5bc33440a28c4c39890fb86f4cff72bcf0dd86517317dc1759d5aac5fa03720a4e792abd458b20b8
-EBUILD blueberry-1.2.9.ebuild 1197 BLAKE2B 12419093013856054d434ad57066fdf67a4f2febb6beac4de6d636ef646df52005fd3dc5c44cb59ef172b425df2939f74cb331c9aaa8485ca8c9c8bc4a992998 SHA512 34b00c6b907927ba216b1176abb71c218a2eee1e68c58ecc85ef1fce9ac08af26ef936367d37fe523eb8d1e4a973f3ad81900288391a41261dad03de9b4cd4b6
+DIST blueberry-1.3.4.tar.gz 1410366 BLAKE2B a684c30b7457c4df8cc1f5449891cb43d0bc314692ad1d135377c861c669b0f4f8185396f39295268821ac6403dfd035201756dea4974f31066da766e36b559c SHA512 d5ca457ace0d46aab425b6821e690a94375de1222e90d0223afa97de5ce16f77089ba84b1b47a90e6494f34d3bd6824dbd6d2ff1e41e0b9be1d7bc9611abd6db
+EBUILD blueberry-1.3.4.ebuild 1288 BLAKE2B e6a836da4933dd5046db0a0b6c66054b96583e010b068d7e18ff1e0b38dbf9457cfc6fae39bb28743d6aaf223a5d86cce942873ff63f6a65655742b9971da082 SHA512 b57f1316cee9c1b1f81d38d08e4cbb1ea050edfe90bbd3aabf30b6a4723770b3b8f35c1b9364f5f70d325220e66a47f00a4fd826a74b6292a4316d054d501cdb
 MISC metadata.xml 576 BLAKE2B 1c705170b11fd8afef9f65f90743b7d3443b3952c084b771dbf93ea5bb4765cedce34cc818334ec01c577c85774e26fcf28b45d35c601e033b3478cd7713d87a SHA512 0d04db85d6d5ce7df8bdddc00ec8ff040e3a1bfdbde15300d83b4c7d59b8577314b43716909fae926ba5ace3ed75ff9b5fed7e1da3e7f8bc54f4411018d1b445
diff --git a/net-wireless/blueberry/blueberry-1.1.13-r1.ebuild b/net-wireless/blueberry/blueberry-1.1.13-r1.ebuild
deleted file mode 100644
index 82e74e30c65b..000000000000
--- a/net-wireless/blueberry/blueberry-1.1.13-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils gnome2-utils python-single-r1
-
-DESCRIPTION="A Bluetooth configuration tool"
-HOMEPAGE="https://github.com/linuxmint/blueberry"
-SRC_URI="https://github.com/linuxmint/blueberry/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	>=net-wireless/gnome-bluetooth-3.14[introspection]
-	net-wireless/bluez[obex]
-	net-wireless/bluez-tools
-	|| (
-		>=sys-apps/util-linux-2.31_rc1
-		net-wireless/rfkill
-	)
-	x11-libs/libnotify[introspection]
-	x11-misc/wmctrl"
-DEPEND="${RDEPEND}"
-
-src_prepare () {
-	sed -i 's@^#!.*python$@#!/usr/bin/python2@' usr/bin/blueberry{,-tray} || die
-	default_src_prepare
-}
-
-src_install() {
-	doins -r etc
-	exeinto /usr/bin
-	doexe usr/bin/*
-	exeinto /usr/lib/blueberry
-	doexe usr/lib/blueberry/*
-	insinto /usr
-	doins -r usr/share
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-}
diff --git a/net-wireless/blueberry/blueberry-1.2.9.ebuild b/net-wireless/blueberry/blueberry-1.3.4.ebuild
index 6ca6d4fc15ec..9eda79f9577b 100644
--- a/net-wireless/blueberry/blueberry-1.2.9.ebuild
+++ b/net-wireless/blueberry/blueberry-1.3.4.ebuild
@@ -21,6 +21,7 @@ RDEPEND="${PYTHON_DEPS}
 	dev-python/dbus-python[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	dev-python/setproctitle[${PYTHON_USEDEP}]
+	dev-python/xapp[${PYTHON_USEDEP}]
 	>=net-wireless/gnome-bluetooth-3.14[introspection]
 	net-wireless/bluez[obex]
 	net-wireless/bluez-tools
@@ -32,6 +33,11 @@ RDEPEND="${PYTHON_DEPS}
 	x11-misc/wmctrl"
 DEPEND="${RDEPEND}"
 
+src_prepare() {
+	default
+	python_fix_shebang usr/lib
+}
+
 src_install() {
 	doins -r etc
 	exeinto /usr/bin