Revert "gentoo resync : 13.10.2019"

This reverts commit ab499d7cfb9ad23e83cf7a4f5052bdf1b4c42030.

3 files changed, 3 insertions, 82 deletions

diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index 07fb85df56c8..5c2a18664eb1 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,5 +1,3 @@
 DIST gnome-music-3.30.2.tar.xz 3027580 BLAKE2B 9cd5a10fecbf7fb962455bec7ee5392a305f3bab9ebb3e2f0d24066ffd6975377c57a722e850ee340e2990f61b06456f1fe963b80d57030416af7ea3b7f92b32 SHA512 b9fa33ccb76d747e22e1144b2c77dc88432386fdfd4f52720cb1ae3230c06fb899fec654dc1e126103e393eb0358a4385099743abe26505b9b7dcffe2d04a8c8
-DIST gnome-music-3.32.2.tar.xz 1391112 BLAKE2B ec64d48bcc137c69df77d9d9fadb3fa5c1809850e7a434d501cf6fd680500e57a4e6946ab591db9b715e728f0274f37b659afce53fd9213b3cf74f329f4373f3 SHA512 633748dcb5cf839f29059fd9bdd5283c455a4157d6c004168d9ef80352b83be3db547377034d0d78af0b6a84fec6fb941888bd53aa14c8bf51da880f04170a23
-EBUILD gnome-music-3.30.2.ebuild 1875 BLAKE2B f3152d6664dc5f7b9166d86d3adf88be1eb5d87454a50729451eb0a55fb4951057202f086549b6a7cdaaf439a7751f7dc16dc3f67918bae2cd53fa79d05a7a58 SHA512 00716b316ea3af6cd4928a2a9d659bae0d2a94b44807eca9cc1b6470b9334fd029000a03569e9fd16cdc3671156b342da0c1eeba02fa1bb078186c10eac669a0
-EBUILD gnome-music-3.32.2.ebuild 1971 BLAKE2B 1720f095eb449238fe1096f256e76e835cb8876fcd633bb1d72983c9c643760c89fbcbb5f1bb37aa991f25cfd23bf0f3d71d7a6363258247e925996471537161 SHA512 e076ef2aebb06ea4075852943a72e88daeb4c39c8bca9e5257333ea14900b0ef6023801b3f7d995e513281b1cc2e7ef357aa179c1ff75074beb89daa40622f0a
+EBUILD gnome-music-3.30.2.ebuild 1937 BLAKE2B 318b6ad95b725e1a88d25f7ee310f69d2daa0ed3e7df19f633bea2682005f0f9bf779aa50e9c083be718ce4d0f1836cdaa0f48ed3cba433aca98cd9d4dd0387e SHA512 3dd49d5f04478be68708e628ddd6e584c3fc57c4d52dd7d76f2207685c282b85b204e8b14f62ffe642d3a3ed7dd5746b330b354ef6c9dba0bb95b8016dcf45c7
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/gnome-music/gnome-music-3.30.2.ebuild b/media-sound/gnome-music/gnome-music-3.30.2.ebuild
index 04d88e333422..c6dba4f8ad4d 100644
--- a/media-sound/gnome-music/gnome-music-3.30.2.ebuild
+++ b/media-sound/gnome-music/gnome-music-3.30.2.ebuild
@@ -16,11 +16,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 KEYWORDS="amd64 ~arm64 x86"
 
+# At 3.30.2 libdazzle only used from .ui file, thus introspection not needed
 COMMON_DEPEND="${PYTHON_DEPS}
 	net-libs/gnome-online-accounts[introspection]
 	>=dev-libs/gobject-introspection-1.54:=
 	>=x11-libs/gtk+-3.19.3:3[introspection]
-	>=dev-libs/libdazzle-3.28.0[introspection]
+	>=dev-libs/libdazzle-3.28.0
 	>=media-libs/libmediaart-1.9.1:2.0[introspection]
 	net-libs/libsoup:2.4[introspection]
 	>=app-misc/tracker-1.99.1:=[introspection(+)]
diff --git a/media-sound/gnome-music/gnome-music-3.32.2.ebuild b/media-sound/gnome-music/gnome-music-3.32.2.ebuild
deleted file mode 100644
index 49e7450a357e..000000000000
--- a/media-sound/gnome-music/gnome-music-3.32.2.ebuild
+++ /dev/null
@@ -1,78 +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 gnome.org gnome2-utils meson python-single-r1 xdg
-
-DESCRIPTION="Music management for Gnome"
-HOMEPAGE="https://wiki.gnome.org/Apps/Music"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-DEPEND="${PYTHON_DEPS}
-	net-libs/gnome-online-accounts[introspection]
-	>=dev-libs/gobject-introspection-1.54:=
-	>=x11-libs/gtk+-3.23.1:3[introspection]
-	>=dev-libs/libdazzle-3.28.0[introspection]
-	>=media-libs/libmediaart-1.9.1:2.0[introspection]
-	net-libs/libsoup:2.4[introspection]
-	>=app-misc/tracker-1.99.1:=[introspection(+)]
-	>=dev-python/pygobject-3.29.1:3[cairo,${PYTHON_USEDEP}]
-	>=dev-python/pycairo-1.14.0[${PYTHON_USEDEP}]
-	>=media-libs/grilo-0.3.4:0.3[introspection]
-	>=media-plugins/grilo-plugins-0.3.8:0.3
-"
-# xdg-user-dirs-update needs to be there to create needed dirs
-# https://bugzilla.gnome.org/show_bug.cgi?id=731613
-RDEPEND="${DEPEND}
-	|| (
-		>=app-misc/tracker-miners-1.99.1[gstreamer]
-		>=app-misc/tracker-miners-1.99.1[ffmpeg]
-	)
-	x11-libs/libnotify[introspection]
-	media-libs/gstreamer:1.0[introspection]
-	media-libs/gst-plugins-base:1.0[introspection]
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/grilo-plugins:0.3[tracker]
-	x11-misc/xdg-user-dirs
-"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-RESTRICT="test" # only does desktop and appdata validation, and latter needs network to validate screenshot from https
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	sed -e '/sys.path.insert/d' -i "${S}"/gnome-music.in || die "python fixup sed failed"
-	xdg_src_prepare
-}
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${D}"/usr/bin/gnome-music
-	python_optimize
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}