gentoo resync : 17.12.2017

3 files changed, 2 insertions, 74 deletions

diff --git a/media-plugins/gst-plugins-meta/Manifest b/media-plugins/gst-plugins-meta/Manifest
index 564dbcb16c0c..ebf3f7e57760 100644
--- a/media-plugins/gst-plugins-meta/Manifest
+++ b/media-plugins/gst-plugins-meta/Manifest
@@ -1,6 +1,5 @@
 EBUILD gst-plugins-meta-0.10-r11.ebuild 4379 BLAKE2B 5ef0393cd63810d6f66d1fcd0cd3852606881e80e7ba44e650523a9690f65eedf1ee475c2b4039349af285009a2792360ceb4c8e194d576d9a1d8145dae6a5ea SHA512 abb076159bfc3ba50cd74b8546b5194945e6d1a93c860024e20c514983d1e39e04f15509640ed01761b00c6efa1d8a8bec8bbd1a5e3215a0428922fcd52d2cd0
-EBUILD gst-plugins-meta-1.10.3.ebuild 3872 BLAKE2B 2be580ebe53231ff2fcd93af52fbca31899c7f85a7262faca00e69ec197bae1cb0511fefd92561c783178d6a163e739d114298073ce4a2064e06d79c62237d29 SHA512 1b72f3c6387266b4f52b8610483ecbf3b4d7daaca0012dbcef690fba0d3d97b9cdcddf2f7a3c0464629e72286364c9e6188df8a76f0933c0aef7533fec27ac2a
 EBUILD gst-plugins-meta-1.10.5.ebuild 3872 BLAKE2B 99890ba647d86b43f277ce61a24793dccb42387dd4ac142ad3aa509a0d88b711310b0c474b38980cc5fd06ace83b43b8ee2e6859496f2a8495f9d5d8e473deba SHA512 a165de9b05ce9eee6685e5369f20d953843079ece36f9d44fed562ec72ce719a6a51c999a567a74b23d99793463c5478984e77835970c990338c051d66ddc0f7
-EBUILD gst-plugins-meta-1.12.3.ebuild 3718 BLAKE2B 553065776a187860ae11b7c53875da6b1ebae14d5dc16f35afca3a1c642c7ff1704d147690eb2b2137a2f7a3f3e00f18d559e47afe715fb56f6080f04d27b500 SHA512 a5c6a88bd0dddcbe5db43207159ca48e863c1b8836d72c10cc3bf91048e59196162db156859d8d45971bcb96e7e9fa94a9afd6b8e66679b473abe1accd133de2
+EBUILD gst-plugins-meta-1.12.3.ebuild 3722 BLAKE2B f006d7dab61f5131f4816d9e3ea6145d0b27c72740daa93b89d4f821d37c77152ba727a3811292e234e7d1a7c55ecfab0c94be4164521bbc6db185eb22320fcf SHA512 842cf59c59b289d397288d79d662255fd1f966633a2fe92a9657a4301c4e8e1f3e5cfc56f1c0e2ad1566905f601f006a312054450f67b06ab53e1468ba34e832
 EBUILD gst-plugins-meta-1.8.3.ebuild 3816 BLAKE2B 821c2abcd8443b67d96a5666ca458bce2b53fe9bb38035bcb61f48deb630d7843bb63bbcc12ab3f30de64e506d2950130988467a8f4bdf22455f1d0988391402 SHA512 30dd925c5ee2ec2ff88a9a862dc605211d02ed7c5293d336c6432c4e826b1c5445c6c4fbcf4975128a1f5c98333a4bd314163d5fad0cfc5c5a5e9d46eb8474bd
 MISC metadata.xml 1054 BLAKE2B f766fa7d1ffda2bdc4523f242deaf22b13cb3e89f979071a90bbe1758785c797eb1d08ff318978b6375d5cbeb7db59bcdbd4d7f27b979b3aabdfe28b01d9b902 SHA512 604995aac26c05be7a4ec9bb1632420f96e930536c344e1c059f70c3eb13a3e1f1c604fbd95a8201b0ff3d727af0830f788ff14edf399b8c3a1d48de93fb490c
