diff --git a/app-misc/gplaycli/Manifest b/app-misc/gplaycli/Manifest index 0a6b4b43a..63e541078 100644 --- a/app-misc/gplaycli/Manifest +++ b/app-misc/gplaycli/Manifest @@ -1,3 +1,2 @@ -DIST gplaycli-3.21.tar.gz 4848493 BLAKE2B 555c5ab2018f89770a2f158b4581ad293f635adbd971d44b4a5552929353e3892293742d874fcc5b70698be9f5703f2d13d67e910f04045e09ced3a1143cebb7 SHA512 897b3d07a91f3b4ad5e4b5985f203874796c1205026be7485e79a0e32c57c81fd375c50d00277e60cc83660fb8644fee0ee9a179d2bcd04a91f1c67cc3fb02ee -DIST gplaycli-3.22.tar.gz 4847622 BLAKE2B 3c2fd36f081aaa04a2ceee136d094a7b222daa404d7e6a593445f997fcf7e21207276f6dbca6fa2c1d68b549944101a45c3756070664a295e9fa0e3ee6c94b2c SHA512 7b65d214c3fe2c7684c0a793add1cf62c5a19ca2ccc8d446f67d57783321e6da50aa08a6de1caa87655b672cdfb41bbb39b12366ae249fe61bacc5bbb9eb2b8b DIST gplaycli-3.23.tar.gz 2990154 BLAKE2B 7ad0d3f50a24542ec5a361471b1248a7a19358de4d48f5081360fd967dc68e7d0b02b306b665548638258049187549dbe9813562113683ef309dae753864e3fa SHA512 b64c7faf44418136c2186b310670b63c814720f738ec70a2b031f33753e8fc398692495dcca2e2c5016778386ae02dee132ca71ab2a9d09dfb439965e9871989 +DIST gplaycli-3.24.tar.gz 2990637 BLAKE2B 67f90e2871cf9f57c49c694f8d7f8ca34e0f1f72fb98a0ad084f455da1954c4acaf771076d1ae251c082b73b6ba752759d14363b3eb7f1eaeec7d54efd383d8d SHA512 d7bb2c3c4db58e8d11b82f102031e806bb7ae2fb08b31c0be750735cce0287342f6bd219bf39b8a929418f6d0889857907d4acc81710443a39f2062da8d6cae8 diff --git a/app-misc/gplaycli/gplaycli-3.22-r1.ebuild b/app-misc/gplaycli/gplaycli-3.22-r1.ebuild deleted file mode 100644 index 47ac34d6d..000000000 --- a/app-misc/gplaycli/gplaycli-3.22-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{5,6} ) -inherit distutils-r1 - -DESCRIPTION="Google Play Downloader via Command line" -HOMEPAGE="https://github.com/matlink/gplaycli" -SRC_URI="https://github.com/matlink/gplaycli/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="pyaxmlparser" - -#https://github.com/matlink/gplaycli/issues/182 -change_deps() { - PATCHES=( "${FILESDIR}/pyaxmlparser.patch" ) -} - -RDEPEND="dev-python/protobuf-python[${PYTHON_USEDEP}] - >=dev-python/gpapi-0.4.2[${PYTHON_USEDEP}] - pyaxmlparser? ( dev-python/pyaxmlparser[${PYTHON_USEDEP}] ) - !pyaxmlparser? ( dev-python/androguard[${PYTHON_USEDEP}] ) - dev-python/clint[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" - -python_prepare_all() { - use pyaxmlparser && change_deps - - # disarm pycrypto dep to allow || ( pycryptodome pycrypto ) - sed -i -e "s|os.path.expanduser('~')+'/.config/|'/etc/|" setup.py || die - distutils-r1_python_prepare_all -} diff --git a/app-misc/gplaycli/gplaycli-3.22.ebuild b/app-misc/gplaycli/gplaycli-3.22.ebuild deleted file mode 100644 index 13ec3f46c..000000000 --- a/app-misc/gplaycli/gplaycli-3.22.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{5,6} ) -inherit distutils-r1 - -DESCRIPTION="Google Play Downloader via Command line" -HOMEPAGE="https://github.com/matlink/gplaycli" -SRC_URI="https://github.com/matlink/gplaycli/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-python/protobuf-python[${PYTHON_USEDEP}] - >=dev-python/gpapi-0.4.2[${PYTHON_USEDEP}] - dev-python/androguard[${PYTHON_USEDEP}] - dev-python/clint[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" - -python_prepare_all() { - # disarm pycrypto dep to allow || ( pycryptodome pycrypto ) - sed -i -e "s|os.path.expanduser('~')+'/.config/|'/etc/|" setup.py || die - distutils-r1_python_prepare_all -} diff --git a/app-misc/gplaycli/gplaycli-3.21.ebuild b/app-misc/gplaycli/gplaycli-3.24.ebuild similarity index 90% rename from app-misc/gplaycli/gplaycli-3.21.ebuild rename to app-misc/gplaycli/gplaycli-3.24.ebuild index 829b67d7a..7b07cf1f1 100644 --- a/app-misc/gplaycli/gplaycli-3.21.ebuild +++ b/app-misc/gplaycli/gplaycli-3.24.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python3_{4,5,6} ) +PYTHON_COMPAT=( python3_{5,6} ) inherit distutils-r1 DESCRIPTION="Google Play Downloader via Command line" @@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86" IUSE="" RDEPEND="dev-python/protobuf-python[${PYTHON_USEDEP}] - >=dev-python/gpapi-0.4.2[${PYTHON_USEDEP}] + >=dev-python/gpapi-0.4.3[${PYTHON_USEDEP}] dev-python/pyaxmlparser[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/gpapi/Manifest b/dev-python/gpapi/Manifest index 7bd08f5c1..fcc58d7cd 100644 --- a/dev-python/gpapi/Manifest +++ b/dev-python/gpapi/Manifest @@ -1,3 +1,3 @@ -DIST gpapi-0.3.2.tar.gz 81344 BLAKE2B f9c36f3777f9cb7b54a6585e90b9a4c536735f98fe3b2b5c7826db5d6dc34f964e6e841f1c18dcf43ebd9b87030ed5c9f7bab4a557f68b1f8707a9feb42ecfce SHA512 431bb08926913a676cb60b7dbf0d3ea44e9337e6da6c2e89116386f5dbd7f77166c646d04ad49a83c4e4707a31834251c37f1b28a2238195b86aaf0d59902fc8 DIST gpapi-0.4.1.tar.gz 81302 BLAKE2B 06b2e4162ea77f61975f691a7e90629e7ec73b386b2532ba806f55b0b6eb599d1c7f9951adfd69d89c4c7d30193166eaea41402c583ada5107babc5159519f98 SHA512 5319478f9466a8d55d8d86a6814f18a06f14db109b9ac010e84af0405208a2047ecd3b4c490bcf0aeeedd376ec8b83e4225fc4dca264229e22bfdc043f74f1bf DIST gpapi-0.4.2.tar.gz 81865 BLAKE2B 48b6776fb88428ee79f07617c9927fd7771448611e1dad8e330b977ecfedbfd17d5ed29ab64cf64295689317ae906e7f86610c6441156a9b3fbd00ccc0a88c51 SHA512 809b7af601c8081a52f78b46dc87e03634c4c3d26749fbbc19cfcde0602c67bd97a20a52fe04f2a57e1a01f7db7a2d76afd4f6b7adf500b036de739d59ad5d82 +DIST gpapi-0.4.3.tar.gz 87367 BLAKE2B 0564de83a0d075a73f907fa720c8e53b96e4f632dce1cbc76433ed856a29b6f4dfc39990b3011301f6712498eb69a117d72448882c303e321f5ec2343f2ce907 SHA512 b629ba84b407b3e1e6cbcdafcafdee065c6318bdae1ff28780eb10e3bcdce1707f76dd4134402e3822e302004366bc022fc3dc617ef241fe23d56a49c0aeb157 diff --git a/dev-python/gpapi/gpapi-0.3.2-r1.ebuild b/dev-python/gpapi/gpapi-0.4.3.ebuild similarity index 64% rename from dev-python/gpapi/gpapi-0.3.2-r1.ebuild rename to dev-python/gpapi/gpapi-0.4.3.ebuild index 7d0311988..ba4f9d463 100644 --- a/dev-python/gpapi/gpapi-0.3.2-r1.ebuild +++ b/dev-python/gpapi/gpapi-0.4.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,12 +18,6 @@ IUSE="" RDEPEND="dev-python/requests[${PYTHON_USEDEP}] dev-python/clint[${PYTHON_USEDEP}] >=dev-python/protobuf-python-3.5.1[${PYTHON_USEDEP}] - || ( dev-python/pycryptodome[${PYTHON_USEDEP}] dev-python/pycrypto[${PYTHON_USEDEP}] )" + dev-python/pycryptodome[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}]" - -python_prepare_all() { - # disarm pycryptodome dep to allow || ( pycryptodome pycrypto ) - sed -i -e "s|'pycryptodome',||" setup.py || die - distutils-r1_python_prepare_all -} diff --git a/profiles/pentoo/base/package.accept_keywords/dev-python b/profiles/pentoo/base/package.accept_keywords/dev-python index e430b7fb0..f2306aa5f 100644 --- a/profiles/pentoo/base/package.accept_keywords/dev-python +++ b/profiles/pentoo/base/package.accept_keywords/dev-python @@ -212,7 +212,7 @@ dev-python/pyDes ~dev-python/args-0.1.0 ~dev-python/pyaxmlparser-0.3.7 -=dev-python/gpapi-0.4.2 +~dev-python/gpapi-0.4.3 #Tiredful-API ~dev-python/django-filter-0.15.3