gentoo resync : 21.05.2019

32 files changed, 48 insertions, 1137 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 786f1ab4d6c0..02aa1b52fd07 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index 8fce5d6ad15f..1d38c5b4909c 100644
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -1,3 +1,4 @@
-DIST beets-1.4.7.tar.gz 1458621 BLAKE2B f7dd19a7dd92415c29e9b1a7932ba33cb5d43000d35a58b2f42c1487db68c6374dd159960f67e1ac68722693d91d364b24297fb2c0c86a39b82fe5b40a1e739d SHA512 6663a2ffece208a510fce9f5d3dd9c8e617cab60cdb994f7bdb13fd759cfea8882290c75c3cdf4f6de9c7d9b78845b6ed29f98b41c787c89ff8782e4ac3ec152
-EBUILD beets-1.4.7.ebuild 3546 BLAKE2B 58368f23a27a357214b86b767f8317f01dfbd7fe82f8d71a6cf3bef0e1867003ea0ab133c546cd9cb36c2d0f090511abd20c84617f5c3ccdbe50ff0140c6d9e4 SHA512 a592d5cc11ecf49aea157a44bbc574f79be4b887ef06283eba9d520cf4684b94fa3d1e851865c2bb275722095547fe2efa2ce2b9ed3dd40ffb4eec16e729080e
+AUX beets-1.4.8-imagemagick-detection.patch 770 BLAKE2B 120e0af71fe9c63548f49bf20fa94ec20f8b0cfb8395b319d6f8e2a62b5212adb229691c35297615a3b0272b215c87e1ff861e1887d227fc9460501900edae48 SHA512 6c5da1591e0bfc0936dca52c48f74b80b57c18bb0398877d38deb7d448df9466a8544628e0ce6948204a8deae4679c8dd454dab9a2f0778a236eaa60387a1751
+DIST beets-1.4.8.tar.gz 1493539 BLAKE2B 63c44f05bbf139cd43b5f5ada972fd30beeea2303c6b479b1be35ea21fabb0039b3c8eb6e90f8f1b2a61fed36d97ce09a32c6346cbd3b84c7c978e796505f4b4 SHA512 449bed88185a5ecb4781719e092c2428ddc52fb8084033db64a4c0eca8899154192e7cea82517993d60326c7fe39b26429584ba368ffc35800f722d8d6a03217
+EBUILD beets-1.4.8.ebuild 3664 BLAKE2B 5614f65a3489bc6ee055f25592811fb693123af75b5da4c78c2519244003f81438e162bf6d861b6f023d6a9829f63ec937feb8f37848e7e6091d6aba90ba04d9 SHA512 49049389dd652571f82da01da5ce2f676e6bd4340d989669c58db436d819e0fe27e2b1c8a202c9ff40978a4fb4465e64291918283b3f86e1db372e249eb5cebe
 MISC metadata.xml 2395 BLAKE2B 0df8a5d3fa7b94b5b8e3e45f25e2c4dc0716c438dd51a6061f2276e20bf9779847c34bc571bcdd8948289c75c879cae6ef76fa8432a550855e9f74966fb80374 SHA512 ea2c961e7380a8c05e0e90b34f50323ca932e06ba33d5a214a633e8eba4281577993a870a7d294f286a90c0492256d3142b9e17aa02e2ea129c9c28e24bf90ec
diff --git a/media-sound/beets/beets-1.4.7.ebuild b/media-sound/beets/beets-1.4.8.ebuild
index 580bf88dca80..432eaabd9850 100644
--- a/media-sound/beets/beets-1.4.7.ebuild
+++ b/media-sound/beets/beets-1.4.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ HOMEPAGE="http://beets.io/ https://pypi.org/project/beets/"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
 LICENSE="MIT"
-IUSE="badfiles chromaprint doc discogs ffmpeg gstreamer lastfm mpd replaygain test thumbnail webserver"
+IUSE="badfiles chromaprint doc discogs ffmpeg gstreamer icu lastfm mpd replaygain test thumbnail webserver"
 
 RDEPEND="
 	dev-python/jellyfish[${PYTHON_USEDEP}]
