gentoo resync : 06.01.2018

11 files changed, 6 insertions, 328 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 4f9ba42a8d4b..54b0c5e9152e 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/freeverb3/Manifest b/media-libs/freeverb3/Manifest
index 513d369c30a0..d465f84a78aa 100644
--- a/media-libs/freeverb3/Manifest
+++ b/media-libs/freeverb3/Manifest
@@ -1,5 +1,4 @@
 AUX freeverb3-3.1.2_pre20151102-jack-audacious-3-6.patch 2943 BLAKE2B de4464dff7c5476f39d3757f945edae4a524b2267fe02988add4d1f1bab314a06910ba8f2cb5ed66e5843a7725df2abbbc0b00b04a5cf20036832d14ffe414e4 SHA512 fe5d2a14f08f123a1c16bdab4c84f1f2c3b3fa800bf05efca28b1c0b755ed1d8e5848a1b95a8d8fd7a8f4dd626b3ad0e87db072db877f195495558f09f75cb30
 DIST freeverb3-3.1.2_pre20151102.tar.gz 8416503 BLAKE2B 114089be0829e3f1ac36e43e43f455f020e0c72ee6e8e66e1dc2571b8715e56bbdf3b71aa332c3451d511ea4695d6b11a08fb11c9a0e8876ed2556a964be38d9 SHA512 ccdcf8832155e479164bb6a4cb2f830db83bf55b8c797ba96686abe8392e7d88f55c6ab8bcb2db447ec3ab4f5cca05e09ec0753a61452c01a32ff9f4008b3536
-EBUILD freeverb3-3.1.2_pre20151102-r1.ebuild 2239 BLAKE2B 797515196d2f1efd40fa6ace0865b48cdc30a2e865268bc97d3445e42a87b7702d781c3066f6882025818e9cb5274da2d02c9df7f1158e441a6587a758acd34e SHA512 d9dd88027ebf0a28affe04f6e14b8def82097146331bf50ca0cef485fd9952494426bb9d794a21663f662dd85f336d3bc60970a8c566df4ed5c1302cf6356b1b
-EBUILD freeverb3-3.1.2_pre20151102.ebuild 2059 BLAKE2B 82a173d6feab5f0c8938b2522b0d726541738151f7f645f0cc2cbbb8855152305870539cfb4c27d8e3b00e13673be97219ef47bc2ff4b6e53c05fd0290742a46 SHA512 58cf24f0297669492de917bc9df0d43f61325fab49d4465ccfd9fdcfd7e6ea2cc4d900ff23b2afcd079b3eff8236790f5089acf43867093e2fe65ce2a1b8aa4a
+EBUILD freeverb3-3.1.2_pre20151102-r1.ebuild 2166 BLAKE2B 365c7fd3b7b9031c50a5dfd6c16a6403194bfc2a87cd4624d1042ccb99acd8bf5a6c553c3368e3ca5410185f9dedf015d7cfd1b9e32ccd513d8b0b15e3db0ee4 SHA512 0e4693c93a52604084c09cb9a3d2377eee846837e14d07529c8afa3897f623c8ca9cf5b2a4a54673d3e54e05a87a42619c550e6316255c086e78ff1de480405e
 MISC metadata.xml 659 BLAKE2B a7f87a8f8a936d3b366baa087d928641b6690029a039526b4d10bb66ae65d1017d476ea278482853444e613844ab1a16030a7816fe120ecc26c5ee34f8ecd181 SHA512 160cb0784d386e3afe894c5552de7991ceacf332c78e47ebf4b33f02e8f36c3eb05b355f2156cea4b7146a0f13551c1341e5aed0e47ceee39f43c63885e4cece
diff --git a/media-libs/freeverb3/freeverb3-3.1.2_pre20151102-r1.ebuild b/media-libs/freeverb3/freeverb3-3.1.2_pre20151102-r1.ebuild
index 7bf95fa1c744..99aab4c4be8d 100644
--- a/media-libs/freeverb3/freeverb3-3.1.2_pre20151102-r1.ebuild
+++ b/media-libs/freeverb3/freeverb3-3.1.2_pre20151102-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://www.hartwork.org/public/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 _IUSE_INSTRUCTION_SETS="cpu_flags_x86_3dnow cpu_flags_x86_avx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1"
 IUSE="${_IUSE_INSTRUCTION_SETS} audacious forcefpu jack openmp plugdouble threads"
 
