gentoo resync : 15.12.2019

4 files changed, 5 insertions, 115 deletions

diff --git a/app-cdr/gcdemu/Manifest b/app-cdr/gcdemu/Manifest
index 97f39431752f..0b1c26a967b6 100644
--- a/app-cdr/gcdemu/Manifest
+++ b/app-cdr/gcdemu/Manifest
@@ -1,7 +1,3 @@
-DIST gcdemu-3.2.1.tar.bz2 52231 BLAKE2B f6b0025f6c5e79fe7312bf15b467327152e561db33f6190847e4e702cb98ff8005b37fe997c721b5c76cd64d64bafef1c015a9151c0ee200c52efcb849c93dba SHA512 c2da75d985981ccd0b44f210745670501fecd0ae7c60bde783fc5f91ab4c629c6eab9e8b35df906b5669b6518d3bdf36c5814b513c0f3e2d703659d23df1c82e
-DIST gcdemu-3.2.2.tar.bz2 52251 BLAKE2B 9defe9972e0ec1a594cc354113ef4877846a9abc152ea6768e7089c76b20e8cb488e2c988d92cc459abd10fbf4cdd9d2f5ad425b1ffd23dffca75d18352a0a3e SHA512 831c49e7929c379585fa48b0860054b8246c1798c783dc390edd781fca0e8c85450cb49d1e920e3f0ff29130c1049cd12e0c117851377557826803dfad9e8a8f
 DIST gcdemu-3.2.3.tar.bz2 52229 BLAKE2B 9f8d0b6e04b438c0637f42875b144ad4d1a643b8f1216d868040121e417203ffedbf983fec235eb30bf9d11bcfe142e52c1c89966ac3b64442071d0897a9e8bf SHA512 1d31b9edeb111145c7dd438fc645c7513877fe89f78cf262c282bba2d2e7f9a99a8499e607bf00f880186bd4a37a8ebbcc5ba14e1e014254e767a8335396d6e2
-EBUILD gcdemu-3.2.1.ebuild 1124 BLAKE2B ca3230f358917866a2fb5708b459b33eeca45ea23a16d7c51c53b8b18a2ae3615f39a6a6f12d8fcc7a4be0a54155907dec68eddd5bb4b731c4fb5cb74eb54f37 SHA512 bbdd46cae47b5f06d428f0131403b2b2bb39e000f02035d298155d7c81bf178c5cafbbf612a4abd34b656b835ecd3bb68643e56efd507befc7734dccdc7ba380
-EBUILD gcdemu-3.2.2.ebuild 1124 BLAKE2B 6e850dab70659ad96f92e4fd7a7b8a8da960633f0eb1d953aa3e8ef50f98fb15a102e49bcda067beabcd28ba1269196c7db351f17d572e120956add4aff9c25b SHA512 0c2d1c5db61774cd66944f1dcdc79e69900a78b0cda0440ae532b22c1565778e7697a19dbc90a9cadcf7d48aae811873f688fb634e54973c8668a120df390e81
-EBUILD gcdemu-3.2.3.ebuild 1152 BLAKE2B 3f054867d54b70f0532f2505302a82ff39632b71c5ddef830428ccb6175990ed24f932e6b678aed89dd664c315d246ccb42e094c1a73b45e971f57a78139d4ad SHA512 c5570d54e35e2ed50d1164867e1b88ef6e3ab8e7fa3daefccc1ee0554516686fc0bc05eb7d6d458c148d821417eb83ecefc0b84f16811d0818aefee7648f98b9
+EBUILD gcdemu-3.2.3.ebuild 1190 BLAKE2B 144aaaf820d1d636bf03823ddb6c3a33864e6edc5d39036d28bee464a86772fe4621bc9c888f14c7f49ed72103bc7efa05156a1851ca56eb22d85073297cb6af SHA512 d123dbc35c1458fc8de215f9b4568bef1bb32a75555e9e81792311b7d4c6d8606148a708de02109727d70140818a34e3eb22d1227c340487cc84150c9746a6c5
 MISC metadata.xml 332 BLAKE2B 0be8fdf09b872003fbd913a72966a059ad2d0870b281e6b86b19cf52f8c32b113d392dd71c85281f2f1abcb0933b592fb2112c18fe70359af7c7aacc9ff3a011 SHA512 d8bf249636b4dfda07c67e935bdd4b7392543fe31e2bf8c153954f4d680db45b0090f9bd89399f0241554a311b604185737c2bb7e64df43ea25adda9ee7468a0
diff --git a/app-cdr/gcdemu/gcdemu-3.2.1.ebuild b/app-cdr/gcdemu/gcdemu-3.2.1.ebuild
deleted file mode 100644
index 07325dc46248..000000000000
--- a/app-cdr/gcdemu/gcdemu-3.2.1.ebuild
+++ /dev/null
@@ -1,54 +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 cmake-utils gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="Gtk+ GUI for controlling cdemu-daemon"
-HOMEPAGE="http://cdemu.org/"
-SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# librsvg for pixbuf-loader
-RDEPEND="${PYTHON_DEPS}
-	app-cdr/cdemu-daemon:0/7
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	gnome-base/librsvg:2
-	x11-libs/gdk-pixbuf[introspection]
-	x11-libs/gtk+:3[introspection]
-	x11-libs/libnotify[introspection]"
-DEPEND="
-	dev-util/desktop-file-utils
-	>=dev-util/intltool-0.21
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS README )
-
-src_prepare() {
-	cmake-utils_src_prepare
-	python_fix_shebang src/gcdemu
-}
-
-src_configure() {
-	local mycmakeargs=( -DPOST_INSTALL_HOOKS=OFF )
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_schemas_update
-}
diff --git a/app-cdr/gcdemu/gcdemu-3.2.2.ebuild b/app-cdr/gcdemu/gcdemu-3.2.2.ebuild
deleted file mode 100644
index 1e96f5a37523..000000000000
--- a/app-cdr/gcdemu/gcdemu-3.2.2.ebuild
+++ /dev/null
@@ -1,54 +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 cmake-utils gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="Gtk+ GUI for controlling cdemu-daemon"
-HOMEPAGE="http://cdemu.org/"
-SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# librsvg for pixbuf-loader
-RDEPEND="${PYTHON_DEPS}
-	app-cdr/cdemu-daemon:0/7
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	gnome-base/librsvg:2
-	x11-libs/gdk-pixbuf[introspection]
-	x11-libs/gtk+:3[introspection]
-	x11-libs/libnotify[introspection]"
-DEPEND="
-	dev-util/desktop-file-utils
-	>=dev-util/intltool-0.21
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS README )
-
-src_prepare() {
-	cmake-utils_src_prepare
-	python_fix_shebang src/gcdemu
-}
-
-src_configure() {
-	local mycmakeargs=( -DPOST_INSTALL_HOOKS=OFF )
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_schemas_update
-}
diff --git a/app-cdr/gcdemu/gcdemu-3.2.3.ebuild b/app-cdr/gcdemu/gcdemu-3.2.3.ebuild
index c5330923b91f..0b62f16b24be 100644
--- a/app-cdr/gcdemu/gcdemu-3.2.3.ebuild
+++ b/app-cdr/gcdemu/gcdemu-3.2.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7,8} )
 
 inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
 
@@ -20,7 +20,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 # librsvg for pixbuf-loader
 RDEPEND="${PYTHON_DEPS}
 	app-cdr/cdemu-daemon:0/7
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
 	gnome-base/librsvg:2
 	x11-libs/gdk-pixbuf[introspection]
 	x11-libs/gtk+:3[introspection]