diff --git a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.10.3.ebuild b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.10.3.ebuild
deleted file mode 100644
index 3d74ee5e68e0..000000000000
--- a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.10.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-build
-
-DESCRIPTION="Meta ebuild to pull in gst plugins for apps"
-HOMEPAGE="https://www.gentoo.org"
-
-LICENSE="metapackage"
-SLOT="1.0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~sh x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass libvisual mms mp3 modplug mpeg ogg opus oss pulseaudio taglib theora v4l vaapi vcd vorbis vpx wavpack X x264"
-REQUIRED_USE="opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )"
-
-RDEPEND="
-	>=media-libs/gstreamer-${PV}:1.0[${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-base-${PV}:1.0[alsa?,ogg?,theora?,vorbis?,X?,${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-good-${PV}:1.0[${MULTILIB_USEDEP}]
-	a52? ( >=media-plugins/gst-plugins-a52dec-${PV}:1.0[${MULTILIB_USEDEP}] )
-	aac? ( >=media-plugins/gst-plugins-faad-${PV}:1.0[${MULTILIB_USEDEP}] )
-	cdda? ( || (
-		>=media-plugins/gst-plugins-cdparanoia-${PV}:1.0[${MULTILIB_USEDEP}]
-		>=media-plugins/gst-plugins-cdio-${PV}:1.0[${MULTILIB_USEDEP}] ) )
-	dts? ( >=media-plugins/gst-plugins-dts-${PV}:1.0[${MULTILIB_USEDEP}] )
-	dv? ( >=media-plugins/gst-plugins-dv-${PV}:1.0[${MULTILIB_USEDEP}] )
-	dvb? (
-		>=media-plugins/gst-plugins-dvb-${PV}:1.0[${MULTILIB_USEDEP}]
-		>=media-libs/gst-plugins-bad-${PV}:1.0[${MULTILIB_USEDEP}] )
-	dvd? (
-		>=media-libs/gst-plugins-ugly-${PV}:1.0[${MULTILIB_USEDEP}]
-		>=media-plugins/gst-plugins-a52dec-${PV}:1.0[${MULTILIB_USEDEP}]
-		>=media-plugins/gst-plugins-dvdread-${PV}:1.0[${MULTILIB_USEDEP}]
-		>=media-plugins/gst-plugins-mpeg2dec-${PV}:1.0[${MULTILIB_USEDEP}]
-		>=media-plugins/gst-plugins-resindvd-${PV}:1.0[${MULTILIB_USEDEP}] )
-	ffmpeg? ( >=media-plugins/gst-plugins-libav-${PV}:1.0[${MULTILIB_USEDEP}] )
-	flac? ( >=media-plugins/gst-plugins-flac-${PV}:1.0[${MULTILIB_USEDEP}] )
-	http? ( >=media-plugins/gst-plugins-soup-${PV}:1.0[${MULTILIB_USEDEP}] )
-	jack? ( >=media-plugins/gst-plugins-jack-${PV}:1.0[${MULTILIB_USEDEP}] )
-	lame? ( >=media-plugins/gst-plugins-lame-${PV}:1.0[${MULTILIB_USEDEP}] )
-	libass? ( >=media-plugins/gst-plugins-assrender-${PV}:1.0[${MULTILIB_USEDEP}] )
-	libvisual? ( >=media-plugins/gst-plugins-libvisual-${PV}:1.0[${MULTILIB_USEDEP}] )
-	mms? ( >=media-plugins/gst-plugins-libmms-${PV}:1.0[${MULTILIB_USEDEP}] )
-	modplug? ( >=media-plugins/gst-plugins-modplug-${PV}:1.0[${MULTILIB_USEDEP}] )
-	mp3? (
-		>=media-libs/gst-plugins-ugly-${PV}:1.0[${MULTILIB_USEDEP}]
-		|| (
-			>=media-plugins/gst-plugins-mad-${PV}:1.0[${MULTILIB_USEDEP}]
-			>=media-plugins/gst-plugins-mpg123-${PV}:1.0[${MULTILIB_USEDEP}] ) )
-	mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-${PV}:1.0[${MULTILIB_USEDEP}] )
-	opus? ( >=media-plugins/gst-plugins-opus-${PV}:1.0[${MULTILIB_USEDEP}] )
-	oss? ( >=media-plugins/gst-plugins-oss-${PV}:1.0[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-plugins/gst-plugins-pulse-${PV}:1.0[${MULTILIB_USEDEP}] )
-	taglib? ( >=media-plugins/gst-plugins-taglib-${PV}:1.0[${MULTILIB_USEDEP}] )
-	v4l? ( >=media-plugins/gst-plugins-v4l2-${PV}:1.0[${MULTILIB_USEDEP}] )
-	vaapi? ( >=media-plugins/gst-plugins-vaapi-${PV}:1.0[${MULTILIB_USEDEP}] )
-	vcd? (
-		>=media-plugins/gst-plugins-mplex-${PV}:1.0[${MULTILIB_USEDEP}]
-		>=media-plugins/gst-plugins-mpeg2dec-${PV}:1.0[${MULTILIB_USEDEP}] )
-	vpx? ( >=media-plugins/gst-plugins-vpx-${PV}:1.0[${MULTILIB_USEDEP}] )
-	wavpack? ( >=media-plugins/gst-plugins-wavpack-${PV}:1.0[${MULTILIB_USEDEP}] )
-	x264? ( >=media-plugins/gst-plugins-x264-${PV}:1.0[${MULTILIB_USEDEP}] )
-"
-
-# Usage note:
-# The idea is that apps depend on this for optional gstreamer plugins.  Then,
-# when USE flags change, no app gets rebuilt, and all apps that can make use of
-# the new plugin automatically do.
-
-# When adding deps here, make sure the keywords on the gst-plugin are valid.
diff --git a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.12.3.ebuild b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.12.3.ebuild
index 28d3242bde24..abcd4374de25 100644
--- a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.12.3.ebuild
+++ b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.12.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gentoo.org"
 
 LICENSE="metapackage"
 SLOT="1.0"
-KEYWORDS="~amd64 ~arm64 ia64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 hppa ia64 ppc ppc64 x86"
 IUSE="aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass libvisual mms mp3 modplug mpeg ogg opus oss pulseaudio taglib theora v4l vaapi vcd vorbis vpx wavpack X x264"
 REQUIRED_USE="opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )"