gentoo resync : 25.11.2020

3 files changed, 4 insertions, 34 deletions

diff --git a/app-emulation/glean/Manifest b/app-emulation/glean/Manifest
index f840e15e6e6c..13ca94c3603b 100644
--- a/app-emulation/glean/Manifest
+++ b/app-emulation/glean/Manifest
@@ -1,6 +1,4 @@
 AUX glean.initd 241 BLAKE2B ea451713203da8dd61eef5155e2ab2d5fa7be5d9cd210ce2d0ce890fe54af05b461671702d1a2b60b8e6b8e0cb0f4d12f90ff2884409e9f2a3dcc380ba48bb60 SHA512 a5af77b16e1864158dfe858f932dd4eecb5633bd71fbdd00085863e56bd1862d7eba4500d0f4ac8c692b06750fcfe3f9f5b2bb7a4ca6a4ba72dbc43bb12856c5
-DIST glean-1.10.3.tar.gz 51898 BLAKE2B 95bcee5caae1bdcdc586c8d8ab8097b1dfaa35c521d7b90d128db14f496d4d31e1d0d4c540c4205861e5c7fa87d0e7038227ae9db0e898e3bf43b8b9b989e766 SHA512 27d4f29bf35585f73813e9efdea0253f0be3a8fa059c6ce524fbdd37b865d9c9e10d29bb8f970317ffe772c110cc76f10ae7debce5f7433461639dc63b9349db
 DIST glean-1.17.0.tar.gz 62791 BLAKE2B 6429bd721655499732f84dc8db4bd31bdb128289956ab65fab78ea5461cf7945ced893fd832ac6a3cdcedb331f3885004eaa530be1ee4fcc4168870b5c345dd3 SHA512 55c8ceae941296c038acff3f40cf4d6b783d7c6530ebd6fbd6d87938de11a1be1403741a559802c9135d3fc4d904b1936319dcf7a0179f95ac3f909667f5622c
-EBUILD glean-1.10.3.ebuild 593 BLAKE2B 88652cb271f366b33dcc74309b543ed1eea54f2a1b7c283bd653e5a30c49dcee8adb040af5a86bd247ea43c7caf9fd2fda037d4cb58d92d01f79fa3335c9d9cb SHA512 b5b6c1bbff11ab7a5e4320059664628bcd5683d11a7c4f6a4bf34df8758aea4b49bfb90c5c6041fdec1efcd0d38f567f593dd6f8231e754a134e8be7259bfdce
-EBUILD glean-1.17.0.ebuild 613 BLAKE2B 41656ea79c42932ff422d65c797d2cf6b476d1868cf60ab69babca3e78a28f26374379f4df7ef7675de105d2aaaf127ba3c32648aee87cfb0b35bdf6c37e50fa SHA512 cd9962cd19f33a6c627f909d568f4cded89a03cbbb5536ff6753ba4979fcc03a0ad9405c7190fec89a4f321355629a7188ff8e0a9e84a9710f66761d374d0e80
+EBUILD glean-1.17.0.ebuild 601 BLAKE2B 3a5617fb56bebf2a70759a2733f8fd0a80806cd743a93411ddf9d668604a40398ac6e30d1910f271f2f66a1952f96f62114a37c414a03986c31db948d083a974 SHA512 9f3aedbd1db0d2a2598d5279cdc78f1184d51e415fa042b967aa33463f04cc9788c48d52ada6a6366d32636463a92825543b8822d77ad7960a69fb54de145a7a
 MISC metadata.xml 641 BLAKE2B ee81e3a785b2622805b1d30e1283daf523d5c6577c313aa970c8745f870e5058af90a46c11a954a3f641b93b7ece772336be4330f7f1e77625ec9869053342bd SHA512 28e64d8afd054e05b0155773b4b35c8b03b1488be4aba776c0b6b23397e2e8ac35330be8da668c57239a0826c5af00d93a17ba4d00936829e9b67d4d53ee3c7a
diff --git a/app-emulation/glean/glean-1.10.3.ebuild b/app-emulation/glean/glean-1.10.3.ebuild
deleted file mode 100644
index db1ffac942b3..000000000000
--- a/app-emulation/glean/glean-1.10.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple program to write static config from config-drive"
-HOMEPAGE="https://github.com/openstack-infra/glean"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/pbr[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	distutils-r1_src_install
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-}
diff --git a/app-emulation/glean/glean-1.17.0.ebuild b/app-emulation/glean/glean-1.17.0.ebuild
index 521c8d3efe66..6f94d92f9f24 100644
--- a/app-emulation/glean/glean-1.17.0.ebuild
+++ b/app-emulation/glean/glean-1.17.0.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
@@ -13,12 +14,10 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/pbr[${PYTHON_USEDEP}]"
+DEPEND="dev-python/pbr[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
 
 src_install() {