@@ -41,6 +41,7 @@ RDEPEND="
 	discogs? ( dev-python/discogs-client[${PYTHON_USEDEP}] )
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	ffmpeg? ( media-video/ffmpeg:0[encode] )
+	icu? ( dev-db/sqlite[icu] )
 	lastfm? ( dev-python/pylast[${PYTHON_USEDEP}] )
 	mpd? (
 		dev-python/bluelet[${PYTHON_USEDEP}]
@@ -74,6 +75,8 @@ DEPEND="
 
 RESTRICT="test" # tests broken in 1.4.3 already
 
+PATCHES=( "${FILESDIR}/${P}-imagemagick-detection.patch" )
+
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
@@ -101,6 +104,7 @@ src_prepare() {
 
 	rm_use_plugins chromaprint chroma
 	rm_use_plugins ffmpeg convert
+	rm_use_plugins icu loadext
 	rm_use_plugins lastfm lastgenre lastimport
 	rm_use_plugins mpd bpd mpdstats
 	rm_use_plugins webserver web
diff --git a/media-sound/beets/files/beets-1.4.8-imagemagick-detection.patch b/media-sound/beets/files/beets-1.4.8-imagemagick-detection.patch
new file mode 100644
index 000000000000..1564cd80b1ff
--- /dev/null
+++ b/media-sound/beets/files/beets-1.4.8-imagemagick-detection.patch
@@ -0,0 +1,23 @@
+From 299cb53e44efdbccd2ad623434edcdbd4073547a Mon Sep 17 00:00:00 2001
+From: Filipe Fortes <fortes@users.noreply.github.com>
+Date: Fri, 17 May 2019 15:02:18 -0400
+Subject: [PATCH] Fix ImageMagick Detection
+
+The `return` statement was at the wrong indent level, so we never checked for the legacy `convert` executable
+---
+ beets/util/artresizer.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/beets/util/artresizer.py b/beets/util/artresizer.py
+index 3590dcf22..1ee3e560d 100644
+--- a/beets/util/artresizer.py
++++ b/beets/util/artresizer.py
+@@ -278,7 +278,7 @@ def get_im_version():
+                                int(match.group(3)))
+                     return version, legacy
+ 
+-        return None
++    return None
+ 
+ 
+ def get_pil_version():
diff --git a/media-sound/cmus/Manifest b/media-sound/cmus/Manifest
index 82a2fdaeabad..68570c2c76a5 100644
--- a/media-sound/cmus/Manifest
+++ b/media-sound/cmus/Manifest
@@ -3,7 +3,7 @@ AUX cmus-2.8.0-ffmpeg-deprecations.patch 3913 BLAKE2B 71065d6db1682955e96aa70bfd
 AUX cmus-2.8.0-opus.patch 774 BLAKE2B 3ac353e658ec4bd87e7cf6156d76760fb84ca03b78126403ccc577c169001f468d763341da5df8a63cff2a94f3e732b4ed94384bc94da414c229793c89595497 SHA512 a1f22b620232700a30249a61ee13559bea75cf82cdac9c29ee5ccafb45c689e4c0d487523d613e37cf9c3e8764c9a4170c612721fbf1a56b04ddac63ddfe6801
 DIST cmus-2.8.0.tar.gz 317243 BLAKE2B b24c3dd74797ef26b42c2c303191dd751af7bb3b5c4c6f05bfef393eda9a35371eba4658321d473f9af210321132cfba5eab4037d257dd71c38ea3e24f78067f SHA512 cf359dfcefa833a5b10a2d16ac405672bea762b62b7177c115560127035682fba65c15b9a8710179a343d1f99212a0260b5c095542982202e2cd1bef5b0c17fc
 DIST cmus-2.8.0_rc0.tar.gz 315613 BLAKE2B b5f44b724176ecca61376866da20614ba34e741b8295b8d21ba0eb13226024812dd6dfafe98f08ed367fd9454e787da5ba623b238b5944f5ae69fe58b02a224c SHA512 0379f18497d6510fad35a2d905c932d12f2726a5694d3ab272ce139e9ea4520cb4dd1cf3fafe890f6ada8a64285f8c04ef7571647a66c2d44df17e2dca80f869
-EBUILD cmus-2.8.0.ebuild 3828 BLAKE2B 097425fffc4be6e97b4fe919582dd8e2725283cdf9f45f0daf5b6882dc3cbf5065488a1a1f11702ddd78fb4e407c0be343954be5b6d9b7cd15495a1a162fbd6c SHA512 301421639c61d74215518ebe879a79786bc3203a78684d41cd272e3658319d19ca060d8fbe796ff6ae46fe14a256ce00111d13878c8f25be3540aaffecbaee2f
+EBUILD cmus-2.8.0.ebuild 3826 BLAKE2B 8f043ad9a26c7cc49bc848e450abc6f0dd903e271231cd5822b4104af607f5b7f81f740010c771efba65ecb9d0cdde148b3f7f8e18b2fab5fd107660f7e98aa5 SHA512 1ece1938a47705ac389044fd2fb46c2fa9644a9d13dabc941b93439a090452c39a5aaeee715d2be8feb84ec5bdfdabd97fd973daf316c42623c696ed4b92555a
 EBUILD cmus-2.8.0_rc0.ebuild 3300 BLAKE2B f4af7df639feff9d976cda04f6bcb9b3cdb2592046ca3ce8600845b0200f34b0541042edb0785010698296775864fc9221876e887f4acd1d675c05dbae4002f3 SHA512 306d304bc131a67960188573ad46da113539c86eb40e7bf78762214065fb69c8653f2af8e19ac140499ad199139c0c12a82249e6f6d13d632704fd99cf49d2a8
 EBUILD cmus-9999.ebuild 3705 BLAKE2B 2452b59c056ad050a8e3015d10d157a0492ddb7ba1620883c83b36129f40dbc4d8838652f88b7122a4b9c6e281175f90be6b63c7942bebc840bd3eb2073eaa55 SHA512 03ded6c4b2fc7b4e1a201e98191d38311be5d2c56d17f9ed8b58af72c251eafe7180f0a5fda5baddbb104790d94e45716abd176ac2d4a4a999633edf7a08bde0
 MISC metadata.xml 935 BLAKE2B 6623b356fec8c0bb8ea7b30ff8b767ba108afdd0f02e4881b2afd7229b4b912f781ec89daf1078a057d6f10638e361889ecb9535b3cd81822a6a88c17972ae58 SHA512 f17d07ee3d1bb7e7a813c12d994005c6603f2c381680d4b79c07504556d7de4a84f3720916f39325eacf846000af39500259e4d2446ca6b302d61c59a1535710
diff --git a/media-sound/cmus/cmus-2.8.0.ebuild b/media-sound/cmus/cmus-2.8.0.ebuild
index eeff92441106..9b6c52634101 100644
--- a/media-sound/cmus/cmus-2.8.0.ebuild
+++ b/media-sound/cmus/cmus-2.8.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/cmus/cmus/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+	KEYWORDS="amd64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 fi
 
 DESCRIPTION="Ncurses based music player with plugin support for many formats"
diff --git a/media-sound/dir2ogg/Manifest b/media-sound/dir2ogg/Manifest
index ad29c61f0d2c..8712dc891ddb 100644
--- a/media-sound/dir2ogg/Manifest
+++ b/media-sound/dir2ogg/Manifest
@@ -1,5 +1,5 @@
 DIST dir2ogg-0.11.6.tar.gz 19442 BLAKE2B 4cad096f6e727b90e8b09594b1b189b3dbeae581e5ecd485ac8dc853b3f059cd73529422835d682ac7db96d4225380c48ef101343faecc8f32aa8ce056a6b784 SHA512 c5b82640b21e5c94bf15ae174b1351bab11511fee15c30ba39f8ac64103fd5f6934687eb5c025f68adb3e70701f1b644f61800e2d745e33ecb02005f07b6c6b0
 DIST dir2ogg-0.12.tar.gz 19608 BLAKE2B 39b1210b2458f7774aef64f29b07826a19b274d17a6038fc676557c8b15bed3662f851b87414b9318be154cdadd450001ea45bd8ed6103cffb2ee183511fe617 SHA512 bd76ba168b6e5305e4e5cfd87333200ec72a1d6e7055e966e1544abc842b39743b479b80c63382e10e85eebad92e97ec33e6fe52b0ace2df024ed50468e3946e
 EBUILD dir2ogg-0.11.6.ebuild 872 BLAKE2B 87808d632d07bcb7508af868d3402486314b0fc18b1da430e3548e97d89efbcc8dfd4121aa54686c26a7aadbc1440a35101fdf8a7f3579ae9507890ff848fa7b SHA512 a85412cd58fca620d19da47247d3bba1878bc91a179381b9a252d403aea5cc7d7f3d6e4700aa8c0c71b0a387d27af150b96f2429309f0ce5fef9976bb0d9f5eb
-EBUILD dir2ogg-0.12.ebuild 1168 BLAKE2B 80279d00e5d1559d862b178877cb7754a4a360a496dcd494ee497db006d894ecba6976581fc7d6df3798f5ee893cf45106ac69a7923c6486d0a1f721e0b196f5 SHA512 86ab6cbd11e5bdfced7e2e85b836b42a6e1c67825a467edecc8fc7986485d3b020a3943263309f13a4283325ec756a89d1b4ed27f9d572e159af07312b23a031
+EBUILD dir2ogg-0.12.ebuild 1167 BLAKE2B 332f8a448d1a8045bfe5a4d4469a2c53bb0256a9798d069071ae32b14f831f5b3acdad7f3e588f256f3be008f6c13bf088ebbd2fe07bc8299effd520d61701e9 SHA512 3a2d66203146187194fca8eef7164c923488c1e11dfdc4f5b02218192c05c2483a00a965873bb88a9ce753e12acf133fcb969d601192fd2421405bdfc63c59d6
 MISC metadata.xml 420 BLAKE2B 96885d28693df18ad564fe6ff658cd66bc39b3d556dcb5079ba531fea3bf603cdd558cd083c82bf76e06c170bf21e880600981dcb114117e55d585664119f1e5 SHA512 3c87da9d9f935209757f3731cb1b80817d28eab005b9ce29cc5113e3ad063e61666d1e00585e709b77f1ba3aca5703f4c9f64100c075062cddf58c2f72edc074
diff --git a/media-sound/dir2ogg/dir2ogg-0.12.ebuild b/media-sound/dir2ogg/dir2ogg-0.12.ebuild
index a09a25bd5d6c..1e90d2050a91 100644
--- a/media-sound/dir2ogg/dir2ogg-0.12.ebuild
+++ b/media-sound/dir2ogg/dir2ogg-0.12.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://jak-linux.org/projects/${PN}/${MY_PR}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc sparc ~x86"
+KEYWORDS="amd64 ~ppc sparc x86"
 IUSE="aac flac mac mp3 musepack wavpack wma"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index 30fdb115d37b..a09195d7b764 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-music-3.26.2.tar.xz 1563244 BLAKE2B 5a5d27b34470a49a752cb67a1040e227595fd15c6ca4f7656818636d614dfef8ec082dc014ea05c271f512f7c362dc2f81a38359ef04e0663467f62ff3ac2423 SHA512 e8efe31003a54b6cfea151c5402c4d06e48928be7b79332f7f9fb8a567ff7d0d42a43e943398ad6cb7e391d0162322c7fde74922a4b16e52ec24691cc1bfc5b0
 DIST gnome-music-3.30.2.tar.xz 3027580 BLAKE2B 9cd5a10fecbf7fb962455bec7ee5392a305f3bab9ebb3e2f0d24066ffd6975377c57a722e850ee340e2990f61b06456f1fe963b80d57030416af7ea3b7f92b32 SHA512 b9fa33ccb76d747e22e1144b2c77dc88432386fdfd4f52720cb1ae3230c06fb899fec654dc1e126103e393eb0358a4385099743abe26505b9b7dcffe2d04a8c8
-EBUILD gnome-music-3.26.2.ebuild 1624 BLAKE2B d6db41f12fa7722e78ba7e1f16071c7afb16df1d29c7b2cf5e859a86ed74e7b5b09570db32fcabe49fac782fca1099982fd6a63b29086ee32b001d3e20924074 SHA512 66619a886cf9e5b544d967a0c708abe3a4ab7ba7429f70cb151b298679bb6001e27b6f9be214ba6542643704a3184d3531d90032455c7b2a8a33f0502bcd004c
 EBUILD gnome-music-3.30.2.ebuild 1930 BLAKE2B 13988a73d9e75e80595c41881a7a0fa339786fa0cc14d76da1bcb084db6be7f70a580712a482aee543967f2b70576f067ba6cf28e5d3f9e64acb156162de1a3c SHA512 656e1a91687791a5ff1254285733e6b5ff6538c10b8eb3b3148781db3c0f4c2919591db2896260d502f1cf9cb397708761c903111426582e7e8c64300fb6d8cb
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/gnome-music/gnome-music-3.26.2.ebuild b/media-sound/gnome-music/gnome-music-3.26.2.ebuild
deleted file mode 100644
index 1ccbf317c741..000000000000
--- a/media-sound/gnome-music/gnome-music-3.26.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_5,3_6} )
-
-inherit gnome2 python-single-r1
-
-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 x86"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	>=app-misc/tracker-1.99.1:=[introspection(+)]
-	>=dev-python/pygobject-3.21.1:3[cairo,${PYTHON_USEDEP}]
-	>=dev-libs/glib-2.28:2
-	>=dev-libs/gobject-introspection-1.35.9:=
-	>=media-libs/grilo-0.3.4:0.3[introspection]
-	>=media-libs/libmediaart-1.9.1:2.0[introspection]
-	>=x11-libs/gtk+-3.19.3:3[introspection]
-"
-# xdg-user-dirs-update needs to be there to create needed dirs
-# https://bugzilla.gnome.org/show_bug.cgi?id=731613
-RDEPEND="${COMMON_DEPEND}
-	|| (
-		>=app-misc/tracker-miners-1.99.1[gstreamer]
-		>=app-misc/tracker-miners-1.99.1[ffmpeg]
-	)
-	x11-libs/libnotify[introspection]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	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
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.26
-	dev-util/itstool
-	virtual/pkgconfig
-"
-# eautoreconf needs app-text/yelp-tools
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	sed -e '/sys.path.insert/d' -i "${S}"/gnome-music.in || die "python fixup sed failed"
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	python_fix_shebang "${D}"usr/bin/gnome-music
-}
diff --git a/media-sound/gnome-sound-recorder/Manifest b/media-sound/gnome-sound-recorder/Manifest
index ddd19ac1b6b5..631a5f62735d 100644
--- a/media-sound/gnome-sound-recorder/Manifest
+++ b/media-sound/gnome-sound-recorder/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-sound-recorder-3.24.0.1.tar.xz 452240 BLAKE2B 37b2b81255af5aff4de08e92bf7db216b229885b1aeee87d91a1210412634b62641758c6132290b75494f780d304d78dee4c3d5d7e08de46736750c2730b20d0 SHA512 00e190e8d6a1a3961122485742705da4d85ef926453ff8098718566771600690562597f012f7cd9dc61b5910b4e75cc7518e86a092f052c3fc40a96310ab3c3f
 DIST gnome-sound-recorder-3.28.2.tar.xz 454216 BLAKE2B 9f9a5a7c0a5a34c2a5ba00ed6d83736a0facb2dd7ffbe86b9c482e7bc50b282f9e20a8800591238e74a45c3c8eb2adf27c66dea59d0551d87c8997b2ef53d24c SHA512 1f4022d96d636391d4973bdc1285286a61a28107b9f875e66b4b2def767b4f2900ba2fe4b92166b1cdb61dc0b5afe65c0f81ffa7304aa38c1f510108dcd8b70f
-EBUILD gnome-sound-recorder-3.24.0.1.ebuild 1083 BLAKE2B d9df40ebe569a1c0f3edfb91c57ff26b8d6345f56c9d5122c42abeda635df851f679009e21cce1dced73deb7ed7f529df036bc1aa5e2a5a4143200cface68a3e SHA512 499c05e1955bad18123c5a3f994da3034b7df4d0d6816718f39ca43df1da1cde7dc8212ca84193474a832c5d9976b996ab6394009a52420f1a0d96a88c7b2691
 EBUILD gnome-sound-recorder-3.28.2.ebuild 1080 BLAKE2B 1a0f4da7e721c2d71a04d9058d479567e4387cd973c0b9bc94987831997a1b5dec408afb563b7aa01cb31f821c7222dce482ab3df4caa7e84035f2005cb95d23 SHA512 b9d90776b7a38e7f6944097a2cda69124da6c82d3eb2a0c0aa537c7360987d5d0314c922f4477affa8549209200c5659154873d391a3733184aa1a255b2172a7
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.24.0.1.ebuild b/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.24.0.1.ebuild
deleted file mode 100644
index 2e40dc899df6..000000000000
--- a/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.24.0.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Simple sound recorder"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/SoundRecorder"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	dev-libs/gjs
-	>=dev-libs/glib-2.46:2
-	>=dev-libs/gobject-introspection-1.31.6
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.12:3[introspection]
-"
-RDEPEND="${COMMON_DEPEND}
-	media-libs/gstreamer:1.0[introspection]
-	media-libs/gst-plugins-base:1.0[introspection,ogg]
-	media-libs/gst-plugins-bad:1.0
-	media-libs/gst-plugins-good:1.0
-	media-plugins/gst-plugins-flac:1.0
-	media-plugins/gst-plugins-pulse:1.0
-
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.26
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# FIXME: upstream should provide a way to set GST_INSPECT, bug #358755 & co.
-	# gst-inspect causes sandbox violations when a plugin needs write access to
-	# /dev/dri/card* in its init phase.
-	sed -e "s|\(gst10_inspect=\).*|\1$(type -P true)|" \
-		-i configure || die
-}
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index 2fea9b1f2bd7..08d4badf3941 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,5 +1,3 @@
-DIST kid3-3.7.0.tar.gz 1466849 BLAKE2B 39bdab9afb187754914ef77326d9c323e5dd4ab13a6f603deca3dfe97acb0d7a81d58a8eb569397c1a094ebaa7449997b729ce008614c8fc9f04d2b9e7995e03 SHA512 3112addba1e0697ae8874bf12336e54c744165a692dc81a99d97194df8511aa540a53085e2be84b3557cd9a2c9d3d887046c06550cef11406b28e6f6e6b507a6
 DIST kid3-3.7.1.tar.gz 1486532 BLAKE2B aec19ca9792ab5a3ae975d64b581074f6505507027bc52483a95b8570fdf7484fadd63a5cc740b59817b6b2b7227f02637aeb3e9611d206a536138c6db083198 SHA512 68b1d4978e5e984d180981d02df5efa247d50da79e5c6a41010eb3c5369b6cdc023042333865f4730e47814c4b4b69dc2f1bcbe1566396b72637fd576f5e543c
