diff --git a/dev-python/geoip2-python/Manifest b/dev-python/geoip2-python/Manifest index fd907d00c..e497bd616 100644 --- a/dev-python/geoip2-python/Manifest +++ b/dev-python/geoip2-python/Manifest @@ -1 +1 @@ -DIST GeoIP2-python-2.9.0.tar.gz 32999 BLAKE2B 3992391f07c1bcd966cd0be13fd6ba980354f82f8a785b9857a9b834480e3f7ff165c511a4a3ca2cd9ea0592eb379ef21533215400ea59c99b02b938d872b832 SHA512 8631a41d9644887d0149678e40a5f9d03bba660853c308c43bf358cd49b3f021566b9d6f65b670c0c1c78bcb4cb7cb007ad2db6f3c032749afa454fc9e06d74c +DIST GeoIP2-python-2.8.0.tar.gz 32783 BLAKE2B 48b711b2517769ab9483a4f33c53e5ad9d84c2b6b013219ba7e945db22fbbfa3b0348e9cd1f4f63ae62024d39a74c5fedbae6502cfac8492576ba25b2e545f17 SHA512 08a23b55bc2cb55552aad4d821e129170d2c2e2d9a22aff7e365692a325166470460b77e500cfa04c00e08f89531f762dc9e4c1b1543752c40459b1cd99f55c5 diff --git a/dev-python/geoip2-python/geoip2-python-2.9.0.ebuild b/dev-python/geoip2-python/geoip2-python-2.8.0.ebuild similarity index 89% rename from dev-python/geoip2-python/geoip2-python-2.9.0.ebuild rename to dev-python/geoip2-python/geoip2-python-2.8.0.ebuild index 1506dbe34..11658a91f 100644 --- a/dev-python/geoip2-python/geoip2-python-2.9.0.ebuild +++ b/dev-python/geoip2-python/geoip2-python-2.8.0.ebuild @@ -18,8 +18,8 @@ SLOT="0" KEYWORDS="~amd64" IUSE="" -RDEPEND=">=dev-python/maxminddb-1.4.0 - >=dev-python/requests-2.20.0" +RDEPEND=">=dev-python/maxminddb-1.2.1 + >=dev-python/requests-2.9" DEPEND="${RDEPEND}" S="${WORKDIR}/${MY_P}" diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest deleted file mode 100644 index 25e12ae56..000000000 --- a/dev-python/requests/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST requests-2.20.1.tar.gz 111475 BLAKE2B 3d57831915d7f27cbd0891799eb8eca3a1c28a2fc9096cf2189fb17351fbb1b35ac754d44b5c0c7f5df367d51b61287ef383b97cb983399df695954eae21b39e SHA512 631969fab07e6674afc8cc9707a2e18ea394c09cdef031894fd0b28cf94e20f4f24434901edf3233b84ce7be199cc8325b9fe975d9003334206bb4a85ca278ae diff --git a/dev-python/requests/requests-2.20.1.ebuild b/dev-python/requests/requests-2.20.1.ebuild deleted file mode 100644 index 0d6c239ab..000000000 --- a/dev-python/requests/requests-2.20.1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -DESCRIPTION="HTTP library for human beings" -HOMEPAGE="http://python-requests.org/" -SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris" -IUSE="socks5 +ssl" - -RDEPEND=" - >=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}] - >=dev-python/chardet-3.0.2[${PYTHON_USEDEP}] - >=dev-python/idna-2.5[${PYTHON_USEDEP}] - =dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] ) - ssl? ( - >=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}] - >=dev-python/pyopenssl-0.14[$(python_gen_usedep 'python*' pypy)] - ) -" - -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] -" - -# tests connect to various remote sites -RESTRICT="test" - -#DEPEND+=" -# test? ( -# dev-python/pytest[${PYTHON_USEDEP}] -# dev-python/pytest-httpbin[${PYTHON_USEDEP}] -# dev-python/pytest-mock[${PYTHON_USEDEP}] -# dev-python/pytest-xdist[${PYTHON_USEDEP}] -# >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] -# ) -#" - -python_test() { - py.test || die -} diff --git a/profiles/pentoo/base/package.accept_keywords/dev-python b/profiles/pentoo/base/package.accept_keywords/dev-python index a11de32af..1106ac4fa 100644 --- a/profiles/pentoo/base/package.accept_keywords/dev-python +++ b/profiles/pentoo/base/package.accept_keywords/dev-python @@ -293,7 +293,6 @@ dev-python/PyVirtualDisplay dev-python/htmlentities # required by net-analyser/dirhunt -~dev-python/geoip2-python-2.9.0 +~dev-python/geoip2-python-2.8.0 ~dev-python/googlesearch-20181112 ~dev-python/proxy-db-0.2.3 -~dev-python/requests-2.20.1