gentoo Easter resync : 12.04.2020

6 files changed, 2 insertions, 134 deletions

diff --git a/dev-python/mergedict/Manifest b/dev-python/mergedict/Manifest
index 25d4b481f87f..491a3449d206 100644
--- a/dev-python/mergedict/Manifest
+++ b/dev-python/mergedict/Manifest
@@ -1,9 +1,3 @@
-AUX mergedict-0.2.0-py34.patch 1553 BLAKE2B 4528010ef6dbce8210576aa76fdf011b87b3484a8fc6b4432f5760ba8afcc4827a2283f139f46920b99132cb93a8c740cab317a94d53ad0598b1c29ee6d33de5 SHA512 034d2f185257c6f4387c50940385a191a7f7822946394eed6ca02e677a6525f296133947992d06c8e9933ee12ca9e8b51af68457c0b4d6cd883fb1c2df18f6aa
-DIST mergedict-0.2.0.tar.gz 3554 BLAKE2B 3dab9dbbae8cd592b9eeae2e7383bdf2b536139027cc791a48e47a9a2894c3a385b9a993ab34563d4f75ebedef57eb39c1ebbed60a5eada20f5e3c14ade44ecc SHA512 5d867944865881731a854526ad17c178be44854e040ba47ccf493ba1e8bd627346da07fd55c066a5497d806c5537c8627c8e903883e35ac86a05661fd3248f3a
-DIST mergedict-0.3.0.tar.gz 5286 BLAKE2B 9a0d08da1d3a0eb85d0e98df88f246b4ee7a54a748e81dfe72a3adb15649c90cc623e39f475cd481e3fc613e29506d3ded7df1aa3761433642c8f48ec636cabe SHA512 7608f2d156fda8050672542b2704b5feeee266fb9e6052102d6250d7e5745cb9ba32e17528e0fd7d959e27a6c29e845796029ce6bd7e6e869b1ecd462b70a9ca
 DIST mergedict-1.0.0.tar.gz 5188 BLAKE2B 6ec3a5df1b9c366cbb8b87b4c02ff18f15953d1e10469c5d20e170f0a1deca949edab6f0bd0100fb085401375cce51b9e323279d296153144548b93a8d072e7e SHA512 0f9f619961d2840995d2c2498debcf8b47c54fae76f419588562311d5bc43483c994cbeb618f2a1220a9ab33c56f12e3e257323c40ecd0db3a7181d7dd80ef27
-EBUILD mergedict-0.2.0-r1.ebuild 495 BLAKE2B 77bd0f7b6e1b2dfec9736d11555d741cd8aff315cedf492f5ce9ee853f3c86915b5b327877446717fd05a1883e0ddd7c91d19c8bafbbdfdc81f321bce3d40394 SHA512 47c24152e014fc9ca5f6ceb96d0f9c11bb48bcbc72d96c14d519400c23e411f3e475c0291a2cc16904e8b7f400bc5e2557a47af8c3b0feea814b0cf4a783009a
-EBUILD mergedict-0.2.0.ebuild 483 BLAKE2B 4b6ab86c0aee4135366faa52de9f11c5c92b7371c36a2f9d2f95b287b0fff86b15f0ddab8b9ac7a576dde5f92b9079f3ba28edc6fcaa69fb6ad39884265a931c SHA512 3f9f4f233999ec26795033bd1665a000d4b907d79c745d812ec389f3071b68033b8175099b4d8ebf9aba6eff3f5ceb6f362d1b84523495140e0ae4ff601e07c0
-EBUILD mergedict-0.3.0.ebuild 482 BLAKE2B 2b1e99c3ba7189914de4b95430385062fe63fd71e37715b97fee6eaf20e7fc22bbc84e63b852b90259c4c85f6af19a5f3f5e7e40a2b199f6f08c0959e69e273a SHA512 6ba2a3cab68a61da6e92b8dfcfe19146715b9d50a27fde27ca3d46e049e4af9bb4925be9e906dbe3f034f42e138a5be5bbfbcd519e505222ba0b021fa0fbc4c1
-EBUILD mergedict-1.0.0.ebuild 435 BLAKE2B 4dd060cd409ac908cf702a7540974b055cb39b0e1c8954636587fb309d35e1cadb9ef8647b562379f533b3b7eed667de2c20b13305236bcbb4d6cf685bbd13d2 SHA512 46429b8ff8ffc6ca442d34267fd3a2f4509646981b6332ba5537c3eea578f2c3f11c3417c824ba204493a8aa046cc90b67c3b3d80ba8639c0eb8c5165ae57ebb
+EBUILD mergedict-1.0.0.ebuild 434 BLAKE2B 12b4f13a521c8a8aef3981293a9c1e05d94860195ea42e55968404d86a03587476fb66d3b11458a1874636f9ea18e6d2480ce4790dfd9eeaed26c5ff5fa5e985 SHA512 eed7df36b89f898bfad0ec98574f10dd3a2bfdc9369b0ca04002c2c6a3f9ccac46549455e291756b4c1e97d69c4535fe9ad0732815cb5676ba14fc7b489fa973
 MISC metadata.xml 375 BLAKE2B 4a8004375ba9a901afcdd9573fe5e76b481f1831c9556f888792d1e993b2450e4ac6353d2dbd03dc129f46ca55bbaa1563ac3c7de033d23ad7dfc833bee26de7 SHA512 544ef98dfb5099a4cb1eb42b0be0692a02d7e965b4f1ded19fb87acd1b9f1dcbfe605c1a73710dd3daa2a53949d58a7e3b5dd45e7e5a6eace0349446220a8b9e
