gentoo resync : 15.01.2020

4 files changed, 9 insertions, 64 deletions

diff --git a/sys-fs/udiskie/Manifest b/sys-fs/udiskie/Manifest
index 7371c72fa93c..dda5f579985c 100644
--- a/sys-fs/udiskie/Manifest
+++ b/sys-fs/udiskie/Manifest
@@ -1,7 +1,5 @@
-DIST udiskie-1.1.1.tar.gz 62207 BLAKE2B 47dea106580fbd037970b274205b896fa95e1f41cd8593bc9a14c8d19f40c3c44281e7334d4b0aaab0aa5e37146b8fa702afc4b82a2ed0e00549d2f9eb475533 SHA512 0524aeafb4777039a35be8854a0cf3bdbefd43eccb758da9aa2fa71fc4041816ff009dbbff20b4906c9bac281995c9923fcf542107a83c76ecb8c45d6b20b1ba
-DIST udiskie-1.7.5.tar.gz 92103 BLAKE2B 9996ea150c0052809825479f500c6bc44fa514a1b9433521b2a5d1d1de62546e16cd77fd94c61e73164af2bad34a8e9b0d5a681db99a66011950b435423456b3 SHA512 d6178b582bfe855cbf7710bc9699d10f1e06fbc303b9c5a352a7261734be18178b3fd7f44fece7d2a05e7fe85d1337c93fa11c3e6011abee44b62aafd1c7c656
 DIST udiskie-1.7.7.tar.gz 91858 BLAKE2B 7d9729f8c66e0d9afdf2b89f5cc2a941ce6726c809af1069146f13466eccdfa54ed45f43535d84592f1b09ccf6454814d7ff62d453781c547ebfb989fcab7767 SHA512 ea192cc8a50c742e96d5163bb1378a7cd110599cfe731d676343766a1ce3ee1102ab43322c5f9666d6c6a232e310fd494e0f76ad33aeab1fd8225a3267f3193a
-EBUILD udiskie-1.1.1.ebuild 1078 BLAKE2B 4b3f90ca67699ada2a3959cb91b0b68e11e17a597eca9a8f4c30da46a60b1635d93421ba891a0609ea70d4b946640411d0c678cef076bd4805db4e4d8ac2b82d SHA512 956d0c074d9d5dd414db188360d96182be8c799094d35ea16e94f42781b7db653471a80eab9b644cb94b088f0de3033d3ec3250a3df15118153477b54e945cff
-EBUILD udiskie-1.7.5.ebuild 1007 BLAKE2B ea45c955fa8aadc891eb60e396ff3dfbee9609fc56e7ae7dd23b15016ab5db70b13d9345f4a34e9df80d6c9670bdd6f6c5f62cee2ad5682564513c8725615eb8 SHA512 9ee8745ceae7d145d71e1807ab750cf087fdc013348cf352d9cbc52496843f834e6c96a6ee4f1df136c73c937e8062e104cfe4d5546e1d069526016be77c5d58
-EBUILD udiskie-1.7.7.ebuild 1005 BLAKE2B 2bf2cab1de984c3ebbbbe7ce2fd56efcee9ca13a98e1ae7c0123b1448107b6746e11cfd5b6b8abcc8663b0c630bd171f0f077a44326af61f4e3150951cd53848 SHA512 0333eec045d9476612b33e7cc41231087eb8242d2fa1eaf51733fe093b688e090032662c863645316abe9348a4eb5544c1f6213ca002d9b1b1437bdf556a6862
+DIST udiskie-2.0.2.tar.gz 85616 BLAKE2B 4d2ab17679610a4d3aa5eae5e6a611a5ae16e7958071c6b44f52884d945b7776d5dd84e85acda2a9b763f5c7da8846e0d2a80e7c788b739953cde04790610804 SHA512 ae3e298b11adaa50046bf521c5f3bd67cbcaa2f1e1cf18cf43f4b6b086ded2540f7db93de5c8b57048ea1bb115fb5266f9e3b69f7bb1acb9b7f429efcbe101c1
+EBUILD udiskie-1.7.7.ebuild 1001 BLAKE2B 4c11cc62dc78e04bac3b01a7b6b1fc19b4ad29a876a86a1abcf5b3d7f1233f9e71211b7bc211f5873637fd21269e4d0d0819748e26edc94e4be49f76eac3a06c SHA512 dcc2cd4ffbbf77021fc9ad7d4c74163fe5825a6f9ae3d19b90c1fb333382b1fdab90dcb1b860b1c0ca8c6eda259878d5182afc43f1f2cf3f96644f8225672ca6
+EBUILD udiskie-2.0.2-r1.ebuild 1096 BLAKE2B 329a2c23ff404ba204bfbe9859aad676dc77ea44097f94859d96d7248d77486061aaadf1cc699a2b943f4971b91feb1afa928e1c4acaa5f040dccc712d9a8fbf SHA512 a80a1a402beaabe9bac66a30e7d09576bb4c81943f067da7be503f3f251204547e9d6176b6704e81c3c190f6df074d312a602760c395acf3816ef7a452d7c65e
 MISC metadata.xml 369 BLAKE2B 0241a847b1eb2f650f66bc3fd631ccdf1927562d510e08c7bcd3db850752b665894838d0c705b7d03690aeea0aa93372d1faae5b313c9136d46e4913c177b0a4 SHA512 0772b0fa065a42292268b9e6a6b99b7198f5923bcc4697913b6c432db4e206a28b0fb1bd6c14b6363591cca02108a8a91029233824c3ec5bd7fbc592a941137e
diff --git a/sys-fs/udiskie/udiskie-1.1.1.ebuild b/sys-fs/udiskie/udiskie-1.1.1.ebuild
deleted file mode 100644
index 5a469d48d77d..000000000000
--- a/sys-fs/udiskie/udiskie-1.1.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-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"
-DEPEND="app-text/asciidoc
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	sed -i \
-		-e "s:udiskie.__version__:2:" \
-		-e 's:gtk-update-icon-cache:true:' \
-		setup.py || die
-
-	distutils-r1_src_prepare
-}
-
-src_compile() {
-	distutils-r1_src_compile
-	emake -C doc
-}
-
-src_install() {
-	distutils-r1_src_install
-	doman doc/${PN}.8
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/sys-fs/udiskie/udiskie-1.7.7.ebuild b/sys-fs/udiskie/udiskie-1.7.7.ebuild
index 4bda47307f30..e8cea14bd9b6 100644
--- a/sys-fs/udiskie/udiskie-1.7.7.ebuild
+++ b/sys-fs/udiskie/udiskie-1.7.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1 gnome2-utils
 
 DESCRIPTION="An automatic disk mounting service using udisks"
diff --git a/sys-fs/udiskie/udiskie-1.7.5.ebuild b/sys-fs/udiskie/udiskie-2.0.2-r1.ebuild
index 22152090e9d0..342a8f0494a3 100644
--- a/sys-fs/udiskie/udiskie-1.7.5.ebuild
+++ b/sys-fs/udiskie/udiskie-2.0.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1 gnome2-utils
 
 DESCRIPTION="An automatic disk mounting service using udisks"
@@ -18,7 +18,8 @@ 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"
+	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}]"