-EBUILD kid3-3.7.0.ebuild 1892 BLAKE2B a0136ed5d6f8bf649a7ef068ba5cbfc928ab480dfe258b6d70b8d0f9b94ebd7d2e7d0e574ef4f8e2414d2cd6ddb2aacd29ab5e4ee79dbee22e2e09e255f505d9 SHA512 d152bf282c735e9e302a99464c6056346dc0616bb4fbe282446da4ea87934891eabb2f1b08dca677ff628b7ab08391305434dc0019d332808710038e32657460
-EBUILD kid3-3.7.1.ebuild 1634 BLAKE2B 2e500c9faae9bea5864cbc0233761468ead726659ef5e866de9e271964410089a0a502ff0b889ee33357905b6cc4013dd6922238edd64a3cc51a6a5ca13ad37d SHA512 deca2ec8bb69526203c5bfc8825f52f8d49372b9d40fe4ce9655cbb3067fe785ca2b509dd45aae993681857e5fa86f991b896478aa6149e510193531df11e9f8
+EBUILD kid3-3.7.1.ebuild 1632 BLAKE2B c12fec8923b9e8fd951d95d2d91acaf74d19772f173393823dc221b3b02c740f9a9bb89ecac7d5450637562dcce9cf992c31197296619a5904350097df2e6051 SHA512 4b04447619ba6e4618fab769fb1eb13ac42888b12e51c8b9257c1b4d5a1137d81e714deb606150c47310300b2157178ba7620cc89e858ca5fa5ebce08c28b1a2
 MISC metadata.xml 661 BLAKE2B 5a16df625ed1a34a04f7cd00cae636ec4dc2867cf1bab477c4a2fd99e21777ac949391c0c940da1235ee976a00b3812a84db1fb58c8c089aed983668f9ff49fb SHA512 d27b8c077e8363864d6d4baa217bd7813a01c520cba943bf25996823b944ed07c7b78205d5c77c1610566e2aa55cf03624633e4abef86e4378f6386b7bfb89c9
diff --git a/media-sound/kid3/kid3-3.7.0.ebuild b/media-sound/kid3/kid3-3.7.0.ebuild
deleted file mode 100644
index 737a79bd331d..000000000000
--- a/media-sound/kid3/kid3-3.7.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ECM_KDEINSTALLDIRS="false"
-KDE_HANDBOOK="false" # buildsystem applies broken python hacks, bug #614950
-inherit kde5
-
-DESCRIPTION="Simple tag editor based on Qt"
-HOMEPAGE="https://kid3.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 x86"
-IUSE="acoustid flac kde mp3 mp4 +taglib vorbis"
-
-REQUIRED_USE="flac? ( vorbis )"
-
-COMMON_DEPEND="
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtmultimedia)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	sys-libs/readline:0=
-	acoustid? (
-		media-libs/chromaprint
-		virtual/ffmpeg
-	)
-	flac? (
-		media-libs/flac[cxx]
-		media-libs/libvorbis
-	)
-	kde? (
-		$(add_frameworks_dep kconfig)
-		$(add_frameworks_dep kconfigwidgets)
-		$(add_frameworks_dep kcoreaddons)
-		$(add_frameworks_dep kwidgetsaddons)
-		$(add_frameworks_dep kxmlgui)
-	)
-	mp3? ( media-libs/id3lib )
-	mp4? ( media-libs/libmp4v2:0 )
-	taglib? ( >=media-libs/taglib-1.9.1 )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!media-sound/kid3:4
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep linguist-tools)
-"
-
-src_prepare() {
-	# overengineered upstream build system
-	# kde5 eclass src_prepare leads to compile failure
-
-	# only enable handbook when required
-	if ! use_if_iuse handbook ; then
-		cmake_comment_add_subdirectory ${KDE_DOC_DIR}
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_CHROMAPRINT=$(usex acoustid)
-		-DWITH_FLAC=$(usex flac)
-		-DWITH_ID3LIB=$(usex mp3)
-		-DWITH_MP4V2=$(usex mp4)
-		-DWITH_TAGLIB=$(usex taglib)
-		-DWITH_VORBIS=$(usex vorbis)
-	)
-
-	if use kde ; then
-		mycmakeargs+=( "-DWITH_APPS=KDE;CLI" )
-	else
-		mycmakeargs+=( "-DWITH_APPS=Qt;CLI" )
-	fi
-
-	kde5_src_configure
-}
diff --git a/media-sound/kid3/kid3-3.7.1.ebuild b/media-sound/kid3/kid3-3.7.1.ebuild
index 0ae648d6fa23..e6b2937cb437 100644
--- a/media-sound/kid3/kid3-3.7.1.ebuild
+++ b/media-sound/kid3/kid3-3.7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="acoustid flac kde mp3 mp4 +taglib vorbis"
 
 REQUIRED_USE="flac? ( vorbis )"
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 012949588536..da23750f35c5 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,11 +1,9 @@
 AUX mixxx-2.0.0-docs.patch 435 BLAKE2B c2e9b09abb293e59b2af49527eccf07c9488ae5e30e29e6c4d6330cc298a568ee7dd7014af6b9c1f1c4d98b8c11c96da7f74660eb4b3b522f449e7a6a431addc SHA512 01ab76466f782f538c894e460f7694553ae12804651f68aabb6aaa0dbdc89e2ff7e2b51529b0f112cee42c8053b75fc64241a9c8898def8cf1c76231b1ec5d59
 AUX mixxx-2.2.0-lilv_include_fix.patch 1006 BLAKE2B 1541ecc32cb20d02d71577615b96605938a2d38e40e04fc43e864c8a85722475b795c807ccda1df0ff86c6268d1d1425934e3b413fdedc2effcbd6a2ab584ad6 SHA512 e15980f9861a61bf965636182fe3f0d41d25d569d2d4b43e167e53e33fe7e8f533878e93db237e90551ac409811de497e3313e32fc62462bf963b7f1f29c4a11
-DIST mixxx-2.1.1.tar.gz 34458368 BLAKE2B cf718cfea64fe71e2ccd5f299454fc9d396266052cc2516fa4494216a9d8ae9cea62858bf02e026d5072705df780d6243616d1d1705e3f251bc2392b4dc3d166 SHA512 c0047a238bf39e464f2bc25646ba03138d0b8d27cde667ca7b12bfba5f40d339ce4b426853e048d695b2c59c847e88322e27b91bead467899d7bf1cb43358f20
 DIST mixxx-2.1.8.tar.gz 34652727 BLAKE2B d996bb07a5914e5a3b8f276130e1f8fb46a9493e192e45a1b65cdb961b1a7ca0e98fed69d894ace8e61ee72231a1d8ba731921e46d3601ad0d41a79aa04a47ab SHA512 c1423bec9b3a9654ece5ae68c0f72975dcd2a9cee377520e56d4f35366a3bb23157c9c64f0f2b8a61d36e5d818216b64cb6aae53ca2b8e3dfa865b8911a7e1eb
 DIST mixxx-2.2.0.tar.gz 34639153 BLAKE2B b99d05508f3f59debf026fdc5102f213eaa10a747c234e3f8f1782af9c07fb30c4641ca3c15fc634e2e8081966f8897751fb7bc72928f8b07a3c9c6d9d728530 SHA512 8174b504d236cde36c636985e0e224915f0be69b13691bf0d88c21087c20c1100ff55561b6e395d97fe5b21a0229fe9ecdac2493cb44fa99a42549c368fa2134
 DIST mixxx-2.2.1.tar.gz 34763333 BLAKE2B 246bd01fe346298ea27d1cf64a597ddf009f31fe7edb004a2b5ffd4a2c4a09843e5c47d38acb6428ed2b8f3bb4e5618b1e97d64ff1b9721682a6b34fbd49b73a SHA512 16f0f4f6a83cd18501fdba3cb8d4f7fe4ac14b980d390406cb61acb889647ba89bc4051bb342d73081f940166f1689027f47fe6928e36c72babc18bf2a0d9bf3
