gentoo resync : 15.01.2020

4 files changed, 3 insertions, 88 deletions

diff --git a/dev-python/pushbullet-py/Manifest b/dev-python/pushbullet-py/Manifest
index a0dd1a8c3148..56962889ad13 100644
--- a/dev-python/pushbullet-py/Manifest
+++ b/dev-python/pushbullet-py/Manifest
@@ -1,6 +1,3 @@
-AUX pushbullet-py-0.10.0-fix-filetypes-python3.patch 705 BLAKE2B d70f4746288bc3a54d4f5a780722ef04d85ae5018cb2b62d714856ce11a9596a5767218735def55a31ef9cb0c3628e3ab1422ed4e40001fc7754d2409f190058 SHA512 b349e98877eaa540c688f7e1d1c3dbfe708e2bda253f8cd177f26510716db58f8c3ac10531722a16706f7e53951cfa99268b9afa0597558630c344f7bea6bf1e
-DIST pushbullet-py-0.10.0.tar.gz 18929 BLAKE2B 900e42ce407a0baff0b24cbe6e04a3c10e1aeb9f7dbfc917cd58b2c35a2f42f81c0aa935fecdbd50d087a45d309b9baad1e3e5235568461b3e54c12874a2ac93 SHA512 2e259b76413c5e644350a891678eb98f761e56b18f5a06a9d7cc34353c7c7ee67fa875aed575b1b005782b21f4440d682db5c09be7033d52b7b9cf41e9120123
 DIST pushbullet.py-0.11.0.tar.gz 21653 BLAKE2B a6c9b6f4958ce35b63ea4043d1d4f8691885bd0aa2927af541f2080a0b0b65a7df979a497967f3adceab8ad2382448a4c6a02d1184c9d72a18d91844eb970722 SHA512 b236f30b99e5bb79eff183529716c1c8f83cfd2526fdf50d86041eb6d3fcd6670d0c4dce407ae6e50aea0fa96d6a5527af980148f0c71ef758c480f972ad9659
-EBUILD pushbullet-py-0.10.0.ebuild 1334 BLAKE2B 8817b0e6f5b9eab9171a677866df91d82e9b32c17fe71eb80abc89f8c9953fe26a8771030a9e7569c43dae81a1f998a290bd04c2509ee4324f5a8155db192630 SHA512 df6238faa5dbe262d60128372eb7d7cb7968fca45fef03f747dcbd768e3469b3b5519f1eb317ceb1dabe85a23d2307061bb955cd115705ee4075a54a674b50d3
-EBUILD pushbullet-py-0.11.0.ebuild 1140 BLAKE2B c4b318922c254373cef3abfdbde6a13e92e73cd6f269729c87eb9e237a3e58a88ee2293bbc543f313582f674fa892a9d3ae1b2c46c19fa79f231258086e2c566 SHA512 f1719d2952e2698610afa05f603182a52be3dd481e5114b9d6a6dc06f51552741874a3cc9d54ec5432989b8f5b827c45cbb79adb899459a34fe7420524c75a3d
+EBUILD pushbullet-py-0.11.0.ebuild 1130 BLAKE2B 614cf6a5ea5661cfb8748fc1376775c27e8d4d776229e38f2c0f26379fa33e2c5d937d7e31a18b9018ab6a65c4745a6b4e09a60cec7a8f37685a47c981be24b3 SHA512 a017d3919983d68b71b092dbb88311f27cd12fdd590afd36ec17dc45a0af7ebbcaf6ae0d1509a53df42b62f744d71569db99bc94c44a9894e3a81a5f435380a4
 MISC metadata.xml 459 BLAKE2B 86e83479fde9503defd709e67ea6ba81e5dd9430e1e1b4ea6545f332979173fab9a2392528007638531c58ec205f2d45ca9817f21981b4ebd94f0f81596bde71 SHA512 cda083520abafb4b81b0691234a2bc2bbdf75f4bef69943e5243492a8d8916f9924eae5f06288a6f636ef7bf36477e198dc6a33a04e55a9fd2376a03999f91a2
diff --git a/dev-python/pushbullet-py/files/pushbullet-py-0.10.0-fix-filetypes-python3.patch b/dev-python/pushbullet-py/files/pushbullet-py-0.10.0-fix-filetypes-python3.patch
deleted file mode 100644
index 09ded3540487..000000000000
--- a/dev-python/pushbullet-py/files/pushbullet-py-0.10.0-fix-filetypes-python3.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/pushbullet/filetype.py b/pushbullet/filetype.py
-index a2f2be0..22ffedf 100644
---- a/pushbullet/filetype.py
-+++ b/pushbullet/filetype.py
-@@ -1,13 +1,22 @@
- def _magic_get_file_type(f, _):
-     file_type = magic.from_buffer(f.read(1024), mime=True)
-     f.seek(0)
--    return file_type.decode('utf-8')
-+    return maybe_decode(file_type)
- 
- 
- def _guess_file_type(_, filename):
-     return mimetypes.guess_type(filename)[0]
- 
- 
-+# return str on python3.  Don't want to unconditionally
-+# decode because that results in unicode on python2
-+def maybe_decode(s):
-+    if str == bytes:
-+        return s.decode('utf-8')
-+    else:
-+        return s
-+
-+
- try:
-     import magic
- except ImportError:
diff --git a/dev-python/pushbullet-py/pushbullet-py-0.10.0.ebuild b/dev-python/pushbullet-py/pushbullet-py-0.10.0.ebuild
deleted file mode 100644
index 4d369b1e74a1..000000000000
--- a/dev-python/pushbullet-py/pushbullet-py-0.10.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-DESCRIPTION="A simple python client for pushbullet.com"
-HOMEPAGE="https://github.com/randomchars/pushbullet.py"
-# tests and examples are missing from PyPI tarballs
-# https://github.com/randomchars/pushbullet.py/pull/104
-SRC_URI="https://github.com/randomchars/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/python-magic[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-# Backport from upstream git
-PATCHES=( "${FILESDIR}/${P}-fix-filetypes-python3.patch" )
-
-python_test() {
-	# skip tests which require network access
-	PUSHBULLET_API_KEY= py.test \
-		-k "not test_auth" || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r example/.
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pushbullet-py/pushbullet-py-0.11.0.ebuild b/dev-python/pushbullet-py/pushbullet-py-0.11.0.ebuild
index 6b2549833e3b..267422432286 100644
--- a/dev-python/pushbullet-py/pushbullet-py-0.11.0.ebuild
+++ b/dev-python/pushbullet-py/pushbullet-py-0.11.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1