@@ -21,9 +21,7 @@ _GTK_DEPEND=">=dev-libs/glib-2.4.7:2
 	x11-libs/cairo"
 
 RDEPEND=">=sci-libs/fftw-3.0.1
-	audacious? (
-		|| ( >=media-sound/audacious-3.7[gtk3]
-			( >=media-sound/audacious-3.6 <media-sound/audacious-3.7 ) )
+	audacious? ( >=media-sound/audacious-3.7[gtk3]
 		${_GTK_DEPEND}
 		media-libs/libsndfile )
 	jack? ( media-sound/jack-audio-connection-kit
diff --git a/media-libs/freeverb3/freeverb3-3.1.2_pre20151102.ebuild b/media-libs/freeverb3/freeverb3-3.1.2_pre20151102.ebuild
deleted file mode 100644
index 7ebbab40e26d..000000000000
--- a/media-libs/freeverb3/freeverb3-3.1.2_pre20151102.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils multilib versionator
-
-MY_PV=796b552e8a32cc8e63d40dfb94b8a6209731060b
-DESCRIPTION="Reverb and Impulse Response Convolution plug-ins (Audacious/JACK)"
-HOMEPAGE="https://savannah.nongnu.org/projects/freeverb3"
-SRC_URI="https://www.hartwork.org/public/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-_IUSE_INSTRUCTION_SETS="cpu_flags_x86_3dnow cpu_flags_x86_avx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1"
-IUSE="${_IUSE_INSTRUCTION_SETS} audacious forcefpu jack openmp plugdouble threads"
-
-_GTK_DEPEND=">=dev-libs/glib-2.4.7:2
-	>=x11-libs/gtk+-3.0.0:3
-	x11-libs/pango
-	x11-libs/cairo"
-
-RDEPEND=">=sci-libs/fftw-3.0.1
-	audacious? ( >=media-sound/audacious-3.6
-		${_GTK_DEPEND}
-		media-libs/libsndfile )
-	jack? ( media-sound/jack-audio-connection-kit
-		${_GTK_DEPEND}
-		media-libs/libsndfile )"
-DEPEND=${RDEPEND}
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-profile \
-		--enable-release \
-		--disable-autocflags \
-		--enable-undenormal \
-		$(use_enable threads pthread) \
-		$(use_enable forcefpu) \
-		--disable-force3dnow \
-		$(use_enable cpu_flags_x86_3dnow 3dnow) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable cpu_flags_x86_sse2 sse2) \
-		$(use_enable cpu_flags_x86_sse3 sse3) \
-		$(use_enable cpu_flags_x86_sse4_1 sse4) \
-		$(use_enable cpu_flags_x86_avx avx) \
-		--disable-fma \
-		--disable-fma4 \
-		$(use_enable openmp omp) \
-		--disable-sample \
-		$(use_enable jack) \
-		$(use_enable audacious) \
-		--disable-srcnewcoeffs \
-		$(use_enable plugdouble) \
-		--disable-pluginit \
-		|| die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc ChangeLog README || die 'dodoc failed'
-
-	if use audacious ; then
-		find "${D}/usr/$(get_libdir)/audacious/" -name '*.la' -print -delete || die
-	fi
-
-	insinto /usr/share/${PN}/samples/IR
-	doins samples/IR/*.wav || die
-}
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index 5d5f389f7e52..5c76e2736fbc 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -1,10 +1,7 @@
 AUX gstreamer-0.10.36-disable-test_fail_abstract_new.patch 1319 BLAKE2B 6b7fc64688f7b078d5018d0ec9b90dc8aa6c0c48bbdd19873a95fabd4da7ffed5b767ac1756ffa6b802d6dd2f261a9f2170a52c7a029732296d22b45999d5cda SHA512 6d2ef5d837551481c85b75edc9246049ca237d8b7efd462646a39ce5526a9b309a6390f2257930bfc54383c9b13447002b2c61f777d38e717995eee6030f5198
-AUX gstreamer-1.10.3-automagic-libunwind.patch 1673 BLAKE2B 1795cc2065ae750d6685dc9c0a3b0ca62d16afc317718516dbfcbcd8b9e6caa6cad8699f227aafaa20401ae5fc92d6a2cdd4110a21acb3673d345986cfb1f1c2 SHA512 ecb02165a3af362bf5dbbb37a3a10c9c8b0462cf1ede67ae7e6ebfa4a065fc328ca1b40b935a8ccec0ef438c6419e418d99e68751f2ee9f03490d6b878feef8a
 AUX gstreamer-make-grammar.y-work-with-bison-3.patch 820 BLAKE2B 1809d190e37fde67c1e7108315e477ed05a3602e401013c26aff33dd0a74e2db8fc4e3d72d6e0b2d5fd79b3c4390c2ec5d2140fdcdb60530facc5e546c1dbe31 SHA512 8f5e904cc42be918c0a170c7227e22d0a31b5eb613a44294dbc03e5b1d7315d565f29d3de796ffbca822fe53b10b83bea54694b58ff2bf453af4b8859741ee21
 DIST gstreamer-0.10.36.tar.xz 3025876 BLAKE2B f0f70f483e8ccb2a294fb3bc8b51aac089f5e76522249b64e3e60e7b488a9e03b9300617e2c137bdcc0e3e61668b7b203e899f270f004e2dfcee0927fa7dfc3c SHA512 7468abb578398681d2adb0e9bbc9ee8ae25aaef72369d45a66ada6c67d1759afdce606cb32e68d9e30ae813196bdfef3d4d33202bc77839cc1fbf5fc436c1bd8
-DIST gstreamer-1.10.5.tar.xz 3798304 BLAKE2B 37be838d5cfb7299bc9ba2a475cc8e5f339fd991150297843d238ba2d79345d90ee420ab31c78fd2b1fec7bccf1b5b7f90712e23c4474272fc8295812188cf8a SHA512 c138d672966232a4eb0fb4c49dbb39a7942d06b6474c9ee2c884eed2d470674dcbc4a3e2c7338472ac25b710788078241217391e7e5bc076ef21216cbaf0bc31
 DIST gstreamer-1.12.3.tar.xz 3175480 BLAKE2B e42b908b6fef2be5d4a0ad435cab5760a5e73e6f09afa0fd0993dd84d01f956b6437beb367082002e875307970f3b4b3fcb8735f7f69836da0ba76ed186e42db SHA512 fceeeca4314aead7ff358db3474bd6fe1eef70f745a6ba20505da6c0caaea6ea6317246dc66c23edab396ca811a610c52fa930f8f99c701241ae7f15857aa2b0
 EBUILD gstreamer-0.10.36-r2.ebuild 3975 BLAKE2B fd2155ec778c09848da944eaaeeef191050fa98be5fe3463cbfe9acf75233e2d1f5571a28c7e0f14891005bcd8678664ed4d0ccb37b6773fe359285e265780f3 SHA512 b3e544ebed44ab38c1fa3dea0dc776abac7920a3674d12ad09b82ace577d5ee2cc367647165da15d227e0a12670248557fb7431eb9b764468feac8040c6f2623
-EBUILD gstreamer-1.10.5.ebuild 3473 BLAKE2B 8b97247781482c7a9df93ae277bef38c6f6307f00d6e0dd369e1a6e65b5c60eb16db8d612ef19b5078d96807580646dcd0ec88207c7242d58d4538b82a34b02c SHA512 2d032bb18978ab3266e15928342699b7a36991b59d44c99d9159bcf8b90d296d9b0ffcd9f16926b5c2a9a753c1fedcdf739d478cead723e1cf9ac193401ad91a
 EBUILD gstreamer-1.12.3.ebuild 3309 BLAKE2B f2dae365901d455f952bcb9a568a4aafaa46ac2da6e90307108ebc1f28d89adec2e96c3c0aae0811ce20f6dd7559d5cf90e4c8e8022a65c3ac26b06a9ece3997 SHA512 4fd05a9b129e65dff3420defc93b5dd7b3f2573c3c587f410c301732b879e12b904dbaafcab98aa7f8aef0b9cb897488e62fde387d40c199a42929172a9c7119
 MISC metadata.xml 586 BLAKE2B 319df0c2c013f3018bdb31afddcd80b298f9b74d0a581981f30d483b0773339befe4dc62eb78a267b3a0f5a63a7e6462bd0ece4d4285c0ca91a1329c12ba1b93 SHA512 f7de0325f671119a5b787dcba9572d06d58375ba9d815854beffd668da55e4d4695f586365b3455e63cd56f4469fb8e1a92ab6de4e05847668f56c076dfdaf57
diff --git a/media-libs/gstreamer/files/gstreamer-1.10.3-automagic-libunwind.patch b/media-libs/gstreamer/files/gstreamer-1.10.3-automagic-libunwind.patch
deleted file mode 100644
index 472726f56101..000000000000
--- a/media-libs/gstreamer/files/gstreamer-1.10.3-automagic-libunwind.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 930fc152babda61d2eab05f0c9cc1a1928ead731 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sun, 5 Feb 2017 09:03:46 +0200
-Subject: [PATCH] configure: Allow specifying libunwind usage explicitly
-
-https://bugzilla.gnome.org/show_bug.cgi?id=778193
----
- configure.ac | 23 ++++++++++++++++++-----
- 1 file changed, 18 insertions(+), 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5081a75..5905430 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -827,7 +827,24 @@ fi
- AM_CONDITIONAL(HAVE_GTK, test "x$HAVE_GTK" = "xyes")
- 
- dnl libunwind is optionally used by the leaks tracer
--PKG_CHECK_MODULES(UNWIND, libunwind, HAVE_UNWIND=yes, HAVE_UNWIND=no)
-+AC_ARG_ENABLE(libunwind,
-+  AS_HELP_STRING([--disable-libunwind],[disable using libunwind inside leaks tracer @<:@default=auto@:>@]),
-+  [LIBUNWIND="$enableval"], [LIBUNWIND="auto"])
-+
-+if test "x$LIBUNWIND" != "xno"; then
-+    PKG_CHECK_MODULES(UNWIND, libunwind, [
-+        HAVE_UNWIND=yes
-+        AC_DEFINE(HAVE_UNWIND, 1, [libunwind available])
-+    ], [
-+        HAVE_UNWIND=no
-+        if test "x$LIBUNWIND" = "xyes"; then
-+            AC_MSG_ERROR([libunwind requested but not installed.])
-+        fi
-+    ])
-+else
-+    HAVE_UNWIND=no
-+fi
-+AM_CONDITIONAL(HAVE_UNWIND, [test "x$HAVE_UNWIND" = "xyes"])
- 
- dnl Check for backtrace() from libc
- AC_CHECK_FUNC(backtrace, [
-@@ -836,10 +853,6 @@ AC_CHECK_FUNC(backtrace, [
-   ], [], [])
- ])
- 
--if test "x$HAVE_UNWIND" = "xyes"; then
--  AC_DEFINE(HAVE_UNWIND, 1, [libunwind available])
--fi
--
- dnl building of unit test libraries
- AC_ARG_ENABLE(check,
-   AS_HELP_STRING([--disable-check],[disable building unit test libraries]),
--- 
-2.10.1
-
diff --git a/media-libs/gstreamer/gstreamer-1.10.5.ebuild b/media-libs/gstreamer/gstreamer-1.10.5.ebuild
deleted file mode 100644
index 385bf7a3dca8..000000000000
--- a/media-libs/gstreamer/gstreamer-1.10.5.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 eutils multilib-minimal pax-utils autotools
-
-DESCRIPTION="Open source multimedia framework"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="1.0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+caps +introspection nls +orc test unwind"
-
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
-	caps? ( sys-libs/libcap[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
-	unwind? ( >=sys-libs/libunwind-1.2_rc1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-	sys-devel/bison
-	sys-devel/flex
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	nls? ( sys-devel/gettext )
-"
-# gtk-doc-am to install API docs
-
-# https://bugzilla.gnome.org/show_bug.cgi?id=778193 (remove src_prepare/eautoreconf once not needed on bump)
-PATCHES=( "${FILESDIR}"/${PN}-1.10.3-automagic-libunwind.patch )
-
-src_prepare() {
-	default
-	eautoreconf # Due to automagic libunwind fix
-}
-
-src_configure() {
-	if [[ ${CHOST} == *-interix* ]] ; then
-		export ac_cv_lib_dl_dladdr=no
-		export ac_cv_func_poll=no
-	fi
-	if [[ ${CHOST} == powerpc-apple-darwin* ]] ; then
-		# GCC groks this, but then refers to an implementation (___multi3,
-		# ___udivti3) that don't exist (at least I can't find it), so force
-		# this one to be off, such that we use 2x64bit emulation code.
-		export gst_cv_uint128_t=no
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# Set 'libexecdir' to ABI-specific location for the library spawns
-	# helpers from there.
-	# Disable static archives and examples to speed up build time
-	# Disable debug, as it only affects -g passing (debugging symbols), this must done through make.conf in gentoo
-	local myconf=(
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		--disable-debug
-		--disable-examples
-		--disable-static
-		--disable-valgrind
-		--enable-check
-		$(use_enable unwind libunwind)
-		$(multilib_native_use_enable introspection)
-		$(use_enable nls)
-		$(use_enable test tests)
-		--with-bash-completion-dir="$(get_bashcompdir)"
-		--with-package-name="GStreamer ebuild for Gentoo"
-		--with-package-origin="https://packages.gentoo.org/package/media-libs/gstreamer"
-	)
-
-	if use caps ; then
-		myconf+=( --with-ptp-helper-permissions=capabilities )
-	else
-		myconf+=(
-			--with-ptp-helper-permissions=setuid-root
-			--with-ptp-helper-setuid-user=nobody
-			--with-ptp-helper-setuid-group=nobody
-		)
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	if multilib_is_native_abi; then
-		local x
-		for x in gst libs plugins; do
-			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
-		done
-	fi
-}
-
-multilib_src_install() {
-	# can't do "default", we want to install docs in multilib_src_install_all
-	emake DESTDIR="${D}" install
-
-	# Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
-	use orc && pax-mark -m "${ED}usr/$(get_libdir)/gstreamer-${SLOT}/gst-plugin-scanner"
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README RELEASE"
-	einstalldocs
-	prune_libtool_files --modules
-
-	# Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
-	use orc && pax-mark -m "${ED}usr/bin/gst-launch-${SLOT}"
-}
diff --git a/media-libs/libcanberra/Manifest b/media-libs/libcanberra/Manifest
index dd8d56d56a0b..78106e82a005 100644
--- a/media-libs/libcanberra/Manifest
+++ b/media-libs/libcanberra/Manifest
@@ -1,6 +1,5 @@
 AUX libcanberra-0.30-wayland.patch 2382 BLAKE2B bc2be1eb32541c80483538b8e3105f281023cee22a2a0f67c8210b8cfc97273f5323cf31e3b7955e8b944af1a414b30554c9dff7d2de97cb1bcfb13f4cd56baa SHA512 9822e67dea1b541fedb0fa9779cfcb101ba8bd24d9ff238af59920b937cb1f5fbe5854ee5e642ff53e65f8d2d0996f2c46be67a51a211d2e76ae89ae98ec553a
 AUX libcanberra-gtk-module.sh 275 BLAKE2B d7f863f77983d4144035eefc7ce3abb4eb411ecc3aac5f5737b7ce0f44e42cf713b963a17c6a6afdaa95833eedaa510ccd9371056c2c6f0e805febf16c245e36 SHA512 6c945211ad9d461e5bdac209c83e0fc0c714eb194f6d57e4f18db1d904528fe845cd628572d0ab9eb4d53005c00073b376b6d718bcd0cddaeee83dc90042643d
 DIST libcanberra-0.30.tar.xz 318960 BLAKE2B c90c6863738b103c256eeb0907060a0f74b73ef50ac0728d2114aa558a7a1ad7cbae4184860573d3fac0032eba77327a4de94c459b99a81c3dc19da0e98adfda SHA512 f7543582122256826cd01d0f5673e1e58d979941a93906400182305463d6166855cb51f35c56d807a56dc20b7a64f7ce4391368d24990c1b70782a7d0b4429c2
-EBUILD libcanberra-0.30-r4.ebuild 2042 BLAKE2B 177924aa0d976c8bd2cd3924cf2c9dde79e23f2853d8cf00ca0a3d347333adcb386fc617c16751ac581da8fb80c5bb13101644393f1898d2784291594b1733ea SHA512 5449fa1d8c14d3b989af6f70878ad782daa76571497910bed507d0f1897adf2a73ca5430b3dd9e263cfd1acc4844124153ed1827ccbe16c8b3232aae3640862c
 EBUILD libcanberra-0.30-r5.ebuild 2496 BLAKE2B c90a16d7906248fbd9d1beac69c21deb06465a6de97bd7ddc8c4076cdd3ec3ddd2d40c67d9a6b280369d1cbd489f5aa3b43bde63782609739694ff68c4a06d70 SHA512 8a6d39f0ac0e362bb7c5552c8e07b1a29637d657c82645691184d80892a91c29f3aaf90eaf569c5bd41a11362ff2650037dcaf593079eae9216e1b395f94d335
 MISC metadata.xml 1730 BLAKE2B 8a3bef42abdbb7b229af42e8555eee2eb339275c55ffbfa89e62564d4ca28501de45fe99f6efbae91bcbd0c580ed99136bba751367deda70f137230ae7a5746d SHA512 14720aaeff663ff227dc7f59d1f69e636d8bbc7771dda7ed5a950c2ac75c09e0075223fad78b24feda994fa92dce8e5cfc186e08a3515db0645f4403641a9061
diff --git a/media-libs/libcanberra/libcanberra-0.30-r4.ebuild b/media-libs/libcanberra/libcanberra-0.30-r4.ebuild
deleted file mode 100644
index 6b1934d37ea9..000000000000
--- a/media-libs/libcanberra/libcanberra-0.30-r4.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit eutils systemd
-
-DESCRIPTION="Portable sound event library"
-HOMEPAGE="http://git.0pointer.net/libcanberra.git/"
-SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="alsa gnome gstreamer +gtk +gtk3 oss pulseaudio +sound tdb udev"
-
-COMMON_DEPEND="
-	dev-libs/libltdl:0
-	media-libs/libvorbis
-	alsa? (
-		media-libs/alsa-lib:=
-		udev? ( virtual/libudev:= ) )
-	gstreamer? ( media-libs/gstreamer:1.0 )
-	gtk? (
-		>=dev-libs/glib-2.32:2
-		>=x11-libs/gtk+-2.20.0:2
-		x11-libs/libX11 )
-	gtk3? (
-		>=dev-libs/glib-2.32:2
-		x11-libs/gtk+:3
-		x11-libs/libX11 )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.11 )
-	tdb? ( sys-libs/tdb:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	gnome? (
-		gnome-base/dconf
-		gnome-base/gsettings-desktop-schemas )
-	sound? ( x11-themes/sound-theme-freedesktop )" # Required for index.theme wrt #323379
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="udev? ( alsa )"
-
-src_prepare() {
-	# gtk: Don't assume all GdkDisplays are GdkX11Displays: broadway/wayland (from 'master')
-	epatch "${FILESDIR}/${PN}-0.30-wayland.patch"
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		$(use_enable alsa) \
-		$(use_enable oss) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable gstreamer) \
-		$(use_enable gtk) \
-		$(use_enable gtk3) \
-		$(use_enable tdb) \
-		$(use_enable udev) \
-		$(systemd_with_unitdir) \
-		--disable-lynx \
-		--disable-gtk-doc
-}
-
-src_install() {
-	# Disable parallel installation until bug #253862 is solved
-	MAKEOPTS="${MAKEOPTS} -j1" default
-	prune_libtool_files --modules
-
-	# This is needed for desktops different than GNOME, bug #520550
-	exeinto /etc/X11/xinit/xinitrc.d
-	newexe "${FILESDIR}"/libcanberra-gtk-module.sh 40-libcanberra-gtk-module
-}
diff --git a/media-libs/libmpris2client/Manifest b/media-libs/libmpris2client/Manifest
index 6d51ecf91046..ecad1fddd12d 100644
--- a/media-libs/libmpris2client/Manifest
+++ b/media-libs/libmpris2client/Manifest
@@ -1,4 +1,4 @@
 DIST libmpris2client-0.1.0.tar.bz2 287862 BLAKE2B ab5d19c0469e3adad9734141d507ce036d4ddc9d3716b7905648f880680a496c237f2c26afa4983a2c17327171ad5d9052911a5a30e76145b1c5d3e6fc8a17e2 SHA512 29926a60c2da71c78b38154ff39e310785e089abac756a5e1adea71f9f33975028a3110473a07c2cf56271fa978400d1249e5cab44c4bdd440f48ef37775ca44
-EBUILD libmpris2client-0.1.0-r1.ebuild 683 BLAKE2B 87e467cda7bfeab71817abd5f0d2a3deb46e8d6802a3b5ee8540ef2e6b857c57f5968b5786bdf0e2d456b60a233fc085a22e0c06d5e49ed00475c9fcc475c04d SHA512 130faf2c33aa4c60a6266dc81adba61721159f4062bf847e14176c9dba3c15d917f1dda816e5cb5d6ed9cd1cd31ed1427aa26596a59a221bec04724ab38b6d3a
+EBUILD libmpris2client-0.1.0-r1.ebuild 682 BLAKE2B 0431cdf420648a7e0aec3a34f0b8d40688d8988348f247f44c00dda11d89b6a0fc707663904bc3fc8bf496999790cddb3e357958d6944c14c2fcddad96bf7458 SHA512 e34447e76bbebf913b874ceffa4a71f6d2480595e9f4add835d70d25f5c8db70a62a0f5ac86cc97d50cef8e352432bc6c1b44e4a8b229d7afd56dd9f39d0a206
 EBUILD libmpris2client-0.1.0.ebuild 706 BLAKE2B f9b6bda980119605a27dbb78fd1f6135b7721792dc8800fe661eb4067e3ef9b3cbcb0ce93ef5c095ee914fb1480fbc54197d772a52e35fd0c1a8f999dfd6e9e0 SHA512 7de56ef5053237436fb47591ed02e3c2deee117fb2f9509eda0d75b7cfd3376d29f43d06b14a7512419ca77843a72cd8742b8a85b4427d488107c3d24ca8ffb6
 MISC metadata.xml 346 BLAKE2B f27dc0e8f01c8c2810e8920a46e87c98484cbeb0137faef98c9ece3907df3c5881ee8603a68c258b9fa6ba9b23bc18e0b29610d83c065803849b4f268f01630a SHA512 3e491f998b2ca58209ab5eb0913637b2ae55360d0f356a3fbd054ce0243e361c2852185c1ed0e5b835c7661fc2102bd0831d016320da8686d8573aa8c0b872cf
diff --git a/media-libs/libmpris2client/libmpris2client-0.1.0-r1.ebuild b/media-libs/libmpris2client/libmpris2client-0.1.0-r1.ebuild
index d1b7136e6b7a..a119a972166a 100644
--- a/media-libs/libmpris2client/libmpris2client-0.1.0-r1.ebuild
+++ b/media-libs/libmpris2client/libmpris2client-0.1.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/matiasdelellis/${PN}/releases/download/V${PV}/${P}.t
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2