-EBUILD mixxx-2.1.1-r1.ebuild 3004 BLAKE2B a1718363b127fe5515d616bf8daf6a354c9ee4798514327fee5b90d8f9d397a1b59ca5ec6423d1949ebc3863b24beeb6f8f154cf6610dd1ae3e7fcb527a329b1 SHA512 db6c3550d8453e36e0b469a283317235e27fae69f2ec7c40b893e4e2345a7a4c5295d6ab7fe4572c91867311067697a602cd8173e771f2b10319fcfc453d3bd9
-EBUILD mixxx-2.1.8.ebuild 3003 BLAKE2B 5d35929d617994bd53f442deb2d6ececb490ee8867736a5232c864fe16d0e1ca44ff65c5965a7790653319d02c06bc8f528cfb8730379db54d238ebea4d8cff5 SHA512 838ec039f8acdbbce7cab3147ebf1446fc9fdc0130dedd6a13ce8f468537c1e9832b9d552a48f601acfbf069784118eabfa61d0ae24d1c8f3aa083791742abf8
+EBUILD mixxx-2.1.8.ebuild 3001 BLAKE2B e1812e508163883035ad68d507c9b186646fd8d49801cef7948dbeb3b6c3b4312285ad71ec8dd85966ce875f2706d3ee31f6233689327600f23a13eaafbda37d SHA512 858f7b5f84d9a95f48541da198d89691dae24267a3efc4846ec950602d4106a4f46df9387ca97fc6305c85fdd8b492bad48a57029f267c22b6700ad6a8351d61
 EBUILD mixxx-2.2.0.ebuild 3159 BLAKE2B 01478993c3cf731fba6ec0df3a53492cd8e932100d9b37ed398c231eb91be7179f3244715d7db0351b6a3a71dfc29c23b6f5b1e819509a90e97d4d6292b98098 SHA512 194f76c1d2aeb32a331abde710ada213879b80e0c18afe7cb2164c542ee084466496d5c7a5a21db46b07c41bc3d4a9ef439bf05e20b2f6221467d990a5d21cb6
 EBUILD mixxx-2.2.1.ebuild 3159 BLAKE2B ab14ada19b18cf85144ac82b915ce3b16e2df4516587d7b11765f2f8c7d13db2c342d1a3e6d3f79b66a58a9a1dfddd1fcaf6b8a34f2f7d3179d61c73fced3f8b SHA512 8a124c7d2fa60b726707bf181f38193f36cf77ce6608343d13bc9ef9c78e32318837dccc8115233f44da637699327a9cd6aac2f8697c04d0fd466ded07ed9622
 EBUILD mixxx-9999.ebuild 3156 BLAKE2B 9251127fa8cab40f36aa43f999478b2bda2a4e99ab7939f1f758efd59fd58716e938b4e0128820996bd9bad616e35cf209eee4c9134fe229a296910db45dfa28 SHA512 ae54684c8970ad8068fd97674e4972326c14006c1c1e48d4563ab3b574a215d140eaa3c88f2ee6fa4ad3ebe9479c3bc1ffe5e855016605106d8ea30ab71e5af1
diff --git a/media-sound/mixxx/mixxx-2.1.1-r1.ebuild b/media-sound/mixxx/mixxx-2.1.1-r1.ebuild
deleted file mode 100644
index 6134b2177b39..000000000000
--- a/media-sound/mixxx/mixxx-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic scons-utils toolchain-funcs
-
-DESCRIPTION="Advanced Digital DJ tool based on Qt"
-HOMEPAGE="https://www.mixxx.org/"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git"
-else
-	#SRC_URI="https://downloads.mixxx.org/${P}/${P}-src.tar.gz"
-	SRC_URI="https://github.com/mixxxdj/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-release-${PV}"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="aac doc ffmpeg hid mp3 mp4 opus shout wavpack"
-
-# fails to compile system-fidlib. Add ">media-libs/fidlib-0.9.10-r1" once this
-# got fixed
-RDEPEND="
-	dev-db/sqlite
-	dev-libs/glib:2
-	dev-libs/protobuf:0=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtscript:5[scripttools]
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/chromaprint
-	media-libs/flac
-	media-libs/libid3tag
-	media-libs/libogg
-	media-libs/libsndfile
-	>=media-libs/libsoundtouch-1.5
-	media-libs/libvorbis
-	>=media-libs/portaudio-19_pre
-	media-libs/portmidi
-	media-libs/rubberband
-	media-libs/taglib
-	media-libs/vamp-plugin-sdk
-	sci-libs/fftw:3.0=
-	sys-power/upower
-	virtual/libusb:1
-	virtual/opengl
-	x11-libs/libX11
-	aac? (
-		media-libs/faad2
-		media-libs/libmp4v2:0
-	)
-	hid? ( dev-libs/hidapi )
-	mp3? ( media-libs/libmad )
-	mp4? ( media-libs/libmp4v2:= )
-	opus? (	media-libs/opusfile )
-	shout? ( media-libs/libshout )
-	wavpack? ( media-sound/wavpack )
-	ffmpeg? ( media-video/ffmpeg:0= )
-"
-# media-libs/rubberband RDEPENDs on sci-libs/fftw:3.0
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	dev-qt/qttest:5
-	dev-qt/qtxmlpatterns:5
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.0-docs.patch
-)
-
-src_prepare() {
-	# use multilib compatible directory for plugins
-	sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die
-
-	default
-}
-
-src_configure() {
-	local myoptimize=0
-
-	# Required for >=qt-5.7.0 (bug #590690)
-	append-cxxflags -std=c++11
-
-	# Try to get cpu type based on CFLAGS.
-	# Bug #591968
-	for i in $(get-flag mcpu) $(get-flag march) ; do
-		if [[ ${i} = native ]] ; then
-			myoptimize="native"
-			break
-		fi
-	done
-
-	myesconsargs=(
-		prefix="${EPREFIX}/usr"
-		qtdir="${EPREFIX}/usr/$(get_libdir)/qt5"
-		faad="$(usex aac 1 0)"
-		ffmpeg="$(usex ffmpeg 1 0)"
-		hid="$(usex hid 1 0)"
-		hifieq=1
-		m4a="$(usex mp4 1 0)"
-		mad="$(usex mp3 1 0)"
-		optimize="${myoptimize}"
-		opus="$(usex opus 1 0)"
-		qt5=1
-		shoutcast="$(usex shout 1 0)"
-		vinylcontrol=1
-		wv="$(usex wavpack 1 0)"
-	)
-}
-
-src_compile() {
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
-	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]}
-}
-
-src_install() {
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
-	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]} \
-		install_root="${ED%/}"/usr install
-
-	dodoc README Mixxx-Manual.pdf
-}
diff --git a/media-sound/mixxx/mixxx-2.1.8.ebuild b/media-sound/mixxx/mixxx-2.1.8.ebuild
index ab11da0490bc..5604a69b447d 100644
--- a/media-sound/mixxx/mixxx-2.1.8.ebuild
+++ b/media-sound/mixxx/mixxx-2.1.8.ebuild
@@ -14,7 +14,7 @@ else
 	#SRC_URI="https://downloads.mixxx.org/${P}/${P}-src.tar.gz"
 	SRC_URI="https://github.com/mixxxdj/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-release-${PV}"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-sound/moc/Manifest b/media-sound/moc/Manifest
index 42568d2933ba..475c0a9fec55 100644
--- a/media-sound/moc/Manifest
+++ b/media-sound/moc/Manifest
@@ -2,5 +2,5 @@ AUX ffmpeg4.patch 1401 BLAKE2B 116679802c4acb9e843dbb8d656177ae133aefc49a270392e
 DIST moc-2.5.2.tar.bz2 602728 BLAKE2B 10b568404632f29ed5fd1d04ec424aa364a6e74c1a31d47cb9a3b377ccd04e2be53e57274e76daed29177368c944740fd26cc862fc498f950070f0b83b0acc7a SHA512 992d06809fb52e58dcee63704bde05795b99edbac46edd8381f314c564490013b18e1853926f419c2c3c7f1bb68ff35e97048de03ace3232b800cf4b3b7dbe0f
 DIST moc-2.6-alpha3.tar.xz 496676 BLAKE2B 3b4f31676c869a0cacd44cce1e4509304e3b00a15e578eb394510fbe0ddaf53f5c5628f2dccd60f4b3925f3e597d9fbc04bc2a8e090e2e05227b822f1aa05ef0 SHA512 e38e277e5e945827308f47a8f3614eb1e52c16271da372f50e7b6427a7dfc994e1c66761a9e46326bf483b91e9127efe7796a329c62e95524609edfb3a7603bf
 EBUILD moc-2.5.2.ebuild 2148 BLAKE2B 3039de5a7faa6b92c6b9c836a5268896eec61657dc9ce98075f39096df8b3b21494b2bcc1fe7b3178d6870be7505bd8db5aec1b9e08118ded7c315f4dcfec172 SHA512 9680c784f3dcf4a1ceb57c5df5b6c92e27bd3f144ff49d3805fbe8a3afb614b72c40160da15f3a204738a935d6fb84aa16dd329002c59a461e0550c15a80ed5b
-EBUILD moc-2.6_alpha3.ebuild 2305 BLAKE2B 9c1ba7e34bbb91492fff3390954743937ca5dfd048ac8d164d177dd413b2c4ca287e94009b5e882d68d55c63b16533bcd2c6e727c167f89e96e261e2ddf1be64 SHA512 0979e27ab059b22eed01f67ddf3533b5220d34d34d83c9305c1981c1daf04d0d80db6df929816845ac88a1a44a208ed89bbb1894fb468d6d4269519ff1f3b387
+EBUILD moc-2.6_alpha3.ebuild 2304 BLAKE2B 5baf9185736a667d74e7b9dc6157f7768b512fdd1b5a74ce5f1329849a8f8b8c1be0f9dc5463fd04228f8cf0bb730e41c37856a8f204377643c407f58c6912e2 SHA512 22e7457851930461006ea056552b2b80cc574228ebdb43b3a062ee06cd4d003da0c5a2956f886a63d485e00efc6b48e658604774e16ccf22b28224bb4589b0b2
 MISC metadata.xml 596 BLAKE2B 4ebc0826f9a0352909b2dfcfcbd7712d0af6b484b5801ee8e0b73be7a5966968af27d5fc4d56893d407e0bbb3809376f8336291901bc36aeb2e43e549e60bc44 SHA512 f2ca529805ed93256100396a8ee414ba1098097eb4a8379144d52fbdf02d98a05c399cb1be861c64eb712bd5160f3286c30e73875dce05ce2e974f7123b40699
diff --git a/media-sound/moc/moc-2.6_alpha3.ebuild b/media-sound/moc/moc-2.6_alpha3.ebuild
index eafc3dee94df..086ee1704824 100644
--- a/media-sound/moc/moc-2.6_alpha3.ebuild
+++ b/media-sound/moc/moc-2.6_alpha3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://ftp.daper.net/pub/soft/moc/unstable/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ppc ppc64 sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ppc ppc64 sparc x86"
 IUSE="aac alsa +cache curl debug ffmpeg flac jack libsamplerate mad +magic modplug musepack
 	oss sid sndfile speex timidity tremor +unicode vorbis wavpack"
 
diff --git a/media-sound/pavucontrol/Manifest b/media-sound/pavucontrol/Manifest
index d0061263d62a..2a869ced7e47 100644
--- a/media-sound/pavucontrol/Manifest
+++ b/media-sound/pavucontrol/Manifest
@@ -1,5 +1,5 @@
 DIST pavucontrol-3.0.tar.xz 145092 BLAKE2B 3461aaac4228150918effcff04b61f9112c8b12aa61bcce9a82d033c825d7466720a4d8f008ff19d9d8d2ad0d52c6ffd0ee0a2288ce84beb7f30c5f816eb0c11 SHA512 3562fc50e5f60c6b6280c2d524e13cf44114bf481e5ec98b8714c7c2f162d0332179ebcf4c5a78d86f511de857bdc3aa7415e1548e0c10d4582b5958c4cacae9
 DIST pavucontrol-4.0.tar.xz 165216 BLAKE2B 5a556dbd8132d811b7704b377f4a62ad606378e235f9892a7951e1f981917e4196d17e85350ef757a956e6fbc448f0f6cd600b5656e12e2152b71d10b5e64e2a SHA512 eaea303c46ddb36733aed88c8a603907d70e4539c345d8acec23527d3306ee21ae630c0508bdab6ae52cbc2f1eb8fc4b212abda72876dc92e83fba7ceb623be2
 EBUILD pavucontrol-3.0.ebuild 881 BLAKE2B ea25e8863fe6e1ce340db5c1981dea6afa587e7596ba2b4f3992fabb054566117481a5e51ff2b3c6b1171d7971d547ddef228c0035c369310b63ec392f9acb36 SHA512 520625ac6fc823eb12c31210f810b5febff29da6f35c94757c4515fe9828e01381c3be4b1e2881d071515369e780ffbabc55bc2972205ba69e99f8dc9192b782
