gentoo resync : 08.06.2019

4 files changed, 2 insertions, 85 deletions

diff --git a/dev-python/mygpoclient/Manifest b/dev-python/mygpoclient/Manifest
index 927a7155d334..f604a1d84b81 100644
--- a/dev-python/mygpoclient/Manifest
+++ b/dev-python/mygpoclient/Manifest
@@ -1,7 +1,4 @@
 AUX mygpoclient-1.8-tests.patch 1635 BLAKE2B fb92cd995755013dbb2b35424de88d5c949485e818be45e00c89192bb60b9506690b971fd586c08d7be31e7680c54586a015cd8dee299320fbbccf87c9ea70ab SHA512 9036f3328ed4980858db07f57661300e429c15ca8159118067d1385f8cf0ed5fcbcb7ef498dd12336c9fe2b8e5d22c944b8cd1f4043d418c5ce2b706a47aa239
-AUX tests.patch 1727 BLAKE2B 4715320acd97346342aed76f41b684469043e04ffbb6c6516da4b9df14b78369aafd38eb167358113cbfd673041ca93b00890af64a0a64a08658fe2b4eaf3ed5 SHA512 dfd7f07575cf0816ac1072757e5ee64d696fda020ec7baaa492f97309a55f8c8758f87b1aa75752550beb2fc83a953b2937b746f8672ecd1370d283c20a4c21e
-DIST mygpoclient-1.7.tar.gz 36423 BLAKE2B 6331eff9d095a705cb805a8984f530b418d8f8f61dcb239fd3dba4236c8f376dcb329747887c4f22f66ca657525c3333ea260d5e2d2093a37d33dea43d2ca93d SHA512 618c94cea37f427fbef333a7cecade12fadda33bd727814b4ce904e74aae65d4ba85d7d09578b9e5b6b9fb0b2f6fe0f73abbd7f60d66b3d9b51dabb554169e9f
 DIST mygpoclient-1.8.tar.gz 43671 BLAKE2B 0a1c10c00a9ee034acc17bb5e28d1ebab50a14f3eea534f4a4277172251ce567a26e7ab66859a66d89d4adc06f44dfe5899edb0aeec45e90e461a4a8cb3ff337 SHA512 1edecd5ccb116c7f4017ebe6572439d87ff76501ed0628934e548dc0c9c041127a11ec9f4def4a54a6f7fabe46a461c863ec2ff2f8c14c3c67b5d1fd9285bb9f
-EBUILD mygpoclient-1.7-r1.ebuild 1116 BLAKE2B 0f4b9eb116f842dc63b6d2f6bbf43b06ade103ec326770dce078cebc77234dc68b4125f190d6808ac302cfc72ba2a29a716d12625025ebbd0ac47f2ea6964b6f SHA512 b8e022f08d66dd44be870791ec9eb357aea89208913cd923d582d1f934eb9e449328e038550df53ca3f43356cbe1ab8856e003127b2a390d71a7348d58569373
-EBUILD mygpoclient-1.8.ebuild 1147 BLAKE2B 00af85fb48de979dd3d80a416130aa9c82be5f387afb7756f68442f5d1280f0a9136c2fb0bf6c942a341831551211ef98c25e66e5a6552e90be5d1626043684f SHA512 02a6cb6f9209f96c0156fb46f1ae441b0ae43c85d7460c0456fae7cb7dd933f9b216d241e1a3f7ceb9695e9556922a52cbd6aaf5eaed9b24f51268835ff709be
+EBUILD mygpoclient-1.8.ebuild 1146 BLAKE2B a512aedf5b7de5d02bddf37f6275f765bb0edb16e255fd54bb11f454de8d7fd1cd232b1126d3256c3f030dafbfa3b5a1c31134402637a1772499965ab334cb9a SHA512 9674780f73fcf02aec81cfe9250b798df7cd7d6bc551a3a1fdde69077505cf83237095815d07e13e7a084d664655a6b2c1e61c317fba987899374c27557a773c
 MISC metadata.xml 346 BLAKE2B f7a2d7e94b509007e77797724c67413616c4833eab04227f65088bc01cee098da763738c810adcfd0be1b13de261240b24d80ca2940925a847df4638709cfa1e SHA512 83fb6ffd70d907e1fd4be3ba91e781cf9131a980338b2fe66874fecde7673bd40df0005b34f5f52c2a7ec88e4b3e92ef2417d293474c1b51ecd06ff4ee6edf2f
