gentoo resync : 28.04.2019

3 files changed, 2 insertions, 43 deletions

diff --git a/media-libs/libmatemixer/Manifest b/media-libs/libmatemixer/Manifest
index f4949deadeb0..2e675c23ac88 100644
--- a/media-libs/libmatemixer/Manifest
+++ b/media-libs/libmatemixer/Manifest
@@ -1,5 +1,3 @@
-DIST libmatemixer-1.18.0.tar.xz 418772 BLAKE2B f37689b9929ac659c6f314f2d5751beff18304575680985f4e3b24b3032237464d2ab32e4675ca3bbb0be796d90ecca47d49925a4a6105bf50907722c4505765 SHA512 254d1ff74f036d813f9ec2b983b86a730fec0d1f2009e7d22a9d779e509aec92409225cec5ff1f7c747c468c5e40affaa67130df4bb7087d5ee61036359b4407
 DIST libmatemixer-1.22.0.tar.xz 432592 BLAKE2B 36f16c0ed516dea05368ae5b4f287cce275844b547fb7eebe7fb0604d0fddce72649dcac1c16475539dc5199f5d310b8bd19f165efd4bfa5c4f1bf31c1141df7 SHA512 6eaa006142601c077ac70739e637273288a4b9713dfc4179341c4832ae4e3b362e92104e150132ee274224d6c5dc057d812b7e1814e49a7690581de6d81e0db8
-EBUILD libmatemixer-1.18.0.ebuild 778 BLAKE2B 1f503c2e32a091cc8fd598f87d4ebe4b9dcf0666cdeeeffd2ac8bcd1f7d452fd1c18a7986fc905bbd112db0d301f12cfdea72f6eff8e1957d1e4b5b000f13260 SHA512 1c9037c115b9036c4143a2e771d80172aa84ca5475b5e84e7ac9e031656c2d067bc0fc4d0badd6abee48161f1d6faca72e682e9ba9e71da251cfa6c01150d700
-EBUILD libmatemixer-1.22.0.ebuild 775 BLAKE2B 84035ef7c5651c64642827340ab1404783af8cbc62465eed858b94efcea744b41280d0900fe637b3196058e50b79a8cb98296f68d9f7d5f109f819d35eb84b4a SHA512 c24124342d42eddd9d3bab7ffcdd985ae71fbb59ba8a599bfc8e3971608887d1ac3f3c15d84b125275211ed149c9faffc60eced91bebe7c673a6911f0f3ccaca
+EBUILD libmatemixer-1.22.0.ebuild 773 BLAKE2B 9c4bbacf5148258e41e1c29e490e37794995d304edf71a19727d9ae472ad434cebbb87f2179da03583d9ab40514d88a51dc8524ef80967800a64c65f4a261227 SHA512 16b7318b7381df18bbfb722dc79e768740cbf9568ca4b00979223d35aaa8ef2c58b8441f24d12e9eaab87fa11eee1b8fab48228273ee88f8d156c0ec1cfc2e61
 MISC metadata.xml 341 BLAKE2B e060b6c02aaaea5885ec10566d2e3b13fb2f480201b3b43144255fa1f27a93a648a9030fa02f0efd20c8f32ee93e03661f379a63576822ed5c27b094ff6d7d81 SHA512 0c6f04ebdfe4cd26e7fdad53fd184045f6d95c4b9c888883f255ddc566fc02e0cf86138d5557fb71c0e8e9ea12e0d19657b218e1d310ce414e2911470eaa9359
diff --git a/media-libs/libmatemixer/libmatemixer-1.18.0.ebuild b/media-libs/libmatemixer/libmatemixer-1.18.0.ebuild
deleted file mode 100644
index 07c33e23c573..000000000000
--- a/media-libs/libmatemixer/libmatemixer-1.18.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Mixer library for MATE Desktop"
-LICENSE="LGPL-2 GPL-2"
-SLOT="0"
-
-IUSE="+alsa oss pulseaudio"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.36:2
-	sys-devel/gettext:*
-	alsa? ( >=media-libs/alsa-lib-1.0.5 )
-	pulseaudio? ( >=media-sound/pulseaudio-2.0.0:0[alsa?,glib] )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35.0:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--disable-null \
-		$(use_enable alsa) \
-		$(use_enable oss) \
-		$(use_enable pulseaudio)
-}
diff --git a/media-libs/libmatemixer/libmatemixer-1.22.0.ebuild b/media-libs/libmatemixer/libmatemixer-1.22.0.ebuild
index bc08d21212ed..3bb4a5033c0c 100644
--- a/media-libs/libmatemixer/libmatemixer-1.22.0.ebuild
+++ b/media-libs/libmatemixer/libmatemixer-1.22.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Mixer library for MATE Desktop"