-EBUILD pavucontrol-4.0.ebuild 891 BLAKE2B b79fc755cc00ae2e3dc1420fd43ec97c56b08ef5fa122fed98b31f54a664e80eb4c651f195b555bddf35e2e981c2455230a84ff5149363506d06cb1fc1403b29 SHA512 521fcafbf2033d5e34463e485b8bd92c891a8397f19c78146deb71b7ebb3ca3b6fff31131088959e134ef91f44182d56835151c341e9d441943d7da9aae2952b
+EBUILD pavucontrol-4.0.ebuild 890 BLAKE2B 940caf0d5a8ab91e33c3fa52341e6b31f70bbd5097561876de5b0eb8c842600beb76f0213a2cfe0b4b99cc41d8f3cc01f23c24a515f64393f1d7c708308301bb SHA512 7b70d0023af44c52ebc76c29f9acf1778c123878808397efad165e7d2ec7f24f4cfae2c7b3f76063a16e6afbaf2adeec462d2e6f2deb57fc7465ffa5e9cce3e3
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/pavucontrol/pavucontrol-4.0.ebuild b/media-sound/pavucontrol/pavucontrol-4.0.ebuild
index 45130e44acab..c26203ba7be3 100644
--- a/media-sound/pavucontrol/pavucontrol-4.0.ebuild
+++ b/media-sound/pavucontrol/pavucontrol-4.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="nls"
 
 RDEPEND="
diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index b5d584a23deb..aec58e178f83 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -1,8 +1,4 @@
 AUX qsynth-0.4.0-qt5-tagging.patch 372 BLAKE2B 2c0773d24939e103c2741de0498ee36963683c7004ef1039a7a45a935844b99c59072860227111eaf19fb0a75e1a17826867d8e2fbd0d131ecdc194d6ba7294d SHA512 158eb436d801d555ca5a481375553fa456d44c16f6bf706dbf99e6837f96c001bc2654405b7b5f55ccaedddee39ae4b44526eb05fe3f165ba9ea55518bef93c1
-DIST qsynth-0.5.3.tar.gz 269252 BLAKE2B c496063ba33bc78a65d63151871e841f9d3938fe03049655da3c124fd495c592f9c726c479062c3fb2d1561e4dee3284d12b04e04a51ba06e20d297b6e84ac0f SHA512 15632274e5822f5e1a49bd332c5d8b7e59a54800ad32510f425f06b4557e474d5479bd531b45fc43af20535017a656fbd9469d318940931912a56ea1856dc117
-DIST qsynth-0.5.4.tar.gz 268106 BLAKE2B e7e17c1427cbb6105fc6fbaa511325fcfbed0d06e28374e3b9fdce14a633e6554267339bb1ffe2bf1f16fbebf38095ae02eca86d74412add3a1e16d191cd1e45 SHA512 711b18efea3b4050c567f2c549ab4f44525f53de42c6cfea379260e62966215e6d59432bed946733c7e772d691edb739a882de753cf3f46b932833de7b120b7d
 DIST qsynth-0.5.5.tar.gz 269061 BLAKE2B e17bb0ced40764c5bef9ae7c793f7ba1ebfe4edd761f434ad129f338d30384c639f27d697ecfdaa93d7fff52c38bed0a3b95cf51fbdad25e13c14abe795d49dd SHA512 4e90b38d428c6b49a78b648ac9604e683f32623898205abe3a98c4136c5b29ab27c101cf63207dbbfdcba105913de2dcb5cc7669a6433def71d071f39cf68429
-EBUILD qsynth-0.5.3.ebuild 1328 BLAKE2B 61f84dd2f5da070ed3c18c93e0b0c111673998326f25ec0816126a5bcf5458f4d78932e2fe40735bdb5ceb936b3abf0a1f209d297d5bbf6f07949798874494e9 SHA512 53bee67b1ca4be0d938be720fcb6b4d6a8fe1be52345b61349729d5ff19c85d8cc2f0e5de57f8d0cadf02d47f7852d6509ab67a13a0ade3618b85e01024438bb
-EBUILD qsynth-0.5.4.ebuild 1306 BLAKE2B 49f580815944ad797dd264781e8d58c222338cd4c162556246941e1e8d33f1d3370b3846fc78df2c2d09dff712c1e27235c6e3b9bd1aecc68bb6503a18446e63 SHA512 12595163c9f3a1ea7b7fea0a93a933cdbeca42976a8f56fcb13cd40d382de90f270ba3404d3c9c87a0d42cdd161e03ba6d61f24a8a4c60e5f449c1b530852cfb
-EBUILD qsynth-0.5.5.ebuild 1302 BLAKE2B 28bc375b9c0e1bc8cf630c73011afa165a98aa5633b141ac40f8ad84398c2bcd1b4fb9b46a4827f548a17ed253c6caad0b3c5b430d09d550eacdcbaa7eab83e3 SHA512 688ead81f1a2d0bffb9d5ba1de237c495a6b6a98d114b43be193cf09e8e4df4fbee4d7e698ba7270e633d43f48ac646c02bffa11348252c5790c67a17efedf44
+EBUILD qsynth-0.5.5.ebuild 1300 BLAKE2B 82eb320196d3d8646e3a9c8b1ae5fde1ef8dacc586055bd5eb4830b21d38dc26b72de819ccc29ff98509b73e32fb2c4c0d6038f846f3e04d16f4ff9ac5ea0eeb SHA512 0c94edb732c059066ffc3e99ec9250139a6ebdb697868e387c7fdad17e00473f63326048a5f8a9d1072d1026f8e8a9912041d8a2607d5e7e355f5c30a7eb2ed8
 MISC metadata.xml 755 BLAKE2B 34241e79896f3b24f562853d89374480f2c1f5c7a35bf8aaba623d6ee49a93074a1600c7290ffa7bf9147060482cf261962689c46f3f8b7eb38e17ede402c4ea SHA512 25f7c0ace8cd3b9ebe09ff93e9c39169f5345cb583646bcc146ff3b33c2cd4d689b665ae4e19f6ac588f47d5c691bfe3c16f0e67756847c7b45c090e586ab933
diff --git a/media-sound/qsynth/qsynth-0.5.3.ebuild b/media-sound/qsynth/qsynth-0.5.3.ebuild
deleted file mode 100644
index 798d5cf90b4f..000000000000
--- a/media-sound/qsynth/qsynth-0.5.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop flag-o-matic qmake-utils
-
-DESCRIPTION="A Qt application to control FluidSynth"
-HOMEPAGE="http://qsynth.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="alsa debug jack pulseaudio"
-KEYWORDS="amd64 ppc x86"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?]
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-REQUIRED_USE="|| ( alsa jack pulseaudio )"
-
-PATCHES=( "${FILESDIR}/${PN}-0.4.0-qt5-tagging.patch" )
-
-src_configure() {
-	append-cxxflags -std=c++11
-	sed -e "/@gzip.*mandir)\/man1/d" -i Makefile.in || die
-	econf \
-		$(use_enable debug) \
-		--with-qt5=$(qt5_get_bindir)/..
-
-	eqmake5 ${PN}.pro -o ${PN}.mak
-}
-
-src_install () {
-	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
-	einstalldocs
-
-	# The desktop file is invalid, and we also change the command
-	# depending on useflags
-	rm "${ED}/usr/share/applications/qsynth.desktop" || die
-
-	local cmd
-	if use jack; then
-		cmd="qsynth"
-	elif use pulseaudio; then
-		cmd="qsynth -a pulseaudio"
-	elif use alsa; then
-		cmd="qsynth -a alsa"
-	else
-		cmd="qsynth -a oss"
-	fi
-
-	make_desktop_entry "${cmd}" Qsynth qsynth
-}
diff --git a/media-sound/qsynth/qsynth-0.5.4.ebuild b/media-sound/qsynth/qsynth-0.5.4.ebuild
deleted file mode 100644
index 0e48b9712969..000000000000
--- a/media-sound/qsynth/qsynth-0.5.4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop flag-o-matic qmake-utils
-
-DESCRIPTION="A Qt application to control FluidSynth"
-HOMEPAGE="http://qsynth.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="alsa debug jack pulseaudio"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?]
-	x11-libs/libX11"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="|| ( alsa jack pulseaudio )"
-
-PATCHES=( "${FILESDIR}/${PN}-0.4.0-qt5-tagging.patch" )
-
-src_configure() {
-	append-cxxflags -std=c++11
-	sed -e "/@gzip.*mandir)\/man1/d" -i Makefile.in || die
-	econf \
-		$(use_enable debug)
-
-	eqmake5 ${PN}.pro -o ${PN}.mak
-}
-
-src_install () {
-	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
-	einstalldocs
-
-	# The desktop file is invalid, and we also change the command
-	# depending on useflags
-	rm "${ED}/usr/share/applications/qsynth.desktop" || die
-
-	local cmd
-	if use jack; then
-		cmd="qsynth"
-	elif use pulseaudio; then
-		cmd="qsynth -a pulseaudio"
-	elif use alsa; then
-		cmd="qsynth -a alsa"
-	else
-		cmd="qsynth -a oss"
-	fi
-
-	make_desktop_entry "${cmd}" Qsynth qsynth
-}
diff --git a/media-sound/qsynth/qsynth-0.5.5.ebuild b/media-sound/qsynth/qsynth-0.5.5.ebuild
index 32a04a34d400..68c2993624bb 100644
--- a/media-sound/qsynth/qsynth-0.5.5.ebuild
+++ b/media-sound/qsynth/qsynth-0.5.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="alsa debug jack pulseaudio"
-KEYWORDS="~amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 BDEPEND="
 	dev-qt/linguist-tools:5
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index 1c96fe2c45a7..38bf404e445f 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,6 +1,3 @@
-AUX rhythmbox-3.4.2-gstreamer-1.14.patch 16445 BLAKE2B 0adc6ea739a5a420d8817117cc97477f00453fb0f6426da0dff912ab6ad9ad435645c13657950b1fd31243be4cc21c49d2bf0b5701b5844ac17f8a8279350dc6 SHA512 6e204d2e9af111a138c13aa0a5cb5f74d56ade81e86c7cd5349617119288221b46533682d7b974c1453a6d0a9a0de1fa40f2cc4dcb9f474bb93818d44930520a
-DIST rhythmbox-3.4.2.tar.xz 6909436 BLAKE2B f5714485b253370a161f2255030d85bc8a697d795f97011c2acf6acbf8c9312f5180c0ec06ebe2d6e70730dc3fd4e97289b1f3a5e4dd4989a4e8135433430aab SHA512 275f7c6344c88c7331d433895d479517e7a4b854f6ae660abd79b3c324f5e7a06132fa44387443ec9ce50b20187e1abf1ec9683ec4bedbd4b17da6efece8399b
 DIST rhythmbox-3.4.3.tar.xz 6410600 BLAKE2B 0df8ac37ac0815468414c5b8118da6d07276e0c15f08812a46af7f377c29418416e1a24d7398aec10772887ae98922f6fb9fa9eaecc6ae15115cd7ca1c4b67a4 SHA512 a3585c026037674345909e2050a4ccb22a75084f830f351b926f7fbfc84d200c8246b8da4bd72804e595929ab06d3c7b53d362675dde193746f40b0f38b7c493
