gentoo resync : 15.12.2019

4 files changed, 5 insertions, 113 deletions

diff --git a/app-cdr/cdemu/Manifest b/app-cdr/cdemu/Manifest
index 9abcc54ec1fe..d9d77493f2c3 100644
--- a/app-cdr/cdemu/Manifest
+++ b/app-cdr/cdemu/Manifest
@@ -1,7 +1,3 @@
-DIST cdemu-client-3.2.1.tar.bz2 43584 BLAKE2B d34c09203b7b4e70161d62aee48d531b083952174fd2357bf0fc7b69a0fd59200bedb9ca87fe2d2c18c953979c84e9db3fec4d5fb500375f0bcc155dcaf5cedb SHA512 913c26754d16c339d7ddb4e00cc7d5b754ad6cc7f1a156c9448b51ed09468cf9e8a2bc74ed123a621278d2ad281e447d33ee06c3416bc1d0d2e6c2becd539154
-DIST cdemu-client-3.2.2.tar.bz2 44305 BLAKE2B 3a656bfda48a502752cb2b14df413a26467a1512b867cc1519f3dfd21b764a8086135a70b13272f258eb079ce169f58af55665e56238a7ba57cf4e9d84f07751 SHA512 ab5c1b1c741945618581bedb18a6eebdcb55915dc811e4247f0c3afe17729f7fbfaaaec10302e444a2f237c5a1401aa402a614685a84c63442907982e759ff41
 DIST cdemu-client-3.2.3.tar.bz2 44311 BLAKE2B 23451618897a5281478c9d70ded357089a4baaf47b22f36b4add9c5d2c899478629ce034cce0e593b501a127cdc1f5527f0aaf1951f709bf4c2d131e898045a2 SHA512 5d98870fa42bb639009dc6971747f252f3403eda882bffacf55f647193a1a9fb7a75ad69a7512da3abdcdeb64510b0f163ea997c4d75a804fa93880b62b03dd6
-EBUILD cdemu-3.2.1.ebuild 1081 BLAKE2B 33bb3596f62c2df6265e4313dd0fa84e52fb73d64cdcc938650c9a340b7b6c19505acaae17b4c61080bbdc578a834ac80b90f2027ee0462f345f66d1895f41bf SHA512 95642bbf73fd7a54dae54a4408275be33a55545b91af88db0e5e6890f03433d079309d0a4f28c32b44fa85332f354657391453fa57aedf623af8f6b77bbc4ea0
-EBUILD cdemu-3.2.2.ebuild 1081 BLAKE2B 70bfa6055b171bb1502ecf1a2e00564cf1c2a9699689f6e35cf65410e14025db42bc567162e000ee40d32a881e2f01c13d2adf7a0a775ade15bd546367c9b406 SHA512 84b0acd9dab2d99032de8bfe366455c4e12f4bd07175fc71d24881ee23f81a132da5e84254bc3873723159aacf67a7ca87ed929e9e32f603649ec4294e03d62f
-EBUILD cdemu-3.2.3.ebuild 1118 BLAKE2B 30145b51fe5903d9f43fe4c734ae9303e8cd88b93200979e0019980f545fda87487de4b6c1494e5a47f0fff50bc4e1bab66f047e748e659c523d4e9e4aa452fa SHA512 bbd872e3756bec14c44708c65e84508daef94befb097eca6e98753f66b22b4be5ecde06a082f2765cca2dae7166b5180e46404c9a858b3619b17227cd47b72ba
+EBUILD cdemu-3.2.3.ebuild 1156 BLAKE2B 2e820ef420b9571ecca45728471556c623d80f6385e8edae2d8ab8d8a16f5164072197f2bde684ffa0d2a9e64c9230e7be417496eb7aa8606f60bcbe8135b6b5 SHA512 c444173363e1fdecff08ce5a2ccc88a5f1377c54429fb0b015c20dfbe6208e6af264c7510307f5c32debbf07efc148b0a87f33e9f4961f72b9e24d6fe3550f13
 MISC metadata.xml 529 BLAKE2B 88d72a301708901597eb11c475ae67d8477381c77d430b49042cb4a8658aa44b88273858f87cbbaa1fc16ae222b604fa9ff81f6f791d39c39d5c76b58b9d0d81 SHA512 27850929d16910038f7b406c0ec4c22648c91a6f8a8f9cd56c0a3ea8e4e772de9b77598514c5a621eb71386635a327829251a90128ba33073ac34485a3b60a92
diff --git a/app-cdr/cdemu/cdemu-3.2.1.ebuild b/app-cdr/cdemu/cdemu-3.2.1.ebuild
deleted file mode 100644
index 2a76ff1648ec..000000000000
--- a/app-cdr/cdemu/cdemu-3.2.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit bash-completion-r1 cmake-utils python-single-r1 xdg-utils
-
-DESCRIPTION="Command-line tool for controlling cdemu-daemon"
-HOMEPAGE="http://cdemu.org"
-SRC_URI="mirror://sourceforge/cdemu/cdemu-client-${PV}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+cdemu-daemon"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	cdemu-daemon? ( app-cdr/cdemu-daemon:0/7 )"
-DEPEND="
-	dev-util/desktop-file-utils
-	>=dev-util/intltool-0.21
-	>=sys-devel/gettext-0.18
-	virtual/pkgconfig"
-
-S=${WORKDIR}/cdemu-client-${PV}
-
-DOCS=( AUTHORS README )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	python_fix_shebang src/cdemu
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPOST_INSTALL_HOOKS=OFF
-		-DCMAKE_INSTALL_COMPLETIONSDIR="$(get_bashcompdir)"
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-cdr/cdemu/cdemu-3.2.2.ebuild b/app-cdr/cdemu/cdemu-3.2.2.ebuild
deleted file mode 100644
index 76a0b4986339..000000000000
--- a/app-cdr/cdemu/cdemu-3.2.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit bash-completion-r1 cmake-utils python-single-r1 xdg-utils
-
-DESCRIPTION="Command-line tool for controlling cdemu-daemon"
-HOMEPAGE="http://cdemu.org"
-SRC_URI="mirror://sourceforge/cdemu/cdemu-client-${PV}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cdemu-daemon"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	cdemu-daemon? ( app-cdr/cdemu-daemon:0/7 )"
-DEPEND="
-	dev-util/desktop-file-utils
-	>=dev-util/intltool-0.21
-	>=sys-devel/gettext-0.18
-	virtual/pkgconfig"
-
-S=${WORKDIR}/cdemu-client-${PV}
-
-DOCS=( AUTHORS README )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	python_fix_shebang src/cdemu
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPOST_INSTALL_HOOKS=OFF
-		-DCMAKE_INSTALL_COMPLETIONSDIR="$(get_bashcompdir)"
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-cdr/cdemu/cdemu-3.2.3.ebuild b/app-cdr/cdemu/cdemu-3.2.3.ebuild
index 0929becda5a1..9786afa05476 100644
--- a/app-cdr/cdemu/cdemu-3.2.3.ebuild
+++ b/app-cdr/cdemu/cdemu-3.2.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7,8} )
 
 inherit bash-completion-r1 cmake-utils python-single-r1 xdg-utils
 
@@ -19,7 +19,9 @@ IUSE="+cdemu-daemon"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
 	cdemu-daemon? ( app-cdr/cdemu-daemon:0/7 )"
 DEPEND="
 	dev-util/desktop-file-utils