Merge branch 'gstreamer-1.6'

29 files changed, 384 insertions, 3 deletions

diff --git a/dev-python/gst-python/Manifest b/dev-python/gst-python/Manifest
index 94e920c089f3..f1ebb6b396a0 100644
--- a/dev-python/gst-python/Manifest
+++ b/dev-python/gst-python/Manifest
@@ -1,3 +1,4 @@
 DIST gst-python-0.10.22.tar.bz2 632651 SHA256 8f26f519a5bccd770864317e098e5e307fc5ad1201eb96329634b6508b253178 SHA512 bbbd6b661778cca990da0e216294d86da31a6e472049905989a3311459dd1227bf8f2ae3699a3cdbb66a16288569764352f1e1b93e696d3db4b0728bc38e5b12 WHIRLPOOL c6902554bc8f390b5d295d05598ee60fd6b2637d290125d83a48fc40bbd4e6e261a711430259831c96a30fee4c5ec5c89aea444424b117fb5d62c946b0263454
 DIST gst-python-1.2.1.tar.bz2 410887 SHA256 8823e5a9ffc51212df412652da44dc3f2a0e23295da769de2d111c770280efd4 SHA512 ed318d94831d34687224d82b84735984b946c6f33704e6bda56847b633af06212f394b709257007cec5d3a3597b200fbe6b19eade6b76e7855e8668c5ebc270e WHIRLPOOL 959e976c5a481367eb298d24eed4b3bf125d173662ff30cf02506906c88cd369259e0f5cb2bbd31bae31c39934b4a894d2eae13a5e411301f055aef030dcebbb
 DIST gst-python-1.4.0.tar.xz 350316 SHA256 b1e40c29ceb41b03f08d38aca6056054f0341d0706276326dceeec6ac8d53d3e SHA512 b970fd16a3b9d82f343fbf20642d165bff25fb815cfe20cc51db8c04c298a8fbd9b96f41811c2d26982eadf1f9a84495c70fbdad553778c68604f828e4773a94 WHIRLPOOL 248d91fc0aac1314c4f7b40866579601a8024c947a29a90b5b6c3585358984f1a50eb6d56aec26609d37fc9144fdf38d5edd7ad61364481d25b7cebfaeff1a96
+DIST gst-python-1.6.0.tar.xz 368100 SHA256 60dbc7f5ac2b6655ed4a7ed2cee63ee5a525d37cb16eaa6b9df7d7dfe4e9605f SHA512 6ca7e274d6aac580aec52d2bc635ffcd1361de73324a2818632d5304d59b71111433f888d89864ee2053ddd71cddec93a1f8dfe511414bd6e3ab2f26e87bfece WHIRLPOOL ef2c990a7949fc9e39b93761f817bba195fc53f314017a7223504930913fe883a6953aa1a3bdb7f1ebd2fef110b3bc2ec6e6e53108ae96125ea8f74a0cfa23e7
diff --git a/dev-python/gst-python/gst-python-1.6.0.ebuild b/dev-python/gst-python/gst-python-1.6.0.ebuild
new file mode 100644
index 000000000000..53128bc120af
--- /dev/null
+++ b/dev-python/gst-python/gst-python-1.6.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 python{3_3,3_4,3_5} )
+
+inherit python-r1
+
+DESCRIPTION="A Python Interface to GStreamer"
+HOMEPAGE="http://gstreamer.freedesktop.org/"
+SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	dev-libs/libxml2
+	>=dev-python/pygobject-3:3[${PYTHON_USEDEP}]
+	>=media-libs/gstreamer-1.6:1.0
+	>=media-libs/gst-plugins-base-1.6:1.0
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+# XXX: unittests are not ported to 1.0 yet.
+
+src_prepare() {
+	prepare_gst() {
+		mkdir -p "${BUILD_DIR}" || die
+	}
+	python_foreach_impl prepare_gst
+}
+
+src_configure() {
+	ECONF_SOURCE="${S}" python_foreach_impl run_in_build_dir econf
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir default
+	prune_libtool_files --modules
+	einstalldocs
+}
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.6.0.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.6.0.ebuild
index 720bab9baf1b..6781558ab7b7 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.6.0.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.6.0.ebuild
@@ -25,8 +25,8 @@ REQUIRED_USE="
 # X11 is automagic for now, upstream #709530
 RDEPEND="
 	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-base-1.6:${SLOT}[${MULTILIB_USEDEP}]