diff --git a/dev-python/mygpoclient/files/tests.patch b/dev-python/mygpoclient/files/tests.patch
deleted file mode 100644
index 041cee501a00..000000000000
--- a/dev-python/mygpoclient/files/tests.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -ur mygpoclient-1.7.orig/mygpoclient/locator_test.py mygpoclient-1.7/mygpoclient/locator_test.py
---- mygpoclient-1.7.orig/mygpoclient/locator_test.py	2013-02-08 19:39:32.000000000 +0800
-+++ mygpoclient-1.7/mygpoclient/locator_test.py	2013-03-09 23:33:37.137651841 +0800
-@@ -16,7 +16,7 @@
- # along with this program.  If not, see <http://www.gnu.org/licenses/>.
- 
- from mygpoclient import locator
--import unittest
-+import unittest, sys
- 
- class Test_Exceptions(unittest.TestCase):
-     def setUp(self):
-@@ -54,18 +54,21 @@
-                 podcast='http://example.org/episodes.rss',
-                 device_id='gpodder')
-     
-+    @unittest.skipIf(hasattr(sys, 'pypy_version_info'), "pypy doesn't raise ValueError")
-     def test_device_settings_uri_exception(self):
-         """Test if using no parameter for a device Setting raises a ValueError"""
-         self.assertRaises(ValueError,
-                           self.locator.settings_uri, type='device',
-                           scope_param1=None, scope_param2=None)
-         
-+    @unittest.skipIf(hasattr(sys, 'pypy_version_info'), "pypy doesn't raise ValueError")    
-     def test_podcast_settings_uri_exception(self):
-         """Test if using no parameter for a podcast Setting raises a ValueError"""
-         self.assertRaises(ValueError,
-                           self.locator.settings_uri, type='podcast',
-                           scope_param1=None, scope_param2=None)
-         
-+    @unittest.skipIf(hasattr(sys, 'pypy_version_info'), "pypy doesn't raise ValueError")    
-     def test_episode_settings_uri_exception(self):
-         """Test if only using one parameter for a episode Setting raises a ValueError"""
-         self.assertRaises(ValueError,
diff --git a/dev-python/mygpoclient/mygpoclient-1.7-r1.ebuild b/dev-python/mygpoclient/mygpoclient-1.7-r1.ebuild
deleted file mode 100644
index e91e9b673f70..000000000000
--- a/dev-python/mygpoclient/mygpoclient-1.7-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A gpodder.net client library"
-HOMEPAGE="https://github.com/gpodder/mygpoclient
-	https://mygpoclient.readthedocs.io/en/latest/"
-SRC_URI="https://github.com/gpodder/mygpoclient/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="dev-python/simplejson"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/minimock
-	)"
-
-PATCHES=( "${FILESDIR}"/tests.patch )
-
-src_prepare() {
-	distutils-r1_src_prepare
-	# Disable tests requring network connection.
-	rm -f mygpoclient/http_test.py
-}
-
-python_test() {
-	if [[ "${EPYTHON:0:4}" == "pypy" ]]; then
-		nosetests --cover-erase --with-coverage --cover-package=mygpoclient "${BUILD_DIR}"/lib/${PN}/
-	else
-		nosetests --cover-erase --with-coverage --with-doctest --cover-package=mygpoclient "${BUILD_DIR}"/lib/${PN}/
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-	rm -f $(find "${D}" -name "*_test.py")
-}
diff --git a/dev-python/mygpoclient/mygpoclient-1.8.ebuild b/dev-python/mygpoclient/mygpoclient-1.8.ebuild
index 2c425dd78548..5ca600a21490 100644
--- a/dev-python/mygpoclient/mygpoclient-1.8.ebuild
+++ b/dev-python/mygpoclient/mygpoclient-1.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/gpodder/mygpoclient/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"