diff --git a/dev-python/mergedict/files/mergedict-0.2.0-py34.patch b/dev-python/mergedict/files/mergedict-0.2.0-py34.patch
deleted file mode 100644
index 454a41a4fc88..000000000000
--- a/dev-python/mergedict/files/mergedict-0.2.0-py34.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From c3f6333298c86e5681af282c7210eb1047a991dd Mon Sep 17 00:00:00 2001
-From: schettino72 <schettino72@gmail.com>
-Date: Sat, 30 Aug 2014 10:51:26 +0800
-Subject: [PATCH] install sigledispatch only when required.
-
----
- mergedict.py | 7 +++++--
- setup.py     | 7 ++++++-
- 2 files changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/mergedict.py b/mergedict.py
-index 5dcd994..ad80a16 100644
---- a/mergedict.py
-+++ b/mergedict.py
-@@ -26,8 +26,11 @@
- 
- import sys
- import inspect
--from singledispatch import singledispatch
--
-+try:
-+    from functools import singledispatch
-+# singledispatch was added on python 3.4
-+except ImportError: # pragma: no cover
-+    from singledispatch import singledispatch
- 
- class MergeDict(dict):
-     """Base class for a dict that implements a merge() method.
-diff --git a/setup.py b/setup.py
-index b37319e..1966b9a 100644
---- a/setup.py
-+++ b/setup.py
-@@ -1,6 +1,7 @@
- #!/usr/bin/python
- # -*- coding: utf-8 -*-
- 
-+import sys
- import os
- import codecs
- from setuptools import setup
-@@ -11,6 +12,10 @@
-     long_description = ld_file.read()
- 
- 
-+install_requires = []
-+if sys.version_info[0] < 3 or sys.version_info[1] < 4:
-+    install_requires.append('singledispatch')
-+
- setup (
-     name = 'mergedict',
-     version = '0.2.0',
-@@ -23,7 +28,7 @@
-     platforms = ['any'],
-     license = 'MIT',
-     py_modules = ['mergedict'],
--    install_requires = ['singledispatch'],
-+    install_requires = install_requires,
-     classifiers = [
-         'Development Status :: 4 - Beta',
-         'Intended Audience :: Developers',
diff --git a/dev-python/mergedict/mergedict-0.2.0-r1.ebuild b/dev-python/mergedict/mergedict-0.2.0-r1.ebuild
deleted file mode 100644
index cd0924beaadd..000000000000
--- a/dev-python/mergedict/mergedict-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python 'dict' with a merge() method"
-HOMEPAGE="https://github.com/schettino72/mergedict/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="virtual/python-singledispatch[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-py34.patch
-)
diff --git a/dev-python/mergedict/mergedict-0.2.0.ebuild b/dev-python/mergedict/mergedict-0.2.0.ebuild
deleted file mode 100644
index 437c55402666..000000000000
--- a/dev-python/mergedict/mergedict-0.2.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python 'dict' with a merge() method"
-HOMEPAGE="https://github.com/schettino72/mergedict/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="virtual/python-singledispatch[${PYTHON_USEDEP}]"
diff --git a/dev-python/mergedict/mergedict-0.3.0.ebuild b/dev-python/mergedict/mergedict-0.3.0.ebuild
deleted file mode 100644
index 7f18076b3228..000000000000
--- a/dev-python/mergedict/mergedict-0.3.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python 'dict' with a merge() method"
-HOMEPAGE="https://github.com/schettino72/mergedict/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="virtual/python-singledispatch[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/mergedict/mergedict-1.0.0.ebuild b/dev-python/mergedict/mergedict-1.0.0.ebuild
index 60436652d3db..fd15f4587d65 100644
--- a/dev-python/mergedict/mergedict-1.0.0.ebuild
+++ b/dev-python/mergedict/mergedict-1.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND=""