-	>=media-libs/gstreamer-1.6:${SLOT}[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-1.6:${SLOT}[${MULTILIB_USEDEP},introspection?]
+	>=media-libs/gst-plugins-base-1.6:${SLOT}[${MULTILIB_USEDEP},introspection?]
 	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
 
 	egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
diff --git a/media-libs/gst-plugins-ugly/Manifest b/media-libs/gst-plugins-ugly/Manifest
index b14ec571d6ff..ba8aa210d826 100644
--- a/media-libs/gst-plugins-ugly/Manifest
+++ b/media-libs/gst-plugins-ugly/Manifest
@@ -1,3 +1,4 @@
 DIST gst-plugins-ugly-0.10.19.tar.xz 882452 SHA256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda WHIRLPOOL f72f224c5f486982370e9d264ad7c658324783b42e995eef759faf270a18d8f12261d90ac6e70af38579921b0970f7aba50c6d091edcd6dc3dda272bcbef755f
 DIST gst-plugins-ugly-1.2.4.tar.xz 844968 SHA256 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 SHA512 91a9d950e73a8d6c8bb4c559ba8f4a4dffc163be714d93c0d0d6421f2c9932a4b1af665f76417e79b50b31c83d8a766df9cf6c337b8371371708efc8683e24e1 WHIRLPOOL c1c3885cf2e041c4427f30ca13cda2948b8a35273d3e6417bfe83566f03230208ce1e019e655ae2c98725e94cce6c7fb37b450307312f682bdbd7c948190e7c0
 DIST gst-plugins-ugly-1.4.5.tar.xz 846828 SHA256 5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067 SHA512 9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0 WHIRLPOOL b212a4dcba654dac7866ad75551b26818349780b0d7905e63c45b75e21ffbb86ae0f4e9e79ef8bfb317149c2d4f01cbda2c6e2cf2cbcf58991bc09ba9aa85f4e
+DIST gst-plugins-ugly-1.6.0.tar.xz 859996 SHA256 91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06 SHA512 72fadf593d3307b04757763ea7cec00c8c4f1d1aa7ab68a0876e7888f63b995b81b2d5efe6ac45a4dd068c0cfa9ea23b7a6b4435666bcd36b42e174b068874f0 WHIRLPOOL 3ad574a2d74591de9ecb0167bdea29478f48b7fe2cf4a1fec83ece5d0189d66826f1793e84215d7f412245b5b290310c500fea6a67cfcde94358da3884edeb57
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.6.0.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.6.0.ebuild
new file mode 100644
index 000000000000..69bb42e0936e
--- /dev/null
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.6.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE="gst-plugins-ugly"
+
+inherit eutils flag-o-matic gstreamer
+
+DESCRIPTION="Basepack of plugins for gstreamer"
+HOMEPAGE="http://gstreamer.freedesktop.org/"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="+orc"
+
+RDEPEND="
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-1.6:${SLOT}[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-1.6:${SLOT}[${MULTILIB_USEDEP}]
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+"
+
+multilib_src_configure() {
+	gstreamer_multilib_src_configure
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/plugins/html docs/plugins/html || die
+	fi
+
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
+	einstalldocs
+	prune_libtool_files --modules
+}
diff --git a/media-libs/gstreamer-editing-services/Manifest b/media-libs/gstreamer-editing-services/Manifest
index 7c27ae0a08c9..4833b010d5bc 100644
--- a/media-libs/gstreamer-editing-services/Manifest
+++ b/media-libs/gstreamer-editing-services/Manifest
@@ -1,2 +1,3 @@
 DIST gstreamer-editing-services-1.2.1.tar.xz 900316 SHA256 fe768b21af5c644093a06a0e573b6e2fa9b467bec18de408c7ff7171c4fb40b0 SHA512 245d3f8934e36f5c58112a820375c90f775af928f5a32e5f6c5793a6ad0709b1d29f4e60e572778d1b3fca308d5eb7c55f89a04b38de67a0ba254f85d43d42fa WHIRLPOOL d354c6cfb1c8226b6a5f3b7d175187dfa1a099dbe5d292f1d6b691e51638f72534ac1b412e7851b5c05073e731ecefd0dfbc7ee1106459906498d8d6b61b7080
 DIST gstreamer-editing-services-1.4.0.tar.xz 915420 SHA256 cc20b90fb7bcec257b2afda7474664d493b1acece66da675d7df584588808bb3 SHA512 4a3e39089810aa15f2e2e802b1f2a0fcf6f3508a86a5aa8323078334a3f3b427a53e0d3bbb62d42140dc43cbcd9d4985faf0b28edefbcb9814fa76cbb638119b WHIRLPOOL 913149756f5a3dc19e2549014b66484e6390c33d7bfd204899d5d3e9d1f86fe73570ed04548d8ad6700cf9b917344917ae647b0b1d8fb06655dc446e42653e56
+DIST gstreamer-editing-services-1.6.0.tar.xz 1013632 SHA256 4a780cc27029d25271cf4f8bc17531aa9a1d435e4f807202fd3790f53b964dbe SHA512 25435a9db98ed9d973a2414047f466b0fb865b869b29a7792c690e11e872933018d7fe8f998a4ddd1b452b21aa4021187f76ab8124366cde9a016292ad27646e WHIRLPOOL 67c88e89e9dd8aa26eac649bb8b4ea09048bcd538149b0c1380220094fe39e2be5966c19c69329a7582f2409aa66272f0ee2c0724d5fc5a468a4f2bcfb4319fd
diff --git a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.6.0.ebuild b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.6.0.ebuild
new file mode 100644
index 000000000000..ac63af2c125e
--- /dev/null
+++ b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.6.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit bash-completion-r1 gnome2
+
+DESCRIPTION="SDK for making video editors and more"
+HOMEPAGE="http://wiki.pitivi.org/wiki/GES"
+SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="1.0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection"
+
+# FIXME: There is something odd with pygobject check for >=4.22,
+#        check with upstream
+COMMON_DEPEND="
+	>=dev-libs/glib-2.34:2
+	dev-libs/libxml2:2
+	>=media-libs/gstreamer-1.6:1.0[introspection?]
+	>=media-libs/gst-plugins-base-1.6:1.0[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
+"
+RDEPEND="${COMMON_DEPEND}
+	media-libs/gnonlin:1.0
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1.3
+	virtual/pkgconfig
+"
+# XXX: tests do pass but need g-e-s to be installed due to missing
+# AM_TEST_ENVIRONMENT setup.
+RESTRICT="test"
+
+src_configure() {
+	# gtk is only used for examples
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		--disable-examples \
+		--without-gtk \
+		--with-bash-completion-dir="$(get_bashcompdir)" \
+		--with-package-name="GStreamer editing services ebuild for Gentoo" \
+		--with-package-origin="https://packages.gentoo.org/package/media-libs/gstreamer-editing-services"
+}
+
+src_compile() {
+	# Prevent sandbox violations, bug #538888
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	addpredict /dev
+	gnome2_src_compile
+}
diff --git a/media-libs/gstreamer/gstreamer-1.6.0.ebuild b/media-libs/gstreamer/gstreamer-1.6.0.ebuild
index ecba53c07fa0..3b7dce9213c5 100644
--- a/media-libs/gstreamer/gstreamer-1.6.0.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.6.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-inherit eutils multilib multilib-minimal pax-utils
+inherit bash-completion-r1 eutils multilib multilib-minimal pax-utils
 
 DESCRIPTION="Open source multimedia framework"
 HOMEPAGE="http://gstreamer.freedesktop.org/"
@@ -61,6 +61,7 @@ multilib_src_configure() {
 		$(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"
 	)
diff --git a/media-plugins/gst-plugins-a52dec/Manifest b/media-plugins/gst-plugins-a52dec/Manifest
index b14ec571d6ff..ba8aa210d826 100644
--- a/media-plugins/gst-plugins-a52dec/Manifest
+++ b/media-plugins/gst-plugins-a52dec/Manifest
@@ -1,3 +1,4 @@
 DIST gst-plugins-ugly-0.10.19.tar.xz 882452 SHA256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda WHIRLPOOL f72f224c5f486982370e9d264ad7c658324783b42e995eef759faf270a18d8f12261d90ac6e70af38579921b0970f7aba50c6d091edcd6dc3dda272bcbef755f
 DIST gst-plugins-ugly-1.2.4.tar.xz 844968 SHA256 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 SHA512 91a9d950e73a8d6c8bb4c559ba8f4a4dffc163be714d93c0d0d6421f2c9932a4b1af665f76417e79b50b31c83d8a766df9cf6c337b8371371708efc8683e24e1 WHIRLPOOL c1c3885cf2e041c4427f30ca13cda2948b8a35273d3e6417bfe83566f03230208ce1e019e655ae2c98725e94cce6c7fb37b450307312f682bdbd7c948190e7c0
 DIST gst-plugins-ugly-1.4.5.tar.xz 846828 SHA256 5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067 SHA512 9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0 WHIRLPOOL b212a4dcba654dac7866ad75551b26818349780b0d7905e63c45b75e21ffbb86ae0f4e9e79ef8bfb317149c2d4f01cbda2c6e2cf2cbcf58991bc09ba9aa85f4e
+DIST gst-plugins-ugly-1.6.0.tar.xz 859996 SHA256 91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06 SHA512 72fadf593d3307b04757763ea7cec00c8c4f1d1aa7ab68a0876e7888f63b995b81b2d5efe6ac45a4dd068c0cfa9ea23b7a6b4435666bcd36b42e174b068874f0 WHIRLPOOL 3ad574a2d74591de9ecb0167bdea29478f48b7fe2cf4a1fec83ece5d0189d66826f1793e84215d7f412245b5b290310c500fea6a67cfcde94358da3884edeb57
diff --git a/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.6.0.ebuild b/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.6.0.ebuild
new file mode 100644
index 000000000000..08fa4b1aedfe
--- /dev/null
+++ b/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.6.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-ugly
+
+inherit gstreamer
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="+orc"
+
+RDEPEND="
+	>=media-libs/a52dec-0.7.4-r6[${MULTILIB_USEDEP}]
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-amr/Manifest b/media-plugins/gst-plugins-amr/Manifest
index 4172f1d8942a..55a98c4b5759 100644
--- a/media-plugins/gst-plugins-amr/Manifest
+++ b/media-plugins/gst-plugins-amr/Manifest
@@ -2,3 +2,4 @@ DIST gst-plugins-ugly-0.10.19.tar.xz 882452 SHA256 4934f65ff892637e7efaf1cfe6357
 DIST gst-plugins-ugly-1.2.3.tar.xz 843156 SHA256 537b0a7607eee499026388bb705b5b68985a3fd59fe22ee09accaf8cdf57eb3b SHA512 fdfd22360cf1cb6ba203fb8a5a2a98658c898a41c630e4b466a4a34749b537ea387eee1069adb73bbbacd2da89632c56cd2cf8c371c315b75b11a49f5b9c4beb WHIRLPOOL 0a24e29f2e06d714059c2a83662fbd011808ba2a1996453c4aa44624efeef2a00fd6a4c578332548fc22494c9c1be93497a133f7ce87ab6325198e3465cc9f42
 DIST gst-plugins-ugly-1.2.4.tar.xz 844968 SHA256 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 SHA512 91a9d950e73a8d6c8bb4c559ba8f4a4dffc163be714d93c0d0d6421f2c9932a4b1af665f76417e79b50b31c83d8a766df9cf6c337b8371371708efc8683e24e1 WHIRLPOOL c1c3885cf2e041c4427f30ca13cda2948b8a35273d3e6417bfe83566f03230208ce1e019e655ae2c98725e94cce6c7fb37b450307312f682bdbd7c948190e7c0
 DIST gst-plugins-ugly-1.4.5.tar.xz 846828 SHA256 5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067 SHA512 9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0 WHIRLPOOL b212a4dcba654dac7866ad75551b26818349780b0d7905e63c45b75e21ffbb86ae0f4e9e79ef8bfb317149c2d4f01cbda2c6e2cf2cbcf58991bc09ba9aa85f4e
+DIST gst-plugins-ugly-1.6.0.tar.xz 859996 SHA256 91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06 SHA512 72fadf593d3307b04757763ea7cec00c8c4f1d1aa7ab68a0876e7888f63b995b81b2d5efe6ac45a4dd068c0cfa9ea23b7a6b4435666bcd36b42e174b068874f0 WHIRLPOOL 3ad574a2d74591de9ecb0167bdea29478f48b7fe2cf4a1fec83ece5d0189d66826f1793e84215d7f412245b5b290310c500fea6a67cfcde94358da3884edeb57
diff --git a/media-plugins/gst-plugins-amr/gst-plugins-amr-1.6.0.ebuild b/media-plugins/gst-plugins-amr/gst-plugins-amr-1.6.0.ebuild
new file mode 100644
index 000000000000..6a944bbf1e61
--- /dev/null
+++ b/media-plugins/gst-plugins-amr/gst-plugins-amr-1.6.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-ugly
+
+inherit gstreamer
+
+DESCRIPTION="GStreamer plugin for AMRNB/AMRWB codec"
+HOMEPAGE="http://gstreamer.freedesktop.org/"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+GST_PLUGINS_BUILD="amrnb amrwb"
+GST_PLUGINS_BUILD_DIR="amrnb amrwbdec"
diff --git a/media-plugins/gst-plugins-cdio/Manifest b/media-plugins/gst-plugins-cdio/Manifest
index b14ec571d6ff..ba8aa210d826 100644
--- a/media-plugins/gst-plugins-cdio/Manifest
+++ b/media-plugins/gst-plugins-cdio/Manifest
@@ -1,3 +1,4 @@
 DIST gst-plugins-ugly-0.10.19.tar.xz 882452 SHA256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda WHIRLPOOL f72f224c5f486982370e9d264ad7c658324783b42e995eef759faf270a18d8f12261d90ac6e70af38579921b0970f7aba50c6d091edcd6dc3dda272bcbef755f
 DIST gst-plugins-ugly-1.2.4.tar.xz 844968 SHA256 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 SHA512 91a9d950e73a8d6c8bb4c559ba8f4a4dffc163be714d93c0d0d6421f2c9932a4b1af665f76417e79b50b31c83d8a766df9cf6c337b8371371708efc8683e24e1 WHIRLPOOL c1c3885cf2e041c4427f30ca13cda2948b8a35273d3e6417bfe83566f03230208ce1e019e655ae2c98725e94cce6c7fb37b450307312f682bdbd7c948190e7c0
 DIST gst-plugins-ugly-1.4.5.tar.xz 846828 SHA256 5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067 SHA512 9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0 WHIRLPOOL b212a4dcba654dac7866ad75551b26818349780b0d7905e63c45b75e21ffbb86ae0f4e9e79ef8bfb317149c2d4f01cbda2c6e2cf2cbcf58991bc09ba9aa85f4e
+DIST gst-plugins-ugly-1.6.0.tar.xz 859996 SHA256 91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06 SHA512 72fadf593d3307b04757763ea7cec00c8c4f1d1aa7ab68a0876e7888f63b995b81b2d5efe6ac45a4dd068c0cfa9ea23b7a6b4435666bcd36b42e174b068874f0 WHIRLPOOL 3ad574a2d74591de9ecb0167bdea29478f48b7fe2cf4a1fec83ece5d0189d66826f1793e84215d7f412245b5b290310c500fea6a67cfcde94358da3884edeb57
diff --git a/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.6.0.ebuild b/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.6.0.ebuild
new file mode 100644
index 000000000000..bec73c95e324
--- /dev/null
+++ b/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.6.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-ugly
+
+inherit gstreamer
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=dev-libs/libcdio-0.90-r1:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-dvdread/Manifest b/media-plugins/gst-plugins-dvdread/Manifest
index b14ec571d6ff..ba8aa210d826 100644
--- a/media-plugins/gst-plugins-dvdread/Manifest
+++ b/media-plugins/gst-plugins-dvdread/Manifest
@@ -1,3 +1,4 @@
 DIST gst-plugins-ugly-0.10.19.tar.xz 882452 SHA256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda WHIRLPOOL f72f224c5f486982370e9d264ad7c658324783b42e995eef759faf270a18d8f12261d90ac6e70af38579921b0970f7aba50c6d091edcd6dc3dda272bcbef755f
 DIST gst-plugins-ugly-1.2.4.tar.xz 844968 SHA256 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 SHA512 91a9d950e73a8d6c8bb4c559ba8f4a4dffc163be714d93c0d0d6421f2c9932a4b1af665f76417e79b50b31c83d8a766df9cf6c337b8371371708efc8683e24e1 WHIRLPOOL c1c3885cf2e041c4427f30ca13cda2948b8a35273d3e6417bfe83566f03230208ce1e019e655ae2c98725e94cce6c7fb37b450307312f682bdbd7c948190e7c0
 DIST gst-plugins-ugly-1.4.5.tar.xz 846828 SHA256 5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067 SHA512 9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0 WHIRLPOOL b212a4dcba654dac7866ad75551b26818349780b0d7905e63c45b75e21ffbb86ae0f4e9e79ef8bfb317149c2d4f01cbda2c6e2cf2cbcf58991bc09ba9aa85f4e
+DIST gst-plugins-ugly-1.6.0.tar.xz 859996 SHA256 91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06 SHA512 72fadf593d3307b04757763ea7cec00c8c4f1d1aa7ab68a0876e7888f63b995b81b2d5efe6ac45a4dd068c0cfa9ea23b7a6b4435666bcd36b42e174b068874f0 WHIRLPOOL 3ad574a2d74591de9ecb0167bdea29478f48b7fe2cf4a1fec83ece5d0189d66826f1793e84215d7f412245b5b290310c500fea6a67cfcde94358da3884edeb57
diff --git a/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.6.0.ebuild b/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.6.0.ebuild
new file mode 100644
index 000000000000..a5f5bbf682f8
--- /dev/null
+++ b/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.6.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-ugly
+
+inherit gstreamer
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/libdvdread-4.2.0-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-lame/Manifest b/media-plugins/gst-plugins-lame/Manifest
index b14ec571d6ff..ba8aa210d826 100644
--- a/media-plugins/gst-plugins-lame/Manifest
+++ b/media-plugins/gst-plugins-lame/Manifest
@@ -1,3 +1,4 @@
 DIST gst-plugins-ugly-0.10.19.tar.xz 882452 SHA256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda WHIRLPOOL f72f224c5f486982370e9d264ad7c658324783b42e995eef759faf270a18d8f12261d90ac6e70af38579921b0970f7aba50c6d091edcd6dc3dda272bcbef755f
 DIST gst-plugins-ugly-1.2.4.tar.xz 844968 SHA256 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 SHA512 91a9d950e73a8d6c8bb4c559ba8f4a4dffc163be714d93c0d0d6421f2c9932a4b1af665f76417e79b50b31c83d8a766df9cf6c337b8371371708efc8683e24e1 WHIRLPOOL c1c3885cf2e041c4427f30ca13cda2948b8a35273d3e6417bfe83566f03230208ce1e019e655ae2c98725e94cce6c7fb37b450307312f682bdbd7c948190e7c0
 DIST gst-plugins-ugly-1.4.5.tar.xz 846828 SHA256 5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067 SHA512 9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0 WHIRLPOOL b212a4dcba654dac7866ad75551b26818349780b0d7905e63c45b75e21ffbb86ae0f4e9e79ef8bfb317149c2d4f01cbda2c6e2cf2cbcf58991bc09ba9aa85f4e
+DIST gst-plugins-ugly-1.6.0.tar.xz 859996 SHA256 91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06 SHA512 72fadf593d3307b04757763ea7cec00c8c4f1d1aa7ab68a0876e7888f63b995b81b2d5efe6ac45a4dd068c0cfa9ea23b7a6b4435666bcd36b42e174b068874f0 WHIRLPOOL 3ad574a2d74591de9ecb0167bdea29478f48b7fe2cf4a1fec83ece5d0189d66826f1793e84215d7f412245b5b290310c500fea6a67cfcde94358da3884edeb57
diff --git a/media-plugins/gst-plugins-lame/gst-plugins-lame-1.6.0.ebuild b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.6.0.ebuild
new file mode 100644
index 000000000000..ea1442d8b665
--- /dev/null
+++ b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.6.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-ugly
+
+inherit gstreamer
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-mad/Manifest b/media-plugins/gst-plugins-mad/Manifest
index b14ec571d6ff..ba8aa210d826 100644
--- a/media-plugins/gst-plugins-mad/Manifest
+++ b/media-plugins/gst-plugins-mad/Manifest
@@ -1,3 +1,4 @@
 DIST gst-plugins-ugly-0.10.19.tar.xz 882452 SHA256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda WHIRLPOOL f72f224c5f486982370e9d264ad7c658324783b42e995eef759faf270a18d8f12261d90ac6e70af38579921b0970f7aba50c6d091edcd6dc3dda272bcbef755f
 DIST gst-plugins-ugly-1.2.4.tar.xz 844968 SHA256 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 SHA512 91a9d950e73a8d6c8bb4c559ba8f4a4dffc163be714d93c0d0d6421f2c9932a4b1af665f76417e79b50b31c83d8a766df9cf6c337b8371371708efc8683e24e1 WHIRLPOOL c1c3885cf2e041c4427f30ca13cda2948b8a35273d3e6417bfe83566f03230208ce1e019e655ae2c98725e94cce6c7fb37b450307312f682bdbd7c948190e7c0
 DIST gst-plugins-ugly-1.4.5.tar.xz 846828 SHA256 5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067 SHA512 9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0 WHIRLPOOL b212a4dcba654dac7866ad75551b26818349780b0d7905e63c45b75e21ffbb86ae0f4e9e79ef8bfb317149c2d4f01cbda2c6e2cf2cbcf58991bc09ba9aa85f4e
+DIST gst-plugins-ugly-1.6.0.tar.xz 859996 SHA256 91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06 SHA512 72fadf593d3307b04757763ea7cec00c8c4f1d1aa7ab68a0876e7888f63b995b81b2d5efe6ac45a4dd068c0cfa9ea23b7a6b4435666bcd36b42e174b068874f0 WHIRLPOOL 3ad574a2d74591de9ecb0167bdea29478f48b7fe2cf4a1fec83ece5d0189d66826f1793e84215d7f412245b5b290310c500fea6a67cfcde94358da3884edeb57
diff --git a/media-plugins/gst-plugins-mad/gst-plugins-mad-1.6.0.ebuild b/media-plugins/gst-plugins-mad/gst-plugins-mad-1.6.0.ebuild
new file mode 100644
index 000000000000..5506eba09628
--- /dev/null
+++ b/media-plugins/gst-plugins-mad/gst-plugins-mad-1.6.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-ugly
+
+inherit gstreamer
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=media-libs/libmad-0.15.1b-r8[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.6.ebuild b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.6.ebuild
new file mode 100644
index 000000000000..a739ca93262d
--- /dev/null
+++ b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.6.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+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 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~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-1.6:1.0[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-1.6:1.0[alsa?,ogg?,theora?,vorbis?,X?,${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-good-1.6:1.0[${MULTILIB_USEDEP}]
+	a52? ( >=media-plugins/gst-plugins-a52dec-1.6:1.0[${MULTILIB_USEDEP}] )
+	aac? ( >=media-plugins/gst-plugins-faad-1.6:1.0[${MULTILIB_USEDEP}] )
+	cdda? ( || (
+		>=media-plugins/gst-plugins-cdparanoia-1.6:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-cdio-1.6:1.0[${MULTILIB_USEDEP}] ) )
+	dts? ( >=media-plugins/gst-plugins-dts-1.6:1.0[${MULTILIB_USEDEP}] )
+	dv? ( >=media-plugins/gst-plugins-dv-1.6:1.0[${MULTILIB_USEDEP}] )
+	dvb? (
+		>=media-plugins/gst-plugins-dvb-1.6:1.0[${MULTILIB_USEDEP}]
+		>=media-libs/gst-plugins-bad-1.6:1.0[${MULTILIB_USEDEP}] )
+	dvd? (
+		>=media-libs/gst-plugins-ugly-1.6:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-a52dec-1.6:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-dvdread-1.6:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-mpeg2dec-1.6:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-resindvd-1.6:1.0[${MULTILIB_USEDEP}] )
+	ffmpeg? ( >=media-plugins/gst-plugins-libav-1.4.5:1.0[${MULTILIB_USEDEP}] )
+	flac? ( >=media-plugins/gst-plugins-flac-1.6:1.0[${MULTILIB_USEDEP}] )
+	http? ( >=media-plugins/gst-plugins-soup-1.6:1.0[${MULTILIB_USEDEP}] )
+	jack? ( >=media-plugins/gst-plugins-jack-1.6:1.0[${MULTILIB_USEDEP}] )
+	lame? ( >=media-plugins/gst-plugins-lame-1.6:1.0[${MULTILIB_USEDEP}] )
+	libass? ( >=media-plugins/gst-plugins-assrender-1.6:1.0[${MULTILIB_USEDEP}] )
+	libvisual? ( >=media-plugins/gst-plugins-libvisual-1.6:1.0[${MULTILIB_USEDEP}] )
+	mms? ( >=media-plugins/gst-plugins-libmms-1.6:1.0[${MULTILIB_USEDEP}] )
+	modplug? ( >=media-plugins/gst-plugins-modplug-1.6:1.0[${MULTILIB_USEDEP}] )
+	mp3? (
+		>=media-libs/gst-plugins-ugly-1.6:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-mad-1.6:1.0[${MULTILIB_USEDEP}] )
+	mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-1.6:1.0[${MULTILIB_USEDEP}] )
+	opus? ( >=media-plugins/gst-plugins-opus-1.6:1.0[${MULTILIB_USEDEP}] )
+	oss? ( >=media-plugins/gst-plugins-oss-1.6:1.0[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-plugins/gst-plugins-pulse-1.6:1.0[${MULTILIB_USEDEP}] )
+	taglib? ( >=media-plugins/gst-plugins-taglib-1.6:1.0[${MULTILIB_USEDEP}] )
+	v4l? ( >=media-plugins/gst-plugins-v4l2-1.6:1.0[${MULTILIB_USEDEP}] )
+	vaapi? ( >=media-plugins/gst-plugins-vaapi-0.6:1.0[${MULTILIB_USEDEP}] )
+	vcd? (
+		>=media-plugins/gst-plugins-mplex-1.6:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-mpeg2dec-1.6:1.0[${MULTILIB_USEDEP}] )
+	vpx? ( >=media-plugins/gst-plugins-vpx-1.6:1.0[${MULTILIB_USEDEP}] )
+	wavpack? ( >=media-plugins/gst-plugins-wavpack-1.6:1.0[${MULTILIB_USEDEP}] )
+	x264? ( >=media-plugins/gst-plugins-x264-1.6: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-mpeg2dec/Manifest b/media-plugins/gst-plugins-mpeg2dec/Manifest
index b14ec571d6ff..ba8aa210d826 100644
--- a/media-plugins/gst-plugins-mpeg2dec/Manifest
+++ b/media-plugins/gst-plugins-mpeg2dec/Manifest
@@ -1,3 +1,4 @@
 DIST gst-plugins-ugly-0.10.19.tar.xz 882452 SHA256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda WHIRLPOOL f72f224c5f486982370e9d264ad7c658324783b42e995eef759faf270a18d8f12261d90ac6e70af38579921b0970f7aba50c6d091edcd6dc3dda272bcbef755f
 DIST gst-plugins-ugly-1.2.4.tar.xz 844968 SHA256 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 SHA512 91a9d950e73a8d6c8bb4c559ba8f4a4dffc163be714d93c0d0d6421f2c9932a4b1af665f76417e79b50b31c83d8a766df9cf6c337b8371371708efc8683e24e1 WHIRLPOOL c1c3885cf2e041c4427f30ca13cda2948b8a35273d3e6417bfe83566f03230208ce1e019e655ae2c98725e94cce6c7fb37b450307312f682bdbd7c948190e7c0
 DIST gst-plugins-ugly-1.4.5.tar.xz 846828 SHA256 5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067 SHA512 9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0 WHIRLPOOL b212a4dcba654dac7866ad75551b26818349780b0d7905e63c45b75e21ffbb86ae0f4e9e79ef8bfb317149c2d4f01cbda2c6e2cf2cbcf58991bc09ba9aa85f4e
+DIST gst-plugins-ugly-1.6.0.tar.xz 859996 SHA256 91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06 SHA512 72fadf593d3307b04757763ea7cec00c8c4f1d1aa7ab68a0876e7888f63b995b81b2d5efe6ac45a4dd068c0cfa9ea23b7a6b4435666bcd36b42e174b068874f0 WHIRLPOOL 3ad574a2d74591de9ecb0167bdea29478f48b7fe2cf4a1fec83ece5d0189d66826f1793e84215d7f412245b5b290310c500fea6a67cfcde94358da3884edeb57
diff --git a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.6.0.ebuild b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.6.0.ebuild
new file mode 100644
index 000000000000..880137c223a1
--- /dev/null
+++ b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.6.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-ugly
+
+inherit gstreamer
+
+DESCRIPTION="Libmpeg2 based decoder plug-in for gstreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=media-libs/libmpeg2-0.5.1-r2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-sidplay/Manifest b/media-plugins/gst-plugins-sidplay/Manifest
index b14ec571d6ff..ba8aa210d826 100644
--- a/media-plugins/gst-plugins-sidplay/Manifest
+++ b/media-plugins/gst-plugins-sidplay/Manifest
@@ -1,3 +1,4 @@
 DIST gst-plugins-ugly-0.10.19.tar.xz 882452 SHA256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda WHIRLPOOL f72f224c5f486982370e9d264ad7c658324783b42e995eef759faf270a18d8f12261d90ac6e70af38579921b0970f7aba50c6d091edcd6dc3dda272bcbef755f
 DIST gst-plugins-ugly-1.2.4.tar.xz 844968 SHA256 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 SHA512 91a9d950e73a8d6c8bb4c559ba8f4a4dffc163be714d93c0d0d6421f2c9932a4b1af665f76417e79b50b31c83d8a766df9cf6c337b8371371708efc8683e24e1 WHIRLPOOL c1c3885cf2e041c4427f30ca13cda2948b8a35273d3e6417bfe83566f03230208ce1e019e655ae2c98725e94cce6c7fb37b450307312f682bdbd7c948190e7c0
 DIST gst-plugins-ugly-1.4.5.tar.xz 846828 SHA256 5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067 SHA512 9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0 WHIRLPOOL b212a4dcba654dac7866ad75551b26818349780b0d7905e63c45b75e21ffbb86ae0f4e9e79ef8bfb317149c2d4f01cbda2c6e2cf2cbcf58991bc09ba9aa85f4e
+DIST gst-plugins-ugly-1.6.0.tar.xz 859996 SHA256 91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06 SHA512 72fadf593d3307b04757763ea7cec00c8c4f1d1aa7ab68a0876e7888f63b995b81b2d5efe6ac45a4dd068c0cfa9ea23b7a6b4435666bcd36b42e174b068874f0 WHIRLPOOL 3ad574a2d74591de9ecb0167bdea29478f48b7fe2cf4a1fec83ece5d0189d66826f1793e84215d7f412245b5b290310c500fea6a67cfcde94358da3884edeb57
diff --git a/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.6.0.ebuild b/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.6.0.ebuild
new file mode 100644
index 000000000000..a4dd29441a63
--- /dev/null
+++ b/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.6.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-ugly
+
+inherit gstreamer
+
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libsidplay-1.36.59-r1:1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-twolame/Manifest b/media-plugins/gst-plugins-twolame/Manifest
index b14ec571d6ff..ba8aa210d826 100644
--- a/media-plugins/gst-plugins-twolame/Manifest
+++ b/media-plugins/gst-plugins-twolame/Manifest
@@ -1,3 +1,4 @@
 DIST gst-plugins-ugly-0.10.19.tar.xz 882452 SHA256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda WHIRLPOOL f72f224c5f486982370e9d264ad7c658324783b42e995eef759faf270a18d8f12261d90ac6e70af38579921b0970f7aba50c6d091edcd6dc3dda272bcbef755f
 DIST gst-plugins-ugly-1.2.4.tar.xz 844968 SHA256 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 SHA512 91a9d950e73a8d6c8bb4c559ba8f4a4dffc163be714d93c0d0d6421f2c9932a4b1af665f76417e79b50b31c83d8a766df9cf6c337b8371371708efc8683e24e1 WHIRLPOOL c1c3885cf2e041c4427f30ca13cda2948b8a35273d3e6417bfe83566f03230208ce1e019e655ae2c98725e94cce6c7fb37b450307312f682bdbd7c948190e7c0
 DIST gst-plugins-ugly-1.4.5.tar.xz 846828 SHA256 5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067 SHA512 9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0 WHIRLPOOL b212a4dcba654dac7866ad75551b26818349780b0d7905e63c45b75e21ffbb86ae0f4e9e79ef8bfb317149c2d4f01cbda2c6e2cf2cbcf58991bc09ba9aa85f4e
+DIST gst-plugins-ugly-1.6.0.tar.xz 859996 SHA256 91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06 SHA512 72fadf593d3307b04757763ea7cec00c8c4f1d1aa7ab68a0876e7888f63b995b81b2d5efe6ac45a4dd068c0cfa9ea23b7a6b4435666bcd36b42e174b068874f0 WHIRLPOOL 3ad574a2d74591de9ecb0167bdea29478f48b7fe2cf4a1fec83ece5d0189d66826f1793e84215d7f412245b5b290310c500fea6a67cfcde94358da3884edeb57
diff --git a/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.6.0.ebuild b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.6.0.ebuild
new file mode 100644
index 000000000000..6a2fd35ef2c5
--- /dev/null
+++ b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.6.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-ugly
+
+inherit gstreamer
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-x264/Manifest b/media-plugins/gst-plugins-x264/Manifest
index b14ec571d6ff..ba8aa210d826 100644
--- a/media-plugins/gst-plugins-x264/Manifest
+++ b/media-plugins/gst-plugins-x264/Manifest
@@ -1,3 +1,4 @@
 DIST gst-plugins-ugly-0.10.19.tar.xz 882452 SHA256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda WHIRLPOOL f72f224c5f486982370e9d264ad7c658324783b42e995eef759faf270a18d8f12261d90ac6e70af38579921b0970f7aba50c6d091edcd6dc3dda272bcbef755f
 DIST gst-plugins-ugly-1.2.4.tar.xz 844968 SHA256 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 SHA512 91a9d950e73a8d6c8bb4c559ba8f4a4dffc163be714d93c0d0d6421f2c9932a4b1af665f76417e79b50b31c83d8a766df9cf6c337b8371371708efc8683e24e1 WHIRLPOOL c1c3885cf2e041c4427f30ca13cda2948b8a35273d3e6417bfe83566f03230208ce1e019e655ae2c98725e94cce6c7fb37b450307312f682bdbd7c948190e7c0
 DIST gst-plugins-ugly-1.4.5.tar.xz 846828 SHA256 5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067 SHA512 9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0 WHIRLPOOL b212a4dcba654dac7866ad75551b26818349780b0d7905e63c45b75e21ffbb86ae0f4e9e79ef8bfb317149c2d4f01cbda2c6e2cf2cbcf58991bc09ba9aa85f4e
+DIST gst-plugins-ugly-1.6.0.tar.xz 859996 SHA256 91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06 SHA512 72fadf593d3307b04757763ea7cec00c8c4f1d1aa7ab68a0876e7888f63b995b81b2d5efe6ac45a4dd068c0cfa9ea23b7a6b4435666bcd36b42e174b068874f0 WHIRLPOOL 3ad574a2d74591de9ecb0167bdea29478f48b7fe2cf4a1fec83ece5d0189d66826f1793e84215d7f412245b5b290310c500fea6a67cfcde94358da3884edeb57
diff --git a/media-plugins/gst-plugins-x264/gst-plugins-x264-1.6.0.ebuild b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.6.0.ebuild
new file mode 100644
index 000000000000..faa54312800a
--- /dev/null
+++ b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.6.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-ugly
+
+inherit gstreamer
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+# 20111220 ensures us X264_BUILD >= 120
+RDEPEND=">=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"