commit: 478a1d6873f302f30a1b36b6a28d8a5399f3c743
Author: Michał Górny gentoo org>
AuthorDate: Fri Mar 27 21:22:37 2020 +
Commit: Michał Górny gentoo org>
CommitDate: Fri Mar 27 21:22:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=478a1d68
dev-python/mergedict: Remove redundant versions
Signed-off-by: Michał Górny gentoo.org>
dev-python/mergedict/Manifest | 2 -
.../mergedict/files/mergedict-0.2.0-py34.patch | 60 --
dev-python/mergedict/mergedict-0.2.0-r1.ebuild | 21
dev-python/mergedict/mergedict-0.2.0.ebuild| 19 ---
dev-python/mergedict/mergedict-0.3.0.ebuild| 19 ---
5 files changed, 121 deletions(-)
diff --git a/dev-python/mergedict/Manifest b/dev-python/mergedict/Manifest
index 9d8274559bb..89faf338a76 100644
--- a/dev-python/mergedict/Manifest
+++ b/dev-python/mergedict/Manifest
@@ -1,3 +1 @@
-DIST mergedict-0.2.0.tar.gz 3554 BLAKE2B
3dab9dbbae8cd592b9eeae2e7383bdf2b536139027cc791a48e47a9a2894c3a385b9a993ab34563d4f75ebedef57eb39c1ebbed60a5eada20f5e3c14ade44ecc
SHA512
5d867944865881731a854526ad17c178be44854e040ba47ccf493ba1e8bd627346da07fd55c066a5497d806c5537c8627c8e903883e35ac86a05661fd3248f3a
-DIST mergedict-0.3.0.tar.gz 5286 BLAKE2B
9a0d08da1d3a0eb85d0e98df88f246b4ee7a54a748e81dfe72a3adb15649c90cc623e39f475cd481e3fc613e29506d3ded7df1aa3761433642c8f48ec636cabe
SHA512
7608f2d156fda8050672542b2704b5f266fb9e6052102d6250d7e5745cb9ba32e17528e0fd7d959e27a6c29e845796029ce6bd7e6e869b1ecd462b70a9ca
DIST mergedict-1.0.0.tar.gz 5188 BLAKE2B
6ec3a5df1b9c366cbb8b87b4c02ff18f15953d1e10469c5d20e170f0a1deca949edab6f0bd0100fb085401375cce51b9e323279d296153144548b93a8d072e7e
SHA512
0f9f619961d2840995d2c2498debcf8b47c54fae76f419588562311d5bc43483c994cbeb618f2a1220a9ab33c56f12e3e257323c40ecd0db3a7181d7dd80ef27
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 454a41a4fc8..000
--- 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
-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 9f4e8c8bf81..000
--- a/dev-python/mergedict/mergedict-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,21 +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=""
-
-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 ca71030b0e0..000
--- a/dev-python/mergedict/mergedict-0.2.0.ebuild
+++ /dev/null
@@ -1,19 +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/;
