gentoo resync : 22.01.2021

3 files changed, 6 insertions, 57 deletions

diff --git a/sys-fs/udiskie/Manifest b/sys-fs/udiskie/Manifest
index 8b1659e3c7a3..008e369ea8b6 100644
--- a/sys-fs/udiskie/Manifest
+++ b/sys-fs/udiskie/Manifest
@@ -1,7 +1,5 @@
-DIST udiskie-2.1.0.tar.gz 86339 BLAKE2B e92c61ac61aaab81bb91874ed1ed0c8bab60524fe79c9432053968418767b6ebc5c15c33abc74f37471fcc5a799152a50d88528a4b7bbd91e015d448fb36d0cb SHA512 704bdf8226dd2eeb6b13c5a4facca76d9f5fa7119cef7b5af08d0d399f9e65318ed5a921638cd9b7db3acbadcff1029f2e7698a942350f31b8f94f5032c25663
-DIST udiskie-2.1.1.tar.gz 87216 BLAKE2B 4860e8ae7310c89d3292fe7fadcd49f6c92f05628ea0c398f0e7f77183b93c5e34c4119f0ae4b4e031109cc8bc6ea23ddc14c9478709cdce594bfea3b39a1af8 SHA512 bad0f024c64a7d2c48dd6c3bc59f5bc223789bec9a8201f763cabf97096312bbdc9779711d15a9f7f8f9545a7088042b159f856c9a9db12413e9bea41b215ef4
 DIST udiskie-2.2.0.tar.gz 88232 BLAKE2B ba037b0828b7bf42b00be481ecec807bc9ed591ad3990cb6b6f0db21b4894c184ff2fcb5410272a55f3f78caae999458cb159cd450ede540606138e5e9dab1af SHA512 7c6c096eeb52458a2e30415c1489a640ca679489a34729f5502ae35f178f810476111a17f082a092d61d6d08022cfd208cb1f71ab34d6b88ea7f1f4e4a1ae49c
-EBUILD udiskie-2.1.0.ebuild 1094 BLAKE2B 32f5aed7d312f8e5e03e9ff1ca9ef06338f2f9bbcd21c76a7f175f1ba9844cdf8c8b081daff9ef800fc1fa794e0f7292dc8dcf0537acdd280faafb8d60d598ea SHA512 3a91284b4bdb3eddc252be3513eb8d1512d7a40b1b0b19e478d618a253a187d6defb1062dc148362287e09889b7a7a734382ba82bfbee470b5693b7788558970
-EBUILD udiskie-2.1.1.ebuild 1060 BLAKE2B 537b294271d993616124655a924b2b4bf665271fd17507146b9ad59edc7fc6634ec8449f339466c1d1f493734e03765f1ea69e3586296a438dbaf049332cf59d SHA512 04827ea4f09649134f953482d1ac5b90f944e301ee1ffa21ab43695c2109c92cfe8ae1c3eb275fbc388a5f1dd5d80a9637425a35d422cc09df183f326db2e522
+DIST udiskie-2.3.0.tar.gz 89954 BLAKE2B ece40590aee684325a8df4b793a5407a0f15ba07c3d8a0df72d72afe5af2f1d3bb6c072fa33fbe61b647a3ed3b0d5b9f6881be4db3943fdc0208e14ced4acec2 SHA512 4b2d97ac458a70bbb6458fdf2386b5847c1ab590d4f8ae420d4c799871be732f793d31c3c6a51558caea266797da10647de437790237f01cc313e08f74524148
 EBUILD udiskie-2.2.0.ebuild 1003 BLAKE2B 20fdd6665401685ff2c97f82b989e916f08060e0085a87a1c327c3fef469a00f8c085456b8d5f5a9cf3a098fb752143fea68b98a99038fe20a1098f29d76555e SHA512 b6283de8d33f593580a566572912750f294544a960ea810c5003aedc2cdb8747848f9893047d91c8ac335efeda5aaf84b0586f500e422abff26e00a90713d39b
+EBUILD udiskie-2.3.0.ebuild 1005 BLAKE2B 7f2e1c0083cdb534db439f7f981d0571163802c42482c30c1ac875f66ab472801cc82714cb3ceef819bd3149ef337b9c42aa23570cc5d6ba7b747be84af08f9e SHA512 032997d18db21a3ea5e9badbfebecb00c480adf7289e19f49a785eb41dba216c77bff7556b6d05f1646cb9930bc33e520e569a1ad636d1fe5146dc459e6c282e
 MISC metadata.xml 369 BLAKE2B 0241a847b1eb2f650f66bc3fd631ccdf1927562d510e08c7bcd3db850752b665894838d0c705b7d03690aeea0aa93372d1faae5b313c9136d46e4913c177b0a4 SHA512 0772b0fa065a42292268b9e6a6b99b7198f5923bcc4697913b6c432db4e206a28b0fb1bd6c14b6363591cca02108a8a91029233824c3ec5bd7fbc592a941137e
diff --git a/sys-fs/udiskie/udiskie-2.1.0.ebuild b/sys-fs/udiskie/udiskie-2.1.0.ebuild
deleted file mode 100644
index 182cb3d80118..000000000000
--- a/sys-fs/udiskie/udiskie-2.1.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit distutils-r1 gnome2-utils
-
-DESCRIPTION="An automatic disk mounting service using udisks"
-HOMEPAGE="https://pypi.org/project/udiskie/ https://github.com/coldfix/udiskie"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="dev-python/docopt[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	sys-fs/udisks:2
-	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' 'python3_6')"
-DEPEND="app-text/asciidoc
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	sed -i -e 's:gtk-update-icon-cache:true:' setup.py || die
-	default
-
-	distutils-r1_src_prepare
-}
-
-src_compile() {
-	distutils-r1_src_compile
-	emake -C doc
-}
-
-src_install() {
-	distutils-r1_src_install
-	doman doc/${PN}.8
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/sys-fs/udiskie/udiskie-2.1.1.ebuild b/sys-fs/udiskie/udiskie-2.3.0.ebuild
index 391ac1d6d382..55fa66a15c5a 100644
--- a/sys-fs/udiskie/udiskie-2.1.1.ebuild
+++ b/sys-fs/udiskie/udiskie-2.3.0.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1 gnome2-utils
 
 DESCRIPTION="An automatic disk mounting service using udisks"
@@ -17,8 +18,7 @@ IUSE=""
 RDEPEND="dev-python/docopt[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
-	sys-fs/udisks:2
-	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' 'python3_6')"
+	sys-fs/udisks:2"
 DEPEND="app-text/asciidoc
 	dev-python/setuptools[${PYTHON_USEDEP}]"