-EBUILD rhythmbox-3.4.2.ebuild 3441 BLAKE2B d2e56df3485478b8398e478130d3457d2ed50b79b843fcca2ae7b7532dc224a2ee7ad06fe7f0100c8188be9b45f96e56cbb0b95935e43003fefd88dd562a2411 SHA512 ccb33aa6378a9801a43ab68aaeaed523453e574432152924d6b2e26cb9e9598444a1c1f1446c42e33dc09e19691aac7b82a2d6faed4644a0166c5240edae1a94
 EBUILD rhythmbox-3.4.3.ebuild 3371 BLAKE2B 5e01913300ef35132df218f4cabf37b38f9a5a796953f4276e6aa500d816da728eed790a9ef2934bc4410200d8729d33a72bea4bcca68fa19a450e33dff25212 SHA512 e1846abf3d30e99d1140906c328f9162ae1ce859e9d24302a8b8c5c3c984ad9cb1bb67ac17dd93a3a9fea5809ccfedbcb330a3741d7a618c1c7f96b4a266dfa8
 MISC metadata.xml 545 BLAKE2B 541f660e1607a2e02779487edf290dbd8d8262184c2b0f245eabea4490165a0b019b1a989ad9a27acea26a15edc1ba39b4669756a9b17464b9592191e4498a99 SHA512 a734430876806e8bc114e3058c6b5cdabe87372af71a478f333dd7449faa63af011dc2c7115293049e74da8df742ed6a03f03c8e2a56a2d56b2aa4c547bd6065
diff --git a/media-sound/rhythmbox/files/rhythmbox-3.4.2-gstreamer-1.14.patch b/media-sound/rhythmbox/files/rhythmbox-3.4.2-gstreamer-1.14.patch
deleted file mode 100644
index 86ed17ba98ea..000000000000
--- a/media-sound/rhythmbox/files/rhythmbox-3.4.2-gstreamer-1.14.patch
+++ /dev/null
@@ -1,455 +0,0 @@
-From 36a648db0af05be579190d98c96cfb6b7bcc6ebd Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Mon, 9 Oct 2017 13:11:47 +0200
-Subject: [PATCH 01/12] fmradio: Fix build with GStreamer master
-
-The plugin description is not supposed to be a string constant, but an
-unescaped string, to be concatenated with function names.
-
-This used to be acceptable (though would have warned), but breaks with
-the GStreamer 1.13 development branch.
-
-rb-fm-radio-gst-src.c:181:6: error: pasting ""rbsilencesrc"" and "_get_desc" does not give a valid preprocessing token
-      "rbsilencesrc",
-      ^
-
-https://bugzilla.gnome.org/show_bug.cgi?id=788706
----
- plugins/fmradio/rb-fm-radio-gst-src.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/fmradio/rb-fm-radio-gst-src.c b/plugins/fmradio/rb-fm-radio-gst-src.c
-index 09d709c28..88abdaf35 100644
---- a/plugins/fmradio/rb-fm-radio-gst-src.c
-+++ b/plugins/fmradio/rb-fm-radio-gst-src.c
-@@ -178,7 +178,7 @@ plugin_init (GstPlugin *plugin)
- 
- GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
- 		   GST_VERSION_MINOR,
--		   "rbsilencesrc",
-+		   rbsilencesrc,
- 		   "element to output silence",
- 		   plugin_init,
- 		   VERSION,
--- 
-2.17.0
-
-
-From 355e3c40efe47f6f90d12afb6590caf85db62487 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Mon, 24 Apr 2017 16:21:41 +0200
-Subject: [PATCH 02/12] mmkeys: media-player-keys: Fix usage to match API
- documentation
-
-See https://bugzilla.gnome.org/show_bug.cgi?id=781326
-
-https://bugzilla.gnome.org/show_bug.cgi?id=781664
----
- plugins/mmkeys/rb-mmkeys-plugin.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/mmkeys/rb-mmkeys-plugin.c b/plugins/mmkeys/rb-mmkeys-plugin.c
-index 46431584f..058b82f0e 100644
---- a/plugins/mmkeys/rb-mmkeys-plugin.c
-+++ b/plugins/mmkeys/rb-mmkeys-plugin.c
-@@ -385,7 +385,7 @@ impl_activate (PeasActivatable *pplugin)
- 		plugin->proxy = g_dbus_proxy_new_sync (bus,
- 						       G_DBUS_PROXY_FLAGS_NONE,
- 						       NULL,
--						       "org.gnome.SettingsDaemon",
-+						       "org.gnome.SettingsDaemon.MediaKeys",
- 						       "/org/gnome/SettingsDaemon/MediaKeys",
- 						       "org.gnome.SettingsDaemon.MediaKeys",
- 						       NULL,
--- 
-2.17.0
-
-
-From 19d604093667139c6660d9452b4037a761bf75e0 Mon Sep 17 00:00:00 2001
-From: gkrithi8 <gkrithi8@gmail.com>
-Date: Thu, 26 Oct 2017 02:27:38 +0530
-Subject: [PATCH 03/12] brasero-disc-recorder: Fix invalid object reference
- warnings
-
-https://bugzilla.gnome.org/show_bug.cgi?id=789494
----
- plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c b/plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c
-index 8608e84fd..a89d87a70 100644
---- a/plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c
-+++ b/plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c
-@@ -558,7 +558,7 @@ update_source (RBDiscRecorderPlugin *pi,
- 	RBDisplayPage *selected_page;
- 	const char *page_type;
- 
--	if (pi->selected_page != NULL && RB_IS_SOURCE (pi->selected_page)) {
-+	if (pi->selected_page != NULL && RB_IS_PLAYLIST_SOURCE (pi->selected_page)) {
- 		RhythmDBQueryModel *model;
- 
- 		g_object_get (pi->selected_page, "query-model", &model, NULL);
--- 
-2.17.0
-
-
-From 00970203e760f9ae43c31087706bd31b2b395dcb Mon Sep 17 00:00:00 2001
-From: gkrithi8 <gkrithi8@gmail.com>
-Date: Mon, 30 Oct 2017 02:25:09 +0530
-Subject: [PATCH 04/12] song-info: fix the signal name used for entry deletion
-
-https://bugzilla.gnome.org/show_bug.cgi?id=789632
----
- widgets/rb-song-info.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/widgets/rb-song-info.c b/widgets/rb-song-info.c
-index 54810e0b7..202f3d36e 100644
---- a/widgets/rb-song-info.c
-+++ b/widgets/rb-song-info.c
-@@ -733,6 +733,7 @@ rb_song_info_set_source_internal (RBSongInfo *song_info,
- 
- 	g_object_get (G_OBJECT (song_info->priv->query_model), "db", &song_info->priv->db, NULL);
- 
-+	rb_song_info_query_model_changed_cb (G_OBJECT (song_info->priv->source), NULL, song_info);
- 	rb_song_info_base_query_model_changed_cb (G_OBJECT (song_info->priv->source), NULL, song_info);
- }
- 
-@@ -1514,7 +1515,7 @@ rb_song_info_query_model_changed_cb (GObject *source,
- 				 "row-changed", G_CALLBACK (rb_song_info_query_model_inserted_cb),
- 				 song_info, 0);
- 	g_signal_connect_object (G_OBJECT (song_info->priv->query_model),
--				 "entry-deleted", G_CALLBACK (rb_song_info_query_model_deleted_cb),
-+				 "post-entry-delete", G_CALLBACK (rb_song_info_query_model_deleted_cb),
- 				 song_info, 0);
- 	g_signal_connect_object (G_OBJECT (song_info->priv->query_model),
- 				 "rows-reordered", G_CALLBACK (rb_song_info_query_model_reordered_cb),
--- 
-2.17.0
-
-
-From 223bafcc98a33262d70adc325f3393ac8f4b3ecc Mon Sep 17 00:00:00 2001
-From: gkrithi8 <gkrithi8@gmail.com>
-Date: Tue, 31 Oct 2017 17:06:58 +0530
-Subject: [PATCH 05/12] shell: remove extra pixbuf unref
-
-https://bugzilla.gnome.org/show_bug.cgi?id=789706
----
- shell/rb-shell.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/shell/rb-shell.c b/shell/rb-shell.c
-index 7ae022795..734b90dcb 100644
---- a/shell/rb-shell.c
-+++ b/shell/rb-shell.c
-@@ -375,7 +375,6 @@ load_external_art_cb (RBExtDB *store, GValue *value, RBShell *shell)
- 
- 	pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
- 	if (accept_art_pixbuf (pixbuf) == FALSE) {
--		g_object_unref (pixbuf);
- 		g_object_unref (loader);
- 		return NULL;
- 	}
--- 
-2.17.0
-
-
-From 2604eeb2338a4da7a95f9b6d46223323c864ddf2 Mon Sep 17 00:00:00 2001
-From: gkrithi8 <gkrithi8@gmail.com>
-Date: Mon, 27 Nov 2017 13:31:39 +0530
-Subject: [PATCH 06/12] ext-db: fix crash when store request processing fails
-
-https://bugzilla.gnome.org/show_bug.cgi?id=727670
----
- metadata/rb-ext-db.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/metadata/rb-ext-db.c b/metadata/rb-ext-db.c
-index 3e241e609..7d8e01573 100644
---- a/metadata/rb-ext-db.c
-+++ b/metadata/rb-ext-db.c
-@@ -954,7 +954,11 @@ do_store_request (GSimpleAsyncResult *result, GObject *object, GCancellable *can
- 		 */
- 		g_signal_emit (store, signals[STORE], 0, req->value, &req->data);
- 
--		rb_debug ("stored value into encoded data of type %s", G_VALUE_TYPE_NAME (req->data));
-+		if (req->data != NULL) {
-+			rb_debug ("stored value into encoded data of type %s", G_VALUE_TYPE_NAME (req->data));
-+		} else {
-+			rb_debug ("failed to store value");
-+		}
- 	} else {
- 		/* indicates we actually didn't get anything, as opposed to communication errors etc.
- 		 * providers just shouldn't call rb_ext_db_store_* in that case.
--- 
-2.17.0
-
-
-From a6f696f195b3c0aba63267c250ee15ccb058a8a9 Mon Sep 17 00:00:00 2001
-From: Jonathan Matthew <jonathan@d14n.org>
-Date: Tue, 30 Jan 2018 08:20:31 +1000
-Subject: [PATCH 07/12] xfade: schedule stream reap after EOS
-
-This stops streams hanging around in pending-remove state until
-the stream after the following stream starts,
----
- backends/gstreamer/rb-player-gst-xfade.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/backends/gstreamer/rb-player-gst-xfade.c b/backends/gstreamer/rb-player-gst-xfade.c
-index d553397ce..420cf7f65 100644
---- a/backends/gstreamer/rb-player-gst-xfade.c
-+++ b/backends/gstreamer/rb-player-gst-xfade.c
-@@ -1831,6 +1831,7 @@ rb_player_gst_xfade_bus_cb (GstBus *bus, GstMessage *message, RBPlayerGstXFade *
- 				 * message on the stream thread and now.
- 				 */
- 				start_waiting_eos_streams (player);
-+				schedule_stream_reap (player);
- 			} else {
- 				/* no need to emit EOS here, we already know what to do next */
- 				rb_debug ("got EOS message for stream %s in REUSING state", stream->uri);
--- 
-2.17.0
-
-
-From f984934cfcbda9253bf26460163a546d8da69a01 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Wed, 6 Jun 2018 10:48:52 +0200
-Subject: [PATCH 08/12] daap: Fix build warning
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Replace strncpy with memcpy to avoid adding a NUL-byte in the string.
-
-rhythmbox/plugins/daap/rb-daap-src.c: In function ‘rb_daap_src_change_state’:
-rhythmbox/plugins/daap/rb-daap-src.c:286:4: error: ‘strncpy’ output truncated before terminating nul copying 4 bytes from a string of the same length [-Werror=stringop-truncation]
-    strncpy (httpuri, http, 4);
-    ^~~~~~~~~~~~~~~~~~~~~~~~~~
----
- plugins/daap/rb-daap-src.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/daap/rb-daap-src.c b/plugins/daap/rb-daap-src.c
-index 99a55caf4..002ac6a00 100644
---- a/plugins/daap/rb-daap-src.c
-+++ b/plugins/daap/rb-daap-src.c
-@@ -283,7 +283,7 @@ rb_daap_src_change_state (GstElement *element, GstStateChange transition)
- 
- 			/* Set daap://... URI as http:// on souphttpsrc to ready connection. */
- 			httpuri = g_strdup (src->daap_uri);
--			strncpy (httpuri, http, 4);
-+			memcpy (httpuri, http, 4);
- 
- 			g_object_set (src->souphttpsrc, "location", httpuri, NULL);
- 			g_free (httpuri);
--- 
-2.17.0
-
-
-From a73dbae82e3b3a782d36261fa2676cce1f589e45 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Wed, 6 Jun 2018 11:34:52 +0200
-Subject: [PATCH 09/12] build: Remove -Wcast-align warning
-
-It generates a false positive error message when trying to compile on
-ARM:
-/usr/include/gstreamer-1.0/gst/gstbuffer.h: In function 'gst_buffer_ref':
-/usr/include/gstreamer-1.0/gst/gstbuffer.h:429:10: error: cast increases required alignment of target type [-Werror=cast-align]
-   return (GstBuffer *) gst_mini_object_ref (GST_MINI_OBJECT_CAST (buf));
-          ^
-
-See https://bugzilla.gnome.org/show_bug.cgi?id=767255
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 746dfb49e..7124db904 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -469,7 +469,7 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
- 	-Wunused-label -Wunused-value \
- 	-Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
- 	-Wnested-externs -Wpointer-arith \
--	-Wcast-align -Wformat-security -Wall \
-+	-Wformat-security -Wall \
- 	-Werror -Wno-deprecated-declarations -std=gnu89"
- 
- 	if echo "$CFLAGS" | grep -q -- '-O' && echo "$CFLAGS" | grep -q -v -- '-O0'; then
--- 
-2.17.0
-
-
-From 9871ddcce16cae60535523ab8c229319927f6d75 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Fri, 8 Jun 2018 16:09:05 +0200
-Subject: [PATCH 10/12] artsearch: Fix TypeError when returning results
-
-eg. Traceback (most recent call last):
-  File "/usr/lib64/rhythmbox/plugins/artsearch/local.py", line 136, in _enum_children_cb
-    self.callback(self.callback_args)
-TypeError: Argument 1 does not allow None as a value
----
- plugins/artsearch/embedded.py | 2 +-
- plugins/artsearch/lastfm.py   | 2 +-
- plugins/artsearch/local.py    | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/plugins/artsearch/embedded.py b/plugins/artsearch/embedded.py
-index 206df547f..646da0a24 100644
---- a/plugins/artsearch/embedded.py
-+++ b/plugins/artsearch/embedded.py
-@@ -56,7 +56,7 @@ class EmbeddedSearch(object):
- 			return
- 
- 
--	def search (self, key, last_time, store, callback, args):
-+	def search (self, key, last_time, store, callback, *args):
- 		location = key.get_info("location")
- 		if location is None:
- 			print("not searching, we don't have a location")
-diff --git a/plugins/artsearch/lastfm.py b/plugins/artsearch/lastfm.py
-index ff1966eae..2169ebab2 100644
---- a/plugins/artsearch/lastfm.py
-+++ b/plugins/artsearch/lastfm.py
-@@ -145,7 +145,7 @@ class LastFMSearch (object):
- 		l.get_url(url, self.album_info_cb)
- 
- 
--	def search(self, key, last_time, store, callback, args):
-+	def search(self, key, last_time, store, callback, *args):
- 		if last_time > (time.time() - REPEAT_SEARCH_PERIOD):
- 			print("we already tried this one")
- 			callback (args)
-diff --git a/plugins/artsearch/local.py b/plugins/artsearch/local.py
-index 58214037e..4d28bf0e8 100644
---- a/plugins/artsearch/local.py
-+++ b/plugins/artsearch/local.py
-@@ -136,7 +136,7 @@ class LocalSearch:
- 			self.callback(self.callback_args)
- 
- 
--	def search (self, key, last_time, store, callback, args):
-+	def search (self, key, last_time, store, callback, *args):
- 		# ignore last_time
- 
- 		location = key.get_info("location")
--- 
-2.17.0
-
-
-From 68fb588544a094a27127fe50c95e18019065b793 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Fri, 8 Jun 2018 16:10:00 +0200
-Subject: [PATCH 11/12] artsearch: Ignore unsupported scheme
-
-When trying to play an HTTP stream, the local artsearch backend would
-throw an error. We can safely ignore it though.
-
-Traceback (most recent call last):
-  File "/usr/lib64/rhythmbox/plugins/artsearch/local.py", line 129, in _enum_children_cb
-    enumfiles = parent.enumerate_children_finish(result)
-GLib.Error: g-io-error-quark: Operation not supported by backend (15)
----
- plugins/artsearch/local.py | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/plugins/artsearch/local.py b/plugins/artsearch/local.py
-index 4d28bf0e8..074795a76 100644
---- a/plugins/artsearch/local.py
-+++ b/plugins/artsearch/local.py
-@@ -130,10 +130,12 @@ class LocalSearch:
- 			enumfiles.next_files_async(ITEMS_PER_NOTIFICATION, GLib.PRIORITY_DEFAULT, None, self._enum_dir_cb, [])
- 		except Exception as e:
- 			print("okay, probably done: %s" % e)
--			if not isinstance(e, GLib.GError):
-+			if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_SUPPORTED):
-+				self.callback(self.callback_args)
-+			elif not isinstance(e, GLib.GError):
- 				import sys
- 				sys.excepthook(*sys.exc_info())
--			self.callback(self.callback_args)
-+				self.callback(self.callback_args)
- 
- 
- 	def search (self, key, last_time, store, callback, *args):
--- 
-2.17.0
-
-
-From 0994e76b65d0533bd148cab5631362202602b28f Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Tue, 12 Jun 2018 15:16:29 +0200
-Subject: [PATCH 12/12] sources: Fix state of initial import not reflecting
- reality
-
-When rhythmbox is started with an empty "locations" setting, it will
-rewrite the setting with the user's music folder as the only location.
-This will start an import job from the setting's "changed" signal. But
-we already start another import job from the "load-complete" signal of
-the database.
-
-Make sure only the load-complete signal triggers an import when setting
-the "locations" setting is empty on startup.
----
- sources/rb-library-source.c | 29 +++++++++++++----------------
- 1 file changed, 13 insertions(+), 16 deletions(-)
-
-diff --git a/sources/rb-library-source.c b/sources/rb-library-source.c
-index 15ba523d2..378a3e006 100644
---- a/sources/rb-library-source.c
-+++ b/sources/rb-library-source.c
-@@ -284,6 +284,10 @@ db_load_complete_cb (RhythmDB *db, RBLibrarySource *source)
- 	if (source->priv->do_initial_import) {
- 		const char *music_dir;
- 		char *music_dir_uri;
-+		const char *set_locations[2];
-+
-+		g_signal_handlers_block_by_func (source->priv->db_settings,
-+						 G_CALLBACK (db_settings_changed_cb), source);
- 		
- 		music_dir = rb_music_dir ();
- 		music_dir_uri = g_filename_to_uri (music_dir, NULL, NULL);
-@@ -293,6 +297,13 @@ db_load_complete_cb (RhythmDB *db, RBLibrarySource *source)
- 			g_mkdir_with_parents (music_dir, 0700);
- 		}
- 
-+		set_locations[0] = music_dir_uri;
-+		set_locations[1] = NULL;
-+		g_settings_set_strv (source->priv->db_settings, "locations", set_locations);
-+
-+		g_signal_handlers_unblock_by_func (source->priv->db_settings,
-+						   G_CALLBACK (db_settings_changed_cb), source);
-+
- 		/* import anything that's already in there */
- 		job = maybe_create_import_job (source);
- 		rhythmdb_import_job_add_uri (job, music_dir_uri);
-@@ -344,22 +355,8 @@ rb_library_source_constructed (GObject *object)
- 
- 	/* Set up the default library location if there's no library location set */
- 	locations = g_settings_get_strv (source->priv->db_settings, "locations");
--	if (g_strv_length (locations) == 0) {
--		char *music_dir_uri;
--
--		music_dir_uri = g_filename_to_uri (rb_music_dir (), NULL, NULL);
--		if (music_dir_uri != NULL) {
--			const char *set_locations[2];
--
--			set_locations[0] = music_dir_uri;
--			set_locations[1] = NULL;
--			g_settings_set_strv (source->priv->db_settings, "locations", set_locations);
--
--			source->priv->do_initial_import = TRUE;
--
--			g_free (music_dir_uri);
--		}
--	}
-+	if (g_strv_length (locations) == 0)
-+		source->priv->do_initial_import = TRUE;
- 	g_strfreev (locations);
- 
- 	songs = rb_source_get_entry_view (RB_SOURCE (source));
--- 
-2.17.0
-
diff --git a/media-sound/rhythmbox/rhythmbox-3.4.2.ebuild b/media-sound/rhythmbox/rhythmbox-3.4.2.ebuild
deleted file mode 100644
index 17ce213bbca3..000000000000
--- a/media-sound/rhythmbox/rhythmbox-3.4.2.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{5,6} )
-PYTHON_REQ_USE="xml"
-
-inherit eutils gnome2 python-single-r1 multilib virtualx
-
-DESCRIPTION="Music management and playback software for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Rhythmbox"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="cdr daap dbus gnome-keyring ipod libnotify lirc mtp nsplugin +python test +udev upnp-av"
-REQUIRED_USE="
-	ipod? ( udev )
-	mtp? ( udev )
-	dbus? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/libxml2-2.7.8:2
-	>=x11-libs/gtk+-3.16:3[X,introspection]
-	>=x11-libs/gdk-pixbuf-2.18:2
-	>=dev-libs/gobject-introspection-0.10:=
-	>=dev-libs/libpeas-0.7.3[gtk]
-	>=dev-libs/totem-pl-parser-3.2
-	>=net-libs/libsoup-2.42:2.4
-	>=media-libs/gst-plugins-base-1.4:1.0[introspection]
-	>=media-libs/gstreamer-1.4:1.0[introspection]
-	>=sys-libs/tdb-1.2.6
-	dev-libs/json-glib
-
-	cdr? ( >=app-cdr/brasero-2.91.90 )
-	daap? (
-		>=net-libs/libdmapsharing-2.9.19:3.0
-		>=media-plugins/gst-plugins-soup-1.4:1.0 )
-	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-	libnotify? ( >=x11-libs/libnotify-0.7.0 )
-	lirc? ( app-misc/lirc )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}]
-	)
-	udev? (
-		virtual/libgudev:=
-		ipod? ( >=media-libs/libgpod-0.7.92[udev] )
-		mtp? ( >=media-libs/libmtp-0.3 ) )
-"
-RDEPEND="${COMMON_DEPEND}
-	media-plugins/gst-plugins-soup:1.0
-	media-plugins/gst-plugins-libmms:1.0
-	|| (
-		media-plugins/gst-plugins-cdparanoia:1.0
-		media-plugins/gst-plugins-cdio:1.0 )
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/gst-plugins-taglib:1.0
-	x11-themes/adwaita-icon-theme
-	python? (
-		>=dev-libs/libpeas-0.7.3[python,${PYTHON_USEDEP}]
-		net-libs/libsoup:2.4[introspection]
-		x11-libs/gdk-pixbuf:2[introspection]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection]
-
-		dbus? ( sys-apps/dbus )
-		gnome-keyring? ( >=app-crypt/libsecret-0.18[introspection] ) )
-	upnp-av? (
-		>=media-libs/grilo-0.3:0.3
-		>=media-plugins/grilo-plugins-0.3:0.3[upnp-av] )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35
-	dev-util/itstool
-	virtual/pkgconfig
-	test? ( dev-libs/check )
-"
-# eautoreconf needs yelp-tools
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gstreamer-1.14.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	# --enable-vala just installs the sample vala plugin, and the configure
-	# checks are broken, so don't enable it
-	gnome2_src_configure \
-		MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser/plugins \
-		VALAC=$(type -P true) \
-		--enable-mmkeys \
-		--disable-more-warnings \
-		--disable-static \
-		--disable-vala \
-		--without-hal \
-		$(use_enable daap) \
-		$(use_enable libnotify) \
-		$(use_enable lirc) \
-		$(use_enable nsplugin browser-plugin) \
-		$(use_enable python) \
-		$(use_enable upnp-av grilo) \
-		$(use_with cdr brasero) \
-		$(use_with gnome-keyring libsecret) \
-		$(use_with ipod) \
-		$(use_with mtp) \
-		$(use_with udev gudev)
-}
-
-src_test() {
-	unset SESSION_MANAGER
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-	GSETTINGS_SCHEMA_DIR="${S}/data" virtx emake check CK_DEFAULT_TIMEOUT=60
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog DOCUMENTERS INTERNALS \
-		MAINTAINERS MAINTAINERS.old NEWS README THANKS"
-
-	gnome2_src_install
-}
diff --git a/media-sound/soundconverter/Manifest b/media-sound/soundconverter/Manifest
index 10e824ebe742..2739a6df0055 100644
--- a/media-sound/soundconverter/Manifest
+++ b/media-sound/soundconverter/Manifest
@@ -1,5 +1,3 @@
-DIST soundconverter-3.0.0.tar.xz 201548 BLAKE2B bdca42d22d2e497b807149dcd5c8f911519b71dc7e836ad359831d0b7cd2241f58f8f9f60fa4580e2f038528e9c249dfa8a811d1681d0c8dead2c53e0f58f7ce SHA512 6f5518711c76e7748447805dbf16ac8622c5041c3f3cac2de6f31968aab4eff43a2fde2da48c47d12093ce1732208923d83d57b6a97ea99fbf882dfef239a62d
 DIST soundconverter-3.0.2.tar.xz 208440 BLAKE2B e7817648fe27b2083629ea718b0479f7b9e2607a017868b1e1ce3fb0407a84a548bd007647e73a1d4163a7f51b162a89e3914419ccdbfd07586c2a94a23f4af2 SHA512 0746395de412a4d845e3df4d6cce0dbcba266c9efc8db71663dd1c751d2a5de5b0dc266f24bbfe6c00f69428801ce5f9558fc8e5e2f5d5e6be8562085cd7fe92
-EBUILD soundconverter-3.0.0.ebuild 1795 BLAKE2B 9708f0fed867b06009862386e4c375292e70e9d5dd25507ee3ad2eb902ca6a58e5a83570e23a07ce1f6a3c138b62088ad47a24d0dd0c33e2b6a76779d8e171fd SHA512 69f83e8ef303fcd0432113eb39de60665471e7c8c8bd1c3080a34954fb031817101d4af7ebdfec0badfb9b46f1054a13ddf8f9a8de91c246ea321f9674be891f
-EBUILD soundconverter-3.0.2.ebuild 1796 BLAKE2B e21ce025bedb8290992dc8503b2a76b56cb0ce049a02e27a43e3c03dabb811edc66686a7dcd6d81e2279a4dbe2864699e55eea7cf2de4ab640d030cdaea41123 SHA512 ad2e641ee2aff0ea2c4e7640ad1d5546d63b545b7491c307810573683fc2ca4e8ce4ecfb7adc3fe3479ab4bf725d844d5961afd290f5a7351f138f9e6587d937
+EBUILD soundconverter-3.0.2.ebuild 1795 BLAKE2B 9708f0fed867b06009862386e4c375292e70e9d5dd25507ee3ad2eb902ca6a58e5a83570e23a07ce1f6a3c138b62088ad47a24d0dd0c33e2b6a76779d8e171fd SHA512 69f83e8ef303fcd0432113eb39de60665471e7c8c8bd1c3080a34954fb031817101d4af7ebdfec0badfb9b46f1054a13ddf8f9a8de91c246ea321f9674be891f
 MISC metadata.xml 348 BLAKE2B ca79913ada8d48522d7f0f593caff90549704f518c13f1ca79f34a1f885ffa1500d498be6fe4f70b301a3ff168235ca9e6a2642ff4c4d5a0565ad3bc8de99050 SHA512 a9daf27ee0eeb8342f28e7089b3ff3fdfafb1e19f517efc0d56f5eaae09f05b5b7309368af53fba1f46b8810349ca1f6f82aa3c14369144b22970f488c6ae1b5
diff --git a/media-sound/soundconverter/soundconverter-3.0.0.ebuild b/media-sound/soundconverter/soundconverter-3.0.0.ebuild
deleted file mode 100644
index 58d2ba6e2c78..000000000000
--- a/media-sound/soundconverter/soundconverter-3.0.0.ebuild
+++ /dev/null
@@ -1,63 +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} )
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="A simple audiofile converter application for the GNOME environment"
-HOMEPAGE="https://soundconverter.org/"
-MY_PV="${PV/_/-}"
-SRC_URI="https://launchpad.net/${PN}/trunk/${MY_PV}/+download/${PN}-${MY_PV}.tar.xz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="aac flac libnotify mp3 ogg opus vorbis"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-libs/gobject-introspection:=
-	x11-libs/gtk+:3[introspection]
-	media-libs/gstreamer:1.0[introspection]
-"
-
-# gst-plugins-meta for any decoders, USE flags for specific encoders used by code
-# List in soundconverter/gstreamer.py
-# wavenc and mp4mux come from gst-plugins-good, which everyone having base should have, so unconditional
-RDEPEND="${COMMON_DEPEND}
-	x11-libs/pango[introspection]
-	dev-python/gst-python:1.0[${PYTHON_USEDEP}]
-	libnotify? ( x11-libs/libnotify[introspection] )
-
-	media-libs/gst-plugins-base:1.0[vorbis?,ogg?]
-	media-plugins/gst-plugins-meta:1.0
-	flac? ( media-plugins/gst-plugins-flac:1.0 )
-	media-libs/gst-plugins-good:1.0
-	mp3? (
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gst-plugins-ugly:1.0
-		media-plugins/gst-plugins-lame:1.0
-	)
-	aac? ( media-plugins/gst-plugins-faac:1.0 )
-	opus? (	media-plugins/gst-plugins-opus:1.0 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-"
-
-RESTRICT="test" # broken pot files list in 3.0.0 release, making src_test fallback to "make test" which fails
-
-src_prepare() {
-	python_fix_shebang .
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	python_optimize "${ED%/}"/usr/$(get_libdir)/soundconverter/python
-}
diff --git a/media-sound/soundconverter/soundconverter-3.0.2.ebuild b/media-sound/soundconverter/soundconverter-3.0.2.ebuild
index e0324bbe7b4c..58d2ba6e2c78 100644
--- a/media-sound/soundconverter/soundconverter-3.0.2.ebuild
+++ b/media-sound/soundconverter/soundconverter-3.0.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="aac flac libnotify mp3 ogg opus vorbis"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"