reinit the tree, so we can have metadata

955 files changed, 52339 insertions, 0 deletions

diff --git a/media-video/2mandvd/2mandvd-1.8.5.ebuild b/media-video/2mandvd/2mandvd-1.8.5.ebuild
new file mode 100644
index 000000000000..f272c5b4e872
--- /dev/null
+++ b/media-video/2mandvd/2mandvd-1.8.5.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+LANGS="cs de en it ru"
+
+inherit qt4-r2
+
+MY_PN="2ManDVD"
+
+DESCRIPTION="The successor of ManDVD"
+HOMEPAGE="http://kde-apps.org/content/show.php?content=99450"
+SRC_URI="http://download.tuxfamily.org/${PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug libav"
+
+DEPEND="libav? ( media-video/libav:= )
+	!libav? ( media-video/ffmpeg:0= )
+	media-libs/libsdl
+	virtual/glu
+	virtual/opengl
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtopengl:4
+"
+RDEPEND="${DEPEND}
+	|| ( app-cdr/cdrkit app-cdr/cdrtools )
+	dev-lang/perl
+	media-fonts/dejavu
+	media-gfx/exif
+	media-libs/netpbm
+	media-sound/sox
+	media-video/dvdauthor
+	media-video/ffmpegthumbnailer
+	media-video/mjpegtools
+	media-video/mplayer[encode]
+"
+
+S=${WORKDIR}/${MY_PN}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.7.3-libav.patch"
+	"${FILESDIR}/${PN}-1.8.5-libavformat54.patch"
+	"${FILESDIR}/${PN}-1.8.5-gcc6.patch"
+	"${FILESDIR}/${PN}-1.8.5-ffmpeg3.patch"
+)
+
+src_prepare() {
+	# Clean backup files
+	find . -name "*~" -delete || die
+
+	# Delete useless chmod that violates the sandbox
+	sed -i -e '/chmod/d' ${MY_PN}.pro || die
+
+	# Fix desktop file
+	sed -i -e '/^Categories=/s/GNOME;AudioVideo;//' ${MY_PN}.desktop || die
+
+	qt4-r2_src_prepare
+}
+
+pkg_postinst() {
+	elog "You may wish to install media-video/xine-ui and/or build"
+	elog "media-sound/sox with USE=mad for improved media handling support."
+}
diff --git a/media-video/2mandvd/Manifest b/media-video/2mandvd/Manifest
new file mode 100644
index 000000000000..ee1668f517ca
--- /dev/null
+++ b/media-video/2mandvd/Manifest
@@ -0,0 +1,9 @@
+AUX 2mandvd-1.7.3-libav.patch 269 SHA256 5c60fc260aca4a7c32e9a54646b8fae88eabbdc9a9fb8f867f2f81de62abefe5 SHA512 fc6d557ee3bf81f388f3f76b57a76364d1c68105d89391eaad74f2a429e1847d97a937c627ca28085dd3e9c12d9b882e0ffa68ffe9ba7b917faa9e952a8de0c5 WHIRLPOOL 8d95a4b78043d9026a06b8c292dcdc17f55569780b270de3ea0ec0d9b6181b8480b9d89bc0968d6d7bc6627e3581a96383848e784de52fb896e5cc911bc43d55
+AUX 2mandvd-1.8.5-ffmpeg3.patch 1469 SHA256 26667726c5cf7a006f313bda0a0a4ef6a98bec091bf29b32149dfd1ab692d824 SHA512 369a5eedb48b630b26e786bb1492047d59a76ab2e84c9c21230236253ccbf55ce36f4cc9a0b7aba214d7dcbfe567e183a50cea12b2b146f5a6599bc4d04c905d WHIRLPOOL 6ea49bbec47046e05a37e65a7d4f611c35c20d55cd15a8bf8eac157dabde21828328e6fa9d4cbfb8f7beb0f6cc19fc830a80943a68f29159aea55e9aadd0ecad
+AUX 2mandvd-1.8.5-gcc6.patch 531 SHA256 11162401a8059ce44802dbc2e2d9387c4226231d34f2dca7e318dff48f4c6c82 SHA512 8598d2ba4bdc10bcda46c86749e03647971ed517218ffea1c78d314351a53013ac28fd7755f9640e8601d9f0c360c352507d1a614ee7573cc4f8512f670a7d09 WHIRLPOOL 26ed1f018764db72dbce88f6e0cce5c1012b40fe69366c22be4be2d6edc80bb0f8d20032ad78a62ca5ded3ea1c2698eef0d925cbef4984b3ac0c9b17ea1afac4
+AUX 2mandvd-1.8.5-libavformat54.patch 819 SHA256 e4d662a31da92c83947f388cad545b1a592659911a7e8e11ee4399bbfff493ae SHA512 ff1500e95646966258890983a37abdd42eb4509d1bb084fd901cc9ab420be1108cb2b7fe3d3db1c92c453c8ae3a2ebc60218fe4994ca7f3fc91feaffcdc23b61 WHIRLPOOL 28aaef96fd9c4d6248a39289a2246ddfd447474753679329f9ce63fde2aaab60154c76974078c44127eddf120f7d1ea51720db11239b9a6c776920df0a8c2c7c
+DIST 2ManDVD-1.8.5.tar.gz 29525071 SHA256 19c3c02123684220e77b3baa12f37b6feb5ecb523c504c65d306c75136191873 SHA512 1e43034cab310ce0a642afdfcb2b4ddbc47b16b0f353adebd1fd2ec5f8445add41226390c6656e7cb520d9900e1b482adee7adb6f784d2fbfbaff2334feb3284 WHIRLPOOL 1a5b8e148fbfb2d7e67e18f64f15f560fe421e0f32d7f416ceea30a4b318f5078506d755df487be83032a7eb3279ced716a4122c215d5aed1bf69816f3a53f9f
+EBUILD 2mandvd-1.8.5.ebuild 1482 SHA256 5e116658b7d858ce0ebeeb93502396fee15c81aa28255f214b93d6b791a1b5b4 SHA512 81377876f32a2ada7f81731dbf6f9d0d93a6e0e3b23bff50b0da4498de229d8b1e8ec4bb156a78818b55dbbc26cf150ed28919d1bb2cc3ec7e653517575bac2a WHIRLPOOL e232b4a6bb04a36e30eab2ee24078b10359a26e2b28a2e7ab8b1bf7634e738e9b573af6cf7202e4ccd51e7e27e4990597d9eff4075e5670ef2fbefb25db295a3
+MISC ChangeLog 2737 SHA256 50cea1bf4e9ef82fce9e46ebd25e0d8c59441b4150fc7b718018c129302b0687 SHA512 7f5ec05a839d3fb5b5bfb36319830f7ce2edfc340b61afc6761f5175e76c73b99680c27f2aea7df1f9553b52c8e121cdb18e0b36f571001ac47ad59b5b6354b2 WHIRLPOOL 52eb5dd87d4432edee2d11e26a7517b5680cb889dfda07adb1b637087fee3a7971eca5a692eb86930b7d3d3251398a7ea3883dd13014b69fc1f4780163553b19
+MISC ChangeLog-2015 5670 SHA256 57cb4676c37b2a6e67f8d6a34e27a5294872a2208c2896b1a139a7a364003443 SHA512 87b575a53d84b6fc6b03178dcc524ce69229b6f026f5b664b1532bcc4439041768926fc21c0ac6ed1e458fbf3c1fa0d1f60274f5f37c0ae742d9ac0e20519da2 WHIRLPOOL 76011952ad47840d46f28b6beec894193cb3b00141b220fa748810f0b72dcabb9abf3fba0834c3ec578b7812dc306c17301290d077ba5956892e81695d3b409a
+MISC metadata.xml 243 SHA256 40d70720dcef790c8b2af5864ea1d289f0a661e0db1e89d2c6a8a5c0d2ea971e SHA512 fc40891d1d0c8526f7ac87f25fbdb63e927494f972894e0006fe85eab8eef60ae79761cbc42febd202172da040283a2daa432908bf02ef83d27454660f20e72b WHIRLPOOL 0c09ba0a23280f3d5b0bd26ca7e3f3fe8e43302780afbcb20218599b9b8f426485b8aba8c97f1507f9adab1688d78cb132792cb4d13e130454c393b69fc662f4
diff --git a/media-video/2mandvd/files/2mandvd-1.7.3-libav.patch b/media-video/2mandvd/files/2mandvd-1.7.3-libav.patch
new file mode 100644
index 000000000000..59dfd1e33a1e
--- /dev/null
+++ b/media-video/2mandvd/files/2mandvd-1.7.3-libav.patch
@@ -0,0 +1,10 @@
+--- videowrapper.h
++++ videowrapper.h
+@@ -11,6 +11,7 @@
+         #include <libavutil/common.h>
+         #include <libavcodec/avcodec.h>
+         #include <libavformat/avformat.h>
++        #include <libavutil/mathematics.h>
+         #include <libswscale/swscale.h>
+ }
+ 
diff --git a/media-video/2mandvd/files/2mandvd-1.8.5-ffmpeg3.patch b/media-video/2mandvd/files/2mandvd-1.8.5-ffmpeg3.patch
new file mode 100644
index 000000000000..29ffc95ffa82
--- /dev/null
+++ b/media-video/2mandvd/files/2mandvd-1.8.5-ffmpeg3.patch
@@ -0,0 +1,32 @@
+Index: 2ManDVD/videowrapper.cpp
+===================================================================
+--- 2ManDVD.orig/videowrapper.cpp
++++ 2ManDVD/videowrapper.cpp
+@@ -99,11 +99,11 @@ int videowrapper::load_video(QString fil
+ 
+     img_convert_ctx = sws_getContext(pCodecCtx->width,
+                     pCodecCtx->height, pCodecCtx->pix_fmt, pCodecCtx->width,
+-                    pCodecCtx->height, PIX_FMT_RGB24, SWS_BICUBIC, NULL,
++                    pCodecCtx->height, AV_PIX_FMT_RGB24, SWS_BICUBIC, NULL,
+                     NULL, NULL);
+ 
+     // *** ON DETERMINE LA TAILLE DU BUFFER ***
+-    numBytes=avpicture_get_size(PIX_FMT_RGB24, pCodecCtx->width,
++    numBytes=avpicture_get_size(AV_PIX_FMT_RGB24, pCodecCtx->width,
+                                 pCodecCtx->height);
+     buffer=(uint8_t *)av_malloc(numBytes*sizeof(uint8_t));
+     old_frame = -1;
+@@ -120,10 +120,10 @@ QImage videowrapper::read_frame(int64_t
+     if ( num_frame != old_frame )
+     {
+         // *** ALLOCATE VIDEO FRAME ***
+-        pFrameRGB=avcodec_alloc_frame();
+-        pFrame=avcodec_alloc_frame();
++        pFrameRGB=av_frame_alloc();
++        pFrame=av_frame_alloc();
+ 
+-        avpicture_fill((AVPicture *)pFrameRGB, buffer, PIX_FMT_RGB24,
++        avpicture_fill((AVPicture *)pFrameRGB, buffer, AV_PIX_FMT_RGB24,
+                         pCodecCtx->width, pCodecCtx->height);
+         av_seek_frame(pFormatCtx,videoStream,0, AVSEEK_FLAG_FRAME);
+         compte_frame = -1;
diff --git a/media-video/2mandvd/files/2mandvd-1.8.5-gcc6.patch b/media-video/2mandvd/files/2mandvd-1.8.5-gcc6.patch
new file mode 100644
index 000000000000..5a16d95ef17f
--- /dev/null
+++ b/media-video/2mandvd/files/2mandvd-1.8.5-gcc6.patch
@@ -0,0 +1,21 @@
+Index: 2ManDVD/tetrahedron.h
+===================================================================
+--- 2ManDVD.orig/tetrahedron.h
++++ 2ManDVD/tetrahedron.h
+@@ -83,7 +83,6 @@ public:
+     float scale_factor;
+     float wg_x;
+     float wdecal;
+-    GLfloat light_position[];
+ 
+     GLfloat anag_x;
+     GLfloat anag_y;
+@@ -427,6 +426,8 @@ private:
+     void dropEvent(QDropEvent *);
+     void dragEnterEvent(QDragEnterEvent *);
+     Qt::DropActions supportedDropActions () const;
++public:
++    GLfloat light_position[];
+ };
+ 
+ #endif
diff --git a/media-video/2mandvd/files/2mandvd-1.8.5-libavformat54.patch b/media-video/2mandvd/files/2mandvd-1.8.5-libavformat54.patch
new file mode 100644
index 000000000000..89ecc4d23c60
--- /dev/null
+++ b/media-video/2mandvd/files/2mandvd-1.8.5-libavformat54.patch
@@ -0,0 +1,27 @@
+diff --git a/videowrapper.cpp b/videowrapper.cpp
+index 7ae4ad3..d50599b 100644
+--- a/videowrapper.cpp
++++ b/videowrapper.cpp
+@@ -38,7 +38,7 @@ void videowrapper::delete_videowrapper()
+ int videowrapper::load_video(QString filename)
+ {
+     // *** OUVERTURE DU FICHIER VIDEO ***
+-    #ifdef avformat_open_input
++    #if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(53,5,0)
+         if (avformat_open_input(&pFormatCtx,filename.toAscii().data(),NULL,NULL)!=0)
+         {
+     #else
+@@ -91,13 +91,8 @@ int videowrapper::load_video(QString filename)
+ 
+     // *** OUVERTURE DU CODEC ***
+ 
+-    #ifdef av_find_stream_info
+-    if(avcodec_open(pCodecCtx, pCodec)<0)
+-    {
+-    #else
+     if (avcodec_open2(pCodecCtx, pCodec, NULL) < 0)
+     {
+-    #endif
+         qDebug() << "CAN'T FIND VIDEO CODEC";
+         return 1;
+     }
diff --git a/media-video/2mandvd/metadata.xml b/media-video/2mandvd/metadata.xml
new file mode 100644
index 000000000000..32fe1293e9a9
--- /dev/null
+++ b/media-video/2mandvd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>qt@gentoo.org</email>
+	<name>Gentoo Qt Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-video/aacskeys/Manifest b/media-video/aacskeys/Manifest
new file mode 100644
index 000000000000..35b5368be512
--- /dev/null
+++ b/media-video/aacskeys/Manifest
@@ -0,0 +1,9 @@
+AUX aacskeys-0.4.0c-aacskeys-makefile.patch 1502 SHA256 81b48eaa059f1b0282f2b59388f3b5296fa74a4e103180436690986010d39fd2 SHA512 51cb650966da58dceccc9baf1f339bb4e92003b08537ca74c037aa70038a211fc0c3f91706d731de8c280f22c1c1aba472e7f023552bc85883a1d080e0dc1704 WHIRLPOOL 9df34d471032be122b94e836439d2f1d74f23c48b7d7a8c7972d21a75980aed85c2bea2201aaeca2bbe022719bb8ef47211e11600dd8ec9dd7154d09972669d8
+AUX aacskeys-0.4.0c-libaacskeys-makefile.patch 2486 SHA256 adff9ed101e016b21e902e18285826c9da2b40a787f8c57989e2d92c48fabc7f SHA512 f1ec7136c42162d9f981d80e918f63e729728d22d8c460d740004dcf8a9b3e7427b5ad33f40c5bdb88f872a2fad4d13651f069e43cae1464b961fa2503597b21 WHIRLPOOL cb98c31ee78aee3c0f0a1d7455b206b0a9fc1ba51c8766f1e00f1b0672641a11edfecf66e8bac80d3e0fc300add2f0b58cfb6f7a5480e7fdcb43826d8be4254f
+DIST aacskeys-0.4.0c.tar.gz 4118637 SHA256 54ea78898917f4acaf78101dda254de56bc7696bad12cbf22ee6f09d4ee88a43 SHA512 34c434fd1b118fb301b8af9c20762075bab213b39584e8e33c6b685c7504e4863f78ee2754d131e760c535dd24b29826dc6756833b5deaaa5c4b70ab8f9a6ba8 WHIRLPOOL c710dfc56804390a8c89c57f50cf756e5b96c38224621f1f14f9600830b10ff4b3e4b5a7f9d3069523d4c5a5ec2c0130bd43269e990e3f0c433ac7b698acf79b
+DIST aacskeys-0.4.0e.tar.gz 4117374 SHA256 d9ee6332ae545f93f17f16438c352c98ad2ee019929bc0e6743dcedb23df7f34 SHA512 86435bd4b5ce31cae87390bade631d9dc36814cd5e03fdcaca02eefe3d351432e7ba61f7127f6030b92e929ba3726547d7c04d8558239bd23a32bcb1574b7f6f WHIRLPOOL 88b5beee39a78d81fa3e6fb714faf35ebbf5ba118239d3afad121cb80e5fd37b6445f2282d2b25d4c9bf71a5a35b02473abff12b28adbe5cf5d2bd9f9973f275
+EBUILD aacskeys-0.4.0c-r2.ebuild 809 SHA256 9b49fcbb361102ae183c05c51fe1db09fe129ba4a5c8fbf09f19041360eac275 SHA512 ce803b7378c1502906466899da0811e5b20ccbca466458255de37b1a8b4e4040b1deec9bc6bf059c31d2bf6b5713bc6f57c2542d652c0117cf4d1cbf62dc4252 WHIRLPOOL e52d84856bd73026af5d84c4177c5cc6f7c3e1716c2c87c0957d8284ed5e8018a6e543c7734475918219fe5afc21fc7b856b1ebf000084c7aa1172653045efe6
+EBUILD aacskeys-0.4.0e-r1.ebuild 864 SHA256 b04aaa8121fbc0c693e77b2112055313775e09f5dc47e7bc942fa247c4650bef SHA512 9ccfa5585de8a23f52d2225e87bca7cc1eebc13239e638c5b7ef382de5f7c760e50bc2f0c62da19aaae966e21f42e8fcefc0df52e2c3277812bcacf99aa8caac WHIRLPOOL ab5309d32c696f74b3c04e0452215172c3431ab08a4fc16120c62d38efa94dc883a30d3f34de7ad86ab0e82a7c0e522ed08c5447495eed2a40ad396ae5e5145b
+MISC ChangeLog 3003 SHA256 c26d9de85c1522e21e714e9355264322c27cfb8bea2038613c9f9b746e1bff2c SHA512 2ff7afeb828e9616c7d4bf42a325a09f58c5e3c422694fa4ad0ebeea08f5e507ee5954a2f929a33408794ee7bb484b0bebe8434e636a8b5e604d3883e5d1168e WHIRLPOOL eec9e7b64c69a179d666e16b7acc1ad16c8b6235efdd91ab95cf5fcadf1c2684c5dd74134de48da479f28671480c0e7931a8353eb7510d885966d8f26ce46e3f
+MISC ChangeLog-2015 2004 SHA256 a14975651a82f2d342952883c5aa1350767053b915df8f87d7c7ef1fe24a2e98 SHA512 6c1b4798faa59b86ffadd517c1642d01f021236e920739dafdcb16f7de41cb6bdf52f2bc5a06d48300b1b3867bd574d88bf84ce0fdf2cf09b82ec8b4c2a7dd06 WHIRLPOOL 0fa956f53176f001c81406b0a63bce9c5618ecef4ab2af14e350a9e58514de9536756a08db3dead6859536c1cbba3bcc3216cbd6a30c3b447447418d63f3d270
+MISC metadata.xml 380 SHA256 5de7bbc44be111a6a3b8f51893e0a87e5a379c7ef5e707baf37ab37d9d7289dd SHA512 7160dff7516eb6b883400830f1a9d55f08552f911a4433ec1a041ac1dd99d88e41cdb8e2b68aae844aab0f00859e5135f03eeeca0edbdaf979e35a92087a21c8 WHIRLPOOL 6868ae5ae37ccb846b408090448d25f163e3a3d1b45fc36c8ddfe6c787215040ea2a157bab8d47bf00ec8db63eb941cdbb3c0dbd97efa7546c84df6b685d4af7
diff --git a/media-video/aacskeys/aacskeys-0.4.0c-r2.ebuild b/media-video/aacskeys/aacskeys-0.4.0c-r2.ebuild
new file mode 100644
index 000000000000..7eed7a5ffb04
--- /dev/null
+++ b/media-video/aacskeys/aacskeys-0.4.0c-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils java-pkg-2
+
+DESCRIPTION="Decrypt keys from an AACS source (HD DVD / Blu-Ray)"
+HOMEPAGE="http://forum.doom9.org/showthread.php?t=123311"
+SRC_URI="http://bluray.beandog.org/aacskeys/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="dev-libs/openssl[-bindist]"
+DEPEND=">=virtual/jdk-1.6
+	${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-aacskeys-makefile.patch"
+	epatch "${FILESDIR}/${P}-libaacskeys-makefile.patch"
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	dobin bin/linux/aacskeys || die
+	dolib lib/linux/libaacskeys.so || die
+	dodoc HostKeyCertificate.txt ProcessingDeviceKeysSimple.txt \
+		README.txt || die
+}
diff --git a/media-video/aacskeys/aacskeys-0.4.0e-r1.ebuild b/media-video/aacskeys/aacskeys-0.4.0e-r1.ebuild
new file mode 100644
index 000000000000..a9a91825c350
--- /dev/null
+++ b/media-video/aacskeys/aacskeys-0.4.0e-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils java-pkg-2
+
+DESCRIPTION="Decrypt keys from an AACS source (HD DVD / Blu-Ray)"
+HOMEPAGE="http://forum.doom9.org/showthread.php?t=123311"
+SRC_URI="http://bluray.beandog.org/aacskeys/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/openssl:0=[-bindist]"
+DEPEND=">=virtual/jdk-1.6
+	${RDEPEND}"
+
+DOCS=(
+	HostKeyCertificate.txt
+	ProcessingDeviceKeysSimple.txt
+	README.txt
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.4.0c-aacskeys-makefile.patch"
+	"${FILESDIR}/${PN}-0.4.0c-libaacskeys-makefile.patch"
+)
+
+# overriding src_* functions from java-pkg-2 eclass.
+src_prepare() {
+	default
+}
+
+src_compile() {
+	emake
+}
+
+src_install() {
+	dobin bin/linux/aacskeys
+	dolib lib/linux/libaacskeys.so
+	einstalldocs
+}
diff --git a/media-video/aacskeys/files/aacskeys-0.4.0c-aacskeys-makefile.patch b/media-video/aacskeys/files/aacskeys-0.4.0c-aacskeys-makefile.patch
new file mode 100644
index 000000000000..272dcc010819
--- /dev/null
+++ b/media-video/aacskeys/files/aacskeys-0.4.0c-aacskeys-makefile.patch
@@ -0,0 +1,35 @@
+--- a/aacskeys.make
++++ b/aacskeys.make
+@@ -13,12 +13,12 @@
+   LIBDIR := .
+   OBJDIR := obj/linux/Release
+   OUTDIR := bin/linux
+-  CPPFLAGS := $(DEPFLAGS) -D "_REENTRANT" -I "/usr/local/ssl/include"
+-  CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -Wall -fomit-frame-pointer -O3 -pipe
++  CPPFLAGS := $(DEPFLAGS) -D "_REENTRANT" -I "/usr/ssl/include"
++  CFLAGS += $(CPPFLAGS) $(TARGET_ARCH)
+   CXXFLAGS := $(CFLAGS)
+-  LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -s -L"/usr/local/ssl/lib" -lcrypto
++  LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L"/usr/ssl/lib" -lcrypto
+   LDDEPS :=
+-  RESFLAGS := -D "_REENTRANT" -I "/usr/local/ssl/include"
++  RESFLAGS := -D "_REENTRANT" -I "/usr/ssl/include"
+   TARGET := aacskeys
+   BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
+ endif
+@@ -28,12 +28,12 @@
+   LIBDIR := .
+   OBJDIR := obj/linux/Debug
+   OUTDIR := bin/linux/debug
+-  CPPFLAGS := $(DEPFLAGS) -D "_REENTRANT" -D "DEBUG" -I "/usr/local/ssl/include"
+-  CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -Wall -pipe
++  CPPFLAGS := $(DEPFLAGS) -D "_REENTRANT" -D "DEBUG" -I "/usr/ssl/include"
++  CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g
+   CXXFLAGS := $(CFLAGS)
+   LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L"/usr/local/ssl/lib" -lcrypto
+   LDDEPS :=
+-  RESFLAGS := -D "_REENTRANT" -D "DEBUG" -I "/usr/local/ssl/include"
++  RESFLAGS := -D "_REENTRANT" -D "DEBUG" -I "/usr/ssl/include"
+   TARGET := aacskeys
+   BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
+ endif
diff --git a/media-video/aacskeys/files/aacskeys-0.4.0c-libaacskeys-makefile.patch b/media-video/aacskeys/files/aacskeys-0.4.0c-libaacskeys-makefile.patch
new file mode 100644
index 000000000000..2d5e6cc2431a
--- /dev/null
+++ b/media-video/aacskeys/files/aacskeys-0.4.0c-libaacskeys-makefile.patch
@@ -0,0 +1,36 @@
+--- a/libaacskeys.make
++++ b/libaacskeys.make
+@@ -13,12 +13,12 @@
+   LIBDIR := .
+   OBJDIR := obj/linux/ReleaseLib
+   OUTDIR := lib/linux
+-  CPPFLAGS := $(DEPFLAGS) -D "_REENTRANT" -D "JNILIB" -I "/usr/local/ssl/include" -I "/usr/lib/jvm/java-6-sun/include" -I "/usr/lib/jvm/java-6-sun/include/linux"
+-  CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -fPIC -Wall -fomit-frame-pointer -O3 -pipe
++  CPPFLAGS := $(DEPFLAGS) -D "_REENTRANT" -D "JNILIB" -I "/usr/ssl/include" -I "/etc/java-config-2/current-system-vm/include" -I "/etc/java-config-2/current-system-vm/include/linux"
++  CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -fPIC
+   CXXFLAGS := $(CFLAGS)
+-  LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -shared -s -L"/usr/local/ssl/lib" -lcrypto
++  LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -shared -L"/usr/ssl/lib" -lcrypto
+   LDDEPS :=
+-  RESFLAGS := -D "_REENTRANT" -D "JNILIB" -I "/usr/local/ssl/include" -I "/usr/lib/jvm/java-6-sun/include" -I "/usr/lib/jvm/java-6-sun/include/linux"
++  RESFLAGS := -D "_REENTRANT" -D "JNILIB" -I "/usr/ssl/include" -I "/etc/java-config-2/current-system-vm/include" -I "/etc/java-config-2/current-system-vm/include/linux"
+   TARGET := libaacskeys.so
+   BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
+ endif
+@@ -28,12 +28,12 @@
+   LIBDIR := .
+   OBJDIR := obj/linux/DebugLib
+   OUTDIR := lib/linux/debug
+-  CPPFLAGS := $(DEPFLAGS) -D "_REENTRANT" -D "JNILIB" -D "DEBUG" -I "/usr/local/ssl/include" -I "/usr/lib/jvm/java-6-sun/include" -I "/usr/lib/jvm/java-6-sun/include/linux"
+-  CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -fPIC -g -Wall -pipe
++  CPPFLAGS := $(DEPFLAGS) -D "_REENTRANT" -D "JNILIB" -D "DEBUG" -I "/usr/ssl/include" -I "/etc/java-config-2/current-system-vm/include" -I "/etc/java-config-2/current-system-vm/include/linux"
++  CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -fPIC -g
+   CXXFLAGS := $(CFLAGS)
+-  LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -shared -L"/usr/local/ssl/lib" -lcrypto
++  LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -shared -L"/usr/ssl/lib" -lcrypto
+   LDDEPS :=
+-  RESFLAGS := -D "_REENTRANT" -D "JNILIB" -D "DEBUG" -I "/usr/local/ssl/include" -I "/usr/lib/jvm/java-6-sun/include" -I "/usr/lib/jvm/java-6-sun/include/linux"
++  RESFLAGS := -D "_REENTRANT" -D "JNILIB" -D "DEBUG" -I "/usr/ssl/include" -I "/etc/java-config-2/current-system-vm/include" -I "/etc/java-config-2/current-system-vm/include/linux"
+   TARGET := libaacskeys.so
+   BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
+ endif
diff --git a/media-video/aacskeys/metadata.xml b/media-video/aacskeys/metadata.xml
new file mode 100644
index 000000000000..531e97b976d1
--- /dev/null
+++ b/media-video/aacskeys/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>media-video@gentoo.org</email>
+  </maintainer>
+  <longdescription lang="en">aacskeys is a program to decrypt all required keys from an AACS protected HD-DVD / Blu-Ray to decrypt it.</longdescription>
+</pkgmetadata>
diff --git a/media-video/abby/Manifest b/media-video/abby/Manifest
new file mode 100644
index 000000000000..cf9c841551d2
--- /dev/null
+++ b/media-video/abby/Manifest
@@ -0,0 +1,5 @@
+DIST abby-0.4.8.tar.bz2 53183 SHA256 662e20ca5260ad2778f03f666fecac433d4ad1b533c00f716b01c47c427c566e SHA512 e92c8c9634f581834fcb1d00171993050e285593e28ba86c33e92135527173ad02eb15767bce699793f2dae4caca5a2f7083fb23d4ca8d7a28796e1e630ea02e WHIRLPOOL 412201418121442f25aa147721cd41188f4ddb549ab822cb80640cc0ecfebdc51c5d908ad42ec07c075582c848d02419829db7703279ebbf1b6c7c7670189423
+EBUILD abby-0.4.8.ebuild 573 SHA256 1afc5e04fe02f903c6c4a35dbfd427332a557640b308d4df325cf89219043723 SHA512 98cb23a8427b654868260d0cd8d37746312455aa704b437cfcf6a03be8c008eb37a42fed59da0bf009154e996bbcbd510662cb4f47c34d15fa3f2b11701d0aa1 WHIRLPOOL 98cd984cf83689d0decdcdd0136c623c8be002cdfc6eb1212b5654508f45103b07e9fc1f19b78841c1155264e05a0f18ffc617c29fd8693991b59502652ff939
+MISC ChangeLog 2733 SHA256 e1239b952d8e85780107357fd574f00b3e370782e35bd06a834770b5aef387e7 SHA512 125b74d0ca58b686f90c241b23fc643f680f3a4d87515698d902a220af776d080e2a3ad8b8087249b00679cd646002cc5f6d07c845a3da2b3c165329707fc888 WHIRLPOOL adfc0098b48c753f326d0922b0d0a09eb12e06fe864cdac64d6b3fca3306aeb55fa8f1b1ccb65130ecac7eaec02ed0a0d00ed838c6c26778f37da191d6b1ebf6
+MISC ChangeLog-2015 2104 SHA256 dd702c53ee381c52bdb6a8386116ea27a5cdb9881422b52ec0818087cc5e1854 SHA512 dcd90f76db60974b1365ef95dde5fade03e710ff6249114c60533f5ee0e8276d1b771e7bc0a6a1ab9fb97db332f2722b465774b5681fdf4d5cc771c286db38fd WHIRLPOOL 1fca71169dcf8fab7ef78505d4b6b3e27d7e895d23f9d95a912596dd5440bce3521cdd5d41b8050d635d97ae97741440791413320663cb4e74a5743abba1f922
+MISC metadata.xml 297 SHA256 a18eb5405bae890878adbdcf719929f346923a99c08d6ea8c95545798bf917cd SHA512 95839b6dd51c29396d19f03e815edc18c71e6c759559f5491af8ffade1ce5055d964a1ad2214c49a59352de1c94c766095cb1e9533ccc36012bc0ccf64d020e5 WHIRLPOOL 0c43bd878c2d0e81b20cb2a6e887c194b1a65fee8d1995e1e840fb234c7f98ec70ec0ca722a1495bcd9ad960d68ab376b8eb80d12b65a01cb154bc1ce60dde2f
diff --git a/media-video/abby/abby-0.4.8.ebuild b/media-video/abby/abby-0.4.8.ebuild
new file mode 100644
index 000000000000..f6f371e6ab89
--- /dev/null
+++ b/media-video/abby/abby-0.4.8.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+inherit qt4-r2
+
+DESCRIPTION="GUI front-end for cclive and clive video extraction utilities"
+HOMEPAGE="https://code.google.com/p/abby/"
+SRC_URI="https://abby.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+IUSE=""
+
+RDEPEND="|| ( >=media-video/clive-2.2.5 >=media-video/cclive-0.5.0 )
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	dobin abby
+	dodoc AUTHORS ChangeLog README TODO NEWS
+}
diff --git a/media-video/abby/metadata.xml b/media-video/abby/metadata.xml
new file mode 100644
index 000000000000..cd6cdcdeeabe
--- /dev/null
+++ b/media-video/abby/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">abby</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/acidrip/Manifest b/media-video/acidrip/Manifest
new file mode 100644
index 000000000000..3375f141114a
--- /dev/null
+++ b/media-video/acidrip/Manifest
@@ -0,0 +1,7 @@
+AUX acidrip-0.14-makefile.patch 2360 SHA256 62a1c221da8f36646a5003cc894df7fa588fff701c877f29e7557d9daec95696 SHA512 7e91ea9ad24e20f620f0d406f2dd5d5ed5364cf92d57566c969e17aef0a0bb3d172142692a08766b4cbce0f4e1c2594672542765e68c559e9c9679a27012441b WHIRLPOOL dd8681a7b572faf37bf3797dae2bbd33f702aac635de3ab01e1675e1816c3142df93e99b3e9e7c08aee507d34246c67445038f3e1506eb296e3e521bef1764e5
+AUX acidrip-mplayer.patch 1079 SHA256 18638433fc407fc42fcb468a15b0c545581dced034ca5c867adac2b521cafc88 SHA512 ae1b57efbd49de33f60dd0d6daffb4c4ddf6bf726ad5fc2fab485a4af39d5c1326c43471dbbe8a28147e3a0f42e1ea55bd98554a1fbd8ee0fa3a150a180f4f23 WHIRLPOOL b04df065f9486ea315684e9e3242f604a13c3e99353580f332e3c5a57bd221d92bf48e31b42f1cc8fefdd417dfe1c94513b7bda99cb8379b2260f6f22f8b6643
+DIST acidrip-0.14.tar.gz 92086 SHA256 51bb84174e8dae733ddd1f69a16b90d875e4455135ed20a024a79b98ae7d58c1 SHA512 3ee0e329bd7e5eb4067d618fc79a49707084526d53e8c10cd9ec560828cf621e8d7263259cc8bc7944e6f9d7b7fd1fc5b8a42a8f37f18666f1974f240edb99a0 WHIRLPOOL 8aa1f2aeaa8e29a97399f714989be38fc60803a7a3ba3f872750a4a440741c1f2173e88f3a0b3421651e3c86bf64721ec24077165e664cf107ab0e9cefcd2917
+EBUILD acidrip-0.14-r4.ebuild 620 SHA256 3ce2c1924e0397b9028886efef380e8f3a1da1ae871176d3cb683062dca25baa SHA512 bf8a8b74ada88e8ed4669e56b5f19990cdfece5b6ac07ac0c23adabb2940ebfb3b656a65a0648802fc7e3420dc5ae68bb9b7f8eb47540ef13534b0cc6dbb2bfe WHIRLPOOL 2b76c3f86eef071316d114ea1e4262949ea92987bee0104df12f7bcc862423bacab5db87340b825e7b6788c34521792f3b6a75d5edc6b622dad8241529f3e00e
+MISC ChangeLog 2616 SHA256 984b1602ebb008fd4fd349c9d5939fbfcf728046ca20cde327d663dd57cea547 SHA512 2567b429b621712a6ada4b5f75a0aaf59dbc08fe424681d34f076808d89b9eeb120b1fd95791cd80a42f8a340e432ce42318bd5a981ff06265151dce79b38170 WHIRLPOOL e1775e1fb75652ba32629f75be1fbcb27e7035da8b7f41c4d8130d57e049586061f636eeb5a286862555db379373773071bc1590c1463dad29e7c3da1f41e305
+MISC ChangeLog-2015 4926 SHA256 0c68303bc7428111208f32e0f8cf2e2eee1bae70308eeecb8ab4c9b2a3fac7ed SHA512 5848406453094c28cace59cc0fc38c751b5f2ea3a0fb22519a682e3593be731c5ed24a9b522246eb93c68f198a619d08577b154b9f9a1be2240bd382d0ccdc47 WHIRLPOOL 9d3fe176264655aba9c2142ae34eebd759a141ea678aae815aacfa2090a9821aa3b7f0117bc9f7a1b2b473a4930d77c301da4951e7d314e60e35ce88f9555268
+MISC metadata.xml 300 SHA256 15f71accd5f4b3aca41ba624b273c95b6e249858298d82f37ef3fdb009323903 SHA512 d4462ccdb3ba44f4a36198f8896c7688fe165ceccd1952a9e92e0106830221413976f4fcbdee23cde5a7fd00dd25578c9391d1e2c52cd03e921ea2caf78d0df3 WHIRLPOOL 769d0b9255791374f09ecb74c22d326290c2324e20f987d5eefe9d56dd96dd2cfb46467db5466f6c7acff7e43e8ec96d4caef678411397f9435a599732d83d3e
diff --git a/media-video/acidrip/acidrip-0.14-r4.ebuild b/media-video/acidrip/acidrip-0.14-r4.ebuild
new file mode 100644
index 000000000000..85ef8b4a34d1
--- /dev/null
+++ b/media-video/acidrip/acidrip-0.14-r4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit perl-app
+
+DESCRIPTION="A gtk-perl mplayer/mencoder frontend for ripping DVDs"
+HOMEPAGE="https://sourceforge.net/acidrip/"
+SRC_URI="mirror://sourceforge/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="encode"
+
+RDEPEND="dev-lang/perl:=
+	dev-perl/Gtk2
+	media-video/lsdvd
+	media-video/mplayer[encode]
+	encode? ( >=media-sound/lame-3.92 )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-mplayer.patch #168012
+	epatch "${FILESDIR}/${P}-makefile.patch" #299173
+}
diff --git a/media-video/acidrip/files/acidrip-0.14-makefile.patch b/media-video/acidrip/files/acidrip-0.14-makefile.patch
new file mode 100644
index 000000000000..bbaf340799c3
--- /dev/null
+++ b/media-video/acidrip/files/acidrip-0.14-makefile.patch
@@ -0,0 +1,50 @@
+--- acidrip-0.14/Makefile.PL.orig	2014-08-22 09:38:46.179128473 -0600
++++ acidrip-0.14/Makefile.PL	2014-08-22 09:40:33.045103299 -0600
+@@ -36,47 +36,7 @@
+     $_;
+ }
+ 
+-print "\nRunning additional test to be sure acidrip will work\n";
+-
+-print "test for lsdvd: "; 
+-my $lsdvd = `lsdvd -V 2>&1`;
+-if ( $lsdvd !~ /0.(\d+)\s/ ) {
+-die "Not Found!\n\n***************\n" . 
+-  "AcidRip needs my little app \"lsdvd\" in order to see what is on your dvd\'s\n" .
+-  "Download it and install it (and libdvdread) before trying to use AcidRip.\n" .
+-  "If it\'s simply not on your path then set the full path inside AcidRip.\n" .
+-  "***************\n\n"
+-}
+-if ( $1 < 9 ) {
+-die "Too old!\n\n***************\n" . 
+-  "AcidRip needs at least version 0.9 of lsdvd, but version 0.$1 was found\n" .
+-  "Download it and install it (and libdvdread) before trying to use AcidRip.\n" .
+-  "***************\n\n"
+-}
+-print "found\n";
+-
+-print "test for MPlayer: "; die "Not Found!\n\n***************\n" .
+-  "AcidRip is based around the MPlayer video player. it has not been found on\n" .
+-  "your current path. Install it from http://mplayerhq/hu see INSTALL.html or\n" .
+-  "INSTALL for installation instructions.\n" .
+-  "***************\n\n" if ( system "mplayer 2&>1 > /dev/null" ); print "found\n";
+-
+-print "test for MEncoder: "; die "Not Found!\n\n***************\n" .
+-  "AcidRip uses MEncoder, which is part of MPlayer video player package. This\n" .
+-  "was not found. Install it from http://mplayerhq/hu see INSTALL.html or\n" .
+-  "INSTALL for installation instructions.\n" .
+-  "***************\n\n" if ( system "mencoder -ovc help 2> /dev/null | grep MEncoder > /dev/null" ); print "found\n";
+-
+-print "test for MP3 support in mencoder: "; die "Not Found!\n\n***************\n" .
+-  "MEncoder was found, however it does not have MP3 support built into it.\n" .
+-  "If you DO want MP3 support you'll need to recompile mplayer with mp3 support\n" .
+-  "See INSTALL or INSTALL.html for more information\n" .
+-  "***************\n\n" if ( system "mencoder -oac help 2> /dev/null | grep mp3lame > /dev/null" ); print "found\n";
+-
+-print "Everything looks good here...\n"; 
+-
+ print "\nPlease send any feedback to me, I actually do want to know what you think of it.";
+ print "\nMaybe then I can make it suck less. acid_kewpie\@users.sourceforge.net\n\n"; 
+ 
+ exit(0);
+-
diff --git a/media-video/acidrip/files/acidrip-mplayer.patch b/media-video/acidrip/files/acidrip-mplayer.patch
new file mode 100644
index 000000000000..5d9c84701d5e
--- /dev/null
+++ b/media-video/acidrip/files/acidrip-mplayer.patch
@@ -0,0 +1,22 @@
+http://bugs.gentoo.org/168012
+
+--- AcidRip/acidrip.pm
++++ AcidRip/acidrip.pm
+@@ -680,7 +680,7 @@
+     message( "Running " . get_command("cropdetect") );
+     open( CROP, get_command("cropdetect") . " 2>&1 |" );
+     while (<CROP>) {
+-      if ( $_ =~ /crop area.*\s(crop=\d*:\d*:\d*:\d*)/ ) { $crop{$1}++ }
++      if ( $_ =~ /Crop area.*\s(crop=\d*:\d*:\d*:\d*)/ ) { $crop{$1}++ }
+       $crop_output .= $_;
+       gui_check($_);
+     }
+@@ -863,7 +863,7 @@
+     if ( $::settings->{'mencoder_pid'} = open( MENCODER, "$menc 2>&1 |" ) ) {
+       $/ = "\r";
+ 			while (<MENCODER>) {
+-        if (/^Pos:\s*(\d+).\ds\s+(\d+)f\s+\(\s*(\d+)%\)\s+(\d+fps)\sTrem:\s+(\d+min)\s+(\d+mb).+\[([\d:]+)\]/) {
++	 if (/^Pos:\s*(\d+).\ds\s+(\d+)f\s+\(\s*(\d+)%\)\s+(\d+.\d+fps)\sTrem:\s+(\d+min)\s+(\d+mb).+\[([\d:]+)\]/) {
+           if ( $1 ne $sec )  { $sec  = $1; $::widgets->{'menc_seconds'}->set_text( hhmmss($1) ) }
+           if ( $4 ne $fps )  { $fps  = $4; $::widgets->{'menc_fps'}->set_text($4) }
+           if ( $6 ne $size ) { $size = $6; $::widgets->{'menc_filesize'}->set_text($6) }
diff --git a/media-video/acidrip/metadata.xml b/media-video/acidrip/metadata.xml
new file mode 100644
index 000000000000..8e91ffebd6bb
--- /dev/null
+++ b/media-video/acidrip/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">.tar.gz</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/aegisub/Manifest b/media-video/aegisub/Manifest
new file mode 100644
index 000000000000..16f40229c54c
--- /dev/null
+++ b/media-video/aegisub/Manifest
@@ -0,0 +1,10 @@
+AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-icu59-build.patch 496 SHA256 109072dc4a062e854291c50e41a79c7379b114f53bcb0993619091b75df51d83 SHA512 58c8acc766751b6f9122821b5958ef3756c4802e91ed7ed8915c54eb7c8c960c46734a8d76cc200c064e0dab5a1f0008f99a5dd4a1c51ecda7983bb84ef6d645 WHIRLPOOL dabcb2577234c083a75ea9c46e45b3bcf7995a7584a83d0be95db6fe01a0d55234c1124b0523d3d9e483123a0ee1d5cb0326dba9e5e55d1bbee44fef270c39a7
+AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-system-luajit-build.patch 4029 SHA256 d6d98af919b1d4b8a4c7526e922dc6d0bf092b5cccc1b4e35f3626c3695ce123 SHA512 247dba6e593212294f3157226c03e2fb5d3a5a8eaf9a16e0a65ea1fee006b8f21fadbdd80fb0b748be3a9b043779a0da6bb6007fac07b7908fb46f27a055704e WHIRLPOOL 99fef83bcac6ce271aa7b38a7403b7e55f1f7aadb9e472f152dc003fdb5a1798c03f34fbf9fc9abef0ecaab3b43936c4ea39aee4800542bcbde393ceb230aa2a
+AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-respect-compiler-flags.patch 2186 SHA256 8bf8eb0fb562fd4b7962cd5c3d249db78cc682f80eca5cc9783949065cc3c628 SHA512 8584f8b6822642f5afdbe1fb9a1e77b32fa4eefebb473d6a501147d328ca38ecb2f88f4247a7ad06a8dfe3d9cc6695f60652dbc122237a17d097bae2f29a6a7e WHIRLPOOL 0739c222d7194e08cbe246f122675636595142b3f341be2ddfbaf73bd68629d4ccf1b207d919dfb91949f0141cc3e64ec1bee8ea1898f1a0b237d16740b0bd5b
+AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch 2483 SHA256 c82c8486b4cc2efec748d2fe689e2c0bb612a68f320a8dcf2ffed92caced888e SHA512 802ee218e2c005760a8260271791df0891ef6392bec4fbbb5936df5a84db888b0b6f36055d0760c4929cb442adcc1433a363fa93eae6c163f296166028684daf WHIRLPOOL 5f3cea07ea09b495cb2c2e4b132a6beace331acd0ae7fee2d65eb6970f1852b58080e86dd42ffa2d74c12a1af0b53f22f45594ca54349be54159b4101cc6656e
+DIST aegisub-3.2.2_p20160518.tar.gz 7438734 SHA256 744318ce8be1afb21fbd6b0ce6d407a6f42c442db0df10c7cf89692a5bc8ca31 SHA512 8d8775ba0a12735a9756b9abfd65c89519dae4e21afcaedbd18985d1c1021975b1ae909b3bef1121b707c626e1711d56f1823f3b4746eab49e8386536a5e84e6 WHIRLPOOL 0d46799009c72cac1d6df89f4ffe5110d904e671175380e20605683b6a2f3ccdd46855cf98ebac8f0088c7a928b82547557afc8214b2fce85aed759aa5e9e4ab
+EBUILD aegisub-3.2.2_p20160518-r2.ebuild 3477 SHA256 9564d83e4772e1e287119dd1844d39d58bdac8e467ac06ff11062cdc9e477db1 SHA512 a3ffee8d55f0f9608ce8e64eacc3560b38f0cd899f443ede1c2bf3fa39bcffdad87e15529654312e3c58ddf5074f118f4e6d15f5f925961bfd4f4d6c4fedea43 WHIRLPOOL 68594cd758ba14f5ee4f315d30ee91f9ace59dcf9692341502350f0112a515f6b7bed9f5407ab7a6bc3965f71fc8211b4226217b03f32e33aeff3155ec1bf4fa
+EBUILD aegisub-9999.ebuild 3041 SHA256 7786fea6af10193239d18c0a09dd367a8b0d6c12860ef57f726841683a8b8365 SHA512 d2231b788ff67fd79db1c8a353cd87d5e9959f496b80b88cd7ec89f380756b3defe3f0c69a703828b00d63020276fbe749618a555912724c65077914bafe0a9d WHIRLPOOL a2205a67baca5a7c2fb95a7b90cb39b2777547cdefd4b6d620b8c6bb9e288e645270ef36ddfbc84744671cf3a37b785feece676b3e2c15715e032d6a9c832e5c
+MISC ChangeLog 18822 SHA256 453958ec465d56ad2b4eecc613109726ce81742dd95f7cb853e742f7648c1063 SHA512 fd3dfcf15b3145cdf268116ffaae774de0c175321290d58d60013fc1c469f70427ef17fc922eac72edf86b5d528b67ee3513309513ebac798aefa93784b6e8a3 WHIRLPOOL d313a825d1d94230a30e7da2a0ebb845c935379210fedd5759cd207cbb8fafd52a7c93637446e39885fedf70356b8a3e400ca9bf6fccd6a012b6df444fdd0345
+MISC ChangeLog-2015 3581 SHA256 34687fcf4b354780e614d7cbc6b64a7891e67d6a4150f4cf1036b14ff719c5ef SHA512 f81bc2114ca51b52dfee23fac301c5b2076fd74f400917a5b19e3654da4b28e1bce879a6e535925def5cf905da4b51f1b2253399019091b084d1c1d6b0998973 WHIRLPOOL 17fd707c268a02d4ad7139588dc3b9831e9878ccd2391d085005c43cc19de0d0d4553e87632ac315a8156a17fbe95515648d1c745344c70799d59ff29e4d088f
+MISC metadata.xml 611 SHA256 cc413cf5f3499adbc91263408af94d555a7816f7c6f0f0443fbff4bfe4bb8b98 SHA512 8c724c1981d7ef5ae3ffbe18f8fd23cc97a6f573ac6e63f7d31d4b5c71ea34cb6b3746ad7ad86f4ce1544e7b5b58ba3489f25c94cee1c6fb2840fad6cca99cb6 WHIRLPOOL e2e7afb3ce85182996cea1b91c7ae56780c73373c98c2cf2f0b86c57d6f50aa149c3cddd3bad86cbf63e256737d2e28ca3f00f9cba2afc2ebc9bcd66a0625f5d
diff --git a/media-video/aegisub/aegisub-3.2.2_p20160518-r2.ebuild b/media-video/aegisub/aegisub-3.2.2_p20160518-r2.ebuild
new file mode 100644
index 000000000000..34d509212bae
--- /dev/null
+++ b/media-video/aegisub/aegisub-3.2.2_p20160518-r2.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER=3.0
+PLOCALES="ar bg ca cs da de el es eu fa fi fr_FR gl hu id it ja ko nl pl pt_BR pt_PT ru sr_RS sr_RS@latin uk_UA vi zh_CN zh_TW"
+COMMIT_ID="b118fe7e7a5c37540e2f0aa75af105e272bad234"
+
+inherit autotools flag-o-matic gnome2-utils l10n wxwidgets xdg-utils vcs-snapshot
+
+DESCRIPTION="Advanced subtitle editor"
+HOMEPAGE="http://www.aegisub.org/ https://github.com/Aegisub/Aegisub"
+SRC_URI="https://github.com/Aegisub/Aegisub/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+alsa debug +fftw openal oss portaudio pulseaudio spell test +uchardet"
+
+# aegisub bundles luabins (https://github.com/agladysh/luabins).
+# Unfortunately, luabins upstream is practically dead since 2010.
+# Thus unbundling luabins isn't worth the effort.
+RDEPEND="
+	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,debug?]
+	dev-lang/luajit:2[lua52compat]
+	dev-libs/boost:=[icu,nls,threads]
+	dev-libs/icu:=
+	media-libs/ffmpegsource:=
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libass:=[fontconfig]
+	sys-libs/zlib
+	virtual/libiconv
+	virtual/opengl
+	alsa? ( media-libs/alsa-lib )
+	fftw? ( >=sci-libs/fftw-3.3:= )
+	openal? ( media-libs/openal )
+	portaudio? ( =media-libs/portaudio-19* )
+	pulseaudio? ( media-sound/pulseaudio )
+	spell? ( app-text/hunspell:= )
+	uchardet? ( app-i18n/uchardet )
+"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		~dev-cpp/gtest-1.7.0
+		dev-lua/busted
+		dev-lua/luarocks
+	)
+"
+
+REQUIRED_USE="|| ( alsa openal oss portaudio pulseaudio )"
+
+PATCHES=(
+	"${FILESDIR}/${PV}/${P}-fix-system-luajit-build.patch"
+	"${FILESDIR}/${PV}/${P}-respect-compiler-flags.patch"
+	"${FILESDIR}/${PV}/${P}-support-system-gtest.patch"
+	"${FILESDIR}/${PV}/${P}-fix-icu59-build.patch"
+)
+
+aegisub_check_compiler() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
+		die "Your compiler lacks C++11 support. Use GCC>=4.7.0 or Clang>=3.3."
+	fi
+}
+
+pkg_pretend() {
+	aegisub_check_compiler
+}
+
+pkg_setup() {
+	aegisub_check_compiler
+}
+
+src_prepare() {
+	default_src_prepare
+
+	# Remove tests that require unavailable uuid Lua module.
+	rm automation/tests/modules/lfs.moon || die
+
+	remove_locale() {
+		rm "po/${1}.po" || die
+	}
+
+	l10n_find_plocales_changes 'po' '' '.po'
+	l10n_for_each_disabled_locale_do remove_locale
+
+	# See http://devel.aegisub.org/ticket/1914
+	config_rpath_update "${S}"/config.rpath
+
+	eautoreconf
+
+	cat <<- EOF > build/git_version.h || die
+		#define BUILD_GIT_VERSION_NUMBER 8897
+		#define BUILD_GIT_VERSION_STRING "${PV}"
+		#define TAGGED_RELEASE 0
+	EOF
+}
+
+src_configure() {
+	# Prevent access violations from OpenAL detection. See Gentoo bug 508184.
+	use openal && export agi_cv_with_openal="yes"
+
+	setup-wxwidgets
+	local myeconfargs=(
+		--disable-update-checker
+		--with-ffms2
+		--with-system-luajit
+		$(use_enable debug)
+		$(use_with alsa)
+		$(use_with fftw fftw3)
+		$(use_with openal)
+		$(use_with oss)
+		$(use_with portaudio)
+		$(use_with pulseaudio libpulse)
+		$(use_with spell hunspell)
+		$(use_with uchardet)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake WITH_SYSTEM_GTEST=$(usex test)
+}
+
+src_test() {
+	emake test-automation
+	emake test-libaegisub
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-9999.ebuild
new file mode 100644
index 000000000000..3d4464c989fa
--- /dev/null
+++ b/media-video/aegisub/aegisub-9999.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER=3.0
+PLOCALES="ar bg ca cs da de el es eu fa fi fr_FR gl hu id it ja ko nl pl pt_BR pt_PT ru sr_RS sr_RS@latin uk_UA vi zh_CN zh_TW"
+
+inherit autotools gnome2-utils l10n wxwidgets xdg-utils git-r3
+
+DESCRIPTION="Advanced subtitle editor"
+HOMEPAGE="http://www.aegisub.org/ https://github.com/Aegisub/Aegisub"
+EGIT_REPO_URI="https://github.com/${PN^}/${PN^}.git"
+# Submodules are used to pull bundled libraries.
+EGIT_SUBMODULES=()
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE="+alsa debug +fftw openal oss portaudio pulseaudio spell test +uchardet"
+
+# aegisub bundles luabins (https://github.com/agladysh/luabins).
+# Unfortunately, luabins upstream is practically dead since 2010.
+# Thus unbundling luabins isn't worth the effort.
+RDEPEND="
+	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,debug?]
+	dev-lang/luajit:2[lua52compat]
+	dev-libs/boost:=[icu,nls,threads]
+	dev-libs/icu:=
+	media-libs/ffmpegsource:=
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libass:=[fontconfig]
+	sys-libs/zlib
+	virtual/libiconv
+	virtual/opengl
+	alsa? ( media-libs/alsa-lib )
+	fftw? ( >=sci-libs/fftw-3.3:= )
+	openal? ( media-libs/openal )
+	portaudio? ( =media-libs/portaudio-19* )
+	pulseaudio? ( media-sound/pulseaudio )
+	spell? ( app-text/hunspell:= )
+	uchardet? ( app-i18n/uchardet )
+"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		~dev-cpp/gtest-1.7.0
+		dev-lua/busted
+		dev-lua/luarocks
+	)
+"
+
+REQUIRED_USE="|| ( alsa openal oss portaudio pulseaudio )"
+
+PATCHES=(
+	"${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-fix-system-luajit-build.patch"
+	"${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-respect-compiler-flags.patch"
+	"${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-support-system-gtest.patch"
+)
+
+src_prepare() {
+	default_src_prepare
+
+	# Remove tests that require unavailable uuid Lua module.
+	rm automation/tests/modules/lfs.moon || die
+
+	remove_locale() {
+		rm "po/${1}.po" || die
+	}
+
+	l10n_find_plocales_changes 'po' '' '.po'
+	l10n_for_each_disabled_locale_do remove_locale
+
+	# See http://devel.aegisub.org/ticket/1914
+	config_rpath_update "${S}"/config.rpath
+
+	eautoreconf
+}
+
+src_configure() {
+	# Prevent access violations from OpenAL detection. See Gentoo bug 508184.
+	use openal && export agi_cv_with_openal="yes"
+
+	setup-wxwidgets
+	local myeconfargs=(
+		--disable-update-checker
+		--with-ffms2
+		--with-system-luajit
+		$(use_enable debug)
+		$(use_with alsa)
+		$(use_with fftw fftw3)
+		$(use_with openal)
+		$(use_with oss)
+		$(use_with portaudio)
+		$(use_with pulseaudio libpulse)
+		$(use_with spell hunspell)
+		$(use_with uchardet)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake WITH_SYSTEM_GTEST=$(usex test)
+}
+
+src_test() {
+	emake test-automation
+	emake test-libaegisub
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-icu59-build.patch b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-icu59-build.patch
new file mode 100644
index 000000000000..a6564def1b84
--- /dev/null
+++ b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-icu59-build.patch
@@ -0,0 +1,18 @@
+commit dd67db47cb2203e7a14058e52549721f6ff16a49
+Author: Maxime Gauduin <alucryd@archlinux.org>
+Date:   Tue May 9 04:01:47 2017 +0200
+
+Fix compilation against icu 59.1 (#46)
+
+diff --git a/src/utils.cpp b/src/utils.cpp
+index e1cde5e83..876c4c011 100644
+--- a/src/utils.cpp
++++ b/src/utils.cpp
+@@ -44,6 +44,7 @@
+ #include <boost/filesystem/path.hpp>
+ #include <map>
+ #include <unicode/locid.h>
++#include <unicode/unistr.h>
+ #include <wx/clipbrd.h>
+ #include <wx/filedlg.h>
+ #include <wx/stdpaths.h>
diff --git a/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-system-luajit-build.patch b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-system-luajit-build.patch
new file mode 100644
index 000000000000..42b57e5fcf45
--- /dev/null
+++ b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-system-luajit-build.patch
@@ -0,0 +1,121 @@
+See http://devel.aegisub.org/ticket/1904
+and http://devel.aegisub.org/ticket/1913
+and http://devel.aegisub.org/ticket/1922
+
+diff --git a/Makefile.inc.in b/Makefile.inc.in
+index d8b3f4a..52e4cf6 100644
+--- a/Makefile.inc.in
++++ b/Makefile.inc.in
+@@ -9,6 +9,7 @@ HAVE_OPENAL     = @with_openal@
+ HAVE_OSS        = @with_oss@
+ HAVE_PORTAUDIO  = @with_portaudio@
+ HAVE_UCHARDET   = @with_uchardet@
++SYSTEM_LUAJIT   = @with_system_luajit@
+
+ ##############
+ # BUILD OUTPUT
+diff --git a/automation/Makefile b/automation/Makefile
+index 5483dbd..1231aab 100644
+--- a/automation/Makefile
++++ b/automation/Makefile
+@@ -12,10 +12,16 @@ DATA_AUTOMATION_INSTALLED = $(addprefix $(DESTDIR)$(P_DATA)/automation/, $(DATA_
+ $(DESTDIR)$(P_DATA)/automation/%: $(d)%
+ 	$(MKDIR_INSTALL)
+
+-aegisub-lua_OBJ := $(d)tests/aegisub.o $(TOP)lib/libaegisub.a $(TOP)lib/libluabins.a $(LIBS_LUA)
++aegisub-lua_OBJ := $(d)tests/aegisub.o $(TOP)lib/libaegisub.a $(TOP)lib/libluabins.a
+ aegisub-lua_CPPFLAGS := $(CPPFLAGS_BOOST) $(CFLAGS_LUA) -I$(TOP)libaegisub/include -I$(TOP)src $(CXXFLAGS_WX)
+ aegisub-lua_LIBS := $(LIBS_WX) $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_PTHREAD)
+
++ifeq (no, $(SYSTEM_LUAJIT))
++aegisub-lua_OBJ += $(LIBS_LUA)
++else
++aegisub-lua_LIBS += $(LIBS_LUA)
++endif
++
+ PROGRAM += $(d)aegisub-lua
+
+ test-automation: $(PROGRAM)
+diff --git a/configure.ac b/configure.ac
+index 1649efc..81b1413 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -429,13 +429,15 @@ AS_IF([test $with_system_luajit = no],
+       [AC_SUBST([LUAJIT_CFLAGS], ['-I$(TOP)vendor/luajit/include'])
+        AC_SUBST([LUAJIT_LIBS], ['$(TOP)vendor/luajit/src/libluajit.a'])])
+
++AC_SUBST(with_system_luajit)
++
+ # We also need a Lua binary to run part of the build system
+ # Which version doesn't matter as the scripts are portable between them
+-AC_CHECK_PROGS([LUA], [lua luajit lua5.3 lua-5.3 lua5.2 lua-5.2 lua5.1 lua-5.1])
++AC_PATH_PROGS([LUA], [luajit lua lua5.3 lua-5.3 lua5.2 lua-5.2 lua5.1 lua-5.1])
+
+ # If the user doesn't have an installed copy of Lua, just use the one built
+ # as part of building LuaJIT
+-AS_IF([test -z $LUA], [LUA="$srcdir/vendor/luajit/src/host/minilua"])
++AS_IF([test -z $LUA], [LUA='$(TOP)vendor/luajit/src/host/minilua'])
+
+ ######################################################
+ # Debugging support
+diff --git a/header.mk b/header.mk
+index 613b38f..a9ce1d7 100644
+--- a/header.mk
++++ b/header.mk
+@@ -13,7 +13,10 @@ subdirs := \
+ 	tests \
+ 	tools \
+ 	vendor/luabins \
+-	vendor/luajit
++
++ifeq (no, $(SYSTEM_LUAJIT))
++subdirs += vendor/luajit
++endif
+
+ subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
+
+diff --git a/src/Makefile b/src/Makefile
+index 0ee6c84..1a6f015 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -6,7 +6,7 @@ src_CPPFLAGS := -I$(d) -I.. -I$(d)include -I$(TOP)libaegisub/include -I$(TOP)bui
+ 	$(CFLAGS_PTHREAD) $(CFLAGS_FFTW3) $(CFLAGS_ICU) $(CPPFLAGS_BOOST)
+ src_CXXFLAGS := $(CXXFLAGS_WX)
+ src_LIBS := $(LIBS_GL) $(LIBS_PTHREAD) $(LIBS_WX) $(LIBS_FREETYPE) \
+-	$(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3)  $(LIBS_BOOST) $(LIBS_ICU)
++	$(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) $(LIBS_ICU)
+ src_PCH := $(d)agi_pre.h
+ src_INSTALLNAME := $(AEGISUB_COMMAND)
+
+@@ -111,11 +111,16 @@ src_OBJ := \
+ 	$(d)video_provider_yuv4mpeg.o \
+ 	$(d)video_slider.o \
+ 	$(d)visual_feature.o \
+-	$(LIBS_LUA) \
+ 	$(TOP)lib/libaegisub.a \
+ 	$(TOP)lib/libluabins.a \
+ 	$(TOP)lib/libresrc.a \
+
++ifeq (no, $(SYSTEM_LUAJIT))
++src_OBJ += $(LIBS_LUA)
++else
++src_LIBS += $(LIBS_LUA)
++endif
++
+ ifeq (yes, $(BUILD_DARWIN))
+ src_OBJ += $(d)font_file_lister_coretext.o
+ src_OBJ += $(subst .mm,.o,$(wildcard $(d)osx/*.mm))
+diff --git a/tools/Makefile b/tools/Makefile
+index de6166a..e3d108a 100644
+--- a/tools/Makefile
++++ b/tools/Makefile
+@@ -12,6 +12,8 @@ repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU)
+
+ PROGRAM += $(d)repack-thes-dict
+
+-$(TOP)tools/respack.lua: $(shell command -v "$(BIN_LUA)")
++ifeq (no, $(SYSTEM_LUAJIT))
++$(TOP)tools/respack.lua: $(BIN_LUA)
++endif
+
+ include $(TOP)Makefile.target
diff --git a/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-respect-compiler-flags.patch b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-respect-compiler-flags.patch
new file mode 100644
index 000000000000..90e57f178dc4
--- /dev/null
+++ b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-respect-compiler-flags.patch
@@ -0,0 +1,53 @@
+See http://devel.aegisub.org/ticket/1899
+and http://devel.aegisub.org/ticket/1900
+
+diff --git a/configure.ac b/configure.ac
+index 1649efc..2f4470b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -133,20 +133,17 @@ AS_IF([test x$build_darwin != xyes], [
+ AC_ARG_ENABLE(compiler-flags, AS_HELP_STRING([--disable-compiler-flags],[Disable *all* additional compiler flags. [no]]))
+
+ AS_IF([test x$enable_compiler_flags != xno], [
+-  CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g"
+-  CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g"
++  CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter"
++  CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing"
++  AC_C_FLAG([-std=gnu99])
+   AC_CXX_FLAG([-std=c++11])
+-  AC_CXX_FLAG([-Wno-c++11-narrowing])
+   AC_C_FLAG([-Wno-unused-local-typedefs])
+   AC_CXX_FLAG([-Wno-unused-local-typedefs])
+
+   # -O* messes with debugging.
+   AS_IF([test x$enable_debug = xyes], [
+-    CFLAGS="$CFLAGS -O0"
+-    CXXFLAGS="$CXXFLAGS -O0"
+-  ], [
+-    CFLAGS="$CFLAGS -O3"
+-    CXXFLAGS="$CXXFLAGS -O3"
++    CFLAGS="$CFLAGS -O0 -g"
++    CXXFLAGS="$CXXFLAGS -O0 -g"
+   ])
+ ])
+
+diff --git a/src/Makefile b/src/Makefile
+index 0ee6c84..cad213b 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -188,14 +188,13 @@ endif
+ #####################
+ # SOURCE-LEVEL CFLAGS
+ #####################
+-$(d)MatroskaParser.o_FLAGS              := -Wno-sometimes-uninitialized
+ $(d)audio_player.o_FLAGS                := $(CFLAGS_ALSA) $(CFLAGS_PORTAUDIO) $(CFLAGS_LIBPULSE) $(CFLAGS_OPENAL)
+ $(d)audio_provider_factory.o_FLAGS      := $(CFLAGS_FFMS2)
+ $(d)auto4_base.o_FLAGS                  := $(CFLAGS_FREETYPE)
+ $(d)charset_detect.o_FLAGS              := -D_X86_
+ $(d)font_file_lister_fontconfig.o_FLAGS := $(CFLAGS_FONTCONFIG)
+ $(d)subtitles_provider.o_FLAGS          := $(CFLAGS_LIBASS)
+-$(d)subtitles_provider_libass.o_FLAGS   := $(CFLAGS_LIBASS) -Wno-c++11-narrowing
++$(d)subtitles_provider_libass.o_FLAGS   := $(CFLAGS_LIBASS)
+ $(d)text_file_reader.o_FLAGS            := -D_X86_
+ $(d)video_provider_manager.o_FLAGS      := $(CFLAGS_FFMS2)
+ $(d)auto4_lua.o_FLAGS                   := $(CFLAGS_LUA)
diff --git a/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch
new file mode 100644
index 000000000000..8209ac5ec7c3
--- /dev/null
+++ b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch
@@ -0,0 +1,75 @@
+commit 83f868ea8decbbe97891631fe142e84c883ee33d
+Author: Ilya Tumaykin <itumaykin@gmail.com>
+Date:   Wed Jun 1 20:00:37 2016 +0300
+
+Allow to build and run tests with a system copy of gtest (googletest)
+
+Also add LIBS_UCHARDET to the mix only when uchardet is requested.
+
+Closes #1923
+
+Bug: http://devel.aegisub.org/ticket/1923
+---
+
+diff --git a/tests/Makefile b/tests/Makefile
+index 8c30c1d..c5bf049 100644
+--- a/tests/Makefile
++++ b/tests/Makefile
+@@ -1,24 +1,45 @@
+ include $(dir $(lastword $(MAKEFILE_LIST)))../header.mk
+
++WITH_SYSTEM_GTEST ?= no
++
++ifeq (no, $(WITH_SYSTEM_GTEST))
+ GTEST_ROOT ?= $(TOP)vendor/googletest
+ GTEST_FILE := ${GTEST_ROOT}/src/gtest-all
++GTEST_CPPFLAGS := -I$(GTEST_ROOT) -I$(GTEST_ROOT)/include
++GTEST_CXXFLAGS := $(CFLAGS_PTHREAD)
++GTEST_LIBS := $(LIBS_PTHREAD)
++else
++GTEST_CPPFLAGS := $(shell gtest-config --cppflags)
++GTEST_CXXFLAGS := $(shell gtest-config --cxxflags)
++GTEST_LIBS := $(shell gtest-config --libs)
++endif
+
+ run_PCH := $(d)support/tests_pre.h
+ run_CPPFLAGS := -I$(TOP)libaegisub/include -I$(TOP) -I$(d)support \
+-	-I$(GTEST_ROOT) -I$(GTEST_ROOT)/include $(CPPFLAGS_BOOST) $(CFLAGS_LUA)
+-run_CXXFLAGS := -Wno-unused-value -Wno-sign-compare
+-run_LIBS := $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_UCHARDET) $(LIBS_PTHREAD)
++	$(CPPFLAGS_BOOST) $(CFLAGS_ICU) $(CFLAGS_LUA) $(GTEST_CPPFLAGS)
++run_CXXFLAGS := -Wno-unused-value -Wno-sign-compare $(GTEST_CXXFLAGS)
++run_LIBS := $(LIBS_BOOST) $(LIBS_ICU) $(GTEST_LIBS)
+ run_OBJ := \
+ 	$(subst .cpp,.o,$(wildcard $(d)tests/*.cpp)) \
+ 	$(d)support/main.o \
+ 	$(d)support/util.o \
+-	$(TOP)lib/libaegisub.a \
+-	$(GTEST_FILE).o
++	$(TOP)lib/libaegisub.a
+
++ifeq (yes, $(HAVE_UCHARDET))
++run_LIBS += $(LIBS_UCHARDET)
++endif
++
++ifeq (no, $(WITH_SYSTEM_GTEST))
++run_OBJ += $(GTEST_FILE).o
+ # This bit of goofiness is to make it only try to build the tests if google
+ # test can be found and silently skip it if not, by using $(wildcard) to check
+ # for file existence
+ PROGRAM += $(subst $(GTEST_FILE).cc,$(d)run,$(wildcard $(GTEST_FILE).cc))
++test: $(subst $(GTEST_FILE).cc,test-libaegisub,$(wildcard $(GTEST_FILE).cc))
++else
++PROGRAM += $(d)run
++test: test-libaegisub
++endif
+
+ ifeq (yes, $(BUILD_DARWIN))
+ run_LIBS += -framework ApplicationServices -framework Foundation
+@@ -31,6 +52,4 @@ gtest_filter ?= *
+ test-libaegisub: $(d)run $(d)data
+ 	cd $(TOP)tests; ./run --gtest_filter="$(gtest_filter)"
+
+-test: $(subst $(GTEST_FILE).cc,test-libaegisub,$(wildcard $(GTEST_FILE).cc))
+-
+ include $(TOP)Makefile.target
diff --git a/media-video/aegisub/metadata.xml b/media-video/aegisub/metadata.xml
new file mode 100644
index 000000000000..3ca352be29a1
--- /dev/null
+++ b/media-video/aegisub/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>itumaykin+gentoo@gmail.com</email>
+		<name>Coacher</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="uchardet">Enable charset discovery via <pkg>app-i18n/uchardet</pkg></flag>
+	</use>
+	<upstream>
+		<bugs-to>http://devel.aegisub.org/wiki/NewTicket</bugs-to>
+		<remote-id type="github">Aegisub/Aegisub</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/alevt/Manifest b/media-video/alevt/Manifest
new file mode 100644
index 000000000000..e99f12ca898a
--- /dev/null
+++ b/media-video/alevt/Manifest
@@ -0,0 +1,7 @@
+AUX alevt-1.6.2-libpng15.patch 179 SHA256 686d2d0720ac880a1ced5b29ae0cb454553178e5c53ded94dcc6289e3415b126 SHA512 f97967c6eab94a4e302b0ded693c9c7ea1150fc698bf949959077bf680a446632f11798a29c11bcae86b97266e1afa644afc428c31f0e7a21f4ee31365b6cbb3 WHIRLPOOL daacd3c0bebf5f0b72b2c9a03b509f348caa0aef0538142b4c1d5d649a8b13edc472f913567c22d91a814399789b6b2035d703ab4b33e76535431326307af2a8
+AUX alevt-1.6.2-respectflags.patch 1178 SHA256 92151dafd890b0a04cf2f7ac1631b7812406fb51d072b93c1d9c0e10aa3aa135 SHA512 e3450a688c1e0c010b0644d70e4a07675dc84b0823b15902730f651df3e1156d0f1bbedae6a086082dc3f4de12ae3d265e0d68fee4a8e27025237e3784d796e9 WHIRLPOOL 593db161d5d65340424540cbcf4b53a5a64e6fbecc7ee33e8cdf37a6603f9575049c327e7374c6c6110da21f5c60644ffca5a6e1f317ddb9d16fb893b3a42eac
+DIST alevt-1.6.2.tar.gz 133234 SHA256 9347c2af4b528edec87df8a424ddccebcc252ca7a06f6b18310733cfa547e5f5 SHA512 8ddc0b03065b186bff8b705ec6ee8581460c4da4e65f97d15915d3bf708c7898661f61fa5fe004c7634adc9f850747b3fa08fe9ec94a5155482fcda479a884ed WHIRLPOOL b4a37708f5ba2bc51efd50ba097564f772e84bb7234f9b75b66fd11e56f1a47ef56d2828450d837300b89ad3353e63a44d3ad8767821203a8f8e231307eaf43f
+EBUILD alevt-1.6.2.ebuild 1012 SHA256 922a6103c9a9ec423ead12851a74536f938eea24d4d2e57be826e60766e5788d SHA512 d239ee486ac937eceed30775590c05283cba45d8e213e9363d8be71885ecd91b7fed06510048a2cc59bad7311ea87a94fc2ca41f6afa756e03b19bbde4998622 WHIRLPOOL b60372cad730ef00cc0ff52202b9fa9d9bff612bc9f41ca390ea202d0e95ef470ccb282aa53a28e6c40ecb0b5755ca081d132a683ef8d545ad49d8e8478d155d
+MISC ChangeLog 2529 SHA256 8ac7d9bd0c77ad59a650e183bded8ada130a070797e647e9bed3e35c2d653cf4 SHA512 162e7d7cf276fecf7c3d401a1fedbffa28e4a8cdfa9e44fb77a3b55238e0cdf7c8d65fd307f5325807090f431dc9e1264afab70a43b3f0f7704db11d49d8c2a8 WHIRLPOOL 76dd685e5b1bd6e40ac30627f8755a8dc95d8f00d32db84da2e3363772356cd46dbd73e75ff87a69d8e6bf2c78211cc43f9daee7b6900f8bba647a3266b93d6d
+MISC ChangeLog-2015 5572 SHA256 612b0f4ab63bf353fcccd3f31600ec2b9c9ea0a51e4115eb8a9ea04d2cf9c0c6 SHA512 7dc17a6113d6280f1591092fa0417554072b711d079cdc6b2065b9f1cfbd1491ab0fb173c1f429b6707f91f66c13cf85c3bbe1651e05d272635b49ba78c6d17e WHIRLPOOL e68ac5745ef5d32c5d248f3c187e915801c26235955a62f1e9b0251e44f71ee213ffc67acccd7ca3c583a13dbbaab198c6df32493ef59316b4f164cdd5dc588d
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/media-video/alevt/alevt-1.6.2.ebuild b/media-video/alevt/alevt-1.6.2.ebuild
new file mode 100644
index 000000000000..5e65dbcd0b4b
--- /dev/null
+++ b/media-video/alevt/alevt-1.6.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="Teletext viewer for X11"
+HOMEPAGE="http://www.goron.de/~froese/"
+SRC_URI="http://www.goron.de/~froese/alevt/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	>=media-libs/libpng-1.4"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+RESTRICT="strip"
+
+src_prepare() {
+	cp -va Makefile{,.orig}
+
+	epatch \
+		"${FILESDIR}"/${P}-respectflags.patch \
+		"${FILESDIR}"/${P}-libpng15.patch
+}
+
+src_compile() {
+	append-flags -fno-strict-aliasing
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin alevt alevt-cap alevt-date
+	doman alevt.1x alevt-date.1 alevt-cap.1
+	dodoc CHANGELOG README
+
+	insinto /usr/share/icons/hicolor/16x16/apps
+	newins contrib/mini-alevt.xpm alevt.xpm
+	insinto /usr/share/icons/hicolor/48x48/apps
+	newins contrib/icon48x48.xpm alevt.xpm
+
+	make_desktop_entry alevt "AleVT" alevt
+}
diff --git a/media-video/alevt/files/alevt-1.6.2-libpng15.patch b/media-video/alevt/files/alevt-1.6.2-libpng15.patch
new file mode 100644
index 000000000000..337a6f7c709f
--- /dev/null
+++ b/media-video/alevt/files/alevt-1.6.2-libpng15.patch
@@ -0,0 +1,11 @@
+--- exp-gfx.c
++++ exp-gfx.c
+@@ -4,6 +4,8 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
++#include <zlib.h> /* Z_DEFAULT_COMPRESSION */
++
+ #include "lang.h"
+ #include "export.h"
+ 
diff --git a/media-video/alevt/files/alevt-1.6.2-respectflags.patch b/media-video/alevt/files/alevt-1.6.2-respectflags.patch
new file mode 100644
index 000000000000..368b0ff614cd
--- /dev/null
+++ b/media-video/alevt/files/alevt-1.6.2-respectflags.patch
@@ -0,0 +1,34 @@
+--- alevt-1.6.2/Makefile.orig	2007-12-03 06:19:54.000000000 +0100
++++ alevt-1.6.2/Makefile	2009-05-14 10:17:39.000000000 +0200
+@@ -1,5 +1,4 @@
+ VER=1.6.2
+-OPT=-O2 -s -w
+ #OPT=-O -g
+ DEFS=-DWITH_PNG
+ FONT=vtxt
+@@ -11,7 +10,7 @@
+ # a smaller and thinner font
+ #FONT=neep9
+ 
+-CFLAGS=$(OPT) -DVERSION=\"$(VER)\" $(DEFS) -I$(USR_X11R6)/include
++CFLAGS += -DVERSION=\"$(VER)\" $(DEFS) -I$(USR_X11R6)/include
+ 
+ EXPOBJS=export.o exp-txt.o exp-html.o exp-gfx.o font.o
+ OBJS=main.o ui.o xio.o fdset.o vbi.o cache.o help.o edline.o search.o edit.o misc.o hamm.o lang.o $(EXPOBJS)
+@@ -25,13 +24,13 @@
+ all: alevt alevt-date alevt-cap alevt.1x alevt-date.1 alevt-cap.1
+ 
+ alevt: $(OBJS)
+-	$(CC) $(OPT) $(OBJS) -o alevt -L$(USR_X11R6)/lib -L$(USR_X11R6)/lib64 -lX11 $(EXPLIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o alevt -L$(USR_X11R6)/lib -L$(USR_X11R6)/lib64 -lX11 $(EXPLIBS)
+ 
+ alevt-date: $(TOBJS)
+-	$(CC) $(OPT) $(TOBJS) -o alevt-date
++	$(CC) $(CFLAGS) $(LDFLAGS) $(TOBJS) -o alevt-date
+ 
+ alevt-cap: $(COBJS)
+-	$(CC) $(OPT) $(COBJS) -o alevt-cap $(EXPLIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(COBJS) -o alevt-cap $(EXPLIBS)
+ 
+ font.o: font1.xbm font2.xbm
+ fontsize.h: font1.xbm font2.xbm
diff --git a/media-video/alevt/metadata.xml b/media-video/alevt/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/media-video/alevt/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/media-video/aravis/Manifest b/media-video/aravis/Manifest
new file mode 100644
index 000000000000..cf840c16fed9
--- /dev/null
+++ b/media-video/aravis/Manifest
@@ -0,0 +1,8 @@
+DIST aravis-0.1.14.tar.xz 414932 SHA256 4f7a5e8a965db2ac2428029f7e91933fcc40664f78d645041b8bb7b710e66bea SHA512 d84fe519074a69e679b08e0c0933bce191e50cfcdd1b46b743aa68ba33445a3a87cbd1701ba424666b638949f9faf531ec668acbe5d22017712f70cfa9620ea9 WHIRLPOOL 1e225a92c11341327452946cc35f18d76fe90626dca6b82631640443920675be270beeb053cc352c5c552b5a3edc2661fc96e2e00a1222630ed76fe5d35403c0
+DIST aravis-0.1.15.tar.xz 448348 SHA256 8181b9965abad9065607be0d28015ea56615b37e8297b9ec445a2c8fe58214df SHA512 f6a2e1f7fa4f712bea6a91f896bbc92afb3dcf3146109f3f7aee2ad6812a69f0b47a0f2116062cba6163dc058c7981a01a6eec395d4af633da666fe186291929 WHIRLPOOL 68b23fbb24fb78542db0f9b9ce9dbafc0a3b81971c5dc471313fbc2164bbae1b9317f00254ccaf457fb907b7ff8130cdf0612a66a6474c5effbbe601138ba04d
+EBUILD aravis-0.1.14.ebuild 1399 SHA256 8114487762032d52f0d4e24a3282496e565338b1a30f5d516ec9e503a73ee868 SHA512 7bc823b724cc4db6d0129291c46a296b147f29d8c076e6476145fd68315e35af77d67c57a40bbdacec4fb7708ee728ef02b0d79a69662b280ac17d58f23d8d0e WHIRLPOOL a69eaa65859486cd379c74249f3868d077cea1dbd8763f54a5eede0604b9cd45bd2d5c7cb8eca467fbe6d10e744cd1926060d19cbe920c34bd81778652fafc6d
+EBUILD aravis-0.1.15.ebuild 1399 SHA256 8114487762032d52f0d4e24a3282496e565338b1a30f5d516ec9e503a73ee868 SHA512 7bc823b724cc4db6d0129291c46a296b147f29d8c076e6476145fd68315e35af77d67c57a40bbdacec4fb7708ee728ef02b0d79a69662b280ac17d58f23d8d0e WHIRLPOOL a69eaa65859486cd379c74249f3868d077cea1dbd8763f54a5eede0604b9cd45bd2d5c7cb8eca467fbe6d10e744cd1926060d19cbe920c34bd81778652fafc6d
+EBUILD aravis-9999.ebuild 1399 SHA256 8114487762032d52f0d4e24a3282496e565338b1a30f5d516ec9e503a73ee868 SHA512 7bc823b724cc4db6d0129291c46a296b147f29d8c076e6476145fd68315e35af77d67c57a40bbdacec4fb7708ee728ef02b0d79a69662b280ac17d58f23d8d0e WHIRLPOOL a69eaa65859486cd379c74249f3868d077cea1dbd8763f54a5eede0604b9cd45bd2d5c7cb8eca467fbe6d10e744cd1926060d19cbe920c34bd81778652fafc6d
+MISC ChangeLog 3136 SHA256 b06cdb29ba18d2aabf2e4be5f28bd2a906d931102abc8dd9c1486aabfc959b32 SHA512 a82f193f2b7b21349e3c658a5a235c132f3e356ec0b29ced4c985c0838e45c940cd47f812667bcedacd0bf09abbf918ee47956187e57773ace146ba0b958c4fb WHIRLPOOL 12a920ffbed5642a250e1b4449dc49d8a2b481fcb6230dfdefa82af1042e7d2b72fb7a8c32b13503f84741e90faca23981dcd80c300e0c1c856242062dc5a59d
+MISC ChangeLog-2015 2010 SHA256 3439677f35579c282b892c526d042cafaf87e9471e053ab7ac593ddf1877588b SHA512 42f3f3604d178b253f0d2ac51e5b3d76fa2e423a823e3461975a1c2066589c261f03291c7fd8407d040b66bcb07bd15c9b26bc3e37fe4b0eaa9e852a930ddee9 WHIRLPOOL 3a7917f9fa73b0852aed5f446057671eb6483b3cbf0102ca692a9fb8c7dc4dc19cbed77f88095bc427f0158c24e24fc61487b4ba5f9241bdb366f26e4bfcc363
+MISC metadata.xml 664 SHA256 b7009351ea7f0947641f54fc2528db75b0ff0fbad7084c3476b342bc0fe3beb5 SHA512 023c02e3a69fad5c7302d2dc857fa0de23096ecb80640f9adba7d12ab10e969be2a10f1183e44cf3a3afc6e57ec1585826b73907103490b78052bd10b0857cac WHIRLPOOL d6c061248e887a6d0e08b7dceeb69d02970d10acbcdb487962e2792a3166bf210ab25545e3f0e449229b04917abd64a0ba093d502d0577c7592e8cfb856233a3
diff --git a/media-video/aravis/aravis-0.1.14.ebuild b/media-video/aravis/aravis-0.1.14.ebuild
new file mode 100644
index 000000000000..5d0d72cf0220
--- /dev/null
+++ b/media-video/aravis/aravis-0.1.14.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit versionator
+
+KEYWORDS="~amd64"
+
+if [[ ${PV} == "9999" ]]; then
+	KEYWORDS=""
+	EGIT_REPO_URI="git://git.gnome.org/aravis"
+	EGIT_COMMIT="${aravis_LIVE_COMMIT:-master}"
+	inherit git-2 autotools
+fi
+
+DESCRIPTION="Library for video acquisition using Genicam cameras"
+HOMEPAGE="https://live.gnome.org/Aravis"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+IUSE="X gstreamer"
+
+GST_DEPEND="media-libs/gstreamer:0.10
+	media-libs/gst-plugins-base:0.10"
+
+RDEPEND=">=dev-libs/glib-2.22
+	dev-libs/libxml2
+	X? (
+		>=x11-libs/gtk+-2.12:2
+		${GST_DEPEND}
+		media-libs/gst-plugins-base:0.10
+		media-plugins/gst-plugins-xvideo:0.10
+	)
+	gstreamer? ( ${GST_DEPEND} )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-libs/gobject-introspection"
+
+if [[ -z ${EGIT_COMMIT} ]]; then
+	SRC_URI="mirror://gnome/sources/${PN}/$(get_version_component_range 1-2)/${P}.tar.xz"
+else
+	DEPEND+=" dev-util/gtk-doc dev-util/intltool"
+fi
+
+src_prepare() {
+	if [[ -n ${EGIT_COMMIT} ]]; then
+		intltoolize || die
+		gtkdocize || die
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	econf \
+		--disable-silent-rules \
+		--disable-static \
+		$(use_enable X viewer) \
+		$(use_enable gstreamer gst-plugin) \
+		--enable-introspection
+}
+
+src_install() {
+	emake install DESTDIR="${D}" aravisdocdir="/usr/share/doc/${PF}"
+	find "${D}" -name '*.la' -delete
+}
diff --git a/media-video/aravis/aravis-0.1.15.ebuild b/media-video/aravis/aravis-0.1.15.ebuild
new file mode 100644
index 000000000000..5d0d72cf0220
--- /dev/null
+++ b/media-video/aravis/aravis-0.1.15.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit versionator
+
+KEYWORDS="~amd64"
+
+if [[ ${PV} == "9999" ]]; then
+	KEYWORDS=""
+	EGIT_REPO_URI="git://git.gnome.org/aravis"
+	EGIT_COMMIT="${aravis_LIVE_COMMIT:-master}"
+	inherit git-2 autotools
+fi
+
+DESCRIPTION="Library for video acquisition using Genicam cameras"
+HOMEPAGE="https://live.gnome.org/Aravis"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+IUSE="X gstreamer"
+
+GST_DEPEND="media-libs/gstreamer:0.10
+	media-libs/gst-plugins-base:0.10"
+
+RDEPEND=">=dev-libs/glib-2.22
+	dev-libs/libxml2
+	X? (
+		>=x11-libs/gtk+-2.12:2
+		${GST_DEPEND}
+		media-libs/gst-plugins-base:0.10
+		media-plugins/gst-plugins-xvideo:0.10
+	)
+	gstreamer? ( ${GST_DEPEND} )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-libs/gobject-introspection"
+
+if [[ -z ${EGIT_COMMIT} ]]; then
+	SRC_URI="mirror://gnome/sources/${PN}/$(get_version_component_range 1-2)/${P}.tar.xz"
+else
+	DEPEND+=" dev-util/gtk-doc dev-util/intltool"
+fi
+
+src_prepare() {
+	if [[ -n ${EGIT_COMMIT} ]]; then
+		intltoolize || die
+		gtkdocize || die
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	econf \
+		--disable-silent-rules \
+		--disable-static \
+		$(use_enable X viewer) \
+		$(use_enable gstreamer gst-plugin) \
+		--enable-introspection
+}
+
+src_install() {
+	emake install DESTDIR="${D}" aravisdocdir="/usr/share/doc/${PF}"
+	find "${D}" -name '*.la' -delete
+}
diff --git a/media-video/aravis/aravis-9999.ebuild b/media-video/aravis/aravis-9999.ebuild
new file mode 100644
index 000000000000..5d0d72cf0220
--- /dev/null
+++ b/media-video/aravis/aravis-9999.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit versionator
+
+KEYWORDS="~amd64"
+
+if [[ ${PV} == "9999" ]]; then
+	KEYWORDS=""
+	EGIT_REPO_URI="git://git.gnome.org/aravis"
+	EGIT_COMMIT="${aravis_LIVE_COMMIT:-master}"
+	inherit git-2 autotools
+fi
+
+DESCRIPTION="Library for video acquisition using Genicam cameras"
+HOMEPAGE="https://live.gnome.org/Aravis"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+IUSE="X gstreamer"
+
+GST_DEPEND="media-libs/gstreamer:0.10
+	media-libs/gst-plugins-base:0.10"
+
+RDEPEND=">=dev-libs/glib-2.22
+	dev-libs/libxml2
+	X? (
+		>=x11-libs/gtk+-2.12:2
+		${GST_DEPEND}
+		media-libs/gst-plugins-base:0.10
+		media-plugins/gst-plugins-xvideo:0.10
+	)
+	gstreamer? ( ${GST_DEPEND} )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-libs/gobject-introspection"
+
+if [[ -z ${EGIT_COMMIT} ]]; then
+	SRC_URI="mirror://gnome/sources/${PN}/$(get_version_component_range 1-2)/${P}.tar.xz"
+else
+	DEPEND+=" dev-util/gtk-doc dev-util/intltool"
+fi
+
+src_prepare() {
+	if [[ -n ${EGIT_COMMIT} ]]; then
+		intltoolize || die
+		gtkdocize || die
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	econf \
+		--disable-silent-rules \
+		--disable-static \
+		$(use_enable X viewer) \
+		$(use_enable gstreamer gst-plugin) \
+		--enable-introspection
+}
+
+src_install() {
+	emake install DESTDIR="${D}" aravisdocdir="/usr/share/doc/${PF}"
+	find "${D}" -name '*.la' -delete
+}
diff --git a/media-video/aravis/metadata.xml b/media-video/aravis/metadata.xml
new file mode 100644
index 000000000000..1bfe243d4f2d
--- /dev/null
+++ b/media-video/aravis/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>lu_zero@gentoo.org</email>
+  </maintainer>
+
+  <maintainer type="project">
+    <email>media-video@gentoo.org</email>
+    <name>Gentoo Video project</name>
+  </maintainer>
+
+  <use>
+    <flag name="X">
+      Build the GTK+-based video viewer for aravis. This requires
+      GStreamer and a few plugins but technically not the GST plugin
+      for aravis.
+    </flag>
+
+    <flag name="gstreamer">
+      Build the GStreamer plugin for aravis, but not the video viewer.
+    </flag>
+  </use>
+</pkgmetadata>
diff --git a/media-video/asfrecorder/Manifest b/media-video/asfrecorder/Manifest
new file mode 100644
index 000000000000..90c20ff6c794
--- /dev/null
+++ b/media-video/asfrecorder/Manifest
@@ -0,0 +1,5 @@
+DIST ASFRecorder.zip 377571 SHA256 fd94d102231a31a56c368e02a30e6e700573a0f145c8be48173843b7e9054ea8 SHA512 ca541c56e5f744df3415d97b9256e59db8d0e9adf8a3da2ec8b6b21b59153c4b7ee489971201c8d47caf7637cca62cfd463cc189793057b78d81a6bf409e0485 WHIRLPOOL fc453a88e4119074a8a8caff932a68aad810ed0afc31d1c13fa172f5cd0397b3380b27e16d44a7da6167324d3e6da5d08c3056850a85b590a515004a10f59d00
+EBUILD asfrecorder-1.1.ebuild 811 SHA256 c7ba8eeefeab9f2db877a236d1a404aee9a786efe3d7c7aa66eff0c07206c534 SHA512 f69be30c00c5e7064c6c8ed454561ffa003b38073528eb2a0436ca9d6e02e026ec8a17837f2573fbfe9ae1d68f5e936523bafe7be9241b11d2c8180325e35eb2 WHIRLPOOL c2f7e38f4e9f229b11b156d239f20a4ba8d251adfb29e65ae1f9e61d23560987c46f948e474ccdc2ac437016bece54623f882eb12ed9905137750e890f7f2e97
+MISC ChangeLog 2552 SHA256 009cb362762f51a1936185e2f4ac081eea3d4a25972d0b16caef64b8005217fe SHA512 10e3f75a06585280caa20805579968370efb9ffaaad1f38aa66776324da7f2b1acbcb6b722865f84a3ddfb14c2621a6e2a6a622569c7d132ef3484d4aab01223 WHIRLPOOL e45a63dd5d1deb90eeb99d0b4126b209e04265e68d5cbd39f51b988d19fcdf3fb4ff6080c40b198c400f1257faf5152d6fd0765f3f5186057d973039d69fd055
+MISC ChangeLog-2015 1949 SHA256 8f86e3d462ecf6d19e656495ee2d3ee413d492508a9b650b65a03ca5d0178487 SHA512 18c46df13f08baf32407ddd204f59863331fcc5f75ec37ce8b20bc37d306dabdf07cb6212a393b954953e321125e4da7258827540e8586071a3d3255bed5ec3c WHIRLPOOL 6a71a6e98484e11e74e672ceedd879a18b65dd987890e2ebfca479dc814fe4dc43945200ce158b21fb34cc4deb209bb7be96d7774832ab44ed14ae4dd3f2288d
+MISC metadata.xml 304 SHA256 a9cae6731cf2e514e77c4a7fcce543698b80a7da35f65a4bdadd0b55a45468d1 SHA512 4af698eb6e94b51cbac7357fd6418aa3c75f3831826f61fa0a82e1bd8bb5c7e29d132062fc50c031f6dd616710988904488e0e2ab9fec8d64b5fdf473f865560 WHIRLPOOL 773447d829005a36e1d659c50b3d50fb9833f0aba81bc0affe177ec694dacc8447a5832a3b56ac2ec498a6ab2b68af2c3977193fb3a68a37e12ae5f6082b5741
diff --git a/media-video/asfrecorder/asfrecorder-1.1.ebuild b/media-video/asfrecorder/asfrecorder-1.1.ebuild
new file mode 100644
index 000000000000..29691025a4ae
--- /dev/null
+++ b/media-video/asfrecorder/asfrecorder-1.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit toolchain-funcs
+
+MY_PN="${PN/asfr/ASFR}"
+DESCRIPTION="ASFRecorder - Download Windows Media Streaming files"
+HOMEPAGE="https://sourceforge.net/projects/asfrecorder/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}.zip"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ppc x86 ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}/${MY_PN}
+
+src_compile() {
+	# There is a Makefile, but it only works for Cygwin, so we
+	# only compile this single program.
+	cd "${S}"/source
+	$(tc-getCC) -o asfrecorder ${CFLAGS} ${LDFLAGS} asfrecorder.c || die "Build failed"
+}
+
+src_install () {
+	# Again, no makefiles, so just take what we want.
+	dobin source/asfrecorder
+	dodoc README.TXT
+}
diff --git a/media-video/asfrecorder/metadata.xml b/media-video/asfrecorder/metadata.xml
new file mode 100644
index 000000000000..e0d8b09be0d0
--- /dev/null
+++ b/media-video/asfrecorder/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">asfrecorder</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/atomicparsley-wez/Manifest b/media-video/atomicparsley-wez/Manifest
new file mode 100644
index 000000000000..75f22e57265f
--- /dev/null
+++ b/media-video/atomicparsley-wez/Manifest
@@ -0,0 +1,5 @@
+DIST atomicparsley-wez-0.9.6.tar.bz2 178956 SHA256 e28d46728be86219e6ce48695ea637d831ca0170ca6bdac99810996a8291ee50 SHA512 1f094fd4d43f652319abd2eee70529d9a57e7843b4b725815b9939ad90cf56e3f061ffd9104507a7d74cabbdd9b7cb24ca12d30c88a89832629da3091bbcf1b6 WHIRLPOOL 701076bc72d49a74b96afb210035b1c121f686ff45dc95d6f11dfcb34a83f8cb7fbd38328cd156d848d200954e7ff34f27dc07fc1dd7d11280540dd608c93a98
+EBUILD atomicparsley-wez-0.9.6.ebuild 706 SHA256 4a23fc58807a05dacb1eb24d6e94c20af09d1efadb5ac1dfba27143fe4a71c5d SHA512 02e001d95d8ecbf656b28d2b5e0a998251a643adf7d28c6ba8e923007ccd806c71687354fa738bac83f726f84450f3de31427d93f5b95fd197e2e123f1cd5a18 WHIRLPOOL 4e09274cf4ef6418695363fe658e8411b213efa9ce9ec5e5bc60003dc54d0e42337a39b8f936fa3de7ced057b930e862b13f0131b13ab89734b3c7b455e3d273
+MISC ChangeLog 3291 SHA256 683c972a291d8f3082ac02fab1bba2f04d59ef2df18dc2de4c7cfa24a552e3a6 SHA512 97c88eaa9c2c3626404b34152d76b05c1725fa8b801d0ffafc8069961aabf4fa58bcc9e45f28198adcf9f2a52c74ec80122c176db07d8ccf14d6e8a75e880e6b WHIRLPOOL 5e88c51fdc09ac8b39b029fce577b26a071e08a405948017dd63fc12144f27d7ea92d31740f918a05a71ceaa1664f8102e1186b5003da99d464fd407639fb84c
+MISC ChangeLog-2015 410 SHA256 60956b0b929818c68a0c35a244f9144f965db43476e813142c1ab9710093db8e SHA512 9977f21fa3cad9adc3d59be994f1871e330a1aa9c9184e353881e8448759e6b67294391bbc3be81d38af65c35755ac6e244a177500a48da641bfe09268463ba0 WHIRLPOOL 8e174105e5738eb570dbde45d869d908d0b71447aa8f04ea150212fa7712955a60c3a237d535d4951cee4d7649fc1fad3f320dc51cd970114b29f6fd203280a3
+MISC metadata.xml 365 SHA256 948bc090cb6f7639aa8e0868dde059caca3538c20b28d3816ca39031947576be SHA512 f634055357e9aa696af346204c57499d7cff56ad5cf9842d0aa5e82e1b8579084c38331965d5b8771635b792921d6a9ad1d597257b04081322b4d518d2e1df58 WHIRLPOOL 84be2c368888feea978224aee84336c15aa458e6c2f318b1bf3802ce79a22a972ad641c558cdf81e55627d939be93d04c25b5ce9e6d566bf721b56ee4f92902b
diff --git a/media-video/atomicparsley-wez/atomicparsley-wez-0.9.6.ebuild b/media-video/atomicparsley-wez/atomicparsley-wez-0.9.6.ebuild
new file mode 100644
index 000000000000..87fbafb2ae38
--- /dev/null
+++ b/media-video/atomicparsley-wez/atomicparsley-wez-0.9.6.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools flag-o-matic
+
+MY_PN=${PN/-wez}
+
+DESCRIPTION="command line program for reading, parsing and setting iTunes-style metadata in MPEG4 files"
+HOMEPAGE="https://github.com/wez/atomicparsley"
+SRC_URI="https://bitbucket.org/wez/${MY_PN}/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="sys-libs/zlib
+	!media-video/atomicparsley"
+DEPEND="${RDEPEND}"
+
+DOCS="Changes.txt CREDITS"
+
+src_unpack() {
+	unpack ${A}
+	mv *-${MY_PN}-* "${S}"
+}
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	econf
+}
diff --git a/media-video/atomicparsley-wez/metadata.xml b/media-video/atomicparsley-wez/metadata.xml
new file mode 100644
index 000000000000..272eb3257ab5
--- /dev/null
+++ b/media-video/atomicparsley-wez/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">wez/atomicparsley</remote-id>
+		<remote-id type="bitbucket">wez/atomicparsley</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/atomicparsley/Manifest b/media-video/atomicparsley/Manifest
new file mode 100644
index 000000000000..2f5d871502a8
--- /dev/null
+++ b/media-video/atomicparsley/Manifest
@@ -0,0 +1,7 @@
+AUX atomicparsley-0.9.0-environment.patch 6195 SHA256 842fe5f974962c5a768dc7cb500e153cdfd1d59f07734b70a39a93d6796b3f5c SHA512 99e871d3ec76a4d6ff0c254241a9eca591786712ddce906d4f6df26a57142e28e489c4d289b4d24977cbbe2352d5e537532f82a561d57476cc63e07d2c7e2eb3 WHIRLPOOL 86a7c39f019cf57ec2690e15aea1faed145632b5feffe30160a45009b08fda802797d78e6ea00ee9a1331081356c212f5d7a2293ab8388ec16e9dc77653f5d30
+AUX atomicparsley-0.9.0-glibc-2.10.patch 1988 SHA256 9e0895bcfd2a056e837a58471c62f7ac51d56bbce33eb8d11eddc68a41085b0e SHA512 a139ec08b6918d1a879c97a294f6ec7cafe7c98eb81db977987ca274334347c7954a3f71d9facad72642654e79b3de742ea7ea2c5ec008b79ac89cfb6c936874 WHIRLPOOL 2755c1f2230a5afd17d74184063413817d72ed07c8c8dbb1811fde88a517565ea4988e5198374d3e7908fec554398723a844cee4c236b55157e99b647a71918e
+DIST AtomicParsley-source-0.9.0.zip 172616 SHA256 1344a66170e1f324eb43618763dbcfe984ca84c64ea8baf81e99e59657e082f7 SHA512 a4733893bb0d8bf824ee46d7da7f8c2ab9338ae56ea89810db1ac40282554e7e095b3e88631786b248a66aba878f166b9ac403769c66ef3ad45ac8ff7d411982 WHIRLPOOL d492ef1a3bbf77025362ae0fc36bae78e65e13b61e364cc810601f19a3e2d6662cb48a22758e4eabb6ba756aa75ea30e610cc46dfbaa47afc2f7c9e4f8df246f
+EBUILD atomicparsley-0.9.0.ebuild 892 SHA256 b3c76fcd2c47cd85ea2e9c091f1897bef6fb5fa1a8fba60b910c80de1721643c SHA512 3482d8caa0237cd3085a955d7da60aab856e81e6cf2686aea9682bed5771610a195e016100989008ccf933a496dd4486bc5fc54afbb305943aae1d26e104106a WHIRLPOOL 33ec80bbb85d000a03ac4976676b31ad7cba3a8a7cb0d4fed665bbe79230829021ffcc7b3016919c34bb3ba6752e4acb3b8634ea5d872c8511e3fbe54187251f
+MISC ChangeLog 2541 SHA256 ecc751b8877bbed2afa7f1c3954f8349d37cc41a062ae6da5d3e592e77ec6037 SHA512 120ce0a5b4e4c3df307b7bc61b48477f9d16bfcdfd5fbf232049ca78d92af8c377e8b0ba08ede73db103714ea7e4f5300a027aee0d5d95f05d818ccf4280bfa9 WHIRLPOOL 33ab4abbb926d8cfa0c2199616ae97b0eb3ce9cba3213247fd26592d9b1eefd1c9462b1620a9467bff96b4c8b3222f5460461c30417b8fa1cdeb60b9f9fa376a
+MISC ChangeLog-2015 2498 SHA256 e25c0785c396bec645deeda068caf874a6cf260c868f7e363fd68279cce90715 SHA512 9d092c36563ac4da3fdb346d5f10e8c7aab433e4f5426ed5d8bd5bed6375029dc8b667c635fa2b61588d3d47f5fec48edf4df62b838a8d273181e2983249becc WHIRLPOOL 24c5fc44d5ee50ccff9002d0f55396c3061609c29f9563c50eedfc016707160093fee798400679419322340a082d132381866c3e1a377ebbbb6e8e2db7aba6b0
+MISC metadata.xml 306 SHA256 6383242db3fa3c4574f6532581b24e6bd255aae01a07dc908a0cab94008e186c SHA512 db5fd17c01260020d0e1df5ffc2dcb3f4c904467b627256f004e13aad5de0c89ea67fe53d7a8092a0549ee6e4acbf30d6a6820329ac45511c210504e94aeae2a WHIRLPOOL 1a98adc6d00866fccd2b94fc9c5bfe8dcf699a86777a4fc4b5d4cc71e0a8abd20aa72a90b762c9afd70e5583547e12e698755a1e92067581a6cb45aa465771c0
diff --git a/media-video/atomicparsley/atomicparsley-0.9.0.ebuild b/media-video/atomicparsley/atomicparsley-0.9.0.ebuild
new file mode 100644
index 000000000000..c80ea969acdf
--- /dev/null
+++ b/media-video/atomicparsley/atomicparsley-0.9.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+MY_P=AtomicParsley-source-${PV}
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="command line program for reading, parsing and setting iTunes-style metadata in MPEG4 files"
+HOMEPAGE="http://atomicparsley.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-glibc-2.10.patch \
+		"${FILESDIR}"/${P}-environment.patch
+}
+
+src_compile() {
+	# APar_sha1.cpp:116:47 and 117:43: warning: dereferencing type-punned
+	# pointer will break strict-aliasing rules
+	append-flags -fno-strict-aliasing
+	tc-export CXX
+	./build || die
+}
+
+src_install() {
+	dobin AtomicParsley
+	dodoc *.{txt,rtf}
+}
diff --git a/media-video/atomicparsley/files/atomicparsley-0.9.0-environment.patch b/media-video/atomicparsley/files/atomicparsley-0.9.0-environment.patch
new file mode 100644
index 000000000000..6db9c79a3275
--- /dev/null
+++ b/media-video/atomicparsley/files/atomicparsley-0.9.0-environment.patch
@@ -0,0 +1,80 @@
+diff -ur AtomicParsley-source-0.9.0.orig/build AtomicParsley-source-0.9.0/build
+--- AtomicParsley-source-0.9.0.orig/build	2006-09-10 18:02:58.000000000 +0300
++++ AtomicParsley-source-0.9.0/build	2009-07-22 01:19:39.000000000 +0300
+@@ -39,45 +39,45 @@
+ 
+ echo "Compiling AP_commons.cpp ..."
+ 
+-g++ -g -O2 -Wall -MT obj_files/AP_commons.o -MD -MP -MF "./obj_files/AP_commons.Tpo" -c -o obj_files/AP_commons.o AP_commons.cpp
++${CXX} ${CXXFLAGS} -Wall -MT obj_files/AP_commons.o -MD -MP -MF "./obj_files/AP_commons.Tpo" -c -o obj_files/AP_commons.o AP_commons.cpp
+ 
+ echo "Compiling AtomicParsley_genres.cpp ..."
+ 
+-g++ -g -O2 -Wall -MT obj_files/AtomicParsley_genres.o -MD -MP -MF "./obj_files/AtomicParsley_genres.Tpo" -c -o obj_files/AtomicParsley_genres.o AtomicParsley_genres.cpp
++${CXX} ${CXXFLAGS} -Wall -MT obj_files/AtomicParsley_genres.o -MD -MP -MF "./obj_files/AtomicParsley_genres.Tpo" -c -o obj_files/AtomicParsley_genres.o AtomicParsley_genres.cpp
+ 
+ echo "Compiling AP_iconv.cpp ..."
+ 
+-g++ -g -O2 -Wall $EXTRA_CPP_FLAGS -MT AP_iconv.o -MD -MP -MF "./obj_files/AP_iconv.Tpo" -c -o obj_files/AP_iconv.o AP_iconv.cpp
++${CXX} ${CXXFLAGS} -Wall $EXTRA_CPP_FLAGS -MT AP_iconv.o -MD -MP -MF "./obj_files/AP_iconv.Tpo" -c -o obj_files/AP_iconv.o AP_iconv.cpp
+ 
+ if test $OS = Darwin ; then
+   echo "Compiling AP_NSFile_utils.mm ..."
+ 
+-  g++ -g -O2 -Wall -MT obj_files/AP_NSFile_utils.o -MD -MP -MF "./obj_files/AP_NSFile_utils.Tpo" -c -o obj_files/AP_NSFile_utils.o AP_NSFile_utils.mm
++  ${CXX} ${CXXFLAGS} -Wall -MT obj_files/AP_NSFile_utils.o -MD -MP -MF "./obj_files/AP_NSFile_utils.Tpo" -c -o obj_files/AP_NSFile_utils.o AP_NSFile_utils.mm
+ 
+   echo "Compiling AP_NSImage.mm ..."
+ 
+-  g++ -g -O2 -Wall -MT obj_files/AP_NSImage.o -MD -MP -MF "./obj_files/AP_NSImage.Tpo" -c -o obj_files/AP_NSImage.o AP_NSImage.mm
++  ${CXX} ${CXXFLAGS} -Wall -MT obj_files/AP_NSImage.o -MD -MP -MF "./obj_files/AP_NSImage.Tpo" -c -o obj_files/AP_NSImage.o AP_NSImage.mm
+ fi
+ 
+ echo "Compiling AtomicParsley.cpp ..."
+ 
+-g++ -g -O2 -Wall -Wno-unused $EXTRA_CPP_FLAGS -MT obj_files/AtomicParsley.o -MD -MP -MF "./obj_files/AtomicParsley.Tpo" -c -o obj_files/AtomicParsley.o AtomicParsley.cpp
++${CXX} ${CXXFLAGS} -Wall -Wno-unused $EXTRA_CPP_FLAGS -MT obj_files/AtomicParsley.o -MD -MP -MF "./obj_files/AtomicParsley.Tpo" -c -o obj_files/AtomicParsley.o AtomicParsley.cpp
+ 
+ echo "Compiling AP_AtomExtracts.cpp ..."
+ 
+-g++ -g -O2 -Wall $EXTRA_CPP_FLAGS -I../AtomicParsley -MT obj_files/AP_AtomExtracts.o -MD -MP -MF "./obj_files/AP_AtomExtracts.Tpo" -c -o obj_files/AP_AtomExtracts.o AP_AtomExtracts.cpp
++${CXX} ${CXXFLAGS} -Wall $EXTRA_CPP_FLAGS -I../AtomicParsley -MT obj_files/AP_AtomExtracts.o -MD -MP -MF "./obj_files/AP_AtomExtracts.Tpo" -c -o obj_files/AP_AtomExtracts.o AP_AtomExtracts.cpp
+ 
+ echo "Compiling APar_sha1.cpp ..."
+ 
+-g++ -g -O2 -Wall $EXTRA_CPP_FLAGS -I../AtomicParsley -MT obj_files/APar_sha1.o -MD -MP -MF "./obj_files/APar_sha1.Tpo" -c -o obj_files/APar_sha1.o APar_sha1.cpp
++${CXX} ${CXXFLAGS} -Wall $EXTRA_CPP_FLAGS -I../AtomicParsley -MT obj_files/APar_sha1.o -MD -MP -MF "./obj_files/APar_sha1.Tpo" -c -o obj_files/APar_sha1.o APar_sha1.cpp
+ 
+ echo "Compiling APar_uuid.cpp ..."
+ 
+-g++ -g -O2 -Wall $EXTRA_CPP_FLAGS -I../AtomicParsley -MT obj_files/APar_uuid.o -MD -MP -MF "./obj_files/APar_uuid.Tpo" -c -o obj_files/APar_uuid.o APar_uuid.cpp
++${CXX} ${CXXFLAGS} -Wall $EXTRA_CPP_FLAGS -I../AtomicParsley -MT obj_files/APar_uuid.o -MD -MP -MF "./obj_files/APar_uuid.Tpo" -c -o obj_files/APar_uuid.o APar_uuid.cpp
+ 
+ echo "Compiling main.cpp ..."
+ 
+-g++ -g -O2 -Wall $EXTRA_CPP_FLAGS -I../AtomicParsley -MT obj_files/main.o -MD -MP -MF "./obj_files/main.Tpo" -c -o obj_files/main.o main.cpp
++${CXX} ${CXXFLAGS} -Wall $EXTRA_CPP_FLAGS -I../AtomicParsley -MT obj_files/main.o -MD -MP -MF "./obj_files/main.Tpo" -c -o obj_files/main.o main.cpp
+ 
+ #---------------------------------------------#
+ #                  Linking                    #
+@@ -85,16 +85,16 @@
+ echo "Linking AtomicParsley..."
+ 
+ if test $OS = Darwin ; then
+-  g++ -g -O2 -Wall -framework Cocoa -o AtomicParsley obj_files/APar_sha1.o obj_files/APar_uuid.o obj_files/AP_commons.o obj_files/AtomicParsley_genres.o obj_files/AP_iconv.o obj_files/AP_NSFile_utils.o obj_files/AP_NSImage.o obj_files/AP_AtomExtracts.o obj_files/AtomicParsley.o obj_files/main.o
++  ${CXX} ${LDFLAGS} -Wall -framework Cocoa -o AtomicParsley obj_files/APar_sha1.o obj_files/APar_uuid.o obj_files/AP_commons.o obj_files/AtomicParsley_genres.o obj_files/AP_iconv.o obj_files/AP_NSFile_utils.o obj_files/AP_NSImage.o obj_files/AP_AtomExtracts.o obj_files/AtomicParsley.o obj_files/main.o
+ 
+ elif test $OS = Linux ; then
+-  g++ -O2 -Wall -o AtomicParsley obj_files/APar_sha1.o obj_files/APar_uuid.o obj_files/AP_commons.o obj_files/AtomicParsley_genres.o obj_files/AP_iconv.o obj_files/AP_AtomExtracts.o obj_files/AtomicParsley.o obj_files/main.o
++  ${CXX} ${LDFLAGS} -Wall -o AtomicParsley obj_files/APar_sha1.o obj_files/APar_uuid.o obj_files/AP_commons.o obj_files/AtomicParsley_genres.o obj_files/AP_iconv.o obj_files/AP_AtomExtracts.o obj_files/AtomicParsley.o obj_files/main.o
+ 
+ elif test $OS = CYGWIN ; then
+-  g++ -g -O2 -Wall -o AtomicParsley.exe obj_files/APar_sha1.o obj_files/APar_uuid.o  obj_files/AP_commons.o obj_files/AtomicParsley_genres.o obj_files/AP_iconv.o obj_files/AP_AtomExtracts.o obj_files/AtomicParsley.o obj_files/main.o -lgcc 
++  ${CXX} ${LDFLAGS} -Wall -o AtomicParsley.exe obj_files/APar_sha1.o obj_files/APar_uuid.o  obj_files/AP_commons.o obj_files/AtomicParsley_genres.o obj_files/AP_iconv.o obj_files/AP_AtomExtracts.o obj_files/AtomicParsley.o obj_files/main.o -lgcc 
+ 
+ else
+-  g++ -g -O2 -Wall -o AtomicParsley.exe obj_files/APar_sha1.o obj_files/APar_uuid.o obj_files/AP_commons.o obj_files/AtomicParsley_genres.o obj_files/AP_iconv.o obj_files/AP_AtomExtracts.o obj_files/AtomicParsley.o obj_files/main.o
++  ${CXX} ${CXXFLAGS} -Wall -o AtomicParsley.exe obj_files/APar_sha1.o obj_files/APar_uuid.o obj_files/AP_commons.o obj_files/AtomicParsley_genres.o obj_files/AP_iconv.o obj_files/AP_AtomExtracts.o obj_files/AtomicParsley.o obj_files/main.o
+ fi
+ 
+ #---------------------------------------------#
diff --git a/media-video/atomicparsley/files/atomicparsley-0.9.0-glibc-2.10.patch b/media-video/atomicparsley/files/atomicparsley-0.9.0-glibc-2.10.patch
new file mode 100644
index 000000000000..0397a4e42bca
--- /dev/null
+++ b/media-video/atomicparsley/files/atomicparsley-0.9.0-glibc-2.10.patch
@@ -0,0 +1,39 @@
+diff -ur AtomicParsley-source-0.9.0.orig/AtomicParsley.cpp AtomicParsley-source-0.9.0/AtomicParsley.cpp
+--- AtomicParsley-source-0.9.0.orig/AtomicParsley.cpp	2006-09-16 02:22:33.000000000 +0300
++++ AtomicParsley-source-0.9.0/AtomicParsley.cpp	2009-07-22 00:52:48.000000000 +0300
+@@ -1447,7 +1447,7 @@
+ 	uint32_t atom_offsets = 0;
+ 	char* uuid_outfile = (char*)calloc(1, sizeof(char)*MAXPATHLEN+1); //malloc a new string because it may be a cli arg for a specific output path	
+ 	if (output_path == NULL) {
+-		char* orig_suffix = strrchr(originating_file, '.');
++		const char* orig_suffix = strrchr(originating_file, '.');
+ 		if (orig_suffix == NULL) {
+ 			fprintf(stdout, "AP warning: a file extension for the input file was not found.\n\tGlobbing onto original filename...\n");
+ 			path_len = strlen(originating_file);
+@@ -4462,7 +4462,7 @@
+ #endif
+ 
+ void APar_DeriveNewPath(const char *filePath, char* temp_path, int output_type, const char* file_kind, char* forced_suffix, bool random_filename = true) {
+-	char* suffix = NULL;
++	const char* suffix = NULL;
+ 	if (forced_suffix == NULL) {
+ 		suffix = strrchr(filePath, '.');
+ 	} else {
+@@ -4480,7 +4480,7 @@
+ 		memcpy(temp_path, filePath, base_len);
+ 		memcpy(temp_path + base_len, file_kind, strlen(file_kind));
+ #else
+-		char* file_name = strrchr(filePath, '/');
++		const char* file_name = strrchr(filePath, '/');
+ 		size_t file_name_len = strlen(file_name);
+ 		memcpy(temp_path, filePath, filepath_len-file_name_len+1);
+ 		memcpy(temp_path + strlen(temp_path), ".", 1);
+@@ -5006,7 +5006,7 @@
+ 			free_modified_name = true;
+ 			if (forced_suffix_type == FORCE_M4B_TYPE) { //using --stik Audiobook with --overWrite will change the original file's extension
+ 				uint16_t filename_len = strlen(m4aFile);
+-				char* suffix = strrchr(m4aFile, '.');
++				const char* suffix = strrchr(m4aFile, '.');
+ 				memcpy(originating_file, m4aFile, filename_len+1 );
+ 				memcpy(originating_file + (filename_len - strlen(suffix) ), ".m4b", 5 );
+ 			}
diff --git a/media-video/atomicparsley/metadata.xml b/media-video/atomicparsley/metadata.xml
new file mode 100644
index 000000000000..52009b050aaa
--- /dev/null
+++ b/media-video/atomicparsley/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">atomicparsley</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
new file mode 100644
index 000000000000..bc21321d7a90
--- /dev/null
+++ b/media-video/avidemux/Manifest
@@ -0,0 +1,8 @@
+DIST avidemux_2.6.20.tar.gz 20172362 SHA256 03c6cb7fc9eb74688b4fcd5eb654ed7b9c4ffc717a72cc09b08a2d10cdc7ef9f SHA512 d01d0fc24a3004770bd3923c2debc4fa2752eb71df08cfe423746b9c44a2562ca01d82965ed2563b99572a4bed8034b79487199ce330208b51a3b7f87ccf7103 WHIRLPOOL 2e2dc21bed49eeb0cdfefe75fe51f6a84226e7e8e80b063bc0b3d8711a6b91db710611dc0ec06575be69ec8e24f2f9e5b5eb363b9c095267729e85e162a4ce38
+DIST avidemux_2.6.8.tar.gz 17380534 SHA256 02998c235a89894d184d745c94cac37b78bc20e9eb44b318ee2bb83f2507e682 SHA512 57a4042f1a9d46462850871d36950215c5ffb5b66ce2f2cde09d747e946c05adb7a550ac7763c96f4c1bcb2c39881407d9d88bc64c93053741091751495ba0b0 WHIRLPOOL 29f8a6039d82e686e8dfbfc7b23658921834238a4cc6c4de338afdfdc032a9a7cba1c8236789aa6dbcab318ec14c344c19563f153e6cbd63cd265c5fb15b44b6
+EBUILD avidemux-2.6.20.ebuild 4429 SHA256 1d3faeeb54d83aab20edd51e8baad2f9e2b564f0a272c7bb5292f223892f6106 SHA512 bfb165003b197c1bd6ce6579cc5ef2ef6e974087bb66589cf7f72d50f0f0fe0521bfa9f1cec00cc3abb9f2a03b87bc046c6c0fb94ab0f58176afc5581d92acee WHIRLPOOL 3bab699388501377585ec4277b0070ff666a235b2f9c2823fa8aca65b3a98bbc23c2acc1081132cff3bfe6034bcc2dfbbb2a6fe80f8e19d96dcc7942a358b8d9
+EBUILD avidemux-2.6.8.ebuild 3756 SHA256 172e966eb9bbd8c601fd9e9955bb1734661c50ce4b691983bf6650a0f8b75e9b SHA512 81fe43ed4d4e4263587310b5a14eaf355dddee13d145e6417b9cbd528e2bff230dc16e63b39004977be61ca8ee3507cfb4b438f88e9778f0087da08b74b0bf0a WHIRLPOOL 53e6427ad1939f300c90c1268e528ee6faa14208cb8e0250ccb929b40c398c2bd6da8588b793a5a3c9b92d69cb877847b9ef7e3d5e8d86da2403d22cf389bccc
+EBUILD avidemux-9999.ebuild 4429 SHA256 1d3faeeb54d83aab20edd51e8baad2f9e2b564f0a272c7bb5292f223892f6106 SHA512 bfb165003b197c1bd6ce6579cc5ef2ef6e974087bb66589cf7f72d50f0f0fe0521bfa9f1cec00cc3abb9f2a03b87bc046c6c0fb94ab0f58176afc5581d92acee WHIRLPOOL 3bab699388501377585ec4277b0070ff666a235b2f9c2823fa8aca65b3a98bbc23c2acc1081132cff3bfe6034bcc2dfbbb2a6fe80f8e19d96dcc7942a358b8d9
+MISC ChangeLog 3639 SHA256 3a79a443e426c7880449f1b2cb9a46029fad0e5f38d292e0eb95a9fba14cfbf7 SHA512 10d5194ff3371f4d98eaf444c00958f3b597732b8d8f7f08156ff4fd629a7223637e96feb76af5f5f447be6a354e056a25c91cae10c3d17efd23be7a7c948c6a WHIRLPOOL 97abe8eaf9b159d491e2a07a52f0b0024e064eddfadf25eaec3d19e1379f8c535a61479c06ef07feb8cceba884b92e3a9302c7efb67460255bb5398ff2d2d0b9
+MISC ChangeLog-2015 43501 SHA256 bf5c8b539d6e30ac299b9383b3c3dda2ce8a5bb087860335f6b970b174da3957 SHA512 e85c2de4babc72668e180da6e580876ae2c6cef1cc0826b96546e9838e071949c167507ab02ee943d97d7e4ab77b90116e615fdcecfc10dc1326d4f7ceed6652 WHIRLPOOL b070add4eed7e98da1dfea88a5f534b50944c7ebdef40bdc4e8e38eeb860509d57f95a04f58429a163375f0c3d9084e73b28e13cf5267b7d40159c5d5a0b9754
+MISC metadata.xml 489 SHA256 cea0a7554482097ce99fec34fb6abb767c09620acf42d23842285d4efb4ae9f3 SHA512 7a1b885e05a9bb6684583dcaefc5853903330bbcfc6b1e07b76cde7405894d94e0f095fcfe18bc33bc24c1bbf260814c9ebb8219397e0e861a2fb5977361bc4d WHIRLPOOL f00dfaf7eeaaa1302955b696309f4d3b75ea64b483b0bca62098cb36a1edd4b49fa40043df1968bc6ca2100a085819e105b183e375575bc7a2c73b57170f68a5
diff --git a/media-video/avidemux/avidemux-2.6.20.ebuild b/media-video/avidemux/avidemux-2.6.20.ebuild
new file mode 100644
index 000000000000..72ad632f6969
--- /dev/null
+++ b/media-video/avidemux/avidemux-2.6.20.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PLOCALES="ca cs de el es fr it ja pt_BR ru sr sr@latin tr"
+
+inherit cmake-utils l10n xdg-utils
+
+DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
+HOMEPAGE="http://fixounet.free.fr/${PN}"
+
+# Multiple licenses because of all the bundled stuff.
+LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
+SLOT="2.6"
+IUSE="debug opengl nls nvenc qt4 qt5 sdl vaapi vdpau xv"
+
+if [[ ${PV} == *9999* ]] ; then
+	MY_P="${P}"
+	EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"
+
+	inherit git-r3
+else
+	MY_P="${PN}_${PV}"
+	SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DEPEND="
+	~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?]
+	opengl? ( virtual/opengl:0 )
+	qt4? ( >=dev-qt/qtgui-4.8.3:4 )
+	qt5? ( dev-qt/qtgui:5 )
+	vaapi? ( x11-libs/libva:0 )
+	nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) )
+"
+RDEPEND="
+	$DEPEND
+	nls? ( virtual/libintl:0 )
+"
+PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt4?,qt5?]"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	processes="buildCli:avidemux/cli"
+	if use qt4 || use qt5 ; then
+		processes+=" buildQt4:avidemux/qt4"
+	fi
+
+	for process in ${processes} ; do
+		CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare
+	done
+
+	# Fix icon name -> avidemux-2.6.png
+	sed -i -e "/^Icon/ s:${PN}:${PN}-2.6:" ${PN}2.desktop || die "Icon name fix failed."
+
+	# The desktop file is broken. It uses avidemux2 instead of avidemux3
+	# so it will actually launch avidemux-2.5 if it is installed.
+	sed -i -e "/^Exec/ s:${PN}2:${PN}3:" ${PN}2.desktop || die "Desktop file fix failed."
+	sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt'$(usex qt5 5 4)':' ${PN}2.desktop || die "Desktop file fix failed."
+
+	# Fix QA warnings that complain a trailing ; is missing and Application is deprecated.
+	sed -i -e 's/Application;AudioVideo/AudioVideo;/g' ${PN}2.desktop || die "Desktop file fix failed."
+
+	# Now rename the desktop file to not collide with 2.5.
+	mv ${PN}2.desktop ${PN}-2.6.desktop || die "Collision rename failed."
+
+	# Remove "Build Option" dialog because it doesn't reflect what the GUI can or has been built with. (Bug #463628)
+	sed -i -e '/Build Option/d' avidemux/common/ADM_commonUI/myOwnMenu.h || die "Couldn't remove \"Build Option\" dialog."
+}
+
+src_configure() {
+	# Add lax vector typing for PowerPC.
+	if use ppc || use ppc64 ; then
+		append-cflags -flax-vector-conversions
+	fi
+
+	# See bug 432322.
+	use x86 && replace-flags -O0 -O1
+
+	# The build relies on an avidemux-core header that uses 'nullptr'
+	# which is from >=C++11.  Let's use the GCC-6 default C++ dialect.
+	append-cxxflags -std=c++14
+
+	local mycmakeargs=(
+		-DAVIDEMUX_SOURCE_DIR='${S}'
+		-DGETTEXT="$(usex nls)"
+		-DSDL="$(usex sdl)"
+		-DLIBVA="$(usex vaapi)"
+		-DVDPAU="$(usex vdpau)"
+		-DXVIDEO="$(usex xv)"
+	)
+
+	if use qt5 ; then
+		mycmakeargs+=( -DENABLE_QT5="$(usex qt5)" )
+	fi
+
+	if use debug ; then
+		mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
+	fi
+
+	for process in ${processes} ; do
+		local build="${WORKDIR}/${P}_build/${process%%:*}"
+		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake-utils_src_configure
+	done
+}
+
+src_compile() {
+	for process in ${processes} ; do
+		local build="${WORKDIR}/${P}_build/${process%%:*}"
+		BUILD_DIR="${build}" cmake-utils_src_compile
+	done
+}
+
+src_test() {
+	for process in ${processes} ; do
+		local build="${WORKDIR}/${P}_build/${process%%:*}"
+		BUILD_DIR="${build}" cmake-utils_src_test
+	done
+}
+
+src_install() {
+	for process in ${processes} ; do
+		local build="${WORKDIR}/${P}_build/${process%%:*}"
+		BUILD_DIR="${build}" cmake-utils_src_install
+	done
+
+	if [[ -f "${ED}"/usr/bin/avidemux3_cli ]] ; then
+		fperms +x /usr/bin/avidemux3_cli
+	fi
+
+	if [[ -f "${ED}"/usr/bin/avidemux3_jobs ]] ; then
+		fperms +x /usr/bin/avidemux3_jobs
+	fi
+
+	cd "${S}" || die "Can't enter source folder."
+	newicon ${PN}_icon.png ${PN}-2.6.png
+
+	if [[ -f "${ED}"/usr/bin/avidemux3_qt4 ]] ; then
+		fperms +x /usr/bin/avidemux3_qt4
+	fi
+
+	if [[ -f "${ED}"/usr/bin/avidemux3_qt5 ]] ; then
+		fperms +x /usr/bin/avidemux3_qt5
+	fi
+
+	if [[ -f "${ED}"/usr/bin/avidemux3_jobs_qt5 ]] ; then
+		fperms +x /usr/bin/avidemux3_jobs_qt5
+	fi
+
+	if use qt4 || use qt5 ; then
+		domenu ${PN}-2.6.desktop
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-video/avidemux/avidemux-2.6.8.ebuild b/media-video/avidemux/avidemux-2.6.8.ebuild
new file mode 100644
index 000000000000..d31c66fd8977
--- /dev/null
+++ b/media-video/avidemux/avidemux-2.6.8.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PLOCALES="ca cs de el es fr it ja pt_BR ru sr sr@latin tr"
+
+inherit cmake-utils eutils flag-o-matic l10n
+
+SLOT="2.6"
+
+DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
+HOMEPAGE="http://fixounet.free.fr/${PN}"
+
+# Multiple licenses because of all the bundled stuff.
+LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
+IUSE="debug opengl nls qt4 sdl vaapi vdpau video_cards_fglrx xv"
+KEYWORDS="~amd64 ~x86"
+
+if [[ ${PV} == *9999* ]] ; then
+	KEYWORDS=""
+	EGIT_REPO_URI="git://gitorious.org/${PN}2-6/${PN}2-6.git https://git.gitorious.org/${PN}2-6/${PN}2-6.git"
+
+	inherit git-2
+else
+	MY_P="${PN}_${PV}"
+	SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${MY_P}.tar.gz"
+fi
+
+DEPEND="
+	~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,video_cards_fglrx?,xv?]
+	opengl? ( virtual/opengl:0 )
+	qt4? ( >=dev-qt/qtgui-4.8.3:4 )
+	vaapi? ( x11-libs/libva:0 )
+	video_cards_fglrx? (
+		|| ( >=x11-drivers/ati-drivers-14.12-r3
+			x11-libs/xvba-video:0 )
+		)"
+RDEPEND="$DEPEND"
+PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt4?]"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# Fix icon name -> avidemux-2.6.png
+	sed -i -e "/^Icon/ s:${PN}:${PN}-2.6:" ${PN}2.desktop || die "Icon name fix failed."
+
+	# The desktop file is broken. It uses avidemux2 instead of avidemux3
+	# so it will actually launch avidemux-2.5 if it is installed.
+	sed -i -e "/^Exec/ s:${PN}2:${PN}3:" ${PN}2.desktop || die "Desktop file fix failed."
+	sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt4:' ${PN}2.desktop || die "Desktop file fix failed."
+
+	# Fix QA warnings that complain a trailing ; is missing and Application is deprecated.
+	sed -i -e 's/Application;AudioVideo/AudioVideo;/g' ${PN}2.desktop || die "Desktop file fix failed."
+
+	# Now rename the desktop file to not collide with 2.5.
+	mv ${PN}2.desktop ${PN}-2.6.desktop || die "Collision rename failed."
+
+	# Remove "Build Option" dialog because it doesn't reflect what the GUI can or has been built with. (Bug #463628)
+	sed -i -e '/Build Option/d' avidemux/common/ADM_commonUI/myOwnMenu.h || die "Couldn't remove \"Build Option\" dialog."
+}
+
+src_configure() {
+	local mycmakeargs="
+		-DAVIDEMUX_SOURCE_DIR='${S}'
+		$(cmake-utils_use nls GETTEXT)
+		$(cmake-utils_use sdl)
+		$(cmake-utils_use vaapi LIBVA)
+		$(cmake-utils_use vdpau)
+		$(cmake-utils_use video_cards_fglrx XVBA)
+		$(cmake-utils_use xv XVIDEO)
+	"
+
+	if use debug ; then
+		mycmakeargs+=" -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug -DADM_DEBUG=1"
+	fi
+
+	processes="buildCli:avidemux/cli"
+	use qt4 && processes+=" buildQt4:avidemux/qt4"
+
+	for process in ${processes} ; do
+		local build="${process%%:*}"
+
+		mkdir "${S}"/${build} || die "Can't create build folder."
+		cd "${S}"/${build} || die "Can't enter build folder."
+		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${S}"/${build} cmake-utils_src_configure
+	done
+
+	# Add lax vector typing for PowerPC.
+	if use ppc || use ppc64 ; then
+		append-cflags -flax-vector-conversions
+	fi
+
+	# See bug 432322.
+	use x86 && replace-flags -O0 -O1
+}
+
+src_compile() {
+	for process in ${processes} ; do
+		BUILD_DIR="${S}/${process%%:*}" cmake-utils_src_compile
+	done
+}
+
+DOCS=( AUTHORS README )
+
+src_install() {
+	for process in ${processes} ; do
+		BUILD_DIR="${S}/${process%%:*}" cmake-utils_src_install
+	done
+
+	if [[ -f "${ED}"/usr/bin/avidemux3_cli ]] ; then
+		fperms +x /usr/bin/avidemux3_cli
+	fi
+
+	if [[ -f "${ED}"/usr/bin/avidemux3_jobs ]] ; then
+		fperms +x /usr/bin/avidemux3_jobs
+	fi
+
+	cd "${S}" || die "Can't enter source folder."
+	newicon ${PN}_icon.png ${PN}-2.6.png
+
+	if use qt4 ; then
+		fperms +x /usr/bin/avidemux3_qt4
+		domenu ${PN}-2.6.desktop
+	fi
+}
diff --git a/media-video/avidemux/avidemux-9999.ebuild b/media-video/avidemux/avidemux-9999.ebuild
new file mode 100644
index 000000000000..72ad632f6969
--- /dev/null
+++ b/media-video/avidemux/avidemux-9999.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PLOCALES="ca cs de el es fr it ja pt_BR ru sr sr@latin tr"
+
+inherit cmake-utils l10n xdg-utils
+
+DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
+HOMEPAGE="http://fixounet.free.fr/${PN}"
+
+# Multiple licenses because of all the bundled stuff.
+LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
+SLOT="2.6"
+IUSE="debug opengl nls nvenc qt4 qt5 sdl vaapi vdpau xv"
+
+if [[ ${PV} == *9999* ]] ; then
+	MY_P="${P}"
+	EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"
+
+	inherit git-r3
+else
+	MY_P="${PN}_${PV}"
+	SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DEPEND="
+	~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?]
+	opengl? ( virtual/opengl:0 )
+	qt4? ( >=dev-qt/qtgui-4.8.3:4 )
+	qt5? ( dev-qt/qtgui:5 )
+	vaapi? ( x11-libs/libva:0 )
+	nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) )
+"
+RDEPEND="
+	$DEPEND
+	nls? ( virtual/libintl:0 )
+"
+PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt4?,qt5?]"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	processes="buildCli:avidemux/cli"
+	if use qt4 || use qt5 ; then
+		processes+=" buildQt4:avidemux/qt4"
+	fi
+
+	for process in ${processes} ; do
+		CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare
+	done
+
+	# Fix icon name -> avidemux-2.6.png
+	sed -i -e "/^Icon/ s:${PN}:${PN}-2.6:" ${PN}2.desktop || die "Icon name fix failed."
+
+	# The desktop file is broken. It uses avidemux2 instead of avidemux3
+	# so it will actually launch avidemux-2.5 if it is installed.
+	sed -i -e "/^Exec/ s:${PN}2:${PN}3:" ${PN}2.desktop || die "Desktop file fix failed."
+	sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt'$(usex qt5 5 4)':' ${PN}2.desktop || die "Desktop file fix failed."
+
+	# Fix QA warnings that complain a trailing ; is missing and Application is deprecated.
+	sed -i -e 's/Application;AudioVideo/AudioVideo;/g' ${PN}2.desktop || die "Desktop file fix failed."
+
+	# Now rename the desktop file to not collide with 2.5.
+	mv ${PN}2.desktop ${PN}-2.6.desktop || die "Collision rename failed."
+
+	# Remove "Build Option" dialog because it doesn't reflect what the GUI can or has been built with. (Bug #463628)
+	sed -i -e '/Build Option/d' avidemux/common/ADM_commonUI/myOwnMenu.h || die "Couldn't remove \"Build Option\" dialog."
+}
+
+src_configure() {
+	# Add lax vector typing for PowerPC.
+	if use ppc || use ppc64 ; then
+		append-cflags -flax-vector-conversions
+	fi
+
+	# See bug 432322.
+	use x86 && replace-flags -O0 -O1
+
+	# The build relies on an avidemux-core header that uses 'nullptr'
+	# which is from >=C++11.  Let's use the GCC-6 default C++ dialect.
+	append-cxxflags -std=c++14
+
+	local mycmakeargs=(
+		-DAVIDEMUX_SOURCE_DIR='${S}'
+		-DGETTEXT="$(usex nls)"
+		-DSDL="$(usex sdl)"
+		-DLIBVA="$(usex vaapi)"
+		-DVDPAU="$(usex vdpau)"
+		-DXVIDEO="$(usex xv)"
+	)
+
+	if use qt5 ; then
+		mycmakeargs+=( -DENABLE_QT5="$(usex qt5)" )
+	fi
+
+	if use debug ; then
+		mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
+	fi
+
+	for process in ${processes} ; do
+		local build="${WORKDIR}/${P}_build/${process%%:*}"
+		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake-utils_src_configure
+	done
+}
+
+src_compile() {
+	for process in ${processes} ; do
+		local build="${WORKDIR}/${P}_build/${process%%:*}"
+		BUILD_DIR="${build}" cmake-utils_src_compile
+	done
+}
+
+src_test() {
+	for process in ${processes} ; do
+		local build="${WORKDIR}/${P}_build/${process%%:*}"
+		BUILD_DIR="${build}" cmake-utils_src_test
+	done
+}
+
+src_install() {
+	for process in ${processes} ; do
+		local build="${WORKDIR}/${P}_build/${process%%:*}"
+		BUILD_DIR="${build}" cmake-utils_src_install
+	done
+
+	if [[ -f "${ED}"/usr/bin/avidemux3_cli ]] ; then
+		fperms +x /usr/bin/avidemux3_cli
+	fi
+
+	if [[ -f "${ED}"/usr/bin/avidemux3_jobs ]] ; then
+		fperms +x /usr/bin/avidemux3_jobs
+	fi
+
+	cd "${S}" || die "Can't enter source folder."
+	newicon ${PN}_icon.png ${PN}-2.6.png
+
+	if [[ -f "${ED}"/usr/bin/avidemux3_qt4 ]] ; then
+		fperms +x /usr/bin/avidemux3_qt4
+	fi
+
+	if [[ -f "${ED}"/usr/bin/avidemux3_qt5 ]] ; then
+		fperms +x /usr/bin/avidemux3_qt5
+	fi
+
+	if [[ -f "${ED}"/usr/bin/avidemux3_jobs_qt5 ]] ; then
+		fperms +x /usr/bin/avidemux3_jobs_qt5
+	fi
+
+	if use qt4 || use qt5 ; then
+		domenu ${PN}-2.6.desktop
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-video/avidemux/metadata.xml b/media-video/avidemux/metadata.xml
new file mode 100644
index 000000000000..ad0bd2cc0b7d
--- /dev/null
+++ b/media-video/avidemux/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>media-video@gentoo.org</email>
+    <name>Gentoo Video project</name>
+  </maintainer>
+  <use>
+    <flag name="nvenc">Adds support for NVIDIA Encoder (NVENC) API for hardware accelerated encoding on NVIDIA cards.</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">avidemux</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-video/baka-mplayer/Manifest b/media-video/baka-mplayer/Manifest
new file mode 100644
index 000000000000..cb2a42a1aa72
--- /dev/null
+++ b/media-video/baka-mplayer/Manifest
@@ -0,0 +1,6 @@
+AUX baka-mplayer-2.0.4-gcc5.patch 1251 SHA256 2e6ef2f6c11c06d15c070609df428627142b8c6b0018b654ed3a07542854b18f SHA512 3d6b76227c465869a4497f51cd5b7759d038638a02aa821acd099edb7f4f0fe99dbee145687d286eb40cb7dfb840fdee40625c663476630064e9e88a7961fc79 WHIRLPOOL 32d94afd8d815a602c356055dab54a44e54e4bd17781937600c78822a845e504a4dd35c96335159f181ff7a2bfd3b40e48782a9d6c5588f36e867a2808ebc7a2
+DIST baka-mplayer-2.0.4.tar.gz 988060 SHA256 43647217695bdfc85771ce2fc8fcecebd49bdf6282c3a439816cfb4e08754002 SHA512 7898d65e87540bcb528d429dc70daefc7d4c0711b2983326cf6fa3a14e566c2742334378befdb710b8cc59452f960bc17b290058ba9e6878e830de6dbafce55a WHIRLPOOL 276f6fb6dfaf8b80858a75506fa5f1c282071076744a21c20ec75dc9458073e58618fa1ca828533c401da50585e178014f3a6423888dd8bd1f107853a4634b97
+EBUILD baka-mplayer-2.0.4.ebuild 1092 SHA256 36afccfd55d85c9cfbd1976df6b2fa7458ea94ab1eb5d16c2daf1db294b8b7fb SHA512 011aaf6230b57e93dbcfd8359cba4212e325139d4de56d4bff30e1798c1c14488e130084381085abc9dbe77c724c88d1b6c7643009409eb6aae86257a4e0f4df WHIRLPOOL 231c5fc397efbe12be7c0ee17b2313601adbd79cb65e96e6f457c2d5361d17c2a01232480260e72a88ed56e3088942f8c82695a5f820cd17df63863e5af5c23e
+MISC ChangeLog 3715 SHA256 6f15bcbabad77897895aa204cc3ad08bf1bba0c79deeba763146b898f2fda609 SHA512 102aa4abf7c7c70607398b9fe2f2151208165f44a506c1f0944fb42bd458c2945b75687a3d0afd0fe0f075a4425d3d5402b55bf4787c707435d8e093391928a4 WHIRLPOOL 05c07dc5d755299d19c335c4127bc6d3a4858ed05933cd62c07cf586ffc2f3153417d58dd4bb4747c7e2a5d4ce16e7c74ceccc893dbd0f65bf4c094993221713
+MISC ChangeLog-2015 616 SHA256 8a5ce74b06a873cc236b8093d7e6c18882fcce508a1a30699564939904d397ce SHA512 ce4530d5a2dfd9f6a45c84de2d0c36a7dfd4b9510e787374b6bd0d3edc85a58d8e9951bf7dade3c8158158976a2545606109e244c9ef39b1f338f06382dc6848 WHIRLPOOL 2a0ffea5347d936a431f7b15d2f8ced9bec4b4d824b66d9e9d07f2691b84a8fb1d58dce5e05aecfe4504614943a0336fdbedc6d0a0dacf2277634b96df2f4d93
+MISC metadata.xml 467 SHA256 fbee63a52c58bd91e8b37e8595d02d5da93e461ea5ac3f153e5d7b9e2ffeae15 SHA512 7a66080df67604b34cf202ddbc2686186d0558ad6caa2ec0d9f6596ef5f410b238cebc28b61eea5738445954374f9b81bce14a2b3269c537f734a20612c68c5d WHIRLPOOL 8824058cd89ab31f975937b65c336f3494c371b267b5cb2727e5fd7d7ab61f264fcad1ad862aae18fdda757f0340c329bfb58051d4ba2031995b9f3a51866991
diff --git a/media-video/baka-mplayer/baka-mplayer-2.0.4.ebuild b/media-video/baka-mplayer/baka-mplayer-2.0.4.ebuild
new file mode 100644
index 000000000000..bc38e4aa65d3
--- /dev/null
+++ b/media-video/baka-mplayer/baka-mplayer-2.0.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils qmake-utils
+
+DESCRIPTION="Cross-platform libmpv-based multimedia player with uncluttered design"
+HOMEPAGE="http://bakamplayer.u8sand.net/"
+SRC_URI="https://github.com/u8sand/Baka-MPlayer/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-video/mpv[libmpv]
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/Baka-MPlayer-${PV}"
+
+src_prepare() {
+	# no need to install license
+	sed -e '/^INSTALLS/s:license::' -i src/Baka-MPlayer.pro || die
+	# put manual in our docdir
+	sed -e '/^manual.path/s:'${PN}':'${PF}':' -i src/Baka-MPlayer.pro || die
+
+	epatch "${FILESDIR}/${P}-gcc5.patch"
+}
+
+src_configure() {
+	eqmake5 \
+		INSTROOT="${D}" \
+		CONFIG+=install_translations \
+		lrelease="$(qt5_get_bindir)"/lrelease \
+		lupdate="$(qt5_get_bindir)"/lupdate \
+		src/Baka-MPlayer.pro
+}
diff --git a/media-video/baka-mplayer/files/baka-mplayer-2.0.4-gcc5.patch b/media-video/baka-mplayer/files/baka-mplayer-2.0.4-gcc5.patch
new file mode 100644
index 000000000000..97ff52537ad0
--- /dev/null
+++ b/media-video/baka-mplayer/files/baka-mplayer-2.0.4-gcc5.patch
@@ -0,0 +1,32 @@
+From 640cac8bab18cffca8258645c2b13b4defc01a8e Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Wed, 2 Dec 2015 02:38:44 +0000
+Subject: [PATCH] Explicitly use <cmath> to unbreak build with libc++
+
+src/ui/mainwindow.cpp:996:53: error: use of undeclared identifier 'ceil'
+        playlistRect.setLeft(playlistRect.right() - ceil(playlistRect.width()/7.0))
+---
+ src/ui/mainwindow.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
+index 4f051ad..c3f5f92 100644
+--- a/src/ui/mainwindow.cpp
++++ b/src/ui/mainwindow.cpp
+@@ -1,6 +1,7 @@
+ #include "mainwindow.h"
+ #include "ui_mainwindow.h"
+ 
++#include <cmath>
+ #include <QLibraryInfo>
+ #include <QMimeData>
+ #include <QDesktopWidget>
+@@ -993,7 +994,7 @@ void MainWindow::mouseMoveEvent(QMouseEvent *event)
+         ui->seekBar->setVisible(showPlayback || ui->outputTextEdit->isVisible());
+ 
+         QRect playlistRect = geometry();
+-        playlistRect.setLeft(playlistRect.right() - ceil(playlistRect.width()/7.0));
++        playlistRect.setLeft(playlistRect.right() - std::ceil(playlistRect.width()/7.0));
+         bool showPlaylist = playlistRect.contains(event->globalPos());
+         ShowPlaylist(showPlaylist);
+ 
diff --git a/media-video/baka-mplayer/metadata.xml b/media-video/baka-mplayer/metadata.xml
new file mode 100644
index 000000000000..caeecbbcc447
--- /dev/null
+++ b/media-video/baka-mplayer/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>qt@gentoo.org</email>
+    <name>Gentoo Qt Project</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>media-video@gentoo.org</email>
+    <name>Gentoo Video project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">u8sand/Baka-MPlayer</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-video/bashnapi/Manifest b/media-video/bashnapi/Manifest
new file mode 100644
index 000000000000..f175c7236b21
--- /dev/null
+++ b/media-video/bashnapi/Manifest
@@ -0,0 +1,7 @@
+DIST bashnapi_v1.3.5.tar.gz 98580 SHA256 a51f1c30f04bdd8fb3b267f4adbe5c8caa80e3e3320fda7d7be0a6ef5faeb961 SHA512 7cf5abb009021a43261be863f320d6324b02ea25f1388c7cc99a4f695a3eb987971ada172f74d21e3a44deeec35e48c4424fa378de53749f994b6c0d0f76eec8 WHIRLPOOL 7bd9f7d4cad694da29849fe5885b93092d35632fb41d53381c4c77efdb63bd9341a325b97900f0b638c7068e2cbaec97a481138b655413ca34ac6a8433b1b685
+DIST napi_v1.1.5_subotage_0.15.tgz 38080 SHA256 7748a94bcefcbf840f4a7a13fcda2df6442de049f453baa8ff4d4158e21a47d3 SHA512 a8f2b79a3d0767c99af448e7ec9fb8d9b2048876f966ab7ef07c17b7935066387dd20e9535f43947266810d66d28e5e2d02cffc5f033c65112c10744506e86f5 WHIRLPOOL 9dd9c62dfcae68df02d022ce264030290b8d2097fbab7600770e1288c3c44321c65a54ea60e45ad8c30ce0afb8ec4b02fc8cbfdef4a62847fd821ceebf001b02
+EBUILD bashnapi-1.1.5.ebuild 737 SHA256 52d8099c70dfcedc4f5627908a109e5de1c89218aac516400a49a14c45803ad7 SHA512 6311b0c41e49a0af06425b70b19ee1627cb2c2fa40211011cbbc7465dd6a67262f7b4d490435e3c6ff1021f598918037d2346b4a1bab32e3e8d2ff2b6726edfa WHIRLPOOL 48dad198c492fbd630644b645006d763c01f7936cd64a70d0f7a41e6050e8ea37c96ced3a809bd3392c2f8d8efa1ee265470804a4b41a62423f398a5daef81d5
+EBUILD bashnapi-1.3.5.ebuild 1191 SHA256 ce77769ed4d3d6f9b8f333c5f6442a376abb4beb716fb2d555a833fd45751797 SHA512 7eaea6de7b4ef121ea70faff2c76ee963c0f76af9ca9440cffd7eea5c86bd6bb2129eeda6b9f56250e15e7a616c5be20a9c4ae589f92dae60bcabadcde7260dc WHIRLPOOL 1d601faa9cd906ee61ba742a83b103433cfc653a9d5065634ce101762dccafff56156f34e78c32021d5aa8ab72b162307e37cc80c1bb8520d9e7fe591042c53e
+MISC ChangeLog 2442 SHA256 134a8b1d959a822f96c53b407bae2e91c143f10f0d95a2b7abe2a7cdc961027b SHA512 ffdea3e51437fa0e620dbbc806aa4c2676140f7f569554dfa6b138dd3c95e91dc7a0c2dbd5570c8c473619339203f9129bfd76fe6b083d859448203b1807f8f4 WHIRLPOOL 560b7ccbb661c72b1f02d0df9e6e2ad8c00c20ae40e83d7d91e302f45d34d9592867efa901cf9692634186006f6843876a243200e87216e89f2cd1b4473eb7a3
+MISC ChangeLog-2015 414 SHA256 a8e21870ad30ac3232924a0f4013aeed50fa74cdc192f5676bf713230a032e90 SHA512 eb163aaa0d7f12256d020040a25a31767b68c2ed9a5a25a885beb2f0b7d911de26f1987a8c01cf5ce860a3c9490208bcd3901f63995d2417f00c99d4f107ca21 WHIRLPOOL 92abda077fa90921aa53d71591ee89b9db4a739df4ea1cb3a4fea2c8584f0937e93e707f53ecaaf2cf5a0a3da01a5d6687c24031cb9b180f86e2e25bf65b6cdc
+MISC metadata.xml 325 SHA256 baeed7f194082af0374d19a1ddae7a2f3f5f0b876bb5ce76c9f752af757d327d SHA512 93311c8909919558e542db42c144d361ee0289e4c61fa2d49508941f1aa93e307fc6f9a6afce008e3fe54a964cfe35b7774fb94eca405cd4dabba8aa9cb80732 WHIRLPOOL 190cc7fba1e1889e5283638ae67c4190f3ef478e0a048286b893fc3c010c475cf722c5a4ab320a460815f1d63f93a8e371c3fb0cd0068b989ff0e60b6a81c6ec
diff --git a/media-video/bashnapi/bashnapi-1.1.5.ebuild b/media-video/bashnapi/bashnapi-1.1.5.ebuild
new file mode 100644
index 000000000000..d4e2ad65a1ab
--- /dev/null
+++ b/media-video/bashnapi/bashnapi-1.1.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+SUB_VER=0.15
+MY_TAR=napi_v${PV}_subotage_${SUB_VER}
+
+DESCRIPTION="Napiprojekt.pl subtitle downloader in bash"
+HOMEPAGE="https://sourceforge.net/projects/bashnapi/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_TAR}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S=${WORKDIR}/napi
+
+src_install() {
+	default # for docs
+
+	dobin napi.sh
+}
+
+pkg_postinst() {
+	elog "Optional runtime dependencies:"
+	elog
+	elog "   \033[1mmedia-video/subotage\033[0m for subtitle format conversion"
+	elog
+	elog "   \033[1mmedia-video/mediainfo\033[0m"
+	elog "or \033[1mmedia-video/mplayer\033[0m for FPS detection (for conversion)"
+}
diff --git a/media-video/bashnapi/bashnapi-1.3.5.ebuild b/media-video/bashnapi/bashnapi-1.3.5.ebuild
new file mode 100644
index 000000000000..9671be6e2615
--- /dev/null
+++ b/media-video/bashnapi/bashnapi-1.3.5.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Napiprojekt.pl subtitle downloader in bash"
+HOMEPAGE="https://sourceforge.net/projects/bashnapi/"
+SRC_URI="mirror://sourceforge/${PN}/bashnapi_v${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# subotage is now integrated into bashnapi
+RDEPEND="app-arch/p7zip
+	!media-video/subotage"
+
+S=${WORKDIR}/napi-${PV}
+
+src_configure() {
+	# install.sh does not support --destdir
+	sed -i -e "s^\(NAPI_COMMON_PATH=\).*$^\1${EPREFIX}/usr/share/napi^" \
+		napi.sh subotage.sh || die
+}
+
+src_install() {
+	default # for docs
+	dobin napi.sh subotage.sh
+	insinto /usr/share/napi
+	doins napi_common.sh
+}
+
+pkg_postinst() {
+	# packages that can be used to detect FPS
+	local fps_pkgs=(
+		media-video/ffmpeg
+		media-video/mediainfo
+		media-video/mplayer
+		# also mplayer2
+	)
+	local p found
+
+	for p in "${fps_pkgs[@]}"; do
+		if has_version "${p}"; then
+			found=1
+			break
+		fi
+	done
+
+	if [[ ! ${found} ]]; then
+		elog "In order to support FPS detection, install one of the following packages:"
+		elog
+		for p in "${fps_pkgs[@]}"; do
+			elog "  ${p}"
+		done
+	fi
+}
diff --git a/media-video/bashnapi/metadata.xml b/media-video/bashnapi/metadata.xml
new file mode 100644
index 000000000000..15be92e50293
--- /dev/null
+++ b/media-video/bashnapi/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">bashnapi</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/bbtools/Manifest b/media-video/bbtools/Manifest
new file mode 100644
index 000000000000..5fb5c444153d
--- /dev/null
+++ b/media-video/bbtools/Manifest
@@ -0,0 +1,6 @@
+AUX bbtools-1.9-gentoo.patch 2816 SHA256 1fe81381496520d41bb06927aab1bc2776a357906cf3cb51bd80c824b9e0a91c SHA512 7ed795bbf5042b8ae70234d2d90139d7f6cf0b610c94688d0c5e401a028f733df9f53894e61b01f91acf8fd58f1253e6db229628775d5cb4a7e8c278f3e23e09 WHIRLPOOL c3d0270d881b3f0eb1856dc4b96fde5d171043ca26e1a93bea2c5b77f985a3a194725bfcda1b8bcea5f762b2d7760efd6d2db31fb0b2c23102d82ae7f604ab8e
+DIST bbtool19_src.zip 68080 SHA256 69e0b0b2b2f3b1e60f7b5391df3e41b0355612243c2591916fd510d9813a3b2d SHA512 7d22a3934e0b5a8fa228963989b20387b493a672026adcac1761256030f64681fdc936f15934bb7ecf019db43f3bdfbebbf94782534b21883c5c5c3674d073c7 WHIRLPOOL cb820e1c567a8166ec5802e8acd1933491b920af8458897128601d0aac3b91585db258a997b7754840321be0cd261b3df1514d53bbcc73701b3228c3954f2dea
+EBUILD bbtools-1.9.ebuild 783 SHA256 5fc6584a7ad44cf81e31969ea4ef678e236e096b55a343feadbe7143ee66c5ee SHA512 de5abc7824c872a710bf940377369127430803c1248dbcf3832deb174075413ae494d1c57acd5523f779c2dd8a5237d073f287a182bf49447e6a0959448b5891 WHIRLPOOL efc71a1367619b201c0a312715097987d550058175406c132e4a62f687f7647a7025737ef41217ab2f659a5fbe462385764afaa45debf08cde69823fb0a32bcc
+MISC ChangeLog 2852 SHA256 684777d8aaf8bb184de3d865601b6255e960e6e4c2e79ef68c55d1e22600ad3d SHA512 3f6605d7de873ca00554a96b91038290c604198c019e09c694f180e04707f855927c8e0499ae62ca5c0fbdc7b482c5b8eec1d7baec671b1ffc7ec3df24d569d9 WHIRLPOOL 3e1a8094980a4ca99cba96bd0347ae3054d7ab65ab5ff8fed229d2e1456d3189bcc3c52d1be94892098c0372063b76e377b06da98638c4b513d047a31b114f95
+MISC ChangeLog-2015 1121 SHA256 a27cb03a864bfda6c2b319edc2c2b3106341db4524da0581f91e9e4ebc840d63 SHA512 24c7b2c4b23a3985c60998cc45ed889e9a6abc78a8e54ad92e5ebce7d38feef98cd2941bee8c379f84a8b980fd4a8e70c07b76c6429e1032b6c5e7239c801323 WHIRLPOOL eaee266c8977aa23b43bc806b94534e2d1cd564359e4597c0176381f8aece6f301a7e6fad8d187f669e524032b08d71dc6f11a5bf28e6d3f216660e8f35cd243
+MISC metadata.xml 554 SHA256 73bd35c6a1f387da37295d61358dca1aca5d5c8845808063dfa3052ffce56036 SHA512 ca7a79616518939ae835c8d2e327aadd7f7d48d9ab28af61ad61b7ab435b9384c285d45614f0ee10a0222fa556739b02cfe4ed0f78b9233a4007fbb8b41f0ad7 WHIRLPOOL c9e529894713b307cfa67a32bbf2ca2b780b7df4fe5fadaa60a36c09f2abcdd33800a4f510b58d40b09e6c1b378c11898876769f3dc5e22eb595fcf29884dc78
diff --git a/media-video/bbtools/bbtools-1.9.ebuild b/media-video/bbtools/bbtools-1.9.ebuild
new file mode 100644
index 000000000000..f824754bccb5
--- /dev/null
+++ b/media-video/bbtools/bbtools-1.9.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="bbdmux, bbinfo, bbvinfo and bbainfo from Brent Beyeler"
+HOMEPAGE="http://members.cox.net/beyeler/bbmpeg.html"
+SRC_URI="http://files.digital-digest.com/downloads/files/encode/bbtool${PV/./}_src.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}
+
+src_prepare() {
+	mv BBINFO.cpp bbinfo.cpp || die
+	mv BITS.CPP bits.cpp || die
+	mv BITS.H bits.h || die
+	mv bbdmux.CPP bbdmux.cpp || die
+	rm *.ide
+	edos2unix *.cpp *.h
+
+	epatch "${FILESDIR}"/bbtools-${PV}-gentoo.patch
+
+	append-lfs-flags
+	tc-export CXX
+}
+
+src_install() {
+	dobin bbainfo bbdmux bbinfo bbvinfo
+}
diff --git a/media-video/bbtools/files/bbtools-1.9-gentoo.patch b/media-video/bbtools/files/bbtools-1.9-gentoo.patch
new file mode 100644
index 000000000000..7f9ff7ab6279
--- /dev/null
+++ b/media-video/bbtools/files/bbtools-1.9-gentoo.patch
@@ -0,0 +1,78 @@
+--- bits.h
++++ bits.h	2003-10-20 22:04:30.000000000 +0000
+@@ -15,4 +15,4 @@
+ int seek_sync(unsigned int sync, int N);
+ unsigned int look_ahead(int N);
+ 
+-
++#define strlwr(x)
+--- bbainfo.cpp
++++ bbainfo.cpp	2003-10-20 22:19:15.000000000 +0000
+@@ -97,8 +97,8 @@
+ {
+   int i, framesize, skip;
+ 
+-  framesize = bitrate_index[3 - layer][bit_rate] /
+-              frequency[freq] * slots[3 - layer];
++  framesize = (int) (bitrate_index[3 - layer][bit_rate] /
++              frequency[freq] * slots[3 - layer]);
+ 
+   if (padding_bit)
+     framesize++;
+--- bbinfo.cpp
++++ bbinfo.cpp	2003-10-20 22:16:43.000000000 +0000
+@@ -984,7 +984,7 @@
+                           bit_rate = (k & 0xF0) >> 4;
+                           freq = (k & 0x0C) >> 2;
+                           padding_bit = (k & 0x02) >> 1;
+-                          audio_sync[i] = ((bitrate_index[3 - layer][bit_rate] /
++                          audio_sync[i] = (int) ((bitrate_index[3 - layer][bit_rate] /
+                                             frequency[freq]) * slots[3 - layer]) - 4;
+                           if (padding_bit)
+                             audio_sync[i] += 1;
+@@ -1274,7 +1274,7 @@
+                           bit_rate = (k & 0xF0) >> 4;
+                           freq = (k & 0x0C) >> 2;
+                           padding_bit = (k & 0x02) >> 1;
+-                          audio_sync[i] = ((bitrate_index[3 - layer][bit_rate] /
++                          audio_sync[i] = (int) ((bitrate_index[3 - layer][bit_rate] /
+                                             frequency[freq]) * slots[3 - layer]) - 4;
+ 
+                           if (padding_bit)
+@@ -2198,7 +2198,7 @@
+                     bit_rate = (k & 0xF0) >> 4;
+                     freq = (k & 0x0C) >> 2;
+                     padding_bit = (k & 0x02) >> 1;
+-                    streams[PID]->audio_sync = ((bitrate_index[3 - layer][bit_rate] /
++                    streams[PID]->audio_sync = (int) ((bitrate_index[3 - layer][bit_rate] /
+                                       frequency[freq]) * slots[3 - layer]) - 4;
+                     if (padding_bit)
+                       streams[PID]->audio_sync += 1;
+--- Makefile
++++ Makefile	2003-10-20 22:26:07.000000000 +0000
+@@ -0,0 +1,25 @@
++all: bbainfo bbdmux bbinfo bbvinfo
++
++bbdmux: bits.o bbdmux.o
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -lm -o $@ 
++
++bbinfo: bits.o bbinfo.o
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -lm -o $@ 
++
++bbvinfo: bits.o bbvinfo.o
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -lm -o $@ 
++
++bbainfo: bits.o bbainfo.o
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -lm -o $@ 
++
++%.o: %.c
++	$(CXX) $(CXXFLAGS) -c -o $@ $<
++
++clean:
++	rm -f bbainfo bbdmux bbinfo bbvinfo core *.o
++
++bbainfo.o: bbainfo.cpp bits.h
++bbdmux.o: bbdmux.cpp bits.h
++bbinfo.o: bbinfo.cpp bits.h
++bbvinfo.o: bbvinfo.cpp bits.h
++bits.o: bits.cpp bits.h
diff --git a/media-video/bbtools/metadata.xml b/media-video/bbtools/metadata.xml
new file mode 100644
index 000000000000..b02500394b71
--- /dev/null
+++ b/media-video/bbtools/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>media-video@gentoo.org</email>
+</maintainer>
+<longdescription lang="en">
+bbtools is a package of 4 small tools written by Brent Beyeler.
+
+bbdmux: an MPEG-1 or MPEG-2 program/transport stream de-multiplexer
+bbinfo: an MPEG-1 or MPEG-2 program/transport stream analyzer
+bbvinfo: an MPEG-1 or MPEG-2 video stream analyzer
+bbainfo: an MPEG-1 audio stream analyzer
+</longdescription>
+</pkgmetadata>
diff --git a/media-video/bdsup2sub++/Manifest b/media-video/bdsup2sub++/Manifest
new file mode 100644
index 000000000000..2fbcbaf57f13
--- /dev/null
+++ b/media-video/bdsup2sub++/Manifest
@@ -0,0 +1,5 @@
+AUX bdsup2sub++-1.0.2-hidden-config.patch 1761 SHA256 ac9c95f51f2bbf63eb15860dfef07b6f08e211f969ad4de8f51012aba44d166a SHA512 851759e87387f3bb4536f7cfc79db1ca3ec095448d4ba29bc9258288d8e2d010689dd64c423e4d300796b2f601eb820a58c3ef4339d5cbcfafb9adac9345a7d8 WHIRLPOOL eb89867a4d9bb055b1a5d061cba7c416f5fd1999bd193e745d7db4cf9498c0d12d02e05dab8fa1bf3399334f9d46391ff1a7ef472fe4d78147dc6f55acf680e6
+DIST bdsup2sub++-1.0.2.tar.gz 301413 SHA256 89b1a99313fe2f1a3ff101c64a2f85e7f92c81fde41a212a3d854caf49b933c5 SHA512 181cd241588d0fe9217b4534c377af745ff04bcf1af5fbff44c821ec8e45063bb5df0bef0b5d8ba6a9f24740387959487c6e2d3964bfefd935a098ad525b8102 WHIRLPOOL b5a81ea1bfca02bc8ecf7fb35f47fd9507bd3b078bfd7241bd9ae176e7c7acf97c9478654f1c1e50b9ee1474d14b6c63d7184e1b66d9b432f0f44f771570c0e6
+EBUILD bdsup2sub++-1.0.2.ebuild 637 SHA256 513ee4bf38d6a58d81ece8736d2000b22678e9e7fd45073a1033300ba3d20214 SHA512 7164a28718280e5df09417088ecbcaf7dc44f593129fc4760f518638df8230e74ae0082be512511cfeb29950b6d950d13c60a002b1413365d9a41f6cb78c7f48 WHIRLPOOL 0d109e263674e08674f23072809cda361000e4d7735f6b8e494d631466c23dc2b7252234ad792618cab5c90add56284a22ca033121a4542998f66345b77b1444
+MISC ChangeLog 697 SHA256 09649bdcd4cd96bcf4c0ba9a60cbd5ad1f0e037c81f93f6e660844268c8dab4b SHA512 f2f92e4bb74fe9f9479bd6038b3b010f70cff5912649973c6faf5f0b8bf8424051e1e4dd390810e8936578931b2cca4594b1fa022a16ff1cf30676191fecc9b5 WHIRLPOOL d97adc02914131dd49bb4e63ce7770a45ff97b50821836f95653edd058fa1f8e79412e9b819ca07fe5097d0b3ae09817f29c53d591a0524b9b2940c007edb43f
+MISC metadata.xml 915 SHA256 2d60438ac40bdc398e421359c1e98003d42fb32c034df1d18784954168d5b9fb SHA512 c68b63e1078c9e2314fa21d204421bdda0dd6c521bec461723d95ca84b17e8668eb4b7a4d944bc1b2f6bdf7ad130d3af5d54055d50c561ccc8100a3f5a6bfb24 WHIRLPOOL 56642b5779f964531615d519bd4f355de594c16aeacbe7e9792c6d4fa21e4f73a921bbce35a31a126b62ef68e4c2800efc6324c267c3a043232b2258ab966701
diff --git a/media-video/bdsup2sub++/bdsup2sub++-1.0.2.ebuild b/media-video/bdsup2sub++/bdsup2sub++-1.0.2.ebuild
new file mode 100644
index 000000000000..aa0b4c64034f
--- /dev/null
+++ b/media-video/bdsup2sub++/bdsup2sub++-1.0.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils
+
+MY_PN="BDSup2SubPlusPlus"
+DESCRIPTION="C++ port of BDSup2Sub"
+HOMEPAGE="https://github.com/amichaelt/BDSup2SubPlusPlus"
+SRC_URI="https://github.com/amichaelt/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	x11-libs/libqxt
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}/src"
+
+PATCHES=( "${FILESDIR}/${P}-hidden-config.patch" )
+
+src_configure() {
+	eqmake4 ${PN}.pro
+}
+
+src_install() {
+	dobin ${PN}
+}
diff --git a/media-video/bdsup2sub++/files/bdsup2sub++-1.0.2-hidden-config.patch b/media-video/bdsup2sub++/files/bdsup2sub++-1.0.2-hidden-config.patch
new file mode 100644
index 000000000000..cf75cc35ca41
--- /dev/null
+++ b/media-video/bdsup2sub++/files/bdsup2sub++-1.0.2-hidden-config.patch
@@ -0,0 +1,53 @@
+From 2e27e6a49cc0be24b9a8efbf6a2ab2ec84fd1f92 Mon Sep 17 00:00:00 2001
+From: darealshinji <djcj@gmx.de>
+Date: Thu, 23 Oct 2014 18:20:38 +0200
+Subject: [PATCH] save ini file in hidden directory on Unix systems
+
+---
+ src/bdsup2sub.cpp | 6 ++++--
+ src/types.h       | 8 ++++++--
+ 2 files changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/bdsup2sub.cpp b/bdsup2sub.cpp
+index 823e365..a9ccc15 100644
+--- a/bdsup2sub.cpp
++++ b/bdsup2sub.cpp
+@@ -386,15 +386,17 @@ void BDSup2Sub::init()
+ 

+ void BDSup2Sub::loadSettings()

+ {

+-    QString iniPath;

++    QString iniPath, configPath;

+ #ifdef Q_OS_WIN

+     iniPath = QString(getenv("APPDATA"));

++    configPath = QString("bdsup2sub++");

+ #endif

+ #ifndef Q_OS_WIN

+     iniPath = QString(getenv("HOME"));

++    configPath = QString(".config/bdsup2sub++");

+ #endif

+     QSettings::setPath(QSettings::IniFormat, QSettings::UserScope, iniPath);

+-    settings = new QSettings(QSettings::IniFormat, QSettings::UserScope, "bdsup2sub++", "bdsup2sub++");

++    settings = new QSettings(QSettings::IniFormat, QSettings::UserScope, configPath, iniName);

+ 

+     if (!fromCLI)

+     {

+diff --git a/types.h b/types.h
+index d760eca..784a81b 100644
+--- a/types.h
++++ b/types.h
+@@ -28,8 +28,12 @@
+ const QString progName = "BDSup2Sub++";

+ const QString progNameVer = progName + " 1.0.2";

+ const QString authorDate = "0xdeadbeef, mjuhasz, Adam T.";

+-const QString oldIniName = "bdsup2sub.ini";

+-const QString iniName = "bdsup2sub++.ini";

++#ifdef Q_OS_WIN

++    const QString iniName = "bdsup2sub++";

++#endif

++#ifndef Q_OS_WIN

++    const QString iniName = "config";

++#endif

+ 

+ const QStringList scalingFilters = {

+     "Bilinear", "Triangle", "Bicubic", "Bell", "B-Spline", "Hermite", "Lanczos3", "Mitchell"

diff --git a/media-video/bdsup2sub++/metadata.xml b/media-video/bdsup2sub++/metadata.xml
new file mode 100644
index 000000000000..d02dde92d43c
--- /dev/null
+++ b/media-video/bdsup2sub++/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+		<description>Proxied maintainer; set to assignee in all bugs</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">amichaelt/BDSup2SubPlusPlus</remote-id>
+		<bugs-to>https://github.com/amichaelt/BDSup2SubPlusPlus/issues</bugs-to>
+	</upstream>
+	<longdescription lang="en">
+		BDSup2Sub++ (c) 2012 is a port of the original BDSup2Sub (c) 2009 by 0xdeadbeef and incorporating enhancements from Miklos Juhasz. It is a subtitle conversion tool for image based stream formats with scaling capabilities and some other nice features.
+	</longdescription>
+</pkgmetadata>
diff --git a/media-video/bdsup2sub/Manifest b/media-video/bdsup2sub/Manifest
new file mode 100644
index 000000000000..10c399afbd4f
--- /dev/null
+++ b/media-video/bdsup2sub/Manifest
@@ -0,0 +1,9 @@
+AUX bdsup2sub-4.0.0-xdg.patch 1036 SHA256 39b4a66ae0ffbeb1ce09344110d018a121776c8f1544afb538ab25c48f4c662d SHA512 4f0232f5906cd685daf2b86cbd24a284a96939c653d36479ff271902af1dae0c558391bbf302fcdaac8a01f29aecfe56850407798d2520e22a1f227664e7c254 WHIRLPOOL 60552300bb1b0952d10cc849a8ad77b189936acefc6ed88c008ac8cc52aab67cafc2b85f8a5e0445d58ec958f57602da1fac3ca62d8b790996ec32fd2fdd5b2d
+AUX build-4.0.0.xml 1836 SHA256 63dc1fa4234893f8155668dfb08ce72ad0160143a787d196f4b28999992a5e86 SHA512 ec2f7c82dd00243a692182e8ecf363674703a11fcc59b81bb290bb9ef2afb0617da506459f7dc7e50018560364b2e5bddfb40e766e33cc15111b6984c18c6119 WHIRLPOOL 2be9403e4a070cbbc86903251d6e2ad58a315bb7754d14165564dcae65a72ea3811b26ff7e53ab56e49970da6d27a0fa4c6e71ea762e07900c6441883e2a3c14
+DIST bdsup2sub-4.0.0.tar.xz 199796 SHA256 72d06f013ab13a89e213ada48e0b43dc8abee87e8eb16ba2d07b5d1a96f69569 SHA512 d12f5ddde2b9fec9dc50a43212db52f068852c972c0ee559dbe7f56490d7082eb1f603413a17737f791450d7f1458ed5ba39fda9a7a1349af03c07a0173c13a6 WHIRLPOOL fd1d5feddb5387bcc26a9f75aba901398e72da3f57f2d85e0a23c4b8bb5c6eaa43955373ff93e0e0a3705f68978b89283c6253b9322e63c02c871cf50fbab7f2
+DIST xdg-20100731.java.xz 648 SHA256 b6a189323fcc25ae5bebc006d870b4191a3bec34c80de7e337e5ed8a39f332c6 SHA512 8b5d8e695f3f052f889002dc93742da8ba9eada173cb10ad1db525e1ad89d1c8f44200d79dc02068ccf93fdbf2e8daa5bb359dae77bacbc89cb6d4895732774b WHIRLPOOL 8a79fe5a73fae9662f0c74d293dbbe43d034484601649f170232e1b79ad0bb337fa8a6b3160683839893cc9e83171ad77e645fc64724c75321b02ef9f47efc85
+EBUILD bdsup2sub-4.0.0-r1.ebuild 1141 SHA256 ebec6ae19775fe96c4e8bb49a94ece1abbeff53ba97090b4f207328801faf46f SHA512 9b4ea1ead50da4073fcd91e4ffe23e786d453526165770926af65ab3d267ecb146350200d02e423a52c49b52a54e93e4de64a67f3bf9e4132a8ed597b59ed5dd WHIRLPOOL 4c5377f496935c6f25b23fb2ea85f643eb355eb5cd3221ed522844100ceba0011cd3775e0fba7f8aeeeec56e2a57b8ebada269aabd693eaffb27e71bc6686202
+EBUILD bdsup2sub-4.0.0-r2.ebuild 1175 SHA256 4be74c0ee8bd613dc9333d314f8464675966de54d23e7c5f21c812822e7f7d0d SHA512 1cf68cb7898a039a58cbcd794466e10c6249895234b6ac3add213cff2b862016b342a2796c550b141291ad7c63416fb3adfa6529b2a0bcadd552c4778093a3b9 WHIRLPOOL ae5132f6db2b2d71598c8edd05e10980035a56087230cec09fba2bb518fe04745642535015ce5babe48396dc00e5d114594317d5eba5285a5392e14574709080
+MISC ChangeLog 2535 SHA256 10f96f99ab990f861369f23206947b5da0388122751a474c485e4d5b15f32dfc SHA512 47dd96b02a202e93e6d1cf7866d170a0e8a15207c9541fa22b687a9b26a57a8e10973f99666d58aebed79863fe6e5586f0501b289ada074e8cba7b4f4e244cfe WHIRLPOOL 7647d5c1266159963ea42b883209ffe91dd5827ddc741c191f58176f1ee5c2bb9684b7e760d3ec95023467891ebea842686e62e7f3438b62a88aa359ea1a8830
+MISC ChangeLog-2015 1061 SHA256 ce68abfeed4e1eb6f644b16b447bb4ceb8fd607b7ab3e5118bee77f75775f270 SHA512 fae933bf2433ef67a40e580fda09df05f3e5f39558532b40aeb9c4703e8a4b33ac01a72377b7ad33c2afc073932675d26087745acf8df0f336ed625abb7231c9 WHIRLPOOL 9041e42999f501e0b576858cf7d090c13a77e5cd4d05e83b6c6185d00161ce64da02c8e1eaded0b537edc313e0d447f5b800687c26edd9612891c9003c5a9352
+MISC metadata.xml 381 SHA256 7b23db87ee7177c2582fb7aab1308e86e05775f9cc9e69614feffbd99445cca7 SHA512 5f9298ee19a292eea7612e7055b7c689f8ad7c86be2f820aec2b6b1afcf2bb5ab01ace028656a0e9daca9791e45c5b1ffdb70d959014b7bd0e42fc5f2f1da8bd WHIRLPOOL 6c4034b7f91372d4d0ea4abf57856fb1ed3e85e055efeae10de23862502705f482e2145842475f35666d0041cd3ff9e0203b05a77aa275b251c84b022e956329
diff --git a/media-video/bdsup2sub/bdsup2sub-4.0.0-r1.ebuild b/media-video/bdsup2sub/bdsup2sub-4.0.0-r1.ebuild
new file mode 100644
index 000000000000..7818e675d5d2
--- /dev/null
+++ b/media-video/bdsup2sub/bdsup2sub-4.0.0-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="3"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+XDG_P="xdg-20100731"
+
+DESCRIPTION="A tool to convert and tweak bitmap based subtitle streams"
+HOMEPAGE="http://bdsup2sub.javaforge.com/help.htm"
+SRC_URI="http://sbriesen.de/gentoo/distfiles/${P}.tar.xz
+	http://sbriesen.de/gentoo/distfiles/${XDG_P}.java.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/xz-utils"
+
+S="${WORKDIR}/${PN}/${PV}"
+
+java_prepare() {
+	# apply XDG patch
+	cp -f "${WORKDIR}/${XDG_P}.java" "${S}/src/xdg.java"
+	epatch "${FILESDIR}/${P}-xdg.patch"
+
+	# copy build.xml
+	cp -f "${FILESDIR}/build-${PV}.xml" build.xml || die
+}
+
+src_compile() {
+	eant build $(use_doc)
+}
+
+src_install() {
+	java-pkg_dojar dist/BDSup2Sub.jar
+	java-pkg_dolauncher BDSup2Sub --main BDSup2Sub --java_args -Xmx256m
+	newicon bin_copy/icon_32.png BDSup2Sub.png
+	make_desktop_entry BDSup2Sub BDSup2Sub BDSup2Sub
+	use doc && java-pkg_dojavadoc apidocs
+	use source && java-pkg_dosrc src
+}
diff --git a/media-video/bdsup2sub/bdsup2sub-4.0.0-r2.ebuild b/media-video/bdsup2sub/bdsup2sub-4.0.0-r2.ebuild
new file mode 100644
index 000000000000..72f449b2a644
--- /dev/null
+++ b/media-video/bdsup2sub/bdsup2sub-4.0.0-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+XDG_P="xdg-20100731"
+
+MY_PN="BDSup2Sub"
+
+DESCRIPTION="A tool to convert and tweak bitmap based subtitle streams"
+HOMEPAGE="http://bdsup2sub.javaforge.com/help.htm"
+SRC_URI="
+	http://sbriesen.de/gentoo/distfiles/${P}.tar.xz
+	http://sbriesen.de/gentoo/distfiles/${XDG_P}.java.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	app-arch/xz-utils"
+
+S="${WORKDIR}/${PN}/${PV}"
+
+PATCHES=( "${FILESDIR}/${P}-xdg.patch" )
+
+src_prepare() {
+	default
+
+	# apply XDG patch
+	cp -v "${WORKDIR}/${XDG_P}.java" "${S}/src/xdg.java" || die
+
+	# copy build.xml
+	cp -f "${FILESDIR}/build-${PV}.xml" build.xml || die
+}
+
+src_compile() {
+	eant build $(use_doc)
+}
+
+src_install() {
+	java-pkg_dojar "dist/${MY_PN}.jar"
+	java-pkg_dolauncher "${PN}" --main "${MY_PN}" --java_args -Xmx256m
+	newicon bin_copy/icon_32.png "${MY_PN}.png"
+	make_desktop_entry "${MY_PN}" "${MY_PN}" "${MY_PN}"
+	use doc && java-pkg_dojavadoc apidocs
+	use source && java-pkg_dosrc src
+}
diff --git a/media-video/bdsup2sub/files/bdsup2sub-4.0.0-xdg.patch b/media-video/bdsup2sub/files/bdsup2sub-4.0.0-xdg.patch
new file mode 100644
index 000000000000..3f68beb6d495
--- /dev/null
+++ b/media-video/bdsup2sub/files/bdsup2sub-4.0.0-xdg.patch
@@ -0,0 +1,40 @@
+--- a/src/deadbeef/SupTools/Core.java	2010-07-29 13:01:48.000000000 +0200
++++ b/src/deadbeef/SupTools/Core.java	2010-08-01 02:19:25.215473885 +0200
+@@ -22,6 +22,8 @@
+ import deadbeef.Tools.Props;

+ import deadbeef.Tools.ToolBox;

+ 

++import xdg.*;

++

+ /*

+  * Copyright 2009 Volker Oth (0xdeadbeef)

+  *

+@@ -750,6 +752,7 @@
+ 			cliMode = false;

+ 			String s = c.getClass().getName().replace('.','/') + ".class";

+ 			URL url = c.getClass().getClassLoader().getResource(s);

++			/*

+ 			int pos;

+ 			try {

+ 				fnameProps = URLDecoder.decode(url.getPath(),"UTF-8");

+@@ -767,6 +770,8 @@
+ 					fnameProps = fnameProps.substring(0,pos+1);

+ 			}

+ 			fnameProps += Core.iniName;

++			*/

++			fnameProps = xdg.config_home() + "/" + Core.iniName;

+ 

+ 			// read properties from ini file

+ 			props = new Props();

+@@ -905,8 +910,10 @@
+ 	 * Write properties

+ 	 */

+ 	public static void storeProps() {

+-		if (props != null)

++		if (props != null) {

++			xdg.mkdirs_file(fnameProps);

+ 			props.save(fnameProps);

++		}

+ 	}

+ 	

+ 	/**

diff --git a/media-video/bdsup2sub/files/build-4.0.0.xml b/media-video/bdsup2sub/files/build-4.0.0.xml
new file mode 100644
index 000000000000..9aab31c3a5e1
--- /dev/null
+++ b/media-video/bdsup2sub/files/build-4.0.0.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0"?>
+
+<project name="BDSup2Sub" default="jar">
+	<!-- some properties -->
+	<property name="src.dir" value="src" />
+	<property name="build.dir" value="build" />
+	<property name="docs.dir" value="apidocs" />
+	<property name="dist.dir" value="dist" />
+	<property name="resources.dir" value="bin_copy" />
+	<property name="project.jar" value="${dist.dir}/${ant.project.name}.jar" />
+	<property name="target.jdk" value="1.6" />
+
+	<!-- init -->
+	<target name="init">
+		<mkdir dir="${dist.dir}" />
+		<mkdir dir="${docs.dir}" />
+		<mkdir dir="${build.dir}" />
+	</target>	
+
+	<!-- compile everything -->
+	<target name="compile" depends="init">
+		<javac srcdir="${src.dir}"
+			destdir="${build.dir}"
+			source="${target.jdk}"
+			target="${target.jdk}"
+			encoding="ISO-8859-1"/>
+		<copy todir="${build.dir}">
+			<fileset dir="${resources.dir}" />
+		</copy>
+	</target>
+
+	<!-- build the jar files -->
+	<target name="build" depends="compile">
+		<jar jarfile="${project.jar}" basedir="${build.dir}">
+			<manifest>
+				<attribute name="Main-Class" value="${ant.project.name}" />
+			</manifest>
+		</jar>
+	</target>
+	
+	<!-- generate javadocs -->
+	<target name="javadoc" depends="init">
+		<javadoc sourcepath="${src.dir}"
+			packagenames="*"
+           		destdir="${docs.dir}"
+           		author="true"
+           		version="true"
+			use="true"
+			charset="UTF-8"
+			encoding="ISO-8859-1"
+           		windowtitle="${ant.project.name} API" />
+	</target>
+	
+	<!-- clean up -->
+	<target name="clean">
+		<delete dir="${build.dir}" />
+		<delete dir="${docs.dir}" />
+		<delete dir="${dist.dir}" />
+	</target>
+
+        <!-- zip the sources -->
+        <target name="sourcezip">
+		<zip destfile="${dist.dir}/${ant.project.name}-src.zip">
+                        <zipfileset dir="${src.dir}" />
+                </zip>
+        </target>
+
+</project>
diff --git a/media-video/bdsup2sub/metadata.xml b/media-video/bdsup2sub/metadata.xml
new file mode 100644
index 000000000000..66883ac6cbda
--- /dev/null
+++ b/media-video/bdsup2sub/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+	<longdescription lang="en">
+		BDSup2Sub - A tool to convert and tweak bitmap based subtitle streams.
+	</longdescription>
+</pkgmetadata>
diff --git a/media-video/binkplayer/Manifest b/media-video/binkplayer/Manifest
new file mode 100644
index 000000000000..6087173742d6
--- /dev/null
+++ b/media-video/binkplayer/Manifest
@@ -0,0 +1,5 @@
+DIST binkplayer-1.99w.zip 100620 SHA256 cfcfdd8f3b8d9087ca237cdf0a9a361d807e4a9fa0bba60e84f966e85a4d5caf SHA512 2f6e58780098e19cd446e7876de8187e585c1be13cf53f1311975e107644c08d25703b93ceacc596b787a351bc104bde5aaf9f2da8338fcdc7a2795bf49936ce WHIRLPOOL 70e46654399a3bab1aa032adca87f3c7c3ce76cd75584ab91b363eebf0030218c79b4f9e3265f4109731fead89578e7acd37f14df3221f34248a232da090f494
+EBUILD binkplayer-1.99w.ebuild 689 SHA256 a6ac30b2f8c82492a1baf4d013410e4cfe56364c930e31b54c9db3243dab0dab SHA512 f3da55df3d14cfd808f66bc97a5bd85fe7c5e9b1ad1a18b2aabfd892cbb7617c47aebc592d397c089f225975359a3471b7487f4f756a03b7df5bcca245581064 WHIRLPOOL 462db5e4cd93f23f394cb78cdb81210d91dcfe032c2cdcf8cb26543cbdc2fe76c0bb10a48bdf4374f31c379457d9108a4a4d34d95c26bbc5c7881551b7afa06c
+MISC ChangeLog 2439 SHA256 5789525e041710fc908c19e9c73154f677952843c9231dbf5375d93ed67db4cd SHA512 5780c8847aeca316267a9dd02cee480dd9a0b2ebeb1061c2485ba1187d89c7b283f62cf3c5870081fe46771980c6172c1021a9138cc65e9318d50cd6219659f9 WHIRLPOOL a507a3912349cf08ad22f06833de76c5a923d63a1fe7c076040d0219ba6ebbbe6ca5a593d14506ac05ec805c73a5b26ff86c4e3da7124645bb2a1958c422decc
+MISC ChangeLog-2015 4570 SHA256 550cc3ef91a73767e4ffdcb6614a2589c18cabac6f3eb40da0b3fee8b0f5db07 SHA512 7a6dbaa9ad5ddcce6cb22245520b1551b763ed452aa60aa7bac37f0ae832ae50951ec8dc54fdfa01844bf554f1bc7bf477cc471943043106e3218c8e28e705fc WHIRLPOOL 9c88c8eab51717915b8dcf77947369b734ab9dad6309f8b450216eea55db2f45791364bd5ec662b88dc87f04dbc5089b588877736175ccda54ce9555d9236948
+MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/media-video/binkplayer/binkplayer-1.99w.ebuild b/media-video/binkplayer/binkplayer-1.99w.ebuild
new file mode 100644
index 000000000000..01e6281cfd4b
--- /dev/null
+++ b/media-video/binkplayer/binkplayer-1.99w.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+DESCRIPTION="Bink Video! Player"
+HOMEPAGE="http://www.radgametools.com/default.htm"
+# No version on the archives and upstream has said they are not
+# interested in providing versioned archives.
+SRC_URI="mirror://gentoo/${P}.zip"
+
+# distributable per http://www.radgametools.com/binkfaq.htm
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND="
+	>=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)]
+	>=media-libs/openal-1.15.1-r1[abi_x86_32(-)]"
+
+S=${WORKDIR}
+
+QA_PREBUILT="opt/bin/BinkPlayer"
+
+src_install() {
+	into /opt
+	dobin BinkPlayer
+}
diff --git a/media-video/binkplayer/metadata.xml b/media-video/binkplayer/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/media-video/binkplayer/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-video/bino/Manifest b/media-video/bino/Manifest
new file mode 100644
index 000000000000..d123ce263fa2
--- /dev/null
+++ b/media-video/bino/Manifest
@@ -0,0 +1,8 @@
+AUX bino-1.4.2-lirc-detect.patch 1532 SHA256 bb3cc5f249123bf60e10e6145b4fbea01866ff511fdcf87f6c80c54fb4c04fc7 SHA512 f332b468b70cc5de1c9928609ae61710e988c72347e3bf0a935817948d9bd7d252b4727e87fb6f13b59198bf71edd756e7c7ce9fd8051503a3dbed74be1ce298 WHIRLPOOL 983496c107529c616cfc264d2792fd484b9f7fe478d735d52cd4b72117b34e343c1dc96190155f052abd40fd3230abff928e35682071155a2c551d819ae26dd9
+AUX bino.html 658 SHA256 4f7988d9bf6a49dfce58a60a9178355d6b1fc56eb77e8663aa79954ea71669d2 SHA512 c4861b4536ebc08fd9a68a9b8d420b323eb16ab057b74a83fd56c5c4e0c1f7c4fc7665a0933eabf58e5eca7c38206597e7b6ddb99722054804a64821950f23be WHIRLPOOL 5bb3f29c776f76233c51b899eb43d1565ed57202c3a1141fd00dfb34013ff48e054bdd23c7a8d43344cb9bfd7f245381ecad628f59268ddf1a602421320d9ee3
+AUX ffmpeg_2.9.patch 8244 SHA256 fd19f99d5397422e919bd37de7f42dcb5c2ae60353f5bf2eb8ec7f967e3082fa SHA512 3248e42632cbc0e61615f15d7948733d697c6560a485da3c99f126bdbd10d6af40669d6c6795dc49a000f1e092a7063334c7b16554178877e0469fe6270d3bfd WHIRLPOOL debb6c7f5da20122ec556a75ecdd336398c8a05931bb14a8a71ec57bcf7676fb59894ca16616a6b885052779bb67c8d27bb716c7d4c58a823ea208f783979b20
+DIST bino-1.6.1.tar.xz 814212 SHA256 f6e4b07a8e9ff6c929da6200d4ddd1482c46d4aa8516b18ff1c3c193edecc937 SHA512 5c0951f17cf9db37a4bd759aacbd4f3ef1a865499c893ca9c4c3a3775193560234aff9a5b12bc6fc012b987d3bd73264c5a5dcead562a6719f6a1019650e19af WHIRLPOOL 15b0219480d56f00fbaefe4b0935e7783929a3955d6a5632dc49b6681992e720857f09cf9c5d3ea8dd38bb7dbd56a492cbeda6af55c42f27172cb5a28c1bc176
+EBUILD bino-1.6.1-r2.ebuild 1920 SHA256 6dbaab6fa0587ee511a19133afee7df694f1c9feb149324ea4225e728be1124b SHA512 19f58814ac6d9ffde3ccf6d3fe0bb3a00b1a21f7dc25a1c65dea226a29a3dabf911936bc04826bbabc0f4d74c1884204a4ae86d79d468873a4a9d359aa29c69a WHIRLPOOL f9f6042ecd13f5676a7c0cd8de89dbe6b3c97400e8c38ef88144f28c38fd638a7ef0add69d1b1507edffda95e135f761f91ee5dfdc2334428fdea15babf90a27
+MISC ChangeLog 3245 SHA256 b63ae153a74e11c3d7a9a4a5e192271e150650a797c3408d81ae199d9912e21d SHA512 0225490bbb5da33d9bf58fae0e8e39158b9fd0dc78c22ddfa59df9fb93e12cb65614700ac7098f9c7dcff4f9726d7a1967158cc49f99efbe3ad10e029393b5cb WHIRLPOOL 952b339389d54d20b1c82b9ee753a638405374f61ee372421fbf52b940204ab76fe42a89af41af1f307b0efc7c8ef0c81a7d8544c0df0b11eec335dba4776344
+MISC ChangeLog-2015 1524 SHA256 fe2f67d068461a3a0a991b086b9dd337f53db05176b8f773dad886fb267571f5 SHA512 d2ac9eaeaf3144be3bf8b1507a9fdcd801c8a6ff0e584fd86e84f249d74ddc63261858b74e414781f69bef21df094ad85750f4553d1c17b8c925f659140c66e4 WHIRLPOOL 4ff9f6ba21568f8019de13c17d83f6cec60174c6602cc038d5d6fcedb649aca507d66a3dfa64b08b944b80ed09989bfad55d4860c694e806093f9f16bbbea7ca
+MISC metadata.xml 571 SHA256 717121e3a97e1d6d6c46a32a716ec128a1533983ddb96fcaf7f14b2dda19963f SHA512 2aaecbf779b16167d1591ea253a977559c8e4d2068c5eb390b800a9b80927aa0a82a1b5d50738c609f2659176f515fc40a862d99cf68bdbebcf3d4beb5600b0b WHIRLPOOL ced955086147ec7c610ad644a9009f6f8f11696bc3841a1acd816b5cd5859ac3d7ef6c8c0fadfeeeff9907222f414bed1f939a6032f769da058716190a6bc107
diff --git a/media-video/bino/bino-1.6.1-r2.ebuild b/media-video/bino/bino-1.6.1-r2.ebuild
new file mode 100644
index 000000000000..132a4ab0893d
--- /dev/null
+++ b/media-video/bino/bino-1.6.1-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF="1"
+
+inherit autotools-utils flag-o-matic
+
+DESCRIPTION="Stereoscopic and multi-display media player"
+HOMEPAGE="http://bino3d.org/"
+SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug doc libav lirc"
+
+IUSE_VIDEO_CARDS="
+	video_cards_nvidia"
+IUSE+="${IUSE_VIDEO_CARDS}"
+
+LANGS="en bg de fr ru zh_CN"
+for X in ${LANGS} ; do
+	IUSE+=" linguas_${X}"
+done
+
+RDEPEND=">=media-libs/glew-1.6.0:0=
+	>=media-libs/openal-1.15.1
+	dev-qt/qtgui:4
+	dev-qt/qtcore:4
+	dev-qt/qtopengl:4
+	>=media-libs/libass-0.9.9
+	libav? ( >=media-video/libav-0.7:0= )
+	!libav? ( >=media-video/ffmpeg-0.7:0= )
+	lirc? ( app-misc/lirc )
+	video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) )
+	virtual/libintl"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS README README.Linux )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4.2-lirc-detect.patch" # detect lirc
+	"${FILESDIR}/ffmpeg_2.9.patch" # build with latest ffmpeg, #587860
+)
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with video_cards_nvidia xnvctrl)
+		$(use_with lirc liblircclient)
+		$(use_enable debug)
+		--without-equalizer
+		--htmldir=/usr/share/doc/${PF}/html
+	)
+
+	use video_cards_nvidia && append-cppflags "-I/usr/include/NVCtrl" \
+		&& append-ldflags "-L/usr/$(get_libdir)/opengl/nvidia/lib \
+		-L/usr/$(get_libdir)" && append-libs "Xext"
+	use lirc && append-cppflags "-I/usr/include/lirc" \
+		&& append-libs "lirc_client"
+
+	# Fix a compilation error because of a multiple definitions in glew
+	append-ldflags "-zmuldefs"
+
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	use doc || ( rm -rf "${D}"/usr/share/doc/${PF}/html && dohtml "${FILESDIR}/${PN}.html" )
+}
diff --git a/media-video/bino/files/bino-1.4.2-lirc-detect.patch b/media-video/bino/files/bino-1.4.2-lirc-detect.patch
new file mode 100644
index 000000000000..7e476e5d46d8
--- /dev/null
+++ b/media-video/bino/files/bino-1.4.2-lirc-detect.patch
@@ -0,0 +1,35 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -284,14 +284,30 @@
+     [AS_HELP_STRING([--without-liblircclient], [Disable remote control support via liblircclient (enabled by default)])],
+     [if test "$withval" = "yes"; then lirc="yes"; else lirc="no"; fi], [lirc="yes"])
+ if test "$lirc" = "yes"; then
+-    PKG_CHECK_MODULES([liblircclient], [liblircclient0 >= 0.0], [HAVE_LIBLIRCCLIENT=1], [HAVE_LIBLIRCCLIENT=0])
++    CPPFLAGS_BAK="$CPPFLAGS"
++    CPPFLAGS="$CPPFLAGS $xliblircclient_CFLAGS"
++    AC_SUBST([liblircclient_CFLAGS])
++    AC_CHECK_HEADERS([lirc_client.h],
++                     [HAVE_LIBLIRCCLIENT=1],
++                     [HAVE_LIBLIRCCLIENT=0])
++    if test "HAVE_LIBLIRCCLIENT" = "1"; then
++        LDFLAGS_BAK="$LDFLAGS"
++        LDFLAGS="$LDFLAGS $xliblircclient_LDFLAGS"
++        AC_SUBST([liblircclient_LDFLAGS])
++        AC_CHECK_LIB([lirc_client],
++                     [lirc_deinit],
++                     [HAVE_LIBLIRCCLIENT=1],
++                     [HAVE_LIBLIRCCLIENT=0])
++        LDFLAGS="$LDFLAGS_BAK"
++    fi
++    CPPFLAGS="$CPPFLAGS_BAK"
+     if test "$HAVE_LIBLIRCCLIENT" != "1"; then
+         AC_MSG_WARN([optional library liblircclient not found:])
+         AC_MSG_WARN([$liblircclient_PKG_ERRORS])
+         AC_MSG_WARN([liblircclient is provided by LIRC; Debian package: liblircclient-dev])
+ 	lirc="no"
+     else
+-        LIBLIRCCLIENT_PKGCONFIG_VERSION="\"`$PKG_CONFIG --modversion liblircclient0`\""
++        LIBLIRCCLIENT_PKGCONFIG_VERSION="\"system\""
+     fi
+ else
+     HAVE_LIBLIRCCLIENT=0
diff --git a/media-video/bino/files/bino.html b/media-video/bino/files/bino.html
new file mode 100644
index 000000000000..28a6982c1697
--- /dev/null
+++ b/media-video/bino/files/bino.html
@@ -0,0 +1,24 @@
+<html lang="en">
+<head>
+<title>Bino</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Bino">
+<meta http-equiv="Content-Style-Type" content="text/css">
+</head>
+
+<body>
+<h1 class="settitle">Bino</h1>
+<div class="node">
+<p><hr>
+Up:&nbsp;<a rel="up" accesskey="u" href="../">(dir)</a>
+</div>
+
+<h2 class="unnumbered">Warning</h2>
+
+<p>You have chosen not to install the documentation of Bino.
+<p>If you want to have the documentation installed, please enable the <b>doc</b> use flag of <i>media-video/bino</i>.
+<p>Alternatively you may do a:
+<pre>
+USE="doc" emerge media-video/bino
+</pre>
+</body></html>
diff --git a/media-video/bino/files/ffmpeg_2.9.patch b/media-video/bino/files/ffmpeg_2.9.patch
new file mode 100644
index 000000000000..c790d6e97741
--- /dev/null
+++ b/media-video/bino/files/ffmpeg_2.9.patch
@@ -0,0 +1,133 @@
+https://bugs.gentoo.org/show_bug.cgi?id=587860
+https://github.com/schaal/bino/blob/master/debian/patches/ffmpeg_2.9.patch
+
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
+Last-Update: <2015-11-02>
+
+--- bino-1.6.0.orig/src/media_object.cpp
++++ bino-1.6.0/src/media_object.cpp
+@@ -427,20 +427,20 @@ void media_object::set_video_frame_templ
+     video_frame_template.value_range = video_frame::u8_full;
+     video_frame_template.chroma_location = video_frame::center;
+     if (!_always_convert_to_bgra32
+-            && (video_codec_ctx->pix_fmt == PIX_FMT_YUV444P
+-                || video_codec_ctx->pix_fmt == PIX_FMT_YUV444P10
+-                || video_codec_ctx->pix_fmt == PIX_FMT_YUV422P
+-                || video_codec_ctx->pix_fmt == PIX_FMT_YUV422P10
+-                || video_codec_ctx->pix_fmt == PIX_FMT_YUV420P
+-                || video_codec_ctx->pix_fmt == PIX_FMT_YUV420P10))
++            && (video_codec_ctx->pix_fmt == AV_PIX_FMT_YUV444P
++                || video_codec_ctx->pix_fmt == AV_PIX_FMT_YUV444P10
++                || video_codec_ctx->pix_fmt == AV_PIX_FMT_YUV422P
++                || video_codec_ctx->pix_fmt == AV_PIX_FMT_YUV422P10
++                || video_codec_ctx->pix_fmt == AV_PIX_FMT_YUV420P
++                || video_codec_ctx->pix_fmt == AV_PIX_FMT_YUV420P10))
+     {
+-        if (video_codec_ctx->pix_fmt == PIX_FMT_YUV444P
+-                || video_codec_ctx->pix_fmt == PIX_FMT_YUV444P10)
++        if (video_codec_ctx->pix_fmt == AV_PIX_FMT_YUV444P
++                || video_codec_ctx->pix_fmt == AV_PIX_FMT_YUV444P10)
+         {
+             video_frame_template.layout = video_frame::yuv444p;
+         }
+-        else if (video_codec_ctx->pix_fmt == PIX_FMT_YUV422P
+-                || video_codec_ctx->pix_fmt == PIX_FMT_YUV422P10)
++        else if (video_codec_ctx->pix_fmt == AV_PIX_FMT_YUV422P
++                || video_codec_ctx->pix_fmt == AV_PIX_FMT_YUV422P10)
+         {
+             video_frame_template.layout = video_frame::yuv422p;
+         }
+@@ -453,9 +453,9 @@ void media_object::set_video_frame_templ
+         {
+             video_frame_template.color_space = video_frame::yuv709;
+         }
+-        if (video_codec_ctx->pix_fmt == PIX_FMT_YUV444P10
+-                || video_codec_ctx->pix_fmt == PIX_FMT_YUV422P10
+-                || video_codec_ctx->pix_fmt == PIX_FMT_YUV420P10)
++        if (video_codec_ctx->pix_fmt == AV_PIX_FMT_YUV444P10
++                || video_codec_ctx->pix_fmt == AV_PIX_FMT_YUV422P10
++                || video_codec_ctx->pix_fmt == AV_PIX_FMT_YUV420P10)
+         {
+             video_frame_template.value_range = video_frame::u10_mpeg;
+             if (video_codec_ctx->color_range == AVCOL_RANGE_JPEG)
+@@ -482,15 +482,15 @@ void media_object::set_video_frame_templ
+         }
+     }
+     else if (!_always_convert_to_bgra32
+-            && (video_codec_ctx->pix_fmt == PIX_FMT_YUVJ444P
+-                || video_codec_ctx->pix_fmt == PIX_FMT_YUVJ422P
+-                || video_codec_ctx->pix_fmt == PIX_FMT_YUVJ420P))
++            && (video_codec_ctx->pix_fmt == AV_PIX_FMT_YUVJ444P
++                || video_codec_ctx->pix_fmt == AV_PIX_FMT_YUVJ422P
++                || video_codec_ctx->pix_fmt == AV_PIX_FMT_YUVJ420P))
+     {
+-        if (video_codec_ctx->pix_fmt == PIX_FMT_YUVJ444P)
++        if (video_codec_ctx->pix_fmt == AV_PIX_FMT_YUVJ444P)
+         {
+             video_frame_template.layout = video_frame::yuv444p;
+         }
+-        else if (video_codec_ctx->pix_fmt == PIX_FMT_YUVJ422P)
++        else if (video_codec_ctx->pix_fmt == AV_PIX_FMT_YUVJ422P)
+         {
+             video_frame_template.layout = video_frame::yuv422p;
+         }
+@@ -898,15 +898,6 @@ void media_object::open(const std::strin
+             // Activate multithreaded decoding. This must be done before opening the codec; see
+             // http://lists.gnu.org/archive/html/bino-list/2011-08/msg00019.html
+             codec_ctx->thread_count = video_decoding_threads();
+-            // Set CODEC_FLAG_EMU_EDGE in the same situations in which ffplay sets it.
+-            // I don't know what exactly this does, but it is necessary to fix the problem
+-            // described in this thread: http://lists.nongnu.org/archive/html/bino-list/2012-02/msg00039.html
+-            int lowres = 0;
+-#ifdef FF_API_LOWRES
+-            lowres = codec_ctx->lowres;
+-#endif
+-            if (lowres || (codec && (codec->capabilities & CODEC_CAP_DR1)))
+-                codec_ctx->flags |= CODEC_FLAG_EMU_EDGE;
+         }
+         // Find and open the codec. AV_CODEC_ID_TEXT is a special case: it has no decoder since it is unencoded raw data.
+         if (codec_ctx->codec_id != AV_CODEC_ID_TEXT && (!codec || (e = avcodec_open2(codec_ctx, codec, NULL)) < 0))
+@@ -944,8 +935,8 @@ void media_object::open(const std::strin
+             _ffmpeg->video_frames.push_back(av_frame_alloc());
+             _ffmpeg->video_buffered_frames.push_back(av_frame_alloc());
+ #endif
+-            enum PixelFormat frame_fmt = (_ffmpeg->video_frame_templates[j].layout == video_frame::bgra32
+-                    ? PIX_FMT_BGRA : _ffmpeg->video_codec_ctxs[j]->pix_fmt);
++            enum AVPixelFormat frame_fmt = (_ffmpeg->video_frame_templates[j].layout == video_frame::bgra32
++                    ? AV_PIX_FMT_BGRA : _ffmpeg->video_codec_ctxs[j]->pix_fmt);
+             int frame_bufsize = (avpicture_get_size(frame_fmt,
+                         _ffmpeg->video_codec_ctxs[j]->width, _ffmpeg->video_codec_ctxs[j]->height));
+             _ffmpeg->video_buffers.push_back(static_cast<uint8_t *>(av_malloc(frame_bufsize)));
+@@ -958,7 +949,7 @@ void media_object::open(const std::strin
+             if (_ffmpeg->video_frame_templates[j].layout == video_frame::bgra32)
+             {
+                 // Initialize things needed for software pixel format conversion
+-                int sws_bufsize = avpicture_get_size(PIX_FMT_BGRA,
++                int sws_bufsize = avpicture_get_size(AV_PIX_FMT_BGRA,
+                         _ffmpeg->video_codec_ctxs[j]->width, _ffmpeg->video_codec_ctxs[j]->height);
+ #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(55, 28, 1)
+                 _ffmpeg->video_sws_frames.push_back(avcodec_alloc_frame());
+@@ -971,11 +962,11 @@ void media_object::open(const std::strin
+                     throw exc(HERE + ": " + strerror(ENOMEM));
+                 }
+                 avpicture_fill(reinterpret_cast<AVPicture *>(_ffmpeg->video_sws_frames[j]), _ffmpeg->video_sws_buffers[j],
+-                        PIX_FMT_BGRA, _ffmpeg->video_codec_ctxs[j]->width, _ffmpeg->video_codec_ctxs[j]->height);
++                        AV_PIX_FMT_BGRA, _ffmpeg->video_codec_ctxs[j]->width, _ffmpeg->video_codec_ctxs[j]->height);
+                 // Call sws_getCachedContext(NULL, ...) instead of sws_getContext(...) just to avoid a deprecation warning.
+                 _ffmpeg->video_sws_ctxs.push_back(sws_getCachedContext(NULL,
+                             _ffmpeg->video_codec_ctxs[j]->width, _ffmpeg->video_codec_ctxs[j]->height, _ffmpeg->video_codec_ctxs[j]->pix_fmt,
+-                            _ffmpeg->video_codec_ctxs[j]->width, _ffmpeg->video_codec_ctxs[j]->height, PIX_FMT_BGRA,
++                            _ffmpeg->video_codec_ctxs[j]->width, _ffmpeg->video_codec_ctxs[j]->height, AV_PIX_FMT_BGRA,
+                             SWS_POINT, NULL, NULL, NULL));
+                 if (!_ffmpeg->video_sws_ctxs[j])
+                 {
+@@ -1529,7 +1520,7 @@ read_frame:
+                 // We need to buffer the data because FFmpeg will clubber it when decoding the next frame.
+                 av_picture_copy(reinterpret_cast<AVPicture *>(_ffmpeg->video_buffered_frames[_video_stream]),
+                         reinterpret_cast<AVPicture *>(_ffmpeg->video_frames[_video_stream]),
+-                        static_cast<enum PixelFormat>(_ffmpeg->video_codec_ctxs[_video_stream]->pix_fmt),
++                        static_cast<enum AVPixelFormat>(_ffmpeg->video_codec_ctxs[_video_stream]->pix_fmt),
+                         _ffmpeg->video_codec_ctxs[_video_stream]->width,
+                         _ffmpeg->video_codec_ctxs[_video_stream]->height);
+                 src_frame = _ffmpeg->video_buffered_frames[_video_stream];
diff --git a/media-video/bino/metadata.xml b/media-video/bino/metadata.xml
new file mode 100644
index 000000000000..27e43716e9b8
--- /dev/null
+++ b/media-video/bino/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>cuchac@email.cz</email>
+		<name>Jožka Kejzlar (cuchac)</name>
+		<description>Maintainer. Assign bugs on him</description>
+	</maintainer>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+		<description>Proxy maintainer. CC him on bugs</description>
+	</maintainer>
+<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-video/blinkensim/Manifest b/media-video/blinkensim/Manifest
new file mode 100644
index 000000000000..ef8c1b71de7c
--- /dev/null
+++ b/media-video/blinkensim/Manifest
@@ -0,0 +1,5 @@
+DIST blinkensim-2.7.tar.gz 88416 SHA256 5fe4a0675e5dd06661ec3c3dfddda1dee511f3d6f1093d5517bcd1621a2890bc SHA512 35be6f0d871ede4ed3de1bb2a18e53e8a508a08001d795369cf222122dd9596ac48314d1c386905360be0a46b1fefffa763bdb9874eaaa6e1ed713a48a6fefd4 WHIRLPOOL 2b19867657c934bfe3b1325c4f18db2a0a0db11c2f187c5ad9ff71e9f61682fe3feb252a34ef7218dbf7e4afee4b2a907dd12a160f01d7b0e1a3e2912f3702c4
+EBUILD blinkensim-2.7.ebuild 751 SHA256 dbc1a21e11525f51d5ab236b6a5b5df0e06f26e8c6709b41c26bf59c7ec6f6a7 SHA512 6e3206c78dae598a104b9baf9751ffaf7c59c4a9dd49cc3f3d375abf6a86dfc853ba3e71087f754c756c955225e6593eb4f5d44a85684f3406d04142eaa1afb8 WHIRLPOOL 14bb78a84807e9d3029c15a4c946d5f5cbfe83d2e27da8e20f98106d5815202c9bc1352ccf4e8d4d7f5c27c7aeac7be2ced8ae674ea29b73968b03ce832da2a9
+MISC ChangeLog 2435 SHA256 212aacc35a70fece3db10883c1521a56f5ccbaa061cc38cf7e04f80e2ee0dff4 SHA512 9d0405678c14e811e52f0dc8567360764eb59688394d82f6142ef405e15f3acb36658e5d9cd3124f51b0fb5af92fff2b83bc1cc70bd993a8e1db10a64b678c4e WHIRLPOOL d4c83dfd0fd84ce312daeda29d93b7e2060946518a486d52f02add24b491957917d619d582712582fe03b15dc1496acbbcc0ec11b3c15a410b315c3440a23150
+MISC ChangeLog-2015 1477 SHA256 de9de163b6119751a532e3be7d55fa03e0bbd1c6e463696ee4b9c47f06cf2e93 SHA512 54b24822dbc52e42214620dd8a1255179ed91215a1809f097c042958950670ab57c9ade3b7850290c3dd08ba2a5a24e4ed853a10e5ed63b8fe60210090a303e5 WHIRLPOOL 662c531cbb6bbdc655be88879d59c5f4b098d0891f7dbe98e1d36c547a407d67fa1c200f06b6a4ad5a7563fa21cb7b1081721cab40417302e08f82b6f6da83c2
+MISC metadata.xml 360 SHA256 e7f2862aed77d097a61fd48e6f3a3ab8885e70c4f4686badcd4efcb0145dfffd SHA512 b8538f19756f7bf5248e4d60916093cb4aba5d06947dfcc152168941d43acedc6079e0c0aee3da4089a06a6956f74320f874b4cf50d50ae8d7476f2838901782 WHIRLPOOL 2c472738833a4e8e465f8120228b4da38024881e99e62de438abdf52b83027157f9bcf55521a58200935ef7331932bdf75d87ee1f4cdce30f0bb0684ef17de05
diff --git a/media-video/blinkensim/blinkensim-2.7.ebuild b/media-video/blinkensim/blinkensim-2.7.ebuild
new file mode 100644
index 000000000000..ca54eae85e94
--- /dev/null
+++ b/media-video/blinkensim/blinkensim-2.7.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Graphical Blinkenlights simulator with networking support"
+
+HOMEPAGE="http://www.blinkenlights.net/project/developer-tools"
+SRC_URI="http://www.blinkenlights.de/dist/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+IUSE="aalib gtk directfb"
+
+# if the config script finds any of the optional library it will try to
+# compile against it
+DEPEND=">=media-libs/blib-1.1.4
+	virtual/pkgconfig
+	aalib? ( >=media-libs/aalib-1.4_rc4-r2 )
+	gtk? ( >=x11-libs/gtk+-2.4.4 )
+	directfb? ( >=dev-libs/DirectFB-0.9.20-r1 )"
+RDEPEND="media-video/blinkenthemes"
+
+src_install() {
+	make DESTDIR="${D}" \
+		install || die "install failed"
+}
diff --git a/media-video/blinkensim/metadata.xml b/media-video/blinkensim/metadata.xml
new file mode 100644
index 000000000000..19114582cda0
--- /dev/null
+++ b/media-video/blinkensim/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+		Counterpart for the blinkentools and viewing the Blinkenlight-movies in
+		blm-format.
+	</longdescription>
+</pkgmetadata>
diff --git a/media-video/blinkenthemes/Manifest b/media-video/blinkenthemes/Manifest
new file mode 100644
index 000000000000..d92e0213be4d
--- /dev/null
+++ b/media-video/blinkenthemes/Manifest
@@ -0,0 +1,5 @@
+DIST blinkenthemes-0.10.tar.gz 4059605 SHA256 be5853aeefe2f60cb549b8a94787ba707f032da27d2071812320fd956518bff9 SHA512 e7bcc2b41046f78750d32ec2f3b37e6f2e16b4bc35a40bc09a8a9ba0a63e54192796cd69491c0517e0ac612d496f0d04ef79a5508da61a2090943bfc94938cf1 WHIRLPOOL 86aa967b8519b831064dfe7ee16a0ab61a659055a009540ed4b6271ef16bda982e711bce029a3887138514aa93120325a2006e33428a87c8e0c54c9921e4ff89
+EBUILD blinkenthemes-0.10.ebuild 542 SHA256 759ac03634714c16c3404fe52de0309f317cf36baf941bd8c4dfce9f8f659918 SHA512 e254af2001338b6097fc3f9a9165b1bde70d403e774790bbc398a49245441f65db091e3a70f2bd892cd3a22401c435446de590c3668a70d3d73c0a51c2b4173f WHIRLPOOL 87e1b1ac57780b957b7fa6b4b6a8f46644178624c10b8723deeffe6990adf0828997688ccaf53a6e417dd1a5b2ec29f4af89e4abb317426484de956a12c13e9c
+MISC ChangeLog 2446 SHA256 6e1cac6d3549059d7d26eea7e426d874edfb1aeeca389ffd3c45c98ce560b072 SHA512 1cf7ea90e01d04ed84a3e3fce4430c7059604e6da6736292430786c42a9df9628268f92463a543798e7bf14cc09b1230ad0813b1428939002b9fa5bca89f5ff2 WHIRLPOOL 2f3d33465c6dd9940b4e2831466389f83f25057eb72b9f9c50adb4c4584457e42989049b7a94b7ce1c907a6c09136d20db7d544addc002921b3ecc43b1ebfc4d
+MISC ChangeLog-2015 1202 SHA256 45ee1e06ca50f6f208e1adc97c8e1a693c6fbcaff18eea72fbd1487647b937ba SHA512 821cad61192ee1d61ac502fd85dae583e788e051c17cc0dec3ee6b92318302c899fb375c436a6abc0386f8fa9614acc8818f84fec2c277970c1d3e94d35d5fd7 WHIRLPOOL 9a79632039091930c3d105d45ab4cf303f4721a4256f4341e9b322de1da571e4c6b2060be26b78ce34c1133e5e37290bd26b80e11ac146f1bc1355bd7ca4abfe
+MISC metadata.xml 667 SHA256 d4ac59e3b06d103f76750294c62a9eb80404028200f35795c475408b1cc35eda SHA512 11c102eb6ccdb806940c82ca69345ac9acfa113002e5b7ce14426a1107d0a678d8bb444c2f7fda9d25f4b78a35fe022d970471b344e19d0b806ec7bfb454a021 WHIRLPOOL 8138c475354fdddd15f1e3ead6f4deddaf9224f5749943f78513d6bf29878c21e2310b20dd88ce7a7f596115be199047dc5ac11458b3a6145c427022003cdb21
diff --git a/media-video/blinkenthemes/blinkenthemes-0.10.ebuild b/media-video/blinkenthemes/blinkenthemes-0.10.ebuild
new file mode 100644
index 000000000000..4aa7dc5ebc06
--- /dev/null
+++ b/media-video/blinkenthemes/blinkenthemes-0.10.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Themes for blinkensim"
+HOMEPAGE="http://www.blinkenlights.net/project/developer-tools"
+SRC_URI="http://www.blinkenlights.de/dist/blinkenthemes-0.10.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+IUSE=""
+
+DEPEND="media-libs/blib
+	virtual/pkgconfig"
+RDEPEND=""
+
+src_compile() {
+	econf || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" \
+		install || die "install failed"
+}
diff --git a/media-video/blinkenthemes/metadata.xml b/media-video/blinkenthemes/metadata.xml
new file mode 100644
index 000000000000..6c70b61f0876
--- /dev/null
+++ b/media-video/blinkenthemes/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+		Some nice themes for blinkensim. Included are themes of the "Haus des
+		Lehrers" at Alexanderplatz n Berlin. This is the place where the
+		original Blinkenlights installation where set up. Then there are themes
+		of the "Bibliothèque nationale de France" in Paris where the second
+		installation called "Arcade" took place. Furthermore you can find some
+		experimental themes for LED-clones.
+	</longdescription>
+</pkgmetadata>
diff --git a/media-video/blinkentools/Manifest b/media-video/blinkentools/Manifest
new file mode 100644
index 000000000000..fceaa56a1e1b
--- /dev/null
+++ b/media-video/blinkentools/Manifest
@@ -0,0 +1,5 @@
+DIST blinkentools-2.9.tar.gz 560904 SHA256 1fa92c4b3a679085464edc6a194b80b3feea9ccea7e82cdbcdab9ec29aba5920 SHA512 ba6fed446bfa757979469ed2894cb7b6a7fa4c1296a3074d75b6ac6c9f17e69d4ae172d1d54bb62d7f05cc20e9e7ca1a6eca5a83f2cfb7e86f7f9070bc2da2dc WHIRLPOOL 6ff99163556303446ec1f2ee00992af8b8eba518cbabb32c4eac060b52345ee0469398c572f47b729505f579693ce839e57f007f43289a0aa47793ce68d30881
+EBUILD blinkentools-2.9.ebuild 572 SHA256 8b2c67689546d1774dce231a6fffb09377d495cc36b48195e48a2ba14c97cc6c SHA512 352dfa41aefc9a3f0cd88869117d95d92058c14832ac70400d0cdf56e1d2825bc2b500e18740fcc84ed3daf6b7594bd39a73cf6b1815c5342b815030a72ea433 WHIRLPOOL 241e36587cd37fda9655679d42d6102cc058e92c26758c1cb73e7966b825f102cb1c740251973549e7819fab98748658ad15b9cbe909f651e442176ba9e7d6d6
+MISC ChangeLog 2441 SHA256 85d21497be888bd85e94c28dd7fb67d4eb4c0611a285e9f7babfd3e3000d4120 SHA512 728f9d74b93a2beedfe159fe8f822fdb351fb2316e714d002bd70a6890c5e5775932d9b27cf6d6f6daabc8f4602e776a7de9101da4d3850b9f1248bc01ad296a WHIRLPOOL a801fcc8a5fe970217682c323386be86bd3144f2afa90be19b5b4c55433fd278dd9251e12253678ca5a359e80bb3697950593e2fdb95c8bca608e2ed78bc2a2f
+MISC ChangeLog-2015 1352 SHA256 a804cbf5d0f6027d642990dc57261c69f2851efc7cc139e0552c2f150f63574f SHA512 be64d512af95b1b51ab2c39455a4aa81e40ca013a3e29b2e96dfa1892b48519face2a410196397cdb43ed94a706acad5c6fa791634e7366685e71428f8420942 WHIRLPOOL fcfff742c637851c6e83f19493dd3be8c0229d02d5ac6fffc365e3bb54ec38c71018feb800fd3bd6db9813a66beddb5d91ad9ffcfb5fa3cdfff8c607a9361642
+MISC metadata.xml 510 SHA256 619abadf1004350f29cd7afb4b9d981f90e47d756ba070410b495558295733aa SHA512 39f50dda7c89cfbab1b4d29ed81c9e832ff41222d4bd219ad574b59d65a11b882e60feffef9a890769f7e234f992d507daac00b394c09c3e3311a2644f91ad8f WHIRLPOOL 40368ba9c573ea2ee8ba4cf1e8ecf06eec30ce49fb8a8b6b4a4e7929665fafcd5283c7d1e59a00414fb61622a131c57a0c058bb57c6f881ef3710e427dff15e2
diff --git a/media-video/blinkentools/blinkentools-2.9.ebuild b/media-video/blinkentools/blinkentools-2.9.ebuild
new file mode 100644
index 000000000000..cc154189fb1a
--- /dev/null
+++ b/media-video/blinkentools/blinkentools-2.9.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="blinkentools is a set of commandline utilities related to Blinkenlights"
+HOMEPAGE="http://www.blinkenlights.net/project/developer-tools"
+SRC_URI="http://www.blinkenlights.de/dist/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+IUSE=""
+
+DEPEND="media-libs/blib
+	media-libs/libmng
+	virtual/pkgconfig"
+RDEPEND=""
+
+src_compile() {
+	econf
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+}
diff --git a/media-video/blinkentools/metadata.xml b/media-video/blinkentools/metadata.xml
new file mode 100644
index 000000000000..cd39a9774c98
--- /dev/null
+++ b/media-video/blinkentools/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+		The blinkentools bring you scripts for handling and playing the beloved
+		videos from Blinkenlights and Arcade, recorded in blm-format, on your
+		local computer, an attached mini-Blinkenlights, or whatever you intend
+		to use them for.
+	</longdescription>
+</pkgmetadata>
diff --git a/media-video/bluray_info/Manifest b/media-video/bluray_info/Manifest
new file mode 100644
index 000000000000..a7bf06ec36b2
--- /dev/null
+++ b/media-video/bluray_info/Manifest
@@ -0,0 +1,3 @@
+DIST bluray_info-1.0.0.tar.gz 189918 SHA256 a8328c39930634f2aadb9d72b6d43a14a1d123d58c8703baad0158ac9df86dfe SHA512 8d87bc1829daee08d68f3a357400d81b7aa31e21c90da184dc042f7e0c9bc655fbf7901f855d5c4f60b1f22b7dcd243cdcfc4ff2926cdd190e97a8f0229831bf WHIRLPOOL 7b26da4bf21bd54abbe643a473fbfc1798be16ab27795d632a7e599eb823d8517585b5f627eb8cd375edb9a519ed6e3b6cae2cf58f54268950ac1ebdb47eac27
+EBUILD bluray_info-1.0.0.ebuild 392 SHA256 426e12154ba68b679aa469d6637d761d00ae4bdbf4d97a9c0fee87ae174bd3e5 SHA512 278166c06a8b5def32b8e0195e614692387ea72409f3a5acd480cd9c927eb2dece962bdc8cd264a06f79bfb6c526e21de3e8ca0a39693499f1b3f26513955059 WHIRLPOOL 9f9a61d5d97b6cdf6b49b36ef551e7097f2d8d9c44594852495eced1fc45465a0d0f727906135236dfce8445790db5c86d2cdcd43e22f234937a0b03c7edae34
+MISC metadata.xml 384 SHA256 a3d8db1a7dcacf208750e12500bd0b3f8a24a61426397ca3783bd44e225bc2a9 SHA512 910f46c7c56a20f5f0b26b3562dc3a0c9f200686278af88c764e1ceca51b0bb89c5cf85e22b304b5b4c810cc8be7bd83ee6593da06b47552e1e30a518c0ef56c WHIRLPOOL adbe380cc9ba384b15a208b0e1f02652eb9da83e5c9796034e1787f9461a02dfcee35e28f98655ae5f4feee3241db64831a1e9bd4433c404ae83f684abc068a4
diff --git a/media-video/bluray_info/bluray_info-1.0.0.ebuild b/media-video/bluray_info/bluray_info-1.0.0.ebuild
new file mode 100644
index 000000000000..9629b8330f76
--- /dev/null
+++ b/media-video/bluray_info/bluray_info-1.0.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Display information about a Blu-ray disc"
+HOMEPAGE="https://github.com/beandog/bluray_info"
+SRC_URI="mirror://sourceforge/bluray-info/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=media-libs/libbluray-1.0.0"
+RDEPEND="${DEPEND}"
diff --git a/media-video/bluray_info/metadata.xml b/media-video/bluray_info/metadata.xml
new file mode 100644
index 000000000000..96634d3504a6
--- /dev/null
+++ b/media-video/bluray_info/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+<email>media-video@gentoo.org</email>
+</maintainer>
+<longdescription lang="en">
+Display information about a Blu-ray disc
+</longdescription>
+<upstream>
+<remote-id type="sourceforge">bluray-info</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/media-video/camorama/Manifest b/media-video/camorama/Manifest
new file mode 100644
index 000000000000..2e5b23e22d27
--- /dev/null
+++ b/media-video/camorama/Manifest
@@ -0,0 +1,10 @@
+AUX camorama-0.19-fixes.patch 3930 SHA256 ac9fa437d928e77b299e8a2b24b28ce5b0d91a619a9bc2bbfebdd32c7edf3839 SHA512 923343da73b32ca98cd4de29bf636c4f923c1927ec2c99b472d7bebdf71336a2afb8db8e7737427b9209fde193470a3b16a74ddc6b22214d0e9b380652246859 WHIRLPOOL 82019cc6b5037662a76832662222648f8904d0e9073145cc226ed0414218ba4b615cc168c372bff54d5637ea20fdcda64097e6519ce105af64bff3f9f1b257c3
+AUX camorama-0.19-gconf.patch 1541 SHA256 4ac3b70bf976ce8b03b71a4ef3d7984a8a9da7058b7a3f189eb7149bf2f12185 SHA512 b4e946ed7b93d4f7d90a654eefa40826b61af474bb930f27024223733fc65fedcaaa87b946007012361db960716e4cd2d3e225652310999d68aa3c8458f1705b WHIRLPOOL 8c88e5100f21c53b46514eb3918af7a8b505397d4639e75bdfd9c721c8b4ee1cc3939dffac1894c6e93e39def768ec30c22091bb97e19abbc310d4af554e5321
+AUX camorama-0.19-glib-232.patch 658 SHA256 675ca6eea1b73ca4729a800b5171682f2070a6cc7406b08b9f1cfdb97cc6d1de SHA512 a20641e24b4113c3ff763c402e9f5e04706d43bd7c2e5bd507c0cc274abf7e0410a23a19fc943252619d55bc129f0788f06c6aac0bf7caf55536262d9c84344f WHIRLPOOL 8bd9c24b349b4355886131902f1c5113fb491e70de29d25d8d445de98f805c19df3d5ce65f1ae658585832d2b3797234a90c3cbfa13ee6b8591b92d290cc2dac
+AUX camorama-0.19-libv4l.patch 7007 SHA256 921c4428edcac808e3d5d8b383cf8b9878026c0aecd7594a5efc4563179edba3 SHA512 2dd3969b49f1e545ae03aab2f7e3e1a3c28c1f95cb3551e1da31ee2cd39b81316ce7f7a4c47bd187d5e16cfeb8073e0f28312073951cb28194265787f6945929 WHIRLPOOL f1d0c8d8ad4e24b58381f024c913110220c9f61b9786c7db395ed150d27a8269b4815c7be508c26006db648e86ff2878cfdba49fcba0505275438c6582d0594c
+AUX camorama-0.19-no-more-videodev_h.patch 369 SHA256 5f34a9601f1199a9c2c20fb5d50c0d0eba4bbab7b264a5d5ac953ec29e21ab96 SHA512 9b89dfbb1d9d06f6778bf7c013aa81f839fd9fbfcd532c40eaf8e446af9dfe332c032e0f7ddbef84cb2050b38ddd43d379c65bf098aa43cc5c10be669dc33096 WHIRLPOOL df6642e9a0ed7475094bab21c65fbde19c7b616d9a2a7ac8cf675a3b6bc5d8980687ff97a615d10041291505b661eb9c66995719c9f40b6041dac951ff53640b
+DIST camorama-0.19.tar.bz2 277169 SHA256 948c24f96c77f550881102c2c6ca818ba00ffb7a48216ae21ae75eb55d351970 SHA512 efdbe3cdf90a4f4a39b02f141395431c24ac2a7a56ef7faa75b38ae145cdc33f3748daca6bf33a4fa21549b7fef0e7e26d135fd265906e0531e2638739492689 WHIRLPOOL 1f3cb71abac84536736c8e6a3ef141897107b3be1ca2d0ab070faa33bf7db012442e4f704a74937b730d709e56f360ced84d44a726af7e2376d1953d99e59f23
+EBUILD camorama-0.19-r2.ebuild 838 SHA256 4ce505ef48427f933afd81db84584d1e0830a71da689963e493db7e14d400aef SHA512 cbf80816d4af4a67c1d48ec585b1b9ad4c6afbdd95e1a473efcab3c320c771b48442505402f2fafa7bc8d67a8c5faaadc015524dbe868fdb4afc26fc9ba52b11 WHIRLPOOL 2002add55d466acdb7c688259f35601550eac2af5709cdb9ff9d8a8176ffde187380f39e05767f5a70fadf7911206a6446fa1ffb8ae75cdc57cb2dcdb60f989f
+MISC ChangeLog 2801 SHA256 c6b968cacc614c7ba517ce6bcc48bdf584e4c988b6af813dab0d2ad255c02c28 SHA512 5847e14c811d580d8547f667d505179029e9c0b887a6e95628ae3af9fc718f7ea2c98afec34983b136a2c49e45e1786bdfbd8023047991b88cb08f5f082f5572 WHIRLPOOL 6ac584bcfb1f8adcc6dcfd9fe0e2eafc157acc3ae8f6dc27cf31b35c3a9bc007dfe1c574097d779ec8dca632134e7e026daf5e5c748b0fa0036d44a65c2cbe12
+MISC ChangeLog-2015 4125 SHA256 b16a99ae5b6461ab244f07c10aaa09be9177991cf92f1e36e21f2561fb2d89c2 SHA512 5d850c0f739dc76877960b05edaddd3ca911915f74cf513dc822a946907d45c618b06bc357d2bbf5247241dffe32dae574ef9ca7b232b194f745113024e76039 WHIRLPOOL 686a9d2a21ce7f4f3cce99bc095250f095f11b504d3c08df5b0aafe3cfe0fd18fe3c99b41f75245c4de675f607830fd2ea79ead6622d5e2ea26ea4e71b726aec
+MISC metadata.xml 220 SHA256 058c0951c6e06c66fb2225ddd9a8ec6075a6906331e6abb6c645cffb373b672b SHA512 33be2ee02959063935caf88639b7b116430ccacd420b40f9aee5708f081a8cec58d82b9bcbef803e6a4e0084d6f2dccd75cfd3144f15dacfbd783a52397765c3 WHIRLPOOL 1b3e4645ffd0a0895a50fa9c05aa5e3c7c23cae890889bb42ad3c6f5e8395cc57e02923c05db9658802e416fbc715132afbbc0271c603d30f7181cd5e816742e
diff --git a/media-video/camorama/camorama-0.19-r2.ebuild b/media-video/camorama/camorama-0.19-r2.ebuild
new file mode 100644
index 000000000000..a89953f93224
--- /dev/null
+++ b/media-video/camorama/camorama-0.19-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit eutils gnome2
+
+DESCRIPTION="A webcam application featuring various image filters"
+HOMEPAGE="https://git.gnome.org/browse/camorama/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+RDEPEND="
+	>=gnome-base/gconf-2
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnome-2
+	gnome-base/libgnome-keyring
+	>=gnome-base/libgnomeui-2
+	media-libs/libv4l
+	x11-libs/gtk+:2
+"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gconf.patch \
+		"${FILESDIR}"/${P}-fixes.patch \
+		"${FILESDIR}"/${P}-libv4l.patch \
+		"${FILESDIR}"/${P}-no-more-videodev_h.patch \
+		"${FILESDIR}"/${P}-glib-232.patch
+
+	gnome2_src_prepare
+}
diff --git a/media-video/camorama/files/camorama-0.19-fixes.patch b/media-video/camorama/files/camorama-0.19-fixes.patch
new file mode 100644
index 000000000000..949c19d66741
--- /dev/null
+++ b/media-video/camorama/files/camorama-0.19-fixes.patch
@@ -0,0 +1,107 @@
+http://cvs.fedoraproject.org/viewvc/rpms/camorama/devel/
+
+--- camorama-0.19/src/callbacks.c	2007-09-16 15:36:55.000000000 +0200
++++ camorama-0.19.new/src/callbacks.c	2008-06-29 22:22:44.000000000 +0200
+@@ -387,9 +387,6 @@
+         }
+     }
+ 
+-    cam->pixmap = gdk_pixmap_new (NULL, cam->x, cam->y, cam->desk_depth);
+-    gtk_widget_set_size_request (glade_xml_get_widget (cam->xml, "da"),
+-                                 cam->x, cam->y);
+ 
+     /*
+      * if(cam->read == FALSE) {
+@@ -441,6 +438,11 @@
+      * * } 
+      */
+     get_win_info (cam);
++
++    cam->pixmap = gdk_pixmap_new (NULL, cam->x, cam->y, cam->desk_depth);
++    gtk_widget_set_size_request (glade_xml_get_widget (cam->xml, "da"),
++                                 cam->x, cam->y);
++
+     frame = 0;
+     gtk_window_resize (GTK_WINDOW
+                        (glade_xml_get_widget (cam->xml, "main_window")), 320,
+@@ -520,8 +522,14 @@
+     gtk_widget_show (about);
+ }
+ 
++void
++camorama_filter_color_filter(void* filter, guchar *image, int x, int y, int depth);
++
+ static void
+ apply_filters(cam* cam) {
++	/* v4l has reverse rgb order from what camora expect so call the color
++	   filter to fix things up before running the user selected filters */
++	camorama_filter_color_filter(NULL, cam->pic_buf, cam->x, cam->y, cam->depth);
+ 	camorama_filter_chain_apply(cam->filter_chain, cam->pic_buf, cam->x, cam->y, cam->depth);
+ #warning "FIXME: enable the threshold channel filter"
+ //	if((effect_mask & CAMORAMA_FILTER_THRESHOLD_CHANNEL)  != 0) 
+--- camorama-0.19/src/filter.c	2007-09-16 14:48:50.000000000 +0200
++++ camorama-0.19.new/src/filter.c	2008-06-29 22:11:42.000000000 +0200
+@@ -151,12 +151,12 @@
+ static void
+ camorama_filter_color_init(CamoramaFilterColor* self) {}
+ 
+-static void
++void
+ camorama_filter_color_filter(CamoramaFilterColor* filter, guchar *image, int x, int y, int depth) {
+ 	int i;
+ 	char tmp;
+ 	i = x * y;
+-	while (--i) {
++	while (i--) {
+ 		tmp = image[0];
+ 		image[0] = image[2];
+ 		image[2] = tmp;
+--- camorama-0.19/src/main.c	2007-09-16 15:36:55.000000000 +0200
++++ camorama-0.19.new/src/main.c	2008-06-29 22:20:04.000000000 +0200
+@@ -224,8 +224,7 @@
+ 
+     /* get picture attributes */
+     get_pic_info (cam);
+-//	set_pic_info(cam);
+-    /* set_pic_info(cam); */
++    set_pic_info (cam);
+     cam->contrast = cam->vid_pic.contrast;
+     cam->brightness = cam->vid_pic.brightness;
+     cam->colour = cam->vid_pic.colour;
+--- camorama-0.19/src/v4l.c	2007-09-16 14:48:05.000000000 +0200
++++ camorama-0.19.new/src/v4l.c	2008-06-29 22:20:23.000000000 +0200
+@@ -158,8 +158,8 @@
+ 	if(cam->debug) {
+ 		g_message("SET PIC");
+ 	}
+-	//cam->vid_pic.palette = VIDEO_PALETTE_RGB24;
+-	//cam->vid_pic.depth = 24;
++	cam->vid_pic.palette = VIDEO_PALETTE_RGB24;
++	cam->vid_pic.depth = 24;
+ 	//cam->vid_pic.palette = VIDEO_PALETTE_YUV420P;
+ 	if(ioctl(cam->dev, VIDIOCSPICT, &cam->vid_pic) == -1) {
+ 		if(cam->debug) {
+@@ -232,6 +232,8 @@
+       exit(0);
+    }
+ 
++   cam->x = cam->vid_win.width;
++   cam->y = cam->vid_win.height;
+ }
+ 
+ void set_buffer(cam * cam)
+--- camorama-0.19/src/camorama-window.c~	2007-09-16 15:36:55.000000000 +0200
++++ camorama-0.19/src/camorama-window.c	2009-06-23 20:19:16.000000000 +0200
+@@ -209,11 +209,7 @@ load_interface(cam* cam) {
+ 
+     logo = gtk_icon_theme_load_icon(gtk_icon_theme_get_for_screen(gtk_widget_get_screen(glade_xml_get_widget(cam->xml, "main_window"))), CAMORAMA_STOCK_WEBCAM, 24, 0, NULL);
+     gtk_window_set_default_icon(logo);
+-    logo = (GdkPixbuf *) create_pixbuf (PACKAGE_DATA_DIR "/pixmaps/camorama.png");
+-    if (logo == NULL) {
+-        printf ("\n\nLOGO NO GO\n\n");
+-    }
+-
++    logo = gtk_icon_theme_load_icon(gtk_icon_theme_get_for_screen(gtk_widget_get_screen(glade_xml_get_widget(cam->xml, "main_window"))), "camorama", 48, 0, NULL);
+     if (cam->show_adjustments == FALSE) {
+         gtk_widget_hide (glade_xml_get_widget
+                          (cam->xml, "adjustments_table"));
diff --git a/media-video/camorama/files/camorama-0.19-gconf.patch b/media-video/camorama/files/camorama-0.19-gconf.patch
new file mode 100644
index 000000000000..5a1a19e9b576
--- /dev/null
+++ b/media-video/camorama/files/camorama-0.19-gconf.patch
@@ -0,0 +1,40 @@
+# Make camorama respect --disable-schemas-install configure switch
+# https://bugs.gentoo.org/show_bug.cgi?id=243274
+#
+# Makefile.am |    4 ++++
+# Makefile.in |    7 ++++---
+#  2 files changed, 8 insertions(+), 3 deletions(-)
+#
+#
+--- a/data/Makefile.am	2008-11-30 12:39:56.000000000 +0100
++++ b/data/Makefile.am	2008-11-30 12:41:33.000000000 +0100
+@@ -24,9 +24,13 @@
+ 	cp $(app_DATA) ~/.gnome/application-registry
+ 	cp $(keys_DATA) ~/.gnome/mime-info/
+ 
++if GCONF_SCHEMAS_INSTALL
+ install-data-local:
+ 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA) 
+ 	$(GCONFTOOL) --shutdown
++else
++install-data-local:
++endif
+ 
+ EXTRA_DIST = $(glade_DATA) $(schema_in_files) $(stuff_DATA)
+ 
+--- a/data/Makefile.in	2008-11-30 12:41:10.000000000 +0100
++++ b/data/Makefile.in	2008-11-30 12:42:24.000000000 +0100
+@@ -448,9 +437,10 @@
+ 	cp $(app_DATA) ~/.gnome/application-registry
+ 	cp $(keys_DATA) ~/.gnome/mime-info/
+ 
+-install-data-local:
+-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA) 
+-	$(GCONFTOOL) --shutdown
++@GCONF_SCHEMAS_INSTALL_TRUE@install-data-local:
++@GCONF_SCHEMAS_INSTALL_TRUE@	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA) 
++@GCONF_SCHEMAS_INSTALL_TRUE@	$(GCONFTOOL) --shutdown
++@GCONF_SCHEMAS_INSTALL_FALSE@install-data-local:
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/media-video/camorama/files/camorama-0.19-glib-232.patch b/media-video/camorama/files/camorama-0.19-glib-232.patch
new file mode 100644
index 000000000000..d6a76b8e45c2
--- /dev/null
+++ b/media-video/camorama/files/camorama-0.19-glib-232.patch
@@ -0,0 +1,24 @@
+diff -Nu a/src/camorama-stock-items.h b/src/camorama-stock-items.h
+--- a/src/camorama-stock-items.h	2007-06-14 16:05:33.000000000 +0200
++++ b/src/camorama-stock-items.h	2012-05-02 22:40:21.000000000 +0200
+@@ -1,7 +1,7 @@
+ #ifndef CAMORAMA_STOCK_ITEMS_H
+ #define CAMORAMA_STOCK_ITEMS_H
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
+diff -Nu a/src/glib-helpers.h b/src/glib-helpers.h
+--- a/src/glib-helpers.h	2007-06-14 16:05:33.000000000 +0200
++++ b/src/glib-helpers.h	2012-05-02 22:46:06.000000000 +0200
+@@ -24,7 +24,7 @@
+ #ifndef GLIB_HELPERS_H
+ #define GLIB_HELPERS_H
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
diff --git a/media-video/camorama/files/camorama-0.19-libv4l.patch b/media-video/camorama/files/camorama-0.19-libv4l.patch
new file mode 100644
index 000000000000..ada58fe7dd2f
--- /dev/null
+++ b/media-video/camorama/files/camorama-0.19-libv4l.patch
@@ -0,0 +1,198 @@
+http://cvs.fedoraproject.org/viewvc/rpms/camorama/devel/
+
+--- camorama-0.19/src/Makefile.am	2007-09-16 14:48:05.000000000 +0200
++++ camorama-0.19.new/src/Makefile.am	2009-06-24 15:01:37.000000000 +0200
+@@ -36,7 +36,7 @@
+ 	filter.h	\
+ 	$(BUILT_SOURCES)\
+ 	$(NULL)
+-camorama_LDADD = $(PACKAGE_LIBS)
++camorama_LDADD = $(PACKAGE_LIBS) -lv4l1
+ 
+ DISTCLEANFILES=$(BUILT_SOURCES)
+ 
+--- camorama-0.19/src/Makefile.in	2007-10-06 21:06:28.000000000 +0200
++++ camorama-0.19.new/src/Makefile.in	2009-06-24 15:01:50.000000000 +0200
+@@ -248,7 +248,7 @@
+ 	$(BUILT_SOURCES)\
+ 	$(NULL)
+ 
+-camorama_LDADD = $(PACKAGE_LIBS)
++camorama_LDADD = $(PACKAGE_LIBS) -lv4l1
+ DISTCLEANFILES = $(BUILT_SOURCES)
+ all: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) all-am
+--- camorama-0.19/src/callbacks.c	2009-06-24 15:01:55.000000000 +0200
++++ camorama-0.19.new/src/callbacks.c	2009-06-24 14:55:42.000000000 +0200
+@@ -9,6 +9,7 @@
+ #include <libgnomeui/gnome-propertybox.h>
+ #include <libgnomeui/gnome-window-icon.h>
+ #include <pthread.h>
++#include <libv4l1.h>
+ 
+ extern GtkWidget *main_window, *prefswindow;
+ //extern state func_state;
+@@ -390,7 +391,7 @@
+ 
+     /*
+      * if(cam->read == FALSE) {
+-     *  cam->pic = mmap(0, cam->vid_buf.size, PROT_READ | PROT_WRITE, MAP_SHARED, cam->dev, 0);
++     *  cam->pic = v4l1_mmap(0, cam->vid_buf.size, PROT_READ | PROT_WRITE, MAP_SHARED, cam->dev, 0);
+      *  
+      *  if((unsigned char *) -1 == (unsigned char *) cam->pic) {
+      *   if(cam->debug == TRUE) {
+@@ -401,7 +402,7 @@
+      *  }
+      *  }else{
+      *   cam->pic_buf = malloc(cam->x * cam->y * cam->depth);
+-     *   read(cam->dev,cam->pic,(cam->x * cam->y * 3));
++     *   v4l1_read(cam->dev,cam->pic,(cam->x * cam->y * 3));
+      *  } 
+      */
+ 
+@@ -427,7 +428,7 @@
+      * if(cam->read == FALSE) {
+      * * for(frame = 0; frame < cam->vid_buf.frames; frame++) {
+      * * cam->vid_map.frame = frame;
+-     * * if(ioctl(cam->dev, VIDIOCMCAPTURE, &cam->vid_map) < 0) {
++     * * if(v4l1_ioctl(cam->dev, VIDIOCMCAPTURE, &cam->vid_map) < 0) {
+      * * if(cam->debug == TRUE) {
+      * * fprintf(stderr, "Unable to capture image (VIDIOCMCAPTURE) during resize.\n");
+      * * }
+@@ -547,7 +548,7 @@
+     int i, count = 0;
+     GdkGC *gc;
+ 
+-    read (cam->dev, cam->pic, (cam->x * cam->y * 3));
++    v4l1_read (cam->dev, cam->pic, (cam->x * cam->y * 3));
+     frames2++;
+     /*
+      * update_rec.x = 0;
+@@ -588,7 +589,7 @@
+ 
+     i = -1;
+     while (i < 0) {
+-        i = ioctl (cam->dev, VIDIOCSYNC, &frame);
++        i = v4l1_ioctl (cam->dev, VIDIOCSYNC, &frame);
+ 
+         if (i < 0 && errno == EINTR) {
+             if (cam->debug == TRUE) {
+@@ -630,7 +631,7 @@
+                                 0, cam->x, cam->y);
+ 
+     cam->vid_map.frame = frame;
+-    if (ioctl (cam->dev, VIDIOCMCAPTURE, &cam->vid_map) < 0) {
++    if (v4l1_ioctl (cam->dev, VIDIOCMCAPTURE, &cam->vid_map) < 0) {
+         if (cam->debug == TRUE) {
+             fprintf (stderr, "Unable to capture image (VIDIOCMCAPTURE)\n");
+         }
+@@ -677,7 +678,7 @@
+ void init_cam (GtkWidget * capture, cam * cam)
+ {
+     cam->pic =
+-        mmap (0, cam->vid_buf.size, PROT_READ | PROT_WRITE,
++        v4l1_mmap (0, cam->vid_buf.size, PROT_READ | PROT_WRITE,
+               MAP_SHARED, cam->dev, 0);
+ 
+     if ((unsigned char *) -1 == (unsigned char *) cam->pic) {
+@@ -692,7 +693,7 @@
+     cam->vid_map.format = cam->vid_pic.palette;
+     for (frame = 0; frame < cam->vid_buf.frames; frame++) {
+         cam->vid_map.frame = frame;
+-        if (ioctl (cam->dev, VIDIOCMCAPTURE, &cam->vid_map) < 0) {
++        if (v4l1_ioctl (cam->dev, VIDIOCMCAPTURE, &cam->vid_map) < 0) {
+             if (cam->debug == TRUE) {
+                 fprintf (stderr,
+                          "Unable to capture image (VIDIOCMCAPTURE).\n");
+--- camorama-0.19/src/main.c	2009-06-24 15:01:55.000000000 +0200
++++ camorama-0.19.new/src/main.c	2009-06-24 14:59:35.000000000 +0200
+@@ -9,6 +9,7 @@
+ #include <gdk-pixbuf-xlib/gdk-pixbuf-xlib.h>
+ #include <gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h>
+ #include <locale.h>
++#include <libv4l1.h>
+ 
+ #include "camorama-display.h"
+ #include "camorama-stock-items.h"
+@@ -206,7 +207,7 @@
+     gdk_pixbuf_xlib_init (display, 0);
+     cam->desk_depth = xlib_rgb_get_depth ();
+ 
+-    cam->dev = open (cam->video_dev, O_RDWR);
++    cam->dev = v4l1_open (cam->video_dev, O_RDWR);
+ 
+     camera_cap (cam);
+     get_win_info (cam);
+@@ -284,5 +285,8 @@
+ 
+     gtk_timeout_add (2000, (GSourceFunc) fps, cam->status);
+     gtk_main ();
++    v4l1_munmap(cam->pic, cam->vid_buf.size);
++    v4l1_close(cam->dev);
++    
+     return 0;
+ }
+--- camorama-0.19/src/v4l.c	2009-06-24 15:01:55.000000000 +0200
++++ camorama-0.19.new/src/v4l.c	2009-06-24 14:54:09.000000000 +0200
+@@ -2,6 +2,7 @@
+ #include<time.h>
+ #include<errno.h>
+ #include<gnome.h>
++#include <libv4l1.h>
+ #include "support.h"
+ 
+ extern int frame_number;
+@@ -87,7 +88,7 @@
+ void camera_cap(cam * cam)
+ {
+    char *msg;
+-   if(ioctl(cam->dev, VIDIOCGCAP, &cam->vid_cap) == -1) {
++   if(v4l1_ioctl(cam->dev, VIDIOCGCAP, &cam->vid_cap) == -1) {
+       if(cam->debug == TRUE) {
+          fprintf(stderr, "VIDIOCGCAP  --  could not get camera capabilities, exiting.....\n");
+       }
+@@ -161,7 +162,7 @@
+ 	cam->vid_pic.palette = VIDEO_PALETTE_RGB24;
+ 	cam->vid_pic.depth = 24;
+ 	//cam->vid_pic.palette = VIDEO_PALETTE_YUV420P;
+-	if(ioctl(cam->dev, VIDIOCSPICT, &cam->vid_pic) == -1) {
++	if(v4l1_ioctl(cam->dev, VIDIOCSPICT, &cam->vid_pic) == -1) {
+ 		if(cam->debug) {
+ 			g_message("VIDIOCSPICT  --  could not set picture info, exiting....");
+ 		}
+@@ -176,7 +177,7 @@
+ //set_pic_info(cam);
+    char *msg;
+ 	
+-   if(ioctl(cam->dev, VIDIOCGPICT, &cam->vid_pic) == -1) {
++   if(v4l1_ioctl(cam->dev, VIDIOCGPICT, &cam->vid_pic) == -1) {
+       msg = g_strdup_printf(_("Could not connect to video device (%s).\nPlease check connection."), cam->video_dev);
+       error_dialog(msg);
+       if(cam->debug == TRUE) {
+@@ -201,7 +202,7 @@
+ void get_win_info(cam * cam)
+ {
+    gchar *msg;
+-   if(ioctl(cam->dev, VIDIOCGWIN, &cam->vid_win) == -1) {
++   if(v4l1_ioctl(cam->dev, VIDIOCGWIN, &cam->vid_win) == -1) {
+       msg = g_strdup_printf(_("Could not connect to video device (%s).\nPlease check connection."), cam->video_dev);
+       error_dialog(msg);
+       if(cam->debug == TRUE) {
+@@ -222,7 +223,7 @@
+ void set_win_info(cam * cam)
+ {
+    gchar *msg;
+-   if(ioctl(cam->dev, VIDIOCSWIN, &cam->vid_win) == -1) {
++   if(v4l1_ioctl(cam->dev, VIDIOCSWIN, &cam->vid_win) == -1) {
+       msg = g_strdup_printf(_("Could not connect to video device (%s).\nPlease check connection."), cam->video_dev);
+       error_dialog(msg);
+       if(cam->debug == TRUE) {
+@@ -239,7 +240,7 @@
+ void set_buffer(cam * cam)
+ {
+    char *msg;
+-   if(ioctl(cam->dev, VIDIOCGMBUF, &cam->vid_buf) == -1) {
++   if(v4l1_ioctl(cam->dev, VIDIOCGMBUF, &cam->vid_buf) == -1) {
+       msg = g_strdup_printf(_("Could not connect to video device (%s).\nPlease check connection."), cam->video_dev);
+       error_dialog(msg);
+       if(cam->debug == TRUE) {
diff --git a/media-video/camorama/files/camorama-0.19-no-more-videodev_h.patch b/media-video/camorama/files/camorama-0.19-no-more-videodev_h.patch
new file mode 100644
index 000000000000..84c8f68ba72b
--- /dev/null
+++ b/media-video/camorama/files/camorama-0.19-no-more-videodev_h.patch
@@ -0,0 +1,14 @@
+http://pkgs.fedoraproject.org/gitweb/?p=camorama.git;a=blob_plain;f=camorama-0.19-no-more-videodev_h.patch;hb=HEAD
+
+--- src/v4l.h
++++ src/v4l.h
+@@ -12,8 +12,7 @@
+ #include <sys/mman.h>
+ #include <fcntl.h>
+ #include <gtk/gtk.h>
+-#include <linux/types.h>
+-#include <linux/videodev.h>
++#include <libv4l1.h>
+ #include <signal.h>
+ #include <png.h>
+ #include <glade/glade.h>
diff --git a/media-video/camorama/metadata.xml b/media-video/camorama/metadata.xml
new file mode 100644
index 000000000000..80088c21d0ab
--- /dev/null
+++ b/media-video/camorama/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>media-video@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/media-video/ccextractor/Manifest b/media-video/ccextractor/Manifest
new file mode 100644
index 000000000000..b78e4c869cc8
--- /dev/null
+++ b/media-video/ccextractor/Manifest
@@ -0,0 +1,13 @@
+AUX ccextractor-0.68-libpng.patch 316 SHA256 a28597bd5c76aaa0c74d402e7c9b16dea63d817dcedab4e4c882749610f04329 SHA512 1952c3a9a8804cb2adafb026994c94fad3e621fcdd601ead9ccb53d022efd131c8325ea93b1dbf5d37afd272ae69db120087452fad640b990f15e6e1b198d676 WHIRLPOOL a8d1d6f8340e5218eaa75c5c4adc4dbd70c880157acb87014c51b4242a226511aa0b781acb95c9cb85828f41f2d61f96a927bad633d9ec53cc61d98672bed24d
+AUX ccextractor-0.85-makefile.patch 3074 SHA256 84caaa8f8118b23301c5f7b310c395d383a2231ed21c948ab34e54767096a565 SHA512 5b6ff4d68f11bea84159dea3c4b430244bbfccf1037456d9f401fd1d5097fa2a92152d8617de1d1a2bc0b22acaa8249676b1322759f229475afb584ef2b4fa24 WHIRLPOOL e3fa2685b8f737603bdcdc49fa9b541c2bff5df120f2d9cee86a24e66be6dd729f414f2c04b590ab9350c316680430cbb93cb899081b574f6eaf18f0103a0937
+DIST ccextractor-0.59-src.zip 168198 SHA256 13ca427527661e99f156c72ebd09b5bb4eb735904a83c2b3eb3f8aec66425ecb SHA512 13c9ffacdcbea781bac067e850700dbe46ba5fad00f2fde1fb563980c06b77be4c2216b1075d3dad873e3604f408f4cb739fca66bc0764bbaf15a987eb9cc9a3 WHIRLPOOL ff599cb5b07ff275fca34ce325d867e2f7d3c85d996de081335a4ef22f3104ce5e5bb9455c9718139a27b1946283f1b324e585fad8108424201eb77e938f73e8
+DIST ccextractor-src-nowin.0.85.zip 1843154 SHA256 2ac21c6483e206a796d26d6adb7e969eb038a97ead9e2b2a7ee91b8b08c6882e SHA512 53adc017b7b1679302677e3773aabdcceddabdd8a6550cf8b9fb98150b7323a1cc6dbe67a48ebcdf22a4d013c00831907799032dd0f7f6f06943252be8177cec WHIRLPOOL 14b05f4f9bc5c52d3943d0aa0f55ce144b0a221c67feec55779687576e1e7abe8da617002d4d6ca09258d859692861f71db6410fbebcfdcccce35998ea6b9d12
+DIST ccextractor.src.0.68.zip 927590 SHA256 b4d711b88995bbf4e22b70076b802b162fcaca3eff95263e01ed502edc7dbd00 SHA512 c73eb007db7058cf17a818cd5bdf20dfb6f6f3585f55d9f7f1b894aaedcc6b74ac0c2b34b517b44491cdefe2fe7b1fc0035802326b61f7f6330acdb854b8c2ad WHIRLPOOL 4d6b245212f37d79076fc6afe6bdd4bc754c6ffb5c94559aea1f1428270de395daf7720e8cf7d346681975cb68d8357ef2aaed326a59d9a37eea7d7ddc157f3b
+DIST ccextractor.src.0.69.zip 940531 SHA256 bfb6d1174e7a440a624f39ade3c9b9ccbdebb9111ec308578d68aba89a8ec50a SHA512 51c3218a9a8e88aa86acfdd0cbd51bc52a734bde77dbea32c7e2a0f63835b25e0e86ea4b228564e5e996a5a19c74d5513d057bf510c324280f0c155a96b77775 WHIRLPOOL f27c377ab7f535900f858f138867cc8d12b76b05bc2eabbd0309c4ffcd7cd19865f419d4f0fe2b8bd1b480a6594f4a8a0104212fba6923da126b56ed31425c96
+EBUILD ccextractor-0.59.ebuild 589 SHA256 044fbec7e33545de6e93ee1f77007e6f55335841e762444ea8c339916f15755d SHA512 0e0f88172de4ce078192f8279307ead63cea96aa837264e3b823056414c1d3b451cf1971bdbe1fc5633afc749d4e77e867c29e42d592582c3995736e51222c98 WHIRLPOOL 09796ba40308eb3a2a185981e4fba90b427e61dba9ad5fdf6c2703613004697209c3a7edfa0298a7c11953da897a236959fe5d8d1e1cc4e1ba3ceb79ea9d56d1
+EBUILD ccextractor-0.68.ebuild 836 SHA256 92c9df9bc2b1409585082528276b7ca63ca877e423a2ad3b92f84a76b0b7963b SHA512 fbd2aad9e1208b2c0f6a47a6c1086b4fd1ea425ef8c8c5107359b28d94591cac51c382ca24223623595498274005c7e1c2949c31bed13bdef0baef0be3e382e1 WHIRLPOOL 5580684e748da9f28b1cb1fadd4738c7a6d6fb3638f8c57859b1550f4dab7897662b62c6644ffc5789b0fbd11ff08deee012f2ccc5545cc4fb24a517d5acfad3
+EBUILD ccextractor-0.69.ebuild 783 SHA256 d5db46f2b5c3b05fc39886ab2ef924ec61d5af098e37fad06f5fa4b15cf24a78 SHA512 c6e4ee836537639a126f23cc5cb8eedc3ae0f564ef43f33c0476ef975ba1a986020aa87bb91f9fa00e89cb27e933b8d2363d5e6e155a3640d5d1478dcc352a9a WHIRLPOOL c816b5a5f6b5d1821cb32a44ff748299329ff0ab47c3ca307a708c6ab02436e550f8c3a4daa90df55562477c1ddf14e9e803eb31b4a240e8b4e53bfc1c9a0d45
+EBUILD ccextractor-0.85-r1.ebuild 626 SHA256 3a979949fd8d7d3b60e5031994df48c5e88dad6a4d507c182894ea15ea25bdf5 SHA512 2566ba32d6e980b5e541ec3f4b80ff5a669b0a28630b5e601bbbdc41edfb0897f615b92d826355abe97cefcb13e3c867cdd82c3681a6b538af438bc601e7bc49 WHIRLPOOL e255e6197e33305782050e948a37c9db0568fe00b6795cf4f3633739287ef64cd63678ec5c10c5ec05b8c1f546d7b3f50e63c0c24e31af8ed023ae53bb2e0595
+MISC ChangeLog 2596 SHA256 9357f247a793f3bd49d5962e45beeb31d540c755bd93ba6a337fea97eb5fe421 SHA512 b813fa7f25553b3fe92d202745c1c81f9a9865ad497387e39dc4855386156840cb4aa0bf18e370fd3988ed8f8c68e60d848dc47089ac5a25d497a43128c8345b WHIRLPOOL a9d5f83d93fa70672770fc2179e795477b9b83914769d556f796fecb264876c2d7c6875f7c01d8eea6a2ee154754f12de5fc5d77dadd3651d96d966c35243b9a
+MISC ChangeLog-2015 1460 SHA256 b346ca0c7f58f07b6bef3a44aebeac48953ad7118342c47f7800d36629e89d1d SHA512 fc30210346718e56c5a8f290860e8050ae93f8311221fbc738422d148db95b9d860b6a6e96df33d7f76c8a2a0bf429e109707e8cf44bee29520cecf03484c502 WHIRLPOOL e2e5aa657f7b3b7aacd773615380cd7c916afc24f5f8d956bf185eb3664f894c199399dc56c15cf3ef7940bbc3bcb97a727aed5a6713ea64f9e5dd316e6b7a3d
+MISC metadata.xml 525 SHA256 ae43671625eb5d045bfa1e96fd2fe731b8bf3a6e37fd323f41e44b19f28e1e59 SHA512 497eb90960d645c7d1a205c4d556d79b4d2df8aec51fa0abf73afc3b359dbf6f85b4c6e035b966a69f2e5ed4d3de22ee7b335d62d60ad6b20b071edd4d75ddb2 WHIRLPOOL 8fc26c1cc299e1ddda85566c1310f2921d9acf3bae489a9f7533d220936bf0724e73a5a8f6c45ab9434562b409ee7a203a8636cc00e93b7ade880241c3d7c04a
diff --git a/media-video/ccextractor/ccextractor-0.59.ebuild b/media-video/ccextractor/ccextractor-0.59.ebuild
new file mode 100644
index 000000000000..83c1fae4d223
--- /dev/null
+++ b/media-video/ccextractor/ccextractor-0.59.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit toolchain-funcs
+
+DESCRIPTION="Extract closed captioning subtitles from video to SRT"
+HOMEPAGE="http://ccextractor.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ccextractor/${P}-src.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}/${PN}"
+
+src_compile() {
+	cd src
+	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} -D_FILE_OFFSET_BITS=64 -o ccextractor *.cpp || die
+}
+
+src_install() {
+	dobin src/ccextractor
+	dodoc docs/*.TXT
+}
diff --git a/media-video/ccextractor/ccextractor-0.68.ebuild b/media-video/ccextractor/ccextractor-0.68.ebuild
new file mode 100644
index 000000000000..450af1ba16c8
--- /dev/null
+++ b/media-video/ccextractor/ccextractor-0.68.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Extract closed captioning subtitles from video to SRT"
+HOMEPAGE="http://ccextractor.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ccextractor/${PN}.src.${PV}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-arch/unzip
+	media-libs/libpng
+	sys-libs/zlib"
+
+S="${WORKDIR}/${PN}.${PV}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-libpng.patch" || die
+	rm -r src/libpng src/zlib || die
+}
+
+src_compile() {
+	cd src
+	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} -DHAVE_LIBPNG -DGPAC_CONFIG_LINUX -D_FILE_OFFSET_BITS=64 -Igpacmp4/ -o ccextractor $(find . -name '*.cpp') $(find . -name '*.c') -lpng || die
+}
+
+src_install() {
+	dobin src/ccextractor
+	dodoc docs/*.TXT
+}
diff --git a/media-video/ccextractor/ccextractor-0.69.ebuild b/media-video/ccextractor/ccextractor-0.69.ebuild
new file mode 100644
index 000000000000..c98da414d1b9
--- /dev/null
+++ b/media-video/ccextractor/ccextractor-0.69.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Extract closed captioning subtitles from video to SRT"
+HOMEPAGE="http://ccextractor.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ccextractor/${PN}.src.${PV}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-arch/unzip
+	media-libs/libpng
+	sys-libs/zlib"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	rm -r src/libpng src/zlib || die
+}
+
+src_compile() {
+	cd src
+	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} -DHAVE_LIBPNG -DGPAC_CONFIG_LINUX -D_FILE_OFFSET_BITS=64 -Igpacmp4/ -o ccextractor $(find . -name '*.cpp') $(find . -name '*.c') -lpng || die
+}
+
+src_install() {
+	dobin src/ccextractor
+	dodoc docs/*.TXT
+}
diff --git a/media-video/ccextractor/ccextractor-0.85-r1.ebuild b/media-video/ccextractor/ccextractor-0.85-r1.ebuild
new file mode 100644
index 000000000000..35c0f63e14fe
--- /dev/null
+++ b/media-video/ccextractor/ccextractor-0.85-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs cmake-utils
+
+DESCRIPTION="Extract closed captioning subtitles from video to SRT"
+HOMEPAGE="http://ccextractor.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ccextractor/${PN}-src-nowin.${PV}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	media-libs/libpng:0=
+	sys-libs/zlib:=
+"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}/src"
+
+PATCHES=(
+	"${FILESDIR}/${P}-makefile.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+}
diff --git a/media-video/ccextractor/files/ccextractor-0.68-libpng.patch b/media-video/ccextractor/files/ccextractor-0.68-libpng.patch
new file mode 100644
index 000000000000..518d434df369
--- /dev/null
+++ b/media-video/ccextractor/files/ccextractor-0.68-libpng.patch
@@ -0,0 +1,11 @@
+--- src/608_spupng.cpp.orig     2014-03-19 10:32:47.578960867 -0600

++++ src/608_spupng.cpp  2014-03-19 10:33:00.692179157 -0600

+@@ -490,7 +490,7 @@

+ {

+     unsigned int i;

+ 

+-    if (setjmp (png_ptr->jmpbuf))

++    if (setjmp(png_jmpbuf(png_ptr)))

+             return 0;

+ 

+     png_init_io (png_ptr, fppng);
\ No newline at end of file
diff --git a/media-video/ccextractor/files/ccextractor-0.85-makefile.patch b/media-video/ccextractor/files/ccextractor-0.85-makefile.patch
new file mode 100644
index 000000000000..6937869180de
--- /dev/null
+++ b/media-video/ccextractor/files/ccextractor-0.85-makefile.patch
@@ -0,0 +1,76 @@
+--- ccextractor/src/CMakeLists.txt.orig	2017-07-25 12:22:29.294144514 -0600
++++ ccextractor/src/CMakeLists.txt	2017-07-25 12:23:33.979149436 -0600
+@@ -25,14 +25,13 @@
+ include_directories ("${PROJECT_SOURCE_DIR}/protobuf-c/")
+ include_directories ("${PROJECT_SOURCE_DIR}/zvbi")
+ aux_source_directory ("${PROJECT_SOURCE_DIR}/zvbi" SOURCEFILE)
+-aux_source_directory ("${PROJECT_SOURCE_DIR}/zlib" SOURCEFILE)
+ aux_source_directory ("${PROJECT_SOURCE_DIR}/lib_hash" SOURCEFILE)
+ 
+ # Adding some platform specific library path
+ link_directories (/opt/local/lib)
+ link_directories (/usr/local/lib)
+ 
+-set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0 -Wall -g -std=gnu99 -Wno-write-strings -D_FILE_OFFSET_BITS=64")
++set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_FILE_OFFSET_BITS=64")
+ add_subdirectory (lib_ccx)
+ 
+ aux_source_directory (${PROJECT_SOURCE_DIR} SOURCEFILE)
+@@ -43,24 +42,8 @@
+ set (EXTRA_LIBS ${EXTRA_LIBS} iconv)
+ endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+ 
+-
+-find_package (PkgConfig)
+-if(PKG_CONFIG_FOUND)
+-  pkg_check_modules(PNG libpng )
+-  if(PNG_FOUND)
+-    set (EXTRA_LIBS ${EXTRA_LIBS} png)
+-  else (PNG_FOUND)
+-    include_directories ("${PROJECT_SOURCE_DIR}/libpng/")
+-    include_directories ("${PROJEXT_SOURCE_DIR}/zlib/")
+-    aux_source_directory ("${PROJECT_SOURCE_DIR}/libpng/" SOURCEFILE)
+-    aux_source_directory ("${PROJECT_SOURCE_DIR}/zlib/" SOURCEFILE)
+-  endif(PNG_FOUND)
+-else(PKG_CONFIG_FOUND)
+-    include_directories ("${PROJECT_SOURCE_DIR}/libpng/")
+-    include_directories ("${PROJEXT_SOURCE_DIR}/zlib/")
+-    aux_source_directory ("${PROJECT_SOURCE_DIR}/libpng/" SOURCEFILE)
+-    aux_source_directory ("${PROJECT_SOURCE_DIR}/zlib/" SOURCEFILE)
+-endif (PKG_CONFIG_FOUND)
++set (EXTRA_LIBS ${EXTRA_LIBS} png)
++set (EXTRA_LIBS ${EXTRA_LIBS} z)
+ 
+ ########################################################
+ # Build using FFmpeg libraries
+--- ccextractor/src/lib_ccx/CMakeLists.txt.orig	2017-07-25 12:32:32.803190443 -0600
++++ ccextractor/src/lib_ccx/CMakeLists.txt	2017-07-25 12:25:40.819159089 -0600
+@@ -1,6 +1,6 @@
+ cmake_policy (SET CMP0037 NEW)
+ 
+-set (CMAKE_C_FLAGS "-O0 -Wall -g -std=gnu99")
++set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
+ 
+ if (WITH_FFMPEG)
+   set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_FFMPEG")
+@@ -37,20 +37,3 @@
+ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DGPAC_CONFIG_DARWIN")
+ endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+-
+-
+-file (GLOB HeaderFiles *.h)
+-file (WRITE ccx.pc "prefix=${CMAKE_INSTALL_PREFIX}\n"
+-                  "includedir=\${prefix}/include\n"
+-                  "libdir=\${prefix}/lib\n\n"
+-                  "Name: ccx\n"
+-                  "Description: Closed Caption Extraction library\n"
+-                  "Version: 0.75\n"
+-                  "Cflags: -I\${includedir}/\n"
+-                  "Libs: -L\${libdir} -lccx -lpng\n"
+-                  "Libs.private: -lpng\n"
+-                  )
+-
+-install (TARGETS ccx DESTINATION lib)
+-install (FILES ${HeaderFiles} DESTINATION include)
+-install (FILES ccx.pc DESTINATION lib/pkgconfig)
diff --git a/media-video/ccextractor/metadata.xml b/media-video/ccextractor/metadata.xml
new file mode 100644
index 000000000000..cf58411c99b4
--- /dev/null
+++ b/media-video/ccextractor/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+	<longdescription lang="en">
+A tool that analyzes video files and produces independent subtitle files from the closed captions data.  Exports to SRT subtitle format.
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">ccextractor</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/cclive/Manifest b/media-video/cclive/Manifest
new file mode 100644
index 000000000000..dd86ebf619c8
--- /dev/null
+++ b/media-video/cclive/Manifest
@@ -0,0 +1,7 @@
+AUX cclive-0.9.3-boost-ver-check.patch 516 SHA256 e1d0a5a359814d7c5d3213161d5fe990c9c83bec80e524bd66564ed781de7ad0 SHA512 93e458a1c66d57901e8001fb886771ec1409c12a2e31db84dcdbd284e0586af05f756644a2318c427c7b5ba07585c76c490eaac351659c82865378b7d4f99500 WHIRLPOOL 529be1115305a15a60d75700f6e1b3babfaf2e56c184bd5e2ad19d65bdad28424a6ca3f3c5c721d94ea7888d7035455f7b5bac42f7753a279695cad9333c495e
+AUX cclive-0.9.3-iostream.patch 1926 SHA256 c21d459944cfd9cb9a129a4577b87ea7d431337d24e40407cc279e50adf0ea31 SHA512 ccf137cfa06a9ac8cafd9cafd9ae7cd06f72bfe17a3bba5171682d8e5d97007680ac385467f90e260b6e715785330152055778af8a24a4fe50435e4298a6ca8c WHIRLPOOL cdb1bf13f1b902de5f16e8011519c090c2e3d1cc22a2bca0497d692d3e313ef497b0ecc3acf233af5379975d99fae230da9067536a35852c9dc2deee107cfca8
+DIST cclive-0.9.3.tar.xz 296720 SHA256 2edeaf5d76455723577e0b593f0322a97f1e0c8b0cffcc70eca8b5d17374a495 SHA512 0d8f6f870e24e2906542c1e02745009597fca2e879261bef7a81e07f8dec016ee200d8a4b37dd0f20b3ad27c12e2445fed1f6a9dc262a6c27e40222048bb5438 WHIRLPOOL 441a3ef5e7c7633c91b4761a1f728998997648ebb6a7984e6a1dafea418a8863be76ffff7dc3e3727ddff81d4ed5f16d5454fb0e0b84c3dcea7e8214f27f8d35
+EBUILD cclive-0.9.3-r2.ebuild 786 SHA256 2b8e264172c3d4caa275399ec109279eedf40a17c511453caf4cde93881fdac2 SHA512 e6c9ef6659f081dbbbf8159b3031e12f2eaadc2303598f26d0bb3f7f1d5879544d746dde5cf5f837b7568c3e3b2e6b9a4bfe0ca54134a0ef5660012fd2e6aff8 WHIRLPOOL 1580df70eb7b5d25d8462077bdb3df73a5a782f8b222aefb4205bae50ea2e9e188c93cba14fd09e3b0496987a87893a36a6fbd2759a98a059e64e04961b51a9d
+MISC ChangeLog 2780 SHA256 040820cc2d40a7571ae82a9898d2bcca61d4b716725ea18079b9a873889d8238 SHA512 4195f5b442ad834374ed310deb1ee486c7661b0a27d0a471ef5b1822c0243fd224e6a852904325190f877d9dd70828ebb41cc49b793fd079c255dea5782fe87b WHIRLPOOL 7890f6c6e072f2d882016e8ffae96ae404f44c268681b0a0eb577beff7fafed6c426a2739d455095da53ff68e41d27111ce4b15950074f7d2ba014384e57c335
+MISC ChangeLog-2015 9838 SHA256 7f92a5d5df29807b3517cd5c2b7a886e4d6b4105a34d06e1de7f0150ac930b9c SHA512 5be06a6b83929240ac8585fc9698811381f9f5a6229f41ac53f8837a7f8df51e2d5cc87258921332f674e72377bf009d53dbb932617b65c0d6346bffdb1cfc4a WHIRLPOOL 745dd7cc4342e5b3042d44142c349df381bdc67fa5a259acc106b2de7ab0d28fb24df872ace1081afc6662d5c5f54ca3c991eb70fa3dc5d03c85970e5a954d7b
+MISC metadata.xml 502 SHA256 e9b584f4613f47bdbecd8bc14630d7a79103973e36fbb77254d9daeca5d8fe85 SHA512 eb40ae945675f344692bde5749de7ea287ae8ae55408ce4bc8c50932c6587d78fbf0929e003d11b8432c916d8a821af409d90038b84355fa14c96b4210cbcbc1 WHIRLPOOL 8ac352d598a33d77d78ea4c385f7ed320defce56093a3a880f383d74643ee36cb774131b32f40a16a02a3bf5fa800cfa417fd4092f0c749d29e66cf1af36bc69
diff --git a/media-video/cclive/cclive-0.9.3-r2.ebuild b/media-video/cclive/cclive-0.9.3-r2.ebuild
new file mode 100644
index 000000000000..36533f233014
--- /dev/null
+++ b/media-video/cclive/cclive-0.9.3-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+DESCRIPTION="Command line tool for extracting videos from various websites"
+HOMEPAGE="http://cclive.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PV:0:3}/${P}.tar.xz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+
+RDEPEND="
+	>=media-libs/libquvi-0.4.0:0=
+	>=dev-cpp/glibmm-2.24:2
+	>=dev-libs/boost-1.49:=
+	>=dev-libs/glib-2.24:2
+	>=net-misc/curl-7.20
+	>=dev-libs/libpcre-8.02[cxx]"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-iostream.patch #527658
+	"${FILESDIR}"/${P}-boost-ver-check.patch #548310
+)
+
+src_configure() {
+	append-cxxflags -std=c++11 #567174
+	econf --disable-ccl
+}
diff --git a/media-video/cclive/files/cclive-0.9.3-boost-ver-check.patch b/media-video/cclive/files/cclive-0.9.3-boost-ver-check.patch
new file mode 100644
index 000000000000..23e69dd1b665
--- /dev/null
+++ b/media-video/cclive/files/cclive-0.9.3-boost-ver-check.patch
@@ -0,0 +1,18 @@
+https://bugs.gentoo.org/548310
+
+apply boost.m4 updates to fix building w/gcc-5
+
+--- a/configure
++++ b/configure
+@@ -17481,8 +17481,10 @@
+ boost-lib-version = BOOST_LIB_VERSION
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  grep -v '#' |
+   tr -d '\r' |
+-  $SED -n -e "/^boost-lib-version = /{s///;s/\"//g;p;q;}" >conftest.i 2>&1; then :
++  tr -s '\n' ' ' |
++  $SED -n -e "/^boost-lib-version = /{s///;s/[\" ]//g;p;q;}" >conftest.i 2>&1; then :
+   boost_cv_lib_version=`cat conftest.i`
+ fi
+ rm -rf conftest*
diff --git a/media-video/cclive/files/cclive-0.9.3-iostream.patch b/media-video/cclive/files/cclive-0.9.3-iostream.patch
new file mode 100644
index 000000000000..f7bfd074919f
--- /dev/null
+++ b/media-video/cclive/files/cclive-0.9.3-iostream.patch
@@ -0,0 +1,80 @@
+https://github.com/legatvs/cclive/pull/2
+
+From dcaed542d002cbf857e0bca1fa12f8ab501c419a Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Fri, 26 Dec 2014 13:49:36 -0500
+Subject: [PATCH] Add explicit <iostream> includes, fixes build with Boost 1.56
+
+See https://bugs.gentoo.org/show_bug.cgi?id=527658 and
+https://bugs.gentoo.org/show_bug.cgi?id=533506
+---
+ src/cc/error.h   | 1 +
+ src/cc/input.h   | 1 +
+ src/cc/log.h     | 1 +
+ src/cc/options.h | 1 +
+ src/cc/sig.h     | 1 +
+ 5 files changed, 5 insertions(+)
+
+diff --git a/src/cc/error.h b/src/cc/error.h
+index c1d80ab..f6a3e6d 100644
+--- a/src/cc/error.h
++++ b/src/cc/error.h
+@@ -28,6 +28,7 @@
+ #include <boost/exception/get_error_info.hpp>
+ #include <boost/exception/errinfo_errno.hpp>
+ #include <boost/tuple/tuple.hpp>
++#include <iostream>
+ #include <cerrno>
+ 
+ namespace cc
+diff --git a/src/cc/input.h b/src/cc/input.h
+index 98c334b..523e9fe 100644
+--- a/src/cc/input.h
++++ b/src/cc/input.h
+@@ -23,6 +23,7 @@
+ 
+ #include <ccinternal>
+ 
++#include <iostream>
+ #include <istream>
+ #include <sstream>
+ 
+diff --git a/src/cc/log.h b/src/cc/log.h
+index 2b2c986..aaf3b32 100644
+--- a/src/cc/log.h
++++ b/src/cc/log.h
+@@ -25,6 +25,7 @@
+ 
+ #include <boost/iostreams/filtering_stream.hpp>
+ #include <boost/filesystem.hpp>
++#include <iostream>
+ #include <fstream>
+ 
+ #include <ccerror>
+diff --git a/src/cc/options.h b/src/cc/options.h
+index 6c45ce8..6a7e40c 100644
+--- a/src/cc/options.h
++++ b/src/cc/options.h
+@@ -37,6 +37,7 @@
+ #include <boost/filesystem.hpp>
+ #include <boost/foreach.hpp>
+ #include <boost/format.hpp>
++#include <iostream>
+ #include <fstream>
+ 
+ #include <ccerror>
+diff --git a/src/cc/sig.h b/src/cc/sig.h
+index 56de768..cca23ad 100644
+--- a/src/cc/sig.h
++++ b/src/cc/sig.h
+@@ -26,6 +26,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/types.h>
+ #include <unistd.h>
++#include <iostream>
+ #include <csignal>
+ #include <cstdio>
+ 
+-- 
+2.2.1
+
diff --git a/media-video/cclive/metadata.xml b/media-video/cclive/metadata.xml
new file mode 100644
index 000000000000..10ec0145fb87
--- /dev/null
+++ b/media-video/cclive/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Command line tool for extracting videos from Youtube, Google Video,
+		Dailymotion, Guba (free) and Stage6  websites
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">cclive</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/chaplin/Manifest b/media-video/chaplin/Manifest
new file mode 100644
index 000000000000..cba926009795
--- /dev/null
+++ b/media-video/chaplin/Manifest
@@ -0,0 +1,7 @@
+AUX chaplin-1.10-asneeded.patch 828 SHA256 b048bdaa35f1d0e447b96f4783b744733c89623a036af99a0f0c82950a126514 SHA512 610acdaa8c20e7a0246f3c493c2d75e82d6386d02033a11fda473714ee105ab7f5238149160c8a0a835333c66dbbf678d38d52a66b3bfebe2b891f3ec032abc0 WHIRLPOOL feb918820e815e05fd03a1ca222b761ec723a1a053ae069e194d06f9b64b5f264183f7aed316f47490eaf3d5f0e0fcd2635f28da475d58d259dd881181c599b5
+AUX chaplin-1.10-libdvdread-0.9.6.patch 334 SHA256 853967d7caa5a0921f3147ab0ae23f99e8fd1933906711fe028ad2c5463d5cdb SHA512 47fa6e41a05f141e64f06f7d62049006c6292f89c04fcbc63250860215f90da1c683b1b537dad4136897bf4a68f03507340c60c7abf033703c9acc3d7172a922 WHIRLPOOL c2ce98a1c939d7b6bc259082834777a2b294f30fc3ec26874952d5a0e8132776b8ec806e3fb99fc3a15725e5e02cc711a1609114c26d2acd2e9b95199e75a386
+DIST chaplin-1.10.tgz 23843 SHA256 064d3226d003477ae81273cee3870b5797f647623f67eb05e5c1e2e910d89228 SHA512 6d4434149fc157dfa8d7c1e1fe079d66b57a18717f0263ebfc95a14c847d97c018b0563b3dc1f8f8430670ef1f64a1f4c573462e5f0db2fcd8e53c939f58793d WHIRLPOOL 13b23d41d5bdcdf395f2ca96d308225a8ee028c51e44aade665fafee6dcb807a1b9f1f32248eae6ae853526f4b4d6ac52b3907d5256f56dd311c1d66a5942a5f
+EBUILD chaplin-1.10-r2.ebuild 816 SHA256 f53b54e28c2c2247d20c0499a2c7701edf07b7a7a69079735f50a2a045ee9f5d SHA512 c4716b525945ab1b3d3e55221f5b5da05e48bcad6b650cf3564266813568b589a3dd9957aee3d155b3be90f86d96aea21dc5e7c53c716d95541b4bb35a741123 WHIRLPOOL cff4d6eb6473f66e703ee0c7b87a8c243a22f8cfb9377f54798525da9548d5f3f1a86cf9b634e2e119279f8e0497c0a1ca141fc5548ad8f3fb0335943db0369a
+MISC ChangeLog 2516 SHA256 8acae94361c1c03b9c61f24448fefe283a0c9cec3975d1e5fc8b7affeeee24fa SHA512 6d608929959e3c38d912bad021faf74bbc1c944cdb571e0859fcbaa494ee41c2cdf17d294ae44c119d6801e1bc6e4cb2a5a1ac998fc727a450d22cfd006912ef WHIRLPOOL 14396e8d942acfd2b4b4dd5182bda7a7a9cb2c200c7ec3ccb99ec3712c9c2ddd2bffdea738af0378d4b5f07a13396668fbeb7f777d255e476de8f405c4f1a793
+MISC ChangeLog-2015 1821 SHA256 4e82217c19774e4398ced470525852b39aa729bf3e250a0624652f492ea30e02 SHA512 91a69fdfe21a962bb78b761a4303d2aa9308fc66cab4563e4c02d7d5d633f4dc9fa44ffbb70e45be6e6b52a62aaf174930bac48b08dd95efef1c78dd2bcd5952 WHIRLPOOL 9b3bd890d4066265d282d825919554470a339db4a8ed556db420a5576c03ea7fc20a6253967a54b959b5d1b31b29dd1fbb969839f65c55c5fa2ac4af7e4e76d7
+MISC metadata.xml 313 SHA256 111d87e851b2605ba5d3410eca843a357bf505db7e1ad0dd810fe3427655756e SHA512 b1bf468c26cd683d0655677a57330b93579c41b0d4e2584b6fd56f4c6106aa3381cc47531bdb9e9376b207750fdd5edbe9bd4a1bbc75b29f0e1c400233774dc0 WHIRLPOOL f29db73fc98891a19f8fe582b8edba3892acbc7642aa134f65230decaef9636a49a387442971e2bdf6f367dd14418f172be6b2201c77bcd8b96ca4d8b47a81d1
diff --git a/media-video/chaplin/chaplin-1.10-r2.ebuild b/media-video/chaplin/chaplin-1.10-r2.ebuild
new file mode 100644
index 000000000000..452d808b53e7
--- /dev/null
+++ b/media-video/chaplin/chaplin-1.10-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils toolchain-funcs
+
+DESCRIPTION="This is a program to raw copy chapters from a dvd using libdvdread"
+HOMEPAGE="http://www.lallafa.de/bp/chaplin.html"
+SRC_URI="http://www.lallafa.de/bp/files/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="transcode vcd"
+
+DEPEND=">=media-libs/libdvdread-0.9.4"
+RDEPEND="${DEPEND}
+	virtual/imagemagick-tools
+	media-video/mjpegtools
+	transcode? ( >=media-video/transcode-0.6.2 )
+	vcd? ( >=media-video/vcdimager-0.7.2 )"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libdvdread-0.9.6.patch \
+		"${FILESDIR}"/${P}-asneeded.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin chaplin chaplin-genmenu
+}
diff --git a/media-video/chaplin/files/chaplin-1.10-asneeded.patch b/media-video/chaplin/files/chaplin-1.10-asneeded.patch
new file mode 100644
index 000000000000..f7cb499407a8
--- /dev/null
+++ b/media-video/chaplin/files/chaplin-1.10-asneeded.patch
@@ -0,0 +1,15 @@
+--- chaplin.orig/Makefile	2004-03-21 18:44:18.000000000 +0100
++++ chaplin/Makefile	2009-10-25 18:34:26.082229887 +0100
+@@ -6,10 +6,10 @@
+ all: build
+ 
+ build:
+-	gcc -DNDEBUG -Wall -I$(LIBDVDREAD)/include -L$(LIBDVDREAD)/lib -ldvdread -Wl,-rpath,$(LIBDVDREAD)/lib -o chaplin chaplin.c -lm
++	$(CC) $(CFLAGS) $(LDFLAGS) -DNDEBUG -Wall -I$(LIBDVDREAD)/include -Wl,-rpath,$(LIBDVDREAD)/lib -o chaplin chaplin.c -L$(LIBDVDREAD)/lib -ldvdread -lm
+ 
+ debug:
+-	gcc -Wall -I$(LIBDVDREAD)/include -L$(LIBDVDREAD)/lib -ldvdread -Wl,-rpath,$(LIBDVDREAD)/lib -o chaplin chaplin.c -lm
++	$(CC) $(CFLAGS) $(LDFLAGS) -Wall -I$(LIBDVDREAD)/include -Wl,-rpath,$(LIBDVDREAD)/lib -o chaplin chaplin.c -L$(LIBDVDREAD)/lib -ldvdread -lm
+ 
+ dist:
+ 	cd .. ; tar cvfz chaplin.tgz chaplin/Makefile chaplin/chaplin.c chaplin/chaplin-genmenu chaplin/chaplin
diff --git a/media-video/chaplin/files/chaplin-1.10-libdvdread-0.9.6.patch b/media-video/chaplin/files/chaplin-1.10-libdvdread-0.9.6.patch
new file mode 100644
index 000000000000..7e68dd67a692
--- /dev/null
+++ b/media-video/chaplin/files/chaplin-1.10-libdvdread-0.9.6.patch
@@ -0,0 +1,11 @@
+diff -N -u -r chaplin/chaplin.c chaplin-new/chaplin.c
+--- chaplin/chaplin.c	2004-03-21 18:45:44.000000000 +0100
++++ chaplin-new/chaplin.c	2006-06-29 22:36:54.457745979 +0200
+@@ -18,6 +18,7 @@
+ #include <ctype.h>
+ #include <string.h>
+ #include <math.h>
++#include <inttypes.h>
+ 
+ /* libdvdread stuff */
+ #include <dvdread/dvd_reader.h>
diff --git a/media-video/chaplin/metadata.xml b/media-video/chaplin/metadata.xml
new file mode 100644
index 000000000000..cf110aee8d08
--- /dev/null
+++ b/media-video/chaplin/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>media-video@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="transcode">Enable DVD ripping and transcoding</flag>
+  </use>
+</pkgmetadata>
diff --git a/media-video/cheese/Manifest b/media-video/cheese/Manifest
new file mode 100644
index 000000000000..ad180ee9d108
--- /dev/null
+++ b/media-video/cheese/Manifest
@@ -0,0 +1,7 @@
+DIST cheese-3.22.1.tar.xz 1843092 SHA256 34353d19134da0041343b90ba737ec758bb5d1e23bd6e985c66b7e15f5313ae9 SHA512 193e421a0310a60871b8e0ac7ac28c16b7ed1caf0869904f803f45c4b15be74ab98dd88df54e5ce8c0885f466004d182450350295d3d89264e6f39035a389656 WHIRLPOOL 41c140122fb7b01b8bcaea155381b1bbabc016298b19f43645b37f881903d9f5f0399e01baff1c7a215d3949b7804e22785d048c6504539855966f21651837b8
+DIST cheese-3.24.0.tar.xz 1846412 SHA256 26d0324c11d858a53a8a78f60babda63310a2b6f46c8fa3a4f6aa36ca9d0f372 SHA512 c81d2f3038970f735960a2cbcec3a074ac2e9835d3f1fa6aae83d65299692d0464fed274e71caa59831a105430ce5db56557ea0cda27c72cdb050a59331b3107 WHIRLPOOL a2ad8440917a3c572fb4212fec5a0c82e4a710624aa3d58fd18d7fc652f01aefd543742a976980987865ad239b1f893e5ecee6bb6507a18fbcd338290ab3be8f
+EBUILD cheese-3.22.1.ebuild 1853 SHA256 067065f22bbe4cb19212d985b6ebe1868ea80c644b8b1f7a16e4e5f0f652dbac SHA512 892c0f3ec60f9e7d8f54c4ccd70543d2daf3ec92791245e6c9e179cff7cfa3e8a43687bd4d37f731355abdd09fb1c0768dacb331ffcdf05c2533c11c344a23e3 WHIRLPOOL bbf7d705f1278183c72a21f7d8cb7f789eab9357e794f16c3082b25ba6cb94f117acc23a2757b9ce48b8961b7745465e494ac9da157a9d4f17f06e64beb6679c
+EBUILD cheese-3.24.0.ebuild 1873 SHA256 0320e9e30bc160bd781bbb364abfbeba6679f7381a195d51ceb509276cde08b7 SHA512 ee5ceb7c2edd4b6cc74b199a4660fd2277d626f1c07bdfe6531b9d7616c062dcf110667868a8342fa9cf2477887676ca8a582e022f2ba2f0675517218b212273 WHIRLPOOL 2cefa5d937ab73b225add98d302dcdc2de916dd3a4fe6f2d58fe208fecf0dd6988bdac992167a79ad1970acdfe444a72f4d1fe58b218caa37b55c95cdfbd7c0d
+MISC ChangeLog 5488 SHA256 ada6d2dd86fea1f7fc1c4184c0d05f4e7605d72bcf592618432fa27bef56f088 SHA512 9f2d0ca23d5bdaaeae872f54f03cba614c9c90b1575ebc8227e40994614c4b2c8ca1a710c389ef1dcb969117dd5d078dc63a65cc20485d1dd044265d38d9f9ef WHIRLPOOL bee8049b28e42bbc8106b1b0ba3ccc083f80374e463aa14778a0671868e3d14bf220d5f150882dd71d8cffbc81128e5f684c728ea0e96359d37bc80961747d93
+MISC ChangeLog-2015 14117 SHA256 5e458e4f04da68b3fe2521225093c76c4b898f06dfc3aa4e3df7341f199f1a3d SHA512 cb990e8d2da0264c0c5eb506c7ffb3ef29113d351b96eb7e9ac42c125bc813fb8d7c128be44d426a5056027b75ca1b0976ad0768862030e6686ff0249fb31107 WHIRLPOOL 7db61346dac9a40687898639ccdf096a1c49a6371d2f8871726af9cbfbb659bc49ea343fb0862f63cd9dc812793af8a0fa4435583a49a0208722addb7f4f37ae
+MISC metadata.xml 428 SHA256 267bc0ac0322eed00068865e052a9063d8807d44b4ceeff052094317ba750616 SHA512 cbe065cc8fe75a86d8f16788dc2ddeafda2b1c27858427f6c9ec83841730e3d9c1c9f7815718c86e19626098b96782a1017b614bac5a0121c92af04b11a30a22 WHIRLPOOL e30d50afbe4489392a627e190b97e0be1ca0cfbf4487b5112df1ddab30463616b8c86c920da7b684f03031f473c4a587f671f72d6cba59df7f3dad94b4286e10
diff --git a/media-video/cheese/cheese-3.22.1.ebuild b/media-video/cheese/cheese-3.22.1.ebuild
new file mode 100644
index 000000000000..f75ab6e69169
--- /dev/null
+++ b/media-video/cheese/cheese-3.22.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_MIN_API_VERSION="0.26"
+
+inherit gnome2 vala virtualx
+
+DESCRIPTION="A cheesy program to take pictures and videos from your webcam"
+HOMEPAGE="https://wiki.gnome.org/Apps/Cheese"
+
+LICENSE="GPL-2+"
+SLOT="0/8" # subslot = libcheese soname version
+IUSE="+introspection test"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.39.90:2
+	>=x11-libs/gtk+-3.13.4:3[introspection?]
+	>=gnome-base/gnome-desktop-2.91.6:3=
+	>=media-libs/libcanberra-0.26[gtk3]
+	>=media-libs/clutter-1.13.2:1.0[introspection?]
+	>=media-libs/clutter-gtk-0.91.8:1.0
+	media-libs/clutter-gst:3.0
+	media-libs/cogl:1.0=[introspection?]
+
+	media-video/gnome-video-effects
+	x11-libs/gdk-pixbuf:2[jpeg,introspection?]
+	x11-libs/libX11
+	x11-libs/libXtst
+
+	>=media-libs/gstreamer-1.4:1.0[introspection?]
+	>=media-libs/gst-plugins-base-1.4:1.0[introspection?,ogg,pango,theora,vorbis,X]
+
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=media-libs/gst-plugins-bad-1.4:1.0
+	>=media-libs/gst-plugins-good-1.4:1.0
+
+	>=media-plugins/gst-plugins-jpeg-1.4:1.0
+	>=media-plugins/gst-plugins-v4l2-1.4:1.0
+	>=media-plugins/gst-plugins-vpx-1.4:1.0
+"
+DEPEND="${COMMON_DEPEND}
+	$(vala_depend)
+	app-text/docbook-xml-dtd:4.3
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.50
+	dev-util/itstool
+	virtual/pkgconfig
+	x11-proto/xf86vidmodeproto
+	test? ( dev-libs/glib:2[utils] )
+"
+
+src_prepare() {
+	vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		GST_INSPECT=$(type -P true) \
+		$(use_enable introspection) \
+		--disable-lcov \
+		--disable-static
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/media-video/cheese/cheese-3.24.0.ebuild b/media-video/cheese/cheese-3.24.0.ebuild
new file mode 100644
index 000000000000..3fade1b47ba0
--- /dev/null
+++ b/media-video/cheese/cheese-3.24.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_MIN_API_VERSION="0.26"
+
+inherit gnome2 vala virtualx
+
+DESCRIPTION="A cheesy program to take pictures and videos from your webcam"
+HOMEPAGE="https://wiki.gnome.org/Apps/Cheese"
+
+LICENSE="GPL-2+"
+SLOT="0/8" # subslot = libcheese soname version
+IUSE="+introspection test"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.39.90:2
+	>=x11-libs/gtk+-3.13.4:3[introspection?]
+	>=gnome-base/gnome-desktop-2.91.6:3=
+	>=media-libs/libcanberra-0.26[gtk3]
+	>=media-libs/clutter-1.13.2:1.0[introspection?]
+	>=media-libs/clutter-gtk-0.91.8:1.0
+	media-libs/clutter-gst:3.0
+	media-libs/cogl:1.0=[introspection?]
+
+	media-video/gnome-video-effects
+	x11-libs/gdk-pixbuf:2[jpeg,introspection?]
+	x11-libs/libX11
+	x11-libs/libXtst
+
+	>=media-libs/gstreamer-1.4:1.0[introspection?]
+	>=media-libs/gst-plugins-base-1.4:1.0[introspection?,ogg,pango,theora,vorbis,X]
+
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=media-libs/gst-plugins-bad-1.4:1.0
+	>=media-libs/gst-plugins-good-1.4:1.0
+
+	>=media-plugins/gst-plugins-jpeg-1.4:1.0
+	>=media-plugins/gst-plugins-v4l2-1.4:1.0
+	>=media-plugins/gst-plugins-vpx-1.4:1.0
+"
+DEPEND="${COMMON_DEPEND}
+	$(vala_depend)
+	app-text/docbook-xml-dtd:4.3
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.50
+	dev-util/itstool
+	virtual/pkgconfig
+	x11-proto/xf86vidmodeproto
+	test? ( dev-libs/glib:2[utils] )
+"
+
+src_prepare() {
+	vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		GST_INSPECT=$(type -P true) \
+		$(use_enable introspection) \
+		--disable-lcov \
+		--disable-static
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/media-video/cheese/metadata.xml b/media-video/cheese/metadata.xml
new file mode 100644
index 000000000000..b2c5fa1eae4a
--- /dev/null
+++ b/media-video/cheese/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<longdescription lang="en">
+		Cheese uses your webcam to take photos and videos, applies fancy special
+		effects, and lets you share the fun with others.
+	</longdescription>
+</pkgmetadata>
diff --git a/media-video/cinelerra/Manifest b/media-video/cinelerra/Manifest
new file mode 100644
index 000000000000..e1f449502165
--- /dev/null
+++ b/media-video/cinelerra/Manifest
@@ -0,0 +1,16 @@
+AUX cinelerra-20140710-ffmpeg-0.11.patch 4029 SHA256 84f4b3da2687ff126f70e268e81fd99020b837a606c879e0acdf60d166791d3a SHA512 bd1a511d616c8c1661b05db4297dea7c57702658ecb1a18c8cb930a78f396f28f29e87275ec75e70140048caba454e577062c15efb1dcd49c1bf35f51b82cfa0 WHIRLPOOL 08f8050bdc9bf19e238a3cdd85277f8c06a3ce9e12376bc53e043d86e590694fcf59479762ec2fd8c7a2eee3fc910972a2ba4293120c6d94a6278f0decbf59fb
+AUX cinelerra-20140710-underlinking.patch 273 SHA256 3a236dfcd3eabc921156f29fa3d4d4a077f87f5b8773aef725a38b54309e443f SHA512 09db68fecaa8591b5ca1f90b654d30f436c2dcec82642c76303f1db2450bfe90ee0a880decb4fb148a05b24605eacaee566d082bf4ff256ed1a0c099479054ca WHIRLPOOL de3314bf5f6ea09c3aeda022921f78230fd1bca604a7d9cd0fe3bc1bd605abb5e5be1646d32b79b1091227abf254963d02aae6a8efe3ec337dd2bef1ab51e38b
+AUX cinelerra-20140710-validate_desktop_entry.patch 338 SHA256 b26b1f57f7895a3149f840cea1c3292f7ed08225db1a0759fc0cd06d2be92451 SHA512 a8b2d629c952187741671db1806b126a9abf05167fe6fa103053e35354301af168d0fa98146c9007216e6c551b0ed72d518cec543c6e0cdb49959de3b73d8d83 WHIRLPOOL 26a9fbed8dd70c9aaa3c539179abad56fd311b58b8fa5769d20e52d83c5ddd45ef756030c4de446e75608de14ce4dd8ff79f4984bb628aa015a75864719863b5
+AUX cinelerra-ffmpeg.patch 2472 SHA256 d97aac356406258d064a28879c0550ef8e69eaffa247fdb2ebd44b6d858ed3a2 SHA512 59299661832f5631d9a07a0eab0685f897a39acf6c9e8a3f79730f9479c942775005f59abb29f40c9df7446882ccac332fd97bb6387807f41c35e67301022196 WHIRLPOOL 59eaafb82c666bfcf0796a12d4c3c28fa266564001f5bef59a632b08a8c70ac0558b6f52516f1210d527aff343bd59789f7e0498662aaa26ffa937b41ea01477
+AUX cinelerra-ffmpeg2.patch 7440 SHA256 143a7803b1f49589aaa5a50813d576d766b7918faf8df0a8fcd5909c3a6bc8a0 SHA512 c0c5a6e72ca925ca7c0b724aad08bf3c40697903683c7628801e3aceb1f5724e24a634c0d43527ed3256934eed90d30d54b97683c107fcb5519367f921c5a4bd WHIRLPOOL 9e745968499572de12e96f96d17aef8e1400ea85ceb69829514a2718baa1e30b70dca5f846529f3e3a2fdcc7c97ff0f6c1237c0af33b60d19cdde582dec9ed2e
+AUX cinelerra-ffmpeg29.patch 22007 SHA256 7b27bef9fb11d3c5b27e57a58969f93d79ccf5978914afaa532a085b1b0380ca SHA512 1ec88f44348a67c98931a27225fd0df29afa319b4b36ab5397f37a0d0f7a5707f8cafd93955091f82759e1bc2f73edcff164baa6959fa064afc82f6b17b3fb93 WHIRLPOOL 5ce0c9162b96af45c479e689f3cb2128f4c14f0ce735ebc9753cd7c9550816e4c6f0cd42c8b89bf02c21fce96f8b5d5bf93da8c1f98a2d9f92a2a8ab781dccb6
+AUX cinelerra-implicit_decls.patch 1019 SHA256 7ac6381337b1dc325a10f82c2ad7a9a4e72dfd4df4f53377061342206b3a8118 SHA512 20dfcf31de8cfd4c7e1564839366798d37570b939ee14b53c06ffacd1d9e45bd2247e4c85e70b5289c6150dc1927fa103df3d5f7ef5494487a38dc98d62966f5 WHIRLPOOL f479cb5f50d1dffa1c8c139fa7dd9827f6836b647bf889c296244612da3b61ca1929b17d80aab7cfd958b1885914eded53c7ea749a2c41faff149a480a485aa3
+AUX cinelerra-includes.patch 312 SHA256 2a807d24e8fcdeed1aa65dd3c1acdac0fcfc67800041917e4a50192db5b19ed7 SHA512 42f0fba5d071e1f811d0700a799c2cad7af62aa7a21324b66a7944b3bf8955afc512f7de5fc2ec21fd9310036acc1ad16de672fcd7bdb4bad7d5d92ae4bfd38a WHIRLPOOL bc7177489370f4a96f6be3d05ac5e82ea058d7a84c2132b240d992b91fd993ea1e04c635bd6ddffd8512d60b6ef5bbe3c3b75ccb45246c1a28f5369dcff4b01a
+AUX cinelerra-libav9.patch 3760 SHA256 9a29f6f8f8ea23b9f856709f4e210ef7e25ea73ab6d806a00b3b7509ff69903b SHA512 c6bd7a3ffd02daebd3575a4d99cbfd9bb5278dfce66f5c2289c57793f1b9c9994207c63ecdb2a5a3bcbd0d4ddb5cece4d973dd488c9308ddd5501f5bad201cc2 WHIRLPOOL d9b6c10e4dbb2c7da6db0773752fcfef40aea9ecc981181ddb6c7774eb76b363505c4aaba8ed999385bdfd29328975c1bf870ac7b42dbc9eb1a4ccbee219a408
+AUX cinelerra-pngtoh.patch 298 SHA256 1237f420c1057cac28cd62f72cf54470bd1156675a9f6140ef344fffa583d5d3 SHA512 1e3fe901b193aa2ce6237910894be5351c32162d5588485ab86ec36f72bb85e69c78f6d64ae3a0665450206604717e3fce7ec767910bf5e28780882b9f38a0bb WHIRLPOOL cc52d9c07614efb9beeac39bed046e33fd9f5dd74a1cbbac963d2f9dc6eed70825ce0c615b8a3408139ceccb153b55616938beeaf3db850edf0fac2c25b3e9d3
+AUX cinelerra-putbits-gcc52.patch 1222 SHA256 f571d3f62483b05d035d05b3650cf74ffd1d48da2c2cd9d07aa5fd8eead75216 SHA512 523acccdf22ae7c4d78df554ddd8b4f957dc7e3948bedd61e7e8ed07725d28a14df478a3d01e88d4223f90ae6661c70fcc406d9829b685b1fce20892c2306f0d WHIRLPOOL 71d1f7c2e348aa067f601e13cb85f670b415532719193fa5c29ee80cbc7160435846721dd14ee0a992620c57dc5a58f05461b19fa063683a79e3539e5b9f5670
+DIST CinelerraCV-2.3.tar.xz 25705608 SHA256 4bcb450347de5eccea0ed6d49d6d70e4b065905516e4416f9a788d0d7ccc926f SHA512 908dc097af8507e3b60b4787e0350500b8ba8c4340bbbdbf3716e61d74074e5f0617500b94ed1d450e030f88f3821f948cfa37c247ec2c2571fd76974374868e WHIRLPOOL 52a74c74cfeacbebd3cf3e2aced7a0054b68ce3ec04309ac608c4e1e5779a9ced8d9ea50a0898b610288aef588b613455b38b46af3ab67c44f3581ef3676b79e
+EBUILD cinelerra-2.3.ebuild 2974 SHA256 57961ce1e6e05fb2b6b1f51cddf42e6e45056e33961f41092df28df7cc4aa884 SHA512 181cdec14eb74ffdcf0d4166db9995cdf3cfd7a5d1b2ba5839ae099f217fea6d14204ccebec4e5544365960a687891e82b25e79a2a9f635555a416c2602cd26c WHIRLPOOL 1851333c133a7aa178b9054f705864973b011b0c84901e47d756a68066db57ad52eab63ea9f57ebfb06b3a08c4c0327f5f6463ec5cb8dd2672873bcdc6a2a4cc
+MISC ChangeLog 3445 SHA256 4a279d497646371752d9389a731919268aaf010d6c36bb1877b84af07fe8c579 SHA512 6450edf372359df0006c101845927bca321513ee476b749b64120a8d17637863ef84908527d92896e630cdded29e91058df9f13d6b007206011f0a37ed2da087 WHIRLPOOL 8706ab66b1dfd167951a794522d14ede811cb52f3f29f7b63deb49e78aa91b309daa15326e01cfd05b3c7207ee5ce32d997950aef51ab9aaa288c823d46bc675
+MISC ChangeLog-2015 15615 SHA256 aeb6c42fef8cff71fb6fdf3b1620cb087e5ddf0bf2b778e36ddb4722e83eafcb SHA512 b087f3fcda896469d549a366fb3c8f70b83ad37b42417c4b9e1163d6946e857781321f8ec1f7ca00feb77a46635a855fd9671f6f908d2201e914465f2f26d617 WHIRLPOOL 4450c766e7e3d9d2e48a9d9f603f3725e3effb72ad95731460a725abb320783a832697c411c356f075f53096005d0d6a91405f602d4c47b68782f8b763c33165
+MISC metadata.xml 259 SHA256 4852206a3072932a61ab8385eb59e71e039db9ef45a58388793b666cf5e45605 SHA512 c81aea0e68817fa210dc6f66313aee75246139e50d6324338707f11bca2173c64e88ce8440794c85eb64194ff97cf6c6760a06b4822a121e40629bdc3a04e1fd WHIRLPOOL f099222dbec5aedb3b5bd21a72bd6b33869fa88d1c7c5748d39c346cf0194ea495ba7e987c26fbf360407a174d6b8b7bf02aa00482bca341eb3db0bb6bb9ef19
diff --git a/media-video/cinelerra/cinelerra-2.3.ebuild b/media-video/cinelerra/cinelerra-2.3.ebuild
new file mode 100644
index 000000000000..812eb75dbb32
--- /dev/null
+++ b/media-video/cinelerra/cinelerra-2.3.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils multilib flag-o-matic
+
+DESCRIPTION="The most advanced non-linear video editor and compositor"
+HOMEPAGE="http://www.cinelerra.org/"
+SRC_URI="https://cinelerra-cv.org/releases/CinelerraCV-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="cpu_flags_x86_3dnow alsa altivec css debug ieee1394 cpu_flags_x86_mmx opengl oss"
+
+RDEPEND="media-libs/a52dec:=
+	media-libs/faac:=
+	media-libs/faad2:=
+	>=media-libs/freetype-2
+	media-libs/fontconfig
+	media-libs/libdv:=
+	>=media-libs/libogg-1.2:=
+	media-libs/libpng:0=
+	media-libs/libsndfile:=
+	>=media-libs/libtheora-1.1:=
+	>=media-libs/libvorbis-1.3:=
+	>=media-libs/openexr-1.5:=
+	media-libs/tiff:0=
+	media-libs/x264:=
+	media-sound/lame:=
+	>=media-video/mjpegtools-2
+	>=sci-libs/fftw-3
+	x11-libs/libX11:=
+	x11-libs/libXext:=
+	x11-libs/libXft:=
+	x11-libs/libXv:=
+	x11-libs/libXvMC:=
+	x11-libs/libXxf86vm:=
+	virtual/ffmpeg
+	|| ( media-video/ffmpeg:0[postproc(-)] media-libs/libpostproc )
+	virtual/jpeg:0
+	alsa? ( media-libs/alsa-lib:= )
+	ieee1394? (
+		media-libs/libiec61883:=
+		>=sys-libs/libraw1394-1.2.0:=
+		>=sys-libs/libavc1394-0.5.0:=
+		)
+	opengl? (
+		virtual/glu
+		virtual/opengl
+		)"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	cpu_flags_x86_mmx? ( dev-lang/nasm )"
+
+S="${WORKDIR}/CinelerraCV-${PV}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-20140710-validate_desktop_entry.patch \
+		"${FILESDIR}"/${PN}-ffmpeg.patch \
+		"${FILESDIR}"/${PN}-20140710-underlinking.patch \
+		"${FILESDIR}"/${PN}-20140710-ffmpeg-0.11.patch \
+		"${FILESDIR}"/${PN}-libav9.patch \
+		"${FILESDIR}"/${PN}-pngtoh.patch \
+		"${FILESDIR}"/${PN}-putbits-gcc52.patch \
+		"${FILESDIR}"/${PN}-implicit_decls.patch \
+		"${FILESDIR}"/${PN}-includes.patch
+
+	if has_version '>=media-video/ffmpeg-2' ; then
+		epatch "${FILESDIR}"/${PN}-ffmpeg2.patch
+	fi
+
+	if has_version '>=media-video/ffmpeg-2.9' ; then
+		epatch "${FILESDIR}"/${PN}-ffmpeg29.patch
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -D__STDC_CONSTANT_MACROS #321945
+	append-ldflags -Wl,-z,noexecstack #212959
+
+	local myconf
+	use debug && myconf='--enable-x-error-output'
+
+	econf \
+		$(use_enable oss) \
+		$(use_enable alsa) \
+		--disable-esd \
+		$(use_enable ieee1394 firewire) \
+		$(use_enable css) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable cpu_flags_x86_3dnow 3dnow) \
+		$(use_enable altivec) \
+		$(use_enable opengl) \
+		--with-plugindir=/usr/$(get_libdir)/${PN} \
+		--with-buildinfo=cust/"Gentoo - ${PV}" \
+		--with-external-ffmpeg \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dohtml -a png,html,texi,sdw -r doc/*
+
+	rm -rf "${D}"/usr/include
+	mv -vf "${D}"/usr/bin/mpeg3cat{,.hv} || die
+	mv -vf "${D}"/usr/bin/mpeg3dump{,.hv} || die
+	mv -vf "${D}"/usr/bin/mpeg3toc{,.hv} || die
+	dosym /usr/bin/mpeg2enc /usr/$(get_libdir)/${PN}/mpeg2enc.plugin
+
+	prune_libtool_files --all
+}
diff --git a/media-video/cinelerra/files/cinelerra-20140710-ffmpeg-0.11.patch b/media-video/cinelerra/files/cinelerra-20140710-ffmpeg-0.11.patch
new file mode 100644
index 000000000000..2aebd7008c3c
--- /dev/null
+++ b/media-video/cinelerra/files/cinelerra-20140710-ffmpeg-0.11.patch
@@ -0,0 +1,134 @@
+--- cinelerra/ffmpeg.C
++++ cinelerra/ffmpeg.C
+@@ -23,7 +23,6 @@
+ 
+ int FFMPEG::init(char *codec_string) {
+ 
+-	avcodec_init();
+ 	avcodec_register_all();
+ 
+ 	CodecID id = codec_id(codec_string);
+--- cinelerra/fileac3.C
++++ cinelerra/fileac3.C
+@@ -84,7 +84,6 @@
+ 
+ 	if(wr)
+ 	{
+-  		avcodec_init();
+ 		avcodec_register_all();
+ 		codec = avcodec_find_encoder(CODEC_ID_AC3);
+ 		if(!codec)
+--- configure.ac
++++ configure.ac
+@@ -497,7 +497,7 @@
+ AC_ARG_WITH([external-ffmpeg], AC_HELP_STRING([--with-external-ffmpeg], [use external ffmpeg library]))
+ 
+ if test "x$with_external_ffmpeg" = "xyes"; then
+-     PKG_CHECK_MODULES([FFMPEG_TEMP], [libavcodec libpostproc])
++     PKG_CHECK_MODULES([FFMPEG_TEMP], [libavcodec libpostproc libavutil])
+      FFMPEG_FOLDER=""
+      FFMPEG_EXTERNALTEXT="External ffmpeg"
+ 		   
+@@ -515,10 +515,10 @@
+      AC_MSG_RESULT($enable_ffmpeg_swscale)
+      if test x"$enable_ffmpeg_swscale" = xyes; then
+ 	     dnl AC_DEFINE(HAVE_SWSCALER)
+-	     PKG_CHECK_MODULES([FFMPEG], [libavcodec libpostproc libswscale])
++	     PKG_CHECK_MODULES([FFMPEG], [libavcodec libpostproc libswscale libavutil])
+ 	     FFMPEG_CFLAGS="$FFMPEG_CFLAGS -I/usr/include/libavcodec -I/usr/include/libswscale -DHAVE_SWSCALER"
+      else
+-	     PKG_CHECK_MODULES([FFMPEG], [libavcodec libpostproc])
++	     PKG_CHECK_MODULES([FFMPEG], [libavcodec libpostproc libavutil])
+      fi
+      FFMPEG_EXTERNALTEXT="External ffmpeg"
+ else
+--- quicktime/mpeg4.c
++++ quicktime/mpeg4.c
+@@ -624,12 +624,12 @@
+ 		else
+ // ffmpeg section
+ 		{
++			AVDictionary ** opts = NULL;
+ 			static char *video_rc_eq="tex^qComp";
+ 			codec->encode_initialized[current_field] = 1;
+ 			if(!ffmpeg_initialized)
+ 			{
+ 				ffmpeg_initialized = 1;
+-  				avcodec_init();
+ 				avcodec_register_all();
+ 			}
+ 
+@@ -673,8 +673,10 @@
+         	context->b_quant_offset = 1.25;
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+ 			context->error_resilience = FF_ER_CAREFUL;
+-#else
++#elif LIBAVCODEC_VERSION_INT < ((54<<16)+(0<<8)+0)
+ 			context->error_recognition = FF_ER_CAREFUL;
++#else
++			context->err_recognition |= AV_EF_CAREFUL;
+ #endif
+ 			context->error_concealment = 3;
+ 			context->frame_skip_cmp = FF_CMP_DCTMAX;
+@@ -699,7 +701,7 @@
+         	context->profile= FF_PROFILE_UNKNOWN;
+ 			context->rc_buffer_aggressivity = 1.0;
+         	context->level= FF_LEVEL_UNKNOWN;
+-			context->flags |= CODEC_FLAG_H263P_UMV;
++			av_dict_set(opts, "umv", "1", 0);
+ 			context->flags |= CODEC_FLAG_AC_PRED;
+ 
+ // All the forbidden settings can be extracted from libavcodec/mpegvideo.c of ffmpeg...
+@@ -717,10 +719,8 @@
+ 				(codec->ffmpeg_id == CODEC_ID_MPEG4 ||
+ 			         codec->ffmpeg_id == CODEC_ID_MPEG1VIDEO ||
+ 			         codec->ffmpeg_id == CODEC_ID_MPEG2VIDEO ||
+-			         codec->ffmpeg_id == CODEC_ID_H263P || 
+-			         codec->ffmpeg_id == CODEC_FLAG_H263P_SLICE_STRUCT))
++			         codec->ffmpeg_id == CODEC_ID_H263P ))
+ 			{
+-				avcodec_thread_init(context, file->cpus);
+ 				context->thread_count = file->cpus;
+ 			}
+ 
+@@ -740,7 +740,7 @@
+  * codec->fix_bitrate,
+  * codec->quantizer);
+  */
+-			avcodec_open(context, codec->encoder[current_field]);
++			avcodec_open2(context, codec->encoder[current_field], opts);
+ 
+    			avcodec_get_frame_defaults(&codec->picture[current_field]);
+ 
+--- quicktime/qtffmpeg.c
++++ quicktime/qtffmpeg.c
+@@ -54,7 +54,6 @@
+ 	if(!ffmpeg_initialized)
+ 	{
+ 		ffmpeg_initialized = 1;
+-  		avcodec_init();
+ 		avcodec_register_all();
+ 	}
+ 
+@@ -90,10 +89,8 @@
+ 				(ffmpeg_id == CODEC_ID_MPEG4 ||
+ 			         ffmpeg_id == CODEC_ID_MPEG1VIDEO ||
+ 			         ffmpeg_id == CODEC_ID_MPEG2VIDEO ||
+-			         ffmpeg_id == CODEC_ID_H263P || 
+-			         ffmpeg_id == CODEC_FLAG_H263P_SLICE_STRUCT))
++			         ffmpeg_id == CODEC_ID_H263P ))
+ 		{
+-			avcodec_thread_init(context, cpus);
+ 			context->thread_count = cpus;
+ 		}
+ 		if(avcodec_open(context, 
+--- quicktime/wma.c
++++ quicktime/wma.c
+@@ -67,7 +67,6 @@
+ 		if(!ffmpeg_initialized)
+ 		{
+ 			ffmpeg_initialized = 1;
+-			avcodec_init();
+ 			avcodec_register_all();
+ 		}
+ 
diff --git a/media-video/cinelerra/files/cinelerra-20140710-underlinking.patch b/media-video/cinelerra/files/cinelerra-20140710-underlinking.patch
new file mode 100644
index 000000000000..a7dc74f2d445
--- /dev/null
+++ b/media-video/cinelerra/files/cinelerra-20140710-underlinking.patch
@@ -0,0 +1,16 @@
+http://bugs.gentoo.org/367509
+
+pluginserver.C is using dlsym, dlopen, dlclose and dlerror
+
+--- cinelerra/Makefile.am
++++ cinelerra/Makefile.am
+@@ -692,7 +692,8 @@
+ 	$(LIBDV_LIBS) \
+ 	-luuid \
+ 	$(MJPEG_LIBS) \
+-	-lstdc++
++	-lstdc++ \
++	-ldl
+ 
+ EXTRA_DIST = gen-feather-h
+ 
diff --git a/media-video/cinelerra/files/cinelerra-20140710-validate_desktop_entry.patch b/media-video/cinelerra/files/cinelerra-20140710-validate_desktop_entry.patch
new file mode 100644
index 000000000000..006217586630
--- /dev/null
+++ b/media-video/cinelerra/files/cinelerra-20140710-validate_desktop_entry.patch
@@ -0,0 +1,14 @@
+--- image/cinelerra-cv.desktop
++++ image/cinelerra-cv.desktop
+@@ -5,9 +5,8 @@
+ Name[fr]=Cinelerra-CV
+ Name[es]=Cinelerra-CV
+ Comment=Video Editor
+-Categories=Application;AudioVideo;Multimedia;VideoEditing;
+-Encoding=UTF-8
++Categories=AudioVideo;
+ Exec=cinelerra
+-Icon=cinelerra-cv.xpm
++Icon=cinelerra-cv
+ Terminal=false
+ Type=Application
diff --git a/media-video/cinelerra/files/cinelerra-ffmpeg.patch b/media-video/cinelerra/files/cinelerra-ffmpeg.patch
new file mode 100644
index 000000000000..6f7962fb1a54
--- /dev/null
+++ b/media-video/cinelerra/files/cinelerra-ffmpeg.patch
@@ -0,0 +1,76 @@
+Fix build with ffmpeg/libav trunk / 0.7
+
+Index: cinelerra-20101104/cinelerra/ffmpeg.C
+===================================================================
+--- cinelerra-20101104.orig/cinelerra/ffmpeg.C
++++ cinelerra-20101104/cinelerra/ffmpeg.C
+@@ -364,12 +364,15 @@ int FFMPEG::decode(uint8_t *data, long d
+ 
+ 	// NOTE: frame must already have data space allocated
+ 	
++	AVPacket pkt;
+ 	got_picture = 0;
+-	int length = avcodec_decode_video(context,
++	av_init_packet( &pkt );
++	pkt.data = data;
++	pkt.size = data_size;
++	int length = avcodec_decode_video2(context,
+ 					  picture,
+ 					  &got_picture,
+-					  data,
+-					  data_size);
++					  &pkt);
+ 	
+ 	if (length < 0) {
+ 		printf("FFMPEG::decode error decoding frame\n");
+Index: cinelerra-20101104/quicktime/qtffmpeg.c
+===================================================================
+--- cinelerra-20101104.orig/quicktime/qtffmpeg.c
++++ cinelerra-20101104/quicktime/qtffmpeg.c
+@@ -181,6 +181,7 @@ static int decode_wrapper(quicktime_t *f
+  
+ 	if(!result) 
+ 	{ 
++		AVPacket pkt;
+ 
+ 
+ // No way to determine if there was an error based on nonzero status.
+@@ -189,11 +190,13 @@ static int decode_wrapper(quicktime_t *f
+ 			ffmpeg->decoder_context[current_field]->skip_frame = AVDISCARD_NONREF /* AVDISCARD_BIDIR */;
+ 		else
+ 			ffmpeg->decoder_context[current_field]->skip_frame = AVDISCARD_DEFAULT;
+-		result = avcodec_decode_video(ffmpeg->decoder_context[current_field], 
++		av_init_packet( &pkt );
++		pkt.data = ffmpeg->work_buffer;
++		pkt.size = bytes + header_bytes;
++		result = avcodec_decode_video2(ffmpeg->decoder_context[current_field], 
+ 			&ffmpeg->picture[current_field], 
+ 			&got_picture, 
+-			ffmpeg->work_buffer, 
+-			bytes + header_bytes);
++			&pkt);
+ 
+ 
+ 
+Index: cinelerra-20101104/quicktime/wma.c
+===================================================================
+--- cinelerra-20101104.orig/quicktime/wma.c
++++ cinelerra-20101104/quicktime/wma.c
+@@ -195,11 +195,14 @@ printf("decode 2 %x %llx %llx\n", chunk_
+ 			chunk_size);
+ #else
+ 		bytes_decoded = AVCODEC_MAX_AUDIO_FRAME_SIZE;
+-		result = avcodec_decode_audio2(codec->decoder_context,
++		AVPacket pkt;
++		av_init_packet( &pkt );
++		pkt.data = codec->packet_buffer;
++		pkt.size = chunk_size;
++		result = avcodec_decode_audio3(codec->decoder_context,
+ 			(int16_t*)(codec->work_buffer + codec->output_size * sample_size),
+ 			&bytes_decoded,
+-			codec->packet_buffer,
+-			chunk_size);
++			&pkt);
+ #endif
+ 
+ 		pthread_mutex_unlock(&ffmpeg_lock);
diff --git a/media-video/cinelerra/files/cinelerra-ffmpeg2.patch b/media-video/cinelerra/files/cinelerra-ffmpeg2.patch
new file mode 100644
index 000000000000..01680ac952f1
--- /dev/null
+++ b/media-video/cinelerra/files/cinelerra-ffmpeg2.patch
@@ -0,0 +1,218 @@
+https://bugs.gentoo.org/show_bug.cgi?id=479394
+By Helmut Jarausch
+
+--- cinelerra/ffmpeg.h.ORIG	2012-07-06 22:40:26.000000000 +0200
++++ cinelerra/ffmpeg.h	2013-08-01 12:58:12.342474136 +0200
+@@ -26,7 +26,7 @@
+ 	static int convert_cmodel_transfer(VFrame *frame_in,VFrame *frame_out);
+ 	static int init_picture_from_frame(AVPicture *picture, VFrame *frame);
+ 
+-	static CodecID codec_id(char *codec_string);
++	static AVCodecID codec_id(char *codec_string);
+ 
+  private:
+ 	static PixelFormat color_model_to_pix_fmt(int color_model);
+--- cinelerra/ffmpeg.C.ORIG	2013-08-01 11:24:43.794419246 +0200
++++ cinelerra/ffmpeg.C	2013-08-01 12:57:48.121473899 +0200
+@@ -25,7 +25,7 @@
+ 
+ 	avcodec_register_all();
+ 
+-	CodecID id = codec_id(codec_string);
++	AVCodecID id = codec_id(codec_string);
+ 	codec = avcodec_find_decoder(id);
+ 	if (codec == NULL) {
+ 		printf("FFMPEG::init no decoder for '%s'", codec_string);
+@@ -51,7 +51,7 @@
+ }
+ 
+ 
+-CodecID FFMPEG::codec_id(char *codec_string) {
++AVCodecID FFMPEG::codec_id(char *codec_string) {
+ #define CODEC_IS(x) (! strncmp(codec_string, x, 4))
+ 
+ 	if (CODEC_IS(QUICKTIME_DV) ||
+--- quicktime/ffmpeg/ffmpeg.c.ORIG	2012-07-06 22:40:26.000000000 +0200
++++ quicktime/ffmpeg/ffmpeg.c	2013-08-01 12:57:59.025474005 +0200
+@@ -2663,7 +2663,7 @@
+     return 0;
+ }
+ 
+-static enum CodecID find_codec_or_die(const char *name, int type, int encoder)
++static enum AVCodecID find_codec_or_die(const char *name, int type, int encoder)
+ {
+     const char *codec_string = encoder ? "encoder" : "decoder";
+     AVCodec *codec;
+--- quicktime/ffmpeg/libavformat/electronicarts.c.ORIG	2012-07-06 22:40:26.000000000 +0200
++++ quicktime/ffmpeg/libavformat/electronicarts.c	2013-08-01 13:00:57.855475755 +0200
+@@ -49,11 +49,11 @@
+ typedef struct EaDemuxContext {
+     int big_endian;
+ 
+-    enum CodecID video_codec;
++    enum AVCodecID video_codec;
+     AVRational time_base;
+     int video_stream_index;
+ 
+-    enum CodecID audio_codec;
++    enum AVCodecID audio_codec;
+     int audio_stream_index;
+     int audio_frame_counter;
+ 
+--- quicktime/ffmpeg/libavformat/img2.c.ORIG	2012-07-06 22:40:26.000000000 +0200
++++ quicktime/ffmpeg/libavformat/img2.c	2013-08-01 12:59:21.408474812 +0200
+@@ -34,7 +34,7 @@
+ } VideoData;
+ 
+ typedef struct {
+-    enum CodecID id;
++    enum AVCodecID id;
+     const char *str;
+ } IdStrMap;
+ 
+@@ -97,7 +97,7 @@
+     }
+     return -1;
+ }
+-static enum CodecID av_str2id(const IdStrMap *tags, const char *str)
++static enum AVCodecID av_str2id(const IdStrMap *tags, const char *str)
+ {
+     str= strrchr(str, '.');
+     if(!str) return CODEC_ID_NONE;
+@@ -175,7 +175,7 @@
+     return 0;
+ }
+ 
+-enum CodecID av_guess_image2_codec(const char *filename){
++enum AVCodecID av_guess_image2_codec(const char *filename){
+     return av_str2id(img_tags, filename);
+ }
+ 
+--- quicktime/ffmpeg/libavformat/matroskadec.c.ORIG	2012-07-06 22:40:26.000000000 +0200
++++ quicktime/ffmpeg/libavformat/matroskadec.c	2013-08-01 12:59:57.556475165 +0200
+@@ -2476,7 +2476,7 @@
+         AVStream *st;
+ 
+         for (i = 0; i < matroska->num_tracks; i++) {
+-            enum CodecID codec_id = CODEC_ID_NONE;
++            enum AVCodecID codec_id = CODEC_ID_NONE;
+             uint8_t *extradata = NULL;
+             int extradata_size = 0;
+             int extradata_offset = 0;
+@@ -2495,7 +2495,7 @@
+                 }
+             }
+ 
+-            /* Set the FourCC from the CodecID. */
++            /* Set the FourCC from the AVCodecID. */
+             /* This is the MS compatibility mode which stores a
+              * BITMAPINFOHEADER in the CodecPrivate. */
+             if (!strcmp(track->codec_id,
+@@ -2600,7 +2600,7 @@
+ 
+             if (codec_id == CODEC_ID_NONE) {
+                 av_log(matroska->ctx, AV_LOG_INFO,
+-                       "Unknown/unsupported CodecID %s.\n",
++                       "Unknown/unsupported AVCodecID %s.\n",
+                        track->codec_id);
+             }
+ 
+--- quicktime/ffmpeg/libavformat/matroska.h.ORIG	2012-07-06 22:40:26.000000000 +0200
++++ quicktime/ffmpeg/libavformat/matroska.h	2013-08-01 13:00:22.218475407 +0200
+@@ -220,12 +220,12 @@
+ 
+ typedef struct CodecTags{
+     char str[16];
+-    enum CodecID id;
++    enum AVCodecID id;
+ }CodecTags;
+ 
+ typedef struct CodecMime{
+     char str[32];
+-    enum CodecID id;
++    enum AVCodecID id;
+ }CodecMime;
+ 
+ #define MATROSKA_CODEC_ID_VIDEO_VFW_FOURCC   "V_MS/VFW/FOURCC"
+--- quicktime/ffmpeg/libavformat/mov.c.ORIG	2012-07-06 22:40:26.000000000 +0200
++++ quicktime/ffmpeg/libavformat/mov.c	2013-08-01 12:59:33.935474934 +0200
+@@ -678,7 +678,7 @@
+ 
+     for(pseudo_stream_id=0; pseudo_stream_id<entries; pseudo_stream_id++) {
+         //Parsing Sample description table
+-        enum CodecID id;
++        enum AVCodecID id;
+         int dref_id;
+         MOV_atom_t a = { 0, 0, 0 };
+         offset_t start_pos = url_ftell(pb);
+--- quicktime/ffmpeg/libavformat/mxf.c.ORIG	2012-07-06 22:40:26.000000000 +0200
++++ quicktime/ffmpeg/libavformat/mxf.c	2013-08-01 12:59:12.025474720 +0200
+@@ -157,7 +157,7 @@
+ typedef struct {
+     UID uid;
+     unsigned matching_len;
+-    enum CodecID id;
++    enum AVCodecID id;
+ } MXFCodecUL;
+ 
+ typedef struct {
+--- quicktime/ffmpeg/libavformat/riff.h.ORIG	2012-07-06 22:40:26.000000000 +0200
++++ quicktime/ffmpeg/libavformat/riff.h	2013-08-01 12:59:45.950475052 +0200
+@@ -48,7 +48,7 @@
+ extern const AVCodecTag codec_wav_tags[];
+ 
+ unsigned int codec_get_tag(const AVCodecTag *tags, int id);
+-enum CodecID codec_get_id(const AVCodecTag *tags, unsigned int tag);
++enum AVCodecID codec_get_id(const AVCodecTag *tags, unsigned int tag);
+ void ff_parse_specific_params(AVCodecContext *stream, int *au_rate, int *au_ssize, int *au_scale);
+ 
+ #endif /* FFMPEG_RIFF_H */
+--- quicktime/ffmpeg/libavformat/rtp.c.ORIG	2012-07-06 22:40:26.000000000 +0200
++++ quicktime/ffmpeg/libavformat/rtp.c	2013-08-01 12:59:01.778474619 +0200
+@@ -40,7 +40,7 @@
+     int pt;
+     const char enc_name[6];
+     enum CodecType codec_type;
+-    enum CodecID codec_id;
++    enum AVCodecID codec_id;
+     int clock_rate;
+     int audio_channels;
+ } AVRtpPayloadTypes[]=
+@@ -120,7 +120,7 @@
+     return "";
+ }
+ 
+-enum CodecID ff_rtp_codec_id(const char *buf, enum CodecType codec_type)
++enum AVCodecID ff_rtp_codec_id(const char *buf, enum CodecType codec_type)
+ {
+     int i;
+ 
+--- quicktime/ffmpeg/libavformat/rtp_internal.h.ORIG	2012-07-06 22:40:26.000000000 +0200
++++ quicktime/ffmpeg/libavformat/rtp_internal.h	2013-08-01 13:00:09.147475279 +0200
+@@ -61,7 +61,7 @@
+     // fields from AVRtpDynamicPayloadType_s
+     const char enc_name[50];    /* XXX: still why 50 ? ;-) */
+     enum CodecType codec_type;
+-    enum CodecID codec_id;
++    enum AVCodecID codec_id;
+ 
+     // may be null
+     int (*parse_sdp_a_line) (AVStream * stream,
+@@ -123,7 +123,7 @@
+ 
+ void ff_rtp_send_data(AVFormatContext *s1, const uint8_t *buf1, int len, int m);
+ const char *ff_rtp_enc_name(int payload_type);
+-enum CodecID ff_rtp_codec_id(const char *buf, enum CodecType codec_type);
++enum AVCodecID ff_rtp_codec_id(const char *buf, enum CodecType codec_type);
+ 
+ void av_register_rtp_dynamic_payload_handlers(void);
+ 
+--- quicktime/wma.h.ORIG	2012-07-06 22:40:26.000000000 +0200
++++ quicktime/wma.h	2013-08-01 13:11:46.431482103 +0200
+@@ -3,5 +3,6 @@
+ 
+ extern void quicktime_init_codec_wmav1(quicktime_audio_map_t *);
+ extern void quicktime_init_codec_wmav2(quicktime_audio_map_t *);
++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000
+ 
+ #endif
diff --git a/media-video/cinelerra/files/cinelerra-ffmpeg29.patch b/media-video/cinelerra/files/cinelerra-ffmpeg29.patch
new file mode 100644
index 000000000000..604000eff380
--- /dev/null
+++ b/media-video/cinelerra/files/cinelerra-ffmpeg29.patch
@@ -0,0 +1,658 @@
+Index: cinelerra-20140710/cinelerra/ffmpeg.C
+===================================================================
+--- cinelerra-20140710.orig/cinelerra/ffmpeg.C
++++ cinelerra-20140710/cinelerra/ffmpeg.C
+@@ -38,7 +38,7 @@ int FFMPEG::init(char *codec_string) {
+ 		printf("FFMPEG::init avcodec_open() failed\n");
+ 	}
+ 
+-	picture = avcodec_alloc_frame();
++	picture = av_frame_alloc();
+ 
+ 
+ 	return 0;
+@@ -55,62 +55,62 @@ AVCodecID FFMPEG::codec_id(char *codec_s
+ #define CODEC_IS(x) (! strncmp(codec_string, x, 4))
+ 
+ 	if (CODEC_IS(QUICKTIME_DV) ||
+-	    CODEC_IS(QUICKTIME_DVSD)) return CODEC_ID_DVVIDEO;
++	    CODEC_IS(QUICKTIME_DVSD)) return AV_CODEC_ID_DVVIDEO;
+ 	
+ 	if (CODEC_IS(QUICKTIME_MP4V) ||
+-	    CODEC_IS(QUICKTIME_DIVX)) return CODEC_ID_MPEG4;
++	    CODEC_IS(QUICKTIME_DIVX)) return AV_CODEC_ID_MPEG4;
+ 
+-	return CODEC_ID_NONE;
++	return AV_CODEC_ID_NONE;
+ 
+ #undef CODEC_IS
+ }
+ 
+-PixelFormat FFMPEG::color_model_to_pix_fmt(int color_model) {
++AVPixelFormat FFMPEG::color_model_to_pix_fmt(int color_model) {
+ 	switch (color_model) 
+ 		{ 
+ 		case BC_YUV422: 
+-			  return PIX_FMT_YUYV422;
++			  return AV_PIX_FMT_YUYV422;
+ 		case BC_RGB888:
+-			return PIX_FMT_RGB24;
++			return AV_PIX_FMT_RGB24;
+ 		case BC_BGR8888:  // NOTE: order flipped
+-			return PIX_FMT_RGB32;
++			return AV_PIX_FMT_RGB32;
+ 		case BC_BGR888:
+-			return PIX_FMT_BGR24;
++			return AV_PIX_FMT_BGR24;
+ 		case BC_YUV420P: 
+-			return PIX_FMT_YUV420P;
++			return AV_PIX_FMT_YUV420P;
+ 		case BC_YUV422P:
+-			return PIX_FMT_YUV422P;
++			return AV_PIX_FMT_YUV422P;
+ 		case BC_YUV444P:
+-			return PIX_FMT_YUV444P;
++			return AV_PIX_FMT_YUV444P;
+ 		case BC_YUV411P:
+-			return PIX_FMT_YUV411P;
++			return AV_PIX_FMT_YUV411P;
+ 		case BC_RGB565:
+-			return PIX_FMT_RGB565;
++			return AV_PIX_FMT_RGB565;
+ 		};
+ 
+-	return PIX_FMT_NB;
++	return AV_PIX_FMT_NB;
+ }
+ 
+-int FFMPEG::pix_fmt_to_color_model(PixelFormat pix_fmt) {
++int FFMPEG::pix_fmt_to_color_model(AVPixelFormat pix_fmt) {
+ 	switch (pix_fmt) 
+ 		{ 
+-		case PIX_FMT_YUYV422:
++		case AV_PIX_FMT_YUYV422:
+ 			return BC_YUV422;
+-		case PIX_FMT_RGB24:
++		case AV_PIX_FMT_RGB24:
+ 			return BC_RGB888;
+-		case PIX_FMT_RGB32:
++		case AV_PIX_FMT_RGB32:
+ 			return BC_BGR8888;
+-		case PIX_FMT_BGR24:
++		case AV_PIX_FMT_BGR24:
+ 			return BC_BGR888;
+-		case PIX_FMT_YUV420P:
++		case AV_PIX_FMT_YUV420P:
+ 			return BC_YUV420P;
+-		case PIX_FMT_YUV422P:
++		case AV_PIX_FMT_YUV422P:
+ 			return BC_YUV422P;
+-		case PIX_FMT_YUV444P:
++		case AV_PIX_FMT_YUV444P:
+ 			return BC_YUV444P;
+-		case PIX_FMT_YUV411P:
++		case AV_PIX_FMT_YUV411P:
+ 			return BC_YUV411P;
+-		case PIX_FMT_RGB565:
++		case AV_PIX_FMT_RGB565:
+ 			return BC_RGB565;
+ 		};
+ 
+@@ -119,7 +119,7 @@ int FFMPEG::pix_fmt_to_color_model(Pixel
+ 
+ int FFMPEG::init_picture_from_frame(AVPicture *picture, VFrame *frame) {
+ 	int cmodel = frame->get_color_model();
+-	PixelFormat pix_fmt = color_model_to_pix_fmt(cmodel);
++	AVPixelFormat pix_fmt = color_model_to_pix_fmt(cmodel);
+ 
+ 	int size = avpicture_fill(picture, frame->get_data(), pix_fmt, 
+ 				  frame->get_w(), frame->get_h());
+@@ -142,16 +142,16 @@ int FFMPEG::init_picture_from_frame(AVPi
+ 
+ int FFMPEG::convert_cmodel(VFrame *frame_in,  VFrame *frame_out) {
+   
+-	PixelFormat pix_fmt_in = 
++	AVPixelFormat pix_fmt_in = 
+ 		color_model_to_pix_fmt(frame_in->get_color_model());
+-	PixelFormat pix_fmt_out = 
++	AVPixelFormat pix_fmt_out = 
+ 		color_model_to_pix_fmt(frame_out->get_color_model());
+ #ifdef HAVE_SWSCALER
+ 	// We need a context for swscale
+ 	struct SwsContext *convert_ctx;
+ #endif
+ 	// do conversion within libavcodec if possible
+-	if (pix_fmt_in != PIX_FMT_NB && pix_fmt_out != PIX_FMT_NB) {
++	if (pix_fmt_in != AV_PIX_FMT_NB && pix_fmt_out != AV_PIX_FMT_NB) {
+ 		// set up a temporary pictures from frame_in and frame_out
+ 		AVPicture picture_in, picture_out;
+ 		init_picture_from_frame(&picture_in, frame_in);
+@@ -226,14 +226,14 @@ int FFMPEG::convert_cmodel_transfer(VFra
+ }
+ 
+ 
+-int FFMPEG::convert_cmodel(AVPicture *picture_in, PixelFormat pix_fmt_in,
++int FFMPEG::convert_cmodel(AVPicture *picture_in, AVPixelFormat pix_fmt_in,
+ 			  int width_in, int height_in, VFrame *frame_out) {
+ 
+ 	// set up a temporary picture_out from frame_out
+ 	AVPicture picture_out;
+ 	init_picture_from_frame(&picture_out, frame_out);
+ 	int cmodel_out = frame_out->get_color_model();
+-	PixelFormat pix_fmt_out = color_model_to_pix_fmt(cmodel_out);
++	AVPixelFormat pix_fmt_out = color_model_to_pix_fmt(cmodel_out);
+ 
+ #ifdef HAVE_SWSCALER
+ 	// We need a context for swscale
+@@ -242,7 +242,7 @@ int FFMPEG::convert_cmodel(AVPicture *pi
+ 	int result;
+ #ifndef HAVE_SWSCALER
+ 	// do conversion within libavcodec if possible
+-	if (pix_fmt_out != PIX_FMT_NB) {
++	if (pix_fmt_out != AV_PIX_FMT_NB) {
+ 		result = img_convert(&picture_out,
+ 				     pix_fmt_out,
+ 				     picture_in,
+@@ -280,7 +280,7 @@ int FFMPEG::convert_cmodel(AVPicture *pi
+ 	// make an intermediate temp frame only if necessary
+ 	int cmodel_in = pix_fmt_to_color_model(pix_fmt_in);
+ 	if (cmodel_in == BC_TRANSPARENCY) {
+-		if (pix_fmt_in == PIX_FMT_RGB32) {
++		if (pix_fmt_in == AV_PIX_FMT_RGB32) {
+ 			// avoid infinite recursion if things are broken
+ 			printf("FFMPEG::convert_cmodel pix_fmt_in broken!\n");
+ 			return 1;
+Index: cinelerra-20140710/cinelerra/ffmpeg.h
+===================================================================
+--- cinelerra-20140710.orig/cinelerra/ffmpeg.h
++++ cinelerra-20140710/cinelerra/ffmpeg.h
+@@ -18,7 +18,7 @@ class FFMPEG
+ 	int init(char *codec_string);
+ 	int decode(uint8_t *data, long data_size, VFrame *frame_out);
+ 
+-	static int convert_cmodel(AVPicture *picture_in, PixelFormat pix_fmt,
++	static int convert_cmodel(AVPicture *picture_in, AVPixelFormat pix_fmt,
+ 				  int width_in, int height_in, 
+ 				  VFrame *frame_out);
+ 	static int convert_cmodel(VFrame *frame_in, VFrame *frame_out);
+@@ -29,8 +29,8 @@ class FFMPEG
+ 	static AVCodecID codec_id(char *codec_string);
+ 
+  private:
+-	static PixelFormat color_model_to_pix_fmt(int color_model);
+-	static int pix_fmt_to_color_model(PixelFormat pix_fmt);
++	static AVPixelFormat color_model_to_pix_fmt(int color_model);
++	static int pix_fmt_to_color_model(AVPixelFormat pix_fmt);
+ 
+ 	int got_picture;
+ 	Asset *asset;
+Index: cinelerra-20140710/cinelerra/fileac3.C
+===================================================================
+--- cinelerra-20140710.orig/cinelerra/fileac3.C
++++ cinelerra-20140710/cinelerra/fileac3.C
+@@ -85,7 +85,7 @@ int FileAC3::open_file(int rd, int wr)
+ 	if(wr)
+ 	{
+ 		avcodec_register_all();
+-		codec = avcodec_find_encoder(CODEC_ID_AC3);
++		codec = avcodec_find_encoder(AV_CODEC_ID_AC3);
+ 		if(!codec)
+ 		{
+ 			eprintf("codec not found.\n");
+@@ -211,12 +211,56 @@ int FileAC3::write_samples(double **buff
+ 		current_sample + frame_size <= temp_raw_size; 
+ 		current_sample += frame_size)
+ 	{
+-		int compressed_size = avcodec_encode_audio(
+-			codec_context, 
+-			temp_compressed + output_size, 
+-			compressed_allocated - output_size, 
+-            temp_raw + current_sample * asset->channels);
+-		output_size += compressed_size;
++		AVPacket pkt;
++		AVFrame *frame;
++		int ret, samples_size, got_packet;
++		av_init_packet(&pkt);
++		pkt.data = temp_compressed + output_size;
++		pkt.size = compressed_allocated - output_size;
++		frame = av_frame_alloc();
++		if(!frame) return AVERROR(ENOMEM);
++		if(codec_context->frame_size) {
++			frame->nb_samples = codec_context->frame_size;
++		} else {
++			/* if frame_size is not set, the number of samples must be
++			 *              * calculated from the buffer size */
++			int64_t nb_samples;
++			if (!av_get_bits_per_sample(codec_context->codec_id)) {
++				av_frame_free(&frame);
++				return AVERROR(EINVAL);
++			}
++			nb_samples = (int64_t)(compressed_allocated - output_size) * 8 /
++				(av_get_bits_per_sample(codec_context->codec_id) *
++				 codec_context->channels);
++			if (nb_samples >= INT_MAX) {
++				av_frame_free(&frame);
++				return AVERROR(EINVAL);
++			}
++			frame->nb_samples = nb_samples;
++		}
++
++		/* it is assumed that the samples buffer is large enough based on the
++		 *          * relevant parameters */
++		samples_size = av_samples_get_buffer_size(NULL, codec_context->channels,
++				frame->nb_samples,
++				codec_context->sample_fmt, 1);
++		if ((ret = avcodec_fill_audio_frame(frame, codec_context->channels,
++						codec_context->sample_fmt,
++						(const uint8_t *)(temp_raw + current_sample * asset->channels),
++						samples_size, 1)) < 0) {
++			av_frame_free(&frame);
++			return ret;
++		}
++
++		ret = avcodec_encode_audio2(codec_context, &pkt, frame, &got_packet);
++		output_size += pkt.size;
++		/* free any side data since we cannot return it */
++		av_packet_free_side_data(&pkt);
++
++		if (frame && frame->extended_data != frame->data)
++			av_freep(&frame->extended_data);
++
++		av_frame_free(&frame);
+ 	}
+ 
+ // Shift buffer back
+Index: cinelerra-20140710/quicktime/mpeg4.c
+===================================================================
+--- cinelerra-20140710.orig/quicktime/mpeg4.c
++++ cinelerra-20140710/quicktime/mpeg4.c
+@@ -595,7 +595,7 @@ static int encode(quicktime_t *file, uns
+ 	if(!codec->encode_initialized[current_field])
+ 	{
+ // Encore section
+-		if(codec->ffmpeg_id == CODEC_ID_MPEG4 && codec->use_encore)
++		if(codec->ffmpeg_id == AV_CODEC_ID_MPEG4 && codec->use_encore)
+ 		{
+ 			codec->encode_initialized[current_field] = 1;
+ 			codec->encode_handle[current_field] = encode_handle++;
+@@ -647,7 +647,7 @@ static int encode(quicktime_t *file, uns
+ 			context->width = width_i;
+ 			context->height = height_i;
+ 			context->gop_size = codec->gop_size;
+-			context->pix_fmt = PIX_FMT_YUV420P;
++			context->pix_fmt = AV_PIX_FMT_YUV420P;
+ 			context->bit_rate = codec->bitrate / codec->total_fields;
+ 			context->bit_rate_tolerance = codec->bitrate_tolerance;
+ 			context->rc_eq = video_rc_eq;
+@@ -705,19 +705,19 @@ static int encode(quicktime_t *file, uns
+ // All the forbidden settings can be extracted from libavcodec/mpegvideo.c of ffmpeg...
+  			
+ // Copyed from ffmpeg's mpegvideo.c... set 4MV only where it is supported
+-			if(codec->ffmpeg_id == CODEC_ID_MPEG4 ||
+-			   codec->ffmpeg_id == CODEC_ID_H263 ||
+-			   codec->ffmpeg_id == CODEC_ID_H263P ||
+-			   codec->ffmpeg_id == CODEC_ID_FLV1)
++			if(codec->ffmpeg_id == AV_CODEC_ID_MPEG4 ||
++			   codec->ffmpeg_id == AV_CODEC_ID_H263 ||
++			   codec->ffmpeg_id == AV_CODEC_ID_H263P ||
++			   codec->ffmpeg_id == AV_CODEC_ID_FLV1)
+ 				context->flags |= CODEC_FLAG_4MV;
+ // Not compatible with Win
+ //			context->flags |= CODEC_FLAG_QPEL;
+ 
+ 			if(file->cpus > 1 && 
+-				(codec->ffmpeg_id == CODEC_ID_MPEG4 ||
+-			         codec->ffmpeg_id == CODEC_ID_MPEG1VIDEO ||
+-			         codec->ffmpeg_id == CODEC_ID_MPEG2VIDEO ||
+-			         codec->ffmpeg_id == CODEC_ID_H263P ))
++				(codec->ffmpeg_id == AV_CODEC_ID_MPEG4 ||
++			         codec->ffmpeg_id == AV_CODEC_ID_MPEG1VIDEO ||
++			         codec->ffmpeg_id == AV_CODEC_ID_MPEG2VIDEO ||
++			         codec->ffmpeg_id == AV_CODEC_ID_H263P ))
+ 			{
+ 				context->thread_count = file->cpus;
+ 			}
+@@ -740,7 +740,7 @@ static int encode(quicktime_t *file, uns
+  */
+ 			avcodec_open2(context, codec->encoder[current_field], opts);
+ 
+-   			avcodec_get_frame_defaults(&codec->picture[current_field]);
++   			av_frame_unref(&codec->picture[current_field]);
+ 
+ 		}
+ 	}
+@@ -891,10 +891,18 @@ static int encode(quicktime_t *file, uns
+ 		picture->quality = 0;
+ 		picture->pts = vtrack->current_position * quicktime_frame_rate_d(file, track);
+ 		picture->key_frame = 0;
+-		bytes = avcodec_encode_video(context, 
+-			codec->work_buffer, 
+-        	codec->buffer_size, 
+-        	picture);
++
++		AVPacket pkt;
++		int ret, got_pkt;
++		av_init_packet(&pkt);
++		pkt.data = codec->work_buffer;
++		pkt.size = codec->buffer_size;
++		ret = avcodec_encode_video2(context, 
++			&pkt,
++	        	picture, &got_pkt);
++		bytes = pkt.size;
++		if(ret < 0 || !got_pkt) return 1;
++
+ 		is_keyframe = context->coded_frame && context->coded_frame->key_frame;
+ /*
+  * printf("encode current_position=%d is_keyframe=%d\n", 
+@@ -1161,7 +1169,7 @@ void quicktime_init_codec_div3(quicktime
+ 		QUICKTIME_DIV3,
+ 		"DIVX",
+ 		"Mike Row Soft MPEG4 Version 3");
+-	result->ffmpeg_id = CODEC_ID_MSMPEG4V3;
++	result->ffmpeg_id = AV_CODEC_ID_MSMPEG4V3;
+ }
+ 
+ void quicktime_init_codec_div5(quicktime_video_map_t *vtrack)
+@@ -1170,7 +1178,7 @@ void quicktime_init_codec_div5(quicktime
+ 		QUICKTIME_DX50,
+ 		"DIVX",
+ 		"Mike Row Soft MPEG4 Version 5");
+-	result->ffmpeg_id = CODEC_ID_MPEG4;
++	result->ffmpeg_id = AV_CODEC_ID_MPEG4;
+ }
+ 
+ // Mike Rowe Soft MPEG-4
+@@ -1180,7 +1188,7 @@ void quicktime_init_codec_div3lower(quic
+ 		QUICKTIME_DIV3_LOWER,
+ 		"DIVX",
+ 		"Mike Row Soft MPEG4 Version 3");
+-	result->ffmpeg_id = CODEC_ID_MSMPEG4V3;
++	result->ffmpeg_id = AV_CODEC_ID_MSMPEG4V3;
+ }
+ 
+ void quicktime_init_codec_div3v2(quicktime_video_map_t *vtrack)
+@@ -1189,7 +1197,7 @@ void quicktime_init_codec_div3v2(quickti
+ 		QUICKTIME_MP42,
+ 		"MP42",
+ 		"Mike Row Soft MPEG4 Version 2");
+-	result->ffmpeg_id = CODEC_ID_MSMPEG4V2;
++	result->ffmpeg_id = AV_CODEC_ID_MSMPEG4V2;
+ }
+ 
+ // Generic MPEG-4
+@@ -1199,7 +1207,7 @@ void quicktime_init_codec_divx(quicktime
+ 		QUICKTIME_DIVX,
+ 		"MPEG-4",
+ 		"Generic MPEG Four");
+-	result->ffmpeg_id = CODEC_ID_MPEG4;
++	result->ffmpeg_id = AV_CODEC_ID_MPEG4;
+ 	result->use_encore = 1;
+ }
+ 
+@@ -1209,7 +1217,7 @@ void quicktime_init_codec_mpg4(quicktime
+ 		QUICKTIME_MPG4,
+ 		"MPEG-4",
+ 		"FFMPEG (msmpeg4)");
+-	result->ffmpeg_id = CODEC_ID_MSMPEG4V1;
++	result->ffmpeg_id = AV_CODEC_ID_MSMPEG4V1;
+ }
+ 
+ void quicktime_init_codec_dx50(quicktime_video_map_t *vtrack)
+@@ -1218,7 +1226,7 @@ void quicktime_init_codec_dx50(quicktime
+ 		QUICKTIME_DX50,
+ 		"MPEG-4",
+ 		"FFMPEG (mpeg4)");
+-	result->ffmpeg_id = CODEC_ID_MPEG4;
++	result->ffmpeg_id = AV_CODEC_ID_MPEG4;
+ }
+ 
+ // Generic MPEG-4
+@@ -1228,7 +1236,7 @@ void quicktime_init_codec_mp4v(quicktime
+ 		QUICKTIME_MP4V,
+ 		"MPEG4",
+ 		"Generic MPEG Four");
+-	result->ffmpeg_id = CODEC_ID_MPEG4;
++	result->ffmpeg_id = AV_CODEC_ID_MPEG4;
+ //	result->use_encore = 1;
+ }
+ 
+@@ -1240,7 +1248,7 @@ void quicktime_init_codec_svq1(quicktime
+ 		QUICKTIME_SVQ1,
+ 		"Sorenson Version 1",
+ 		"From the chearch of codecs of yesterday's sights");
+-	result->ffmpeg_id = CODEC_ID_SVQ1;
++	result->ffmpeg_id = AV_CODEC_ID_SVQ1;
+ }
+ 
+ void quicktime_init_codec_svq3(quicktime_video_map_t *vtrack)
+@@ -1249,7 +1257,7 @@ void quicktime_init_codec_svq3(quicktime
+ 		QUICKTIME_SVQ3,
+ 		"Sorenson Version 3",
+ 		"From the chearch of codecs of yesterday's sights");
+-	result->ffmpeg_id = CODEC_ID_SVQ3;
++	result->ffmpeg_id = AV_CODEC_ID_SVQ3;
+ }
+ 
+ void quicktime_init_codec_h263(quicktime_video_map_t *vtrack)
+@@ -1258,7 +1266,7 @@ void quicktime_init_codec_h263(quicktime
+         QUICKTIME_H263,
+         "H.263",
+         "H.263");
+-    result->ffmpeg_id = CODEC_ID_H263;
++    result->ffmpeg_id = AV_CODEC_ID_H263;
+ }
+ 
+ void quicktime_init_codec_xvid(quicktime_video_map_t *vtrack)
+@@ -1267,7 +1275,7 @@ void quicktime_init_codec_xvid(quicktime
+         QUICKTIME_XVID,
+         "XVID",
+         "FFmpeg MPEG-4");
+-    result->ffmpeg_id = CODEC_ID_MPEG4;
++    result->ffmpeg_id = AV_CODEC_ID_MPEG4;
+ }
+ 
+ void quicktime_init_codec_dnxhd(quicktime_video_map_t *vtrack)
+@@ -1276,7 +1284,7 @@ void quicktime_init_codec_dnxhd(quicktim
+         QUICKTIME_DNXHD,
+         "DNXHD",
+         "DNXHD");
+-    result->ffmpeg_id = CODEC_ID_DNXHD;
++    result->ffmpeg_id = AV_CODEC_ID_DNXHD;
+ }
+ 
+ // field based MPEG-4
+@@ -1287,7 +1295,7 @@ void quicktime_init_codec_hv60(quicktime
+ 		"Dual MPEG-4",
+ 		"MPEG 4 with alternating streams every other frame.  (Not standardized)");
+ 	result->total_fields = 2;
+-	result->ffmpeg_id = CODEC_ID_MPEG4;
++	result->ffmpeg_id = AV_CODEC_ID_MPEG4;
+ }
+ 
+ 
+Index: cinelerra-20140710/quicktime/qtffmpeg.c
+===================================================================
+--- cinelerra-20140710.orig/quicktime/qtffmpeg.c
++++ cinelerra-20140710/quicktime/qtffmpeg.c
+@@ -39,7 +39,7 @@ quicktime_ffmpeg_t* quicktime_new_ffmpeg
+ 	ptr->height = h;
+ 	ptr->ffmpeg_id = ffmpeg_id;
+ //printf("quicktime_new_ffmpeg 1 %d\n", ptr->ffmpeg_id);
+-	if(ffmpeg_id == CODEC_ID_SVQ1)
++	if(ffmpeg_id == AV_CODEC_ID_SVQ1)
+ 	{
+ 		ptr->width_i = quicktime_quantize32(ptr->width);
+ 		ptr->height_i = quicktime_quantize32(ptr->height);
+@@ -86,10 +86,10 @@ quicktime_ffmpeg_t* quicktime_new_ffmpeg
+ 			context->extradata_size = avcc->data_size;
+ 		}
+ 		if(cpus > 1 && 
+-				(ffmpeg_id == CODEC_ID_MPEG4 ||
+-			         ffmpeg_id == CODEC_ID_MPEG1VIDEO ||
+-			         ffmpeg_id == CODEC_ID_MPEG2VIDEO ||
+-			         ffmpeg_id == CODEC_ID_H263P ))
++				(ffmpeg_id == AV_CODEC_ID_MPEG4 ||
++			         ffmpeg_id == AV_CODEC_ID_MPEG1VIDEO ||
++			         ffmpeg_id == AV_CODEC_ID_MPEG2VIDEO ||
++			         ffmpeg_id == AV_CODEC_ID_H263P ))
+ 		{
+ 			context->thread_count = cpus;
+ 		}
+@@ -224,16 +224,16 @@ static int get_chroma_factor(quicktime_f
+ {
+ 	switch(ffmpeg->decoder_context[current_field]->pix_fmt)
+ 	{
+-		case PIX_FMT_YUV420P:
++		case AV_PIX_FMT_YUV420P:
+ 			return 4;
+ 			break;
+-		case PIX_FMT_YUYV422:
++		case AV_PIX_FMT_YUYV422:
+ 			return 2;
+ 			break;
+-		case PIX_FMT_YUV422P:
++		case AV_PIX_FMT_YUV422P:
+ 			return 2;
+ 			break;
+-		case PIX_FMT_YUV410P:
++		case AV_PIX_FMT_YUV410P:
+ 			return 9;
+ 			break;
+ 		default:
+@@ -277,7 +277,7 @@ int quicktime_ffmpeg_decode(quicktime_ff
+ //printf("quicktime_ffmpeg_decode 1 %d\n", ffmpeg->last_frame[current_field]);
+ 
+ 		if(ffmpeg->last_frame[current_field] == -1 &&
+-			ffmpeg->ffmpeg_id != CODEC_ID_H264)
++			ffmpeg->ffmpeg_id != AV_CODEC_ID_H264)
+ 		{
+ 			int current_frame = vtrack->current_position;
+ // For certain codecs,
+@@ -328,7 +328,7 @@ int quicktime_ffmpeg_decode(quicktime_ff
+ // For MPEG-4, get another keyframe before first keyframe.
+ // The Sanyo tends to glitch with only 1 keyframe.
+ // Not enough memory.
+-			if( 0 /* frame1 > 0 && ffmpeg->ffmpeg_id == CODEC_ID_MPEG4 */)
++			if( 0 /* frame1 > 0 && ffmpeg->ffmpeg_id == AV_CODEC_ID_MPEG4 */)
+ 			{
+ 				do
+ 				{
+@@ -423,16 +423,16 @@ int quicktime_ffmpeg_decode(quicktime_ff
+ // Hopefully this setting will be left over if the cache was used.
+ 	switch(ffmpeg->decoder_context[current_field]->pix_fmt)
+ 	{
+-		case PIX_FMT_YUV420P:
++		case AV_PIX_FMT_YUV420P:
+ 			input_cmodel = BC_YUV420P;
+ 			break;
+-		case PIX_FMT_YUYV422:
++		case AV_PIX_FMT_YUYV422:
+ 			input_cmodel = BC_YUV422;
+ 			break;
+-		case PIX_FMT_YUV422P:
++		case AV_PIX_FMT_YUV422P:
+ 			input_cmodel = BC_YUV422P;
+ 			break;
+-		case PIX_FMT_YUV410P:
++		case AV_PIX_FMT_YUV410P:
+ 			input_cmodel = BC_YUV9P;
+ 			break;
+ 		default:
+Index: cinelerra-20140710/quicktime/qth264.c
+===================================================================
+--- cinelerra-20140710.orig/quicktime/qth264.c
++++ cinelerra-20140710/quicktime/qth264.c
+@@ -370,7 +370,7 @@ static int decode(quicktime_t *file, uns
+ 	if(!codec->decoder) codec->decoder = quicktime_new_ffmpeg(
+ 		file->cpus,
+ 		codec->total_fields,
+-		CODEC_ID_H264,
++		AV_CODEC_ID_H264,
+ 		width,
+ 		height,
+ 		stsd_table);
+Index: cinelerra-20140710/quicktime/wma.c
+===================================================================
+--- cinelerra-20140710.orig/quicktime/wma.c
++++ cinelerra-20140710/quicktime/wma.c
+@@ -193,15 +193,38 @@ printf("decode 2 %x %llx %llx\n", chunk_
+ 			codec->packet_buffer,
+ 			chunk_size);
+ #else
+-		bytes_decoded = AVCODEC_MAX_AUDIO_FRAME_SIZE;
+ 		AVPacket pkt;
+ 		av_init_packet( &pkt );
+ 		pkt.data = codec->packet_buffer;
+ 		pkt.size = chunk_size;
+-		result = avcodec_decode_audio3(codec->decoder_context,
+-			(int16_t*)(codec->work_buffer + codec->output_size * sample_size),
+-			&bytes_decoded,
++		AVFrame *frame = av_frame_alloc();
++		int got_frame = 0;
++
++		result = avcodec_decode_audio4(codec->decoder_context,
++			frame, &got_frame, 
+ 			&pkt);
++
++		if(result >= 0 && got_frame)
++		{
++			int ch, plane_size;
++			int planar    = av_sample_fmt_is_planar(codec->decoder_context->sample_fmt);
++			int data_size = av_samples_get_buffer_size(&plane_size, codec->decoder_context->channels,
++					frame->nb_samples,
++					codec->decoder_context->sample_fmt, 1);
++			memcpy(codec->work_buffer + codec->output_size * sample_size, frame->extended_data[0], plane_size);
++
++			if (planar && codec->decoder_context->channels > 1) {
++				uint8_t *out = ((uint8_t *)(codec->work_buffer + codec->output_size * sample_size)) + plane_size;
++				for (ch = 1; ch < codec->decoder_context->channels; ch++) {
++					memcpy(out, frame->extended_data[ch], plane_size);
++					out += plane_size;
++				}
++			}
++			bytes_decoded = data_size;
++		} else {
++			bytes_decoded = 0;
++		}
++		av_frame_free(&frame);
+ #endif
+ 
+ 		pthread_mutex_unlock(&ffmpeg_lock);
+@@ -298,7 +321,7 @@ void quicktime_init_codec_wmav1(quicktim
+ 	codec_base->title = "Win Media Audio 1";
+ 	codec_base->desc = "Win Media Audio 1";
+ 	codec_base->wav_id = 0x160;
+-	codec->ffmpeg_id = CODEC_ID_WMAV1;
++	codec->ffmpeg_id = AV_CODEC_ID_WMAV1;
+ }
+ 
+ 
+@@ -313,5 +336,5 @@ void quicktime_init_codec_wmav2(quicktim
+ 	codec_base->title = "Win Media Audio 2";
+ 	codec_base->desc = "Win Media Audio 2";
+ 	codec_base->wav_id = 0x161;
+-	codec->ffmpeg_id = CODEC_ID_WMAV2;
++	codec->ffmpeg_id = AV_CODEC_ID_WMAV2;
+ }
+Index: cinelerra-20140710/cinelerra/fileyuv.C
+===================================================================
+--- cinelerra-20140710.orig/cinelerra/fileyuv.C
++++ cinelerra-20140710/cinelerra/fileyuv.C
+@@ -196,7 +196,7 @@ int FileYUV::write_frames(VFrame ***laye
+ 				return stream->write_frame_raw(frame->get_data(), frame_size);
+ 
+ 			// decode and write an encoded frame
+-			if (FFMPEG::codec_id(incoming_asset->vcodec) != CODEC_ID_NONE) 
++			if (FFMPEG::codec_id(incoming_asset->vcodec) != AV_CODEC_ID_NONE) 
+ 			{
+ 				if (! ffmpeg) 
+ 				{
+@@ -306,7 +306,7 @@ int FileYUV::can_copy_from(Edit *edit, i
+ 	if (edit->asset->format == FILE_YUV) return 1;
+ 
+ 	// if FFMPEG can decode it, we'll accept it
+-	if (FFMPEG::codec_id(edit->asset->vcodec) != CODEC_ID_NONE) return 1;
++	if (FFMPEG::codec_id(edit->asset->vcodec) != AV_CODEC_ID_NONE) return 1;
+ 
+ 	incoming_asset = 0;
+ 
diff --git a/media-video/cinelerra/files/cinelerra-implicit_decls.patch b/media-video/cinelerra/files/cinelerra-implicit_decls.patch
new file mode 100644
index 000000000000..c806715e8c44
--- /dev/null
+++ b/media-video/cinelerra/files/cinelerra-implicit_decls.patch
@@ -0,0 +1,36 @@
+Index: CinelerraCV-2.3/quicktime/graphics.c
+===================================================================
+--- CinelerraCV-2.3.orig/quicktime/graphics.c
++++ CinelerraCV-2.3/quicktime/graphics.c
+@@ -1,5 +1,6 @@
+ #include "graphics.h"
+ 
++#include <stdlib.h>
+ #include <string.h>
+ 
+ /* Graphics acceleration routines */
+Index: CinelerraCV-2.3/quicktime/libmjpeg.c
+===================================================================
+--- CinelerraCV-2.3.orig/quicktime/libmjpeg.c
++++ CinelerraCV-2.3/quicktime/libmjpeg.c
+@@ -17,6 +17,8 @@
+  
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
++#include <strings.h>
+ #include "colormodels.h"
+ #include "libmjpeg.h"
+ 
+Index: CinelerraCV-2.3/quicktime/qtpng.c
+===================================================================
+--- CinelerraCV-2.3.orig/quicktime/qtpng.c
++++ CinelerraCV-2.3/quicktime/qtpng.c
+@@ -1,6 +1,7 @@
+ #include "colormodels.h"
+ #include "funcprotos.h"
+ #include <png.h>
++#include <string.h>
+ #include "quicktime.h"
+ #include "qtpng.h"
+ 
diff --git a/media-video/cinelerra/files/cinelerra-includes.patch b/media-video/cinelerra/files/cinelerra-includes.patch
new file mode 100644
index 000000000000..45ac200310da
--- /dev/null
+++ b/media-video/cinelerra/files/cinelerra-includes.patch
@@ -0,0 +1,12 @@
+Index: CinelerraCV-2.3/cinelerra/audiodevice.C
+===================================================================
+--- CinelerraCV-2.3.orig/cinelerra/audiodevice.C
++++ CinelerraCV-2.3/cinelerra/audiodevice.C
+@@ -19,6 +19,7 @@
+  * 
+  */
+ 
++#include <cassert>
+ #ifdef HAVE_FIREWIRE
+ #include "audio1394.h"
+ #endif
diff --git a/media-video/cinelerra/files/cinelerra-libav9.patch b/media-video/cinelerra/files/cinelerra-libav9.patch
new file mode 100644
index 000000000000..47a4d6f231e1
--- /dev/null
+++ b/media-video/cinelerra/files/cinelerra-libav9.patch
@@ -0,0 +1,93 @@
+diff -urN cinelerra-20120707/cinelerra/ffmpeg.C /tmp/cinelerra-20120707/cinelerra/ffmpeg.C
+--- cinelerra-20120707/cinelerra/ffmpeg.C	2013-06-22 18:07:43.632978553 +0200
++++ /tmp/cinelerra-20120707/cinelerra/ffmpeg.C	2013-06-22 18:07:21.668979334 +0200
+@@ -32,9 +32,9 @@
+ 		return 1;
+ 	}
+ 
+-	context = avcodec_alloc_context();
++	context = avcodec_alloc_context3(NULL);
+ 
+-	if (avcodec_open(context, codec)) {
++	if (avcodec_open2(context, codec, NULL)) {
+ 		printf("FFMPEG::init avcodec_open() failed\n");
+ 	}
+
+diff -urN cinelerra-20120707/cinelerra/fileac3.C /tmp/cinelerra-20120707/cinelerra/fileac3.C
+--- cinelerra-20120707/cinelerra/fileac3.C	2013-06-22 18:07:43.632978553 +0200
++++ /tmp/cinelerra-20120707/cinelerra/fileac3.C	2013-06-22 18:07:21.668979334 +0200
+@@ -91,11 +91,11 @@
+ 			eprintf("codec not found.\n");
+ 			return 1;
+ 		}
+-		codec_context = avcodec_alloc_context();
++		codec_context = avcodec_alloc_context3(NULL);
+ 		codec_context->bit_rate = asset->ac3_bitrate * 1000;
+ 		codec_context->sample_rate = asset->sample_rate;
+ 		codec_context->channels = asset->channels;
+-		if(avcodec_open(codec_context, codec))
++		if(avcodec_open2(codec_context, codec, NULL))
+ 		{
+ 			eprintf("failed to open codec.\n");
+ 			return 1;
+diff -urN cinelerra-20120707/quicktime/mpeg4.c /tmp/cinelerra-20120707/quicktime/mpeg4.c
+--- cinelerra-20120707/quicktime/mpeg4.c	2013-06-22 18:07:43.633978553 +0200
++++ /tmp/cinelerra-20120707/quicktime/mpeg4.c	2013-06-22 18:07:21.690979334 +0200
+@@ -642,7 +642,7 @@
+ 				return 1;
+ 			}
+ 
+-			codec->encoder_context[current_field] = avcodec_alloc_context();
++			codec->encoder_context[current_field] = avcodec_alloc_context3(NULL);
+ 			AVCodecContext *context = codec->encoder_context[current_field];
+ 
+ 			context->width = width_i;
+@@ -676,8 +676,6 @@
+ 			context->error_resilience = FF_ER_CAREFUL;
+ #elif LIBAVCODEC_VERSION_INT < ((54<<16)+(0<<8)+0)
+ 			context->error_recognition = FF_ER_CAREFUL;
+-#else
+-			context->err_recognition |= AV_EF_CAREFUL;
+ #endif
+ 			context->error_concealment = 3;
+ 			context->frame_skip_cmp = FF_CMP_DCTMAX;
+diff -urN cinelerra-20120707/quicktime/qtffmpeg.c /tmp/cinelerra-20120707/quicktime/qtffmpeg.c
+--- cinelerra-20120707/quicktime/qtffmpeg.c	2013-06-22 18:07:43.633978553 +0200
++++ /tmp/cinelerra-20120707/quicktime/qtffmpeg.c	2013-06-22 18:07:21.690979334 +0200
+@@ -67,7 +67,7 @@
+ 			return 0;
+ 		}
+ 
+-		AVCodecContext *context = ptr->decoder_context[i] = avcodec_alloc_context();
++		AVCodecContext *context = ptr->decoder_context[i] = avcodec_alloc_context3(NULL);
+ 		static char fake_data[] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+ 		context->width = ptr->width_i;
+ 		context->height = ptr->height_i;
+@@ -93,8 +93,8 @@
+ 		{
+ 			context->thread_count = cpus;
+ 		}
+-		if(avcodec_open(context, 
+-			ptr->decoder[i]) < 0)
++		if(avcodec_open2(context, 
++			ptr->decoder[i], NULL) < 0)
+ 		{
+ 			printf("quicktime_new_ffmpeg: avcodec_open failed.\n");
+ 			quicktime_delete_ffmpeg(ptr);
+diff -urN cinelerra-20120707/quicktime/wma.c /tmp/cinelerra-20120707/quicktime/wma.c
+--- cinelerra-20120707/quicktime/wma.c	2013-06-22 18:07:43.634978553 +0200
++++ /tmp/cinelerra-20120707/quicktime/wma.c	2013-06-22 18:07:21.690979334 +0200
+@@ -76,10 +76,10 @@
+ 			printf("init_decode: avcodec_find_decoder returned NULL.\n");
+ 			return 1;
+ 		}
+-		codec->decoder_context = avcodec_alloc_context();
++		codec->decoder_context = avcodec_alloc_context3(NULL);
+ 		codec->decoder_context->sample_rate = trak->mdia.minf.stbl.stsd.table[0].sample_rate;
+ 		codec->decoder_context->channels = track_map->channels;
+-		if(avcodec_open(codec->decoder_context, codec->decoder) < 0)
++		if(avcodec_open2(codec->decoder_context, codec->decoder, NULL) < 0)
+ 		{
+ 			printf("init_decode: avcodec_open failed.\n");
+ 			return 1;
+
diff --git a/media-video/cinelerra/files/cinelerra-pngtoh.patch b/media-video/cinelerra/files/cinelerra-pngtoh.patch
new file mode 100644
index 000000000000..81a8432b8729
--- /dev/null
+++ b/media-video/cinelerra/files/cinelerra-pngtoh.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/show_bug.cgi?id=526118
+http://bugs.cinelerra-cv.org/ticket/1005
+
+Author: Bernd Feige 
+
+--- guicast/pngtoh.c	2015-01-29 13:41:01 +0000
++++ guicast/pngtoh.c	2015-01-29 13:41:07 +0000
+@@ -148,4 +148,6 @@
+ 		fprintf(out, "};\n\n#endif\n");
+ 		fclose(out);
+ 	}
++
++	return 0;
+ }
+
diff --git a/media-video/cinelerra/files/cinelerra-putbits-gcc52.patch b/media-video/cinelerra/files/cinelerra-putbits-gcc52.patch
new file mode 100644
index 000000000000..646db9f25f05
--- /dev/null
+++ b/media-video/cinelerra/files/cinelerra-putbits-gcc52.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/show_bug.cgi?id=562208
+
+Index: cinelerra-20140710/toolame-02l/bitstream.c
+===================================================================
+--- cinelerra-20140710.orig/toolame-02l/bitstream.c
++++ cinelerra-20140710/toolame-02l/bitstream.c
+@@ -198,9 +198,6 @@ void put1bit (Bit_stream_struc * bs, int
+ }
+ 
+ /*write N bits into the bit stream */
+-#if !defined(__clang__)
+-INLINE
+-#endif /* not __clang__ */
+ void putbits (Bit_stream_struc * bs, unsigned int val, int N)
+ {
+   register int j = N;
+Index: cinelerra-20140710/toolame-02l/bitstream.h
+===================================================================
+--- cinelerra-20140710.orig/toolame-02l/bitstream.h
++++ cinelerra-20140710/toolame-02l/bitstream.h
+@@ -9,7 +9,7 @@ unsigned int get1bit (Bit_stream_struc *
+ void put1bit (Bit_stream_struc *, int);
+ unsigned long look_ahead (Bit_stream_struc *, int);
+ unsigned long getbits (Bit_stream_struc *, int);
+-INLINE void putbits (Bit_stream_struc *, unsigned int, int);
++void putbits (Bit_stream_struc *, unsigned int, int);
+ void byte_ali_putbits (Bit_stream_struc *, unsigned int, int);
+ unsigned long byte_ali_getbits (Bit_stream_struc *, int);
+ unsigned long sstell (Bit_stream_struc *);
diff --git a/media-video/cinelerra/metadata.xml b/media-video/cinelerra/metadata.xml
new file mode 100644
index 000000000000..17f11a20c014
--- /dev/null
+++ b/media-video/cinelerra/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-video/clive/Manifest b/media-video/clive/Manifest
new file mode 100644
index 000000000000..6e79bb95863d
--- /dev/null
+++ b/media-video/clive/Manifest
@@ -0,0 +1,5 @@
+DIST clive-2.3.0.1.tar.gz 43551 SHA256 69b5d6014bdb097395b2d2ac945ebb5f6a73aff78d48fd67f533ddf33a615f33 SHA512 7426d6e8f19c358b30a7d33257d7ee536802eb35442d3cac68f6742613696ab1b280457a65d980237b53b692c5cf311725e46a5d8c27c7f2200172d050337cfc WHIRLPOOL 2e0a03dd700932eaf996ef5eea6059fdca197818ebc886fc4a1e1a6a846a1335334397115aed3c616005882e378ddbbcf3802423494f306360087dd74fc3cf5d
+EBUILD clive-2.3.0.1.ebuild 1633 SHA256 28615795f75ab28e3b2b4e1b328a92f7a7fa8b4857d527e694d092933d5007c7 SHA512 f68d2df557da34ef83ca89d661e3cb88b9cd5faa17b765ea8f7282f78a7135d2d608a39cc248e2a1bf41f3db1fa620ea8191aba5217ee96ee2b39cc8357e2aaa WHIRLPOOL 5115b862966e599c48ac8d17d527d110f97be4b81556366855495cf60cd206f24b889a7bd622dd7c6572176092761f043e9cb541372943ed9b104389575b551d
+MISC ChangeLog 2428 SHA256 02ee9612abce1acc5fe1f46affe47b4b2c5a46aa8e5003183608e8b5842f6f5f SHA512 5dfca00cc09bb5056c51ba18b74dc172a1d38296f6ef06ac0f2f450ccc636fdad30e1279ba68a5f8f2f69ab58f5e308845d733f971ccbdb717b6e7f83523714d WHIRLPOOL 197566370fc067427d6953d0b7694fb835bf740d1acf3a25463b6fcd0e50db86da9d7c510b2d16d205be0beb178af15eb2823fe26acb1f31f2a0a8fb51d06a03
+MISC ChangeLog-2015 9386 SHA256 3e4cdeb300cebf17fc2a1dd59116378ecc3706269cfeba3c3ecfc24b8945870f SHA512 efbcc01bdcb5f5562cdf70729134fc01b4adbcb7615b319335606786a437790bb92cbf7aeef703cb614461493e5335a266c5721533b1b641e71109512ead15b9 WHIRLPOOL c4afb007eff7a172a78618085fdba50d2a897f060b58163db560c4426e59fd17f6dcf37e599fce6ee047e0cd332a08c41eef0ea1eeee0cd270cf39ad9a244889
+MISC metadata.xml 699 SHA256 a22061f05a7875f98ac947ca2cd02e904ee99733f1f55f44cfc2d2603b00aa7c SHA512 c58b34f4586809b4dc9fc151cf75a066a95b6872a6487276cefa5c71ca5a8c6c043e2b11de07240f095fe025a6a042e5c9c52555f6ce841a8b12cb2dd6e75ada WHIRLPOOL 0c19f4b57a570b143f217029862adbf8873017719d9ee125d4431430837d84d016dea832e98aea956741f70e11943c1d5656e14703d867d31f9e94178cfc00f9
diff --git a/media-video/clive/clive-2.3.0.1.ebuild b/media-video/clive/clive-2.3.0.1.ebuild
new file mode 100644
index 000000000000..d5d07324ff83
--- /dev/null
+++ b/media-video/clive/clive-2.3.0.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit perl-app
+
+DESCRIPTION="Command line tool for extracting videos from various websites"
+HOMEPAGE="http://clive.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PV:0:3}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+IUSE="clipboard pager password test"
+
+RDEPEND=">=dev-perl/BerkeleyDB-0.34
+	>=dev-perl/Config-Tiny-2.12
+	>=virtual/perl-Digest-SHA-5.47
+	>=dev-perl/HTML-TokeParser-Simple-2.37
+	>=dev-perl/Class-Singleton-1.4
+	>=dev-perl/WWW-Curl-4.05
+	>=dev-perl/XML-Simple-2.18
+	>=dev-perl/Getopt-ArgvFile-1.11
+	dev-perl/JSON-XS
+	dev-perl/URI
+	virtual/perl-Getopt-Long
+	virtual/perl-File-Spec
+	clipboard? ( >=dev-perl/Clipboard-0.09 )
+	pager? ( >=dev-perl/IO-Pager-0.05 )
+	password? ( >=dev-perl/Expect-1.21 )
+	media-libs/quvi
+	|| ( net-misc/wget net-misc/curl )"
+DEPEND="test? ( dev-perl/Test-Pod ${RDEPEND} )"
+
+SRC_TEST=do
+mydoc="NEWS"
+
+src_install() {
+	perl-module_src_install
+	dodir /etc/clive
+	cat <<-EOF > "${ED}"/etc/clive/config || die
+	--quvi "quvi %u"
+	--get-with "if type -P wget >/dev/null 2>&1; then wget -c -O %f %u; else curl -L -C - -o %f %u; fi"
+	--filename-format "%t.%s"
+	EOF
+}
+
+src_test() {
+	if [ -z "${I_WANT_CLIVE_HOSTS_TESTS}" ] ; then
+		elog "If you wish to run the full testsuite of ${PN}"
+		elog "Please set the variable 'I_WANT_CLIVE_HOSTS_TESTS' variable"
+		elog "Note that the tests try to download some videos from various websites"
+		elog "and thus may randomly fail depending on the site's status."
+		export NO_INTERNET=1
+	fi
+	perl-module_src_test
+}
diff --git a/media-video/clive/metadata.xml b/media-video/clive/metadata.xml
new file mode 100644
index 000000000000..666bdf9cfec8
--- /dev/null
+++ b/media-video/clive/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">Command line tool for extracting videos from Youtube, Google Video,
+		Dailymotion, Guba (free) and Stage6  websites</longdescription>
+	<use>
+		<flag name="clipboard">Support reading from X clipboard</flag>
+		<flag name="pager">Support pager!?</flag>
+		<flag name="password">Support password controlled sites</flag>
+	</use>
+	<upstream>
+		<remote-id type="google-code">clive</remote-id>
+		<remote-id type="sourceforge">clive</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/cpdvd/Manifest b/media-video/cpdvd/Manifest
new file mode 100644
index 000000000000..ca2e9111725f
--- /dev/null
+++ b/media-video/cpdvd/Manifest
@@ -0,0 +1,5 @@
+DIST cpdvd-1.10.gz 3512 SHA256 a6a012305c903a033fd9e35b1052cf0584ef22f57e9bf7493bdd2dea67c96c49 SHA512 795f3f5a43a4ae9ada4a60b2bb6fcdb501d5218c8886d34548b4c8da0af51db7701fc81ae336f34d1b997f377040a5af52773e40939394942de3c2edca1e2d5b WHIRLPOOL 305514a0eda6da0f35759e3500f07b982fafcc7ce0a4de479c6e666d55181e9e160fa744633449706bcd9c5ac779bff0f27bcba7dac0b5220144d7d4032ee65a
+EBUILD cpdvd-1.10-r1.ebuild 514 SHA256 5ccb2a327705d2979132f24afc1690ce2be6525e488d98bde980484279b58b6f SHA512 f484447649e5731dafef3230bd79ae6e8656617c2090380f0bc5078fb17a3e2d1a32f8cb45f7d8e6c65d8d40613f4e6b20dbf0d090579e47a1bc7a97ced793c4 WHIRLPOOL 6d808b709069a8686994155f3b4be4e3e9f7f8f9d1509ef7b2c530c25a1cdc49d7c93ce6e61d14d4c647ece5b6daf3ddd0a5d43e05f407db987c09e9f394eefe
+MISC ChangeLog 2428 SHA256 892c9457e30a7cd867167eedd53ce6f36dba22b3567574538310704ae81fdc6e SHA512 25cc74b1fa86e4ead6576a27ffcf35479561ac53af66e5f714023d95b51ec32308ae7bf487eafd938b61e1be613fb316cb9087dfaa62e54eeba7cfaf114bb1ed WHIRLPOOL 79d233872139653b4e9a0a51592036447b72f465f6aeefdec31203bbfbe15a15c2cde6caa816a029d656c0c3397f5fb914f4c835296f9040f06dc60df3593abb
+MISC ChangeLog-2015 1947 SHA256 60fcd55f7b31385707b27dedac55838fe612083fe8949a571cd7626c39fe90ac SHA512 f0708df304236b4d1eae540757491471d9ef8e1dc031ebe0157b75000a79d82c19a9a13739580f36a492c0ef0a334187227051e37dbee068567c339d9c06cf77 WHIRLPOOL f18e6ce771d723656d7dd2e119cd171882318911e3fc1f545521e31692761fa0f68bf8f789198b6e9cc19b6ed9f023bbbedcd76699ea0896e98589d7a8fa254f
+MISC metadata.xml 227 SHA256 01fa256b46c60492ca90de4799686bcfdc89c3d2657c020fb5a6035deee6af24 SHA512 d39fc0676c06bf09884fa817e0d5dc386a536d5626a9c2cf34ddb8b7e29d612ecb2c617214788ffe729c5118c632c119e03ce6d38f17114c48c090c82a2ec2e5 WHIRLPOOL 9420098faad521e4aa31e2458613159422d2548449cdaf06be90bdbcd53435f73e8a9e343718368a0beadb058abae8803ffa1425ef62859f1b605c2e0d8344e7
diff --git a/media-video/cpdvd/cpdvd-1.10-r1.ebuild b/media-video/cpdvd/cpdvd-1.10-r1.ebuild
new file mode 100644
index 000000000000..70b501e5325c
--- /dev/null
+++ b/media-video/cpdvd/cpdvd-1.10-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+IUSE=""
+
+S="${WORKDIR}"
+
+DESCRIPTION="transfer a DVD title to your harddisk with ease on Linux"
+HOMEPAGE="http://www.lallafa.de/bp/cpdvd.html"
+SRC_URI="http://www.lallafa.de/bp/files/${P}.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+DEPEND=""
+
+RDEPEND=">=media-video/transcode-0.6.2[dvd]
+	>=dev-lang/perl-5.8.0-r12
+	>=media-video/cpvts-1.2"
+
+src_install () {
+	newbin ${P} ${PN} || die
+}
diff --git a/media-video/cpdvd/metadata.xml b/media-video/cpdvd/metadata.xml
new file mode 100644
index 000000000000..106575f01e53
--- /dev/null
+++ b/media-video/cpdvd/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>media-video@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/media-video/cpvts/Manifest b/media-video/cpvts/Manifest
new file mode 100644
index 000000000000..6963334ae79e
--- /dev/null
+++ b/media-video/cpvts/Manifest
@@ -0,0 +1,6 @@
+AUX cpvts-1.2-dvdread.patch 315 SHA256 4cb1a8f7d17c3005add9592bfae577f5b6903e36cc95be25ff7fd9a4ef797fba SHA512 418166b513ddd766b125bf20ff0381c2915497b9946c00942f005ef96f95418eb524f0e9316b324b4635dbeaf03d6a8e55a0f77657748f5f002c696119d4dc00 WHIRLPOOL 647874e22b9b2e2dbd494b80d3ce644a0f55faeb6a59e8ffe0ebd63a3d29dacad0ac0761e6bee96fced01171a6d0ccd160e8bdaefd40c1a85511ca10a7307093
+DIST cpvts-1.2.tgz 4200 SHA256 cfaeb890e5ec6bd17423af8aed781410fcc4a1aebc4678598b109bb00573ee6b SHA512 59314f2b49e7f82d2994aa6725fcc8431ffb72aa2ae83d67cbef008d850890a61322756c1d644e28760e332bcbe17ce9ad8b05c10fe9f30fe997933281e2f06f WHIRLPOOL e728386ce7a7527da27867245e43d6f69fbac42ac6b6f548656ed60878ccea7eacbb345495603fd97ba8b1fb4bfcb637b3929d07cd0c2fff2e99288f1398b5b9
+EBUILD cpvts-1.2.ebuild 731 SHA256 7c95b3983d27877b149c11e7a9b0ec8d9d8b37380d36a66939dea2c7d8f88036 SHA512 0ac5ee87c516906cfeb2430fbd88d065deee3f93a5b48c8c1e453cb3bf80a6310e36d4e1398a285100c5a622807ba5879e3c757ef8c74e955477ea9966bc6d49 WHIRLPOOL 03f32a983ab2557810563ceb88d8900305e31843430a79a81408deccc2f1023bb5a51ef8d6c1b461b0ec4a5161ee2b1653ce01d4b88df2fc1f1aaac5af5ad583
+MISC ChangeLog 2452 SHA256 d47c2bcb458c0d964902adcd172671c1566855ee219d73eee3aae2a8877ab4cf SHA512 45b4f9a6e0783c8c92dfd275bfd89d5a2cb4d9047425b7bdbb9acce4c60bf15aa26d6fcbabda031215379b7d52119591df8046abeb7687e8828782abd5731343 WHIRLPOOL beef91cb00723147cccbe36487a24e91917e2ed912784afa642b53788e468ad2074c69af6e9d7b1e12abd61e29131206f8f648a5fcddebd882b396f09d5092f4
+MISC ChangeLog-2015 1265 SHA256 44980eb629ce1ef2b2e5b876308d4d726bd02d4dcd576b67d11144ca156db1ac SHA512 8d99c8b570496503276b6f29b154bb5cb7b6cdf184181535c2a7dafcc0dcfd0d6072b9e40d0b723873b0dfb073cb9c64495c3338e6a8770b89f9e6a1e3334e6b WHIRLPOOL f3efc1a48e2126d426bb8075ec22b864ec474ef25fb1e0f51a4c3055af235a4c50b0b587e0df7aba7fb3f761560fcbe577e3b916e511e282c9c7a4fbfc9883f0
+MISC metadata.xml 227 SHA256 01fa256b46c60492ca90de4799686bcfdc89c3d2657c020fb5a6035deee6af24 SHA512 d39fc0676c06bf09884fa817e0d5dc386a536d5626a9c2cf34ddb8b7e29d612ecb2c617214788ffe729c5118c632c119e03ce6d38f17114c48c090c82a2ec2e5 WHIRLPOOL 9420098faad521e4aa31e2458613159422d2548449cdaf06be90bdbcd53435f73e8a9e343718368a0beadb058abae8803ffa1425ef62859f1b605c2e0d8344e7
diff --git a/media-video/cpvts/cpvts-1.2.ebuild b/media-video/cpvts/cpvts-1.2.ebuild
new file mode 100644
index 000000000000..2f7cccd6d68c
--- /dev/null
+++ b/media-video/cpvts/cpvts-1.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils toolchain-funcs
+
+IUSE=""
+
+MY_S="${WORKDIR}/${PN}"
+
+DESCRIPTION="raw copy title sets from a DVD to your harddisc"
+SRC_URI="http://www.lallafa.de/bp/files/${P}.tgz"
+HOMEPAGE="http://www.lallafa.de/bp/cpvts.html"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc x86"
+
+DEPEND="media-libs/libdvdread"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-dvdread.patch"
+}
+
+echodo() {
+	echo "$@"
+	"$@" || die "failed"
+}
+
+src_compile () {
+	cd ${MY_S} || die
+
+	echodo $(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,-rpath,/usr/lib -o cpvts \
+		cpvts.c -lm -ldvdread
+}
+
+src_install () {
+	dobin ${MY_S}/${PN} || die
+}
diff --git a/media-video/cpvts/files/cpvts-1.2-dvdread.patch b/media-video/cpvts/files/cpvts-1.2-dvdread.patch
new file mode 100644
index 000000000000..50bc92078b36
--- /dev/null
+++ b/media-video/cpvts/files/cpvts-1.2-dvdread.patch
@@ -0,0 +1,11 @@
+diff -Naur cpvts-orig/cpvts.c cpvts/cpvts.c
+--- cpvts-orig/cpvts.c	2006-03-31 20:47:16.000000000 -0600
++++ cpvts/cpvts.c	2006-03-31 20:47:40.000000000 -0600
+@@ -16,6 +16,7 @@
+ #include <ctype.h>
+ #include <string.h>
+ #include <math.h>
++#include <stdint.h>
+ 
+ /* libdvdread stuff */
+ #include <dvdread/dvd_reader.h>
diff --git a/media-video/cpvts/metadata.xml b/media-video/cpvts/metadata.xml
new file mode 100644
index 000000000000..106575f01e53
--- /dev/null
+++ b/media-video/cpvts/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>media-video@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/media-video/dcpomatic/Manifest b/media-video/dcpomatic/Manifest
new file mode 100644
index 000000000000..dc0892f7c1d4
--- /dev/null
+++ b/media-video/dcpomatic/Manifest
@@ -0,0 +1,12 @@
+AUX dcpomatic-2.10.2-imagemagick-7.patch 501 SHA256 49354dd9c176e8db61f867ba8a258e70e577436cf7653c2cb8e0786ce75b5895 SHA512 77631bd3123f917a9227a56877492dd9b789aed3de428d3a37df927a43f8a9abd55c4151c36a761e17ab2214ddb9ca949b7f833e57fb488279a0ef0b5789a5a2 WHIRLPOOL 17a711a715ede30a9569cf918f2fd158e5e5d6d8359748408a881965bfd39dd94ce8566976a85693c3bcc122ca19b93e8edb2c56563613229359d6037601e0c2
+AUX dcpomatic-2.10.2-respect-cxxflags.patch 485 SHA256 73ffdf33484032b3ba7d691e55b7f65a352d785bf983137f22b74ff5f502fe44 SHA512 2766294bb2168af647086e1a905f1114fd41e8be84f1577ef3ca3e3e831def8347e1d7ec22c0e432c5e3697e76f63d55480b72422921f6a4d39d205061274625 WHIRLPOOL 6ab8987c449a97db8cf3095e80a8ae1c2476b81b3a13be4705c6965c2411c91333d54532ba6286e8230f9397086ead6f46178faa604eb91a06b24241b948cd0a
+AUX dcpomatic-2.8.0-desktop.patch 1081 SHA256 d52898365262d425a3ed35e1e88d3d43fff9e880a2686378e5ecc417ae13b518 SHA512 f7fcd1e038dda2b056a03462d601180e6105a89dee0ff6c143958678622a14fb307e375a6a645c12acbe8041a106234af3dc462bbcbdd74a35ce44159ba0b651 WHIRLPOOL 36cecae44fcf5ad08553277a2695b64dd2aaf88b951e03c707d2109c54c95d1d68edd50f977a922067787b5f98860073eefe9a0d59ca9ede0e65fd584ec29b45
+AUX dcpomatic-2.8.0-no-ldconfig.patch 241 SHA256 2aa40a8f795311a91616958eb6dacae05be610c11df959b761db5c95c6a2ffd8 SHA512 6fac6ec3cacbf40a1f86bd9a5d58a847a1b7bac63acd52a10c1c0cb334e40693d945dfd7e2593d8fde27a853006ac5021bda09208d19f71d613091ca4a7ace01 WHIRLPOOL 15760b9a9917d6677bc4e44050afd97c377cc72c9c03dfb4e5fdffc0f47cad11fc4fc33cf277aa7866cfc3bf30990251b98e63f397b1ac8ffc5e071ebbd152ff
+AUX dcpomatic-2.8.0-wxGTK3.patch 506 SHA256 86d12cc85872ce292f1846d2fa38f8d51167e50bc1ceb7faf4c2ec5a065dd351 SHA512 127694c416d4f0d50e4e793c2b4f5d4f4a19c92bf10f56602247e1aeefe7ce638745a8434723d8973e5c6a6f8bc9af5bca1a1d7113c459c6fd59f20f1b4d94d9 WHIRLPOOL 4a24b6176b0acde864ca2cabab997a0768d55dbd191ea24fdeb550ee71e530ada148758d5e5be3ca96d45d9b288f888e49556d06138d941bdeeb17fa329ee47a
+DIST dcpomatic-2.10.2.tar.bz2 37503820 SHA256 18182dda94de584299e660db3e232be8d98be5aa99255561154eb2048f3c2211 SHA512 dc4fff96db31ee7645cdc9aac59b37a8dc37f2d77287c41bd4da4df074802a518d4b9c0e5143272d50d2dfee03d46b4ac761c0423b51b327185aae0510c0deb5 WHIRLPOOL ed8b0d780e5ea50eae0bcce6ad1f2a087f9b8d703516fb3e1abe246af79bbeb92a18552642bb4517e5f2604856308ffe39bf47891e0dc59cac357c9866e2f52a
+DIST dcpomatic-2.10.5.tar.bz2 37500917 SHA256 bb3ecbd2cce651d4bce317c1d21d5d4f417163dd0192afa6cd5b06fa55831b2c SHA512 0cce80bfb7b6cc830ff9935a16b0610a584628e8f45ad36401c6da6c13963e90a63d0213fff9b8277074b12f522bbe7286caf4cad9beceea77e05977e726ecf4 WHIRLPOOL 53b38a6c73b4562f8f6717005fb3769db2b186a030840bc5c2986aea530b58f280b89ff8cb0f7723ae0e0674837303babc18ebf7b477980babfd61dcfe22a744
+DIST dcpomatic-2.11.7.tar.bz2 48225986 SHA256 948460bfae5d0d3a1e730b63dc98b0fb780019ff08492efebb579fa553498dbb SHA512 06421edc41c32986add3266cf6674eb44f24d4899a391d4ec354840180a83531531bb965cad86b804aa054589a4cb7587988b334882610b5fc699ae6ca0484c3 WHIRLPOOL 57727d2931489d5942ab72a1dacddde2b02627f9e47ee0649b87e95e2e2c3258cb54f0c492dc111c072751c6045606a43e57d1b9f6902fe48bc563f8a3809c3b
+EBUILD dcpomatic-2.10.2.ebuild 2497 SHA256 6770443a5aa9b0d01df6ffe72120ff3de29a23e3f60c8783ebbd49b7017772bd SHA512 ce970d3f985268b112e1e093c4600c76877b68d019f4c0b6ffd5094404ad945a9ce797c045b0efcd18d2cb4914bc68dcac0515c0874eb4e247b5254eafb10ee5 WHIRLPOOL 6ea35c8286b17072de6ba672f3b84ec9d22fef59f942847966b6e7a14cfe4a669b9a49d36ca7afd17babe6a35f9cf15c2051705c51b6ef2d61fdab0043b91e3a
+EBUILD dcpomatic-2.10.5.ebuild 2497 SHA256 6770443a5aa9b0d01df6ffe72120ff3de29a23e3f60c8783ebbd49b7017772bd SHA512 ce970d3f985268b112e1e093c4600c76877b68d019f4c0b6ffd5094404ad945a9ce797c045b0efcd18d2cb4914bc68dcac0515c0874eb4e247b5254eafb10ee5 WHIRLPOOL 6ea35c8286b17072de6ba672f3b84ec9d22fef59f942847966b6e7a14cfe4a669b9a49d36ca7afd17babe6a35f9cf15c2051705c51b6ef2d61fdab0043b91e3a
+EBUILD dcpomatic-2.11.7.ebuild 2819 SHA256 ee00592249f34db3dee8eb47cbda21dcb9df7c16a52ffbb7e3474055ead04e42 SHA512 f827e80f97af608acf3d62ae6c0f4f731059a83cae6a36d1626030f53327939c6634caf95ef6716e5efd8898c3a3c963e4da0b02ce37815d6754440c8cfa0d66 WHIRLPOOL 74273f62839cdbe2613d2a8f58feaeb93dfe3db5b0c3fdc3d29eac7916f3c184b6f19d3067e218bcd4eb728b2e5ac58c3dcef07255b36b84f0e349b976e4975d
+MISC metadata.xml 896 SHA256 67fdbfa5e717e21d9351226048a7867273ddbd71feb9e5c80d89761349060214 SHA512 e696fdf207bf01e89643304f33c45d0b2b97aa804181b49934ea068131fe0104e19a63fad91d65d929ef8b16b2ea7565541e0ac1121f70a9f005061bdb613295 WHIRLPOOL ba300bd02a976a6d8365a96dfc2de20ef895b2f8679fa398a516cb76978c5f0e407459c59585178dbed5d2ac2f64312871da108cfc0622afffd7b8e589adf8f2
diff --git a/media-video/dcpomatic/dcpomatic-2.10.2.ebuild b/media-video/dcpomatic/dcpomatic-2.10.2.ebuild
new file mode 100644
index 000000000000..9cd6b2365fe3
--- /dev/null
+++ b/media-video/dcpomatic/dcpomatic-2.10.2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 )
+PYTHON_REQ_USE="threads(+)"
+inherit python-any-r1 waf-utils wxwidgets
+
+DESCRIPTION="create Digital Cinema Packages (DCPs) from videos, images and sound files"
+HOMEPAGE="http://dcpomatic.com/"
+SRC_URI="http://${PN}.com/downloads/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+gtk"
+
+RDEPEND="dev-cpp/cairomm
+	dev-cpp/glibmm:2
+	dev-cpp/libxmlpp:2.6
+	dev-cpp/pangomm:1.4
+	dev-libs/boost
+	dev-libs/glib:2
+	dev-libs/icu
+	dev-libs/libcxml
+	dev-libs/libzip
+	dev-libs/openssl:0
+	|| ( media-gfx/graphicsmagick media-gfx/imagemagick )
+	media-libs/fontconfig:1.0
+	>=media-libs/libdcp-1.4.1:1.0
+	media-libs/libsamplerate
+	media-libs/libsndfile
+	>=media-libs/libsub-1.2.1:1.0
+	>=media-video/ffmpeg-3:=
+	net-libs/libssh
+	net-misc/curl
+	gtk? ( x11-libs/gtk+:2
+		x11-libs/wxGTK:3.0 )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-util/waf
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.8.0-wxGTK3.patch
+	"${FILESDIR}"/${PN}-2.8.0-no-ldconfig.patch
+	"${FILESDIR}"/${PN}-2.8.0-desktop.patch
+	"${FILESDIR}"/${PN}-2.10.2-respect-cxxflags.patch
+	)
+
+src_prepare() {
+	rm -v waf
+	export WAF_BINARY=${EROOT}usr/bin/waf
+	if [ -z "${PYTHONPATH}" ] ; then
+		export PYTHONPATH="${S}"
+	else
+		export PYTHONPATH="${S}:${PYTHONPATH}"
+	fi
+
+	ewarn "Some tests failing due missing files/certs are disabled."
+	sed \
+		-e '/4k_test.cc/d' \
+		-e '/audio_analysis_test.cc/d' \
+		-e '/audio_decoder_test.cc/d' \
+		-e '/audio_processor_test.cc/d' \
+		-e '/black_fill_test.cc/d' \
+		-e '/client_server_test.cc/d' \
+		-e '/dcp_subtitle_test.cc/d' \
+		-e '/ffmpeg_decoder_sequential_test.cc/d' \
+		-e '/file_naming_test.cc/d' \
+		-e '/import_dcp_test.cc/d' \
+		-e '/interrupt_encoder_test.cc/d' \
+		-e '/j2k_bandwidth_test.cc/d' \
+		-e '/recover_test.cc/d' \
+		-e '/reels_test.cc/d' \
+		-e '/render_subtitles_test.cc/d' \
+		-e '/repeat_frame_test.cc/d' \
+		-e '/scaling_test.cc/d' \
+		-e '/skip_frame_test.cc/d' \
+		-e '/srt_subtitle_test.cc/d' \
+		-e '/ssa_subtitle_test.cc/d' \
+		-e '/vf_test.cc/d' \
+		-e '/video_mxf_content_test.cc/d' \
+        -e '/film_metadata_test.cc/d' \
+		-i test/wscript || die
+
+	if has_version ">media-gfx/imagemagick-7" ; then
+		epatch "${FILESDIR}"/${PN}-2.10.2-imagemagick-7.patch
+	fi
+
+	default
+}
+
+src_configure() {
+	waf-utils_src_configure $(usex gtk "" "--disable-gui")
+}
+
+src_test() {
+	./run/tests || die
+}
diff --git a/media-video/dcpomatic/dcpomatic-2.10.5.ebuild b/media-video/dcpomatic/dcpomatic-2.10.5.ebuild
new file mode 100644
index 000000000000..9cd6b2365fe3
--- /dev/null
+++ b/media-video/dcpomatic/dcpomatic-2.10.5.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 )
+PYTHON_REQ_USE="threads(+)"
+inherit python-any-r1 waf-utils wxwidgets
+
+DESCRIPTION="create Digital Cinema Packages (DCPs) from videos, images and sound files"
+HOMEPAGE="http://dcpomatic.com/"
+SRC_URI="http://${PN}.com/downloads/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+gtk"
+
+RDEPEND="dev-cpp/cairomm
+	dev-cpp/glibmm:2
+	dev-cpp/libxmlpp:2.6
+	dev-cpp/pangomm:1.4
+	dev-libs/boost
+	dev-libs/glib:2
+	dev-libs/icu
+	dev-libs/libcxml
+	dev-libs/libzip
+	dev-libs/openssl:0
+	|| ( media-gfx/graphicsmagick media-gfx/imagemagick )
+	media-libs/fontconfig:1.0
+	>=media-libs/libdcp-1.4.1:1.0
+	media-libs/libsamplerate
+	media-libs/libsndfile
+	>=media-libs/libsub-1.2.1:1.0
+	>=media-video/ffmpeg-3:=
+	net-libs/libssh
+	net-misc/curl
+	gtk? ( x11-libs/gtk+:2
+		x11-libs/wxGTK:3.0 )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-util/waf
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.8.0-wxGTK3.patch
+	"${FILESDIR}"/${PN}-2.8.0-no-ldconfig.patch
+	"${FILESDIR}"/${PN}-2.8.0-desktop.patch
+	"${FILESDIR}"/${PN}-2.10.2-respect-cxxflags.patch
+	)
+
+src_prepare() {
+	rm -v waf
+	export WAF_BINARY=${EROOT}usr/bin/waf
+	if [ -z "${PYTHONPATH}" ] ; then
+		export PYTHONPATH="${S}"
+	else
+		export PYTHONPATH="${S}:${PYTHONPATH}"
+	fi
+
+	ewarn "Some tests failing due missing files/certs are disabled."
+	sed \
+		-e '/4k_test.cc/d' \
+		-e '/audio_analysis_test.cc/d' \
+		-e '/audio_decoder_test.cc/d' \
+		-e '/audio_processor_test.cc/d' \
+		-e '/black_fill_test.cc/d' \
+		-e '/client_server_test.cc/d' \
+		-e '/dcp_subtitle_test.cc/d' \
+		-e '/ffmpeg_decoder_sequential_test.cc/d' \
+		-e '/file_naming_test.cc/d' \
+		-e '/import_dcp_test.cc/d' \
+		-e '/interrupt_encoder_test.cc/d' \
+		-e '/j2k_bandwidth_test.cc/d' \
+		-e '/recover_test.cc/d' \
+		-e '/reels_test.cc/d' \
+		-e '/render_subtitles_test.cc/d' \
+		-e '/repeat_frame_test.cc/d' \
+		-e '/scaling_test.cc/d' \
+		-e '/skip_frame_test.cc/d' \
+		-e '/srt_subtitle_test.cc/d' \
+		-e '/ssa_subtitle_test.cc/d' \
+		-e '/vf_test.cc/d' \
+		-e '/video_mxf_content_test.cc/d' \
+        -e '/film_metadata_test.cc/d' \
+		-i test/wscript || die
+
+	if has_version ">media-gfx/imagemagick-7" ; then
+		epatch "${FILESDIR}"/${PN}-2.10.2-imagemagick-7.patch
+	fi
+
+	default
+}
+
+src_configure() {
+	waf-utils_src_configure $(usex gtk "" "--disable-gui")
+}
+
+src_test() {
+	./run/tests || die
+}
diff --git a/media-video/dcpomatic/dcpomatic-2.11.7.ebuild b/media-video/dcpomatic/dcpomatic-2.11.7.ebuild
new file mode 100644
index 000000000000..d8f8113508ba
--- /dev/null
+++ b/media-video/dcpomatic/dcpomatic-2.11.7.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 )
+PYTHON_REQ_USE="threads(+)"
+inherit python-any-r1 waf-utils wxwidgets
+
+DESCRIPTION="create Digital Cinema Packages (DCPs) from videos, images and sound files"
+HOMEPAGE="http://dcpomatic.com/"
+SRC_URI="http://${PN}.com/downloads/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="+alsa +gtk jack pulseaudio"
+
+REQUIRED_USE="^^ ( alsa jack pulseaudio )"
+
+RDEPEND="dev-cpp/cairomm
+	dev-cpp/glibmm:2
+	dev-cpp/libxmlpp:2.6
+	dev-cpp/pangomm:1.4
+	dev-libs/boost
+	dev-libs/glib:2
+	dev-libs/icu
+	dev-libs/libcxml
+	dev-libs/libzip
+	dev-libs/openssl:0
+	|| ( media-gfx/graphicsmagick media-gfx/imagemagick )
+	media-libs/fontconfig:1.0
+	>media-libs/libdcp-1.4.4:1.0
+	media-libs/libsamplerate
+	media-libs/libsndfile
+	>=media-libs/libsub-1.2.1:1.0
+	media-libs/rtaudio[alsa?,jack?,pulseaudio?]
+	>=media-video/ffmpeg-3:=
+	net-libs/libssh
+	net-misc/curl
+	gtk? ( x11-libs/gtk+:2
+		x11-libs/wxGTK:3.0 )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-util/waf
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.8.0-wxGTK3.patch
+	"${FILESDIR}"/${PN}-2.8.0-no-ldconfig.patch
+	"${FILESDIR}"/${PN}-2.8.0-desktop.patch
+	"${FILESDIR}"/${PN}-2.10.2-respect-cxxflags.patch
+	)
+
+src_prepare() {
+	rm -v waf
+	export WAF_BINARY=${EROOT}usr/bin/waf
+	if [ -z "${PYTHONPATH}" ] ; then
+		export PYTHONPATH="${S}"
+	else
+		export PYTHONPATH="${S}:${PYTHONPATH}"
+	fi
+
+	ewarn "Some tests failing due missing files/certs are disabled."
+	sed \
+		-e '/4k_test.cc/d' \
+		-e '/audio_analysis_test.cc/d' \
+		-e '/audio_decoder_test.cc/d' \
+		-e '/audio_processor_test.cc/d' \
+		-e '/black_fill_test.cc/d' \
+		-e '/client_server_test.cc/d' \
+		-e '/dcp_subtitle_test.cc/d' \
+		-e '/ffmpeg_decoder_sequential_test.cc/d' \
+		-e '/file_naming_test.cc/d' \
+		-e '/import_dcp_test.cc/d' \
+		-e '/interrupt_encoder_test.cc/d' \
+		-e '/j2k_bandwidth_test.cc/d' \
+		-e '/recover_test.cc/d' \
+		-e '/reels_test.cc/d' \
+		-e '/render_subtitles_test.cc/d' \
+		-e '/repeat_frame_test.cc/d' \
+		-e '/scaling_test.cc/d' \
+		-e '/skip_frame_test.cc/d' \
+		-e '/srt_subtitle_test.cc/d' \
+		-e '/ssa_subtitle_test.cc/d' \
+		-e '/vf_test.cc/d' \
+		-e '/video_mxf_content_test.cc/d' \
+        -e '/film_metadata_test.cc/d' \
+		-i test/wscript || die
+
+	if has_version ">media-gfx/imagemagick-7" ; then
+		epatch "${FILESDIR}"/${PN}-2.10.2-imagemagick-7.patch
+	fi
+
+	if use alsa ; then
+		sed -e "s|RtAudio::LINUX_PULSE|RtAudio::LINUX_ALSA|"\
+			-i src/wx/wx_util.h || die
+	elif use jack ; then
+		sed -e "s|RtAudio::LINUX_PULSE|RtAudio::UNIX_JACK|"\
+			-i src/wx/wx_util.h || die
+	fi
+
+	default
+}
+
+src_configure() {
+	waf-utils_src_configure $(usex gtk "" "--disable-gui")
+}
+
+src_test() {
+	./run/tests || die
+}
diff --git a/media-video/dcpomatic/files/dcpomatic-2.10.2-imagemagick-7.patch b/media-video/dcpomatic/files/dcpomatic-2.10.2-imagemagick-7.patch
new file mode 100644
index 000000000000..2e4e9e8838ef
--- /dev/null
+++ b/media-video/dcpomatic/files/dcpomatic-2.10.2-imagemagick-7.patch
@@ -0,0 +1,18 @@
+--- dcpomatic-2.10.2/src/lib/environment_info.cc
++++ dcpomatic-2.10.2/src/lib/environment_info.cc
+@@ -25,12 +25,13 @@
+ #include <dcp/version.h>
+ #include <libssh/libssh.h>
+ #ifdef DCPOMATIC_IMAGE_MAGICK
+-#include <magick/MagickCore.h>
++#include <MagickCore/MagickCore.h>
++#include <MagickCore/version.h>
+ #else
+ #include <magick/common.h>
+ #include <magick/magick_config.h>
+-#endif
+ #include <magick/version.h>
++#endif
+ extern "C" {
+ #include <libavcodec/avcodec.h>
+ #include <libavformat/avformat.h>
diff --git a/media-video/dcpomatic/files/dcpomatic-2.10.2-respect-cxxflags.patch b/media-video/dcpomatic/files/dcpomatic-2.10.2-respect-cxxflags.patch
new file mode 100644
index 000000000000..330dfd0609f3
--- /dev/null
+++ b/media-video/dcpomatic/files/dcpomatic-2.10.2-respect-cxxflags.patch
@@ -0,0 +1,13 @@
+--- dcpomatic-2.10.2/wscript
++++ dcpomatic-2.10.2/wscript
+@@ -89,9 +89,7 @@
+     have_c11 = int(gcc[0]) >= 4 and int(gcc[1]) >= 8 and int(gcc[2]) >= 1
+ 
+     if conf.options.enable_debug:
+-        conf.env.append_value('CXXFLAGS', ['-g', '-DDCPOMATIC_DEBUG', '-fno-omit-frame-pointer'])
+-    else:
+-        conf.env.append_value('CXXFLAGS', '-O2')
++        conf.env.append_value('CXXFLAGS', ['-DDCPOMATIC_DEBUG', '-fno-omit-frame-pointer'])
+ 
+     #
+     # Windows/Linux/OS X specific
diff --git a/media-video/dcpomatic/files/dcpomatic-2.8.0-desktop.patch b/media-video/dcpomatic/files/dcpomatic-2.8.0-desktop.patch
new file mode 100644
index 000000000000..615a998e2a7f
--- /dev/null
+++ b/media-video/dcpomatic/files/dcpomatic-2.8.0-desktop.patch
@@ -0,0 +1,32 @@
+--- dcpomatic-2.8.0/platform/linux/dcpomatic.desktop.in
++++ dcpomatic-2.8.0/platform/linux/dcpomatic.desktop.in
+@@ -7,4 +7,4 @@
+ Name=DCP-o-matic 2
+ Icon=dcpomatic2
+ Comment=DCP generator
+-Categories=AudioVideo;Video
++Categories=AudioVideo;Video;
+--- dcpomatic-2.8.0/platform/linux/dcpomatic_server.desktop.in
++++ dcpomatic-2.8.0/platform/linux/dcpomatic_server.desktop.in
+@@ -7,4 +7,4 @@
+ Name=DCP-o-matic 2 Encode Server
+ Icon=dcpomatic2_server
+ Comment=DCP generator
+-Categories=AudioVideo;Video
++Categories=AudioVideo;Video;
+--- dcpomatic-2.8.0/platform/linux/dcpomatic_kdm.desktop.in
++++ dcpomatic-2.8.0/platform/linux/dcpomatic_kdm.desktop.in
+@@ -7,4 +7,4 @@
+ Name=DCP-o-matic 2 KDM Creator
+ Icon=dcpomatic2_kdm
+ Comment=DCP generator
+-Categories=AudioVideo;Video
++Categories=AudioVideo;Video;
+--- dcpomatic-2.8.0/platform/linux/dcpomatic_batch.desktop.in
++++ dcpomatic-2.8.0/platform/linux/dcpomatic_batch.desktop.in
+@@ -7,4 +7,4 @@
+ Name=DCP-o-matic 2 Batch Converter
+ Icon=dcpomatic2_batch
+ Comment=DCP generator
+-Categories=AudioVideo;Video
++Categories=AudioVideo;Video;
diff --git a/media-video/dcpomatic/files/dcpomatic-2.8.0-no-ldconfig.patch b/media-video/dcpomatic/files/dcpomatic-2.8.0-no-ldconfig.patch
new file mode 100644
index 000000000000..106e2395e738
--- /dev/null
+++ b/media-video/dcpomatic/files/dcpomatic-2.8.0-no-ldconfig.patch
@@ -0,0 +1,12 @@
+--- dcpomatic-2.8.0/wscript
++++ dcpomatic-2.8.0/wscript
+@@ -503,8 +503,7 @@
+         sys.exit(-1)
+ 
+ def post(ctx):
+-    if ctx.cmd == 'install':
+-        ctx.exec_command('/sbin/ldconfig')
++    pass
+ 
+ def pot(bld):
+     bld.recurse('src')
diff --git a/media-video/dcpomatic/files/dcpomatic-2.8.0-wxGTK3.patch b/media-video/dcpomatic/files/dcpomatic-2.8.0-wxGTK3.patch
new file mode 100644
index 000000000000..9d85ad583317
--- /dev/null
+++ b/media-video/dcpomatic/files/dcpomatic-2.8.0-wxGTK3.patch
@@ -0,0 +1,13 @@
+--- dcpomatic-2.8.0/src/wx/wscript
++++ dcpomatic-2.8.0/src/wx/wscript
+@@ -103,8 +103,8 @@
+ 
+ def configure(conf):
+     try:
+-        wx_config = 'wx-config-3.0-gtk2'
+-        conf.check_cfg(msg='Checking for wxWidgets using wx-config-3.0-gtk2',
++        wx_config = 'wx-config-3.0'
++        conf.check_cfg(msg='Checking for wxWidgets using wx-config-3.0',
+                        package='',
+                        path=wx_config,
+                        args='--cppflags --cxxflags --libs std,richtext',
diff --git a/media-video/dcpomatic/metadata.xml b/media-video/dcpomatic/metadata.xml
new file mode 100644
index 000000000000..1fe7fe154da0
--- /dev/null
+++ b/media-video/dcpomatic/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+<longdescription lang="en">
+DCP-o-matic is a free, open-source program to create Digital Cinema Packages (DCPs) from videos, images, sound and subtitle files. You can use it to make content for playback on DCI-compliant cinema projectors.
+
+It can take files in many different formats, including MP4, Apple ProRes, MOV, AVI, VOB (from DVDs), M2TS (from Blu-Ray), WMV, MKV, JPEG, PNG, TIFF and lots of others.
+</longdescription>
+<use>
+	<flag name="alsa">Utilize alsa output of media-libs/rtaudio.</flag>
+	<flag name="jack">Utilize jack output of media-libs/rtaudio.</flag>
+	<flag name="pulseaudio">Utilize pulseaudio output of media-libs/rtaudio.</flag>
+</use>
+</pkgmetadata>
diff --git a/media-video/devedeng/Manifest b/media-video/devedeng/Manifest
new file mode 100644
index 000000000000..b24615022f76
--- /dev/null
+++ b/media-video/devedeng/Manifest
@@ -0,0 +1,9 @@
+DIST devedeng-4.8.7.tar.gz 1883405 SHA256 f699fa129fe41acf277cae05d92768c7ca7ac4021baaffd2a7b5d6ce58a33a79 SHA512 30e40f93c51b576e283de15d2526d686d3b8e3f04795aac6aa25ee4b418e1d44c2b80e880446f66494197f26e8f036e7def0c26e168a0553c454ccd859876ba6 WHIRLPOOL a3d4c86b09a5b205ced1036255c724a141d9e6e01b86870aeba68d1566089955005e4c5a898c5236876b2be39d95ac22f3481462ee14262ade40e0c3cef3c964
+DIST devedeng-4.8.8.tar.gz 1883468 SHA256 3650751da3d9764e767725b6a744b16395bfce43b6243a75b2b8a1ea6dfcbd56 SHA512 b4ab241a0cf5e1bfd2da4709528fa361ceed660688384a0f2cf965c45bb865d94aa19f8e282477e8e0d3fc43213fb42da2dd75dbe9e26e4811593d7b773386df WHIRLPOOL b2984ee56b0d681ef882d0cb9e8611a20938eec13dcf6c0dc6bcefbf3e85603106a1bc61191c23b42d2b9d9be804adb8572d095002c7754d1261c41f1cb3659c
+DIST devedeng-4.8.9.tar.gz 1883507 SHA256 e1b41689f93c398af11529ba857df68dc982a3979bc2c675a9f44fdedf77b30c SHA512 224a10886ea7f8a0e2cd3fdeed9c7b0ef5413892f4b800194d957a764b90220fed7b2f3d6bfa416798acb89024a95d678604f3d23fb19cccb8a11e2734a92b7a WHIRLPOOL 0aa94cf3a440b3ae9f98d8e5ac82156f2ea4eb9bbe1ce60447eb5b0db9ea4c8d7d22c066385fb73e8cd123f79ff31abf2a316df450e4def1370c53bbe4121bc6
+EBUILD devedeng-4.8.7.ebuild 813 SHA256 18c3a8978b054fb9f91205c6286fccc60403cd61084a0bc09ada01a9e079d215 SHA512 7d7574be3df9e4128e6fa278dfd6ea1af8805dd42c12734073dc4adb720c38054e751a20078d7f90f25c0d607a642d0a69950b0839963e66a8bb1f5969372773 WHIRLPOOL c6bdef7d8e71337c05c3beb70aacf49818235b940bc20e2b3ec6d9ec1114b031a16d434d6a3c5fb5152df5b5c825a930bfd3644ab96311b048db4365027b343e
+EBUILD devedeng-4.8.8.ebuild 813 SHA256 18c3a8978b054fb9f91205c6286fccc60403cd61084a0bc09ada01a9e079d215 SHA512 7d7574be3df9e4128e6fa278dfd6ea1af8805dd42c12734073dc4adb720c38054e751a20078d7f90f25c0d607a642d0a69950b0839963e66a8bb1f5969372773 WHIRLPOOL c6bdef7d8e71337c05c3beb70aacf49818235b940bc20e2b3ec6d9ec1114b031a16d434d6a3c5fb5152df5b5c825a930bfd3644ab96311b048db4365027b343e
+EBUILD devedeng-4.8.9.ebuild 813 SHA256 18c3a8978b054fb9f91205c6286fccc60403cd61084a0bc09ada01a9e079d215 SHA512 7d7574be3df9e4128e6fa278dfd6ea1af8805dd42c12734073dc4adb720c38054e751a20078d7f90f25c0d607a642d0a69950b0839963e66a8bb1f5969372773 WHIRLPOOL c6bdef7d8e71337c05c3beb70aacf49818235b940bc20e2b3ec6d9ec1114b031a16d434d6a3c5fb5152df5b5c825a930bfd3644ab96311b048db4365027b343e
+EBUILD devedeng-9999.ebuild 794 SHA256 eedb0aba1288d37d8bab3356b826151fffc85787a7d2f529d5aed4ad33eec47d SHA512 7fcfd9993cf94a377fa0fe593dfb8f6d67dbc10be27adebb60ef3e88a889dae7e899df89df847858adf272f0ca99a32bb4b5ed393fd841eea81a5eb0cad6b227 WHIRLPOOL f4c637497a82542337541dfbe13e4267d860a6eea48731549674c2176c83022e71dcf32bac77b7c7671861da8852e3709d6ab15e5a077529fa588faee54ae53d
+MISC ChangeLog 1591 SHA256 f232f1b3c17169b5af048d6cc283b40fcf88a24bb545982afde15e8db76ca565 SHA512 8f411d4f4d1eadf21e7dc511204eabc70d96e06c4fbe959ce3124c505517e3ecc2ead49e93e3f81d7e32fb11865291f02d825f52b6e5c0494b7dc5b3dd52dff5 WHIRLPOOL 2a633351d5eae8e0f73413263d658700dbc3e132ca7953f5f0736af804628eced5909d49be9b75d5c281cfb8cbe91844fd01b2e7842bf9d22183ce6999018481
+MISC metadata.xml 943 SHA256 e2d239e20c2e5f225b07de3fa5b0f3ae6d906ff1843bdca4f88d075bc80dde24 SHA512 9c5cf515b958e7125d383fc9513546f9a663ea45e4c60308fb20e85eb6eedf22c71a94561721ebffd156ee5b61d5ac309c66c9a7782d905b98a95c2ad8b7b545 WHIRLPOOL 3af4d9da055b6aa58a8decd30e5642f21689b416413ea41d296b210353c98eb5b78a27877d3dacba0482d44d2cfa9e1a61783968bb45d225d8f1cf04098b1c66
diff --git a/media-video/devedeng/devedeng-4.8.7.ebuild b/media-video/devedeng/devedeng-4.8.7.ebuild
new file mode 100644
index 000000000000..d10522edca24
--- /dev/null
+++ b/media-video/devedeng/devedeng-4.8.7.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="DevedeNG is a program to create video DVDs and CDs (VCD, sVCD or CVD)"
+HOMEPAGE="http://www.rastersoft.com/programas/devede.html"
+SRC_URI="https://github.com/rastersoft/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libav"
+
+RDEPEND="dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3
+	|| ( media-video/vlc media-video/mpv media-video/mplayer )
+	!libav? ( media-video/ffmpeg )
+	libav? ( media-video/libav )
+	media-video/dvdauthor
+	media-video/vcdimager
+	virtual/cdrtools
+	|| ( app-cdr/brasero kde-apps/k3b )"
+
+DEPEND="${PYTHON_DEPS}"
diff --git a/media-video/devedeng/devedeng-4.8.8.ebuild b/media-video/devedeng/devedeng-4.8.8.ebuild
new file mode 100644
index 000000000000..d10522edca24
--- /dev/null
+++ b/media-video/devedeng/devedeng-4.8.8.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="DevedeNG is a program to create video DVDs and CDs (VCD, sVCD or CVD)"
+HOMEPAGE="http://www.rastersoft.com/programas/devede.html"
+SRC_URI="https://github.com/rastersoft/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libav"
+
+RDEPEND="dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3
+	|| ( media-video/vlc media-video/mpv media-video/mplayer )
+	!libav? ( media-video/ffmpeg )
+	libav? ( media-video/libav )
+	media-video/dvdauthor
+	media-video/vcdimager
+	virtual/cdrtools
+	|| ( app-cdr/brasero kde-apps/k3b )"
+
+DEPEND="${PYTHON_DEPS}"
diff --git a/media-video/devedeng/devedeng-4.8.9.ebuild b/media-video/devedeng/devedeng-4.8.9.ebuild
new file mode 100644
index 000000000000..d10522edca24
--- /dev/null
+++ b/media-video/devedeng/devedeng-4.8.9.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="DevedeNG is a program to create video DVDs and CDs (VCD, sVCD or CVD)"
+HOMEPAGE="http://www.rastersoft.com/programas/devede.html"
+SRC_URI="https://github.com/rastersoft/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libav"
+
+RDEPEND="dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3
+	|| ( media-video/vlc media-video/mpv media-video/mplayer )
+	!libav? ( media-video/ffmpeg )
+	libav? ( media-video/libav )
+	media-video/dvdauthor
+	media-video/vcdimager
+	virtual/cdrtools
+	|| ( app-cdr/brasero kde-apps/k3b )"
+
+DEPEND="${PYTHON_DEPS}"
diff --git a/media-video/devedeng/devedeng-9999.ebuild b/media-video/devedeng/devedeng-9999.ebuild
new file mode 100644
index 000000000000..59d0a358e669
--- /dev/null
+++ b/media-video/devedeng/devedeng-9999.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5} )
+
+inherit distutils-r1 git-r3
+
+DESCRIPTION="DevedeNG is a program to create video DVDs and CDs (VCD, sVCD or CVD)"
+HOMEPAGE="http://www.rastersoft.com/programas/devede.html"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/rastersoft/${PN}.git"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="libav"
+
+RDEPEND="dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3
+	|| ( media-video/vlc media-video/mpv media-video/mplayer )
+	!libav? ( media-video/ffmpeg )
+	libav? ( media-video/libav )
+	media-video/dvdauthor
+	media-video/vcdimager
+	virtual/cdrtools
+	|| ( app-cdr/brasero kde-apps/k3b )"
+
+DEPEND="${PYTHON_DEPS}"
diff --git a/media-video/devedeng/metadata.xml b/media-video/devedeng/metadata.xml
new file mode 100644
index 000000000000..3affff4934c7
--- /dev/null
+++ b/media-video/devedeng/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<longdescription>
+DevedeNG is a program to create video DVDs and CDs (VCD, sVCD or CVD), suitables for home players, from any number of video files, in any of the formats supported by Mplayer. The big advantage over other utilites is that it only needs Mplayer, Mencoder, FFMpeg, DVDAuthor, VCDImager and MKisofs (well, and Python3, PyGTK and PyGlade), so its dependencies are quite small.
+
+The suffix NG is because it is a rewrite from scratch of the old Devede, to work with Python3 and Gtk3, and with a new internal architecture that allows to expand it and easily add new features.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">rastersoft/devedeng</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/dirac/Manifest b/media-video/dirac/Manifest
new file mode 100644
index 000000000000..f2dcf1711040
--- /dev/null
+++ b/media-video/dirac/Manifest
@@ -0,0 +1,7 @@
+AUX dirac-0.5.2-doc.patch 2304 SHA256 48d18f815991833bc39239ec5029c047739133d4e6b167c6a5652d7714b79cf7 SHA512 1cac4ce26efd5f28b1d671258d5b8b0612815ac41dff230eda0db2c3a0f7414e2266ed1f92de728c97c40319e5d035f42fd1882233f85e3ccfd83b36b84ac099 WHIRLPOOL 6f66143188fef166d6787e807c3169bc12c2ce458bbe662f99e4008066758f1f616a64b5de2a2069cb93b2da09811934c5384e3fba3eb8c1ae45454fb2f2d7c1
+DIST dirac-1.0.2.tar.gz 918366 SHA256 816b16f18d235ff8ccd40d95fc5b4fad61ae47583e86607932929d70bf1f00fd SHA512 71d49fe17da4069ea28581565d5a4c4f64565848b51d04b39a646bdaa9afc899a265e9ace34af57fba64b03562e8c2259f882f6f17c1e49d1057cd8e69d1250c WHIRLPOOL bb01f8a444f79cd194300ff83cae484bd0ff7be58c712cdaf5f525524f68474a89e093999df770d469d38fedae84559f8fab0b087cb448c52dc21daeaeb29ce8
+EBUILD dirac-1.0.2-r1.ebuild 1502 SHA256 5122d66d48308cf002ac37b2a268183fc3385c2f81bb44c447b264f16663528f SHA512 30f862129ecc2bd6b683c70801d5974b74b598af16032c6b12b1fb45fc793779e37866d6ce06e1a45e644282e55caf5724f06f0ddd7aa67f4490f45b7d628f38 WHIRLPOOL 777f9a6c248d401f71cf8ce9a279f0e296bd5e1365d75661ff396673cbfda41c80b565cd92d80a6b6a3d5408856add1575295a6070f3e9ee2229c6e256948ffe
+EBUILD dirac-1.0.2.ebuild 1256 SHA256 c08051f2b5d96aa4289dba37d513b055211af911016aa895f93c3d091ca38ca8 SHA512 acc928cbce4d609ea5a758132208a95b445993fb91a74e1c35c61c99a84298b0fe2abeedacb9b6632faf49eaabaf24b488f52f4c52daa6489ba3fb48b6e456ae WHIRLPOOL 8a557a8a122d2d1c8393c7e5f4aef786f4cd8b3d43f26b2bc176d723b9520143b2e98aadb864b49fd01f37f4a17b6b365e113cfe33943fd7a76b8c3c47d3c8f0
+MISC ChangeLog 2508 SHA256 361120c3d111625b268a17301b9d66e938e11131a6341197e5444b69525f1d76 SHA512 15e6077c94c49e832b22bba52a0c89d2f10e6ae93db7bd2bea8ac32a06c3fe18a4d4f7697825c33533889c5bb7c1e535b74d8a4cf2f00541ba8f8fe9c37e94de WHIRLPOOL 0dab58a6ed56be864938d73def1c98a7a290a8aab2a9799167bd4d8e6ed7df1df7c1328a9c6c9362b0ebdfb070e9f669a101075187731f33ef1f68849c7d8257
+MISC ChangeLog-2015 6587 SHA256 77378523c1f4de8a80187fc1da58f0aa0cea436bb0084f0815279d4acf957dbd SHA512 4106f0d33fb213eeda401eb9f4bb9b82995bb769a334153430f9b26b169fc7ef0555545fc7d296554ebebc50dc6900eba2bd8d676b3a52fe03d3ccb80dbb3267 WHIRLPOOL cfb49cf0416fc7b9bb159061e1c398b6aa3fd4a8d505d4969652414e266219c7886752e785400fc9c50368e0e4789eec016127abe9934237f57541706c3a3a1e
+MISC metadata.xml 298 SHA256 8fbdf99e1ba61a10d970ba8cc67aae1b2268650c55f7ac1a4ec610a8d56f7d7b SHA512 af4dca87e12f4378990ff854d7f6ad5af7ccc083694a3ad34521dece8cc740508aa2cecaf6ab8aae3cac66069ba9d6becc5fd7e0856af532a5011db50041dff6 WHIRLPOOL 807907496e1ccc18513c1f8fafd217fbf805f7e373459c48f9b6dc8b37b3e227fb24fad52b2472ff0b822eeaba812962457e8944ac5f5fdfe842085a032bf126
diff --git a/media-video/dirac/dirac-1.0.2-r1.ebuild b/media-video/dirac/dirac-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..9721f4f7e14d
--- /dev/null
+++ b/media-video/dirac/dirac-1.0.2-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils multilib-minimal
+
+DESCRIPTION="Open Source video codec"
+HOMEPAGE="http://dirac.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="debug doc cpu_flags_x86_mmx static-libs"
+
+RDEPEND=""
+DEPEND="
+	doc? (
+		app-doc/doxygen
+		virtual/latex-base
+		media-gfx/graphviz
+		|| ( >=app-text/texlive-core-2014 app-text/dvipdfm )
+	)"
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.5.2-doc.patch
+	AT_M4DIR="m4" eautoreconf
+	export VARTEXFONTS="${T}/fonts"
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable static-libs static) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable debug) \
+		$(multilib_is_native_abi && echo $(use_enable doc))
+	if ! multilib_is_native_abi ; then
+		sed -i -e 's/ encoder decoder util//' Makefile || die
+	fi
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		latexdir="${EPREFIX}/usr/share/doc/${PF}/programmers" \
+		algodir="${EPREFIX}/usr/share/doc/${PF}/algorithm" \
+		faqdir="${EPREFIX}/usr/share/doc/${PF}" \
+		install
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --all
+	einstalldocs
+}
diff --git a/media-video/dirac/dirac-1.0.2.ebuild b/media-video/dirac/dirac-1.0.2.ebuild
new file mode 100644
index 000000000000..afc629a5c63e
--- /dev/null
+++ b/media-video/dirac/dirac-1.0.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit autotools eutils
+
+DESCRIPTION="Open Source video codec"
+HOMEPAGE="http://dirac.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="debug doc cpu_flags_x86_mmx static-libs"
+
+RDEPEND=""
+DEPEND="
+	doc? (
+		app-doc/doxygen
+		virtual/latex-base
+		media-gfx/graphviz
+		app-text/dvipdfm
+	)"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.5.2-doc.patch
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_configure() {
+	export VARTEXFONTS="${T}/fonts"
+
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable debug) \
+		$(use_enable doc)
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		latexdir="${EPREFIX}/usr/share/doc/${PF}/programmers" \
+		algodir="${EPREFIX}/usr/share/doc/${PF}/algorithm" \
+		faqdir="${EPREFIX}/usr/share/doc/${PF}" \
+		install
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+
+	find "${ED}"usr -name '*.la' -exec rm -f {} +
+}
diff --git a/media-video/dirac/files/dirac-0.5.2-doc.patch b/media-video/dirac/files/dirac-0.5.2-doc.patch
new file mode 100644
index 000000000000..211486635dbd
--- /dev/null
+++ b/media-video/dirac/files/dirac-0.5.2-doc.patch
@@ -0,0 +1,59 @@
+diff -x '*~' -ur dirac-0.5.2/configure.ac dirac-0.5.2-doc/configure.ac
+--- dirac-0.5.2/configure.ac	2005-05-20 15:05:25.000000000 +0200
++++ dirac-0.5.2-doc/configure.ac	2005-06-10 03:31:58.683588784 +0200
+@@ -105,28 +105,37 @@
+ dnl -----------------------------------------------
+ dnl Checks for optional programs.
+ dnl -----------------------------------------------
+-AC_CHECK_PROG(HAVE_DOXYGEN, doxygen, true, false)
+-	if test $HAVE_DOXYGEN = "false"; then
+-		AC_MSG_WARN([*** doxygen not found, code documentation will not be built])
+-	fi
+-AM_CONDITIONAL(HAVE_DOXYGEN, $HAVE_DOXYGEN)
++AC_ARG_ENABLE(doc, AC_HELP_STRING([--enable-doc], [enables doc building (no)]), [enabledoc=${enableval}], [enabledoc=no])
+ 
+-AC_CHECK_PROG(HAVE_DOT, dot, true, false)
+-	if test $HAVE_DOT = "false"; then
+-		AC_MSG_WARN([*** dot not found, inheritance diagrams will not be generated in code documentation])
++if test "x$enabledoc" != "xno"; then
++	AC_CHECK_PROG(HAVE_DOXYGEN, doxygen, true, false)
++		if test $HAVE_DOXYGEN = "false"; then
++			AC_MSG_WARN([*** doxygen not found, code documentation will not be built])
++		fi
++	
++	AC_CHECK_PROG(HAVE_DOT, dot, true, false)
++		if test $HAVE_DOT = "false"; then
++			AC_MSG_WARN([*** dot not found, inheritance diagrams will not be generated in code documentation])
++		fi
++	
++	AC_CHECK_PROG(HAVE_LATEX, latex, true, false)
++		if test $HAVE_LATEX = "false"; then
++			AC_MSG_WARN([*** latex not found, algorithm documentation will not be built])
++		fi
++	
++	AC_CHECK_PROG(HAVE_DVIPDFM, dvipdfm, true, false)
++		if test $HAVE_DVIPDFM = "false"; then
++		AC_MSG_WARN([*** dvipdfm not found, programmer documentation will not be built])
+ 	fi
++else
++HAVE_DOXYGEN=false
++HAVE_DOT=false
++HAVE_LATEX=false
++HAVE_DVIPDFM=false
++fi
++AM_CONDITIONAL(HAVE_DOXYGEN, $HAVE_DOXYGEN)
+ AM_CONDITIONAL(HAVE_DOT, $HAVE_DOT)
+-
+-AC_CHECK_PROG(HAVE_LATEX, latex, true, false)
+-	if test $HAVE_LATEX = "false"; then
+-		AC_MSG_WARN([*** latex not found, algorithm documentation will not be built])
+-	fi
+ AM_CONDITIONAL(HAVE_LATEX, $HAVE_LATEX)
+-
+-AC_CHECK_PROG(HAVE_DVIPDFM, dvipdfm, true, false)
+-	if test $HAVE_DVIPDFM = "false"; then
+-	    AC_MSG_WARN([*** dvipdfm not found, programmer documentation will not be built])
+-    fi
+ AM_CONDITIONAL(HAVE_DVIPDFM, $HAVE_DVIPDFM)
+ 
+ AC_ARG_ENABLE(overlay,
diff --git a/media-video/dirac/metadata.xml b/media-video/dirac/metadata.xml
new file mode 100644
index 000000000000..8a24b7f05fd3
--- /dev/null
+++ b/media-video/dirac/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">dirac</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/dv2sub/Manifest b/media-video/dv2sub/Manifest
new file mode 100644
index 000000000000..c08e3380c942
--- /dev/null
+++ b/media-video/dv2sub/Manifest
@@ -0,0 +1,5 @@
+DIST dv2sub-0.3.tar.gz 121756 SHA256 6ce33bd59de3fe50cf5aa95a7455cf0b34586e72af44fa59c3e5dd9b50f7ca8c SHA512 3284afd6b9698d7a464771e244eed567c7937d5b022f7f98f6dfc1ae73fde220bb816cc16d44c22cbf2112a0b7621f41a2223f25e2b8d3cad469275db4e8cfe2 WHIRLPOOL 482b8624a74da3f3ff193e69484c03240274bc4d5c74cabe35b4fa88d75ad0e99716efcb55805cd4d9084269bfc9b19d9f1f9ac20a5656ff2156a570b51b019f
+EBUILD dv2sub-0.3.ebuild 744 SHA256 e0f58a9c0226e190441769d043b3776ad7b6d8b101235f791433f3b826056eb9 SHA512 bea02bc2aec637fafc62f22fbc2af5b4c202ea18fdd225cb6d5a4923edf02b909356c1623a0a5f4bb6ff7aafd3b7dadf79e3f3784adb7022a180611cb5b17b43 WHIRLPOOL 9607aaa2096ba4321ca13e6528ad48f47658824515749438cab19ba7071b26afc70132ce78638d0ed5905c97d38b7e942d7c0a9a6b385a0104a9ccc0719be861
+MISC ChangeLog 2423 SHA256 66ef5c33e2f5ff6aef6eb62edbd94d9ca8d27ef0a1d0555f785e1ad18f63048f SHA512 6803bc6618e8253f5c0ab8f869ec0dd81e880f05376bfabaea921fe9784e5b97b19a00505fb3ca0bdce5e400ed9af28e71a41bace80002100cf3ecc8fbcca505 WHIRLPOOL 1b5616e49e0c7af9989a63423e2a2f162aef177d04851d04c33028891ee902100d501f131c9c6726a9c1b596c252538f47073e4ae8a0beb1317cc286fd1f675f
+MISC ChangeLog-2015 807 SHA256 6b3c37392726479ce8b39d72b4b266268bfe990f4150eb9bd89bc47c2aba7987 SHA512 cfb655af2fd48c2fa94e560995632bdb1345900e5d256995010e37b4861686260ce26ffa7988cc15fc1861b46f14e84eeee1b77a88c0d7f8e31067c5a6b3d947 WHIRLPOOL 76551c7267f98af0989a832776ab368f0baf8c740c05348f4fe81d480f11b7fb1a9860d6eb870c1a1e2a8675d5252e38a3de65fd1fedc7c72915a387eb120954
+MISC metadata.xml 682 SHA256 78818f66526560f26ec12aa2b3e5853250aeab20add001b58c7fa32aa1e9c129 SHA512 87b005d8a4b133854827d5b4fc4ec4fe2e063ca30289975f490f0c92436cf4d02e8fd4bbfb90628e5246b6092099c7ef6dbf930f8dda82e14f222aafee22385d WHIRLPOOL 7b64ba2a712c5f7730d25169346334786de2717ad6343360873fb1d201f3cf9da9f106d13f526edebd69af2bce66f13001c48ed12e4b4cded5e8919866896499
diff --git a/media-video/dv2sub/dv2sub-0.3.ebuild b/media-video/dv2sub/dv2sub-0.3.ebuild
new file mode 100644
index 000000000000..6ed8b40a7849
--- /dev/null
+++ b/media-video/dv2sub/dv2sub-0.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils
+
+DESCRIPTION="extract info or subtitles from DV stream"
+HOMEPAGE="http://dv2sub.sourceforge.net/"
+SRC_URI="mirror://sourceforge/dv2sub/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="kino"
+
+DEPEND="media-libs/libdv"
+RDEPEND="${DEPEND}
+	kino? (
+		media-video/kino
+		media-video/dvdauthor
+		virtual/ffmpeg
+	)"
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog README TODO
+	if use kino; then
+		insinto /usr/share/kino/scripts/exports
+		exeinto /usr/share/kino/scripts/exports
+		doins kino_scripts/dv2sub_spumux.xml
+		doexe kino_scripts/*.sh
+	fi
+}
diff --git a/media-video/dv2sub/metadata.xml b/media-video/dv2sub/metadata.xml
new file mode 100644
index 000000000000..518c9dc42991
--- /dev/null
+++ b/media-video/dv2sub/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>media-video@gentoo.org</email>
+    <name>Gentoo Video project</name>
+  </maintainer>
+  <longdescription lang="en">
+		Utility dv2sub reads raw DV stream from file argument dv-file or
+		standard input if absent. It can generate a parameter log about
+		every input DV frame or create MicroDVD subtitles with the
+		recording date and time.
+	</longdescription>
+  <use>
+    <flag name="kino">install kino plugin</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">dv2sub</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-video/dvbackup/Manifest b/media-video/dvbackup/Manifest
new file mode 100644
index 000000000000..68f894a73234
--- /dev/null
+++ b/media-video/dvbackup/Manifest
@@ -0,0 +1,6 @@
+AUX dvbackup-0.0.4-gcc4.diff 336 SHA256 259f8b7693fc28de655c30d30c3c6b8cef41b3e5ac9a5e1f1a7a28201a6ce1a1 SHA512 adda4164cc3f6722ffe1ea44066b8b0d1d0aeceb6de771403a1b357bf04764d60ddb90342083392263ba09d3b3360f85ada86b3173ced0a535b856d7a8a47db6 WHIRLPOOL 0f894a2a735ddcc01789eccd0402a1feee96d5480c6b750ce0d62122ba8a16865847ba13459f3c8b0cb3189f013ba2e8239a373dbc098197eb522fc4e3ea3f70
+DIST dvbackup-0.0.4.tar.gz 115303 SHA256 0020cd05d9985f5fcf80d49315373265d6d6a755efb0e18d337254f2aea249e1 SHA512 0e647b37229e644edf72765c3c9644617140118e8e9e854b6a2da490aac1ef3dfe28edd647323f1f0d0219aa82f4548de3dd5a01e10320db0b0dcf3b88e748b1 WHIRLPOOL b9d5c0d5d37193ca99d85348eb6d523ca65ee698250624a38400f706d4988d74753b4c4d0c8fa07cfb2bb04c200d81e38f743bf218b0a7c0ebdf3254f6f04107
+EBUILD dvbackup-0.0.4-r1.ebuild 1102 SHA256 81f0b269d20b086311bfc709f919a14858c2e62c374e4bc9f363ebe303374b14 SHA512 351e1efc1b285e659ef0257c3d5fd6a8ca3fb90a5d198d6f3cb3c0c97c8776d515985231aa3740531467c079fb7549a3f6c9331e5d3caee5ad4b841dfdfdb1a7 WHIRLPOOL a5e7df9729bcdaeb537f520bfde8e09a554de8d9ddf0f16a94ac4aa854e2432159e7e572323b30de9513ad812382eb77da286634aae7cfa00935c7f72cf1a30b
+MISC ChangeLog 2472 SHA256 5282276da09592ed8b3a7a27766daadbff505705dd16aaf30721343e0d99f073 SHA512 d03f5744f63b27e79d5a67e584ea2d4f6892434cfd5ee55deb0ad0efef2aacf1637fb949cc62355188f7f47037b3aab6329a22630a00ce823a8550538702951a WHIRLPOOL 4436e4d0d678a2d92b1d9f70c8195b69a122c03c9e7ba2a3726e7652b43abd871852b51c93e17dacf2dfb31528e299db51a2f62e3372af07714f02272d14aecc
+MISC ChangeLog-2015 1445 SHA256 c141b98713394be4e1946d57228bf0855dba9e98e6a56c4c73037e792b55faae SHA512 79b513159d115b94ac72e30856d778733d71e13eee5e3bb83f2eb6b0253922d8d42761d9343a172b984014c1efd904a472950bb31691ea02b7acca8894fe2bd2 WHIRLPOOL 4eb3f39684033228ab20f2bce67fb2091743d87e30be5d353bc6fd0af7333a7d2afb78481fc0e42db8557a3883d8cbc4d0d3618121777a76a85cac0e030d093b
+MISC metadata.xml 301 SHA256 525d5d4705afa7f960e6419946d602cc6bbe321ae2f8656d96e758b9a1727952 SHA512 57d7055984f446902f9ab3783215376794153cabe2c3b05b80d6a83bb288c58575b86b7ee6631f90a8992f7a28c06815b44e4d96847a5de8d1149cb05763eb10 WHIRLPOOL 568bf627355fc628a18ff30ed87803ffe97c3256c9a0743720bf7febdff670bb86d1d55a9975022d504ab3a3a9aa26c2d10ed1ce03fa3e3399ee204acf6a9b53
diff --git a/media-video/dvbackup/dvbackup-0.0.4-r1.ebuild b/media-video/dvbackup/dvbackup-0.0.4-r1.ebuild
new file mode 100644
index 000000000000..dabe40404d6f
--- /dev/null
+++ b/media-video/dvbackup/dvbackup-0.0.4-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="A small utility for creating backups on DV tapes"
+HOMEPAGE="http://dvbackup.sourceforge.net/"
+SRC_URI="mirror://sourceforge/dvbackup/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="sys-libs/glibc
+	dev-libs/popt
+	sys-libs/zlib"
+
+RDEPEND="${DEPEND}
+	media-libs/libdv"
+
+src_prepare() {
+	local i
+
+	epatch "${FILESDIR}/${P}-gcc4.diff"
+
+	# fix Makefile to respect $LDFLAGS
+	sed -i -e 's:gcc \$(CFLAGS):\$(CC) \$(CFLAGS) \$(LDFLAGS):g' \
+		-e 's:^\(CFLAGS=\):#\1:g' Makefile
+
+	# convert LATIN1 docs to UTF-8
+	for i in ChangeLog ReleaseNotes; do
+		if [ -f "${i}" ]; then
+			echo ">>> Converting ${i} to UTF-8"
+			iconv -f LATIN1 -t UTF8 -o "${i}~" "${i}" && mv -f "${i}~" "${i}" || rm -f "${i}~"
+		fi
+	done
+}
+
+src_compile() {
+	emake dvbackup || die "emake failed"
+}
+
+src_install() {
+	dobin dvbackup
+	insinto /usr/share/${PN}
+	doins underrun-ntsc.dv underrun-pal.dv
+	dodoc AUTHORS ChangeLog ReleaseNotes
+	dohtml dvbackup.html
+}
diff --git a/media-video/dvbackup/files/dvbackup-0.0.4-gcc4.diff b/media-video/dvbackup/files/dvbackup-0.0.4-gcc4.diff
new file mode 100644
index 000000000000..1ab2c4b07eb8
--- /dev/null
+++ b/media-video/dvbackup/files/dvbackup-0.0.4-gcc4.diff
@@ -0,0 +1,11 @@
+diff -Naur dvbackup-0.0.4.orig/dvconnect.c dvbackup-0.0.4/dvconnect.c
+--- dvbackup-0.0.4.orig/dvconnect.c	2002-03-24 20:27:10.000000000 +0100
++++ dvbackup-0.0.4/dvconnect.c	2009-11-05 16:16:10.467442012 +0100
+@@ -9,6 +9,7 @@
+ 
+ #include <pthread.h>
+ #include <signal.h>
++#include <string.h>
+ 
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
diff --git a/media-video/dvbackup/metadata.xml b/media-video/dvbackup/metadata.xml
new file mode 100644
index 000000000000..fda46f1094ff
--- /dev/null
+++ b/media-video/dvbackup/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">dvbackup</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/dvbsnoop/Manifest b/media-video/dvbsnoop/Manifest
new file mode 100644
index 000000000000..55d9c874b612
--- /dev/null
+++ b/media-video/dvbsnoop/Manifest
@@ -0,0 +1,6 @@
+AUX dvbsnoop-1.4.50-crc32.patch 2031 SHA256 5b5782f8451ddcf9e68bd84f5f9094e1de26c0de735c40e77ae7c1da84d5dacf SHA512 29b0b0b4814680840df4ff5e9b480b939b2ed916357ae6cfaec26bf8275f2d1ab700b2d550384f437650932f2b1e98690afc470bb01e537ac4f556d15651d7a1 WHIRLPOOL bca5f63499f09409611986f894cc633378fef427bf8254f5175c8b7e1517954fd6a5ca6370ede235cd211f5d8d6074dc49a4efb4899e6d2657c837c0ecb5054e
+DIST dvbsnoop-1.4.50.tar.gz 333992 SHA256 7658498b26a5d2a0242e81f0cfafa0e43a2bec56f8674e7ac197dfc310866ec6 SHA512 288b98e9205b9ee6638b65cd0d7c463c2c243c1f7e650a6df8592acd3f40eca3352a563cc8a1a04f0f2731b3718e6dc3d09f56f59da4b59fbe25b86acf434f81 WHIRLPOOL 2e9c779cf2689759be0c04b74952313d2b026e4819f7064fe919cbd41465a325300e1e0e0f864983b881006dea3de2fe30365c375f430d667e0cfc589eeb4690
+EBUILD dvbsnoop-1.4.50-r1.ebuild 555 SHA256 943c23d0bd3c39b2dcd20498343dd6fa9fd045ae62194beb79dbb5e00fbbac15 SHA512 285963b55d4f5d23190a41817c793801921fbff9ef7d6956bf2102d73fa1819b002a788fedd86c45956aac7228100c36ea4af9cda53b5c93b801afcd06ad5481 WHIRLPOOL a033afbbab6ffd1e895e03beba1dddcd30ea0a31df004809b9b50f68964a28ce232f489039ae721cf847b84e1839f9678fcaa11541d7d36da111e1ffedfc8050
+MISC ChangeLog 2508 SHA256 6507a422b7399e90974cd75657aa277ce2d8bfb75301ca154b33af84b9391daa SHA512 de302ae6b4561588b7880e4ae01095764736689a25484045a644f4104bff4a96a314ca0d7a5d36df9369d23a7d7ce14a940c4a68fc790245ed3a7965666ecdd4 WHIRLPOOL 07dae909f03dd8538866cbb13f326bcabc73fd7e4bcc6745bbf95b38390e4687e3e3e4f10ac6c4d2f15d707c4a1bccbf77925a211d6aa06f1b26fc054dff5cd6
+MISC ChangeLog-2015 2965 SHA256 4efe7add98b8b11cc73b980f90268304d394b1a99984905624219d959d530624 SHA512 505d943889c5fa619ecb35a0c9150cd616e6915c923087cc2a280cb7e6ce0e180c2849157f7aabde86ca412fb23f0ddb25bbb31218881096c80e8cfe2428f3f6 WHIRLPOOL df9ef02e53e5d0eadaa3cd50d0a72dcd1e2e48f87472255204bd2ae684ba1cfd5692cf137f2a38885dead1907f0350542505ee961a5cb430ef5992f790d3ac77
+MISC metadata.xml 245 SHA256 d99b26ca2fbca2938693a2955a53f4bd27ec389389c9dd0edc837a35b2338d77 SHA512 0b34b35bb16bcc796c549cb5b35da06ff468bcab0d1ea72eb9fd50c36fa44a5b0cb6e9db38b5a8007b0a3fd45c97a9a25bb9858f5d9ed12bda54a406380a1ec1 WHIRLPOOL 1ff94c08d0dbb374fa14d946a9d46def59e6963094abfb8d6c7514b12f960d2b34c829adf4fc0a5d3b3cfd3ec3d3c85fa78d89281ca35ecefd4416f812dedaa2
diff --git a/media-video/dvbsnoop/dvbsnoop-1.4.50-r1.ebuild b/media-video/dvbsnoop/dvbsnoop-1.4.50-r1.ebuild
new file mode 100644
index 000000000000..f43b51400d77
--- /dev/null
+++ b/media-video/dvbsnoop/dvbsnoop-1.4.50-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="DVB/MPEG stream analyzer program"
+SRC_URI="mirror://sourceforge/dvbsnoop/${P}.tar.gz"
+HOMEPAGE="http://dvbsnoop.sourceforge.net/"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~ppc x86"
+DEPEND="virtual/linuxtv-dvb-headers"
+
+RDEPEND=""
+SLOT="0"
+IUSE=""
+
+src_prepare () {
+	epatch "${FILESDIR}/${P}-crc32.patch"
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS ChangeLog README
+}
diff --git a/media-video/dvbsnoop/files/dvbsnoop-1.4.50-crc32.patch b/media-video/dvbsnoop/files/dvbsnoop-1.4.50-crc32.patch
new file mode 100644
index 000000000000..eb663a4426c4
--- /dev/null
+++ b/media-video/dvbsnoop/files/dvbsnoop-1.4.50-crc32.patch
@@ -0,0 +1,59 @@
+diff -rupN dvbsnoop-1.4.50-origdeb/src/misc/crc32.c dvbsnoop-1.4.50/src/misc/crc32.c
+--- dvbsnoop-1.4.50-origdeb/src/misc/crc32.c	2006-01-02 21:24:04.000000000 +0200
++++ dvbsnoop-1.4.50/src/misc/crc32.c	2010-01-19 13:21:37.000000000 +0200
+@@ -17,14 +17,14 @@  $Id$
+ 
+ 
+ 
+-#include <sys/types.h>
++#include <stdint.h>
+ #include "crc32.h"
+ 
+ 
+ 
+ // CRC32 lookup table for polynomial 0x04c11db7
+ 
+-static u_long crc_table[256] = {
++static uint32_t crc_table[256] = {
+ 	0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9, 0x130476dc, 0x17c56b6b,
+ 	0x1a864db2, 0x1e475005, 0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, 0x2b4bcb61,
+ 	0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd, 0x4c11db70, 0x48d0c6c7,
+@@ -69,10 +69,10 @@ static u_long crc_table[256] = {
+ 	0x933eb0bb, 0x97ffad0c, 0xafb010b1, 0xab710d06, 0xa6322bdf, 0xa2f33668,
+ 	0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4};
+ 
+-u_long crc32 (char *data, int len)
++uint32_t crc32 (char *data, int len)
+ {
+ 	register int i;
+-	u_long crc = 0xffffffff;
++	uint32_t crc = 0xffffffff;
+ 
+ 	for (i=0; i<len; i++)
+ 		crc = (crc << 8) ^ crc_table[((crc >> 24) ^ *data++) & 0xff];
+diff -rupN dvbsnoop-1.4.50-origdeb/src/misc/crc32.h dvbsnoop-1.4.50/src/misc/crc32.h
+--- dvbsnoop-1.4.50-origdeb/src/misc/crc32.h	2006-01-02 21:24:04.000000000 +0200
++++ dvbsnoop-1.4.50/src/misc/crc32.h	2010-01-19 13:21:37.000000000 +0200
+@@ -19,8 +19,9 @@  $Id$
+ #ifndef __CRC32_H
+ #define __CRC32_H
+ 
++#include <stdint.h>
+ 
+-u_long crc32 (char *data, int len);
++uint32_t crc32 (char *data, int len);
+ 
+ 
+ #endif
+diff -rupN dvbsnoop-1.4.50-origdeb/src/sections/sectables.c dvbsnoop-1.4.50/src/sections/sectables.c
+--- dvbsnoop-1.4.50-origdeb/src/sections/sectables.c	2005-12-29 05:43:40.000000000 +0200
++++ dvbsnoop-1.4.50/src/sections/sectables.c	2010-01-19 13:59:07.000000000 +0200
+@@ -269,7 +269,7 @@ void decodeSI_packet (u_char *buf, int l
+   softcrc_fail = 0;
+ 
+   if (opt->soft_crc) {
+-    u_long crc = crc32 ((char *)buf,len);
++    uint32_t crc = crc32 ((char *)buf,len);
+     if (crc) {
+ 	softcrc_fail = 1;
+     }
diff --git a/media-video/dvbsnoop/metadata.xml b/media-video/dvbsnoop/metadata.xml
new file mode 100644
index 000000000000..6586705a719e
--- /dev/null
+++ b/media-video/dvbsnoop/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">dvbsnoop</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/dvd9to5/Manifest b/media-video/dvd9to5/Manifest
new file mode 100644
index 000000000000..9ebc7a12b25d
--- /dev/null
+++ b/media-video/dvd9to5/Manifest
@@ -0,0 +1,5 @@
+DIST dvd9to5-0.1.7.tar.bz2 11803 SHA256 181d6eed53624e6b4364506d12aa9f2ce64cef821503553f769c83b1bfdcecb9 SHA512 5329ad810d181b62d3b57b48f21dc8114fb11806745ab611e1aac5980f3e732c740aaddf17de7ef6f23769c9da934e646c01e82c9aed3390b5a2f9ad704f5f84 WHIRLPOOL bb9d3e249a481f78074cdc999cef238c89258cbb7ed9c5e14ae82c0e1a92fc56c7aa56455d0529a3f0d1e7afc27db2dbdca2e0d7143872daf5306ca08cd87d15
+EBUILD dvd9to5-0.1.7.ebuild 619 SHA256 8ebc7cf6c70f4fe33f42c08a42f351cfa26b5eae168f2149518cd07ad8288f72 SHA512 28115375e4aaffbae8bfe0bd80b0d347040a7c3dbd195f42dd100d7ecdd6308de31317141f0111fc442b2f1068a3e3348b9b7f35f5b0bfc7f1dfc4168225d723 WHIRLPOOL e5d48333f172cd29a40a61c31a9f970cdae01e793c9be92a76b264a729e2cfcf25d8c7a0698e13647cd598e4bb3796a0dc6adf64b08d83c6d55eb156350efb30
+MISC ChangeLog 2823 SHA256 4b9da494f1f7dc23d6f5d2554c39f028467330042eb202590470f6b96a9723bc SHA512 9103629e6286f20977015f2ecfc43018103e80ed08d4a7118c0e0e5041f889edcd08a64bf46100251330e1a009616905bd17bdfd4afb11375de8bc158f507098 WHIRLPOOL dc400bf8d76bc65fb361890d8c7db9cb4c0f677f2f51586366f2dacf2cf8e904d015e30fc5962f9ced0b6f41413d34c3abb426fa323af36f146a76500814f7f2
+MISC ChangeLog-2015 1225 SHA256 7f39dc075d2886f573e07e47f5580efd76f40a35e1b2236f9e10e15c271023c0 SHA512 12c718f57cae0668b23125f48c0242fd443c0f7a1623e3d6e23916b4bf2251897fcac2edfeab074af3a68ab4d7e6002823a39136c5b5e22a072a5400daa83721 WHIRLPOOL 71d835ad3277df01abc7d7043299bd4ceef6f30587aa43ae671cfc0ea23792de0c0d767562763b842073aa992fa6e256294c4937fcc31479d7c4a049105b3fc4
+MISC metadata.xml 341 SHA256 8e4347541735059f7b3465134e5c4f2a541abf582bdb42bf7c3d496f5b0b7c22 SHA512 46233755a2b2654e19356ea2680101440b4b8c592dd4af1d472ff0837dba4c8dcfa38d9d7ee86e0079def89361974ba48faba4e147403ff140787c13bdd7e888 WHIRLPOOL 90c320bf3aeef617846fb956b78801804287fd6933fe64dcc3e44841f8f9793138feecc42f34d347dadb5441a9164678cd5d31fa016590309cb01d5898b0ef44
diff --git a/media-video/dvd9to5/dvd9to5-0.1.7.ebuild b/media-video/dvd9to5/dvd9to5-0.1.7.ebuild
new file mode 100644
index 000000000000..0ec5eecdf4ef
--- /dev/null
+++ b/media-video/dvd9to5/dvd9to5-0.1.7.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Perl script to backup the main feature of a DVD-9 on DVD-5"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="http://bluray.beandog.org/dvd9to5/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+RDEPEND=">=media-video/transcode-0.6.11
+	>=media-video/mjpegtools-1.6.2
+	>=media-video/dvdauthor-0.6.10
+	app-cdr/dvd+rw-tools
+	dev-lang/perl"
+
+src_compile() {
+	true # nothing to do
+}
+
+src_install() {
+	dobin dvd9to5.pl
+	dodoc CHANGELOG README TODO dvd9to5.conf.example
+}
diff --git a/media-video/dvd9to5/metadata.xml b/media-video/dvd9to5/metadata.xml
new file mode 100644
index 000000000000..7856c21806be
--- /dev/null
+++ b/media-video/dvd9to5/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>media-video@gentoo.org</email>
+</maintainer>
+<longdescription lang="en">
+A program to rip double layer discs (9gig) to single layer discs (5 gig).
+</longdescription>
+</pkgmetadata>
diff --git a/media-video/dvdauthor/Manifest b/media-video/dvdauthor/Manifest
new file mode 100644
index 000000000000..cf9aa68b5bd9
--- /dev/null
+++ b/media-video/dvdauthor/Manifest
@@ -0,0 +1,9 @@
+AUX dvdauthor-0.7.1-glibc220.patch 3462 SHA256 e74c5ab228fe0bdaaf66b7662507b980f2790cd8df3722a3666e2bb560633e00 SHA512 1f1dd830ab7e101e412429453185a7221f1c417e441aa0f7937576695fc079a3935ddd5925c983e48b716b08059942541942a392c5bce7c360942f67c47e22ea WHIRLPOOL 139bb33a441a56fc2fe8447ca619b8aca483ff2954d2beeb47d46240420bb7e64248727f2cd4f6d9943187a12a022263bc1fbd85f461f740a6a4defdf0bdbc1c
+AUX dvdauthor-0.7.2-imagemagick7.patch 850 SHA256 0c190fab9cc548de3981a352c4310205f536f71ba6e31198b61f67d10d27a1fd SHA512 9b1862efaedf97dd9f8a138fe172c76b442e4c4203ed8133f9e0f77a9edef7a5f1d5d9ced4f358892375493f7d3547eff6bb07572d2fbd288255eeaeaadfc04b WHIRLPOOL e4abfac049e61a3f3afb5cfdccb8c42b9987c8ef7f472fd5dc6d513fa3ddaac1b897d88396d5fee61977ad06e0221f4dfe8bc80400fc824064fffeff15b08435
+DIST dvdauthor-0.7.1.tar.gz 421324 SHA256 501fb11b09c6eb9c5a229dcb400bd81e408cc78d34eab6749970685023c51fe9 SHA512 0875300df4711bf5758cb8a3ec03793689abd403cdebfc5736463d9b6df49a22e66e9e1f0c2abfcb7d25469c2e7f7e76789f7779cc0743ec972f8965b0f744a9 WHIRLPOOL c07526bbdbd75b4ddc0f2a1057f2bf27dbb5c63b4e4495b3a051d530af58ba4d4d75ec15dff2e3628cd1cb46b476ecb6a3d640ec30e1e6692d832549108b3e63
+DIST dvdauthor-0.7.2.tar.gz 648305 SHA256 3020a92de9f78eb36f48b6f22d5a001c47107826634a785a62dfcd080f612eb7 SHA512 202b8bba38939d122dc864921a57e89906ca99ddabf44e3b07419cc42cc052567cd892b41f1171c9c195c9a770758e9319a942ea64d14ee8fa847588c7761125 WHIRLPOOL d74d9b9d7976c5b98c9c6ebae5f5af5c201bc93f295c400b8cf7a10d4012e9b602f7817dd4acca70578a347d38fbe5bf43bbe8df398b4bc38c20bcc165ee1c3c
+EBUILD dvdauthor-0.7.1-r1.ebuild 1179 SHA256 2f5f67001ca8ada92a818c89f2ae6b36154dba4e9613f45f70a04e3a892f3ab1 SHA512 5b32d4c47c63cf0fc42be1b50d6175a18ab61f629bc731fb965c441b0f99dc7e4f2bef6646afac2dfa751cd4bf72d5a1ac6149bafa83274f472ae427cbae72b0 WHIRLPOOL 469e739db98f0616bd0b3ad98253b3bb5d9728d271d238d41650f6eb5d09c16255f1e4c8ed50fbafc11c35c1a122e100eba4ba3c7f0a7d3b0773cdde42e282e4
+EBUILD dvdauthor-0.7.2-r1.ebuild 1274 SHA256 d7453f480e07e540b520ed2b68bad218b7e610254f515f36afc5e1bec34482f8 SHA512 d183c95c673a28c0f2f604cb70ab3cf1a6be66027fcfe0a90a57ca171c07bef109583b5e15825e5384b1d08bbb31d1839279073d8329159fe9c353742a6b80f8 WHIRLPOOL 29c019ebb8c5dccd145fc17aee5b10b1a17532ca40b9560807b3ec0145c4a35f7726a1f44eb0a10c856e41b93e23ce79abf2fbcf0f38f53184b931e2c7556a05
+MISC ChangeLog 3131 SHA256 f6c59c78c5c8d5f1fc8c22d4e55fb9df790021724d48a16dc3da0777a03f4b7a SHA512 ca64984688ba6fa9c4d3a54870b574ef887c57dc2e1f703e2f685b6400624f907e579d4a3095813741261e1123c3e4953b2157abbf73cacaf15fc70b47c7fc23 WHIRLPOOL 984b2087f52753ef271857ee29abd0172051b0733f124f68a9a30bdee8be33be772de9f870484e0cc36564217c8309fe4ab55f9c7eea6ff511b9b0761cb8e28d
+MISC ChangeLog-2015 7685 SHA256 63e39b9e149659b6d91dedd78c46da6291fbf3f4224ebde159cad591ca097af5 SHA512 c7715514194f4a1295e1a5e71da24cf0c8796774a919f79a68589c65fe72722be83c23c8ec97df6727a7566d46bfc43ef238d79895c8feb0739fe1f37adb2fd1 WHIRLPOOL 42b3591b174e9500c2155e4672ba64ba86ed6beefcfe73b543150d08756b60887cca3c3eb722c90675cde1263cdf54eb92c66c89d5781e990e1a5e807d132a0d
+MISC metadata.xml 310 SHA256 6fc2126de90efd249044ece78d273009e1de2b4e84eaba0fab99fe82ab155e9e SHA512 e9f2f78be647d48778accbf7da1d1b925dd8c441fa07743c776eee3362bf75f57a7051a7805ad1b2ab76a5958a18ae1b889ccb006da66d3197fefb0498e1f0c4 WHIRLPOOL 4f74bd85d2820c980e1c3e1e66b65cfbc979b432df7a919b01b68b882f153af6bd2ef14103a4ec31448da1679adc2ed2855d0f2df9ca7368b7eabba6f99fc356
diff --git a/media-video/dvdauthor/dvdauthor-0.7.1-r1.ebuild b/media-video/dvdauthor/dvdauthor-0.7.1-r1.ebuild
new file mode 100644
index 000000000000..838735e5b1f2
--- /dev/null
+++ b/media-video/dvdauthor/dvdauthor-0.7.1-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Tools for generating DVD files to be played on standalone DVD players"
+HOMEPAGE="http://dvdauthor.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+IUSE="graphicsmagick +imagemagick"
+REQUIRED_USE="^^ ( graphicsmagick imagemagick )"
+
+RDEPEND=">=dev-libs/fribidi-0.19.2
+	dev-libs/libxml2
+	>=media-libs/freetype-2
+	media-libs/libdvdread
+	media-libs/libpng:0=
+	graphicsmagick? ( media-gfx/graphicsmagick:= )
+	imagemagick? ( media-gfx/imagemagick:= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${PN}
+
+DOCS=( AUTHORS ChangeLog README TODO )
+
+PATCHES=(
+	"${FILESDIR}/${P}-glibc220.patch"
+)
+
+src_prepare() {
+	default
+	if use graphicsmagick ; then
+		sed -i -e 's:ExportImagePixels:dIsAbLeAuToMaGiC&:' configure \
+			|| die
+	fi
+}
+
+src_configure() {
+	use graphicsmagick && \
+		append-cppflags "$($(tc-getPKG_CONFIG) --cflags GraphicsMagick)" #459976
+	append-cppflags "$($(tc-getPKG_CONFIG) --cflags fribidi)" #417041
+	econf
+}
diff --git a/media-video/dvdauthor/dvdauthor-0.7.2-r1.ebuild b/media-video/dvdauthor/dvdauthor-0.7.2-r1.ebuild
new file mode 100644
index 000000000000..b84707597712
--- /dev/null
+++ b/media-video/dvdauthor/dvdauthor-0.7.2-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Tools for generating DVD files to be played on standalone DVD players"
+HOMEPAGE="http://dvdauthor.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="graphicsmagick +imagemagick"
+REQUIRED_USE="^^ ( graphicsmagick imagemagick )"
+
+RDEPEND=">=dev-libs/fribidi-0.19.2
+	dev-libs/libxml2
+	>=media-libs/freetype-2
+	media-libs/libdvdread
+	media-libs/libpng:0=
+	graphicsmagick? ( media-gfx/graphicsmagick:= )
+	imagemagick? ( media-gfx/imagemagick:= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}"
+
+DOCS=( AUTHORS ChangeLog README TODO )
+
+src_prepare() {
+	default
+
+	if use imagemagick && has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
+		eapply "${FILESDIR}/${PN}-0.7.2-imagemagick7.patch"
+	fi
+
+	if use graphicsmagick ; then
+		sed -i -e 's:ExportImagePixels:dIsAbLeAuToMaGiC&:' configure \
+			|| die
+	fi
+}
+
+src_configure() {
+	use graphicsmagick && \
+		append-cppflags "$($(tc-getPKG_CONFIG) --cflags GraphicsMagick)" #459976
+	append-cppflags "$($(tc-getPKG_CONFIG) --cflags fribidi)" #417041
+	econf
+}
diff --git a/media-video/dvdauthor/files/dvdauthor-0.7.1-glibc220.patch b/media-video/dvdauthor/files/dvdauthor-0.7.1-glibc220.patch
new file mode 100644
index 000000000000..880c63aa79d7
--- /dev/null
+++ b/media-video/dvdauthor/files/dvdauthor-0.7.1-glibc220.patch
@@ -0,0 +1,162 @@
+From 5b890b47aaf6f692c876faf435e6bf8990e7a45d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
+Date: Sat, 19 Jul 2014 21:06:58 +0300
+Subject: [PATCH] compat.h needs stuff from config.h so include it there
+
+This was brought up by dvdvml.* not including it and thus causing a
+build failure on Fedora (22) devel. While at it, uninclude config.h
+from files where it was included just for compat.h reasons.
+---
+ src/compat.h        | 2 ++
+ src/conffile.c      | 1 -
+ src/dvdauthor.c     | 2 --
+ src/dvdcompile.c    | 2 --
+ src/dvdpgc.c        | 1 -
+ src/dvdunauthor.c   | 2 --
+ src/dvduncompile.c  | 1 -
+ src/dvdvob.c        | 2 --
+ src/readxml.c       | 2 --
+ src/spuunmux.c      | 1 -
+ src/subgen-encode.c | 2 --
+ 11 files changed, 2 insertions(+), 16 deletions(-)
+
+diff --git a/src/compat.h b/src/compat.h
+index 126dcd7..93de081 100644
+--- a/src/compat.h
++++ b/src/compat.h
+@@ -1,6 +1,8 @@
+ // basic headers
+ #define _GNU_SOURCE /* really just for strndup */
+ 
++#include "config.h"
++
+ #ifdef HAVE_STDBOOL_H
+ # include <stdbool.h>
+ #else
+diff --git a/src/conffile.c b/src/conffile.c
+index cab661a..36ded07 100644
+--- a/src/conffile.c
++++ b/src/conffile.c
+@@ -21,7 +21,6 @@
+  * MA 02110-1301 USA.
+  */
+ 
+-#include "config.h"
+ #include "compat.h"
+ #include <errno.h>
+ #include "conffile.h"
+diff --git a/src/dvdauthor.c b/src/dvdauthor.c
+index d591d68..4860258 100644
+--- a/src/dvdauthor.c
++++ b/src/dvdauthor.c
+@@ -20,8 +20,6 @@
+  * MA 02110-1301 USA.
+  */
+ 
+-#include "config.h"
+-
+ #include "compat.h"
+ 
+ #include <sys/types.h>
+diff --git a/src/dvdcompile.c b/src/dvdcompile.c
+index fd232b6..47f13e5 100644
+--- a/src/dvdcompile.c
++++ b/src/dvdcompile.c
+@@ -20,8 +20,6 @@
+  * MA 02110-1301 USA.
+  */
+ 
+-#include "config.h"
+-
+ #include "compat.h"
+ #include <assert.h>
+ 
+diff --git a/src/dvdpgc.c b/src/dvdpgc.c
+index e0adc61..cf6eb04 100644
+--- a/src/dvdpgc.c
++++ b/src/dvdpgc.c
+@@ -20,7 +20,6 @@
+  * MA 02110-1301 USA.
+  */
+ 
+-#include "config.h"
+ #include "compat.h"
+ #include <errno.h>
+ #include <assert.h>
+diff --git a/src/dvdunauthor.c b/src/dvdunauthor.c
+index ccd422f..f988cdf 100644
+--- a/src/dvdunauthor.c
++++ b/src/dvdunauthor.c
+@@ -23,8 +23,6 @@
+  * MA 02110-1301 USA.
+  */
+ 
+-#include "config.h"
+-
+ #include "compat.h"
+ 
+ #include <ctype.h>
+diff --git a/src/dvduncompile.c b/src/dvduncompile.c
+index 0c5eaf1..a064011 100644
+--- a/src/dvduncompile.c
++++ b/src/dvduncompile.c
+@@ -22,7 +22,6 @@
+  * MA 02110-1301 USA.
+  */
+ 
+-#include "config.h"
+ #include "compat.h"
+ 
+ #include <stdio.h>
+diff --git a/src/dvdvob.c b/src/dvdvob.c
+index 2d7e2b8..2146689 100644
+--- a/src/dvdvob.c
++++ b/src/dvdvob.c
+@@ -20,8 +20,6 @@
+  * MA 02110-1301 USA.
+  */
+ 
+-#include "config.h"
+-
+ #include "compat.h"
+ 
+ #include <assert.h>
+diff --git a/src/readxml.c b/src/readxml.c
+index 61ff0a1..3b83f07 100644
+--- a/src/readxml.c
++++ b/src/readxml.c
+@@ -20,8 +20,6 @@
+  * MA 02110-1301 USA.
+  */
+ 
+-#include "config.h"
+-
+ #include "compat.h"
+ 
+ #include <assert.h>
+diff --git a/src/spuunmux.c b/src/spuunmux.c
+index 1981e41..94fcb10 100644
+--- a/src/spuunmux.c
++++ b/src/spuunmux.c
+@@ -31,7 +31,6 @@
+  * MA 02110-1301 USA.
+  */
+ 
+-#include "config.h"
+ #include "compat.h"
+ 
+ #include <fcntl.h>
+diff --git a/src/subgen-encode.c b/src/subgen-encode.c
+index 53ed4b2..962e902 100644
+--- a/src/subgen-encode.c
++++ b/src/subgen-encode.c
+@@ -21,8 +21,6 @@
+  * MA 02110-1301 USA.
+  */
+ 
+-#include "config.h"
+-
+ #include "compat.h"
+ 
+ #include <assert.h>
+ 
\ No newline at end of file
diff --git a/media-video/dvdauthor/files/dvdauthor-0.7.2-imagemagick7.patch b/media-video/dvdauthor/files/dvdauthor-0.7.2-imagemagick7.patch
new file mode 100644
index 000000000000..9f9e3a0b3016
--- /dev/null
+++ b/media-video/dvdauthor/files/dvdauthor-0.7.2-imagemagick7.patch
@@ -0,0 +1,37 @@
+--- dvdauthor/src/subgen-image.c
++++ dvdauthor/src/subgen-image.c
+@@ -30,7 +30,7 @@
+ 
+ #if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK)
+ #include <stdarg.h>
+-#include <magick/api.h>
++#include <MagickWand/MagickWand.h>
+ #else
+ #include <png.h>
+ #endif
+@@ -181,7 +181,8 @@
+     unsigned long magickver;
+     unsigned char amask;
+ 
+-    GetExceptionInfo(&ei);
++    ExceptionInfo *exception_info;
++    exception_info = AcquireExceptionInfo();
+     ii=CloneImageInfo(NULL);
+     strcpy(ii->filename,s->fname);
+     im=ReadImage(ii,&ei);
+@@ -1098,13 +1099,13 @@
+ void image_init()
+ {
+ #if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK)
+-    InitializeMagick(NULL);
++    MagickCoreGenesis("", MagickFalse);
+ #endif
+ }
+ 
+ void image_shutdown()
+ {
+ #if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK)
+-    DestroyMagick();
++    MagickCoreTerminus();
+ #endif
+ }
diff --git a/media-video/dvdauthor/metadata.xml b/media-video/dvdauthor/metadata.xml
new file mode 100644
index 000000000000..f98abb86f189
--- /dev/null
+++ b/media-video/dvdauthor/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>media-video@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">dvdauthor</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-video/dvdbackup/Manifest b/media-video/dvdbackup/Manifest
new file mode 100644
index 000000000000..2e0ddf575cdc
--- /dev/null
+++ b/media-video/dvdbackup/Manifest
@@ -0,0 +1,7 @@
+DIST dvdbackup-0.4.1.tar.bz2 188496 SHA256 8194fe84950f3886551e75357d56c0fff3bd5fbd47d3b661c75d57d60cd3c6be SHA512 4f6fcb06f3bc9c0066e9cb51582707accc9629c8239f15d84a05a877927292449dda515796bd91069b1280ceb99dab50213cf6f3fbc79e6f56242923d9e2ae86 WHIRLPOOL 10e386a69fd20e280ec9cecd2bdd08c583c2ed91d43a9d6dc2e0ebd2aa9a3a2061fa895d2c03e8f7735804026cb96079dac4cd18f45764bccef1043a1c7353db
+DIST dvdbackup-0.4.2.tar.xz 178660 SHA256 ef8c56fbb82b15b7eef00d2d3118c8253f9770009ed7bb2a5d4849acf88183e6 SHA512 df9abb2ca0b8a7cd7855ddff94dae249b06b2ec0ee42f3e9c53aa46aebd9885bdf26dacecbd4a20ff5f642ea10c0c64b811d25c23802c8a2b1489281900fbe0d WHIRLPOOL 8c1612b3fc33d9d22c52fce705289f371d026650f85a8ecde2e5d29d540a5649f594a139bebe15d76bfdd8839af6468fd0175a43e56e335f0e8f66e622b7d3a0
+EBUILD dvdbackup-0.4.1.ebuild 648 SHA256 04cb343fcbe1e93f27947a5ffffb574b08f95e61041e4a5b883c7275af9eb542 SHA512 698474016f08a7b3bc7eb3fa708266b4a6c009fdeb517c114d33e1cbc8532ce7c997b17b92bac8f8a4cd41e1a7393f04e1df6cfdc802354a9948840515a80c0e WHIRLPOOL 5ad46fc052724d61ce1c4939dd84e810108fe8040c9b5f4216360c3e8bd5a12ae99f5ce47540d1f7977da83d2329d0ab6f2c3463858a8058976c9d822ecfe2b3
+EBUILD dvdbackup-0.4.2.ebuild 647 SHA256 2268174fc9ca575cb55fc4cb9a7ae0dae1214aebef9309c0768736122ebedf37 SHA512 d2b9d265b8059bb4cfd8dff120e042faf47fe49e15d112e521428b08285f89384c03cd4289bd4c17a651aa2443e125f672c1f332a69a4da8afb762fccc0f824b WHIRLPOOL 428547f43ebaf5c2b427b190486cb8efa5df2885fbd1a04e5d6d109825b5a1a0731c01be7a5eff00f0419c6736432ebfd22be7427192a2455e8f5b0e73d8dde3
+MISC ChangeLog 2492 SHA256 de7ccd156295ec7fb2cfc89682212dd888318598e31e18d914046e0564f25356 SHA512 3e3f8181cd95c8c943a2d3bfdd10ba25edfcb304973e370794a7b8db5799c9d048ae11014e96f5e99e025f3061e52d9a080cc4cad3664539ae17955e7a20f387 WHIRLPOOL 0b3744a39b2a8e236ec9b4fbcee96c302fa139ac57306d02424be51f6e21ce3471174e7628138d803fa488a549dc015f2c7d539b9609ab93d3bad63f174b2949
+MISC ChangeLog-2015 4409 SHA256 d253e08e173fbb381ea4ae6622a24711280cc333cfc92b0f1c72ca12cd054906 SHA512 e3809a394cf158cf331a7897e4267a9701e02fa9534c4ec8f064e8eebe4045bfd833b26c86fca36badfac69b813e4b36d7dd8ffe034377a054073945874ade18 WHIRLPOOL 91175a7b563ff2033abdc846dc02118a96e637f44346d3c1e2d579cb06aeebf4c20dfb59533dc26c2fe38689e14d2ae38d9124aad8015bf11003a4b4be85ec14
+MISC metadata.xml 302 SHA256 a6055a08ef3d616c68525394e161edf3e7bc3fa3c09f2f041f7322f36c42f697 SHA512 85850b8f0f8de515d846da33fced47ff85195616dc93562edbc62f11bb1108a101cdcd0db7c54be28c17f56f8cea15af9839cfe34fe2b207ba002f770e9e205f WHIRLPOOL 9dd336eeb45755dac4edcd2d6db05e364624ca0e696f0c1a3958e07e339b748da88fa7d6fe64f94e7631183729b5165d6b7d373212286cc833fa7f2d514a7d72
diff --git a/media-video/dvdbackup/dvdbackup-0.4.1.ebuild b/media-video/dvdbackup/dvdbackup-0.4.1.ebuild
new file mode 100644
index 000000000000..4dc011b5d3a1
--- /dev/null
+++ b/media-video/dvdbackup/dvdbackup-0.4.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="Backup content from DVD to hard disk"
+HOMEPAGE="http://dvdbackup.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="nls"
+
+RDEPEND=">=media-libs/libdvdread-4.2.0_pre
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		--disable-rpath \
+		--docdir=/usr/share/doc/${PF}
+}
diff --git a/media-video/dvdbackup/dvdbackup-0.4.2.ebuild b/media-video/dvdbackup/dvdbackup-0.4.2.ebuild
new file mode 100644
index 000000000000..6dadc6d95997
--- /dev/null
+++ b/media-video/dvdbackup/dvdbackup-0.4.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="Backup content from DVD to hard disk"
+HOMEPAGE="http://dvdbackup.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="nls"
+
+RDEPEND=">=media-libs/libdvdread-4.2.0_pre
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		--disable-rpath \
+		--docdir=/usr/share/doc/${PF}
+}
diff --git a/media-video/dvdbackup/metadata.xml b/media-video/dvdbackup/metadata.xml
new file mode 100644
index 000000000000..b4e085bcdf90
--- /dev/null
+++ b/media-video/dvdbackup/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">dvdbackup</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/dvdimagecmp/Manifest b/media-video/dvdimagecmp/Manifest
new file mode 100644
index 000000000000..68cc35b9e24f
--- /dev/null
+++ b/media-video/dvdimagecmp/Manifest
@@ -0,0 +1,6 @@
+AUX dvdimagecmp-0.3.diff 727 SHA256 a87637c832c831ff75276cf71b816b6934532371693a46701234609930dcaf9c SHA512 6c925557e225c943f455874f5d702236a71c2bfdeebb2e244fb76605ec893885e970f0bf8cac17721e0695ae91b2c19775e05f26443d99d91663f8e7a3a57a99 WHIRLPOOL c4f13e0c5d439730cb4d11a9ad058398eff4d19097d9df94eec25cf23744c1b3f8d21057eee48be3c5109162eb327f08520eb8a147c5164911d2871a450c7e14
+DIST dvdimagecmp-0.3.tgz 10483 SHA256 453df95038dfa7cf5de679323d82963f62adbf39b72cc863542a05ae1dba25a1 SHA512 3283ea8e69702f7fbcb70645b75313e4e502bc1da80ce9698822d98782a7d7a7b1f886bd3220f7753c91717df2c42c38a5283b795467265d4edaf1330cab0db4 WHIRLPOOL 3371dab5631c490c45d441aafa5484511c84d82938028098b79f1fbfb3190eb4df4c3ed3dcbc07b012844c3035e2af6b45a5c139344e8d838fd62e59b911a414
+EBUILD dvdimagecmp-0.3-r1.ebuild 689 SHA256 035398a9936eb9d2d11f7844ac2dc8afd10f443334adeb67302965bf51170b3e SHA512 d516bd027c619bcdffdacd2505ef164b92ec30b9a46fe58bb9053e8949f49be78cd052f2b057d75121614cb22766b3fb4f4bd9a3a7ca058cbbe278b5cddc6ee4 WHIRLPOOL 0bd9050d0ab829dbcd82a697a16bc8edda4f8a6ec63f58ea51a85bf595d4f64da61b574c94b3cedd6498f62f90eea850eff1a4b608dff868a14bd6ea10211f27
+MISC ChangeLog 2473 SHA256 c6f0baf2af2032714a1e3575ffd5741c9acd1c4079d3f65da73e8b63964dee96 SHA512 0c851c4861496743513125dfbc2c049b15769096642bbf0f6a6e686cbd24ee7495e66c8a4774a26d4971d1fca65e3cd449a44cc39176c01ee1cd538ae2d09b1f WHIRLPOOL d40c61390725b73aee1ae673844446e19de0e5afa1c8fd66e9e2a383f2f18dda505a82965869784c147ebe5cb8f02aa74e665c6aba5e8221e5c1fd26b91075de
+MISC ChangeLog-2015 1735 SHA256 5d91d616ff7ea72859160ab42a58cf87465dfdab2fec6e38b992aa49104f7e95 SHA512 e7b4606831f93dd4ace3b209fd305fdff430cda0b1afaada4f4b8a581b49c8dc1b132687156eb43b21411470b628ce0b2f9e27f772e27b263d363b82b3c7908f WHIRLPOOL be8ea477e61a89189b3e6d9b9ef0af0a8e5b9f3801b151f2bc5aee4be1f4399f10e49e37b77ac73e1ab5cea9ebc623a157cc50abd50a96a678561a9c4ed969d0
+MISC metadata.xml 219 SHA256 4246299710294d9f4c0c15b97e8ae7925e01785b962551c6aa27174e99980bcd SHA512 24793c7fd0e2cef8fa5a0efd9bd55fed1e62ff6810199a969d4c0b869bac9b9ec79b288105b73b1b99734320bb13569a8ee00516b5452dd67d91d14dd17038e2 WHIRLPOOL e7f42aba21f5637bb8774cc17a488ecca121e56d5e855a3e956792955b8253f3049e08b2ab258728002263967db02e27914c82ecafee07a6d317bf857d13095f
diff --git a/media-video/dvdimagecmp/dvdimagecmp-0.3-r1.ebuild b/media-video/dvdimagecmp/dvdimagecmp-0.3-r1.ebuild
new file mode 100644
index 000000000000..1d8d8a5514d2
--- /dev/null
+++ b/media-video/dvdimagecmp/dvdimagecmp-0.3-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils toolchain-funcs flag-o-matic
+
+IUSE=""
+
+DESCRIPTION="Tool to compare a burned DVD with an image to check for errors"
+HOMEPAGE="http://panteltje.com/panteltje/dvd/"
+SRC_URI="http://panteltje.com/panteltje/dvd/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}.diff"
+}
+
+src_compile() {
+	append-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE	-D_LARGEFILE64_SOURCE
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	dobin dvdimagecmp
+	dodoc CHANGES README
+}
diff --git a/media-video/dvdimagecmp/files/dvdimagecmp-0.3.diff b/media-video/dvdimagecmp/files/dvdimagecmp-0.3.diff
new file mode 100644
index 000000000000..95917293c130
--- /dev/null
+++ b/media-video/dvdimagecmp/files/dvdimagecmp-0.3.diff
@@ -0,0 +1,23 @@
+diff -Naur dvdimagecmp-0.3.orig/dvdimagecmp.c dvdimagecmp-0.3/dvdimagecmp.c
+--- dvdimagecmp-0.3.orig/dvdimagecmp.c	2005-01-04 14:54:52.000000000 +0100
++++ dvdimagecmp-0.3/dvdimagecmp.c	2007-10-06 15:36:34.000000000 +0200
+@@ -33,6 +33,7 @@
+ #include <errno.h>
+ #include <ctype.h>
+ #include <time.h>
++#include <string.h>
+ 
+ #define MAX_RETRIES 1
+ #define BUFFER_SIZE	2048*16
+diff -Naur dvdimagecmp-0.3.orig/Makefile dvdimagecmp-0.3/Makefile
+--- dvdimagecmp-0.3.orig/Makefile	2005-01-04 14:54:52.000000000 +0100
++++ dvdimagecmp-0.3/Makefile	2007-10-06 15:36:59.000000000 +0200
+@@ -13,7 +13,7 @@
+ # -ltermcap
+ 
+ a.out : $(OBJECT)
+-	$(CC) -o dvdimagecmp  $(OBJECT)
++	$(CC) $(LDFLAGS) -o dvdimagecmp  $(OBJECT)
+ 		
+ # DEPENDENCIES
+ 
diff --git a/media-video/dvdimagecmp/metadata.xml b/media-video/dvdimagecmp/metadata.xml
new file mode 100644
index 000000000000..0427ec20bfd4
--- /dev/null
+++ b/media-video/dvdimagecmp/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+<email>media-video@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/media-video/dvdrip/Manifest b/media-video/dvdrip/Manifest
new file mode 100644
index 000000000000..026d663bab3f
--- /dev/null
+++ b/media-video/dvdrip/Manifest
@@ -0,0 +1,8 @@
+AUX dvdrip-0.98.11-fix_parallel_make.patch 880 SHA256 c5a6418038f97c9a04ac165d7305e42fcedf28d1564024fe4ad913e78cccc83b SHA512 0fabe81659cb510357381d99ae8eea73a6a986e7c646dfd6b0fb7d38920a8b7cf9e79cb40a3606cb88a97f7ff9250d5e64aefb0fa599b9d9e6ae4ce91e692fb9 WHIRLPOOL cb08ffc04a09f6eec37bdc8023fd9c533a287474e08abaeb89f0c9657e4408d603211bb85ac848e634cb8816f03b8e65ab4018dc5b638cb625e7b27c1c7d6bb3
+AUX dvdrip-0.98.11-libav.patch 1183 SHA256 6bd1393ba45fb396cf32374ad48c1dd6486ce11ad9cfb70ef96c2f9436619549 SHA512 38a4d034acb9f4cc0dcbe7deb274d820be5e8b623b8852316599fa76dc6407c7a0dd1c8fa204c659d075f0f5a0a7f73e99f6ca978859e845cc88b99ee51042ea WHIRLPOOL cf997f7c47d816142f3e54e019c25a80d98c3c58e776078ad0e8f7ac78c51eab406632f0081be9a550881bd44d7c40d924ed66e5780c1a598cb7e4ae53439371
+DIST dvdrip-0.98.11.tar.gz 2075302 SHA256 586c20968b2daa55c0afaaf334d5b9b8b6896d6ea45078a577e165806858c3a5 SHA512 8bb2e4cb72666ac3f7d1953e02ac868070503f00b05ea39b4961f54042088d07abd4ef020a9cefec11e96e965d84dd95d00288e7562d92551f480ccba88b9dce WHIRLPOOL f7c62a87a518944ebdb06dded99b71f563bbf6d95a0d62adfcb37b0faabf15bfe1b8900a8fcd4438d0c82fe038114fc717a40a80a2bfe94dd59f7530c388624e
+EBUILD dvdrip-0.98.11-r3.ebuild 1988 SHA256 d32d89ea6dc8c084e2a285fd624987e42ad6c62358023615852f57e89c165274 SHA512 b9fe7daaeec204ed2c8bb15a29b1df39444c9ff4aa188ed810a7c02d5dfcf4e14847f6a2a203ba9d169110d9a543687f5e451e5e49e435d4f8dd8b90fb07a356 WHIRLPOOL d276699410c81509a8c04476ebf6315530c78ccde0f7eb8c8fc6b9f1876c861b0013202ae090f5adfc43554270c4edb2f009bc32d8cf89f8435d5b9f6c3bba71
+EBUILD dvdrip-0.98.11-r4.ebuild 2141 SHA256 99faa04a12984233d511f7bfd1a338e5850cba8bc246e80049eeeb43f1f21e62 SHA512 02dc035addacca9fb444cbcefd36d4d93c1d6ce747d9ef36edf29c46763e3a959538ff2caec98cfc95868b1c0926d4edcdb5d12078608b21df53d7c1de3796ec WHIRLPOOL 83cd9301fadf0ea340b6f61d7d41aea67b03c4b4ecaec1b1ce1b8810558e2eb8a33720bde6aee1cd9e19f6b03de9abc061cccb84fa04d4d471de222ce5b79a74
+MISC ChangeLog 3089 SHA256 ccd912d85f219209579c8f3a9b8acd26f7d738b7cc10fd2021f22f42557fa67f SHA512 35c6a4dbeacbb631af847161a81d1bcefc552043336bcd72ec4b319b4bd260de739379a79e2c888552a1ec84f58cdc09265b26fa49a7ccc5a63c14c9988d400e WHIRLPOOL 4a2472a59ffbba6aea760c9c2da718944dcbcaeabbcffa913dbe368dea1ecaf845727974dafb6c1be4d5b17afd0ebc1cab3be789e8f519a024ff80141b857e6f
+MISC ChangeLog-2015 23269 SHA256 9290f33982dd03a36a37680078c1aac0da8f15385fe70cf42d62b665d1b4409a SHA512 3e0e409d5ef27ae6f16f0f65e96176dc6832340d1b2a6494e27e2cd6b7883720d1a1459a678aefb7a4a28350dd503109471422e48848600dc2f9a4d9def1d6bb WHIRLPOOL 0bc07ebb8b751a53fa61470a1fccd18dd9e37acf981203572b53271333a2ce94bdca3472967610e18880e5acf9a5c3299187ad9ba6bb64dbf76ea0304ebd0ebd
+MISC metadata.xml 389 SHA256 2dbee91eea1eeb5ea722668bf7eb8641c5e6b7bd877eba385501c34f0c99ec22 SHA512 f9762a6801b0f060cff8b36f328729aa20c71ec34fa33be7c6088e20004d3b42ac4d45b60c82774d7519b6be09b76aa9ea06b18fa252300b47fada916620ecfd WHIRLPOOL 2a886639efd974bff2c38ae3a72be1f287f8bd26a7f97bdd7569132c971bcf628efb17211031cdef81c0f445f03ca6407e62cc35473ab14ad283f0c3f19b3eeb
diff --git a/media-video/dvdrip/dvdrip-0.98.11-r3.ebuild b/media-video/dvdrip/dvdrip-0.98.11-r3.ebuild
new file mode 100644
index 000000000000..68bdf3b77ddf
--- /dev/null
+++ b/media-video/dvdrip/dvdrip-0.98.11-r3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils flag-o-matic perl-module
+
+DESCRIPTION="dvd::rip is a graphical frontend for transcode"
+HOMEPAGE="http://www.exit1.org/dvdrip/"
+SRC_URI="http://www.exit1.org/dvdrip/dist/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="ffmpeg fping mplayer ogg subtitles vcd vorbis xine xvid"
+
+DEPEND=">=dev-perl/Event-ExecFlow-0.64
+	>=dev-perl/Event-RPC-0.89
+	dev-perl/Gtk2
+	>=dev-perl/gtk2-ex-formfactory-0.65
+	>=dev-perl/libintl-perl-1.16
+	>=media-video/transcode-1.1.0[dvd,jpeg,mp3,ogg,vorbis]
+	virtual/imagemagick-tools
+	>=virtual/perl-podlators-2.5.3
+"
+RDEPEND="${DEPEND}
+	x11-libs/gdk-pixbuf:2[jpeg]
+	x11-libs/gtk+:2
+	ffmpeg? ( virtual/ffmpeg )
+	fping? ( >=net-analyzer/fping-2.2 )
+	mplayer? ( media-video/mplayer )
+	ogg? ( media-sound/ogmtools )
+	subtitles? ( media-video/subtitleripper )
+	vcd? (
+		media-video/transcode[mjpeg]
+		>=media-video/mjpegtools-1.6.0
+	)
+	vorbis? ( media-sound/vorbis-tools )
+	xine? ( media-video/xine-ui )
+	xvid? ( media-video/xvid4conf )
+	>=media-video/lsdvd-0.15"
+
+pkg_setup() {
+	filter-flags -ftracer
+	export SKIP_UNPACK_REQUIRED_MODULES=1 #255269
+
+	perl_set_version
+}
+
+src_prepare() {
+	sed -i -e 's:$(CC):$(CC) $(OTHERLDFLAGS):' src/Makefile || die #333739
+	epatch "${FILESDIR}"/${P}-fix_parallel_make.patch
+	# Fix default device for >=udev-180 wrt #224559
+	sed -i -e 's:/dev/dvd:/dev/cdrom:' lib/Video/DVDRip/Config.pm || die
+}
+
+src_install() {
+	newicon lib/Video/DVDRip/icon.xpm dvdrip.xpm
+	make_desktop_entry dvdrip dvd::rip
+
+	mydoc="Changes* Credits README TODO" perl-module_src_install
+}
+
+pkg_postinst() {
+	# bug 173924
+	if use fping; then
+		ewarn "For dvdrip-master to work correctly with cluster mode,"
+		ewarn "the fping binary must be setuid."
+		ewarn ""
+		ewarn "Run this command to fix it:"
+		ewarn "chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+		ewarn ""
+		ewarn "Note that this is a security risk when enabled."
+	fi
+}
diff --git a/media-video/dvdrip/dvdrip-0.98.11-r4.ebuild b/media-video/dvdrip/dvdrip-0.98.11-r4.ebuild
new file mode 100644
index 000000000000..3eaca7e3509d
--- /dev/null
+++ b/media-video/dvdrip/dvdrip-0.98.11-r4.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils flag-o-matic perl-module
+
+DESCRIPTION="dvd::rip is a graphical frontend for transcode"
+HOMEPAGE="http://www.exit1.org/dvdrip/"
+SRC_URI="http://www.exit1.org/dvdrip/dist/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="ffmpeg fping libav mplayer ogg subtitles vcd vorbis xine xvid"
+
+DEPEND=">=dev-perl/Event-ExecFlow-0.64
+	>=dev-perl/Event-RPC-0.89
+	dev-perl/Gtk2
+	>=dev-perl/gtk2-ex-formfactory-0.65
+	>=dev-perl/libintl-perl-1.16
+	>=media-video/transcode-1.1.0[dvd,jpeg,mp3,ogg,vorbis]
+	virtual/imagemagick-tools
+	>=virtual/perl-podlators-2.5.3
+"
+RDEPEND="${DEPEND}
+	x11-libs/gdk-pixbuf:2[jpeg]
+	x11-libs/gtk+:2
+	ffmpeg? (
+		libav? ( media-video/libav )
+		!libav? ( media-video/ffmpeg:0 )
+	)
+	fping? ( >=net-analyzer/fping-2.2 )
+	mplayer? ( media-video/mplayer )
+	ogg? ( media-sound/ogmtools )
+	subtitles? ( media-video/subtitleripper )
+	vcd? (
+		media-video/transcode[mjpeg]
+		>=media-video/mjpegtools-1.6.0
+	)
+	vorbis? ( media-sound/vorbis-tools )
+	xine? ( media-video/xine-ui )
+	xvid? ( media-video/xvid4conf )
+	>=media-video/lsdvd-0.15
+"
+
+pkg_setup() {
+	filter-flags -ftracer
+	export SKIP_UNPACK_REQUIRED_MODULES=1 #255269
+
+	perl_set_version
+}
+
+src_prepare() {
+	sed -i -e 's:$(CC):$(CC) $(OTHERLDFLAGS):' src/Makefile || die #333739
+	epatch "${FILESDIR}"/${P}-fix_parallel_make.patch
+	# Fix default device for >=udev-180 wrt #224559
+	sed -i -e 's:/dev/dvd:/dev/cdrom:' lib/Video/DVDRip/Config.pm || die
+
+	# Ubuntu patch for supporting libav
+	use libav && epatch "${FILESDIR}"/${P}-libav.patch
+}
+
+src_install() {
+	newicon lib/Video/DVDRip/icon.xpm dvdrip.xpm
+	make_desktop_entry dvdrip dvd::rip
+
+	mydoc="Changes* Credits README TODO" perl-module_src_install
+}
+
+pkg_postinst() {
+	# bug 173924
+	if use fping; then
+		ewarn "For dvdrip-master to work correctly with cluster mode,"
+		ewarn "the fping binary must be setuid."
+		ewarn ""
+		ewarn "Run this command to fix it:"
+		ewarn "chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+		ewarn ""
+		ewarn "Note that this is a security risk when enabled."
+	fi
+}
diff --git a/media-video/dvdrip/files/dvdrip-0.98.11-fix_parallel_make.patch b/media-video/dvdrip/files/dvdrip-0.98.11-fix_parallel_make.patch
new file mode 100644
index 000000000000..df766c07cbcc
--- /dev/null
+++ b/media-video/dvdrip/files/dvdrip-0.98.11-fix_parallel_make.patch
@@ -0,0 +1,28 @@
+http://bugs.gentoo.org/266739
+
+--- src/Makefile
++++ src/Makefile
+@@ -3,10 +3,10 @@
+ all:	../bin/dvdrip-splitpipe ../bin/dvdrip-progress
+ 
+ ../bin/dvdrip-splitpipe:	dvdrip-splitpipe.c
+-	$(CC) $(OTHERLDFLAGS) $(CFLAGS) -o dvdrip-splitpipe dvdrip-splitpipe.c && mv dvdrip-splitpipe ../bin
++	$(CC) $(OTHERLDFLAGS) $(CFLAGS) -o ../bin/dvdrip-splitpipe dvdrip-splitpipe.c
+ 
+ ../bin/dvdrip-progress:	dvdrip-progress.c
+-	$(CC) $(OTHERLDFLAGS) $(CFLAGS) -o dvdrip-progress dvdrip-progress.c && mv dvdrip-progress ../bin
++	$(CC) $(OTHERLDFLAGS) $(CFLAGS) -o ../bin/dvdrip-progress dvdrip-progress.c
+ 
+ clean:
+ 	rm -f dvdrip-splitpipe ../bin/dvdrip-splitpipe dvdrip-progress ../bin/dvdrip-progress
+--- Makefile.PL
++++ Makefile.PL
+@@ -52,7 +52,7 @@
+ sub MY::postamble {
+     '
+ bin/dvdrip-splitpipe bin/dvdrip-progress: src/Makefile
+-	cd src && make
++	cd src && ( $(MAKE) CC=$(CC) )
+ ';
+ }
+ 
diff --git a/media-video/dvdrip/files/dvdrip-0.98.11-libav.patch b/media-video/dvdrip/files/dvdrip-0.98.11-libav.patch
new file mode 100644
index 000000000000..a9d60e2338b1
--- /dev/null
+++ b/media-video/dvdrip/files/dvdrip-0.98.11-libav.patch
@@ -0,0 +1,29 @@
+Description: Port from ffmpeg to avconv.
+Author: Dmitrijs Ledkovs <xnox@ubuntu.com>
+
+--- dvdrip-0.98.11.orig/lib/Video/DVDRip/Depend.pm
++++ dvdrip-0.98.11/lib/Video/DVDRip/Depend.pm
+@@ -114,10 +114,10 @@ my %TOOLS = (
+     },
+     ffmpeg => {
+         order       => ++$ORDER,
+-        command     => "ffmpeg",
++        command     => "avconv",
+         comment     => __ "FFmpeg video converter command line program",
+         optional    => 1,
+-        version_cmd => "ffmpeg -version",
++        version_cmd => "avconv -version",
+         get_version => sub {
+             my ($cmd) = @_;
+             qx[$cmd 2>&1] =~ /version ([^\s]+)/i;
+--- dvdrip-0.98.11.orig/lib/Video/DVDRip/Title.pm
++++ dvdrip-0.98.11/lib/Video/DVDRip/Title.pm
+@@ -3184,7 +3184,7 @@ sub get_take_snapshot_command {
+         . "tcdemux -s 0x80 -x mpeg2 -S $grab_options->{S} "
+         . "-M 0 -d 0 -P /dev/null | "
+         . "tcextract -t vob -a 0 -x mpeg2 -d 0 | "
+-        . "ffmpeg -r $frame_rate -i - -an -r 1 -ss '$start' -vframes 1 snapshot%03d.png ";
++        . "avconv -r $frame_rate -i - -an -r 1 -ss '$start' -vframes 1 snapshot%03d.png ";
+ 
+     $command .= " && "
+         . "execflow convert"
diff --git a/media-video/dvdrip/metadata.xml b/media-video/dvdrip/metadata.xml
new file mode 100644
index 000000000000..8678ed3ab1ae
--- /dev/null
+++ b/media-video/dvdrip/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>media-video@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="fping">Enables fping support for cluster rendering</flag>
+    <flag name="subtitles">Enables support for subtitle ripping</flag>
+  </use>
+</pkgmetadata>
diff --git a/media-video/dvdstyler/Manifest b/media-video/dvdstyler/Manifest
new file mode 100644
index 000000000000..20cc3e63bf82
--- /dev/null
+++ b/media-video/dvdstyler/Manifest
@@ -0,0 +1,9 @@
+DIST DVDStyler-2.9.6.tar.bz2 8373340 SHA256 d9ac1c2fa8812c194d4a79a5954f96919a4823498a4200018964df549270c6e3 SHA512 7e45a61ecc5df29957c6ff71bf7d5032bc1cba3b43b8444f7cd065aabf3991961f998e220d41c05c3d4e9a3bc213c96bc484b467a40d1b10ab33630ea4cbbcea WHIRLPOOL d7b6f714fcde76c74f5f4dee66918ddfb17066f85147a7efd355fe19d057d3c56bf0f1116595cfa361b09f1d82ebc09ab0fad6f5fc8ab029df01a9abe267b564
+DIST DVDStyler-3.0.2.tar.bz2 8818276 SHA256 fda2105c83c7bf31492573cc81a3ae8730bbab804286dad4d86b5e0bd053158e SHA512 2ae54a3679bea0a6ea6b98c6bd26af13b9e2cb938dd58cf263e2ca2999d5ad48b58598d6f6a4a230e1ca1988cf6095c5ce17c1c2d8c103e28238ddedc5ead006 WHIRLPOOL e9f9a587368a02c17a8166025dc1e1484f91a709a77f6a56e61fc8b5e70bcada4a0ae63037dbd9a89817bbb46eda6bf75a305913731d424f07d146507cda8045
+DIST DVDStyler-3.0.3.tar.bz2 8850630 SHA256 1880386090723271688c236762b3dea5ae46422910a5f1ed68baf2faf51483c8 SHA512 b5e5a93d127bc45b844cadce036b2d70ede5b3ea9d5fd026a93d6a6813684873db41ca0d4cd15680e63a63f2ba4314f65c2a0c08e44d0b4bbcce703874c2c3ed WHIRLPOOL fb18ecdc865180ca06b545e07c962193a952414808b1ca8864744408c4615e307d0dc7adcd1a3f315916279deb67c1c5061537d5601c40a1f7b0e75ff2038079
+EBUILD dvdstyler-2.9.6-r1.ebuild 1741 SHA256 1b5e3d80078b2ae673b3b329575b22a58611122736253ac181c99393ead1f205 SHA512 ab1d8e6644179f68f27e8f4f39eec702d400816597411b03aebc4874e9b960695a6bddaf1488a67837d8f7bd2418fc8c9ec91354a57c837505236b2a5f8ee003 WHIRLPOOL b6f2bc57d5691be3bf461e5734c88fe63a75793018c7b9bec2fd8fbf9d95a514a551a87087c36622d5d6f9d20b56d18c6acd89cebc5ab562598145954659c3ff
+EBUILD dvdstyler-3.0.2.ebuild 1741 SHA256 bb00b3ad6514e46879bf34510e271d45e6cd6809005f3422634847a13a96df5e SHA512 a21936420a612da0be5d238fb1631a54e35b5d1692f84ace793128b8041dc31b7263d248701b4aea5ab50519332ed02a17561e4a5d697c9d2b30f7e85af7da15 WHIRLPOOL d86aa269bf7739f6ce0e72de428583c210d94a8c9b070bc95d42fcd0a3e02475de6e0e904203f4dc17de36f3826f8563da010447c03a3de989f8c81bd20a934b
+EBUILD dvdstyler-3.0.3.ebuild 1742 SHA256 8afabdd9ba46c7de18635cb2bb302a38707b51ba5b19ab75412ffa3a04d8b7d4 SHA512 ad0abd52ec284e6889cd63b87f663a6330da4b1505d4ef2136c70b9eca973bd2f337b298bbf9261c4e4d8da2ddc44bc478db2404b126dbec2af7b08fa2aac2f7 WHIRLPOOL cc477b8aabf0a8eb4e648109b5935ed21c5710a906092e62e9ec7a5d99935e2572a7fdf22383ffd225f71fd2025df13a046cfa96826ebb13a74711859250ed1e
+MISC ChangeLog 4572 SHA256 7ade3a3725890149d5eecc0589c0a6c805819c733ea23aa91ddafa1ec205e30c SHA512 85c7e8cb5a34053ad32b7a6a1380ab3863c0f16bd119e292b6c15d5c3fb93c97ccd42258d8ae4a13fa8e943493ce7f25be3bb80463cfea426e558ad5933db636 WHIRLPOOL da6ebd0ed27c1a49b0e73f45d3f572aa744e97fee0cbe297c1efe1ac26c9b9c048e5da6e811f1438fb5082d0b68b7ff3c98aae7a550ffc34aeb540698f643512
+MISC ChangeLog-2015 11636 SHA256 af6db4a98e079c705ae1a98ab62b31f80c85d02eb4f560b441c9c7d6f923c23f SHA512 58e7d3b88405ae077b89a2277b4789083aadf46e5f54c0a1b95a4724436527c3f3f8b1816422ed38d133ab6beb579f8eb8c385b436c32f39ecfc744c57bcc871 WHIRLPOOL ae9d2600a2325971d4f1cff42b2e5b0b3957c60eb4808165b38ac876b8c6aa0f76de7f1e6ecfc688d882c2c9006fd0b46adf2d31d9cbd7ceb8c139b034bdfc26
+MISC metadata.xml 302 SHA256 2b71d2d4a9132a66952b48130040c41ba2f8fb571676f11bd2553871de06c80f SHA512 ebc7b7d7e9d24c31f2e6f3cd811dbf7b36e142974cb909bace0929882230be34552aca8741e471374e62ffed749675440d2ee9b723bfd774a1c503d2a5bd40c2 WHIRLPOOL d46be2986f275723e6e7e8088bf01ebc127dfc7fa9f34c829efc105ced2c95a87b549bedd019c4599f7d5959942efd548909d8317e497c73165e56a3801bef0c
diff --git a/media-video/dvdstyler/dvdstyler-2.9.6-r1.ebuild b/media-video/dvdstyler/dvdstyler-2.9.6-r1.ebuild
new file mode 100644
index 000000000000..fbfdb6e87c35
--- /dev/null
+++ b/media-video/dvdstyler/dvdstyler-2.9.6-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_P=${P/dvds/DVDS}
+WX_GTK_VER=3.0
+
+inherit wxwidgets eutils
+
+DESCRIPTION="A cross-platform free DVD authoring application"
+HOMEPAGE="http://www.dvdstyler.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug libav +udev"
+
+COMMON_DEPEND="
+	>=app-cdr/dvd+rw-tools-7.1
+	media-libs/libexif:=
+	>=media-libs/wxsvg-1.5.5:=
+	>=media-video/dvdauthor-0.7.1
+	>=media-video/xine-ui-0.99.7
+	virtual/cdrtools
+	libav? ( >=media-video/libav-9:0=[encode] )
+	!libav? ( >=media-video/ffmpeg-2.6:0=[encode] )
+	virtual/jpeg:0
+	x11-libs/wxGTK:${WX_GTK_VER}=[gstreamer,X]
+	sys-apps/dbus
+	udev? ( >=virtual/libudev-215:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=app-cdr/dvdisaster-0.72.4
+	media-video/mjpegtools
+"
+DEPEND="${COMMON_DEPEND}
+	app-arch/zip
+	app-text/xmlto
+	sys-devel/gettext
+	virtual/yacc
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	need-wxwidgets unicode
+	# disable obsolete GNOME 2.x libraries wrt #508854
+	sed -i -e '/PKG_CONFIG/s:libgnomeui-2.0:dIsAbLeAuToMaGiC&:' configure || die
+	# rmdir: failed to remove `tempfoobar': Directory not empty
+	sed -i -e '/rmdir "$$t"/d' docs/Makefile.in || die
+	# fix underlinking wrt #367863
+	sed -i -e 's:@LIBS@:& -ljpeg:' wxVillaLib/Makefile.in || die
+	# silence desktop-file-validate QA check
+	sed -i \
+		-e '/Icon/s:.png::' -e '/^Encoding/d' -e '/Categories/s:Application;::' \
+		data/dvdstyler.desktop || die
+}
+
+src_configure() {
+	econf \
+		--docdir=/usr/share/doc/${PF} \
+		$(use_enable debug) \
+		--with-wx-config=${WX_CONFIG}
+}
+
+src_install() {
+	default
+	rm -f "${ED}"/usr/share/doc/${PF}/{COPYING*,INSTALL*}
+}
diff --git a/media-video/dvdstyler/dvdstyler-3.0.2.ebuild b/media-video/dvdstyler/dvdstyler-3.0.2.ebuild
new file mode 100644
index 000000000000..c705685063c2
--- /dev/null
+++ b/media-video/dvdstyler/dvdstyler-3.0.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_P=${P/dvds/DVDS}
+WX_GTK_VER=3.0
+
+inherit wxwidgets eutils
+
+DESCRIPTION="A cross-platform free DVD authoring application"
+HOMEPAGE="http://www.dvdstyler.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug libav +udev"
+
+COMMON_DEPEND="
+	>=app-cdr/dvd+rw-tools-7.1
+	media-libs/libexif:=
+	>=media-libs/wxsvg-1.5.9:=
+	>=media-video/dvdauthor-0.7.1
+	>=media-video/xine-ui-0.99.7
+	virtual/cdrtools
+	libav? ( >=media-video/libav-9:0=[encode] )
+	!libav? ( >=media-video/ffmpeg-2.6:0=[encode] )
+	virtual/jpeg:0
+	x11-libs/wxGTK:${WX_GTK_VER}=[gstreamer,X]
+	sys-apps/dbus
+	udev? ( >=virtual/libudev-215:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=app-cdr/dvdisaster-0.72.4
+	media-video/mjpegtools
+"
+DEPEND="${COMMON_DEPEND}
+	app-arch/zip
+	app-text/xmlto
+	sys-devel/gettext
+	virtual/yacc
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	need-wxwidgets unicode
+	# disable obsolete GNOME 2.x libraries wrt #508854
+	sed -i -e '/PKG_CONFIG/s:libgnomeui-2.0:dIsAbLeAuToMaGiC&:' configure || die
+	# rmdir: failed to remove `tempfoobar': Directory not empty
+	sed -i -e '/rmdir "$$t"/d' docs/Makefile.in || die
+	# fix underlinking wrt #367863
+	sed -i -e 's:@LIBS@:& -ljpeg:' wxVillaLib/Makefile.in || die
+	# silence desktop-file-validate QA check
+	sed -i \
+		-e '/Icon/s:.png::' -e '/^Encoding/d' -e '/Categories/s:Application;::' \
+		data/dvdstyler.desktop || die
+}
+
+src_configure() {
+	econf \
+		--docdir=/usr/share/doc/${PF} \
+		$(use_enable debug) \
+		--with-wx-config=${WX_CONFIG}
+}
+
+src_install() {
+	default
+	rm -f "${ED}"/usr/share/doc/${PF}/{COPYING*,INSTALL*}
+}
diff --git a/media-video/dvdstyler/dvdstyler-3.0.3.ebuild b/media-video/dvdstyler/dvdstyler-3.0.3.ebuild
new file mode 100644
index 000000000000..ed34681039c2
--- /dev/null
+++ b/media-video/dvdstyler/dvdstyler-3.0.3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_P=${P/dvds/DVDS}
+WX_GTK_VER=3.0
+
+inherit wxwidgets eutils
+
+DESCRIPTION="A cross-platform free DVD authoring application"
+HOMEPAGE="http://www.dvdstyler.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug libav +udev"
+
+COMMON_DEPEND="
+	>=app-cdr/dvd+rw-tools-7.1
+	media-libs/libexif:=
+	>=media-libs/wxsvg-1.5.11:=
+	>=media-video/dvdauthor-0.7.1
+	>=media-video/xine-ui-0.99.7
+	virtual/cdrtools
+	libav? ( >=media-video/libav-9:0=[encode] )
+	!libav? ( >=media-video/ffmpeg-2.6:0=[encode] )
+	virtual/jpeg:0
+	x11-libs/wxGTK:${WX_GTK_VER}=[gstreamer,X]
+	sys-apps/dbus
+	udev? ( >=virtual/libudev-215:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=app-cdr/dvdisaster-0.72.4
+	media-video/mjpegtools
+"
+DEPEND="${COMMON_DEPEND}
+	app-arch/zip
+	app-text/xmlto
+	sys-devel/gettext
+	virtual/yacc
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	need-wxwidgets unicode
+	# disable obsolete GNOME 2.x libraries wrt #508854
+	sed -i -e '/PKG_CONFIG/s:libgnomeui-2.0:dIsAbLeAuToMaGiC&:' configure || die
+	# rmdir: failed to remove `tempfoobar': Directory not empty
+	sed -i -e '/rmdir "$$t"/d' docs/Makefile.in || die
+	# fix underlinking wrt #367863
+	sed -i -e 's:@LIBS@:& -ljpeg:' wxVillaLib/Makefile.in || die
+	# silence desktop-file-validate QA check
+	sed -i \
+		-e '/Icon/s:.png::' -e '/^Encoding/d' -e '/Categories/s:Application;::' \
+		data/dvdstyler.desktop || die
+}
+
+src_configure() {
+	econf \
+		--docdir=/usr/share/doc/${PF} \
+		$(use_enable debug) \
+		--with-wx-config=${WX_CONFIG}
+}
+
+src_install() {
+	default
+	rm -f "${ED}"/usr/share/doc/${PF}/{COPYING*,INSTALL*}
+}
diff --git a/media-video/dvdstyler/metadata.xml b/media-video/dvdstyler/metadata.xml
new file mode 100644
index 000000000000..7db511ede33b
--- /dev/null
+++ b/media-video/dvdstyler/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">dvdstyler</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/dvgrab/Manifest b/media-video/dvgrab/Manifest
new file mode 100644
index 000000000000..19365fdc6b06
--- /dev/null
+++ b/media-video/dvgrab/Manifest
@@ -0,0 +1,7 @@
+AUX dvgrab-3.5-gcc6.patch 993 SHA256 148885d4de8ca880d93ed418913aafc08529dacda5cd0d1095682ad49451ff78 SHA512 db155702d050c58b7833c609e5e1a38f91256b5bf5b8c6c8619648e12851924fb0177ad7930f4dd77671bd6515abfd6059ed5ab5611aef9b6ba4e3c8260b88b0 WHIRLPOOL 1563c74a7fcb358d2d6c275e8d42fe60a900a8958252640fc8a10b08408a6564130d2d2e933c5aa726883be44187e390316802d361ed242911fec04b27e04c92
+DIST dvgrab-3.5.tar.gz 205268 SHA256 5910183429d300221783d6054ff5add15bb2ae49ae33272d723a314bc2ce0af9 SHA512 7d9cae1661d27dbef1d0dcdf18966a0ab386d936803ff7d071a18e0303fca45631c9b27187a413adfa4391c395e5909e3b8dc5c543d529e7805550f1a3ee6735 WHIRLPOOL 2e1227a1845c047e0b8161afa6b50cf1d271758fe4a47a77b7f47c46f1cc568e4fb72d8d795c5f1a0976fb12f0d6ff461c0326af002be5b3f1c6a5a3a4ebec90
+EBUILD dvgrab-3.5-r1.ebuild 706 SHA256 ea3a85ed800714c77b696bd68376667cdfd1b2f94a99ac8f44d1bbd078f80dd2 SHA512 f5d15abde322117c6818229b018ff0e696be7e81c29d3411f70c278595c3e69379454483c2d9a8ce3683b5e721c416f3a33c5eb143f800aff2832626df6db9fe WHIRLPOOL a74fc207d69f2fe3afdbc4fc1d0706417106574446646f6c447a021ea221cf7caf5a8816c3c383957974ae742bf2f55a618cfc46500ad99027964913a7b5215b
+EBUILD dvgrab-3.5.ebuild 787 SHA256 7e9d068f8b384cb3a059111bde0715e9d209595d75430c3bdd23f2ecc41874c8 SHA512 6c9a164a8837d2279710ef04744313edc2d210574615903ae079219b69f8036394df9d11eac390b7c44be77f7c1e23678058fca61347fd2c58edb9084b045590 WHIRLPOOL 1162d359095aebdd0994f4e12ecf300a528c4532b49b25f5f87be02279390a32649832d77eb58d8f32297ee947bc2e477e10d1afbe6adb09dcb26eeb15fd5075
+MISC ChangeLog 2423 SHA256 949a1dca7c8f62690e96b7d147d655a81c8aa217416adc82d91c0acd868c47fe SHA512 f167a747b4a4a1219bbb258953fa7b214bbd0e3cd9d3d3555d0c1427597f6daf01417ed62012b7cd0c3c9d05465b06dde4d1545c88a8b69de7061ae0590e6bc0 WHIRLPOOL d10dc3b734fdbe8c7a642604a79cfe68184a387640f44b1ecc65d7f7f618d70b68fb759cb8551aed7bece912a7011e79ebddba89987d91cdfba17b6c03cf152e
+MISC ChangeLog-2015 5696 SHA256 64bc6461429e8463504a76dbb34828f176b11e0e8f450113092e0c2e9fb3c42d SHA512 9dadbc48f3900866e0f6bd8fa870a5c060aec213f2cf5e6340212b661b4d56ec3c084fb1908a128f96e2cff35429c22865d869b2dff53945bff3002d52af50f8 WHIRLPOOL c2b70f9814f24e3f02684fd81175fed1cdd59c1c2365d903c1f00cf34f85afa57a5d9fb811dbc2d4557034ae8350611ebe9572e59c36da85c40e0f979a2ed17d
+MISC metadata.xml 305 SHA256 b8a8662171ec9a7761c6704393c03bd0ecf07a72efdf37de7f9f3c0d20268bea SHA512 957b950aea4b4ee25ebd490de7176fc07213a64237b20ccd17eb34e37246f133d86f9f726f64d71d4ebdd27b088e2259d6ffec85ea1221108becf559283b07ec WHIRLPOOL 4d6000e0dada136bd99604f47a130c613c091ae3029cf7a891bceb57cf5206740500088662e6d986200ebd1b08f789c66f10614a20d9d420af855b1709db8083
diff --git a/media-video/dvgrab/dvgrab-3.5-r1.ebuild b/media-video/dvgrab/dvgrab-3.5-r1.ebuild
new file mode 100644
index 000000000000..004dae6a1642
--- /dev/null
+++ b/media-video/dvgrab/dvgrab-3.5-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Digital Video (DV) grabber for GNU/Linux"
+HOMEPAGE="http://www.kinodv.org/"
+SRC_URI="mirror://sourceforge/kino/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="jpeg quicktime"
+
+RDEPEND=">=sys-libs/libraw1394-1.1
+	>=media-libs/libdv-0.103
+	>=media-libs/libiec61883-1
+	>=sys-libs/libavc1394-0.5.1
+	jpeg? ( virtual/jpeg:0 )
+	quicktime? ( media-libs/libquicktime )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.5-gcc6.patch"
+)
+
+src_configure() {
+	econf \
+		$(use_with quicktime libquicktime) \
+		$(use_with jpeg libjpeg)
+}
diff --git a/media-video/dvgrab/dvgrab-3.5.ebuild b/media-video/dvgrab/dvgrab-3.5.ebuild
new file mode 100644
index 000000000000..789b98b6698c
--- /dev/null
+++ b/media-video/dvgrab/dvgrab-3.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Digital Video (DV) grabber for GNU/Linux"
+HOMEPAGE="http://www.kinodv.org/"
+SRC_URI="mirror://sourceforge/kino/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~ppc64 x86"
+IUSE="jpeg quicktime"
+
+RDEPEND=">=sys-libs/libraw1394-1.1
+	>=media-libs/libdv-0.103
+	>=media-libs/libiec61883-1
+	>=sys-libs/libavc1394-0.5.1
+	jpeg? ( virtual/jpeg )
+	quicktime? ( media-libs/libquicktime )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_compile() {
+	econf $(use_with quicktime libquicktime) $(use_with jpeg libjpeg)
+	emake || die "emake failed."
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
diff --git a/media-video/dvgrab/files/dvgrab-3.5-gcc6.patch b/media-video/dvgrab/files/dvgrab-3.5-gcc6.patch
new file mode 100644
index 000000000000..9b82c5eac230
--- /dev/null
+++ b/media-video/dvgrab/files/dvgrab-3.5-gcc6.patch
@@ -0,0 +1,25 @@
+commit 8dd729f2cf4cc5b99ad2e3961419cf71d2dfb843
+Author: Aaro Koskinen <aaro.koskinen@iki.fi>
+Date:   Sun May 15 22:44:23 2016 +0300
+
+    iec13818-1.h: fix build with GCC 6.1.0
+    
+    Fix the following build issue with GCC 6.1.0:
+    
+    iec13818-1.h:45:75: error: narrowing conversion of '255' from 'int' to 'char' inside { } [-Wnarrowing]
+     static char bitmask[8] = { 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff };
+                                                                               ^
+
+diff --git a/iec13818-1.h b/iec13818-1.h
+index 56a4aa0..e964288 100644
+--- a/iec13818-1.h
++++ b/iec13818-1.h
+@@ -42,7 +42,7 @@
+ #define BCD(c) ( ((((c) >> 4) & 0x0f) * 10) + ((c) & 0x0f) )
+ 
+ #define TOBYTES( n ) ( ( n + 7 ) / 8 )
+-static char bitmask[8] = { 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff };
++static unsigned char bitmask[8] = { 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff };
+ #define GETBITS( offset, len ) do { \
+ 	unsigned long value = 0; \
+ 	while ( len > 0 ) \
diff --git a/media-video/dvgrab/metadata.xml b/media-video/dvgrab/metadata.xml
new file mode 100644
index 000000000000..8ca6ee9fe0a4
--- /dev/null
+++ b/media-video/dvgrab/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>media-video@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">kino</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-video/emovix/Manifest b/media-video/emovix/Manifest
new file mode 100644
index 000000000000..e97a0cd39af0
--- /dev/null
+++ b/media-video/emovix/Manifest
@@ -0,0 +1,5 @@
+DIST emovix-0.9.0.tar.gz 11297252 SHA256 96b84843ed80d31df5c07f6ee972362f7a0629a9b181afeb4a99b2127c07ff57 SHA512 87df6f124d8478d0704472adf80e541b3573bc448836f4525d99b614aba5bffbeea8f73b0b8e0b4a9a95375ee78d0f78352254eeb4f99be67611f4d17f5c3e2a WHIRLPOOL 913d14a18e3a982778e4d6d1e0d8d3cd61dbc7d256fc6ebe0888160446bc4c7e418700d20c652b4db4b57dd2e39105d96360af7f74c8d88ddea799e923e26d20
+EBUILD emovix-0.9.0.ebuild 589 SHA256 d03eb5d0053c781641bcd0f1e276834018872513134ad5b31a42ffbd1218f6b1 SHA512 24fcc8b2da837b4af27da1cad5a4e83abe0be1c1dfe7bec1e36e8836bfda52632b9951f5f1a9d5b1c62db3870a60cfde564c4b3b9f08923d664b40ccbc70fb81 WHIRLPOOL dfe6ba493d5136c9a220c2ffdf22baa3be0047dc4617a4cc84fe08b37c8c4c149da621bc4b0bc3f23e8aa35f35b10c54da56ca75d458e3253cf614b70e11fd0c
+MISC ChangeLog 2427 SHA256 7a54db266940d132d4fe1c2f1a71716658241a68eae8af6ca839c66fdce49bbb SHA512 337f085f025fbc53eba3eb874b3f16797bd52863faf4e44d70fe2a4602822324b60c96af29e4b92a513e5a086e3033c8233c51a7dcf09b503f6f6397ab61fa05 WHIRLPOOL 520269a6a172cf1e2195f24717b72673bb6b771e36a5f7350b7cb9787f276fb9750e8f5aa33b2371c9e40b041082b9fb2696da9cbb09102b78e01712fd9d96d3
+MISC ChangeLog-2015 2413 SHA256 c506217e8ced432cf6c06d91f08f1f91a5712cbbc64309779b82305fe5bbdffa SHA512 49465f6b8b535bd7d022d49a1f1230c550a7360213393ce499e1c80020739a8b64e4a679d18e476121f8132ecd7d947e140babf7740f04153c13c9efe2dd44db WHIRLPOOL 03f1881fa0f7f41275fa184bb8082fa69fc6e532b8d37278618a558f7570ca91100a21588db30847a810c8917d3a3e08cf01c2f3ac60f76013e41fc692fb5751
+MISC metadata.xml 298 SHA256 f1d73e8d0ae6ca3f504e6efb3915a6c8386f722185099eb302a609572286b116 SHA512 1a8c14b452885e3e7bf4baf9468df6d5fdf58676031fd7f97b75ba78f5701abb9ce1b6a6b449745cf509b2d8ced78e3fa337b243885ec09988ebc45ba36c46d6 WHIRLPOOL 276b6e115438da009aabc154d458e22d423504603e0a8cf66a1742b2a2fa9382efb0a3df879b733ca528998c40ae43dade69c6adb40df9a0d91ec4ab512349b2
diff --git a/media-video/emovix/emovix-0.9.0.ebuild b/media-video/emovix/emovix-0.9.0.ebuild
new file mode 100644
index 000000000000..a7cd13048bd1
--- /dev/null
+++ b/media-video/emovix/emovix-0.9.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Micro Linux distro to boot from a CD and play every video file localized in the CD root"
+HOMEPAGE="http://movix.sourceforge.net"
+SRC_URI="mirror://sourceforge/movix/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+
+RDEPEND="virtual/cdrtools"
+DEPEND="dev-lang/perl
+	virtual/awk"
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS ChangeLog README* TODO
+	dosym /usr/lib/win32 /usr/share/emovix/codecs
+}
diff --git a/media-video/emovix/metadata.xml b/media-video/emovix/metadata.xml
new file mode 100644
index 000000000000..aac6d852016d
--- /dev/null
+++ b/media-video/emovix/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">movix</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/episoder/Manifest b/media-video/episoder/Manifest
new file mode 100644
index 000000000000..6cadd3a611fb
--- /dev/null
+++ b/media-video/episoder/Manifest
@@ -0,0 +1,5 @@
+DIST episoder-0.4.7.tar.gz 17410 SHA256 ea7ccb0ac642ae9bf8b8b8442bb5aea377c8dcded8478612c4b20bd41f28a626 SHA512 cce943df403463d40ab5faf384c218f6b1b871f3b67c31d77fb351868bf44d6d427d0eb07cd017ce8561cc6bdc4a2605c5a2ecad591a7c3ffa02ebbabbf79ba4 WHIRLPOOL 969b8dc559c95705564806aa2d9e425c26af5e7f98225f0d2cc08236192e57ac1d46ff9b91150ad2179a41e6e5db96f77e82073457440d49f34336bf8027a508
+EBUILD episoder-0.4.7.ebuild 584 SHA256 a5a55fa5e6cc9a506c1e39b67b0c5b155943af3feaa3518bfcd6c329e8bcdc2e SHA512 258cd0da95f27c6accf528ef1319d885198142a97239f8783f060f1b687ab2f0495a9a30df9c4a1bda588eaa52daec09c7a78efd354a345cf469568fbcd86a69 WHIRLPOOL 1ff864e485c9b20d503eb5b420a0c0b2f154a57e01fc8c9fa3824f71750cdf7a6762100831d15e0b2022e771b61c29476f2cc01c44ced4e421d638866633faa8
+MISC ChangeLog 2433 SHA256 b44e4f36d938f027025d61b189c7ee12b02086b151e7c7c9e6661bff55a0b92b SHA512 43033ba9b23274d5905ec1f3f8bb344c4937712c5a4d5c80d683e253e19581ed845458f86067989da82fce1cfc768f081f1d650ad411641b519e88f8067fce73 WHIRLPOOL a74a92ca3defbcba26252e8160c40b30d3d7c2e040f6187c90af7672b6dae4096439f3ab9592838a3e45503fef9c09b22511002546e7b9deea0c43ba2003ebcd
+MISC ChangeLog-2015 1234 SHA256 8ade7c589a926e8a6dfe0060eb3c7fad44eb1f4edd40218526147320e917ab4a SHA512 534130f0806b1f4f9d718a021f4caf4a2712db809a199dcf5624b4aecd687df2aa85f343c1b61b07d85ce0eb1d7fb9146aadaf9172572dfa455cc426804c25c1 WHIRLPOOL 70816d60078e48b2cfef560748b09b093d7fbed35e25ce3f936fc9f5b60df51674ded9b970bf75bba2acf7680aa9e59deabfbf5e71ecf4500a3ee0572e94cfda
+MISC metadata.xml 301 SHA256 64ea2f708f5f07c6f79d26660dace88fae95d340b41e9e0de7918866451f51eb SHA512 73972a12f59f7457f42129cb16cc8df78eebfee5e8bc87e36d306b221c3892de10a123eb41e4702c7e94b4bd946cb43759d677167cda8c2cd7b4f099e64fdcd0 WHIRLPOOL 78c733cfa1889033341cb8130f938364c6bf8d15a3c2fa444080de008ce9d7cde5d052c3311e2e22b1c23df218e053110451026147d8bafda355d72cc73a5bfb
diff --git a/media-video/episoder/episoder-0.4.7.ebuild b/media-video/episoder/episoder-0.4.7.ebuild
new file mode 100644
index 000000000000..dbd48630ec71
--- /dev/null
+++ b/media-video/episoder/episoder-0.4.7.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="episoder is a tool to tell you when new episodes of your favourite
+TV shows are airing"
+HOMEPAGE="http://www.desire.ch/tools/episoder/"
+SRC_URI="mirror://sourceforge/episoder/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="net-misc/wget"
+
+src_install() {
+	insinto /usr/share/${PN}/
+	insopts -m755
+	doins scripts/*sh
+	doins plugins/*
+
+	dobin scripts/episoder
+	dodoc README examples/home.episoder CHANGELOG
+
+	doman episoder.1
+}
diff --git a/media-video/episoder/metadata.xml b/media-video/episoder/metadata.xml
new file mode 100644
index 000000000000..955f6a232677
--- /dev/null
+++ b/media-video/episoder/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">episoder</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/ffcast/Manifest b/media-video/ffcast/Manifest
new file mode 100644
index 000000000000..60fa498085dd
--- /dev/null
+++ b/media-video/ffcast/Manifest
@@ -0,0 +1,4 @@
+DIST ffcast-2.4.8.tar.gz 25471 SHA256 a9bf54ad581d1174a432a50dbcadd0829fe86df6572937597ef2583c91c511bb SHA512 69f3d2927fac61f530cf6c0d8de422f0ab2baf90249a0771680fc724221edc5c97cbb38811f6b9523848d6dc96e9cbf659c8984543f8ca98ee98e45c105d3434 WHIRLPOOL bf270127f3cb6dd897f6f5c3e16c2b49d87a4c14fff5d0404a2d150c3f4aa077243c01c7cd9e8aa18367b193eaf990106a562b8708d762030be9b126f69ef83c
+EBUILD ffcast-2.4.8.ebuild 605 SHA256 8579eb89e52e3f9a16fc234974fccdafbb9be6cf00c22db20e640e50473e0975 SHA512 0077c02f550c530e32391c508365fb9ae20ac1df9678105d09a00c7ffb2942caa260f89d885bd9fd9821f04e22034c2bcc928036e402fc872e42c3630eb365c5 WHIRLPOOL 509962eb74e68dd672019addda9a4ed4e2047fc114d2372c3cb6010c3833e68188a542adcf93067312ef5be7f80ae9dfddf34a87babcaa0990f7734df5f55a77
+MISC ChangeLog 1561 SHA256 34e0f65a310930ae408b4de19e477f17ef885641c33dc77093935b472ba31664 SHA512 c8b8727e03f7b1f670d10cf2da115d2614e075bdd0f7e0326144327a11b5c9b3f8d918396c35282e395b1c620b45376348a3ce49b304f232677b4216dc4a5514 WHIRLPOOL f2de038455fac9a4b6520a352012d7a513ee5d04df13a8af6b35a180d641e8d2f8d005955372722281cf6109ce49e413c667ced8ab2f1e85a946ecca8a39f2c0
+MISC metadata.xml 433 SHA256 177ed87eed88b5bbf2e5492228e81fe7bcef474fa6889b4329d7ce59485d0620 SHA512 5786bd86b86659cb41cdb29898223ee36652a423c044df1f464b8c5920c6dab588459774a239c7a8804512ae25ccde9a52c9426ae94b29aa7f5b0897e346b118 WHIRLPOOL 87c86e843e4c37148cd59ded8aa14ae5dab737b0ac2199cdd6922884108330c6569cec2e33a39e9737fbab656ec1ba6cda27a285f20ce0e38dfed75467c6cdbf
diff --git a/media-video/ffcast/ffcast-2.4.8.ebuild b/media-video/ffcast/ffcast-2.4.8.ebuild
new file mode 100644
index 000000000000..e1e4a89cbe13
--- /dev/null
+++ b/media-video/ffcast/ffcast-2.4.8.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Record screencasts using ffmpeg"
+HOMEPAGE="https://github.com/lolilolicon/ffcast"
+SRC_URI="https://github.com/lolilolicon/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-apps/xdpyinfo
+		x11-apps/xprop
+		x11-apps/xwininfo
+		x11-apps/xrectsel
+		media-video/ffmpeg
+		>=app-shells/bash-4.3"
+DEPEND=""
+
+S="${WORKDIR}/FFcast-${PV}"
+
+src_prepare() {
+	rmdir src/xrectsel
+	eapply_user
+	eautoreconf
+}
diff --git a/media-video/ffcast/metadata.xml b/media-video/ffcast/metadata.xml
new file mode 100644
index 000000000000..af0b38672573
--- /dev/null
+++ b/media-video/ffcast/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>zx2c4@gentoo.org</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>media-video@gentoo.org</email>
+    <name>Gentoo Video project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">lolilolicon/ffcast</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-video/ffdiaporama/Manifest b/media-video/ffdiaporama/Manifest
new file mode 100644
index 000000000000..36a80976cf3e
--- /dev/null
+++ b/media-video/ffdiaporama/Manifest
@@ -0,0 +1,12 @@
+AUX ffdiaporama-2.1-ffmpeg-2.4.patch 755 SHA256 dc51fb9fd5019d9e2c10723bd4220edc2cb4bfcae4cc65f5b4ba7fb6a6f71d0d SHA512 791a4885188536b4bfb5d4877783c887e1d457878c1d69d925c4e4257ae65864cc0a8eb1ab0063ea082ac13a57791147c16be80087b663fe81b1c8e68dbd8f38 WHIRLPOOL bb59de7483fb6cefd979d01f020571349896afd242def1f3fe3a979f0713227107bd8c825fadc43269d24022c9c9f5a5de160ea7baa6671072789438afe1f4c8
+AUX ffdiaporama-2.1-ffmpeg-3.0.patch 9617 SHA256 7cc7a3415704856743e3c858fdda61733a684abbf05825cd3b29dbeda50a2b8e SHA512 427df6b22b8c758d6e47a53de0219c1b84806cbb7b9bcdacff40e797e5d52fccd2f90ddba1aabe39f1c184628309d712ca521ad33bdabd0d07caead29b407399 WHIRLPOOL 9d43bb2e625920901fbcdc76cddf40fd4c5d2d541d9f0c544b004b1db61fc871354f3217bdcd0c74048cf6f25b7b02108eba34c19397995a5611dd4fba1fb079
+AUX ffdiaporama-2.1-libav10.patch 24734 SHA256 30fc17333071795aa5114dd4f1d6925b6890a1a83087fcbdf19010fb2c39074f SHA512 635dd967792159bfb5986eb97715aa46222029cbf3bcd5b58779b8894272728f2a422b4e73645ddc80f5d4cb1bc9a12ceccc06e160c72140571d2233e029b38b WHIRLPOOL 7ecabbc5895e7a24f79b1e5fe9f8dedf7c29dfbe6cc751bfb519c66d676d1b9afbdaa8e8b647727f08ccab828d0947042785848e2ff287d2ba2554881254bf87
+DIST ffdiaporama_bin_2.1.2014.0209.tar.gz 16063604 SHA256 a1f55367a3d915045a5f4ce5db20419c2e8ea26a8cd4d56bef2e3d525e55acaa SHA512 40fc40ae8f09d311dc615051bd0bc4573f1f9ab5abe06032e161b759194c772b43c337902baf9c5a1eb027796fcdecc2fc20dce5d998091e6ccf8f696149223d WHIRLPOOL 0cc1b7343bef904e6b89bda4d9fc17066ca1e9aff4beccf0a8b615c7e42a7a84d9cb7f582c6799bfc2e4a1398ad71f8398920ff1f57c2f60cf03ac12a66ce241
+DIST ffdiaporama_rsc_2.1.2014.0209.tar.gz 17669845 SHA256 965bb1506531f7b5214d9003019aff410107908f4837fe7f2a1fcbd2e55c4447 SHA512 910b2139eb1b97a86c8d795b65255f723e346b3b4ce805878835813f9b21c7b606f811488f9099003a0e0951006df6d32663f1d8be2ffe1c355cf9311ac4be19 WHIRLPOOL 1d9ecdb96df47785b146156c54ba1a9a80e3e5ec03b9ad9c4ca08bab17fd5738d20cf7a75247840c2c08af6feca75a14974f4602b8f73736080634644be15e9e
+DIST ffdiaporama_texturemate_1.0.2014.0125.tar.gz 30352923 SHA256 47ef9a0391baa4dd145a4c9c39590afb3c7a2857da4a8fa7c74bd081f52a0417 SHA512 e9aa9607d670a620b2e3c27d6ec5bf983eb31ab3d3139edf32ebb84d9ffa58b11c822f7db4b3f3c4a430b256719803df4a3a385bd467bdda09f8710d010eb2f5 WHIRLPOOL 00b22bfcaf6d5a698fe2d0f38d6578d027ca8451707bf49edecfca0ea6b181202e05cc5d13b32d9090825b4bde5eba509f1fd4e7a68d19dab7d2440b2eaa420e
+DIST openclipart-0.18-svgonly.tar.bz2 82108957 SHA256 57572d443439759b0347da95a5457f988048976c7e13d70a09894cdee412be29 SHA512 71ad11fd2e94f4c3d560ff0fa6e0cee70ec2c8506fd4c4d7a4b7a0db25480aaca9b36d0e91862cf05347be5caa614bfb528bdfdb151342e28efba31d9a8b0473 WHIRLPOOL 151dafd9ce46cdeb2a203bec3960a81043b9ee0ba5afe508b3090dd073ddbdd0cb96d29277e814dec2b7218d3017db9820aa7a429d91ecbf2ecb1f08fd28b664
+EBUILD ffdiaporama-2.1-r1.ebuild 2184 SHA256 4cde0c4000861f5e32449d99bb48bd29ffa5a58694c5b9ed7103a4134f157c15 SHA512 18fd2480af4b998f795b0a71339746e202273295859596689caefe463fe30b60693a0dd329d5a2677ca5bcd3e3b30b51da1d6a767665f34db7dd4c2851288049 WHIRLPOOL 97214938fa72659cc6f9f02bec4ff6617eb0001345087a1b36ca0056010af2c33264ab4d9fcaa25c11cbd0a7f02a4a52fa2538b4ae1a0dd2213cfcf8f15cdab2
+EBUILD ffdiaporama-2.1.ebuild 2163 SHA256 09dd963350d69ec45d76a7645e3bc445719375e93bbcb40f3e2bdb47bb9a45b9 SHA512 245ab88c90cda8da404778282003efd8253399988439b88766b647eb0bc3a37f5e6c1e843bc855194daf868097f4fc9fac26db5696cabaebe0d5a2d9bdd96a52 WHIRLPOOL 7d27875562efcaf3a074e4d6d42d92a9e5ab2e03249ea4c381b02d3261839eee6fee2954691a21e8160d6a754ceea7efbe69971aa50629b438a3be56be6e877e
+MISC ChangeLog 4503 SHA256 02ff43d0edb7642f02129511219d44725d66d1de7b275802cc8c925584654024 SHA512 8349ff330f16c6e531c308e13e656267054a600fc87a71da8724f72136371ccade71a13aafbc00d952c50080aa10ac29d9c4b6f3f5b7fc4f18debe2250b3c782 WHIRLPOOL ed8b4a26a1197c75620f86b6d8280548c4bb27babc03165fc3bbbb7cbba207e9eeffadd9ec21bb1d0f770deea842b0faa9c701afed29608c6e8b0b41ad4199b4
+MISC ChangeLog-2015 3834 SHA256 aa4e01cdbc5fac532c7ec58e27bee05511ea1c486f440b201bc4a4541474e5b0 SHA512 327567d8b1da2d5a5d18e7aa02564fa5486b7c777eeff19c3cf50f4e65c45f990a1dffb93bcf6ccbe474501ddb4b9ca8754b577f7805bef6f9d42db921586e33 WHIRLPOOL ea05156b43a771b1a433365b2375faed8befbc884837650661fce55b2b45666b9e898adb49c3a628c33628a1b0e62ba58a876a04b4e7d86069b2b41c14798f28
+MISC metadata.xml 2367 SHA256 0054e263a58361790872425b5adde9e2e7f722d9129da10d8c4baff82ef9a089 SHA512 aec9afe8cd31d8ec5c535d6219a4102b7f84705ed4180d6fd14c59eabace406c5e2cebcaf0ef635b078b6edd13c9ed032b5124ba0bd887181afaa068e1cdd6f2 WHIRLPOOL d07f8dc49c5d0e91fa835fa043a723ce8a64202278e4ee5dc73251007642122b6122c1d9ccbe287ebb88ee0760dea29fb9d92c5719d25801f4c05117ab384336
diff --git a/media-video/ffdiaporama/ffdiaporama-2.1-r1.ebuild b/media-video/ffdiaporama/ffdiaporama-2.1-r1.ebuild
new file mode 100644
index 000000000000..3c8b95d50b73
--- /dev/null
+++ b/media-video/ffdiaporama/ffdiaporama-2.1-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils fdo-mime gnome2-utils qt4-r2
+
+BIN_PV=${PV}.2014.0209
+RSC_PV=${PV}.2014.0209
+TMT_PV=1.0.2014.0125
+OPENCLI_PV=0.18
+OPENCLI_P=openclipart-${OPENCLI_PV}
+DESCRIPTION="Movie creator from photos and video clips"
+HOMEPAGE="http://ffdiaporama.tuxfamily.org"
+SRC_URI="http://ffdiaporama.tuxfamily.org/script/GetPackage.php?f=${PN}_bin_${BIN_PV}.tar.gz -> ${PN}_bin_${BIN_PV}.tar.gz
+	http://ffdiaporama.tuxfamily.org/script/GetPackage.php?f=${PN}_rsc_${RSC_PV}.tar.gz -> ${PN}_rsc_${RSC_PV}.tar.gz
+	openclipart? ( http://openclipart.org/downloads/${OPENCLI_PV}/${OPENCLI_P}-svgonly.tar.bz2 )
+	texturemate? ( http://ffdiaporama.tuxfamily.org/script/GetPackage.php?f=${PN}_texturemate_${TMT_PV}.tar.gz -> ${PN}_texturemate_${TMT_PV}.tar.gz )"
+
+LICENSE="GPL-2
+	openclipart? ( CC0-1.0 )
+	texturemate? ( CC-BY-3.0 )"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="libav openclipart texturemate"
+
+RDEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qthelp:4
+	dev-qt/qtsql:4[sqlite]
+	dev-qt/qtsvg:4
+	media-gfx/exiv2
+	media-libs/libsdl[sound]
+	media-libs/taglib
+	!libav? ( >media-video/ffmpeg-1.2:0=[encode] )
+	libav? ( >=media-video/libav-9:0=[encode] )"
+DEPEND="${RDEPEND}"
+
+DOCS=( authors.txt )
+PATCHES=( "${FILESDIR}"/${P}-{ffmpeg-2.4,libav10,ffmpeg-3.0}.patch )
+
+S="${WORKDIR}/ffDiaporama"
+
+src_prepare() {
+	echo "SUBDIRS += ../ffDiaporama_rsc" >> ffDiaporama.pro || die
+	if use texturemate; then
+		echo "SUBDIRS += ../ffDiaporama_texturemate" >> ffDiaporama.pro || die
+	fi
+	qt4-r2_src_prepare
+}
+
+src_install() {
+	qt4-r2_src_install
+	doicon -s 32 ffdiaporama.png
+	if use openclipart; then
+		dodir /usr/share/ffDiaporama/clipart/openclipart
+		cd "${WORKDIR}"/${OPENCLI_P}-svgonly/clipart || die
+		find . -type d -maxdepth 1 -not -name . -exec cp -R '{}' "${D}"/usr/share/ffDiaporama/clipart/openclipart \; || die
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-video/ffdiaporama/ffdiaporama-2.1.ebuild b/media-video/ffdiaporama/ffdiaporama-2.1.ebuild
new file mode 100644
index 000000000000..48456601fcbe
--- /dev/null
+++ b/media-video/ffdiaporama/ffdiaporama-2.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils fdo-mime gnome2-utils qt4-r2
+
+BIN_PV=${PV}.2014.0209
+RSC_PV=${PV}.2014.0209
+TMT_PV=1.0.2014.0125
+OPENCLI_PV=0.18
+OPENCLI_P=openclipart-${OPENCLI_PV}
+DESCRIPTION="Movie creator from photos and video clips"
+HOMEPAGE="http://ffdiaporama.tuxfamily.org"
+SRC_URI="http://ffdiaporama.tuxfamily.org/script/GetPackage.php?f=${PN}_bin_${BIN_PV}.tar.gz -> ${PN}_bin_${BIN_PV}.tar.gz
+	http://ffdiaporama.tuxfamily.org/script/GetPackage.php?f=${PN}_rsc_${RSC_PV}.tar.gz -> ${PN}_rsc_${RSC_PV}.tar.gz
+	openclipart? ( http://openclipart.org/downloads/${OPENCLI_PV}/${OPENCLI_P}-svgonly.tar.bz2 )
+	texturemate? ( http://ffdiaporama.tuxfamily.org/script/GetPackage.php?f=${PN}_texturemate_${TMT_PV}.tar.gz -> ${PN}_texturemate_${TMT_PV}.tar.gz )"
+
+LICENSE="GPL-2
+	openclipart? ( CC0-1.0 )
+	texturemate? ( CC-BY-3.0 )"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="libav openclipart texturemate"
+
+RDEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qthelp:4
+	dev-qt/qtsql:4[sqlite]
+	dev-qt/qtsvg:4
+	media-gfx/exiv2
+	media-libs/libsdl[sound]
+	media-libs/taglib
+	!libav? ( >media-video/ffmpeg-1.2:0=[encode] )
+	libav? ( >=media-video/libav-9:0=[encode] )"
+DEPEND="${RDEPEND}"
+
+DOCS=( authors.txt )
+PATCHES=( "${FILESDIR}"/${P}-ffmpeg-2.4.patch )
+
+S="${WORKDIR}/ffDiaporama"
+
+src_prepare() {
+	echo "SUBDIRS += ../ffDiaporama_rsc" >> ffDiaporama.pro || die
+	if use texturemate; then
+		echo "SUBDIRS += ../ffDiaporama_texturemate" >> ffDiaporama.pro || die
+	fi
+	qt4-r2_src_prepare
+}
+
+src_install() {
+	qt4-r2_src_install
+	doicon -s 32 ffdiaporama.png
+	if use openclipart; then
+		dodir /usr/share/ffDiaporama/clipart/openclipart
+		cd "${WORKDIR}"/${OPENCLI_P}-svgonly/clipart || die
+		find . -type d -maxdepth 1 -not -name . -exec cp -R '{}' "${D}"/usr/share/ffDiaporama/clipart/openclipart \; || die
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-video/ffdiaporama/files/ffdiaporama-2.1-ffmpeg-2.4.patch b/media-video/ffdiaporama/files/ffdiaporama-2.1-ffmpeg-2.4.patch
new file mode 100644
index 000000000000..7a8e664add37
--- /dev/null
+++ b/media-video/ffdiaporama/files/ffdiaporama-2.1-ffmpeg-2.4.patch
@@ -0,0 +1,16 @@
+--- src/ffDiaporama/engine/cDeviceModelDef.h	2015-02-14 10:02:12.592365100 +0100
++++ src/ffDiaporama/engine/cDeviceModelDef.h	2015-02-14 10:01:59.202463800 +0100
+@@ -84,7 +84,12 @@
+ #elif (LIBAVUTIL_VERSION_MICRO>=100)&&(LIBAVCODEC_VERSION_MICRO>=100)&&(LIBAVFORMAT_VERSION_MICRO>=100)&&(LIBAVDEVICE_VERSION_MICRO>=100)&&(LIBAVFILTER_VERSION_MICRO>=100)&&(LIBSWSCALE_VERSION_MICRO>=100)
+     #define FFMPEG
+     #include "libswresample/swresample.h"
+-    #define RESAMPLE_MAX_CHANNELS SWR_CH_MAX
++    #ifdef SWR_CH_MAX
++      #define RESAMPLE_MAX_CHANNELS SWR_CH_MAX
++    #else
++      #define RESAMPLE_MAX_CHANNELS 32
++    #endif
++    
+     #include "libavfilter/avcodec.h"
+     #include "libavfilter/buffersink.h"
+     #include "libavfilter/buffersrc.h"
diff --git a/media-video/ffdiaporama/files/ffdiaporama-2.1-ffmpeg-3.0.patch b/media-video/ffdiaporama/files/ffdiaporama-2.1-ffmpeg-3.0.patch
new file mode 100644
index 000000000000..4eb8c9704235
--- /dev/null
+++ b/media-video/ffdiaporama/files/ffdiaporama-2.1-ffmpeg-3.0.patch
@@ -0,0 +1,196 @@
+--- src/ffDiaporama/engine/cBaseMediaFile.cpp	2014-02-09 10:48:04.000000000 +0100
++++ src/ffDiaporama/engine/cBaseMediaFile.cpp	2016-02-21 19:00:43.129114600 +0100
+@@ -113,10 +113,23 @@
+ #define VC_USERDATA     0x00000008
+ #define VC_FLUSHED      0x00000010
+ 
+-#define PIXFMT          PIX_FMT_RGB24
++#if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=300))
++  #define PIXELFORMAT AVPixelFormat
++  #define PIXFMT AV_PIX_FMT_RGB24
++#else
++  #define PIXELFORMAT PixelFormat
++  #define PIXFMT PIX_FMT_RGB24
++#endif
+ #define QTPIXFMT        QImage::Format_RGB888
+ 
+-AVFrame *ALLOCFRAME()           { return avcodec_alloc_frame(); }
++AVFrame *ALLOCFRAME()           { return 
++  #if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=300))
++    av_frame_alloc();
++  #else
++    avcodec_alloc_frame();
++  #endif
++}
++
+ void    FREEFRAME(AVFrame **Buf){ avcodec_free_frame(Buf); *Buf=NULL; }
+ 
+ //****************************************************************************************************************************************************************
+@@ -2402,7 +2415,7 @@
+                             AVFrame *FrameRGB=ALLOCFRAME();
+                             if ((FrameRGB)&&(!Thumbnail.isNull())) {
+                                 avpicture_fill((AVPicture *)FrameRGB,Thumbnail.bits(),PIXFMT,RealW,RealH);
+-                                struct SwsContext *img_convert_ctx=sws_getContext(FrameYUV->width,FrameYUV->height,(PixelFormat)FrameYUV->format,RealW,RealH,PIXFMT,SWS_FAST_BILINEAR,NULL,NULL,NULL);
++                                struct SwsContext *img_convert_ctx=sws_getContext(FrameYUV->width,FrameYUV->height,(PIXELFORMAT)FrameYUV->format,RealW,RealH,PIXFMT,SWS_FAST_BILINEAR,NULL,NULL,NULL);
+                                 if (img_convert_ctx!=NULL) {
+                                     int ret = sws_scale(img_convert_ctx,FrameYUV->data,FrameYUV->linesize,0,FrameYUV->height,FrameRGB->data,FrameRGB->linesize);
+                                     if (ret>0) {
+@@ -3482,7 +3495,7 @@
+         struct SwsContext *img_convert_ctx=sws_getContext(
+             Frame->width,                                                     // Src width
+             Frame->height,                                                    // Src height
+-            (PixelFormat)Frame->format,                                       // Src Format
++            (PIXELFORMAT)Frame->format,                                       // Src Format
+             W,                                                                // Destination width
+             H,                                                                // Destination height
+             PIXFMT,                                                           // Destination Format
+--- src/ffDiaporama/engine/cDeviceModelDef.h	2016-02-21 19:53:00.487286000 +0100
++++ src/ffDiaporama/engine/cDeviceModelDef.h	2016-02-21 19:52:47.623287800 +0100
+@@ -53,7 +53,9 @@
+ 
+ #include <libavutil/mathematics.h>
+ #include <libavutil/pixdesc.h>
+-#include <libavutil/audioconvert.h>
++#if (LIBAVUTIL_VERSION_INT<AV_VERSION_INT(54,31,100))
++    #include <libavutil/audioconvert.h>
++#endif
+ 
+ #include <libavcodec/avcodec.h>
+ 
+@@ -90,10 +92,10 @@
+       #define RESAMPLE_MAX_CHANNELS 32
+     #endif
+     
+-    #include "libavfilter/avcodec.h"
+-    #include "libavfilter/buffersink.h"
+-    #include "libavfilter/buffersrc.h"
+-    #if     ((LIBAVUTIL_VERSION_INT>=AV_VERSION_INT(52,48,100))&&(LIBAVCODEC_VERSION_INT>=AV_VERSION_INT(55,39,100))&&(LIBAVFORMAT_VERSION_INT>=AV_VERSION_INT(55,19,104))&&(LIBAVDEVICE_VERSION_INT>=AV_VERSION_INT(55,5,100))&&(LIBAVFILTER_VERSION_INT>=AV_VERSION_INT(3,90,100))&&(LIBSWSCALE_VERSION_INT>=AV_VERSION_INT(2,5,101))&&(LIBSWRESAMPLE_VERSION_INT>=AV_VERSION_INT(0,17,104)))
++    #if     ((LIBAVUTIL_VERSION_INT>=AV_VERSION_INT(55,17,103))&&(LIBAVCODEC_VERSION_INT>=AV_VERSION_INT(57,24,102))&&(LIBAVFORMAT_VERSION_INT>=AV_VERSION_INT(57,25,100))&&(LIBAVDEVICE_VERSION_INT>=AV_VERSION_INT(57,0,101))&&(LIBAVFILTER_VERSION_INT>=AV_VERSION_INT(6,31,100))&&(LIBSWSCALE_VERSION_INT>=AV_VERSION_INT(4,0,100))&&(LIBSWRESAMPLE_VERSION_INT>=AV_VERSION_INT(2,0,101)))
++        #define FFMPEGVERSIONINT    300
++        #define FFMPEGVERSION       "FFmpeg 3.0 or higher"
++    #elif     ((LIBAVUTIL_VERSION_INT>=AV_VERSION_INT(52,48,100))&&(LIBAVCODEC_VERSION_INT>=AV_VERSION_INT(55,39,100))&&(LIBAVFORMAT_VERSION_INT>=AV_VERSION_INT(55,19,104))&&(LIBAVDEVICE_VERSION_INT>=AV_VERSION_INT(55,5,100))&&(LIBAVFILTER_VERSION_INT>=AV_VERSION_INT(3,90,100))&&(LIBSWSCALE_VERSION_INT>=AV_VERSION_INT(2,5,101))&&(LIBSWRESAMPLE_VERSION_INT>=AV_VERSION_INT(0,17,104)))
+         #define FFMPEGVERSIONINT    210
+         #define FFMPEGVERSION       "FFmpeg 2.1 or higher"
+     #elif   ((LIBAVUTIL_VERSION_INT>=AV_VERSION_INT(52,38,100))&&(LIBAVCODEC_VERSION_INT>=AV_VERSION_INT(55,18,102))&&(LIBAVFORMAT_VERSION_INT>=AV_VERSION_INT(55,12,100))&&(LIBAVDEVICE_VERSION_INT>=AV_VERSION_INT(55,3,100))&&(LIBAVFILTER_VERSION_INT>=AV_VERSION_INT(3,79,101))&&(LIBSWSCALE_VERSION_INT>=AV_VERSION_INT(2,3,100))&&(LIBSWRESAMPLE_VERSION_INT>=AV_VERSION_INT(0,17,102)))
+@@ -108,6 +110,13 @@
+     #else
+         // unsupported version
+     #endif
++    #if (FFMPEGVERSIONINT<300)
++      #include "libavfilter/avcodec.h"
++    #else
++      #include "libavcodec/avcodec.h"
++    #endif
++    #include "libavfilter/buffersink.h"
++    #include "libavfilter/buffersrc.h"
+ #endif
+ }
+ 
+--- src/ffDiaporama/engine/_EncodeVideo.cpp	2016-02-22 08:19:13.935794200 +0100
++++ src/ffDiaporama/engine/_EncodeVideo.cpp	2016-02-22 08:33:52.928215900 +0100
+@@ -20,7 +20,11 @@
+ 
+ #include "_EncodeVideo.h"
+ 
+-#define PIXFMT      PIX_FMT_RGB24
++#if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=300))
++  #define PIXFMT AV_PIX_FMT_RGB24
++#else
++  #define PIXFMT PIX_FMT_RGB24
++#endif
+ #define QTPIXFMT    QImage::Format_RGB888
+ 
+ //*************************************************************************************************************************************************
+@@ -410,8 +414,13 @@
+     // Setup codec parameters
+     VideoStream->codec->width               =ImageWidth;
+     VideoStream->codec->height              =ImageHeight;
++    #if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=300))
++    VideoStream->codec->pix_fmt             =AV_PIX_FMT_YUV420P;
++    #else
+     VideoStream->codec->pix_fmt             =PIX_FMT_YUV420P;
++    #endif
+     VideoStream->codec->time_base           =VideoFrameRate;
++    VideoStream->time_base                  =VideoFrameRate;
+     VideoStream->codec->sample_aspect_ratio =PixelAspectRatio;
+     VideoStream->sample_aspect_ratio        =PixelAspectRatio;
+     if ((codec->id!=AV_CODEC_ID_H264)||(!VBR)) {
+@@ -434,7 +443,11 @@
+ 
+     } else if (codec->id==AV_CODEC_ID_MJPEG) {
+         //-qscale 2 -qmin 2 -qmax 2
++        #if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=300))
++        VideoStream->codec->pix_fmt             =AV_PIX_FMT_YUVJ420P;
++        #else
+         VideoStream->codec->pix_fmt             =PIX_FMT_YUVJ420P;
++        #endif
+         VideoStream->codec->qmin                =2;
+         VideoStream->codec->qmax                =2;
+         VideoStream->codec->bit_rate_tolerance  =(ImageWidth*ImageHeight*2*VideoFrameRate.den/VideoFrameRate.num)*2;
+@@ -564,7 +577,11 @@
+     #endif
+ 
+     // Create and prepare VideoFrame and VideoFrameBuf
+-    VideoFrame=avcodec_alloc_frame();  // Allocate structure for RGB image
++    #if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=300))
++    VideoFrame=av_frame_alloc();
++    #else
++    VideoFrame=avcodec_alloc_frame();
++    #endif
+     if (!VideoFrame) {
+         ToLog(LOGMSG_CRITICAL,"EncodeVideo-OpenVideoStream: avcodec_alloc_frame() failed");
+         return false;
+@@ -654,7 +671,11 @@
+         return false;
+     }
+ 
++    #if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=300))
++    AudioFrame=av_frame_alloc();
++    #else
+     AudioFrame=avcodec_alloc_frame();
++    #endif
+     if (AudioFrame==NULL) {
+         ToLog(LOGMSG_CRITICAL,QString("EncodeVideo-OpenAudioStream:: avcodec_alloc_frame failed"));
+         return false;
+@@ -1095,7 +1116,11 @@
+             if (Continue) {
+                 // Init AudioFrame
+                 AVRational AVR;
++                #if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=300))
++                av_frame_unref(AudioFrame);
++                #else
+                 avcodec_get_frame_defaults(AudioFrame);
++                #endif
+                 AVR.num                     =1;
+                 AVR.den                     =AudioStream->codec->sample_rate;
+                 AudioFrame->nb_samples      =DestPacketSize/DestSampleSize;
+@@ -1180,7 +1205,11 @@
+     int     errcode;
+ 
+     if (Image) {
+-        avcodec_get_frame_defaults(VideoFrame);
++        #if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=300))
++        av_frame_unref(AudioFrame);
++        #else
++        avcodec_get_frame_defaults(AudioFrame);
++        #endif
+         if (avpicture_fill(
+             (AVPicture *)VideoFrame,            // Frame to prepare
+             VideoFrameBuf,                      // Buffer which will contain the image data
+@@ -1225,9 +1254,14 @@
+         }
+     }
+ 
+-    if ((VideoFrameNbr%VideoStream->codec->gop_size)==0) VideoFrame->pict_type=AV_PICTURE_TYPE_I;
+-        else VideoFrame->pict_type=(AVPictureType)0;
++    if ((VideoFrameNbr%VideoStream->codec->gop_size)==0)
++        VideoFrame->pict_type=AV_PICTURE_TYPE_I;
++    else
++        VideoFrame->pict_type=(AVPictureType)0;
+     VideoFrame->pts=VideoFrameNbr;
++    VideoFrame->format=VideoStream->codec->pix_fmt;
++    VideoFrame->width=VideoStream->codec->width;
++    VideoFrame->height=VideoStream->codec->height;
+ 
+     if ((Continue)&&(!StopProcessWanted)) {
+ 
diff --git a/media-video/ffdiaporama/files/ffdiaporama-2.1-libav10.patch b/media-video/ffdiaporama/files/ffdiaporama-2.1-libav10.patch
new file mode 100644
index 000000000000..1b607ba6c66f
--- /dev/null
+++ b/media-video/ffdiaporama/files/ffdiaporama-2.1-libav10.patch
@@ -0,0 +1,427 @@
+--- src/ffDiaporama/engine/cBaseMediaFile.cpp	2014-02-09 10:48:04.000000000 +0100
++++ src/ffDiaporama/engine/cBaseMediaFile.cpp	2015-03-29 00:20:56.672641700 +0100
+@@ -1861,12 +1861,12 @@
+ }
+ 
+ cImageInCache::~cImageInCache() {
+-    #if defined(LIBAV) || (defined(FFMPEG)&&(FFMPEGVERSIONINT<201))
++    #if (defined(LIBAV)&&(LIBAVVERSIONINT<=9) || defined(FFMPEG)&&(FFMPEGVERSIONINT<201))
+     if (FrameBufferYUV->opaque) {
+         avfilter_unref_buffer((AVFilterBufferRef *)FrameBufferYUV->opaque);
+         FrameBufferYUV->opaque=NULL;
+     }
+-    #elif defined(FFMPEG) && (FFMPEGVERSIONINT>=201)
++    #else
+     if (FiltFrame) {
+         av_frame_unref(FiltFrame);
+         av_frame_free(&FiltFrame);
+@@ -2239,7 +2239,7 @@
+                     LibavFile->streams[VideoStreamNumber]->discard=AVDISCARD_DEFAULT;  // Setup STREAM options
+ 
+                     // Setup decoder options
+-                    LibavFile->streams[VideoStreamNumber]->codec->debug_mv         =0;                    // Debug level (0=nothing)
++                    //LibavFile->streams[VideoStreamNumber]->codec->debug_mv         =0;                    // Debug level (0=nothing)
+                     LibavFile->streams[VideoStreamNumber]->codec->debug            =0;                    // Debug level (0=nothing)
+                     LibavFile->streams[VideoStreamNumber]->codec->workaround_bugs  =1;                    // Work around bugs in encoders which sometimes cannot be detected automatically : 1=autodetection
+                     LibavFile->streams[VideoStreamNumber]->codec->idct_algo        =FF_IDCT_AUTO;         // IDCT algorithm, 0=auto
+@@ -2256,12 +2256,12 @@
+                     if (avcodec_open2(LibavFile->streams[VideoStreamNumber]->codec,Codec,NULL)>=0) {
+                         // Get Aspect Ratio
+ 
+-                        AspectRatio=double(LibavFile->streams[VideoStreamNumber]->codec->sample_aspect_ratio.num)/double(LibavFile->streams[VideoStreamNumber]->codec->sample_aspect_ratio.den);
+-
+-                        if (LibavFile->streams[VideoStreamNumber]->sample_aspect_ratio.num!=0)
++                        if (LibavFile->streams[VideoStreamNumber]->codec->sample_aspect_ratio.num!=0)
++                            AspectRatio=double(LibavFile->streams[VideoStreamNumber]->codec->sample_aspect_ratio.num)/double(LibavFile->streams[VideoStreamNumber]->codec->sample_aspect_ratio.den);
++                        else if (LibavFile->streams[VideoStreamNumber]->sample_aspect_ratio.num!=0)
+                             AspectRatio=double(LibavFile->streams[VideoStreamNumber]->sample_aspect_ratio.num)/double(LibavFile->streams[VideoStreamNumber]->sample_aspect_ratio.den);
+-
+-                        if (AspectRatio==0) AspectRatio=1;
++                        else
++                            AspectRatio=1;
+ 
+                         // Special case for DVD mode video without PAR
+                         if ((AspectRatio==1)&&(LibavFile->streams[VideoStreamNumber]->codec->coded_width==720)&&((LibavFile->streams[VideoStreamNumber]->codec->coded_height==576)||(LibavFile->streams[VideoStreamNumber]->codec->coded_height==480)))
+@@ -2384,7 +2384,7 @@
+                     AVCodec *ThumbDecoderCodec=avcodec_find_decoder(ThumbStream->codec->codec_id);
+ 
+                     // Setup decoder options
+-                    ThumbStream->codec->debug_mv         =0;                    // Debug level (0=nothing)
++                    //ThumbStream->codec->debug_mv         =0;                    // Debug level (0=nothing)
+                     ThumbStream->codec->debug            =0;                    // Debug level (0=nothing)
+                     ThumbStream->codec->workaround_bugs  =1;                    // Work around bugs in encoders which sometimes cannot be detected automatically : 1=autodetection
+                     ThumbStream->codec->idct_algo        =FF_IDCT_AUTO;         // IDCT algorithm, 0=auto
+@@ -2552,7 +2552,7 @@
+     }
+ 
+     if (FrameBufferYUV!=NULL) {
+-        #if defined(LIBAV) || (defined(FFMPEG)&&(FFMPEGVERSIONINT<201))
++        #if (defined(LIBAV)&&(LIBAVVERSIONINT<=9) || defined(FFMPEG)&&(FFMPEGVERSIONINT<201))
+         if (FrameBufferYUV->opaque) {
+             avfilter_unref_buffer((AVFilterBufferRef *)FrameBufferYUV->opaque);
+             FrameBufferYUV->opaque=NULL;
+@@ -2572,7 +2572,7 @@
+     if (RSC) {
+         #if defined(LIBAV) && (LIBAVVERSIONINT<=8)
+             audio_resample_close(RSC);
+-        #elif defined(LIBAV) && (LIBAVVERSIONINT<=9)
++        #elif defined(LIBAV)
+             avresample_close(RSC);
+             avresample_free(&RSC);
+         #elif defined(FFMPEG)
+@@ -2619,7 +2619,7 @@
+                 1,                                          // linear
+                 0);                                         // cutoff
+             if (!RSC) ToLog(LOGMSG_CRITICAL,QString("CheckResampler: av_audio_resample_init failed"));
+-        #elif defined(LIBAV) && (LIBAVVERSIONINT<=9)
++        #elif defined(LIBAV)
+             this->RSC_InChannelLayout =RSC_InChannelLayout;
+             this->RSC_OutChannelLayout=RSC_OutChannelLayout;
+             RSC=avresample_alloc_context();
+@@ -2704,7 +2704,7 @@
+         AVFilterInOut *outputs = (AVFilterInOut *)av_malloc(sizeof(AVFilterInOut));
+         AVFilterInOut *inputs  = (AVFilterInOut *)av_malloc(sizeof(AVFilterInOut));
+ 
+-    #elif defined(LIBAV) && (LIBAVVERSIONINT<=9)
++    #elif defined(LIBAV)
+ 
+         QString args=QString("%1:%2:%3:%4:%5:%6:%7")
+             .arg(LibavVideoFile->streams[VideoStreamNumber]->codec->width)
+@@ -2768,10 +2768,8 @@
+     inputs->pad_idx = 0;
+     inputs->next = NULL;
+ 
+-    #if defined(LIBAV) && (LIBAVVERSIONINT<=8)
++    #if defined(LIBAV)
+     if ((result=avfilter_graph_parse(VideoFilterGraph,QString("yadif=1:-1").toLocal8Bit().constData(),inputs,outputs,NULL))<0) {
+-    #elif (defined(LIBAV) && (LIBAVVERSIONINT<=9))
+-    if ((result=avfilter_graph_parse(VideoFilterGraph,QString("yadif=deint=interlaced:mode=send_frame:parity=auto").toLocal8Bit().constData(),inputs,outputs,NULL))<0) {
+     #elif (defined(FFMPEG)&&(FFMPEGVERSIONINT<201))
+     if ((result=avfilter_graph_parse(VideoFilterGraph,QString("yadif=deint=interlaced:mode=send_frame:parity=auto").toLocal8Bit().constData(),&inputs,&outputs,NULL))<0) {
+     #elif defined(FFMPEG)&&(FFMPEGVERSIONINT>=201)
+@@ -2799,7 +2797,7 @@
+ 
+ //====================================================================================================================
+ 
+-#if defined(LIBAV) || (FFMPEGVERSIONINT<201)
++#if (defined(LIBAV)&&(LIBAVVERSIONINT<=9) || defined(FFMPEG)&&(FFMPEGVERSIONINT<201))
+     int cVideoFile::VideoFilter_Process() {
+         #if defined(LIBAV) && (LIBAVVERSIONINT<=8)
+             // LIBAV 8
+@@ -2831,7 +2829,7 @@
+                 FrameBufferYUV->opaque=(void *)avfilter_ref_buffer(VideoFilterOut->inputs[0]->cur_buf,AV_PERM_READ);
+             }
+ 
+-        #elif defined(LIBAV) && (LIBAVVERSIONINT<=9)
++        #elif defined(LIBAV)
+             // LIBAV9
+             AVFilterBufferRef *m_pBufferRef=NULL;
+             int Ret=av_buffersrc_write_frame(VideoFilterIn,FrameBufferYUV);
+@@ -2964,7 +2962,7 @@
+     #if defined(LIBAV) && (LIBAVVERSIONINT<=8)
+         Data=(u_int8_t *)av_malloc(MaxAudioLenDecoded);
+         if (Data) *SizeDecoded=audio_resample(RSC,(short int*)Data,(short int*)Frame->data[0],Frame->nb_samples)*DstSampleSize;
+-    #elif defined(LIBAV) && (LIBAVVERSIONINT<=9)
++    #elif defined(LIBAV)
+         u_int8_t *in_data[RESAMPLE_MAX_CHANNELS]={0};
+         int     in_linesize=0;
+         Data=Frame->data[0];
+@@ -2979,7 +2977,7 @@
+             } else if (av_samples_fill_arrays(out_data,&out_linesize,Data,RSC_OutChannels,out_samples,RSC_OutSampleFmt,1)<0) {
+                 ToLog(LOGMSG_CRITICAL,QString("failed out_data fill arrays"));
+             } else {
+-                *SizeDecoded=avresample_convert(RSC,out_data,out_linesize,out_samples,in_data,in_linesize,Frame->nb_samples)*DstSampleSize;
++                *SizeDecoded=avresample_convert(RSC,out_data,out_linesize,out_samples,Frame->data,in_linesize,Frame->nb_samples)*DstSampleSize;
+             }
+         }
+     #elif defined(FFMPEG)
+@@ -3024,7 +3022,7 @@
+ 
+     if (!FPSDuration) {
+         if (PreviewMode) FPSDuration=double(AV_TIME_BASE)/((cApplicationConfig *)ApplicationConfig)->PreviewFPS;
+-            else if (VideoStream) FPSDuration=double(VideoStream->r_frame_rate.den*AV_TIME_BASE)/double(VideoStream->r_frame_rate.num);
++            else if (VideoStream) FPSDuration=double(VideoStream->avg_frame_rate.den*AV_TIME_BASE)/double(VideoStream->avg_frame_rate.num);
+             else FPSDuration=double(AV_TIME_BASE)/double(SoundTrackBloc->SamplingRate);
+     }
+     // If position >= end of file : disable audio
+@@ -3164,7 +3162,7 @@
+                                 Data=Frame->data[0];
+                                 #if (defined(LIBAV)&&(LIBAVVERSIONINT<=8))
+                                 SizeDecoded=Frame->nb_samples*av_get_bytes_per_sample(AudioStream->codec->sample_fmt)*AudioStream->codec->channels;
+-                                #elif (defined(LIBAV)&&(LIBAVVERSIONINT<=9))
++                                #elif defined(LIBAV)
+                                 SizeDecoded=av_samples_get_buffer_size(NULL,AudioStream->codec->channels,Frame->nb_samples,AudioStream->codec->sample_fmt,0);
+                                 #elif defined(FFMPEG)
+                                 SizeDecoded=Frame->nb_samples*av_get_bytes_per_sample(AudioStream->codec->sample_fmt)*AudioStream->codec->channels;
+@@ -3290,7 +3288,7 @@
+                             if (FrameBufferYUV==NULL) FrameBufferYUV=ALLOCFRAME();
+                             if (FrameBufferYUV) {
+ 
+-                                #if defined(LIBAV) || (defined(FFMPEG)&&(FFMPEGVERSIONINT<201))
++                                #if (defined(LIBAV)&&(LIBAVVERSIONINT<=9) || defined(FFMPEG)&&(FFMPEGVERSIONINT<201))
+                                 if (FrameBufferYUV->opaque) {
+                                     avfilter_unref_buffer((AVFilterBufferRef *)FrameBufferYUV->opaque);
+                                     FrameBufferYUV->opaque=NULL;
+@@ -3324,14 +3322,14 @@
+                                     if ((Deinterlace)&&(!VideoFilterGraph))           VideoFilter_Open();
+                                         else if ((!Deinterlace)&&(VideoFilterGraph))  VideoFilter_Close();
+ 
+-                                    #if defined(LIBAV) || (defined(FFMPEG)&&(FFMPEGVERSIONINT<201))
++                                    #if (defined(LIBAV)&&(LIBAVVERSIONINT<=9) || defined(FFMPEG)&&(FFMPEGVERSIONINT<201))
+                                     if (VideoFilterGraph) VideoFilter_Process();
+-                                    #elif defined(FFMPEG)&&(FFMPEGVERSIONINT>=201)
++                                    #elif (defined(LIBAV)&&(LIBAVVERSIONINT>=10) || defined(FFMPEG)&&(FFMPEGVERSIONINT>=201))
+                                     AVFrame *FiltFrame=NULL;
+                                     if (VideoFilterGraph) {
+-                                        // FFMPEG 2.0
++                                        // FFMPEG 2.0 / LIBAV 10
+                                         // push the decoded frame into the filtergraph
+-                                        if (av_buffersrc_add_frame_flags(VideoFilterIn,FrameBufferYUV,AV_BUFFERSRC_FLAG_KEEP_REF)<0) {
++                                        if (av_buffersrc_write_frame(VideoFilterIn,FrameBufferYUV)<0) {
+                                             ToLog(LOGMSG_INFORMATION,"IN:cVideoFile::ReadFrame : Error while feeding the filtergraph");
+                                         } else {
+                                             FiltFrame=av_frame_alloc();
+@@ -3364,7 +3362,7 @@
+ 
+                                         // Append this frame
+                                         cImageInCache *ObjImage=
+-                                            #if defined(LIBAV) || (defined(FFMPEG)&&(FFMPEGVERSIONINT<201))
++                                            #if (defined(LIBAV)&&(LIBAVVERSIONINT<=9) || defined(FFMPEG)&&(FFMPEGVERSIONINT<201))
+                                                 new cImageInCache(FrameBufferYUVPosition,NULL,FrameBufferYUV);
+                                             #else
+                                                 new cImageInCache(FrameBufferYUVPosition,FiltFrame,FrameBufferYUV);
+@@ -3386,7 +3384,7 @@
+                                         IsVideoFind=Nbr>0;
+                                     }
+                                     if (FreeFrames) {
+-                                        #if defined(LIBAV) || (defined(FFMPEG)&&(FFMPEGVERSIONINT<201))
++                                        #if (defined(LIBAV)&&(LIBAVVERSIONINT<=9) || defined(FFMPEG)&&(FFMPEGVERSIONINT<201))
+                                         if (FrameBufferYUV->opaque) {
+                                             avfilter_unref_buffer((AVFilterBufferRef *)FrameBufferYUV->opaque);
+                                             FrameBufferYUV->opaque=NULL;
+@@ -3401,7 +3399,7 @@
+                                         FREEFRAME(&FrameBufferYUV);
+                                     } else {
+                                         FrameBufferYUV=NULL;
+-                                        #if defined(FFMPEG)&&(FFMPEGVERSIONINT>=201)
++                                        #if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=201) || defined(LIBAV)&&(LIBAVVERSIONINT>=10))
+                                         FiltFrame     =NULL;
+                                         #endif
+                                     }
+@@ -3490,7 +3488,7 @@
+ 
+         if (img_convert_ctx!=NULL) {
+             int ret;
+-            #if defined(LIBAV) || (defined(FFMPEG)&&(FFMPEGVERSIONINT<201))
++            #if (defined(LIBAV)&&(LIBAVVERSIONINT<=9) || defined(FFMPEG)&&(FFMPEGVERSIONINT<201))
+             if (Frame->opaque) {
+                 AVFilterBufferRef *Buf=(AVFilterBufferRef *)Frame->opaque;
+                 ret = sws_scale(
+@@ -3565,12 +3563,12 @@
+ int cVideoFile::getThreadFlags(AVCodecID ID) {
+     int Ret=0;
+     switch (ID) {
+-        case CODEC_ID_PRORES:
+-        case CODEC_ID_MPEG1VIDEO:
+-        case CODEC_ID_DVVIDEO:
+-        case CODEC_ID_MPEG2VIDEO:   Ret=FF_THREAD_SLICE;                    break;
+-        case CODEC_ID_H264 :        Ret=FF_THREAD_FRAME|FF_THREAD_SLICE;    break;
+-        default:                    Ret=FF_THREAD_FRAME;                    break;
++        case AV_CODEC_ID_PRORES:
++        case AV_CODEC_ID_MPEG1VIDEO:
++        case AV_CODEC_ID_DVVIDEO:
++        case AV_CODEC_ID_MPEG2VIDEO:   Ret=FF_THREAD_SLICE;                    break;
++        case AV_CODEC_ID_H264 :        Ret=FF_THREAD_FRAME|FF_THREAD_SLICE;    break;
++        default:                       Ret=FF_THREAD_FRAME;                    break;
+     }
+     return Ret;
+ }
+@@ -3607,7 +3605,7 @@
+         AudioDecoderCodec=avcodec_find_decoder(AudioStream->codec->codec_id);
+ 
+         // Setup decoder options
+-        AudioStream->codec->debug_mv         =0;                    // Debug level (0=nothing)
++        //AudioStream->codec->debug_mv         =0;                    // Debug level (0=nothing)
+         AudioStream->codec->debug            =0;                    // Debug level (0=nothing)
+         AudioStream->codec->workaround_bugs  =1;                    // Work around bugs in encoders which sometimes cannot be detected automatically : 1=autodetection
+         AudioStream->codec->idct_algo        =FF_IDCT_AUTO;         // IDCT algorithm, 0=auto
+@@ -3648,7 +3646,7 @@
+         VideoDecoderCodec=avcodec_find_decoder(VideoStream->codec->codec_id);
+ 
+         // Setup decoder options
+-        VideoStream->codec->debug_mv         =0;                    // Debug level (0=nothing)
++        //VideoStream->codec->debug_mv         =0;                    // Debug level (0=nothing)
+         VideoStream->codec->debug            =0;                    // Debug level (0=nothing)
+         VideoStream->codec->workaround_bugs  =1;                    // Work around bugs in encoders which sometimes cannot be detected automatically : 1=autodetection
+         VideoStream->codec->idct_algo        =FF_IDCT_AUTO;         // IDCT algorithm, 0=auto
+@@ -3662,7 +3660,19 @@
+         // Hack to correct wrong frame rates that seem to be generated by some codecs
+         if (VideoStream->codec->time_base.num>1000 && VideoStream->codec->time_base.den==1)
+             VideoStream->codec->time_base.den=1000;
+-
++            
++        if (VideoStream->codec->time_base.num == 0) {
++          VideoStream->codec->time_base.num = VideoStream->avg_frame_rate.den;
++          VideoStream->codec->time_base.den = VideoStream->avg_frame_rate.num;
++        }          
++        
++        if (VideoStream->codec->sample_aspect_ratio.num == 0) {
++          if (VideoStream->sample_aspect_ratio.num == 0)
++            VideoStream->codec->sample_aspect_ratio.num = VideoStream->codec->sample_aspect_ratio.den = 1;
++          else
++            VideoStream->codec->sample_aspect_ratio = VideoStream->sample_aspect_ratio;
++        }
++        
+         if ((VideoDecoderCodec==NULL)||(avcodec_open2(VideoStream->codec,VideoDecoderCodec,NULL)<0)) return false;
+         LibavStartTime=LibavVideoFile->start_time;
+     }
+
+--- src/ffDiaporama/engine/cBaseMediaFile.h	2014-02-09 10:48:04.000000000 +0100
++++ src/ffDiaporama/engine/cBaseMediaFile.h	2015-03-29 00:14:35.225871600 +0100
+@@ -429,7 +429,7 @@
+ 
+     virtual int             VideoFilter_Open();
+     virtual void            VideoFilter_Close();
+-    #if defined(LIBAV) || (FFMPEGVERSIONINT<201)
++    #if (defined(LIBAV)&&(LIBAVVERSIONINT<=9) || defined(FFMPEG)&&(FFMPEGVERSIONINT<201))
+         virtual int         VideoFilter_Process();
+     #endif
+ 
+@@ -444,7 +444,7 @@
+     // Audio resampling
+     #if defined(LIBAV) && (LIBAVVERSIONINT<=8)
+     ReSampleContext         *RSC;
+-    #elif defined(LIBAV) && (LIBAVVERSIONINT<=9)
++    #elif defined(LIBAV)
+     AVAudioResampleContext  *RSC;
+     uint64_t                RSC_InChannelLayout,RSC_OutChannelLayout;
+     #elif defined(FFMPEG)
+
+--- src/ffDiaporama/engine/cDeviceModelDef.h	2014-02-09 10:48:04.000000000 +0100
++++ src/ffDiaporama/engine/cDeviceModelDef.h	2015-03-28 23:57:31.667562500 +0100
+@@ -65,7 +65,14 @@
+ 
+ #if (LIBAVUTIL_VERSION_MICRO<100)&&(LIBAVCODEC_VERSION_MICRO<100)&&(LIBAVFORMAT_VERSION_MICRO<100)&&(LIBAVDEVICE_VERSION_MICRO<100)&&(LIBAVFILTER_VERSION_MICRO<100)&&(LIBSWSCALE_VERSION_MICRO<100)
+     #define LIBAV
+-    #if ((LIBAVUTIL_VERSION_INT>=AV_VERSION_INT(52,3,0))&&(LIBAVCODEC_VERSION_INT>=AV_VERSION_INT(54,35,0))&&(LIBAVFORMAT_VERSION_INT>=AV_VERSION_INT(54,20,0))&&(LIBAVDEVICE_VERSION_INT>=AV_VERSION_INT(53,2,0))&&(LIBAVFILTER_VERSION_INT>=AV_VERSION_INT(3,3,0))&&(LIBSWSCALE_VERSION_INT>=AV_VERSION_INT(2,1,1)))
++    #if ((LIBAVUTIL_VERSION_INT>=AV_VERSION_INT(53,3,0))&&(LIBAVCODEC_VERSION_INT>=AV_VERSION_INT(55,34,1))&&(LIBAVFORMAT_VERSION_INT>=AV_VERSION_INT(55,12,0))&&(LIBAVDEVICE_VERSION_INT>=AV_VERSION_INT(54,0,0))&&(LIBAVFILTER_VERSION_INT>=AV_VERSION_INT(4,2,0))&&(LIBSWSCALE_VERSION_INT>=AV_VERSION_INT(2,1,2)))
++        #define LIBAVVERSION        "Libav 10 or higher"
++        #define LIBAVVERSIONINT     10
++        #include "libavresample/avresample.h"
++        #define RESAMPLE_MAX_CHANNELS AVRESAMPLE_MAX_CHANNELS
++        #include "libavfilter/buffersink.h"
++        #include "libavfilter/buffersrc.h"
++    #elif ((LIBAVUTIL_VERSION_INT>=AV_VERSION_INT(52,3,0))&&(LIBAVCODEC_VERSION_INT>=AV_VERSION_INT(54,35,0))&&(LIBAVFORMAT_VERSION_INT>=AV_VERSION_INT(54,20,0))&&(LIBAVDEVICE_VERSION_INT>=AV_VERSION_INT(53,2,0))&&(LIBAVFILTER_VERSION_INT>=AV_VERSION_INT(3,3,0))&&(LIBSWSCALE_VERSION_INT>=AV_VERSION_INT(2,1,1)))
+         #define LIBAVVERSION        "Libav 9.x"
+         #define LIBAVVERSIONINT     9
+         #include "libavresample/avresample.h"
+@@ -110,7 +117,7 @@
+     #define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000
+ #endif
+ 
+-#if !defined(FF_API_CODEC_ID)
++#if (LIBAVCODEC_VERSION_MAJOR < 55)
+     #define AV_CODEC_ID_NONE        CODEC_ID_NONE
+     #define AV_CODEC_ID_MJPEG       CODEC_ID_MJPEG
+     #define AV_CODEC_ID_MPEG2VIDEO  CODEC_ID_MPEG2VIDEO
+@@ -133,6 +140,9 @@
+     #define AV_CODEC_ID_FLAC        CODEC_ID_FLAC
+     #define AV_CODEC_ID_WMAV1       CODEC_ID_WMAV1
+     #define AV_CODEC_ID_WMAV2       CODEC_ID_WMAV2
++    #define AV_CODEC_ID_PRORES      CODEC_ID_PRORES
++    #define AV_CODEC_ID_MPEG1VIDEO  CODEC_ID_MPEG1VIDEO
++    #define AV_CODEC_ID_DVVIDEO     CODEC_ID_DVVIDEO
+ #endif
+ 
+ #if !defined(avcodec_free_frame)
+
+--- src/ffDiaporama/engine/_EncodeVideo.cpp	2014-02-09 10:48:04.000000000 +0100
++++ src/ffDiaporama/engine/_EncodeVideo.cpp	2015-03-29 00:23:23.090780000 +0100
+@@ -136,7 +136,7 @@
+             av_freep(&Container->streams[i]->codec->extradata);
+             av_freep(&Container->streams[i]->codec->subtitle_header);
+             av_freep(&Container->streams[i]->priv_data);
+-            if (Container->streams[i]->info) av_freep(&Container->streams[i]->info->duration_error);
++            //if (Container->streams[i]->info) av_freep(&Container->streams[i]->info->duration_error);
+         }
+         //=== End of patch
+         avformat_free_context(Container);
+@@ -151,7 +151,7 @@
+     if (AudioResampler) {
+         #if defined(LIBAV) && (LIBAVVERSIONINT<=8)
+             audio_resample_close(AudioResampler);
+-        #elif defined(LIBAV) && (LIBAVVERSIONINT<=9)
++        #elif defined(LIBAV)
+             avresample_close(AudioResampler);
+             avresample_free(&AudioResampler);
+         #elif defined(FFMPEG)
+@@ -185,12 +185,12 @@
+ int cEncodeVideo::getThreadFlags(AVCodecID ID) {
+     int Ret=0;
+     switch (ID) {
+-        case CODEC_ID_PRORES:
+-        case CODEC_ID_MPEG1VIDEO:
+-        case CODEC_ID_DVVIDEO:
+-        case CODEC_ID_MPEG2VIDEO:   Ret=FF_THREAD_SLICE;                    break;
+-        case CODEC_ID_H264 :        Ret=FF_THREAD_FRAME|FF_THREAD_SLICE;    break;
+-        default:                    Ret=FF_THREAD_FRAME;                    break;
++        case AV_CODEC_ID_PRORES:
++        case AV_CODEC_ID_MPEG1VIDEO:
++        case AV_CODEC_ID_DVVIDEO:
++        case AV_CODEC_ID_MPEG2VIDEO:   Ret=FF_THREAD_SLICE;                    break;
++        case AV_CODEC_ID_H264 :        Ret=FF_THREAD_FRAME|FF_THREAD_SLICE;    break;
++        default:                       Ret=FF_THREAD_FRAME;                    break;
+     }
+     return Ret;
+ }
+@@ -789,7 +789,7 @@
+                     Continue=false;
+                 }
+             }
+-        #elif defined(LIBAV) && (LIBAVVERSIONINT<=9)
++        #elif defined(LIBAV)
+             if ((AudioStream->codec->sample_fmt!=ToEncodeMusic.SampleFormat)||(AudioStream->codec->channels!=ToEncodeMusic.Channels)||(AudioSampleRate!=ToEncodeMusic.SamplingRate)) {
+                 if (!AudioResamplerBuffer) {
+                     int out_linesize=0;
+@@ -857,7 +857,7 @@
+     }
+ 
+     // Define InterleaveFrame to not compute it for each frame
+-    #if defined(FFMPEG)&&(FFMPEGVERSIONINT>=201)
++    #if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=201) || (LIBAVVERSIONINT >=10))
+     InterleaveFrame=(strcmp(Container->oformat->name,"avi")!=0);
+     #else
+     InterleaveFrame=true;
+@@ -1038,7 +1038,7 @@
+         } else {
+             #if defined(LIBAV) && (LIBAVVERSIONINT<=8)
+                 DestPacket=(u_int8_t *)PacketSound;
+-            #elif defined(LIBAV) && (LIBAVVERSIONINT<=9)
++            #elif defined(LIBAV)
+                 // LIBAV 9 => Convert sample format (is needed)
+                 if ((AudioResampler!=NULL)&&(AudioResamplerBuffer!=NULL)) {
+                     DestPacket=AudioResamplerBuffer;
+
+--- src/ffDiaporama/engine/_EncodeVideo.h	2014-02-09 10:48:04.000000000 +0100
++++ src/ffDiaporama/engine/_EncodeVideo.h	2015-03-29 00:22:10.452192800 +0100
+@@ -82,7 +82,7 @@
+     int                 AudioResamplerBufferSize;
+     #if defined(LIBAV) && (LIBAVVERSIONINT<=8)
+     ReSampleContext         *AudioResampler;            // Audio resampler
+-    #elif defined(LIBAV) && (LIBAVVERSIONINT<=9)
++    #elif defined(LIBAV)
+     AVAudioResampleContext  *AudioResampler;
+     #elif defined(FFMPEG)
+     SwrContext              *AudioResampler;
+
+--- src/ffDiaporama/MainWindow/mainwindow.cpp	2014-02-09 10:48:08.000000000 +0100
++++ src/ffDiaporama/MainWindow/mainwindow.cpp	2015-03-29 00:00:47.710860800 +0100
+@@ -472,7 +472,7 @@
+     delete ApplicationConfig;
+ 
+     // Close some libav additionnals
+-    #if defined(LIBAV) || (defined(FFMPEG)&&(FFMPEGVERSIONINT<201))
++    #if (defined(LIBAV)&&(LIBAVVERSIONINT<=9) || defined(FFMPEG)&&(FFMPEGVERSIONINT<201))
+     avfilter_uninit();
+     #endif
+     avformat_network_deinit();
diff --git a/media-video/ffdiaporama/metadata.xml b/media-video/ffdiaporama/metadata.xml
new file mode 100644
index 000000000000..6b20ac540fec
--- /dev/null
+++ b/media-video/ffdiaporama/metadata.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>olivier.laurantin@laposte.net</email>
+		<name>Olivier Laurantin</name>
+		<description>Proxy maintainer. CC him on bugs</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+        <changelog>http://ffdiaporama.tuxfamily.org/?page_id=7266&amp;lang=en</changelog>
+        <doc lang="en">http://ffdiaporama.tuxfamily.org/?page_id=6268</doc>
+        <bugs-to>http://ffdiaporama.tuxfamily.org/Forum/viewforum.php?id=4</bugs-to>
+	</upstream>
+	<longdescription lang="en">
+ffDiaporama is an application for creating video sequences consisting of
+
+    - titles, fixed or animated.
+    - images or photos, fixed or animated.
+    - movie clips
+    - music
+
+These sequences are assembled into a slide show by means of transitions to produce complete videos
+The following options are available:
+
+
+    - Reframing of images and photos
+    - Cutting of video clips
+    - Adding text, notes to images, photos, sequences and animations
+    - Graphical filters on the images and the videos (conversion into black and white, dust removal, equalization of colors, etc.)
+    - Creation of animation by zoom, rotation or Ken Burns Effect on images or photos
+    - Correction of the images and the videos during animations (luminosity, contrast, gamma, colors, etc.)
+    - Transitions between sequences with definition of the transition type, sequence by sequence.
+    - Addition of a background sound (wav, mp3 or ogg) with customizable effects for volume, fade in/out and passage in pause, sequence by sequence.
+    - Generation of videos usable on most current video equipment (DVD player/smartphone, multimedia box, hard drive, etc.) but also publishable on the main video-sharing Websites (YouTube, Dailymotion, etc.)
+    - Video formats from QVGA (320×240) to Full HD (1920×1080) by way of the DVD and HD 720 formats.
+    - Image geometry (aspect ratio) : 4:3, 16:9 or 2.35:1 (cinema)
+    - Possible formats for rendering : avi, mpg, mp4, mkv
+	</longdescription>
+	<use>
+		<flag name="openclipart">Support openslipart database</flag>
+		<flag name="texturemate">Install extra backgrounds</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
new file mode 100644
index 000000000000..19a3332c5599
--- /dev/null
+++ b/media-video/ffmpeg/Manifest
@@ -0,0 +1,17 @@
+AUX chromium.patch 1420 SHA256 934ccd37bf4e36b20bf4fc1e6599f6e6489c3bac7940ca48bc93ff93dd20696f SHA512 1f3f6d08aac64bb8c9d8a974170064b8a3531a6d06cea6fb208439dc687addeaf0c90f7f407dd7e71f50cd524f69c110c92d5276d04fe3bcaf7fb1ff2494ec59 WHIRLPOOL 46889e7842bd134e94f2a79ccddb561e0f7128557973e2ffe0b6a5d85a789a80eecaa64cdcea0cd7fd61a01fe8459b30c62d960a5d449ea1b4dfa938e2cbdff5
+AUX ffmpeg32-openjpeg22.patch 4777 SHA256 4a9ed7ff8716fd6e3f311c09af3a062023fe922dcc4b6786922e0e2947f77547 SHA512 0d619b0e353ee9f80dffdb94bedd31b55fb4e6a18a0e60d8ef7119e5012583c1c0531b0b200b41c32caaa71cbade4899f74c9d0ae70d15403ef0aa6f3d77e07d WHIRLPOOL 3d49d34ff0bd5ac8638b91c16e7e1280d60c2565dd4e9593406c240ecc98f14bea1c7f9b54f26fb6f7c65d531cfe793f854f7772addda903abd71f6692aadbd8
+AUX openjpeg22.patch 4770 SHA256 48d399b12299da0eb709412e52b6e545afe82ba4bb3e59f4a02828985f9dfed5 SHA512 8a198910cdf43df83fdf50e372c2ec5d911637dd61768d5ac3a1984f99d1f374f594af9ff6c501b248c390a22898e4964f7d07c81eb3586fa1bebad2c9e00730 WHIRLPOOL c655b65761b198225f03a072ec690c81eb27a2972f602a3ef0be260e0e4acb242357f7421a213e32af0159da4a3398c5b5794a0bb616e7e4a36e6698341e9208
+AUX openjpeg23.patch 5105 SHA256 c3d4844cee8704f2205694df7be44dcc77ea5fb35e092cd15182f8b0b533cbcb SHA512 a1e3b91add49a80633e19eb49870ecb7ef1493cf3503d121bdeb74f2fcd0320b8e5f04a3505241f7375f4a598f5da651afb92350e3b92412977f55b9193409a7 WHIRLPOOL d2e9bf24aae50ebc27a47aefebab7e81511a0e46fac1344119bd4e9f955af552d6e05450b1675bb799955fc67317d459832fa8d3e48dcc510f5190d6ce9d183f
+DIST ffmpeg-3.2.6.tar.bz2 9623111 SHA256 602b1a8c91bbc87f6e8897c0918d2bf1c7d4820d3888712f0ff0c1198a3f1e8f SHA512 eca75524374003eac78033bd2a744b459a4dc631c59150b6c9291e06a693bdd14e0b11cae9c800446f0648edccc066480c2b869bcb456a74eeabb91ab41f8285 WHIRLPOOL b2b5b78ae0a1ad0c44387e1241825a79cfe87234f1470d9095757b25ed724e04fe42ae96287e3242a80f6f74f380c5167b5388ddc6abf4d6738a1bc4af1ebe4d
+DIST ffmpeg-3.2.7.tar.bz2 9622391 SHA256 d5a0f891ed7764876e3c2fd541adcab90641eefe9103ab4d8269a346b10ebc8a SHA512 a5b6df77d2d4ede0cc2f398b763d7405f43f43e37c11a596ec1a2a8921714875fd8fa9ffbcff84355854780872ab7313c859a4a19bf419298b4d3bc797ad8ac4 WHIRLPOOL 8c3f36cd1d254ce5ed3917d498124860bb9620a65add1a3461844565fddb6d315914d38cc9760b7e45ebe4e1818e1872eeaebe65a040dd738a5bcc6508233f7d
+DIST ffmpeg-3.3.3.tar.bz2 9940959 SHA256 1069ac8fc7f52e566bea28b41b9c437246aeb5096f82fb26fa96dc7d5a10a473 SHA512 1cc63bf73356f4e618c0d3572a216bdf5689f10deff56b4262f6d740b0bee5a4b3eac234f45fca3d4d2da77903a507b4fba725b76d2d2070f31b6dae9e7a2dab WHIRLPOOL c90d2cc0d3fa7c3635a00c8039f94ff9e7b8413bd14400ddd6f1cccdc9cbbbfd2254ca2a209cefccd7e6c2f750b4594053d4c664eb2867ee208fe5657e95330b
+DIST ffmpeg-3.3.4.tar.bz2 9944256 SHA256 5ef5e9276c311c74ab2e9d301c2d7ee10e1f2cbd758c6f13d6cb9514dffbac7e SHA512 d2257a71f9ae7856390b807d70bf643d4360fe4f2ad7c76af3ac5332cda353a1a543cdcdea0c510dbb6141f7a3a36ffbf26ae87b0ffc9ce4b3b7641814a40e3a WHIRLPOOL b28e0c37a70f7dba8af2599861bc748b2c7f0e56ff6e7eca86f45e94b4f9318c48a1ad8d2c3c5c9446f71f5fc1f20fadd240a9e638d39337158010c2ae00ad41
+EBUILD ffmpeg-3.2.6.ebuild 15052 SHA256 bec4aea66c6d9f0fcde470658898a47f941eda9ca8a48fa69253ab137157af10 SHA512 938928ca584ecedba7cde7d9ef8a58e45652068b1299431590b50cc72d53cd5c0ff512195d75ce652659ff2269e35d66b55d4811431804fa8f810e17e0590913 WHIRLPOOL bb9f8c1a268f010efcc842299572bb3d013fae2bc9eab819fb7d5bbfa463463105d5cbaa6e10a0e4fdd6b59865ad93295eb624fc74999f5b82a794e9010291a0
+EBUILD ffmpeg-3.2.7.ebuild 15057 SHA256 5b5a4aca2c1de577dfb8d73462395b4ce8dc84a3669a6186c3eea0874ec5964d SHA512 62eba0bd34e68cf6ea4d49559292f28e6840e555af06d94c81f1a6a628153a5d8a483e7858b071e508d11233a0869951cfa7a7c87b49fada612b319c0e0c2e26 WHIRLPOOL 89b41ebe97fe0a8b9ecf52641e8b107d9e7a9ee4c285b1b7ed8a0a0307a76d2d40483cd5961e0a9c418fa8b2554af82b53b8ad99c791bc9f013c21749ff798a4
+EBUILD ffmpeg-3.3.3.ebuild 16050 SHA256 f82e1a856ad5496867ad003b85eb4006e08f29f3276d095b12061a0bbfa84d2d SHA512 b317f5249edced441ebadda0307b4622570bef6ad1952b93edfa140f831709f7e829fc311c1b9e1452a1fb9dc93d44c4f22c793d6e31645cd20c8a546c34188d WHIRLPOOL 79bb8c4a106e34d80d522a53b5dce1ce7bfaed8fba95393f1c2149056b387d094329c77e8cab86d9dd7356798b81dd3e679ccd7d2c28e0a8d21e14f87ad0ee41
+EBUILD ffmpeg-3.3.4.ebuild 16084 SHA256 db4e25d499909f316afd4b3306239e4a1ae624019ff8a8fc77171cb14284f17d SHA512 f7321fc0d6093bac4bbe773f6ca749798bea455316cfa76347d6aaecc7f8ce31d1a3a0ce0077e64384ce4f16aebaf957cac75c9b002dc607779ba3a3f68278b8 WHIRLPOOL 06b72809b24ac4df65d415d83159f0967ac5a7a0e9dfd4d473d491e79b505463a9b423350352264ef4c57a8b4263efcee66a229c9bfd250ea192e193137a0c91
+EBUILD ffmpeg-9999.ebuild 15639 SHA256 b8ddff4473372788f87f6c31b05076ad2f662f563ce70300d503affc65ded351 SHA512 1eefc9e81a7fbe83b3cc22a3a3643823b307360d1b8885f1400472fb0b559abebe7d164dd4f590bf7745885c89a4eff10a45ca313167b4194d55c5290a8a6cdc WHIRLPOOL f86c3f599e18e3f93ffd7090178a61d82142402ce35d8eac8f676091464f0e80f9b757af8c1e76d942e634eaa797555e6a5140526383b4b417377bafdf3fe685
+MISC ChangeLog 23132 SHA256 09ec61b302618a36f1aaf270cc3d8a0adfecae89915cfa1db49eba415094887f SHA512 6ec8dcf80d54a23683e72425d5989d70ee5a2f0a9cbf93a6ff3583d7af1556e9897ae9d917e216d0d2a4469ea0ea05d75389bff11c07193f9c599d59848b0468 WHIRLPOOL 7bd7dd2164286941873d7640311f3b9e501a66c4fadce9f825dcf94ff054e79e1ab1ec4922a193d12631806ceb5fed3787cf4992332586a75e4d7993a74e7a86
+MISC ChangeLog-2014 113291 SHA256 4c06c33d7ce130dbe891dac8bbed5394756966a4317815651276b5354aa943ca SHA512 1bd9eb77e715e26a406bf58a543987caf24051dec4f7fd928f6d03af41bf4d952dcdda7c6237cb2ffb9517f04adb9f8fcaac91087fcc758c0836c754050c5ae9 WHIRLPOOL 99024abbc682eee208a9086d0a5450a8855b18a6e20e51e0a19403c0669420e8448b1fd20d5d7558c51c1cc661eb6d3d18623b1dfc42cba9c5fed64f7822b701
+MISC ChangeLog-2015 8933 SHA256 24148e3f70412c102205ed06eb8c94ad223a8a5c27fc9c57cddc507debc166ba SHA512 032c283b925782c6f2dc95fc747e97caf3743c8cb53785882c5e9066abf6d603ba49b52bc4742688c2aadad11afbd4d5fa95d05213cb50aa285bb466863fa9d0 WHIRLPOOL 383477f273a7a255e571ab1a2dd51205832bf82010438abf2b0c3b31f748d2a6b3075b4a264c49f2806bceb8fac4851ac9ad65c314f8b298d863ea9028283d7f
+MISC metadata.xml 5585 SHA256 a6fc43267404a7d11df8ff36981ec63db2f6e8f0a2fa7d10575d2499e42835aa SHA512 7ed5ff26cc2cabff62045f00354cd5b7f5638d5d766ccf3d2b6eedff2b059b56bffc033e57c0d61deee5566d0c274403faa671ccefa58dc79fbeb515fa4dd5e0 WHIRLPOOL 6cff514cd37c978972f55072e8dec790e167a88e1aa4882301944e244182da698835792e1c3a11bccdfa3bd7ff3d015a8dd20b3c599a160f0e23e7b84e67c9d4
diff --git a/media-video/ffmpeg/ffmpeg-3.2.6.ebuild b/media-video/ffmpeg/ffmpeg-3.2.6.ebuild
new file mode 100644
index 000000000000..b80c746f8b2c
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-3.2.6.ebuild
@@ -0,0 +1,462 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Subslot: libavutil major.libavcodec major.libavformat major
+# Since FFmpeg ships several libraries, subslot is kind of limited here.
+# Most consumers will use those three libraries, if a "less used" library
+# changes its soname, consumers will have to be rebuilt the old way
+# (preserve-libs).
+# If, for example, a package does not link to libavformat and only libavformat
+# changes its ABI then this package will be rebuilt needlessly. Hence, such a
+# package is free _not_ to := depend on FFmpeg but I would strongly encourage
+# doing so since such a case is unlikely.
+FFMPEG_SUBSLOT=55.57.57
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
+fi
+
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
+HOMEPAGE="http://ffmpeg.org/"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+else # Release
+	SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
+fi
+FFMPEG_REVISION="${PV#*_p}"
+
+SLOT="0/${FFMPEG_SUBSLOT}"
+LICENSE="
+	!gpl? ( LGPL-2.1 )
+	gpl? ( GPL-2 )
+	amr? (
+		gpl? ( GPL-3 )
+		!gpl? ( LGPL-3 )
+	)
+	gmp? (
+		gpl? ( GPL-3 )
+		!gpl? ( LGPL-3 )
+	)
+	encode? (
+		amrenc? (
+			gpl? ( GPL-3 )
+			!gpl? ( LGPL-3 )
+		)
+	)
+	samba? ( GPL-3 )
+"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+# Options to use as use_enable in the foo[:bar] form.
+# This will feed configure with $(use_enable foo bar)
+# or $(use_enable foo foo) if no :bar is set.
+# foo is added to IUSE.
+FFMPEG_FLAG_MAP=(
+		+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp
+		+gpl +hardcoded-tables +iconv lzma +network openssl +postproc
+		samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau X:xlib xcb:libxcb
+		xcb:libxcb-shm xcb:libxcb-xfixes +zlib
+		# libavdevice options
+		cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
+		opengl
+		# indevs
+		libv4l:libv4l2 pulseaudio:libpulse
+		# decoders
+		amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
+		jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm
+		mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
+		schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx
+		zvbi:libzvbi
+		# libavfilter options
+		bs2b:libbs2b chromaprint ebur128:libebur128 flite:libflite frei0r
+		fribidi:libfribidi fontconfig ladspa libass truetype:libfreetype
+		rubberband:librubberband zimg:libzimg
+		# libswresample options
+		libsoxr
+		# Threads; we only support pthread for now but ffmpeg supports more
+		+threads:pthreads
+)
+
+# Same as above but for encoders, i.e. they do something only with USE=encode.
+FFMPEG_ENCODER_FLAG_MAP=(
+	amrenc:libvo-amrwbenc mp3:libmp3lame
+	kvazaar:libkvazaar nvenc:nvenc
+	openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame
+	wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
+)
+
+IUSE="
+	alsa doc +encode jack oss pic static-libs test v4l
+	${FFMPEG_FLAG_MAP[@]%:*}
+	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
+"
+
+# Strings for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+ARM_CPU_FEATURES=( armv5te armv6 armv6t2 neon armvfp:vfp )
+MIPS_CPU_FEATURES=( mipsdspr1 mipsdspr2 mipsfpu )
+PPC_CPU_FEATURES=( altivec )
+X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+X86_CPU_REQUIRED_USE="
+	cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
+	cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
+	cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
+	cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
+	cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
+	cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
+	cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
+	cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
+	cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
+	cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
+	cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
+"
+
+IUSE="${IUSE}
+	${ARM_CPU_FEATURES[@]%:*}
+	${MIPS_CPU_FEATURES[@]%:*}
+	${PPC_CPU_FEATURES[@]%:*}
+	${X86_CPU_FEATURES[@]%:*}
+"
+
+CPU_REQUIRED_USE="
+	${X86_CPU_REQUIRED_USE}
+"
+
+# "$(tc-arch):XXX" form where XXX_CPU_FEATURES are the cpu features that apply to
+# $(tc-arch).
+CPU_FEATURES_MAP="
+	arm:ARM
+	arm64:ARM
+	mips:MIPS
+	ppc:PPC
+	ppc64:PPC
+	x86:X86
+	amd64:X86
+"
+
+FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher )
+IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
+
+RDEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+	bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
+	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
+	celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
+	chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
+	ebur128? ( >=media-libs/libebur128-1.1.0[${MULTILIB_USEDEP}] )
+	encode? (
+		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+		kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] )
+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+		nvenc? ( media-video/nvidia_video_sdk )
+		openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
+		snappy? ( >=app-arch/snappy-1.1.2-r1[${MULTILIB_USEDEP}] )
+		theora? (
+			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
+		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
+		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
+	)
+	fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
+	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+	frei0r? ( media-plugins/frei0r-plugins )
+	fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
+	gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
+	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
+	gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
+	gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
+	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
+	iec61883? (
+		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
+	)
+	ieee1394? (
+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+	)
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
+	libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
+	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
+	libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
+	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
+	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+	mmal? ( media-libs/raspberrypi-userland )
+	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
+	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
+	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+	openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vorbis? (
+		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+	)
+	vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		!xcb? ( >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] )
+		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
+	)
+	xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] )
+	zimg? ( media-libs/zimg[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
+	!media-video/qt-faststart
+	postproc? ( !media-libs/libpostproc )
+"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	doc? ( sys-apps/texinfo )
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
+	cpu_flags_x86_mmx? ( >=dev-lang/yasm-1.2 )
+	test? ( net-misc/wget sys-devel/bc )
+	v4l? ( sys-kernel/linux-headers )
+"
+
+RDEPEND="${RDEPEND}
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+
+# Code requiring FFmpeg to be built under gpl license
+GPL_REQUIRED_USE="
+	postproc? ( gpl )
+	frei0r? ( gpl )
+	cdio? ( gpl )
+	samba? ( gpl )
+	encode? (
+		x264? ( gpl )
+		x265? ( gpl )
+		xvid? ( gpl )
+		X? ( !xcb? ( gpl ) )
+	)
+"
+REQUIRED_USE="
+	libv4l? ( v4l )
+	fftools_cws2fws? ( zlib )
+	test? ( encode )
+	${GPL_REQUIRED_USE}
+	${CPU_REQUIRED_USE}"
+RESTRICT="
+	gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
+"
+
+S=${WORKDIR}/${P/_/-}
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libavutil/avconfig.h
+)
+
+PATCHES=( "${FILESDIR}/ffmpeg32-openjpeg22.patch" )
+
+src_prepare() {
+	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
+		export revision=git-N-${FFMPEG_REVISION}
+	fi
+	default
+
+	# the version script on Solaris causes invalid symbol version problems
+	# we don't want their hacky workarounds, we're having a GNU ld
+	sed -i -e 's/sunos)/sunos) network_extralibs="-lsocket -lnsl"; add_cppflags -D__EXTENSIONS__; enable pic; disable symver ;; no-sunos)/' configure || die
+}
+
+multilib_src_configure() {
+	local myconf=( ${EXTRA_FFMPEG_CONF} )
+
+	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
+	use openssl && use gpl && myconf+=( --enable-nonfree )
+	use samba && myconf+=( --enable-version3 )
+
+	# Encoders
+	if use encode ; then
+		ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
+
+		# Licensing.
+		if use amrenc ; then
+			myconf+=( --enable-version3 )
+		fi
+	else
+		myconf+=( --disable-encoders )
+	fi
+
+	# Indevs
+	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
+	for i in alsa oss jack ; do
+		use ${i} || myconf+=( --disable-indev=${i} )
+	done
+	use xcb || ffuse+=( X:x11grab )
+
+	# Outdevs
+	for i in alsa oss sdl ; do
+		use ${i} || myconf+=( --disable-outdev=${i} )
+	done
+
+	# Decoders
+	use amr && myconf+=( --enable-version3 )
+	use gmp && myconf+=( --enable-version3 )
+	use fdk && use gpl && myconf+=( --enable-nonfree )
+
+	for i in "${ffuse[@]#+}" ; do
+		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
+	done
+
+	# (temporarily) disable non-multilib deps
+	if ! multilib_is_native_abi; then
+		for i in frei0r ; do
+			myconf+=( --disable-${i} )
+		done
+	fi
+
+	# CPU features
+	for i in ${CPU_FEATURES_MAP} ; do
+		if [ "$(tc-arch)" = "${i%:*}" ] ; then
+			local var="${i#*:}_CPU_FEATURES[@]"
+			for j in ${!var} ; do
+				use ${j%:*} || myconf+=( --disable-${j#*:} )
+			done
+		fi
+	done
+
+	if use pic ; then
+		myconf+=( --enable-pic )
+		# disable asm code if PIC is required
+		# as the provided asm decidedly is not PIC for x86.
+		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
+	fi
+	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
+
+	# Try to get cpu type based on CFLAGS.
+	# Bug #172723
+	# We need to do this so that features of that CPU will be better used
+	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
+	# will just ignore it.
+	for i in $(get-flag mcpu) $(get-flag march) ; do
+		[[ ${i} = native ]] && i="host" # bug #273421
+		myconf+=( --cpu=${i} )
+		break
+	done
+
+	# LTO support, bug #566282
+	is-flagq "-flto*" && myconf+=( "--enable-lto" )
+
+	# Mandatory configuration
+	myconf=(
+		--enable-avfilter
+		--enable-avresample
+		--disable-stripping
+		"${myconf[@]}"
+	)
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
+		case ${CHOST} in
+			*freebsd*)
+				myconf+=( --target-os=freebsd )
+				;;
+			*mingw32*)
+				myconf+=( --target-os=mingw32 )
+				;;
+			*linux*)
+				myconf+=( --target-os=linux )
+				;;
+		esac
+	fi
+
+	# doc
+	myconf+=(
+		$(multilib_native_use_enable doc)
+		$(multilib_native_use_enable doc htmlpages)
+		$(multilib_native_enable manpages)
+	)
+
+	set -- "${S}/configure" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--mandir="${EPREFIX}/usr/share/man" \
+		--enable-shared \
+		--cc="$(tc-getCC)" \
+		--cxx="$(tc-getCXX)" \
+		--ar="$(tc-getAR)" \
+		--optflags="${CFLAGS}" \
+		$(use_enable static-libs static) \
+		"${myconf[@]}"
+	echo "${@}"
+	"${@}" || die
+}
+
+multilib_src_compile() {
+	emake V=1
+
+	if multilib_is_native_abi; then
+		for i in "${FFTOOLS[@]}" ; do
+			if use fftools_${i} ; then
+				emake V=1 tools/${i}
+			fi
+		done
+	fi
+}
+
+multilib_src_install() {
+	emake V=1 DESTDIR="${D}" install install-doc
+
+	if multilib_is_native_abi; then
+		for i in "${FFTOOLS[@]}" ; do
+			if use fftools_${i} ; then
+				dobin tools/${i}
+			fi
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
+	[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
+		emake V=1 fate
+}
diff --git a/media-video/ffmpeg/ffmpeg-3.2.7.ebuild b/media-video/ffmpeg/ffmpeg-3.2.7.ebuild
new file mode 100644
index 000000000000..15961769e9ce
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-3.2.7.ebuild
@@ -0,0 +1,462 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Subslot: libavutil major.libavcodec major.libavformat major
+# Since FFmpeg ships several libraries, subslot is kind of limited here.
+# Most consumers will use those three libraries, if a "less used" library
+# changes its soname, consumers will have to be rebuilt the old way
+# (preserve-libs).
+# If, for example, a package does not link to libavformat and only libavformat
+# changes its ABI then this package will be rebuilt needlessly. Hence, such a
+# package is free _not_ to := depend on FFmpeg but I would strongly encourage
+# doing so since such a case is unlikely.
+FFMPEG_SUBSLOT=55.57.57
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
+fi
+
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
+HOMEPAGE="http://ffmpeg.org/"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+else # Release
+	SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
+fi
+FFMPEG_REVISION="${PV#*_p}"
+
+SLOT="0/${FFMPEG_SUBSLOT}"
+LICENSE="
+	!gpl? ( LGPL-2.1 )
+	gpl? ( GPL-2 )
+	amr? (
+		gpl? ( GPL-3 )
+		!gpl? ( LGPL-3 )
+	)
+	gmp? (
+		gpl? ( GPL-3 )
+		!gpl? ( LGPL-3 )
+	)
+	encode? (
+		amrenc? (
+			gpl? ( GPL-3 )
+			!gpl? ( LGPL-3 )
+		)
+	)
+	samba? ( GPL-3 )
+"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+# Options to use as use_enable in the foo[:bar] form.
+# This will feed configure with $(use_enable foo bar)
+# or $(use_enable foo foo) if no :bar is set.
+# foo is added to IUSE.
+FFMPEG_FLAG_MAP=(
+		+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp
+		+gpl +hardcoded-tables +iconv lzma +network openssl +postproc
+		samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau X:xlib xcb:libxcb
+		xcb:libxcb-shm xcb:libxcb-xfixes +zlib
+		# libavdevice options
+		cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
+		opengl
+		# indevs
+		libv4l:libv4l2 pulseaudio:libpulse
+		# decoders
+		amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
+		jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm
+		mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
+		schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx
+		zvbi:libzvbi
+		# libavfilter options
+		bs2b:libbs2b chromaprint ebur128:libebur128 flite:libflite frei0r
+		fribidi:libfribidi fontconfig ladspa libass truetype:libfreetype
+		rubberband:librubberband zimg:libzimg
+		# libswresample options
+		libsoxr
+		# Threads; we only support pthread for now but ffmpeg supports more
+		+threads:pthreads
+)
+
+# Same as above but for encoders, i.e. they do something only with USE=encode.
+FFMPEG_ENCODER_FLAG_MAP=(
+	amrenc:libvo-amrwbenc mp3:libmp3lame
+	kvazaar:libkvazaar nvenc:nvenc
+	openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame
+	wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
+)
+
+IUSE="
+	alsa doc +encode jack oss pic static-libs test v4l
+	${FFMPEG_FLAG_MAP[@]%:*}
+	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
+"
+
+# Strings for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+ARM_CPU_FEATURES=( armv5te armv6 armv6t2 neon armvfp:vfp )
+MIPS_CPU_FEATURES=( mipsdspr1 mipsdspr2 mipsfpu )
+PPC_CPU_FEATURES=( altivec )
+X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+X86_CPU_REQUIRED_USE="
+	cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
+	cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
+	cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
+	cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
+	cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
+	cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
+	cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
+	cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
+	cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
+	cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
+	cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
+"
+
+IUSE="${IUSE}
+	${ARM_CPU_FEATURES[@]%:*}
+	${MIPS_CPU_FEATURES[@]%:*}
+	${PPC_CPU_FEATURES[@]%:*}
+	${X86_CPU_FEATURES[@]%:*}
+"
+
+CPU_REQUIRED_USE="
+	${X86_CPU_REQUIRED_USE}
+"
+
+# "$(tc-arch):XXX" form where XXX_CPU_FEATURES are the cpu features that apply to
+# $(tc-arch).
+CPU_FEATURES_MAP="
+	arm:ARM
+	arm64:ARM
+	mips:MIPS
+	ppc:PPC
+	ppc64:PPC
+	x86:X86
+	amd64:X86
+"
+
+FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher )
+IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
+
+RDEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+	bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
+	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
+	celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
+	chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
+	ebur128? ( >=media-libs/libebur128-1.1.0[${MULTILIB_USEDEP}] )
+	encode? (
+		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+		kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] )
+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+		nvenc? ( media-video/nvidia_video_sdk )
+		openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
+		snappy? ( >=app-arch/snappy-1.1.2-r1[${MULTILIB_USEDEP}] )
+		theora? (
+			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
+		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
+		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
+	)
+	fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
+	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+	frei0r? ( media-plugins/frei0r-plugins )
+	fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
+	gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
+	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
+	gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
+	gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
+	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
+	iec61883? (
+		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
+	)
+	ieee1394? (
+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+	)
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
+	libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
+	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
+	libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
+	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
+	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+	mmal? ( media-libs/raspberrypi-userland )
+	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
+	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
+	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+	openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vorbis? (
+		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+	)
+	vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		!xcb? ( >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] )
+		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
+	)
+	xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] )
+	zimg? ( media-libs/zimg[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
+	!media-video/qt-faststart
+	postproc? ( !media-libs/libpostproc )
+"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	doc? ( sys-apps/texinfo )
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
+	cpu_flags_x86_mmx? ( >=dev-lang/yasm-1.2 )
+	test? ( net-misc/wget sys-devel/bc )
+	v4l? ( sys-kernel/linux-headers )
+"
+
+RDEPEND="${RDEPEND}
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+
+# Code requiring FFmpeg to be built under gpl license
+GPL_REQUIRED_USE="
+	postproc? ( gpl )
+	frei0r? ( gpl )
+	cdio? ( gpl )
+	samba? ( gpl )
+	encode? (
+		x264? ( gpl )
+		x265? ( gpl )
+		xvid? ( gpl )
+		X? ( !xcb? ( gpl ) )
+	)
+"
+REQUIRED_USE="
+	libv4l? ( v4l )
+	fftools_cws2fws? ( zlib )
+	test? ( encode )
+	${GPL_REQUIRED_USE}
+	${CPU_REQUIRED_USE}"
+RESTRICT="
+	gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
+"
+
+S=${WORKDIR}/${P/_/-}
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libavutil/avconfig.h
+)
+
+PATCHES=( "${FILESDIR}/ffmpeg32-openjpeg22.patch" )
+
+src_prepare() {
+	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
+		export revision=git-N-${FFMPEG_REVISION}
+	fi
+	default
+
+	# the version script on Solaris causes invalid symbol version problems
+	# we don't want their hacky workarounds, we're having a GNU ld
+	sed -i -e 's/sunos)/sunos) network_extralibs="-lsocket -lnsl"; add_cppflags -D__EXTENSIONS__; enable pic; disable symver ;; no-sunos)/' configure || die
+}
+
+multilib_src_configure() {
+	local myconf=( ${EXTRA_FFMPEG_CONF} )
+
+	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
+	use openssl && use gpl && myconf+=( --enable-nonfree )
+	use samba && myconf+=( --enable-version3 )
+
+	# Encoders
+	if use encode ; then
+		ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
+
+		# Licensing.
+		if use amrenc ; then
+			myconf+=( --enable-version3 )
+		fi
+	else
+		myconf+=( --disable-encoders )
+	fi
+
+	# Indevs
+	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
+	for i in alsa oss jack ; do
+		use ${i} || myconf+=( --disable-indev=${i} )
+	done
+	use xcb || ffuse+=( X:x11grab )
+
+	# Outdevs
+	for i in alsa oss sdl ; do
+		use ${i} || myconf+=( --disable-outdev=${i} )
+	done
+
+	# Decoders
+	use amr && myconf+=( --enable-version3 )
+	use gmp && myconf+=( --enable-version3 )
+	use fdk && use gpl && myconf+=( --enable-nonfree )
+
+	for i in "${ffuse[@]#+}" ; do
+		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
+	done
+
+	# (temporarily) disable non-multilib deps
+	if ! multilib_is_native_abi; then
+		for i in frei0r ; do
+			myconf+=( --disable-${i} )
+		done
+	fi
+
+	# CPU features
+	for i in ${CPU_FEATURES_MAP} ; do
+		if [ "$(tc-arch)" = "${i%:*}" ] ; then
+			local var="${i#*:}_CPU_FEATURES[@]"
+			for j in ${!var} ; do
+				use ${j%:*} || myconf+=( --disable-${j#*:} )
+			done
+		fi
+	done
+
+	if use pic ; then
+		myconf+=( --enable-pic )
+		# disable asm code if PIC is required
+		# as the provided asm decidedly is not PIC for x86.
+		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
+	fi
+	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
+
+	# Try to get cpu type based on CFLAGS.
+	# Bug #172723
+	# We need to do this so that features of that CPU will be better used
+	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
+	# will just ignore it.
+	for i in $(get-flag mcpu) $(get-flag march) ; do
+		[[ ${i} = native ]] && i="host" # bug #273421
+		myconf+=( --cpu=${i} )
+		break
+	done
+
+	# LTO support, bug #566282
+	is-flagq "-flto*" && myconf+=( "--enable-lto" )
+
+	# Mandatory configuration
+	myconf=(
+		--enable-avfilter
+		--enable-avresample
+		--disable-stripping
+		"${myconf[@]}"
+	)
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
+		case ${CHOST} in
+			*freebsd*)
+				myconf+=( --target-os=freebsd )
+				;;
+			*mingw32*)
+				myconf+=( --target-os=mingw32 )
+				;;
+			*linux*)
+				myconf+=( --target-os=linux )
+				;;
+		esac
+	fi
+
+	# doc
+	myconf+=(
+		$(multilib_native_use_enable doc)
+		$(multilib_native_use_enable doc htmlpages)
+		$(multilib_native_enable manpages)
+	)
+
+	set -- "${S}/configure" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--mandir="${EPREFIX}/usr/share/man" \
+		--enable-shared \
+		--cc="$(tc-getCC)" \
+		--cxx="$(tc-getCXX)" \
+		--ar="$(tc-getAR)" \
+		--optflags="${CFLAGS}" \
+		$(use_enable static-libs static) \
+		"${myconf[@]}"
+	echo "${@}"
+	"${@}" || die
+}
+
+multilib_src_compile() {
+	emake V=1
+
+	if multilib_is_native_abi; then
+		for i in "${FFTOOLS[@]}" ; do
+			if use fftools_${i} ; then
+				emake V=1 tools/${i}
+			fi
+		done
+	fi
+}
+
+multilib_src_install() {
+	emake V=1 DESTDIR="${D}" install install-doc
+
+	if multilib_is_native_abi; then
+		for i in "${FFTOOLS[@]}" ; do
+			if use fftools_${i} ; then
+				dobin tools/${i}
+			fi
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
+	[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
+		emake V=1 fate
+}
diff --git a/media-video/ffmpeg/ffmpeg-3.3.3.ebuild b/media-video/ffmpeg/ffmpeg-3.3.3.ebuild
new file mode 100644
index 000000000000..4ac68852ca4c
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-3.3.3.ebuild
@@ -0,0 +1,509 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Subslot: libavutil major.libavcodec major.libavformat major
+# Since FFmpeg ships several libraries, subslot is kind of limited here.
+# Most consumers will use those three libraries, if a "less used" library
+# changes its soname, consumers will have to be rebuilt the old way
+# (preserve-libs).
+# If, for example, a package does not link to libavformat and only libavformat
+# changes its ABI then this package will be rebuilt needlessly. Hence, such a
+# package is free _not_ to := depend on FFmpeg but I would strongly encourage
+# doing so since such a case is unlikely.
+FFMPEG_SUBSLOT=55.57.57
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
+fi
+
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
+HOMEPAGE="http://ffmpeg.org/"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+else # Release
+	SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
+fi
+FFMPEG_REVISION="${PV#*_p}"
+
+SLOT="0/${FFMPEG_SUBSLOT}"
+LICENSE="
+	!gpl? ( LGPL-2.1 )
+	gpl? ( GPL-2 )
+	amr? (
+		gpl? ( GPL-3 )
+		!gpl? ( LGPL-3 )
+	)
+	gmp? (
+		gpl? ( GPL-3 )
+		!gpl? ( LGPL-3 )
+	)
+	encode? (
+		amrenc? (
+			gpl? ( GPL-3 )
+			!gpl? ( LGPL-3 )
+		)
+	)
+	samba? ( GPL-3 )
+"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	KEYWORDS="amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+# Options to use as use_enable in the foo[:bar] form.
+# This will feed configure with $(use_enable foo bar)
+# or $(use_enable foo foo) if no :bar is set.
+# foo is added to IUSE.
+FFMPEG_FLAG_MAP=(
+		+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp
+		+gpl +hardcoded-tables +iconv lzma +network openssl +postproc
+		samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau X:xlib xcb:libxcb
+		xcb:libxcb-shm xcb:libxcb-xfixes +zlib
+		# libavdevice options
+		cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
+		opengl
+		# indevs
+		libv4l:libv4l2 pulseaudio:libpulse
+		# decoders
+		amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
+		jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm
+		mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
+		schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx
+		zvbi:libzvbi
+		# libavfilter options
+		bs2b:libbs2b chromaprint flite:libflite frei0r
+		fribidi:libfribidi fontconfig ladspa libass truetype:libfreetype
+		rubberband:librubberband sofalizer:netcdf zeromq:libzmq zimg:libzimg
+		# libswresample options
+		libsoxr
+		# Threads; we only support pthread for now but ffmpeg supports more
+		+threads:pthreads
+)
+
+# Same as above but for encoders, i.e. they do something only with USE=encode.
+FFMPEG_ENCODER_FLAG_MAP=(
+	amrenc:libvo-amrwbenc mp3:libmp3lame
+	kvazaar:libkvazaar nvenc:nvenc
+	openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame
+	wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
+)
+
+IUSE="
+	alsa chromium doc +encode jack oss pic static-libs test v4l
+	${FFMPEG_FLAG_MAP[@]%:*}
+	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
+"
+
+# Strings for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+ARM_CPU_FEATURES=(
+	cpu_flags_arm_thumb:armv5te
+	cpu_flags_arm_v6:armv6
+	cpu_flags_arm_thumb2:armv6t2
+	cpu_flags_arm_neon:neon
+	cpu_flags_arm_vfp:vfp
+	cpu_flags_arm_vfpv3:vfpv3
+	cpu_flags_arm_v8:armv8
+)
+ARM_CPU_REQUIRED_USE="
+	arm64? ( cpu_flags_arm_v8 )
+	cpu_flags_arm_v8? (  cpu_flags_arm_vfpv3 cpu_flags_arm_neon )
+	cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp )
+	cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp )
+	cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 )
+	cpu_flags_arm_v6? ( cpu_flags_arm_thumb )
+"
+MIPS_CPU_FEATURES=( mipsdspr1:mipsdsp mipsdspr2 mipsfpu )
+PPC_CPU_FEATURES=( altivec )
+X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+X86_CPU_REQUIRED_USE="
+	cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
+	cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
+	cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
+	cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
+	cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
+	cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
+	cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
+	cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
+	cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
+	cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
+	cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
+"
+
+IUSE="${IUSE}
+	${ARM_CPU_FEATURES[@]%:*}
+	${MIPS_CPU_FEATURES[@]%:*}
+	${PPC_CPU_FEATURES[@]%:*}
+	${X86_CPU_FEATURES[@]%:*}
+"
+
+CPU_REQUIRED_USE="
+	${ARM_CPU_REQUIRED_USE}
+	${X86_CPU_REQUIRED_USE}
+"
+
+# "$(tc-arch):XXX" form where XXX_CPU_FEATURES are the cpu features that apply to
+# $(tc-arch).
+CPU_FEATURES_MAP="
+	arm:ARM
+	arm64:ARM
+	mips:MIPS
+	ppc:PPC
+	ppc64:PPC
+	x86:X86
+	amd64:X86
+"
+
+FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher )
+IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
+
+RDEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+	bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
+	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
+	celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
+	chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
+	encode? (
+		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+		kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] )
+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+		nvenc? ( media-video/nvidia_video_sdk )
+		openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
+		snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
+		theora? (
+			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
+		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
+		webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
+	)
+	fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
+	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+	frei0r? ( media-plugins/frei0r-plugins )
+	fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
+	gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
+	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
+	gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
+	gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
+	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
+	iec61883? (
+		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
+	)
+	ieee1394? (
+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+	)
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
+	libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
+	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
+	libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
+	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
+	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+	mmal? ( media-libs/raspberrypi-userland )
+	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
+	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
+	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+	openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
+	sofalizer? (
+		>=sci-libs/netcdf-4.3.2-r1[hdf5]
+		>=sci-libs/hdf5-1.8.18[hl]
+	)
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vorbis? (
+		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+	)
+	vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
+	)
+	xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] )
+	zeromq? ( >=net-libs/zeromq-4.1.6 )
+	zimg? ( >=media-libs/zimg-2.4:=[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
+	!media-video/qt-faststart
+	postproc? ( !media-libs/libpostproc )
+"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	doc? ( sys-apps/texinfo )
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
+	cpu_flags_x86_mmx? ( >=dev-lang/yasm-1.2 )
+	test? ( net-misc/wget sys-devel/bc )
+	v4l? ( sys-kernel/linux-headers )
+"
+
+RDEPEND="${RDEPEND}
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+
+# Code requiring FFmpeg to be built under gpl license
+GPL_REQUIRED_USE="
+	postproc? ( gpl )
+	frei0r? ( gpl )
+	cdio? ( gpl )
+	samba? ( gpl )
+	encode? (
+		x264? ( gpl )
+		x265? ( gpl )
+		xvid? ( gpl )
+		X? ( !xcb? ( gpl ) )
+	)
+"
+REQUIRED_USE="
+	libv4l? ( v4l )
+	fftools_cws2fws? ( zlib )
+	test? ( encode )
+	${GPL_REQUIRED_USE}
+	${CPU_REQUIRED_USE}"
+RESTRICT="
+	gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
+"
+
+S=${WORKDIR}/${P/_/-}
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libavutil/avconfig.h
+)
+
+PATCHES=(
+	"${FILESDIR}"/openjpeg22.patch
+	"${FILESDIR}"/chromium.patch
+)
+
+src_prepare() {
+	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
+		export revision=git-N-${FFMPEG_REVISION}
+	fi
+	default
+	echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
+}
+
+multilib_src_configure() {
+	local myconf=( ${EXTRA_FFMPEG_CONF} )
+
+	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
+	use openssl && use gpl && myconf+=( --enable-nonfree )
+	use samba && myconf+=( --enable-version3 )
+
+	# Encoders
+	if use encode ; then
+		ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
+
+		# Licensing.
+		if use amrenc ; then
+			myconf+=( --enable-version3 )
+		fi
+	else
+		myconf+=( --disable-encoders )
+	fi
+
+	# Indevs
+	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
+	for i in alsa oss jack ; do
+		use ${i} || myconf+=( --disable-indev=${i} )
+	done
+
+	# Outdevs
+	for i in alsa oss sdl ; do
+		use ${i} || myconf+=( --disable-outdev=${i} )
+	done
+
+	# Decoders
+	use amr && myconf+=( --enable-version3 )
+	use gmp && myconf+=( --enable-version3 )
+	use fdk && use gpl && myconf+=( --enable-nonfree )
+
+	for i in "${ffuse[@]#+}" ; do
+		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
+	done
+
+	# (temporarily) disable non-multilib deps
+	if ! multilib_is_native_abi; then
+		for i in frei0r netcdf libzmq ; do
+			myconf+=( --disable-${i} )
+		done
+	fi
+
+	# CPU features
+	for i in ${CPU_FEATURES_MAP} ; do
+		if [ "$(tc-arch)" = "${i%:*}" ] ; then
+			local var="${i#*:}_CPU_FEATURES[@]"
+			for j in ${!var} ; do
+				use ${j%:*} || myconf+=( --disable-${j#*:} )
+			done
+		fi
+	done
+
+	if use pic ; then
+		myconf+=( --enable-pic )
+		# disable asm code if PIC is required
+		# as the provided asm decidedly is not PIC for x86.
+		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
+	fi
+	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
+
+	# Try to get cpu type based on CFLAGS.
+	# Bug #172723
+	# We need to do this so that features of that CPU will be better used
+	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
+	# will just ignore it.
+	for i in $(get-flag mcpu) $(get-flag march) ; do
+		[[ ${i} = native ]] && i="host" # bug #273421
+		myconf+=( --cpu=${i} )
+		break
+	done
+
+	# LTO support, bug #566282
+	is-flagq "-flto*" && myconf+=( "--enable-lto" )
+
+	# Mandatory configuration
+	myconf=(
+		--enable-avfilter
+		--enable-avresample
+		--disable-stripping
+		"${myconf[@]}"
+	)
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" )
+		case ${CHOST} in
+			*freebsd*)
+				myconf+=( --target-os=freebsd )
+				;;
+			*mingw32*)
+				myconf+=( --target-os=mingw32 )
+				;;
+			*linux*)
+				myconf+=( --target-os=linux )
+				;;
+		esac
+	fi
+
+	# doc
+	myconf+=(
+		$(multilib_native_use_enable doc)
+		$(multilib_native_use_enable doc htmlpages)
+		$(multilib_native_enable manpages)
+	)
+
+	set -- "${S}/configure" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--mandir="${EPREFIX}/usr/share/man" \
+		--enable-shared \
+		--cc="$(tc-getCC)" \
+		--cxx="$(tc-getCXX)" \
+		--ar="$(tc-getAR)" \
+		--optflags="${CFLAGS}" \
+		$(use_enable static-libs static) \
+		"${myconf[@]}"
+	echo "${@}"
+	"${@}" || die
+
+	if multilib_is_native_abi && use chromium; then
+		einfo "Configuring for Chromium"
+		mkdir -p ../chromium || die
+		pushd ../chromium >/dev/null || die
+		set -- "${@}" \
+			--disable-shared \
+			--enable-static \
+			--enable-pic \
+			--extra-cflags="-DFF_API_CONVERGENCE_DURATION=0"
+		echo "${@}"
+		"${@}" || die
+		popd >/dev/null || die
+	fi
+}
+
+multilib_src_compile() {
+	emake V=1
+
+	if multilib_is_native_abi; then
+		for i in "${FFTOOLS[@]}" ; do
+			if use fftools_${i} ; then
+				emake V=1 tools/${i}
+			fi
+		done
+
+		if use chromium; then
+			einfo "Compiling for Chromium"
+			pushd ../chromium >/dev/null || die
+			emake V=1 libffmpeg
+			popd >/dev/null || die
+		fi
+	fi
+}
+
+multilib_src_install() {
+	emake V=1 DESTDIR="${D}" install install-doc
+
+	if multilib_is_native_abi; then
+		for i in "${FFTOOLS[@]}" ; do
+			if use fftools_${i} ; then
+				dobin tools/${i}
+			fi
+		done
+
+		if use chromium; then
+			einfo "Installing for Chromium"
+			pushd ../chromium >/dev/null || die
+			emake V=1 DESTDIR="${D}" install-libffmpeg
+			popd >/dev/null || die
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
+	[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
+		emake V=1 fate
+}
diff --git a/media-video/ffmpeg/ffmpeg-3.3.4.ebuild b/media-video/ffmpeg/ffmpeg-3.3.4.ebuild
new file mode 100644
index 000000000000..66159129457a
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-3.3.4.ebuild
@@ -0,0 +1,510 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Subslot: libavutil major.libavcodec major.libavformat major
+# Since FFmpeg ships several libraries, subslot is kind of limited here.
+# Most consumers will use those three libraries, if a "less used" library
+# changes its soname, consumers will have to be rebuilt the old way
+# (preserve-libs).
+# If, for example, a package does not link to libavformat and only libavformat
+# changes its ABI then this package will be rebuilt needlessly. Hence, such a
+# package is free _not_ to := depend on FFmpeg but I would strongly encourage
+# doing so since such a case is unlikely.
+FFMPEG_SUBSLOT=55.57.57
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
+fi
+
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
+HOMEPAGE="http://ffmpeg.org/"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+else # Release
+	SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
+fi
+FFMPEG_REVISION="${PV#*_p}"
+
+SLOT="0/${FFMPEG_SUBSLOT}"
+LICENSE="
+	!gpl? ( LGPL-2.1 )
+	gpl? ( GPL-2 )
+	amr? (
+		gpl? ( GPL-3 )
+		!gpl? ( LGPL-3 )
+	)
+	gmp? (
+		gpl? ( GPL-3 )
+		!gpl? ( LGPL-3 )
+	)
+	encode? (
+		amrenc? (
+			gpl? ( GPL-3 )
+			!gpl? ( LGPL-3 )
+		)
+	)
+	samba? ( GPL-3 )
+"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	KEYWORDS="amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+# Options to use as use_enable in the foo[:bar] form.
+# This will feed configure with $(use_enable foo bar)
+# or $(use_enable foo foo) if no :bar is set.
+# foo is added to IUSE.
+FFMPEG_FLAG_MAP=(
+		+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp
+		+gpl +hardcoded-tables +iconv lzma +network openssl +postproc
+		samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau X:xlib xcb:libxcb
+		xcb:libxcb-shm xcb:libxcb-xfixes +zlib
+		# libavdevice options
+		cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
+		opengl
+		# indevs
+		libv4l:libv4l2 pulseaudio:libpulse
+		# decoders
+		amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
+		jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm
+		mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
+		schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx
+		zvbi:libzvbi
+		# libavfilter options
+		bs2b:libbs2b chromaprint flite:libflite frei0r
+		fribidi:libfribidi fontconfig ladspa libass truetype:libfreetype
+		rubberband:librubberband sofalizer:netcdf zeromq:libzmq zimg:libzimg
+		# libswresample options
+		libsoxr
+		# Threads; we only support pthread for now but ffmpeg supports more
+		+threads:pthreads
+)
+
+# Same as above but for encoders, i.e. they do something only with USE=encode.
+FFMPEG_ENCODER_FLAG_MAP=(
+	amrenc:libvo-amrwbenc mp3:libmp3lame
+	kvazaar:libkvazaar nvenc:nvenc
+	openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame
+	wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
+)
+
+IUSE="
+	alsa chromium doc +encode jack oss pic static-libs test v4l
+	${FFMPEG_FLAG_MAP[@]%:*}
+	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
+"
+
+# Strings for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+ARM_CPU_FEATURES=(
+	cpu_flags_arm_thumb:armv5te
+	cpu_flags_arm_v6:armv6
+	cpu_flags_arm_thumb2:armv6t2
+	cpu_flags_arm_neon:neon
+	cpu_flags_arm_vfp:vfp
+	cpu_flags_arm_vfpv3:vfpv3
+	cpu_flags_arm_v8:armv8
+)
+ARM_CPU_REQUIRED_USE="
+	arm64? ( cpu_flags_arm_v8 )
+	cpu_flags_arm_v8? (  cpu_flags_arm_vfpv3 cpu_flags_arm_neon )
+	cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp )
+	cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp )
+	cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 )
+	cpu_flags_arm_v6? ( cpu_flags_arm_thumb )
+"
+MIPS_CPU_FEATURES=( mipsdspr1:mipsdsp mipsdspr2 mipsfpu )
+PPC_CPU_FEATURES=( altivec )
+X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+X86_CPU_REQUIRED_USE="
+	cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
+	cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
+	cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
+	cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
+	cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
+	cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
+	cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
+	cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
+	cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
+	cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
+	cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
+"
+
+IUSE="${IUSE}
+	${ARM_CPU_FEATURES[@]%:*}
+	${MIPS_CPU_FEATURES[@]%:*}
+	${PPC_CPU_FEATURES[@]%:*}
+	${X86_CPU_FEATURES[@]%:*}
+"
+
+CPU_REQUIRED_USE="
+	${ARM_CPU_REQUIRED_USE}
+	${X86_CPU_REQUIRED_USE}
+"
+
+# "$(tc-arch):XXX" form where XXX_CPU_FEATURES are the cpu features that apply to
+# $(tc-arch).
+CPU_FEATURES_MAP="
+	arm:ARM
+	arm64:ARM
+	mips:MIPS
+	ppc:PPC
+	ppc64:PPC
+	x86:X86
+	amd64:X86
+"
+
+FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher )
+IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
+
+RDEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+	bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
+	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
+	celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
+	chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
+	encode? (
+		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+		kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] )
+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+		nvenc? ( media-video/nvidia_video_sdk )
+		openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
+		snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
+		theora? (
+			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
+		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
+		webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
+	)
+	fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
+	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+	frei0r? ( media-plugins/frei0r-plugins )
+	fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
+	gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
+	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
+	gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
+	gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
+	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
+	iec61883? (
+		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
+	)
+	ieee1394? (
+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+	)
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
+	libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
+	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
+	libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
+	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
+	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+	mmal? ( media-libs/raspberrypi-userland )
+	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
+	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
+	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+	openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
+	sofalizer? (
+		>=sci-libs/netcdf-4.3.2-r1[hdf5]
+		>=sci-libs/hdf5-1.8.18[hl]
+	)
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vorbis? (
+		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+	)
+	vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
+	)
+	xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] )
+	zeromq? ( >=net-libs/zeromq-4.1.6 )
+	zimg? ( >=media-libs/zimg-2.4:=[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
+	!media-video/qt-faststart
+	postproc? ( !media-libs/libpostproc )
+"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	doc? ( sys-apps/texinfo )
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
+	cpu_flags_x86_mmx? ( >=dev-lang/yasm-1.2 )
+	test? ( net-misc/wget sys-devel/bc )
+	v4l? ( sys-kernel/linux-headers )
+"
+
+RDEPEND="${RDEPEND}
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+
+# Code requiring FFmpeg to be built under gpl license
+GPL_REQUIRED_USE="
+	postproc? ( gpl )
+	frei0r? ( gpl )
+	cdio? ( gpl )
+	samba? ( gpl )
+	encode? (
+		x264? ( gpl )
+		x265? ( gpl )
+		xvid? ( gpl )
+		X? ( !xcb? ( gpl ) )
+	)
+"
+REQUIRED_USE="
+	libv4l? ( v4l )
+	fftools_cws2fws? ( zlib )
+	test? ( encode )
+	${GPL_REQUIRED_USE}
+	${CPU_REQUIRED_USE}"
+RESTRICT="
+	gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
+"
+
+S=${WORKDIR}/${P/_/-}
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libavutil/avconfig.h
+)
+
+PATCHES=(
+	"${FILESDIR}"/openjpeg22.patch
+	"${FILESDIR}"/openjpeg23.patch
+	"${FILESDIR}"/chromium.patch
+)
+
+src_prepare() {
+	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
+		export revision=git-N-${FFMPEG_REVISION}
+	fi
+	default
+	echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
+}
+
+multilib_src_configure() {
+	local myconf=( ${EXTRA_FFMPEG_CONF} )
+
+	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
+	use openssl && use gpl && myconf+=( --enable-nonfree )
+	use samba && myconf+=( --enable-version3 )
+
+	# Encoders
+	if use encode ; then
+		ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
+
+		# Licensing.
+		if use amrenc ; then
+			myconf+=( --enable-version3 )
+		fi
+	else
+		myconf+=( --disable-encoders )
+	fi
+
+	# Indevs
+	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
+	for i in alsa oss jack ; do
+		use ${i} || myconf+=( --disable-indev=${i} )
+	done
+
+	# Outdevs
+	for i in alsa oss sdl ; do
+		use ${i} || myconf+=( --disable-outdev=${i} )
+	done
+
+	# Decoders
+	use amr && myconf+=( --enable-version3 )
+	use gmp && myconf+=( --enable-version3 )
+	use fdk && use gpl && myconf+=( --enable-nonfree )
+
+	for i in "${ffuse[@]#+}" ; do
+		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
+	done
+
+	# (temporarily) disable non-multilib deps
+	if ! multilib_is_native_abi; then
+		for i in frei0r netcdf libzmq ; do
+			myconf+=( --disable-${i} )
+		done
+	fi
+
+	# CPU features
+	for i in ${CPU_FEATURES_MAP} ; do
+		if [ "$(tc-arch)" = "${i%:*}" ] ; then
+			local var="${i#*:}_CPU_FEATURES[@]"
+			for j in ${!var} ; do
+				use ${j%:*} || myconf+=( --disable-${j#*:} )
+			done
+		fi
+	done
+
+	if use pic ; then
+		myconf+=( --enable-pic )
+		# disable asm code if PIC is required
+		# as the provided asm decidedly is not PIC for x86.
+		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
+	fi
+	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
+
+	# Try to get cpu type based on CFLAGS.
+	# Bug #172723
+	# We need to do this so that features of that CPU will be better used
+	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
+	# will just ignore it.
+	for i in $(get-flag mcpu) $(get-flag march) ; do
+		[[ ${i} = native ]] && i="host" # bug #273421
+		myconf+=( --cpu=${i} )
+		break
+	done
+
+	# LTO support, bug #566282
+	is-flagq "-flto*" && myconf+=( "--enable-lto" )
+
+	# Mandatory configuration
+	myconf=(
+		--enable-avfilter
+		--enable-avresample
+		--disable-stripping
+		"${myconf[@]}"
+	)
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" )
+		case ${CHOST} in
+			*freebsd*)
+				myconf+=( --target-os=freebsd )
+				;;
+			*mingw32*)
+				myconf+=( --target-os=mingw32 )
+				;;
+			*linux*)
+				myconf+=( --target-os=linux )
+				;;
+		esac
+	fi
+
+	# doc
+	myconf+=(
+		$(multilib_native_use_enable doc)
+		$(multilib_native_use_enable doc htmlpages)
+		$(multilib_native_enable manpages)
+	)
+
+	set -- "${S}/configure" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--mandir="${EPREFIX}/usr/share/man" \
+		--enable-shared \
+		--cc="$(tc-getCC)" \
+		--cxx="$(tc-getCXX)" \
+		--ar="$(tc-getAR)" \
+		--optflags="${CFLAGS}" \
+		$(use_enable static-libs static) \
+		"${myconf[@]}"
+	echo "${@}"
+	"${@}" || die
+
+	if multilib_is_native_abi && use chromium; then
+		einfo "Configuring for Chromium"
+		mkdir -p ../chromium || die
+		pushd ../chromium >/dev/null || die
+		set -- "${@}" \
+			--disable-shared \
+			--enable-static \
+			--enable-pic \
+			--extra-cflags="-DFF_API_CONVERGENCE_DURATION=0"
+		echo "${@}"
+		"${@}" || die
+		popd >/dev/null || die
+	fi
+}
+
+multilib_src_compile() {
+	emake V=1
+
+	if multilib_is_native_abi; then
+		for i in "${FFTOOLS[@]}" ; do
+			if use fftools_${i} ; then
+				emake V=1 tools/${i}
+			fi
+		done
+
+		if use chromium; then
+			einfo "Compiling for Chromium"
+			pushd ../chromium >/dev/null || die
+			emake V=1 libffmpeg
+			popd >/dev/null || die
+		fi
+	fi
+}
+
+multilib_src_install() {
+	emake V=1 DESTDIR="${D}" install install-doc
+
+	if multilib_is_native_abi; then
+		for i in "${FFTOOLS[@]}" ; do
+			if use fftools_${i} ; then
+				dobin tools/${i}
+			fi
+		done
+
+		if use chromium; then
+			einfo "Installing for Chromium"
+			pushd ../chromium >/dev/null || die
+			emake V=1 DESTDIR="${D}" install-libffmpeg
+			popd >/dev/null || die
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
+	[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
+		emake V=1 fate
+}
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
new file mode 100644
index 000000000000..227453fbbd4b
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -0,0 +1,489 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Subslot: libavutil major.libavcodec major.libavformat major
+# Since FFmpeg ships several libraries, subslot is kind of limited here.
+# Most consumers will use those three libraries, if a "less used" library
+# changes its soname, consumers will have to be rebuilt the old way
+# (preserve-libs).
+# If, for example, a package does not link to libavformat and only libavformat
+# changes its ABI then this package will be rebuilt needlessly. Hence, such a
+# package is free _not_ to := depend on FFmpeg but I would strongly encourage
+# doing so since such a case is unlikely.
+FFMPEG_SUBSLOT=55.57.57
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
+fi
+
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
+HOMEPAGE="http://ffmpeg.org/"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+else # Release
+	SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
+fi
+FFMPEG_REVISION="${PV#*_p}"
+
+SLOT="0/${FFMPEG_SUBSLOT}"
+LICENSE="
+	!gpl? ( LGPL-2.1 )
+	gpl? ( GPL-2 )
+	amr? (
+		gpl? ( GPL-3 )
+		!gpl? ( LGPL-3 )
+	)
+	gmp? (
+		gpl? ( GPL-3 )
+		!gpl? ( LGPL-3 )
+	)
+	encode? (
+		amrenc? (
+			gpl? ( GPL-3 )
+			!gpl? ( LGPL-3 )
+		)
+	)
+	samba? ( GPL-3 )
+"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+# Options to use as use_enable in the foo[:bar] form.
+# This will feed configure with $(use_enable foo bar)
+# or $(use_enable foo foo) if no :bar is set.
+# foo is added to IUSE.
+FFMPEG_FLAG_MAP=(
+		+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp
+		+gpl +hardcoded-tables +iconv lzma +network openssl +postproc
+		samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau X:xlib xcb:libxcb
+		xcb:libxcb-shm xcb:libxcb-xfixes +zlib
+		# libavdevice options
+		cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
+		opengl
+		# indevs
+		libv4l:libv4l2 pulseaudio:libpulse
+		# decoders
+		amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
+		jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm
+		mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
+		speex:libspeex svg:librsvg vorbis:libvorbis
+		vpx:libvpx zvbi:libzvbi
+		# libavfilter options
+		bs2b:libbs2b chromaprint flite:libflite frei0r
+		fribidi:libfribidi fontconfig ladspa libass truetype:libfreetype
+		rubberband:librubberband zeromq:libzmq zimg:libzimg
+		# libswresample options
+		libsoxr
+		# Threads; we only support pthread for now but ffmpeg supports more
+		+threads:pthreads
+)
+
+# Same as above but for encoders, i.e. they do something only with USE=encode.
+FFMPEG_ENCODER_FLAG_MAP=(
+	amrenc:libvo-amrwbenc mp3:libmp3lame
+	kvazaar:libkvazaar nvenc:nvenc
+	openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame
+	wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
+)
+
+IUSE="
+	alsa chromium doc +encode jack oss pic static-libs test v4l
+	${FFMPEG_FLAG_MAP[@]%:*}
+	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
+"
+
+# Strings for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+ARM_CPU_FEATURES=(
+	cpu_flags_arm_thumb:armv5te
+	cpu_flags_arm_v6:armv6
+	cpu_flags_arm_thumb2:armv6t2
+	cpu_flags_arm_neon:neon
+	cpu_flags_arm_vfp:vfp
+	cpu_flags_arm_vfpv3:vfpv3
+	cpu_flags_arm_v8:armv8
+)
+ARM_CPU_REQUIRED_USE="
+	arm64? ( cpu_flags_arm_v8 )
+	cpu_flags_arm_v8? (  cpu_flags_arm_vfpv3 cpu_flags_arm_neon )
+	cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp )
+	cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp )
+	cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 )
+	cpu_flags_arm_v6? ( cpu_flags_arm_thumb )
+"
+MIPS_CPU_FEATURES=( mipsdspr1:mipsdsp mipsdspr2 mipsfpu )
+PPC_CPU_FEATURES=( altivec )
+X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+X86_CPU_REQUIRED_USE="
+	cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
+	cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
+	cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
+	cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
+	cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
+	cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
+	cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
+	cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
+	cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
+	cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
+	cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
+"
+
+CPU_FEATURES_MAP=(
+	${ARM_CPU_FEATURES[@]}
+	${MIPS_CPU_FEATURES[@]}
+	${PPC_CPU_FEATURES[@]}
+	${X86_CPU_FEATURES[@]}
+)
+IUSE="${IUSE}
+	${CPU_FEATURES_MAP[@]%:*}"
+
+CPU_REQUIRED_USE="
+	${ARM_CPU_REQUIRED_USE}
+	${X86_CPU_REQUIRED_USE}
+"
+
+FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher )
+IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
+
+RDEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+	bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
+	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
+	celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
+	chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
+	encode? (
+		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+		kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] )
+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+		nvenc? ( media-video/nvidia_video_sdk )
+		openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
+		snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
+		theora? (
+			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
+		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
+		webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
+	)
+	fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
+	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+	frei0r? ( media-plugins/frei0r-plugins )
+	fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
+	gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
+	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
+	gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
+	gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
+	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
+	iec61883? (
+		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
+	)
+	ieee1394? (
+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+	)
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
+	libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
+	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
+	libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
+	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
+	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+	mmal? ( media-libs/raspberrypi-userland )
+	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
+	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
+	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+	openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
+	svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vorbis? (
+		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+	)
+	vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
+	)
+	xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] )
+	zeromq? ( >=net-libs/zeromq-4.1.6 )
+	zimg? ( >=media-libs/zimg-2.4:=[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
+	!media-video/qt-faststart
+	postproc? ( !media-libs/libpostproc )
+"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	doc? ( sys-apps/texinfo )
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
+	cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
+	test? ( net-misc/wget sys-devel/bc )
+	v4l? ( sys-kernel/linux-headers )
+"
+
+RDEPEND="${RDEPEND}
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+
+# Code requiring FFmpeg to be built under gpl license
+GPL_REQUIRED_USE="
+	postproc? ( gpl )
+	frei0r? ( gpl )
+	cdio? ( gpl )
+	samba? ( gpl )
+	encode? (
+		x264? ( gpl )
+		x265? ( gpl )
+		xvid? ( gpl )
+		X? ( !xcb? ( gpl ) )
+	)
+"
+REQUIRED_USE="
+	libv4l? ( v4l )
+	fftools_cws2fws? ( zlib )
+	test? ( encode )
+	${GPL_REQUIRED_USE}
+	${CPU_REQUIRED_USE}"
+RESTRICT="
+	gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
+"
+
+S=${WORKDIR}/${P/_/-}
+
+PATCHES=(
+	"${FILESDIR}"/chromium.patch
+)
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libavutil/avconfig.h
+)
+
+src_prepare() {
+	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
+		export revision=git-N-${FFMPEG_REVISION}
+	fi
+	default
+	echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
+}
+
+multilib_src_configure() {
+	local myconf=( ${EXTRA_FFMPEG_CONF} )
+
+	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
+	use openssl && use gpl && myconf+=( --enable-nonfree )
+	use samba && myconf+=( --enable-version3 )
+
+	# Encoders
+	if use encode ; then
+		ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
+
+		# Licensing.
+		if use amrenc ; then
+			myconf+=( --enable-version3 )
+		fi
+	else
+		myconf+=( --disable-encoders )
+	fi
+
+	# Indevs
+	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
+	for i in alsa oss jack ; do
+		use ${i} || myconf+=( --disable-indev=${i} )
+	done
+
+	# Outdevs
+	for i in alsa oss sdl ; do
+		use ${i} || myconf+=( --disable-outdev=${i} )
+	done
+
+	# Decoders
+	use amr && myconf+=( --enable-version3 )
+	use gmp && myconf+=( --enable-version3 )
+	use fdk && use gpl && myconf+=( --enable-nonfree )
+
+	for i in "${ffuse[@]#+}" ; do
+		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
+	done
+
+	# (temporarily) disable non-multilib deps
+	if ! multilib_is_native_abi; then
+		for i in frei0r libzmq ; do
+			myconf+=( --disable-${i} )
+		done
+	fi
+
+	# CPU features
+	for i in "${CPU_FEATURES_MAP[@]}" ; do
+		use ${i%:*} || myconf+=( --disable-${i#*:} )
+	done
+
+	if use pic ; then
+		myconf+=( --enable-pic )
+		# disable asm code if PIC is required
+		# as the provided asm decidedly is not PIC for x86.
+		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
+	fi
+	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
+
+	# Try to get cpu type based on CFLAGS.
+	# Bug #172723
+	# We need to do this so that features of that CPU will be better used
+	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
+	# will just ignore it.
+	for i in $(get-flag mcpu) $(get-flag march) ; do
+		[[ ${i} = native ]] && i="host" # bug #273421
+		myconf+=( --cpu=${i} )
+		break
+	done
+
+	# LTO support, bug #566282
+	is-flagq "-flto*" && myconf+=( "--enable-lto" )
+
+	# Mandatory configuration
+	myconf=(
+		--enable-avfilter
+		--enable-avresample
+		--disable-stripping
+		"${myconf[@]}"
+	)
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" )
+		case ${CHOST} in
+			*freebsd*)
+				myconf+=( --target-os=freebsd )
+				;;
+			*mingw32*)
+				myconf+=( --target-os=mingw32 )
+				;;
+			*linux*)
+				myconf+=( --target-os=linux )
+				;;
+		esac
+	fi
+
+	# doc
+	myconf+=(
+		$(multilib_native_use_enable doc)
+		$(multilib_native_use_enable doc htmlpages)
+		$(multilib_native_enable manpages)
+	)
+
+	set -- "${S}/configure" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--mandir="${EPREFIX}/usr/share/man" \
+		--enable-shared \
+		--cc="$(tc-getCC)" \
+		--cxx="$(tc-getCXX)" \
+		--ar="$(tc-getAR)" \
+		--optflags="${CFLAGS}" \
+		$(use_enable static-libs static) \
+		"${myconf[@]}"
+	echo "${@}"
+	"${@}" || die
+
+	if multilib_is_native_abi && use chromium; then
+		einfo "Configuring for Chromium"
+		mkdir -p ../chromium || die
+		pushd ../chromium >/dev/null || die
+		set -- "${@}" \
+			--disable-shared \
+			--enable-static \
+			--enable-pic \
+			--extra-cflags="-DFF_API_CONVERGENCE_DURATION=0"
+		echo "${@}"
+		"${@}" || die
+		popd >/dev/null || die
+	fi
+}
+
+multilib_src_compile() {
+	emake V=1
+
+	if multilib_is_native_abi; then
+		for i in "${FFTOOLS[@]}" ; do
+			if use fftools_${i} ; then
+				emake V=1 tools/${i}
+			fi
+		done
+
+		if use chromium; then
+			einfo "Compiling for Chromium"
+			pushd ../chromium >/dev/null || die
+			emake V=1 libffmpeg
+			popd >/dev/null || die
+		fi
+	fi
+}
+
+multilib_src_install() {
+	emake V=1 DESTDIR="${D}" install install-doc
+
+	if multilib_is_native_abi; then
+		for i in "${FFTOOLS[@]}" ; do
+			if use fftools_${i} ; then
+				dobin tools/${i}
+			fi
+		done
+
+		if use chromium; then
+			einfo "Installing for Chromium"
+			pushd ../chromium >/dev/null || die
+			emake V=1 DESTDIR="${D}" install-libffmpeg
+			popd >/dev/null || die
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
+	[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
+		emake V=1 fate
+}
diff --git a/media-video/ffmpeg/files/chromium.patch b/media-video/ffmpeg/files/chromium.patch
new file mode 100644
index 000000000000..60a3e5d6cb99
--- /dev/null
+++ b/media-video/ffmpeg/files/chromium.patch
@@ -0,0 +1,36 @@
+Allow libffmpeg to be built for Chromium-based browsers
+https://patchwork.ffmpeg.org/patch/4500/
+
+NOTE: This patch lacks the Makefile include line. We append it
+manually instead to make patching across different versions easier.
+
+diff --git a/ffbuild/libffmpeg.mak b/ffbuild/libffmpeg.mak
+new file mode 100644
+index 0000000..992cf3c
+--- /dev/null
++++ b/ffbuild/libffmpeg.mak
+@@ -0,0 +1,21 @@
++LIBFFMPEG = $(SLIBPREF)ffmpeg$(SLIBSUF)
++LIBFFMPEG_LINK = $(LD) -shared -Wl,-soname,$(LIBFFMPEG) -Wl,-Bsymbolic -Wl,-z,now -Wl,-z,relro -Wl,-z,defs -Wl,--gc-sections $(LDFLAGS) $(LDLIBFLAGS) -o $(LIBFFMPEG)
++
++libffmpeg-: libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF) libavutil/$(LIBPREF)avutil$(LIBSUF) libswresample/$(LIBPREF)swresample$(LIBSUF)
++	$(LIBFFMPEG_LINK) -Wl,--whole-archive $^ -Wl,--no-whole-archive $(FFEXTRALIBS)
++
++libffmpeg-yes: libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF) libavutil/$(SLIBPREF)avutil$(SLIBSUF)
++	$(LIBFFMPEG_LINK) -Wl,--no-as-needed -lavcodec -lavformat -lavutil
++
++$(LIBFFMPEG): libffmpeg-$(CONFIG_SHARED)
++libffmpeg: $(LIBFFMPEG)
++
++install-libffmpeg: $(LIBFFMPEG)
++	$(Q)mkdir -p "$(SHLIBDIR)/chromium"
++	$(INSTALL) -m 755 $< "$(SHLIBDIR)/chromium/$<"
++	$(STRIP) "$(SHLIBDIR)/chromium/$<"
++
++uninstall-libffmpeg:
++	$(RM) "$(SHLIBDIR)/chromium/$(LIBFFMPEG)"
++
++.PHONY: libffmpeg libffmpeg-* install-libffmpeg
+-- 
+2.13.1
+
diff --git a/media-video/ffmpeg/files/ffmpeg32-openjpeg22.patch b/media-video/ffmpeg/files/ffmpeg32-openjpeg22.patch
new file mode 100644
index 000000000000..0ee648641be4
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg32-openjpeg22.patch
@@ -0,0 +1,106 @@
+commit 078322f33ced4b2db6ac3e5002f98233d6fbf643
+Author: Reino17 <rwijnsma@xs4all.nl>
+Date:   Fri Jun 23 23:49:31 2017 +0200
+
+    Add support for LibOpenJPEG v2.2/git
+    
+    Signed-off-by: Michael Bradshaw <mjbshaw@google.com>
+
+Index: ffmpeg-3.2.7/configure
+===================================================================
+--- ffmpeg-3.2.7.orig/configure
++++ ffmpeg-3.2.7/configure
+@@ -1831,6 +1831,7 @@ HEADERS_LIST="
+     machine_ioctl_meteor_h
+     malloc_h
+     opencv2_core_core_c_h
++    openjpeg_2_2_openjpeg_h
+     openjpeg_2_1_openjpeg_h
+     openjpeg_2_0_openjpeg_h
+     openjpeg_1_5_openjpeg_h
+@@ -5721,7 +5722,9 @@ enabled libopencv         && { check_hea
+                                  require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
+                                require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; }
+ enabled libopenh264       && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion
+-enabled libopenjpeg       && { { check_lib2 openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
++enabled libopenjpeg       && { { check_lib2 openjpeg-2.2/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
++                               check_lib2 openjpeg-2.2/openjpeg.h opj_version -lopenjp2 ||
++                               { check_lib2 openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
+                                check_lib2 openjpeg-2.1/openjpeg.h opj_version -lopenjp2 ||
+                                { check_lib2 openjpeg-2.0/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
+                                { check_lib2 openjpeg-1.5/openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
+Index: ffmpeg-3.2.7/libavcodec/libopenjpegdec.c
+===================================================================
+--- ffmpeg-3.2.7.orig/libavcodec/libopenjpegdec.c
++++ ffmpeg-3.2.7/libavcodec/libopenjpegdec.c
+@@ -34,7 +34,9 @@
+ #include "internal.h"
+ #include "thread.h"
+ 
+-#if HAVE_OPENJPEG_2_1_OPENJPEG_H
++#if HAVE_OPENJPEG_2_2_OPENJPEG_H
++#  include <openjpeg-2.2/openjpeg.h>
++#elif HAVE_OPENJPEG_2_1_OPENJPEG_H
+ #  include <openjpeg-2.1/openjpeg.h>
+ #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
+ #  include <openjpeg-2.0/openjpeg.h>
+@@ -44,7 +46,7 @@
+ #  include <openjpeg.h>
+ #endif
+ 
+-#if HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
++#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
+ #  define OPENJPEG_MAJOR_VERSION 2
+ #  define OPJ(x) OPJ_##x
+ #else
+@@ -429,7 +431,7 @@ static int libopenjpeg_decode_frame(AVCo
+     opj_stream_set_read_function(stream, stream_read);
+     opj_stream_set_skip_function(stream, stream_skip);
+     opj_stream_set_seek_function(stream, stream_seek);
+-#if HAVE_OPENJPEG_2_1_OPENJPEG_H
++#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
+     opj_stream_set_user_data(stream, &reader, NULL);
+ #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
+     opj_stream_set_user_data(stream, &reader);
+Index: ffmpeg-3.2.7/libavcodec/libopenjpegenc.c
+===================================================================
+--- ffmpeg-3.2.7.orig/libavcodec/libopenjpegenc.c
++++ ffmpeg-3.2.7/libavcodec/libopenjpegenc.c
+@@ -32,7 +32,9 @@
+ #include "avcodec.h"
+ #include "internal.h"
+ 
+-#if HAVE_OPENJPEG_2_1_OPENJPEG_H
++#if HAVE_OPENJPEG_2_2_OPENJPEG_H
++#  include <openjpeg-2.2/openjpeg.h>
++#elif HAVE_OPENJPEG_2_1_OPENJPEG_H
+ #  include <openjpeg-2.1/openjpeg.h>
+ #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
+ #  include <openjpeg-2.0/openjpeg.h>
+@@ -42,7 +44,7 @@
+ #  include <openjpeg.h>
+ #endif
+ 
+-#if HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
++#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
+ #  define OPENJPEG_MAJOR_VERSION 2
+ #  define OPJ(x) OPJ_##x
+ #else
+@@ -306,7 +308,7 @@ static av_cold int libopenjpeg_encode_in
+ 
+     opj_set_default_encoder_parameters(&ctx->enc_params);
+ 
+-#if HAVE_OPENJPEG_2_1_OPENJPEG_H
++#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
+     switch (ctx->cinema_mode) {
+     case OPJ_CINEMA2K_24:
+         ctx->enc_params.rsiz = OPJ_PROFILE_CINEMA_2K;
+@@ -771,7 +773,7 @@ static int libopenjpeg_encode_frame(AVCo
+     opj_stream_set_write_function(stream, stream_write);
+     opj_stream_set_skip_function(stream, stream_skip);
+     opj_stream_set_seek_function(stream, stream_seek);
+-#if HAVE_OPENJPEG_2_1_OPENJPEG_H
++#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
+     opj_stream_set_user_data(stream, &writer, NULL);
+ #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
+     opj_stream_set_user_data(stream, &writer);
diff --git a/media-video/ffmpeg/files/openjpeg22.patch b/media-video/ffmpeg/files/openjpeg22.patch
new file mode 100644
index 000000000000..a458c15208a9
--- /dev/null
+++ b/media-video/ffmpeg/files/openjpeg22.patch
@@ -0,0 +1,106 @@
+commit 078322f33ced4b2db6ac3e5002f98233d6fbf643
+Author: Reino17 <rwijnsma@xs4all.nl>
+Date:   Fri Jun 23 23:49:31 2017 +0200
+
+    Add support for LibOpenJPEG v2.2/git
+    
+    Signed-off-by: Michael Bradshaw <mjbshaw@google.com>
+
+Index: ffmpeg-3.3.3/configure
+===================================================================
+--- ffmpeg-3.3.3.orig/configure
++++ ffmpeg-3.3.3/configure
+@@ -1875,6 +1875,7 @@ HEADERS_LIST="
+     machine_ioctl_meteor_h
+     malloc_h
+     opencv2_core_core_c_h
++    openjpeg_2_2_openjpeg_h
+     openjpeg_2_1_openjpeg_h
+     openjpeg_2_0_openjpeg_h
+     openjpeg_1_5_openjpeg_h
+@@ -5805,7 +5806,9 @@ enabled libopencv         && { check_hea
+                                  require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
+                                require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; }
+ enabled libopenh264       && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion
+-enabled libopenjpeg       && { { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
++enabled libopenjpeg       && { { check_lib openjpeg-2.2/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
++                               check_lib openjpeg-2.2/openjpeg.h opj_version -lopenjp2 ||
++                               { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
+                                check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 ||
+                                { check_lib openjpeg-2.0/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
+                                { check_lib openjpeg-1.5/openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
+Index: ffmpeg-3.3.3/libavcodec/libopenjpegdec.c
+===================================================================
+--- ffmpeg-3.3.3.orig/libavcodec/libopenjpegdec.c
++++ ffmpeg-3.3.3/libavcodec/libopenjpegdec.c
+@@ -34,7 +34,9 @@
+ #include "internal.h"
+ #include "thread.h"
+ 
+-#if HAVE_OPENJPEG_2_1_OPENJPEG_H
++#if HAVE_OPENJPEG_2_2_OPENJPEG_H
++#  include <openjpeg-2.2/openjpeg.h>
++#elif HAVE_OPENJPEG_2_1_OPENJPEG_H
+ #  include <openjpeg-2.1/openjpeg.h>
+ #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
+ #  include <openjpeg-2.0/openjpeg.h>
+@@ -44,7 +46,7 @@
+ #  include <openjpeg.h>
+ #endif
+ 
+-#if HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
++#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
+ #  define OPENJPEG_MAJOR_VERSION 2
+ #  define OPJ(x) OPJ_##x
+ #else
+@@ -429,7 +431,7 @@ static int libopenjpeg_decode_frame(AVCo
+     opj_stream_set_read_function(stream, stream_read);
+     opj_stream_set_skip_function(stream, stream_skip);
+     opj_stream_set_seek_function(stream, stream_seek);
+-#if HAVE_OPENJPEG_2_1_OPENJPEG_H
++#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
+     opj_stream_set_user_data(stream, &reader, NULL);
+ #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
+     opj_stream_set_user_data(stream, &reader);
+Index: ffmpeg-3.3.3/libavcodec/libopenjpegenc.c
+===================================================================
+--- ffmpeg-3.3.3.orig/libavcodec/libopenjpegenc.c
++++ ffmpeg-3.3.3/libavcodec/libopenjpegenc.c
+@@ -32,7 +32,9 @@
+ #include "avcodec.h"
+ #include "internal.h"
+ 
+-#if HAVE_OPENJPEG_2_1_OPENJPEG_H
++#if HAVE_OPENJPEG_2_2_OPENJPEG_H
++#  include <openjpeg-2.2/openjpeg.h>
++#elif HAVE_OPENJPEG_2_1_OPENJPEG_H
+ #  include <openjpeg-2.1/openjpeg.h>
+ #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
+ #  include <openjpeg-2.0/openjpeg.h>
+@@ -42,7 +44,7 @@
+ #  include <openjpeg.h>
+ #endif
+ 
+-#if HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
++#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
+ #  define OPENJPEG_MAJOR_VERSION 2
+ #  define OPJ(x) OPJ_##x
+ #else
+@@ -305,7 +307,7 @@ static av_cold int libopenjpeg_encode_in
+ 
+     opj_set_default_encoder_parameters(&ctx->enc_params);
+ 
+-#if HAVE_OPENJPEG_2_1_OPENJPEG_H
++#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
+     switch (ctx->cinema_mode) {
+     case OPJ_CINEMA2K_24:
+         ctx->enc_params.rsiz = OPJ_PROFILE_CINEMA_2K;
+@@ -769,7 +771,7 @@ static int libopenjpeg_encode_frame(AVCo
+     opj_stream_set_write_function(stream, stream_write);
+     opj_stream_set_skip_function(stream, stream_skip);
+     opj_stream_set_seek_function(stream, stream_seek);
+-#if HAVE_OPENJPEG_2_1_OPENJPEG_H
++#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
+     opj_stream_set_user_data(stream, &writer, NULL);
+ #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
+     opj_stream_set_user_data(stream, &writer);
diff --git a/media-video/ffmpeg/files/openjpeg23.patch b/media-video/ffmpeg/files/openjpeg23.patch
new file mode 100644
index 000000000000..4398769a22ca
--- /dev/null
+++ b/media-video/ffmpeg/files/openjpeg23.patch
@@ -0,0 +1,109 @@
+From: Michael Bradshaw <mjbshaw at google.com>
+
+Signed-off-by: Michael Bradshaw <mjbshaw at google.com>
+---
+ configure                   |  5 ++++-
+ libavcodec/libopenjpegdec.c |  8 +++++---
+ libavcodec/libopenjpegenc.c | 10 ++++++----
+ 3 files changed, 15 insertions(+), 8 deletions(-)
+
+diff --git a/configure b/configure
+index 391c141e7a..77c9a18c3c 100755
+--- a/configure
++++ b/configure
+@@ -1930,6 +1930,7 @@ HEADERS_LIST="
+     machine_ioctl_meteor_h
+     malloc_h
+     opencv2_core_core_c_h
++    openjpeg_2_3_openjpeg_h
+     openjpeg_2_2_openjpeg_h
+     openjpeg_2_1_openjpeg_h
+     openjpeg_2_0_openjpeg_h
+@@ -5950,7 +5951,9 @@ enabled libopencv         && { check_header opencv2/core/core_c.h &&
+                                  require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
+                                require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; }
+ enabled libopenh264       && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion
+-enabled libopenjpeg       && { { check_lib openjpeg-2.2/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
++enabled libopenjpeg       && { { check_lib openjpeg-2.3/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
++                               check_lib openjpeg-2.3/openjpeg.h opj_version -lopenjp2 ||
++                               { check_lib openjpeg-2.2/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
+                                check_lib openjpeg-2.2/openjpeg.h opj_version -lopenjp2 ||
+                                { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
+                                check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 ||
+diff --git a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c
+index 1210123265..67d47bd6a0 100644
+--- a/libavcodec/libopenjpegdec.c
++++ b/libavcodec/libopenjpegdec.c
+@@ -34,7 +34,9 @@
+ #include "internal.h"
+ #include "thread.h"
+ 
+-#if HAVE_OPENJPEG_2_2_OPENJPEG_H
++#if HAVE_OPENJPEG_2_3_OPENJPEG_H
++#  include <openjpeg-2.3/openjpeg.h>
++#elif HAVE_OPENJPEG_2_2_OPENJPEG_H
+ #  include <openjpeg-2.2/openjpeg.h>
+ #elif HAVE_OPENJPEG_2_1_OPENJPEG_H
+ #  include <openjpeg-2.1/openjpeg.h>
+@@ -46,7 +48,7 @@
+ #  include <openjpeg.h>
+ #endif
+ 
+-#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
++#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
+ #  define OPENJPEG_MAJOR_VERSION 2
+ #  define OPJ(x) OPJ_##x
+ #else
+@@ -431,7 +433,7 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx,
+     opj_stream_set_read_function(stream, stream_read);
+     opj_stream_set_skip_function(stream, stream_skip);
+     opj_stream_set_seek_function(stream, stream_seek);
+-#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
++#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
+     opj_stream_set_user_data(stream, &reader, NULL);
+ #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
+     opj_stream_set_user_data(stream, &reader);
+diff --git a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c
+index b67e533d1d..92b4433b04 100644
+--- a/libavcodec/libopenjpegenc.c
++++ b/libavcodec/libopenjpegenc.c
+@@ -32,7 +32,9 @@
+ #include "avcodec.h"
+ #include "internal.h"
+ 
+-#if HAVE_OPENJPEG_2_2_OPENJPEG_H
++#if HAVE_OPENJPEG_2_3_OPENJPEG_H
++#  include <openjpeg-2.3/openjpeg.h>
++#elif HAVE_OPENJPEG_2_2_OPENJPEG_H
+ #  include <openjpeg-2.2/openjpeg.h>
+ #elif HAVE_OPENJPEG_2_1_OPENJPEG_H
+ #  include <openjpeg-2.1/openjpeg.h>
+@@ -44,7 +46,7 @@
+ #  include <openjpeg.h>
+ #endif
+ 
+-#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
++#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
+ #  define OPENJPEG_MAJOR_VERSION 2
+ #  define OPJ(x) OPJ_##x
+ #else
+@@ -307,7 +309,7 @@ static av_cold int libopenjpeg_encode_init(AVCodecContext *avctx)
+ 
+     opj_set_default_encoder_parameters(&ctx->enc_params);
+ 
+-#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
++#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
+     switch (ctx->cinema_mode) {
+     case OPJ_CINEMA2K_24:
+         ctx->enc_params.rsiz = OPJ_PROFILE_CINEMA_2K;
+@@ -771,7 +773,7 @@ static int libopenjpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
+     opj_stream_set_write_function(stream, stream_write);
+     opj_stream_set_skip_function(stream, stream_skip);
+     opj_stream_set_seek_function(stream, stream_seek);
+-#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
++#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
+     opj_stream_set_user_data(stream, &writer, NULL);
+ #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
+     opj_stream_set_user_data(stream, &writer);
+-- 
+2.13.5 (Apple Git-94)
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
new file mode 100644
index 000000000000..a0b4d7e7ad73
--- /dev/null
+++ b/media-video/ffmpeg/metadata.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>media-video@gentoo.org</email>
+  </maintainer>
+  <use>
+	<flag name="amr">Enables Adaptive Multi-Rate Audio support</flag>
+	<flag name="amrenc">Enables Adaptive Multi-Rate Audio encoding support with <pkg>media-libs/vo-amrwbenc</pkg>.</flag>
+	<flag name="armv5te">Enables optimizations for armv5te processors.</flag>
+	<flag name="armv6">Enables optimizations for armv6 processors.</flag>
+	<flag name="armv6t2">Enables optimizations for armv6t2 processors.</flag>
+	<flag name="armvfp">Enables VFP optimizations for ARM processors.</flag>
+	<flag name="bluray">Enable playback of Blu-ray filesystems</flag>
+	<flag name="bs2b">Enables <pkg>media-libs/libbs2b</pkg> based Bauer stereo-to-binaural filter.</flag>
+	<flag name="cdio">Enables audio CD grabbing with <pkg>dev-libs/libcdio</pkg>.</flag>
+	<flag name="celt">Adds Xiph CELT audio decoding support via <pkg>media-libs/celt</pkg></flag>
+	<flag name="chromaprint">Enables audio fingerprinting support with <pkg>media-libs/chromaprint</pkg>.</flag>
+	<flag name="chromium">Builds libffmpeg.so to enable media playback in Chromium-based browsers like Opera and Vivaldi.</flag>
+	<flag name="cpudetection">Enables runtime CPU detection (useful for bindist, compatibility on other CPUs)</flag>
+	<flag name="ebur128">Enables EBU R128 loudness normalization filter via <pkg>media-libs/libebur128</pkg></flag>
+	<flag name="fdk">Use external fdk-aac library for AAC encoding</flag>
+	<flag name="flite">Adds a text-to-speech filter based on <pkg>app-accessibility/flite</pkg>.</flag>
+	<flag name="frei0r">Enable frei0r wrapping in libavfilter</flag>
+	<flag name="fribidi">Enables fribidi support in the drawtext filter.</flag>
+	<flag name="gcrypt">Enables gcrypt support: Needed for rtmp(t)e support if openssl, librtmp or gmp is not used.</flag>
+	<flag name="gme">Enables support for <pkg>media-libs/game-music-emu</pkg> for playing various video game music formats.</flag>
+	<flag name="gpl">Build GPL code. Should be enabled unless you require LGPL binaries.</flag>
+	<flag name="hardcoded-tables">Use pre-calculated tables rather than calculating them on the fly.</flag>
+	<flag name="iec61883"> Support for FireWire DV/HDV input device using <pkg>media-libs/libiec61883</pkg>.</flag>
+	<flag name="kvazaar">Enables <pkg>media-libs/kvazaar</pkg> based HEVC encoder.</flag>
+	<flag name="libilbc">Enables iLBC de/encoding via <pkg>media-libs/libilbc</pkg>.</flag>
+	<flag name="librtmp">Enables Real Time Messaging Protocol using librtmp (<pkg>media-video/rtmpdump</pkg>) in addition to FFmpeg's native implementation.</flag>
+	<flag name="libsoxr">Enables audio resampling through <pkg>media-libs/soxr</pkg>.</flag>
+	<flag name="libv4l">Uses <pkg>media-libs/libv4l</pkg> for video4linux instead of direct calls. Adds support for more devices via the userspace library.</flag>
+	<flag name="mipsdspr1">Enables MIPS DSP ASE R1 optimizations.</flag>
+	<flag name="mipsdspr2">Enables MIPS DSP ASE R2 optimizations.</flag>
+	<flag name="mipsfpu">Enables floating point MIPS optimizations.</flag>
+	<flag name="mmal">Enables Multi-Media Abstraction Layer (MMAL) decoding support: Available e.g. on the Raspberry Pi.</flag>
+	<flag name="network">Enables network streaming support</flag>
+	<flag name="nvenc">Adds support for NVIDIA Encoder (NVENC) API for hardware accelerated encoding on NVIDIA cards.</flag>
+	<flag name="openh264">Enables H.264 encoding suppoprt via <pkg>media-libs/openh264</pkg>.</flag>
+	<flag name="openssl">Enables <pkg>dev-libs/openssl</pkg> support. Adds support for encrypted network protocols (TLS/HTTPS).</flag>
+	<flag name="opus">Adds (decoding) support for the Opus codec via <pkg>media-libs/opus</pkg>.</flag>
+	<flag name="pic">Force shared libraries to be built as PIC (this is slower)</flag>
+	<flag name="postproc">Build and install libpostproc.</flag>
+	<flag name="rubberband">Adds time-stretching and pitch-shifting audio filter based on <pkg>media-libs/rubberband</pkg>.</flag>
+	<flag name="schroedinger">Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec).</flag>
+	<flag name="snappy">Enable <pkg>app-arch/snappy</pkg> support. Required for e.g. Vidvox Hap encoder.</flag>
+	<flag name="sofalizer">Enables Sofalizer filter</flag>
+	<flag name="ssh">Enable SSH/sftp support via <pkg>net-libs/libssh</pkg>.</flag>
+	<flag name="twolame">Enables MP2 encoding via <pkg>media-sound/twolame</pkg> as an alternative to the internal encoder.</flag>
+	<flag name="vpx">Enables vp8 codec support using libvpx: Decoding vp8 does not require this to be enabled but libvpx can also be used for decoding; encoding vp8 requires this useflag to be enabled though.</flag>
+	<flag name="webp">Enables WebP encoding with <pkg>media-libs/libwebp</pkg>.</flag>
+	<flag name="x265">Enables HEVC encoding with <pkg>media-libs/x265</pkg>.</flag>
+	<flag name="zeromq">Enables <pkg>net-libs/zeromq</pkg> support with the zmq/azmq filters.</flag>
+	<flag name="zimg">Enables <pkg>media-libs/zimg</pkg> based scale filter.</flag>
+	<flag name="zvbi">Enables <pkg>media-libs/zvbi</pkg> based teletext decoder.</flag>
+  </use>
+  <slots>
+    <slot name="0">For building against. This is the only slot that provides
+     headers and command line tools. Binary compatibility slots come and go
+     as required, so always pin dependencies to this slot when appropriate.</slot>
+  </slots>
+</pkgmetadata>
diff --git a/media-video/ffmpeg2theora/Manifest b/media-video/ffmpeg2theora/Manifest
new file mode 100644
index 000000000000..8d2b0905a932
--- /dev/null
+++ b/media-video/ffmpeg2theora/Manifest
@@ -0,0 +1,7 @@
+AUX ffmpeg2theora-0.29-swr.patch 778 SHA256 f0e9faa4770ff965eb5a95318a3f9b52f8e6a2abf8de780f909e36ddc911537d SHA512 38ab469efff0f7607cbc8d8b9c57e1b4e92ce02ff2d4380aa2a04e1e3092e8b5fb2b95eb1c761df4809333d6979cb66fcd8892d245777d375adacfdd82d07c73 WHIRLPOOL 3e33b488c759730eb73fad415a237acee3119026b99d9750d828622d9ce5cd8db98d515fcc175299bef9721a7940f64c6a89283dc6208f7b3cd2e0207116c018
+AUX ffmpeg2theora-0.29-underlinking.patch 503 SHA256 3b937c7e3a5afe327ee75e246ef606a747b8fb5880b43a864b3b9db4a245ef7f SHA512 a9c16e115d72400cd29c60e9893b89e37a1c4800edebc23ebd576c47b49c37ec69e31fe2de4bef50a32c1f60a1be5df5dae2b62000e8f558b30c440938652632 WHIRLPOOL e7e6d9a91e904c818514d02d12eff877d74d2960ccb201aefaff4f56de3588c7d481a8daa07da3928424d7c506561fbebd004a92b8d4a8ce873d2b8596112ec8
+DIST ffmpeg2theora-0.30.tar.bz2 91269 SHA256 4f6464b444acab5d778e0a3359d836e0867a3dcec4ad8f1cdcf87cb711ccc6df SHA512 2c77d2c5e705751928e2bfd86c4fe4c2b7df2ca2ce70f3dfeb0014a3269eef067587eaa045c11b0db86c69176d8f01a43b3ad75544d181c016a89aa50b6518c1 WHIRLPOOL d048027e57903252fcb0c7358fc13b2242c6a6429b3d6adbebe1ad07e00fb0a922d6b0fcf193300a88ecd9539dffeb66e0516c0acb311b203a16bf5d9ea099bc
+EBUILD ffmpeg2theora-0.30.ebuild 1115 SHA256 6747567a08f2f68bc61e5ce75b833869714b50055c1c0ceb8e5f996b34bf9997 SHA512 4a065d46a2948a79741f8d72b204489751180086df1ee8282039a35485c011f5a6ab51d00f0ebbc8dfb20b7679706eb82d688e410a882f1b53836f6eac8d3bf3 WHIRLPOOL 6499fbcb8f4d0623acbe33a3befa5cef21de581424c52d6b67a90d32dd81e7e145e9717e07d7de6eca92c4ab02349c318fe84d3695641af35a20960f8a9cc80e
+MISC ChangeLog 3310 SHA256 44a61d5cafa5e440a89d90d58f6e85a244271ee9ac5ef10b0d531dfd8838fe6e SHA512 4360d3252804c2375e1e382fdcd102a57b71dcdd62887b7fa02f421eb53112e46a893724c1010dbcc453ce305ae346014de4b98290b58b3f35ef6f27001f4a34 WHIRLPOOL afbbf6d81c33f99c13ddcd9a1d18cac0232cb1d2dda6589eacf9bfbe781abfd6544882d4429521c364135fa565fdfbfa06c8df9659ed6cd6c0eaee4808ac1d8d
+MISC ChangeLog-2015 10867 SHA256 c9bd9300553cca9d9388ff8a618f92eeabf6941b4992a27aae6ec5510bc9f2e2 SHA512 4383d13c2a66b99b967d0b16e933c700b82c473c6e25c7438fd76ef50bd170590f94b8e1cf934c3076811cba715dfc98c4b7529bf6f2be139e18f0d33c1f3e41 WHIRLPOOL c62f9552b90747151cbffe50123c1551691244efc58c91b73de70e717b80846bf297343c7e2ea294a910e73822d5b760dfc09700bdd4d766d02c33a71b0fa026
+MISC metadata.xml 314 SHA256 68b1491689d0cb26e3ded8deaa82033a0a0f35afae2045de8c94ca32461fe021 SHA512 2cc51e06842a129ba5e490939f29861b36a1919086aae97a1f5639b56b211700b3839ac66898d0e14b25a3b1471869266ccbff47d2fd98a0baae429514466f54 WHIRLPOOL 2e3abffb6f03a01590c54825949fd3af371ebc522a3d0542bac5420d2527c529703c5332d180946587c28c4d95a329ed0dac1ab8a864ea1ef235294762eb3fba
diff --git a/media-video/ffmpeg2theora/ffmpeg2theora-0.30.ebuild b/media-video/ffmpeg2theora/ffmpeg2theora-0.30.ebuild
new file mode 100644
index 000000000000..a5dbd34ce2a9
--- /dev/null
+++ b/media-video/ffmpeg2theora/ffmpeg2theora-0.30.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs scons-utils
+
+DESCRIPTION="A simple converter to create Ogg Theora files"
+HOMEPAGE="http://www.v2v.cc/~j/ffmpeg2theora/"
+SRC_URI="http://www.v2v.cc/~j/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+IUSE="kate libav"
+
+RDEPEND="
+	!libav? ( media-video/ffmpeg:0=[postproc] )
+	libav? ( media-libs/libpostproc:0=
+		media-video/libav:0= )
+	>=media-libs/libvorbis-1.1
+	>=media-libs/libogg-1.1
+	>=media-libs/libtheora-1.1[encode]
+	kate? ( >=media-libs/libkate-0.3.7 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-0.29-swr.patch \
+		"${FILESDIR}"/${PN}-0.29-underlinking.patch
+}
+
+src_configure() {
+	myesconsargs=(
+		APPEND_CCFLAGS="${CFLAGS}"
+		APPEND_LINKFLAGS="${LDFLAGS}"
+		prefix=/usr
+		mandir=PREFIX/share/man
+		libkate=$(usex kate 1 0)
+		)
+}
+
+src_compile() {
+	escons
+}
+
+src_install() {
+	escons destdir="${D}" install
+	dodoc AUTHORS ChangeLog README subtitles.txt TODO
+}
diff --git a/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-swr.patch b/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-swr.patch
new file mode 100644
index 000000000000..b1117a87ea6f
--- /dev/null
+++ b/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-swr.patch
@@ -0,0 +1,24 @@
+commit a72baecd4dc7b01c0785b481460dde0fbab9a90a
+Author: Jan Gerber <j@xiph.org>
+Date:   Fri Nov 23 20:21:54 2012 +0100
+
+    only depend on libswresample for local branch
+    
+    libav does not have libswresample so its not in ubuntu.
+
+diff --git a/SConstruct b/SConstruct
+index 90520c3..01d234a 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -152,10 +152,10 @@ if not env.GetOption('clean'):
+       "libavcodec >= 52.30.0",
+       "libpostproc",
+       "libswscale",
+-      "libswresample",
+       "libavutil",
+   ]
+   if os.path.exists("./ffmpeg"):
++    FFMPEG_LIBS.append('libswresample')
+     pkg_path = list(set(map(os.path.dirname, glob('./ffmpeg/*/*.pc'))))
+     pkg_path.append(os.environ.get('PKG_CONFIG_PATH', ''))
+     os.environ['PKG_CONFIG_PATH'] = ':'.join(pkg_path)
diff --git a/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-underlinking.patch b/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-underlinking.patch
new file mode 100644
index 000000000000..dc877603913a
--- /dev/null
+++ b/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-underlinking.patch
@@ -0,0 +1,21 @@
+For example, pow() from mathlib is used directly in src/ffmpeg2theora.c:
+
+<snip>
+v = pow(v, g) * 255.0;    // mplayer's vf_eq2.c multiplies with 256 here, strange...
+</snip>
+
+For build failure and log, see Gentoo bug #504698
+
+--- SConstruct
++++ SConstruct
+@@ -206,9 +206,8 @@
+   if env['crossmingw']:
+       env.Append(CCFLAGS=['-Wl,-subsystem,windows'])
+       env.Append(LIBS=['m'])
+-  elif env['static']:
+-      env.Append(LIBS=['m', 'dl'])
+ 
++  env.Append(LIBS=['m', 'dl'])
+ 
+ env = conf.Finish()
+ 
diff --git a/media-video/ffmpeg2theora/metadata.xml b/media-video/ffmpeg2theora/metadata.xml
new file mode 100644
index 000000000000..5056262414cc
--- /dev/null
+++ b/media-video/ffmpeg2theora/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="kate">Adds support for Ogg Kate subtitles via libkate.</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-video/ffmpegthumbnailer/Manifest b/media-video/ffmpegthumbnailer/Manifest
new file mode 100644
index 000000000000..da2a527f2487
--- /dev/null
+++ b/media-video/ffmpegthumbnailer/Manifest
@@ -0,0 +1,5 @@
+DIST ffmpegthumbnailer-2.2.0.tar.bz2 1223895 SHA256 e5c31299d064968198cd378f7488e52cd5e738fac998eea780bc77d7f32238c2 SHA512 526d15b2c754fcb1415e69fb54cb6e7d0102b6d73a32a7e8528df81e32633dfe3786898984fdb988c93daee7218956c75c096ef657c9b3a42399d2d1d27c7bbf WHIRLPOOL 8634c8c33ae61a2b50cc8bc30e666b2c814a589758d83805f11710651a834439564c4702778e385eca3c63a76f1cf1a066d3ba2b6685df51f21acfe3bd5b4c4c
+EBUILD ffmpegthumbnailer-2.2.0.ebuild 1076 SHA256 8fc25c50d91f762b6fff04a0b3e3b2232311c921dcd4c919673819761994e147 SHA512 7b4bae26667130559f279da041e79d0b956e1d1f98e39843cf33799b0d029074e9688a477bf1c6e91398bb4bae39c7d22388f55d08b7bea9d4c2faf0faea4795 WHIRLPOOL 587726350ad0a5121d5b9aa93d00e2679509c3712d629e1a81284541541c0d1577d4b24469a01a34907afb69095e37de9fe0e0aae8e532ab32b5cfba6cf99e20
+MISC ChangeLog 5076 SHA256 cb8a24888072b21c55b6a65bac8836b376b208b7b1b0360ffbecf013ae6f8909 SHA512 c80b71a25a72fce1432f1a1e0b4148a0ff3ff104d855bf5491a461104ff75b9d0aa027d9abcfbef0ce00a87396fade872be9ca9bbd5373e4b1b8626f1f8ae0aa WHIRLPOOL e4d5955b9e17be7920dc36ccdeb51c5646cf61f33d28a3de8ed7ad125c9dc08378c69c2b73a3c82b19253dbd8145b20c4e067e982bf93e75fd72279d1056eada
+MISC ChangeLog-2015 22024 SHA256 1ddb2da9d8638b6232f704e5cdbdc62296dd441aa09e050006549cd74f6072fb SHA512 30be47d53f864f6ca882ccb60121ebd6e6dc118dc3e1df976a54a21db950c389b19e7b112e003dffdc86583c449bb5a0058932ad03660f749396e7f303222000 WHIRLPOOL ba4fa1dd3a9747aaa111d254a7f9d8354d12d4fdbcabf1cdc142831bb6fa6a0994cba1ca0fbb412fa0a814b0b434ca22674c8e2c1bddc09d06053aeb3ff83b77
+MISC metadata.xml 375 SHA256 4d89f9c477120b7be1373e1ff4a058e4c5477bf698093c18fb666464d677c105 SHA512 a3b8d0dc66f4660489b8e084a310da37b5379843b5e4a661a7c1150a4c2a7c4924f6d92366edefa6e57ed77016577d86c4aef084238df06925395f21c3078ab0 WHIRLPOOL f681c17237d9d1c25846f9575840b150147b2f2c866741323b0dbaa4259a563c21ab0d4ecfa1763bbe7c5fe8a5b6e0fb3013c4d62c864eca30145a4f9375fea5
diff --git a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.0.ebuild b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.0.ebuild
new file mode 100644
index 000000000000..d92f8f290948
--- /dev/null
+++ b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils
+
+DESCRIPTION="Lightweight video thumbnailer that can be used by file managers"
+HOMEPAGE="https://github.com/dirkvdb/ffmpegthumbnailer"
+SRC_URI="https://github.com/dirkvdb/${PN}/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="gnome gtk jpeg libav png test"
+
+RDEPEND="
+	gtk? ( dev-libs/glib:2= )
+	jpeg? ( virtual/jpeg:0= )
+	!libav? ( >=media-video/ffmpeg-2.7:0= )
+	libav? ( >=media-video/libav-11:0= )
+	png? ( media-libs/libpng:0= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+REQUIRED_USE="gnome? ( gtk )
+	test? ( png jpeg )"
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+src_prepare() {
+	rm -rf out* || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_GIO=$(usex gtk)
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_THUMBNAILER=$(usex gnome)
+		-DHAVE_JPEG=$(usex jpeg)
+		-DHAVE_PNG=$(usex png)
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-video/ffmpegthumbnailer/metadata.xml b/media-video/ffmpegthumbnailer/metadata.xml
new file mode 100644
index 000000000000..72da0013bd20
--- /dev/null
+++ b/media-video/ffmpegthumbnailer/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">ffmpegthumbnailer</remote-id>
+		<remote-id type="github">dirkvdb/ffmpegthumbnailer</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/flvstreamer/Manifest b/media-video/flvstreamer/Manifest
new file mode 100644
index 000000000000..dc22611a8f99
--- /dev/null
+++ b/media-video/flvstreamer/Manifest
@@ -0,0 +1,5 @@
+DIST flvstreamer-2.1c.tar.gz 77308 SHA256 1bba81fcd1518ec05af1017522d4ef92b9a2ae3a0da6a09396050cc7cc550729 SHA512 029f689f47a7ecbc71fef5194456bc1dd4039bd146bf738afc3e872c96655c54bfa60140576de94bd1d9da5777509876689e9e678e64cce2baf3a8eff53ccb3f WHIRLPOOL 0e77c9f8e2f5e78cc75a5db5e38acdd14f5c8e6f78ad0773526dc14885eece1f8c07f0be0cbe61a081eb36eed440912a1060ce31370a342ac58aab4e333a09ac
+EBUILD flvstreamer-2.1c.ebuild 870 SHA256 07ec7ae088a6f4e1ff70a78be2254fac82ae818250396fc4a790db8a21e85d9e SHA512 8978faa09e4f57444dac3243169d900bcd2ba04eb5b60eb5aafe181731bd62e494feb7de6e8846dc18f6e938224a4e1a9f09fac4c390f34a949cfb68046f9b1c WHIRLPOOL 08f07e9d4628ce2e0179cbf0ea69ff818e1fab3115d11896bcaf6cc69859c0624ab7de57ae1e8753a49b1a02d7205c2f69eb19b76b8045d09d6b0c82b2efd6c4
+MISC ChangeLog 2549 SHA256 4cda9f8168edae79b98ddf3a04b70ecc210831dc6591392285ec0f99470c9869 SHA512 0e6fe86068dd19f0ad8bab01dfa64bb10b8f7c19e6e280bf8e4036ec0e087b8e38ba829dddc475d3df02c67d8227f58d4603aaf8b3712724066bf3f8c7ee3828 WHIRLPOOL 429a43b3ae6b4236aa1b84e74bcb5cf800d6e966fe1a584c6cb744c2d564dc47ce5161e7ac970c84814fba70ce2a951acc53982a749485878edf6336da194155
+MISC ChangeLog-2015 2038 SHA256 48067e3bbe6f3a8e20d53b96d7b04469d18cdf5f560f900d174b347c4719ccc3 SHA512 adff96d5d42af10e6f5baceccdb2b776ca457e8ae2b7312204ced83704bec5fe431f645caf9b28a893bec1b158191f68f9d5006918cb380e2d21f872a62cd56e WHIRLPOOL d3c6b9b600b56a1dc93b8d3055598fbb50b11b836d887b4bf5ee4585296e93308d3a5edfa07b2b6d6fd21b17fd0f00c1dc901c4c19f1a79c44cd7c909106d9da
+MISC metadata.xml 498 SHA256 63d6cb403c2fc211dcba7e0fb1ea739b081e7fa328be42030f9b1be1f2b49deb SHA512 a258fa89ab4988271adea48a16240ebc78c5c511744d7c20b89f2583998122398754e5f697729a23dc50cc00580c3f0de11b508a8e2c1060a38d1c66c580bb8b WHIRLPOOL 266cd006971d2fbb21f0cc7d29eab71d55130fe9283f4f6f1409089b4f0989f0cb275683b8bacf6e044b9cc36c00060ab322036569142f30c980447d36a7aebd
diff --git a/media-video/flvstreamer/flvstreamer-2.1c.ebuild b/media-video/flvstreamer/flvstreamer-2.1c.ebuild
new file mode 100644
index 000000000000..f8aed0990fb4
--- /dev/null
+++ b/media-video/flvstreamer/flvstreamer-2.1c.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Open source command-line RTMP client intended to stream audio or video flash content"
+HOMEPAGE="https://savannah.nongnu.org/projects/flvstreamer/"
+SRC_URI="mirror://nongnu/${PN}/source/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	#fix Makefile ( bug #298535 and bug #318353)
+	sed -i 's/\$(MAKEFLAGS)//g' Makefile \
+		|| die "failed to fixe Makefile"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		CFLAGS="${CFLAGS} `sed -n 's/DEF=\(.*\)/\1/p' Makefile`" \
+		CXXFLAGS="${CXXFLAGS}" \
+		LDFLAGS="${LDFLAGS}" linux
+}
+
+src_install() {
+	dobin {${PN},streams} || die "dobin failed"
+	dodoc README ChangeLog || die "dodoc failed"
+}
diff --git a/media-video/flvstreamer/metadata.xml b/media-video/flvstreamer/metadata.xml
new file mode 100644
index 000000000000..0a3534dc79e8
--- /dev/null
+++ b/media-video/flvstreamer/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>hwoarang@gentoo.org</email>
+    <name>Markos Chandras</name>
+  </maintainer>
+<maintainer type="project">
+    <email>media-video@gentoo.org</email>
+    <name>Gentoo Video project</name>
+  </maintainer>
+<maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/media-video/frameworks/Manifest b/media-video/frameworks/Manifest
new file mode 100644
index 000000000000..a1e6afff9852
--- /dev/null
+++ b/media-video/frameworks/Manifest
@@ -0,0 +1,7 @@
+AUX frameworks-0.3.7-ceilf.patch 243 SHA256 a454d5dc878cf0f7501ec1c2c14a866a1ef34b12767075512a4162bfcb6914ac SHA512 68b094fa58f59aebb639b8799bf5a15ea7cf7916803744de26a138d8f9b34f43172719dbf73889039cdc7c87edac6a5525f0c0a35acbed353e29e17694e00d3c WHIRLPOOL 0ecd49c5d6d3fcb06483fd4c064b11d08adadcaff186ce2e6835ac014d4b48d615338908ba3abc2b21d1744bc1f3667cbb0ea5fb29bec160862b4bd634f7f5c8
+AUX frameworks-0.3.7-strcmp-and-datadir.patch 826 SHA256 3679fe6bec6913a6f5a27cdf61e361605551bc8e31e7c66a498feffc80a81fe7 SHA512 9987e0c4aff9b42ec8a826991e38638548614986fc83f12e46dc9e357f9f8f6e7d3be9de23c7012f5b36f7cadb5a3f144cc3d2b3615f69ae0f444c5c017675c6 WHIRLPOOL f8d0e5bc96dbcbf01f8c2dbde8d6c33b23910f6063541b54a3fdb3e63865d4345ae74a1c6db074f0ce3132a8b46e51050d8f18eea8b216f6785f49fa46337415
+DIST frameworks-0.3.7.tar.gz 116266 SHA256 bf069ea0701c0d86485aa75bd7dc367acdc2efbb9a7aa425110b8cf473dd7f08 SHA512 e146bf9e6c793fbfb809a47501fa4f9f12ba2a4f2e9e4e6c4acac8dda44421eefc4053b6cc01d98f4429e923ecd8322bc499a8a9fa39f41a334df322229df93d WHIRLPOOL a9c62e10c7bcb1f178a76483ffa9eeeb8ff6bf48e67c292f1ac21e0d0a389b791a9a276273427e811254df446b753615a692d4c225d717da5cfb50590cbaf096
+EBUILD frameworks-0.3.7-r1.ebuild 677 SHA256 074ab8f2877e296f5964ea3d69d73c5e46034985ba1aa57470d7de72b450b5ec SHA512 021f0155e4c06c40019df9d456ef999ab70abbe7610b61b1fc3002d4b248343226a54ea9f4b66e4e458cf3886eeb98fd52b0c3b96026010367aeacb2ae5bc0f2 WHIRLPOOL 552b63c0e002aedb377f3f7417106804d2bf4fe4f9021ee052439dd4d47ac1cbab47b3e48f28fbf965a1354007af38b40cf50fa46d76adffa673c027a93a7817
+MISC ChangeLog 3271 SHA256 c7bc4f96a1cb730d69bc266ef1abf0a7113c237123b61396be87fd1d82e7d3ad SHA512 46bac0f77f2c13cabc459b0520e0525eb09379b7c844a1ad79915217a1d31d754c9291b18ec1e8be7f5607799bc613036db996cbdfcae554728907388a382902 WHIRLPOOL e29bf7ebd3f803235384d64cdf72e46d6c7d8504bd42e132fe1909f7638d668c119b4ad7f1718ed8cd75c84c8537b5ec9caf113e966310872ce881e535bf7086
+MISC ChangeLog-2015 1537 SHA256 000a6e1359b477d8d1c3dc5d1b65f577b7a6ca78a090a4a131d50122eb0452f7 SHA512 c789d6703769e7a9801087847e68f626f9afcd795a55cef07a3f5ab59df1d93e6915885e952daf92f19267572ceecad784d4d5aafa66d4732f189948bef0161d WHIRLPOOL dd003601257666c3311f31c57ef1df36dfc1840ac45aea99003d9b0e3143e0bdf83209dbaba37fb29d42345a0d624fcd3934ee99115dbcf0105555af5539ac3e
+MISC metadata.xml 369 SHA256 4a8aa20f156151bf42c7959fe33d2ad4985e82bb66ba3fb41da211665a62b7a9 SHA512 447c8547b21a573156781ddefb9adc5c4010807b7ff5d8e5270b14f3bc512ca394a3d1d5a6e81cc459eccec60c7ade516de85a9a0b945c24a98c71b43fb59052 WHIRLPOOL 73c19b9e4eb6f3b253f9cac9a9bdc9d95b1ce395ecaa28dd14ec36bc7d6f124e79c8428d7971bb29bcaa1752e7fbf5c86abc6b41be8b503f8495a2e2408263be
diff --git a/media-video/frameworks/files/frameworks-0.3.7-ceilf.patch b/media-video/frameworks/files/frameworks-0.3.7-ceilf.patch
new file mode 100644
index 000000000000..6ccc271b5abf
--- /dev/null
+++ b/media-video/frameworks/files/frameworks-0.3.7-ceilf.patch
@@ -0,0 +1,10 @@
+--- a/configure.in
++++ b/configure.in
+@@ -12,6 +12,7 @@
+ AC_PROG_INSTALL
+ 
+ # Checks for libraries
++AC_SEARCH_LIBS(ceil, m)
+ pkg_modules="gtk+-2.0 gthread-2.0 libglade-2.0"
+ PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
+ AC_SUBST(PACKAGE_CFLAGS)
diff --git a/media-video/frameworks/files/frameworks-0.3.7-strcmp-and-datadir.patch b/media-video/frameworks/files/frameworks-0.3.7-strcmp-and-datadir.patch
new file mode 100644
index 000000000000..1550a211bda8
--- /dev/null
+++ b/media-video/frameworks/files/frameworks-0.3.7-strcmp-and-datadir.patch
@@ -0,0 +1,24 @@
+--- a/src/interface.c
++++ b/src/interface.c
+@@ -258,8 +258,8 @@
+ 
+     /* find our glade interface file */
+     datadir = g_string_new(DATADIR);
+-    if (datadir->str != "" || datadir->str != NULL)
+-        datadir = g_string_append(datadir, "/");
++    if (strcmp(datadir->str, "") || datadir->str != NULL)
++        datadir = g_string_append(datadir, "/frameworks/");
+     filename = g_string_new("frameworks.glade");
+ 
+     if (g_file_test(filename->str, G_FILE_TEST_EXISTS) == TRUE) {
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -8,7 +8,7 @@
+ EXTRA_DIST = template.glade template.gladep
+ 
+ bin_PROGRAMS = frameworks
+-data_DATA = frameworks.glade
++pkgdata_DATA = frameworks.glade
+ 
+ frameworks_SOURCES = frameworks.c frameworks.h common.h videodev.h \
+ 	camera.c camera.h interface.c interface.h callbacks.c callbacks.h \
diff --git a/media-video/frameworks/frameworks-0.3.7-r1.ebuild b/media-video/frameworks/frameworks-0.3.7-r1.ebuild
new file mode 100644
index 000000000000..cbaab961263b
--- /dev/null
+++ b/media-video/frameworks/frameworks-0.3.7-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="A small v4l frame capture utility especially suited for stop motion animation"
+SRC_URI="http://frameworks.polycrystal.org/release/${P}.tar.gz"
+HOMEPAGE="http://frameworks.polycrystal.org"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~ppc ~x86 ~amd64"
+
+RDEPEND="
+	>=gnome-base/libglade-2
+	x11-libs/gtk+:2
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS=(
+	AUTHORS ChangeLog NEWS README TODO
+)
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.7-ceilf.patch
+	"${FILESDIR}"/${PN}-0.3.7-strcmp-and-datadir.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
diff --git a/media-video/frameworks/metadata.xml b/media-video/frameworks/metadata.xml
new file mode 100644
index 000000000000..e4ddc0b43949
--- /dev/null
+++ b/media-video/frameworks/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>media-video@gentoo.org</email>
+</maintainer>
+<longdescription lang="en">
+A small frame capture utiliy compatible with v4l usefull especially for doing stop motion animations.
+</longdescription>
+</pkgmetadata>
diff --git a/media-video/gaupol/Manifest b/media-video/gaupol/Manifest
new file mode 100644
index 000000000000..a8dbf3b74935
--- /dev/null
+++ b/media-video/gaupol/Manifest
@@ -0,0 +1,9 @@
+DIST gaupol-0.91.tar.gz 518493 SHA256 cb7d2d3fa4dfd321802eb6c3dd0a2f9582a9195a70b153d0ce65f2dfa9048add SHA512 92459ec0a7d77c8e4a34f44489ae8fc01feeb2d34f6fd152c8bfeaf72b8235c680155698c55e7f9d46ce82bee8274b14313b6a43167f65f784511e583d4858fb WHIRLPOOL 7d46d9bb20d104355f16a966a46e25eb76e8cb72fa5082b9526a6ee3b012312dc1e5a6a74d6fe850cce40d9ce993b4a06471ec93ac907bb1f3de30409217ff43
+DIST gaupol-1.0.tar.gz 520620 SHA256 bc407489855eb0a7a8bda6f6fcc7fcbe6136582cc588ec081750b8546f311e3b SHA512 1f6a9ff1bf6722473aa53c9c8e787ce9d25669bbafe19b4c117965bf281307365cb4cd31241af92b0623ead8a9627d38c5811d5b361c8707ac3467d520c1d89c WHIRLPOOL 50cd2546cc48538c8095ad9fbb9eb71efb6ea8cd038fa9ad217cf5a502c6cfee9530e94a8da9f69e60fbd9c511c112c9fbebc62a24edec10049e80b135c7232d
+DIST gaupol-1.2.tar.gz 504222 SHA256 a6749d1ee77b36dfb0b80f41f11f63fbba3b9e638552a566f973dc9216d6f97c SHA512 03738c9ad3f22deaa5588bbd272a6ad7a837ad5fffe72afea0ad0580be8288c956993b6986a74754c3ede70a9465a569fe4c1b95f4f7b35d6356bddf914285bb WHIRLPOOL 365ceedcbda9c87c6047dec6a10d9f03c98e6825e09d9b323c1a7163958ef6504331dadb4f43c6edd3033d5259f13330874483580f048d5c322f0d19b7d7f4ce
+EBUILD gaupol-0.91.ebuild 1403 SHA256 9205452141a0728954507679631e938fd5d0a4453516362cfdc3dce163c2d1af SHA512 1d68f949205c055f4a7cd423bcd830081406d7fb4ff4218b544986ca4d3216795341400a6112f5a74f8d2bc8db7d114d3213caa0126cd50192e615fa72e23d39 WHIRLPOOL 4709c6a92600315e2bd7143ecfc3557127c72133b9fe3de7430971746592793d70c51085f16fd8b846cf3a296ecb693422c6adcdd044fa5760ae97a8b45f76f9
+EBUILD gaupol-1.0.ebuild 1400 SHA256 24065d0fe549940447057217e2d49284fd11dd738f6a64663276635c68755b77 SHA512 ad6d5fc9a3f0784b74351949a8c1842fd26756ca8f61fa309264f3bd19faa91d98836b46b3873d48c9714690fd9bb248c4760d9b4efb7c5a60e060ea2cc03999 WHIRLPOOL a08c27c5e3df080e94f20f76734aa2f832dad1af5003cb9b8245987f05617840a47df52ed904273662a6f5f562ce7623649f442fdd836d726d50afc7fbf8f00e
+EBUILD gaupol-1.2.ebuild 1400 SHA256 10129c2b1cb555115b898e45c543798bdf14b794015821195dae39f470b0d60f SHA512 e5d15a746d644688516ead11ec704913aa91755eacd5c03f97d1f549b5d8147b06544180cb3886a9f12ef77919f3b82a0a00551e3c1bfd9fd91642b39568a252 WHIRLPOOL f20f8493c5454e034cf7c22014d40e2f8ba1e8dd8bbb50db14aa2dd480330c12ef614746d1f435079d6c5f789ca250433ae6bf85a912dd7c23a25a6406900ad0
+MISC ChangeLog 4146 SHA256 6e05cbcd9d4b2a71d14b66626b090d9dcf380004af4c96a4a274843223e1f782 SHA512 a7fe8fa0091e3004904c6fa9df8227970010c85f489105246879ec3577385cbdce6c7a77d6c086d4f6d4eec8cc40e2fea766cd64b0c5d68dbb5f410f5f0acfbe WHIRLPOOL 8d8f8256bae2d8f5a0e62b6b535adbcab34883a32b457b3a117341744df52952f35c042e0c7b2d4ff7d0d86b08e66a10f4dc40c75ecec7be0a2bd163f627c316
+MISC ChangeLog-2015 2931 SHA256 3e64603025eba4204748aaeaa312b7e2ab421ab21ab55f45b83dcaee0a523a4b SHA512 c7f9a93c49356f527815a6b2f068afbd85ae18b31b7e5616ef70df0cda961a481fd879efe838286565a052667c3ef42afe5c95ac222b00ea4aeffaa8db2247d8 WHIRLPOOL 62730ff8853af6fdb5c1c489370ccecd0f6a06519eb2ab264b4752f5ef3bb862e56bf11fba34b92f7a167aaf9288ca9abfc63f848c2bf33dea28f5c25dd47d0d
+MISC metadata.xml 402 SHA256 ba99941aee8699fdf3f0d7efde78486e573fef4d6fc10a1ef134bdd3ad67e39f SHA512 e351a06e75ac1bf14c60a47eb479553c12ffe4144dead6630b3cbafba920d7a28e6bf7d4117a9eaddf950fbf8272638baf58a15c6d1f28bf074b2194b2e35281 WHIRLPOOL 0360f38b48c3175de6560b184fa7f4e1471879bdc33724a7d70a9959200afc04653dad89598d00f8d8b5e18f07a3945e87eacd5faee6a2d261ce02b1f4b7b4bb
diff --git a/media-video/gaupol/gaupol-0.91.ebuild b/media-video/gaupol/gaupol-0.91.ebuild
new file mode 100644
index 000000000000..be8d1841d88e
--- /dev/null
+++ b/media-video/gaupol/gaupol-0.91.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5} )
+
+inherit distutils-r1 gnome2-utils virtualx xdg-utils
+
+DESCRIPTION="A subtitle editor for text-based subtitles"
+HOMEPAGE="http://otsaloma.io/gaupol/"
+SRC_URI="https://github.com/otsaloma/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="spell test"
+
+RDEPEND="
+	app-text/iso-codes
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3[introspection]
+	spell? (
+		>=dev-python/pyenchant-1.4[${PYTHON_USEDEP}]
+		app-text/gtkspell:3
+	)"
+
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( AUTHORS.md NEWS.md TODO.md README.md README.aeidon.md )
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Previewing support needs MPV, MPlayer or VLC."
+
+		if use spell; then
+			elog "Additionally, spell-checking requires a dictionary, any of"
+			elog "Aspell/Pspell, Ispell, MySpell, Uspell, Hspell or AppleSpell."
+		fi
+	fi
+}
+
+python_test() {
+	virtx py.test
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-video/gaupol/gaupol-1.0.ebuild b/media-video/gaupol/gaupol-1.0.ebuild
new file mode 100644
index 000000000000..7e3d769d03a7
--- /dev/null
+++ b/media-video/gaupol/gaupol-1.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5} )
+
+inherit distutils-r1 gnome2-utils virtualx xdg-utils
+
+DESCRIPTION="A subtitle editor for text-based subtitles"
+HOMEPAGE="http://otsaloma.io/gaupol/"
+SRC_URI="https://github.com/otsaloma/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="spell test"
+
+RDEPEND="app-text/iso-codes
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3[introspection]
+	spell? (
+		app-text/gtkspell:3
+		>=dev-python/pyenchant-1.4[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( AUTHORS.md NEWS.md TODO.md README.md README.aeidon.md )
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "Previewing support needs MPV, MPlayer or VLC."
+
+		if use spell; then
+			elog "Additionally, spell-checking requires a dictionary, any of"
+			elog "Aspell/Pspell, Ispell, MySpell, Uspell, Hspell or AppleSpell."
+		fi
+	fi
+}
+
+python_test() {
+	virtx py.test
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-video/gaupol/gaupol-1.2.ebuild b/media-video/gaupol/gaupol-1.2.ebuild
new file mode 100644
index 000000000000..7dde44b909d5
--- /dev/null
+++ b/media-video/gaupol/gaupol-1.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1 gnome2-utils virtualx xdg-utils
+
+DESCRIPTION="A subtitle editor for text-based subtitles"
+HOMEPAGE="http://otsaloma.io/gaupol/"
+SRC_URI="https://github.com/otsaloma/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="spell test"
+
+RDEPEND="app-text/iso-codes
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3[introspection]
+	spell? (
+		app-text/gtkspell:3
+		>=dev-python/pyenchant-1.4[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( AUTHORS.md NEWS.md TODO.md README.md README.aeidon.md )
+
+python_test() {
+	virtx py.test
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "Previewing support needs MPV, MPlayer or VLC."
+
+		if use spell; then
+			elog "Additionally, spell-checking requires a dictionary, any of"
+			elog "Aspell/Pspell, Ispell, MySpell, Uspell, Hspell or AppleSpell."
+		fi
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-video/gaupol/metadata.xml b/media-video/gaupol/metadata.xml
new file mode 100644
index 000000000000..75a264b3ad6c
--- /dev/null
+++ b/media-video/gaupol/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">otsaloma/gaupol</remote-id>
+		<bugs-to>https://github.com/otsaloma/gaupol/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/get_flash_videos/Manifest b/media-video/get_flash_videos/Manifest
new file mode 100644
index 000000000000..ed276518dda9
--- /dev/null
+++ b/media-video/get_flash_videos/Manifest
@@ -0,0 +1,7 @@
+AUX get_flash_videos-youtubefix.patch 3543 SHA256 ca3bc4dce61c4de438ae333de122f6e1eda0ae44059d68f27dd593290f4d0e5e SHA512 d196f90384ee745e16577b12e74694d439a1e6fc44a4b3803e6872beb77b9f21a4b6b45a4775314056499c0bd2e92c363044f8399e6b51e38f351408f370b223 WHIRLPOOL 734341ae950d364fe9bfe90de1f53f1c50afdb6ee603c2c05dbf989034cfa86a5dcd32f573326a18d53cae1e030ebf14fc20c643775726b113367be436e786b4
+DIST get_flash_videos-1.24.tar.gz 86380 SHA256 6c6055109951b42eafa45c62c309afd920e46c0730a5d497be6957ecbb0f319e SHA512 b966adc381ddf096f9f57ddd3ce0a9a155b3850f345b0624f11b4c553036f1e8881cf7c70e4f789741a43263325e35653f005731563702b6d7a594530558fc48 WHIRLPOOL e52607ba841c63a63aabf113773bd289b4b68fb759cc0d0db4897e03ef25742933a596c7ccde2666ab1de83b0d8ce055a02c3d9a1f31b1888ccaa6b0db806007
+EBUILD get_flash_videos-1.24-r1.ebuild 1400 SHA256 7c614b5f4cad119b7c09fd610c2b6ef3724bbd278e695167a8cb155f7177c69f SHA512 cc5606b2dfd03bc7dbf56107d21c8cb92a741941d74b5664cfc7240dd68b9f49864d86034b1cbc4d5b212dbe07f7aaf5d32ef4eea955e799e0d32ba60e64c7d1 WHIRLPOOL b1bf27c0d04134ab64c9a5ab5fe6cd5d88a47e782cf55d06900d32eaac8e12c3cf3f50c8b682c23009089eab7c4c17571c3e81b3afd8e8227dea715a6f3b3272
+EBUILD get_flash_videos-9999.ebuild 1206 SHA256 e24b9cccd7f44c3c055782a257e58ca93080aa5ef6ed2435f92465222f737ea9 SHA512 273f691e704638784af6211459beb5f6e519798c3bbadb6998856fe9e981c346b55b1f8bfce9c18183992f66105ea804410d774ddbe50fae69deda04345bf57d WHIRLPOOL 01cc152e6676b6c6417a541b806be56272576fc5ee1f8eeffe935c43e65b868536214fe52c91f16ee3f658cf26d422b4e9b66eac3437be9a1fe3c1bd259d573f
+MISC ChangeLog 2696 SHA256 33639727d29aa9759aa6f97e3445a21c33a4f0686281eb9e155d47ad104c8d4a SHA512 4b56ba37e83aed7e8e1f5aebe19afe8e2e1b48eb02569570b8f13b24e0ae3b333daf246dc9c452d6c330c269da93594a21c012e7e8eb60efb14acf1d1c1f6357 WHIRLPOOL bd2194c98428921db3e29440e6604a382b89919d2d239779f7d8d3d30dfdb6027e3f9e29bb504e0f8e018df835191e5477f18bf4a94886fc819b60907ebe5db7
+MISC ChangeLog-2015 3699 SHA256 8998cd6b34069b7c2f38f68ad63406a10d1d18586cdf2f3912034718414e1e6a SHA512 4c7f69e08e6915cc0a3ac74ad0eb6cd075aab48d8d61294b59bab8b483b052da01374e19936c0b4bd1fce4cdb2b18029049a9ce4cf675879ac52f65926cbcad9 WHIRLPOOL 0de77b125554342481eaf6b4f349e749ed589a07d71bc10fd3acdbf7ed831305cce92ca91286c638147ebbb93eae681393116d712dd565d9642e9fd49e291943
+MISC metadata.xml 336 SHA256 5c7779848d3b929829e8f5627542bbeea3c681b1d56a002f0ddbc69811d1782e SHA512 3bc7678e69857ba46142e36be30bcaea62810f9bb1f22592c55aa7ac03d15f15bed1bce98c5f034da322ae6e0af62c9d6454649ae5451024e8a3c3abc1910b69 WHIRLPOOL f33ee05c45f134d0d63369ea4e52ac01da4a19c2e68993cfc81a6955098f5d2d67b751a26f91d77d86fbf8a777a27e539e70b9f4d4f92c067361147167577f47
diff --git a/media-video/get_flash_videos/files/get_flash_videos-youtubefix.patch b/media-video/get_flash_videos/files/get_flash_videos-youtubefix.patch
new file mode 100644
index 000000000000..0bca2bbd450d
--- /dev/null
+++ b/media-video/get_flash_videos/files/get_flash_videos-youtubefix.patch
@@ -0,0 +1,100 @@
+https://bugs.gentoo.org/show_bug.cgi?id=405761
+
+https://github.com/richcollins/get-flash-videos/commit/27e0f1d214e291debfd567b1652908d0ef6b79d1#lib/FlashVideo/Site
+
+--- lib/FlashVideo/Site/Youtube.pm~	2010-11-30 14:34:17.000000000 +0000
++++ lib/FlashVideo/Site/Youtube.pm	2012-02-20 23:56:35.000000000 +0000
+@@ -26,6 +26,7 @@
+   if($embed_url !~ m!youtube\.com/watch!) {
+     $browser->get($embed_url);
+     if ($browser->response->header('Location') =~ m!/swf/.*video_id=([^&]+)!
++        || $browser->content =~ m!\<iframe[^\>]*src="http://www.youtube.com/embed/([^"]+)"!i
+         || $embed_url =~ m!/v/([-_a-z0-9]+)!i
+         || $browser->uri =~ m!v%3D([-_a-z0-9]+)!i) {
+       # We ended up on a embedded SWF or other redirect page
+@@ -48,12 +49,19 @@
+   # If the page contains fmt_url_map, then process this. With this, we
+   # don't require the 't' parameter.
+   if ($browser->content =~ /["']fmt_url_map["']:\s{0,3}(["'][^"']+["'])/) {
+-    debug "Using fmt_url_map method from page ($1)";
+-    return $self->download_fmt_map($prefs, $browser, $title, {}, @{from_json $1});
++    my $fmt_map = $1;
++    if ($fmt_map !~ /\|/) {
++      # $fmt_map is double escaped. We should unescape it here just
++      # once.  Be careful not to unescape ',' in the URL.
++      $fmt_map = uri_unescape($fmt_map);
++    }
++    debug "Using fmt_url_map method from page ($fmt_map)";
++    return $self->download_fmt_map($prefs, $browser, $title, {}, @{from_json $fmt_map});
+   }
+ 
+   my $video_id;
+   if ($browser->content =~ /(?:var pageVideoId =|(?:CFG_)?VIDEO_ID'?\s*:)\s*'(.+?)'/
++      || $browser->content =~ /"video_id": "([^"]+)"/
+       || $embed_url =~ /v=([^&]+)/) {
+     $video_id = $1;
+   } else {
+@@ -125,6 +133,9 @@
+     } elsif($info{fmt_url_map}) {
+       debug "Using fmt_url_map method from info";
+       return $self->download_fmt_map($prefs, $browser, $title, \%info, $info{fmt_url_map});
++    } elsif($info{url_encoded_fmt_stream_map}) {
++      debug "Using url_encoded_fmt_stream_map method from info";
++      return $self->download_url_encoded_fmt_stream_map($prefs, $browser, $title, \%info, $info{url_encoded_fmt_stream_map});
+     }
+   }
+ 
+@@ -132,6 +143,53 @@
+   return download_get_video($browser, $prefs, $video_id, $title, $t);
+ }
+ 
++sub download_url_encoded_fmt_stream_map {
++  my($self, $prefs, $browser, $title, $info, $fmt_map) = @_;
++
++  my $fmt_url_map = parse_youtube_url_encoded_fmt_stream_map($fmt_map);
++
++  if (!$title and $browser->uri->as_string =~ m'/user/.*?#') {
++    my $video_id = (split /\//, $browser->uri->fragment)[-1];
++
++    my %info = get_youtube_video_info($browser->clone, $video_id);
++
++    $title = $info->{title};
++  }
++
++  my $preferred_quality = $prefs->quality->choose(map { $fmt_url_map->{$_->{id}}
++      ? { resolution => $_->{resolution}, url => $fmt_url_map->{$_->{id}} }
++      : () } @formats);
++
++  $browser->allow_redirects;
++
++  return $preferred_quality->{url}, title_to_filename($title, "mp4");
++}
++
++sub parse_youtube_url_encoded_fmt_stream_map {
++  my($raw_map) = @_;;
++
++  my $map = {};
++
++  foreach my $params (split /,/, $raw_map) {
++    
++    my $format = "";
++    my $url = "";
++    
++    foreach my $pair (split /&/, $params) {
++      my ($name, $value) = split /=/, $pair;
++      if ($name eq "itag"){
++        $format = $value;
++      } elsif ($name eq "url") {
++        $url = uri_unescape($value);
++      }
++    }
++    
++    $map->{$format} = $url;
++  }
++  
++  return $map;
++}
++
+ sub download_fmt_map {
+   my($self, $prefs, $browser, $title, $info, $fmt_map) = @_;
+ 
diff --git a/media-video/get_flash_videos/get_flash_videos-1.24-r1.ebuild b/media-video/get_flash_videos/get_flash_videos-1.24-r1.ebuild
new file mode 100644
index 000000000000..81ef2d756308
--- /dev/null
+++ b/media-video/get_flash_videos/get_flash_videos-1.24-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils perl-module readme.gentoo
+
+MY_PN="App-${PN}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Downloads videos from various Flash-based video hosting sites"
+HOMEPAGE="https://github.com/monsieurvideo/get-flash-videos"
+SRC_URI="https://github.com/monsieurvideo/get-flash-videos/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-perl/WWW-Mechanize
+	virtual/perl-Module-CoreList
+	dev-perl/HTML-TokeParser-Simple"
+DEPEND="${RDEPEND}
+	dev-perl/UNIVERSAL-require
+	test? ( media-video/rtmpdump
+		dev-perl/Tie-IxHash
+		dev-perl/XML-Simple
+		dev-perl/Crypt-Rijndael
+		dev-perl/Data-AMF
+		virtual/perl-IO-Compress )"
+
+SRC_TEST="do"
+
+S="${WORKDIR}/${MY_P}"
+SRC_TEST="do"
+myinst="DESTDIR=${D}"
+
+src_prepare() {
+	DISABLE_AUTOFORMATTING="yes"
+	DOC_CONTENTS="Downloading videos from RTMP server requires the following packages:
+- media-video/rtmpdump
+- dev-perl/Tie-IxHash
+Other optional dependencies:
+- dev-perl/XML-Simple
+- dev-perl/Crypt-Rijndael
+- dev-perl/Data-AMF
+- virtual/perl-IO-Compress"
+
+	# 405761
+	epatch "${FILESDIR}"/${PN}-youtubefix.patch
+	perl-module_src_prepare
+}
+
+src_install() {
+	perl-module_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/media-video/get_flash_videos/get_flash_videos-9999.ebuild b/media-video/get_flash_videos/get_flash_videos-9999.ebuild
new file mode 100644
index 000000000000..b5d0b1057ebf
--- /dev/null
+++ b/media-video/get_flash_videos/get_flash_videos-9999.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils perl-module git-2
+
+MY_PN="App-${PN}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Downloads videos from various Flash-based video hosting sites"
+HOMEPAGE="https://github.com/monsieurvideo/get-flash-videos"
+EGIT_REPO_URI="https://github.com/monsieurvideo/get-flash-videos.git"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+
+RDEPEND="dev-perl/WWW-Mechanize
+	virtual/perl-Module-CoreList
+	dev-perl/HTML-TokeParser-Simple
+	dev-perl/Module-Find"
+DEPEND="${RDEPEND}
+	dev-perl/UNIVERSAL-require
+	test? ( media-video/rtmpdump
+		dev-perl/Tie-IxHash
+		dev-perl/XML-Simple
+		dev-perl/Crypt-Rijndael
+		dev-perl/Data-AMF
+		virtual/perl-IO-Compress )"
+
+SRC_TEST="do"
+
+S="${WORKDIR}/${MY_P}"
+SRC_TEST="do"
+myinst="DESTDIR=${D}"
+
+src_prepare() {
+	perl-module_src_prepare
+}
+
+pkg_postinst() {
+	elog "Downloading videos from RTMP server requires the following packages :"
+	elog "	media-video/rtmpdump"
+	elog "	dev-perl/Tie-IxHash"
+	elog "Others optional dependencies :"
+	elog "	dev-perl/XML-Simple"
+	elog "	dev-perl/Crypt-Rijndael"
+	elog "	dev-perl/Data-AMF"
+	elog "	virtual/perl-IO-Compress"
+}
diff --git a/media-video/get_flash_videos/metadata.xml b/media-video/get_flash_videos/metadata.xml
new file mode 100644
index 000000000000..2f75ad014b5b
--- /dev/null
+++ b/media-video/get_flash_videos/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">get-flash-videos</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/gnome-mplayer/Manifest b/media-video/gnome-mplayer/Manifest
new file mode 100644
index 000000000000..9c21b892a51c
--- /dev/null
+++ b/media-video/gnome-mplayer/Manifest
@@ -0,0 +1,7 @@
+DIST gnome-mplayer-1.0.8.tar.gz 1062691 SHA256 bbd914ab620341e0c074374d2079c335eaea3c93cde746ebc7357577e7b00414 SHA512 795530313a6b8135e328e0cb8f5d9081b0b5caf8f81b1ab182a2876241bd662b96d2ef25164dc6f436fb66168472f3716e033697f0aeffe5f84c59cd8de420c2 WHIRLPOOL eb1b7a69dc058d8d1a6ab10a11cff506f8676fa2954a2202c267eb1969f36c8f84ed59cd17ccc71f19e9e4a66d1f5c7356ff779cda5e30c6086fcc2b917db18d
+DIST gnome-mplayer-1.0.9.tar.gz 1082199 SHA256 e43ca4929e7dc591256a16a793c7cce2678e07e948ee8ef11ed46cce2b3d81db SHA512 5aaea17afddaf2f949b798b87d4d6306130b9622d2dae68a7f24abebc2174cac7cb17c3112dac6629a0643e31098865462c10355dfcd43f16d2503848e18fa7d WHIRLPOOL 393618f0d5716496fb83c32a87862ae6a6a83cefd0ae01120dddeffaea82039f2197df3708ec0443615d8afcd040a41fb39fac9b36cc9c66448e3c123ad47853
+EBUILD gnome-mplayer-1.0.8.ebuild 1853 SHA256 4a64d9f8af38ec3b3888d5c059c99fe408360377b04e84ce1a0342013b37b4de SHA512 afb16e11717f6a4f97ab492c991dd620f49340069eceaa98e583014ab404402d97fc65cddfb0015003a2f32a5ef4100a3d944fe105e71fed27d32904fb47063f WHIRLPOOL 4cf32991584ad539bcf674466d0e042b20a7e2098052fcd3d96710ebcc384716e9fbffa3c2163d90345355195b3ffb6468a2aff54c791161408d1ad01065d9d2
+EBUILD gnome-mplayer-1.0.9.ebuild 1967 SHA256 6f7d3595a19a7d484ec006230afa3e8c3c93aafd7d607c48455f80232631d360 SHA512 0051da8dee3bb1058f5282265574f06c54634214beb064dabf68a86335ef6c16c98d3b10b4c5a3d6c108696ff02eaa2b2330e7d1982ac1156f4f1f6fc4b4b964 WHIRLPOOL 4e136ba32041d3fd4f65b88f7046814d1e4117dc8a9c97497c49f5810c3a61e12b1dc8ee95c61a9c1d0ea70b78c5429a6923362052f76ef930aacb4e068ecbbc
+MISC ChangeLog 3295 SHA256 07468c99cd19bf60adb2de5dc45b21e97c544d907c5d0af24f156526b1b6c3a1 SHA512 3c53c232e4b22973623ce075f2b4b6020f58009738cb460f3639d456c6bdb97954dd4510be1f4cdd481ecdbfa2300a1ccbe3925f034f555d0ea3ffe35abc1e67 WHIRLPOOL 2aa39f0060cc6b1a21146933fe792189e6427208f87ee8912e0c082a6917f5e283ec54906ddd27c33461911fb07693a51e16d2402f4d93dddc79c2d938c90cc3
+MISC ChangeLog-2015 12781 SHA256 4874165e2383b264bb85f23bf945139bfd4674da50079ee342461800bb63035a SHA512 31851ab65127c3231bde215ba4038460e95429449949f5a7e941d99bd623ceef6a7cb026d4bfe798d2e420cc9617ebf3b8690900a4cd5f70277e6c79dc93ab72 WHIRLPOOL 9003df597d9eff655fdb27584039a58e3ab452e8e78af3bf42c52942656c299a8859e53a5389323a1e26a81b900032f42ac7590e667be55222dbbab888310f4f
+MISC metadata.xml 398 SHA256 6f1a75cf12c79cb298f14be2abe660a57f3f405f723122c0d5143eb0cdc34713 SHA512 5916892e84d2f43920e341fce811b49419c27a81a1c95e8e8a6a269b1a9b58702aef3d5728b947afc2699dffc788e877f44dce45380f0024894c4422750c9a87 WHIRLPOOL 55955dbbb1a4f30fbc32a0a6e490c7a37441a55a666b89a3138e635d9b430806b44df8b1cb625b29d745180fda24a92ecc7cccfa8195c54309bd6d1eeab6794c
diff --git a/media-video/gnome-mplayer/gnome-mplayer-1.0.8.ebuild b/media-video/gnome-mplayer/gnome-mplayer-1.0.8.ebuild
new file mode 100644
index 000000000000..9f874a98641f
--- /dev/null
+++ b/media-video/gnome-mplayer/gnome-mplayer-1.0.8.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit fdo-mime gnome2-utils
+
+DESCRIPTION="A GTK+ interface to MPlayer"
+HOMEPAGE="https://code.google.com/p/gnome-mplayer/"
+SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
+IUSE="alsa +dbus +dconf gda gnome ipod libnotify musicbrainz pulseaudio"
+
+COMMON_DEPEND=">=dev-libs/glib-2.30
+	>=media-libs/gmtk-${PV}[dconf=]
+	>=x11-libs/gtk+-3.2:3
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( >=dev-libs/dbus-glib-0.100 )
+	gda? ( gnome-extra/libgda:5 )
+	gnome? ( gnome-base/nautilus )
+	ipod? ( >=media-libs/libgpod-0.7 )
+	libnotify? ( >=x11-libs/libnotify-0.7 )
+	musicbrainz? (
+		media-libs/musicbrainz:3
+		net-misc/curl
+		)
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.14 )"
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/gnome-icon-theme-symbolic
+	|| ( >=media-video/mplayer-1.0_rc4_p20100101[libass] media-video/mplayer2[libass] )"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+DOCS="ChangeLog README DOCS/*.txt DOCS/tech/*.txt"
+
+src_configure() {
+	econf \
+		--enable-gtk3 \
+		$(use_enable gnome nautilus) \
+		--with-gio \
+		$(use_with dbus) \
+		$(use_with gda libgda) \
+		$(use_with alsa) \
+		$(use_with pulseaudio) \
+		$(use_with libnotify) \
+		$(use_with ipod libgpod) \
+		$(use_with musicbrainz libmusicbrainz3)
+}
+
+src_install() {
+	default
+	rm -rf "${ED}"/usr/share/doc/${PN}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/media-video/gnome-mplayer/gnome-mplayer-1.0.9.ebuild b/media-video/gnome-mplayer/gnome-mplayer-1.0.9.ebuild
new file mode 100644
index 000000000000..5000169c4c1c
--- /dev/null
+++ b/media-video/gnome-mplayer/gnome-mplayer-1.0.9.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit fdo-mime gnome2-utils
+
+DESCRIPTION="A GTK+ interface to MPlayer"
+HOMEPAGE="https://code.google.com/p/gnome-mplayer/"
+SRC_URI="https://${PN}.googlecode.com/svn/packages/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
+IUSE="alsa +dbus +dconf gda gnome ipod libnotify musicbrainz pulseaudio"
+
+COMMON_DEPEND=">=dev-libs/glib-2.30
+	>=media-libs/gmtk-${PV}[dconf=]
+	>=x11-libs/gtk+-3.2:3
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( >=dev-libs/dbus-glib-0.100 )
+	gda? ( gnome-extra/libgda:5 )
+	gnome? ( gnome-base/nautilus )
+	ipod? ( >=media-libs/libgpod-0.7 )
+	libnotify? ( >=x11-libs/libnotify-0.7 )
+	musicbrainz? (
+		media-libs/musicbrainz:3
+		net-misc/curl
+		)
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.14 )"
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/gnome-icon-theme-symbolic
+	|| ( >=media-video/mplayer-1.0_rc4_p20100101[libass] media-video/mplayer2[libass] )"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+DOCS="ChangeLog README DOCS/*.txt DOCS/tech/*.txt"
+
+src_configure() {
+	# TODO: temporarily --disable-nemo only because it's untested and new feature in 1.0.9
+	econf \
+		--enable-gtk3 \
+		$(use_enable gnome nautilus) \
+		--disable-nemo \
+		--with-gio \
+		$(use_with dbus) \
+		$(use_with gda libgda) \
+		$(use_with alsa) \
+		$(use_with pulseaudio) \
+		$(use_with libnotify) \
+		$(use_with ipod libgpod) \
+		$(use_with musicbrainz libmusicbrainz3)
+}
+
+src_install() {
+	default
+	rm -rf "${ED}"/usr/share/doc/${PN}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/media-video/gnome-mplayer/metadata.xml b/media-video/gnome-mplayer/metadata.xml
new file mode 100644
index 000000000000..59723785c6af
--- /dev/null
+++ b/media-video/gnome-mplayer/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>media-video@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="dconf">Enable support for <pkg>gnome-base/dconf</pkg></flag>
+    <flag name="gda">Enable support for <pkg>gnome-extra/libgda</pkg></flag>
+  </use>
+</pkgmetadata>
diff --git a/media-video/gnome-video-effects/Manifest b/media-video/gnome-video-effects/Manifest
new file mode 100644
index 000000000000..57148f02422a
--- /dev/null
+++ b/media-video/gnome-video-effects/Manifest
@@ -0,0 +1,5 @@
+DIST gnome-video-effects-0.4.3.tar.xz 142100 SHA256 5a7ee0f5ade4b7d921f1b99f3b97d7d7bb830f2fef0f1daee20a7a1867708219 SHA512 5cf708f7deea4edd5d80cd838a78a7b539cb87504f55bfda1686bbe0136ee0eba20885ab8cd2a880ad0c825bf5ca972b0f612a579016eace736b790d7bdd10d3 WHIRLPOOL 1ebd15d82a4d2cb6f2a00580e34f59c1dff1168816530b398f3394e09c0aafae7fd83dcbd5fd58e7c8c72a074d8ae776f561877defe5d0312d42cb078a7b735b
+EBUILD gnome-video-effects-0.4.3.ebuild 526 SHA256 fa606a05beda885bc67288f0ac5eaffda28bad52e5d691d616c51f2f277e3615 SHA512 509494ccc9964be35bbcad7c20b7cd725c54d61ec1e525416198ce28876f43019eb4954c81a7f552aaca2ec74d401884f740e92be3046d43ce4a566c5ca560c7 WHIRLPOOL 7946c961ae249ba07d17173fa62da8e31dcc8d0f46698752a77f74e89c738651d0852a894381ad868cddde70e00212ed2be232eeb2920d12a1e29ba4d1683e47
+MISC ChangeLog 2466 SHA256 c2f4f44e5c02bd0f345e76015655f6b7475219770ea6ed71920ad9fbf7be12e6 SHA512 098d55a4ed3bbe32dc451d01add8a0502083a2be88b075feb421ae65ec65734eebdf8e49fa9f6670156e2b00d87c98f577d6fa3d84761bb975997e8f2654e90f WHIRLPOOL d4df158ff20d90762a436ac2b7d13f4f964131a58989841ead2ea1c1ebe30bc44487cd9a53c41b8e4d63799e7ad071bf40ca45386a1bfd9ae2d775e90204ebdb
+MISC ChangeLog-2015 2641 SHA256 a8656ead89cc6dd0b0403359bb7cd5185996a7e73f5ade4a4e48e34f327c99d8 SHA512 2c97011c746a144ce8bdd3b665b8388b15310d309b77dc17a2d18d8f97dfd7677d1aba0a8110ec007ad1613410eb8d1005abffa0305326f2528f20363f791851 WHIRLPOOL dcd348867abb41a09bde796fa07d0e13a2c2b79ac0a623ebec4f58dd5c64f8738a4ab9485fb3f8a2aaf841857153d865f9885d9ea22e67c97a1c439e856c0ee6
+MISC metadata.xml 488 SHA256 fa1c899276b6f63dcd290753fabc86985c1c818097991f141da395ab78035217 SHA512 db1e3250d928428f492fca5e87c5824d7cf8e19746e433292faa19544ba89c043f046305c650c5c18e6d94fb429ff5f4e634dd5c0609d8c6aead26e3ec9d50ec WHIRLPOOL e3a9d82812b262e0b2623db3312782425d3d0c5a2da029cff81193160ef29c4ebf5f4628bdcbc4c11a517002710cba0f39d6c3143d8691f1c0a71b37ec6dd9c2
diff --git a/media-video/gnome-video-effects/gnome-video-effects-0.4.3.ebuild b/media-video/gnome-video-effects/gnome-video-effects-0.4.3.ebuild
new file mode 100644
index 000000000000..75cf2f6b21a5
--- /dev/null
+++ b/media-video/gnome-video-effects/gnome-video-effects-0.4.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2
+
+DESCRIPTION="Effects for Cheese, the webcam video and picture application"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeVideoEffects"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40.0
+	>=sys-devel/gettext-0.17
+"
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
diff --git a/media-video/gnome-video-effects/metadata.xml b/media-video/gnome-video-effects/metadata.xml
new file mode 100644
index 000000000000..dad930e723d8
--- /dev/null
+++ b/media-video/gnome-video-effects/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<maintainer type="project">
+	<email>media-video@gentoo.org</email>
+	<name>Gentoo Video project</name>
+</maintainer>
+<maintainer type="project">
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-video/google2srt/Manifest b/media-video/google2srt/Manifest
new file mode 100644
index 000000000000..041194019de8
--- /dev/null
+++ b/media-video/google2srt/Manifest
@@ -0,0 +1,7 @@
+AUX build.xml 2320 SHA256 545bb2203a03215ae213cab6ba69411b06d49f03c473896add9ddd51122e513b SHA512 057368c9199a41d840b0326647e3a3aef70ddc1c3a286fb53e2d68a9baf3ebd82cc21299af5792d0f0fa0fba4abb399a02c781d83403683a54a895fa04167bf9 WHIRLPOOL 1f308239743609ec25d2200f669d74719c238da70ee18d9fedc71069f2f82a1a4bb6e65b4d2178e290b15fb77c6f3f68b3bdeb8bfb8251e2137a5f061cc28f2e
+DIST Google2SRT-0.5.6.zip 355167 SHA256 9f021954ff2ed3b386211a839784ae213403981f53068c51a9d2733865b249bb SHA512 edb7b1ee4440f4962220557c794090edb9b3647a64deb70c19170bb4af3edbb5abc93ddd6061badf458c6cd92c17024b91bbdfa95bb1b366d1092b659db08094 WHIRLPOOL 63b120cf28019c0c39132c99e3877ec264b5396a15003c1a235fd296aab4b178048a45a406c5697adef4ac45ab0ea5ac845a4c4665de2f0fce8b4a360ccea2c7
+DIST google2srt-icon.png 1848 SHA256 d832d20322e79ad74950e0bd2168f402d18f4de2ffeff0ba7d573092b0d6e588 SHA512 051d8ffe8488e2521cdfbfd045d6b5159a18619e12dc1216b1687514cf3f1cebdf2167af372c2ec46d3886412350f5872e8a8c245fee341a30fec51615b5140f WHIRLPOOL 5a9a0c9388a0e2d8e76d87a4ff0446b83399cb5c8ca5d8718982356431a2abc9461517363590cad8dca534e75c172aecc841956392bc01b94ec965bbcb15f98b
+EBUILD google2srt-0.5.6-r1.ebuild 1408 SHA256 41b9904a08c43bff9c87d72d9f2fefbc72e5db8f588fda285ac2ffa5c338d6c9 SHA512 486331e74c0dea20650213e68c1611c9dd9705e5f586f03ab0d80388984a62369cc943bbdc60f4ea27abd9274c70b1bb6475462ad21968c651562afb10267fe7 WHIRLPOOL a7e6ea2b06fbae66d2764001e58e121dfab5452948a3c738dd0c088ec7013a18ea337a1adbd9e1095205a9d6b03ae5478245153758814ea5ebe6a3d3f338015d
+MISC ChangeLog 2764 SHA256 5e6bd4f97d01712cffa42e53718fb995ff4cdfcfc28134a1f93fe6089b87a8d9 SHA512 7972727c585e47a00616ad7b599c3c3efa8d94a168028167a868c70d837a98b3d74fa5868acf23c941997164342f60f9f0cc34105cd6925924afcf78d16913fe WHIRLPOOL 47be267d3edf2484dad23170c038e34c06c24b7e871c1a77aa21eaa18de1f5755d772d1e5bc1ff945b52aae0bd32b715ed98c7f4a3b7f94ac9b71cf4303a0501
+MISC ChangeLog-2015 930 SHA256 1e9b036768491f9bae6ea5c95dd33457cca792a92d437639b51218b4d6524d39 SHA512 d243700a291ac82c7919881a99fb758f2dc712146ce0b1a139021238ad2ced5e6fcc6565c3a19b2655ffe2f98baa656b85981c0f852937873d012f49e08bc825 WHIRLPOOL ea6256af0818a3f82d87e3eec8be5032c4f255fb8194d586d7d5ad05cac66ebdff585b07644eca2356f0f821887eb9a825a6d1de737a310d513cba300e52218c
+MISC metadata.xml 694 SHA256 e946150d553ac325c134b66101321fd95f6270007e406a82ab529c7babec9e6d SHA512 1bb8f8d9e54b9ba4199ec8f92e4a01838ce08cc2c2cda8c1758681932032ba141b57021c7f078bd21f9205a156434c6f29553a2d5279efb476dd9bf52164eb86 WHIRLPOOL e3579a0c99230b39a5b74e62b3479f18db6ee9d1bb7b224cc47712639eb16adbb501f767b51659d7fdd980e1712301fd0daf3a54059691ad268155eda37d8c9f
diff --git a/media-video/google2srt/files/build.xml b/media-video/google2srt/files/build.xml
new file mode 100644
index 000000000000..b1c7e3c775bb
--- /dev/null
+++ b/media-video/google2srt/files/build.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0"?>
+
+<project name="Google2SRT" default="jar">
+	<!-- some properties -->
+	<property name="src.dir"       value="src" />
+	<property name="lib.dir"       value="lib" />
+	<property name="resources.dir" value="resources" />
+	<property name="docs.dir"      value="apidocs" />
+	<property name="build.dir"     value="build" />
+	<property name="dist.dir"      value="dist" />
+	<property name="project.jar"   value="${dist.dir}/${ant.project.name}.jar" />
+	<property name="mainclass.jar" value="GUI" />
+	<property name="source.enc"    value="UTF-8" />
+	<property name="target.jdk"    value="1.6" />
+
+	<!-- classpath -->
+	<path id="refcp">
+		<fileset dir="${lib.dir}">
+			<include name="**/*.jar" />
+		</fileset>
+	</path>
+
+	<!-- init -->
+	<target name="init">
+		<mkdir dir="${dist.dir}" />
+		<mkdir dir="${docs.dir}" />
+		<mkdir dir="${build.dir}" />
+	</target>	
+
+	<!-- compile everything -->
+	<target name="compile" depends="init">
+		<javac srcdir="${src.dir}"
+			destdir="${build.dir}"
+			source="${target.jdk}"
+			target="${target.jdk}"
+			classpathref="refcp"
+			encoding="${source.enc}"/>
+		<copy todir="${build.dir}">
+			<fileset dir="${resources.dir}" />
+		</copy>
+	</target>
+
+	<!-- build the jar files -->
+	<target name="build" depends="compile">
+		<jar jarfile="${project.jar}" basedir="${build.dir}">
+			<manifest>
+				<attribute name="Main-Class" value="${mainclass.jar}" />
+			</manifest>
+		</jar>
+	</target>
+	
+	<!-- generate javadocs -->
+	<target name="javadoc" depends="init">
+		<javadoc sourcepath="${src.dir}"
+           		destdir="${docs.dir}"
+			packagenames="*"
+           		author="true"
+           		version="true"
+			use="true"
+			charset="UTF-8"
+			encoding="${source.enc}"
+			defaultexcludes="yes"
+			classpathref="refcp"
+           		windowtitle="${ant.project.name} API">
+			<fileset dir="${src.dir}" defaultexcludes="yes">
+				<include name="**/*.java"/>
+		        </fileset>
+		</javadoc>
+	</target>
+	
+	<!-- clean up -->
+	<target name="clean">
+		<delete dir="${build.dir}" />
+		<delete dir="${docs.dir}" />
+		<delete dir="${dist.dir}" />
+	</target>
+
+        <!-- zip the sources -->
+        <target name="sourcezip">
+		<zip destfile="${dist.dir}/${ant.project.name}-src.zip">
+                        <zipfileset dir="${src.dir}" />
+                </zip>
+        </target>
+
+</project>
diff --git a/media-video/google2srt/google2srt-0.5.6-r1.ebuild b/media-video/google2srt/google2srt-0.5.6-r1.ebuild
new file mode 100644
index 000000000000..3c4143460253
--- /dev/null
+++ b/media-video/google2srt/google2srt-0.5.6-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_PN="Google2SRT"
+MY_P="${MY_PN}-${PV}"
+MAINCLASS="GUI"
+
+DESCRIPTION="Convert subtitles from Google Video and YouTube to SubRip (.srt) format"
+HOMEPAGE="http://google2srt.sourceforge.net/en/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
+	http://sbriesen.de/gentoo/distfiles/google2srt-icon.png"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="html"
+
+COMMON_DEP="dev-java/jdom:0"
+
+RDEPEND=">=virtual/jre-1.6
+	${COMMON_DEP}"
+
+DEPEND=">=virtual/jdk-1.6
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${MY_P}"
+
+java_prepare() {
+	# copy build.xml
+	cp -f "${FILESDIR}/build.xml" build.xml || die
+
+	# move resources
+	mkdir -p "resources"
+	mv -f src/*.{jpg,properties} "resources/"
+
+	# update library packages
+	cd lib
+	rm -f jdom.jar ../${MY_PN}.jar || die
+	java-pkg_jar-from jdom
+	java-pkg_ensure-no-bundled-jars
+}
+
+src_compile() {
+	eant build $(use_doc)
+}
+
+src_install() {
+	java-pkg_dojar dist/${MY_PN}.jar
+	java-pkg_dolauncher ${MY_PN} --main ${MAINCLASS} --java_args -Xmx256m
+	newicon "${DISTDIR}/${PN}-icon.png" "${MY_PN}.png"
+	make_desktop_entry ${MY_PN} ${MY_PN} ${MY_PN}
+	use doc && java-pkg_dojavadoc apidocs
+	use source && java-pkg_dosrc src
+	use html && dohtml -r doc
+	newdoc Changelog.txt ChangeLog
+	newdoc README.TXT README
+}
diff --git a/media-video/google2srt/metadata.xml b/media-video/google2srt/metadata.xml
new file mode 100644
index 000000000000..e7b5598e5610
--- /dev/null
+++ b/media-video/google2srt/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Google2SRT allows you to convert subtitles from Google Video and YouTube
+		to SubRip (.srt) format, which is recognized by most video players. You
+		can download XML subtitles or simply type video's URL, Google2SRT will
+		do the rest.
+	</longdescription>
+	<use>
+		<flag name="html">Install HTML documentation</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">google2srt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
new file mode 100644
index 000000000000..5c7a73257503
--- /dev/null
+++ b/media-video/gpac/Manifest
@@ -0,0 +1,12 @@
+AUX 110_all_implicitdecls.patch 1048 SHA256 6607d53e88dbecfa7185ba97f8f4ac13b266cb7396833ee42f307289f9d3d123 SHA512 cbd949b72bbe708decd7f4d24c2e1f9fbfda658fd6b355f11bc20b19ebf583e74eebb8ffc3c5b9945619efe4022123638fa243abaf07841d41101f62ad51e5ee WHIRLPOOL 3a852e35e940f6d1ecd58c8706eb519c524b9907497ac1df58da6648e4395184fe6a0ae834d850b9f69986700756aaa51ac1397a58c6f15e8bbe5ad8b39f2e9d
+AUX gpac-0.5.2-gf_isom_set_pixel_aspect_ratio.patch 542 SHA256 276e262e05e14fec7431a049b0809fb16d8dab1d29b6fdceff7c9324ce396f47 SHA512 65746044b1a8f2125b5113f4ec1ffa2c46b53f1927202c38130431e53875483ac834444e6e5ea1e589176dba0139e9703b4fc61be038ac305234b53765ba16cd WHIRLPOOL 2c269ecdc4064934e7b1e49d47db9dc3037369013b233adf89f19f06551a613f09bb7cedb7b3c80e65b85a0a6cf42e567ccee257c69202b351a670dd28f9b3fc
+AUX gpac-0.5.3-static-libs.patch 2843 SHA256 a5d33da5dfc802105a966ab1fefcfc71a3de2e2550423db43b46c95d8ad70cd1 SHA512 aa130e8744124c8cf4d280b669a0e1d133f57e3637a1ab7f151610439d37366145e1aec28a07338118f1c19e5a81c5068dcda813e15787575953332040603d5c WHIRLPOOL ebd5b6d336a23ba2d41dead75473e049e58e4083865a4008289d24173b0bee4a0019c17f2632f4a19ee511c4ed801018d255ab240c761dfdaa57b47e48d7ccc5
+AUX gpac-0.7.1-configure.patch 2928 SHA256 f29d8b8be1a3ad4824788515076607722737c8d1ce879ef5e5050019f96c8792 SHA512 f359693d43b3d033bc05c8af4951aff9cb432601421d888e50296c6164157b85be368ea4ae828e5229ae9344738bd49136d947ef0eb57bf545f80c3243c94046 WHIRLPOOL a673e1da614459dc1b82a505fad3c645f65344f94e4ff140d703208f086158fcc036805794836a7ecfdf935c71a3f74087c16d74c36425bdb9496e32905e4882
+DIST gpac-0.6.1.tar.gz 9113143 SHA256 67d1ac8f8b3e74da0e4e38ea926dc15bca6e9941e8f366e3538abcf13c103c09 SHA512 b1409a8ebcda08c3af504d7de591528ef84f5c3d8d506dd490502e16493de11c2435ea3f5957f39100a2ce040d5e431c86a5a203f806fcc865ae4b08f6cf5595 WHIRLPOOL bd0c87841036220623021898f0b82d2364fd37c5254f58cd7db33617350f0864ce9672b8cbfa10f0d08948f2842fe9b19db9f562074c43df6d94cf2b13a7d141
+DIST gpac-0.7.1.tar.gz 10654838 SHA256 c7a18b9eea1264fee392e7222d16b180e0acdd6bb173ff6b8baadbf50b3b1d7f SHA512 0377d9471db9e5ccf75f85dfd0c9f4e37a211108b5e128a5411ac015bd9c906257320d517717f0fa03d434e1fce24bd8a9c3a73200fac5c21b80895b716ab403 WHIRLPOOL a82e6de4a48b29ca0b74eb206075302aa9db34cfa6681a1e98f22cfc88c43c5f0d0557ade6e770fe9b9f47756039fcb8ef42bd892ab08ef7a7e0fbbd4f239057
+EBUILD gpac-0.6.1-r2.ebuild 3211 SHA256 67b98e3035d473d322a99a377a85e416c8478b14fb70bb17cf49112a1d2bb21a SHA512 2bfa94a7e2ccfb8953a505047bcbf2843218530d79b66a839dc2ee9c6d324914d37f673563a0bc71eca4fdd18ee720acdc30fe58d24efb8b347df6030afb75a5 WHIRLPOOL 26e1efddd3da5368841867e076a2a17d95ef8741f68fdd21ac23907762036913058805fbfab3ab1fd9c3f22f3d546a4bb4b7ef2a2dfb85b3bbeba8de29a7f87b
+EBUILD gpac-0.7.1.ebuild 3377 SHA256 4c42e3e45042cbec9e78e54705c08a8482737a5bb73a59d176d0130093d2e1b4 SHA512 f6f89a82d96599c145ff5f9d95043feae1ab7224d275853502055d4d933e25034a131c8214210cc7e4f7dbe0d7b3de70c8533785bf8fef8a3c3c1e20e23b1c9f WHIRLPOOL 96357ec8b2bc3de3bf8a2796062d5e3e1ece5d23bffb8bcefa504cd1f22350b1b463f5bcd178c887ae14110c26886c6f19c371707436c73b2ba251cde11c969a
+EBUILD gpac-9999.ebuild 3095 SHA256 cb8677ea232ff9b8d9bd5bb5de22de283417b9136ff8d3b7550582c67eb9c81a SHA512 f5d8046010c916cdca9ae2698e5d08fe29fb2637a869799c021968aad872094d1e2ca68db77cf36c62b154bd5b5e31ff392b01cb522e701c04565304eb185a06 WHIRLPOOL 4369139c14e7f6800e9bfc4285dc1e636897c829aeec84f5e7274c77f37365d183637b9bfbf0e36a734bd7c7e33e72364721040ab9b2f0839399df665f5907fa
+MISC ChangeLog 6394 SHA256 fecf700ed1ecb192a7db4110e79ab5aa3537ceca69732d6da6c0dd1b47275b16 SHA512 845ba7c190430ef1cec1e8cba8333355549439acb6a7edb4341d6be91be9151a22993e0b48c50b8f3e10ad268bc72235b4a34ca9ade2979fdb8a04952fb60ecf WHIRLPOOL 1d7e0125da682d6ec29441e638c62f82d8e52d1c9bee0f7b882e055492655546a2a4ba05859f0a1c708f9147828c18d8cb5e7fec4fc221fbb3910b2e7a436846
+MISC ChangeLog-2015 18903 SHA256 d6a055d5db5de2199a14114add2f39cca80d9d38650806752e55d9fca419d4f6 SHA512 b8bc06bbbf798b782adaeb1a8b2b4020c9c328ecc9e4e7982878db3c7d96b75d436a0129e82d8c5424b67ca646f862afcf17e66ba6be7657faff606780f55784 WHIRLPOOL fbffd168fe9cbdd45c4275dbc61f055a88a4753c417804cc5ebbeb33cb43b43d0c3aa14107651bc8b8f88f850c65dc1bb9edb72bdc852ac2c58e357e67ea2dc4
+MISC metadata.xml 356 SHA256 cbbb73d10845e45241e56cc5c4f8d533b9220325b466afdc149e70a01c3e562d SHA512 651073c0156c19eda006ee7622db5a127f1e2f747ed7e0cb141be1abca2084a1427ea82a888b335a68b056980b68a693f852b44d96bfe47f28cc985bf72dfac4 WHIRLPOOL e7f98419aa96cc8c8d1c5b6341904764759cee69822930d7599b310b2a22e0c7939e137b7400617f92cb7229788fe2ec9d46010e1f2c837dc92d670808007377
diff --git a/media-video/gpac/files/110_all_implicitdecls.patch b/media-video/gpac/files/110_all_implicitdecls.patch
new file mode 100644
index 000000000000..71017b53b9eb
--- /dev/null
+++ b/media-video/gpac/files/110_all_implicitdecls.patch
@@ -0,0 +1,22 @@
+Index: gpac/applications/generators/SVG/svggen.h
+===================================================================
+--- gpac.orig/applications/generators/SVG/svggen.h
++++ gpac/applications/generators/SVG/svggen.h
+@@ -107,6 +107,17 @@ typedef struct {
+ } SVGGenAttrGrp;
+ 
+ 
++SVGGenAttribute *findAttribute(SVGGenElement *e, char *name);
++void generateAttributes(FILE *output, GF_List *attributes, Bool inDefine);
++void generateSVGCode_V1(GF_List *svg_elements);
++void generate_laser_tables_da(GF_List *atts);
++void generate_laser_tables(GF_List *svg_elements);
++u32 generateCoreInfo(FILE *output, SVGGenElement *elt, u32 start);
++u32 generateGenericInfo(FILE *output, SVGGenElement *elt, u32 index, char *pointer_root, u32 start);
++void svgNameToImplementationName(xmlChar *svg_name, char implementation_name[50]);
++void generate_table(GF_List *elements);
++void generateSVGCode_V2(GF_List *svg_elements);
++void generateSVGCode_V3(GF_List *svg_elements);
+ 
+ /*******************************************
+  * Structures needed for static allocation *
diff --git a/media-video/gpac/files/gpac-0.5.2-gf_isom_set_pixel_aspect_ratio.patch b/media-video/gpac/files/gpac-0.5.2-gf_isom_set_pixel_aspect_ratio.patch
new file mode 100644
index 000000000000..df3a5fc32990
--- /dev/null
+++ b/media-video/gpac/files/gpac-0.5.2-gf_isom_set_pixel_aspect_ratio.patch
@@ -0,0 +1,15 @@
+Export gf_isom_set_pixel_aspect_ratio.
+media-video/x264-encoder needs it and this funcion used to be exported.
+
+diff --git a/src/isomedia/isom_write.c b/src/isomedia/isom_write.c
+index e935acc..9841d85 100644
+--- a/src/isomedia/isom_write.c
++++ b/src/isomedia/isom_write.c
+@@ -1270,6 +1270,7 @@ GF_Err gf_isom_set_visual_info(GF_ISOFile *movie, u32 trackNumber, u32 StreamDes
+ 	}
+ }
+ 
++GF_EXPORT
+ GF_Err gf_isom_set_pixel_aspect_ratio(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 hSpacing, u32 vSpacing)
+ {
+ 	GF_Err e;
diff --git a/media-video/gpac/files/gpac-0.5.3-static-libs.patch b/media-video/gpac/files/gpac-0.5.3-static-libs.patch
new file mode 100644
index 000000000000..ec11eaea172a
--- /dev/null
+++ b/media-video/gpac/files/gpac-0.5.3-static-libs.patch
@@ -0,0 +1,85 @@
+diff --git a/Makefile b/Makefile
+index 62b7850..ff4b589 100644
+--- a/Makefile
++++ b/Makefile
+@@ -219,7 +219,9 @@ ifeq ($(GPAC_ENST), yes)
+ 	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/include/gpac/enst/*.h "$(DESTDIR)$(prefix)/include/gpac/enst"
+ endif
+ 	mkdir -p "$(DESTDIR)$(prefix)/$(libdir)"
++ifeq ($(STATICLIBS),yes)
+ 	$(INSTALL) $(INSTFLAGS) -m 644 "./bin/gcc/libgpac_static.a" "$(DESTDIR)$(prefix)/$(libdir)"
++endif
+ 	$(MAKE) installdylib
+ 
+ uninstall-lib:
+diff --git a/configure b/configure
+index df00dff..561bcd3 100755
+--- a/configure
++++ b/configure
+@@ -101,6 +101,7 @@ has_xmlrpc="no"
+ has_openjpeg="no"
+ gprof_build="no"
+ static_build="no"
++static_libs="no"
+ want_pic="no"
+ want_gcov="no"
+ has_joystick="no"
+@@ -252,6 +253,7 @@ GPAC configuration options:
+   --enable-amr-wb          enable AMR WB library
+   --enable-amr             enable both AMR NB and WB libraries
+   --enable-static-bin      link statically against libgpac
++  --enable-static-lib      GPAC static libraries build
+   --static-mp4box          configure for static linking of MP4Box only.
+   --enable-depth           enables depth handling in the compositor
+ 
+@@ -1849,6 +1851,8 @@ for opt do
+             ;;
+         --enable-static-bin) static_build="yes";
+             ;;
++        --enable-static-lib) static_libs="yes";
++            ;;
+         --disable-ipv6) has_ipv6="no"
+             ;;
+         --disable-wx) has_wx="no"
+@@ -2525,6 +2529,7 @@ echo "** GPAC $version rev$revision Core Configuration **"
+ echo "debug version: $debuginfo"
+ echo "GProf enabled: $gprof_build"
+ echo "Static build enabled: $static_build"
++echo "Static libs build enabled: $static_libs"
+ echo "Memory tracking enabled: $use_memory_tracking"
+ echo "Fixed-Point Version: $use_fixed_point"
+ echo "IPV6 Support: $has_ipv6"
+@@ -3133,6 +3138,7 @@ echo "DEBUGBUILD=$debuginfo" >> config.mak
+ echo "GPROFBUILD=$gprof_build" >> config.mak
+ echo "MP4BOX_STATIC=$static_mp4box" >> config.mak
+ echo "STATICBUILD=$static_build" >> config.mak
++echo "STATICLIBS=$static_libs" >> config.mak
+ 
+ echo "CONFIG_IPV6=$has_ipv6" >> config.mak
+ if test "$has_ipv6" = "yes" ; then
+diff --git a/src/Makefile b/src/Makefile
+index ba9d9ab..89ea67f 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -610,17 +610,20 @@ compositor: $(LIBGPAC_COMPOSITOR)
+ 	@echo "LIBS $(EXTRALIBS)"
+ 
+ ifeq ($(CONFIG_DARWIN),yes)
+-
++ifeq ($(STATICLIBS),yes)
+ 	$(LIBTOOL) -s -o ../bin/gcc/libgpac_static.a $(OBJS)
+ 	$(RANLIB) ../bin/gcc/libgpac_static.a
++endif
+ ifneq ($(STATICBUILD),yes)
+ 	$(CC) $(SHFLAGS) $(LD_SONAME) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) 
+ endif
+ 
+ else
+ 
++ifeq ($(STATICLIBS),yes)
+ 	$(AR) cr ../bin/gcc/libgpac_static.a $(OBJS)
+ 	$(RANLIB) ../bin/gcc/libgpac_static.a
++endif
+ ifneq ($(STATICBUILD),yes)
+ 	$(CC) $(SHFLAGS) $(LD_SONAME) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS)	
+ 	mv $@ $@.$(VERSION_SONAME)
diff --git a/media-video/gpac/files/gpac-0.7.1-configure.patch b/media-video/gpac/files/gpac-0.7.1-configure.patch
new file mode 100644
index 000000000000..8bc3ec9f9079
--- /dev/null
+++ b/media-video/gpac/files/gpac-0.7.1-configure.patch
@@ -0,0 +1,94 @@
+--- gpac-0.7.1/Makefile.orig	2017-07-25 09:34:51.910379115 -0600
++++ gpac-0.7.1/Makefile	2017-07-25 09:36:18.906385736 -0600
+@@ -252,7 +252,9 @@
+ 	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/include/gpac/enst/*.h "$(DESTDIR)$(prefix)/include/gpac/enst"
+ endif
+ 	mkdir -p "$(DESTDIR)$(prefix)/$(libdir)"
++ifeq ($(STATIC_LIBS),yes)
+ 	$(INSTALL) $(INSTFLAGS) -m 644 "./bin/gcc/libgpac_static.a" "$(DESTDIR)$(prefix)/$(libdir)"
++endif
+ 	$(MAKE) installdylib
+ 
+ uninstall-lib:
+--- gpac-0.7.1/src/Makefile.orig	2017-07-25 09:37:48.157392528 -0600
++++ gpac-0.7.1/src/Makefile	2017-07-25 09:39:06.092398459 -0600
+@@ -267,16 +267,20 @@
+ 
+ ifeq ($(CONFIG_DARWIN),yes)
+ 
++ifeq ($(STATICLIBS),yes)
+ 	$(LIBTOOL) -s -o ../bin/gcc/libgpac_static.a $(OBJS)
+ 	$(RANLIB) ../bin/gcc/libgpac_static.a
++endif
+ ifneq ($(STATICBUILD),yes)
+ 	$(CC) $(SHFLAGS) $(LD_SONAME) -o $@ $(OBJS) $(EXTRALIBS)  $(LDFLAGS)
+ endif
+ 
+ else
+ 
++ifeq ($(STATICLIBS),yes)
+ 	$(AR) cr ../bin/gcc/libgpac_static.a $(OBJS)
+ 	$(RANLIB) ../bin/gcc/libgpac_static.a
++endif
+ ifneq ($(STATICBUILD),yes)
+ 	$(CC) $(SHFLAGS) $(LD_SONAME) -o $@ $(OBJS) $(EXTRALIBS)	 $(LDFLAGS)
+ 	mv $@ $@.$(VERSION_SONAME)
+--- gpac-0.7.1/configure.orig	2017-07-25 10:01:58.789502926 -0600
++++ gpac-0.7.1/configure	2017-07-25 10:02:54.110507136 -0600
+@@ -109,6 +109,7 @@
+ has_openjpeg="no"
+ gprof_build="no"
+ static_build="no"
++static_libs="no"
+ want_pic="no"
+ want_gcov="no"
+ has_joystick="no"
+@@ -260,6 +261,7 @@
+   --enable-amr-wb          enable AMR WB library
+   --enable-amr             enable both AMR NB and WB libraries
+   --enable-static-bin      link statically against libgpac
++  --enable-static-lib      GPAC static libraries build
+   --static-mp4box          configure for static linking of MP4Box only.
+   --enable-depth           enables depth handling in the compositor
+ 
+@@ -705,15 +707,6 @@
+     CFLAGS="$CFLAGS -Wno-pointer-sign"
+ fi
+ 
+-
+-#GCC opt
+-if test "$no_gcc_opt" = "no"; then
+-    CFLAGS="-O3 $CFLAGS"
+-else
+-    CFLAGS="-O0 $CFLAGS"
+-fi
+-
+-
+ #GCC PIC
+ if test "$cross_prefix" != "" ; then
+     want_pic="no"
+@@ -1885,6 +1878,8 @@
+             ;;
+         --enable-static-bin) static_build="yes";
+             ;;
++        --enable-static-lib) static_libs="yes";
++            ;;
+         --disable-ipv6) has_ipv6="no"
+             ;;
+         --disable-wx) has_wx="no"
+@@ -2559,6 +2554,7 @@
+ echo "debug version: $debuginfo"
+ echo "GProf enabled: $gprof_build"
+ echo "Static build enabled: $static_build"
++echo "Static libs enabled: $static_libs"
+ echo "Memory tracking enabled: $use_memory_tracking"
+ echo "Fixed-Point Version: $use_fixed_point"
+ echo "IPV6 Support: $has_ipv6"
+@@ -3194,6 +3190,7 @@
+ echo "GPROFBUILD=$gprof_build" >> config.mak
+ echo "MP4BOX_STATIC=$static_mp4box" >> config.mak
+ echo "STATICBUILD=$static_build" >> config.mak
++echo "STATICLIBS=$static_libs" >> config.mak
+ 
+ echo "CONFIG_IPV6=$has_ipv6" >> config.mak
+ if test "$has_ipv6" = "yes" ; then
diff --git a/media-video/gpac/gpac-0.6.1-r2.ebuild b/media-video/gpac/gpac-0.6.1-r2.ebuild
new file mode 100644
index 000000000000..86e1355ce3fd
--- /dev/null
+++ b/media-video/gpac/gpac-0.6.1-r2.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == *9999 ]] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/gpac/gpac"
+else
+	SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd"
+fi
+
+inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
+
+DESCRIPTION="Implementation of the MPEG-4 Systems standard developed from scratch in ANSI C"
+HOMEPAGE="http://gpac.wp.mines-telecom.fr/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libav libressl mad opengl oss png
+	pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
+
+RDEPEND="
+	a52? ( media-libs/a52dec )
+	aac? ( >=media-libs/faad2-2.0 )
+	alsa? ( media-libs/alsa-lib )
+	dvb? ( media-tv/linuxtv-dvb-apps )
+	ffmpeg? (
+		!libav? ( media-video/ffmpeg:0= )
+		libav? ( media-video/libav:0= ) )
+	jack? ( media-sound/jack-audio-connection-kit )
+	jpeg? ( virtual/jpeg:0 )
+	mad? ( >=media-libs/libmad-0.15.1b )
+	opengl? ( virtual/opengl media-libs/freeglut virtual/glu )
+	>=media-libs/libogg-1.1
+	png? ( >=media-libs/libpng-1.4:0= )
+	vorbis? ( >=media-libs/libvorbis-1.1 )
+	theora? ( media-libs/libtheora )
+	truetype? ( >=media-libs/freetype-2.1.4:2 )
+	xml? ( >=dev-libs/libxml2-2.6.0:2 )
+	xvid? ( >=media-libs/xvid-1.0.1 )
+	sdl? ( media-libs/libsdl )
+	jpeg2k? ( media-libs/openjpeg:0 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= ) )
+	pulseaudio? ( media-sound/pulseaudio )
+	X? (
+		x11-libs/libXt
+		x11-libs/libX11
+		x11-libs/libXv
+		x11-libs/libXext
+	)
+"
+# disabled upstream, see applications/Makefile
+# wxwidgets? ( =x11-libs/wxGTK-2.8* )
+DEPEND="${RDEPEND}"
+
+my_use() {
+	local flag="$1" pflag="${2:-$1}"
+	if use ${flag}; then
+		echo "--use-${pflag}=system"
+	else
+		echo "--use-${pflag}=no"
+	fi
+}
+
+src_prepare() {
+	default
+	eapply	"${FILESDIR}"/110_all_implicitdecls.patch \
+		"${FILESDIR}"/${PN}-0.5.3-static-libs.patch \
+		"${FILESDIR}"/${PN}-0.5.2-gf_isom_set_pixel_aspect_ratio.patch
+	sed -i -e "s:\(--disable-.*\)=\*):\1):" configure || die
+}
+
+src_configure() {
+	tc-export CC CXX AR RANLIB
+
+	econf \
+		--enable-svg \
+		--enable-pic \
+		--disable-amr \
+		--use-js=no \
+		--use-ogg=system \
+		$(use_enable alsa) \
+		$(use_enable debug) \
+		$(use_enable ipv6) \
+		$(use_enable jack jack yes) \
+		$(use_enable opengl 3d) \
+		$(use_enable oss oss-audio) \
+		$(use_enable pulseaudio pulseaudio yes) \
+		$(use_enable sdl) \
+		$(use_enable ssl) \
+		$(use_enable static-libs static-lib) \
+		$(use_enable X x11) $(use_enable X x11-shm) $(use_enable X x11-xv) \
+		--disable-wx \
+		$(my_use a52) \
+		$(my_use aac faad) \
+		$(my_use dvb dvbx) \
+		$(my_use ffmpeg) \
+		$(my_use jpeg) \
+		$(my_use jpeg2k openjpeg) \
+		$(my_use mad) \
+		$(my_use png) \
+		$(my_use theora) \
+		$(my_use truetype ft) \
+		$(my_use vorbis) \
+		$(my_use xvid) \
+		--extra-cflags="${CFLAGS}" \
+		--cc="$(tc-getCC)" \
+		--libdir="/$(get_libdir)" \
+		--verbose
+}
+
+src_install() {
+	emake STRIP="true" DESTDIR="${D}" install
+	emake STRIP="true" DESTDIR="${D}" install-lib
+	dodoc AUTHORS BUGS Changelog README.md TODO
+	dodoc doc/*.txt
+	dohtml doc/*.html
+}
diff --git a/media-video/gpac/gpac-0.7.1.ebuild b/media-video/gpac/gpac-0.7.1.ebuild
new file mode 100644
index 000000000000..2e7046a175c5
--- /dev/null
+++ b/media-video/gpac/gpac-0.7.1.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == *9999 ]] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/gpac/gpac"
+else
+	SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+fi
+
+inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
+
+DESCRIPTION="Implementation of the MPEG-4 Systems standard developed from scratch in ANSI C"
+HOMEPAGE="https://gpac.wp.imt.fr/"
+
+LICENSE="GPL-2"
+# subslot == libgpac major
+SLOT="0/7"
+IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libav libressl mad opengl oss png
+	pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
+
+RDEPEND="
+	a52? ( media-libs/a52dec )
+	aac? ( >=media-libs/faad2-2.0 )
+	alsa? ( media-libs/alsa-lib )
+	dvb? ( media-tv/linuxtv-dvb-apps )
+	ffmpeg? (
+		!libav? ( media-video/ffmpeg:0= )
+		libav? ( media-video/libav:0= ) )
+	jack? ( media-sound/jack-audio-connection-kit )
+	jpeg? ( virtual/jpeg:0 )
+	mad? ( >=media-libs/libmad-0.15.1b )
+	opengl? ( virtual/opengl media-libs/freeglut virtual/glu )
+	>=media-libs/libogg-1.1
+	png? ( >=media-libs/libpng-1.4:0= )
+	vorbis? ( >=media-libs/libvorbis-1.1 )
+	theora? ( media-libs/libtheora )
+	truetype? ( >=media-libs/freetype-2.1.4:2 )
+	xml? ( >=dev-libs/libxml2-2.6.0:2 )
+	xvid? ( >=media-libs/xvid-1.0.1 )
+	sdl? ( media-libs/libsdl )
+	jpeg2k? ( media-libs/openjpeg:0 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= ) )
+	pulseaudio? ( media-sound/pulseaudio )
+	X? (
+		x11-libs/libXt
+		x11-libs/libX11
+		x11-libs/libXv
+		x11-libs/libXext
+	)
+"
+# disabled upstream, see applications/Makefile
+# wxwidgets? ( =x11-libs/wxGTK-2.8* )
+DEPEND="${RDEPEND}"
+
+# DOCS="AUTHORS BUGS Changelog README.md TODO doc/CODING_STYLE doc/*.doc doc/*.bt doc/SceneGenerators doc/ipmpx_syntax.bt doc/*.txt"
+PATCHES=(
+	"${FILESDIR}/${PN}-0.7.1-configure.patch"
+)
+
+DOCS=(
+	doc/CODING_STYLE
+	doc/GPAC\ UPnP.doc
+	doc/ISO\ 639-2\ codes.txt
+	doc/SceneGenerators
+	doc/ipmpx_syntax.bt
+	Changelog
+	AUTHORS
+	BUGS
+	README.md
+	TODO
+)
+HTML_DOCS="doc/*.html"
+
+my_use() {
+	local flag="$1" pflag="${2:-$1}"
+	if use ${flag}; then
+		echo "--use-${pflag}=system"
+	else
+		echo "--use-${pflag}=no"
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i -e "s:\(--disable-.*\)=\*):\1):" configure || die
+}
+
+src_configure() {
+	tc-export CC CXX AR RANLIB
+
+	econf \
+		--enable-svg \
+		--enable-pic \
+		--disable-amr \
+		--use-js=no \
+		--use-ogg=system \
+		$(use_enable alsa) \
+		$(use_enable debug) \
+		$(use_enable ipv6) \
+		$(use_enable jack jack yes) \
+		$(use_enable opengl 3d) \
+		$(use_enable oss oss-audio) \
+		$(use_enable pulseaudio pulseaudio yes) \
+		$(use_enable sdl) \
+		$(use_enable ssl) \
+		$(use_enable static-libs static-lib) \
+		$(use_enable X x11) $(use_enable X x11-shm) $(use_enable X x11-xv) \
+		--disable-wx \
+		$(my_use a52) \
+		$(my_use aac faad) \
+		$(my_use dvb dvbx) \
+		$(my_use ffmpeg) \
+		$(my_use jpeg) \
+		$(my_use jpeg2k openjpeg) \
+		$(my_use mad) \
+		$(my_use png) \
+		$(my_use theora) \
+		$(my_use truetype ft) \
+		$(my_use vorbis) \
+		$(my_use xvid) \
+		--extra-cflags="${CFLAGS}" \
+		--cc="$(tc-getCC)" \
+		--libdir="/$(get_libdir)" \
+		--verbose
+}
+
+src_install() {
+	einstalldocs
+	emake STRIP="true" DESTDIR="${D}" install
+	emake STRIP="true" DESTDIR="${D}" install-lib
+}
diff --git a/media-video/gpac/gpac-9999.ebuild b/media-video/gpac/gpac-9999.ebuild
new file mode 100644
index 000000000000..1853504344e3
--- /dev/null
+++ b/media-video/gpac/gpac-9999.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+if [[ ${PV} == *9999 ]] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/gpac/gpac"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+fi
+
+inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
+
+DESCRIPTION="GPAC is an implementation of the MPEG-4 Systems standard developed from scratch in ANSI C"
+HOMEPAGE="http://gpac.wp.mines-telecom.fr/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k mad opengl oss png
+	pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
+
+RDEPEND="
+	a52? ( media-libs/a52dec )
+	aac? ( >=media-libs/faad2-2.0 )
+	alsa? ( media-libs/alsa-lib )
+	dvb? ( media-tv/linuxtv-dvb-apps )
+	ffmpeg? ( virtual/ffmpeg )
+	jack? ( media-sound/jack-audio-connection-kit )
+	jpeg? ( virtual/jpeg )
+	mad? ( >=media-libs/libmad-0.15.1b )
+	opengl? ( virtual/opengl media-libs/freeglut virtual/glu )
+	>=media-libs/libogg-1.1
+	png? ( >=media-libs/libpng-1.4 )
+	vorbis? ( >=media-libs/libvorbis-1.1 )
+	theora? ( media-libs/libtheora )
+	truetype? ( >=media-libs/freetype-2.1.4 )
+	xml? ( >=dev-libs/libxml2-2.6.0 )
+	xvid? ( >=media-libs/xvid-1.0.1 )
+	sdl? ( media-libs/libsdl )
+	jpeg2k? ( media-libs/openjpeg:0 )
+	ssl? ( dev-libs/openssl )
+	pulseaudio? ( media-sound/pulseaudio )
+	X? (
+		x11-libs/libXt
+		x11-libs/libX11
+		x11-libs/libXv
+		x11-libs/libXext
+	)"
+# disabled upstream, see applications/Makefile
+# wxwidgets? ( =x11-libs/wxGTK-2.8* )
+
+DEPEND="${RDEPEND}"
+
+my_use() {
+	local flag="$1" pflag="${2:-$1}"
+	if use ${flag}; then
+		echo "--use-${pflag}=system"
+	else
+		echo "--use-${pflag}=no"
+	fi
+}
+
+src_prepare() {
+	epatch	"${FILESDIR}"/110_all_implicitdecls.patch \
+			"${FILESDIR}"/${PN}-0.5.3-static-libs.patch \
+			"${FILESDIR}"/${PN}-0.5.2-gf_isom_set_pixel_aspect_ratio.patch
+	sed -i -e "s:\(--disable-.*\)=\*):\1):" configure || die
+}
+
+src_configure() {
+	tc-export CC CXX AR RANLIB
+
+	econf \
+		--enable-svg \
+		--enable-pic \
+		--disable-amr \
+		--use-js=no \
+		--use-ogg=system \
+		$(use_enable alsa) \
+		$(use_enable debug) \
+		$(use_enable ipv6) \
+		$(use_enable jack jack yes) \
+		$(use_enable opengl) \
+		$(use_enable oss oss-audio) \
+		$(use_enable pulseaudio pulseaudio yes) \
+		$(use_enable sdl) \
+		$(use_enable ssl) \
+		$(use_enable static-libs static-lib) \
+		$(use_enable X x11) $(use_enable X x11-shm) $(use_enable X x11-xv) \
+		--disable-wx \
+		$(my_use a52) \
+		$(my_use aac faad) \
+		$(my_use dvb dvbx) \
+		$(my_use ffmpeg) \
+		$(my_use jpeg) \
+		$(my_use jpeg2k openjpeg) \
+		$(my_use mad) \
+		$(my_use png) \
+		$(my_use theora) \
+		$(my_use truetype ft) \
+		$(my_use vorbis) \
+		$(my_use xvid) \
+		--extra-cflags="${CFLAGS}" \
+		--cc="$(tc-getCC)" \
+		--libdir="/$(get_libdir)" \
+		--verbose
+}
+
+src_install() {
+	emake STRIP="true" DESTDIR="${D}" install
+	emake STRIP="true" DESTDIR="${D}" install-lib
+	dodoc AUTHORS BUGS Changelog README.md TODO
+	dodoc doc/*.txt
+	dohtml doc/*.html
+}
diff --git a/media-video/gpac/metadata.xml b/media-video/gpac/metadata.xml
new file mode 100644
index 000000000000..8cd751d8d732
--- /dev/null
+++ b/media-video/gpac/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>media-video@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">gpac</remote-id>
+    <remote-id type="github">gpac/gpac</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-video/griffith/Manifest b/media-video/griffith/Manifest
new file mode 100644
index 000000000000..c55af938f499
--- /dev/null
+++ b/media-video/griffith/Manifest
@@ -0,0 +1,7 @@
+AUX 0.10-fix_lib_path.patch 667 SHA256 f9c5a58ac4552ddfe254cdb9e02ef3e91a5feb500c7afe92f9faed9cc02687f2 SHA512 9e85aa92627898a667b86ead4ae691c9d2562300f99da4c4efe57644a9c2bddef0648fce39290b50471cc22e49b4bd478979d3147dfda8a52e8bd55d2c1c6ee7 WHIRLPOOL 2d21cf60ec65001dc5606c4cae638d9102bf0ff576b258aff45246d631d94a900e19a508aff8fed9becb80b5f0708d94959f4473271d35e7fec73492b40e8560
+DIST griffith-0.13.tar.gz 1565903 SHA256 60576d33aa855ab45d654288d7bf2ead8accecb72fd2acbc373656294ab8f242 SHA512 dc8117b1a89253a87eb303c5229e6cdffde26b52de9ac4a3409dcc3f6dca64105f13a98cace225a932aefb2d620e828eea66bae57f40328b7ee3c06a944f0bed WHIRLPOOL 9f46b25e345f5e3b6823c7a5faff173d6d63921b812f7b6de7c0f7c691f881f4252560baae5f4a8660b2f0e94370dcb28e60264d1c261e0b64f03c8d710bcdf1
+DIST griffith-extra-artwork-0.9.4.tar.gz 124008 SHA256 96bc01a05ad54aad9fabcf411809c46c78b990fc7656ea004cebdfd8ea9894fd SHA512 09e912b4511c5c4a7b501d9a8f98223d20e58574e667cdb759e66f743cce14b45cce8bf0f9502ff2aacfc09e7a7b37966a887205a74a6e028b832703a65a2734 WHIRLPOOL 166dcf1bee1ef07452d00b7c87f487fea5417a0b6d156afd127f8723c6d2c44d2a0e4a5719ab5f85c662b7bbc30f0fadd8ba7873908cdf7ae85167b07a518e6b
+EBUILD griffith-0.13-r1.ebuild 2104 SHA256 8070b303d7fed28f1f0de6c1c18df1232cfa55403a053beae1685666bbcfcfa6 SHA512 d295f32b9daf641cb05dd8cd9be7d3852725d4dfa66220f24eb478599d6d9b210b93d1d87d2be9f99c1a11e8ecc3f2b95f54e1fd984288cf41232cf4d2a59e75 WHIRLPOOL 0cc84b6c13f03263b7e97850541d67a8ce62e25fd0af70dc00d94a81d79e0bc6bc6945dd47a08d4558eab0aceb4e8e0fd3991656a730892539141aae9806f4fd
+MISC ChangeLog 3032 SHA256 ae8db1cd37e72e665ead210852d4cd7c525877487b55ae795ee23664cf9ab5cf SHA512 3833126c33efdd30b5ac3848d5e460a3bfbdb669ad4f6c7fc8269572ea6179b32c1a0b7bd757809fc1333cda2734ba4b9ce7aa3f445ef8043c521005969bb4aa WHIRLPOOL 5382d59070d38edfb47bad710d0d098a6e48d07d23c8ea2588b4ed4db2684a743dfae3a073d2b2223d52c7c5ffea820076c5a213429541812cf26be4b80fdba2
+MISC ChangeLog-2015 9835 SHA256 78a400b34b02b1b3dd875913a658719436a8babfe31978c55e5b59a45881f435 SHA512 f5702d13f2a1b96d3d82520a01b765648b2b78f01eed62ca5d963c1b546f47da0192a9379e77224ee517c6432224f7baba472072c000998bf6f0390dba266963 WHIRLPOOL 5115452e9824a3c69f58980f8a71ac83d42f7cff554b98ad10a1044d4a212edb047458ac6a81f522d50e4de3e4ac98589fd847758c4d55904047dcc3d6247ed2
+MISC metadata.xml 462 SHA256 6e2bf71ddd60d3db2ea72117a88617f654058b959fafcef23d771228da75e6ba SHA512 0aab82c7eaffc0269cb66bbdb5df6e98dad1259c50bfc5343839a7ec2c6b547d3f5d47053673dd8759d945083f2860790a7e2f2efb5f8b0f50be4e74beb1381e WHIRLPOOL e6e875629a9733ac0109bff47e87cdc20c4f270d96279efe1c8c705149dda98a3ada370bd18ec915b9b7a88078aa3e6a6d83b4a9f8eeef2a4268bff0f39f7246
diff --git a/media-video/griffith/files/0.10-fix_lib_path.patch b/media-video/griffith/files/0.10-fix_lib_path.patch
new file mode 100644
index 000000000000..952448f0f013
--- /dev/null
+++ b/media-video/griffith/files/0.10-fix_lib_path.patch
@@ -0,0 +1,13 @@
+Index: lib/initialize.py
+===================================================================
+--- lib.orig/initialize.py
++++ lib/initialize.py
+@@ -73,7 +73,7 @@ def locations(self, home_dir):
+             os.environ['LANG'] = lang
+ 
+     elif os.name == 'posix':
+-        locations['share'] = os.path.abspath(os.path.join(locations['lib'], '..'))
++        locations['share'] = os.path.abspath(os.path.join(locations['lib'], '../../share/griffith/'))
+         locations['glade'] = os.path.join(locations['share'], 'glade')
+         locations['i18n']  = os.path.abspath(os.path.join(locations['share'], '..', 'locale'))
+         if not os.path.isdir(locations['i18n']):
diff --git a/media-video/griffith/griffith-0.13-r1.ebuild b/media-video/griffith/griffith-0.13-r1.ebuild
new file mode 100644
index 000000000000..55114ed59695
--- /dev/null
+++ b/media-video/griffith/griffith-0.13-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='sqlite'
+
+inherit versionator python-single-r1 multilib
+
+ARTWORK_PV="0.9.4"
+
+DESCRIPTION="Movie collection manager"
+HOMEPAGE="http://www.griffith.cc/"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz
+	https://dev.gentoo.org/~hwoarang/distfiles/${PN}-extra-artwork-${ARTWORK_PV}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x86-fbsd"
+IUSE="doc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-python/pillow[${PYTHON_USEDEP}]
+	gnome-base/libglade[${PYTHON_USEDEP}]
+	dev-python/pyxml[${PYTHON_USEDEP}]
+	>=dev-python/pygtk-2.6.1:2[${PYTHON_USEDEP}]
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-0.5.2[${PYTHON_USEDEP}]
+	>=dev-python/reportlab-1.19[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( app-text/docbook2X )"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	use doc || { sed -i -e '/docs/d' Makefile || die ; }
+	sed -i \
+		-e 's#/pl/#/pl.UTF-8/#' \
+		"${S}"/docs/pl/Makefile || die "sed failed"
+
+	sed -i \
+		-e 's/ISO-8859-1/UTF-8/' \
+		"${S}"/lib/gconsole.py || die "sed failed"
+
+	epatch "${FILESDIR}/0.10-fix_lib_path.patch"
+}
+
+src_compile() {
+	# Nothing to compile and default `emake` spews an error message
+	true
+}
+
+src_install() {
+	use doc || { sed -i -e '/docs/d' Makefile || die ; }
+
+	emake \
+		LIBDIR="${D}/usr/$(get_libdir)/griffith" \
+		DESTDIR="${D}" DOC2MAN=docbook2man.pl install
+	dodoc AUTHORS ChangeLog README THANKS TODO NEWS TRANSLATORS
+
+	cd "${WORKDIR}/${PN}-extra-artwork-${ARTWORK_PV}/"
+	emake DESTDIR="${D}" install
+	# This carries over from -0.13 but appears to have no effect.
+	python_optimize "${D}"usr/share/${PN}
+}
+
+pkg_postinst() {
+	einfo
+	einfo "${PN} can make use of the following optional dependencies"
+	einfo "dev-python/chardet: CSV file encoding detections"
+	einfo "dev-python/mysql-python: Python interface for MySQL connectivity"
+	einfo ">=dev-python/psycopg-2.4: Python interface for PostgreSQL connectivity"
+	einfo
+}
diff --git a/media-video/griffith/metadata.xml b/media-video/griffith/metadata.xml
new file mode 100644
index 000000000000..2625db8c809a
--- /dev/null
+++ b/media-video/griffith/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>hwoarang@gentoo.org</email>
+    <name>Markos Chandras</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>media-video@gentoo.org</email>
+    <name>Gentoo Video project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="launchpad">griffith</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-video/gtk-recordmydesktop/Manifest b/media-video/gtk-recordmydesktop/Manifest
new file mode 100644
index 000000000000..bb2b90629001
--- /dev/null
+++ b/media-video/gtk-recordmydesktop/Manifest
@@ -0,0 +1,6 @@
+AUX gtk-recordmydesktop-0.3.8-check-for-jack.patch 1200 SHA256 5aa0721cadcad73afd8c046e48a31a2ae503452e1808b7981e471467e279da4b SHA512 439b756afd6d078ff71ce111b4a63b3bb527a09d63d62139396689a0b4c3c51ebb08a7d9e07e909b9ba43fde6578e8b693a2f80372ed15f5f761eb7747091c3e WHIRLPOOL eccd3c6fe6d700a069d81ac901908ca5e906cfd06232a12dc65277a91de5dbbcb66774f44f3c4a973240ceb75fc0239383b2269beb72b531c37e651c3d35bd81
+DIST gtk-recordmydesktop-0.3.8.tar.gz 176381 SHA256 61ad43a6e4f0bf86d8553f03297e4b1b137b47337fa150ce1da8c24494ca8326 SHA512 7d9785b81b17e7a8fbfcd7dfd227f4bce38b450150b89819b30e9b0e17c4053bda02fc1f653a18ddf4ca2a0f2157dd3c18f061b3ca661c10a9dd7208b1183e49 WHIRLPOOL 1464618ae3e7f93759c5407593bf5da9baaeeace13ec64a25d92c5611a10eb1f5cc84753516f574352a4c58f9c2919657b5bada0d94af0d57706a667110457c6
+EBUILD gtk-recordmydesktop-0.3.8-r3.ebuild 1169 SHA256 386bab061cdd87d47dc379c3b2cade1645bf033ba98a5a084129b105ae5b8e7b SHA512 fe6d60ed0c9b15582224bc8cf4c7693783d84f490a47f97bc2c5fb1fc9fe892028c47dc21a03bc43d64dc44f8d015f06c574062351d1e025afc183b16535c71b WHIRLPOOL 412c916680f789a51ef72fc8ebcacaeb6a5b0896aedbcad54b15ace7d5cb14a7522b49d65d3fa9de4d7ab2ac387c1f6e293dd5a07e5118c2600735a67db3ad7a
+MISC ChangeLog 2529 SHA256 633831f3bbe71ed84bcf464c2d79cf31d7555235847fd82b97eef0b543e81617 SHA512 3100bf4e71e34bffe018b832c5a412f7572e09980d68b432744439677a852337ced020d0bd193a1c99a0eac43c03d33228133cc9688a3a82927f590df299c510 WHIRLPOOL 8cd9d7e3a0e908b9d773069abc4554ca59134c7953bfc33db35ffcbedd868699241b79f8c2ddbf80518d66f91a0ae4343faba7438c3fa943a21821f149ea8daf
+MISC ChangeLog-2015 5111 SHA256 84ad4978bcdce9ef24e796d3e59ae48c79bbf82face2d4d1ba0ba578ec6bc1d9 SHA512 2f143bbe5c335b7626dc2788c0990e077b7e7e6a6186d0f6f2b24934d38dc077c933fe745cf41f0d79ac63f4bd40d47cd0ba675c2afdd926d1a996ebd9379ffd WHIRLPOOL 7397fd630ea0e483e289c06fb8bb36e0dc16fa1cc6f2671a423edb48167992c51966653f83d9da0c131085b445054a30dcea5d89c96f4db8d1d45803d90b7f21
+MISC metadata.xml 316 SHA256 2cdd2fd34653a7708f85d21f2effd9465ccd1e98cbe4ba49d6fafebc7538f48d SHA512 b2b2172a9a6fe5c1b1677138e045a24ec1922838e0ed7c2a958b41b73864c8a35f4dc6717468f0d2231763521b9b067d5123c930ec48c51789a7ea962629e1a8 WHIRLPOOL 2832d65e74d4f9373d071432f80d651503da897997daad112ec9046b7c1e8c8398404bee225c557f62259b448b0825075433cd7d0e5a387fc5476666364e2ad4
diff --git a/media-video/gtk-recordmydesktop/files/gtk-recordmydesktop-0.3.8-check-for-jack.patch b/media-video/gtk-recordmydesktop/files/gtk-recordmydesktop-0.3.8-check-for-jack.patch
new file mode 100644
index 000000000000..7743d43199cd
--- /dev/null
+++ b/media-video/gtk-recordmydesktop/files/gtk-recordmydesktop-0.3.8-check-for-jack.patch
@@ -0,0 +1,36 @@
+--- gtk-recordmydesktop-0.3.8.orig/src/rmdPrefsWidget.py	2009-10-12 12:40:32.470028483 +0100
++++ gtk-recordmydesktop-0.3.8/src/rmdPrefsWidget.py	2009-10-12 12:41:08.086044353 +0100
+@@ -323,11 +323,33 @@
+         for i in range(4):
+             self.labelbox[i].show()
+         self.notebook.show()
++
++    def which(self,program):
++        import os
++        def is_exe(fpath):
++            return os.path.exists(fpath) and os.access(fpath, os.X_OK)
++
++        fpath, fname = os.path.split(program)
++        if fpath:
++            if is_exe(program):
++                return program
++        else:
++            for path in os.environ["PATH"].split(os.pathsep):
++                exe_file = os.path.join(path, program)
++                if is_exe(exe_file):
++                    return exe_file
++
++        return None
++
++
+     def __runJackLSP__(self,button=None):
+         if button!=None:
+             self.__getSelectedPorts__()
+         self.ports=[]
+         failed=0
++        if self.which('jack_lsp') == None:
++            self.jack_button.set_sensitive(False)
++            return
+         (stdin,stdout,stderr)=os.popen3(['jack_lsp'],'t')
+         ports=stdout.readlines()
+         stdin.close()
diff --git a/media-video/gtk-recordmydesktop/gtk-recordmydesktop-0.3.8-r3.ebuild b/media-video/gtk-recordmydesktop/gtk-recordmydesktop-0.3.8-r3.ebuild
new file mode 100644
index 000000000000..111584b31dd4
--- /dev/null
+++ b/media-video/gtk-recordmydesktop/gtk-recordmydesktop-0.3.8-r3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit eutils python-single-r1
+
+DESCRIPTION="GTK+ interface for RecordMyDesktop"
+HOMEPAGE="http://recordmydesktop.sourceforge.net/"
+SRC_URI="mirror://sourceforge/recordmydesktop/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Test is buggy : bug #186752
+# Tries to run intl-toolupdate without it being substituted from
+# configure, make test tries run make check in flumotion/test what
+# makes me think that this file has been copied from flumotion without
+# much care...
+RESTRICT=test
+
+RDEPEND=">=x11-libs/gtk+-2.10.0:2
+	dev-python/pygtk:2
+	>=media-video/recordmydesktop-0.3.5
+	x11-apps/xwininfo
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-check-for-jack.patch
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	python_fix_shebang "${D}/usr/bin/gtk-recordMyDesktop"
+	sed -i 's#gtk-recordmydesktop.png#gtk-recordmydesktop#' "${D}/usr/share/applications/gtk-recordmydesktop.desktop" || die
+	dodoc NEWS README AUTHORS ChangeLog
+}
diff --git a/media-video/gtk-recordmydesktop/metadata.xml b/media-video/gtk-recordmydesktop/metadata.xml
new file mode 100644
index 000000000000..cd0bf6d9d5f2
--- /dev/null
+++ b/media-video/gtk-recordmydesktop/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>media-video@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">recordmydesktop</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-video/guvcview/Manifest b/media-video/guvcview/Manifest
new file mode 100644
index 000000000000..984d286bcf15
--- /dev/null
+++ b/media-video/guvcview/Manifest
@@ -0,0 +1,10 @@
+AUX ffmpeg3.patch 1159 SHA256 cdbae0161e8396a4b7dbfc6c15cb18b972c0e90dd3198ae625f5c902baa38055 SHA512 0707e6ff0fa2098b02c58001014d9ddf09b3b9dc9f211d74143c893b0a3cb1bc12cfbb05a05cacf7599689441934a63294d7fbed1a4b4e273aea0058dc41a6ee WHIRLPOOL 2e92cc8f171b755f5a2d7ef21af2cc71d7259cbbe99cef94bac8af747a79be46e5875e86208375b762c3a9b17cbd499ea0b85cbbd47e5897cdaf208086fa7a68
+DIST guvcview-src-2.0.3.tar.gz 1062788 SHA256 1f2c79f2dccbf512a0aa1c397ce8e5d37fb0a48008ef72a0d3f10f9dc0758bce SHA512 976e62ffe26bd9c815ff754337a42512c6fcc9d55285e79e0505f6211a7ca2407546e433fc0e8439ea541ef51a23101b0badda2f9fcc9d197d3a2ab27983b704 WHIRLPOOL 8d94d9e669bee2f551745af03efba22d956d37927edf9b1a8b901ac943dc8c0d4e59a0aeada904b7c45e4ce693f9b49ef6e383485b827323fea066e28de0f220
+DIST guvcview-src-2.0.4.tar.gz 1120666 SHA256 670ef45168a9b58d36ac42f09c498db5e56b76b0be25b0a6dc97528569334fa2 SHA512 9339e9cf7dc5224f1b87bb21e0ad711d9c27f4197d5f758c70edf465eb01c8c9c51542c75d686f0439f9e843a1c14c2f76835e8529b87b35a737fc5ccb01fe0a WHIRLPOOL ff168a9c785f4f165891a4e9f4541bcd1774fbd7b3c98d2259f10b1fe02689f4c1f91b0cdd966ea82905a9a23ad8af40081a80df9389b01640bbfca32f4734df
+DIST guvcview-src-2.0.5.tar.gz 1134237 SHA256 a86beb5993a8449ed3cbcc6ec2a238ef0b90138b6cbe2afab4456d37f44c41a0 SHA512 b4a1216ab2effbd0022d5ba0ce266ac06a781e453d3dbedfe29b654864d3a26fe1e8b68245d76eff854281d42f1871a8a82b06f783b5115e94ec1c111aac05eb WHIRLPOOL 404f6f2afb57b0ac21326e996ab4c21e533a73c1617d3110550cf109c23555a9f2124fb77ac888dc0434844d1b7b5c728265c41bcbeaec6a85bdb4fdf21585b5
+EBUILD guvcview-2.0.3.ebuild 1266 SHA256 94b6ac15fa239e09af3e46cad0b1aa8d8d0333a19c803a07195a17e5d97ac01e SHA512 8b2302dd8513622e99895d627006583569c17ffa033df755caa0b0128c83980e33d3163913a76bf83625d17f2a3e0617d3b40a0779aeb87398b0e14648ec9dae WHIRLPOOL bd79a5313c34c165bfd81b7e036192549647181263b20d39f3152d9772cc3df1364d816a710fb507eda341c3a5ede3f6e572ca99ebbc9de34a4732dbbc0ae719
+EBUILD guvcview-2.0.4.ebuild 1320 SHA256 e1b15a3bbc6a351c3efef87432816fbc7be675cfd70213b301c57361e3564884 SHA512 593c8fecd6475822e55a7ec9b4b5176e032f16861c97c1f74a6dc8c3a2234991232740ea76d5d3ab1bac52831f4a1d39d979d464f300485e6e7412632427e095 WHIRLPOOL 308749d1161e88c855327e18ee4913d0af5426bac91a43d97b2126d05000a7632cd1168d80b843156e176114d51fd2d17ad3bb07bef19db334368fa0ad86b4d7
+EBUILD guvcview-2.0.5.ebuild 1326 SHA256 3646f308af9d8b505bcfe4237d2dc09c9851945c8d81edaafe7a0513e763dc06 SHA512 9b84a52c39b4005d8becedabddc19587491638873600c5d6c7bc1909810734884f7ed2dbb326d4f3f460f90e94e1906819e8485ebb75d513ecb436f862788d68 WHIRLPOOL 8af54e1cd9e6602ade8879b266db9c697e478c02c5ffa1c37ad035ee3b73d0cc3b41fdd1d559938ca31f4cba5f99999660293528a7c5db4556cc63a8c9f59d7e
+MISC ChangeLog 3459 SHA256 123aa558d76fd282896cc633a5d5c2586c43e91b48eca22efbcbf21ccab2e723 SHA512 f5367fe73aac64cfc806ea7395f77ad6914905f3d3b8bfa668c7dcb3d065d84ff823b2c6fe7350f9ab7d2b223dd417f2a314ad0ec790b4d37c01fc196dffe90e WHIRLPOOL d55d1934248c8d60e0d2821f0a5ec8c7da20388fbbb0839018944b3b082010aec6a7b04bc5f362c31c52b99605fc1018af9a74b01b754a55f4772a7e26b7b002
+MISC ChangeLog-2015 6596 SHA256 c6d869d0e863c554bbf7a2493b3026ef959b962d90d8a5a72ebe03b3fbed99c0 SHA512 d5036afa682fdc0857ab01812933308e4615ff487f8cb70b4e7b3a9a39a62cd236bb964b93b5b38b3f636bea55166ae693761633a3afb0639a605623222e139f WHIRLPOOL b7bd4a5e22c22ab5e43bf598cef86f83ec85f1d5d8598b4b2a2f071f0407a6f4c3efd0291c7810fc2311ba6509457209e052a2dd159d1a310e2534207cfdc209
+MISC metadata.xml 301 SHA256 e412a1f077895ca3045da354e5bfbdc07604e58bccc13dc4583efd747193e9cb SHA512 c4c12767b33b64b58f02905235bebe4337c18d5a7e33dbb02c50c29effa9d236bc137b41ff8b0948aaeab36deb6f282c57d1770d7594cc087caeac7dc1036b8c WHIRLPOOL d25f76a9302b9b4d6aae95da5ca33da573efe7860ce57ea73ccfe09d0b4e6422fbd84c312ba503b8dc177bd8b05079b0302fa1af16dc4c13549ffefc2cbe977a
diff --git a/media-video/guvcview/files/ffmpeg3.patch b/media-video/guvcview/files/ffmpeg3.patch
new file mode 100644
index 000000000000..5397d68834af
--- /dev/null
+++ b/media-video/guvcview/files/ffmpeg3.patch
@@ -0,0 +1,26 @@
+Index: guvcview-src-2.0.3/gview_v4l2core/jpeg_decoder.c
+===================================================================
+--- guvcview-src-2.0.3.orig/gview_v4l2core/jpeg_decoder.c
++++ guvcview-src-2.0.3/gview_v4l2core/jpeg_decoder.c
+@@ -1436,7 +1436,7 @@ int jpeg_init_decoder(int width, int hei
+ 		exit(-1);
+ 	}
+ 
+-	codec_data->context->pix_fmt = PIX_FMT_YUV422P;
++	codec_data->context->pix_fmt = AV_PIX_FMT_YUV422P;
+ 	codec_data->context->width = width;
+ 	codec_data->context->height = height;
+ 	//jpeg_ctx->context->dsp_mask = (FF_MM_MMX | FF_MM_MMXEXT | FF_MM_SSE);
+Index: guvcview-src-2.0.3/gview_v4l2core/uvc_h264.c
+===================================================================
+--- guvcview-src-2.0.3.orig/gview_v4l2core/uvc_h264.c
++++ guvcview-src-2.0.3/gview_v4l2core/uvc_h264.c
+@@ -970,7 +970,7 @@ int h264_init_decoder(int width, int hei
+ 	}
+ 	
+ 	h264_ctx->context->flags2 |= CODEC_FLAG2_FAST;
+-	h264_ctx->context->pix_fmt = PIX_FMT_YUV420P;
++	h264_ctx->context->pix_fmt = AV_PIX_FMT_YUV420P;
+ 	h264_ctx->context->width = width;
+ 	h264_ctx->context->height = height;
+ 	//h264_ctx->context->dsp_mask = (FF_MM_MMX | FF_MM_MMXEXT | FF_MM_SSE);
diff --git a/media-video/guvcview/guvcview-2.0.3.ebuild b/media-video/guvcview/guvcview-2.0.3.ebuild
new file mode 100644
index 000000000000..434941114598
--- /dev/null
+++ b/media-video/guvcview/guvcview-2.0.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils qmake-utils
+
+MY_P=${PN}-src-${PV}
+
+DESCRIPTION="GTK+ UVC Viewer"
+HOMEPAGE="http://guvcview.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="gsl libav pulseaudio qt5"
+
+RDEPEND=">=dev-libs/glib-2.10
+	media-libs/libpng:0=
+	media-libs/libsdl2
+	media-libs/libv4l
+	>=media-libs/portaudio-19_pre
+	!libav? ( >=media-video/ffmpeg-2.8:0= )
+	libav? ( media-video/libav:= )
+	virtual/ffmpeg
+	virtual/libusb:1
+	virtual/udev
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
+	gsl? ( >=sci-libs/gsl-1.15 )
+	qt5? ( dev-qt/qtwidgets:5 )
+	!qt5? ( >=x11-libs/gtk+-3.6:3 )
+	!<sys-kernel/linux-headers-3.4-r2" #448260
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/os-headers
+	sys-devel/autoconf-archive
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}/ffmpeg3.patch"
+	sed -i '/^docdir/,/^$/d' Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	export MOC="$(qt5_get_bindir)/moc"
+	econf \
+		--disable-debian-menu \
+		$(use_enable gsl) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable qt5) \
+		$(use_enable !qt5 gtk3)
+}
diff --git a/media-video/guvcview/guvcview-2.0.4.ebuild b/media-video/guvcview/guvcview-2.0.4.ebuild
new file mode 100644
index 000000000000..7d6a7794823c
--- /dev/null
+++ b/media-video/guvcview/guvcview-2.0.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils flag-o-matic qmake-utils
+
+MY_P=${PN}-src-${PV}
+
+DESCRIPTION="GTK+ UVC Viewer"
+HOMEPAGE="http://guvcview.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gsl libav pulseaudio qt5"
+
+RDEPEND=">=dev-libs/glib-2.10
+	media-libs/libpng:0=
+	media-libs/libsdl2
+	media-libs/libv4l
+	>=media-libs/portaudio-19_pre
+	!libav? ( >=media-video/ffmpeg-2.8:0= )
+	libav? ( media-video/libav:= )
+	virtual/ffmpeg
+	virtual/libusb:1
+	virtual/udev
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
+	gsl? ( >=sci-libs/gsl-1.15 )
+	qt5? ( dev-qt/qtwidgets:5 )
+	!qt5? ( >=x11-libs/gtk+-3.6:3 )
+	!<sys-kernel/linux-headers-3.4-r2" #448260
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/os-headers
+	sys-devel/autoconf-archive
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}/ffmpeg3.patch"
+	sed -i '/^docdir/,/^$/d' Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	export MOC="$(qt5_get_bindir)/moc"
+	use qt5 && append-cxxflags -std=c++11
+	econf \
+		--disable-debian-menu \
+		$(use_enable gsl) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable qt5) \
+		$(use_enable !qt5 gtk3)
+}
diff --git a/media-video/guvcview/guvcview-2.0.5.ebuild b/media-video/guvcview/guvcview-2.0.5.ebuild
new file mode 100644
index 000000000000..d2b5e54c3eab
--- /dev/null
+++ b/media-video/guvcview/guvcview-2.0.5.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils flag-o-matic qmake-utils toolchain-funcs
+
+MY_P=${PN}-src-${PV}
+
+DESCRIPTION="GTK+ UVC Viewer"
+HOMEPAGE="http://guvcview.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="gsl libav pulseaudio qt5"
+
+RDEPEND=">=dev-libs/glib-2.10
+	media-libs/libpng:0=
+	media-libs/libsdl2
+	media-libs/libv4l
+	>=media-libs/portaudio-19_pre
+	!libav? ( >=media-video/ffmpeg-2.8:0= )
+	libav? ( media-video/libav:= )
+	virtual/ffmpeg
+	virtual/libusb:1
+	virtual/udev
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
+	gsl? ( >=sci-libs/gsl-1.15 )
+	qt5? ( dev-qt/qtwidgets:5 )
+	!qt5? ( >=x11-libs/gtk+-3.6:3 )
+	!<sys-kernel/linux-headers-3.4-r2" #448260
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/os-headers
+	sys-devel/autoconf-archive
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	sed -i '/^docdir/,/^$/d' Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	export MOC="$(qt5_get_bindir)/moc"
+	use qt5 && append-cxxflags -std=c++11
+	# 599030
+	tc-export CC CXX
+	econf \
+		--disable-debian-menu \
+		$(use_enable gsl) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable qt5) \
+		$(use_enable !qt5 gtk3)
+}
diff --git a/media-video/guvcview/metadata.xml b/media-video/guvcview/metadata.xml
new file mode 100644
index 000000000000..6d3ed0b48f08
--- /dev/null
+++ b/media-video/guvcview/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">guvcview</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/gxine/Manifest b/media-video/gxine/Manifest
new file mode 100644
index 000000000000..9ce2facb4230
--- /dev/null
+++ b/media-video/gxine/Manifest
@@ -0,0 +1,14 @@
+AUX gxine-0.5.905-desktop.patch 377 SHA256 e0051e9737382b3c21e2d3e6f0d9eacd1fb5d589f480a155a396e1924512d7a5 SHA512 dcc34836594c4616e2962c08ffb20608fd6978f2914231202afb6bae406fdd23b0a0f82cedcd87c9201d004bd0a42c8616ab4b2277ef487d93306a17c50f120e WHIRLPOOL 95957ade8f0feefe218ed7fdc67ddcecf09f281894850dc8aae461dae4c399e9303c90833f18719881ad32b95e6ff82be432b3f4dda91709b9ed15eb1e27b4b7
+AUX gxine-0.5.905-fix-nspr-useage.patch 433 SHA256 4d05d9144eba4f30976ed3e33e3985c782b95227d165ab90b4f453c377451ea6 SHA512 b528e7c7cb8f3dce8c8ef81ca8f9bf5078e499e7c5f1afe88e85f1e17297ee3de26e2d53ff8dd13bf912a18337eff6b8260fbdcd6012174bb8b017421fdff7de WHIRLPOOL 4ef23f39c637e85ef9638d3a1040ab4a399b2c0c52fd7904ca97b2abac8fa06f5cba3cf6da240a59a1554c1a6504bef914be1f803019d506344d0c79ae38f6b9
+AUX gxine-0.5.906-endif.patch 349 SHA256 d3d14fdffe9f8e1872bcbf28670d48b72ed76d7a882902bb298902bb8ca4b6fa SHA512 7bdea80e1ddc98621d76540cb4fc02e037ef85f2d9bd8d882701d5a2f408f038d23722ac5d57d309f46510358518a4b0ab812b4a67f8630d5c645b2b070f0d39 WHIRLPOOL 64b1528da3c250b60c95e673797464ef458e932fba71e497457ff8c53b168f7521623db794094b6a1f5604a7ad497db956f754fc185d70863687ab72050b6cfd
+AUX gxine-0.5.907-glib-2.31.patch 636 SHA256 c45a8fa2df4a779bbc7866a3d7fd56c4c9946e71656f06452f5f147a9ee4e15c SHA512 0b017254f4a7412ea243e7b8977c37170d18a005a98f9c8b8fea0113c7dc294e6c7c20719fc1a171093b0be7d672bcf0ccc18ea00699829ece327aca86cdc8a9 WHIRLPOOL f3015231026af0c4dc6b9d4d68479ff1e66e0eb0e179ef03588408cefe782cf48f52634abeddaf369b77eae612cc20c89240d15cc2c9c17a4bb27b712db45210
+AUX gxine-0.5.907-underlinking.patch 781 SHA256 1d1f39579b38f7a8c2a8d19136fb30dd98ce14859911969dffea4c55dd8f7ece SHA512 47775e2c06116505644eaeb13c91fa58ca289d133380857eade90e2e7b7520b1d7801626772d537621358676132202ac83d31ac4e0871ad07e1ce68d2b7b7610 WHIRLPOOL 54a419560b5b6bc97c8634922c56d4cb9a28d9ea3d082de30b7b5bf8c0eda7600356b7f5b4cea41d26de4f33f53332fe7707d46a0f5c158e6e9b3523dddcdcfa
+DIST gxine-0.5.907.tar.xz 910528 SHA256 b5c925806a35cb23a24a80a39d494cefb529e22c957987741f269a994ab258d5 SHA512 dd35c8a8810c233e81a28e9f10504645662d60dc9609451e7c49c5d516bb041b61a3b9c8f330021af1e527064cf3f62f37bde98402df7426f501d0c78c571045 WHIRLPOOL 01037e358c515f01bd42ec48e54d92e7672162098a4d0a279f979dd01d9a6354dd37f7194f36f9dfc804a8730bd792676cef39e48b608104724a787bf9c51e57
+DIST gxine-0.5.908.tar.xz 917780 SHA256 832e47136ec68a573b22b6cc1c1d57607e78b05712ba9fb8e64464b5201ed9e7 SHA512 6172f442948655178fde837a5fa9194fdb06b5cc50f8cbbfcd153b72f9a360a5497bd7ebd09c8f2340547fd7a0c834d5c673712a13202768bf0c762ee41c5454 WHIRLPOOL 8e97e1f1d72a7b669c3346030522e4d2d755220fa337ad1a6486415f28d7ec375e4a5ae86fe2c7d3a4fb2ad84a76f5beb8d8c8ca7a4e06d9f1b0d1e01aebd00c
+DIST gxine-0.5.909.tar.xz 928544 SHA256 bd44816fac24353ec14bf0dea01176469bd7ce9b3c4277952056c24f71266ee9 SHA512 87e65bb87fa416535f76253e4394447c6cd7dfaaa209b76c07b9aa81aeca0ca09399991bb2be8e6928fa3883ff61b155e173610c6c28aab10f5b1487e0699215 WHIRLPOOL a3dd9d7ace2c29a33922b5c6b787ba27459ec0ae1f041ede0ae736fe138d2134c703072adaecb104782238329ab2e1af808e60725629790b21590e7a629c9eff
+EBUILD gxine-0.5.907-r1.ebuild 2527 SHA256 0a6729a37e37e1ed623c4be8348aadcab81f618cc2fe06be4748f1209e75525b SHA512 26e08ba9bce79b0eadd13263ce84a94e72985d2d4889551d02365174d948f6a8cc086e17c8544df423395e21fc6ef89efb48199ac6542499823410c83a7aee10 WHIRLPOOL 618eb4c6a36c5a94212fd911e9b1f6d8944f71e099d809a6d968ad675c85258edcbb5f10b1b457b48ff286d76df161d0be1108acd63151b0fb708cab1749b526
+EBUILD gxine-0.5.908-r1.ebuild 2510 SHA256 deec3e710b2fa5150d866647c965b4a6ace86110f2c8ba1625de0c6e4105c2f3 SHA512 29c6486aeb52b9e4fe4802b20cb8c57957e04deb407c8791a6299fb416f255a36d20ed915a335ad25b7917783d1078db0aed384e3985a062c2bb4d66040b7d9f WHIRLPOOL 8642a695a2e1c0d4f408489fb20204639e7821d03fb0ee8e4a477179fcea94d9bbc795cd0666ef6508078328e09a7d78ec2e3370a913aca4b114127a9ec56c71
+EBUILD gxine-0.5.909.ebuild 2083 SHA256 3ba4107b99bc7ad6caf4c30568428abe9d6502f9834fc91b8a339b7a6da333d3 SHA512 95bce2d60f04f63dc12c03fcb07eafdb3767a7e61854b24ca14325ff2e18f0593ea73a3d45f4c740e76418547ce68fdc4fb147be10c205ea87c8533698f117a7 WHIRLPOOL 6f9cea35b8a3eb07364c309f4b5c8ade9c0bed09710a4fd97c0844e4fba297c48e149ed962b0e82e17b0c70a1af0f2a5e2f07ecdd3967911bd107469330c4c5f
+MISC ChangeLog 2862 SHA256 d8724811306b2f40e1a27bcad1618359504ee2841dd633077757c891a7ac4681 SHA512 9ff984a62f4f7ae5c0c8d93e2b7b573c3ee115fa3b121567f1ea5ed1c820dd1c22bd2dae5aa1d3e87cb819fe68a0b91b1f8f9564a1fba08954a1ab67221c0162 WHIRLPOOL 2e3970965bf1154631b19eb848332bd09e03c2c5400dd41a9cde52588b972e83cb6527bdea866e7b7caea5c6d063e342361ed48e413d290624c8e3aa633d417b
+MISC ChangeLog-2015 19243 SHA256 70ad45ec4a9b459af2015517ac2cfed3a7a646ba21c18c4b38f6c5dbb9a384bc SHA512 3b3ff5b6eaeab25fa4919ea416a96a2aaa30861ad6a6fc286c40c88179e604993f47197ed0c51119dcffa2d740d8dd9fd41de62fa1a088a4b1bb1be62d6bb372 WHIRLPOOL e183cf45b37118b12eb314160e44845a409ed0b10b24088048679b104858df4604f5a63f88a9dcb8ab89ca59f65a11d6162a0dc9deb339c1c2209c3ea78e137b
+MISC metadata.xml 305 SHA256 9fbcc953029af9d326b6ffe1792d782509b885577398c1faa76a0d4fe7902c25 SHA512 396865e52e9dc380cbf6d3dbf33deb69877495356dc6c6a09ba35ab3062608a93e7ab3d5d22564192070ddc186f3a5ff9ceea639911cc554ca6db5084a413587 WHIRLPOOL cea3dafc281da4016f18d51184c66a73d74b823dd6e38c798f5f6ab34077858ed8969a10c8461052042ee6c9c9bef13c97994dfd3f807b6eac4d48e9a6627326
diff --git a/media-video/gxine/files/gxine-0.5.905-desktop.patch b/media-video/gxine/files/gxine-0.5.905-desktop.patch
new file mode 100644
index 000000000000..c5777a157506
--- /dev/null
+++ b/media-video/gxine/files/gxine-0.5.905-desktop.patch
@@ -0,0 +1,12 @@
+--- gxine.desktop.in
++++ gxine.desktop.in
+@@ -14,5 +14,5 @@
+ Terminal=false
+ Type=Application
+ StartupNotify=true
+-Categories=AudioVideo;GTK;Player;TV;
+-MimeType=x-content/video-dvd;x-content/audio-cdda;x-content/video-vcd;x-content/video-svcd;
+\ No newline at end of file
++Categories=AudioVideo;Video;GTK;Player;TV;
++MimeType=x-content/audio-cdda;
+\ No newline at end of file
diff --git a/media-video/gxine/files/gxine-0.5.905-fix-nspr-useage.patch b/media-video/gxine/files/gxine-0.5.905-fix-nspr-useage.patch
new file mode 100644
index 000000000000..9d0e5f87da5c
--- /dev/null
+++ b/media-video/gxine/files/gxine-0.5.905-fix-nspr-useage.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile.am	2011-01-02 11:33:09.675000001 -0600
++++ b/src/Makefile.am	2011-01-02 11:34:05.205000001 -0600
+@@ -4,7 +4,7 @@
+ 	   -I$(top_builddir)/pixmaps $(LIRC_INCLUDE)
+ 
+ AM_CFLAGS = $(GNU99) $(XINE_CFLAGS) $(X_CFLAGS) \
+-	    $(GTK2_CFLAGS) $(GTHREAD2_CFLAGS) \
++	    $(GTK2_CFLAGS) $(GTHREAD2_CFLAGS) $(NSPR_CFLAGS) \
+ 	    $(HAL_CFLAGS) $(UDEV_CFLAGS) $(DBUS_CFLAGS) $(JS_CFLAGS) \
+ 	    -DLOCALEDIR=\"$(localedir)\"
+ 
diff --git a/media-video/gxine/files/gxine-0.5.906-endif.patch b/media-video/gxine/files/gxine-0.5.906-endif.patch
new file mode 100644
index 000000000000..40c4a8a39458
--- /dev/null
+++ b/media-video/gxine/files/gxine-0.5.906-endif.patch
@@ -0,0 +1,14 @@
+lirc.c:227:3: error: ‘gxine_lirc_thread’ undeclared (first use in this function)
+
+--- src/lirc.c
++++ src/lirc.c
+@@ -223,8 +223,8 @@
+   if (gxine_lirc_thread_created)
+     pthread_join (gxine_lirc_thread, NULL);
+   gxine_lirc_start ();
+-#endif
+   JS_SET_RVAL (cx, vp, gxine_lirc_thread ? JSVAL_TRUE : JSVAL_FALSE);
++#endif
+   return JS_TRUE;
+ }
+
diff --git a/media-video/gxine/files/gxine-0.5.907-glib-2.31.patch b/media-video/gxine/files/gxine-0.5.907-glib-2.31.patch
new file mode 100644
index 000000000000..9edea6c84af6
--- /dev/null
+++ b/media-video/gxine/files/gxine-0.5.907-glib-2.31.patch
@@ -0,0 +1,34 @@
+http://bugs.gentoo.org/412323
+
+--- src/console_output.h
++++ src/console_output.h
+@@ -21,7 +21,7 @@
+ #ifndef GXINE_CONSOLE_OUTPUT_H
+ #define GXINE_CONSOLE_OUTPUT_H
+ 
+-#include <glib/gmessages.h>
++#include <glib.h>
+ 
+ void console_output_init (void);
+ 
+--- src/engine.c
++++ src/engine.c
+@@ -30,7 +30,7 @@
+ #include <errno.h>
+ #include <unistd.h>
+ 
+-#include <glib/gthread.h>
++#include <glib.h>
+ 
+ #include "engine.h"
+ #include "ui.h"
+--- src/main.c
++++ src/main.c
+@@ -46,7 +46,6 @@
+ #include <gdk/gdk.h>
+ #include <gdk/gdkkeysyms.h>
+ #include <glib.h>
+-#include <glib/gmessages.h>
+ 
+ #include "desktop_integration.h"
+ #include "engine.h"
diff --git a/media-video/gxine/files/gxine-0.5.907-underlinking.patch b/media-video/gxine/files/gxine-0.5.907-underlinking.patch
new file mode 100644
index 000000000000..21f8a697766f
--- /dev/null
+++ b/media-video/gxine/files/gxine-0.5.907-underlinking.patch
@@ -0,0 +1,23 @@
+--- configure.ac
++++ configure.ac
+@@ -333,6 +333,20 @@
+ AC_SUBST(THREAD_LIBS)
+ 
+ dnl ---------------------------------------------
++dnl Check for libdl/libdld for dlopen()
++dnl ---------------------------------------------
++AC_SEARCH_LIBS([dlopen], [dl dld], [], [
++	AC_MSG_ERROR([unable to find the dlopen() function])
++])
++
++dnl ---------------------------------------------
++dnl Check for libm for log10()
++dnl ---------------------------------------------
++AC_SEARCH_LIBS([log10], [m], [], [
++	AC_MSG_ERROR([unable to find the log10() function])
++])
++
++dnl ---------------------------------------------
+ dnl Check for xine-lib
+ dnl ---------------------------------------------
+ AM_PATH_XINE([$XINE_LIB_MIN_VER],, AC_MSG_ERROR([*** Please install xine-lib (devel) first ***]))
diff --git a/media-video/gxine/gxine-0.5.907-r1.ebuild b/media-video/gxine/gxine-0.5.907-r1.ebuild
new file mode 100644
index 000000000000..0b95f0fb3292
--- /dev/null
+++ b/media-video/gxine/gxine-0.5.907-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils fdo-mime gnome2-utils multilib nsplugins
+
+DESCRIPTION="GTK+ Front-End for libxine"
+HOMEPAGE="http://xine.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="linguas_cs linguas_de lirc nls nsplugin udev +xcb xinerama"
+
+COMMON_DEPEND=">=media-libs/xine-lib-1.1.20
+	x11-libs/gtk+:2
+	>=dev-libs/glib-2
+	>=dev-lang/spidermonkey-1.8.2.15:0
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	lirc? ( app-misc/lirc )
+	nls? ( virtual/libintl )
+	nsplugin? ( dev-libs/nspr
+		x11-libs/libXaw
+		x11-libs/libXt )
+	udev? ( virtual/libgudev:= )
+	xcb? ( x11-libs/libxcb )
+	xinerama? ( x11-libs/libXinerama )"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	# ld: cannot find -ljs
+	sed -i -e '/JS_LIBS="`spidermonkey_locate_lib/s:js:mozjs:' m4/_js.m4 || die
+
+	if has_version '>=dev-lang/spidermonkey-1.8.7:0'; then
+		sed -i -e 's:mozjs185:mozjs187:' m4/_js.m4 || die #422983
+	fi
+
+	epatch \
+		"${FILESDIR}"/${PN}-0.5.905-desktop.patch \
+		"${FILESDIR}"/${PN}-0.5.905-fix-nspr-useage.patch \
+		"${FILESDIR}"/${PN}-0.5.906-endif.patch \
+		"${FILESDIR}"/${PN}-0.5.907-glib-2.31.patch \
+		"${FILESDIR}"/${PN}-0.5.907-underlinking.patch
+
+	# need to disable calling of xine-list when running without
+	# userpriv, otherwise we get sandbox violations (bug #233847)
+	if [[ ${EUID} == "0" ]]; then
+		sed -i -e 's:^XINE_LIST=.*$:XINE_LIST=:' configure.ac || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable lirc) \
+		--enable-watchdog \
+		$(use_with xcb) \
+		$(has_version '<dev-lang/spidermonkey-1.8.5' && echo --with-spidermonkey=/usr/include/js) \
+		$(use_with nsplugin browser-plugin) \
+		$(use_with udev gudev) \
+		--without-hal \
+		--without-dbus \
+		$(use_with xinerama)
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		docdir=/usr/share/doc/${PF} \
+		docsdir=/usr/share/doc/${PF} \
+		install
+
+	dodoc AUTHORS BUGS ChangeLog README{,_l10n} TODO
+
+	use linguas_cs && dodoc README.cs
+	use linguas_de && dodoc README.de
+
+	use nsplugin && inst_plugin /usr/$(get_libdir)/gxine/gxineplugin.so
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-video/gxine/gxine-0.5.908-r1.ebuild b/media-video/gxine/gxine-0.5.908-r1.ebuild
new file mode 100644
index 000000000000..9354f40efac7
--- /dev/null
+++ b/media-video/gxine/gxine-0.5.908-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils fdo-mime gnome2-utils multilib nsplugins
+
+DESCRIPTION="GTK+ Front-End for libxine"
+HOMEPAGE="http://xine.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="linguas_cs linguas_de lirc nls nsplugin udev +xcb xinerama"
+
+COMMON_DEPEND=">=media-libs/xine-lib-1.1.20
+	x11-libs/gtk+:2
+	>=dev-libs/glib-2
+	>=dev-lang/spidermonkey-1.8.2.15:0
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	lirc? ( app-misc/lirc )
+	nls? ( virtual/libintl )
+	nsplugin? ( dev-libs/nspr
+		x11-libs/libXaw
+		x11-libs/libXt )
+	udev? ( virtual/libgudev:= )
+	xcb? ( x11-libs/libxcb )
+	xinerama? ( x11-libs/libXinerama )"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+RDEPEND="${COMMON_DEPEND}"
+
+src_prepare() {
+	# ld: cannot find -ljs
+	sed -i -e '/JS_LIBS="`spidermonkey_locate_lib/s:js:mozjs:' m4/_js.m4 || die
+
+	if has_version '>=dev-lang/spidermonkey-1.8.7:0'; then
+		sed -i -e 's:mozjs185:mozjs187:' m4/_js.m4 || die #422983
+	fi
+
+	epatch \
+		"${FILESDIR}"/${PN}-0.5.905-desktop.patch \
+		"${FILESDIR}"/${PN}-0.5.905-fix-nspr-useage.patch \
+		"${FILESDIR}"/${PN}-0.5.906-endif.patch \
+		"${FILESDIR}"/${PN}-0.5.907-underlinking.patch
+
+	# need to disable calling of xine-list when running without
+	# userpriv, otherwise we get sandbox violations (bug #233847)
+	if [[ ${EUID} == "0" ]]; then
+		sed -i -e 's:^XINE_LIST=.*$:XINE_LIST=:' configure.ac || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable lirc) \
+		--enable-watchdog \
+		$(use_with xcb) \
+		$(has_version '<dev-lang/spidermonkey-1.8.5' && echo --with-spidermonkey=/usr/include/js) \
+		$(use_with nsplugin browser-plugin) \
+		$(use_with udev gudev) \
+		--without-hal \
+		--without-dbus \
+		$(use_with xinerama)
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		docdir=/usr/share/doc/${PF} \
+		docsdir=/usr/share/doc/${PF} \
+		install
+
+	dodoc AUTHORS BUGS ChangeLog README{,_l10n} TODO
+
+	use linguas_cs && dodoc README.cs
+	use linguas_de && dodoc README.de
+
+	use nsplugin && inst_plugin /usr/$(get_libdir)/gxine/gxineplugin.so
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-video/gxine/gxine-0.5.909.ebuild b/media-video/gxine/gxine-0.5.909.ebuild
new file mode 100644
index 000000000000..c03bbd619438
--- /dev/null
+++ b/media-video/gxine/gxine-0.5.909.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils fdo-mime gnome2-utils multilib nsplugins
+
+DESCRIPTION="GTK+ Front-End for libxine"
+HOMEPAGE="http://xine.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="linguas_cs linguas_de lirc nls nsplugin udev +xcb xinerama"
+
+COMMON_DEPEND=">=media-libs/xine-lib-1.1.20
+	x11-libs/gtk+:2
+	>=dev-libs/glib-2
+	>=dev-lang/spidermonkey-1.8.2.15:0
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	lirc? ( app-misc/lirc )
+	nls? ( virtual/libintl )
+	nsplugin? ( dev-libs/nspr
+		x11-libs/libXaw
+		x11-libs/libXt )
+	udev? ( virtual/libgudev:= )
+	xcb? ( x11-libs/libxcb )
+	xinerama? ( x11-libs/libXinerama )"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+RDEPEND="${COMMON_DEPEND}"
+
+src_prepare() {
+	# need to disable calling of xine-list when running without
+	# userpriv, otherwise we get sandbox violations (bug #233847)
+	if [[ ${EUID} == "0" ]]; then
+		sed -i -e 's:^XINE_LIST=.*$:XINE_LIST=:' configure.ac || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable lirc) \
+		--enable-watchdog \
+		$(use_with xcb) \
+		$(has_version '<dev-lang/spidermonkey-1.8.5' && echo --with-spidermonkey=/usr/include/js) \
+		$(use_with nsplugin browser-plugin) \
+		$(use_with udev gudev) \
+		--without-hal \
+		--without-dbus \
+		$(use_with xinerama)
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		docdir=/usr/share/doc/${PF} \
+		docsdir=/usr/share/doc/${PF} \
+		install
+
+	dodoc AUTHORS BUGS ChangeLog README{,_l10n} TODO
+
+	use linguas_cs && dodoc README.cs
+	use linguas_de && dodoc README.de
+
+	use nsplugin && inst_plugin /usr/$(get_libdir)/gxine/gxineplugin.so
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-video/gxine/metadata.xml b/media-video/gxine/metadata.xml
new file mode 100644
index 000000000000..eff7ed13e1ff
--- /dev/null
+++ b/media-video/gxine/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>media-video@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">xine</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-video/h264enc/Manifest b/media-video/h264enc/Manifest
new file mode 100644
index 000000000000..7823fef19024
--- /dev/null
+++ b/media-video/h264enc/Manifest
@@ -0,0 +1,7 @@
+DIST h264enc-10.4.1.tar.gz 138598 SHA256 3d0f280f8ab28999964b8c4c8b0d02cce9303a3c37b36d5e4ea3e0633a9cb711 SHA512 34b7177582931b0e291bf97eee27c8f2c8f5c83539875eebdb8f30f9dfed3eb0f03830130d49ae5c9c80477c7a90b80e95b27fc5855db1ec18894a813f1656f4 WHIRLPOOL a47498d94ff1d2bff90bbb4f1941a00930ea82ce7bf56e4b1c9465c6c1263867ad28cc56dd397b52cd317873467bd7acc161ab47909589114c32c0cc824a41e1
+DIST h264enc-10.4.7.tar.gz 138481 SHA256 80f81205288beed257e12f0134266621d75374e87d3a1bdfa26a943fba46c5be SHA512 09d133e8b4d16f513b790b4517a276d48fe400c2a09a80ee2ae229a9224a9d225d54b5b48b5b60ed6ebe1f181f8b96340ad0e44a9e1e1eb7e6889809edab0bcf WHIRLPOOL 301f2156dd0bba7d11028798482ba07f10bcf47a8acdbdf3b1ae9349bfb4a5c35330e821da0a257295e16c8ee53ff7738bb6549af3537211ecb4fbd7f0f8f750
+EBUILD h264enc-10.4.1.ebuild 874 SHA256 668f2c42d7d50968741b442547bbb75b2b47a2943026d01f2bfd010562226acb SHA512 e467a23b1aa44d9d6c1e6e662ae8cee2816c79cbea5e686ecdc18d69b4caffc63a8f2ed0993870fea86a334840f8a112246db98125599182d979a1e5c2ff4bda WHIRLPOOL 4477eee19b38a6420d75fbb026a8babfed3a644e334658defee04ba6937536e28166ff2cd1b368ea2fd200f79ff21b1d30e673934a5efaef179f150522f97f9e
+EBUILD h264enc-10.4.7.ebuild 874 SHA256 a228b088ff939f672b160d03c2752673b79d48b1814f065e9c81ea3662c1fef1 SHA512 5148bc8bf58b2f080e2ab1bb2e063898ac3fce914228e5f10cd06d211b5023400a61eb0e38c619f2d3da8e5dac372d1845466578736c587801f74277f4aaa256 WHIRLPOOL 0a5b51979ab9b5d9a0152cb3b353733eab537ace87b66dc236c8b2522ff40e0466a0b0b252a86676301a932c5d3267e4d7c1b5e3a2032e82c25236281f857ec4
+MISC ChangeLog 3078 SHA256 6d7266456407ec1de6e36c55ea8028bcd91186c4ce14788f36dfeabb69d5379a SHA512 7bedbb3c518c31bb987634d57ad28630aa0e0e2961421d56cd67c9f381d5a9027e570f0ae7168d4003a37772b6e459766d70b34b4b4dca6bec8f54b75f2d16a2 WHIRLPOOL 25c77e5a3a26784befe5d18a56b24fc4da378e9e5d7d7a7c7090129b9bd115213d3f827b57a400da54083a99b9ea5fa3f217ea10db565a23c54252daa6bbc304
+MISC ChangeLog-2015 1691 SHA256 725df9c0bb5c07aabf5e8e8f19ab7dbbec77640f680efdc02c5d7e33fce7e783 SHA512 71167ab4836371a5a7d3638fe0e2b57e69da3c06f4ead90a2a763cbe3053a9bd2149ef16c1ce2c15b23dd876a3548f582660ddee5a88caa169c974dabfccb91d WHIRLPOOL 50535586c022f965c0aa26d33e5c2cbe46d207a6b305d4128a6f4d3db24f147126c81343672562c9c896e0293f67dc30cec93cc7cd450e9e2ca8727612dc25ab
+MISC metadata.xml 374 SHA256 ac157562041f8e2d2954515cf43a487f4dd8c8e8324784b0a069dc442c52e32a SHA512 701d70f6994d2839433f1b7fbef04e1545b9d25a16169e478a465bd0fa3706141b0c190e40520b64c8d2f3c2d55106738295be4d812c750bb9e7874d4fe2a4c8 WHIRLPOOL 3a4e7479e8aa09a647a292d685a1a1407a2d109dc5998d8a11858e494262a22bda891b2f466128492e421fe076a2a3804a31dae423c19da8093a3b97c7a99782
diff --git a/media-video/h264enc/h264enc-10.4.1.ebuild b/media-video/h264enc/h264enc-10.4.1.ebuild
new file mode 100644
index 000000000000..7dac014c220f
--- /dev/null
+++ b/media-video/h264enc/h264enc-10.4.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Script to encode H.264/AVC/MPEG-4 Part 10 formats"
+HOMEPAGE="http://h264enc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aac dvd flac lame matroska mp4 ogm vorbis"
+
+RDEPEND="
+	media-video/mplayer[encode,x264]
+	sys-apps/coreutils
+	sys-apps/pv
+	sys-devel/bc
+	sys-process/time
+	aac? (
+		media-libs/faac
+		media-sound/aacplusenc )
+	dvd? ( media-video/lsdvd )
+	flac? ( media-libs/flac )
+	lame? ( media-sound/lame )
+	matroska? ( media-video/mkvtoolnix )
+	mp4? ( >=media-video/gpac-0.4.5[a52] )
+	ogm? ( media-sound/ogmtools )
+	vorbis? ( media-sound/vorbis-tools )"
+DEPEND=""
+
+src_install() {
+	dobin ${PN}
+	doman man/${PN}.1
+	dodoc doc/*
+	docinto matrices
+	dodoc matrices/*
+}
diff --git a/media-video/h264enc/h264enc-10.4.7.ebuild b/media-video/h264enc/h264enc-10.4.7.ebuild
new file mode 100644
index 000000000000..fef4d27a4655
--- /dev/null
+++ b/media-video/h264enc/h264enc-10.4.7.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Script to encode H.264/AVC/MPEG-4 Part 10 formats"
+HOMEPAGE="http://h264enc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aac dvd flac lame matroska mp4 ogm vorbis"
+
+RDEPEND="
+	media-video/mplayer[encode,x264]
+	sys-apps/coreutils
+	sys-apps/pv
+	sys-devel/bc
+	sys-process/time
+	aac? (
+		media-libs/faac
+		media-sound/aacplusenc )
+	dvd? ( media-video/lsdvd )
+	flac? ( media-libs/flac )
+	lame? ( media-sound/lame )
+	matroska? ( media-video/mkvtoolnix )
+	mp4? ( >=media-video/gpac-0.4.5[a52] )
+	ogm? ( media-sound/ogmtools )
+	vorbis? ( media-sound/vorbis-tools )"
+DEPEND=""
+
+src_install() {
+	dobin ${PN}
+	doman man/${PN}.1
+	dodoc doc/*
+	docinto matrices
+	dodoc matrices/*
+}
diff --git a/media-video/h264enc/metadata.xml b/media-video/h264enc/metadata.xml
new file mode 100644
index 000000000000..3a904dcc63d8
--- /dev/null
+++ b/media-video/h264enc/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="ogm">Support for OGM container format</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">h264enc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
new file mode 100644
index 000000000000..a7d564a3d063
--- /dev/null
+++ b/media-video/handbrake/Manifest
@@ -0,0 +1,14 @@
+AUX handbrake-0.10.3-nolibav.patch 2821 SHA256 5824aca86ed4350d650019575b00c50bfe27a0d08ed1faffa3f1b71a8508dd61 SHA512 88a0b5df6cc198a8383a2d1dcf6d4c71f24445ea71e29dac570a2b3987cdaa0a563b56c7cccd291b58099dbdb15130bdcc0cd4527bdaeb442aefe4fa06455ec7 WHIRLPOOL f67b9138c83df07c044710720ec2457d11df29c2ee185ea50f9c4d6624d652093860e974d79fc9ee52a762f4372b160ef5330a9856a1a7c99c12a171ab929164
+AUX handbrake-9999-fix-missing-x265-link-flag.patch 281 SHA256 05e212e76b6e0b94a04de02cbeb7bf9db607059e19297b5bd3d0d143135285c4 SHA512 30d457258dd287cae3df66e7899b66480be2212a3969fe3a4e4f99ed383740e8f597fa7cf869922f29f501f100313b7efd78ebe09e2949ed4c235e2df22d22e5 WHIRLPOOL f7f599bf25d1522cc6a829d80e0a7ffcde038a7156cecf7358a83b97ff5fb6da8466de5f3a73a986451fded12a2dceed356272579f9d30cbacad0f39ea9f933c
+AUX handbrake-9999-remove-dvdnav-dup.patch 809 SHA256 f4eb9b127eb1adb6ced32eee4aecbfaeb8c13b749429f2f9f039800a6d2f1172 SHA512 e2005155adf29e8253f4313d209b2ccc642fb1d7f63256d3bdf675ddd0e6b0e15bc6bffd98e19aa7dab3907e161e29c5268dc5656590ce9254b12a91ac3ff6b0 WHIRLPOOL 598a972be822d16ed80879eb588482b54d2e0fb95a23be94dab3630e65e1d4b336e3abca07fff7e39bd463e42753c253c664ff71b596b5e1ba880bbf277eaf20
+AUX handbrake-9999-remove-faac-dependency.patch 3697 SHA256 05af966252b8b6e50d3c79c5dc258d8db95574335ca10d31b9f87af9a23b049b SHA512 9d070e50a9b7d4b8ac25b7d56bd341aca6dc979ba506c84f4b95109909f70020723915cd120bed24e84a8fc242ee3c3a5775f43a78b7995e53cd499444c9f6dc WHIRLPOOL 64fe289dbe9128b108e5d00b50f15ca9770c52e7f0fd5a384bdce1d66903ec264222360ffa25038c622c2dfbcbb4676648445da9dc5c39e5c1bf600945da8446
+DIST handbrake-0.10.5.tar.bz2 10452839 SHA256 fb9230dd121b456f6829d1d25ac8bbf76e503b51c4efc70f0a7fd2bb8607e2f0 SHA512 30aa09f5bf2ceb45500f316aa2bc070f630dbe399c9be739f60fd73bbb97d52157498ba7a1e7d024f7fa5b75aa0154976df3c346abda43168c881b1ad0a858ea WHIRLPOOL 190923ade8b28685d9b2ae275ec0806b74235d3644715f90f3993b7d113e3b65c28caa5c839da507913f8a4cf63d0f89f1d2e77fca65e65308b6091003a9f1f9
+DIST handbrake-1.0.3.tar.bz2 12600683 SHA256 591fb489edd6146136f0a92f895c2098365f612ad308d5ff9dc83223ad73ed27 SHA512 2d3dac2e29520f1d51cbca35385f775b5deed823c7cffd6beba0589f124ff99a120bf0db261efae1524c1c2d373789fc0b3e5784664e4aa6eebff372e928b6a2 WHIRLPOOL a16a124a9f2ab8761e2d4494580950f0559e44070829e1115c61b55ecf403fd32ca39be1d3ac2948735361520ee3f6d91919c3cfcff88c37e10f07c454b740c0
+DIST handbrake-1.0.7.tar.bz2 12650549 SHA256 ffdee112f0288f0146b965107956cd718408406b75db71c44d2188f5296e677f SHA512 bacc5ff105893a0fdea95174839663e00027c87a13f00fb67d39c347b55e35869c0b998ec52181389b98cc2cc358d221e41d729e76952e4cb21fe8d12ee5a44a WHIRLPOOL 4243959f8d95885681aa61b5905855586ac773d2a7b4aceff280576f9a900bf601b3ade630bd87b228cc5f682d8b31987c26b453394796c74cc3c387bbe4fb5f
+EBUILD handbrake-0.10.5-r2.ebuild 3479 SHA256 2da39fa41527e6b48fea22b1c3440491429169a4cf391e9cbdd0b0928ee4eebc SHA512 1f5bf9e88bbed89473edcf81013eee4b6ef223ea4fe9fc43ca46aa0b1ce657a122f2f6a020b46d354d36fb4c6044911c36c3c37793f5d2c6feffe89275d3ce52 WHIRLPOOL a12cbe58e3df2eb51493608adfa9953a6a489da0126669250a7300541da87308486757c43296d99790b5a2285f587970a8f5d83940826e3a8dda37c1adb5af76
+EBUILD handbrake-1.0.3.ebuild 3524 SHA256 6f149781c51b59d02bca39f70c8921d5a9a36f4d26e29452062e288c0e93ada4 SHA512 b519a8842dbd5a1420e1b3bd4256b2edbf5b1163c0a2eac90a6386798d86af63cdf18aa519f4244b51042a38a14a10cfae6fbf3211dbd9e1c981f730011dfb99 WHIRLPOOL e2f276612841e66db409934199d188181274b79494088ddac14398b7f71ad94c931439c2d409e612be37a690e74f37dd1520f920fe6d0fca8f61a70e564ddfd6
+EBUILD handbrake-1.0.7.ebuild 3524 SHA256 6f149781c51b59d02bca39f70c8921d5a9a36f4d26e29452062e288c0e93ada4 SHA512 b519a8842dbd5a1420e1b3bd4256b2edbf5b1163c0a2eac90a6386798d86af63cdf18aa519f4244b51042a38a14a10cfae6fbf3211dbd9e1c981f730011dfb99 WHIRLPOOL e2f276612841e66db409934199d188181274b79494088ddac14398b7f71ad94c931439c2d409e612be37a690e74f37dd1520f920fe6d0fca8f61a70e564ddfd6
+EBUILD handbrake-9999.ebuild 3524 SHA256 6f149781c51b59d02bca39f70c8921d5a9a36f4d26e29452062e288c0e93ada4 SHA512 b519a8842dbd5a1420e1b3bd4256b2edbf5b1163c0a2eac90a6386798d86af63cdf18aa519f4244b51042a38a14a10cfae6fbf3211dbd9e1c981f730011dfb99 WHIRLPOOL e2f276612841e66db409934199d188181274b79494088ddac14398b7f71ad94c931439c2d409e612be37a690e74f37dd1520f920fe6d0fca8f61a70e564ddfd6
+MISC ChangeLog 6273 SHA256 719292c02a6fddeb3c9e2dee683264a1ae024f388a84c4c2c04e9ef02b168374 SHA512 827ba2fbc2750bca2c209d6dd58b051902b832fac116385b85bf370369aaf5459d83134c1d713cb414aa011d672e0ce7e036351aa4a62381228ee589eedab5f0 WHIRLPOOL c56e38d05785b4e407b3bfc97d10cc18ec7811c6678ab485113bba790482d9e50afd184f9e061da25e0f4163c8f608e848a18e1df9d5845aeadf40e1eb126a58
+MISC ChangeLog-2015 7744 SHA256 5a5e95fb548a31d8bdbf9991e784efc02c40f053aadcb575d3183e81312a361c SHA512 eb24e6b7844e9aade708790834fb9a0fd6c0495af26f29e7a76f69da99c0b930328df9007fa706bff86891560afd01477df61c586eaea3f3c63afb0189741264 WHIRLPOOL 80b3676f64129795c8e5dc9e886db9062de33e568cc041a957125442f4cb59f977d4eee35834e37b9bb9a7aa2f4a6b70d1611e1f7eaec5df6ad11f8ecab0fb35
+MISC metadata.xml 842 SHA256 eb1bc76107b3a756dc0cb164032c4565b6d6d72360e6bf687942a8fb0474e377 SHA512 d503d78aefd9a994d3197093f97dd3f958fb8347e6eff7598d9d5ef11a5eb17e0088bac4bb676dfa617dd0377ee185e2d0e80fe91feecd53e5257cbf9adc5f0e WHIRLPOOL 148eeeb2b6d5c05747101b3325fd5a00c27550595eae66465ce11ccb2a8f0ec934a2292d19ccd96335b84144c47e022f4a6a1205607f10623b4ebd26c015cad7
diff --git a/media-video/handbrake/files/handbrake-0.10.3-nolibav.patch b/media-video/handbrake/files/handbrake-0.10.3-nolibav.patch
new file mode 100644
index 000000000000..8539186aaa56
--- /dev/null
+++ b/media-video/handbrake/files/handbrake-0.10.3-nolibav.patch
@@ -0,0 +1,76 @@
+From 75549414927212d4d1666730133805b33447de79 Mon Sep 17 00:00:00 2001
+From: John Stebbins <jstebbins.hb@gmail.com>
+Date: Tue, 3 Nov 2015 10:16:01 -0800
+Subject: [PATCH] muxavformat: add support for mp4 fallback audio signalling
+
+---
+diff --git a/libhb/muxavformat.c b/libhb/muxavformat.c
+index 0d70597..373c2ab 100644
+--- a/libhb/muxavformat.c
++++ b/libhb/muxavformat.c
+@@ -121,7 +121,7 @@ static int avformatInit( hb_mux_object_t * m )
+     hb_mux_data_t * track;
+     int meta_mux;
+     int max_tracks;
+-    int ii, ret;
++    int ii, jj, ret;
+ 
+     int clock_min, clock_max, clock;
+     hb_video_framerate_get_limits(&clock_min, &clock_max, &clock);
+@@ -589,6 +589,56 @@ static int avformatInit( hb_mux_object_t * m )
+         }
+     }
+ 
++    // Check for audio track associations
++    for (ii = 0; ii < hb_list_count(job->list_audio); ii++)
++    {
++        audio = hb_list_item(job->list_audio, ii);
++        switch (audio->config.out.codec & HB_ACODEC_MASK)
++        {
++            case HB_ACODEC_FFAAC:
++            case HB_ACODEC_CA_AAC:
++            case HB_ACODEC_CA_HAAC:
++            case HB_ACODEC_FDK_AAC:
++            case HB_ACODEC_FDK_HAAC:
++                break;
++
++            default:
++            {
++                // Mark associated fallback audio tracks for any non-aac track
++                for(jj = 0; jj < hb_list_count( job->list_audio ); jj++ )
++                {
++                    hb_audio_t    * fallback;
++                    int             codec;
++
++                    if (ii == jj) continue;
++
++                    fallback = hb_list_item( job->list_audio, jj );
++                    codec = fallback->config.out.codec & HB_ACODEC_MASK;
++                    if (fallback->config.in.track == audio->config.in.track &&
++                        (codec == HB_ACODEC_FFAAC ||
++                         codec == HB_ACODEC_CA_AAC ||
++                         codec == HB_ACODEC_CA_HAAC ||
++                         codec == HB_ACODEC_FDK_AAC ||
++                         codec == HB_ACODEC_FDK_HAAC))
++                    {
++                        hb_mux_data_t * fallback_track;
++                        int           * sd;
++
++                        track = audio->priv.mux_data;
++                        fallback_track = fallback->priv.mux_data;
++                        sd = (int*)av_stream_new_side_data(track->st,
++                                                     AV_PKT_DATA_FALLBACK_TRACK,
++                                                     sizeof(int));
++                        if (sd != NULL)
++                        {
++                            *sd = fallback_track->st->index;
++                        }
++                    }
++                }
++            } break;
++        }
++    }
++
+     char * subidx_fmt =
+         "size: %dx%d\n"
+         "org: %d, %d\n"
diff --git a/media-video/handbrake/files/handbrake-9999-fix-missing-x265-link-flag.patch b/media-video/handbrake/files/handbrake-9999-fix-missing-x265-link-flag.patch
new file mode 100644
index 000000000000..a963fe0af216
--- /dev/null
+++ b/media-video/handbrake/files/handbrake-9999-fix-missing-x265-link-flag.patch
@@ -0,0 +1,13 @@
+Written by: Peter Foley <pefoley2@pefoley.com>
+Gentoo Bug: #552792
+
+--- a/test/module.defs
++++ b/test/module.defs
+@@ -25,6 +25,7 @@
+ 
+ ifeq (1,$(FEATURE.x265))
+     TEST.GCC.D += USE_X265
++    TEST.GCC.l += x265
+ endif
+ 
+ TEST.GCC.l += $(foreach m,$(MODULES.NAMES),$($m.OSL.libs))
diff --git a/media-video/handbrake/files/handbrake-9999-remove-dvdnav-dup.patch b/media-video/handbrake/files/handbrake-9999-remove-dvdnav-dup.patch
new file mode 100644
index 000000000000..7dc1f69328ea
--- /dev/null
+++ b/media-video/handbrake/files/handbrake-9999-remove-dvdnav-dup.patch
@@ -0,0 +1,20 @@
+--- a/libhb/dvdnav.c
++++ b/libhb/dvdnav.c
+@@ -1225,16 +1225,7 @@
+                 {
+                     for (kk = 0; kk < buttons; kk++)
+                     {
+-                        dvdnav_t *dvdnav_copy;
+-
+-                        result = dvdnav_dup( &dvdnav_copy, d->dvdnav );
+-                        if (result != DVDNAV_STATUS_OK)
+-                        {
+-                            hb_log("dvdnav dup failed: %s", dvdnav_err_to_string(d->dvdnav));
+-                            goto done;
+-                        }
+-                        title = try_button( dvdnav_copy, kk, list_title );
+-                        dvdnav_free_dup( dvdnav_copy );
++                        title = try_button( d->dvdnav, kk, list_title );
+ 
+                         if ( title >= 0 )
+                         {
diff --git a/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch b/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch
new file mode 100644
index 000000000000..7e8ab99730a8
--- /dev/null
+++ b/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch
@@ -0,0 +1,84 @@
+--- a/libhb/common.c
++++ b/libhb/common.c
+@@ -243,7 +243,6 @@
+ {
+     // legacy encoders, back to HB 0.9.4 whenever possible (disabled)
+     { { "",                   "dts",        NULL,                          HB_ACODEC_DCA_PASS,    HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_DTS_PASS,   },
+-    { { "AAC (faac)",         "faac",       NULL,                          0,                     HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AAC,        },
+     { { "AAC (ffmpeg)",       "ffaac",      NULL,                          HB_ACODEC_FFAAC,       HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AAC,        },
+     { { "AC3 (ffmpeg)",       "ffac3",      NULL,                          HB_ACODEC_AC3,         HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AC3,        },
+     { { "MP3 (lame)",         "lame",       NULL,                          HB_ACODEC_LAME,        HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_MP3,        },
+--- a/scripts/manicure.rb
++++ b/scripts/manicure.rb
+@@ -349,7 +349,7 @@
+           audioEncoders << "copy:dtshd"
+         when /AAC Pass/
+           audioEncoders << "copy:aac"
+-        when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
++        when "AAC (ffmpeg)", "AAC (avcodec)"
+           audioEncoders << "av_aac"
+         when "AAC (FDK)"
+           audioEncoders << "fdk_aac"
+@@ -466,7 +466,7 @@
+     case hash["AudioEncoderFallback"]
+       when /AC3/
+         audioEncoderFallback << "ac3"
+-      when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
++      when "AAC (ffmpeg)", "AAC (avcodec)"
+         audioEncoderFallback << "av_aac"
+       when "AAC (FDK)"
+         audioEncoderFallback << "fdk_aac"
+@@ -753,7 +753,7 @@
+           audioEncoders << "copy:dtshd"
+         when /AAC Pass/
+           audioEncoders << "copy:aac"
+-        when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
++        when "AAC (ffmpeg)", "AAC (avcodec)"
+           audioEncoders << "av_aac"
+         when "AAC (FDK)"
+           audioEncoders << "fdk_aac"
+@@ -870,7 +870,7 @@
+     case hash["AudioEncoderFallback"]
+       when /AC3/
+         audioEncoderFallback << "ac3"
+-      when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
++      when "AAC (ffmpeg)", "AAC (avcodec)"
+         audioEncoderFallback << "av_aac"
+       when "AAC (FDK)"
+         audioEncoderFallback << "fdk_aac"
+@@ -1163,7 +1163,7 @@
+           audioEncoders << "copy:dtshd"
+         when /AAC Pass/
+           audioEncoders << "copy:aac"
+-        when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
++        when "AAC (ffmpeg)", "AAC (avcodec)"
+           audioEncoders << "av_aac"
+         when "AAC (FDK)"
+           audioEncoders << "fdk_aac"
+@@ -1298,7 +1298,7 @@
+     case hash["AudioEncoderFallback"]
+       when /AC3/
+         audioEncoderFallback << "ac3"
+-      when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
++      when "AAC (ffmpeg)", "AAC (avcodec)"
+         audioEncoderFallback << "av_aac"
+       when "AAC (FDK)"
+         audioEncoderFallback << "fdk_aac"
+@@ -1615,7 +1615,7 @@
+           audioEncoders << "copy:dtshd"
+         when /AAC Pass/
+           audioEncoders << "copy:aac"
+-        when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
++        when "AAC (ffmpeg)", "AAC (avcodec)"
+           audioEncoders << "av_aac"
+         when "AAC (FDK)"
+           audioEncoders << "fdk_aac"
+@@ -1732,7 +1732,7 @@
+     case hash["AudioEncoderFallback"]
+       when /AC3/
+         audioEncoderFallback << "ac3"
+-      when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
++      when "AAC (ffmpeg)", "AAC (avcodec)"
+         audioEncoderFallback << "av_aac"
+       when "AAC (FDK)"
+         audioEncoderFallback << "fdk_aac"
diff --git a/media-video/handbrake/handbrake-0.10.5-r2.ebuild b/media-video/handbrake/handbrake-0.10.5-r2.ebuild
new file mode 100644
index 000000000000..558ee7f48fc6
--- /dev/null
+++ b/media-video/handbrake/handbrake-0.10.5-r2.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils gnome2-utils python-any-r1
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	MY_P="HandBrake-${PV}"
+	SRC_URI="http://handbrake.fr/rotation.php?file=${MY_P}.tar.bz2 -> ${P}.tar.bz2"
+	S="${WORKDIR}/${MY_P}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder"
+HOMEPAGE="http://handbrake.fr/"
+LICENSE="GPL-2"
+
+SLOT="0"
+IUSE="+fdk gstreamer gtk libav libav-aac x265"
+
+REQUIRED_USE="^^ ( fdk libav-aac )"
+
+RDEPEND="
+	dev-libs/jansson
+	media-libs/a52dec
+	media-libs/libass:=
+	media-libs/libbluray:=
+	media-libs/libdvdnav
+	media-libs/libdvdread
+	media-libs/libsamplerate
+	media-libs/libtheora
+	media-libs/libvorbis
+	media-libs/libvpx
+	media-libs/x264:=
+	media-sound/lame
+	sys-libs/zlib
+	libav? ( >=media-video/libav-12:0=[fdk?] )
+	!libav? ( >=media-video/ffmpeg-2.3:0=[fdk?] )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0
+		media-libs/gst-plugins-bad:1.0
+		media-libs/gst-plugins-ugly:1.0
+		media-plugins/gst-plugins-a52dec:1.0
+		media-plugins/gst-plugins-libav:1.0
+		media-plugins/gst-plugins-x264:1.0
+	)
+	gtk? (
+		>=x11-libs/gtk+-3.10
+		dev-libs/dbus-glib
+		dev-libs/glib:2
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf:2
+		x11-libs/libnotify
+		x11-libs/pango
+		virtual/libgudev:=
+	)
+	fdk? ( media-libs/fdk-aac )
+	x265? ( >=media-libs/x265-1.7:0= )
+	"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-lang/yasm
+	dev-util/intltool
+	sys-devel/automake"
+
+PATCHES=(
+	# Remove libdvdnav duplication and call it on the original instead.
+	# It may work this way; if not, we should try to mimic the duplication.
+	"${FILESDIR}/${PN}-9999-remove-dvdnav-dup.patch"
+
+	# Remove faac dependency; TODO: figure out if we need to do this at all.
+	"${FILESDIR}/${PN}-9999-remove-faac-dependency.patch"
+
+	# Fix missing x265 link flag
+	"${FILESDIR}/${PN}-9999-fix-missing-x265-link-flag.patch"
+)
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Get rid of leftover bundled library build definitions,
+	sed -i 's:.*\(/contrib\|contrib/\).*::g' \
+		"${S}"/make/include/main.defs \
+		|| die "Contrib removal failed."
+
+	default
+
+	# Get rid of libav specific code when using ffmpeg
+	use libav || eapply -R "${FILESDIR}/${PN}-0.10.3-nolibav.patch"
+
+	cd "${S}/gtk"
+	# Don't run autogen.sh.
+	sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
+	eautoreconf
+}
+
+src_configure() {
+	./configure \
+		--force \
+		--verbose \
+		--prefix="${EPREFIX}/usr" \
+		--disable-gtk-update-checks \
+		$(use_enable libav-aac) \
+		$(use_enable fdk fdk-aac) \
+		$(use_enable gtk) \
+		$(usex !gstreamer --disable-gst) \
+		$(use_enable x265) || die "Configure failed."
+}
+
+src_compile() {
+	emake -C build
+
+	# TODO: Documentation building is currently broken, try to fix it.
+	#
+	# if use doc ; then
+	# 	emake -C build doc
+	# fi
+}
+
+src_install() {
+	emake -C build DESTDIR="${D}" install
+
+	dodoc AUTHORS CREDITS NEWS THANKS TRANSLATIONS
+}
+
+pkg_postinst() {
+	einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`."
+
+	if use gtk ; then
+		einfo ""
+		einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
+	fi
+
+	gnome2_icon_cache_update
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-video/handbrake/handbrake-1.0.3.ebuild b/media-video/handbrake/handbrake-1.0.3.ebuild
new file mode 100644
index 000000000000..0ce63641f6e7
--- /dev/null
+++ b/media-video/handbrake/handbrake-1.0.3.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils gnome2-utils python-any-r1
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	MY_P="HandBrake-${PV}"
+	SRC_URI="http://handbrake.fr/rotation.php?file=${MY_P}.tar.bz2 -> ${P}.tar.bz2"
+	S="${WORKDIR}/${MY_P}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder"
+HOMEPAGE="http://handbrake.fr/"
+LICENSE="GPL-2"
+
+SLOT="0"
+IUSE="+fdk gstreamer gtk libav libav-aac x265"
+
+REQUIRED_USE="^^ ( fdk libav-aac )"
+
+RDEPEND="
+	dev-libs/jansson
+	media-libs/a52dec
+	media-libs/libass:=
+	>=media-libs/libbluray-1.0
+	media-libs/libdvdnav
+	media-libs/libdvdread
+	media-libs/libsamplerate
+	media-libs/libtheora
+	media-libs/libvorbis
+	media-libs/libvpx
+	media-libs/opus
+	media-libs/x264:=
+	media-sound/lame
+	sys-libs/zlib
+	libav? ( >=media-video/libav-10.1:0=[fdk?] )
+	!libav? ( >=media-video/ffmpeg-2.3:0=[fdk?] )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0
+		media-libs/gst-plugins-bad:1.0
+		media-libs/gst-plugins-ugly:1.0
+		media-plugins/gst-plugins-a52dec:1.0
+		media-plugins/gst-plugins-libav:1.0
+		media-plugins/gst-plugins-x264:1.0
+	)
+	gtk? (
+		>=x11-libs/gtk+-3.10
+		dev-libs/dbus-glib
+		dev-libs/glib:2
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf:2
+		x11-libs/libnotify
+		x11-libs/pango
+		virtual/libgudev:=
+	)
+	fdk? ( media-libs/fdk-aac )
+	x265? ( >=media-libs/x265-1.7:0= )
+	"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-lang/yasm
+	dev-util/intltool
+	sys-devel/automake"
+
+PATCHES=(
+	# Remove libdvdnav duplication and call it on the original instead.
+	# It may work this way; if not, we should try to mimic the duplication.
+	"${FILESDIR}/${PN}-9999-remove-dvdnav-dup.patch"
+
+	# Remove faac dependency; TODO: figure out if we need to do this at all.
+	"${FILESDIR}/${PN}-9999-remove-faac-dependency.patch"
+
+	# Fix missing x265 link flag
+	"${FILESDIR}/${PN}-9999-fix-missing-x265-link-flag.patch"
+)
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Get rid of leftover bundled library build definitions,
+	sed -i 's:.*\(/contrib\|contrib/\).*::g' \
+		"${S}"/make/include/main.defs \
+		|| die "Contrib removal failed."
+
+	default
+
+	# Get rid of libav specific code when using ffmpeg
+	use libav || eapply -R "${FILESDIR}/${PN}-0.10.3-nolibav.patch"
+
+	cd "${S}/gtk"
+	# Don't run autogen.sh.
+	sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
+	eautoreconf
+}
+
+src_configure() {
+	./configure \
+		--force \
+		--verbose \
+		--prefix="${EPREFIX}/usr" \
+		--disable-gtk-update-checks \
+		$(use_enable libav-aac) \
+		$(use_enable fdk fdk-aac) \
+		$(use_enable gtk) \
+		$(usex !gstreamer --disable-gst) \
+		$(use_enable x265) || die "Configure failed."
+}
+
+src_compile() {
+	emake -C build
+
+	# TODO: Documentation building is currently broken, try to fix it.
+	#
+	# if use doc ; then
+	# 	emake -C build doc
+	# fi
+}
+
+src_install() {
+	emake -C build DESTDIR="${D}" install
+
+	dodoc README.markdown AUTHORS.markdown NEWS.markdown THANKS.markdown
+}
+
+pkg_postinst() {
+	einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`."
+
+	if use gtk ; then
+		einfo ""
+		einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
+	fi
+
+	gnome2_icon_cache_update
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-video/handbrake/handbrake-1.0.7.ebuild b/media-video/handbrake/handbrake-1.0.7.ebuild
new file mode 100644
index 000000000000..0ce63641f6e7
--- /dev/null
+++ b/media-video/handbrake/handbrake-1.0.7.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils gnome2-utils python-any-r1
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	MY_P="HandBrake-${PV}"
+	SRC_URI="http://handbrake.fr/rotation.php?file=${MY_P}.tar.bz2 -> ${P}.tar.bz2"
+	S="${WORKDIR}/${MY_P}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder"
+HOMEPAGE="http://handbrake.fr/"
+LICENSE="GPL-2"
+
+SLOT="0"
+IUSE="+fdk gstreamer gtk libav libav-aac x265"
+
+REQUIRED_USE="^^ ( fdk libav-aac )"
+
+RDEPEND="
+	dev-libs/jansson
+	media-libs/a52dec
+	media-libs/libass:=
+	>=media-libs/libbluray-1.0
+	media-libs/libdvdnav
+	media-libs/libdvdread
+	media-libs/libsamplerate
+	media-libs/libtheora
+	media-libs/libvorbis
+	media-libs/libvpx
+	media-libs/opus
+	media-libs/x264:=
+	media-sound/lame
+	sys-libs/zlib
+	libav? ( >=media-video/libav-10.1:0=[fdk?] )
+	!libav? ( >=media-video/ffmpeg-2.3:0=[fdk?] )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0
+		media-libs/gst-plugins-bad:1.0
+		media-libs/gst-plugins-ugly:1.0
+		media-plugins/gst-plugins-a52dec:1.0
+		media-plugins/gst-plugins-libav:1.0
+		media-plugins/gst-plugins-x264:1.0
+	)
+	gtk? (
+		>=x11-libs/gtk+-3.10
+		dev-libs/dbus-glib
+		dev-libs/glib:2
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf:2
+		x11-libs/libnotify
+		x11-libs/pango
+		virtual/libgudev:=
+	)
+	fdk? ( media-libs/fdk-aac )
+	x265? ( >=media-libs/x265-1.7:0= )
+	"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-lang/yasm
+	dev-util/intltool
+	sys-devel/automake"
+
+PATCHES=(
+	# Remove libdvdnav duplication and call it on the original instead.
+	# It may work this way; if not, we should try to mimic the duplication.
+	"${FILESDIR}/${PN}-9999-remove-dvdnav-dup.patch"
+
+	# Remove faac dependency; TODO: figure out if we need to do this at all.
+	"${FILESDIR}/${PN}-9999-remove-faac-dependency.patch"
+
+	# Fix missing x265 link flag
+	"${FILESDIR}/${PN}-9999-fix-missing-x265-link-flag.patch"
+)
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Get rid of leftover bundled library build definitions,
+	sed -i 's:.*\(/contrib\|contrib/\).*::g' \
+		"${S}"/make/include/main.defs \
+		|| die "Contrib removal failed."
+
+	default
+
+	# Get rid of libav specific code when using ffmpeg
+	use libav || eapply -R "${FILESDIR}/${PN}-0.10.3-nolibav.patch"
+
+	cd "${S}/gtk"
+	# Don't run autogen.sh.
+	sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
+	eautoreconf
+}
+
+src_configure() {
+	./configure \
+		--force \
+		--verbose \
+		--prefix="${EPREFIX}/usr" \
+		--disable-gtk-update-checks \
+		$(use_enable libav-aac) \
+		$(use_enable fdk fdk-aac) \
+		$(use_enable gtk) \
+		$(usex !gstreamer --disable-gst) \
+		$(use_enable x265) || die "Configure failed."
+}
+
+src_compile() {
+	emake -C build
+
+	# TODO: Documentation building is currently broken, try to fix it.
+	#
+	# if use doc ; then
+	# 	emake -C build doc
+	# fi
+}
+
+src_install() {
+	emake -C build DESTDIR="${D}" install
+
+	dodoc README.markdown AUTHORS.markdown NEWS.markdown THANKS.markdown
+}
+
+pkg_postinst() {
+	einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`."
+
+	if use gtk ; then
+		einfo ""
+		einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
+	fi
+
+	gnome2_icon_cache_update
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-video/handbrake/handbrake-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild
new file mode 100644
index 000000000000..0ce63641f6e7
--- /dev/null
+++ b/media-video/handbrake/handbrake-9999.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils gnome2-utils python-any-r1
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	MY_P="HandBrake-${PV}"
+	SRC_URI="http://handbrake.fr/rotation.php?file=${MY_P}.tar.bz2 -> ${P}.tar.bz2"
+	S="${WORKDIR}/${MY_P}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder"
+HOMEPAGE="http://handbrake.fr/"
+LICENSE="GPL-2"
+
+SLOT="0"
+IUSE="+fdk gstreamer gtk libav libav-aac x265"
+
+REQUIRED_USE="^^ ( fdk libav-aac )"
+
+RDEPEND="
+	dev-libs/jansson
+	media-libs/a52dec
+	media-libs/libass:=
+	>=media-libs/libbluray-1.0
+	media-libs/libdvdnav
+	media-libs/libdvdread
+	media-libs/libsamplerate
+	media-libs/libtheora
+	media-libs/libvorbis
+	media-libs/libvpx
+	media-libs/opus
+	media-libs/x264:=
+	media-sound/lame
+	sys-libs/zlib
+	libav? ( >=media-video/libav-10.1:0=[fdk?] )
+	!libav? ( >=media-video/ffmpeg-2.3:0=[fdk?] )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0
+		media-libs/gst-plugins-bad:1.0
+		media-libs/gst-plugins-ugly:1.0
+		media-plugins/gst-plugins-a52dec:1.0
+		media-plugins/gst-plugins-libav:1.0
+		media-plugins/gst-plugins-x264:1.0
+	)
+	gtk? (
+		>=x11-libs/gtk+-3.10
+		dev-libs/dbus-glib
+		dev-libs/glib:2
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf:2
+		x11-libs/libnotify
+		x11-libs/pango
+		virtual/libgudev:=
+	)
+	fdk? ( media-libs/fdk-aac )
+	x265? ( >=media-libs/x265-1.7:0= )
+	"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-lang/yasm
+	dev-util/intltool
+	sys-devel/automake"
+
+PATCHES=(
+	# Remove libdvdnav duplication and call it on the original instead.
+	# It may work this way; if not, we should try to mimic the duplication.
+	"${FILESDIR}/${PN}-9999-remove-dvdnav-dup.patch"
+
+	# Remove faac dependency; TODO: figure out if we need to do this at all.
+	"${FILESDIR}/${PN}-9999-remove-faac-dependency.patch"
+
+	# Fix missing x265 link flag
+	"${FILESDIR}/${PN}-9999-fix-missing-x265-link-flag.patch"
+)
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Get rid of leftover bundled library build definitions,
+	sed -i 's:.*\(/contrib\|contrib/\).*::g' \
+		"${S}"/make/include/main.defs \
+		|| die "Contrib removal failed."
+
+	default
+
+	# Get rid of libav specific code when using ffmpeg
+	use libav || eapply -R "${FILESDIR}/${PN}-0.10.3-nolibav.patch"
+
+	cd "${S}/gtk"
+	# Don't run autogen.sh.
+	sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
+	eautoreconf
+}
+
+src_configure() {
+	./configure \
+		--force \
+		--verbose \
+		--prefix="${EPREFIX}/usr" \
+		--disable-gtk-update-checks \
+		$(use_enable libav-aac) \
+		$(use_enable fdk fdk-aac) \
+		$(use_enable gtk) \
+		$(usex !gstreamer --disable-gst) \
+		$(use_enable x265) || die "Configure failed."
+}
+
+src_compile() {
+	emake -C build
+
+	# TODO: Documentation building is currently broken, try to fix it.
+	#
+	# if use doc ; then
+	# 	emake -C build doc
+	# fi
+}
+
+src_install() {
+	emake -C build DESTDIR="${D}" install
+
+	dodoc README.markdown AUTHORS.markdown NEWS.markdown THANKS.markdown
+}
+
+pkg_postinst() {
+	einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`."
+
+	if use gtk ; then
+		einfo ""
+		einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
+	fi
+
+	gnome2_icon_cache_update
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-video/handbrake/metadata.xml b/media-video/handbrake/metadata.xml
new file mode 100644
index 000000000000..1c5819c4e49a
--- /dev/null
+++ b/media-video/handbrake/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>thev00d00@gentoo.org</email>
+	<name>Ian Whyman</name>
+  </maintainer>
+  <longdescription>
+    Open-source, GPL-licensed, multiplatform, multithreaded video transcoder.
+  </longdescription>
+  <use>
+    <flag name="gstreamer">Support for the streaming media framework from <pkg>media-libs/gstreamer</pkg>.</flag>
+    <flag name="gtk">Install the GTK UI, ghb.</flag>
+    <flag name="fdk">Support for encoding AAC using <pkg>media-libs/fdk-aac</pkg>.</flag>
+    <flag name="libav-aac">Support for encoding AAC using <pkg>media-video/libav</pkg>'s internal encoder.</flag>
+	<flag name="x265">Support for encoding h265 using <pkg>media-libs/x265</pkg>.</flag>
+  </use>
+</pkgmetadata>
diff --git a/media-video/harvid/Manifest b/media-video/harvid/Manifest
new file mode 100644
index 000000000000..2a1a7c41f7e7
--- /dev/null
+++ b/media-video/harvid/Manifest
@@ -0,0 +1,9 @@
+AUX ffmpeg29.patch 11613 SHA256 48494b5d143fe8dd6603bace505cb8b929c45767f4d2bb805750570c2b7d57e5 SHA512 40ddf43ea18912ff8bcf73925ac846a4c96a2b4269f4bb1ca6cdc7a314070bea338c8a4a181018781a6036090c67a1622c1b7968ebad0be290e3a60ce01cba53 WHIRLPOOL c63fb81728f345846f11031b00d88b04e86f29643dbbb232ca47dee526892f76e5031adcbf589e226adde28cf6949b3518dc6e6ac2b4c11fbb845ee645bd7ffa
+DIST harvid-0.8.0.tar.gz 116079 SHA256 d4c017fb010aa1479d41d3f4cc9f77e8a0140dd359ea629faeda81093c2c8c88 SHA512 8e999e91e36708df7264fc351e5b6cac6c47fa5e0e612d0917bbfa02e98d13f9758f43312e6febebe56e7b8f2f72b80b6c47598de7100d3b5479b80720b91568 WHIRLPOOL d50f94b745192158d95f895ce6d13933891078b484f4d5e6b9a06d7c65e340a59cf5a3e66e87c9b013618c4a9ecea7f8006aa7489c932d0d61769e64446fed36
+DIST harvid-0.8.1.tar.gz 116277 SHA256 a4aefc253ede1284b2eb6d3c193984eb4a9dde8dda832e2cbcb72242c3870e3e SHA512 b425eca844bb9eec3ec8caa324f783132a3e83938b258a5f8e92ce6dc47108ae491a009223b7e3c8051d965a1ff1b5e5509a804d1462641128a8524cde5ae60a WHIRLPOOL 5e9c6c5d6456cf04a22a04b862ec0fed9cc056d7db6f1803f88c7affdc3e51a8e6dd54b6d187672ff2ba62bd2abeec96d7cef51b91187d1607ef199650b18399
+DIST harvid-0.8.2.tar.gz 116541 SHA256 3e3e22f554c7c8f0efe3ca400200e95c9fd5c0495cc76c4ae08991bc2abbc358 SHA512 fde352124008cd3d6230950c79a3a2b8d581803f952c7313c941226b00e80f8078053d941f2c5ead04672639a8db696f0c33482f69dab78187801d7ebce23fce WHIRLPOOL 8cf6f7baf9539fc99d8738fd8fe5c4dfd321a28613bb2ec2591813c366cbcd50ba9f1ca16cb66c4700e401cbc396e9dd8e1b5d8400d3c2bbdce42ecad2944d4c
+EBUILD harvid-0.8.0.ebuild 1026 SHA256 b45eabe41b927078e12a8850f630dbfb7bca32f694a7bec085cffee99d3ddcaa SHA512 151afcf1b30f5e074f8ed29123f67e3dbfe9904cb0b57ea7bcab8d58fbead3620affd35078555e82a472a1ed5e2eca918a88e8f2b9dd0fdcfd64941649217be3 WHIRLPOOL 95a521016dc86446f212bb016a746d17e0d929e30750bae82440c60f6af032de85d518f981178d04effa5e2a0fb28b0420fa0ecb42e523e77dcad66c4868cda2
+EBUILD harvid-0.8.1.ebuild 970 SHA256 eaeb3b57b886f38cea3e11d19653a3b6159783c7053e719fc673e280b995db32 SHA512 1ecb3b7435b828af3708f3be3646f38dd98adc4933bb8a4fd9e6309bcf9b8fbddf8213ac466df7c0b8f3d4054e7c0faf4fd9d6910b53d8a3dd71a2031ee806f6 WHIRLPOOL 29335d3ba066143bdd596dafdb963ba9644ac6dd260b35c49b99f9fe1d129d9865f4a8501531de65b53224168d9c7ef5466fe52fdf9aa28ff34c5d678bde3225
+EBUILD harvid-0.8.2.ebuild 970 SHA256 17a489e9c5369d7b68cea766e5faf4de5686f63f0769381400d2778f4b360080 SHA512 a0d70a007258c7f13a55c9a8605e616b414acbbdc82b79647f9b8fe502c8757db7e284b80f62b4011ff01556b5b93dfa82adca3656bbf0b8c31ec0aaa2659ae8 WHIRLPOOL 106330f508436f9d69ec1e10d83faa103e6f07ccbc9f1110cb498079102f87c2d6381295c6669e500f42b6cfaaa1f5dad2b8d16bca0c4acdbc4a80e17be71421
+MISC ChangeLog 1565 SHA256 2e0e28893829e4df02310f5515309c45864957ca2ab2903b6c917fba913cde50 SHA512 2f353d524dd89d49aee2897da0099f92167ca003399360b526fe734a06f1888e1fb5aca9990d1298aaba5bbacb7c469efbb94e53e54898a3e7099b8b4bdc5fad WHIRLPOOL 9efe8e7714440e4dc536306495afc8f56daf0d7bcdcd83cdc3c886eac48ba7defc183f7626ce962aaaf3880fd2cf62e19f7adf2592da95819882de142988150b
+MISC metadata.xml 306 SHA256 9bc3b4f830c9c32dca4e5bac78d1a3cf7b46b620359dd0412a5342564eca82cd SHA512 4fa6b478e09481b73a9c1743c79b108e115a9452c31f3a37134d9ef939f4118c27690e9e7f33fcd0fa7a558d73840b84b944e14344d1ebffc10febc16cbf2315 WHIRLPOOL 3a6518b817dbbf8d03e42632070f79f3b29f50b5d9f0463abd2e8fe8dc91913683929130dfd3273b7238155761a46f83da0c6fb1f5f3bc11d38cd7b018da4392
diff --git a/media-video/harvid/files/ffmpeg29.patch b/media-video/harvid/files/ffmpeg29.patch
new file mode 100644
index 000000000000..09fe15abca27
--- /dev/null
+++ b/media-video/harvid/files/ffmpeg29.patch
@@ -0,0 +1,301 @@
+Index: harvid-0.8.0/libharvid/decoder_ctrl.c
+===================================================================
+--- harvid-0.8.0.orig/libharvid/decoder_ctrl.c
++++ harvid-0.8.0/libharvid/decoder_ctrl.c
+@@ -29,7 +29,7 @@
+ #include "ffcompat.h"
+ #include "dlog.h"
+ 
+-#define DEFAULT_PIX_FMT (PIX_FMT_RGB24) // TODO global default
++#define DEFAULT_PIX_FMT (AV_PIX_FMT_RGB24) // TODO global default
+ 
+ //#define HASH_EMIT_KEYS 3
+ #define HASH_FUNCTION HASH_SAX
+@@ -104,15 +104,15 @@ static inline int my_open_movie(void **v
+   }
+   ff_create(vd);
+   assert (
+-         render_fmt == PIX_FMT_YUV420P
+-      || render_fmt == PIX_FMT_YUV440P
+-      || render_fmt == PIX_FMT_YUYV422
+-      || render_fmt == PIX_FMT_UYVY422
+-      || render_fmt == PIX_FMT_RGB24
+-      || render_fmt == PIX_FMT_BGR24
+-      || render_fmt == PIX_FMT_RGBA
+-      || render_fmt == PIX_FMT_ARGB
+-      || render_fmt == PIX_FMT_BGRA
++         render_fmt == AV_PIX_FMT_YUV420P
++      || render_fmt == AV_PIX_FMT_YUV440P
++      || render_fmt == AV_PIX_FMT_YUYV422
++      || render_fmt == AV_PIX_FMT_UYVY422
++      || render_fmt == AV_PIX_FMT_RGB24
++      || render_fmt == AV_PIX_FMT_BGR24
++      || render_fmt == AV_PIX_FMT_RGBA
++      || render_fmt == AV_PIX_FMT_ARGB
++      || render_fmt == AV_PIX_FMT_BGRA
+       );
+ 
+   if (!ff_open_movie (*vd, fn, render_fmt)) {
+@@ -144,7 +144,7 @@ static inline void my_get_info_canonical
+ static JVOBJECT *newjvo (JVOBJECT *jvo, pthread_mutex_t *appendlock) {
+   debugmsg(DEBUG_DCTL, "DCTL: newjvo() allocated new decoder object\n");
+   JVOBJECT *n = calloc(1, sizeof(JVOBJECT));
+-  n->fmt = PIX_FMT_NONE;
++  n->fmt = AV_PIX_FMT_NONE;
+   n->frame = -1;
+   pthread_mutex_init(&n->lock, NULL);
+   JVOBJECT *cptr = jvo;
+@@ -175,8 +175,8 @@ static JVOBJECT *testjvd(JVOBJECT *jvo,
+     if (!(cptr->flags&VOF_VALID) || cptr->id != id) {
+       continue;
+     }
+-    if (fmt != PIX_FMT_NONE && cptr->fmt != fmt
+-        && cptr->fmt != PIX_FMT_NONE
++    if (fmt != AV_PIX_FMT_NONE && cptr->fmt != fmt
++        && cptr->fmt != AV_PIX_FMT_NONE
+         ) {
+       continue;
+     }
+@@ -324,7 +324,7 @@ static int clearjvo(JVD *jvd, int f, int
+       my_destroy(&cptr->decoder);
+       cptr->decoder = NULL;
+       cptr->flags &= ~VOF_OPEN;
+-      cptr->fmt = PIX_FMT_NONE;
++      cptr->fmt = AV_PIX_FMT_NONE;
+     }
+ 
+     hashref_delete_jvo(jvd, cptr);
+@@ -410,7 +410,7 @@ static JVOBJECT *getjvo(JVD *jvd) {
+         if (cptr->flags&(VOF_OPEN)) {
+           my_destroy(&cptr->decoder); // close it.
+           cptr->decoder = NULL; // not really need..
+-          cptr->fmt = PIX_FMT_NONE;
++          cptr->fmt = AV_PIX_FMT_NONE;
+         }
+ 
+         hashref_delete_jvo(jvd, cptr);
+@@ -563,7 +563,7 @@ static JVOBJECT *new_video_object(JVD *j
+ 
+ 
+   jvo->id = id;
+-  jvo->fmt = fmt == PIX_FMT_NONE ? DEFAULT_PIX_FMT : fmt;
++  jvo->fmt = fmt == AV_PIX_FMT_NONE ? DEFAULT_PIX_FMT : fmt;
+   jvo->frame = -1;
+   jvo->flags |= VOF_VALID;
+ 
+@@ -619,7 +619,7 @@ static void * dctrl_get_decoder(void *p,
+    * use it IFF frame == -1  (ie. non-blocking info lookups) */
+   if (frame < 0) {
+     pthread_rwlock_rdlock(&jvd->lock_jdh);
+-    if (fmt == PIX_FMT_NONE) {
++    if (fmt == AV_PIX_FMT_NONE) {
+       HASH_FIND(hhi, jvd->jvi, &id, sizeof(unsigned short), jvo);
+     } else {
+       const JVOBJECT jvt = {id, fmt, 0};
+@@ -670,7 +670,7 @@ static void * dctrl_get_decoder(void *p,
+       jvo->lru = time(NULL);
+       pthread_mutex_unlock(&jvo->lock);
+ 
+-      if (fmt == PIX_FMT_NONE) fmt = DEFAULT_PIX_FMT;
++      if (fmt == AV_PIX_FMT_NONE) fmt = DEFAULT_PIX_FMT;
+ 
+       if (!my_open_movie(&jvo->decoder, get_fn(jvd, jvo->id), fmt)) {
+         pthread_mutex_lock(&jvo->lock);
+@@ -798,7 +798,7 @@ int dctrl_decode(void *p, unsigned short
+ 
+ int dctrl_get_info(void *p, unsigned short id, VInfo *i) {
+   int err = 0;
+-  JVOBJECT *jvo = (JVOBJECT*) dctrl_get_decoder(p, id, PIX_FMT_NONE, -1, &err);
++  JVOBJECT *jvo = (JVOBJECT*) dctrl_get_decoder(p, id, AV_PIX_FMT_NONE, -1, &err);
+   if (!jvo) return err;
+   my_get_info(jvo->decoder, i);
+   jvo->hitcount_info++;
+Index: harvid-0.8.0/libharvid/ffdecoder.c
+===================================================================
+--- harvid-0.8.0.orig/libharvid/ffdecoder.c
++++ harvid-0.8.0/libharvid/ffdecoder.c
+@@ -102,7 +102,7 @@ static int ff_getbuffersize(void *ptr, s
+ 
+ static void render_empty_frame(ffst *ff, uint8_t* buf, int w, int h, int xoff, int ys) {
+   switch (ff->render_fmt) {
+-    case PIX_FMT_UYVY422:
++    case AV_PIX_FMT_UYVY422:
+       {
+ 	int i;
+ 	for (i = 0; i < w*h*2; i += 2) {
+@@ -110,7 +110,7 @@ static void render_empty_frame(ffst *ff,
+ 	}
+       }
+       break;
+-    case PIX_FMT_YUYV422:
++    case AV_PIX_FMT_YUYV422:
+       {
+ 	int i;
+ 	for (i = 0; i < w*h*2; i += 2) {
+@@ -118,25 +118,25 @@ static void render_empty_frame(ffst *ff,
+ 	}
+       }
+       break;
+-    case PIX_FMT_YUV420P:
++    case AV_PIX_FMT_YUV420P:
+       {
+ 	size_t Ylen = w * h;
+ 	memset(buf, 0, Ylen);
+ 	memset(buf+Ylen, 0x80, Ylen/2);
+       }
+       break;
+-    case PIX_FMT_YUV440P:
++    case AV_PIX_FMT_YUV440P:
+       {
+ 	size_t Ylen = w * h;
+ 	memset(buf, 0, Ylen);
+ 	memset(buf+Ylen, 0x80, Ylen);
+       }
+       break;
+-    case PIX_FMT_BGR24:
+-    case PIX_FMT_RGB24:
+-    case PIX_FMT_RGBA:
+-    case PIX_FMT_BGRA:
+-    case PIX_FMT_ARGB:
++    case AV_PIX_FMT_BGR24:
++    case AV_PIX_FMT_RGB24:
++    case AV_PIX_FMT_RGBA:
++    case AV_PIX_FMT_BGRA:
++    case AV_PIX_FMT_ARGB:
+       memset(buf, 0, ff_getbuffersize(ff, NULL));
+       break;
+     default:
+@@ -147,8 +147,8 @@ static void render_empty_frame(ffst *ff,
+ #if 1 // draw cross
+   int x,y;
+   switch (ff->render_fmt) {
+-    case PIX_FMT_YUV420P:
+-    case PIX_FMT_YUV440P:
++    case AV_PIX_FMT_YUV420P:
++    case AV_PIX_FMT_YUV440P:
+       for (x = 0, y = 0; x < w-1; x++, y = h * x / w) {
+ 	int off = (x + w * y);
+ 	buf[off]=127; buf[off+1]=127;
+@@ -156,8 +156,8 @@ static void render_empty_frame(ffst *ff,
+ 	buf[off]=127; buf[off+1]=127;
+       }
+       break;
+-    case PIX_FMT_YUYV422:
+-    case PIX_FMT_UYVY422:
++    case AV_PIX_FMT_YUYV422:
++    case AV_PIX_FMT_UYVY422:
+       for (x = 0, y = 0; x < w-1; x++, y = h * x / w) {
+ 	int off = (x + w * y) * 2;
+ 	buf[off] = 127; buf[off+1] = 127;
+@@ -165,8 +165,8 @@ static void render_empty_frame(ffst *ff,
+ 	buf[off] = 127; buf[off+1] = 127;
+       }
+       break;
+-    case PIX_FMT_RGB24:
+-    case PIX_FMT_BGR24:
++    case AV_PIX_FMT_RGB24:
++    case AV_PIX_FMT_BGR24:
+       for (x = 0, y = 0; x < w-1; x++, y = h * x / w) {
+ 	int off = 3 * (x + w * y);
+ 	buf[off]=255; buf[off+1]=255; buf[off+2]=255;
+@@ -174,11 +174,11 @@ static void render_empty_frame(ffst *ff,
+ 	buf[off]=255; buf[off+1]=255; buf[off+2]=255;
+       }
+       break;
+-    case PIX_FMT_RGBA:
+-    case PIX_FMT_BGRA:
+-    case PIX_FMT_ARGB:
++    case AV_PIX_FMT_RGBA:
++    case AV_PIX_FMT_BGRA:
++    case AV_PIX_FMT_ARGB:
+       {
+-      const int O = (ff->render_fmt == PIX_FMT_ARGB) ? 1 : 0;
++      const int O = (ff->render_fmt == AV_PIX_FMT_ARGB) ? 1 : 0;
+       for (x = 0, y = 0; x < w-1; x++, y = h * x / w) {
+ 	int off = 4 * (x + w * y) + O;
+ 	buf[off]=255; buf[off+1]=255; buf[off+2]=255;
+@@ -749,7 +749,7 @@ void ff_get_info_canonical(void *ptr, VI
+ 
+ void ff_create(void **ff) {
+   (*((ffst**)ff)) = (ffst*) calloc(1, sizeof(ffst));
+-  (*((ffst**)ff))->render_fmt = PIX_FMT_RGB24;
++  (*((ffst**)ff))->render_fmt = AV_PIX_FMT_RGB24;
+   (*((ffst**)ff))->want_ignstart = 0;
+   (*((ffst**)ff))->want_genpts = 0;
+   (*((ffst**)ff))->packet.data = NULL;
+@@ -792,25 +792,25 @@ void ff_resize(void *ptr, int w, int h,
+ 
+ const char * ff_fmt_to_text(int fmt) {
+   switch (fmt) {
+-    case PIX_FMT_NONE:
++    case AV_PIX_FMT_NONE:
+       return "-";
+-    case PIX_FMT_BGR24:
++    case AV_PIX_FMT_BGR24:
+       return "BGR24";
+-    case PIX_FMT_RGB24:
++    case AV_PIX_FMT_RGB24:
+       return "RGB24";
+-    case PIX_FMT_RGBA:
++    case AV_PIX_FMT_RGBA:
+       return "RGBA";
+-    case PIX_FMT_BGRA:
++    case AV_PIX_FMT_BGRA:
+       return "BGRA";
+-    case PIX_FMT_ARGB:
++    case AV_PIX_FMT_ARGB:
+       return "ARGB";
+-    case PIX_FMT_YUV420P:
++    case AV_PIX_FMT_YUV420P:
+       return "YUV420P";
+-    case PIX_FMT_YUYV422:
++    case AV_PIX_FMT_YUYV422:
+       return "YUYV422";
+-    case PIX_FMT_UYVY422:
++    case AV_PIX_FMT_UYVY422:
+       return "UYVY422";
+-    case PIX_FMT_YUV440P:
++    case AV_PIX_FMT_YUV440P:
+       return "YUV440P";
+     default:
+       return "?";
+Index: harvid-0.8.0/src/ics_handler.c
+===================================================================
+--- harvid-0.8.0.orig/src/ics_handler.c
++++ harvid-0.8.0/src/ics_handler.c
+@@ -109,16 +109,16 @@ void parse_param(struct queryparserstate
+     else if (!strncmp(val, "jpeg",4)) {qps->a->render_fmt = FMT_JPG; qps->a->misc_int = atoi(&val[4]);}
+     else if (!strcmp(val, "png"))      qps->a->render_fmt = FMT_PNG;
+     else if (!strcmp(val, "ppm"))      qps->a->render_fmt = FMT_PPM;
+-    else if (!strcmp(val, "yuv"))     {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = PIX_FMT_YUV420P;}
+-    else if (!strcmp(val, "yuv420"))  {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = PIX_FMT_YUV420P;}
+-    else if (!strcmp(val, "yuv440"))  {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = PIX_FMT_YUV440P;}
+-    else if (!strcmp(val, "yuv422"))  {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = PIX_FMT_YUYV422;}
+-    else if (!strcmp(val, "uyv422"))  {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = PIX_FMT_UYVY422;}
+-    else if (!strcmp(val, "rgb"))     {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = PIX_FMT_RGB24;}
+-    else if (!strcmp(val, "bgr"))     {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = PIX_FMT_BGR24;}
+-    else if (!strcmp(val, "rgba"))    {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = PIX_FMT_RGBA;}
+-    else if (!strcmp(val, "argb"))    {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = PIX_FMT_ARGB;}
+-    else if (!strcmp(val, "bgra"))    {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = PIX_FMT_BGRA;}
++    else if (!strcmp(val, "yuv"))     {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = AV_PIX_FMT_YUV420P;}
++    else if (!strcmp(val, "yuv420"))  {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = AV_PIX_FMT_YUV420P;}
++    else if (!strcmp(val, "yuv440"))  {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = AV_PIX_FMT_YUV440P;}
++    else if (!strcmp(val, "yuv422"))  {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = AV_PIX_FMT_YUYV422;}
++    else if (!strcmp(val, "uyv422"))  {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = AV_PIX_FMT_UYVY422;}
++    else if (!strcmp(val, "rgb"))     {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = AV_PIX_FMT_RGB24;}
++    else if (!strcmp(val, "bgr"))     {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = AV_PIX_FMT_BGR24;}
++    else if (!strcmp(val, "rgba"))    {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = AV_PIX_FMT_RGBA;}
++    else if (!strcmp(val, "argb"))    {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = AV_PIX_FMT_ARGB;}
++    else if (!strcmp(val, "bgra"))    {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = AV_PIX_FMT_BGRA;}
+     /* info, version, rc,... format */
+     else if (!strcmp(val, "html"))    qps->a->render_fmt = OUT_HTML;
+     else if (!strcmp(val, "xhtml"))   qps->a->render_fmt = OUT_HTML;
+@@ -141,7 +141,7 @@ static void parse_http_query_params(stru
+ static int parse_http_query(CONN *c, char *query, httpheader *h, ics_request_args *a) {
+   struct queryparserstate qps = {a, NULL, 0};
+ 
+-  a->decode_fmt = PIX_FMT_RGB24;
++  a->decode_fmt = AV_PIX_FMT_RGB24;
+   a->render_fmt = FMT_PNG;
+   a->frame = 0;
+   a->misc_int = 0;
diff --git a/media-video/harvid/harvid-0.8.0.ebuild b/media-video/harvid/harvid-0.8.0.ebuild
new file mode 100644
index 000000000000..324ebb2f22f5
--- /dev/null
+++ b/media-video/harvid/harvid-0.8.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs multilib eutils
+
+DESCRIPTION="HTTP Ardour Video Daemon"
+HOMEPAGE="http://x42.github.io/harvid/"
+SRC_URI="https://github.com/x42/harvid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libav"
+
+RDEPEND="
+	!libav? ( >=media-video/ffmpeg-2.6:0= )
+	libav? ( >=media-video/libav-9:0= )
+	media-libs/libpng:0=
+	virtual/jpeg:0
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch "${FILESDIR}/ffmpeg29.patch"
+}
+
+hv_make() {
+	emake \
+		CC="$(tc-getCC)" \
+		RANLIB="$(tc-getRANLIB)" \
+		STRIP="true" \
+		NM="$(tc-getNM) -B" \
+		LD="$(tc-getLD)" \
+		AR="$(tc-getAR)" \
+		PREFIX="${EPREFIX:-/}usr" \
+		libdir="${EPREFIX:-/}usr/$(get_libdir)" \
+		hdocdir="${EPREFIX:-/}usr/share/doc/${PF}" \
+		"${@}"
+}
+
+src_compile() {
+	hv_make -C libharvid
+	hv_make -C src
+	hv_make
+}
+
+src_install() {
+	hv_make DESTDIR="${D}" install
+	dodoc ChangeLog README.md
+}
diff --git a/media-video/harvid/harvid-0.8.1.ebuild b/media-video/harvid/harvid-0.8.1.ebuild
new file mode 100644
index 000000000000..56e380ac9d6e
--- /dev/null
+++ b/media-video/harvid/harvid-0.8.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs multilib eutils
+
+DESCRIPTION="HTTP Ardour Video Daemon"
+HOMEPAGE="http://x42.github.io/harvid/"
+SRC_URI="https://github.com/x42/harvid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libav"
+
+RDEPEND="
+	!libav? ( >=media-video/ffmpeg-2.6:0= )
+	libav? ( >=media-video/libav-9:0= )
+	media-libs/libpng:0=
+	virtual/jpeg:0
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+hv_make() {
+	emake \
+		CC="$(tc-getCC)" \
+		RANLIB="$(tc-getRANLIB)" \
+		STRIP="true" \
+		NM="$(tc-getNM) -B" \
+		LD="$(tc-getLD)" \
+		AR="$(tc-getAR)" \
+		PREFIX="${EPREFIX:-/}usr" \
+		libdir="${EPREFIX:-/}usr/$(get_libdir)" \
+		hdocdir="${EPREFIX:-/}usr/share/doc/${PF}" \
+		"${@}"
+}
+
+src_compile() {
+	hv_make -C libharvid
+	hv_make -C src
+	hv_make
+}
+
+src_install() {
+	hv_make DESTDIR="${D}" install
+	dodoc ChangeLog README.md
+}
diff --git a/media-video/harvid/harvid-0.8.2.ebuild b/media-video/harvid/harvid-0.8.2.ebuild
new file mode 100644
index 000000000000..8dbd4423ebc4
--- /dev/null
+++ b/media-video/harvid/harvid-0.8.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs multilib eutils
+
+DESCRIPTION="HTTP Ardour Video Daemon"
+HOMEPAGE="http://x42.github.io/harvid/"
+SRC_URI="https://github.com/x42/harvid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libav"
+
+RDEPEND="
+	!libav? ( >=media-video/ffmpeg-2.6:0= )
+	libav? ( >=media-video/libav-9:0= )
+	media-libs/libpng:0=
+	virtual/jpeg:0
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+hv_make() {
+	emake \
+		CC="$(tc-getCC)" \
+		RANLIB="$(tc-getRANLIB)" \
+		STRIP="true" \
+		NM="$(tc-getNM) -B" \
+		LD="$(tc-getLD)" \
+		AR="$(tc-getAR)" \
+		PREFIX="${EPREFIX:-/}usr" \
+		libdir="${EPREFIX:-/}usr/$(get_libdir)" \
+		hdocdir="${EPREFIX:-/}usr/share/doc/${PF}" \
+		"${@}"
+}
+
+src_compile() {
+	hv_make -C libharvid
+	hv_make -C src
+	hv_make
+}
+
+src_install() {
+	hv_make DESTDIR="${D}" install
+	dodoc ChangeLog README.md
+}
diff --git a/media-video/harvid/metadata.xml b/media-video/harvid/metadata.xml
new file mode 100644
index 000000000000..42e24ce36b09
--- /dev/null
+++ b/media-video/harvid/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>media-video@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">x42/harvid</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-video/hasciicam/Manifest b/media-video/hasciicam/Manifest
new file mode 100644
index 000000000000..7f97e642152d
--- /dev/null
+++ b/media-video/hasciicam/Manifest
@@ -0,0 +1,7 @@
+DIST hasciicam_1.1.1.orig.tar.gz 148487 SHA256 504d917a09ad17f466c0884189865e5d43e3d1ac05c263837666bf08d7dc526c SHA512 d7374dbf53c4ed6b51a33f3a00ade570af18844c81555710fa2c3bcbf3ba7082dac869f83e0a3cabae9973073c2f736ba450e1081cd140e58e8b0411379f5b56 WHIRLPOOL 4a5e0044ef78189c6f1911e2261ec750708ad1fae4ec9f2caff98680b98ab3fd67e0808e299bbff7d3522cb05b102a8aac4f22789077a49cc9bbbb0abc3c418c
+DIST hasciicam_1.1.2.tar.gz 141155 SHA256 724ec6b059b41f77fdd7f201b04c271852f377b5008eba70c74476ce03dd0766 SHA512 3b2ba0a7ea9ed60cd6807bbee4d54a8f7e7875370d6b5280d451f95a9ac0a002ba75290cb314ec33197a1bece2be82b9a07544e1e72cd81cf50805f74d35827f WHIRLPOOL 76e394bb55e752dd4bf679f797d0a7abacfb0496cb9a7a5071594c8674bc3f55c931fe932d404e57e72f043e6295262a6372fb10a8b3696399daa556bc33ba12
+EBUILD hasciicam-1.1.1.ebuild 465 SHA256 2bbcbd2106c04566952cc0449be0d87471f5028d9aefa0b248cd857f2c5e19c6 SHA512 157a8a7bc0980d11110dd7cb83f68d1ef2c51a5b905e12dad7065f0794c3eaf7b275d54304f14b8768d5f670269a73760bb4bcfed85aaee3c9599e5495fdbb85 WHIRLPOOL 0b3c0f52fc0ea4716ce188f6a71926a3c4d086d76c120b0ac48ef9105aa0fd03a11510b7b0aff0fb18a55e54f1457cfe116276a35c76db008cba7e7fd140a283
+EBUILD hasciicam-1.1.2.ebuild 491 SHA256 a08a83ff7d8b009ac434a3b80cf0e39bb48f659dce768e7c1ee38f390ad87f6c SHA512 77e14db56ea9896ce881522243f71656b35af918885a0c2381a6e2d7bca7abf091a3a70a034e5deba2cc1ecfdd18ef3da6d7321f81c31b179debbdb2f9c382d0 WHIRLPOOL 8bb1463d26797121a0f58e8466c348021ebe6459af7a05f5c0e1148fa24929ecf65562a793f6dfd9f170ae0a71cd73b8a783255562e93f3c37a1bd68cc8b35d1
+MISC ChangeLog 2492 SHA256 798c5cab37749b7a1797853e97e33a48d8b0fc6f7db23e715a3f136ee59d3ff3 SHA512 c7fb742ba00fffda86a8cb678ca04385cc70f37eb57e8624e0e2234216a18aa83ba70fc92898bf4723505fcbf98f420b2eab81798109951f1ba07d82b5e371df WHIRLPOOL c8ed6f62de5f874431a591b8be6a8f72fac6efdb70a2d7858842bf482adf787bbc3b0a16511555e91c7bde727eb170ce672a832e281d94542a9ebd1a2e5d2f70
+MISC ChangeLog-2015 2038 SHA256 746aa1fe67fee8eb2ae7682e7b0486587610c76b5d9d1194cc0ad96c6148592a SHA512 dcb74ed4c8a4dbc41da7c74cd37f319af4f46d54997a8d23e0f7f1fbc985b375240ed943c13f36af84ccc615359a1384dcd2473a0156be29d9e681a528248691 WHIRLPOOL 2eed01d9586025593fad946110b54696a5866829117812c54db12c095bd282fd27ba21818faaaea0aa9343631e752a90aa1dfb6d2374e509dc72a7c9e61be51b
+MISC metadata.xml 221 SHA256 f9c43664acd23c026d227c13f3afb1a1e69d190689815295498c32604c8e0c22 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4 WHIRLPOOL 0c890eef9948116352ecd84ee44ecd07c741d7eb82b89aba4ac0d87757df3616d2170550d7b528cb9c359cf7e5cab95b494ebf92c3c1dc0ea96428603577047b
diff --git a/media-video/hasciicam/hasciicam-1.1.1.ebuild b/media-video/hasciicam/hasciicam-1.1.1.ebuild
new file mode 100644
index 000000000000..300da9210dea
--- /dev/null
+++ b/media-video/hasciicam/hasciicam-1.1.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="a webcam software displaying ascii art using aalib"
+HOMEPAGE="http://ascii.dyne.org"
+SRC_URI="ftp://ftp.dyne.org/${PN}/releases/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="media-libs/aalib"
+RDEPEND="${DEPEND}
+	media-fonts/font-misc-misc" #387909
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
diff --git a/media-video/hasciicam/hasciicam-1.1.2.ebuild b/media-video/hasciicam/hasciicam-1.1.2.ebuild
new file mode 100644
index 000000000000..e849c3a8e4a8
--- /dev/null
+++ b/media-video/hasciicam/hasciicam-1.1.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="A webcam software displaying ascii art using aalib"
+HOMEPAGE="http://ascii.dyne.org/"
+SRC_URI="http://ftp.dyne.org/${PN}/releases/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="media-libs/aalib
+	net-libs/ftplib"
+RDEPEND="${DEPEND}
+	media-fonts/font-misc-misc" #387909
+
+DOCS=( AUTHORS NEWS README TODO ) # ChangeLog is dead
diff --git a/media-video/hasciicam/metadata.xml b/media-video/hasciicam/metadata.xml
new file mode 100644
index 000000000000..68b9a06fccf1
--- /dev/null
+++ b/media-video/hasciicam/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>media-video@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/media-video/imagination/Manifest b/media-video/imagination/Manifest
new file mode 100644
index 000000000000..850f9d1a7be8
--- /dev/null
+++ b/media-video/imagination/Manifest
@@ -0,0 +1,7 @@
+AUX imagination-3.0-cflags.patch 834 SHA256 9816dca396536b0c7f4366dbce52c2a8f1022fb40b1952ebf939462375f3e16b SHA512 0afdeb7b3b4b25c08180eabe74631d3689a7eeff8a4f8ca930d6c093d75c29ae8e6c31fc82dcac65ba4dd5efaff21e64114ef8e7218e379845c8dd72aaa93369 WHIRLPOOL c9f97442e3f11385c9dcd0900482baf388f183c2e139ca540d5903bcfdf34ed3f6f2c0dd36b383954344cecc9e8b58d926bafa7672951d16aa9109a9ada36b6b
+DIST imagination-3.0.tar.gz 3327784 SHA256 417d8586d9c85109b87d30b9c196d63531a637cbc2ffb3c12b48a873bfcb4b1e SHA512 0780ab572d8f4fc1e728befef79f974169438d723f67205e677c06cbe0dac06745868936e7d3eab5fc42728902f6b06eb5f9d7e836532c289df005ddab2104b8 WHIRLPOOL f091ea5d65b79cdd2b74cb330a91b9da3b707e0f775af4aa9f0d523e414705fce25e630d32f4c4b6433068a0ce61d48352fa61842b8e736233a6c3eff2a897e7
+EBUILD imagination-3.0-r1.ebuild 995 SHA256 ca5ec4e62d66138f5feaf172707645552d8b20233910470220472721d003e3e4 SHA512 1c2cfb9fd190074bf233fcbd425c4d2e7d37200ff948bce19518268113fa5ccddc18f0c18ae72ea1c20411408001ac25c1af9f12a5320f4ed45dad7a4577e27f WHIRLPOOL 462e1bcfeb25921247c7440df5201f755c550a0da99cbc18ea8a0a8f258ed9234bbbf0fcfe0f63c08e1408b4c7b9f9c7f066797f5cbd3e10e61a5f6691ac491b
+EBUILD imagination-3.0.ebuild 717 SHA256 6c96ccbbaadfe6e853c0116004daab3a3c376c260e6362ca01680a246bf90b5b SHA512 a887ef679354092f7fe2e16853b5f8c2b924e3b3b96c5c88756d6b56e6976b2318d2fdfe9a5e029aa8e12147dd74749665bee06cbf086d35ff1ba83c25f05c2f WHIRLPOOL 43af6259d4a887678488fc0504c5f0cb09a1f92769c643c2894bea07aa2ba27c3ce46d5d15498859c1c71a1335b166479010a44c7e4939b2a82826ce7b5b39b2
+MISC ChangeLog 2288 SHA256 33eacaabcbac8cdf28cf7feb1c25eae0b17190f1c901bd90fce35956039fd7e9 SHA512 80fd1b40799967ea75071dc5c67a39391523e3079d99ddf5db2577b6d9f40dc9a55588556b7b65548000b1aea4e41ebb3ece7bbea38ad275f2028432cdadfae1 WHIRLPOOL 3df6d1c2b3a56befaf34666469e3e829c1850296e7459c3a17791f9322514d8a27ece976c3f829184736b9ba27ddd537add59766130db5e905cf25b56c09cd56
+MISC ChangeLog-2015 1201 SHA256 933f2ca6d28798b948b14ec8e2f9decf89fb762cebc6c9cc7b888270e760c0c7 SHA512 f09a29e8d47c9ef1d8ec185ac05edeec624f7ade69d9afabf1cf259bc8769d42622a60453fe206cfbdae3d27c463772f59846cff75f1c7d7d2426d40bfdab026 WHIRLPOOL 3b376badcb8b2dbf1deed52b16228d9b37c2550f4458951e0e647931d786d7fc1587bfe24081b25b6f6f9c116ce9170856200b12d86236b303faf77261f8a4dc
+MISC metadata.xml 331 SHA256 2c3e823a869d7b0fa35247d42f9100dfbf8d9cec6997a3b733345ba611503aed SHA512 0cb17e38f8738921373bc14d68739778d9fb4539f32c1ff438a803e9442df88d2695d8041df2d203973763469defe320f6769059a9e064173f6af63440c1103c WHIRLPOOL 8ce7d9f6d1ecb3b461a1cbb6a363a8db4e2b20ef3839aba0ffab3143fd8bbdae77035ffccb8b02e5c0342e2fab6dcd91cc189f10c2a8c64b0f72ad7d2392ff32
diff --git a/media-video/imagination/files/imagination-3.0-cflags.patch b/media-video/imagination/files/imagination-3.0-cflags.patch
new file mode 100644
index 000000000000..1b38a9aeff71
--- /dev/null
+++ b/media-video/imagination/files/imagination-3.0-cflags.patch
@@ -0,0 +1,34 @@
+diff --git a/configure.in b/configure.in
+index 0be7802..d19c8ec 100644
+--- a/configure.in
++++ b/configure.in
+@@ -24,7 +24,7 @@
+ AM_PROG_LIBTOOL
+ LIBTOOL="$LIBTOOL --silent"
+ 
+-pkg_modules="gtk+-2.0 >= 2.14.0 gthread-2.0"
++pkg_modules="gtk+-2.0 >= 2.14.0 gthread-2.0 gmodule-2.0"
+ PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
+ 
+ sox_modules="sox >= 14.2.0"
+@@ -33,6 +33,11 @@
+ plugins_modules="cairo >= 1.6 glib-2.0 > 2.18.0"
+ PKG_CHECK_MODULES(PLUGINS, [$plugins_modules])
+ 
++dnl Check for libm for sqrtf()
++AC_SEARCH_LIBS([sqrtf], [m], [], [
++	AC_MSG_ERROR([unable to find the sqrtf() function])
++])
++
+ # get svn revision
+ REVISION="r0"
+ if test "x${REVISION}" = "xr0"
+@@ -46,7 +51,7 @@
+ if test "x${REVISION}" != "xr0"
+ then
+ 	# force debug mode for a SVN working copy
+-	CFLAGS="-g -Wall"
++	CFLAGS +="-Wall"
+ else
+ 	REVISION="-1"
+ fi
diff --git a/media-video/imagination/imagination-3.0-r1.ebuild b/media-video/imagination/imagination-3.0-r1.ebuild
new file mode 100644
index 000000000000..954d04a7c70d
--- /dev/null
+++ b/media-video/imagination/imagination-3.0-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit autotools eutils
+
+DESCRIPTION="Simple DVD slideshow maker"
+HOMEPAGE="http://imagination.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="linguas_cs linguas_de linguas_en_GB linguas_fr linguas_it linguas_pt_BR
+linguas_sv linguas_zh_CN linguas_zh_TW"
+
+DEPEND="x11-libs/gtk+:2
+	media-sound/sox"
+RDEPEND="${DEPEND}
+	virtual/ffmpeg"
+
+LANGS="cs de en_GB fr it pt_BR sv zh_CN zh_TW"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cflags.patch
+	# enable translations. Bug #380011
+	sed -i -e "/#define PLUGINS_INSTALLED/s:0:1:" "${S}"/src/support.h || die
+	rm "${S}"/po/LINGUAS
+	for x in ${LANGS}; do
+		if ! has ${x} ${LINGUAS}; then
+			rm "${S}"/po/${x}.po || die
+		else
+			echo -n "${x} " >> "${S}"/po/LINGUAS
+		fi
+	done
+	eautoreconf
+}
+
+src_install() {
+	default
+	doicon icons/48x48/${PN}.png
+}
diff --git a/media-video/imagination/imagination-3.0.ebuild b/media-video/imagination/imagination-3.0.ebuild
new file mode 100644
index 000000000000..03c33dc2e3ae
--- /dev/null
+++ b/media-video/imagination/imagination-3.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit autotools eutils
+
+DESCRIPTION="Simple DVD slideshow maker"
+HOMEPAGE="http://imagination.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="linguas_cs linguas_de linguas_en_GB linguas_fr linguas_it linguas_pt_BR
+linguas_sv linguas_zh_CN linguas_zh_TW"
+
+DEPEND="x11-libs/gtk+:2
+	media-sound/sox"
+RDEPEND="${DEPEND}
+	virtual/ffmpeg"
+
+LANGS="cs de en_GB fr it pt_BR sv zh_CN zh_TW"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cflags.patch
+	eautoreconf
+}
+
+src_install() {
+	default
+	doicon icons/48x48/${PN}.png
+}
diff --git a/media-video/imagination/metadata.xml b/media-video/imagination/metadata.xml
new file mode 100644
index 000000000000..ccc5cf8ffdde
--- /dev/null
+++ b/media-video/imagination/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">imagination</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/isight-firmware-tools/Manifest b/media-video/isight-firmware-tools/Manifest
new file mode 100644
index 000000000000..d6c4916f5217
--- /dev/null
+++ b/media-video/isight-firmware-tools/Manifest
@@ -0,0 +1,6 @@
+AUX isight-firmware-tools-1.5.90-build-O0.patch 598 SHA256 237476772a4dc8fb81d89ffbb209832ab9f0b7aae9fbd45ed2e4f77f5f75cd2a SHA512 f2b781a94f29ab5c539a8b6f0da9abf554e79ae84825d1d3deb63fcb3844efe36db73c831e359b3436a1b08a8a16218aa1dfff941f07f67e3e7007c71e67cc39 WHIRLPOOL a64a8d39c1ced45242686debfcba9e5d59d975c58f1e3b4b7c966c61ed309da55eeed0eec877f9a892bacf29853d223ab24bb5d2de00011f513a182f195b5fe0
+DIST isight-firmware-tools-1.6.tar.gz 229122 SHA256 3181973db8a1cadd68785cd81959c8e1e9dc8110342ec1639a50db53d82a367e SHA512 1d72e10d1ff97665c96113c70786307e0b5d1cd24cd8f5fcd15ddd7b608ff1596023139a41f550a9fd288bd8968f69d348b433f5a739179fc0e3f8fa3e143fea WHIRLPOOL ac29469f205a3150f8ef0d95fc7c3b113559f325b172a8c4ccb1758195da32024b278d3e46b2eb899eca4e140758ef6b2381086b7f6e5c837adbb5b4bd3d520f
+EBUILD isight-firmware-tools-1.6-r1.ebuild 1587 SHA256 c5cd073c5d49cd213a079524a78202b767787cbab64716e5d15c9af8cfb157b1 SHA512 32ed20190d789e19c33fb7021d9c973b3c6bfe866064b29fd8f76b396adc6bc6284726b283b0af74429d1fcdf608c1b43bc4a2952887c92883f9f4bcfbd3715a WHIRLPOOL 1d68d7a1c4e88b9217feeefb89df9aaa9dc1a29d835689b9aa7078adb7272121e970fea2db5d5da6cf231f610a657634dd035481f5b07063cfa16081fc467eb6
+MISC ChangeLog 2470 SHA256 4d35dc6676317d3b4f7a5385d12e2895962dc8b0883680f5b4d9f87c04353608 SHA512 f8e7c2f97f25c8ea62b21b60329f2cc4fbf707029dd9c187967edad0cabda07699af02292cbfa302ea274eab3ae2633f84e503f941115788891ec44dc0950552 WHIRLPOOL d174a3e469bf48072053480a58b6eed2ecfaf332a81b5f3980e224ea35f956c9c1d31daef0e9f0ce0ce2e0c34337c33800179dc119e4f52dfa4122ba68c24ebf
+MISC ChangeLog-2015 4981 SHA256 78e9a6f9b0699b1d191a83eb8f486e1dfa078cdfb0ecbfad39deb6b496c42113 SHA512 2655e45418277f41ee93133524175184f88cf5fbb699134631ff83959936afabe2dcddd98e9949eb33abdecec606a83f7aed8f0b37f0d3d60429d06608920ed3 WHIRLPOOL bacf7fd9592d657bbd098d7e303833a5503da39f705ee5dc1af895d3ddeef555c06dde78c2958eb791c985122acdf30b5558da67802b7ddf7885d204854cb843
+MISC metadata.xml 303 SHA256 764c403e9542e9926f492f2f997007ccb9c4c1af1127aec7ead80acd0a8d681d SHA512 5c956a27b99e7c8b7a3dfd46b3ed4dc3f397cbb19c4d2d77f26d71f8f1db051471bb88abb80a4ea876849cddf766767386988fbd232fb47c502bebbfc477b6f0 WHIRLPOOL 922f5628e178d937d33284c3315504c7ef9610deffc91e6a41831334996774a52e52549f1f09964bd9a647d8beb9013eb3fba68854f1bf948ca7692e1de3b1fd
diff --git a/media-video/isight-firmware-tools/files/isight-firmware-tools-1.5.90-build-O0.patch b/media-video/isight-firmware-tools/files/isight-firmware-tools-1.5.90-build-O0.patch
new file mode 100644
index 000000000000..8308cf6860b2
--- /dev/null
+++ b/media-video/isight-firmware-tools/files/isight-firmware-tools-1.5.90-build-O0.patch
@@ -0,0 +1,32 @@
+--- src/export.c
++++ src/export.c
+@@ -35,6 +35,8 @@
+ #include <glib/gi18n.h>
+ #include <glib/gstdio.h>
+ 
++#include <locale.h>
++
+ /* OPTIONS */
+ static gchar *input	= NULL;
+ static gchar *output	= "isight.ihx";
+--- src/extract.c
++++ src/extract.c
+@@ -36,6 +36,8 @@
+ #include <glib/gi18n.h>
+ #include <glib/gstdio.h>
+ 
++#include <locale.h>
++
+ /*
+  * Foreach file identified by their sha1sum, we store the offset where
+  * the firmware begin in the file.
+--- src/load.h
++++ src/load.h
+@@ -36,6 +36,8 @@
+ #include <glib.h>
+ #include <usb.h>
+ 
++#include <locale.h>
++
+ #ifndef _LOAD_H_
+ #define	_LOAD_H_
diff --git a/media-video/isight-firmware-tools/isight-firmware-tools-1.6-r1.ebuild b/media-video/isight-firmware-tools/isight-firmware-tools-1.6-r1.ebuild
new file mode 100644
index 000000000000..2959f96fc526
--- /dev/null
+++ b/media-video/isight-firmware-tools/isight-firmware-tools-1.6-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils versionator udev
+
+MY_MAJORV="$(get_version_component_range 1).6"
+
+DESCRIPTION="Extract, load or export firmware for the iSight webcams"
+HOMEPAGE="https://launchpad.net/isight-firmware-tools"
+SRC_URI="https://launchpad.net/${PN}/main/${MY_MAJORV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.14:2
+	dev-libs/libgcrypt:0
+	virtual/libusb:0
+	virtual/udev"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	sys-apps/texinfo
+	virtual/pkgconfig"
+
+src_prepare() {
+	# Fix build with -O0, bug #221325
+	epatch "${FILESDIR}"/${PN}-1.5.90-build-O0.patch
+
+	sed -i \
+		-e "s:@udevdir@:$(get_udevdir):" \
+		src/isight.rules.in.in || die
+}
+
+src_configure() {
+	# https://bugs.launchpad.net/isight-firmware-tools/+bug/243255
+	econf --docdir=/usr/share/doc/${PF}
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		libudevdir="$(get_udevdir)" \
+		rulesdir="$(get_udevdir)"/rules.d \
+		install
+
+	mv -vf "${D}/$(get_udevdir)"/rules.d/{isight.rules,70-isight.rules}
+
+	dodoc AUTHORS ChangeLog HOWTO NEWS README
+	rm -f "${D}"/usr/share/doc/${PF}/HOWTO
+}
+
+pkg_postinst() {
+	elog "You need to extract your firmware prior to being able to loading it"
+	elog "ift-extract --apple-driver /macos/System/Library/Extensions/IOUSBFamily.kext/Contents/PlugIns/AppleUSBVideoSupport.kext/Contents/MacOS/AppleUSBVideoSupport"
+	elog "If you do not have OSX you can get AppleUSBVideoSupport from"
+	elog "http://www.mediafire.com/?81xtkqyttjt"
+}
diff --git a/media-video/isight-firmware-tools/metadata.xml b/media-video/isight-firmware-tools/metadata.xml
new file mode 100644
index 000000000000..1de5fa78159e
--- /dev/null
+++ b/media-video/isight-firmware-tools/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>eva@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="launchpad">isight-firmware-tools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/jubler/Manifest b/media-video/jubler/Manifest
new file mode 100644
index 000000000000..856f412c9de2
--- /dev/null
+++ b/media-video/jubler/Manifest
@@ -0,0 +1,11 @@
+AUX jubler-4.6.1-ffmpeg-1.patch 14239 SHA256 f062f8073d9e21e97638c1952024d4faeea4738e372ddc3bda626ba76a21e7b2 SHA512 c20848a23dfea2e023e041af8c5a249aa0f7399cb21012a997fcbc864691599f817eb1fa5b58fd0b8494ad936119a1366cbb75cac940e2e45b6edb13d35f4c69 WHIRLPOOL c932b2fa42ee44ce5a1a924ac9fbd564311f454b41a5a9c406ed110fbbf62fc852d5c22545b7f0e7579343511a1b7c7d73bf62393e22688259b7e5ba8fb22ffa
+AUX jubler-4.6.1-ffmpeg-2.patch 1846 SHA256 fad5663e54040e7e00091b851d480f80d3ef82b6adacbbf11df7182d98fed972 SHA512 c5c3d6749c6860a91de1f9901c23590803782a69530534fd3635a385e21c0d1d493f43821e26d10491199b86682719fd3d4b0603641812b741714eda0c795d10 WHIRLPOOL df69fd19b4165879ea9270700b9f848cf3e7dac194ce5eef6bede9521c824bb85e4030ed1ac85d6d427a7d421cec9c9fd27d73c6e3d9b83b38f4f08196fd6d74
+AUX jubler-4.6.1-gentoo.patch 7061 SHA256 bdbd3cd908b57e2838c30e590e5296933615bf88369a1ebea19a77bd6fd017ed SHA512 d7d50774c3f3f6780bce455d6e0b2765d14588b3545a913b8f8adedb947877115fcae788eb1d3fed322fac472ae33362c53e36808a3f276b60926e183bab8e0d WHIRLPOOL 53853d0dc0d699f5541dd52f92e97d87178dc60ae0ecf96b7a54c51d985fe349b6e1985479e3a1dd2f532739f94d241e81ad9b68246ad0d63bf4a7c3bc423500
+AUX update-4.6.1.xml 20433 SHA256 c133425099109638160243bf299f395cda13fe9e98ee3a6a1322e576f340d78b SHA512 f50876c78c25f7fc5c20511911427713a11f7063055fc3d3ad0a77b6416af7385108a5426e9c75e773fcbe329cb8a12e580b350bac86442f03a50a7d517306e4 WHIRLPOOL da4465f3962ce7e499210f4fd2490a4742917304f942d55abbfd901acd6f8f398c85b3b39204c13576ee0cf93c6aec8f99f6579f0a3add7c0c99f16f97ff7ff8
+DIST Jubler-source-4.6.1.tar.bz2 1971701 SHA256 1aeed14cc500165470b29884585432e9d14940c314bafa0f6318789005dd18f1 SHA512 629aef58f98d2d8569a58a4c68c9bf440cd4693ca8847a0b8ad9e84458cd88de44542b5fc84e25033c1e22b26a4d675e070c5a58203a6bbe671072e5cdc2680a WHIRLPOOL bf3e95a5515e3895a6773433681f5abfebc159f30b8a91acf51aa6ea961247db8686ab3d92112725b5443b5f1ffb16a5cc4c46036e7b3fa6a5a562e6c7ae211d
+DIST jubler-5.1.tar.bz2 1815531 SHA256 bee88e6e6210ee525749bfb6469261a0ff129ed0233286010503b69b8390c8e6 SHA512 e2a0da737362a3c8dc12966aec1e9939291237fc714a586186b72daa16abf967c8fea8dac04fb191cb803aa11db20cf6d67468d2383f17f5c6114a643860acef WHIRLPOOL 8a5c5ed8f3225ad4984f9755acefe2171460639896baaace0bcbdcd2a9ffcf553b87f3aab8d5b4e8370bee0b97f524050a0fd34bfa1a1592b96a44d8ff7b0f56
+EBUILD jubler-4.6.1-r3.ebuild 3029 SHA256 88e21044b61cfa65f153720667e642a2b8fdadf224db850808f89498d44cad37 SHA512 03dfd15739806037ed90c4c92400c87eca9ae382553be794fcff5464ecb185b9184b3dbbb9ecaef8a0eafe3018591619d2b0beff6bbfe06ebef0487ace847e65 WHIRLPOOL 596cc6f81d290f0d51e4aca4494986ba9d5737a8f3646ecd5c283d43385636390c8a39aa85a92f71b0c1ae53b6525659d5168d1d6da105203b0b2478b18b3462
+EBUILD jubler-5.1.ebuild 1715 SHA256 5a898373515eced756a7991497ea182c7132760cc168fd32a9bdda74300add7c SHA512 850dde8c189238ea16c4a90203ac312333bda382e1125bd56b2b2d1498fa5a228e71bdcd36025423026003aa714650440d7dba8ec7ba2c7a0e24545ff2f99b41 WHIRLPOOL bcd0cc4f89d2029adfaebddaecea39a5e0dd840f0a27fbe17a210728abc73718176ca6e91c526d89b66e803695d6edfea330d22aa700ed388c07efb2a1367382
+MISC ChangeLog 2871 SHA256 6cd0f1813b1a97de71dcdd77e97ac84ab41db9c195adf5f2c141df6faceabfb8 SHA512 a188fd3d134d6d6f95b5e54130ec5e64898853228d0da1ae243957357463022934118f31ccde47825e4d6aece75c0f103dcdb6e651064eb3100a519e4d0cf9e0 WHIRLPOOL 5b8cbeec2b5dedf6ab5288fe1b2092e115d8fe8a09d7309dd05467c6c9d893060c5aceaab5146d53b699622efbaebc860a9e0a4735014f7fdb6c01cedcb1c0f3
+MISC ChangeLog-2015 8075 SHA256 a7a0508dcace6054ea8b5e629559e5f8f65d1cf3396f85248773079f5538cfc5 SHA512 1f5b4b1bf4ce7e5b8f8f8d5606ff158c5ad4513ccafde6ebdbbe4c30634b51c065834a5f84b1f615fea93e1e093e485299e0a6fd77ba7f098e438d949204f686 WHIRLPOOL 60d403eb70454d4949eae31b0a071c793b26957b2fbeefb1548912bc4c4e0c97281cc683268909a76e06a02c9960986fb4fc7f71e14842f2c786a496afa611c7
+MISC metadata.xml 292 SHA256 675da525138f5597c65e0283840ff356109f60853a84bb7360ab35f6a76fcfb8 SHA512 c7131847c06b95cec1212b3ead2a170abc2a5eeae13d6e7db0683370c7e8949e6ebbcffd320f54c3bf26cf50b88cdd44bc02a7e315e7a943407a68c8747c4031 WHIRLPOOL bab2aa573e621eb88eb553e341386ec8fb0abe8f3f7e713c95cdecc5046383c2f69b6fd08e23bbea6f2feb27869c4bff45a28ec20ba6e1776b8f65c9e2c7a043
diff --git a/media-video/jubler/files/jubler-4.6.1-ffmpeg-1.patch b/media-video/jubler/files/jubler-4.6.1-ffmpeg-1.patch
new file mode 100644
index 000000000000..18df9069d198
--- /dev/null
+++ b/media-video/jubler/files/jubler-4.6.1-ffmpeg-1.patch
@@ -0,0 +1,274 @@
+Index: Jubler-4.6.1/resources/ffmpeg/ffdecode/decodeaudio.c
+===================================================================
+--- Jubler-4.6.1.orig/resources/ffmpeg/ffdecode/decodeaudio.c
++++ Jubler-4.6.1/resources/ffmpeg/ffdecode/decodeaudio.c
+@@ -67,19 +67,19 @@ jboolean decodeAudio(JNIEnv * env, jobje
+     AVStream *audio_st=NULL;
+     int got_audio, len, err=0, audio_index=-1, i=0, pack_duration=0, packsize=0, codec_is_open=-1, video_index=-1, codec_enc_is_open=-1;
+     jlong pack_pts=0;
+-    char *outbuf=NULL;
++    AVFrame *outbuf=NULL;
+     unsigned char *packptr;
+     jboolean ret = JNI_TRUE, nobrk = JNI_TRUE;
+     
+     av_register_all();
+     
+     /* Open the input/output files */
+-    err = av_open_input_file(&fcx, input_filename, NULL, 0, NULL);
++    err = avformat_open_input(&fcx, input_filename, NULL, NULL);
+     if(err<0){
+         DEBUG(env, this, "decodeAudio", "Could not open file '%s'.", input_filename);
+         ret = JNI_FALSE;
+     }
+-    outbuf = malloc(AVCODEC_MAX_AUDIO_FRAME_SIZE);
++    outbuf = avcodec_alloc_frame();
+     if(outbuf==NULL) {
+         DEBUG(env, this, "decodeAudio", "Could not allocate memory for outbuf.");
+         ret = JNI_FALSE;
+@@ -129,7 +129,7 @@ jboolean decodeAudio(JNIEnv * env, jobje
+     }
+     else {
+         /* open it */
+-        if ((codec_is_open = avcodec_open(ccx, codec)) < 0) {
++        if ((codec_is_open = avcodec_open2(ccx, codec, NULL)) < 0) {
+             DEBUG(env, this, "decodeAudio", "Could not open codec.");
+             ret = JNI_FALSE;
+         }
+@@ -158,10 +158,10 @@ jboolean decodeAudio(JNIEnv * env, jobje
+                     }
+                     
+                     /* use wav as the output format of the file */
+-                    fmt = guess_format(NULL, output_filename, NULL);
++                    fmt = av_guess_format(NULL, output_filename, NULL);
+                     if (!fmt) {
+ 								DEBUG(env, this, "decodeAudio", "Could not deduce output format from file extension: using WAV.");
+-                        fmt = guess_format("wav", NULL, NULL);
++                        fmt = av_guess_format("wav", NULL, NULL);
+                     }
+                     if (!fmt) {
+                         DEBUG(env, this, "decodeAudio", "Could not find suitable output format.");
+@@ -182,35 +182,28 @@ jboolean decodeAudio(JNIEnv * env, jobje
+                             audio_st = add_audio_stream(env, this, ofcx, fmt->audio_codec, ccx->sample_rate, ccx->channels);
+                         }
+                         
+-                        /* set the output parameters (must be done even if no parameters) */
+-                        if (av_set_parameters(ofcx, NULL) < 0) {
+-                            DEBUG(env, this, "decodeAudio", "Invalid output format parameters.");
+-                            ret = JNI_FALSE;
+-                        }
+-                        else {
+                             codec_enc = avcodec_find_encoder(audio_st->codec->codec_id);
+                             if (!codec_enc) {
+                                 DEBUG(env, this, "decodeAudio", "Encoder codec not found.");
+                                 ret = JNI_FALSE;
+                             }
+                             else {
+-                                if ((codec_enc_is_open = avcodec_open(audio_st->codec, codec_enc)) < 0) {
++                                if ((codec_enc_is_open = avcodec_open2(audio_st->codec, codec_enc, NULL)) < 0) {
+                                     DEBUG(env, this, "decodeAudio", "Could not open encoder codec.");
+                                     ret = JNI_FALSE;
+                                 }
+                                 else {
+                                      if (!(fmt->flags & AVFMT_NOFILE)) {
+-                                         if (url_fopen(&ofcx->pb, output_filename, URL_WRONLY) < 0) {
++                                         if (avio_open(&ofcx->pb, output_filename, AVIO_FLAG_WRITE) < 0) {
+                                              DEBUG(env, this, "decodeAudio", "Could not open file '%s'", output_filename);
+                                              ret = JNI_FALSE;
+                                          }
+                                          else {
+-                                             av_write_header(ofcx);
++                                             avformat_write_header(ofcx,NULL);
+                                          }
+                                      }
+                                 }
+                             }
+-                        }
+                     }
+                 }
+                 else {
+@@ -243,7 +236,7 @@ jboolean decodeAudio(JNIEnv * env, jobje
+                     ccx->request_channels = 2;
+                 }
+                 got_audio = AVCODEC_MAX_AUDIO_FRAME_SIZE;
+-                len = avcodec_decode_audio2(ccx, (short *)outbuf, &got_audio, packptr, packsize);
++                len = avcodec_decode_audio4(ccx, outbuf, &got_audio, &pkt);
+                 
+                 if (len < 0) {
+                     DEBUG(env, this, "decodeAudio", "Error while decoding.");
+@@ -258,7 +251,7 @@ jboolean decodeAudio(JNIEnv * env, jobje
+                      * this is the frame we want */
+                     if (pack_pts >= seek_time_start) {
+                         /* if a frame has been decoded, output it */
+-                        audio_enc_out(env, this, ofcx, audio_st, (short *)outbuf, got_audio);
++                        audio_enc_out(env, this, ofcx, audio_st, (short *)(outbuf->data[0]), av_samples_get_buffer_size(NULL, ccx->channels, outbuf->nb_samples, ccx->sample_fmt, 1));
+                         /* if the next frame gets past our stop time, we want to stop decoding */
+                         if ( pack_pts + pack_duration > seek_time_stop ) {
+                             av_free_packet(&pkt);
+@@ -269,7 +262,7 @@ jboolean decodeAudio(JNIEnv * env, jobje
+                     /* If the next frame will be past our start seek time, this is the frame we want */
+                     else if (pack_pts + pack_duration > seek_time_start) {
+                         /* if a frame has been decoded, output it */
+-                        audio_enc_out(env, this, ofcx, audio_st, (short *)outbuf, got_audio);
++                        audio_enc_out(env, this, ofcx, audio_st, (short *)(outbuf->data[0]), av_samples_get_buffer_size(NULL, ccx->channels, outbuf->nb_samples, ccx->sample_fmt, 1));
+                         /* if the next frame gets past our stop time, we want to stop decoding */
+                         if ( pack_pts + pack_duration > seek_time_stop ) {
+                             av_free_packet(&pkt);
+@@ -301,7 +294,7 @@ jboolean decodeAudio(JNIEnv * env, jobje
+ 
+     	/* close the output file */
+     	if (!(fmt->flags & AVFMT_NOFILE) && ofcx->pb != NULL) {
+-        	url_fclose(ofcx->pb);
++        	avio_close(ofcx->pb);
+     	}
+ 		
+     	/* free the stream */
+@@ -309,7 +302,7 @@ jboolean decodeAudio(JNIEnv * env, jobje
+ 	}
+ 
+     if(codec_is_open >= 0) avcodec_close(ccx);
+-    if(outbuf != NULL)     free(outbuf);
++    if(outbuf != NULL)     av_free(outbuf);
+     if(fcx != NULL)        av_close_input_file(fcx);
+     
+     return ret;
+Index: Jubler-4.6.1/resources/ffmpeg/ffdecode/decodeframe.c
+===================================================================
+--- Jubler-4.6.1.orig/resources/ffmpeg/ffdecode/decodeframe.c
++++ Jubler-4.6.1/resources/ffmpeg/ffdecode/decodeframe.c
+@@ -122,7 +122,7 @@ AVPicture* decodeFrame(JNIEnv * env, job
+     AVFrame *frame=avcodec_alloc_frame();
+     
+     /* Open the input file */
+-    err = av_open_input_file(&fcx, input_filename, NULL, 0, NULL);
++    err = avformat_open_input(&fcx, input_filename, NULL, NULL);
+     if(err<0){
+         DEBUG(env, this, "decodeFrame", "Could not open file '%s'.", input_filename);
+         retflag = FALSE;
+@@ -157,7 +157,7 @@ AVPicture* decodeFrame(JNIEnv * env, job
+     }
+     else {
+         // Open codec
+-        if((codec_is_open = avcodec_open(ccx, codec)) < 0 ) {
++        if((codec_is_open = avcodec_open2(ccx, codec, NULL)) < 0 ) {
+             DEBUG(env, this, "decodeFrame", "Could not open codec.");
+             retflag = FALSE;
+         }
+@@ -190,7 +190,7 @@ AVPicture* decodeFrame(JNIEnv * env, job
+             pack_duration = av_rescale_q(pkt.duration, fcx->streams[video_index]->time_base, AV_TIME_BASE_Q);
+             comp_pts += pkt.duration;
+             // Decode this packet
+-            len = avcodec_decode_video(ccx, frame, &got_picture, pkt.data, pkt.size);
++            len = avcodec_decode_video2(ccx, frame, &got_picture, &pkt);
+             if (len < 0) {
+                 DEBUG(env, this, "decodeFrame", "Error while decoding.");
+                 retflag = FALSE;
+@@ -265,7 +265,7 @@ int file_info(JNIEnv * env, jobject this
+     av_register_all();
+     
+     // Open the input file.
+-    err = av_open_input_file(&fcx, input_filename, NULL, 0, NULL);
++    err = avformat_open_input(&fcx, input_filename, NULL, NULL);
+     if(err<0){
+         DEBUG(env, this, "file_info", "Could not open file '%s'.", input_filename);
+         return 1;
+@@ -275,9 +275,9 @@ int file_info(JNIEnv * env, jobject this
+     err = av_find_stream_info(fcx);
+     
+     // Give us information about the file and exit
+-    dump_format(fcx, 0, input_filename, FALSE);
++    av_dump_format(fcx, 0, input_filename, FALSE);
+     
+-    av_close_input_file(fcx);
++    avformat_close_input(&fcx);
+     return 0;
+ }
+ 
+Index: Jubler-4.6.1/resources/ffmpeg/ffdecode/grabinfo.c
+===================================================================
+--- Jubler-4.6.1.orig/resources/ffmpeg/ffdecode/grabinfo.c
++++ Jubler-4.6.1/resources/ffmpeg/ffdecode/grabinfo.c
+@@ -82,7 +82,7 @@ void get_information(JNIEnv * env, jobje
+     av_register_all();
+     
+     // Open the input file.
+-    err = av_open_input_file(&fcx, video_c, NULL, 0, NULL);
++    err = avformat_open_input(&fcx, video_c, NULL, NULL);
+     if(err<0) {
+         DEBUG(env, this, "get_information", "Could not open file '%s'.", video_c);
+         ret = JNI_FALSE;
+Index: Jubler-4.6.1/resources/ffmpeg/ffdecode/makecache.c
+===================================================================
+--- Jubler-4.6.1.orig/resources/ffmpeg/ffdecode/makecache.c
++++ Jubler-4.6.1/resources/ffmpeg/ffdecode/makecache.c
+@@ -59,7 +59,7 @@ JNIEXPORT jboolean JNICALL Java_com_pana
+     float ratewindow = 0;
+     unsigned int offset=0, maxbyte=0, sampledcounter=1;
+     FILE *cachefile=NULL;
+-    uint8_t *outbuf=NULL;
++    AVFrame *outbuf=NULL;
+     jboolean nobrk = JNI_TRUE;
+     
+     int ENDIANESS = isLittleEndian();
+@@ -81,7 +81,7 @@ JNIEXPORT jboolean JNICALL Java_com_pana
+         ret = JNI_TRUE;
+         
+         // Open the input file.
+-        err = av_open_input_file(&fcx, audio_c, NULL, 0, NULL);
++        err = avformat_open_input(&fcx, audio_c, NULL, NULL);
+         cachefile = fopen(cache_c, "wb");
+         if(err<0){
+             DEBUG(env, this, "makeCache", "Could not open audio file '%s'.", audio_c);
+@@ -91,7 +91,7 @@ JNIEXPORT jboolean JNICALL Java_com_pana
+             DEBUG(env, this, "makeCache", "Could not open cache file '%s'.", cache_c);
+             ret = JNI_FALSE;
+         }
+-        outbuf = malloc(AVCODEC_MAX_AUDIO_FRAME_SIZE);
++        outbuf = avcodec_alloc_frame();
+         if(outbuf==NULL) {
+             DEBUG(env, this, "makeCache", "Could not allocate memory for outbuf.");
+             ret = JNI_FALSE;
+@@ -123,7 +123,7 @@ JNIEXPORT jboolean JNICALL Java_com_pana
+         }
+         else {
+             /* open it */
+-            if ((codec_is_open = avcodec_open(ccx, codec)) < 0) {
++            if ((codec_is_open = avcodec_open2(ccx, codec,NULL)) < 0) {
+                 DEBUG(env, this, "makeCache", "Could not open codec.");
+                 ret = JNI_FALSE;
+             }
+@@ -175,7 +175,7 @@ JNIEXPORT jboolean JNICALL Java_com_pana
+                     pack_pts = av_rescale_q(pkt.pts, fcx->streams[audio_index]->time_base, AV_TIME_BASE_Q);
+                     // Decode the paket
+                     got_audio = AVCODEC_MAX_AUDIO_FRAME_SIZE;
+-                    len = avcodec_decode_audio2(ccx, (short *)outbuf, &got_audio, pkt.data, pkt.size);
++                    len = avcodec_decode_audio4(ccx, outbuf, &got_audio, &pkt);
+                     
+                     if (len < 0) {
+                         DEBUG(env, this, "makeCache", "Error while decoding.");
+@@ -196,7 +196,7 @@ JNIEXPORT jboolean JNICALL Java_com_pana
+                             if (bytecounter+offset + step*channels >= maxbyte) {
+                                 for (j = 1; j <= channels ; j++) {
+                                     // actually sample is not the whole sample, but the data for one channel each time
+-                                    sample = (char)outbuf[bytecounter+ENDIANESS];
++                                    sample = (char)outbuf->data[0][bytecounter+ENDIANESS];
+                                     // min max averaging: only keep the highest and the lowest sample value
+                                     if (maxsample[j-1] < sample) maxsample[j-1] = sample;
+                                     if (minsample[j-1] > sample) minsample[j-1] = sample;
+@@ -215,7 +215,7 @@ JNIEXPORT jboolean JNICALL Java_com_pana
+                             }
+                             else {
+                                 for (j = 1; j <= channels; j++) {
+-                                    sample = (char)outbuf[bytecounter+ENDIANESS];
++                                    sample = (char)outbuf->data[0][bytecounter+ENDIANESS];
+                                     // min max averaging
+                                     if (maxsample[j-1] < sample) maxsample[j-1] = sample;
+                                     if (minsample[j-1] > sample) minsample[j-1] = sample;
+@@ -254,7 +254,7 @@ JNIEXPORT jboolean JNICALL Java_com_pana
+     if(minsample != NULL)  free(minsample);
+     if(cachefile != NULL)  fclose(cachefile);
+     if(codec_is_open >= 0) avcodec_close(ccx);
+-    if(outbuf != NULL)     free(outbuf);
++    if(outbuf != NULL)     av_free(outbuf);
+     if(fcx != NULL)        av_close_input_file(fcx);
+     
+     return ret;
diff --git a/media-video/jubler/files/jubler-4.6.1-ffmpeg-2.patch b/media-video/jubler/files/jubler-4.6.1-ffmpeg-2.patch
new file mode 100644
index 000000000000..28f50b57d6ad
--- /dev/null
+++ b/media-video/jubler/files/jubler-4.6.1-ffmpeg-2.patch
@@ -0,0 +1,37 @@
+diff --git a/Jubler-4.6.1/resources/ffmpeg/ffdecode/decodeaudio.c b/Jubler-4.6.1/resources/ffmpeg/ffdecode/decodeaudio.c
+index 92bf071..d163010 100644
+--- a/Jubler-4.6.1/resources/ffmpeg/ffdecode/decodeaudio.c
++++ b/Jubler-4.6.1/resources/ffmpeg/ffdecode/decodeaudio.c
+@@ -37,6 +37,13 @@ jboolean decodeAudio(JNIEnv* env, jobject this, const char *input_filename, cons
+ AVStream *add_audio_stream(JNIEnv* env, jobject this, AVFormatContext *oc, int codec_id, int sample_rate, int channels);
+ void audio_enc_out(JNIEnv * env, jobject this, AVFormatContext *ofcx, AVStream *audio_st, const short *samples, int buf_size);
+ 
++#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
++#ifndef MAX_AUDIO_FRAME_SIZE
++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
++#else
++#define AVCODEC_MAX_AUDIO_FRAME_SIZE MAX_AUDIO_FRAME_SIZE
++#endif
++#endif
+ 
+ JNIEXPORT jboolean JNICALL Java_com_panayotis_jubler_media_preview_decoders_FFMPEG_createClip(JNIEnv * env, jobject this, jstring audio, jstring wav, jlong start, jlong stop) {
+     const char * audio_c;
+diff --git a/Jubler-4.6.1/resources/ffmpeg/ffdecode/makecache.c b/Jubler-4.6.1/resources/ffmpeg/ffdecode/makecache.c
+index d7ea88b..0190b79 100644
+--- a/Jubler-4.6.1/resources/ffmpeg/ffdecode/makecache.c
++++ b/Jubler-4.6.1/resources/ffmpeg/ffdecode/makecache.c
+@@ -38,6 +38,14 @@
+ #include "defaults.h"
+ #include "utilities.h"
+ 
++#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
++#ifndef MAX_AUDIO_FRAME_SIZE
++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
++#else
++#define AVCODEC_MAX_AUDIO_FRAME_SIZE MAX_AUDIO_FRAME_SIZE
++#endif
++#endif
++
+ JNIEXPORT jboolean JNICALL Java_com_panayotis_jubler_media_preview_decoders_NativeDecoder_makeCache(JNIEnv * env, jobject this, jstring audio, jstring cache, jstring original) {
+     const char *audio_c;
+     const char *cache_c;
diff --git a/media-video/jubler/files/jubler-4.6.1-gentoo.patch b/media-video/jubler/files/jubler-4.6.1-gentoo.patch
new file mode 100644
index 000000000000..25afdba2fcc9
--- /dev/null
+++ b/media-video/jubler/files/jubler-4.6.1-gentoo.patch
@@ -0,0 +1,163 @@
+diff -Nur Jubler-4.6.1/build.xml Jubler-4.6.1_patched/build.xml
+--- Jubler-4.6.1/build.xml	2011-02-05 23:46:03.000000000 +0200
++++ Jubler-4.6.1_patched/build.xml	2011-02-13 14:46:56.562977001 +0200
+@@ -1,36 +1,9 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+-<project name="Jubler" default="dist" basedir=".">
++<project name="Jubler" default="allparts" basedir=".">
+ 	<description>Builds, tests, and runs the project Jubler.</description>
+ 	<property file="core/src/com/panayotis/jubler/information/version.prop" />
+-
+-	<taskdef resource="net/sf/antcontrib/antlib.xml">
+-		<classpath>
+-			<pathelement location="resources/libs/ant-contrib/ant-contrib-1.0b3.jar"/>
+-		</classpath>
+-	</taskdef>
++	<taskdef resource="net/sf/antcontrib/antlib.xml"/>
+ 	
+-	<taskdef name="jarbundler"
+-		onerror="report"
+-		classpath="/opt/local/share/java/jarbundler.jar"
+-		classname="net.sourceforge.jarbundler.JarBundler" />
+-
+-   <taskdef name="izpack"
+-		onerror="report"
+-		classpath="../../Tools/IzPack/standalone-compiler.jar"
+-		classname="com.izforge.izpack.ant.IzPackTask"/>
+-
+-	<taskdef name="launch4j"
+-		onerror="report"
+-		classpath="/opt/local/share/launch4j/launch4j.jar:/opt/local/share/launch4j/lib/xstream.jar" 
+-		classname="net.sf.launch4j.ant.Launch4jTask"/>
+-
+-	<target name="jupidator">
+-		<ant antfile="../jupidator/build.xml" inheritall="false" target="jar"/>
+-		<copy file="../jupidator/dist/jupidator.jar" todir="dist/lib"/>
+-		<ant antfile="../jupidator/build.xml" inheritall="false" target="clean"/>
+-	</target>
+-		
+-
+ 	<target name="i18n">
+ 		<exec dir="resources/i18n" executable="bash" failonerror="true">
+ 			<arg line="compile"/>
+@@ -45,12 +18,14 @@
+ 		<move file="resources/help/jubler-faq.html" todir="dist/help"/>
+ 		<copy file="resources/help/question.png" todir="dist/help"/>
+ 	</target>
+-
++	
++	<target name="jupidator"/>
++	
+ 	<target name="changelog" depends="jupidator">
+ 		<delete file="ChangeLog.html"/>
+ 		<echo message="" file="ChangeLog.html"/>
+-		<java fork="true" classname="com.panayotis.jupidator.helpers.ChangeLogCreator" classpath="dist/lib/jupidator.jar">
+-			<arg value="http://www.jubler.org/files/updates/update.xml"/>
++		<java fork="true" classname="com.panayotis.jupidator.helpers.ChangeLogCreator" classpath="resources/libs/jupidator.jar">
++			<arg value="update-${version}.xml"/>
+ 			<arg value="ChangeLog.html"/>
+ 		</java>
+ 	</target>
+@@ -311,7 +286,7 @@
+ 	</target>
+ 
+ 	<!-- Create an isntallation-like file tree -->
+-	<target name="-linuxinstall" depends="-linuxproperties, -cleandestdir, -linuxdesktopintegration">
++	<target name="-linuxinstall" depends="-linuxproperties, -cleandestdir, linuxdesktopintegration">
+ 		<!-- Basic Jubler files -->
+ 		<copy file="dist/Jubler.jar" todir="${libdir}"/>
+ 		<copy todir="${libdir}/lib">
+@@ -337,7 +312,7 @@
+ 	</target>
+ 
+ 	<!-- Linux desktop intergration -->
+-	<target name="-linuxdesktopintegration" depends="-linuxproperties">
++	<target name="linuxdesktopintegration" depends="-linuxproperties">
+ 		<!-- Icon files -->
+ 		<copy file="resources/installers/linux/jubler.menu" tofile="${sharedir}/menu/jubler"/>
+ 		<copy file="resources/installers/linux/jubler.xpm" todir="${sharedir}/pixmaps"/>
+diff -Nur Jubler-4.6.1/core/src/com/panayotis/jubler/information/HelpBrowser.java Jubler-4.6.1_patched/core/src/com/panayotis/jubler/information/HelpBrowser.java
+--- Jubler-4.6.1/core/src/com/panayotis/jubler/information/HelpBrowser.java	2011-01-31 01:19:02.000000000 +0200
++++ Jubler-4.6.1_patched/core/src/com/panayotis/jubler/information/HelpBrowser.java	2011-02-12 14:38:50.220780001 +0200
+@@ -47,7 +47,7 @@
+ 
+         history = new ArrayList<String>();
+ 
+-        String initpage = "file:" + SystemFileFinder.getJublerAppPath() + "/help/jubler-faq.html";
++        String initpage = "file:" + SystemFileFinder.getJublerAppPath() + "/../help/jubler-faq.html";
+         setPage(initpage);
+         history.add(initpage);
+ 
+diff -Nur Jubler-4.6.1/core/src/com/panayotis/jubler/os/SystemDependent.java Jubler-4.6.1_patched/core/src/com/panayotis/jubler/os/SystemDependent.java
+--- Jubler-4.6.1/core/src/com/panayotis/jubler/os/SystemDependent.java	2011-01-31 01:19:02.000000000 +0200
++++ Jubler-4.6.1_patched/core/src/com/panayotis/jubler/os/SystemDependent.java	2011-02-12 14:43:25.740780001 +0200
+@@ -182,7 +182,7 @@
+                 Runtime.getRuntime().exec("rundll32 url.dll,FileProtocolHandler " + url);
+             else { //assume Unix or Linux
+                 String[] browsers = {
+-                    "firefox", "konqueror", "opera", "epiphany", "mozilla", "netscape"};
++                    "xdg-open", "firefox", "konqueror", "opera", "epiphany", "mozilla", "netscape"};
+                 String browser = null;
+                 for (int count = 0; count < browsers.length && browser == null; count++)
+                     if (Runtime.getRuntime().exec(
+diff -Nur Jubler-4.6.1/core/src/com/panayotis/jubler/os/SystemFileFinder.java Jubler-4.6.1_patched/core/src/com/panayotis/jubler/os/SystemFileFinder.java
+--- Jubler-4.6.1/core/src/com/panayotis/jubler/os/SystemFileFinder.java	2011-02-05 01:59:45.000000000 +0200
++++ Jubler-4.6.1_patched/core/src/com/panayotis/jubler/os/SystemFileFinder.java	2011-02-12 14:38:18.520780001 +0200
+@@ -56,9 +56,8 @@
+ 
+     public static boolean loadLibrary(String name) {
+         File libfile = findFile("lib" + FileCommunicator.FS + System.mapLibraryName(name));
+-        if (libfile != null)
+             try {
+-                System.load(libfile.getAbsolutePath());
++                System.loadLibrary(name);
+                 return true;
+             } catch (UnsatisfiedLinkError e) {
+                 DEBUG.debug(e);
+diff -Nur Jubler-4.6.1/resources/ffmpeg/ffdecode/Makefile Jubler-4.6.1_patched/resources/ffmpeg/ffdecode/Makefile
+--- Jubler-4.6.1/resources/ffmpeg/ffdecode/Makefile	2011-01-31 16:26:26.000000000 +0200
++++ Jubler-4.6.1_patched/resources/ffmpeg/ffdecode/Makefile	2011-02-15 20:26:34.213149001 +0200
+@@ -12,9 +12,6 @@
+ # Name of the produced library
+ PROJ=ffdecode
+ 
+-# Paths of include files
+-JAVA_HOME=${shell /bin/sh ../../system/findjava.sh -j}
+-
+ # Current Path
+ CPATH=${shell pwd}
+ 
+@@ -42,7 +39,6 @@
+ # Various options
+ FFCONF=configure
+ LIBSUF=_${SYSTEM}.${ARCH}
+-MAKEOPTS=-j3
+ 
+ # Find requested files
+ NATIVES=${shell cd ../../src && grep -r ' native ' * | grep -v '/.svn/' | gawk -F ':' '{print $$1}' | uniq | sed -e 's/\.java$$//g' | tr '/' '.' }
+@@ -136,7 +132,6 @@
+ CCPREF_NOS=${shell echo ${CCPREF} | sed -e 's/-$$//g' }
+ DCONFIG=--with-mp4v2 --host=${CCPREF_NOS}
+ 
+-CC=${CCPREF}gcc
+ RANLIB=${CCPREF}ranlib
+ 
+ ifeq (${NOSTRIP},) 
+@@ -151,7 +146,7 @@
+ .SUFFIXES:.o .c
+ 
+ .c.o:
+-	${CC} ${CFLAGS} ${GCCOPTS} -std=c99 -pedantic -O3 -Wall ${INCS} ${JINCLUDE} -c -o $@ $?
++	${CC} ${CFLAGS} ${GCCOPTS} -std=c99 -pedantic -Wall ${INCS} ${JINCLUDE} -c -o $@ $?
+ 
+ 
+ develop:javacheck
+@@ -208,7 +203,7 @@
+ LIB:${LIBNAME}
+ 
+ ${LIBNAME}:${LIBRARYREQ} ${OBJS} ${RANLIBREQ}
+-	${LD} ${GCCOPTS} -o ${LIBNAME} ${OBJS} ${LIBS}
++	${LD} ${LDFLAGS} ${GCCOPTS} -o ${LIBNAME} ${OBJS} ${LIBS}
+ 	${STRIPCMD} ${LIBNAME}
+ 
+ 
diff --git a/media-video/jubler/files/update-4.6.1.xml b/media-video/jubler/files/update-4.6.1.xml
new file mode 100644
index 000000000000..130d59aacafb
--- /dev/null
+++ b/media-video/jubler/files/update-4.6.1.xml
@@ -0,0 +1,326 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<updatelist application="Jubler" baseurl="http://www.jubler.org/files/updates" icon="icons/jubler.png" jupidator="600">
+
+	<mirror constructor="${URL}${FILEBASE}-${FILEPATH}${FILEEXT}${FILECOMPR}" url="http://jubler.googlecode.com/files/Jubler-"/>
+
+    <architect tag="any" os="" arch="">
+        <launcher exec="${JAVABIN}">
+            <argument value="-jar"/>
+            <argument value="${APPHOME}/Jubler.jar"/>
+        </launcher>
+    </architect>
+
+    <architect tag="macosx" os="mac" arch="i386">
+        <launcher exec="${APPHOME}/../../MacOS/JavaApplicationStub"/>
+    </architect>
+
+    <architect tag="macosx" os="mac" arch="ppc">
+        <launcher exec="${APPHOME}/../../MacOS/JavaApplicationStub"/>
+    </architect>
+
+    <architect tag="macosx" os="mac" arch="x86">
+        <launcher exec="${APPHOME}/../../MacOS/JavaApplicationStub"/>
+    </architect>
+
+    <architect tag="linux_i386" os="Linux" arch="i386">
+        <launcher exec="${JAVABIN}">
+            <argument value="-jar"/>
+            <argument value="${APPHOME}/Jubler.jar"/>
+        </launcher>
+    </architect>
+
+    <architect tag="linux_amd64" os="Linux" arch="amd64">
+        <launcher exec="${JAVABIN}">
+            <argument value="-jar"/>
+            <argument value="${APPHOME}/Jubler.jar"/>
+        </launcher>
+    </architect>
+
+    <architect tag="win32" os="Windows" arch="x86">
+        <launcher exec="${APPHOME}\Jubler.exe"/>
+    </architect>
+
+	<version release="1106" version="4.6.1">
+		<description>
+			Fixed ffdecode library for 64 bit Mac OS X. Dutch translation.
+		</description>
+		<arch name="win32">
+			<file name="Jubler.exe" sourcedir="4.6.1" destdir="${APPHOME}" size="720681" compress="gz"/>
+		</arch>
+		<arch name="macosx">	
+			<file name="Info.plist" sourcedir="4.6.1" destdir="${APPHOME}/../../" size="601" compress="gz"/>
+			<file name="Jubler.jar" sourcedir="4.6.1" destdir="${APPHOME}" size="675217" compress="gz"/>
+			<file name="libffdecode.jnilib" sourcedir="4.6.1" destdir="${APPHOME}/lib" size="4902215" compress="gz"/>
+		</arch>
+		<arch name="any">
+			<file name="Jubler.jar" sourcedir="4.6.1" destdir="${APPHOME}" size="675217" compress="gz"/>
+		</arch>
+		<arch name="all">
+			<file name="nl.jar" sourcedir="4.6.1" destdir="${APPHOME}/i18n" size="29264" compress="gz"/>
+		</arch>
+	</version>
+
+	<version release="1083" version="4.6">
+		<description>
+			Plugin system introduced. Updates to GoogleTranslate, MPlayer. Many bug fixes ans minor improvements.
+		</description>
+		<arch name="win32">
+			<file name="Jubler.exe" sourcedir="4.6" destdir="${APPHOME}" size="720582" compress="gz"/>
+		</arch>
+		<arch name="macosx">
+			<file name="Info.plist" sourcedir="4.6" destdir="${APPHOME}/../../" size="599" compress="gz"/>
+			<file name="Jubler.jar" sourcedir="4.6" destdir="${APPHOME}" size="675200" compress="gz"/>
+			<file name="macapp.jar" sourcedir="4.6" destdir="${APPHOME}/lib/" size="4565"/>
+		</arch>
+		<arch name="any">
+			<file name="Jubler.jar" sourcedir="4.6" destdir="${APPHOME}" size="675200" compress="gz"/>
+		</arch>
+		<arch name="all">
+			<file name="aspell.jar" sourcedir="4.6" destdir="${APPHOME}/lib/" size="6578"/>
+			<file name="autoupdate.jar" sourcedir="4.6" destdir="${APPHOME}/lib/" size="1940"/>
+			<file name="basetextsubs.jar" sourcedir="4.6" destdir="${APPHOME}/lib/" size="20847"/>
+			<file name="googletranslate.jar" sourcedir="4.6" destdir="${APPHOME}/lib/" size="18881"/>
+			<file name="mplayer.jar" sourcedir="4.6" destdir="${APPHOME}/lib/" size="8032"/>
+			<file name="zemberek.jar" sourcedir="4.6" destdir="${APPHOME}/lib/" size="3193"/>
+			<file name="cs.jar" sourcedir="4.6" destdir="${APPHOME}/i18n/" size="28377"/>
+			<file name="de.jar" sourcedir="4.6" destdir="${APPHOME}/i18n/" size="27379"/>
+			<file name="el.jar" sourcedir="4.6" destdir="${APPHOME}/i18n/" size="33120"/>
+			<file name="es.jar" sourcedir="4.6" destdir="${APPHOME}/i18n/" size="29243"/>
+			<file name="fr.jar" sourcedir="4.6" destdir="${APPHOME}/i18n/" size="30089"/>
+			<file name="it.jar" sourcedir="4.6" destdir="${APPHOME}/i18n/" size="30813"/>
+			<file name="pt.jar" sourcedir="4.6" destdir="${APPHOME}/i18n/" size="29012"/>
+			<file name="sr.jar" sourcedir="4.6" destdir="${APPHOME}/i18n/" size="20194"/>
+			<file name="tr.jar" sourcedir="4.6" destdir="${APPHOME}/i18n/" size="27872"/>
+			<file name="jubler-faq.html" sourcedir="4.6" destdir="${APPHOME}/help/" size="5402" compress="gz"/>
+		</arch>
+	</version>
+
+	<version release="775" version="4.1.3">
+        <description>
+			Fixed Save not wroking. Fixed Recents menu, when display non-existent entries.
+        </description>
+		<arch name="win32">
+            <file name="Jubler.exe" sourcedir="4.1.3" destdir="${APPHOME}" size="750826" compress="gz"/>
+		</arch>
+		<arch name="any">
+            <file name="Jubler.jar" sourcedir="4.1.3" destdir="${APPHOME}" size="706856" compress="gz"/>
+		</arch>
+	</version>
+
+	<version release="684" version="4.1.2">
+        <description>
+			Fixed a bug in x64 version of Windows. Fixed a bug in trimmed 64-bit Leopard.
+        </description>
+		<arch name="win32">
+            <file name="Jubler.exe" sourcedir="4.1.2" destdir="${APPHOME}" size="750138" compress="gz"/>
+		</arch>
+		<arch name="macosx">
+            <file name="Jubler.jar" sourcedir="4.1.2" destdir="${APPHOME}" size="706775" compress="gz"/>
+            <file name="JavaApplicationStub" sourcedir="4.1.2" destdir="${APPHOME}/../../MacOS" size="8714" compress="gz"/>
+            <chmod file="${APPHOME}/../../MacOS/JavaApplicationStub" attr="a+x"/>
+		</arch>
+	</version>
+
+    <version release="681" version="4.1.1">
+        <description>
+			Updated auto-update library. Fixed bug not updating Recents menu. Fixed bug agressively truncating save file name. Modular translation files.
+        </description>
+		<arch name="macosx">
+            <file name="Jubler.jar" sourcedir="4.1.1" destdir="${APPHOME}" size="706794" compress="gz"/>
+            <file name="jupidator.jar" sourcedir="4.1.1" destdir="${APPHOME}/lib" size="121077"/>
+            <file name="cs.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="28706"/>
+            <file name="de.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="29094"/>
+            <file name="el.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="31983"/>
+            <file name="es.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="29504"/>
+            <file name="fr.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="21845"/>
+            <file name="pt.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="29361"/>
+            <file name="sr.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="20822"/>
+            <file name="tr.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="29658"/>
+		</arch>
+		<arch name="win32">
+            <file name="Jubler.exe" sourcedir="4.1.1" destdir="${APPHOME}" size="750790" compress="gz"/>
+            <file name="jupidator.jar" sourcedir="4.1.1" destdir="${APPHOME}/lib" size="121077"/>
+            <file name="cs.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="28706"/>
+            <file name="de.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="29094"/>
+            <file name="el.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="31983"/>
+            <file name="es.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="29504"/>
+            <file name="fr.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="21845"/>
+            <file name="pt.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="29361"/>
+            <file name="sr.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="20822"/>
+            <file name="tr.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="29658"/>
+		</arch>
+		<arch name="linux_amd64">
+            <file name="Jubler.jar" sourcedir="4.1.1" destdir="${APPHOME}" size="706794" compress="gz"/>
+            <file name="jupidator.jar" sourcedir="4.1.1" destdir="${APPHOME}/lib" size="121077"/>
+            <file name="cs.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="28706"/>
+            <file name="de.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="29094"/>
+            <file name="el.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="31983"/>
+            <file name="es.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="29504"/>
+            <file name="fr.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="21845"/>
+            <file name="pt.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="29361"/>
+            <file name="sr.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="20822"/>
+            <file name="tr.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="29658"/>
+		</arch>
+		<arch name="linux_i386">
+            <file name="Jubler.jar" sourcedir="4.1.1" destdir="${APPHOME}" size="706794" compress="gz"/>
+            <file name="jupidator.jar" sourcedir="4.1.1" destdir="${APPHOME}/lib" size="121077"/>
+            <file name="cs.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="28706"/>
+            <file name="de.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="29094"/>
+            <file name="el.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="31983"/>
+            <file name="es.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="29504"/>
+            <file name="fr.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="21845"/>
+            <file name="pt.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="29361"/>
+            <file name="sr.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="20822"/>
+            <file name="tr.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="29658"/>
+		</arch>
+		<arch name="any">
+            <file name="Jubler.jar" sourcedir="4.1.1" destdir="${APPHOME}" size="706794" compress="gz"/>
+            <file name="jupidator.jar" sourcedir="4.1.1" destdir="${APPHOME}/lib" size="121077"/>
+            <file name="cs.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="28706"/>
+            <file name="de.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="29094"/>
+            <file name="el.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="31983"/>
+            <file name="es.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="29504"/>
+            <file name="fr.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="21845"/>
+            <file name="pt.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="29361"/>
+            <file name="sr.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="20822"/>
+            <file name="tr.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="29658"/>
+		</arch>
+    </version>
+
+    <version release="669" version="4.1">
+        <description>
+            Only one instance of Jubler is now run in a system. Every file remembers loading parameters and uses it when saving. Improved load/save dialog, which encapsulates the information inside the load dialog. General GUI improvements, especially in Mac OSX. Relaxed file loading, when file contains encoding errors. Improved subtitle support. Improved visuals in Video Console window. More compact Preferences dialog. Minor changes and bug fixes.
+        </description>
+		<arch name="macosx">
+            <file name="Jubler.jar" sourcedir="4.1" destdir="${APPHOME}" size="924599" compress="bzip2"/>
+		</arch>
+		<arch name="win32">
+            <file name="Jubler.exe" sourcedir="4.1" destdir="${APPHOME}" size="975784" compress="bzip2"/>
+		</arch>
+		<arch name="linux_i386">
+            <file name="Jubler.jar" sourcedir="4.1" destdir="${APPHOME}" size="924599" compress="bzip2"/>
+		</arch>
+		<arch name="linux_amd64">
+            <file name="Jubler.jar" sourcedir="4.1" destdir="${APPHOME}" size="924599" compress="bzip2"/>
+		</arch>
+		<arch name="any">
+            <file name="Jubler.jar" sourcedir="4.1" destdir="${APPHOME}" size="924599" compress="bzip2"/>
+		</arch>
+    </version>
+
+    <version release="559" version="4.0">
+        <description>
+	Auto-update support. Jubler is able to smart update with minimum user interaction. Improved time fixed tool for overlapping subtitles. Improved FFMPEG color model.
+        </description>
+    </version>
+    <version release="22" version="3.9.6">
+        <description>
+	Improved Google translator parsing engine. Fixed compile issues with ffmpeg under OS X 10.4. Fixed Linux GTK Look and Feel bug with time-spinner under Java 6.0.
+        </description>
+    </version>
+    <version release="21" version="3.9.5">
+        <description>
+	Autosave/recovery of changed subtitles. Automatic translate of subtitles through Google. Updated to latest FFMPEG.  Small GUI improvements. Better SRT support. Minor bug fixes and enhancements.
+        </description>
+    </version>
+    <version release="20" version="3.9.0">
+        <description>
+	Improved user interface. Preview interface integrated inside main Jubler window. Subtitle number is now visible, if desired. Use of preset file encodings. Visual display, using color, of affected subtitles. Maximize waveform visualization. Support of AAC audio streams.
+        </description>
+    </version>
+    <version release="19" version="3.4.1">
+        <description>
+	MPlayer uses threads to properly handle out and error stream. Updated to latest	ffmpeg library. Support of correct MIME type under Linux.
+        </description>
+    </version>
+    <version release="18" version="3.4.0">
+        <description>
+	SRT supports font formatting. Subtitle statistics. Better handling of preview bars. Improved splitting interface. Updated Media files configuration. Display number of lines and characters per line while editing. MPlayer display formatted subtitles - use of ASS format instead of SRT. Linux man and doc paths fixed.  Support for Quicktime Texttrack subtitles. Fixed an error with MPL2 subtitles.  Frame icon now properly display under Windows/Linux. Quit confirmation dialogue properly works under Mac. Check for new version only once per day.  Better display of selected subtitles. Fixed serious memory allocation error in Windows. Various bug fixes and updates.
+        </description>
+    </version>
+    <version release="17" version="3.3.0">
+        <description>
+	Automatic detection of MPlayer/ASpell executables. Preview window GUI updates.  Alt-mousewheel / alt-click slows down rotation in JTimeSpinner boxes.  Support for Spruce DVDMaestro (STL) and MPL2 subtitles (without formatting).  Fixed autoload for Java 1.6 in Linux. Added missing tooltips. Fixed gettext bug with ' character. Improved ffmpeg support. Keep application alive if "Close window" is selected. New window will not fully overlap old one.  Spanish, French and Serbian translations introduced. Czech, German, Portuguese and Greek translation corrections. Various bug fixes and usability improvements.
+        </description>
+    </version>
+    <version release="16" version="3.2.0">
+        <description>
+	Doube click on icons launch Jubler (in Mac OSX, Windows and Debian systems).  MPlayer fixes. Jubler installs in systems with JRE 1.6. MPlayer supports different audio stream. Video playback doesn't change system mixers. FFMPEG time offset and WMV bug fixes. Better handling of audio caches. Updated to newer version of FFMPEG. ASpell updates supported languages when opening preferences. Major internal changes and cleanups. Initial Debian package.
+        </description>
+    </version>
+    <version release="15" version="3.1.0">
+        <description>
+	Read frames per second from the movie now supported. Movie synchronization on the fly, based on time differences between time points supported. Updated recoring of subtitles on the fly. A lot of fine tuning. Zemberek updates.
+        </description>
+    </version>
+    <version release="14" version="3.0.0">
+        <description>
+	FFDecode bugs fixed, preview should be much more stable and accurate. Preview bug fixed, where wrong duration was reported. Tools remember last values.  Column width is now saved. Now it is compatible with latest version of MPlayer.  Updated to newest ffmpeg sources. Turkish translation added. Support for zemberek added. Preliminary built-in FAQ subsystem. Tweaks and code changes.  New icons and splash screen. Linux installation script fixes. Supports cocoASpell under Mac OSX.
+        </description>
+    </version>
+    <version release="13" version="3.0.0-rc4">
+        <description>
+	Fixed bugs: audio line not closing, saving file with an illegal character set, banner not closing, Jubler crashing when audio codec could not be opened, Jubler didn't start under Linux. Mac OSX port is now universal binary.  Synchronize subtitle texts and timestamps. Subtitle preview updates live on key events. Automatic version check through internet. Smaller code changes.
+        </description>
+    </version>
+    <version release="12" version="3.0.0-rc3">
+        <description>
+	Initial Mac OS X version. Big endian bugs fixed. "Quit" introduced. Menu shortcuts are now editable. MPlayer threading issues fixed. Cache is created only when needed. Full AC3 support.
+        </description>
+    </version>
+    <version release="11" version="3.0.0-rc2">
+        <description>
+	Great speedup improvements were made on subtitle preview. Alpha channel values in SSA/ASS format were flipped. MPlayer options may now be edited. Recent items are sorted according to their call. A bug with the installer not properly detecting JRE was fixed. Subtitle preview fixes were done.
+        </description>
+    </version>
+    <version release="10" version="3.0.0-rc1">
+        <description>
+	Czech translation. Subtitle text display on frame preview (draft and full details) using Java 2D. Default display frame when no library is present, or no actual frame preview is required. When FFDecode library is missing, a notice is displayed and no more a popup dialog appers. Subtitle is movable on wave panel too (in preview). Display subtitle time when moving subtitles in preview. Revert, clone and open recent subtitles in File menu. Video preview in normal and half size. Reparent current subtitles (for translations). MPlayer now supports default font size (and font name in Linux). Only static version of ffmpeg for linux is provided. Varius bug fixes.
+        </description>
+    </version>
+    <version release="9" version="2.9.9">
+        <description>
+	Preview of subtitles added (dependance on FFMPEG library). Frame preview of the current frame, waveform preview and waveform listening is supported.  Graphically display of subtitles, which can be moved and resized. Jubler no longer distributed as JAR file but using self expandable platform specific installers (due to FFMPEG). Mouse wheel over subtitle time changes its value.  Various bug fixes and other enchacements.
+        </description>
+    </version>
+    <version release="8" version="2.5.1">
+        <description>
+	Fix while trying to save a splitted subtitle file.
+        </description>
+    </version>
+    <version release="7" version="2.5.0">
+        <description>
+	Suport for SubStation Alpha (SSA), Advanced SubStation (ASS), and SubViewer (1+2) subtitle formats. A German translation. Styles are supported (when saving in SubStation formats). A translating mode. A lot of fine tuning and bugfixes.
+        </description>
+    </version>
+    <version release="6" version="2.0.0">
+        <description>
+	Mostly code cleanup and changes in the "about" box.
+        </description>
+    </version>
+    <version release="5" version="2.0-rc1">
+        <description>
+	This version adds I18n support through gettext.
+        </description>
+    </version>
+    <version release="4" version="1.9.3">
+        <description>
+	Find and replace and global replace features were added. The focus of the subtitle textbox was fixed.
+        </description>
+    </version>
+    <version release="3" version="1.9.1">
+        <description>
+	Enhancements were made to the command line arguments of mplayer in order to play correctly under the Windows ports of MPlayer. A few unimportant corrections were made to the ASpell options.
+        </description>
+    </version>
+    <version release="2" version="1.9.0">
+        <description>
+	This version has great improvements in the mplayer frontend, ASpell support, GUI lifting, and new tools.
+        </description>
+    </version>
+    <version release="1" version="0.9">
+        <description>
+	Initial announcement
+        </description>
+    </version>
+</updatelist>
\ No newline at end of file
diff --git a/media-video/jubler/jubler-4.6.1-r3.ebuild b/media-video/jubler/jubler-4.6.1-r3.ebuild
new file mode 100644
index 000000000000..c8541a6b8181
--- /dev/null
+++ b/media-video/jubler/jubler-4.6.1-r3.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+WANT_ANT_TASKS="ant-nodeps ant-contrib"
+inherit fdo-mime eutils java-pkg-2 java-ant-2 toolchain-funcs
+
+MY_PN=${PN/#j/J}
+DESCRIPTION="Java subtitle editor"
+HOMEPAGE="http://www.jubler.org/"
+SRC_URI="https://${PN}.googlecode.com/files/${MY_PN}-source-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="mplayer nls spell"
+
+RDEPEND=">=virtual/jre-1.5
+	virtual/ffmpeg
+	mplayer? ( media-video/mplayer[libass] )
+	spell? (
+		app-text/aspell
+		>=dev-java/zemberek-2.0[l10n_tr]
+	)"
+
+DEPEND=">=virtual/jdk-1.5
+	virtual/ffmpeg
+	app-text/xmlto
+	>=dev-java/jupidator-0.6.0
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+src_unpack() {
+	unpack ${A}
+	cp "${FILESDIR}"/update-${PV}.xml "${S}" || die
+}
+
+java_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-ffmpeg-1.patch
+	epatch "${FILESDIR}"/${P}-ffmpeg-2.patch
+	chmod +x resources/installers/linux/iconinstall
+	#cd resources/libs || die
+	java-pkg_jarfrom --build-only --into resources/libs jupidator
+	rm -R plugins/{autoupdate,macapp} || die "unneeded plugin cleanup failed"
+	rm -R resources/libs/ant-contrib || die "jar cleanup failed"
+	if ! use mplayer; then
+		rm -R plugins/mplayer || die "mplayer plugin removal failed"
+	fi
+	if ! use spell; then
+		rm -R plugins/{zemberek,aspell} || die "spellcheck plugin removal failed"
+	fi
+	sed -i -e "s/CODEC_TYPE/AVMEDIA_TYPE/g" $(find resources/ffmpeg/ffdecode -name "*.c")
+	sed -i -e "s:PKT_FLAG_KEY:AV_PKT_FLAG_KEY:g" $(find resources/ffmpeg/ffdecode -name "*.c")
+}
+
+src_compile() {
+	java-pkg_filter-compiler ecj-3.2
+	ANT_TASKS="ant-nodeps ant-contrib" eant $(use nls && echo allparts) $(use nls || echo parts) help changelog || die "eant failed"
+	#cp -v dist/help/jubler-faq.html build/classes/help || die "cp failed"
+	cd resources/ffmpeg/ffdecode || die
+	CC=$(tc-getCC) NOSTRIP=true emake linuxdyn || die "make failed"
+}
+
+src_install() {
+	java-pkg_dojar dist/Jubler.jar
+	use nls && java-pkg_dojar dist/i18n/*.jar
+	insinto /usr/share/jubler/lib/lib
+	doins dist/lib/*.jar  || die "Plugin installation failed"
+	#java-pkg_dojar dist/lib/*.jar
+	use spell && java-pkg_register-dependency zemberek zemberek2-cekirdek.jar
+	use spell && java-pkg_register-dependency zemberek zemberek2-tr.jar
+	java-pkg_doso resources/ffmpeg/ffdecode/libffdecode.so
+	doicon resources/installers/linux/jubler.png
+	domenu resources/installers/linux/jubler.desktop
+
+	DESTDIR="${D}" eant linuxdesktopintegration
+	rm -vr "${D}/usr/share/menu" || die
+
+	java-pkg_dolauncher jubler --main Jubler
+	dohtml ChangeLog.html || die "dohtml failed"
+	dodoc README || die "dodoc failed"
+	doman resources/installers/linux/jubler.1 || die "doman failed"
+	insinto /usr/share/jubler/help
+	doins dist/help/* || die "doins failed"
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/media-video/jubler/jubler-5.1.ebuild b/media-video/jubler/jubler-5.1.ebuild
new file mode 100644
index 000000000000..05d272f4c3d5
--- /dev/null
+++ b/media-video/jubler/jubler-5.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit fdo-mime java-pkg-2 java-ant-2
+
+MY_PN="${PN^}"
+
+DESCRIPTION="Java subtitle editor"
+HOMEPAGE="http://www.jubler.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-source-${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mplayer spell nls"
+
+RDEPEND="
+	mplayer? ( media-video/mplayer[libass] )
+	spell? ( app-text/aspell )
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	default
+
+	local REMOVE_PLUGINS=() _plugin
+	use mplayer || REMOVE_PLUGINS+=( mplayer )
+	use spell || REMOVE_PLUGINS+=( aspell zemberek )
+	for _plugin in "${REMOVE_PLUGINS[@]}"; do
+		rm -rv "plugins/${_plugin}" || die
+	done
+}
+
+src_compile() {
+	local JUBLER_TARGETS=()
+	use nls || JUBLER_TARGETS+=( core help )
+	eant -f "${S}/build.xml" "${JUBLER_TARGETS[@]}"
+}
+
+src_install() {
+	DESTDIR="${D}" eant linuxdesktopintegration
+	rm -rv "${D}/usr/share/menu" || die
+
+	doicon "resources/installers/linux/${PN}.png"
+	domenu "resources/installers/linux/${PN}.desktop"
+
+	java-pkg_dojar dist/Jubler.jar
+	java-pkg_dolauncher "${PN}" --main Jubler
+
+	if use nls; then
+		insinto "/usr/share/${PN}/lib/i18n/"
+		doins dist/i18n/*.jar
+	fi
+
+	insinto "/usr/share/${PN}/lib/themes"
+	doins dist/themes/coretheme.jar
+	insinto "/usr/share/${PN}/lib/lib"
+	doins dist/lib/*.jar
+
+	insinto "/usr/share/${PN}/help"
+	doins resources/help/*
+
+	doman "resources/installers/linux/${PN}.1"
+	einstalldocs
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/media-video/jubler/metadata.xml b/media-video/jubler/metadata.xml
new file mode 100644
index 000000000000..ebc08c4e9cdb
--- /dev/null
+++ b/media-video/jubler/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">jubler</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
new file mode 100644
index 000000000000..a93801fd9a28
--- /dev/null
+++ b/media-video/kaffeine/Manifest
@@ -0,0 +1,12 @@
+AUX kaffeine-2.0.9-kf5.34.patch 691 SHA256 0ba0e2c82e01ff12ffc09ec1a4d61984c3abefb1a6e7c82362aee1951683254d SHA512 4078bd1542fd344321333d4566c0c9756b7b8bc19624a36b8dc3e622f3048304c256042c283c54b639aae23562af590355240d4bf953959a439cb1c3b54c0b3e WHIRLPOOL bbde8d778aca60178c85f0cb6291c317d8d6d90b5af01c0887e807689bd1b7a2243e75a2f53d67af25d16361b5e7364f7bb20f3c7ae4682239eb5b3f774a69c9
+DIST kaffeine-2.0.12.1.tar.xz 4412824 SHA256 abd3b4a97ae2af930f506652984198e7ec929640f8cb0a6dbb4af6555cd06ec5 SHA512 479b22ed8f11ea452e1788623cfc1e341002a00fa0a0420b8f33e5255844ca4be7d2a95ac2120e0b0793521bae937cd573186b27a803960d2728f3ae8d518137 WHIRLPOOL 030cfe7b5cb01e5c5acdafc9a3f36d2e59bbed48e203497c8c7d9d96284077e97b4b92ca4c952a4d2dce8531340777b79b45bc6c54df3130fc10cd2ee7b87030
+DIST kaffeine-2.0.12.tar.xz 4371652 SHA256 a19eb8262f1f35b013c3ea5aa66fd7cd99d624643db718d2e9d36d9dd7a796ca SHA512 e53206095e6c06a7caca3f81ab198dadb68fecf8ac5f762b39d55b22d1fe33dab558617226ea06f740a3ad8bf1693809a2a0b3e2618600a9a33a17273b6aed86 WHIRLPOOL 1dc51bcb9f1fc0621adce7e805944c336429583f98980b545b4e8050f37d4bcf253715eaa876921f16d56e70b3adba088bf6cdd584e2b0a8d50013c74cb560e7
+DIST kaffeine-2.0.13.tar.xz 4374124 SHA256 1ac52ac811a9c9e88fcd466a7df13860fcd749cd125e7d533f589e6a6ee176fd SHA512 710d6c5b35f2b2f82094004e8d09edd33ec95c8e0afb64f6dcf2bc14f3e6619ae87712e2a5bd3cde23e886d1e9300510fb0b0c355c33386d4dd238aada2760f5 WHIRLPOOL 3748a8a01289b14a466d3d6651ade04c712350a78ae539811d01ce681b2b2afb96f0882503eccf3e4195ac474429394f874f08560300841f73bc9b9a6860273f
+DIST kaffeine-2.0.9.tar.xz 4398832 SHA256 ac53b697bba4fa97350706698c777908c21c464f7c567fe1a4ce9352e955754f SHA512 5adf86185aaafce4eadda4cfe40af2e0c867477f51b74a464bf813c018ecf035f9e13f47fffd21c0cd547289825441d2d80298ec7035e260f3cc0414c5fdd0d7 WHIRLPOOL 948eecec4957046c6ddee872747959661725f4d9f8408c735803d0dcc82c38dfcc7df6e9e92c46e8fda58e2f53a41ab6cf8c33da4b88f7d89542aa427a486223
+EBUILD kaffeine-2.0.12.1.ebuild 1463 SHA256 3a123d230c9c98bb409ac09732d8edbb494c92d63ff273f9f4798b916557e0bb SHA512 56617338875149ae8e217e1af458deb486c28f95d3d9789c5a43877aca16883c0e9479eb288ea92ade4e965a5f28cf6fdb20d7e8afa393167ea600fa2da37f77 WHIRLPOOL 9569c230db5e20c04c5a277f014e5cb4f8c312cd24c3fe19791f07dac1fb2b43af82da418a64c9f0d9901f52b3d69e252edfb8ece1a2346288e149b7d03d0610
+EBUILD kaffeine-2.0.12.ebuild 1244 SHA256 bbdc7f1c46a46ea01e7733d32664f3cebfe9c61c6a2164c47e003999564fbba5 SHA512 d98c56497c0780cfc260725689f7394ccd70b8e2d67029681f5277f901c75bc730b57593234e423f9cb0175f4628c65616f9fcff7a250a43bd1690c32e565d3b WHIRLPOOL d3aa2da8a2cce0d1cfe40a6a5fdf9bf3e4e859df51591b64e5233c6525233c190a0703fb6c7515f6935f6d968dffa028dac6c7f1dd975fab1feb305ca39bd6a4
+EBUILD kaffeine-2.0.13.ebuild 1424 SHA256 47e329632d8f899d3d7b4def51e23592892b82d132f0d0c2e714bffcb3e5b0d1 SHA512 65654bf1645b0e0b0e72b1c993b39c4459e426a48db19de18a466650b832a6b104129decd29b26b7d426f208bfcecbb5282739c3eb0e33423ed51732118fe149 WHIRLPOOL 95777ba2e4e713e2c4f5458f6e7492f79d9c8abe1e4d755eb928a5a0a0a0096b6c93322b80e9033a68050593ab8df07859d77bf63fb021920b8bbe4c36c213e4
+EBUILD kaffeine-2.0.9.ebuild 1516 SHA256 750735c0795a2ef48a125a15ab10d90c00e471632e5ff373ebb52cf21a122d4e SHA512 108f38faafd1fccd302a4ebde30079ee8e2718e57e9335c473249ab4154264c99a395034c6feff9ddded6707c3d95d9885b64bad11cba1602d7afc8c78506832 WHIRLPOOL 6345d6992cdff7746601f6b243547fb60bc57f1c88bf37700ab723880df2aa0d19e008b394b4c4ba79f80160bf5bb013eebbcbff9d3404adc6a7cccc0ef5cd78
+MISC ChangeLog 6300 SHA256 8573c219c0f82aec4a82229257d1f49d8ef8bde6ac65aacd8830cfc1d10aa7ca SHA512 5c0d2711989efdc9686f8c09fef5b21c603454ffab09b83afec1d3afb531a73d778349bd233dc83d179891d5ea94e9344d8116c8163966c2695dd2210c3cdb71 WHIRLPOOL 946878b7e78b4af8acefb9365ca7dd28faf651713ab56c793d3f0eeb12ff252c2b7cdaab7dfcca0c11212e45fdb42fdd9e12670bd64e6319697b46daa64098be
+MISC ChangeLog-2015 19354 SHA256 37ee70db03aa1b08b7afaf3a54df51b0fa1a4702f1a4c269d483a095bef79175 SHA512 34bf6246e25005249fde917b52da4bd019ca382e03627a23b0761f9f6dfc3840b51a45f0f6fda60a74f36561deffa8e17ebe3875d1caecf9f102acf55972ca9d WHIRLPOOL 28fefd3e498dfbc95fe42391b1f1d6043ad63ae7e2555f9c0f69154790d539c85f149aaf7565f4691db66b8b484280a7894807efe857b4c4aa653e1f2a17c49f
+MISC metadata.xml 447 SHA256 2f8fc7976dc6e420e2d36e90a7bbd03dbadf3ea0f57d96ba0bccc283a030a9d6 SHA512 e2c7a2f56b06dae76e7714fa7a2b2170b47330712bf6b9d91a22854d75469bef20e16b916678674e81ba089f920d9bd27b04cd796cabb7fc4762f79740828d7c WHIRLPOOL 01523797e5b8d0977f4b11ff6ab418d4628137fcdc693e5d589ff6a396d3d4505c0aed22cea1652a3e3194a1e8f7d7e0770ab9a7f84cccaa9f6c1aa00dae1a8c
diff --git a/media-video/kaffeine/files/kaffeine-2.0.9-kf5.34.patch b/media-video/kaffeine/files/kaffeine-2.0.9-kf5.34.patch
new file mode 100644
index 000000000000..3fba1d22ba98
--- /dev/null
+++ b/media-video/kaffeine/files/kaffeine-2.0.9-kf5.34.patch
@@ -0,0 +1,22 @@
+commit 657c11d76271f66fc3f40b60c5ba782061e8d895
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date:   Wed May 17 20:15:43 2017 +0200
+
+    Remove duplicate call of ki18n_install
+    
+    Release script is adding this as well to tarball CMakeLists.txt.
+    That has worked in the past, but is fatal in KDE Frameworks 5.34.
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9a88958..3c4601d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -95,8 +95,6 @@ add_subdirectory(src)
+ if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
+   if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/po/CMakeLists.txt" )
+     add_subdirectory(po)
+-  else()
+-    ki18n_install(po)
+   endif()
+ endif()
+ 
diff --git a/media-video/kaffeine/kaffeine-2.0.12.1.ebuild b/media-video/kaffeine/kaffeine-2.0.12.1.ebuild
new file mode 100644
index 000000000000..6c8e28ca7731
--- /dev/null
+++ b/media-video/kaffeine/kaffeine-2.0.12.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+inherit kde5
+
+DESCRIPTION="Media player with digital TV support by KDE"
+HOMEPAGE="https://kaffeine.kde.org/"
+SRC_URI="mirror://kde/stable/${PN}/$(get_version_component_range 1-3)/src/${P}.tar.xz"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.3 )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsql 'sqlite')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	media-libs/libv4l
+	media-video/vlc[X]
+	x11-libs/libXScrnSaver
+"
+DEPEND="${CDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+RDEPEND="${CDEPEND}
+	!media-video/kaffeine:4
+"
+
+DOCS=( Changelog NOTES README.md )
+
+src_prepare() {
+	default
+
+	if ! use handbook ; then
+		sed -i CMakeLists.txt \
+			-e "/find_package(KF5DocTools CONFIG REQUIRED)/s/^/#/" \
+			-e "/kdoctools_install(po)/s/^/#/" || die
+	fi
+}
+
+src_configure() {
+	# tools working on $HOME directory for a local git checkout
+	local mycmakeargs=(
+		-DBUILD_TOOLS=OFF
+	)
+
+	kde5_src_configure
+}
diff --git a/media-video/kaffeine/kaffeine-2.0.12.ebuild b/media-video/kaffeine/kaffeine-2.0.12.ebuild
new file mode 100644
index 000000000000..eedddad9fe27
--- /dev/null
+++ b/media-video/kaffeine/kaffeine-2.0.12.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+inherit kde5
+
+DESCRIPTION="Media player with digital TV support by KDE"
+HOMEPAGE="https://kaffeine.kde.org/"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.3 )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsql 'sqlite')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	media-libs/libv4l
+	media-video/vlc[X]
+	x11-libs/libXScrnSaver
+"
+DEPEND="${CDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+RDEPEND="${CDEPEND}
+	!media-video/kaffeine:4
+"
+
+DOCS=( Changelog NOTES README.md )
+
+src_configure() {
+	# tools working on $HOME directory for a local git checkout
+	local mycmakeargs=(
+		-DBUILD_TOOLS=OFF
+	)
+
+	kde5_src_configure
+}
diff --git a/media-video/kaffeine/kaffeine-2.0.13.ebuild b/media-video/kaffeine/kaffeine-2.0.13.ebuild
new file mode 100644
index 000000000000..47799bf6d333
--- /dev/null
+++ b/media-video/kaffeine/kaffeine-2.0.13.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+inherit kde5
+
+DESCRIPTION="Media player with digital TV support by KDE"
+HOMEPAGE="https://kaffeine.kde.org/"
+SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.3 )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsql 'sqlite')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	media-libs/libv4l
+	media-video/vlc[X]
+	x11-libs/libXScrnSaver
+"
+DEPEND="${CDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+RDEPEND="${CDEPEND}
+	!media-video/kaffeine:4
+"
+
+DOCS=( Changelog NOTES README.md )
+
+src_prepare() {
+	default
+
+	if ! use handbook ; then
+		sed -i CMakeLists.txt \
+			-e "/find_package(KF5DocTools CONFIG REQUIRED)/s/^/#/" \
+			-e "/kdoctools_install(po)/s/^/#/" || die
+	fi
+}
+
+src_configure() {
+	# tools working on $HOME directory for a local git checkout
+	local mycmakeargs=(
+		-DBUILD_TOOLS=OFF
+	)
+
+	kde5_src_configure
+}
diff --git a/media-video/kaffeine/kaffeine-2.0.9.ebuild b/media-video/kaffeine/kaffeine-2.0.9.ebuild
new file mode 100644
index 000000000000..31cb79ae2e7f
--- /dev/null
+++ b/media-video/kaffeine/kaffeine-2.0.9.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+inherit kde5
+
+DESCRIPTION="Media player with digital TV support by KDE"
+HOMEPAGE="https://kaffeine.kde.org/"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.3 )"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+CDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsql 'sqlite')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	media-libs/libv4l
+	media-video/vlc[X]
+	x11-libs/libXScrnSaver
+"
+DEPEND="${CDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+RDEPEND="${CDEPEND}
+	!media-video/kaffeine:4
+"
+
+DOCS=( Changelog NOTES README.md )
+
+PATCHES=( "${FILESDIR}/${P}-kf5.34.patch" )
+
+src_prepare() {
+	kde5_src_prepare
+
+	# unused dependencies incorrectly added during the release process
+	# they do not appear in upstream git
+	sed -i \
+		-e "/find_package(KF5DocTools CONFIG REQUIRED)/d" \
+		-e "/kdoctools_install(po)/d" \
+		CMakeLists.txt || die
+}
+
+src_configure() {
+	# tools working on $HOME directory for a local git checkout
+	local mycmakeargs=(
+		-DBUILD_TOOLS=OFF
+	)
+
+	kde5_src_configure
+}
diff --git a/media-video/kaffeine/metadata.xml b/media-video/kaffeine/metadata.xml
new file mode 100644
index 000000000000..81fb67df1eba
--- /dev/null
+++ b/media-video/kaffeine/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">kaffeine</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/kamerka/Manifest b/media-video/kamerka/Manifest
new file mode 100644
index 000000000000..53271205e01e
--- /dev/null
+++ b/media-video/kamerka/Manifest
@@ -0,0 +1,5 @@
+DIST kamerka-0.12_p20161002.tar.gz 139348 SHA256 3e6f54f97dca81c8be07f87088964dc20e605e127bef314dd18df54f89901a20 SHA512 e0bdf3ff5ea8b928f1865f6de25e36b57b83d4f135eb605cb02bf2647d50230f20c9db94998332afff478aa2363639ec1a8d6dc44351ed3fc33732a24ff61f9b WHIRLPOOL 0d110f3903d173e18907b0b98a93fc8d7979d6cbc5c5420a650d14fa20b648ee4af498831e2430ebbdb4d1f79e25de2463dc127c06b23ffb05cffadd326edf26
+EBUILD kamerka-0.12_p20161002.ebuild 1062 SHA256 bab512025ac721e131591892b79173e116f5cfa8c76955c4988ac0f356ba51d4 SHA512 4afb62452ff657d73aa1bc89363ca4087753d53aff67ce431a02d758e45bdfee68f052a662467aeb660516f34bbf26dd43350a39122e7dbf7b3c9f5acfc7b05d WHIRLPOOL 138aaf5e2042027d443f969b84897327c1c039b816bf9827164a9de531b4ec64cf77ea9b487c05448f663de53bf94b4d92b00ffbabc76751f0b22e1c6cc5c4d1
+MISC ChangeLog 2428 SHA256 c83f1c18164d1f7e72f6001ff6217a6febd4dc036aca66c09da9db051ac51e0a SHA512 a94ae5b4470c53f1cf187973045deb0eb5583cc0b306e89648ff5a553f0da80b93356a61c47c4328670ed99cab90919439a06dcf2f0eee5d827d4b180b88ba7f WHIRLPOOL bb1d78480fa2225ec9a261ee010c14e1a0605082108c4c4f444f5f6899ac78fa33692de6528480c2dc43701f5d7a52e6eaaf1f10d3540be19d3281e6aea075ff
+MISC ChangeLog-2015 2228 SHA256 af0988707ec955688f648b7c76c8081666983fede4974bd9ed3fcdc14cbbd456 SHA512 b4e2d05bf76570d335b671691e4774b3cc31a861db21fcbb73e168ad303dc1d6bad3b33791aee0323b98631a0ffd134c823a9178553fd779d6b5d706eb429c42 WHIRLPOOL 10bc5ab64fe5c20a82bb16694d1f90ead2d6a474141db0eefd5021f58ee7ad81b77225dc13f9857443d4112a5b68b9d025e8c6556622d38918d8e5ae4196a4bd
+MISC metadata.xml 326 SHA256 f5b8de865c8dacfcf595a755e11ff48aae9bc45c0f2030261acde5a1e7effffe SHA512 4fa92e1c40db08a5c84bfd85718bbd42623919947142989822885d1c86b4327807b72a874ab70f24cc7d0a5bc774fa99db7778606e377c89dda5d83c07fe10eb WHIRLPOOL 682bf8757edac36bd809ad9885a46fc45edfea90efda5e6184ceed0af61730017de519639cef2fcd1369e96e7bb566732e6e32cfbd346eb74de286fc75cdfe0d
diff --git a/media-video/kamerka/kamerka-0.12_p20161002.ebuild b/media-video/kamerka/kamerka-0.12_p20161002.ebuild
new file mode 100644
index 000000000000..634eb57e1a86
--- /dev/null
+++ b/media-video/kamerka/kamerka-0.12_p20161002.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT="a201df47a0849a09a20617fedfee26a407dc847c"
+inherit kde5 vcs-snapshot
+
+DESCRIPTION="Simple photo taking application with fancy animated interface"
+HOMEPAGE="https://dos1.github.io/kamerka/ https://github.com/dos1/kamerka"
+SRC_URI="https://github.com/dos1/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtwidgets)
+	media-libs/libv4l
+	media-libs/phonon[qt5(+)]
+	media-libs/qimageblitz[qt5]
+"
+RDEPEND="${DEPEND}"
diff --git a/media-video/kamerka/metadata.xml b/media-video/kamerka/metadata.xml
new file mode 100644
index 000000000000..5102ce2c9ecf
--- /dev/null
+++ b/media-video/kamerka/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">dos1/kamerka</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/kamoso/Manifest b/media-video/kamoso/Manifest
new file mode 100644
index 000000000000..9b62638c8658
--- /dev/null
+++ b/media-video/kamoso/Manifest
@@ -0,0 +1,4 @@
+DIST kamoso-3.2.4.tar.xz 178976 SHA256 e1d92b2dabec109005c67ea1bfc0411a65107b0a3c491d5522913b6b906ece04 SHA512 5665887e00e61c37a6079ad4fda800a507a57c3da6ee76daffb63e59d23c69e8b76063fc1383f5ef5f8c7fc3b91fee2f6e8ebe41945ca26a6a12e07249bacf2b WHIRLPOOL 52de154a06bba00213331f5b298e80c379a5c0dec1c4513b705f16e653dfe0283f63ac461d00c411f3805132931be15ef27cbf44af54a3855b93e7775a4b64b5
+EBUILD kamoso-3.2.4.ebuild 821 SHA256 c51070aef08f3e0aa6d91be519a605d8e74f1507281f2a2b47882ec44f6f4dfb SHA512 26e42304681e8c9cf10f6fbe6c7030ca720f773b30424bbcdd830c9be1081799c1ddd2b6670ef1415dc891aca9eff3cfe63f6acea6523ba9826fb4d594718bac WHIRLPOOL e5d0078489e9c51d7265f73d671f439fff98994b420a2fd7aa1ce28ef643e72561a945cd11577cc742529fca2536cf563acff23cfc46b84d3ee9dd360cb46e2e
+MISC ChangeLog 2041 SHA256 79799cd7d2cc71072c5b3c2c38ffb405b5a602becf3db456291176b75d451748 SHA512 a2a5877f3723ce05500b2dc7fd81c26b6388fc57947cb1417c9491b55ea615128ac351bfd7a1740d298c2a0734eafaed633ce76be2d08d62bf05d389871d5ff6 WHIRLPOOL 14e11b4a1e56fe6a1bf08455b95009926f6fcc1d62df4eea00a1d1c70d2b9b8de181cfbe6047369041395f3232e8412906969dac1b5112dc686992ba60558038
+MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/media-video/kamoso/kamoso-3.2.4.ebuild b/media-video/kamoso/kamoso-3.2.4.ebuild
new file mode 100644
index 000000000000..a6e202fdda52
--- /dev/null
+++ b/media-video/kamoso/kamoso-3.2.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5 versionator
+
+DESCRIPTION="Application to take pictures and videos from your webcam by KDE"
+HOMEPAGE="https://userbase.kde.org/Kamoso"
+SRC_URI="mirror://kde/stable/${PN}/$(get_version_component_range 1-2)/src/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/purpose:5
+	media-libs/qt-gstreamer[qt5(+)]
+	virtual/libudev:=
+"
+RDEPEND="${DEPEND}
+	media-plugins/gst-plugins-meta:1.0[alsa,theora,vorbis,v4l]
+"
diff --git a/media-video/kamoso/metadata.xml b/media-video/kamoso/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/media-video/kamoso/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-video/kino/Manifest b/media-video/kino/Manifest
new file mode 100644
index 000000000000..00507dd37c7a
--- /dev/null
+++ b/media-video/kino/Manifest
@@ -0,0 +1,11 @@
+AUX kino-1.3.4-ffmpeg3.patch 6804 SHA256 9a263aae48b4b3d1d16a81584bf27870c2496d28564396f745fb22b0c6c7551c SHA512 d6ba42d70a907887a866c195946a130fcfff63c8caacf68e8de13fe4d43d4e1898df38fbea5afdb498aade03d14822f0c6f1a9b8308729041e1319acd8c2a0bf WHIRLPOOL 3918dcbf5cc8d4125dedc8a115c7f0085d7b79de513cdb058c45211db90d4244e1ca74b4c27b3429e4fa0b2de1e701a5b2fe38a6777e9a8cc459375d0931d64c
+AUX kino-1.3.4-libav-0.7.patch 2001 SHA256 8397b6ca5abd86683a3998d6b283875cd49de64c99a79478549d01b518af0c3d SHA512 f4e52546b3451684add1ce5d539b1630d476e0a6889da0f7b3d827cab0ba5d7dc1b5febaea735188886fdf7f8012402c8aa6baa73aa6ae7ae204e035df33394a WHIRLPOOL 259370caead517108f318676b15f199884b69392730b1c447c101c597b6be42eadf4fc99055031d34f777dcd77fdd2b7a57d5e6c3f8f7c17cdc435bf3cee697e
+AUX kino-1.3.4-libav-0.8.patch 2622 SHA256 a3774d953a9a00df766129e4b8a8c7baf3bf6fd98df6c3e9f4a30c159035d4e1 SHA512 736eeb8f6902704166f48975581ebf2eb9e9edc6da8883d49e5f3710679988da57d796b5a926f27282d88584451ff03983402de66a4a707171674ad2de63d4d4 WHIRLPOOL 0c576267b21488809047f6d12cc37144bb84d2f73859d80bb8febab3061685f18592fe7864b4c0977d32bec01bdaf6720e38f470a3bc4f610202110f50a92668
+AUX kino-1.3.4-libavcodec-pkg-config.patch 451 SHA256 38656f8ccf7bb01e6e1adc8b9e9b53b635a9adfd7b4519bedc33cf53d8779b2a SHA512 4351560f26ea47f3122ac5a44bea48eae48b8efcc6ca10e72adb31ff5c535ed17e7324444bd03a29482351c3100b07a4305f092c687f18d56f813839332f5847 WHIRLPOOL d673e4c820df77e9d25d4e05089b2041e019cd819b03ffe46b04e3682892c7ff49bb6eaa40e7b7e17fb0a9546e7c3ad53660d5db80ddb85912f6f2ea5452580f
+AUX kino-1.3.4-v4l1.patch 635 SHA256 1987582a359314203a3c56982e640d9f26baf53c7c78655e2f47f510c3f2fb06 SHA512 840b9549aa4fa639a090ffdf2e4a65b8b37e5b8c8fd7f13eacb599b6659b0a6c1a435da5f3fbb7ca2b81ce5e2759ef49267af93864aff0426e61eb63d3aede77 WHIRLPOOL 0bf4205b96fef2ba93014f42545d9bbbb2dec29f840d87caefcc4bc29987c5712e95790cb9dfa7b7698a5f7d78a6e28be4f36dc441497f08ce0875eb70d03f67
+DIST kino-1.3.4.tar.gz 11090771 SHA256 114d046d76ad9980180e28ababd3c58a457cc9211d693705ce03a90a66011a08 SHA512 065695e6115f3f994ed89ebf52e64c4b8da100f7a973a8c686fd7e7377104b838968800c6a8e31913fd5e2be568076c60d588b840e51da3d082841546a53fc32 WHIRLPOOL 9d7ecc79d23dd8d8c4c0b64da2cd425f48305a81da6b6ae6acb2cad1f4b78fb9ade26ef0e8d36c560aa5f6340fb7221ac7ff3f08b1fecfcdea7d0b7d9614c034
+EBUILD kino-1.3.4-r1.ebuild 2893 SHA256 77ee3e174f9fa5391c30411be75c211ebb00c1672789b9a4c8a5fe080211bcd9 SHA512 33d51922bc141cc8937c75af230b1ef0e6b29a26870a31bea885d7d0ac6812d61cdf06720100638770b2f22f92966652b3c651745e9f83568ca30590dddc87f3 WHIRLPOOL bd33494c29eaf19b91c4d4caae4b86b20f9d68ec7e769dc8d975dd4234a0a59daf433f0415350204f9d93aa4b86f41065ae20ea3be3744687fdde1a4a8cda763
+EBUILD kino-1.3.4.ebuild 3401 SHA256 14639c7ec8c32e466183c20dbfbbcd25339471182591cf976a45af728dc28ac3 SHA512 7eac2bfb55dc38e725d77557c7310cb98bdbc8d94ca9dbf3f8041eda9a0e33e2b5ef139acd73dd3d10db534227172aeb788ff585ce57fca7bb8a72f8aea06f10 WHIRLPOOL 0228011af564c357b441ebbea41a65de42536f4b8c5c65d1b1adec4d4c9d716821c67785fb1fe17d6101aca5e42577886b3ed841623a5b9495bc84b56bae114a
+MISC ChangeLog 2695 SHA256 7a7a68e50465b414c490393b63e6af6bf7194e3200b232379575bd698ec3261d SHA512 4b41a31ef8788d6379d314c40556d26eda7904674e600a1e65ee312a484015dc1095dc124f4aa78b6261f6b8e0259d3b83a35149b2ebe507b81e4d92111a9e40 WHIRLPOOL 37e9095bc45c5941db769dcad5342704c98f2d939f0e71d148922951120e430a28b7756ece98cc4fcd7c1b6e5f8fef31c283e29420f81d75b5d5ffe5f8c5b520
+MISC ChangeLog-2015 16953 SHA256 dde390d15b3ce9654d8cccc4e1037fb6e048f3d5c031cc9adc0afcb2a6f7696f SHA512 586d31a7f8591b8610b5760cd41bc002bc56211c0b4cdd86293f76ce24ed332088792e331d1945930cc0fcb7604cbdd36c29791708f8c99326d81561a3789429 WHIRLPOOL 02dc3d2fe486d676596dede36ebf7970f1fa84361acde3e830f23e31f25f701819bdb75b52635e7f2f5165410852f7ac8419080792f5f475f9f62e71ebd4648b
+MISC metadata.xml 439 SHA256 b62b35b679d8958b4e390f12e87085725dd60ba2c43da55bc092755a59ed62e7 SHA512 b6c464f30ce0e75cad151021288fbf2e2fa360a978b707108eb39e23bb15d3d91212abbb23fa181c97959bd80ce519e4f26bf59c6a22a99ab19bc5051a0746a4 WHIRLPOOL 265d3bf3f2a1468baa96797bac1b1770027813e72333192d9c582103546445906895a790474b1698f9b5c0bf5e470dd93e5cd4ed00438561f4da887b553af9e4
diff --git a/media-video/kino/files/kino-1.3.4-ffmpeg3.patch b/media-video/kino/files/kino-1.3.4-ffmpeg3.patch
new file mode 100644
index 000000000000..57849d74e5c9
--- /dev/null
+++ b/media-video/kino/files/kino-1.3.4-ffmpeg3.patch
@@ -0,0 +1,157 @@
+--- ./src.orig/frame.cc	2016-12-18 12:25:48.480275083 -0600
++++ ./src/frame.cc	2016-12-18 12:54:17.800740672 -0600
+@@ -103,7 +103,7 @@
+ 	av_register_all();
+ 	libavcodec = avcodec_alloc_context3(NULL);
+ 	avcodec_open2( libavcodec,
+-                       avcodec_find_decoder( CODEC_ID_DVVIDEO ), NULL );
++                       avcodec_find_decoder( AV_CODEC_ID_DVVIDEO ), NULL );
+ 	pthread_mutex_unlock( &avcodec_mutex );
+ 	data = ( unsigned char* ) av_mallocz( 144000 );
+ #if defined(HAVE_SWSCALE)
+@@ -1060,7 +1060,7 @@
+ int Frame::ExtractRGB( void * rgb )
+ {
+ #if defined(HAVE_LIBAVCODEC)
+-	AVFrame *frame = avcodec_alloc_frame();
++	AVFrame *frame = av_frame_alloc();
+ 	AVPicture dest;
+ 	int got_picture;
+ 
+@@ -1072,17 +1072,17 @@
+ 	avcodec_decode_video2( libavcodec, frame, &got_picture, &pkt );
+ 	if ( got_picture )
+ 	{
+-		avpicture_fill( &dest, static_cast<uint8_t*>( rgb ), PIX_FMT_RGB24, GetWidth(), GetHeight() );
++		avpicture_fill( &dest, static_cast<uint8_t*>( rgb ), AV_PIX_FMT_RGB24, GetWidth(), GetHeight() );
+ #if defined(HAVE_SWSCALE)
+ 		if ( !imgConvertRgbCtx )
+ 			imgConvertRgbCtx = sws_getContext( libavcodec->width, libavcodec->height, libavcodec->pix_fmt,
+-				GetWidth(), GetHeight(), PIX_FMT_RGB24, SWS_FAST_BILINEAR, NULL, NULL, NULL );
++				GetWidth(), GetHeight(), AV_PIX_FMT_RGB24, SWS_FAST_BILINEAR, NULL, NULL, NULL );
+ 		sws_scale( imgConvertRgbCtx, frame->data, frame->linesize, 0, libavcodec->height, dest.data, dest.linesize );
+ #else
+-		img_convert( &dest, PIX_FMT_RGB24, reinterpret_cast<AVPicture*>( frame ), libavcodec->pix_fmt, GetWidth(), GetHeight() );
++		img_convert( &dest, AV_PIX_FMT_RGB24, reinterpret_cast<AVPicture*>( frame ), libavcodec->pix_fmt, GetWidth(), GetHeight() );
+ #endif
+ 	}
+-	av_free( frame );
++	av_frame_free( &frame );
+ #else
+ 	unsigned char *pixels[ 3 ];
+ 	int pitches[ 3 ];
+@@ -1125,7 +1125,7 @@
+ int Frame::ExtractYUV( void *yuv )
+ {
+ #if defined(HAVE_LIBAVCODEC)
+-	AVFrame *frame = avcodec_alloc_frame();;
++	AVFrame *frame = av_frame_alloc();;
+ 	AVPicture output;
+ 	int got_picture;
+ 
+@@ -1137,14 +1137,14 @@
+ 	avcodec_decode_video2( libavcodec, frame, &got_picture, &pkt );
+ 	if ( got_picture )
+ 	{
+-		avpicture_fill( &output, static_cast<uint8_t*>( yuv ), PIX_FMT_YUV422, GetWidth(), GetHeight() );
++		avpicture_fill( &output, static_cast<uint8_t*>( yuv ), AV_PIX_FMT_YUYV422, GetWidth(), GetHeight() );
+ #if defined(HAVE_SWSCALE)
+ 		if ( !imgConvertYuvCtx )
+ 			imgConvertYuvCtx = sws_getContext( libavcodec->width, libavcodec->height, libavcodec->pix_fmt,
+-				GetWidth(), GetHeight(), PIX_FMT_YUV422, SWS_FAST_BILINEAR, NULL, NULL, NULL );
++				GetWidth(), GetHeight(), AV_PIX_FMT_YUYV422, SWS_FAST_BILINEAR, NULL, NULL, NULL );
+ 		sws_scale( imgConvertYuvCtx, frame->data, frame->linesize, 0, libavcodec->height, output.data, output.linesize );
+ #else
+-		img_convert( &output, PIX_FMT_YUV422, (AVPicture *)frame, libavcodec->pix_fmt, GetWidth(), GetHeight() );
++		img_convert( &output, AV_PIX_FMT_YUYV422, (AVPicture *)frame, libavcodec->pix_fmt, GetWidth(), GetHeight() );
+ #endif
+ 	}
+ 	av_free( frame );
+@@ -1164,7 +1164,7 @@
+ int Frame::ExtractYUV420( uint8_t *yuv, uint8_t *output[ 3 ] )
+ {
+ #if defined(HAVE_LIBAVCODEC)
+-	AVFrame *frame = avcodec_alloc_frame();
++	AVFrame *frame = av_frame_alloc();
+ 	int got_picture;
+ 
+         AVPacket pkt;
+@@ -1176,7 +1176,7 @@
+ 
+ 	int width = GetWidth(), height = GetHeight();
+ 
+-	if ( libavcodec->pix_fmt == PIX_FMT_YUV420P )   // PAL
++	if ( libavcodec->pix_fmt == AV_PIX_FMT_YUV420P )   // PAL
+ 	{
+ 		int h2 = height / 2;
+ 		int w2 = width / 2;
+@@ -1204,7 +1204,7 @@
+ 			}
+ 		}
+ 	}
+-	else // libavcodec.pix_fmt == PIX_FMT_YUV411P // NTSC
++	else // libavcodec.pix_fmt == AV_PIX_FMT_YUV411P // NTSC
+ 	{
+ 		int w4 = width / 4;
+ 
+@@ -1341,7 +1341,7 @@
+ 			avformatEncoder->oformat = av_guess_format( "dv", NULL, NULL );
+ 			AVStream* vst = avformat_new_stream( avformatEncoder, NULL );
+ 			vst->codec->codec_type = AVMEDIA_TYPE_VIDEO;
+-			vst->codec->codec_id = CODEC_ID_DVVIDEO;
++			vst->codec->codec_id = AV_CODEC_ID_DVVIDEO;
+ 			vst->codec->bit_rate = 25000000;
+ 			vst->start_time = 0;
+ 			AVCodecContext *avcodecEncoder = vst->codec;
+@@ -1366,14 +1366,14 @@
+ #endif
+ 			avcodecEncoder->thread_count = 2;
+ 			avcodecEncoder->time_base= isPAL ? ( AVRational ){ 1, 25 } : ( AVRational ){ 1001, 30000 };
+-			avcodecEncoder->pix_fmt = isPAL ? PIX_FMT_YUV420P : PIX_FMT_YUV411P;
++			avcodecEncoder->pix_fmt = isPAL ? AV_PIX_FMT_YUV420P : AV_PIX_FMT_YUV411P;
+ 			avcodecEncoder->flags |= CODEC_FLAG_INTERLACED_DCT;
+-			avcodec_open2( avcodecEncoder, avcodec_find_encoder( CODEC_ID_DVVIDEO ), NULL );
++			avcodec_open2( avcodecEncoder, avcodec_find_encoder( AV_CODEC_ID_DVVIDEO ), NULL );
+ 			av_new_packet( &avpacketEncoder, 144000 );
+ 			tempImage = ( uint8_t* ) av_malloc(
+ 				avpicture_get_size( avcodecEncoder->pix_fmt, avcodecEncoder->width, avcodecEncoder->height ) );
+ #if defined(HAVE_SWSCALE)
+-			imgConvertEncoderCtx = sws_getContext( avcodecEncoder->width, avcodecEncoder->height, PIX_FMT_RGB24,
++			imgConvertEncoderCtx = sws_getContext( avcodecEncoder->width, avcodecEncoder->height, AV_PIX_FMT_RGB24,
+ 				avcodecEncoder->width, avcodecEncoder->height, avcodecEncoder->pix_fmt, SWS_FAST_BILINEAR, NULL, NULL, NULL);
+ #endif
+ 		}
+@@ -1452,8 +1452,8 @@
+ 	if ( CreateEncoder( IsPAL(), IsWide() ) )
+ 	{
+ #if defined(HAVE_LIBAVCODEC)
+-		AVFrame *input = avcodec_alloc_frame();
+-		AVFrame *output = avcodec_alloc_frame();
++		AVFrame *input = av_frame_alloc();
++		AVFrame *output = av_frame_alloc();
+ 
+ 		if ( input && output )
+ 		{
+@@ -1464,16 +1464,19 @@
+ 
+ 			// Convert color space
+ 			avpicture_fill( ( AVPicture* )output, tempImage, avcodecEncoder->pix_fmt, width, height );
+-			avpicture_fill( ( AVPicture* )input, rgb, PIX_FMT_RGB24, width, height );
++			avpicture_fill( ( AVPicture* )input, rgb, AV_PIX_FMT_RGB24, width, height );
+ #if defined(HAVE_SWSCALE)
+ 			sws_scale( imgConvertEncoderCtx, input->data, input->linesize, 0, height,
+ 				output->data, output->linesize);
+ #else
+-			img_convert( ( AVPicture* )output, avcodecEncoder->pix_fmt, ( AVPicture* )input, PIX_FMT_RGB24, width, height );
++			img_convert( ( AVPicture* )output, avcodecEncoder->pix_fmt, ( AVPicture* )input, AV_PIX_FMT_RGB24, width, height );
+ #endif
+ 
+ 			// Encode
+-			bytesInFrame = avcodec_encode_video( avcodecEncoder, avpacketEncoder.data, size, output );
++
++		        // bytesInFrame = avcodec_encode_video( avcodecEncoder, avpacketEncoder.data, size, output );
++                        int got_packet;  
++			bytesInFrame = avcodec_encode_video2( avcodecEncoder, &avpacketEncoder, output, &got_packet );
+                         avformatEncoder->pb = avio_alloc_context(data, bytesInFrame, 0, NULL, NULL, NULL, NULL);
+ 			avpacketEncoder.size = bytesInFrame;
+ 			if ( !isEncoderHeaderWritten )
diff --git a/media-video/kino/files/kino-1.3.4-libav-0.7.patch b/media-video/kino/files/kino-1.3.4-libav-0.7.patch
new file mode 100644
index 000000000000..65c5bc38276d
--- /dev/null
+++ b/media-video/kino/files/kino-1.3.4-libav-0.7.patch
@@ -0,0 +1,60 @@
+--- kino-1.3.4.orig/src/frame.cc	2011-07-17 14:54:59.089481638 +0200
++++ kino-1.3.4/src/frame.cc	2011-07-17 15:09:23.199481714 +0200
+@@ -1063,7 +1063,12 @@
+ 	AVPicture dest;
+ 	int got_picture;
+ 
+-	avcodec_decode_video( libavcodec, frame, &got_picture, data, GetFrameSize() );
++	AVPacket pkt;
++	av_init_packet(&pkt);
++	pkt.data = data;
++	pkt.size = GetFrameSize();
++
++	avcodec_decode_video2( libavcodec, frame, &got_picture, &pkt );
+ 	if ( got_picture )
+ 	{
+ 		avpicture_fill( &dest, static_cast<uint8_t*>( rgb ), PIX_FMT_RGB24, GetWidth(), GetHeight() );
+@@ -1123,7 +1128,12 @@
+ 	AVPicture output;
+ 	int got_picture;
+ 
+-	avcodec_decode_video( libavcodec, frame, &got_picture, data, GetFrameSize() );
++	AVPacket pkt;
++	av_init_packet(&pkt);
++	pkt.data = data;
++	pkt.size = GetFrameSize();
++
++	avcodec_decode_video2( libavcodec, frame, &got_picture, &pkt );
+ 	if ( got_picture )
+ 	{
+ 		avpicture_fill( &output, static_cast<uint8_t*>( yuv ), PIX_FMT_YUV422, GetWidth(), GetHeight() );
+@@ -1156,7 +1166,12 @@
+ 	AVFrame *frame = avcodec_alloc_frame();
+ 	int got_picture;
+ 
+-	avcodec_decode_video( libavcodec, frame, &got_picture, data, GetFrameSize() );
++        AVPacket pkt;
++        av_init_packet(&pkt);
++        pkt.data = data;
++        pkt.size = GetFrameSize();
++
++        avcodec_decode_video2( libavcodec, frame, &got_picture, &pkt );
+ 
+ 	int width = GetWidth(), height = GetHeight();
+ 
+@@ -1319,12 +1334,12 @@
+ #if defined(HAVE_LIBAVCODEC)
+ 	if ( avformatEncoder == NULL )
+ 	{
+-		avformatEncoder = av_alloc_format_context();
++		avformatEncoder = avformat_alloc_context();
+ 		if ( avformatEncoder )
+ 		{
+-			avformatEncoder->oformat = guess_format( "dv", NULL, NULL );
++			avformatEncoder->oformat = av_guess_format( "dv", NULL, NULL );
+ 			AVStream* vst = av_new_stream( avformatEncoder, 0 );
+-			vst->codec->codec_type = CODEC_TYPE_VIDEO;
++			vst->codec->codec_type = AVMEDIA_TYPE_VIDEO;
+ 			vst->codec->codec_id = CODEC_ID_DVVIDEO;
+ 			vst->codec->bit_rate = 25000000;
+			vst->start_time = 0;
diff --git a/media-video/kino/files/kino-1.3.4-libav-0.8.patch b/media-video/kino/files/kino-1.3.4-libav-0.8.patch
new file mode 100644
index 000000000000..f98cbda0bc49
--- /dev/null
+++ b/media-video/kino/files/kino-1.3.4-libav-0.8.patch
@@ -0,0 +1,57 @@
+--- kino-1.3.4.orig/src/frame.cc	2012-05-14 19:55:42.153772418 -0700
++++ kino-1.3.4/src/frame.cc	2012-05-14 20:28:34.448838653 -0700
+@@ -101,8 +101,9 @@
+ #if defined(HAVE_LIBAVCODEC)
+ 	pthread_mutex_lock( &avcodec_mutex );
+ 	av_register_all();
+-	libavcodec = avcodec_alloc_context();
+-	avcodec_open( libavcodec, avcodec_find_decoder( CODEC_ID_DVVIDEO ) );
++	libavcodec = avcodec_alloc_context3(NULL);
++	avcodec_open2( libavcodec,
++                       avcodec_find_decoder( CODEC_ID_DVVIDEO ), NULL );
+ 	pthread_mutex_unlock( &avcodec_mutex );
+ 	data = ( unsigned char* ) av_mallocz( 144000 );
+ #if defined(HAVE_SWSCALE)
+@@ -1338,7 +1339,7 @@
+ 		if ( avformatEncoder )
+ 		{
+ 			avformatEncoder->oformat = av_guess_format( "dv", NULL, NULL );
+-			AVStream* vst = av_new_stream( avformatEncoder, 0 );
++			AVStream* vst = avformat_new_stream( avformatEncoder, NULL );
+ 			vst->codec->codec_type = AVMEDIA_TYPE_VIDEO;
+ 			vst->codec->codec_id = CODEC_ID_DVVIDEO;
+ 			vst->codec->bit_rate = 25000000;
+@@ -1364,12 +1365,10 @@
+ 			vst->sample_aspect_ratio = avcodecEncoder->sample_aspect_ratio;
+ #endif
+ 			avcodecEncoder->thread_count = 2;
+-			avcodec_thread_init( avcodecEncoder, avcodecEncoder->thread_count );
+ 			avcodecEncoder->time_base= isPAL ? ( AVRational ){ 1, 25 } : ( AVRational ){ 1001, 30000 };
+ 			avcodecEncoder->pix_fmt = isPAL ? PIX_FMT_YUV420P : PIX_FMT_YUV411P;
+ 			avcodecEncoder->flags |= CODEC_FLAG_INTERLACED_DCT;
+-			av_set_parameters( avformatEncoder, NULL );
+-			avcodec_open( avcodecEncoder, avcodec_find_encoder( CODEC_ID_DVVIDEO ) );
++			avcodec_open2( avcodecEncoder, avcodec_find_encoder( CODEC_ID_DVVIDEO ), NULL );
+ 			av_new_packet( &avpacketEncoder, 144000 );
+ 			tempImage = ( uint8_t* ) av_malloc(
+ 				avpicture_get_size( avcodecEncoder->pix_fmt, avcodecEncoder->width, avcodecEncoder->height ) );
+@@ -1475,16 +1474,16 @@
+ 
+ 			// Encode
+ 			bytesInFrame = avcodec_encode_video( avcodecEncoder, avpacketEncoder.data, size, output );
+-			url_open_buf( &avformatEncoder->pb, data, bytesInFrame, URL_WRONLY );
++                        avformatEncoder->pb = avio_alloc_context(data, bytesInFrame, 0, NULL, NULL, NULL, NULL);
+ 			avpacketEncoder.size = bytesInFrame;
+ 			if ( !isEncoderHeaderWritten )
+ 			{
+-				av_write_header( avformatEncoder );
++				avformat_write_header( avformatEncoder, NULL );
+ 				isEncoderHeaderWritten = true;
+ 			}
+ 			av_write_frame( avformatEncoder, &avpacketEncoder );
+ #if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(0<<8)+0)
+-			url_close_buf( avformatEncoder->pb );
++			avio_close( avformatEncoder->pb );
+ #else
+ 			url_close_buf( &avformatEncoder->pb );
+ #endif
diff --git a/media-video/kino/files/kino-1.3.4-libavcodec-pkg-config.patch b/media-video/kino/files/kino-1.3.4-libavcodec-pkg-config.patch
new file mode 100644
index 000000000000..c5cd12106f5c
--- /dev/null
+++ b/media-video/kino/files/kino-1.3.4-libavcodec-pkg-config.patch
@@ -0,0 +1,11 @@
+--- a/configure.in	2009-09-08 02:35:23.000000000 -0400
++++ b/configure.in	2014-01-27 14:53:01.366063037 -0500
+@@ -221,7 +221,7 @@
+ 		if (test "x$avcodec_include" != x) || (test "x$avcodec_lib" != x) ; then
+ 			local_legacy_ffmpeg_test
+ 		else
+-			PKG_CHECK_MODULES(AVCODEC, libavformat,
++			PKG_CHECK_MODULES(AVCODEC, [libavcodec libavformat libavutil],
+ 			[
+ 				AC_DEFINE(HAVE_LIBAVCODEC, 1, [Enable FFMPEG libavcodec])
+ 				AC_SUBST(AVCODEC_LIBS)
diff --git a/media-video/kino/files/kino-1.3.4-v4l1.patch b/media-video/kino/files/kino-1.3.4-v4l1.patch
new file mode 100644
index 000000000000..c6757743cd7e
--- /dev/null
+++ b/media-video/kino/files/kino-1.3.4-v4l1.patch
@@ -0,0 +1,22 @@
+--- kino-1.3.3.orig/ffmpeg/libavdevice/v4l.c	2011-05-17 02:20:37.161004916 +0400
++++ kino-1.3.3.orig/ffmpeg/libavdevice/v4l.c	2011-05-17 02:21:57.302377529 +0400
+@@ -26,7 +26,7 @@ 
+ #include <sys/mman.h>
+ #include <sys/time.h>
+ #define _LINUX_TIME_H 1
+-#include <linux/videodev.h>
++#include <libv4l1-videodev.h>
+ #include <time.h>
+ 
+ typedef struct {
+--- kino-1.3.3.orig/src/v4l.h	2011-05-17 02:20:38.896969666 +0400
++++ kino-1.3.3.orig/src/v4l.h	2011-05-17 02:21:39.922730395 +0400
+@@ -40,7 +40,7 @@ 
+ 
+ #define _DEVICE_H_
+ #define _LINUX_TIME_H
+-#include <linux/videodev.h>
++#include <libv4l1-videodev.h>
+ 
+ #include "displayer.h"
+ 
diff --git a/media-video/kino/kino-1.3.4-r1.ebuild b/media-video/kino/kino-1.3.4-r1.ebuild
new file mode 100644
index 000000000000..5ff6142d3d3b
--- /dev/null
+++ b/media-video/kino/kino-1.3.4-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools ltprune udev
+
+DESCRIPTION="Kino is a non-linear DV editor for GNU/Linux"
+HOMEPAGE="http://www.kinodv.org/"
+SRC_URI="mirror://sourceforge/kino/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="alsa dvdr gpac lame libav quicktime sox vorbis"
+
+# Optional dependency on cinelerra-cvs (as a replacement for libquicktime)
+# dropped because kino may run with it but won't build anymore.
+
+CDEPEND="
+	>=x11-libs/gtk+-2.6.0:2
+	>=gnome-base/libglade-2.5.0
+	>=dev-libs/glib-2:2
+	x11-libs/libXv
+	dev-libs/libxml2:2
+	media-libs/audiofile
+	>=sys-libs/libraw1394-1.0.0
+	>=sys-libs/libavc1394-0.4.1
+	>=media-libs/libdv-0.103
+	media-libs/libsamplerate
+	media-libs/libiec61883
+	media-libs/libv4l:0=
+	alsa? ( >=media-libs/alsa-lib-1.0.9 )
+	!libav? ( >=media-video/ffmpeg-3:0= )
+	libav? ( media-video/libav:0= )
+	quicktime? ( >=media-libs/libquicktime-0.9.5 )
+"
+DEPEND="${CDEPEND}
+	dev-util/intltool
+"
+RDEPEND="${CDEPEND}
+	media-video/mjpegtools
+	media-sound/rawrec
+	dvdr? ( media-video/dvdauthor
+		app-cdr/dvd+rw-tools )
+	gpac? ( media-video/gpac )
+	lame? ( media-sound/lame )
+	sox? ( media-sound/sox )
+	vorbis? ( media-sound/vorbis-tools )
+"
+
+src_prepare() {
+	default
+
+	# Deactivating automagic alsa configuration, bug #134725
+	if ! use alsa ; then
+		sed -i -e "s:HAVE_ALSA 1:HAVE_ALSA 0:" configure || die
+	fi
+
+	# Fix bug #169590
+	# https://sourceforge.net/tracker/?func=detail&aid=3304495&group_id=14103&atid=314103
+	sed -i \
+		-e '/\$(LIBQUICKTIME_LIBS) \\/d' \
+		-e '/^[[:space:]]*\$(SRC_LIBS)/ a\
+	\$(LIBQUICKTIME_LIBS) \\' \
+		src/Makefile.in || die
+
+	# Fix test failure discovered in bug #193947
+	# https://sourceforge.net/tracker/?func=detail&aid=3304499&group_id=14103&atid=314103
+	sed -i -e '$a\
+\
+ffmpeg/libavcodec/ps2/idct_mmi.c\
+ffmpeg/libavcodec/sparc/dsputil_vis.c\
+ffmpeg/libavcodec/sparc/vis.h\
+ffmpeg/libavutil/bswap.h\
+ffmpeg/libswscale/yuv2rgb_template.c\
+src/export.h\
+src/message.cc\
+src/page_bttv.cc' po/POTFILES.in || die
+
+	sed -i -e 's:^#include <quicktime.h>:#include <lqt/quicktime.h>:' src/filehandler.h || die
+	eapply "${FILESDIR}/${P}-v4l1.patch"
+	eapply "${FILESDIR}/${P}-libav-0.7.patch"
+	eapply "${FILESDIR}/${P}-libav-0.8.patch"
+	eapply "${FILESDIR}/${P}-libavcodec-pkg-config.patch"
+	eapply "${FILESDIR}/${P}-ffmpeg3.patch"
+
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-local-ffmpeg \
+		$(use_enable quicktime) \
+		$(use_with sparc dv1394) \
+		--with-udev-rules-dir="$(get_udevdir)"/rules.d \
+		CPPFLAGS="-I${ROOT}usr/include/libavcodec -I${ROOT}usr/include/libavformat -I${ROOT}usr/include/libswscale"
+}
+
+src_install() {
+	default
+	mv "${ED}/$(get_udevdir)"/rules.d/{,99-}kino.rules
+	fowners root:root -R /usr/share/kino/help #177378
+	prune_libtool_files --all #385361
+}
diff --git a/media-video/kino/kino-1.3.4.ebuild b/media-video/kino/kino-1.3.4.ebuild
new file mode 100644
index 000000000000..8f4d4bfa586f
--- /dev/null
+++ b/media-video/kino/kino-1.3.4.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils udev
+
+DESCRIPTION="Kino is a non-linear DV editor for GNU/Linux"
+HOMEPAGE="http://www.kinodv.org/"
+SRC_URI="mirror://sourceforge/kino/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
+IUSE="alsa dvdr gpac lame gstreamer quicktime sox vorbis"
+
+# This ebuild would benefit a lot of USE dependencies but that has to wait for
+# EAPI 2. The usual fix is to issue built_with_use checks but in that particu-
+# lar case it would make the ebuild rather complicated to write and maintain
+# (certain features can be enabled in various different ways). Also it would
+# also force the emerge process to stop a bit too often for users not to comp-
+# lain. Thus, if you need features like theora, x264, xvid and maybe others,
+# make sure you activate the required support where it should be (ffmpeg, mostly).
+
+# Optional dependency on cinelerra-cvs (as a replacement for libquicktime)
+# dropped because kino may run with it but won't build anymore.
+
+CDEPEND=">=x11-libs/gtk+-2.6.0:2
+	>=gnome-base/libglade-2.5.0
+	>=dev-libs/glib-2:2
+	x11-libs/libXv
+	dev-libs/libxml2:2
+	media-libs/audiofile
+	>=sys-libs/libraw1394-1.0.0
+	>=sys-libs/libavc1394-0.4.1
+	>=media-libs/libdv-0.103
+	media-libs/libsamplerate
+	media-libs/libiec61883
+	media-libs/libv4l
+	alsa? ( >=media-libs/alsa-lib-1.0.9 )
+	virtual/ffmpeg
+	quicktime? ( >=media-libs/libquicktime-0.9.5 )"
+DEPEND="${CDEPEND}
+	dev-util/intltool"
+RDEPEND="${CDEPEND}
+	media-video/mjpegtools
+	media-sound/rawrec
+	dvdr? ( media-video/dvdauthor
+		app-cdr/dvd+rw-tools )
+	gpac? ( media-video/gpac )
+	lame? ( media-sound/lame )
+	gstreamer? ( media-libs/gst-plugins-base:0.10 )
+	sox? ( media-sound/sox )
+	vorbis? ( media-sound/vorbis-tools )"
+
+DOCS="AUTHORS BUGS ChangeLog NEWS README* TODO"
+
+src_prepare() {
+	# Deactivating automagic alsa configuration, bug #134725
+	if ! use alsa ; then
+		sed -i -e "s:HAVE_ALSA 1:HAVE_ALSA 0:" configure || die
+	fi
+
+	# Fix bug #169590
+	# https://sourceforge.net/tracker/?func=detail&aid=3304495&group_id=14103&atid=314103
+	sed -i \
+		-e '/\$(LIBQUICKTIME_LIBS) \\/d' \
+		-e '/^[[:space:]]*\$(SRC_LIBS)/ a\
+	\$(LIBQUICKTIME_LIBS) \\' \
+		src/Makefile.in || die
+
+	# Fix test failure discovered in bug #193947
+	# https://sourceforge.net/tracker/?func=detail&aid=3304499&group_id=14103&atid=314103
+	sed -i -e '$a\
+\
+ffmpeg/libavcodec/ps2/idct_mmi.c\
+ffmpeg/libavcodec/sparc/dsputil_vis.c\
+ffmpeg/libavcodec/sparc/vis.h\
+ffmpeg/libavutil/bswap.h\
+ffmpeg/libswscale/yuv2rgb_template.c\
+src/export.h\
+src/message.cc\
+src/page_bttv.cc' po/POTFILES.in || die
+
+	sed -i -e 's:^#include <quicktime.h>:#include <lqt/quicktime.h>:' src/filehandler.h || die
+	epatch "${FILESDIR}/${P}-v4l1.patch"
+	epatch "${FILESDIR}/${P}-libav-0.7.patch"
+	epatch "${FILESDIR}/${P}-libav-0.8.patch"
+	epatch "${FILESDIR}/${P}-libavcodec-pkg-config.patch"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-local-ffmpeg \
+		$(use_enable quicktime) \
+		$(use_with sparc dv1394) \
+		--with-udev-rules-dir="$(get_udevdir)"/rules.d \
+		CPPFLAGS="-I${ROOT}usr/include/libavcodec -I${ROOT}usr/include/libavformat -I${ROOT}usr/include/libswscale"
+}
+
+src_install() {
+	default
+	mv "${ED}/$(get_udevdir)"/rules.d/{,99-}kino.rules
+	fowners root:root -R /usr/share/kino/help #177378
+	prune_libtool_files --all #385361
+}
diff --git a/media-video/kino/metadata.xml b/media-video/kino/metadata.xml
new file mode 100644
index 000000000000..b66baaf03b71
--- /dev/null
+++ b/media-video/kino/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>media-video@gentoo.org</email>
+    <name>Gentoo Video project</name>
+  </maintainer>
+  <use>
+    <flag name="gpac">Enable GPAC support when exporting to 3GPP format</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">kino</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-video/kmplayer/Manifest b/media-video/kmplayer/Manifest
new file mode 100644
index 000000000000..717a2a548fb4
--- /dev/null
+++ b/media-video/kmplayer/Manifest
@@ -0,0 +1,5 @@
+DIST kmplayer-0.12.0b.tar.bz2 599496 SHA256 5e98cea9bd958860d90003d37037172a95ed8b699133e8f1e6033147aaefed73 SHA512 d34c496d0c24c6d5c1bb675b83fac60da5c9672e4076aed72bac2e9b333e88d031076e7e386ec7b61ae8ece88870f6187c61f483f425aa78edd1e443c7f2e882 WHIRLPOOL 4ce75858bd6f385572f1c39e1aef47ad9526986b8c99de228d9e77168e804b2aeeca2933bb95c8be0f3a2200154473fd99a02af2d449a3861c845715f772570c
+EBUILD kmplayer-0.12.0b.ebuild 2077 SHA256 c49eb87724e6a7d7e0cf4d5fe5da59622f53de75d6bad172da15647d63b55658 SHA512 15992dd9b6485df8ded3c2832d7171bb44ae8253ab2fc7b5bd499768c3c4194a74b9aab47fe6927e2d0b66a0ccf7db32f8a2e64cb05f575c070a92fdd0c41902 WHIRLPOOL c98aef27fefe1d14d569b07c2b7e775268ba3feed7bce39480c15a05231a156665b81b79227ec5ad2ad1798693e76d0beff38f810c709d12d0a2d04b1aa898e8
+MISC ChangeLog 5633 SHA256 15d410bd74fe1ef05557d48faac64ed49d381783bc53db4ff9c858616ea7a89e SHA512 5bd62143bfd2f04eb3db8125502ff2d0137a50d1d5e3e5a5fdc28556af894ee738f19209c6d4e7636b2f71a4d8e6812a65587ba448991cde0069af5b63c9cc54 WHIRLPOOL 039f38d9d89bbf83818bebb4e46b71d4c4566e7d017b6d5adeea57e1c3e1e7ac59f21b14340464d66e99ed173c8059d8456725b2714ce1c0debd8234bcb570cb
+MISC ChangeLog-2015 23920 SHA256 d16882d10c22fb9696c68b8e162fac2642aa7665f76373c11e4b2c4d6115c1d1 SHA512 09e481388be5ec4714798a16c905569cf1e5fcd14b7d27f9aef625dcc3ec10fe90eb49e04cb3d7d48ed4a2dc116325505b46e312efb444ea16c64cd326f910b0 WHIRLPOOL 652eeac8fe785f54c5fed1ea67afa684cde658c25e48eb49431cf90f023a4299b4d7395ecf0249016b4554fc3c95e42fcdb6f32f9b062cb9a169173b0db819cf
+MISC metadata.xml 475 SHA256 a1f733d5e733b1a3ffd4bc93667e65116737ce3efe1cd982b084d2897092aeac SHA512 0f45fbd4596c4e885093addcf323d7c53a5d550f91bd9bf0bcf5bc18cd9a808caac52dee949ad5437a1e6827b1b6bbd42a81a563eb648ebad64a6a7a6c34e37f WHIRLPOOL f1d2a0f4cfeb819bb0843fa1f3139402d8e6307b9897bb4765756864ca77c70b208e4ac3c2699066428f06ef8dcd669e9af697d6beb5ebf2551b70a7e0ac8c61
diff --git a/media-video/kmplayer/kmplayer-0.12.0b.ebuild b/media-video/kmplayer/kmplayer-0.12.0b.ebuild
new file mode 100644
index 000000000000..dff58d1dbfff
--- /dev/null
+++ b/media-video/kmplayer/kmplayer-0.12.0b.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_BRANCH="0.12"
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="Video player plugin for Konqueror and basic MPlayer frontend"
+HOMEPAGE="https://kmplayer.kde.org"
+SRC_URI="mirror://kde/stable/${PN}/${EGIT_BRANCH}/${P}.tar.bz2"
+
+LICENSE="GPL-2 FDL-1.2 LGPL-2.1"
+KEYWORDS="amd64 x86"
+IUSE="cairo npp"
+
+CDEPEND="
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kmediaplayer)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	media-libs/phonon[qt5(+)]
+	x11-libs/libX11
+	x11-libs/libxcb
+	cairo? ( x11-libs/cairo[xcb] )
+	npp? (
+		dev-libs/dbus-glib
+		dev-libs/glib:2
+		www-plugins/adobe-flash:*
+		>=x11-libs/gtk+-2.10.14:2
+	)
+"
+DEPEND="${CDEPEND}
+	sys-devel/gettext
+"
+RDEPEND="${CDEPEND}
+	media-video/mplayer
+	!media-video/kmplayer:4
+"
+
+src_prepare() {
+	if use npp; then
+		sed -i src/kmplayer_part.desktop \
+		-e ":^MimeType: s:=:=application/x-shockwave-flash;:" || die
+	fi
+
+	kde5_src_prepare
+}
+
+src_configure() {
+	# 0.12: expat build broken, check in later releases
+	local mycmakeargs=(
+		-DKMPLAYER_BUILT_WITH_EXPAT=OFF
+		-DKMPLAYER_BUILT_WITH_CAIRO=$(usex cairo)
+		-DKMPLAYER_BUILT_WITH_NPP=$(usex npp)
+	)
+
+	kde5_src_configure
+}
+
+src_install() {
+	kde5_src_install
+
+	if use npp; then
+		kwriteconfig5 --file "${ED}/usr/share/config/kmplayerrc" --group "application/x-shockwave-flash" --key player npp
+		kwriteconfig5 --file "${ED}/usr/share/config/kmplayerrc" --group "application/x-shockwave-flash" --key plugin /usr/lib/nsbrowser/plugins/libflashplayer.so
+	fi
+}
diff --git a/media-video/kmplayer/metadata.xml b/media-video/kmplayer/metadata.xml
new file mode 100644
index 000000000000..d4fe1b93f0d5
--- /dev/null
+++ b/media-video/kmplayer/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+	<use>
+		<flag name="npp">Compile the npp backend that plays xembed style browser plugins.</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-video/kplayer/Manifest b/media-video/kplayer/Manifest
new file mode 100644
index 000000000000..8b6c45500b60
--- /dev/null
+++ b/media-video/kplayer/Manifest
@@ -0,0 +1,5 @@
+DIST kplayer-0.7.2.tar.xz 5546012 SHA256 c5e52ae74815878930e15ed0be398617d20394eec8c8f183ddd5e39a433d5d7b SHA512 f4560b6e502845fa2d3328d1221d4808f33d3eb4d1416b575b1c718f41366d769e53ef2e1823356319c4df4040003a54c5ac4b5bfc18d1ba75ec0f72bcd5b611 WHIRLPOOL c0b79637af7e5061a5d6b766ffa62531fe2ee57a5af5816d21edaf48acecb57a52418a85663e2de0874bc1fe3e774148cdd500c6c9a0527d4bd34096ff31b620
+EBUILD kplayer-0.7.2-r1.ebuild 679 SHA256 3acca8a5448f68229fec0a99eee882f6429409df3cf12ad3b21fbb5c7ca49859 SHA512 68cb0b1181acdb4364cc1ce896253f5e9547b042ea2530f0baf4425fb50c33b2868e2abda95e28a4d06e020226de649d248c7d887006dd5911ef1314e7ee9df7 WHIRLPOOL 20d684fc14e3dfe500b5a6ae1ea676ff7da634dc1670461261b9efbb9effd6d8106ebe4bab6d06a0c1c070446040c69626d9953fa6055e1b8729ca164504855e
+MISC ChangeLog 2436 SHA256 70d33f5fbe3bf5e139e56fb77f6eb3f3ba25ac26d12cf5c50d44207ab2dfbb56 SHA512 5f96451e9d681d1d15fbad479314df910c686b5ad556901118415d4a496c2c7b414bff0216b4bde14e9b066ebde613665860e5fcb2b29fe554c02668c02e585a WHIRLPOOL da33ff85d7ab7d87c92207642f525158eff97835b5e1f6088a70737959c98d60daf6dc6bd048b48b0e9252ae1bc8606bb0b9e03786bf1ccc08b54d249070f046
+MISC ChangeLog-2015 7607 SHA256 0c7e790a9d3ec6d63944b85b2d4df49f1e0566513af1296a90d027c1c4eef79b SHA512 bd4dade01a5299e6ec7b3eca86bd4402292c913160bd88809caf9ad93d8714b6e2e86d4dd73d5c30af8bc08d53cbd1202848d466e4fd84c205e4932f463b38cf WHIRLPOOL 55157dfea251702e9918fef5056884d0af7e365ba9685544b042eb25ea7a4950a293dfd47a844c2301337d85cc663634bda3d31153a8373f87c3c59cbe3b4ae9
+MISC metadata.xml 368 SHA256 b3cd793b51936d3a2d6e09694bb2824593bbbd2a41c5f4e9dec2c9e03a333e6e SHA512 de5600022dba73cdad1c03d3943aa7a07b744d1a973326fc032ed38e19fa790a01881cb58c1b3a4f7cbbb88a8dceb63eef3d6d1b358c129e6b3b9598eb6245c6 WHIRLPOOL 05514fd7dd36f44c4cdc5bc2aed307c41436473dafbb6326e1fedac2903870fa05c875f0cb26b918593ab14f87efff5674ee97e6563df79bb8ce260b7c6ae5d9
diff --git a/media-video/kplayer/kplayer-0.7.2-r1.ebuild b/media-video/kplayer/kplayer-0.7.2-r1.ebuild
new file mode 100644
index 000000000000..e578cd88cb59
--- /dev/null
+++ b/media-video/kplayer/kplayer-0.7.2-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB es et eu fr ga gl he hi hne
+it ja km lt mai nb nds nl pa pl pt pt_BR ro ru sr sr@ijekavian sr@ijekavianlatin
+sr@latin sv th tr uk zh_CN zh_TW"
+KDE_HANDBOOK="optional"
+QT3SUPPORT_REQUIRED="true"
+inherit kde4-base
+
+DESCRIPTION="KPlayer is a KDE media player based on mplayer"
+HOMEPAGE="https://projects.kde.org/projects/unmaintained/kplayer"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="4"
+KEYWORDS="amd64 x86"
+IUSE="debug"
+
+RDEPEND="${DEPEND}
+	>=media-video/mplayer-1.0_rc1
+"
diff --git a/media-video/kplayer/metadata.xml b/media-video/kplayer/metadata.xml
new file mode 100644
index 000000000000..66e12c8c3bd6
--- /dev/null
+++ b/media-video/kplayer/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
new file mode 100644
index 000000000000..72ebd8d227e7
--- /dev/null
+++ b/media-video/libav/Manifest
@@ -0,0 +1,30 @@
+AUX libav-11.3-libvpx-1.5.0.patch 2168 SHA256 98affd7d0ee4bfebc71f93d6ea5e7d8fbd6c27201ab6bdd0377aac985d2de454 SHA512 ef4a50d710eb11658fbf13fa29e5f60a64dbb3bf99ed56e12480a595679c242876ea7e0211048c3013e762c9484c3cd3363244c1b040fc8fd11f010b497d2e9e WHIRLPOOL cbf7e1ec949085250bc40ed39f862506984a8363a3e1f336682a212fcc68f3bd16ac3713133be6bad5a8144c9867b61f68e4c4316a7a38220ab0ddad8422af5d
+DIST 0001-x86-Put-COPY3_IF_LT-under-HAVE_6REGS.patch.gz 736 SHA256 3df88fc60ad15116c03fd3f70d41f1a18db98b095add0fb937309116d7cf7201 SHA512 dbdfdf7fc1d42ebd93b0853e85ba0c07d816035c126a9303e6a5656bb9faeea16f16068d7e4aa67c7c4ade8ca09f64669e67f52d7d0a2a65518fa3897d586311 WHIRLPOOL 3038214bd498a195f405a0ce6eece3b04004802f50e05cb1ed081bd0345f93a7a00663902f50207061998a33cb4f5f8fcc1f63c8056233e79a3ad43d9823e9c5
+DIST 0001-xcb-Add-all-the-libraries-to-the-link-line-explicitl.patch 1017 SHA256 c7c6ba4a95f168f54907425badcbe445b01a86b35bedf9a3a04a91eb58386a8e SHA512 8cf8d1dd46a423381e70ab046e5843f13028c1d2ee14877e96339ea6a7d80d3ae5b2441b5b41ca23ba0104a5ff2d1b7e871f43680967bad0b7f242952d7b0be9 WHIRLPOOL 8f9270eae1e2d270f2ee440be2e653fe8a0581d77696a1e60f7910e326585412ed841dc13cb1de495481c5ebcdbfd8d3812dff5ebccf7a874d4f374a90eb11ec
+DIST fate-11.tar.xz 691009480 SHA256 4de446ae8c665e9410475c58f6294720f34cfdb1f20d29bbc0ee2576f810d597 SHA512 f9dc152964e3f19cf32d5d4cbc923a2bd05ba3b0f8f3880122df79d32852ee9d4795a0bfd66d7a2925299e9e9533888df6103e212ea3e5cbfe799d17ffa2b433 WHIRLPOOL 11034760105d1028330712f5ead087dffc9edc119945d618f6b02b37f4599db4c575a04c72f77cd5c6f180dc8e8ac2c9c1786d748b759aef2efd38191fcc6361
+DIST fate-12-r1.tar.xz 763758260 SHA256 4056682360a80f40a02f9158b9cb17647b5e9207e607391284f9299df181e73b SHA512 084f584c34d34b66c1f4d4742a11376ee2b90f6a07529b5aba6d50421dc8f863fded73dd57ad2c201aadfd529f0f923fa531ea9b41aaaa7b682846ef565a1018 WHIRLPOOL 73fa37586d4f1e269eec5bcefb49960789186e8c7dce8f6f31f5cf54bed28352439f91cbcff9a6961a0ff58551dee6e1d24f46fbb304007336f5374776a72df8
+DIST fate-9.tar.xz 467671500 SHA256 27d10fd49267452ac787c3f43501a4a21d0ccaccc5ddd6d79d8a6150ee276532 SHA512 8e45539f2512ef915b37c857226c0243940259f269b8f99393b9defa3352d7b8c1fcc5078f4f0d40dc0509737f0c915e179cedcc77f71fe5d96b1b956169a202 WHIRLPOOL d280ac32c6d84f121be8d733774e72a4df3f2e84d71051aea509ef5ca3289c94fd548bf03ff12215e045bf20c83426c547e6b5eb446429d167f38af7c7aa9803
+DIST libav-11.3.tar.xz 4858864 SHA256 12ae6c051967765ae5faeddf94c4584129ac0b18edb884afffc5fcedcdb5e030 SHA512 f25b9fb7392d5bb4df35937f79beae26bd8f6606f0ad7cdebf16963834eb9b423d882f6a3a44b5120a5d5d853c7c31bb8c3420a427cd2b360f41a48a6d5df284 WHIRLPOOL 721c4cbe7ee3f7307d24c0e4f1cc1f8ab8b0ccd50ddf88b77ecf1cae05f06fc80d7527e9f7a0a098a6d95d0e7fed50082aaffa07935eab6e9131f7c9be6e696c
+DIST libav-11.4.tar.xz 4860264 SHA256 0b7dabc2605f3a254ee410bb4b1a857945696aab495fe21b34c3b6544ff5d525 SHA512 82ffe6aaccb1a19782dfcb0de641c8255531ce34ee5f49f9b8ec7f5a11c81713432aafc3a6b7c4de927eb8141ddea41f28e4e3a1ab715b943774193050fb02e7 WHIRLPOOL c2e14e06fd7632852feea45f468803929cb1c1688d77ac8641c56d77523da455ccdf4cc6bf52b3dba9b387af9ad15ea9efd82b11ce365c3a84440fb2998f06aa
+DIST libav-11.6.tar.xz 4860268 SHA256 542f30e4266d2d2226e681b888bc718c995f5438f2db66a9a27d581243d27aed SHA512 bff3e22de93e4ab357715ae20e25b6435df52d1868c5164426a693d14fe7f54e47a46c4c62a36fbf27bd204e12f6a29a6f58016c7deaa838915d424b5ce530bd WHIRLPOOL 060bd61e784112a56e02ba86d0901ff488d6ef1735d731a869c68a27da72a209734648148edf9922efe2d15fed3380c36129a92c6917af812bf9e606ef97c131
+DIST libav-11.7.tar.xz 4861984 SHA256 8c9a75c89c6df58dd5e3f6f735d1ba5448680e23013fd66a51b50b4f49913c46 SHA512 23c6ffd0efdfa6b22c7863bf440d7469eba03a7990382fe33c8c4c7871edf250641ac536572516225679b0934e5c250ee0e2e91ea093c770a0c4c32b4776e3c5 WHIRLPOOL adb106828ae1e3c802b719a5c9feede1c96d02d79512bf04e2bf29da3d24e969a044a887eeb94dc76d528582026aed6cb1e0e342115507aaa98a8918de358ecd
+DIST libav-11.8.tar.xz 4865796 SHA256 7014b869570b9ea759e5c06beb3e9debd024a1c5af517655a9e1ccfe145baf4e SHA512 26f9a6bb7312acc08b6785c260220ada3ca2a8db0d0f2bd4621b47082c275fbdb7978457cb423693ba9a61dc4570b05d0dceb5861ff0bcce859c349a6a8f49be WHIRLPOOL e6ca039aa8919b9e6b593de8d99728980e32176fc33276b419e5d73cb36981f487e1c35eac1f07d2fc0f0672e1b0d59d9fda022e16afe96467f77226c95a34a0
+DIST libav-12.1.tar.xz 5267292 SHA256 fad96aa265d3d64b9e53c159559621ec888effa022908da8372164fa4cbe5d2d SHA512 a0dd5fcc95cb62901b05b59a63ce4fcc6fb2943f0032a824ff6cfeeab2d13bd5edc65811aba1d06fe4d794119da049c52e5a9efbbc3599b445b61769992c9919 WHIRLPOOL 31c0f8c0451b81b48a0373f94fcde68f5f23fa7e71fd040f6d97e7e7b20995627a59b08d4f2dfa07e55df3d23e8313af275b38872d923f9455031b8ec66e80b1
+DIST libav-12.2.tar.xz 5268804 SHA256 7b5620261fb3e372bf3992736862f598967988502f7804c39c5246b62348c53b SHA512 4b37cfb18a6cf6f12eddb5175b1751c093f3a495ae1d1b588884c60157cb260479b1d8fa3a6e3e08c00d7a26422b1e78a750eb35cf7bc763c01790f3567cba03 WHIRLPOOL 02d4a8bc00262c9dcdc1fd30187b8ac3ce51dadf533ba9df7cd2875d5e83787e4dd91b84a096aa798788535bb964c0eecebd7ec50bc453079cf61902aa269159
+DIST libav-12.tar.xz 5265280 SHA256 72291ec223b08716fe5204b7b79ea8b90d75003730caa1c575dbf4232277a90e SHA512 55f7dd171882d191c79c6ade10f02123b8b7d897cbbd13c77766c9af944c5ba4bfbc81487966bac1ee459bc61f7a2471ddd9a3ea29b412296e9044b98440c423 WHIRLPOOL 3e52280b09354fddcf35002010d35b19657756a5b2c77e5c35551f899c1fa2c4e939f97058a1a77801caf7c8a9e8955d7d556ae1874c78f210eaf26b368c20ec
+DIST libav-9.17.tar.xz 4080028 SHA256 e32d5f152bce1de283c002a35eb6e71f265877633dee8a40db4d16381dd5d17c SHA512 20af83d4b6a23c159c2386b6592ba6a6acf3f2c54e8aeb16dd0c8a64d637fbde24f37b864698b1143c6802b64a7b5e8ddfe0e7601b35c35686a789e2b3232f5a WHIRLPOOL ec07b5dd116e87416a9841044e09a6ef9b124fe4882f53e88711a32813d3d3a1d71f5067854bbd553ecdadec401dbbb8b504bfc1c6966bfd5e2db79459fb9995
+EBUILD libav-11.3-r1.ebuild 11294 SHA256 34bcb63943d54063515edeb1fd4a7a732edff4282a16eabd4071fe9c45d516bf SHA512 fe16d5e1b238a9a39b4ebcfd18cc1b1609afc8d5c2d89de3e743932f5b290f3f0b42e3821faa1cebef94260add0a9595d03cc614db82a77a69e5727a9b0e0689 WHIRLPOOL 2d023d58e43cf248ac09d994cbd35b125ab9afc3f2628a9b92789cb92fd4ca3efdeb2acab8b81301f88891ceecdeba74fad0e0b1ad525290c2d3e15338495def
+EBUILD libav-11.3.ebuild 11199 SHA256 6895fdbdff8bef1fdeefb0833941648f65e29b93d7931b49dbd9964f2cebb429 SHA512 0c0248f1e456a00e7acb1ad4bab0158a886588cb7d4a9d9299b304196b14c9a17a436cf1367e4f46bc833664880ab5cab61c8332397205c3a393dfee46026141 WHIRLPOOL b76586eef3ad6f615aeb7000e1d17bc7a4f4d3c15ce31174183f11ba79051acaecea6f9e7ce7d7e54a33c9d5ea19d820b4a81ad21ed222c9a0a886a00ce94d5f
+EBUILD libav-11.4.ebuild 11190 SHA256 764ca16b6fafff7f0c95086b74e4a3f885965841890d53ea70dfbe63d1be5bc6 SHA512 b1212eae8f26f8579e40ebf3ac4ffd21d9ae38e4b2b1f896aa85cf45d4b781d3935ec71858e71a6fa25ff17d4d88e7be0eec14d8083ff389c3e043dd0112c3fc WHIRLPOOL 1b81ed884739af319d4baf9c68ebd20e9851b7788d6a57db65a96940a7591e43f74c4d13eb62ef3e8b75a6ffaa1f56c54b02a26206ea915dd36c5e0f4fa9a9a8
+EBUILD libav-11.6.ebuild 11190 SHA256 764ca16b6fafff7f0c95086b74e4a3f885965841890d53ea70dfbe63d1be5bc6 SHA512 b1212eae8f26f8579e40ebf3ac4ffd21d9ae38e4b2b1f896aa85cf45d4b781d3935ec71858e71a6fa25ff17d4d88e7be0eec14d8083ff389c3e043dd0112c3fc WHIRLPOOL 1b81ed884739af319d4baf9c68ebd20e9851b7788d6a57db65a96940a7591e43f74c4d13eb62ef3e8b75a6ffaa1f56c54b02a26206ea915dd36c5e0f4fa9a9a8
+EBUILD libav-11.7.ebuild 11190 SHA256 764ca16b6fafff7f0c95086b74e4a3f885965841890d53ea70dfbe63d1be5bc6 SHA512 b1212eae8f26f8579e40ebf3ac4ffd21d9ae38e4b2b1f896aa85cf45d4b781d3935ec71858e71a6fa25ff17d4d88e7be0eec14d8083ff389c3e043dd0112c3fc WHIRLPOOL 1b81ed884739af319d4baf9c68ebd20e9851b7788d6a57db65a96940a7591e43f74c4d13eb62ef3e8b75a6ffaa1f56c54b02a26206ea915dd36c5e0f4fa9a9a8
+EBUILD libav-11.8.ebuild 11181 SHA256 6efa17abc813febdde20fa67e4484913bbec5a8aa52d5c1116dc52e0a28c66d8 SHA512 167c8c1c0931ea35b0661f894956969c03debff3de338d6f8b336b1cf0d2f88938cf626aa88ba91daf597394be29c2e0d622756ffd4e94f18ef3053f141851b8 WHIRLPOOL cd2983c5c8ed2c8392b98da4deb0ea4591c330fe2d0606cf0aef3c4f1e7caa28b1bfb5cf47dfc85daf1a057a264be49edce30c7725852027b2e41fe77204c1c9
+EBUILD libav-11.9999.ebuild 11141 SHA256 78eb82b97833511f5d9e9866680adbb6134065e6e86e8ac735e111c31fbaa526 SHA512 c879c5bc09b22f77387bf62066b845d8d2e6f6e130d1a439dcc648cf7f1802df0abddcfb9a6c7f3fe11d122abe33da3726cd89eab1346fcce39730cc47f18cfe WHIRLPOOL 11ed897e39bf9e7d7163d19bc090fc10ee4414f13c380299f3428346b971733583e2d4b11be20e18df5c079dbf932861a9b097b17d5e5934884d43a3e85172f8
+EBUILD libav-12.1.ebuild 11722 SHA256 8b42a0101ff7d70da269e3d4f422c4092dc024c5a867742aaff95af093797057 SHA512 989293bae7659082d707edbc01c1b5c6d5aa0ba31065640daa17e325887ab43cc43aee0efb64c2ab181905d7a465f0089b9052c610d7576135fdcb96107f3082 WHIRLPOOL 556f2922a76979d2a35d5c9b6cb59f36815345ee4c06c46204d9fe0e16eb5b0d257b9511d47c1271fe957566296a87655c53acb2c7ca0301a4b10ad3552814a5
+EBUILD libav-12.2.ebuild 11522 SHA256 4b283f0b57d11e8661ad65ec249f94322b9817ae20085fbf09b69dcfe076a7f4 SHA512 a6afb2e793af497cff59660936b2aee2ff990faade1d8af9b52aa62c2380b3229f340a7698ff892aa87c603490e6965bdf1b422124cd560d76f77b961058f062 WHIRLPOOL 560d7f12f53d9f83fe11a272941b08dc06171576dfc6e2908d267b0507796f7fcf3a44418601364818530efef66693d6dad3319d53d332ec8f79baa9d17c4974
+EBUILD libav-12.ebuild 11704 SHA256 62a93f6f7edf0f1bb972076b617e7f88bd0b9a37ac7e3eaabfdf1f27bd331465 SHA512 8601573882fb7170f9cc5e62f82afa87aa7e55750f8d41d8a6b50893e278837a2b31472a6a9625660248c3cd136030eed50f83afd05c8e90133d4da6d72e8a61 WHIRLPOOL 7cf836c884798cbe78953a3918cf7e0a5c57fafeb9ab6731678ee664ffffbeaf434635a0014bb0426d6799cfa5f284217c0c2c16337ffb8a26f353a0488c57e1
+EBUILD libav-9.17.ebuild 10192 SHA256 35c04784e7ff2829b679f33f0282abb0e8d4bba31bcabbe3da9f2a7fd130dedb SHA512 c12da6532ceeb8da0eff9336727d189cd67c6a296c2597cd20e3216082a111c5baefaf329eaed3376b7c8cd6434dc56af806819df83599a61d3998114b8dbb4e WHIRLPOOL d9bfdd3c7e8fb88fa34d5eb2592c023f63cedfee9dcc38f87b9e52119d92c3247a4628af9720e3b591d4b9d83225f40af5c50f3d83c6aec71b7e08ba91c04c49
+EBUILD libav-9999.ebuild 11081 SHA256 e061cbd43a2440ae54a6439364834915003930b8ddfadc3a2f3c61d526e628b6 SHA512 9db33bb8dc207f49cc7f24f9021f025fa24f3d013eddde0c45613b04b978f2dac5a0e4817bba4e8d4368c64c1121d0d865a2f62eac717e177e703a94418815ac WHIRLPOOL fba027330b93cf0d04a1f077200706baf60354c47ab721432aeae9221855192f809a62320996d7f480fc1a675862bb65d73639ce1e4357142ee430d10a57aa34
+MISC ChangeLog 6902 SHA256 d707bc18686b7913c6cd55ec74db213f6d2f9821c23325506c1ee2fc8b75e478 SHA512 6426293a648700f28c2bb38603c985299fc282bcc791ba514b6557e2b7f89649c2c1eb8d4d9e76f8debb23ad59cb7d603f4f661d98c0c282f7f1012572dfdd8f WHIRLPOOL fe1ff28380e74b985af21f3a69144b543e5d254712b0b901f59868841064bb65845f55d624b3f4a2332edf6d775d9564a39beb6a9008d5724af4aa6600f6e205
+MISC ChangeLog-2015 38087 SHA256 a36d8af810fd2f9749f9541910e3222a41ea287c6dd11d05dd851ee741c0cfaf SHA512 e1c807e87f990804fa81cd6233ea6ea98764606adca660ce2c1e0d2064e8b00d3fd80a91c59ff5285f464f79304234f67b14fe41a75e536d654549d792d163c5 WHIRLPOOL 7912d796729fcc56803e2dfbe1d918ccbd868f0fba7543ef850a5ce8e12d897db94ad0717989e6a740849dfb04df94aaa1f6f7d8327e34d93a775575044f2dad
+MISC metadata.xml 2959 SHA256 ec02c03d1724f833d25f54afd4de16ecc879b3547fb0704c8233ebc59e539571 SHA512 ac43516b324f96eb13b2ae4ab511c1dfffddd47293079b9b297ee3f312e92a0dc88561d55bb8d12e6bd89a8ace62670ad30b723a48708046f987cc65244bc628 WHIRLPOOL 1cba6f18bd407168416e2e31d8e4cd6f2a7fb2dec9497dde0708c3068acca19946385f4684992ce02a53e692516666d991ccf6494f6a10fbc92fc32b859b8238
diff --git a/media-video/libav/files/libav-11.3-libvpx-1.5.0.patch b/media-video/libav/files/libav-11.3-libvpx-1.5.0.patch
new file mode 100644
index 000000000000..6844a152b7a5
--- /dev/null
+++ b/media-video/libav/files/libav-11.3-libvpx-1.5.0.patch
@@ -0,0 +1,47 @@
+https://bugs.gentoo.org/565696
+
+commit 4d05e9392f84702e3c833efa86e84c7f1cf5f612
+Author: James Zern <jzern@google.com>
+Date:   Mon Oct 19 22:44:11 2015 -0700
+
+    libvpxenc: remove some unused ctrl id mappings
+    
+    VP8E_UPD_ENTROPY, VP8E_UPD_REFERENCE, VP8E_USE_REFERENCE were removed
+    from libvpx and the remaining values were never used here
+    
+    Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
+    Signed-off-by: James Zern <jzern@google.com>
+    Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
+
+diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
+index 563117f..d1e2523 100644
+--- a/libavcodec/libvpxenc.c
++++ b/libavcodec/libvpxenc.c
+@@ -71,23 +71,15 @@ typedef struct VP8EncoderContext {
+ 
+ /** String mappings for enum vp8e_enc_control_id */
+ static const char *const ctlidstr[] = {
+-    [VP8E_UPD_ENTROPY]           = "VP8E_UPD_ENTROPY",
+-    [VP8E_UPD_REFERENCE]         = "VP8E_UPD_REFERENCE",
+-    [VP8E_USE_REFERENCE]         = "VP8E_USE_REFERENCE",
+-    [VP8E_SET_ROI_MAP]           = "VP8E_SET_ROI_MAP",
+-    [VP8E_SET_ACTIVEMAP]         = "VP8E_SET_ACTIVEMAP",
+-    [VP8E_SET_SCALEMODE]         = "VP8E_SET_SCALEMODE",
++    [VP8E_SET_ARNR_MAXFRAMES]    = "VP8E_SET_ARNR_MAXFRAMES",
++    [VP8E_SET_ARNR_STRENGTH]     = "VP8E_SET_ARNR_STRENGTH",
++    [VP8E_SET_ARNR_TYPE]         = "VP8E_SET_ARNR_TYPE",
+     [VP8E_SET_CPUUSED]           = "VP8E_SET_CPUUSED",
++    [VP8E_SET_CQ_LEVEL]          = "VP8E_SET_CQ_LEVEL",
+     [VP8E_SET_ENABLEAUTOALTREF]  = "VP8E_SET_ENABLEAUTOALTREF",
+     [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY",
+-    [VP8E_SET_SHARPNESS]         = "VP8E_SET_SHARPNESS",
+     [VP8E_SET_STATIC_THRESHOLD]  = "VP8E_SET_STATIC_THRESHOLD",
+     [VP8E_SET_TOKEN_PARTITIONS]  = "VP8E_SET_TOKEN_PARTITIONS",
+-    [VP8E_GET_LAST_QUANTIZER]    = "VP8E_GET_LAST_QUANTIZER",
+-    [VP8E_SET_ARNR_MAXFRAMES]    = "VP8E_SET_ARNR_MAXFRAMES",
+-    [VP8E_SET_ARNR_STRENGTH]     = "VP8E_SET_ARNR_STRENGTH",
+-    [VP8E_SET_ARNR_TYPE]         = "VP8E_SET_ARNR_TYPE",
+-    [VP8E_SET_CQ_LEVEL]          = "VP8E_SET_CQ_LEVEL",
+ };
+ 
+ static av_cold void log_encoder_error(AVCodecContext *avctx, const char *desc)
diff --git a/media-video/libav/libav-11.3-r1.ebuild b/media-video/libav/libav-11.3-r1.ebuild
new file mode 100644
index 000000000000..ddd93225c964
--- /dev/null
+++ b/media-video/libav/libav-11.3-r1.ebuild
@@ -0,0 +1,347 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="git://git.libav.org/libav.git"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+fi
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video"
+HOMEPAGE="https://libav.org/"
+if [[ ${PV} == *9999 ]] ; then
+	SRC_URI=""
+elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
+	SRC_URI="https://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"
+else # Official release
+	SRC_URI="https://libav.org/releases/${P}.tar.xz"
+	SRC_URI+=" https://dev.gentoo.org/~lu_zero/libav/patches/0001-x86-Put-COPY3_IF_LT-under-HAVE_6REGS.patch.gz"
+fi
+# 9999 does not have fate-*.tar.xz
+[[ ${PV%9999} != "" ]] && SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-${PV%%.*}.tar.xz )"
+
+LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
+SLOT="0/11"
+[[ ${PV} == *9999 ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk
+	frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3
+	+network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
+	static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X
+	wavpack webp x264 x265 xvid +zlib"
+
+# String for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+CPU_FEATURES="altivec armv5te armv6 armv6t2 armvfp:vfp neon"
+X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext mmx mmxext sse sse2 sse3 ssse3 sse4_1:sse4 sse4_2:sse42 avx xop fma3 fma4 avx2"
+for i in ${X86_CPU_FEATURES} ; do
+	CPU_FEATURES+=" cpu_flags_x86_${i%:*}:${i#*:}"
+done
+for i in ${CPU_FEATURES} ; do
+	IUSE+=" ${i%:*}"
+done
+
+RDEPEND="
+	!media-video/ffmpeg:0
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
+	encode? (
+		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
+		amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+		theora? (
+			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
+		vorbis? (
+			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
+		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
+	)
+	fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] )
+	frei0r? ( media-plugins/frei0r-plugins )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
+	ieee1394? (
+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+	)
+	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	ssl? (
+		openssl? (
+			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+			libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+		)
+		!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
+	)
+	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	truetype? (	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	doc? ( app-text/texi2html )
+	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	cpu_flags_x86_mmx? ( dev-lang/yasm )
+	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	test? ( sys-devel/bc )
+	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	v4l? ( sys-kernel/linux-headers )
+"
+
+RDEPEND="${RDEPEND}
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+
+# faac can't be binary distributed
+# openssl support marked as nonfree
+# faac and aac are concurent implementations
+# amr and aac require at least lgpl3
+# x264 requires gpl2
+REQUIRED_USE="
+	rtmp? ( network )
+	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl ) x265? ( gpl )
+	test? ( encode zlib )
+	fontconfig? ( truetype )
+"
+RESTRICT="faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libavutil/avconfig.h
+)
+
+src_unpack() {
+	[[ ${PV} == *9999 ]] && git-r3_src_unpack
+	# 9999 does not have fate-*.tar.xz
+	[[ ${PV%9999} != "" ]] && default_src_unpack
+}
+
+src_prepare() {
+	epatch_user
+
+	epatch "${WORKDIR}/0001-x86-Put-COPY3_IF_LT-under-HAVE_6REGS.patch"
+	epatch "${FILESDIR}"/${P}-libvpx-1.5.0.patch #565696
+
+	# if we have snapshot then we need to hardcode the version
+	if [[ ${PV%_p*} != ${PV} ]]; then
+		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
+	fi
+
+	TOOLS=( aviocat graph2dot ismindex pktdumper qt-faststart trasher )
+	use zlib && TOOLS+=( cws2fws )
+
+	MAKEOPTS+=" V=1"
+}
+
+multilib_src_configure() {
+	local myconf=( ${EXTRA_LIBAV_CONF} )
+	local uses i
+
+	# 9999 does not have fate-*.tar.xz
+	[[ ${PV%9999} != "" ]] && use test && myconf+=( --samples="${WORKDIR}/fate" )
+
+	myconf+=(
+		$(use_enable gpl)
+		$(use_enable gpl version3)
+		--enable-avfilter
+	)
+
+	# enabled by default
+	uses="debug doc network zlib"
+	for i in ${uses}; do
+		use ${i} || myconf+=( --disable-${i} )
+	done
+	use bzip2 || myconf+=( --disable-bzlib )
+	use sdl || myconf+=( --disable-avplay )
+
+	if use ssl; then
+		use openssl && myconf+=( --enable-openssl --enable-nonfree ) \
+			|| myconf+=( --enable-gnutls )
+	fi
+
+	use custom-cflags && myconf+=( --disable-optimizations )
+	use cpudetection && myconf+=( --enable-runtime-cpudetect )
+
+	use vdpau || myconf+=( --disable-vdpau )
+
+	use vaapi && myconf+=( --enable-vaapi )
+
+	# Encoders
+	if use encode; then
+		use faac && myconf+=( --enable-nonfree )
+		use mp3 && myconf+=( --enable-libmp3lame )
+		use amr && myconf+=( --enable-libvo-amrwbenc )
+		use aac && myconf+=( --enable-libvo-aacenc )
+		uses="faac theora twolame vorbis wavpack webp x264 x265 xvid"
+		for i in ${uses}; do
+			use ${i} && myconf+=( --enable-lib${i} )
+		done
+	else
+		myconf+=( --disable-encoders )
+	fi
+
+	# libavdevice options
+	use cdio && myconf+=( --enable-libcdio )
+	use ieee1394 && myconf+=( --enable-libdc1394 )
+	use pulseaudio && myconf+=( --enable-libpulse )
+
+	# Indevs
+	# v4l1 is gone since linux-headers-2.6.38
+	myconf+=( --disable-indev=v4l )
+	use v4l || myconf+=( --disable-indev=v4l2 )
+	for i in alsa oss jack; do
+		use ${i} || myconf+=( --disable-indev=${i} )
+	done
+	use X && myconf+=( --enable-x11grab )
+	# Outdevs
+	for i in alsa oss ; do
+		use ${i} || myconf+=( --disable-outdev=${i} )
+	done
+	# libavfilter options
+	use bs2b && myconf+=( --enable-libbs2b )
+	multilib_is_native_abi && use frei0r && myconf+=( --enable-frei0r )
+	use truetype && myconf+=( --enable-libfreetype )
+	use fontconfig && myconf+=( --enable-libfontconfig )
+
+	# Threads; we only support pthread for now
+	use threads && myconf+=( --enable-pthreads )
+
+	# Decoders
+	use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb )
+	use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac )
+	uses="gsm opus rtmp schroedinger speex vpx"
+	for i in ${uses}; do
+		use ${i} && myconf+=( --enable-lib${i} )
+	done
+	use jpeg2k && myconf+=( --enable-libopenjpeg )
+
+	# CPU features
+	for i in ${CPU_FEATURES}; do
+		use ${i%:*} || myconf+=( --disable-${i#*:} )
+	done
+
+	# pass the right -mfpu as extra
+	use neon && append-cflags -mfpu=neon
+
+	# disable mmx accelerated code if PIC is required
+	# as the provided asm decidedly is not PIC for x86.
+	if use pic && [[ ${ABI} == x86 ]]; then
+		myconf+=( --disable-mmx --disable-mmxext )
+	fi
+
+	# Option to force building pic
+	use pic && myconf+=( --enable-pic )
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
+		case ${CHOST} in
+			*freebsd*)
+				myconf+=( --target-os=freebsd )
+				;;
+			mingw32*)
+				myconf+=( --target-os=mingw32 )
+				;;
+			*linux*)
+				myconf+=( --target-os=linux )
+				;;
+		esac
+	fi
+
+	# Misc stuff
+	use hardcoded-tables && myconf+=( --enable-hardcoded-tables )
+
+	# Specific workarounds for too-few-registers arch...
+	if [[ ${ABI} == x86 ]]; then
+		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+		filter-flags -fforce-addr -momit-leaf-frame-pointer
+		append-flags -fomit-frame-pointer
+		is-flag -O? || append-flags -O2
+		if use debug; then
+			# no need to warn about debug if not using debug flag
+			ewarn ""
+			ewarn "Debug information will be almost useless as the frame pointer is omitted."
+			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
+			ewarn "difficult to fix. Please have that in mind."
+			ewarn ""
+		fi
+	fi
+
+	set -- "${S}"/configure \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--shlibdir="${EPREFIX}"/usr/$(get_libdir) \
+		--mandir="${EPREFIX}"/usr/share/man \
+		--enable-shared \
+		--cc="$(tc-getCC)" \
+		--ar="$(tc-getAR)" \
+		--optflags="${CFLAGS}" \
+		--extra-cflags="${CFLAGS}" \
+		$(use_enable static-libs static) \
+		"${myconf[@]}"
+	echo "${@}"
+	"${@}" || die
+}
+
+multilib_src_compile() {
+	emake
+
+	if use tools; then
+		tc-export CC
+
+		emake ${TOOLS[@]/#/tools/}
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install install-man
+	use doc && dodoc doc/*.html
+
+	if use tools; then
+		dobin ${TOOLS[@]/#/tools/}
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README.md INSTALL
+}
+
+multilib_src_test() {
+	local _libs="$(for i in lib*/;do echo -n "${BUILD_DIR}/${i%/}:";done)"
+	einfo "LD_LIBRARY_PATH is set to \"${_libs}\""
+	LD_LIBRARY_PATH="${_libs}" emake -k -j1 fate
+}
diff --git a/media-video/libav/libav-11.3.ebuild b/media-video/libav/libav-11.3.ebuild
new file mode 100644
index 000000000000..db8e6c4c8e99
--- /dev/null
+++ b/media-video/libav/libav-11.3.ebuild
@@ -0,0 +1,344 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="git://git.libav.org/libav.git"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+fi
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video"
+HOMEPAGE="https://libav.org/"
+if [[ ${PV} == *9999 ]] ; then
+	SRC_URI=""
+elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
+	SRC_URI="https://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"
+else # Official release
+	SRC_URI="https://libav.org/releases/${P}.tar.xz"
+	SRC_URI+=" https://dev.gentoo.org/~lu_zero/libav/patches/0001-x86-Put-COPY3_IF_LT-under-HAVE_6REGS.patch.gz"
+fi
+# 9999 does not have fate-*.tar.xz
+[[ ${PV%9999} != "" ]] && SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-${PV%%.*}.tar.xz )"
+
+LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
+SLOT="0/11"
+[[ ${PV} == *9999 ]] || \
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk
+	frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k mp3
+	+network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
+	static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X
+	wavpack webp x264 x265 xvid +zlib"
+
+# String for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+CPU_FEATURES="altivec armv5te armv6 armv6t2 armvfp:vfp neon"
+X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext mmx mmxext sse sse2 sse3 ssse3 sse4_1:sse4 sse4_2:sse42 avx xop fma3 fma4 avx2"
+for i in ${X86_CPU_FEATURES} ; do
+	CPU_FEATURES+=" cpu_flags_x86_${i%:*}:${i#*:}"
+done
+for i in ${CPU_FEATURES} ; do
+	IUSE+=" ${i%:*}"
+done
+
+RDEPEND="
+	!media-video/ffmpeg:0
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
+	encode? (
+		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
+		amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+		theora? (
+			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
+		vorbis? (
+			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
+		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
+	)
+	fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] )
+	frei0r? ( media-plugins/frei0r-plugins )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
+	ieee1394? (
+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+	)
+	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	ssl? (
+		openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+		!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
+	)
+	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	truetype? (	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	doc? ( app-text/texi2html )
+	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	cpu_flags_x86_mmx? ( dev-lang/yasm )
+	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	test? ( sys-devel/bc )
+	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	v4l? ( sys-kernel/linux-headers )
+"
+
+RDEPEND="${RDEPEND}
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+
+# faac can't be binary distributed
+# openssl support marked as nonfree
+# faac and aac are concurent implementations
+# amr and aac require at least lgpl3
+# x264 requires gpl2
+REQUIRED_USE="
+	rtmp? ( network )
+	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl ) x265? ( gpl )
+	test? ( encode zlib )
+	fontconfig? ( truetype )
+"
+RESTRICT="faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libavutil/avconfig.h
+)
+
+src_unpack() {
+	[[ ${PV} == *9999 ]] && git-r3_src_unpack
+	# 9999 does not have fate-*.tar.xz
+	[[ ${PV%9999} != "" ]] && default_src_unpack
+}
+
+src_prepare() {
+	epatch_user
+
+	epatch "${WORKDIR}/0001-x86-Put-COPY3_IF_LT-under-HAVE_6REGS.patch"
+	epatch "${FILESDIR}"/${P}-libvpx-1.5.0.patch #565696
+
+	# if we have snapshot then we need to hardcode the version
+	if [[ ${PV%_p*} != ${PV} ]]; then
+		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
+	fi
+
+	TOOLS=( aviocat graph2dot ismindex pktdumper qt-faststart trasher )
+	use zlib && TOOLS+=( cws2fws )
+
+	MAKEOPTS+=" V=1"
+}
+
+multilib_src_configure() {
+	local myconf=( ${EXTRA_LIBAV_CONF} )
+	local uses i
+
+	# 9999 does not have fate-*.tar.xz
+	[[ ${PV%9999} != "" ]] && use test && myconf+=( --samples="${WORKDIR}/fate" )
+
+	myconf+=(
+		$(use_enable gpl)
+		$(use_enable gpl version3)
+		--enable-avfilter
+	)
+
+	# enabled by default
+	uses="debug doc network zlib"
+	for i in ${uses}; do
+		use ${i} || myconf+=( --disable-${i} )
+	done
+	use bzip2 || myconf+=( --disable-bzlib )
+	use sdl || myconf+=( --disable-avplay )
+
+	if use ssl; then
+		use openssl && myconf+=( --enable-openssl --enable-nonfree ) \
+			|| myconf+=( --enable-gnutls )
+	fi
+
+	use custom-cflags && myconf+=( --disable-optimizations )
+	use cpudetection && myconf+=( --enable-runtime-cpudetect )
+
+	use vdpau || myconf+=( --disable-vdpau )
+
+	use vaapi && myconf+=( --enable-vaapi )
+
+	# Encoders
+	if use encode; then
+		use faac && myconf+=( --enable-nonfree )
+		use mp3 && myconf+=( --enable-libmp3lame )
+		use amr && myconf+=( --enable-libvo-amrwbenc )
+		use aac && myconf+=( --enable-libvo-aacenc )
+		uses="faac theora twolame vorbis wavpack webp x264 x265 xvid"
+		for i in ${uses}; do
+			use ${i} && myconf+=( --enable-lib${i} )
+		done
+	else
+		myconf+=( --disable-encoders )
+	fi
+
+	# libavdevice options
+	use cdio && myconf+=( --enable-libcdio )
+	use ieee1394 && myconf+=( --enable-libdc1394 )
+	use pulseaudio && myconf+=( --enable-libpulse )
+
+	# Indevs
+	# v4l1 is gone since linux-headers-2.6.38
+	myconf+=( --disable-indev=v4l )
+	use v4l || myconf+=( --disable-indev=v4l2 )
+	for i in alsa oss jack; do
+		use ${i} || myconf+=( --disable-indev=${i} )
+	done
+	use X && myconf+=( --enable-x11grab )
+	# Outdevs
+	for i in alsa oss ; do
+		use ${i} || myconf+=( --disable-outdev=${i} )
+	done
+	# libavfilter options
+	use bs2b && myconf+=( --enable-libbs2b )
+	multilib_is_native_abi && use frei0r && myconf+=( --enable-frei0r )
+	use truetype && myconf+=( --enable-libfreetype )
+	use fontconfig && myconf+=( --enable-libfontconfig )
+
+	# Threads; we only support pthread for now
+	use threads && myconf+=( --enable-pthreads )
+
+	# Decoders
+	use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb )
+	use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac )
+	uses="gsm opus rtmp schroedinger speex vpx"
+	for i in ${uses}; do
+		use ${i} && myconf+=( --enable-lib${i} )
+	done
+	use jpeg2k && myconf+=( --enable-libopenjpeg )
+
+	# CPU features
+	for i in ${CPU_FEATURES}; do
+		use ${i%:*} || myconf+=( --disable-${i#*:} )
+	done
+
+	# pass the right -mfpu as extra
+	use neon && append-cflags -mfpu=neon
+
+	# disable mmx accelerated code if PIC is required
+	# as the provided asm decidedly is not PIC for x86.
+	if use pic && [[ ${ABI} == x86 ]]; then
+		myconf+=( --disable-mmx --disable-mmxext )
+	fi
+
+	# Option to force building pic
+	use pic && myconf+=( --enable-pic )
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
+		case ${CHOST} in
+			*freebsd*)
+				myconf+=( --target-os=freebsd )
+				;;
+			mingw32*)
+				myconf+=( --target-os=mingw32 )
+				;;
+			*linux*)
+				myconf+=( --target-os=linux )
+				;;
+		esac
+	fi
+
+	# Misc stuff
+	use hardcoded-tables && myconf+=( --enable-hardcoded-tables )
+
+	# Specific workarounds for too-few-registers arch...
+	if [[ ${ABI} == x86 ]]; then
+		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+		filter-flags -fforce-addr -momit-leaf-frame-pointer
+		append-flags -fomit-frame-pointer
+		is-flag -O? || append-flags -O2
+		if use debug; then
+			# no need to warn about debug if not using debug flag
+			ewarn ""
+			ewarn "Debug information will be almost useless as the frame pointer is omitted."
+			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
+			ewarn "difficult to fix. Please have that in mind."
+			ewarn ""
+		fi
+	fi
+
+	set -- "${S}"/configure \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--shlibdir="${EPREFIX}"/usr/$(get_libdir) \
+		--mandir="${EPREFIX}"/usr/share/man \
+		--enable-shared \
+		--cc="$(tc-getCC)" \
+		--ar="$(tc-getAR)" \
+		--optflags="${CFLAGS}" \
+		--extra-cflags="${CFLAGS}" \
+		$(use_enable static-libs static) \
+		"${myconf[@]}"
+	echo "${@}"
+	"${@}" || die
+}
+
+multilib_src_compile() {
+	emake
+
+	if use tools; then
+		tc-export CC
+
+		emake ${TOOLS[@]/#/tools/}
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install install-man
+	use doc && dodoc doc/*.html
+
+	if use tools; then
+		dobin ${TOOLS[@]/#/tools/}
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README.md INSTALL
+}
+
+multilib_src_test() {
+	local _libs="$(for i in lib*/;do echo -n "${BUILD_DIR}/${i%/}:";done)"
+	einfo "LD_LIBRARY_PATH is set to \"${_libs}\""
+	LD_LIBRARY_PATH="${_libs}" emake -k -j1 fate
+}
diff --git a/media-video/libav/libav-11.4.ebuild b/media-video/libav/libav-11.4.ebuild
new file mode 100644
index 000000000000..dba68568769a
--- /dev/null
+++ b/media-video/libav/libav-11.4.ebuild
@@ -0,0 +1,346 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="git://git.libav.org/libav.git"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+fi
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video"
+HOMEPAGE="https://libav.org/"
+if [[ ${PV} == *9999 ]] ; then
+	SRC_URI=""
+elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
+	SRC_URI="https://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"
+else # Official release
+	SRC_URI="https://libav.org/releases/${P}.tar.xz"
+fi
+# 9999 does not have fate-*.tar.xz
+[[ ${PV%9999} != "" ]] && SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-${PV%%.*}.tar.xz )"
+
+LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
+SLOT="0/11"
+[[ ${PV} == *9999 ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk
+	frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3
+	+network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
+	static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X
+	wavpack webp x264 x265 xvid +zlib"
+
+# String for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+CPU_FEATURES="altivec armv5te armv6 armv6t2 armvfp:vfp neon"
+X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext mmx mmxext sse sse2 sse3 ssse3 sse4_1:sse4 sse4_2:sse42 avx xop fma3 fma4 avx2"
+for i in ${X86_CPU_FEATURES} ; do
+	CPU_FEATURES+=" cpu_flags_x86_${i%:*}:${i#*:}"
+done
+for i in ${CPU_FEATURES} ; do
+	IUSE+=" ${i%:*}"
+done
+
+RDEPEND="
+	!media-video/ffmpeg:0
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
+	encode? (
+		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
+		amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+		theora? (
+			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
+		vorbis? (
+			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
+		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
+	)
+	fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] )
+	frei0r? ( media-plugins/frei0r-plugins )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
+	ieee1394? (
+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+	)
+	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	ssl? (
+		openssl? (
+			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+			libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+		)
+		!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
+	)
+	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	truetype? (	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	doc? ( app-text/texi2html )
+	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	cpu_flags_x86_mmx? ( dev-lang/yasm )
+	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	test? ( sys-devel/bc )
+	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	v4l? ( sys-kernel/linux-headers )
+"
+
+RDEPEND="${RDEPEND}
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+
+# faac can't be binary distributed
+# openssl support marked as nonfree
+# faac and aac are concurent implementations
+# amr and aac require at least lgpl3
+# x264 requires gpl2
+REQUIRED_USE="
+	rtmp? ( network )
+	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl ) x265? ( gpl )
+	test? ( encode zlib )
+	fontconfig? ( truetype )
+"
+RESTRICT="faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libavutil/avconfig.h
+)
+
+src_unpack() {
+	[[ ${PV} == *9999 ]] && git-r3_src_unpack
+	# 9999 does not have fate-*.tar.xz
+	[[ ${PV%9999} != "" ]] && default_src_unpack
+}
+
+src_prepare() {
+	epatch_user
+
+	epatch "${FILESDIR}"/libav-11.3-libvpx-1.5.0.patch #565696
+
+	# if we have snapshot then we need to hardcode the version
+	if [[ ${PV%_p*} != ${PV} ]]; then
+		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
+	fi
+
+	TOOLS=( aviocat graph2dot ismindex pktdumper qt-faststart trasher )
+	use zlib && TOOLS+=( cws2fws )
+
+	MAKEOPTS+=" V=1"
+}
+
+multilib_src_configure() {
+	local myconf=( ${EXTRA_LIBAV_CONF} )
+	local uses i
+
+	# 9999 does not have fate-*.tar.xz
+	[[ ${PV%9999} != "" ]] && use test && myconf+=( --samples="${WORKDIR}/fate" )
+
+	myconf+=(
+		$(use_enable gpl)
+		$(use_enable gpl version3)
+		# It is a security concern and removed in the next version
+		--disable-protocol=concat
+	)
+
+	# enabled by default
+	uses="debug doc network zlib"
+	for i in ${uses}; do
+		use ${i} || myconf+=( --disable-${i} )
+	done
+	use bzip2 || myconf+=( --disable-bzlib )
+	use sdl || myconf+=( --disable-avplay )
+
+	if use ssl; then
+		use openssl && myconf+=( --enable-openssl --enable-nonfree ) \
+			|| myconf+=( --enable-gnutls )
+	fi
+
+	use custom-cflags && myconf+=( --disable-optimizations )
+	use cpudetection && myconf+=( --enable-runtime-cpudetect )
+
+	use vdpau || myconf+=( --disable-vdpau )
+
+	use vaapi && myconf+=( --enable-vaapi )
+
+	# Encoders
+	if use encode; then
+		use faac && myconf+=( --enable-nonfree )
+		use mp3 && myconf+=( --enable-libmp3lame )
+		use amr && myconf+=( --enable-libvo-amrwbenc )
+		use aac && myconf+=( --enable-libvo-aacenc )
+		uses="faac theora twolame vorbis wavpack webp x264 x265 xvid"
+		for i in ${uses}; do
+			use ${i} && myconf+=( --enable-lib${i} )
+		done
+	else
+		myconf+=( --disable-encoders )
+	fi
+
+	# libavdevice options
+	use cdio && myconf+=( --enable-libcdio )
+	use ieee1394 && myconf+=( --enable-libdc1394 )
+	use pulseaudio && myconf+=( --enable-libpulse )
+
+	# Indevs
+	# v4l1 is gone since linux-headers-2.6.38
+	myconf+=( --disable-indev=v4l )
+	use v4l || myconf+=( --disable-indev=v4l2 )
+	for i in alsa oss jack; do
+		use ${i} || myconf+=( --disable-indev=${i} )
+	done
+	use X && myconf+=( --enable-x11grab )
+	# Outdevs
+	for i in alsa oss ; do
+		use ${i} || myconf+=( --disable-outdev=${i} )
+	done
+	# libavfilter options
+	use bs2b && myconf+=( --enable-libbs2b )
+	multilib_is_native_abi && use frei0r && myconf+=( --enable-frei0r )
+	use truetype && myconf+=( --enable-libfreetype )
+	use fontconfig && myconf+=( --enable-libfontconfig )
+
+	# Threads; we only support pthread for now
+	use threads && myconf+=( --enable-pthreads )
+
+	# Decoders
+	use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb )
+	use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac )
+	uses="gsm opus rtmp schroedinger speex vpx"
+	for i in ${uses}; do
+		use ${i} && myconf+=( --enable-lib${i} )
+	done
+	use jpeg2k && myconf+=( --enable-libopenjpeg )
+
+	# CPU features
+	for i in ${CPU_FEATURES}; do
+		use ${i%:*} || myconf+=( --disable-${i#*:} )
+	done
+
+	# pass the right -mfpu as extra
+	use neon && append-cflags -mfpu=neon
+
+	# disable mmx accelerated code if PIC is required
+	# as the provided asm decidedly is not PIC for x86.
+	if use pic && [[ ${ABI} == x86 ]]; then
+		myconf+=( --disable-mmx --disable-mmxext )
+	fi
+
+	# Option to force building pic
+	use pic && myconf+=( --enable-pic )
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
+		case ${CHOST} in
+			*freebsd*)
+				myconf+=( --target-os=freebsd )
+				;;
+			mingw32*)
+				myconf+=( --target-os=mingw32 )
+				;;
+			*linux*)
+				myconf+=( --target-os=linux )
+				;;
+		esac
+	fi
+
+	# Misc stuff
+	use hardcoded-tables && myconf+=( --enable-hardcoded-tables )
+
+	# Specific workarounds for too-few-registers arch...
+	if [[ ${ABI} == x86 ]]; then
+		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+		filter-flags -fforce-addr -momit-leaf-frame-pointer
+		append-flags -fomit-frame-pointer
+		is-flag -O? || append-flags -O2
+		if use debug; then
+			# no need to warn about debug if not using debug flag
+			ewarn ""
+			ewarn "Debug information will be almost useless as the frame pointer is omitted."
+			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
+			ewarn "difficult to fix. Please have that in mind."
+			ewarn ""
+		fi
+	fi
+
+	set -- "${S}"/configure \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--shlibdir="${EPREFIX}"/usr/$(get_libdir) \
+		--mandir="${EPREFIX}"/usr/share/man \
+		--enable-shared \
+		--cc="$(tc-getCC)" \
+		--ar="$(tc-getAR)" \
+		--optflags="${CFLAGS}" \
+		--extra-cflags="${CFLAGS}" \
+		$(use_enable static-libs static) \
+		"${myconf[@]}"
+	echo "${@}"
+	"${@}" || die
+}
+
+multilib_src_compile() {
+	emake
+
+	if use tools; then
+		tc-export CC
+
+		emake ${TOOLS[@]/#/tools/}
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install install-man
+	use doc && dodoc doc/*.html
+
+	if use tools; then
+		dobin ${TOOLS[@]/#/tools/}
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README.md INSTALL
+}
+
+multilib_src_test() {
+	local _libs="$(for i in lib*/;do echo -n "${BUILD_DIR}/${i%/}:";done)"
+	einfo "LD_LIBRARY_PATH is set to \"${_libs}\""
+	LD_LIBRARY_PATH="${_libs}" emake -k -j1 fate
+}
diff --git a/media-video/libav/libav-11.6.ebuild b/media-video/libav/libav-11.6.ebuild
new file mode 100644
index 000000000000..dba68568769a
--- /dev/null
+++ b/media-video/libav/libav-11.6.ebuild
@@ -0,0 +1,346 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="git://git.libav.org/libav.git"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+fi
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video"
+HOMEPAGE="https://libav.org/"
+if [[ ${PV} == *9999 ]] ; then
+	SRC_URI=""
+elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
+	SRC_URI="https://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"
+else # Official release
+	SRC_URI="https://libav.org/releases/${P}.tar.xz"
+fi
+# 9999 does not have fate-*.tar.xz
+[[ ${PV%9999} != "" ]] && SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-${PV%%.*}.tar.xz )"
+
+LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
+SLOT="0/11"
+[[ ${PV} == *9999 ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk
+	frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3
+	+network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
+	static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X
+	wavpack webp x264 x265 xvid +zlib"
+
+# String for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+CPU_FEATURES="altivec armv5te armv6 armv6t2 armvfp:vfp neon"
+X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext mmx mmxext sse sse2 sse3 ssse3 sse4_1:sse4 sse4_2:sse42 avx xop fma3 fma4 avx2"
+for i in ${X86_CPU_FEATURES} ; do
+	CPU_FEATURES+=" cpu_flags_x86_${i%:*}:${i#*:}"
+done
+for i in ${CPU_FEATURES} ; do
+	IUSE+=" ${i%:*}"
+done
+
+RDEPEND="
+	!media-video/ffmpeg:0
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
+	encode? (
+		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
+		amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+		theora? (
+			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
+		vorbis? (
+			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
+		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
+	)
+	fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] )
+	frei0r? ( media-plugins/frei0r-plugins )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
+	ieee1394? (
+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+	)
+	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	ssl? (
+		openssl? (
+			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+			libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+		)
+		!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
+	)
+	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	truetype? (	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	doc? ( app-text/texi2html )
+	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	cpu_flags_x86_mmx? ( dev-lang/yasm )
+	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	test? ( sys-devel/bc )
+	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	v4l? ( sys-kernel/linux-headers )
+"
+
+RDEPEND="${RDEPEND}
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+
+# faac can't be binary distributed
+# openssl support marked as nonfree
+# faac and aac are concurent implementations
+# amr and aac require at least lgpl3
+# x264 requires gpl2
+REQUIRED_USE="
+	rtmp? ( network )
+	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl ) x265? ( gpl )
+	test? ( encode zlib )
+	fontconfig? ( truetype )
+"
+RESTRICT="faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libavutil/avconfig.h
+)
+
+src_unpack() {
+	[[ ${PV} == *9999 ]] && git-r3_src_unpack
+	# 9999 does not have fate-*.tar.xz
+	[[ ${PV%9999} != "" ]] && default_src_unpack
+}
+
+src_prepare() {
+	epatch_user
+
+	epatch "${FILESDIR}"/libav-11.3-libvpx-1.5.0.patch #565696
+
+	# if we have snapshot then we need to hardcode the version
+	if [[ ${PV%_p*} != ${PV} ]]; then
+		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
+	fi
+
+	TOOLS=( aviocat graph2dot ismindex pktdumper qt-faststart trasher )
+	use zlib && TOOLS+=( cws2fws )
+
+	MAKEOPTS+=" V=1"
+}
+
+multilib_src_configure() {
+	local myconf=( ${EXTRA_LIBAV_CONF} )
+	local uses i
+
+	# 9999 does not have fate-*.tar.xz
+	[[ ${PV%9999} != "" ]] && use test && myconf+=( --samples="${WORKDIR}/fate" )
+
+	myconf+=(
+		$(use_enable gpl)
+		$(use_enable gpl version3)
+		# It is a security concern and removed in the next version
+		--disable-protocol=concat
+	)
+
+	# enabled by default
+	uses="debug doc network zlib"
+	for i in ${uses}; do
+		use ${i} || myconf+=( --disable-${i} )
+	done
+	use bzip2 || myconf+=( --disable-bzlib )
+	use sdl || myconf+=( --disable-avplay )
+
+	if use ssl; then
+		use openssl && myconf+=( --enable-openssl --enable-nonfree ) \
+			|| myconf+=( --enable-gnutls )
+	fi
+
+	use custom-cflags && myconf+=( --disable-optimizations )
+	use cpudetection && myconf+=( --enable-runtime-cpudetect )
+
+	use vdpau || myconf+=( --disable-vdpau )
+
+	use vaapi && myconf+=( --enable-vaapi )
+
+	# Encoders
+	if use encode; then
+		use faac && myconf+=( --enable-nonfree )
+		use mp3 && myconf+=( --enable-libmp3lame )
+		use amr && myconf+=( --enable-libvo-amrwbenc )
+		use aac && myconf+=( --enable-libvo-aacenc )
+		uses="faac theora twolame vorbis wavpack webp x264 x265 xvid"
+		for i in ${uses}; do
+			use ${i} && myconf+=( --enable-lib${i} )
+		done
+	else
+		myconf+=( --disable-encoders )
+	fi
+
+	# libavdevice options
+	use cdio && myconf+=( --enable-libcdio )
+	use ieee1394 && myconf+=( --enable-libdc1394 )
+	use pulseaudio && myconf+=( --enable-libpulse )
+
+	# Indevs
+	# v4l1 is gone since linux-headers-2.6.38
+	myconf+=( --disable-indev=v4l )
+	use v4l || myconf+=( --disable-indev=v4l2 )
+	for i in alsa oss jack; do
+		use ${i} || myconf+=( --disable-indev=${i} )
+	done
+	use X && myconf+=( --enable-x11grab )
+	# Outdevs
+	for i in alsa oss ; do
+		use ${i} || myconf+=( --disable-outdev=${i} )
+	done
+	# libavfilter options
+	use bs2b && myconf+=( --enable-libbs2b )
+	multilib_is_native_abi && use frei0r && myconf+=( --enable-frei0r )
+	use truetype && myconf+=( --enable-libfreetype )
+	use fontconfig && myconf+=( --enable-libfontconfig )
+
+	# Threads; we only support pthread for now
+	use threads && myconf+=( --enable-pthreads )
+
+	# Decoders
+	use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb )
+	use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac )
+	uses="gsm opus rtmp schroedinger speex vpx"
+	for i in ${uses}; do
+		use ${i} && myconf+=( --enable-lib${i} )
+	done
+	use jpeg2k && myconf+=( --enable-libopenjpeg )
+
+	# CPU features
+	for i in ${CPU_FEATURES}; do
+		use ${i%:*} || myconf+=( --disable-${i#*:} )
+	done
+
+	# pass the right -mfpu as extra
+	use neon && append-cflags -mfpu=neon
+
+	# disable mmx accelerated code if PIC is required
+	# as the provided asm decidedly is not PIC for x86.
+	if use pic && [[ ${ABI} == x86 ]]; then
+		myconf+=( --disable-mmx --disable-mmxext )
+	fi
+
+	# Option to force building pic
+	use pic && myconf+=( --enable-pic )
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
+		case ${CHOST} in
+			*freebsd*)
+				myconf+=( --target-os=freebsd )
+				;;
+			mingw32*)
+				myconf+=( --target-os=mingw32 )
+				;;
+			*linux*)
+				myconf+=( --target-os=linux )
+				;;
+		esac
+	fi
+
+	# Misc stuff
+	use hardcoded-tables && myconf+=( --enable-hardcoded-tables )
+
+	# Specific workarounds for too-few-registers arch...
+	if [[ ${ABI} == x86 ]]; then
+		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+		filter-flags -fforce-addr -momit-leaf-frame-pointer
+		append-flags -fomit-frame-pointer
+		is-flag -O? || append-flags -O2
+		if use debug; then
+			# no need to warn about debug if not using debug flag
+			ewarn ""
+			ewarn "Debug information will be almost useless as the frame pointer is omitted."
+			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
+			ewarn "difficult to fix. Please have that in mind."
+			ewarn ""
+		fi
+	fi
+
+	set -- "${S}"/configure \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--shlibdir="${EPREFIX}"/usr/$(get_libdir) \
+		--mandir="${EPREFIX}"/usr/share/man \
+		--enable-shared \
+		--cc="$(tc-getCC)" \
+		--ar="$(tc-getAR)" \
+		--optflags="${CFLAGS}" \
+		--extra-cflags="${CFLAGS}" \
+		$(use_enable static-libs static) \
+		"${myconf[@]}"
+	echo "${@}"
+	"${@}" || die
+}
+
+multilib_src_compile() {
+	emake
+
+	if use tools; then
+		tc-export CC
+
+		emake ${TOOLS[@]/#/tools/}
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install install-man
+	use doc && dodoc doc/*.html
+
+	if use tools; then
+		dobin ${TOOLS[@]/#/tools/}
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README.md INSTALL
+}
+
+multilib_src_test() {
+	local _libs="$(for i in lib*/;do echo -n "${BUILD_DIR}/${i%/}:";done)"
+	einfo "LD_LIBRARY_PATH is set to \"${_libs}\""
+	LD_LIBRARY_PATH="${_libs}" emake -k -j1 fate
+}
diff --git a/media-video/libav/libav-11.7.ebuild b/media-video/libav/libav-11.7.ebuild
new file mode 100644
index 000000000000..dba68568769a
--- /dev/null
+++ b/media-video/libav/libav-11.7.ebuild
@@ -0,0 +1,346 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="git://git.libav.org/libav.git"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+fi
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video"
+HOMEPAGE="https://libav.org/"
+if [[ ${PV} == *9999 ]] ; then
+	SRC_URI=""
+elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
+	SRC_URI="https://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"
+else # Official release
+	SRC_URI="https://libav.org/releases/${P}.tar.xz"
+fi
+# 9999 does not have fate-*.tar.xz
+[[ ${PV%9999} != "" ]] && SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-${PV%%.*}.tar.xz )"
+
+LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
+SLOT="0/11"
+[[ ${PV} == *9999 ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk
+	frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3
+	+network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
+	static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X
+	wavpack webp x264 x265 xvid +zlib"
+
+# String for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+CPU_FEATURES="altivec armv5te armv6 armv6t2 armvfp:vfp neon"
+X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext mmx mmxext sse sse2 sse3 ssse3 sse4_1:sse4 sse4_2:sse42 avx xop fma3 fma4 avx2"
+for i in ${X86_CPU_FEATURES} ; do
+	CPU_FEATURES+=" cpu_flags_x86_${i%:*}:${i#*:}"
+done
+for i in ${CPU_FEATURES} ; do
+	IUSE+=" ${i%:*}"
+done
+
+RDEPEND="
+	!media-video/ffmpeg:0
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
+	encode? (
+		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
+		amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+		theora? (
+			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
+		vorbis? (
+			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
+		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
+	)
+	fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] )
+	frei0r? ( media-plugins/frei0r-plugins )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
+	ieee1394? (
+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+	)
+	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	ssl? (
+		openssl? (
+			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+			libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+		)
+		!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
+	)
+	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	truetype? (	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	doc? ( app-text/texi2html )
+	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	cpu_flags_x86_mmx? ( dev-lang/yasm )
+	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	test? ( sys-devel/bc )
+	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	v4l? ( sys-kernel/linux-headers )
+"
+
+RDEPEND="${RDEPEND}
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+
+# faac can't be binary distributed
+# openssl support marked as nonfree
+# faac and aac are concurent implementations
+# amr and aac require at least lgpl3
+# x264 requires gpl2
+REQUIRED_USE="
+	rtmp? ( network )
+	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl ) x265? ( gpl )
+	test? ( encode zlib )
+	fontconfig? ( truetype )
+"
+RESTRICT="faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libavutil/avconfig.h
+)
+
+src_unpack() {
+	[[ ${PV} == *9999 ]] && git-r3_src_unpack
+	# 9999 does not have fate-*.tar.xz
+	[[ ${PV%9999} != "" ]] && default_src_unpack
+}
+
+src_prepare() {
+	epatch_user
+
+	epatch "${FILESDIR}"/libav-11.3-libvpx-1.5.0.patch #565696
+
+	# if we have snapshot then we need to hardcode the version
+	if [[ ${PV%_p*} != ${PV} ]]; then
+		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
+	fi
+
+	TOOLS=( aviocat graph2dot ismindex pktdumper qt-faststart trasher )
+	use zlib && TOOLS+=( cws2fws )
+
+	MAKEOPTS+=" V=1"
+}
+
+multilib_src_configure() {
+	local myconf=( ${EXTRA_LIBAV_CONF} )
+	local uses i
+
+	# 9999 does not have fate-*.tar.xz
+	[[ ${PV%9999} != "" ]] && use test && myconf+=( --samples="${WORKDIR}/fate" )
+
+	myconf+=(
+		$(use_enable gpl)
+		$(use_enable gpl version3)
+		# It is a security concern and removed in the next version
+		--disable-protocol=concat
+	)
+
+	# enabled by default
+	uses="debug doc network zlib"
+	for i in ${uses}; do
+		use ${i} || myconf+=( --disable-${i} )
+	done
+	use bzip2 || myconf+=( --disable-bzlib )
+	use sdl || myconf+=( --disable-avplay )
+
+	if use ssl; then
+		use openssl && myconf+=( --enable-openssl --enable-nonfree ) \
+			|| myconf+=( --enable-gnutls )
+	fi
+
+	use custom-cflags && myconf+=( --disable-optimizations )
+	use cpudetection && myconf+=( --enable-runtime-cpudetect )
+
+	use vdpau || myconf+=( --disable-vdpau )
+
+	use vaapi && myconf+=( --enable-vaapi )
+
+	# Encoders
+	if use encode; then
+		use faac && myconf+=( --enable-nonfree )
+		use mp3 && myconf+=( --enable-libmp3lame )
+		use amr && myconf+=( --enable-libvo-amrwbenc )
+		use aac && myconf+=( --enable-libvo-aacenc )
+		uses="faac theora twolame vorbis wavpack webp x264 x265 xvid"
+		for i in ${uses}; do
+			use ${i} && myconf+=( --enable-lib${i} )
+		done
+	else
+		myconf+=( --disable-encoders )
+	fi
+
+	# libavdevice options
+	use cdio && myconf+=( --enable-libcdio )
+	use ieee1394 && myconf+=( --enable-libdc1394 )
+	use pulseaudio && myconf+=( --enable-libpulse )
+
+	# Indevs
+	# v4l1 is gone since linux-headers-2.6.38
+	myconf+=( --disable-indev=v4l )
+	use v4l || myconf+=( --disable-indev=v4l2 )
+	for i in alsa oss jack; do
+		use ${i} || myconf+=( --disable-indev=${i} )
+	done
+	use X && myconf+=( --enable-x11grab )
+	# Outdevs
+	for i in alsa oss ; do
+		use ${i} || myconf+=( --disable-outdev=${i} )
+	done
+	# libavfilter options
+	use bs2b && myconf+=( --enable-libbs2b )
+	multilib_is_native_abi && use frei0r && myconf+=( --enable-frei0r )
+	use truetype && myconf+=( --enable-libfreetype )
+	use fontconfig && myconf+=( --enable-libfontconfig )
+
+	# Threads; we only support pthread for now
+	use threads && myconf+=( --enable-pthreads )
+
+	# Decoders
+	use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb )
+	use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac )
+	uses="gsm opus rtmp schroedinger speex vpx"
+	for i in ${uses}; do
+		use ${i} && myconf+=( --enable-lib${i} )
+	done
+	use jpeg2k && myconf+=( --enable-libopenjpeg )
+
+	# CPU features
+	for i in ${CPU_FEATURES}; do
+		use ${i%:*} || myconf+=( --disable-${i#*:} )
+	done
+
+	# pass the right -mfpu as extra
+	use neon && append-cflags -mfpu=neon
+
+	# disable mmx accelerated code if PIC is required
+	# as the provided asm decidedly is not PIC for x86.
+	if use pic && [[ ${ABI} == x86 ]]; then
+		myconf+=( --disable-mmx --disable-mmxext )
+	fi
+
+	# Option to force building pic
+	use pic && myconf+=( --enable-pic )
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
+		case ${CHOST} in
+			*freebsd*)
+				myconf+=( --target-os=freebsd )
+				;;
+			mingw32*)
+				myconf+=( --target-os=mingw32 )
+				;;
+			*linux*)
+				myconf+=( --target-os=linux )
+				;;
+		esac
+	fi
+
+	# Misc stuff
+	use hardcoded-tables && myconf+=( --enable-hardcoded-tables )
+
+	# Specific workarounds for too-few-registers arch...
+	if [[ ${ABI} == x86 ]]; then
+		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+		filter-flags -fforce-addr -momit-leaf-frame-pointer
+		append-flags -fomit-frame-pointer
+		is-flag -O? || append-flags -O2
+		if use debug; then
+			# no need to warn about debug if not using debug flag
+			ewarn ""
+			ewarn "Debug information will be almost useless as the frame pointer is omitted."
+			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
+			ewarn "difficult to fix. Please have that in mind."
+			ewarn ""
+		fi
+	fi
+
+	set -- "${S}"/configure \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--shlibdir="${EPREFIX}"/usr/$(get_libdir) \
+		--mandir="${EPREFIX}"/usr/share/man \
+		--enable-shared \
+		--cc="$(tc-getCC)" \
+		--ar="$(tc-getAR)" \
+		--optflags="${CFLAGS}" \
+		--extra-cflags="${CFLAGS}" \
+		$(use_enable static-libs static) \
+		"${myconf[@]}"
+	echo "${@}"
+	"${@}" || die
+}
+
+multilib_src_compile() {
+	emake
+
+	if use tools; then
+		tc-export CC
+
+		emake ${TOOLS[@]/#/tools/}
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install install-man
+	use doc && dodoc doc/*.html
+
+	if use tools; then
+		dobin ${TOOLS[@]/#/tools/}
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README.md INSTALL
+}
+
+multilib_src_test() {
+	local _libs="$(for i in lib*/;do echo -n "${BUILD_DIR}/${i%/}:";done)"
+	einfo "LD_LIBRARY_PATH is set to \"${_libs}\""
+	LD_LIBRARY_PATH="${_libs}" emake -k -j1 fate
+}
diff --git a/media-video/libav/libav-11.8.ebuild b/media-video/libav/libav-11.8.ebuild
new file mode 100644
index 000000000000..4a42816a6301
--- /dev/null
+++ b/media-video/libav/libav-11.8.ebuild
@@ -0,0 +1,346 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="git://git.libav.org/libav.git"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+fi
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video"
+HOMEPAGE="https://libav.org/"
+if [[ ${PV} == *9999 ]] ; then
+	SRC_URI=""
+elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
+	SRC_URI="https://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"
+else # Official release
+	SRC_URI="https://libav.org/releases/${P}.tar.xz"
+fi
+# 9999 does not have fate-*.tar.xz
+[[ ${PV%9999} != "" ]] && SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-${PV%%.*}.tar.xz )"
+
+LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
+SLOT="0/11"
+[[ ${PV} == *9999 ]] || \
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk
+	frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3
+	+network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
+	static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X
+	wavpack webp x264 x265 xvid +zlib"
+
+# String for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+CPU_FEATURES="altivec armv5te armv6 armv6t2 armvfp:vfp neon"
+X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext mmx mmxext sse sse2 sse3 ssse3 sse4_1:sse4 sse4_2:sse42 avx xop fma3 fma4 avx2"
+for i in ${X86_CPU_FEATURES} ; do
+	CPU_FEATURES+=" cpu_flags_x86_${i%:*}:${i#*:}"
+done
+for i in ${CPU_FEATURES} ; do
+	IUSE+=" ${i%:*}"
+done
+
+RDEPEND="
+	!media-video/ffmpeg:0
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
+	encode? (
+		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
+		amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+		theora? (
+			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
+		vorbis? (
+			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
+		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
+	)
+	fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] )
+	frei0r? ( media-plugins/frei0r-plugins )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
+	ieee1394? (
+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+	)
+	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	ssl? (
+		openssl? (
+			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+			libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+		)
+		!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
+	)
+	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	truetype? (	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	doc? ( app-text/texi2html )
+	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	cpu_flags_x86_mmx? ( dev-lang/yasm )
+	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	test? ( sys-devel/bc )
+	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	v4l? ( sys-kernel/linux-headers )
+"
+
+RDEPEND="${RDEPEND}
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+
+# faac can't be binary distributed
+# openssl support marked as nonfree
+# faac and aac are concurent implementations
+# amr and aac require at least lgpl3
+# x264 requires gpl2
+REQUIRED_USE="
+	rtmp? ( network )
+	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl ) x265? ( gpl )
+	test? ( encode zlib )
+	fontconfig? ( truetype )
+"
+RESTRICT="faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libavutil/avconfig.h
+)
+
+src_unpack() {
+	[[ ${PV} == *9999 ]] && git-r3_src_unpack
+	# 9999 does not have fate-*.tar.xz
+	[[ ${PV%9999} != "" ]] && default_src_unpack
+}
+
+src_prepare() {
+	epatch_user
+
+	epatch "${FILESDIR}"/libav-11.3-libvpx-1.5.0.patch #565696
+
+	# if we have snapshot then we need to hardcode the version
+	if [[ ${PV%_p*} != ${PV} ]]; then
+		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
+	fi
+
+	TOOLS=( aviocat graph2dot ismindex pktdumper qt-faststart trasher )
+	use zlib && TOOLS+=( cws2fws )
+
+	MAKEOPTS+=" V=1"
+}
+
+multilib_src_configure() {
+	local myconf=( ${EXTRA_LIBAV_CONF} )
+	local uses i
+
+	# 9999 does not have fate-*.tar.xz
+	[[ ${PV%9999} != "" ]] && use test && myconf+=( --samples="${WORKDIR}/fate" )
+
+	myconf+=(
+		$(use_enable gpl)
+		$(use_enable gpl version3)
+		# It is a security concern and removed in the next version
+		--disable-protocol=concat
+	)
+
+	# enabled by default
+	uses="debug doc network zlib"
+	for i in ${uses}; do
+		use ${i} || myconf+=( --disable-${i} )
+	done
+	use bzip2 || myconf+=( --disable-bzlib )
+	use sdl || myconf+=( --disable-avplay )
+
+	if use ssl; then
+		use openssl && myconf+=( --enable-openssl --enable-nonfree ) \
+			|| myconf+=( --enable-gnutls )
+	fi
+
+	use custom-cflags && myconf+=( --disable-optimizations )
+	use cpudetection && myconf+=( --enable-runtime-cpudetect )
+
+	use vdpau || myconf+=( --disable-vdpau )
+
+	use vaapi && myconf+=( --enable-vaapi )
+
+	# Encoders
+	if use encode; then
+		use faac && myconf+=( --enable-nonfree )
+		use mp3 && myconf+=( --enable-libmp3lame )
+		use amr && myconf+=( --enable-libvo-amrwbenc )
+		use aac && myconf+=( --enable-libvo-aacenc )
+		uses="faac theora twolame vorbis wavpack webp x264 x265 xvid"
+		for i in ${uses}; do
+			use ${i} && myconf+=( --enable-lib${i} )
+		done
+	else
+		myconf+=( --disable-encoders )
+	fi
+
+	# libavdevice options
+	use cdio && myconf+=( --enable-libcdio )
+	use ieee1394 && myconf+=( --enable-libdc1394 )
+	use pulseaudio && myconf+=( --enable-libpulse )
+
+	# Indevs
+	# v4l1 is gone since linux-headers-2.6.38
+	myconf+=( --disable-indev=v4l )
+	use v4l || myconf+=( --disable-indev=v4l2 )
+	for i in alsa oss jack; do
+		use ${i} || myconf+=( --disable-indev=${i} )
+	done
+	use X && myconf+=( --enable-x11grab )
+	# Outdevs
+	for i in alsa oss ; do
+		use ${i} || myconf+=( --disable-outdev=${i} )
+	done
+	# libavfilter options
+	use bs2b && myconf+=( --enable-libbs2b )
+	multilib_is_native_abi && use frei0r && myconf+=( --enable-frei0r )
+	use truetype && myconf+=( --enable-libfreetype )
+	use fontconfig && myconf+=( --enable-libfontconfig )
+
+	# Threads; we only support pthread for now
+	use threads && myconf+=( --enable-pthreads )
+
+	# Decoders
+	use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb )
+	use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac )
+	uses="gsm opus rtmp schroedinger speex vpx"
+	for i in ${uses}; do
+		use ${i} && myconf+=( --enable-lib${i} )
+	done
+	use jpeg2k && myconf+=( --enable-libopenjpeg )
+
+	# CPU features
+	for i in ${CPU_FEATURES}; do
+		use ${i%:*} || myconf+=( --disable-${i#*:} )
+	done
+
+	# pass the right -mfpu as extra
+	use neon && append-cflags -mfpu=neon
+
+	# disable mmx accelerated code if PIC is required
+	# as the provided asm decidedly is not PIC for x86.
+	if use pic && [[ ${ABI} == x86 ]]; then
+		myconf+=( --disable-mmx --disable-mmxext )
+	fi
+
+	# Option to force building pic
+	use pic && myconf+=( --enable-pic )
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
+		case ${CHOST} in
+			*freebsd*)
+				myconf+=( --target-os=freebsd )
+				;;
+			mingw32*)
+				myconf+=( --target-os=mingw32 )
+				;;
+			*linux*)
+				myconf+=( --target-os=linux )
+				;;
+		esac
+	fi
+
+	# Misc stuff
+	use hardcoded-tables && myconf+=( --enable-hardcoded-tables )
+
+	# Specific workarounds for too-few-registers arch...
+	if [[ ${ABI} == x86 ]]; then
+		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+		filter-flags -fforce-addr -momit-leaf-frame-pointer
+		append-flags -fomit-frame-pointer
+		is-flag -O? || append-flags -O2
+		if use debug; then
+			# no need to warn about debug if not using debug flag
+			ewarn ""
+			ewarn "Debug information will be almost useless as the frame pointer is omitted."
+			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
+			ewarn "difficult to fix. Please have that in mind."
+			ewarn ""
+		fi
+	fi
+
+	set -- "${S}"/configure \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--shlibdir="${EPREFIX}"/usr/$(get_libdir) \
+		--mandir="${EPREFIX}"/usr/share/man \
+		--enable-shared \
+		--cc="$(tc-getCC)" \
+		--ar="$(tc-getAR)" \
+		--optflags="${CFLAGS}" \
+		--extra-cflags="${CFLAGS}" \
+		$(use_enable static-libs static) \
+		"${myconf[@]}"
+	echo "${@}"
+	"${@}" || die
+}
+
+multilib_src_compile() {
+	emake
+
+	if use tools; then
+		tc-export CC
+
+		emake ${TOOLS[@]/#/tools/}
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install install-man
+	use doc && dodoc doc/*.html
+
+	if use tools; then
+		dobin ${TOOLS[@]/#/tools/}
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README.md INSTALL
+}
+
+multilib_src_test() {
+	local _libs="$(for i in lib*/;do echo -n "${BUILD_DIR}/${i%/}:";done)"
+	einfo "LD_LIBRARY_PATH is set to \"${_libs}\""
+	LD_LIBRARY_PATH="${_libs}" emake -k -j1 fate
+}
diff --git a/media-video/libav/libav-11.9999.ebuild b/media-video/libav/libav-11.9999.ebuild
new file mode 100644
index 000000000000..f97572a73515
--- /dev/null
+++ b/media-video/libav/libav-11.9999.ebuild
@@ -0,0 +1,344 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="git://git.libav.org/libav.git"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+fi
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video"
+HOMEPAGE="https://libav.org/"
+if [[ ${PV} == *9999 ]] ; then
+	SRC_URI=""
+elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
+	SRC_URI="https://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"
+else # Official release
+	SRC_URI="https://libav.org/releases/${P}.tar.xz"
+fi
+# 9999 does not have fate-*.tar.xz
+[[ ${PV%9999} != "" ]] && SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-${PV%%.*}.tar.xz )"
+
+LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
+SLOT="0/11"
+[[ ${PV} == *9999 ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk
+	frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3
+	+network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
+	static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X
+	wavpack webp x264 x265 xvid +zlib"
+
+# String for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+CPU_FEATURES="altivec armv5te armv6 armv6t2 armvfp:vfp neon"
+X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext mmx mmxext sse sse2 sse3 ssse3 sse4_1:sse4 sse4_2:sse42 avx xop fma3 fma4 avx2"
+for i in ${X86_CPU_FEATURES} ; do
+	CPU_FEATURES+=" cpu_flags_x86_${i%:*}:${i#*:}"
+done
+for i in ${CPU_FEATURES} ; do
+	IUSE+=" ${i%:*}"
+done
+
+RDEPEND="
+	!media-video/ffmpeg:0
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
+	encode? (
+		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
+		amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+		theora? (
+			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
+		vorbis? (
+			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
+		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
+	)
+	fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] )
+	frei0r? ( media-plugins/frei0r-plugins )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
+	ieee1394? (
+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+	)
+	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	ssl? (
+		openssl? (
+			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+			libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+		)
+		!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
+	)
+	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	truetype? (	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	doc? ( app-text/texi2html )
+	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	cpu_flags_x86_mmx? ( dev-lang/yasm )
+	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	test? ( sys-devel/bc )
+	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	v4l? ( sys-kernel/linux-headers )
+"
+
+RDEPEND="${RDEPEND}
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+
+# faac can't be binary distributed
+# openssl support marked as nonfree
+# faac and aac are concurent implementations
+# amr and aac require at least lgpl3
+# x264 requires gpl2
+REQUIRED_USE="
+	rtmp? ( network )
+	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl ) x265? ( gpl )
+	test? ( encode zlib )
+	fontconfig? ( truetype )
+"
+RESTRICT="faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libavutil/avconfig.h
+)
+
+src_unpack() {
+	[[ ${PV} == *9999 ]] && git-r3_src_unpack
+	# 9999 does not have fate-*.tar.xz
+	[[ ${PV%9999} != "" ]] && default_src_unpack
+}
+
+src_prepare() {
+	epatch_user
+
+	# if we have snapshot then we need to hardcode the version
+	if [[ ${PV%_p*} != ${PV} ]]; then
+		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
+	fi
+
+	TOOLS=( aviocat graph2dot ismindex pktdumper qt-faststart trasher )
+	use zlib && TOOLS+=( cws2fws )
+
+	MAKEOPTS+=" V=1"
+}
+
+multilib_src_configure() {
+	local myconf=( ${EXTRA_LIBAV_CONF} )
+	local uses i
+
+	# 9999 does not have fate-*.tar.xz
+	[[ ${PV%9999} != "" ]] && use test && myconf+=( --samples="${WORKDIR}/fate" )
+
+	myconf+=(
+		$(use_enable gpl)
+		$(use_enable gpl version3)
+		# It is a security issue and will be removed in the next major version
+		--disable-protocol=concat
+	)
+
+	# enabled by default
+	uses="debug doc network zlib"
+	for i in ${uses}; do
+		use ${i} || myconf+=( --disable-${i} )
+	done
+	use bzip2 || myconf+=( --disable-bzlib )
+	use sdl || myconf+=( --disable-avplay )
+
+	if use ssl; then
+		use openssl && myconf+=( --enable-openssl --enable-nonfree ) \
+			|| myconf+=( --enable-gnutls )
+	fi
+
+	use custom-cflags && myconf+=( --disable-optimizations )
+	use cpudetection && myconf+=( --enable-runtime-cpudetect )
+
+	use vdpau || myconf+=( --disable-vdpau )
+
+	use vaapi && myconf+=( --enable-vaapi )
+
+	# Encoders
+	if use encode; then
+		use faac && myconf+=( --enable-nonfree )
+		use mp3 && myconf+=( --enable-libmp3lame )
+		use amr && myconf+=( --enable-libvo-amrwbenc )
+		use aac && myconf+=( --enable-libvo-aacenc )
+		uses="faac theora twolame vorbis wavpack webp x264 x265 xvid"
+		for i in ${uses}; do
+			use ${i} && myconf+=( --enable-lib${i} )
+		done
+	else
+		myconf+=( --disable-encoders )
+	fi
+
+	# libavdevice options
+	use cdio && myconf+=( --enable-libcdio )
+	use ieee1394 && myconf+=( --enable-libdc1394 )
+	use pulseaudio && myconf+=( --enable-libpulse )
+
+	# Indevs
+	# v4l1 is gone since linux-headers-2.6.38
+	myconf+=( --disable-indev=v4l )
+	use v4l || myconf+=( --disable-indev=v4l2 )
+	for i in alsa oss jack; do
+		use ${i} || myconf+=( --disable-indev=${i} )
+	done
+	use X && myconf+=( --enable-x11grab )
+	# Outdevs
+	for i in alsa oss ; do
+		use ${i} || myconf+=( --disable-outdev=${i} )
+	done
+	# libavfilter options
+	use bs2b && myconf+=( --enable-libbs2b )
+	multilib_is_native_abi && use frei0r && myconf+=( --enable-frei0r )
+	use truetype && myconf+=( --enable-libfreetype )
+	use fontconfig && myconf+=( --enable-libfontconfig )
+
+	# Threads; we only support pthread for now
+	use threads && myconf+=( --enable-pthreads )
+
+	# Decoders
+	use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb )
+	use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac )
+	uses="gsm opus rtmp schroedinger speex vpx"
+	for i in ${uses}; do
+		use ${i} && myconf+=( --enable-lib${i} )
+	done
+	use jpeg2k && myconf+=( --enable-libopenjpeg )
+
+	# CPU features
+	for i in ${CPU_FEATURES}; do
+		use ${i%:*} || myconf+=( --disable-${i#*:} )
+	done
+
+	# pass the right -mfpu as extra
+	use neon && append-cflags -mfpu=neon
+
+	# disable mmx accelerated code if PIC is required
+	# as the provided asm decidedly is not PIC for x86.
+	if use pic && [[ ${ABI} == x86 ]]; then
+		myconf+=( --disable-mmx --disable-mmxext )
+	fi
+
+	# Option to force building pic
+	use pic && myconf+=( --enable-pic )
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
+		case ${CHOST} in
+			*freebsd*)
+				myconf+=( --target-os=freebsd )
+				;;
+			mingw32*)
+				myconf+=( --target-os=mingw32 )
+				;;
+			*linux*)
+				myconf+=( --target-os=linux )
+				;;
+		esac
+	fi
+
+	# Misc stuff
+	use hardcoded-tables && myconf+=( --enable-hardcoded-tables )
+
+	# Specific workarounds for too-few-registers arch...
+	if [[ ${ABI} == x86 ]]; then
+		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+		filter-flags -fforce-addr -momit-leaf-frame-pointer
+		append-flags -fomit-frame-pointer
+		is-flag -O? || append-flags -O2
+		if use debug; then
+			# no need to warn about debug if not using debug flag
+			ewarn ""
+			ewarn "Debug information will be almost useless as the frame pointer is omitted."
+			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
+			ewarn "difficult to fix. Please have that in mind."
+			ewarn ""
+		fi
+	fi
+
+	set -- "${S}"/configure \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--shlibdir="${EPREFIX}"/usr/$(get_libdir) \
+		--mandir="${EPREFIX}"/usr/share/man \
+		--enable-shared \
+		--cc="$(tc-getCC)" \
+		--ar="$(tc-getAR)" \
+		--optflags="${CFLAGS}" \
+		--extra-cflags="${CFLAGS}" \
+		$(use_enable static-libs static) \
+		"${myconf[@]}"
+	echo "${@}"
+	"${@}" || die
+}
+
+multilib_src_compile() {
+	emake
+
+	if use tools; then
+		tc-export CC
+
+		emake ${TOOLS[@]/#/tools/}
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install install-man
+	use doc && dodoc doc/*.html
+
+	if use tools; then
+		dobin ${TOOLS[@]/#/tools/}
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README.md INSTALL
+}
+
+multilib_src_test() {
+	local _libs="$(for i in lib*/;do echo -n "${BUILD_DIR}/${i%/}:";done)"
+	einfo "LD_LIBRARY_PATH is set to \"${_libs}\""
+	LD_LIBRARY_PATH="${_libs}" emake -k -j1 fate
+}
diff --git a/media-video/libav/libav-12.1.ebuild b/media-video/libav/libav-12.1.ebuild
new file mode 100644
index 000000000000..e3d51f053751
--- /dev/null
+++ b/media-video/libav/libav-12.1.ebuild
@@ -0,0 +1,358 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="git://git.libav.org/libav.git"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+fi
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video"
+HOMEPAGE="https://libav.org/"
+if [[ ${PV} == *9999 ]] ; then
+	SRC_URI=""
+elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
+	SRC_URI="https://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"
+	SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-${PV}.tar.xz )"
+else # Official release
+	SRC_URI="https://libav.org/releases/${P}.tar.xz"
+	FATE_VER=${PV%%_*}
+	SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-12-r1.tar.xz )"
+fi
+
+SRC_URI+=" https://dev.gentoo.org/~lu_zero/libav/0001-xcb-Add-all-the-libraries-to-the-link-line-explicitl.patch"
+# 9999 does not have fate-*.tar.xz
+
+LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
+SLOT="0/12"
+[[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64
+~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+~x64-solaris ~x86-solaris"
+IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk
+	frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3
+	+network nvidia openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
+	static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X
+	wavpack webp x264 x265 xvid +zlib"
+
+# String for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+CPU_FEATURES="altivec armv5te armv6 armv6t2 armvfp:vfp neon"
+X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext mmx mmxext sse sse2 sse3 ssse3 sse4_1:sse4 sse4_2:sse42 avx xop fma3 fma4 avx2"
+for i in ${X86_CPU_FEATURES} ; do
+	CPU_FEATURES+=" cpu_flags_x86_${i%:*}:${i#*:}"
+done
+for i in ${CPU_FEATURES} ; do
+	IUSE+=" ${i%:*}"
+done
+
+RDEPEND="
+	!media-video/ffmpeg:0
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
+	encode? (
+		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
+		amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+		theora? (
+			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
+		vorbis? (
+			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
+		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
+	)
+	nvidia? ( media-video/nvidia-video-codec )
+	fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] )
+	frei0r? ( media-plugins/frei0r-plugins )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
+	ieee1394? (
+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+	)
+	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	ssl? (
+		openssl? (
+			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+			libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+		)
+		!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
+	)
+	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	truetype? (	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
+	X? ( >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	doc? ( app-text/texi2html )
+	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	cpu_flags_x86_mmx? ( dev-lang/yasm )
+	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	test? ( sys-devel/bc )
+	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	v4l? ( sys-kernel/linux-headers )
+"
+
+RDEPEND="${RDEPEND}
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+
+# faac can't be binary distributed
+# openssl support marked as nonfree
+# faac and aac are concurent implementations
+# amr and aac require at least lgpl3
+# x264 requires gpl2
+REQUIRED_USE="
+	rtmp? ( network )
+	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) cdio? ( gpl ) x265? ( gpl )
+	test? ( encode zlib )
+	fontconfig? ( truetype )
+"
+RESTRICT="faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist ) nvidia? ( bindist )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libavutil/avconfig.h
+)
+
+src_unpack() {
+	[[ ${PV} == *9999 ]] && git-r3_src_unpack
+	# 9999 does not have fate-*.tar.xz
+	[[ ${PV%9999} != "" ]] && default_src_unpack
+}
+
+src_prepare() {
+	epatch_user
+
+	epatch "${DISTDIR}/0001-xcb-Add-all-the-libraries-to-the-link-line-explicitl.patch"
+
+	# if we have snapshot then we need to hardcode the version
+	if [[ ${PV%_p*} != ${PV} ]]; then
+		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
+	fi
+
+	TOOLS=( aviocat graph2dot ismindex pktdumper qt-faststart trasher )
+	use zlib && TOOLS+=( cws2fws )
+
+	MAKEOPTS+=" V=1"
+}
+
+multilib_src_configure() {
+	local myconf=( ${EXTRA_LIBAV_CONF} )
+	local uses i
+
+	# 9999 does not have fate-*.tar.xz
+	[[ ${PV%9999} != "" ]] && use test && myconf+=( --samples="${WORKDIR}/fate" )
+
+	myconf+=(
+		$(use_enable gpl)
+		$(use_enable gpl version3)
+		--enable-avfilter
+	)
+
+	# enabled by default
+	uses="debug doc network zlib"
+	for i in ${uses}; do
+		use ${i} || myconf+=( --disable-${i} )
+	done
+	use bzip2 || myconf+=( --disable-bzlib )
+	use sdl || myconf+=( --disable-avplay )
+
+	if use ssl; then
+		use openssl && myconf+=( --enable-openssl --enable-nonfree ) \
+			|| myconf+=( --enable-gnutls )
+	fi
+
+	use custom-cflags && myconf+=( --disable-optimizations )
+	use cpudetection && myconf+=( --enable-runtime-cpudetect )
+
+	use vdpau || myconf+=( --disable-vdpau )
+
+	use vaapi && myconf+=( --enable-vaapi )
+
+	NVIDIA_INCLUDES="-I/opt/nvidia-video-codec/include -I/opt/cuda/include"
+	NVIDIA_LIBS="-L/opt/cuda/lib64"
+	use nvidia && myconf+=( --enable-nonfree --enable-cuda --enable-libnpp
+						    --extra-cflags="$NVIDIA_INCLUDES" --extra-ldflags="$NVIDIA_LIBS" )
+
+	# Encoders
+	if use encode; then
+		use faac && myconf+=( --enable-nonfree )
+		use mp3 && myconf+=( --enable-libmp3lame )
+		use amr && myconf+=( --enable-libvo-amrwbenc )
+		use aac && myconf+=( --enable-libvo-aacenc )
+		use nvidia && myconf+=( --enable-nvenc )
+		uses="faac theora twolame vorbis wavpack webp x264 x265 xvid"
+		for i in ${uses}; do
+			use ${i} && myconf+=( --enable-lib${i} )
+		done
+	else
+		myconf+=( --disable-encoders )
+	fi
+
+	# libavdevice options
+	use cdio && myconf+=( --enable-libcdio )
+	use ieee1394 && myconf+=( --enable-libdc1394 )
+	use pulseaudio && myconf+=( --enable-libpulse )
+
+	# Indevs
+	# v4l1 is gone since linux-headers-2.6.38
+	myconf+=( --disable-indev=v4l )
+	use v4l || myconf+=( --disable-indev=v4l2 )
+	for i in alsa oss jack; do
+		use ${i} || myconf+=( --disable-indev=${i} )
+	done
+	use X && myconf+=( --enable-libxcb )
+	# Outdevs
+	for i in alsa oss ; do
+		use ${i} || myconf+=( --disable-outdev=${i} )
+	done
+	# libavfilter options
+	use bs2b && myconf+=( --enable-libbs2b )
+	multilib_is_native_abi && use frei0r && myconf+=( --enable-frei0r )
+	use truetype && myconf+=( --enable-libfreetype )
+	use fontconfig && myconf+=( --enable-libfontconfig )
+
+	# Threads; we only support pthread for now
+	use threads && myconf+=( --enable-pthreads )
+
+	# Decoders
+	use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb )
+	use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac )
+	uses="gsm opus rtmp schroedinger speex vpx"
+	for i in ${uses}; do
+		use ${i} && myconf+=( --enable-lib${i} )
+	done
+	use jpeg2k && myconf+=( --enable-libopenjpeg )
+
+	# CPU features
+	for i in ${CPU_FEATURES}; do
+		use ${i%:*} || myconf+=( --disable-${i#*:} )
+	done
+
+	# pass the right -mfpu as extra
+	use neon && use arm && append-cflags -mfpu=neon
+
+	# disable mmx accelerated code if PIC is required
+	# as the provided asm decidedly is not PIC for x86.
+	if use pic && [[ ${ABI} == x86 ]]; then
+		myconf+=( --disable-mmx --disable-mmxext )
+	fi
+
+	# Option to force building pic
+	use pic && myconf+=( --enable-pic )
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
+		case ${CHOST} in
+			*freebsd*)
+				myconf+=( --target-os=freebsd )
+				;;
+			mingw32*)
+				myconf+=( --target-os=mingw32 )
+				;;
+			*linux*)
+				myconf+=( --target-os=linux )
+				;;
+		esac
+	fi
+
+	# Misc stuff
+	use hardcoded-tables && myconf+=( --enable-hardcoded-tables )
+
+	# Forcing arm would make the compiler break left and right
+	if [[ ${ABI} == arm ]]; then
+		filter-flags -marm
+	fi
+
+	# Specific workarounds for too-few-registers arch...
+	if [[ ${ABI} == x86 ]]; then
+		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+		filter-flags -fforce-addr -momit-leaf-frame-pointer
+		append-flags -fomit-frame-pointer
+		is-flag -O? || append-flags -O2
+		if use debug; then
+			# no need to warn about debug if not using debug flag
+			ewarn ""
+			ewarn "Debug information will be almost useless as the frame pointer is omitted."
+			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
+			ewarn "difficult to fix. Please have that in mind."
+			ewarn ""
+		fi
+	fi
+
+	set -- "${S}"/configure \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--shlibdir="${EPREFIX}"/usr/$(get_libdir) \
+		--mandir="${EPREFIX}"/usr/share/man \
+		--enable-shared \
+		--cc="$(tc-getCC)" \
+		--ar="$(tc-getAR)" \
+		--optflags="${CFLAGS}" \
+		--extra-cflags="${CFLAGS}" \
+		$(use_enable static-libs static) \
+		"${myconf[@]}"
+	echo "${@}"
+	"${@}" || die
+}
+
+multilib_src_compile() {
+	emake
+
+	if use tools; then
+		tc-export CC
+
+		emake ${TOOLS[@]/#/tools/}
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install install-man
+	use doc && dodoc doc/*.html
+
+	if use tools; then
+		dobin ${TOOLS[@]/#/tools/}
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README.md INSTALL
+}
+
+multilib_src_test() {
+	local _libs="$(for i in lib*/;do echo -n "${BUILD_DIR}/${i%/}:";done)"
+	einfo "LD_LIBRARY_PATH is set to \"${_libs}\""
+	LD_LIBRARY_PATH="${_libs}" make -j1 fate V=1
+}
diff --git a/media-video/libav/libav-12.2.ebuild b/media-video/libav/libav-12.2.ebuild
new file mode 100644
index 000000000000..4d3632d69969
--- /dev/null
+++ b/media-video/libav/libav-12.2.ebuild
@@ -0,0 +1,355 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="git://git.libav.org/libav.git"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+fi
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video"
+HOMEPAGE="https://libav.org/"
+if [[ ${PV} == *9999 ]] ; then
+	SRC_URI=""
+elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
+	SRC_URI="https://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"
+	SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-${PV}.tar.xz )"
+else # Official release
+	SRC_URI="https://libav.org/releases/${P}.tar.xz"
+	FATE_VER=${PV%%_*}
+	SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-12-r1.tar.xz )"
+fi
+
+# 9999 does not have fate-*.tar.xz
+
+LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
+SLOT="0/12"
+[[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64
+~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+~x64-solaris ~x86-solaris"
+IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk
+	frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3
+	+network nvidia openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
+	static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X
+	wavpack webp x264 x265 xvid +zlib"
+
+# String for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+CPU_FEATURES="altivec armv5te armv6 armv6t2 armvfp:vfp neon"
+X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext mmx mmxext sse sse2 sse3 ssse3 sse4_1:sse4 sse4_2:sse42 avx xop fma3 fma4 avx2"
+for i in ${X86_CPU_FEATURES} ; do
+	CPU_FEATURES+=" cpu_flags_x86_${i%:*}:${i#*:}"
+done
+for i in ${CPU_FEATURES} ; do
+	IUSE+=" ${i%:*}"
+done
+
+RDEPEND="
+	!media-video/ffmpeg:0
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
+	encode? (
+		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
+		amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+		theora? (
+			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
+		vorbis? (
+			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
+		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
+	)
+	nvidia? ( media-video/nvidia-video-codec )
+	fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] )
+	frei0r? ( media-plugins/frei0r-plugins )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
+	ieee1394? (
+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+	)
+	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	ssl? (
+		openssl? (
+			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+			libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+		)
+		!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
+	)
+	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	truetype? (	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
+	X? ( >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	doc? ( app-text/texi2html )
+	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	cpu_flags_x86_mmx? ( dev-lang/yasm )
+	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	test? ( sys-devel/bc )
+	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	v4l? ( sys-kernel/linux-headers )
+"
+
+RDEPEND="${RDEPEND}
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+
+# faac can't be binary distributed
+# openssl support marked as nonfree
+# faac and aac are concurent implementations
+# amr and aac require at least lgpl3
+# x264 requires gpl2
+REQUIRED_USE="
+	rtmp? ( network )
+	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) cdio? ( gpl ) x265? ( gpl )
+	test? ( encode zlib )
+	fontconfig? ( truetype )
+"
+RESTRICT="faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist ) nvidia? ( bindist )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libavutil/avconfig.h
+)
+
+src_unpack() {
+	[[ ${PV} == *9999 ]] && git-r3_src_unpack
+	# 9999 does not have fate-*.tar.xz
+	[[ ${PV%9999} != "" ]] && default_src_unpack
+}
+
+src_prepare() {
+	epatch_user
+
+	# if we have snapshot then we need to hardcode the version
+	if [[ ${PV%_p*} != ${PV} ]]; then
+		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
+	fi
+
+	TOOLS=( aviocat graph2dot ismindex pktdumper qt-faststart trasher )
+	use zlib && TOOLS+=( cws2fws )
+
+	MAKEOPTS+=" V=1"
+}
+
+multilib_src_configure() {
+	local myconf=( ${EXTRA_LIBAV_CONF} )
+	local uses i
+
+	# 9999 does not have fate-*.tar.xz
+	[[ ${PV%9999} != "" ]] && use test && myconf+=( --samples="${WORKDIR}/fate" )
+
+	myconf+=(
+		$(use_enable gpl)
+		$(use_enable gpl version3)
+		--enable-avfilter
+	)
+
+	# enabled by default
+	uses="debug doc network zlib"
+	for i in ${uses}; do
+		use ${i} || myconf+=( --disable-${i} )
+	done
+	use bzip2 || myconf+=( --disable-bzlib )
+	use sdl || myconf+=( --disable-avplay )
+
+	if use ssl; then
+		use openssl && myconf+=( --enable-openssl --enable-nonfree ) \
+			|| myconf+=( --enable-gnutls )
+	fi
+
+	use custom-cflags && myconf+=( --disable-optimizations )
+	use cpudetection && myconf+=( --enable-runtime-cpudetect )
+
+	use vdpau || myconf+=( --disable-vdpau )
+
+	use vaapi && myconf+=( --enable-vaapi )
+
+	NVIDIA_INCLUDES="-I/opt/nvidia-video-codec/include -I/opt/cuda/include"
+	NVIDIA_LIBS="-L/opt/cuda/lib64"
+	use nvidia && myconf+=( --enable-nonfree --enable-cuda --enable-libnpp
+						    --extra-cflags="$NVIDIA_INCLUDES" --extra-ldflags="$NVIDIA_LIBS" )
+
+	# Encoders
+	if use encode; then
+		use faac && myconf+=( --enable-nonfree )
+		use mp3 && myconf+=( --enable-libmp3lame )
+		use amr && myconf+=( --enable-libvo-amrwbenc )
+		use aac && myconf+=( --enable-libvo-aacenc )
+		use nvidia && myconf+=( --enable-nvenc )
+		uses="faac theora twolame vorbis wavpack webp x264 x265 xvid"
+		for i in ${uses}; do
+			use ${i} && myconf+=( --enable-lib${i} )
+		done
+	else
+		myconf+=( --disable-encoders )
+	fi
+
+	# libavdevice options
+	use cdio && myconf+=( --enable-libcdio )
+	use ieee1394 && myconf+=( --enable-libdc1394 )
+	use pulseaudio && myconf+=( --enable-libpulse )
+
+	# Indevs
+	# v4l1 is gone since linux-headers-2.6.38
+	myconf+=( --disable-indev=v4l )
+	use v4l || myconf+=( --disable-indev=v4l2 )
+	for i in alsa oss jack; do
+		use ${i} || myconf+=( --disable-indev=${i} )
+	done
+	use X && myconf+=( --enable-libxcb )
+	# Outdevs
+	for i in alsa oss ; do
+		use ${i} || myconf+=( --disable-outdev=${i} )
+	done
+	# libavfilter options
+	use bs2b && myconf+=( --enable-libbs2b )
+	multilib_is_native_abi && use frei0r && myconf+=( --enable-frei0r )
+	use truetype && myconf+=( --enable-libfreetype )
+	use fontconfig && myconf+=( --enable-libfontconfig )
+
+	# Threads; we only support pthread for now
+	use threads && myconf+=( --enable-pthreads )
+
+	# Decoders
+	use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb )
+	use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac )
+	uses="gsm opus rtmp schroedinger speex vpx"
+	for i in ${uses}; do
+		use ${i} && myconf+=( --enable-lib${i} )
+	done
+	use jpeg2k && myconf+=( --enable-libopenjpeg )
+
+	# CPU features
+	for i in ${CPU_FEATURES}; do
+		use ${i%:*} || myconf+=( --disable-${i#*:} )
+	done
+
+	# pass the right -mfpu as extra
+	use neon && use arm && append-cflags -mfpu=neon
+
+	# disable mmx accelerated code if PIC is required
+	# as the provided asm decidedly is not PIC for x86.
+	if use pic && [[ ${ABI} == x86 ]]; then
+		myconf+=( --disable-mmx --disable-mmxext )
+	fi
+
+	# Option to force building pic
+	use pic && myconf+=( --enable-pic )
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
+		case ${CHOST} in
+			*freebsd*)
+				myconf+=( --target-os=freebsd )
+				;;
+			mingw32*)
+				myconf+=( --target-os=mingw32 )
+				;;
+			*linux*)
+				myconf+=( --target-os=linux )
+				;;
+		esac
+	fi
+
+	# Misc stuff
+	use hardcoded-tables && myconf+=( --enable-hardcoded-tables )
+
+	# Forcing arm would make the compiler break left and right
+	if [[ ${ABI} == arm ]]; then
+		filter-flags -marm
+	fi
+
+	# Specific workarounds for too-few-registers arch...
+	if [[ ${ABI} == x86 ]]; then
+		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+		filter-flags -fforce-addr -momit-leaf-frame-pointer
+		append-flags -fomit-frame-pointer
+		is-flag -O? || append-flags -O2
+		if use debug; then
+			# no need to warn about debug if not using debug flag
+			ewarn ""
+			ewarn "Debug information will be almost useless as the frame pointer is omitted."
+			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
+			ewarn "difficult to fix. Please have that in mind."
+			ewarn ""
+		fi
+	fi
+
+	set -- "${S}"/configure \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--shlibdir="${EPREFIX}"/usr/$(get_libdir) \
+		--mandir="${EPREFIX}"/usr/share/man \
+		--enable-shared \
+		--cc="$(tc-getCC)" \
+		--ar="$(tc-getAR)" \
+		--optflags="${CFLAGS}" \
+		--extra-cflags="${CFLAGS}" \
+		$(use_enable static-libs static) \
+		"${myconf[@]}"
+	echo "${@}"
+	"${@}" || die
+}
+
+multilib_src_compile() {
+	emake
+
+	if use tools; then
+		tc-export CC
+
+		emake ${TOOLS[@]/#/tools/}
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install install-man
+	use doc && dodoc doc/*.html
+
+	if use tools; then
+		dobin ${TOOLS[@]/#/tools/}
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README.md INSTALL
+}
+
+multilib_src_test() {
+	local _libs="$(for i in lib*/;do echo -n "${BUILD_DIR}/${i%/}:";done)"
+	einfo "LD_LIBRARY_PATH is set to \"${_libs}\""
+	LD_LIBRARY_PATH="${_libs}" make -j1 fate V=1
+}
diff --git a/media-video/libav/libav-12.ebuild b/media-video/libav/libav-12.ebuild
new file mode 100644
index 000000000000..35f9021007d8
--- /dev/null
+++ b/media-video/libav/libav-12.ebuild
@@ -0,0 +1,358 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="git://git.libav.org/libav.git"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+fi
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video"
+HOMEPAGE="https://libav.org/"
+if [[ ${PV} == *9999 ]] ; then
+	SRC_URI=""
+elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
+	SRC_URI="https://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"
+	SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-${PV}.tar.xz )"
+else # Official release
+	SRC_URI="https://libav.org/releases/${P}.tar.xz"
+	FATE_VER=${PV%%_*}
+	SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-12-r1.tar.xz )"
+fi
+
+SRC_URI+=" https://dev.gentoo.org/~lu_zero/libav/0001-xcb-Add-all-the-libraries-to-the-link-line-explicitl.patch"
+# 9999 does not have fate-*.tar.xz
+
+LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
+SLOT="0/12"
+[[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64
+~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+~x64-solaris ~x86-solaris"
+IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk
+	frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3
+	+network nvidia openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
+	static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X
+	wavpack webp x264 x265 xvid +zlib"
+
+# String for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+CPU_FEATURES="altivec armv5te armv6 armv6t2 armvfp:vfp neon"
+X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext mmx mmxext sse sse2 sse3 ssse3 sse4_1:sse4 sse4_2:sse42 avx xop fma3 fma4 avx2"
+for i in ${X86_CPU_FEATURES} ; do
+	CPU_FEATURES+=" cpu_flags_x86_${i%:*}:${i#*:}"
+done
+for i in ${CPU_FEATURES} ; do
+	IUSE+=" ${i%:*}"
+done
+
+RDEPEND="
+	!media-video/ffmpeg:0
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
+	encode? (
+		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
+		amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+		theora? (
+			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
+		vorbis? (
+			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
+		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
+	)
+	nvidia? ( media-video/nvidia-video-codec )
+	fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] )
+	frei0r? ( media-plugins/frei0r-plugins )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
+	ieee1394? (
+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+	)
+	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	ssl? (
+		openssl? (
+			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+			libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+		)
+		!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
+	)
+	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	truetype? (	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
+	X? ( >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	doc? ( app-text/texi2html )
+	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	cpu_flags_x86_mmx? ( dev-lang/yasm )
+	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	test? ( sys-devel/bc )
+	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	v4l? ( sys-kernel/linux-headers )
+"
+
+RDEPEND="${RDEPEND}
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+
+# faac can't be binary distributed
+# openssl support marked as nonfree
+# faac and aac are concurent implementations
+# amr and aac require at least lgpl3
+# x264 requires gpl2
+REQUIRED_USE="
+	rtmp? ( network )
+	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) cdio? ( gpl ) x265? ( gpl )
+	test? ( encode zlib )
+	fontconfig? ( truetype )
+"
+RESTRICT="faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist ) nvidia? ( bindist )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libavutil/avconfig.h
+)
+
+src_unpack() {
+	[[ ${PV} == *9999 ]] && git-r3_src_unpack
+	# 9999 does not have fate-*.tar.xz
+	[[ ${PV%9999} != "" ]] && default_src_unpack
+}
+
+src_prepare() {
+	epatch_user
+
+	epatch "${DISTDIR}/0001-xcb-Add-all-the-libraries-to-the-link-line-explicitl.patch"
+
+	# if we have snapshot then we need to hardcode the version
+	if [[ ${PV%_p*} != ${PV} ]]; then
+		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
+	fi
+
+	TOOLS=( aviocat graph2dot ismindex pktdumper qt-faststart trasher )
+	use zlib && TOOLS+=( cws2fws )
+
+	MAKEOPTS+=" V=1"
+}
+
+multilib_src_configure() {
+	local myconf=( ${EXTRA_LIBAV_CONF} )
+	local uses i
+
+	# 9999 does not have fate-*.tar.xz
+	[[ ${PV%9999} != "" ]] && use test && myconf+=( --samples="${WORKDIR}/fate" )
+
+	myconf+=(
+		$(use_enable gpl)
+		$(use_enable gpl version3)
+		--enable-avfilter
+	)
+
+	# enabled by default
+	uses="debug doc network zlib"
+	for i in ${uses}; do
+		use ${i} || myconf+=( --disable-${i} )
+	done
+	use bzip2 || myconf+=( --disable-bzlib )
+	use sdl || myconf+=( --disable-avplay )
+
+	if use ssl; then
+		use openssl && myconf+=( --enable-openssl --enable-nonfree ) \
+			|| myconf+=( --enable-gnutls )
+	fi
+
+	use custom-cflags && myconf+=( --disable-optimizations )
+	use cpudetection && myconf+=( --enable-runtime-cpudetect )
+
+	use vdpau || myconf+=( --disable-vdpau )
+
+	use vaapi && myconf+=( --enable-vaapi )
+
+	NVIDIA_INCLUDES="-I/opt/nvidia-video-codec/include -I/opt/cuda/include"
+	NVIDIA_LIBS="-L/opt/cuda/lib64"
+	use nvidia && myconf+=( --enable-nonfree --enable-cuda --enable-libnpp
+						    --extra-cflags="$NVIDIA_INCLUDES" --extra-ldflags="$NVIDIA_LIBS" )
+
+	# Encoders
+	if use encode; then
+		use faac && myconf+=( --enable-nonfree )
+		use mp3 && myconf+=( --enable-libmp3lame )
+		use amr && myconf+=( --enable-libvo-amrwbenc )
+		use aac && myconf+=( --enable-libvo-aacenc )
+		use nvidia && myconf+=( --enable-nvenc )
+		uses="faac theora twolame vorbis wavpack webp x264 x265 xvid"
+		for i in ${uses}; do
+			use ${i} && myconf+=( --enable-lib${i} )
+		done
+	else
+		myconf+=( --disable-encoders )
+	fi
+
+	# libavdevice options
+	use cdio && myconf+=( --enable-libcdio )
+	use ieee1394 && myconf+=( --enable-libdc1394 )
+	use pulseaudio && myconf+=( --enable-libpulse )
+
+	# Indevs
+	# v4l1 is gone since linux-headers-2.6.38
+	myconf+=( --disable-indev=v4l )
+	use v4l || myconf+=( --disable-indev=v4l2 )
+	for i in alsa oss jack; do
+		use ${i} || myconf+=( --disable-indev=${i} )
+	done
+	use X && myconf+=( --enable-libxcb )
+	# Outdevs
+	for i in alsa oss ; do
+		use ${i} || myconf+=( --disable-outdev=${i} )
+	done
+	# libavfilter options
+	use bs2b && myconf+=( --enable-libbs2b )
+	multilib_is_native_abi && use frei0r && myconf+=( --enable-frei0r )
+	use truetype && myconf+=( --enable-libfreetype )
+	use fontconfig && myconf+=( --enable-libfontconfig )
+
+	# Threads; we only support pthread for now
+	use threads && myconf+=( --enable-pthreads )
+
+	# Decoders
+	use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb )
+	use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac )
+	uses="gsm opus rtmp schroedinger speex vpx"
+	for i in ${uses}; do
+		use ${i} && myconf+=( --enable-lib${i} )
+	done
+	use jpeg2k && myconf+=( --enable-libopenjpeg )
+
+	# CPU features
+	for i in ${CPU_FEATURES}; do
+		use ${i%:*} || myconf+=( --disable-${i#*:} )
+	done
+
+	# pass the right -mfpu as extra
+	use neon && append-cflags -mfpu=neon
+
+	# disable mmx accelerated code if PIC is required
+	# as the provided asm decidedly is not PIC for x86.
+	if use pic && [[ ${ABI} == x86 ]]; then
+		myconf+=( --disable-mmx --disable-mmxext )
+	fi
+
+	# Option to force building pic
+	use pic && myconf+=( --enable-pic )
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
+		case ${CHOST} in
+			*freebsd*)
+				myconf+=( --target-os=freebsd )
+				;;
+			mingw32*)
+				myconf+=( --target-os=mingw32 )
+				;;
+			*linux*)
+				myconf+=( --target-os=linux )
+				;;
+		esac
+	fi
+
+	# Misc stuff
+	use hardcoded-tables && myconf+=( --enable-hardcoded-tables )
+
+	# Forcing arm would make the compiler break left and right
+	if [[ ${ABI} == arm ]]; then
+		filter-flags -marm
+	fi
+
+	# Specific workarounds for too-few-registers arch...
+	if [[ ${ABI} == x86 ]]; then
+		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+		filter-flags -fforce-addr -momit-leaf-frame-pointer
+		append-flags -fomit-frame-pointer
+		is-flag -O? || append-flags -O2
+		if use debug; then
+			# no need to warn about debug if not using debug flag
+			ewarn ""
+			ewarn "Debug information will be almost useless as the frame pointer is omitted."
+			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
+			ewarn "difficult to fix. Please have that in mind."
+			ewarn ""
+		fi
+	fi
+
+	set -- "${S}"/configure \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--shlibdir="${EPREFIX}"/usr/$(get_libdir) \
+		--mandir="${EPREFIX}"/usr/share/man \
+		--enable-shared \
+		--cc="$(tc-getCC)" \
+		--ar="$(tc-getAR)" \
+		--optflags="${CFLAGS}" \
+		--extra-cflags="${CFLAGS}" \
+		$(use_enable static-libs static) \
+		"${myconf[@]}"
+	echo "${@}"
+	"${@}" || die
+}
+
+multilib_src_compile() {
+	emake
+
+	if use tools; then
+		tc-export CC
+
+		emake ${TOOLS[@]/#/tools/}
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install install-man
+	use doc && dodoc doc/*.html
+
+	if use tools; then
+		dobin ${TOOLS[@]/#/tools/}
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README.md INSTALL
+}
+
+multilib_src_test() {
+	local _libs="$(for i in lib*/;do echo -n "${BUILD_DIR}/${i%/}:";done)"
+	einfo "LD_LIBRARY_PATH is set to \"${_libs}\""
+	LD_LIBRARY_PATH="${_libs}" make -j1 fate V=1
+}
diff --git a/media-video/libav/libav-9.17.ebuild b/media-video/libav/libav-9.17.ebuild
new file mode 100644
index 000000000000..ed4682dcaaf7
--- /dev/null
+++ b/media-video/libav/libav-9.17.ebuild
@@ -0,0 +1,322 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+if [[ ${PV} == *9999 ]] ; then
+	SCM="git-2"
+	EGIT_REPO_URI="git://git.libav.org/libav.git"
+	[[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}"
+fi
+
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video"
+HOMEPAGE="http://libav.org/"
+if [[ ${PV} == *9999 ]] ; then
+	SRC_URI=""
+elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
+	SRC_URI="https://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"
+else # Official release
+	SRC_URI="http://${PN}.org/releases/${P}.tar.xz"
+fi
+
+SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-9.tar.xz )"
+
+LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
+SLOT="0/9"
+
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ ${PV} == *9999 ]] || \
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+IUSE="aac alsa amr +bzip2 cdio cpudetection custom-cflags debug doc	+encode
+	faac fdk frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k mp3
+	+network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
+	static-libs test theora threads tools truetype v4l vaapi vdpau vorbis vpx X
+	x264 xvid +zlib"
+
+# String for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+CPU_FEATURES="cpu_flags_x86_3dnow:amd3dnow cpu_flags_x86_3dnowext:amd3dnowext altivec cpu_flags_x86_avx:avx cpu_flags_x86_mmx:mmx cpu_flags_x86_mmxext:mmxext neon cpu_flags_x86_ssse3:ssse3 vis"
+for i in ${CPU_FEATURES} ; do
+	IUSE+=" ${i%:*}"
+done
+
+RDEPEND="
+	!media-video/ffmpeg:0
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	cdio? (
+		|| (
+			>=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}]
+			<dev-libs/libcdio-0.90[-minimal,${MULTILIB_USEDEP}]
+		)
+	)
+	encode? (
+		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
+		amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
+		fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] )
+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+		theora? (
+			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		vorbis? (
+			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
+	)
+	frei0r? ( media-plugins/frei0r-plugins )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
+	ieee1394? (
+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+	)
+	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	ssl? (
+		openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+		!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
+	)
+	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	doc? ( app-text/texi2html )
+	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	cpu_flags_x86_mmx? ( dev-lang/yasm )
+	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	test? ( sys-devel/bc )
+	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	v4l? ( sys-kernel/linux-headers )
+"
+
+RDEPEND="${RDEPEND}
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+
+# faac can't be binary distributed
+# openssl support marked as nonfree
+# faac and aac are concurent implementations
+# amr and aac require at least lgpl3
+# x264 requires gpl2
+REQUIRED_USE="rtmp? ( network )
+	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl )
+	test? ( encode zlib )
+"
+RESTRICT="faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libavutil/avconfig.h
+)
+
+src_prepare() {
+	# if we have snapshot then we need to hardcode the version
+	if [[ ${PV%_p*} != ${PV} ]]; then
+		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
+	fi
+
+	TOOLS=( aviocat graph2dot ismindex pktdumper qt-faststart trasher )
+	use zlib && TOOLS+=( cws2fws )
+
+	MAKEOPTS+=" V=1"
+}
+
+multilib_src_configure() {
+	local myconf=( ${EXTRA_LIBAV_CONF} )
+	local uses i
+
+	myconf+=(
+		$(use_enable gpl)
+		$(use_enable gpl version3)
+		--enable-avfilter
+	)
+
+	# enabled by default
+	uses="debug doc network zlib"
+	for i in ${uses}; do
+		use ${i} || myconf+=( --disable-${i} )
+	done
+	use bzip2 || myconf+=( --disable-bzlib )
+	use sdl || myconf+=( --disable-avplay )
+
+	if use ssl; then
+		use openssl && myconf+=( --enable-openssl --enable-nonfree ) \
+			|| myconf+=( --enable-gnutls )
+	fi
+
+	use custom-cflags && myconf+=( --disable-optimizations )
+	use cpudetection && myconf+=( --enable-runtime-cpudetect )
+
+	use vdpau || myconf+=( --disable-vdpau )
+
+	use vaapi && myconf+=( --enable-vaapi )
+
+	# Encoders
+	if use encode; then
+		use faac && myconf+=( --enable-nonfree )
+		use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac )
+		use mp3 && myconf+=( --enable-libmp3lame )
+		use amr && myconf+=( --enable-libvo-amrwbenc )
+		use aac && myconf+=( --enable-libvo-aacenc )
+		uses="faac theora vorbis x264 xvid"
+		for i in ${uses}; do
+			use ${i} && myconf+=( --enable-lib${i} )
+		done
+	else
+		myconf+=( --disable-encoders )
+	fi
+
+	# libavdevice options
+	use cdio && myconf+=( --enable-libcdio )
+	use ieee1394 && myconf+=( --enable-libdc1394 )
+	use pulseaudio && myconf+=( --enable-libpulse )
+
+	# Indevs
+	# v4l1 is gone since linux-headers-2.6.38
+	myconf+=( --disable-indev=v4l )
+	use v4l || myconf+=( --disable-indev=v4l2 )
+	for i in alsa oss jack; do
+		use ${i} || myconf+=( --disable-indev=${i} )
+	done
+	use X && myconf+=( --enable-x11grab )
+	# Outdevs
+	for i in alsa oss ; do
+		use ${i} || myconf+=( --disable-outdev=${i} )
+	done
+	# libavfilter options
+	multilib_is_native_abi && use frei0r && myconf+=( --enable-frei0r )
+	use truetype &&  myconf+=( --enable-libfreetype )
+
+	# Threads; we only support pthread for now
+	use threads && myconf+=( --enable-pthreads )
+
+	# Decoders
+	use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb )
+	uses="gsm opus rtmp schroedinger speex vpx"
+	for i in ${uses}; do
+		use ${i} && myconf+=( --enable-lib${i} )
+	done
+	use jpeg2k && myconf+=( --enable-libopenjpeg )
+
+	# CPU features
+	for i in ${CPU_FEATURES}; do
+		use ${i%:*} || myconf+=( --disable-${i#*:} )
+	done
+
+	# pass the right -mfpu as extra
+	use neon && myconf+=( --extra-cflags=-mfpu=neon )
+
+	# disable mmx accelerated code if PIC is required
+	# as the provided asm decidedly is not PIC for x86.
+	if use pic && [[ ${ABI} == x86 ]] ; then
+		myconf+=( --disable-mmx --disable-mmxext )
+	fi
+
+	# Option to force building pic
+	use pic && myconf+=( --enable-pic )
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
+		case ${CHOST} in
+			*freebsd*)
+				myconf+=( --target-os=freebsd )
+				;;
+			mingw32*)
+				myconf+=( --target-os=mingw32 )
+				;;
+			*linux*)
+				myconf+=( --target-os=linux )
+				;;
+		esac
+	fi
+
+	# Misc stuff
+	use hardcoded-tables && myconf+=( --enable-hardcoded-tables )
+
+	# Specific workarounds for too-few-registers arch...
+	if [[ ${ABI} == x86 ]]; then
+		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+		filter-flags -fforce-addr -momit-leaf-frame-pointer
+		append-flags -fomit-frame-pointer
+		is-flag -O? || append-flags -O2
+		if use debug; then
+			# no need to warn about debug if not using debug flag
+			ewarn ""
+			ewarn "Debug information will be almost useless as the frame pointer is omitted."
+			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
+			ewarn "difficult to fix. Please have that in mind."
+			ewarn ""
+		fi
+	fi
+
+	set -- "${S}"/configure \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--shlibdir="${EPREFIX}"/usr/$(get_libdir) \
+		--mandir="${EPREFIX}"/usr/share/man \
+		--enable-shared \
+		--cc="$(tc-getCC)" \
+		--ar="$(tc-getAR)" \
+		--optflags="${CFLAGS}" \
+		--extra-cflags="${CFLAGS}" \
+		$(use_enable static-libs static) \
+		"${myconf[@]}"
+	echo "${@}"
+	"${@}" || die
+}
+
+multilib_src_compile() {
+	emake
+
+	if multilib_is_native_abi && use tools; then
+		tc-export CC
+
+		emake ${TOOLS[@]/#/tools/}
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install install-man
+
+	use doc && dodoc doc/*.html
+
+	if multilib_is_native_abi && use tools; then
+		dobin ${TOOLS[@]/#/tools/}
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README INSTALL
+	dodoc doc/*.txt
+}
+
+multilib_src_test() {
+	echo ${WORKDIR}/fate
+	LD_LIBRARY_PATH="${BUILD_DIR}/libswscale:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavresample:${BUILD_DIR}/libavutil" \
+		emake -j1 fate SAMPLES="${WORKDIR}/fate"
+}
diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild
new file mode 100644
index 000000000000..53e4dbcf9f89
--- /dev/null
+++ b/media-video/libav/libav-9999.ebuild
@@ -0,0 +1,345 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="git://git.libav.org/libav.git"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+fi
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video"
+HOMEPAGE="https://libav.org/"
+if [[ ${PV} == *9999 ]] ; then
+	SRC_URI=""
+elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
+	SRC_URI="https://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"
+else # Official release
+	SRC_URI="https://libav.org/releases/${P}.tar.xz"
+fi
+# 9999 does not have fate-*.tar.xz
+[[ ${PV%9999} != "" ]] && SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-${PV%%.*}.tar.xz )"
+
+LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
+SLOT="0/12"
+[[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64
+~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+~x64-solaris ~x86-solaris"
+IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk
+	frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3
+	+network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
+	static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X
+	wavpack webp x264 x265 xvid +zlib"
+
+# String for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+CPU_FEATURES="altivec armv5te armv6 armv6t2 armvfp:vfp neon"
+X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext mmx mmxext sse sse2 sse3 ssse3 sse4_1:sse4 sse4_2:sse42 avx xop fma3 fma4 avx2"
+for i in ${X86_CPU_FEATURES} ; do
+	CPU_FEATURES+=" cpu_flags_x86_${i%:*}:${i#*:}"
+done
+for i in ${CPU_FEATURES} ; do
+	IUSE+=" ${i%:*}"
+done
+
+RDEPEND="
+	!media-video/ffmpeg:0
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
+	encode? (
+		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
+		amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+		theora? (
+			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
+		vorbis? (
+			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
+		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
+	)
+	fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] )
+	frei0r? ( media-plugins/frei0r-plugins )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
+	ieee1394? (
+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+	)
+	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	ssl? (
+		openssl? (
+			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+			libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+		)
+		!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
+	)
+	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	truetype? (	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
+	X? ( >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	doc? ( app-text/texi2html )
+	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	cpu_flags_x86_mmx? ( dev-lang/yasm )
+	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	test? ( sys-devel/bc )
+	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	v4l? ( sys-kernel/linux-headers )
+"
+
+RDEPEND="${RDEPEND}
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+
+# faac can't be binary distributed
+# openssl support marked as nonfree
+# faac and aac are concurent implementations
+# amr and aac require at least lgpl3
+# x264 requires gpl2
+REQUIRED_USE="
+	rtmp? ( network )
+	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) cdio? ( gpl ) x265? ( gpl )
+	test? ( encode zlib )
+	fontconfig? ( truetype )
+"
+RESTRICT="faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libavutil/avconfig.h
+)
+
+src_unpack() {
+	[[ ${PV} == *9999 ]] && git-r3_src_unpack
+	# 9999 does not have fate-*.tar.xz
+	[[ ${PV%9999} != "" ]] && default_src_unpack
+}
+
+src_prepare() {
+	epatch_user
+
+	# if we have snapshot then we need to hardcode the version
+	if [[ ${PV%_p*} != ${PV} ]]; then
+		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
+	fi
+
+	TOOLS=( aviocat graph2dot ismindex pktdumper qt-faststart trasher )
+	use zlib && TOOLS+=( cws2fws )
+
+	MAKEOPTS+=" V=1"
+}
+
+multilib_src_configure() {
+	local myconf=( ${EXTRA_LIBAV_CONF} )
+	local uses i
+
+	# 9999 does not have fate-*.tar.xz
+	[[ ${PV%9999} != "" ]] && use test && myconf+=( --samples="${WORKDIR}/fate" )
+
+	myconf+=(
+		$(use_enable gpl)
+		$(use_enable gpl version3)
+		--enable-avfilter
+	)
+
+	# enabled by default
+	uses="debug doc network zlib"
+	for i in ${uses}; do
+		use ${i} || myconf+=( --disable-${i} )
+	done
+	use bzip2 || myconf+=( --disable-bzlib )
+	use sdl || myconf+=( --disable-avplay )
+
+	if use ssl; then
+		use openssl && myconf+=( --enable-openssl --enable-nonfree ) \
+			|| myconf+=( --enable-gnutls )
+	fi
+
+	use custom-cflags && myconf+=( --disable-optimizations )
+	use cpudetection && myconf+=( --enable-runtime-cpudetect )
+
+	use vdpau || myconf+=( --disable-vdpau )
+
+	use vaapi && myconf+=( --enable-vaapi )
+
+	# Encoders
+	if use encode; then
+		use faac && myconf+=( --enable-nonfree )
+		use mp3 && myconf+=( --enable-libmp3lame )
+		use amr && myconf+=( --enable-libvo-amrwbenc )
+		use aac && myconf+=( --enable-libvo-aacenc )
+		uses="faac theora twolame vorbis wavpack webp x264 x265 xvid"
+		for i in ${uses}; do
+			use ${i} && myconf+=( --enable-lib${i} )
+		done
+	else
+		myconf+=( --disable-encoders )
+	fi
+
+	# libavdevice options
+	use cdio && myconf+=( --enable-libcdio )
+	use ieee1394 && myconf+=( --enable-libdc1394 )
+	use pulseaudio && myconf+=( --enable-libpulse )
+
+	# Indevs
+	# v4l1 is gone since linux-headers-2.6.38
+	myconf+=( --disable-indev=v4l )
+	use v4l || myconf+=( --disable-indev=v4l2 )
+	for i in alsa oss jack; do
+		use ${i} || myconf+=( --disable-indev=${i} )
+	done
+	use X && myconf+=( --enable-libxcb )
+	# Outdevs
+	for i in alsa oss ; do
+		use ${i} || myconf+=( --disable-outdev=${i} )
+	done
+	# libavfilter options
+	use bs2b && myconf+=( --enable-libbs2b )
+	multilib_is_native_abi && use frei0r && myconf+=( --enable-frei0r )
+	use truetype && myconf+=( --enable-libfreetype )
+	use fontconfig && myconf+=( --enable-libfontconfig )
+
+	# Threads; we only support pthread for now
+	use threads && myconf+=( --enable-pthreads )
+
+	# Decoders
+	use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb )
+	use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac )
+	uses="gsm opus rtmp schroedinger speex vpx"
+	for i in ${uses}; do
+		use ${i} && myconf+=( --enable-lib${i} )
+	done
+	use jpeg2k && myconf+=( --enable-libopenjpeg )
+
+	# CPU features
+	for i in ${CPU_FEATURES}; do
+		use ${i%:*} || myconf+=( --disable-${i#*:} )
+	done
+
+	# pass the right -mfpu as extra
+	use neon && use arm && append-cflags -mfpu=neon
+
+	# disable mmx accelerated code if PIC is required
+	# as the provided asm decidedly is not PIC for x86.
+	if use pic && [[ ${ABI} == x86 ]]; then
+		myconf+=( --disable-mmx --disable-mmxext )
+	fi
+
+	# Option to force building pic
+	use pic && myconf+=( --enable-pic )
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
+		case ${CHOST} in
+			*freebsd*)
+				myconf+=( --target-os=freebsd )
+				;;
+			mingw32*)
+				myconf+=( --target-os=mingw32 )
+				;;
+			*linux*)
+				myconf+=( --target-os=linux )
+				;;
+		esac
+	fi
+
+	# Misc stuff
+	use hardcoded-tables && myconf+=( --enable-hardcoded-tables )
+
+	# Forcing arm would make the compiler break left and right
+	if [[ ${ABI} == arm ]]; then
+		filter-flags -marm
+	fi
+
+	# Specific workarounds for too-few-registers arch...
+	if [[ ${ABI} == x86 ]]; then
+		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+		filter-flags -fforce-addr -momit-leaf-frame-pointer
+		append-flags -fomit-frame-pointer
+		is-flag -O? || append-flags -O2
+		if use debug; then
+			# no need to warn about debug if not using debug flag
+			ewarn ""
+			ewarn "Debug information will be almost useless as the frame pointer is omitted."
+			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
+			ewarn "difficult to fix. Please have that in mind."
+			ewarn ""
+		fi
+	fi
+
+	set -- "${S}"/configure \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--shlibdir="${EPREFIX}"/usr/$(get_libdir) \
+		--mandir="${EPREFIX}"/usr/share/man \
+		--enable-shared \
+		--cc="$(tc-getCC)" \
+		--ar="$(tc-getAR)" \
+		--optflags="${CFLAGS}" \
+		--extra-cflags="${CFLAGS}" \
+		$(use_enable static-libs static) \
+		"${myconf[@]}"
+	echo "${@}"
+	"${@}" || die
+}
+
+multilib_src_compile() {
+	emake
+
+	if use tools; then
+		tc-export CC
+
+		emake ${TOOLS[@]/#/tools/}
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install install-man
+	use doc && dodoc doc/*.html
+
+	if use tools; then
+		dobin ${TOOLS[@]/#/tools/}
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README.md INSTALL
+}
+
+multilib_src_test() {
+	local _libs="$(for i in lib*/;do echo -n "${BUILD_DIR}/${i%/}:";done)"
+	einfo "LD_LIBRARY_PATH is set to \"${_libs}\""
+	LD_LIBRARY_PATH="${_libs}" emake -k -j1 fate
+}
diff --git a/media-video/libav/metadata.xml b/media-video/libav/metadata.xml
new file mode 100644
index 000000000000..222399a18306
--- /dev/null
+++ b/media-video/libav/metadata.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>media-video@gentoo.org</email>
+</maintainer>
+<use>
+	<flag name="aac">Use external vo-aacenc library for AAC encoding</flag>
+	<flag name="amr">Enable Adaptive Multi-Rate Audio support</flag>
+	<flag name="armv5te">Enable optimizations for armv5te processors</flag>
+	<flag name="armv6">Enable optimizations for armv6 processors</flag>
+	<flag name="armv6t2">Enable optimizations for armv6t2 processors</flag>
+	<flag name="armvfp">Enable VFP optimizations for ARM processors</flag>
+	<flag name="bs2b">Enable <pkg>media-libs/libbs2b</pkg> based Bauer stereo-to-binaural audio filter</flag>
+	<flag name="cdio">Enable audio CD grabbing with <pkg>dev-libs/libcdio</pkg>.</flag>
+	<flag name="cpudetection">Enables runtime CPU detection (useful for bindist, compatibility on other CPUs).</flag>
+	<flag name="faac">Use external faac library for AAC encoding</flag>
+	<flag name="fdk">Use external fdk-aac library for AAC encoding and decoding</flag>
+	<flag name="frei0r">Enable frei0r wrapping in libavfilter</flag>
+	<flag name="gpl">Build all GPL licensed code. Without this flag set the package is build under LGPL license.</flag>
+	<flag name="hardcoded-tables">Use pre-calculated tables rather than calculating them on the fly.</flag>
+	<flag name="network">Enable network streaming support.</flag>
+	<flag name="nvidia">Enable nvidia video codec hardware acceleration support.</flag>
+	<flag name="openssl">Prefer <pkg>dev-libs/openssl</pkg> over <pkg>net-libs/gnutls</pkg> to provide SSL/TLS support (notice: the resulting binaries are unredistributable).</flag>
+	<flag name="opus">Use the external opus library for encoding and decoding.</flag>
+	<flag name="pulseaudio">Enable pulseaudio input support.</flag>
+	<flag name="pic">Force shared libraries to be built as PIC (this is slower).</flag>
+	<flag name="rtmp">Enable Real Time Messaging Protocol using librtmp instead the native implementation.</flag>
+	<flag name="schroedinger">Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec).</flag>
+	<flag name="ssl">Enable SSL/TLS support using <pkg>dev-libs/openssl</pkg> or <pkg>net-libs/gnutls</pkg>.</flag>
+	<flag name="tools">Build and install small tools like aviocat, cws2fws, graph2dot, ismindex, qt-faststart.</flag>
+	<flag name="twolame">Enable MP2 encoding via <pkg>media-sound/twolame</pkg> as an alternative to the internal encoder</flag>
+	<flag name="vis"> Adds support for SIMD optimizations for UltraSPARC processors.</flag>
+	<flag name="vpx">Enable vp8 encoding support using <pkg>media-libs/libvpx</pkg>.</flag>
+	<flag name="webp">Enable WebP encoding with <pkg>media-libs/libwebp</pkg>.</flag>
+	<flag name="x265">Enable HEVC encoding with <pkg>media-libs/x265</pkg>.</flag>
+</use>
+</pkgmetadata>
diff --git a/media-video/libva-utils/Manifest b/media-video/libva-utils/Manifest
new file mode 100644
index 000000000000..4be04f1ce4f2
--- /dev/null
+++ b/media-video/libva-utils/Manifest
@@ -0,0 +1,10 @@
+DIST libva-utils-1.8.0.tar.gz 1011595 SHA256 2a7590c8428d0b453b004702c4c515669403cea27f9f17b2560b38da337ec943 SHA512 020cf1d5af7a78ecb4806afe69d34106525086f10b007dddb8d36c0243b670c311df537d969c8b60222b4afc7bfc08c1d594843339af72618886eecfd03887ec WHIRLPOOL 46e76c555a69878e5cb553f3895752aafc821012afefec69b55f35014659e49ab3e30bcd5f94a9ffd86cd1c3fee467d215f58b3e10b69c54d1e630d78144a4b3
+DIST libva-utils-1.8.1.tar.gz 1011602 SHA256 cbd7a88b9b2592106879d271008c9e2236457e5bf4a647efe4bb3d3eaabaf94c SHA512 7b60cf773d7156bf5579754d0525a8cae07b5e63416fd1c6481a9bada388515f8f14d23661c11689599af7ddd192440f96f2c8873b539cf93e7db0550d4e1aae WHIRLPOOL 8d48567146729ab8423dbc52f65a1c004fd6dbca28eda27aecce415c7b0f54d5e973692ce7d7550f7058e59933cdaea21cfe8784107fb7227ca6a02ec9bf8699
+DIST libva-utils-1.8.2.tar.gz 1011622 SHA256 ccae885d9f3b4511081d287816c56bd7dda98e5947e6254ebe60d08e86c6ba4a SHA512 e6d1e025d1c27112bf61869fa097a27c81bff9fb1ed5226842f3c7685852b4cc8903b0a29204d3c85bc4513dab9331b327de0f93c9493a411ab15e7e577ce616 WHIRLPOOL 6eb87fdd46368acf48d483e838b1a5f1a40cf6674171f157eaf6e685ec0e11ecfdb3248a30f5e657b4ded96635a18de6f6e8be2f5d5348d74c28da4cdb225225
+DIST libva-utils-1.8.3.tar.gz 1012261 SHA256 db5df4ae6f6cc572de9ebb2be995f1577226fdd182545793d8de98592c9f7a88 SHA512 0a16243f39556cb7853c144b91c1fb07d4a4fafd43d05f5519af969153bc8a4e5f6512c665c0c7c32c413d50e913f8977bef004bf639f606ae5d6f6af1571d39 WHIRLPOOL 5679871f081fc50e3d63e089949835ff13c346fa7b751e5db1e1dc20478979b87b9bda997117fe5130de3a484b60c56b8f7e63c445a89ce9b705539b53b33574
+EBUILD libva-utils-1.8.0.ebuild 1244 SHA256 8d0542c16771b8e375acb671d6d0bf36227edd8a74f666c496a9ace278388302 SHA512 af4e585ffcacbe4d13283661dcf0e2136d7a75ea0ad81cf716fe565ee0badf7ebc4aecf358cf67b428c942c8f29c5e1ffb03586af2e97f3028007c0e24662816 WHIRLPOOL d00122ee8a19fb76455fa5d4ad526aa695d17dea076bdad7c66e16175539e05aee97b0d973a62bca2206590046f25bedc41c9eced480f387499af7216fcc0f5c
+EBUILD libva-utils-1.8.1.ebuild 1244 SHA256 8d0542c16771b8e375acb671d6d0bf36227edd8a74f666c496a9ace278388302 SHA512 af4e585ffcacbe4d13283661dcf0e2136d7a75ea0ad81cf716fe565ee0badf7ebc4aecf358cf67b428c942c8f29c5e1ffb03586af2e97f3028007c0e24662816 WHIRLPOOL d00122ee8a19fb76455fa5d4ad526aa695d17dea076bdad7c66e16175539e05aee97b0d973a62bca2206590046f25bedc41c9eced480f387499af7216fcc0f5c
+EBUILD libva-utils-1.8.2.ebuild 1348 SHA256 a24258d89c1b3ed1a1837118555896ee4d6d2782773048e73d6494faceae9a8a SHA512 26bfb37359a065a5e4776a046f69f3213b2f82ffa6f0762c17b4416d27d16ebe982947fcc99df4b70cd4ed3d52500264dc5633591d108006739b9de59b86ae5e WHIRLPOOL f51d338b0bdf73bbd1bcb7c3d90aa6263d398dbe6af16f34f87f31f8742c32ec78f5d7e7c66de54fd416f316e2fdb1ade74e59af9ed04083986968c1166555a3
+EBUILD libva-utils-1.8.3.ebuild 1348 SHA256 a24258d89c1b3ed1a1837118555896ee4d6d2782773048e73d6494faceae9a8a SHA512 26bfb37359a065a5e4776a046f69f3213b2f82ffa6f0762c17b4416d27d16ebe982947fcc99df4b70cd4ed3d52500264dc5633591d108006739b9de59b86ae5e WHIRLPOOL f51d338b0bdf73bbd1bcb7c3d90aa6263d398dbe6af16f34f87f31f8742c32ec78f5d7e7c66de54fd416f316e2fdb1ade74e59af9ed04083986968c1166555a3
+EBUILD libva-utils-9999.ebuild 1348 SHA256 a24258d89c1b3ed1a1837118555896ee4d6d2782773048e73d6494faceae9a8a SHA512 26bfb37359a065a5e4776a046f69f3213b2f82ffa6f0762c17b4416d27d16ebe982947fcc99df4b70cd4ed3d52500264dc5633591d108006739b9de59b86ae5e WHIRLPOOL f51d338b0bdf73bbd1bcb7c3d90aa6263d398dbe6af16f34f87f31f8742c32ec78f5d7e7c66de54fd416f316e2fdb1ade74e59af9ed04083986968c1166555a3
+MISC metadata.xml 414 SHA256 42ca6886c5fcbba87e642a207c0b35958f63b626c5d719d9cd2028bec3dcad3d SHA512 4135a2f2d53fc2e53c1eec8c51f24ca2ddfe062b541de33df0fad5c6e21332902249e80b1d049711e7890c9b3802e29bc22d1695afda74949c364b533a829d8e WHIRLPOOL ece46a112089740a0d05d8343b98f90ad186d631ea239a3ee6cdfe1176192dfc3442048eaf96766ca742fe0665079c956d3aa1b01fd3971431887784234dfbe5
diff --git a/media-video/libva-utils/libva-utils-1.8.0.ebuild b/media-video/libva-utils/libva-utils-1.8.0.ebuild
new file mode 100644
index 000000000000..ef34dbe2e6cd
--- /dev/null
+++ b/media-video/libva-utils/libva-utils-1.8.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SCM=git-r3
+	EGIT_BRANCH=master
+	EGIT_REPO_URI="https://github.com/01org/libva-utils"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-utils ${SCM} multilib
+
+DESCRIPTION="Collection of utilities and tests for VA-API"
+HOMEPAGE="https://01.org/linuxmedia/vaapi"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/01org/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+else
+	KEYWORDS=""
+fi
+IUSE="+drm test wayland X"
+
+RDEPEND="
+	>=x11-libs/libva-1.8[drm?,wayland?,X?]
+	drm? ( >=x11-libs/libdrm-2.4 )
+	X? (
+		>=x11-libs/libX11-1.6.2
+		>=x11-libs/libXext-1.3.2
+		>=x11-libs/libXfixes-5.0.1
+	)
+	wayland? ( >=dev-libs/wayland-1.0.6 )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+REQUIRED_USE="|| ( drm wayland X )"
+
+DOCS=( CONTRIBUTING.md README.md )
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable X x11)
+		$(use_enable wayland)
+		$(use_enable drm)
+		$(use_enable test tests)
+	)
+	autotools-utils_src_configure
+}
diff --git a/media-video/libva-utils/libva-utils-1.8.1.ebuild b/media-video/libva-utils/libva-utils-1.8.1.ebuild
new file mode 100644
index 000000000000..ef34dbe2e6cd
--- /dev/null
+++ b/media-video/libva-utils/libva-utils-1.8.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SCM=git-r3
+	EGIT_BRANCH=master
+	EGIT_REPO_URI="https://github.com/01org/libva-utils"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-utils ${SCM} multilib
+
+DESCRIPTION="Collection of utilities and tests for VA-API"
+HOMEPAGE="https://01.org/linuxmedia/vaapi"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/01org/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+else
+	KEYWORDS=""
+fi
+IUSE="+drm test wayland X"
+
+RDEPEND="
+	>=x11-libs/libva-1.8[drm?,wayland?,X?]
+	drm? ( >=x11-libs/libdrm-2.4 )
+	X? (
+		>=x11-libs/libX11-1.6.2
+		>=x11-libs/libXext-1.3.2
+		>=x11-libs/libXfixes-5.0.1
+	)
+	wayland? ( >=dev-libs/wayland-1.0.6 )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+REQUIRED_USE="|| ( drm wayland X )"
+
+DOCS=( CONTRIBUTING.md README.md )
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable X x11)
+		$(use_enable wayland)
+		$(use_enable drm)
+		$(use_enable test tests)
+	)
+	autotools-utils_src_configure
+}
diff --git a/media-video/libva-utils/libva-utils-1.8.2.ebuild b/media-video/libva-utils/libva-utils-1.8.2.ebuild
new file mode 100644
index 000000000000..0c4c99ffb3d8
--- /dev/null
+++ b/media-video/libva-utils/libva-utils-1.8.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SCM=git-r3
+	EGIT_BRANCH=master
+	EGIT_REPO_URI="https://github.com/01org/libva-utils"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-utils ${SCM} multilib
+
+DESCRIPTION="Collection of utilities and tests for VA-API"
+HOMEPAGE="https://01.org/linuxmedia/vaapi"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/01org/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+else
+	KEYWORDS=""
+fi
+IUSE="+drm test wayland X"
+
+RDEPEND="
+	>=x11-libs/libva-1.8[drm?,wayland?,X?]
+	drm? ( >=x11-libs/libdrm-2.4 )
+	X? (
+		>=x11-libs/libX11-1.6.2
+		>=x11-libs/libXext-1.3.2
+		>=x11-libs/libXfixes-5.0.1
+	)
+	wayland? ( >=dev-libs/wayland-1.0.6 )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+REQUIRED_USE="|| ( drm wayland X )"
+
+DOCS=( CONTRIBUTING.md README.md )
+
+src_prepare() {
+	sed -e 's/-Werror//' -i test/Makefile.am || die
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable X x11)
+		$(use_enable wayland)
+		$(use_enable drm)
+		$(use_enable test tests)
+	)
+	autotools-utils_src_configure
+}
diff --git a/media-video/libva-utils/libva-utils-1.8.3.ebuild b/media-video/libva-utils/libva-utils-1.8.3.ebuild
new file mode 100644
index 000000000000..0c4c99ffb3d8
--- /dev/null
+++ b/media-video/libva-utils/libva-utils-1.8.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SCM=git-r3
+	EGIT_BRANCH=master
+	EGIT_REPO_URI="https://github.com/01org/libva-utils"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-utils ${SCM} multilib
+
+DESCRIPTION="Collection of utilities and tests for VA-API"
+HOMEPAGE="https://01.org/linuxmedia/vaapi"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/01org/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+else
+	KEYWORDS=""
+fi
+IUSE="+drm test wayland X"
+
+RDEPEND="
+	>=x11-libs/libva-1.8[drm?,wayland?,X?]
+	drm? ( >=x11-libs/libdrm-2.4 )
+	X? (
+		>=x11-libs/libX11-1.6.2
+		>=x11-libs/libXext-1.3.2
+		>=x11-libs/libXfixes-5.0.1
+	)
+	wayland? ( >=dev-libs/wayland-1.0.6 )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+REQUIRED_USE="|| ( drm wayland X )"
+
+DOCS=( CONTRIBUTING.md README.md )
+
+src_prepare() {
+	sed -e 's/-Werror//' -i test/Makefile.am || die
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable X x11)
+		$(use_enable wayland)
+		$(use_enable drm)
+		$(use_enable test tests)
+	)
+	autotools-utils_src_configure
+}
diff --git a/media-video/libva-utils/libva-utils-9999.ebuild b/media-video/libva-utils/libva-utils-9999.ebuild
new file mode 100644
index 000000000000..0c4c99ffb3d8
--- /dev/null
+++ b/media-video/libva-utils/libva-utils-9999.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SCM=git-r3
+	EGIT_BRANCH=master
+	EGIT_REPO_URI="https://github.com/01org/libva-utils"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-utils ${SCM} multilib
+
+DESCRIPTION="Collection of utilities and tests for VA-API"
+HOMEPAGE="https://01.org/linuxmedia/vaapi"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/01org/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+else
+	KEYWORDS=""
+fi
+IUSE="+drm test wayland X"
+
+RDEPEND="
+	>=x11-libs/libva-1.8[drm?,wayland?,X?]
+	drm? ( >=x11-libs/libdrm-2.4 )
+	X? (
+		>=x11-libs/libX11-1.6.2
+		>=x11-libs/libXext-1.3.2
+		>=x11-libs/libXfixes-5.0.1
+	)
+	wayland? ( >=dev-libs/wayland-1.0.6 )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+REQUIRED_USE="|| ( drm wayland X )"
+
+DOCS=( CONTRIBUTING.md README.md )
+
+src_prepare() {
+	sed -e 's/-Werror//' -i test/Makefile.am || die
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable X x11)
+		$(use_enable wayland)
+		$(use_enable drm)
+		$(use_enable test tests)
+	)
+	autotools-utils_src_configure
+}
diff --git a/media-video/libva-utils/metadata.xml b/media-video/libva-utils/metadata.xml
new file mode 100644
index 000000000000..f539c20c15b0
--- /dev/null
+++ b/media-video/libva-utils/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>aballier@gentoo.org</email>
+    <name>Alexis Ballier</name>
+  </maintainer>
+  <use>
+    <flag name="drm">Enables VA/DRM API support.</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">01org/libva-utils</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-video/loopy/Manifest b/media-video/loopy/Manifest
new file mode 100644
index 000000000000..67bec9d22a78
--- /dev/null
+++ b/media-video/loopy/Manifest
@@ -0,0 +1,5 @@
+DIST 120880-loopy_0.5.3.tar.gz 34450 SHA256 e3b4aa89da8c99bae93b357fff4c64145c5c4ee5115a875fbd71f59380819df6 SHA512 9c8c83fc5411c991749c3f3845c92836fd9776feb8aeebcdfec76f7956184de5c710327a37a8ddc15ed26a069fc44c7fa9302e4bc24faef1fd6d76f15f6d0f50 WHIRLPOOL 32827da012599c175cbf52f7ed486abe9704ccd96fe3b41083338eeeb3a3fb9ce0200a6523aee6ebc8f1095582a01812978415f06c8d4f56022bac7f45f641ab
+EBUILD loopy-0.5.3.ebuild 474 SHA256 314d555e9cd11e3a007e80bf239bcfd204889ac95b4a10eb1dcbf88821fb4c22 SHA512 d96da6b9b55f6d461b78fb15dbeda112bb8d507af158249721c420c19c4be87ff5bca9b485b00387afb40b2490a8496c92ad9b187d3c30a443d1f5488c59d681 WHIRLPOOL f8826ff5eb001fae0b01d8aa2c9d821d36af93885da3981d5d7fb134c4e3a676f655b251d97d983b57ffaadbf71df9d6eef371a04074244bbee520784ca942cb
+MISC ChangeLog 2424 SHA256 946f1dc24e46314ca49a7a9b90c38029529594fddc3106230352362da6beeb52 SHA512 57f906bf17dcd5522c2c2592afc0d173fd220e1922c4a0f77271def3548cd72a46bdca3dd4305994683070ea9161c878ed5098a56f6fb0ad290bf013f9ae0ee5 WHIRLPOOL 55201a0d640e9ccd2dd731d9724adfe3669f7241b9b5ddffe83194ab08e21e8c649af21ee33afa54e0fc440844c043992aa4eda9ebaea6223e6700cd52183ba6
+MISC ChangeLog-2015 676 SHA256 5a8d602e45470a91d899e594f5cb62a5e8ff4ae10f2d9c1ed4366ebf06713bc6 SHA512 c0e6c9804c6869107a615b3134055f237e116fe6b88e8e39bc46d6b9b0e7426337b03280e682967a61b2f091955e6a1821c145a155c188ae2ad5d8c478ab9456 WHIRLPOOL e31eb2e2d7e0becc860b732dff9f04c82f5e369d5ea159e3df3fb0f9d058d79fd7614376a767cbe84fdb92685a07327d1374c144d3a4d4a0e5d5ba46a94e0ace
+MISC metadata.xml 341 SHA256 2ffe29779c73d9103263ed1ca95225e0ef9e6c5c1ade97b300b1988b073c786b SHA512 a88d1ac860818608a25c99589b3a3706998989c163c83f826853702fbb63b574bdb9dd67fed6ea8edf98e8e31828fc7f5bf9da3416cc476570e4781fb74764c0 WHIRLPOOL 0e8ce65733e764ea062702c7e758361ce5977cc9b4c8194c1dba06872ec259c22b6b86b3eb63aeb49890165a4ecf89b9990424db3d6b889d62d8e98aa70305ee
diff --git a/media-video/loopy/loopy-0.5.3.ebuild b/media-video/loopy/loopy-0.5.3.ebuild
new file mode 100644
index 000000000000..0148bec00442
--- /dev/null
+++ b/media-video/loopy/loopy-0.5.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+KDE_LINGUAS="cs de hu pt_BR"
+inherit kde4-base
+
+MY_P=${P/-/_}
+
+DESCRIPTION="Simple video player for KDE"
+HOMEPAGE="http://www.kde-apps.org/content/show.php/Loopy?content=120880"
+SRC_URI="http://www.kde-apps.org/CONTENT/content-files/120880-${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( THEMING )
diff --git a/media-video/loopy/metadata.xml b/media-video/loopy/metadata.xml
new file mode 100644
index 000000000000..34e391df6b46
--- /dev/null
+++ b/media-video/loopy/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>media-video@gentoo.org</email>
+  </maintainer>
+<maintainer type="project">
+    <email>kde@gentoo.org</email>
+    <name>Gentoo KDE Project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/media-video/lsdvd/Manifest b/media-video/lsdvd/Manifest
new file mode 100644
index 000000000000..2a3285b4de40
--- /dev/null
+++ b/media-video/lsdvd/Manifest
@@ -0,0 +1,6 @@
+AUX lsdvd-0.17-autotools.patch 538 SHA256 6cc249c0f486cb30a46139c1a8f23d15d5279da7e96bea2de5ebab8a6e3f11aa SHA512 7fc4b172d8ca75019165758b2bad030e6a5ffc28cf542e1f0d9025078029578cb96b6ba5f1a6bd877f315baef74aa302dae78352636b03592e5a1343da5680b0 WHIRLPOOL a2f74e6161e71ef557fa9d99de88b02fd833fc6d401b77e98b996331acefb5c053fc2ecf2d33114307d4b44b1721f8bec302b169f66dcdb648290de02765e4a3
+DIST lsdvd-0.17.tar.gz 99250 SHA256 7d2c5bd964acd266b99a61d9054ea64e01204e8e3e1a107abe41b1274969e488 SHA512 d217ebe063c9d4c1584abe99cba5c5d09e1d600d26c58f90d542235f9a629433aa24f24fd8399c639e21391e7a5e8bdf54a9c85083aed63eae1090f4c23677e0 WHIRLPOOL 247e50b5487b8e623c5795bafca066f54879c365a49e239c522de825d4422760a4245223b367f815c381f0bd8eafe5963709f8c7a85a36a0d11b767093acab87
+EBUILD lsdvd-0.17.ebuild 611 SHA256 ee43442bd25bf8475fa7b0a307793a7d85ce4c69739832c2fca4d3405e78a7fb SHA512 21f67b121beb1a422aeb0f991577f17333074e68277e3bb1253041e034fa81ca784934bff8551c5f7a40ad5a8b16b5092efe0f65ab13361902522613bb31fb82 WHIRLPOOL 1265b548becb68427fade83e4ad630d3145d2ac68c2ef55a70c0a20427e24d2e45d5566431365682e97d16468f3ad477047a2acc28a6140f2115d0daa13a7ea1
+MISC ChangeLog 2736 SHA256 9b2782f721727843631069b43c206f081dd0f212c35b2e94f84b89071d01a240 SHA512 6d6fdfdd3b5879005a8d8aadb1f92e8db2b238756dbae7ce71e33d1b2b5b266babfb61568d8d17f6d518c6c6f4ba11e16cd39a2b825cc63269ef0dfd8caeb693 WHIRLPOOL 243b742f1fc565922341b5c1c773de282c7092d63fec3caf78412bfe5be74eb899cd79198daa3c4d446217dd4b02395ada9d5810b001b71631787c01c19008b5
+MISC ChangeLog-2015 6799 SHA256 c689160739fc5b649b4237c95baea01031c74764ed7e6a83978dff945f1a19ca SHA512 0e1bbf4748ed39ffbed384b46444cc391cb7191da5a5f4588dddcdddec253f6edc4450b587cd89d8d6bce984d7561c005f89a8d4851765dc522c96e60806231f WHIRLPOOL 464cbebc1d1dfec345eb97b7c63ef989afa5ed3ed96b4d621c147f5eda414f95beea181b633f8c95b3ac4d4f94df20cb84cf95104f00e435170b763feee08a46
+MISC metadata.xml 298 SHA256 a53e256b63cf1526535bb58dc4e8bc5649df9bec39b9f943a023192382205f26 SHA512 b52246d4fa2022782a488aa4181dae1eb3b4c1371f492eae86c871d4e7f4cc23c89889ac08a5d74f337276933a53237a7d49e4489db384913017e74c888230b6 WHIRLPOOL 70c13da41caf1ebc999f96fe9daf216ed730bf05b320a51ccb682845a4575ad71fe1f0f2e5b60dbde38b87b8ee75f38e59f42425c993f6e50fe50db766aa6ebd
diff --git a/media-video/lsdvd/files/lsdvd-0.17-autotools.patch b/media-video/lsdvd/files/lsdvd-0.17-autotools.patch
new file mode 100644
index 000000000000..c2f7e9456ed9
--- /dev/null
+++ b/media-video/lsdvd/files/lsdvd-0.17-autotools.patch
@@ -0,0 +1,12 @@
+--- configure.ac.orig	2014-10-04 00:36:04.484376722 -0600
++++ configure.ac	2014-10-04 00:36:25.080207028 -0600
+@@ -1,9 +1,6 @@
+ AC_INIT([lsdvd], [0.17])
+ AM_INIT_AUTOMAKE([foreign])
+ AC_PROG_CC
+-if eval "test x$GCC = xyes"; then # Enable warnings when using GCC
+-  CFLAGS="$CFLAGS -W -Wall -Wcast-align -Wcast-qual -Wpointer-arith -Wreturn-type -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wformat -Werror=format-security"
+-fi
+ AC_SYS_LARGEFILE
+ PKG_CHECK_MODULES([DVDREAD], [dvdread >= 4.1.3])
+ AC_ARG_ENABLE([debug],
\ No newline at end of file
diff --git a/media-video/lsdvd/lsdvd-0.17.ebuild b/media-video/lsdvd/lsdvd-0.17.ebuild
new file mode 100644
index 000000000000..c7ac5c7dc1d0
--- /dev/null
+++ b/media-video/lsdvd/lsdvd-0.17.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Utility for getting info out of DVDs"
+HOMEPAGE="https://sourceforge.net/projects/lsdvd/"
+SRC_URI="mirror://sourceforge/lsdvd/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+RDEPEND="media-libs/libdvdread"
+DEPEND="${RDEPEND}"
+DOCS="AUTHORS README ChangeLog"
+
+src_prepare() {
+	rm "${S}/aclocal.m4" "${S}/Makefile.in"
+	epatch "${FILESDIR}"/${P}-autotools.patch
+	eautoreconf
+}
diff --git a/media-video/lsdvd/metadata.xml b/media-video/lsdvd/metadata.xml
new file mode 100644
index 000000000000..d09dbab575da
--- /dev/null
+++ b/media-video/lsdvd/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">lsdvd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/luvcview/Manifest b/media-video/luvcview/Manifest
new file mode 100644
index 000000000000..e07c723423e8
--- /dev/null
+++ b/media-video/luvcview/Manifest
@@ -0,0 +1,6 @@
+DIST luvcview_0.2.6-4.diff.gz 8227 SHA256 2e71076ef242751d7931d7ef3198d0e5688e29ab86be4f0125891dc972e46fb1 SHA512 ae0f760e08979065a072f28367fd6c399ff8bc821b79d021d0fec8bb62e36b10804f30f708de3e23ccada0596b7c57dec6d0f8b92a777046e1bfa087686e7f87 WHIRLPOOL 59935271c553554af9a52cef87b34e28717836765b94103d27f3bbcb0589c489edd686da3c6694588acda6c5b4a0a53ceff334530218d711d765a53b7dd8a44b
+DIST luvcview_0.2.6.orig.tar.gz 100318 SHA256 73c37160efaf62b896009d5686e7b21e37c1860a75e0454e8e5dbdded8a4e2d0 SHA512 6d0b480c51716e36401680ae333c37f179122d04feca3e91056f77abee6dc60dac4e431e8cca999780c343d10170678ace1eb29076c9211c0cfef6d65a4599ab WHIRLPOOL a85e7bdef2a7ea4a4c784e3ced665155e5220489ffc6e98c5bd612c03777427cb732803232d7f29b9eb4250a9721ecbd07e26dd265d3d376c609e66df89814c7
+EBUILD luvcview-0.2.6.ebuild 952 SHA256 716e5d0981ae93455d4463619913f3e433a56c4f29956454ea91aff94e48a45f SHA512 7f355e5a7d254b0358f0d0f5092dce186be276ad4cbf48d2c919d155e2b8e84f76fd4476aa21ac9b50f2e2c69f033abed3463a25e57aa03518ec2441f8d5cd64 WHIRLPOOL 4ef49970e0a33d021b074f6e1bcbe85735e99d73d12ff75725c8699743ffa63fb64941b4378166db7011fe4f5ff970066c343fe6f913e0117c7d465360fb0cd3
+MISC ChangeLog 2433 SHA256 bdab0e48ed5d2749f1155375f21818addf35a19d1a1cb891861c71f3523b9f27 SHA512 8b439ae25ba899dbf1b6fe168a6952a7150ed4f7d2e5c1e86af0e8b8ca404fc90147f7aacaf504cf784091f7074fbcdc857f30b6505ed140cc1457ceceefd49d WHIRLPOOL bf7d87726e1f9468bbeb86eb7070f367f0f60e2b465f03584d77c2a92e7fdc654336fae27a5ba877b0580ce593a239c6682ec6b09c3b961dde6a101cc0f9233e
+MISC ChangeLog-2015 1041 SHA256 83cbbfd51c354e625adfd2ab41d982c59cb2ea78326e4222c6c18f702ccaef61 SHA512 501da8cec05a9d47ec84baa90734ab7afff069d6479d751c2ee881865b49ad67c08eb36b9340b59819590e220fd4bf94494ab1fedacd0049d72dd1d2318f5194 WHIRLPOOL f00cbfcf92d87a3cf80ccf84e582fc00787f37cfa79a5375530877b34afee3a528d159d66ddd01d256604b362ac3461ed7169801d976028cdd474ff4aaf6182c
+MISC metadata.xml 259 SHA256 4852206a3072932a61ab8385eb59e71e039db9ef45a58388793b666cf5e45605 SHA512 c81aea0e68817fa210dc6f66313aee75246139e50d6324338707f11bca2173c64e88ce8440794c85eb64194ff97cf6c6760a06b4822a121e40629bdc3a04e1fd WHIRLPOOL f099222dbec5aedb3b5bd21a72bd6b33869fa88d1c7c5748d39c346cf0194ea495ba7e987c26fbf360407a174d6b8b7bf02aa00482bca341eb3db0bb6bb9ef19
diff --git a/media-video/luvcview/luvcview-0.2.6.ebuild b/media-video/luvcview/luvcview-0.2.6.ebuild
new file mode 100644
index 000000000000..093f2e4fe702
--- /dev/null
+++ b/media-video/luvcview/luvcview-0.2.6.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit eutils toolchain-funcs
+
+PATCH_LEVEL=4
+
+DESCRIPTION="USB Video Class grabber"
+HOMEPAGE="https://packages.qa.debian.org/l/luvcview.html"
+SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}.orig.tar.gz
+	mirror://debian/pool/main/l/${PN}/${PN}_${PV}-${PATCH_LEVEL}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/libsdl
+	media-libs/libv4l"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	EPATCH_OPTS="-p1" epatch "${WORKDIR}"/${PN}_${PV}-${PATCH_LEVEL}.diff
+	EPATCH_FORCE=yes EPATCH_SUFFIX=patch epatch debian/patches
+	sed -i -e 's:videodev.h:videodev2.h:' *.{c,h} || die
+	sed -i -e 's:-O2::' Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC) ${LDFLAGS}" || die
+}
+
+src_install() {
+	dobin luvcview || die
+	doman debian/luvcview.1 || die
+	dodoc Changelog README ToDo || die
+}
diff --git a/media-video/luvcview/metadata.xml b/media-video/luvcview/metadata.xml
new file mode 100644
index 000000000000..17f11a20c014
--- /dev/null
+++ b/media-video/luvcview/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-video/lxdvdrip/Manifest b/media-video/lxdvdrip/Manifest
new file mode 100644
index 000000000000..a685c4318773
--- /dev/null
+++ b/media-video/lxdvdrip/Manifest
@@ -0,0 +1,7 @@
+AUX lxdvdrip-1.77-makefile.patch 1341 SHA256 b4d753031aee2ac543ecf34993a694d0e9628c4042338e3775ee3ea317a21250 SHA512 4641e48fa2c7f35948788211a093f96506a74a5beee44b83787774627b52b85b36a65043e1b99cde6fb9352dde0a3838070e1f63a810f7f1433849be04e7e4a2 WHIRLPOOL 65a80eac28ec1adc43baec436563c7e0fd84910aa674f97ddfc255d8b8ad93fa092d4a11ffbea444a6ac01a45080ae3a6db981147d9e98e521df144cc46d7c45
+AUX lxdvdrip-1.77-vamps-makefile.patch 389 SHA256 6a7f56787088311920ff2efb292248b9374c2bf85063ab1c41730c5966bb3486 SHA512 d51a411dd8bee365556b0ee275beccb99f00d4054e40080ca40fbb50f843a6646d2bb5fbc3ae97073dac7411706c0075266b00b7dfafcfa5977442143592e8b4 WHIRLPOOL b391919e5debbac6cbb55b13e0337d3e6459a8d6fc04a8e3127bcfcd93aa9a1c6ea499ee2544777067b94318099dab7181dd89028bf6a079e6168077e6ebbd97
+DIST lxdvdrip-1.77.tgz 714310 SHA256 3b31ebb1c7edb02989bd2c3b6dbfd9d960cfdf6d950ae403639f1d5b63aac41f SHA512 d9b3003d52b90ad0f6c02054cb3171b4613b4210b5681c76f2e6e42d4a233438b1323c93b92457fd2e048e7ddef0df2089d82ea8bf3f9983c453ff99f122cca3 WHIRLPOOL 6953884fdf51e1b824dd7a77a0aea813e3766693207a6f8446840c0f385ed71d5182adcc84406b25c77fd94a7768cb5c5a9a1f1837af508279d5505b91d9df52
+EBUILD lxdvdrip-1.77.ebuild 1181 SHA256 444c7aa0b57ab3e8d97c605aecce4d04afe11b555203243f51ccc6e9f9e1fe39 SHA512 a21a4630d2c0f94b2d5b26009dbf2b1e064ac932f2f3a4fa426ae4cd388a2a61451f6f3c3c3cf508533260d0b8f01d3c41f292d92e24c8b113079d75c194db18 WHIRLPOOL eb941dcddb23426acddf75038571083f321de45ceab68e139dac23ab3fed825216f3e213a80d40302c6f05c9e9410566e50e0fc330106e48c9786895127b3222
+MISC ChangeLog 2709 SHA256 806698920c2a7f1e407a396fae8b3d87debc6ac4a90497e44c45d4dbca3b5df6 SHA512 9fc531c6f309f6f4c8fce91a61b6aed8ce7ce78f65fa3919ab1581ccc6039e24f4779c53b61b8736ab1f12973a226cb1d66d421a02603ed2e33bbd303f2d6291 WHIRLPOOL a0fa53d4b1eb5fc61711e2ab6b5889ea2ab28eb782d9e99555d3458de4da6312723c42be025c09a9906638cfeafb9a4ac45087c52b4d78c4c48ae008643aaefa
+MISC ChangeLog-2015 5941 SHA256 041e005dd22aaa0e01440c7a0a9de449e8fdc2e6fa4fc2f64e75d47c46833d42 SHA512 5c6cbb235cc9b6856bc11d2cea461640849d0f0718af850a8a95d4a51c6a1a0f8cd14bbcda427a02fa092772f9f103b6be00b987a214f9890cb9d7ccf3eec78f WHIRLPOOL 2c6ef50284c4b1cb57f24786c65069fa35cd235c4fff529792171e444d598b7ec3d5057886bad0e81262265784525fede8117ff7bf3dba63519429235cfffe6c
+MISC metadata.xml 301 SHA256 032f0241e25819fdfc515cf70cbb51d1d38008162c2b062d3e7d74dd66171120 SHA512 14dce877e9111310fd764182c06b619ab5ef6c64c779e218aff6d996ceb70ad78c42f05f26a6f00adbf99b83e4b2b743c251fa7e65325d154efdf02cddb713f2 WHIRLPOOL 99fa40ebba5b6ee244472d89055531f4222a494677f62f460712767e108ced67e84d6bbd57e7f88b482cc9c715d498fe3e34125f405db6056688a6932f5a8121
diff --git a/media-video/lxdvdrip/files/lxdvdrip-1.77-makefile.patch b/media-video/lxdvdrip/files/lxdvdrip-1.77-makefile.patch
new file mode 100644
index 000000000000..35df8fb65400
--- /dev/null
+++ b/media-video/lxdvdrip/files/lxdvdrip-1.77-makefile.patch
@@ -0,0 +1,43 @@
+--- Makefile.orig	2014-03-17 15:40:30.886570544 -0600
++++ Makefile	2014-03-17 15:41:22.729159468 -0600
+@@ -3,31 +3,15 @@
+ HINWEIS1 = 'Check the configuration file in /etc with the Changelog'
+ HINWEIS2 = 'Comparez le fichier de config. en /etc avec le Changelog'
+ 
+-all:
+-	if test -f badsect.o; then rm *.o; fi
+-	gcc -g -c badsect.c
+-	gcc -g -c cputest.c
+-	gcc -g -c dvdbackup.c
+-	gcc -g -c dvdcell.c
+-	gcc -g -c dvdcopy.c
+-	gcc -g -c dvdformat.c
+-	gcc -g -c dvdinfo.c
+-	gcc -g -c dvdtools.c
+-	gcc -g -c ifo.c
+-	gcc -g -c lxdvdrip.c
+-	gcc -g -c mpeg2dec.c
+-	gcc -g -c requant.c
+-	gcc -g -c streamanalyze.c
+-	gcc -g -c systools.c
+-	gcc -g -c tcmemcpy.c
+-	gcc -g -c vaporize.c
+-	gcc -pthread  -g -o lxdvdrip *o -ldvdread -lm
+-	if test -f badsect.o; then rm *.o; fi
+-	gcc -g -lm -o lxac3scan lxac3scan.c
+-	cd vamps && make && cd ..
+-	cd dvdbackup && make && cd ..
+-	cd requant && make && cd ..
+-	cd mbuffer && make && cd ..
++LXDVDRIP_SOURCES = lxdvdrip.o streamanalyze.o ifo.o dvdinfo.o dvdbackup.o dvdcell.o systools.o vaporize.o dvdtools.o dvdcopy.o requant.o cputest.o tcmemcpy.o dvdformat.o badsect.o mpeg2dec.o
++
++all: lxdvdrip lxac3scan
++
++lxdvdrip: $(LXDVDRIP_SOURCES)
++	$(CC) $(LDFLAGS) -o $@ $(LXDVDRIP_SOURCES) -lm -ldvdread -lpthread
++
++lxac3scan: lxac3scan.o
++	$(CC) $(LDFLAGS) -o $@ $< -lm
+ 
+ clean: 
+ 	rm -f lxdvdrip lxac3scan *.o
diff --git a/media-video/lxdvdrip/files/lxdvdrip-1.77-vamps-makefile.patch b/media-video/lxdvdrip/files/lxdvdrip-1.77-vamps-makefile.patch
new file mode 100644
index 000000000000..7c32d44ef371
--- /dev/null
+++ b/media-video/lxdvdrip/files/lxdvdrip-1.77-vamps-makefile.patch
@@ -0,0 +1,11 @@
+--- vamps/Makefile.orig	2014-03-17 15:44:50.086513525 -0600
++++ vamps/Makefile	2014-03-17 15:44:56.443321441 -0600
+@@ -21,7 +21,7 @@
+ CFLAGS    ?= -O2  -g -D_LARGEFILE_SOURCE -DLARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \
+ 	       -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_REENTRANT
+ CFLAGS    += -Wall
+-LDFLAGS   += -s
++LDFLAGS   +=
+ LOADLIBES += -lm -pthread -ldvdread
+ 
+ INSTALL   ?= install
diff --git a/media-video/lxdvdrip/lxdvdrip-1.77.ebuild b/media-video/lxdvdrip/lxdvdrip-1.77.ebuild
new file mode 100644
index 000000000000..74763867b526
--- /dev/null
+++ b/media-video/lxdvdrip/lxdvdrip-1.77.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Command line tool to automate the process of ripping and burning DVDs"
+SRC_URI="mirror://sourceforge/lxdvdrip/${P}.tgz"
+HOMEPAGE="https://sourceforge.net/projects/lxdvdrip/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="media-libs/libdvdread"
+RDEPEND="${DEPEND}
+	>=media-video/dvdauthor-0.6.9
+	media-video/streamdvd
+	media-video/mpgtx"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-makefile.patch"
+	epatch "${FILESDIR}/${P}-vamps-makefile.patch"
+}
+
+src_compile() {
+	CC="$(tc-getCC)" emake || die "emake failed"
+	cd "${S}/vamps"
+	emake CC="$(tc-getCC)" || die "emake lxdvdip vamps failed"
+}
+
+src_install () {
+	dobin lxdvdrip || die
+	dobin lxac3scan || die
+	dodoc doc-pak/Changelog* doc-pak/Credits doc-pak/Debugging.*
+	dodoc doc-pak/lxdvdrip.conf* doc-pak/README*
+	doman lxdvdrip.1
+
+	insinto /usr/share
+	doins lxdvdrip.wav
+
+	insinto /etc
+	newins doc-pak/lxdvdrip.conf.EN lxdvdrip.conf
+
+	cd "${S}/vamps"
+	emake PREFIX="${D}/usr" install || die "make install failed for vamps!"
+}
diff --git a/media-video/lxdvdrip/metadata.xml b/media-video/lxdvdrip/metadata.xml
new file mode 100644
index 000000000000..3736acd7c0ea
--- /dev/null
+++ b/media-video/lxdvdrip/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">lxdvdrip</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/m2vrequantizer/Manifest b/media-video/m2vrequantizer/Manifest
new file mode 100644
index 000000000000..eae91e6a76ef
--- /dev/null
+++ b/media-video/m2vrequantizer/Manifest
@@ -0,0 +1,5 @@
+DIST M2VRequantizer-20060306.tgz 25576 SHA256 d024b58efd8ab6e9facc5cbd07da93036baad07c3f5531e794acc58f3b2a0a97 SHA512 e3173aa19301028682adb2046bc536b20ca4c3bacfa7e40e0c22a5174411831969a9ed0e6737be7dede00006ba1629fb178822001166c02c507434e66c66b861 WHIRLPOOL fd05c9729c43a06fa7dc82a611f6ce33638cb40767f93c560cad9b86e5f55edd1118f5dcfa092694b23d69f1a166d4c724265fdaaf3c7049e6ae2c306e2204b0
+EBUILD m2vrequantizer-0.0.2_pre20060306.ebuild 684 SHA256 249993393b1f6caa404951e6c62394f30b30f2322fbd0d47608ebb7fcc187cf0 SHA512 421882f7bcc5acfed46d4000aa9c8548398513f345aa3d93c12898a389f9947d2422d0e9e1cb48596f9d0f3c7c7a68f3a069a2cc1b470edbddabee59fdaed8c7 WHIRLPOOL 0a574834c44d0fe8569718386ad37357669f9eabc4ea0034dcd678bf228921b11c8976fe4a71b60333469ab3357ee9de8bae1b8b0688cb9841dfebb6aae99c09
+MISC ChangeLog 2475 SHA256 dff79c12f82134be3cd06e951c07111ae177375d43569ec686df2cd807fe4aed SHA512 fb9134f0ee8d137326711a8fe919dd6684d1411c1de71a82e10e61288b18506c51be2f9532b87bbc824d50c8c16830ff90e3e0a9bfffcd6df33f53c9284ee708 WHIRLPOOL 2ce1c0472829ea2509a34403f131ce7ea7a45080d5ef6fc247c9a18686ee8bf666b44cfb2aaabe59a001ef80f6d1558909732103805180d814c856758036e181
+MISC ChangeLog-2015 1808 SHA256 0eff65f1c9121fd22d20a2b4289cde2d738430568ffc5b5638ede8405c06dc76 SHA512 0ab3e1b4472d1f77e2c911f3499edce17a6d9d0d8718d45e484622c2f1fd67fa8cb2ac64bc84e93ec5e16846eea99a484478c91a679edcef8ce3ae95ba33c915 WHIRLPOOL 81d5975fda1412715b36e91434c548d08e93856796929ed9861aafc32325563b391f07ed9ef12dcbd27598dbf138b7899cac654e20669af82396b5a436d6b66d
+MISC metadata.xml 357 SHA256 5404f8e98a7d7ea3252ac4efa915b5d0917473ccf0adc35a8c6944e3adb7b826 SHA512 c301a1bb051eefde7856ef1462d13343fba21acfabde35a2fd9feba5c00f3aaf697b9e358132cc56114f59af0b785ffb07998d8a6d084369275cbf1b616a7fa4 WHIRLPOOL de3ca44c2da1758d934ca3285b6370bba3b5e78917d6e0d6b1c9be0639552d8f934cb992857de82d98e7900bdc9e9aa8e949e87f265efd6b04db757aed0383b1
diff --git a/media-video/m2vrequantizer/m2vrequantizer-0.0.2_pre20060306.ebuild b/media-video/m2vrequantizer/m2vrequantizer-0.0.2_pre20060306.ebuild
new file mode 100644
index 000000000000..524ea9eceb47
--- /dev/null
+++ b/media-video/m2vrequantizer/m2vrequantizer-0.0.2_pre20060306.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+MY_P="${PN/m2vr/M2VR}-20060306"
+
+DESCRIPTION="Tool to requantize mpeg2 videos"
+HOMEPAGE="http://www.metakine.com/products/dvdremaster/modules.html"
+SRC_URI="mirror://vdrfiles/requant/${MY_P}.tgz"
+
+KEYWORDS="~amd64 x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/M2VRequantiser
+
+src_prepare() {
+
+	sed -i "s:#elif defined(__i386__):#elif defined(__i386__) || defined(__amd64__):" main.c
+}
+
+src_compile() {
+
+	gcc -c ${CFLAGS} main.c -o requant.o
+	gcc ${CFLAGS} ${LDFLAGS} requant.o -o requant -lm
+}
+
+src_install() {
+
+	dobin requant
+}
diff --git a/media-video/m2vrequantizer/metadata.xml b/media-video/m2vrequantizer/metadata.xml
new file mode 100644
index 000000000000..82041cfbab6e
--- /dev/null
+++ b/media-video/m2vrequantizer/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+<email>vdr@gentoo.org</email>
+<name>Gentoo VDR Project</name>
+</maintainer>
+<maintainer type="project">
+<email>media-video@gentoo.org</email>
+<name>Gentoo Video project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
new file mode 100644
index 000000000000..1c662da1532b
--- /dev/null
+++ b/media-video/makemkv/Manifest
@@ -0,0 +1,8 @@
+AUX makemkv-path.patch 2153 SHA256 daf69f09e936929e78c82ef8efdd6014a3b1bfdf776751f57cc86a8f50888022 SHA512 c7744f92ed7a5f09f0301c454afa32e4fce7251f276129917d2ce602b35f5961e629fa0328213f6e5a8d260b5964db099c44b1e870b209f7bb78712cf52b6e95 WHIRLPOOL baa98199b7735117d756d7458359f4dcc9b12b463d5707d7606fd7676fc157b1868a21e8da803da6c7fc7c577a09ae027fbfc4fd5f2eb0da528dbb545e550289
+AUX makemkv-wget.patch 1013 SHA256 8153281145a2299c190e5b3453fa3f76c9451e1eb16006fde459e6665a7bad80 SHA512 09ece751d6765a93ff18e0eb8edbb7c413e1074676bc5c6fbc57bb1b8c2314f66198737c5077ecef18d286d724088d2db6731977885713bc095531281f104e0f WHIRLPOOL 453a619c70b8ef28e0d8ccfb80141109fe129879f7a4e31355d52d059d95a2abfebe74b16b05d14b033b0c63fa28a0f1567d4382c370937c63990d66d22a1b67
+DIST makemkv-bin-1.10.7.tar.gz 8724225 SHA256 2b9a9e6fb779bc876371b2f88b23fddad3e92d6449fe5d1541dcd9ad04e01eac SHA512 7c3c1713df6b4009de2337a28f4c5b1f38d37be3a30f08ceafc6dc276c960960f6443fd5b29f5f96f10597093ff170fb5ab69d6244db5165da30abe1d3732aab WHIRLPOOL 7cdbd0aef4d1d5e9d7eb0b5ba1e7be5d478a84dfa4fe2c6528c91db29c2ebe86db4ee2cd5059b84b934bb720f293979e0afec9bcce2a3c8460825d9c5a6ce104
+DIST makemkv-oss-1.10.7.tar.gz 4570003 SHA256 be61fcee31dc52944ec7ef440ff8fffbc140d24877e6afb19149c541564eb654 SHA512 f329449ed1bb4240a8256c3171c3c6cc0843c8d07a79526608fa3ea83e012634e6c6d9dd17160853b973d012e3483bcdaa17d9d1e6f7beb90c048b6063c12aa8 WHIRLPOOL 2e74e6d025bf26c12b036c971648975a4e7d9b753a2015e9282f5a4ded0885e83df4f54ca30200c8f50ba5f748283c582fba3b65b4e26211a7d87e4d431ec137
+EBUILD makemkv-1.10.7.ebuild 3113 SHA256 bd8dfb616f0219994f7ea82ca2526ad1030ecb1d4ed765ad2968049fef631d88 SHA512 4733ad340dd9ab8fe247e6f37005620ea5ed5e364c21911d81bb54e7a31e02b5c652699422a14d0fdd3113c2870529e20dba8b3166b424ab3472971c7a960202 WHIRLPOOL 078a37c1892a4fa9700848db25b34f1c232f7428f328303822819d0e86afd35eee61e350f862c68b3af96f681b984f4c53b782e1ecb1fb60b9cbc34be516853e
+MISC ChangeLog 7615 SHA256 377311aefb24e51892ac094ee9733edecad630891cdea77e76c745b3059fc0b1 SHA512 99510e41787abe9edefd918edaff201c5a43f3c8e05c0bf49f9499a9b31e685c6dc8f1d5763f9feb251a352e76a9a9b7d5a13488c33ea8d18ddc32cb6370d1e5 WHIRLPOOL b30a6ec149a2c90ec532b38c4ed8c10b33a7285ee9174c792fdb44123e454704906ebebd92f497c0a5302392884559cabf35af71c7a1e0621f3a7f1534b43cc5
+MISC ChangeLog-2015 12085 SHA256 fbf29eb91bf5bf4b516857b2e3e778bc4ed54b6fe382d80f84ffd688dc0afb02 SHA512 63a0713ae6a6cee55f3077d850a86cc6079a574145683b61b643b8324dcf9ed55dc207e54e70709d1b818489a9fb016c12d553076b5f7aa9a298c599990a565f WHIRLPOOL 3a54bb835dea1cd815cfc2daab46338b46b65e785bc0684a7787ee74ff69b8fd19f8741d821fb5a4de968a3029742e8f7666589e03d64d34b518289a9294c2e6
+MISC metadata.xml 1221 SHA256 19e142b9a9c08384f526c0bf2175aa9443a31c8082f8fe6804dc5011421db4c8 SHA512 697327658b9d1dff99431417d48d9184377c56eacdaf61d98f22a1f7df1e596ee34971f6f75f13cd3842ccb49a21bd2f70592acee8269ae9c130261f72d6a92b WHIRLPOOL 9231c2da5d1d02def5eff7b9609f470720710ea9fb6d2c807226a7488b84f9baa000215761ae71acb88306d59c9429a5bd6ec761bfe1c0918baadd6dc5886083
diff --git a/media-video/makemkv/files/makemkv-path.patch b/media-video/makemkv/files/makemkv-path.patch
new file mode 100644
index 000000000000..7c66849b3234
--- /dev/null
+++ b/media-video/makemkv/files/makemkv-path.patch
@@ -0,0 +1,59 @@
+diff -Naur makemkv-oss-1.9.10.orig/libabi/src/httplinux.cpp makemkv-oss-1.9.10/libabi/src/httplinux.cpp
+--- makemkv-oss-1.9.10.orig/libabi/src/httplinux.cpp	2016-04-15 21:35:36.000000000 +0100
++++ makemkv-oss-1.9.10/libabi/src/httplinux.cpp	2016-05-08 10:52:42.481501963 +0100
+@@ -45,7 +45,7 @@
+     lurl = (char*)alloca(strlen(Url)+1);
+     strcpy(lurl,Url);
+ 
+-    strcpy(argv0,"/usr/bin/wget"); argv[0]=argv0;
++    strcpy(argv0,"wget"); argv[0]=argv0;
+     strcpy(argv1,"-q"); argv[1]=argv1;
+     strcpy(argv2,"-O"); argv[2]=argv2;
+     strcpy(argv3,"-"); argv[3]=argv3;
+diff -Naur makemkv-oss-1.9.10.orig/makemkvgui/src/api_posix.cpp makemkv-oss-1.9.10/makemkvgui/src/api_posix.cpp
+--- makemkv-oss-1.9.10.orig/makemkvgui/src/api_posix.cpp	2016-04-15 21:35:36.000000000 +0100
++++ makemkv-oss-1.9.10/makemkvgui/src/api_posix.cpp	2016-05-08 13:51:48.761885862 +0100
+@@ -54,8 +54,6 @@
+ 
+     if (AppName[0]==':')
+     {
+-        bool app_found = false;
+-        const char* const* app_locations = ApGetAppLocations();
+         const char* p_env = getenv("MAKEMKVCON");
+ 
+         AppName++;
+@@ -63,6 +61,13 @@
+         if (p_env!=NULL)
+         {
+             strcpy(app_path,p_env);
++        } else {
++            strcpy(app_path,AppName);
++        }
++    } else {
++        strcpy(app_path,AppName);
++    }
++/*
+             app_found = true;
+         } else {
+             for (size_t i=0;app_locations[i]!=NULL;i++)
+@@ -105,7 +110,7 @@
+         }
+         strcpy(p,AppName);
+     }
+-
++*/
+     strcpy(str_guiserver,"guiserver");
+     strcpy(str_apver,verstr);
+ 
+diff -Naur makemkv-oss-1.9.10.orig/makemkvgui/src/spawn_posix.cpp makemkv-oss-1.9.10/makemkvgui/src/spawn_posix.cpp
+--- makemkv-oss-1.9.10.orig/makemkvgui/src/spawn_posix.cpp	2016-04-15 21:35:36.000000000 +0100
++++ makemkv-oss-1.9.10/makemkvgui/src/spawn_posix.cpp	2016-05-08 10:52:37.137598384 +0100
+@@ -70,7 +70,7 @@
+         }
+     }
+ 
+-    err = posix_spawn(&pid,argv[0],&spawn_actions,&spawn_attr,argv,envp);
++    err = posix_spawnp(&pid,argv[0],&spawn_actions,&spawn_attr,argv,envp);
+ 
+     posix_spawn_file_actions_destroy(&spawn_actions);
+     posix_spawnattr_destroy(&spawn_attr);
diff --git a/media-video/makemkv/files/makemkv-wget.patch b/media-video/makemkv/files/makemkv-wget.patch
new file mode 100644
index 000000000000..01398469ae6d
--- /dev/null
+++ b/media-video/makemkv/files/makemkv-wget.patch
@@ -0,0 +1,29 @@
+https://www.makemkv.com/forum2/viewtopic.php?f=3&t=15885
+
+diff -Naur a/libabi/src/httplinux.cpp b/libabi/src/httplinux.cpp
+--- a/libabi/src/httplinux.cpp	2017-03-26 16:33:04.000000000 +0100
++++ b/libabi/src/httplinux.cpp	2017-03-26 20:31:04.630357491 +0100
+@@ -29,8 +29,8 @@
+ int HTTP_Download(const char* Url,const char* Agent,void* Buffer,uint32_t* Size)
+ {
+     int     pipe_fd[2],err;
+-    char*   argv[10];
+-    char    argv0[16],argv1[4],argv2[4],argv3[4],argv4[4],argv5[4],argv6[4];
++    char*   argv[12];
++    char    argv0[16],argv1[4],argv2[4],argv3[4],argv4[4],argv5[4],argv6[4],argv8[4],argv9[16];
+     char    *lagent,*lurl;
+     ssize_t rd;
+ 
+@@ -53,8 +53,10 @@
+     strcpy(argv5,"20"); argv[5]=argv5;
+     strcpy(argv6,"-U"); argv[6]=argv6;
+     argv[7]=lagent;
+-    argv[8]=lurl;
+-    argv[9]=NULL;
++    strcpy(argv8,"-o"); argv[8]=argv8;
++    strcpy(argv9,"/dev/null"); argv[9]=argv9;
++    argv[10]=lurl;
++    argv[11]=NULL;
+ 
+     err = SYS_posix_launch(argv,0,pipe_fd[1],0,SYS_posix_envp());
+ 
diff --git a/media-video/makemkv/makemkv-1.10.7.ebuild b/media-video/makemkv/makemkv-1.10.7.ebuild
new file mode 100644
index 000000000000..f01bbdb662fc
--- /dev/null
+++ b/media-video/makemkv/makemkv-1.10.7.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils flag-o-matic
+
+MY_P=makemkv-oss-${PV}
+MY_PB=makemkv-bin-${PV}
+
+DESCRIPTION="Tool for ripping and streaming Blu-ray, HD-DVD and DVD discs"
+HOMEPAGE="http://www.makemkv.com/"
+SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
+	http://www.makemkv.com/download/${MY_PB}.tar.gz"
+
+LICENSE="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="libav multilib qt4 qt5"
+
+QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
+
+DEPEND="
+	sys-libs/glibc[multilib?]
+	dev-libs/expat
+	dev-libs/openssl:0[-bindist(-)]
+	sys-libs/zlib
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	!qt5? ( qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4
+	) )
+	!libav? ( >=media-video/ffmpeg-1.0.0:0= )
+	libav? ( >=media-video/libav-0.8.9:0= )
+"
+RDEPEND="${DEPEND}
+	net-misc/wget"
+
+S="${WORKDIR}/makemkv-oss-${PV}"
+PATCHES=( "${FILESDIR}"/${PN}-{wget,path}.patch )
+
+src_configure() {
+	# See bug #439380.
+	replace-flags -O* -Os
+
+	local econf_args=()
+
+	if use qt5 || use qt4; then
+		econf_args+=( --enable-gui )
+	else
+		econf_args+=( --disable-gui )
+	fi
+
+	econf \
+		--enable-debug \
+		--disable-noec \
+		$(use_enable qt5) \
+		$(use_enable qt4) \
+		"${econf_args[@]}"
+}
+
+src_install() {
+	default
+
+	# add missing symlinks for QA
+	dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so.0.${PV}
+	dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so
+	dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so.1.${PV}
+	dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so
+	dosym libmmbd.so.0    /usr/$(get_libdir)/libmmbd.so
+	dosym libmmbd.so.0    /usr/$(get_libdir)/libmmbd.so.0.${PV}
+
+	cd "${WORKDIR}"/${MY_PB} || die
+
+	# install prebuilt bins
+	if use x86; then
+		dobin bin/i386/{makemkvcon,mmdtsdec}
+	elif use amd64; then
+		dobin bin/amd64/makemkvcon
+		use multilib && dobin bin/i386/mmdtsdec
+	fi
+
+	# install profiles and locales
+	insinto /usr/share/MakeMKV
+	doins src/share/*.{mo.gz,xml}
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	elog "While MakeMKV is in beta mode, upstream has provided a license"
+	elog "to use if you do not want to purchase one."
+	elog ""
+	elog "See this forum thread for more information, including the key:"
+	elog "http://www.makemkv.com/forum2/viewtopic.php?f=5&t=1053"
+	elog ""
+	elog "Note that beta license may have an expiration date and you will"
+	elog "need to check for newer licenses/releases. "
+	elog ""
+	elog "We previously said to copy default.mmcp.xml to ~/.MakeMKV/. This"
+	elog "is no longer necessary and you should delete it from there to"
+	elog "avoid warning messages."
+	elog ""
+	elog "MakeMKV can also act as a drop-in replacement for libaacs and"
+	elog "libbdplus, allowing transparent decryption of a wider range of"
+	elog "titles under players like VLC and mplayer. To enable this, set"
+	elog "the following variables when launching the player:"
+	elog "LIBAACS_PATH=libmmbd LIBBDPLUS_PATH=libmmbd"
+}
+
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/media-video/makemkv/metadata.xml b/media-video/makemkv/metadata.xml
new file mode 100644
index 000000000000..b650d107cd5b
--- /dev/null
+++ b/media-video/makemkv/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
+	</maintainer>
+	<longdescription>
+      MakeMKV is your one-click solution to convert video that you own
+      into free and patents-unencumbered format that can be played
+      everywhere. MakeMKV is a format converter, otherwise called
+      transcoder. It converts the video clips from proprietary (and
+      usually encrypted) disc into a set of MKV files, preserving most
+      information but not changing it in any way. The MKV format can
+      store multiple video/audio tracks with all meta-information and
+      preserve chapters. There are many players that can play MKV
+      files nearly on all platforms, and there are tools to convert
+      MKV files to many formats, including DVD and Blu-ray discs.
+
+      Additionally MakeMKV can instantly stream decrypted video
+      without intermediate conversion to wide range of players, so you
+      may watch Blu-ray and DVD discs with your favorite player on
+      your favorite OS or on your favorite device.
+</longdescription>
+</pkgmetadata>
diff --git a/media-video/matroxset/Manifest b/media-video/matroxset/Manifest
new file mode 100644
index 000000000000..9891f7e45c5f
--- /dev/null
+++ b/media-video/matroxset/Manifest
@@ -0,0 +1,5 @@
+DIST matroxset-0.4.tar.gz 24996 SHA256 7f160b45cd945be10c5cea31a423143ac3be94b0ddf9c3e8edf6f5e5d0199003 SHA512 e313c266331e247fdb790f1fefe58ceeabea5c4dc665f70a53f9318eecda590161b85e1d8804b1d2e14c761afbf58efb719164741cb4a6298de953a62c56da74 WHIRLPOOL 16adc4fca023c03fd4137db8fd8559d2482f11519c8d85aa8c78c39ce1dcacb7dbf34a2567b0026775fca6750e4aa7a76217e113296e4aac5ac57caeee32f61d
+EBUILD matroxset-0.4.ebuild 926 SHA256 d965dab839d66577148ecbdb142932d40055942f694676fbc2a0d6d1d7f9bf1d SHA512 48a81ab1f73b0599ace36b9dc7ac374d641daf393efa7d5ee9dececcb67ab2526e69bdd116788fd1ac21ac412b0cdd939ec8e48c927a914132a4888b3fe4ff1c WHIRLPOOL 017fba5ec69fcb59ed5940c26eaf074c611c45e7413d233e33285d4ec5a0163c45e63524e99801af76fbe9ecc0e75094d80d1af7dd5e346ee7825e1ed196fce7
+MISC ChangeLog 2432 SHA256 bc0bb9266fee88d944a6c5d820e6f01618910a8505f9ac07f1ac7ec9556eb823 SHA512 b48415ea51b069204d2b17adf44743614394b3155923b192c5d896bd4f8b67a09b27672043cba3b65dcfcbf8c47544737fdda6bf18f38a9b1fc72bd32248a217 WHIRLPOOL 96f4681c587b21c7a320480a64a081b9bafc9a9c2d9fd7eb0e2dac5dd68900b6abd426f93266f45ceb7f1749a4416a0a6c58c14969d6d95f166f49bc40ae3f37
+MISC ChangeLog-2015 1991 SHA256 08674a0b9a5c8f19783b807224a48f5329bc0e40a06b52c49e81d291f47d43b1 SHA512 fe0da5f93df700840adb950cab38cbeb3fcdc99799cdbd80bc240287999bb092f24fa4e10cbeba9f4d1ceb28c1f23c6269feedb5a71122d5ee129c0cb0a93615 WHIRLPOOL 485a92908c41ff61d064b59050b882e894cbcd43fe69b1bdbfc0a0a390b6e41afd130ef88fb8b35f491d5adc28c8ee30bab6b5f69300e04afa8fc71aae724d59
+MISC metadata.xml 265 SHA256 af762c7a8168344360ead6370cc84d18bbaf60ffc800ddbab0b8a0e406e4690c SHA512 7af3db1dc60ec583ef99a62d5649624c2ef01efa64cee6ee916b6042cbf8d0edb5a0a9a6a1baa047940d5d17dc10f00e9675ae613bf114d33507c3204aceeab2 WHIRLPOOL 21b8705d481cca346eacba3ca01f966b2952b18ab05bc9b4af61b942b5062c9bac2181678a24404e9eec6ba16c70693a899adf2ad88f8e14816f33356eb78dc8
diff --git a/media-video/matroxset/matroxset-0.4.ebuild b/media-video/matroxset/matroxset-0.4.ebuild
new file mode 100644
index 000000000000..cd27fbb824d1
--- /dev/null
+++ b/media-video/matroxset/matroxset-0.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit toolchain-funcs
+
+IUSE=""
+
+DESCRIPTION="Matrox utility to switch output modes (activate tvout)"
+HOMEPAGE="ftp://platan.vc.cvut.cz/pub/linux/matrox-latest/"
+SRC_URI="ftp://platan.vc.cvut.cz/pub/linux/matrox-latest/${P}.tar.gz"
+
+DEPEND="sys-libs/ncurses"
+RDEPEND="${DEPEND}"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc x86"
+
+doecho() {
+	echo "$@"
+	"$@"
+}
+
+src_compile() {
+	doecho $(tc-getCC) -o ${PN} \
+		${CFLAGS} ${LDFLAGS} \
+		${PN}.c -lncurses \
+		|| die "build failed"
+
+	#prepare small README
+	cat >> "${S}"/README << _EOF_
+This utility has been created by Petr Vandrovec
+
+Not much info here, but here are some pointers
+http://davedina.apestaart.org/download/doc/Matrox-TVOUT-HOWTO-0.1.txt
+http://www.netnode.de/howto/matrox-fb.html
+_EOF_
+}
+
+src_install() {
+	dobin matroxset || die
+
+	dodoc README || die
+}
diff --git a/media-video/matroxset/metadata.xml b/media-video/matroxset/metadata.xml
new file mode 100644
index 000000000000..093834a431a4
--- /dev/null
+++ b/media-video/matroxset/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>media-video@gentoo.org</email>
+    <name>Gentoo Video project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/media-video/maven-poke/Manifest b/media-video/maven-poke/Manifest
new file mode 100644
index 000000000000..d0c4b5227701
--- /dev/null
+++ b/media-video/maven-poke/Manifest
@@ -0,0 +1,5 @@
+DIST maven-poke-0.0.1.tgz 12974 SHA256 352c04766d023924bf73cc41841869b8b3ff38bd5759b1f2370d1537bb73caeb SHA512 e463062d004078b9180d8f5a652a22b029a364189809f739e70237dcf6f96f9e73840e706c082f9d4f1df7f3ec68396f8cf378535cdfef37ca1cc402c3f8a6d8 WHIRLPOOL e57a2026e8f78577450c78d89836365ce36691d60e613d3d04a484693236ed5c5a6ec0842ab7e3f4774ecafc9d8ae8ccc124e1c7d49ffa08312ec5a481808ad5
+EBUILD maven-poke-0.0.1.ebuild 886 SHA256 c87d25ec56e649add479e79010e194d50f96bcec1b4cb647213ef5ca47d9a50b SHA512 c5eaf5faf05bd3c79d4854bfcc8f66bbb242ff2baeb8412ad6e5cb063448a123bedfe5d8e41d719e25f5119b372591ac23225a8d0e81736ba5f320911d7bd849 WHIRLPOOL 4bcd5169c9cab7a5b2a71f363b4e1c40c5996a3dae57d67d4df988cbfb91ff1ac17392342608ab1b0023aade70386d4ae0d8557678b5521fb112b0e89ccb6f6c
+MISC ChangeLog 2439 SHA256 eee756aa4f682240c5d89eeb14f9280005a4b3ede85c465cdd8de2011ed87934 SHA512 ce93d9c8da9967a217e53d2b8e16158ae00e291bbdeab319ae8b6170fb54ac6ef52a2be1daba0b3c9569e0d231be1221d86d0fd2484c7e4bd32d988ccd504b15 WHIRLPOOL ca1b142dfcb1d9ba4a2372203f375bfd56af85501694b13e208c240d4a9337bb4c1c455aca799d14d2f1197849ca42c90534ae5da3a42d95a7af62db0d9acd8c
+MISC ChangeLog-2015 898 SHA256 9ead1ecf5fb5fcdb54f38c843bb3d116be2111687d122680b4c9d4dc311b1515 SHA512 4d84da2a66bf8fe3df593c477cf6bf8a22ae257d5885765219079d43420152f8466e3b318801a1c41446007941c6ff16c11975783fdefbd90ba5b6d0e24f3c03 WHIRLPOOL 436cf19550112370afa2a5a6a232afd5bb3b3b785c72efa4884d24d2c02bae50f8d49a4a6b38ae629c0221c45be27fc36de1ae1a17e14308382a5bb8575784f9
+MISC metadata.xml 265 SHA256 af762c7a8168344360ead6370cc84d18bbaf60ffc800ddbab0b8a0e406e4690c SHA512 7af3db1dc60ec583ef99a62d5649624c2ef01efa64cee6ee916b6042cbf8d0edb5a0a9a6a1baa047940d5d17dc10f00e9675ae613bf114d33507c3204aceeab2 WHIRLPOOL 21b8705d481cca346eacba3ca01f966b2952b18ab05bc9b4af61b942b5062c9bac2181678a24404e9eec6ba16c70693a899adf2ad88f8e14816f33356eb78dc8
diff --git a/media-video/maven-poke/maven-poke-0.0.1.ebuild b/media-video/maven-poke/maven-poke-0.0.1.ebuild
new file mode 100644
index 000000000000..506a45f701ba
--- /dev/null
+++ b/media-video/maven-poke/maven-poke-0.0.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Matrox utility to read and set maven registers (tune tvout)"
+HOMEPAGE="ftp://platan.vc.cvut.cz/pub/linux/matrox-latest/"
+SRC_URI="ftp://platan.vc.cvut.cz/pub/linux/matrox-latest/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+IUSE=""
+
+src_compile() {
+	emake all || die
+
+	#prepare small README
+	cat >> "${S}"/README << _EOF_
+This utility has been created by Petr Vandrovec.
+It was formerly called maven-prog (and the executable was matrox).
+
+A listing of maven registers
+http://platan.vc.cvut.cz/~vana/maven/mavenreg.html
+
+Not much info here, but here are some pointers
+http://davedina.apestaart.org/download/doc/Matrox-TVOUT-HOWTO-0.1.txt
+http://www.netnode.de/howto/matrox-fb.html
+_EOF_
+}
+
+src_install() {
+	newbin matrox maven-poke || die
+	dodoc README
+}
diff --git a/media-video/maven-poke/metadata.xml b/media-video/maven-poke/metadata.xml
new file mode 100644
index 000000000000..093834a431a4
--- /dev/null
+++ b/media-video/maven-poke/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>media-video@gentoo.org</email>
+    <name>Gentoo Video project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/media-video/mediainfo/Manifest b/media-video/mediainfo/Manifest
new file mode 100644
index 000000000000..28d5a9e17c74
--- /dev/null
+++ b/media-video/mediainfo/Manifest
@@ -0,0 +1,7 @@
+DIST mediainfo_0.7.98.tar.xz 1317952 SHA256 f1e32acc44063549b67e0584115a785e48b2a318a9011634affdd9c2cf04d9f6 SHA512 455ea7c51bf572c6ea389f2b8d82f5f5f6afcbf649bef6433293b970318e4ab58447e47c33c234cc0f8051efb7501c36637940c2df92c010a0a74c5f28fc3133 WHIRLPOOL 6c35c4e58124fb38003901c6f9c3ad1b0c524f9050284f232cde308fc16be45f59a28f3ae5add05348eca7db1ce60c2eea86c456d36227976556dcb5b4eb4fe0
+DIST mediainfo_0.7.99.tar.xz 1327592 SHA256 ca308d3fd1ded0baad62be2388f65c98949ab9111589b5561c8f0f9c3537ed88 SHA512 7e50d0757c18e0eb07955a440250ca40fb5ee28dd4565528f8797f842611955942a4a6ff5b3c8736d4e24fe503272b2cd93de55187b2c3bca2c99021fe0330fa WHIRLPOOL 0ac9d9042a5382ae9b3a98879e407013fa593bfc01559834ace61f5b1b9aabde54b31f62a407c01956541cc71e46d879b0fcf57fedd2f5cb46fb7812b0cb5a9f
+EBUILD mediainfo-0.7.98.ebuild 1548 SHA256 af3c49e2bd17a41a7bd3cf846108743f22089b26fd23ecdabbb60ca59c2725d4 SHA512 15448d71392248d998cc6253f3bc0af8e704a990acdbc719846f6178546ae438eefaac66cf92b28cbf592020321bd86b99e95fbe4fb38fdc9c69ce695d319f21 WHIRLPOOL f1dcb041dca43531a2a6df80d1aa689a2f49100cb512cca69d92b15b38e5e727f8a4e4a0e3e6ae960d17d2ca9b60b775559ec433fa97ff95358d6af9d38da471
+EBUILD mediainfo-0.7.99.ebuild 1550 SHA256 9808db6e406855992cbe89c876adbbf2266b86473a3e05ba185af55b42a886ef SHA512 5eca56eedaecb066a123cb042b9ee4c53cc3ba629bc498e9bfb8dcfd519672b680766fc82af8d2fced59deed4a6fb7002322cfd565d790ba620a2782cc3af162 WHIRLPOOL 569aa28882246d4541275cb3272ccc937c893a84b10492234e35011124a453c2bd80612404b7ea902c818492303abc11d7e61d0d2f453b6cb67f7e014176f898
+MISC ChangeLog 5320 SHA256 84bea5b5194a485f443149dea94bb59fccabb1112cc2d829090421a2294d1084 SHA512 58db1a1c6949b86ebb7a226adf66fa853ae90f752bdcf41f5cf184e3e18e9e378fd8c67736cb78c7306add760f0c12e0cf27d02e5ce98e8d6e531e0486bf5c25 WHIRLPOOL d26a51fb5f7f31a227796808bc4a6e31a1f98bde0780d2b83caaad2236cb6fbcb033c95dbd6aca642018850f688e6ea78a28c0654eb7cdb174b2feff320eecce
+MISC ChangeLog-2015 11146 SHA256 6c2b5ed60b828ed8cf45d91cc15fbec9b2509684cc429232444b3121351a2f6f SHA512 8d714aee56ec7c89c4d1ae2c357d2bf9268c22adb63f36b35ee6f7e78bb945d6831532710662e29e15b7e9aea062860f3ea616be7c18746ab4e8d5d4ca804f54 WHIRLPOOL 1377b0762947b48217bd0461e2bb5816f4db81769a02cad4f6c1616b6dd4aa11f81a89c02687b3fff6838d4154676c52839a9701a408c662252a4528ab8a759a
+MISC metadata.xml 343 SHA256 b8b4a87c95842408a4d73eaf5b592d569a99ea6ba3cee8999072cc66cc17e017 SHA512 3647e319de82c1521bd1e6a28dc7a64435b052130102d7a4b6f1478d92cfc94a164b7d9435855b4929d584be2f886f6bc51c84f6cb63b8431ac028583d57f0a3 WHIRLPOOL 5c9ecc6ea491b57153de00a64d3238be4e2b82fb020b883d4529ee04d1807bc37be2572d306716e933f433f504a5dd9d773586993cebc1234a67a3f7e31067b2
diff --git a/media-video/mediainfo/mediainfo-0.7.98.ebuild b/media-video/mediainfo/mediainfo-0.7.98.ebuild
new file mode 100644
index 000000000000..962164535c14
--- /dev/null
+++ b/media-video/mediainfo/mediainfo-0.7.98.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER="3.0"
+
+inherit eutils autotools wxwidgets
+
+DESCRIPTION="MediaInfo supplies technical and tag information about media files"
+HOMEPAGE="https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfo"
+SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="curl mms wxwidgets"
+
+RDEPEND="sys-libs/zlib
+	>=media-libs/libzen-0.4.34
+	~media-libs/lib${P}[curl=,mms=]
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/MediaInfo
+
+pkg_setup() {
+	TARGETS="CLI"
+	use wxwidgets && TARGETS+=" GUI"
+}
+
+src_prepare() {
+	eapply_user
+
+	local target
+	for target in ${TARGETS}; do
+		cd "${S}"/Project/GNU/${target}
+		sed -i -e "s:-O2::" configure.ac
+		eautoreconf
+	done
+}
+
+src_configure() {
+	local target
+	for target in ${TARGETS}; do
+		cd "${S}"/Project/GNU/${target}
+		local args=""
+		[[ ${target} == "GUI" ]] && args="--with-wxwidgets --with-wx-gui"
+		econf ${args}
+	done
+}
+
+src_compile() {
+	local target
+	for target in ${TARGETS}; do
+		cd "${S}"/Project/GNU/${target}
+		default
+	done
+}
+src_install() {
+	local target
+	for target in ${TARGETS}; do
+		cd "${S}"/Project/GNU/${target}
+		default
+		dodoc "${S}"/History_${target}.txt
+		if [[ ${target} == "GUI" ]]; then
+			newicon "${S}"/Source/Resource/Image/MediaInfo.png ${PN}.png
+			make_desktop_entry ${PN}-gui MediaInfo ${PN} "AudioVideo;GTK"
+		fi
+	done
+}
diff --git a/media-video/mediainfo/mediainfo-0.7.99.ebuild b/media-video/mediainfo/mediainfo-0.7.99.ebuild
new file mode 100644
index 000000000000..f3350adbb933
--- /dev/null
+++ b/media-video/mediainfo/mediainfo-0.7.99.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER="3.0"
+
+inherit eutils autotools wxwidgets
+
+DESCRIPTION="MediaInfo supplies technical and tag information about media files"
+HOMEPAGE="https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfo"
+SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl mms wxwidgets"
+
+RDEPEND="sys-libs/zlib
+	>=media-libs/libzen-0.4.37
+	~media-libs/lib${P}[curl=,mms=]
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/MediaInfo
+
+pkg_setup() {
+	TARGETS="CLI"
+	use wxwidgets && TARGETS+=" GUI"
+}
+
+src_prepare() {
+	eapply_user
+
+	local target
+	for target in ${TARGETS}; do
+		cd "${S}"/Project/GNU/${target}
+		sed -i -e "s:-O2::" configure.ac
+		eautoreconf
+	done
+}
+
+src_configure() {
+	local target
+	for target in ${TARGETS}; do
+		cd "${S}"/Project/GNU/${target}
+		local args=""
+		[[ ${target} == "GUI" ]] && args="--with-wxwidgets --with-wx-gui"
+		econf ${args}
+	done
+}
+
+src_compile() {
+	local target
+	for target in ${TARGETS}; do
+		cd "${S}"/Project/GNU/${target}
+		default
+	done
+}
+src_install() {
+	local target
+	for target in ${TARGETS}; do
+		cd "${S}"/Project/GNU/${target}
+		default
+		dodoc "${S}"/History_${target}.txt
+		if [[ ${target} == "GUI" ]]; then
+			newicon "${S}"/Source/Resource/Image/MediaInfo.png ${PN}.png
+			make_desktop_entry ${PN}-gui MediaInfo ${PN} "AudioVideo;GTK"
+		fi
+	done
+}
diff --git a/media-video/mediainfo/metadata.xml b/media-video/mediainfo/metadata.xml
new file mode 100644
index 000000000000..6cf6ecf476e4
--- /dev/null
+++ b/media-video/mediainfo/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">MediaArea/MediaInfo</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/metadata.xml b/media-video/metadata.xml
new file mode 100644
index 000000000000..21e3aff12af5
--- /dev/null
+++ b/media-video/metadata.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The media-video category contains video-related applications.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie media-video enthält Applikationen rund um das Thema Video.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría media-video contiene aplicaciones para video.
+	</longdescription>
+	<longdescription lang="ja">
+		media-videoカテゴリーにはビデオ関連のアプリケーションが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De media-video categorie bevat video-applicaties.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm media-video chứa các ứng dụng liên quan đến phim ảnh.
+	</longdescription>
+	<longdescription lang="sk">
+		Kategória media-video obsahuje aplikácie pre prácu s videomateriálom.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria media-video contiene applicazioni video.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria media-video contém aplicações de vídeo.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria media-video zawiera pakiety związane z odtwarzaniem i
+		przetwarzaniem filmów.
+	</longdescription>
+</catmetadata>
+
diff --git a/media-video/minitube/Manifest b/media-video/minitube/Manifest
new file mode 100644
index 000000000000..2017a1462d3b
--- /dev/null
+++ b/media-video/minitube/Manifest
@@ -0,0 +1,6 @@
+AUX minitube-2.5.1-disable-updates.patch 205 SHA256 0e9d70bc88017bf1c71b9467371d99223c56a88ce94eb2fe7597d4f41201b809 SHA512 9b257652feea431d6ee115fab3ba89f07fd85163290782610b504fa7d556d03a547554d1ede10edd670b98b4b0f042d67cbf546bfcc6e07a8028de42a58b3384 WHIRLPOOL 29fd9a3d646e4cded2ab0560521e297407d84f55fcadb3458ba399e9a61299471bb940ef2c37c0a3e9f8de71615d84e2db9da81f9fcbb1beaacece4848af20b5
+DIST minitube-2.5.2.tar.gz 1063794 SHA256 63678bf153e77e8cdaf6b43bb9a7bf2c5694c62698c3236f1a1133494362d6b5 SHA512 4001ea95e6d3b541e9a8a2555830238f6e3a0b4749566dfd67ae48fdc6102ec77a38e162e04fb2637cc5ff2b3dccdca541119531302332ffa3b90d9db8809284 WHIRLPOOL affb33b2a2b1dea771452c33b4167e0e250a4f5869080b6c4426c372303d62e1f220f62fc64f0d087a75940869042712678a523224cf250247de2bbda46b4248
+EBUILD minitube-2.5.2-r1.ebuild 2526 SHA256 cb5429da21ae4d7c07cd12a4c8b7f74a69c4722e1bb0151b928c7d58ffe2534e SHA512 aca169730389b992cf93a196510ada5e9eb9d4b3a8f8db71f0fdc5583fbd82fdccb381d4302c71ac33b710e30e2f2f0646f345d6c6584aba5fcc95e10b6539e5 WHIRLPOOL ffc7f572955e361939b27990b0f241fa889c482ca9e8b7bad1a61db770efd05ef046800d0cfb6e88e143f3b7fbb09406152590bae26cfedfb27f9fea59ec66d3
+MISC ChangeLog 4002 SHA256 f35984e68ea2bcc06bcd8a3cbc59c049bdbc6b35378612c633a696ce404821d8 SHA512 cee7295e9036909d72677065b54ec43cac9d5e4627cbfc66c5ad23abbe3d555809343ddda33c0d1b2fd9fc8d992f8f0c5c7b663671589f908e27d892c02b95c6 WHIRLPOOL 21c35f1c331ba6182d0d315c3ca2d60b51f85b48e825b19b444addb7cc5467a8e1220f0cf5176209ef1dde3b54bcefdb4c98517bbb7c2f813608bfb7966b2622
+MISC ChangeLog-2015 15090 SHA256 fe486025ef7a386b82e7d4d5198edeb97195751cfb27ae41d8fc297df6d85ec4 SHA512 b9b23c1c55865b57b7acb3c74ff00d33fb66fd092e31492fcfe023aeb4b8c2d10298683fe1ec6ebd222cb6f6900d91587deea15ef3b4e00ab1fc37bcc4c2658b WHIRLPOOL 5229b29587dc03df29ffdf50e188eeb9f445fe7106eebe8cc9b4e1522d7163e95b4475b9269b24ba2a70a8244a7b03f83280b04de18537c3216e6bc818916e7a
+MISC metadata.xml 546 SHA256 6d2120aea5d7d9ba6d6a13ffb582b93f00cf5c8b697443261040a9da2c772ec8 SHA512 b4b597d562b7cd43306a61e871cc853af153f17acf2e69cdbc148dbb4672648e86e1d4869ae098f91f133aacc6206df6c0f4f9a4d47220c39b39b6746929268b WHIRLPOOL d559d3c712dd4e82903747c776d6608dec38e7c7fba545e0ecde6ed71baddcea6b1893fa4dc37ff686cdaea4c8593a13b54bfa22802cae312858bafdcc925ae8
diff --git a/media-video/minitube/files/minitube-2.5.1-disable-updates.patch b/media-video/minitube/files/minitube-2.5.1-disable-updates.patch
new file mode 100644
index 000000000000..a5f496e92b2d
--- /dev/null
+++ b/media-video/minitube/files/minitube-2.5.1-disable-updates.patch
@@ -0,0 +1,11 @@
+--- minitube-2.5.1.orig/src/mainwindow.cpp
++++ minitube-2.5.1/src/mainwindow.cpp
+@@ -232,8 +232,6 @@
+ 
+     ChannelAggregator::instance()->start();
+ 
+-    checkForUpdate();
+-
+     initialized = true;
+ }
+ 
diff --git a/media-video/minitube/metadata.xml b/media-video/minitube/metadata.xml
new file mode 100644
index 000000000000..bb2aac781b2e
--- /dev/null
+++ b/media-video/minitube/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+	<use>
+		<flag name="download">Enable support for downloading YouTube videos</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">flaviotordini/minitube</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/minitube/minitube-2.5.2-r1.ebuild b/media-video/minitube/minitube-2.5.2-r1.ebuild
new file mode 100644
index 000000000000..3f45b976481e
--- /dev/null
+++ b/media-video/minitube/minitube-2.5.2-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PLOCALES="ar ca ca_ES da de_DE el en es es_AR es_ES fi fi_FI fr he_IL hr hu
+ia it jv nl pl pl_PL pt_BR ro ru sk sl tr zh_CN"
+PLOCALE_BACKUP="en"
+
+inherit l10n qmake-utils
+
+DESCRIPTION="Qt5 YouTube Client"
+HOMEPAGE="http://flavio.tordini.org/minitube"
+SRC_URI="https://github.com/flaviotordini/${PN}/archive/${PV}.tar.gz ->
+${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug download"
+
+DEPEND="dev-qt/qtgui:5[accessibility]
+	dev-qt/qtdbus:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtscript:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtwidgets:5
+	dev-qt/qtsingleapplication[qt5(+),X]
+	media-libs/phonon[qt5(+)]
+"
+RDEPEND="${DEPEND}"
+
+DOCS="AUTHORS CHANGES TODO"
+
+#455976
+PATCHES=( "${FILESDIR}"/${PN}-2.5.1-disable-updates.patch )
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+
+	# Remove unneeded translations
+	local trans=
+	for x in $(l10n_get_locales); do
+		trans+="${x}.ts "
+	done
+	if [[ -n ${trans} ]]; then
+		sed -i -e "/^TRANSLATIONS/s/+=.*/+=${trans}/" locale/locale.pri || die
+	fi
+	sed -i \
+		's|include(src/qtsingleapplication/qtsingleapplication.pri)|CONFIG += qtsingleapplication|g' \
+		${PN}.pro || die "Failed to unbundle qtsingleapplication"
+
+	# Enable video downloads. Bug #491344
+	use download && { echo "DEFINES += APP_DOWNLOADS" >> ${PN}.pro; }
+	echo "DEFINES += APP_GOOGLE_API_KEY=${MINITUBE_GOOGLE_API_KEY}" >> ${PN}.pro
+
+	epatch_user
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+	newicon images/app.png minitube.png
+}
+
+pkg_postinst() {
+	elog ""
+	elog "Since version 2.4, you need to generate a Google API Key to use"
+	elog "with this application. Please head over to"
+	elog "https://console.developers.google.com/ and"
+	elog "https://github.com/flaviotordini/minitube/blob/master/README.md"
+	elog "for more information. Once you have generated your key,"
+	elog "please put it in QSettings key \"googleApiKey\", e.g.:"
+	elog "# echo 'googleApiKey=YourKeyHere' >> \"\${HOME}/.config/Flavio Tordini/Minitube.conf\""
+	elog ""
+
+	if use download; then
+		elog "You activated the 'download' USE flag. This allows you to"
+		elog "download videos from youtube, which might violate the youtube"
+		elog "terms-of-service (TOS) in some legislations. If downloading"
+		elog "youtube-videos is not allowed in your legislation, please"
+		elog "disable the 'download' use flag. For details on the youtube TOS,"
+		elog "see http://www.youtube.com/t/terms"
+	fi
+}
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
new file mode 100644
index 000000000000..4985996e08dd
--- /dev/null
+++ b/media-video/mjpegtools/Manifest
@@ -0,0 +1,8 @@
+AUX mjpegtools-2.1.0-no_format.patch 2800 SHA256 52e16f3fbc8181fb6da424c422dad2add38127f6dc570810fa7fd3efc1b8d4fd SHA512 234c02625898f67994261e00ca940bbd597c60d2060507ee1e7391ea61353e00906325aec608d2ba545a7b4725d1ad645bd9d2cd33d23669490de3646998005b WHIRLPOOL 1f68e2961eb95796190ee490ffca8a1df3c76c4e96b8bc84511baf0b755d4fdbcf6728fb86b209733da7e4723166db3911f0928e8183640f2e7b13b86f2bc649
+AUX mjpegtools-2.1.0-pic.patch 2282 SHA256 1b8c08c993d01838b6fe04094c00fd07220ae543c8f115c79ffaae32edc8c5c2 SHA512 3ad9d0b488a4fcc29fab8c0cc8322d99e63c755234c02a7fe7ad7efa974f67871460f43db05ca8097c358fdf7aafcc852967959a2abc83460c258aa38a448e28 WHIRLPOOL 6986af27769fa540706e7dd575b6d42f9a5c5e817929db2c08de2842d32c9cb361f97ecadc0b00bb37563a0be12727e4e4c6719b2dacfe3a684949589314c05a
+AUX mjpegtools-2.1.0-sdl-cflags.patch 387 SHA256 fcba002f1f12f1fd864179f2c9971acab1bf298d9a719f74ceacc231e7232a99 SHA512 67b43ab22d1358755a6e109b8eaf21b14058c6a4f4dc511e27162c4205274eacbe4fb9016a5c8a3938ca071f6d4f1898801ed3ab0571b011aab170771a1b7602 WHIRLPOOL 1eb9815a12d425acc8345a825258f7e71c2e362e79cf064484edc4dfdd67164f4935c1b9de44f8460e791340e315fd9a40127d1899a45a81b74c6a7a880e24c8
+DIST mjpegtools-2.1.0.tar.gz 1844336 SHA256 864f143d7686377f8ab94d91283c696ebd906bf256b2eacc7e9fb4dddcedc407 SHA512 10d3288f47d7cc4de87fa63f65e0fd4bd0a9af95db77155eecccecae7a7e60ebab83eaec44cf7a2c3d9e627f0cc086eda208abee1a7a74cbf3f85e87bb979ac5 WHIRLPOOL e2e869a328e95dab22331ea1f03a669553ee01682a8e76d27d33da8b1cda46e042d252ff2b1974d08b2109ab1a664f4d5247ee92d7846876d496c7e63b472af9
+EBUILD mjpegtools-2.1.0-r2.ebuild 3009 SHA256 b93536eecf62616a7ef023d383d42365cb1c420b77009600b1b425d1eff24f2d SHA512 48572d402737cf8c045abccc31b0641224f7a776380246687187463b6daa4a0a62279b7a2c0d4f39ddd0fb2cb81ad864c2bfc0fb9d8c8c02aef166b5ce593e83 WHIRLPOOL 4e8518dc7cd252ecf44b4e0791ca940aa6042851adefc721b02aea615798553e04e61b0d41905475bcc03f764d118b28824295e19ae342534061caf3ccdc456e
+MISC ChangeLog 2567 SHA256 3a2a4fd539baa9598d93130545c3b9372c3be8b286a23683cbeee50ffe498813 SHA512 a328dd96c408a13a4c7c2a00db5a351d308ee68dffdba40152008137111b4af62a8d0b15a4ee1436548384893c71fe259e2e6c65c397a40c0f2a11f85cdfc4fa WHIRLPOOL bc1f96c9035be540409c1a6287f684333e3bba42ef53e29ba15aa9984479393089ca249fa354e69ed5cf7a436d29117eb8fc7b9147af828e61a10f9a66108955
+MISC ChangeLog-2015 38180 SHA256 441b93a970eba4d2bddfd53f7ffcc86b6aedd089dc151a5ebe681ae531e11949 SHA512 bfdd9db2501f604ec3d3cb82501d3a2e7baa766bb35a9130bfd68269371d227b9f8f9bfa248d27d8e6d237540fca0a08f42f6f3657d4b1aae1e1cd629e3d7398 WHIRLPOOL 56568ec9dd36575cd6092cb464c8638c7b7673c9d6bb55815037aca49033bd9b2ba5c77d8b6c6ec7c2524012d50dca2c2186a81c179706ae28c1edaaf86dc21c
+MISC metadata.xml 537 SHA256 6c1d8efef49e1c977cabf6587b8bdfc3fa758948e415d35cffe4d9f9c4f14c4b SHA512 f3360892e77c064d2062bb963b91f031587ebed6a31b8ba2c698d969cf88998daec9ef910689f477e36921df60d2aa8bdfbe569dda701b0e375d75acfd31d79d WHIRLPOOL 8643f100211c703ac6ec479d98d0d8dcfeffc6a33e1902f0f54137f994cd55783a8cbe862ec51c7c8ec339266e45c317db11957b18b6289e9a194bda6e73174a
diff --git a/media-video/mjpegtools/files/mjpegtools-2.1.0-no_format.patch b/media-video/mjpegtools/files/mjpegtools-2.1.0-no_format.patch
new file mode 100644
index 000000000000..20ed99628fb6
--- /dev/null
+++ b/media-video/mjpegtools/files/mjpegtools-2.1.0-no_format.patch
@@ -0,0 +1,70 @@
+--- ./lavtools/lav_io.c.orig	2014-07-27 17:48:21.474622974 +0100
++++ ./lavtools/lav_io.c	2014-07-27 17:48:48.838881166 +0100
+@@ -926,7 +926,7 @@ lav_file_t *lav_open_input_file(char *fi
+             strcat(errmsg, ", quicktime");
+ #endif
+ 	    strcat(errmsg, ").\n");
+-            fprintf(stderr, errmsg);
++        fprintf(stderr, "%s", errmsg);
+ 	    free(lav_fd);
+ 	    internal_error = ERROR_FORMAT; /* Format not recognized */
+ 	    return 0;
+--- ./lavtools/lavtrans.c.orig	2014-07-27 17:58:09.410282056 +0100
++++ ./lavtools/lavtrans.c	2014-07-27 17:59:24.769016140 +0100
+@@ -275,7 +275,7 @@ int main(int argc, char ** argv)
+    if (process_image_frame != -1)
+    {
+       nv = el_get_video_frame(vbuff, process_image_frame, &el);
+-      sprintf(imgfname,outfile);
++      sprintf(imgfname, "%s", outfile);
+       imgfd = fopen(imgfname,"wb");
+       if (imgfd==0) system_error("opening image file","fopen");
+       res = fwrite(vbuff,nv,1,imgfd);
+--- ./lavtools/jpeg2yuv.c.orig	2014-07-27 18:00:55.600900476 +0100
++++ ./lavtools/jpeg2yuv.c	2014-07-27 18:01:36.848301893 +0100
+@@ -451,7 +451,7 @@ static int generate_YUV4MPEG(parameters_
+            
+            if (firstjpeg) {
+                p = firstjpeg;
+-               sprintf(jpegname, firstjpeg);
++               sprintf(jpegname, "%s", firstjpeg);
+                firstjpeg = NULL;
+            }
+            else {
+--- ./mplex/main.cpp.orig	2014-07-27 18:11:38.282143657 +0100
++++ ./mplex/main.cpp	2014-07-27 18:06:40.352252415 +0100
+@@ -614,7 +614,7 @@ bool CmdLineMultiplexJob::ParseWorkaroun
+                 if( flag_table[flag].longname != 0 )
+                     message += sep;
+             }
+-            mjpeg_error( message.c_str() );
++            mjpeg_error( "%s", message.c_str() );
+             return false;
+         }
+ 
+--- ./yuvfilters/yuvkineco.c.orig	2014-07-27 18:15:01.476097522 +0100
++++ ./yuvfilters/yuvkineco.c	2014-07-27 18:15:29.540366245 +0100
+@@ -48,7 +48,7 @@ buf_debug(char *buf, FILE *fp, const cha
+     } else {
+ #ifdef MJPEGTOOLS
+       buf[n] = '\0';
+-      mjpeg_debug(buf);
++      mjpeg_debug("%s", buf);
+ #else
+       fputs(buf, stderr);
+ #endif
+--- ./yuvfilters/yuvfilters.h.orig	2014-07-27 18:37:02.712645244 +0100
++++ ./yuvfilters/yuvfilters.h	2014-07-27 19:13:28.156101800 +0100
+@@ -34,9 +34,9 @@ extern "C" {
+ 
+ #ifdef MJPEGTOOLS
+ # define perror(MSG) mjpeg_error("%s: %s", MSG, strerror(errno))
+-# define WERROR(MSG) mjpeg_error(MSG)
+-# define WERRORL(MSG) mjpeg_error(MSG)
+-# define WWARN(MSG) mjpeg_warn(MSG)
++# define WERROR(MSG) mjpeg_error("%s", MSG)
++# define WERRORL(MSG) mjpeg_error("%s", MSG)
++# define WWARN(MSG) mjpeg_warn("%s", MSG)
+ #else
+ # define WERROR(MSG) write(2, MSG "\n", sizeof MSG)
+ # define WERRORL(MSG) do { write(2, MSG, strlen(MSG)); write(2, "\n", 1); } while (0)
diff --git a/media-video/mjpegtools/files/mjpegtools-2.1.0-pic.patch b/media-video/mjpegtools/files/mjpegtools-2.1.0-pic.patch
new file mode 100644
index 000000000000..7d0d1b60c017
--- /dev/null
+++ b/media-video/mjpegtools/files/mjpegtools-2.1.0-pic.patch
@@ -0,0 +1,69 @@
+Index: y4mdenoise/Makefile.am
+===================================================================
+RCS file: /cvsroot/mjpeg/mjpeg_play/y4mdenoise/Makefile.am,v
+retrieving revision 1.12
+retrieving revision 1.13
+diff -u -r1.12 -r1.13
+--- y4mdenoise/Makefile.am	1 Apr 2012 08:44:49 -0000	1.12
++++ y4mdenoise/Makefile.am	28 Nov 2013 22:39:41 -0000	1.13
+@@ -4,8 +4,8 @@
+ 
+ EXTRA_DIST = implementation.html
+ 
+-AM_CFLAGS = -DNDEBUG -finline-functions @PROGRAM_NOPIC@
+-AM_CXXFLAGS = -DNDEBUG -finline-functions @PROGRAM_NOPIC@
++AM_CFLAGS = -DNDEBUG -finline-functions
++AM_CXXFLAGS = -DNDEBUG -finline-functions
+ 
+ INCLUDES =  -I$(top_srcdir) -I$(top_srcdir)/utils
+ 
+Index: y4munsharp/Makefile.am
+===================================================================
+RCS file: /cvsroot/mjpeg/mjpeg_play/y4munsharp/Makefile.am,v
+retrieving revision 1.2
+retrieving revision 1.3
+diff -u -r1.2 -r1.3
+--- y4munsharp/Makefile.am	16 Jun 2005 17:09:38 -0000	1.2
++++ y4munsharp/Makefile.am	28 Nov 2013 22:39:41 -0000	1.3
+@@ -4,7 +4,7 @@
+ 
+ INCLUDES = -I $(top_srcdir)/utils -I $(top_srcdir)
+ 
+-y4munharp_CFLAGS=@PROGRAM_NOPIC@
++y4munharp_CFLAGS=
+ 
+ bin_PROGRAMS = y4munsharp
+ 
+Index: y4mutils/Makefile.am
+===================================================================
+RCS file: /cvsroot/mjpeg/mjpeg_play/y4mutils/Makefile.am,v
+retrieving revision 1.7
+retrieving revision 1.8
+diff -u -r1.7 -r1.8
+--- y4mutils/Makefile.am	1 Apr 2012 08:44:49 -0000	1.7
++++ y4mutils/Makefile.am	28 Nov 2013 22:39:41 -0000	1.8
+@@ -2,7 +2,7 @@
+ 
+ MAINTAINERCLEANFILES = Makefile.in
+ 
+-AM_CFLAGS   = @PROGRAM_NOPIC@
++AM_CFLAGS   =
+ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/utils
+ 
+ LIBMJPEGUTILS = $(top_builddir)/utils/libmjpegutils.la
+Index: yuvscaler/Makefile.am
+===================================================================
+RCS file: /cvsroot/mjpeg/mjpeg_play/yuvscaler/Makefile.am,v
+retrieving revision 1.5
+retrieving revision 1.6
+diff -u -r1.5 -r1.6
+--- yuvscaler/Makefile.am	1 Apr 2012 08:44:49 -0000	1.5
++++ yuvscaler/Makefile.am	28 Nov 2013 22:39:41 -0000	1.6
+@@ -18,6 +18,6 @@
+ 
+ EXTRA_DIST = yuvscaler_implementation.txt
+ 
+-yuvscaler_CFLAGS=@PROGRAM_NOPIC@
++yuvscaler_CFLAGS=
+ yuvscaler_SOURCES = yuvscaler.c yuvscaler_resample.c yuvscaler_bicubic.c
+ yuvscaler_LDADD = $(LIBMJPEGUTILS) $(LIBM_LIBS)
diff --git a/media-video/mjpegtools/files/mjpegtools-2.1.0-sdl-cflags.patch b/media-video/mjpegtools/files/mjpegtools-2.1.0-sdl-cflags.patch
new file mode 100644
index 000000000000..3bb7563caaa3
--- /dev/null
+++ b/media-video/mjpegtools/files/mjpegtools-2.1.0-sdl-cflags.patch
@@ -0,0 +1,11 @@
+diff a/y4mutils/Makefile.am b/y4mutils/Makefile.am
+--- a/y4mutils/Makefile.am
++++ b/y4mutils/Makefile.am
+@@ -44,6 +44,7 @@ y4mspatialfilter_LDADD = $(LIBMJPEGUTILS) $(LIBM_LIBS)
+ 
+ y4mhist_SOURCES = y4mhist.c
+ y4mhist_LDADD = $(SDL_LIBS) $(SDLgfx_LIBS) $(LIBMJPEGUTILS)
++y4mhist_CPPFLAGS = $(AM_CPPFLAGS) $(SDL_CFLAGS)
+ 
+ y4mblack_SOURCES = y4mblack.c
+ y4mblack_LDADD = $(LIBMJPEGUTILS)
diff --git a/media-video/mjpegtools/metadata.xml b/media-video/mjpegtools/metadata.xml
new file mode 100644
index 000000000000..484e22f07a72
--- /dev/null
+++ b/media-video/mjpegtools/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>billie@gentoo.org</email>
+		<name>Daniel Pielmeier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+	<use>
+		<flag name="sdlgfx">Enables y4mhist to display a graphical histogram</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">mjpeg</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild b/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild
new file mode 100644
index 000000000000..4c26bb3b89e5
--- /dev/null
+++ b/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="Tools for MJPEG video"
+HOMEPAGE="http://mjpeg.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
+IUSE="dv gtk cpu_flags_x86_mmx png quicktime sdl sdlgfx static-libs"
+REQUIRED_USE="sdlgfx? ( sdl )"
+
+RDEPEND="virtual/jpeg:0=[${MULTILIB_USEDEP}]
+	quicktime? ( >=media-libs/libquicktime-1.2.4-r1[${MULTILIB_USEDEP}] )
+	dv? ( >=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0= )
+	gtk? ( x11-libs/gtk+:2 )
+	sdl? ( >=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		sdlgfx? ( media-libs/sdl-gfx )
+	)"
+
+DEPEND="${RDEPEND}
+	cpu_flags_x86_mmx? ( dev-lang/nasm )
+	>=sys-apps/sed-4
+	virtual/awk
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+
+RDEPEND="${RDEPEND}
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-medialibs-20140508-r4
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
+	)"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-pic.patch
+	# https://sourceforge.net/p/mjpeg/bugs/139/
+	epatch "${FILESDIR}"/${P}-sdl-cflags.patch
+	epatch "${FILESDIR}"/mjpegtools-2.1.0-no_format.patch
+	eautoreconf
+	sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
+}
+
+multilib_src_configure() {
+	[[ $(gcc-major-version) -eq 3 ]] && append-flags -mno-sse2
+
+	local myconf=(
+		--enable-compile-warnings
+		$(use_enable cpu_flags_x86_mmx simd-accel)
+		$(use_enable static-libs static)
+		--enable-largefile
+
+		$(use_with quicktime libquicktime)
+		$(use_with dv libdv)
+		$(use_with sdl libsdl)
+		--without-v4l
+		$(use_with sdl x)
+
+		# used by tools only
+		$(multilib_native_use_with gtk)
+		$(multilib_native_use_with png libpng)
+		$(multilib_native_use_with sdlgfx)
+
+		# used only in V4LCONF_LIBS that is not used anywhere...
+		--without-dga
+	)
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		# avoid building programs
+		emake bin_PROGRAMS=
+	fi
+}
+
+multilib_src_test() {
+	# there are no tests at the moment, so it would just build
+	# all programs in non-native ABIs...
+	multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake DESTDIR="${D}" install \
+			bin_PROGRAMS=
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	dodoc mjpeg_howto.txt PLANS HINTS docs/FAQ.txt
+
+	prune_libtool_files --all
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "mjpegtools installs user contributed scripts which require additional"
+		elog "dependencies not pulled in by the installation."
+		elog "These have to be installed manually."
+		elog "Currently known extra dpendencies are: ffmpeg, mencoder from mplayer,"
+		elog "parts of transcode, mpeg2dec from libmpeg2, sox, toolame, vcdimager, python."
+	fi
+}
diff --git a/media-video/mjpg-streamer/Manifest b/media-video/mjpg-streamer/Manifest
new file mode 100644
index 000000000000..9dc60a23c036
--- /dev/null
+++ b/media-video/mjpg-streamer/Manifest
@@ -0,0 +1,13 @@
+AUX 0_pre20120421-make-var-instead-of-cmd.patch 3756 SHA256 ef7f66e87c6b3b145ad9e5c0a0023b3d4331d0507aca6e69df95a380a421d2eb SHA512 460afe3b80b15586862a9503811b3600116d40928399fd831a7b18e549b6bf76d31a632e9ac145c942c59d7c1976fbeadabed5cad5c82aa3a5459810506373f7 WHIRLPOOL 41516802c4332657f41509cc88908ba2a251cc66a6ffb922f1a92dd0f578c8c577f386604c1af48f889d1c3dd19daec902f99e00e86f8ad250e40c0817d431df
+AUX 0_pre20120621-make-var-instead-of-cmd.patch 3756 SHA256 ef7f66e87c6b3b145ad9e5c0a0023b3d4331d0507aca6e69df95a380a421d2eb SHA512 460afe3b80b15586862a9503811b3600116d40928399fd831a7b18e549b6bf76d31a632e9ac145c942c59d7c1976fbeadabed5cad5c82aa3a5459810506373f7 WHIRLPOOL 41516802c4332657f41509cc88908ba2a251cc66a6ffb922f1a92dd0f578c8c577f386604c1af48f889d1c3dd19daec902f99e00e86f8ad250e40c0817d431df
+AUX 0_pre20120621-to-work-with-kernel-3.18.patch 3420 SHA256 e7882b4d158b2ba91516d0a6d587e46388ee9725c2c501544cefc14db37befdf SHA512 6711ce428e2985a65b8041c09ec9f461615e7e55ccc061d520ece5196e4da5d95ea71b344e7d326bcf7e127f48846808b2903a03e33aec488652067675a8f2b2 WHIRLPOOL 398f562079756e841b8339d111c6c2ea65df9246c4184858a26ce1c7e649002b14188df8b77b438fdac586692963f69af036d1596d627e8b05dfe4c2fc5b6cbe
+AUX mjpg-streamer.confd 347 SHA256 37019a36c29ad350ac3348c1665c631d0b4ab5efacc4583662fcbf7d4b920db1 SHA512 15841b10f0caa136b58372e180bfc3a0198d323ef2df22ddd2b334c09d0d376cac78d799c327306105bc97648ee40a3d0c78ef013a421f9468be7f89278baa33 WHIRLPOOL 7a51d9b565be672212f0b09fa54184ca3138852ae62820d18f80f3a61b6eff739e63c82e479ee0735d13231f5f41252ea3be532c11e5f02e7c6b2dc8f7256325
+AUX mjpg-streamer.initd 1243 SHA256 bc44e311cdbdbdc4b4bd7e25b104574587ecee47b0d583ed25c2b77f924ca916 SHA512 5430b14a8f712ee1c651ab080be5d52c42a388faa3f6b030366efaf8918c07d484aba3e33eda0d87b392b14dba21d0bfe3b996a7edbf0f3ca3f97ea097c74934 WHIRLPOOL eb91b75509bf567cf4d89b8eb2ec2e0a037257135ba77817f84e361b5925c6e96fabf2f5ac12700e109b17693ed2efe1ed07a1ac34dee282b1cc64824a5ca031
+DIST mjpg-streamer-0_pre20120421.tar.bz2 471104 SHA256 cba3027eece48735e104522adf4682169431e0879555c1d22395b4669189aab8 SHA512 bd9fa11c8a615cf33f84898f6acca6c61ead3614c848d50c22891922e7cb553b422f2f121377040f52d636dd719a2f300d3285cefc34759df8861cc84fdc2e82 WHIRLPOOL 734512cdc3e77d7a18231a08949eae8c8b6d8611eaf4c98edef0a679c14a7fe7ac7a81997d9bf9f6e89e67407be5effd1ea6181274600a5455c3a0c2b7baa2d9
+DIST mjpg-streamer-0_pre20120621.tar.bz2 471546 SHA256 585c4fd8f96f9d84d36f5c95cec79c411c2018bb2ebb10bcf73a2394ffe29c20 SHA512 dfc6077ec03fe4f239d8e25b65b7808bd489a954d8cf3aeed444e68fd9536720c2c888a5fa9f4b8d0152dab5ca0bd166a46f2cb22a357ba816eb5bc79ff11332 WHIRLPOOL 925f66c586028369858e55c62dfce136755f0958df7835869e29a0cfbad045842f5d39526ae646d728c0021c89bd31da0e89efcb556d04a5def96eaab5257af3
+EBUILD mjpg-streamer-0_pre20120421.ebuild 1707 SHA256 f6baea4d49cbf90cba3ddf4a132daf3cc1b3cd7575e61b2d1979eafa1190579d SHA512 fe6810679cbb16391a73a75e38a5d3b0ee679fb615cdfb95a15dd72d9f37dac632681cac2532b329c573c9894680f46cf83fd410fe566c2c5289319e5b1d2a7e WHIRLPOOL 88ccd560642b03ce4d80c459e08c0e53b37f1673364a4e32851ccaed6efae138c8d8a1b30e4b7a4eedd2310e13d1bbd3d344e7a0fb050ebbbafef4c657fe4bbe
+EBUILD mjpg-streamer-0_pre20120621-r1.ebuild 1846 SHA256 7c72430704333c4c4212b26c229e5a867b94f70eb8095e8e9aa630fe12743ac1 SHA512 02684add56270f3504787c487cc653e72fc6f28f13e517371a2d6fa1c341b0f5d497f4608201fcba116e36eeee6c3a123592a0959e260185d5943514fe9b66f8 WHIRLPOOL 26f7c44b0bf8c3c6865ea98c71515f835cc0f29e9f595d192d20794bb31bdaf4956b2f82a9f82e50b321a672e1ab16c143dfd0850768b62362bb34fc69610de5
+EBUILD mjpg-streamer-0_pre20120621.ebuild 1787 SHA256 4634f5b031f13880584b4976bf2619f58596b7f6243572cdf545a098b2a75d1d SHA512 9cb6b725c59089b33daec349c9570d0528430354a7faefce39008ab269b4ae42476a762a1cd39e97195b70a04112fc265e79c6ef6e831c458c7c0144fbb5cb7e WHIRLPOOL d5b93bd93f3a4ea24902bad3334ecc0d2ca2032aa9ce2627aa0a84018bff66e709112ea57fe3f473f03c56ef894f054c878d1516ab8ada933c4e710f552f275f
+MISC ChangeLog 4258 SHA256 06741a956aba4ed3c165c259c5673032a406fc29174b30612884bc7bcb54d694 SHA512 c7976b5bf91da6e61c253d50766f01296e117c4713a6de94f8c28d67b8908bde03ad4bfe5287936dc9230d60bb7923b9716f339e1e53a7f063be3528057e4c56 WHIRLPOOL 5d426fce0b214de1a55a3509bb3e51a26c0575021d147cf8bc637a02ded39b9f1f51962585d1fd001f8ba60221c6c1d1d8a89448137c87c4657cf14349e6db29
+MISC ChangeLog-2015 1924 SHA256 907850af9b393f64eed2c9999720201334e4a88ac4fcc00eac21e4ccf6547cf0 SHA512 94c0d4a69a18b765a4647677598c88c5cf98a417adf729b779c4b97523e2e9638b4cea92cfeada756047817caae035ec1b4c1f5fd292af2a85ba8083c2c695d8 WHIRLPOOL 3f4f7f9271d6218ce1b7465b5f7a71d14d645ebe986d607c350b775ac2e00cd447f6bed40aeaca8900090927fa5b334728eae937a94f7e029d721e4acdd05e7b
+MISC metadata.xml 2051 SHA256 38cb031c6ee325bfb06d7a042859bdc7f619a3049ca6898c50c98857c7c02e35 SHA512 2b63ebfc69af90d1da59619a88ad4752c08d7522a9830e2b59be9789d31bb30b2640e79e97a51fd99500466f1aa422c13c7ded9e196cd50e7387f8839a46deff WHIRLPOOL 6645c835323a58f0407e1bb4b23803a2c96c23391972a6d0726d4e726036d0848d51076c36c1ba464ebf9e5868159d52494c1c5aee17eed780d82403cae173d3
diff --git a/media-video/mjpg-streamer/files/0_pre20120421-make-var-instead-of-cmd.patch b/media-video/mjpg-streamer/files/0_pre20120421-make-var-instead-of-cmd.patch
new file mode 100644
index 000000000000..98d89c555e04
--- /dev/null
+++ b/media-video/mjpg-streamer/files/0_pre20120421-make-var-instead-of-cmd.patch
@@ -0,0 +1,118 @@
+Index: Makefile
+===================================================================
+--- Makefile	(revision 150)
++++ Makefile	(working copy)
+@@ -63,64 +63,64 @@
+ 	chmod 755 $(APP_BINARY)
+ 
+ output_autofocus.so: mjpg_streamer.h utils.h
+-	make -C plugins/output_autofocus all
++	$(MAKE) -C plugins/output_autofocus all
+ 	cp plugins/output_autofocus/output_autofocus.so .
+ 
+ input_testpicture.so: mjpg_streamer.h utils.h
+-	make -C plugins/input_testpicture all
++	$(MAKE) -C plugins/input_testpicture all
+ 	cp plugins/input_testpicture/input_testpicture.so .
+ 
+ 
+ ifeq ($(USE_LIBV4L2),true)
+ input_uvc.so: mjpg_streamer.h utils.h
+-	make -C plugins/input_uvc USE_LIBV4L2=true all
++	$(MAKE) -C plugins/input_uvc USE_LIBV4L2=true all
+ 	cp plugins/input_uvc/input_uvc.so .
+ else
+ input_uvc.so: mjpg_streamer.h utils.h
+-	make -C plugins/input_uvc all
++	$(MAKE) -C plugins/input_uvc all
+ 	cp plugins/input_uvc/input_uvc.so .
+ endif
+ 
+ input_control.so: mjpg_streamer.h utils.h
+-	make -C plugins/input_control all
++	$(MAKE) -C plugins/input_control all
+ 	cp plugins/input_control/input_control.so .
+ 
+ output_file.so: mjpg_streamer.h utils.h
+-	make -C plugins/output_file all
++	$(MAKE) -C plugins/output_file all
+ 	cp plugins/output_file/output_file.so .
+ 
+ ifeq ($(WXP_COMPAT),true)
+ output_http.so: mjpg_streamer.h utils.h
+-	make -C plugins/output_http -DWXP_COMPAT all
++	$(MAKE) -C plugins/output_http -DWXP_COMPAT all
+ 	cp plugins/output_http/output_http.so .
+ else
+ output_http.so: mjpg_streamer.h utils.h
+-	make -C plugins/output_http all
++	$(MAKE) -C plugins/output_http all
+ 	cp plugins/output_http/output_http.so .
+ endif
+ 
+ output_udp.so: mjpg_streamer.h utils.h
+-	make -C plugins/output_udp all
++	$(MAKE) -C plugins/output_udp all
+ 	cp plugins/output_udp/output_udp.so .
+ 
+ input_gspcav1.so: mjpg_streamer.h utils.h
+-	make -C plugins/input_gspcav1 all
++	$(MAKE) -C plugins/input_gspcav1 all
+ 	cp plugins/input_gspcav1/input_gspcav1.so .
+ 
+ input_file.so: mjpg_streamer.h utils.h
+-	make -C plugins/input_file all
++	$(MAKE) -C plugins/input_file all
+ 	cp plugins/input_file/input_file.so .
+ 
+ output_rtsp.so: mjpg_streamer.h utils.h
+-	make -C plugins/output_rtsp all
++	$(MAKE) -C plugins/output_rtsp all
+ 	cp plugins/output_rtsp/output_rtsp.so .
+ 	
+ output_ptp2.so: mjpg_streamer.h utils.h
+-	make -C plugins/input_ptp2 all
++	$(MAKE) -C plugins/input_ptp2 all
+ 	cp plugins/input_ptp2/input_ptp2.so .	
+ 
+ #input_http.so: mjpg_streamer.h utils.h
+-#	make -C plugins/input_http all
++#	$(MAKE) -C plugins/input_http all
+ #	cp plugins/input_http/input_http.so .
+ 
+ # The viewer plugin requires the SDL library for compilation
+@@ -129,22 +129,22 @@
+ # execute the following command:
+ # make output_viewer.so
+ output_viewer.so: mjpg_streamer.h utils.h
+-	make -C plugins/output_viewer all
++	$(MAKE) -C plugins/output_viewer all
+ 	cp plugins/output_viewer/output_viewer.so .
+ 
+ # cleanup
+ clean:
+-	make -C plugins/input_uvc $@
+-	make -C plugins/input_testpicture $@
+-	make -C plugins/output_file $@
+-	make -C plugins/output_http $@
+-	make -C plugins/output_udp $@
+-	make -C plugins/output_autofocus $@
+-	make -C plugins/input_gspcav1 $@
+-	make -C plugins/output_viewer $@
+-	make -C plugins/input_control $@
+-	make -C plugins/output_rtsp $@
+-#	make -C plugins/input_http $@
++	$(MAKE) -C plugins/input_uvc $@
++	$(MAKE) -C plugins/input_testpicture $@
++	$(MAKE) -C plugins/output_file $@
++	$(MAKE) -C plugins/output_http $@
++	$(MAKE) -C plugins/output_udp $@
++	$(MAKE) -C plugins/output_autofocus $@
++	$(MAKE) -C plugins/input_gspcav1 $@
++	$(MAKE) -C plugins/output_viewer $@
++	$(MAKE) -C plugins/input_control $@
++	$(MAKE) -C plugins/output_rtsp $@
++#	$(MAKE) -C plugins/input_http $@
+ 	rm -f *.a *.o $(APP_BINARY) core *~ *.so *.lo
+ 
+ # useful to make a backup "make tgz"
diff --git a/media-video/mjpg-streamer/files/0_pre20120621-make-var-instead-of-cmd.patch b/media-video/mjpg-streamer/files/0_pre20120621-make-var-instead-of-cmd.patch
new file mode 100644
index 000000000000..98d89c555e04
--- /dev/null
+++ b/media-video/mjpg-streamer/files/0_pre20120621-make-var-instead-of-cmd.patch
@@ -0,0 +1,118 @@
+Index: Makefile
+===================================================================
+--- Makefile	(revision 150)
++++ Makefile	(working copy)
+@@ -63,64 +63,64 @@
+ 	chmod 755 $(APP_BINARY)
+ 
+ output_autofocus.so: mjpg_streamer.h utils.h
+-	make -C plugins/output_autofocus all
++	$(MAKE) -C plugins/output_autofocus all
+ 	cp plugins/output_autofocus/output_autofocus.so .
+ 
+ input_testpicture.so: mjpg_streamer.h utils.h
+-	make -C plugins/input_testpicture all
++	$(MAKE) -C plugins/input_testpicture all
+ 	cp plugins/input_testpicture/input_testpicture.so .
+ 
+ 
+ ifeq ($(USE_LIBV4L2),true)
+ input_uvc.so: mjpg_streamer.h utils.h
+-	make -C plugins/input_uvc USE_LIBV4L2=true all
++	$(MAKE) -C plugins/input_uvc USE_LIBV4L2=true all
+ 	cp plugins/input_uvc/input_uvc.so .
+ else
+ input_uvc.so: mjpg_streamer.h utils.h
+-	make -C plugins/input_uvc all
++	$(MAKE) -C plugins/input_uvc all
+ 	cp plugins/input_uvc/input_uvc.so .
+ endif
+ 
+ input_control.so: mjpg_streamer.h utils.h
+-	make -C plugins/input_control all
++	$(MAKE) -C plugins/input_control all
+ 	cp plugins/input_control/input_control.so .
+ 
+ output_file.so: mjpg_streamer.h utils.h
+-	make -C plugins/output_file all
++	$(MAKE) -C plugins/output_file all
+ 	cp plugins/output_file/output_file.so .
+ 
+ ifeq ($(WXP_COMPAT),true)
+ output_http.so: mjpg_streamer.h utils.h
+-	make -C plugins/output_http -DWXP_COMPAT all
++	$(MAKE) -C plugins/output_http -DWXP_COMPAT all
+ 	cp plugins/output_http/output_http.so .
+ else
+ output_http.so: mjpg_streamer.h utils.h
+-	make -C plugins/output_http all
++	$(MAKE) -C plugins/output_http all
+ 	cp plugins/output_http/output_http.so .
+ endif
+ 
+ output_udp.so: mjpg_streamer.h utils.h
+-	make -C plugins/output_udp all
++	$(MAKE) -C plugins/output_udp all
+ 	cp plugins/output_udp/output_udp.so .
+ 
+ input_gspcav1.so: mjpg_streamer.h utils.h
+-	make -C plugins/input_gspcav1 all
++	$(MAKE) -C plugins/input_gspcav1 all
+ 	cp plugins/input_gspcav1/input_gspcav1.so .
+ 
+ input_file.so: mjpg_streamer.h utils.h
+-	make -C plugins/input_file all
++	$(MAKE) -C plugins/input_file all
+ 	cp plugins/input_file/input_file.so .
+ 
+ output_rtsp.so: mjpg_streamer.h utils.h
+-	make -C plugins/output_rtsp all
++	$(MAKE) -C plugins/output_rtsp all
+ 	cp plugins/output_rtsp/output_rtsp.so .
+ 	
+ output_ptp2.so: mjpg_streamer.h utils.h
+-	make -C plugins/input_ptp2 all
++	$(MAKE) -C plugins/input_ptp2 all
+ 	cp plugins/input_ptp2/input_ptp2.so .	
+ 
+ #input_http.so: mjpg_streamer.h utils.h
+-#	make -C plugins/input_http all
++#	$(MAKE) -C plugins/input_http all
+ #	cp plugins/input_http/input_http.so .
+ 
+ # The viewer plugin requires the SDL library for compilation
+@@ -129,22 +129,22 @@
+ # execute the following command:
+ # make output_viewer.so
+ output_viewer.so: mjpg_streamer.h utils.h
+-	make -C plugins/output_viewer all
++	$(MAKE) -C plugins/output_viewer all
+ 	cp plugins/output_viewer/output_viewer.so .
+ 
+ # cleanup
+ clean:
+-	make -C plugins/input_uvc $@
+-	make -C plugins/input_testpicture $@
+-	make -C plugins/output_file $@
+-	make -C plugins/output_http $@
+-	make -C plugins/output_udp $@
+-	make -C plugins/output_autofocus $@
+-	make -C plugins/input_gspcav1 $@
+-	make -C plugins/output_viewer $@
+-	make -C plugins/input_control $@
+-	make -C plugins/output_rtsp $@
+-#	make -C plugins/input_http $@
++	$(MAKE) -C plugins/input_uvc $@
++	$(MAKE) -C plugins/input_testpicture $@
++	$(MAKE) -C plugins/output_file $@
++	$(MAKE) -C plugins/output_http $@
++	$(MAKE) -C plugins/output_udp $@
++	$(MAKE) -C plugins/output_autofocus $@
++	$(MAKE) -C plugins/input_gspcav1 $@
++	$(MAKE) -C plugins/output_viewer $@
++	$(MAKE) -C plugins/input_control $@
++	$(MAKE) -C plugins/output_rtsp $@
++#	$(MAKE) -C plugins/input_http $@
+ 	rm -f *.a *.o $(APP_BINARY) core *~ *.so *.lo
+ 
+ # useful to make a backup "make tgz"
diff --git a/media-video/mjpg-streamer/files/0_pre20120621-to-work-with-kernel-3.18.patch b/media-video/mjpg-streamer/files/0_pre20120621-to-work-with-kernel-3.18.patch
new file mode 100644
index 000000000000..5f16f4ab3f45
--- /dev/null
+++ b/media-video/mjpg-streamer/files/0_pre20120621-to-work-with-kernel-3.18.patch
@@ -0,0 +1,74 @@
+From 03796a1d930212aea460405b86cd41bea8fa5150 Mon Sep 17 00:00:00 2001
+From: Eric Lee <saintgimp@hotmail.com>
+Date: Thu, 26 Feb 2015 19:31:41 -0800
+Subject: [PATCH] Fix mjpg-streamer to work with kernel 3.18
+
+I didn't create this fix, it was originally posted to http://www.raspberrypi.org/forums/viewtopic.php?f=28&t=97983&p=681259.  @koosvriezen tried to create a pull request #3 but made kind of a hash of it, so this is the same fix only a proper pull request.
+---
+ mjpg-streamer/plugins/input_uvc/input_uvc.c | 8 +++++---
+ mjpg-streamer/plugins/input_uvc/v4l2uvc.c   | 2 ++
+ mjpg-streamer/plugins/input_uvc/v4l2uvc.h   | 3 +++
+ 3 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/mjpg-streamer/plugins/input_uvc/input_uvc.c b/mjpg-streamer/plugins/input_uvc/input_uvc.c
+index c0b2d10..ef264e9 100644
+--- a/mjpg-streamer/plugins/input_uvc/input_uvc.c
++++ b/mjpg-streamer/plugins/input_uvc/input_uvc.c
+@@ -405,9 +405,13 @@ void *cam_thread(void *arg)
+         if(pcontext->videoIn->formatIn == V4L2_PIX_FMT_YUYV) {
+             DBG("compressing frame from input: %d\n", (int)pcontext->id);
+             pglobal->in[pcontext->id].size = compress_yuyv_to_jpeg(pcontext->videoIn, pglobal->in[pcontext->id].buf, pcontext->videoIn->framesizeIn, gquality);
++            /* copy this frame's timestamp to user space */
++            pglobal->in[pcontext->id].timestamp = pcontext->videoIn->buf.timestamp;
+         } else {
+             DBG("copying frame from input: %d\n", (int)pcontext->id);
+-            pglobal->in[pcontext->id].size = memcpy_picture(pglobal->in[pcontext->id].buf, pcontext->videoIn->tmpbuffer, pcontext->videoIn->buf.bytesused);
++            pglobal->in[pcontext->id].size = memcpy_picture(pglobal->in[pcontext->id].buf, pcontext->videoIn->tmpbuffer, pcontext->videoIn->tmpbytesused);
++            /* copy this frame's timestamp to user space */
++            pglobal->in[pcontext->id].timestamp = pcontext->videoIn->tmptimestamp;
+         }
+ 
+ #if 0
+@@ -418,8 +422,6 @@ void *cam_thread(void *arg)
+         prev_size = global->size;
+ #endif
+ 
+-        /* copy this frame's timestamp to user space */
+-        pglobal->in[pcontext->id].timestamp = pcontext->videoIn->buf.timestamp;
+ 
+         /* signal fresh_frame */
+         pthread_cond_broadcast(&pglobal->in[pcontext->id].db_update);
+diff --git a/mjpg-streamer/plugins/input_uvc/v4l2uvc.c b/mjpg-streamer/plugins/input_uvc/v4l2uvc.c
+index 48fd189..329233b 100644
+--- a/mjpg-streamer/plugins/input_uvc/v4l2uvc.c
++++ b/mjpg-streamer/plugins/input_uvc/v4l2uvc.c
+@@ -450,6 +450,8 @@ int uvcGrab(struct vdIn *vd)
+         */
+ 
+         memcpy(vd->tmpbuffer, vd->mem[vd->buf.index], vd->buf.bytesused);
++        vd->tmpbytesused = vd->buf.bytesused;
++        vd->tmptimestamp = vd->buf.timestamp;
+ 
+         if(debug)
+             fprintf(stderr, "bytes in used %d \n", vd->buf.bytesused);
+diff --git a/mjpg-streamer/plugins/input_uvc/v4l2uvc.h b/mjpg-streamer/plugins/input_uvc/v4l2uvc.h
+index d5296fc..0e3f99f 100644
+--- a/mjpg-streamer/plugins/input_uvc/v4l2uvc.h
++++ b/mjpg-streamer/plugins/input_uvc/v4l2uvc.h
+@@ -28,6 +28,7 @@
+ 
+ 
+ #include <stdio.h>
++#include <stdint.h>
+ #include <string.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+@@ -105,6 +106,8 @@ struct vdIn {
+     int framecount;
+     int recordstart;
+     int recordtime;
++    uint32_t tmpbytesused;
++    struct timeval tmptimestamp;
+ };
+ 
+ /* context of each camera thread */
diff --git a/media-video/mjpg-streamer/files/mjpg-streamer.confd b/media-video/mjpg-streamer/files/mjpg-streamer.confd
new file mode 100644
index 000000000000..07a81b04dcee
--- /dev/null
+++ b/media-video/mjpg-streamer/files/mjpg-streamer.confd
@@ -0,0 +1,21 @@
+# The input plugins and options:
+# uvc
+# testpicture
+# file
+#ex. INPUT_PLUGIN="uvc"
+INPUT_PLUGIN=""
+INPUT_PLUGIN_OPTS=""
+
+# The output plugins and options:
+# autofocus
+# file
+# http
+# udp
+# rtsp
+#ex. OUTPUT_PLUGIN="http"
+OUTPUT_PLUGIN=""
+OUTPUT_PLUGIN_OPTS=""
+
+# Deamon runing as user/group
+MJPG_STREAMER_USER="nobody"
+MJPG_STREAMER_GROUP="video"
diff --git a/media-video/mjpg-streamer/files/mjpg-streamer.initd b/media-video/mjpg-streamer/files/mjpg-streamer.initd
new file mode 100644
index 000000000000..53f046e7b1fe
--- /dev/null
+++ b/media-video/mjpg-streamer/files/mjpg-streamer.initd
@@ -0,0 +1,47 @@
+#!/sbin/openrc-run
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+MJPG_STREAMER_PIDFILE="${MJPG_STREAMER_PIDFILE:-/var/run/${SVCNAME}.pid}"
+MY_NAME=${SVCNAME//-/_}
+
+depend() {
+	use logger
+}
+
+checkconfig() {
+	local vars
+
+	[[ ${INPUT_PLUGIN} ]] || vars+=\ INPUT_PLUGIN
+	[[ ${OUTPUT_PLUGIN} ]] || vars+=\ OUTPUT_PLUGIN
+	[[ ${MJPG_STREAMER_USER} ]] || vars+=\ MJPG_STREAMER_USER
+	[[ ${MJPG_STREAMER_GROUP} ]] || vars+=\ MJPG_STREAMER_GROUP
+	vars="${vars# }"
+
+	if [[ ${vars} ]]; then
+		eerror "Required variables in /etc/conf.d/${SVCNAME} are not set:"
+		eerror "  ${vars// /, }"
+		return 1
+	fi
+
+	return 0
+}
+
+start() {
+	checkconfig || return $?
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --exec /usr/bin/${MY_NAME} \
+		--user "${MJPG_STREAMER_USER}" \
+		--group "${MJPG_STREAMER_GROUP}" -w 100 -b -m \
+		--pidfile "${MJPG_STREAMER_PIDFILE}" \
+		-- -i "/usr/lib/input_${INPUT_PLUGIN}.so ${INPUT_PLUGIN_OPTS}" \
+		-o "/usr/lib/output_${OUTPUT_PLUGIN}.so ${OUTPUT_PLUGIN_OPTS}"
+	eend $? "Check syslog to see why startup failed."
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --exec /usr/bin/${MY_NAME} \
+		--pidfile "${MJPG_STREAMER_PIDFILE}"
+	eend $?
+}
diff --git a/media-video/mjpg-streamer/metadata.xml b/media-video/mjpg-streamer/metadata.xml
new file mode 100644
index 000000000000..289845ee13ab
--- /dev/null
+++ b/media-video/mjpg-streamer/metadata.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrzej.pauli@gmail.com</email>
+		<name>Andrzej Pauli</name>
+		<description>Maintainer.  Assign bugs to him.</description>
+	</maintainer>
+	<maintainer type="person">
+		<email>aidecoe@gentoo.org</email>
+		<name>Amadeusz Żołnowski</name>
+		<description>Proxy maintainer.  CC him on bugs.</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		MJPG-streamer takes JPGs from Linux-UVC compatible webcams, filesystem or
+		other input plugins and streams them as M-JPEG via HTTP to webbrowsers,
+		VLC and other software.  It is the successor of uvc-streamer, a Linux-UVC
+		streaming application with Pan/Tilt
+	</longdescription>
+	<use>
+		<flag name="input_testpicture">Plugin for sending compiled in, test
+			pictures</flag>
+		<flag name="input_control">Plugin giving ability to control camera
+			movement (only specific cameras)</flag>
+		<flag name="input_file">Plugin that watches given directory and send
+			it's content</flag>
+		<flag name="input_uvc">Plugin that sends video stream from UVC
+			compatible camera</flag>
+		<flag name="output_file">Plugin that saves received content under given
+			location</flag>
+		<flag name="output_udp">Plugin receiving content over UDP and storing to
+			a directory</flag>
+		<flag name="output_http">Small HTTP server plugin which sends WWW
+			directory content and streams image content</flag>
+		<flag name="output_autofocus">Auto focusing plugin</flag>
+		<flag name="output_rtsp">Plugin which provides a mechanism to take
+			snapshots with a trigger from a UDP packet</flag>
+		<flag name="www">Installs WWW content</flag>
+		<flag name="v4l">Uses <pkg>media-libs/libv4l</pkg> function mapping for
+			input_uvc plugin</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">mjpg-streamer</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/mjpg-streamer/mjpg-streamer-0_pre20120421.ebuild b/media-video/mjpg-streamer/mjpg-streamer-0_pre20120421.ebuild
new file mode 100644
index 000000000000..773e442761a6
--- /dev/null
+++ b/media-video/mjpg-streamer/mjpg-streamer-0_pre20120421.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="MJPG-streamer takes JPGs from Linux-UVC compatible webcams"
+HOMEPAGE="https://sourceforge.net/projects/mjpg-streamer"
+SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+INPUT_PLUGINS="input_testpicture input_control input_file input_uvc"
+OUTPUT_PLUGINS="output_file output_udp output_http output_autofocus output_rtsp"
+IUSE_PLUGINS="${INPUT_PLUGINS} ${OUTPUT_PLUGINS} +input_file +output_http"
+IUSE="${IUSE_PLUGINS} www v4l"
+REQUIRED_USE="|| ( ${INPUT_PLUGINS} )
+	|| ( ${OUTPUT_PLUGINS} )
+	v4l? ( input_uvc )"
+
+RDEPEND="virtual/jpeg
+	v4l? ( input_uvc? ( media-libs/libv4l ) )"
+DEPEND="${RDEPEND}
+	input_testpicture? ( media-gfx/imagemagick )"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-make-var-instead-of-cmd.patch"
+
+	local flag switch
+
+	for flag in ${IUSE_PLUGINS}; do
+		use ${flag} && switch='' || switch='#'
+		sed -i \
+			-e "s|^#*PLUGINS +\?= ${flag}.so|${switch}PLUGINS += ${flag}.so|" \
+			Makefile
+	done
+}
+
+src_compile() {
+	local v4l=$(use v4l && use input_uvc && echo 'USE_LIBV4L2=true')
+	emake ${v4l}
+}
+
+src_install() {
+	into /usr
+	dobin ${PN//-/_}
+	dolib.so *.so
+
+	if use www ; then
+		insinto /usr/share/${PN}
+		doins -r www
+	fi
+
+	dodoc README TODO
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
+
+pkg_postinst() {
+	elog "Remember to set an input and output plugin for mjpg-streamer."
+
+	if use www ; then
+		echo
+		elog "An example webinterface has been installed into"
+		elog "/usr/share/mjpg-streamer/www for your usage."
+	fi
+}
diff --git a/media-video/mjpg-streamer/mjpg-streamer-0_pre20120621-r1.ebuild b/media-video/mjpg-streamer/mjpg-streamer-0_pre20120621-r1.ebuild
new file mode 100644
index 000000000000..ddb3c1d833f7
--- /dev/null
+++ b/media-video/mjpg-streamer/mjpg-streamer-0_pre20120621-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="MJPG-streamer takes JPGs from Linux-UVC compatible webcams"
+HOMEPAGE="https://sourceforge.net/projects/mjpg-streamer"
+SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+INPUT_PLUGINS="input_testpicture input_control input_file input_uvc"
+OUTPUT_PLUGINS="output_file output_udp output_http output_autofocus output_rtsp"
+IUSE_PLUGINS="${INPUT_PLUGINS} ${OUTPUT_PLUGINS}"
+IUSE="input_testpicture input_control +input_file input_uvc output_file
+	output_udp +output_http output_autofocus output_rtsp
+	www v4l"
+REQUIRED_USE="|| ( ${INPUT_PLUGINS} )
+	|| ( ${OUTPUT_PLUGINS} )
+	v4l? ( input_uvc )"
+
+RDEPEND="virtual/jpeg
+	v4l? ( input_uvc? ( media-libs/libv4l ) )"
+DEPEND="${RDEPEND}
+	input_testpicture? ( media-gfx/imagemagick )"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-make-var-instead-of-cmd.patch"
+	epatch "${FILESDIR}/${PV}-to-work-with-kernel-3.18.patch"
+
+	local flag switch
+
+	for flag in ${IUSE_PLUGINS}; do
+		use ${flag} && switch='' || switch='#'
+		sed -i \
+			-e "s|^#*PLUGINS +\?= ${flag}.so|${switch}PLUGINS += ${flag}.so|" \
+			Makefile
+	done
+}
+
+src_compile() {
+	local v4l=$(use v4l && use input_uvc && echo 'USE_LIBV4L2=true')
+	emake ${v4l}
+}
+
+src_install() {
+	into /usr
+	dobin ${PN//-/_}
+	dolib.so *.so
+
+	if use www ; then
+		insinto /usr/share/${PN}
+		doins -r www
+	fi
+
+	dodoc README TODO
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
+
+pkg_postinst() {
+	elog "Remember to set an input and output plugin for mjpg-streamer."
+
+	if use www ; then
+		echo
+		elog "An example webinterface has been installed into"
+		elog "/usr/share/mjpg-streamer/www for your usage."
+	fi
+}
diff --git a/media-video/mjpg-streamer/mjpg-streamer-0_pre20120621.ebuild b/media-video/mjpg-streamer/mjpg-streamer-0_pre20120621.ebuild
new file mode 100644
index 000000000000..f5858dc445ed
--- /dev/null
+++ b/media-video/mjpg-streamer/mjpg-streamer-0_pre20120621.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="MJPG-streamer takes JPGs from Linux-UVC compatible webcams"
+HOMEPAGE="https://sourceforge.net/projects/mjpg-streamer"
+SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+INPUT_PLUGINS="input_testpicture input_control input_file input_uvc"
+OUTPUT_PLUGINS="output_file output_udp output_http output_autofocus output_rtsp"
+IUSE_PLUGINS="${INPUT_PLUGINS} ${OUTPUT_PLUGINS}"
+IUSE="input_testpicture input_control +input_file input_uvc output_file
+	output_udp +output_http output_autofocus output_rtsp
+	www v4l"
+REQUIRED_USE="|| ( ${INPUT_PLUGINS} )
+	|| ( ${OUTPUT_PLUGINS} )
+	v4l? ( input_uvc )"
+
+RDEPEND="virtual/jpeg
+	v4l? ( input_uvc? ( media-libs/libv4l ) )"
+DEPEND="${RDEPEND}
+	input_testpicture? ( media-gfx/imagemagick )"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-make-var-instead-of-cmd.patch"
+
+	local flag switch
+
+	for flag in ${IUSE_PLUGINS}; do
+		use ${flag} && switch='' || switch='#'
+		sed -i \
+			-e "s|^#*PLUGINS +\?= ${flag}.so|${switch}PLUGINS += ${flag}.so|" \
+			Makefile
+	done
+}
+
+src_compile() {
+	local v4l=$(use v4l && use input_uvc && echo 'USE_LIBV4L2=true')
+	emake ${v4l}
+}
+
+src_install() {
+	into /usr
+	dobin ${PN//-/_}
+	dolib.so *.so
+
+	if use www ; then
+		insinto /usr/share/${PN}
+		doins -r www
+	fi
+
+	dodoc README TODO
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
+
+pkg_postinst() {
+	elog "Remember to set an input and output plugin for mjpg-streamer."
+
+	if use www ; then
+		echo
+		elog "An example webinterface has been installed into"
+		elog "/usr/share/mjpg-streamer/www for your usage."
+	fi
+}
diff --git a/media-video/mkclean/Manifest b/media-video/mkclean/Manifest
new file mode 100644
index 000000000000..63b270912f8a
--- /dev/null
+++ b/media-video/mkclean/Manifest
@@ -0,0 +1,7 @@
+DIST mkclean-0.8.10.tar.bz2 764380 SHA256 96773e72903b00d73e68ba9d5f19744a91ed46d27acd511a10eb23533589777d SHA512 8e12ac906205b14c162f0fd29d9e1a56ee854e7946706adf22c3df40376ddeb2c23a02c499d8146aeafc945381eabb96e16ca33da1323dda5929a1fc1f337892 WHIRLPOOL 02994d357315fed1d6f88fe93e2c92debb6bcce5b8e9f9f3a24536a4d45f342f399d47348374d0a5a1055ed5964290ed20726778a4989b39c773160eaee69669
+DIST mkclean-0.8.9.tar.bz2 739749 SHA256 28df51f3b59b5d04ecd7f50e609112fe3185b7d74cd7abcd0ab8148c66156275 SHA512 23cf1d6ae66089ea717a09afb02b532b3555a4e3061916c460c15a71c0834127b5650fcb663b8d06d88aa9ba45ffff0b063a4b8914d852cb1086d4b59df59b98 WHIRLPOOL f6fc08f09f6159a1327e4ba75b647696b77e2f0465d6b5ecd12fc5df115ec4e7aa3a78f7fe59cbfb14d745ff054c5e30b959a2f964979d7c9ab9f2c5b02b747b
+EBUILD mkclean-0.8.10.ebuild 982 SHA256 386d69fe69ee9e5f32b27315bc14d4ee686251fff41280a34f75697cf0312a7f SHA512 380a0a9ea83757500d33ad8638b1f32a98fef1d68e97ebf2541f31f7c85f9e24a485caa64e543bb898ecca9cb074638400f017d2c4ef91e9ee035e65d9af6886 WHIRLPOOL b5c8887fe58ee6b457f4cdec53134c029bbacfb8f7e587acdf0880b479ee97df671b0ca5a9b1a64bf28aa2df56ce1e4b3b58e6ffae21c197740c74cc476bbb67
+EBUILD mkclean-0.8.9.ebuild 849 SHA256 b07d3de7b16867d685d77e9faf8e86f9d61861fe940b8caafe2f128c7596b8b6 SHA512 d7db7640bfadea73ab75a74ad9e99bc1adef241fbb910b2cd1559e436a8d8391b613e6f74076193d7231f444287a26c2fa6da95bb2f63153778ec822171c9ad8 WHIRLPOOL 4c3d3919be69e43e0e0eccf729be2fe981ad0e6b0d015ea082e4a670d9e80cbbf890c10dd3b2286e0f9e47c0c566423cf41555f4eb1cb0fa47969b955c7ec948
+MISC ChangeLog 3013 SHA256 53139e362783fc3e5a229d0ca3776736f00a197bb7a1028cb47e5e8f056b389c SHA512 de87467b09c58df09c7e1ea4b7daf4e2d8c819630165a72e3d1dfec2903a369cd64e0a4cb2b3229e0b994f71eb5c4180a175035309ad3149df0b87aa2c020c79 WHIRLPOOL a2d90dc5eb4a480cd47b79f6c66a4571832ccf2a1369e43d4a4dfaeaedc4645b5e6dc05fdc1059368cad4ec16579922f68fe253fcd489425c9192a92ac281e15
+MISC ChangeLog-2015 970 SHA256 09d64f30e9bfdfb89793ef5a4665bbc5cc46761d1fbd548d217648d5f3a26e0d SHA512 24f2e3dcdfa6959ce3042880e317b87150c2f92f81fefdd875f1d7fd43f65416057a44bdc07e05cf5fd32ce74ebd3bbf62abe6128c5e77e930e06931f2a0e54f WHIRLPOOL 0c8db8c3157cc6fd5307303952861e615a702f3c6f417256e4c7cb089f76406f721830eec33ccf050c34f15842d929a0828a0e7bb06998ae48259347469be010
+MISC metadata.xml 948 SHA256 810183b52d8b316f94828269133f9f87479caf246293d49e308c2c0170012e51 SHA512 c246ead2ee597aaf369567b30e4577d6865befa0ef89877f512b1e192913459800d980c84e81f43a06d006e9a8f35204c8d484713a24c2886fa39b5201d226a2 WHIRLPOOL 07b7c74285ca5ecc38411c444c89aec6e69c9b8353580581d79b465212a1879bf047768d02ad7b00835bd84cb1e783659682a1fc027cb4b50f0f2ec0199a357e
diff --git a/media-video/mkclean/metadata.xml b/media-video/mkclean/metadata.xml
new file mode 100644
index 000000000000..d1a34e1539cc
--- /dev/null
+++ b/media-video/mkclean/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+	<longdescription lang="en">
+		mkclean is a command line tool to clean and optimize Matroska (.mkv / .mka / .mks / .mk3d) and WebM (.webm / .weba) files that have already been muxed. It reorders the elements with the Cues at the front, so your Matroska files are ready to be streamed efficiently over the web. It also removes elements not found in the Matroska specs and the extra Meta Seek list of Clusters that some program add to their file. It can also optionally remux the Cluster blocks to start each boundary with a keyframe and the matching audio/subtitle blocks for that keyframe.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">downloads</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/mkclean/mkclean-0.8.10.ebuild b/media-video/mkclean/mkclean-0.8.10.ebuild
new file mode 100644
index 000000000000..c094af08ab56
--- /dev/null
+++ b/media-video/mkclean/mkclean-0.8.10.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit toolchain-funcs
+
+DESCRIPTION="mkclean is a command line tool to clean and optimize Matroska files"
+HOMEPAGE="http://www.matroska.org/downloads/mkclean.html"
+SRC_URI="http://downloads.sourceforge.net/project/matroska/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_configure() {
+	tc-export CC CXX
+
+	emake -C corec/tools/coremake
+	mv corec/tools/coremake/coremake . || die
+
+	./coremake $(corec/tools/coremake/system_output.sh) || die
+
+	# fixing generated makefiles
+	sed -i -e 's|^\(LFLAGS.*+=.*\$(LIBS)\)|\1 \$(LDFLAGS)|g' \
+		-e 's|^\(STRIP.*=\)|\1 echo|g' $(find -name "*.mak") || die
+}
+
+src_compile() {
+	emake -f GNUmakefile -j1
+	emake -C mkclean -f mkWDclean.mak -j1
+	emake -C mkclean/regression -f mkcleanreg.mak -j1
+}
+
+src_install() {
+	dobin release/*/mk*clean*
+	newdoc ChangeLog.txt ChangeLog
+	newdoc ReadMe.txt README
+}
diff --git a/media-video/mkclean/mkclean-0.8.9.ebuild b/media-video/mkclean/mkclean-0.8.9.ebuild
new file mode 100644
index 000000000000..bae50b89372c
--- /dev/null
+++ b/media-video/mkclean/mkclean-0.8.9.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="mkclean is a command line tool to clean and optimize Matroska files"
+HOMEPAGE="http://www.matroska.org/downloads/mkclean.html"
+SRC_URI="http://downloads.sourceforge.net/project/matroska/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_configure() {
+	# non-standard configure
+	./configure || die
+
+	# fixing generated makefiles
+	sed -i -e 's|^\(LFLAGS.*+=.*\$(LIBS)\)|\1 \$(LDFLAGS)|g' \
+		-e 's|^\(STRIP.*=\)|\1 echo|g' $(find -name "*.mak") || die
+}
+
+src_compile() {
+	emake -f GNUmakefile -j1
+	emake -C mkclean -f mkWDclean.mak -j1
+	emake -C mkclean/regression -f mkcleanreg.mak -j1
+}
+
+src_install() {
+	dobin release/*/mk*clean*
+	newdoc ChangeLog.txt ChangeLog
+	newdoc ReadMe.txt README
+}
diff --git a/media-video/mkvalidator/Manifest b/media-video/mkvalidator/Manifest
new file mode 100644
index 000000000000..c3c171ebd4a8
--- /dev/null
+++ b/media-video/mkvalidator/Manifest
@@ -0,0 +1,7 @@
+DIST mkvalidator-0.5.1.tar.bz2 589116 SHA256 e4f9b2e89df141926a3ac447bd9a2de17df28f6c413c2bff3323068b530da48f SHA512 236f15f2161e59b9a9923c1f9e4347069696578956d490def776e0b11339b9ba90eeb9a4b4ac85e1e506c250830e9ff3f007b52f7208c10d05180489abd1ccb9 WHIRLPOOL f0dfc728c5fdf0629fdd162c18f5542453271727911068f1cdc89592b648bf77ad253fbcff4405f64305e7dfb8391908ec2e15c3747cc0debadbf7cfa23f39b9
+DIST mkvalidator-0.5.2.tar.bz2 612382 SHA256 2e2a91062f6bf6034e8049646897095b5fc7a1639787d5fe0fcef1f1215d873b SHA512 c87d89ce97f8c701f73932012af8c8df3d6e5ac8b0ee24e48000f93b0e29e02ce74250565f6a662fa0c9c2fbd9910705e1d1403ac6d2ac2fe54331ef150d00cc WHIRLPOOL 87c98a98c4b9a44fcaa057c37d5f7b00d8ee23fcfe1bb95dd63ff92c5f0bdff3ef90cb9b7a0931c69c85000345c5a852a3c2b263312215e96f8497736444d726
+EBUILD mkvalidator-0.5.1.ebuild 803 SHA256 1b11b7bdfef0812a47c542a0fe672c687780fd2eb47b7f9a0be3520d038f38d2 SHA512 7009aae1ed262265434d1b011b3e22b985bc19855631add68baa4a2b94e314a8adbe2349add03653e56ccd6342d859c832fb1d515f2ddeb85fa85f5fcbd4b76b WHIRLPOOL 42431ab8a5b76e695d272b30ea2c1fda2f6183132a98accd9f04a9da354e82e04d29b986a74cb9ae677ff2f3e2bd37682346f04d2f61c0997927e1b6e61aede3
+EBUILD mkvalidator-0.5.2.ebuild 902 SHA256 bca593022c98f5769330840e3d96f93ee0c3d691acf46a85d5166c520868719a SHA512 76f3b3118045d5ff688e404e5f02cad909c299a8dd62d91448b446dd84a1c3b935dc10aec9fa97ef968d062f94d94e06b3b56c59bba1cbb5497b5df404ebea9a WHIRLPOOL 9a2f579fcea76938fea130ff7ca604f99ac21c85b34bf5ad5321dbe9cd9953811f9557b309d5741965a2b3419e9afce16badbeea0c28c9ce88361dab03b942b6
+MISC ChangeLog 3323 SHA256 9fe6ba1fe154d857330ef2be0853afea4cb641bcb1f9bd58d8e4fedb6746423e SHA512 8682e2e0769585ffef8dfe10d6175dabbce0b1af0d9a94781008115e3aec7b1b113f6556aa885236a91fc0156f663c240bfedea091a7508db23cdf9cfc9ecbe0 WHIRLPOOL 6887a866f68dd2d2cc5bdcbace4273e2bc29cb4a3738e92dffeb8acfc171a21294e1cb5d16e43b9f5ada4a87732f64483cbd2246de34c9ea905422724d884268
+MISC ChangeLog-2015 1392 SHA256 30457c09aad3ac30447c06e1770ee2a833fcebaf2dc85808e2b72749f30a4e68 SHA512 b007c42c6cd66a742b59c430b6c8610fd43a6ed0e1ef570d3d5f9601c196fcf617d47e4d5b484555c70e580e146e67710f0a5b5824c3b6d57ed7470d2c94eefe WHIRLPOOL 145cd23cea15bd1b80eec0c405f2327c5b1f0e91132a4f7ac4ed6f7daff57b378b499ca359547f74d1fd7b63e41e8194c19ccc058011296e7325d109db3b5d15
+MISC metadata.xml 637 SHA256 87e6f6c84a14933e3f6899969c6ead85bb9c936139e989f52c27c428c0371f81 SHA512 5fb4d548f51476d67d42f1ef830303f45e0f6aba344f943c017a111518aa575998fa89312112dffe140681ba92a04eb98eee7d32a86ea876405bb6de67c8751b WHIRLPOOL 8a13d68b022b4cf35b5b0300496d80d752d5c945b31f0c8e7722882861df74472519446b90acf50674d20191d50cb231cbf6724e9ace86d3bf9aea5760d728d0
diff --git a/media-video/mkvalidator/metadata.xml b/media-video/mkvalidator/metadata.xml
new file mode 100644
index 000000000000..b9b1eb5aff56
--- /dev/null
+++ b/media-video/mkvalidator/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+	<longdescription lang="en">
+		mkvalidator is a simple command line tool to verify Matroska and WebM files for spec conformance. It checks the various bogus or missing key elements against the EBML DocType version of the file and reports the errors/warnings in the command line.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">downloads</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/mkvalidator/mkvalidator-0.5.1.ebuild b/media-video/mkvalidator/mkvalidator-0.5.1.ebuild
new file mode 100644
index 000000000000..07d62646f609
--- /dev/null
+++ b/media-video/mkvalidator/mkvalidator-0.5.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="mkvalidator is a command line tool to verify Matroska files for spec conformance"
+HOMEPAGE="http://www.matroska.org/downloads/mkvalidator.html"
+SRC_URI="http://downloads.sourceforge.net/project/matroska/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_configure() {
+	tc-export CC CXX
+	# non-standard configure
+	./configure || die
+
+	# fixing generated makefiles
+	sed -i -e 's|^\(LFLAGS.*+=.*\$(LIBS)\)|\1 \$(LDFLAGS)|g' \
+		-e 's|^\(STRIP.*=\)|\1 echo|g' $(find -name "*.mak") || die
+}
+
+src_compile() {
+	emake -j1 V=1
+}
+
+src_install() {
+	dobin release/*/mkv*
+	newdoc ChangeLog.txt ChangeLog
+	newdoc ReadMe.txt README
+}
diff --git a/media-video/mkvalidator/mkvalidator-0.5.2.ebuild b/media-video/mkvalidator/mkvalidator-0.5.2.ebuild
new file mode 100644
index 000000000000..3e4f279a6c73
--- /dev/null
+++ b/media-video/mkvalidator/mkvalidator-0.5.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="mkvalidator is a command line tool to verify Matroska files for spec conformance"
+HOMEPAGE="http://www.matroska.org/downloads/mkvalidator.html"
+SRC_URI="http://downloads.sourceforge.net/project/matroska/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_configure() {
+	tc-export CC CXX
+
+	emake -C corec/tools/coremake
+	mv corec/tools/coremake/coremake . || die
+
+	./coremake $(corec/tools/coremake/system_output.sh) || die
+
+	# fixing generated makefiles
+	sed -i -e 's|^\(LFLAGS.*+=.*\$(LIBS)\)|\1 \$(LDFLAGS)|g' \
+		-e 's|^\(STRIP.*=\)|\1 echo|g' $(find -name "*.mak") || die
+}
+
+src_compile() {
+	emake -j1 V=1 -C ${PN}
+}
+
+src_install() {
+	dobin release/*/mkv*
+	newdoc ChangeLog.txt ChangeLog
+	newdoc ReadMe.txt README
+}
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
new file mode 100644
index 000000000000..897a6b83016d
--- /dev/null
+++ b/media-video/mkvtoolnix/Manifest
@@ -0,0 +1,10 @@
+DIST mkvtoolnix-15.0.0.tar.xz 4552588 SHA256 73dc3b6f0a7147e28c06f44427fa0e824d0a4129e40c942d7642d9f451a51195 SHA512 5cef57dce4e6ca3d036142e42e302e8a315782ded11fb4c5982b406d389c8709bc7cf2a86d605b7c02797dc7b907dc3895db515e9d3e40976ab14198d9f400c6 WHIRLPOOL ee4bb153c4773535526bcb7352c13eab84a8b7fa28e66862f5bdc931a89e5ba3fc0d4c621f6784a9bd8b3a35c95cd1c1fdae9cfbb85640077b81b0914dc96fa5
+DIST mkvtoolnix-16.0.0.tar.xz 4607360 SHA256 5dfb2517003f69f3d8b942751200122c2e4cad2a8675b6fc2dfaad5c98e946e0 SHA512 5255c5a1d995bbf24d414dcdde8de987295581d4a8054164f15dca6019c79d96c9c074dc1892a86cd0084da34079529357efbeb3381addd9dc087b433be493fa WHIRLPOOL 20c2c2b387f78a5c2486692dda1503016447a551cd97d831b551c83e58ebecbf787deaca75d31b0409544eb11d354f2eb21b6585bb21fb30499c91c9af33f4d1
+DIST mkvtoolnix-9.6.0.tar.xz 3810216 SHA256 ebab8dcc59533d248b127d375286eb47880a222ef68ff7a10e1c87d49dbd86bb SHA512 5f469215a10dc865e51f77c43961705d70b1b0e38d70b930e5065d8d89b8379734d9826a63e2cb7ae9cb6723ed8a1d16793df35bad6244cedaa19bc4df49b436 WHIRLPOOL f90056b595402315651754bf4428762a99a665f8ce78d7eb8d6d5ad3bb8bc95e19b130c154c52c2d1281028ebf78c5834abedf068601382a3fcca9ea2c37aa2a
+EBUILD mkvtoolnix-15.0.0-r1.ebuild 2552 SHA256 2a1846d144aed927fa144d9083fb2597b98abdf94a78f714812131b7c783e045 SHA512 29dad1e71c085a2bb54379ec1a7daa4516ef072fdd1048905b43f6adb6ee4eb988b74e7626a99908a1b149095ff4f8a42b3844b5c3a4b3bffce5f9f953d4a817 WHIRLPOOL 78b71004864f145a88214517f3d1f2ace192dd6025891740edd60a12064e5198441f80cdc119af0bad77389ed8a78536589e2f8492bc290293334caa3afd9b53
+EBUILD mkvtoolnix-16.0.0.ebuild 2552 SHA256 495214f6a7c3863894b255f3c1639d2eeaf01f25bc0b6cbd6e3b9c4613067c8a SHA512 2f326f9d3300ddbe52aef7d0fceb0b393a335eb0cd8d716ba5627cde93db95d246821d959d2bff16c30cbd1aa936742c137f190b6021e2a3f78bc35679170ca2 WHIRLPOOL 2b3cb0257128cef0331fd086f84f94d863fbe699b0bac8b53587a54598015fd951de9c6071f6dcd31077c3473cf76bace86373c4088b13f74f2735d44c79264a
+EBUILD mkvtoolnix-9.6.0.ebuild 2804 SHA256 46ea31710f9278a078175bfc69f3478fb3b362b66122ddc9e3691a5b52174afe SHA512 6197ff1dec6dfca50711c7165d46f8a08d0844666686142eef5124485f448428bf9c0445a9976c52dbc28cede017921d2bccc5ca7089021c35f71d394a174d51 WHIRLPOOL c372198542ccd54303345a39e67e36686a46534bf7b7268588f64d54a419ec0cb57bcbbfb3859030aeeaec7be3e2810c210f5741e35fbe6426dff09bc0eae124
+EBUILD mkvtoolnix-9999.ebuild 2552 SHA256 2a1846d144aed927fa144d9083fb2597b98abdf94a78f714812131b7c783e045 SHA512 29dad1e71c085a2bb54379ec1a7daa4516ef072fdd1048905b43f6adb6ee4eb988b74e7626a99908a1b149095ff4f8a42b3844b5c3a4b3bffce5f9f953d4a817 WHIRLPOOL 78b71004864f145a88214517f3d1f2ace192dd6025891740edd60a12064e5198441f80cdc119af0bad77389ed8a78536589e2f8492bc290293334caa3afd9b53
+MISC ChangeLog 8086 SHA256 8903d17d86b9d83c6ed274b54fea99093105d638f8ede9a7e83fcf3c70887cb9 SHA512 4b2e0e3c75c32d6cbd98b4e088c34c46927bf72ee5485dfa0643cf440033002b4868ce0e974085cc464b42b11eaa197a095e3b4265f74a48ba87ab61d5e338d8 WHIRLPOOL 3fc8cde847811db2929a0ce11930575a8e381036d6ce094a6b910f0b9faf27f6db22f9f9c9fd12bd446fa53af6871279aeb88727788a68e6f9aa403d2880f942
+MISC ChangeLog-2015 32895 SHA256 f847d3ae0f6702549f24a8d659490b8958a8b1d4b2b7632c39ed9f69c2a9f8a6 SHA512 958b8320e4ba089b7f0e391ae02838ed1c3482e72654c97776fd2e297f48ae2d55e8ff5a5c3d921cf8ad85c3b6131d54b90364eb22e163795967bc4f25bbce1c WHIRLPOOL 7b3f31a49bf0fbd6c3b768be42198b8675b5c1dc5180cd0f6b995000980aef8878a9f39da841d6436dabb36d1468c2bed40f5152f381f91e28a1c7d3f97e7cc9
+MISC metadata.xml 255 SHA256 cfa2e7e4e1ad84d152c6b2f49467e2beb07d188dad704bc9887438f2b0d95f18 SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9 WHIRLPOOL 6fbb4f57853f7ac5b979c506736e63f571606215889abf768ddb44fc91b3491a846ea84d46c6984bd3cd230f4808f8f39fa83580e636576c7756fdb1564869da
diff --git a/media-video/mkvtoolnix/metadata.xml b/media-video/mkvtoolnix/metadata.xml
new file mode 100644
index 000000000000..2a705e39ce78
--- /dev/null
+++ b/media-video/mkvtoolnix/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>media-video@gentoo.org</email>
+	<name>Gentoo Video project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-video/mkvtoolnix/mkvtoolnix-15.0.0-r1.ebuild b/media-video/mkvtoolnix/mkvtoolnix-15.0.0-r1.ebuild
new file mode 100644
index 000000000000..e3d6a0086ae4
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-15.0.0-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs versionator multiprocessing
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/mbunkus/mkvtoolnix.git"
+	inherit git-r3
+else
+	SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Tools to create, alter, and inspect Matroska files"
+HOMEPAGE="https://mkvtoolnix.download/ https://github.com/mbunkus/mkvtoolnix"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug pch test qt5"
+
+# check NEWS.md for build system changes entries for boost/libebml/libmatroska
+# version requirement updates and other packaging info
+RDEPEND="
+	>=dev-libs/boost-1.49.0:=
+	>=dev-libs/libebml-1.3.5:=
+	dev-libs/jsoncpp:=
+	dev-libs/pugixml
+	media-libs/flac
+	>=media-libs/libmatroska-1.4.7:=
+	media-libs/libogg
+	media-libs/libvorbis
+	sys-apps/file
+	sys-libs/zlib
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtconcurrent:5
+		dev-qt/qtmultimedia:5
+	)
+"
+DEPEND="${RDEPEND}
+	dev-ruby/rake
+	sys-devel/gettext
+	virtual/pkgconfig
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	app-text/po4a
+	test? ( dev-cpp/gtest )
+"
+
+DOCS="AUTHORS NEWS.md README.md"
+
+pkg_pretend() {
+	# https://bugs.gentoo.org/419257
+	local ver=4.6
+	local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
+	if ! version_is_at_least ${ver} $(gcc-version); then
+		eerror ${msg}
+		die ${msg}
+	fi
+}
+
+src_prepare() {
+	default
+	[[ ${PV} == "9999" ]] && { ./autogen.sh || die; }
+}
+
+src_configure() {
+	local myconf
+
+	if use qt5 ; then
+		# ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
+		myconf+=(
+			--with-moc=/usr/$(get_libdir)/qt5/bin/moc
+			--with-uic=/usr/$(get_libdir)/qt5/bin/uic
+			--with-rcc=/usr/$(get_libdir)/qt5/bin/rcc
+			--with-qmake=/usr/$(get_libdir)/qt5/bin/qmake
+		)
+	fi
+
+	econf \
+		$(use_enable debug) \
+		$(use_enable qt5 qt) \
+		$(usex pch "" --disable-precompiled-headers) \
+		"${myconf[@]}" \
+		--disable-update-check \
+		--disable-optimization \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--with-boost="${EPREFIX}"/usr \
+		--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_compile() {
+	rake V=1 -j$(makeopts_jobs) || die
+}
+
+src_test() {
+	rake V=1 -j$(makeopts_jobs) tests:unit || die
+	rake V=1 -j$(makeopts_jobs) tests:run_unit || die
+}
+
+src_install() {
+	DESTDIR="${D}" rake -j$(makeopts_jobs) install || die
+
+	einstalldocs
+	doman doc/man/*.1
+}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-16.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-16.0.0.ebuild
new file mode 100644
index 000000000000..93682af702f5
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-16.0.0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs versionator multiprocessing
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/mbunkus/mkvtoolnix.git"
+	inherit git-r3
+else
+	SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Tools to create, alter, and inspect Matroska files"
+HOMEPAGE="https://mkvtoolnix.download/ https://github.com/mbunkus/mkvtoolnix"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug pch test qt5"
+
+# check NEWS.md for build system changes entries for boost/libebml/libmatroska
+# version requirement updates and other packaging info
+RDEPEND="
+	>=dev-libs/boost-1.49.0:=
+	>=dev-libs/libebml-1.3.5:=
+	dev-libs/jsoncpp:=
+	dev-libs/pugixml
+	media-libs/flac
+	>=media-libs/libmatroska-1.4.8:=
+	media-libs/libogg
+	media-libs/libvorbis
+	sys-apps/file
+	sys-libs/zlib
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtconcurrent:5
+		dev-qt/qtmultimedia:5
+	)
+"
+DEPEND="${RDEPEND}
+	dev-ruby/rake
+	sys-devel/gettext
+	virtual/pkgconfig
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	app-text/po4a
+	test? ( dev-cpp/gtest )
+"
+
+DOCS="AUTHORS NEWS.md README.md"
+
+pkg_pretend() {
+	# https://bugs.gentoo.org/419257
+	local ver=4.6
+	local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
+	if ! version_is_at_least ${ver} $(gcc-version); then
+		eerror ${msg}
+		die ${msg}
+	fi
+}
+
+src_prepare() {
+	default
+	[[ ${PV} == "9999" ]] && { ./autogen.sh || die; }
+}
+
+src_configure() {
+	local myconf
+
+	if use qt5 ; then
+		# ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
+		myconf+=(
+			--with-moc=/usr/$(get_libdir)/qt5/bin/moc
+			--with-uic=/usr/$(get_libdir)/qt5/bin/uic
+			--with-rcc=/usr/$(get_libdir)/qt5/bin/rcc
+			--with-qmake=/usr/$(get_libdir)/qt5/bin/qmake
+		)
+	fi
+
+	econf \
+		$(use_enable debug) \
+		$(use_enable qt5 qt) \
+		$(usex pch "" --disable-precompiled-headers) \
+		"${myconf[@]}" \
+		--disable-update-check \
+		--disable-optimization \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--with-boost="${EPREFIX}"/usr \
+		--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_compile() {
+	rake V=1 -j$(makeopts_jobs) || die
+}
+
+src_test() {
+	rake V=1 -j$(makeopts_jobs) tests:unit || die
+	rake V=1 -j$(makeopts_jobs) tests:run_unit || die
+}
+
+src_install() {
+	DESTDIR="${D}" rake -j$(makeopts_jobs) install || die
+
+	einstalldocs
+	doman doc/man/*.1
+}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-9.6.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-9.6.0.ebuild
new file mode 100644
index 000000000000..f8a9580b5300
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-9.6.0.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils multilib toolchain-funcs versionator multiprocessing autotools
+
+DESCRIPTION="Tools to create, alter, and inspect Matroska files"
+HOMEPAGE="https://mkvtoolnix.download/"
+SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="curl debug pch test qt5"
+
+ruby_atom() {
+	local ruby_slot=${1/ruby/}
+	ruby_slot="${ruby_slot:0:1}.${ruby_slot:1:2}"
+	echo "dev-lang/ruby:${ruby_slot}"
+}
+
+# hacks to avoid using the ruby eclasses since this requires something similar
+# to the python-any-r1 eclass for ruby which currently doesn't exist
+RUBY_IMPLS=( ruby24 ruby23 ruby22 ruby21 )
+RUBY_BDEPS="$(for ruby_impl in "${RUBY_IMPLS[@]}"; do
+	echo "( $(ruby_atom ${ruby_impl}) virtual/rubygems[ruby_targets_${ruby_impl}] )"; done)"
+
+RDEPEND="
+	>=dev-libs/boost-1.46.0:=
+	>=dev-libs/libebml-1.3.3:=
+	dev-libs/pugixml
+	media-libs/flac
+	>=media-libs/libmatroska-1.4.4:=
+	media-libs/libogg
+	media-libs/libvorbis
+	sys-apps/file
+	sys-libs/zlib
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="${RDEPEND}
+	|| ( ${RUBY_BDEPS} )
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( dev-cpp/gtest )
+"
+
+pkg_pretend() {
+	# https://bugs.gentoo.org/419257
+	local ver=4.6
+	local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
+	if ! version_is_at_least ${ver} $(gcc-version); then
+		eerror ${msg}
+		die ${msg}
+	fi
+}
+
+src_prepare() {
+	local ruby_impl
+	for ruby_impl in "${RUBY_IMPLS[@]}"; do
+		if has_version "$(ruby_atom ${ruby_impl})"; then
+			export RUBY=${ruby_impl}
+			break
+		fi
+	done
+	[[ -z ${RUBY} ]] && die "No available ruby implementations to build with"
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if use qt5 ; then
+		# ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
+		myconf+=(
+			--with-moc=/usr/$(get_libdir)/qt5/bin/moc
+			--with-uic=/usr/$(get_libdir)/qt5/bin/uic
+			--with-rcc=/usr/$(get_libdir)/qt5/bin/rcc
+		)
+	fi
+
+	econf \
+		$(use_enable debug) \
+		$(use_enable qt5 qt) \
+		$(use_with curl) \
+		$(usex pch "" --disable-precompiled-headers) \
+		"${myconf[@]}" \
+		--disable-optimization \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--with-boost="${EPREFIX}"/usr \
+		--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_compile() {
+	"${RUBY}" ./drake V=1 -j$(makeopts_jobs) || die
+}
+
+src_test() {
+	"${RUBY}" ./drake V=1 -j$(makeopts_jobs) tests:unit || die
+	"${RUBY}" ./drake V=1 -j$(makeopts_jobs) tests:run_unit || die
+}
+
+src_install() {
+	DESTDIR="${D}" "${RUBY}" ./drake -j$(makeopts_jobs) install || die
+
+	dodoc AUTHORS ChangeLog README.md
+	doman doc/man/*.1
+}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
new file mode 100644
index 000000000000..e3d6a0086ae4
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs versionator multiprocessing
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/mbunkus/mkvtoolnix.git"
+	inherit git-r3
+else
+	SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Tools to create, alter, and inspect Matroska files"
+HOMEPAGE="https://mkvtoolnix.download/ https://github.com/mbunkus/mkvtoolnix"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug pch test qt5"
+
+# check NEWS.md for build system changes entries for boost/libebml/libmatroska
+# version requirement updates and other packaging info
+RDEPEND="
+	>=dev-libs/boost-1.49.0:=
+	>=dev-libs/libebml-1.3.5:=
+	dev-libs/jsoncpp:=
+	dev-libs/pugixml
+	media-libs/flac
+	>=media-libs/libmatroska-1.4.7:=
+	media-libs/libogg
+	media-libs/libvorbis
+	sys-apps/file
+	sys-libs/zlib
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtconcurrent:5
+		dev-qt/qtmultimedia:5
+	)
+"
+DEPEND="${RDEPEND}
+	dev-ruby/rake
+	sys-devel/gettext
+	virtual/pkgconfig
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	app-text/po4a
+	test? ( dev-cpp/gtest )
+"
+
+DOCS="AUTHORS NEWS.md README.md"
+
+pkg_pretend() {
+	# https://bugs.gentoo.org/419257
+	local ver=4.6
+	local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
+	if ! version_is_at_least ${ver} $(gcc-version); then
+		eerror ${msg}
+		die ${msg}
+	fi
+}
+
+src_prepare() {
+	default
+	[[ ${PV} == "9999" ]] && { ./autogen.sh || die; }
+}
+
+src_configure() {
+	local myconf
+
+	if use qt5 ; then
+		# ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
+		myconf+=(
+			--with-moc=/usr/$(get_libdir)/qt5/bin/moc
+			--with-uic=/usr/$(get_libdir)/qt5/bin/uic
+			--with-rcc=/usr/$(get_libdir)/qt5/bin/rcc
+			--with-qmake=/usr/$(get_libdir)/qt5/bin/qmake
+		)
+	fi
+
+	econf \
+		$(use_enable debug) \
+		$(use_enable qt5 qt) \
+		$(usex pch "" --disable-precompiled-headers) \
+		"${myconf[@]}" \
+		--disable-update-check \
+		--disable-optimization \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--with-boost="${EPREFIX}"/usr \
+		--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_compile() {
+	rake V=1 -j$(makeopts_jobs) || die
+}
+
+src_test() {
+	rake V=1 -j$(makeopts_jobs) tests:unit || die
+	rake V=1 -j$(makeopts_jobs) tests:run_unit || die
+}
+
+src_install() {
+	DESTDIR="${D}" rake -j$(makeopts_jobs) install || die
+
+	einstalldocs
+	doman doc/man/*.1
+}
diff --git a/media-video/motion/Manifest b/media-video/motion/Manifest
new file mode 100644
index 000000000000..e836ae6712bb
--- /dev/null
+++ b/media-video/motion/Manifest
@@ -0,0 +1,12 @@
+AUX motion.conf 37 SHA256 9fa49bb51e130b618587c9d002143d42d18a8aa91d92ecb0353d007879e78982 SHA512 06e2dd29b946f35c78e7cf0ddeca727ca7f3f84e57e38b6688b2a493d487061ea6c959c5b365305a7813e0d3315f719003c681c26265566f46faa6ff88606853 WHIRLPOOL a7670aa307d66e97488a31929094fb8bf3cb16da9bd339a01a7ec76a3f597bd3654f9d4876efcef6e9ed13f37cfcfe522d3cb95a264e12950f582b190a7a50e8
+AUX motion.confd 99 SHA256 c43ac28bcf76d96b105a03d0d3685688c5f731894bf68a501706681bba76b060 SHA512 b0135b220ac2f1857012455726fb5c5aaa73a79f864619cb7fbfbb1e8aaf95b0c4dd51bbc30f29714cc29a271f9196f3d92e160fa75a90ccbcf0024640620d5d WHIRLPOOL fc69fca880a1f6b53d216b2ca7ffba73041f696e64a9df6986ec98bc49306d0770d8b7164c17c1961bb5300cc5bb4c7665d0aad5418f2645cf1cb561743774ee
+AUX motion.confd-r1 272 SHA256 4c6eae3fa79e7d4d736a8e4468cbd2e1e683bd3fc8d815c023f5be1a838acbd2 SHA512 8a67b5b0360924e58ba3136a737ce73bb43201a49b2b6e2c632426561b830f6ab55cbbeaa89be7f1683aa8fd322b4f31b9f560e67a93eaceb964c9f56ceef363 WHIRLPOOL cb2fe0ec0409c0c80961373516391c28e29ea111c05f6344323f977c746cd4f23c6e4185ead4b3f8906d848d763e1e813bc646b1e1724716293923de38901005
+AUX motion.initd-r3 1163 SHA256 8d8029a51db4fccac5f8e653b206dbab49c9f77cbf2183e9f3c23ec451d9764c SHA512 7c7201768fd868f851bb35b8df5e22d43688f1729178fd94d10f21436db6d5c178811bcef8b51c5b79b426bb92d542892edd65ee0414acaa799639a3a226934e WHIRLPOOL afd19cb742fbf88c0b76dcb1190771e16e611757cc04c8c68e2ca621cfb0386041bef954954617ef81451a49dc2c6f8c3ae615d14a7a7910ef764403009346ee
+AUX motion.service 356 SHA256 8db64c7eaa9190e8c8dc7403a3051f703067e823b88f05ae484193e659901584 SHA512 03f875b1e0c7051496eaa28a0af50164b20c6f7646d40ec09e1a360e81747135299fe092c91e57a28464bac826a0ace54267ceecd9abf41e63fe505d58ecf7ed WHIRLPOOL ad8f4505b02ce0badb588c057c5e2a5c14118694ce33f62dd6eab033b415b0d9e32932298a362830ef60f43bb1d281aa7953c196c7e6444082f5f90ced1c7398
+AUX motion_at.service 366 SHA256 114a6a7bea8ac5bf94d855def00d3ccc3b9028d43d8c25a49fc36a9292b7eef4 SHA512 589508e6886683300d909bab0a8c625af72e5802e655877039799891efe92534ca1690e4103679592924d0530c0ba2fa107e85eed99537897d3c7071371a5921 WHIRLPOOL 84a9cf175cad5667377443afbe0533c46bd46c58f3e0cb05fa60e9e11bf5555da770c9cc8d1d58ab8eef6d27d712a514f82fc001f6f9dcc0998b963ffc6f6714
+DIST release-4.0.1.tar.gz 444779 SHA256 2f67669a09ce0481ecd987028dae1c5cb135dfdc3c254c06ab7c9ca0c6c183f0 SHA512 6ccde3890e6af56f28208321987dd1b9d62a55bbe7cbc3ab5600263602e6e8f47589392c2f3a3a6cb54f927ee76aea94d0e83f26ce8e4047890c891b6c2f8976 WHIRLPOOL 425587a1ff52edadddbdc7fd65cdb015324b99514128d3810a6d1bb6d2cd2f1c5daea03c1db0c4a89679358793f9201156dd821ce795d704ede12bdb151fafdd
+EBUILD motion-4.0.1-r1.ebuild 1979 SHA256 87e2b3ab5324880e807f106580c188aedf93b6558710e601eb7c9826a8fb1706 SHA512 336da1d0dc347fa610bd810c309dedf82e66137723decba9edaeb44ae68ad0f490483f722fce267f1de8a70406698f6f5701711ec00b11d25cdba1a2a6cb5d95 WHIRLPOOL e5992ed45f7269bcea86b1cf58328e25655ecc6f2fb34154c3de1d2e866b2196e06f30565418e05b2fd1a8ca5d43bd8ca3cc2e14eea40a344deeca06dbcc1bc9
+EBUILD motion-4.0.1-r2.ebuild 2011 SHA256 715ffb7b0df4dcbdceabb562044c69e7518cd918e7721da11e1d8dcffbb6d36a SHA512 6429e44d029443192c347ae8d0f309244cc63cc67ccf46b9f78c678c7621c808d085fca85d0120da71964d323e10d817c835513ef0a1fb5857be4b4aea36a305 WHIRLPOOL 48d2186334e72bd325bad35ed4d57534593e9f5b6abea34912254a36896bdebbf51f20050148891345a692c9e5ec38be335b1edaebada3bfaccbaf484c744acd
+MISC ChangeLog 2871 SHA256 187c96c7ec40c302954a5e50cbb5827061eee92739ff54bdbe3e2c4b537ce576 SHA512 fa80810fd60e9deb6464618e791a7f12aae063e72152985bcca1a615afde3218ee8efdbd846fd08a084f0ad7bd2909c57b2fa395fb0ee4f8d35d51dcf4e76ac4 WHIRLPOOL a924ffff89be05b6d7db98e92a579d536109f85accbcef7e857e29d55d3f786d566e8fa50a1cd07c15c0509ec5c73d51dbff310b541c835afe9037fb4b095569
+MISC ChangeLog-2015 7979 SHA256 a093b773890873949fa46c54993707771f63a6520ce69fc1cfe8da9bba86f84b SHA512 0e844c2d4dec6929faf64b22b799bb341df64722bc761c5dc984ae55851f3b499cf5d8fe12512e6967051681277c3987a73cafb41d8cdeb97bf2052a997a6bb9 WHIRLPOOL 681f21013235f53a853348aec987581dfe45247020dd66695099b12dbd60c86d2763564250e714fbfa9555f2834f32b38765f9dbfdaa121ed20444647e3b7cc8
+MISC metadata.xml 688 SHA256 300730aa77ffd02dd8e26e35f93de47f85708ae6b98944827244bf4485a4321b SHA512 f69d8539a16d80a49c147a60f8e831a245814c4853383f9991f4c2762aa2d1b7f22b8993eb7184a49c6c783b75d23ef91a10b6293563aa7e29f561f40fad56d1 WHIRLPOOL 30c546396ba6baa85b9172737a080dbbcc2a457d8252fb6e0c7daf5123deb755ca258f0cb8b593071ab8bcada4f6ec0e33050700802388124a80f60f2268e6f5
diff --git a/media-video/motion/files/motion.conf b/media-video/motion/files/motion.conf
new file mode 100644
index 000000000000..f032d874f0ca
--- /dev/null
+++ b/media-video/motion/files/motion.conf
@@ -0,0 +1 @@
+d /var/lib/motion/ 0750 motion video
diff --git a/media-video/motion/files/motion.confd b/media-video/motion/files/motion.confd
new file mode 100644
index 000000000000..f79c97aee968
--- /dev/null
+++ b/media-video/motion/files/motion.confd
@@ -0,0 +1,4 @@
+# Set the user and group under which motion will be ran
+
+MOTION_USER="motion"
+MOTION_GROUP="video"
diff --git a/media-video/motion/files/motion.confd-r1 b/media-video/motion/files/motion.confd-r1
new file mode 100644
index 000000000000..dfff31beb45d
--- /dev/null
+++ b/media-video/motion/files/motion.confd-r1
@@ -0,0 +1,9 @@
+# Set the user and group under which motion will be run
+MOTION_USER="motion"
+MOTION_GROUP="video"
+
+# Set the the directory for storing the pidfile
+MOTION_RUN_DIR="/var/run/motion"
+
+# Set the the working directory for storing images/videos
+MOTION_LIB_DIR="/var/lib/motion"
diff --git a/media-video/motion/files/motion.initd-r3 b/media-video/motion/files/motion.initd-r3
new file mode 100644
index 000000000000..2b474fc56f9a
--- /dev/null
+++ b/media-video/motion/files/motion.initd-r3
@@ -0,0 +1,42 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="reload"
+
+depend() {
+	need modules
+	after mysql
+}
+
+checkconfig() {
+	export MOTION_RUN_DIR="${MOTION_RUN_DIR:-/var/run/motion}"
+	checkpath -d -m 750 -o "${MOTION_USER:-motion}:${MOTION_GROUP:-video}" "${MOTION_RUN_DIR}"
+	export MOTION_LIB_DIR="${MOTION_LIB_DIR:-/var/lib/motion}"
+	checkpath -d -m 750 -o "${MOTION_USER:-motion}:${MOTION_GROUP:-video}" "${MOTION_LIB_DIR}"
+	return 0
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting motion detection"
+	start-stop-daemon --start -u "${MOTION_USER}" -g "${MOTION_GROUP}" -d "${MOTION_LIB_DIR}" --quiet --exec /usr/bin/motion -- -b -p "${MOTION_RUN_DIR}/motion.pid"
+	eend $?
+}
+
+stop() {
+	checkconfig || return 1
+
+	ebegin "Stopping motion detection"
+	start-stop-daemon --stop --quiet --exec /usr/bin/motion --pidfile "${MOTION_RUN_DIR}/motion.pid"
+	eend $?
+}
+
+reload() {
+	checkconfig || return 1
+
+	ebegin "Reloading motion detection configuration"
+	start-stop-daemon --stop --signal HUP --exec /usr/bin/motion --pidfile "${MOTION_RUN_DIR}/motion.pid"
+	eend $?
+}
diff --git a/media-video/motion/files/motion.service b/media-video/motion/files/motion.service
new file mode 100644
index 000000000000..559b94b6b29a
--- /dev/null
+++ b/media-video/motion/files/motion.service
@@ -0,0 +1,20 @@
+[Unit]
+Description=Motion detection daemon
+After=local-fs.target network.target
+Documentation=man:motion(1)
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/motion -n -c /etc/motion/motion.conf
+StandardError=null
+
+User=motion
+Group=video
+
+#RuntimeDirectory=motion
+#RuntimeDirectoryMode=0750
+
+WorkingDirectory=/var/lib/motion
+
+[Install]
+WantedBy=multi-user.target
diff --git a/media-video/motion/files/motion_at.service b/media-video/motion/files/motion_at.service
new file mode 100644
index 000000000000..87df91132486
--- /dev/null
+++ b/media-video/motion/files/motion_at.service
@@ -0,0 +1,20 @@
+[Unit]
+Description=Motion detection daemon for %I
+After=local-fs.target network.target
+Documentation=man:motion(1)
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/motion -n -c /etc/motion/motion-%i.conf
+StandardError=null
+
+User=motion
+Group=video
+
+#RuntimeDirectory=motion
+#RuntimeDirectoryMode=0750
+
+WorkingDirectory=/var/lib/motion
+
+[Install]
+WantedBy=multi-user.target
diff --git a/media-video/motion/metadata.xml b/media-video/motion/metadata.xml
new file mode 100644
index 000000000000..e02a13726c5e
--- /dev/null
+++ b/media-video/motion/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>vilhelm.gray@gmail.com</email>
+		<name>William Breathitt Gray</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="mmal">Enables Multi-Media Abstraction Layer (MMAL) decoding support: Available e.g. on the Raspberry Pi.</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">Motion-Project/motion</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/motion/motion-4.0.1-r1.ebuild b/media-video/motion/motion-4.0.1-r1.ebuild
new file mode 100644
index 000000000000..d22071452593
--- /dev/null
+++ b/media-video/motion/motion-4.0.1-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools readme.gentoo-r1 user systemd
+
+DESCRIPTION="A software motion detector"
+HOMEPAGE="https://motion-project.github.io"
+SRC_URI="https://github.com/Motion-Project/${PN}/archive/release-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="ffmpeg libav mmal mysql postgres v4l"
+
+RDEPEND="
+	ffmpeg? (
+		libav? ( media-video/libav:= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	virtual/jpeg:=
+	mmal? ( media-libs/raspberrypi-userland )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )
+"
+DEPEND="${RDEPEND}
+	v4l? ( virtual/os-headers media-libs/libv4l )
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="You need to setup /etc/${PN}/${PN}.conf before running
+${PN} for the first time. You can use /etc/${PN}/${PN}-dist.conf as a
+template. Please note that the 'daemon' and 'process_id_file' settings
+are overridden by the bundled OpenRC init script and systemd unit where
+appropriate.
+
+To install ${PN} as a service, use:
+rc-update add ${PN} default # with OpenRC
+systemctl enable ${PN}.service # with systemd
+"
+
+pkg_setup() {
+	enewuser ${PN} -1 -1 -1 video
+}
+
+S="${WORKDIR}"/${PN}-release-${PV}
+
+src_prepare() {
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with ffmpeg) \
+		$(use_with mmal) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with v4l) \
+		--without-optimizecpu
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		docdir=/usr/share/doc/${PF} \
+		examplesdir=/usr/share/doc/${PF}/examples \
+		install
+
+	newinitd "${FILESDIR}"/${PN}.initd-r3 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_dounit "${FILESDIR}"/${PN}_at.service
+	systemd_dotmpfilesd "${FILESDIR}"/${PN}.conf
+
+	keepdir /var/lib/motion
+	fowners motion:video /var/lib/motion
+	fperms 0750 /var/lib/motion
+
+	readme.gentoo_create_doc
+}
diff --git a/media-video/motion/motion-4.0.1-r2.ebuild b/media-video/motion/motion-4.0.1-r2.ebuild
new file mode 100644
index 000000000000..362423c2bc6f
--- /dev/null
+++ b/media-video/motion/motion-4.0.1-r2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools readme.gentoo-r1 user systemd
+
+DESCRIPTION="A software motion detector"
+HOMEPAGE="https://motion-project.github.io"
+SRC_URI="https://github.com/Motion-Project/${PN}/archive/release-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ffmpeg libav mmal mysql postgres v4l"
+
+RDEPEND="
+	ffmpeg? (
+		libav? ( media-video/libav:= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	virtual/jpeg:=
+	mmal? ( media-libs/raspberrypi-userland )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )
+"
+DEPEND="${RDEPEND}
+	v4l? ( virtual/os-headers media-libs/libv4l )
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+You need to setup /etc/${PN}/${PN}.conf before running ${PN} for
+the first time. You can use /etc/${PN}/${PN}-dist.conf as a template.
+Please note that the 'daemon' and 'process_id_file' settings are
+overridden by the bundled OpenRC init script and systemd unit where
+appropriate.
+
+To install ${PN} as a service, use:
+rc-update add ${PN} default # with OpenRC
+systemctl enable ${PN}.service # with systemd
+"
+
+pkg_setup() {
+	enewuser ${PN} -1 -1 -1 video
+}
+
+S="${WORKDIR}"/${PN}-release-${PV}
+
+src_prepare() {
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with ffmpeg) \
+		$(use_with mmal) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with v4l) \
+		--without-optimizecpu
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		docdir=/usr/share/doc/${PF} \
+		examplesdir=/usr/share/doc/${PF}/examples \
+		install
+
+	newinitd "${FILESDIR}"/${PN}.initd-r3 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd-r1 ${PN}
+
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_dounit "${FILESDIR}"/${PN}_at.service
+	systemd_dotmpfilesd "${FILESDIR}"/${PN}.conf
+
+	keepdir /var/lib/motion
+	fowners motion:video /var/lib/motion
+	fperms 0750 /var/lib/motion
+
+	readme.gentoo_create_doc
+	readme.gentoo_print_elog
+}
diff --git a/media-video/motiontrack/Manifest b/media-video/motiontrack/Manifest
new file mode 100644
index 000000000000..270d15714d07
--- /dev/null
+++ b/media-video/motiontrack/Manifest
@@ -0,0 +1,5 @@
+DIST motiontrack-0.1.3.tar.gz 136592 SHA256 57bd0e19f4e2a1bbb8c0e5b5143592d26f0d9fdd31f62ab6968c71a3f9e7d859 SHA512 edda7e6019aab95ed93ae82ac4a09a763442073ba0eb5e9476daacbfdd0421019a3a0fd99ee2fa0a1930c69925e1494a2e2954bcefc0865d9f1d2f84cec15c0d WHIRLPOOL 5bca08db13bf243bea307ab162ba7e0c395f00aca2b756daeba3185015eae4a00ca66e29952c9fe8c4bfa3372524b379a98688d6a2d4bd7a056e2e51ebe592e5
+EBUILD motiontrack-0.1.3-r1.ebuild 826 SHA256 89fee6d2d70ab69c6db2188fec7c3afdc0b66cbc4624dd8467dabe2a44970063 SHA512 343400bdae71751221a1a4a7489241a0a12931f35a9a040a0f1e4f409b9a0b70881c65af6bb4f0184002b59e44f5dffb0b72ac41328f09a65fcb1cd8cdc536b7 WHIRLPOOL bffdd77d2f65e8b06f1ce9dd7d8e728dac113ce636b687c1c673224636ad630caed5fe1032592e337db0c4622ecf05e4d619f2c4900a948381e214de38e3cb19
+MISC ChangeLog 3339 SHA256 241fb3a55ba10d1cbb610a0fa49172b84bdba16641b4007e1b151146bdda92a0 SHA512 956e778cb669b64ebac948289f1e46161fd6f16ad084a6693e0b5cea4e649c0001842858bc43b7fd5870334af0267adc2163d58c4c1cb1bd6b5ddad313231010 WHIRLPOOL 11a0452cb7754e64bf856846cec465061949d70b61b3b311c813813601975aef23a5704aa4a45cd92becac177475c913ca9be621865bf1c30d3b9d9557acaec7
+MISC ChangeLog-2015 2074 SHA256 d6ca0fe5c233e33cf23f7105f891a6e962128a9c52417ea4f2ce2f874265aefd SHA512 95ceb71ab6eaac55781ef71ad89917cfc48c1758d9435df8812e6c0c4cc7d9202dfb2874d75d9c66677fd7715931cfead51f44faa9d744cf0df932e3475b952f WHIRLPOOL 242c447211f4df38469bdde1050caf2892a9e5d71e3e2ad23da4bae01d91865c2211790dc779ff1fa67b58d40d5dbd3ed58081f45373cb0fc574e21c3d2e2623
+MISC metadata.xml 435 SHA256 9e19ebc4598d55d11d37cea04dde43fb8b48df9e32af8beb01af067ef6e2fbeb SHA512 ac216d99f9648a27fc5f15ed15df4d28c59e14a4a4662732fd52e75bb725841cfa4a04e8d001a6631f4182116b418ed57e7a3bb858f36a69b1a29326046033cd WHIRLPOOL 91e4ce3470c6a528e3707f0cc95d7136cd6faa9d06239e2cbe8a123c222858519dec74ed63609b91c368d9227597b9796ea12201cf980978790dd330fced1e32
diff --git a/media-video/motiontrack/metadata.xml b/media-video/motiontrack/metadata.xml
new file mode 100644
index 000000000000..4ce513c025e4
--- /dev/null
+++ b/media-video/motiontrack/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>media-video@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="multiprocess">Enables multi-process support (SMP/cluster) for motiontrack programs</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">motiontrack</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-video/motiontrack/motiontrack-0.1.3-r1.ebuild b/media-video/motiontrack/motiontrack-0.1.3-r1.ebuild
new file mode 100644
index 000000000000..016434aac7e3
--- /dev/null
+++ b/media-video/motiontrack/motiontrack-0.1.3-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+DESCRIPTION="A set of tools that detect motion between two images"
+SRC_URI="http://gemia.de/motion/${P}.tar.gz"
+HOMEPAGE="http://motiontrack.sourceforge.net"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~ppc64 ~sparc ~mips ~alpha ~hppa ~amd64"
+
+IUSE="debug imagemagick multiprocess"
+
+RDEPEND="
+	imagemagick? ( media-gfx/imagemagick )
+	!imagemagick? ( media-libs/gd )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	# fix missing inline definition
+	# with GCC 5, bug 570352
+	append-cflags -std=gnu89
+
+	econf \
+		$(use_enable debug) \
+		$(use_enable !imagemagick gd) \
+		$(use_enable imagemagick magick) \
+		$(use_enable multiprocess cluster)
+}
+
+src_install() {
+	default
+	dodoc src/TheCode.txt
+}
diff --git a/media-video/movit/Manifest b/media-video/movit/Manifest
new file mode 100644
index 000000000000..5578202e17fc
--- /dev/null
+++ b/media-video/movit/Manifest
@@ -0,0 +1,23 @@
+AUX movit-fix-locale.patch 556 SHA256 eb65b8e72981d8c288f24144838bdbbdcb9106c22ae462c574e241dad43ab5f2 SHA512 5a9d94a5b7404fd327412bd8b994710158e1d81fcbfda39b372dc2d89d592b87e3f067970dc73c68c7c335f8cd2adddb5a108068f13c506e850e4fac69bab819 WHIRLPOOL 9b3bab50e0d2a010de2486d77fd41e4202fd6540d11c9c24433e61f4ce41c5f745122ea2ddcc2450750f2dc3dfceb98ea921122a79ce43d8aa71173321a9b2ce
+DIST gtest-1.7.0.zip 1164254 SHA256 247ca18dd83f53deb1328be17e4b1be31514cedfc1e3424f672bf11fd7e0d60d SHA512 8859369f2dd32cbc2ac01aba029aa3ff20a321f40658b9643aff442d34c33468221866b801b28c66a28af47dbcd362d26941fc98db92b6efb7e41ea5b7be1a07 WHIRLPOOL 0c31a385159551859c1afe76480b3fb1b560d666db9a0afc5cbda92bcd53bf129f85a8f902c6ded0779c2b4c49aacec59ba5a4d5ce316a07bf08174f4fc64049
+DIST movit-1.2.0.tar.gz 534145 SHA256 aeda1212288277ca136f2483765577a43ebd718be835dde73d81cf4b682fd473 SHA512 7c75ae60e2b5248e2691074d67005728555d6b7fea320ac9d7bcd401c1640467f18f78e446e57894d9b3b3b6a597ee0603ccdd963f21a408e96c7f0d0f5ac154 WHIRLPOOL 3b937f8964e79066f2b9811f80d0bd8d97375d3a2154a8763f5caac0a416432c6229de7c711edd606f1d7b7970ba2da97b2b2647b61b435a677267c0d24187ac
+DIST movit-1.3.0.tar.gz 546075 SHA256 6a4b4fd6a49d6231d0ab84a2b98c822ed67bb32a803eea5a985557094b84abb3 SHA512 fea5419c4e5034f8e43d0a88845e6bdbd0b7b45bd2517368e8575432c564a62a3b14e290bc2751f046c5345c4dd64961f1829eb0b238237fbb1e09da58686658 WHIRLPOOL 3ad785ec72aca7aa8e24e448478ccf663c4f63dc638b24c574e688dd9d0aeb41d3ad357033d8e9e73749e1bab62cb5443ae74a6225250dbc24d6ff7f20310885
+DIST movit-1.3.1.tar.gz 574203 SHA256 8755d1a93b923dac21897faad883fec3aa793cb04938e05b16d96422ec7a664f SHA512 44610609ab85a8684e7e1469d50f4e6fa3a786e9bdeba58ccbb093c2312572b01e710ddec598e765bf81fa504bb31455ae430959180f326463da7a535d20b01b WHIRLPOOL 3f772cbd259a2600e850a42dca75a39569b3194ecc82c2337ffb23245a12fe5e0a9bcaec71ecbb2ccfe737d868bc0695c2c48eef6a4f35447f67742e4983784c
+DIST movit-1.3.2.tar.gz 574225 SHA256 1d41043e8db1363c69b897c970f5740b583ad9c1b6923ebe97790b8f9e72ed66 SHA512 662cf88cf294b9e2b3172ec02f74766a6dc36b28f3057894bd46090dfa26afc24219155f23225434244543238a1df37c039ad73f2de3aae8346a3d9a8aee23c7 WHIRLPOOL c038fb2e2b1f7e97661732f287969cbcfaf4aacf29fdc0ef1408efc1ded72d0ff2c3e5a65c8df15af0a8f47ace534e66656bd5fe5cb84f37c96c43f224d7d32c
+DIST movit-1.4.0.tar.gz 578195 SHA256 cc6bbcd0c907f47cfa7bb3401a30bda849e6a0de2a3ed5c895badbc116d51512 SHA512 01d7609bca86415b1dd3169430691d109a3c516485f0a8b7b854258ee60da363571bff8f90e675adc3620005ec8e1c4191deb1a578f369f0ab55d2de6635c6da WHIRLPOOL 0396f0e9e6cdcbeb7e2a2dd09f57917109bd7a1927335e3e467d7b5e9d7b18200fce1271671a2eb755fd0e3de8dd8536186506e55cd06bfc31cff9a2d77f2ded
+DIST movit-1.5.0.tar.gz 941449 SHA256 4d595a20b7d836aca10b362bb2003ed958b337d643bb93f4973bc07e8bbf90e7 SHA512 9552791f5bd6723bae23acf869b6438934b595084f00e60fb31dda08ecb28623ff2457511004fcbf985307091734089b2d546bc03973c60177e836c2b43a02fd WHIRLPOOL 226c28835c3c6be3dc4a6cafdd986a1b007fa64e3e1b5d45d3fd132c366785a8e781bc795b67504e9784f04856bd0f8ee4f5fa7ab7a9477dbf220a154b85fc85
+DIST movit-1.5.1.tar.gz 969481 SHA256 8434edd81c2226c8d6fa7f4715b0d4818bb76cbceafa632b99f9c61e058ea988 SHA512 2aa35cb05374a0b6a74eaeccf8a50d382684c16c47f6be43139ebeac9f6399bd4f6a22cbd27bbb4a78fce48f3357199ea51a53b168719ece624018ae4c620c4a WHIRLPOOL 771f91dddc44e0a3c43eba6a06558b3866e94362c48f501ee9e881795ee0890a47eb2a9375338bdbcb7937144a97dc4608a91e182e84c2efe231d738c6ccc919
+DIST movit-1.5.2.tar.gz 852983 SHA256 872ee2cd634527b505d631eea0b3e20e7155d6a260db11cb347a2a7a52fd6a8c SHA512 96cf5e985f32bd3b278fa6cb4a83d2220337f5efc2c1ca636949e257bfa3817dcb5fdf396ec4f9c49469c481225bcb5a4f292a5960ccec1746985714ff8c6618 WHIRLPOOL 5329a8066578f41bc185ca3fe93e9717859a9b1df7277b9ce391c3fcaa2f74f0a465d2b6d7484564f196ad3fe0f37ea2708236e7b3114390002d3c521a8fe02b
+DIST movit-1.5.3.tar.gz 853170 SHA256 ead191d717dbefbe914260ed0335cf04a7dfc6fde8f23293c5ca7f88e45ace81 SHA512 390f893c06c5ea7e0b6c9f5e89db858af53d9926460fb05df2147ec10fe0fc957d211dbcc5d4778dd19f0d94cd5280b015902f796758910347611d817ae8c035 WHIRLPOOL 2eae8e6d46dafe91fd3d58e9a4893fc531af74b671944ae472cb127645b956d4353efbc7d738f2c2f992a2b804654284b81a8116d67152420cce7d83413b97a1
+EBUILD movit-1.2.0.ebuild 741 SHA256 f69d0ce552fb2a4940ef12a0e725e29c2d78a84961be983c8c6407043e4b8cf1 SHA512 0b7c9a076764cc9d38a5cbc6c3b9577fb398c03e849dc4f0e4b4c247e436d9862af602ab1d39703addc5c18e7e9fa661ac7ba41ebc7e25e743dcc423363b2375 WHIRLPOOL de47329af29ac8a5df450c199d775e6b242935c2fb8c238c52a85d6d69c836995dc552f0c57b38b8a6be7ddb753e6f7ed74f18a2aa12eafb45e780cc4b3960af
+EBUILD movit-1.3.0.ebuild 743 SHA256 ab62741f836c7b73771965c48c5bb769bbf3bc341b857badac46368ea0681f80 SHA512 557d4da2bf5bc94a243556361d00d636663a87a89358a4776c91c5de1ce66e9902bdc4eff73c312c58e39e204d490ba3866ef1c29ea103faf300ce8bec160e57 WHIRLPOOL 7bc2bec37ed7edf0a3685b2d36d22730ec5f6cb79cf2a42bcb3e3e62fa94fd2b3dbba1f393946c0acba4405d6e382a7fc14e7cb1866dbbf5b6bc0f7f388fb5b2
+EBUILD movit-1.3.1-r1.ebuild 823 SHA256 afe3fb4f20a8475f94f5cad563ffcb5ace8e11ea73468aa2c45ca66ccdc709eb SHA512 369b689e675ab202d88df62328939d97b153e258421d91775c5a4c9b96ed0529d140cafc44a2a46bbbd4c2d05dad23f39a292d54af0bfe3c235b2e30868ed2eb WHIRLPOOL ee3228f4c527dd29ac239290109bafa7f7759cac1b1078ed1ce830c374b4ea6896c49911848ebc26f604fff745755edd183ebafd6f87dd2b84e75db1a99bd2c4
+EBUILD movit-1.3.2.ebuild 763 SHA256 3bd53bdd88b00864d826dd6f3859a31bac922817b517dc963060ec6a0411d641 SHA512 0061f82a56a48c311700ccef1eb99ad2dcf6869f845611c0eaf67b7db3f1cc43761bb1006e05462682cf419a3cff11ce61ee4ed3f9f8ae01a3f5a8dc569f78c6 WHIRLPOOL 930912822fb4fd44d370cbc92a5ea51b1121ddcf7a70e0737b797d784aae5c53b441706de92abe82065907a08343edd2cdaa7436ca21ffc2e0c10335aebffdeb
+EBUILD movit-1.4.0.ebuild 763 SHA256 3bd53bdd88b00864d826dd6f3859a31bac922817b517dc963060ec6a0411d641 SHA512 0061f82a56a48c311700ccef1eb99ad2dcf6869f845611c0eaf67b7db3f1cc43761bb1006e05462682cf419a3cff11ce61ee4ed3f9f8ae01a3f5a8dc569f78c6 WHIRLPOOL 930912822fb4fd44d370cbc92a5ea51b1121ddcf7a70e0737b797d784aae5c53b441706de92abe82065907a08343edd2cdaa7436ca21ffc2e0c10335aebffdeb
+EBUILD movit-1.5.0.ebuild 763 SHA256 7218bfa0389c162e18875e8d9de833219e071dfcf8bdcd06744b142a99075e5f SHA512 5265ab1aa099af2506d848f8b25995075b0f375e877d264665d953033b3e671f0b179ae955d4f4d6c63de4a6ceb101c4ea4ba5a88f862d51a9283f8d2d6b0b33 WHIRLPOOL 73d995d32b14f2cbdddd8cff8d945d566f0e8c34ebf5d9f0da4893278ee9a5071d74e59f1df784c27f258dd6532d0e7b596ed5f1f3f8a73d26602aff9e595f3c
+EBUILD movit-1.5.1.ebuild 763 SHA256 7218bfa0389c162e18875e8d9de833219e071dfcf8bdcd06744b142a99075e5f SHA512 5265ab1aa099af2506d848f8b25995075b0f375e877d264665d953033b3e671f0b179ae955d4f4d6c63de4a6ceb101c4ea4ba5a88f862d51a9283f8d2d6b0b33 WHIRLPOOL 73d995d32b14f2cbdddd8cff8d945d566f0e8c34ebf5d9f0da4893278ee9a5071d74e59f1df784c27f258dd6532d0e7b596ed5f1f3f8a73d26602aff9e595f3c
+EBUILD movit-1.5.2.ebuild 763 SHA256 7218bfa0389c162e18875e8d9de833219e071dfcf8bdcd06744b142a99075e5f SHA512 5265ab1aa099af2506d848f8b25995075b0f375e877d264665d953033b3e671f0b179ae955d4f4d6c63de4a6ceb101c4ea4ba5a88f862d51a9283f8d2d6b0b33 WHIRLPOOL 73d995d32b14f2cbdddd8cff8d945d566f0e8c34ebf5d9f0da4893278ee9a5071d74e59f1df784c27f258dd6532d0e7b596ed5f1f3f8a73d26602aff9e595f3c
+EBUILD movit-1.5.3.ebuild 763 SHA256 7218bfa0389c162e18875e8d9de833219e071dfcf8bdcd06744b142a99075e5f SHA512 5265ab1aa099af2506d848f8b25995075b0f375e877d264665d953033b3e671f0b179ae955d4f4d6c63de4a6ceb101c4ea4ba5a88f862d51a9283f8d2d6b0b33 WHIRLPOOL 73d995d32b14f2cbdddd8cff8d945d566f0e8c34ebf5d9f0da4893278ee9a5071d74e59f1df784c27f258dd6532d0e7b596ed5f1f3f8a73d26602aff9e595f3c
+MISC ChangeLog 4341 SHA256 127182555f92bd4dbc4e4455a3be5c3b8f8fa2de3f98b0f29a67b75ea746c14f SHA512 fffaf96e7098b0c310fdf26f20b87cb335531af98b95326c46d9605f29b037be51b36db30d06154a57a8b58081af0d6ddaf9e8ed2d525d5fad17eac01c3ebe90 WHIRLPOOL 4feb755372bc8dadbd7bdefb4d1f126176c3ea33d46dcd8ca629f052890b0b18c7ae03886e11b3930da3ba1e9f6ce3f715a0c4db1197ced44195a53dc0a8932b
+MISC ChangeLog-2015 826 SHA256 7c922df1551324f735aa234de5d68222e6bb40da66836b1235050265a5aaf4a6 SHA512 67ce8a80df6f44b310a066fe6f0fa1fd699dce83fb9415905b7d468a43661386660ca15d8e8179d8ef69853f27f07728338bd7f7a636c3806aae4facc6401dcf WHIRLPOOL 8de0834bb28076f694af47e9f65ee7c50daec47e5267ce016e703b7abdc01022c32fefd19752176bb621af73a4226c253de37447ac9af93947af83d54ffd0ce9
+MISC metadata.xml 253 SHA256 0c78fc0afa8613e977eb4628a883b16145da7aadb7d5de8f1c46404cefd75e5b SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1 WHIRLPOOL 7a7e49ac517082517073244d5b110e8f751910e5f5245d52dada566f95f2432696db1747492592bc84b35fdf48e947d2e9aeca6e44f1f2a5076c26f3d6e1870c
diff --git a/media-video/movit/files/movit-fix-locale.patch b/media-video/movit/files/movit-fix-locale.patch
new file mode 100644
index 000000000000..f98c9705e9f9
--- /dev/null
+++ b/media-video/movit/files/movit-fix-locale.patch
@@ -0,0 +1,16 @@
+--- a/init.cpp	2016-02-14 19:53:12.141197530 +0100
++++ b/init.cpp	2016-02-14 19:55:09.374196665 +0100
+@@ -388,7 +388,12 @@
+ 	// Now we have something on the form X.YY. We convert it to a float, and hope
+ 	// that if it's inexact (e.g. 1.30), atof() will round the same way the
+ 	// compiler will.
+-	float glsl_version = atof(glsl_version_str);
++	
++	std::istringstream locale_convert(glsl_version_str);
++	locale_convert.imbue(std::locale("C"));
++	double glsl_version;
++	locale_convert >> glsl_version;	
++	
+ 	free(glsl_version_str);
+ 
+ 	return glsl_version;
diff --git a/media-video/movit/metadata.xml b/media-video/movit/metadata.xml
new file mode 100644
index 000000000000..f3de5f693ed8
--- /dev/null
+++ b/media-video/movit/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>patrick@gentoo.org</email>
+    <name>Patrick Lauer</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/media-video/movit/movit-1.2.0.ebuild b/media-video/movit/movit-1.2.0.ebuild
new file mode 100644
index 000000000000..06615ac1b78f
--- /dev/null
+++ b/media-video/movit/movit-1.2.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# no sane way to use OpenGL from within tests?
+RESTRICT="test"
+
+DESCRIPTION="Modern Video Toolkit"
+HOMEPAGE="http://movit.sesse.net/"
+# Tests need gtest, makefile unconditionally builds tests, so ... yey!
+SRC_URI="http://movit.sesse.net/${P}.tar.gz
+	https://googletest.googlecode.com/files/gtest-1.7.0.zip"
+LICENSE="GPL-2+"
+SLOT="0"
+
+KEYWORDS="amd64 ~ppc64 x86"
+IUSE=""
+
+RDEPEND="media-libs/mesa
+	>=dev-cpp/eigen-3.2.0:3
+	media-libs/libepoxy
+	sci-libs/fftw
+	media-libs/libsdl2
+	"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake
+}
+
+src_test() {
+	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake check
+}
diff --git a/media-video/movit/movit-1.3.0.ebuild b/media-video/movit/movit-1.3.0.ebuild
new file mode 100644
index 000000000000..c725fe3bd85c
--- /dev/null
+++ b/media-video/movit/movit-1.3.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# no sane way to use OpenGL from within tests?
+RESTRICT="test"
+
+DESCRIPTION="Modern Video Toolkit"
+HOMEPAGE="http://movit.sesse.net/"
+# Tests need gtest, makefile unconditionally builds tests, so ... yey!
+SRC_URI="http://movit.sesse.net/${P}.tar.gz
+	https://googletest.googlecode.com/files/gtest-1.7.0.zip"
+LICENSE="GPL-2+"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/mesa
+	>=dev-cpp/eigen-3.2.0:3
+	media-libs/libepoxy
+	sci-libs/fftw
+	media-libs/libsdl2
+	"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake
+}
+
+src_test() {
+	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake check
+}
diff --git a/media-video/movit/movit-1.3.1-r1.ebuild b/media-video/movit/movit-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..cdde0bef6f0d
--- /dev/null
+++ b/media-video/movit/movit-1.3.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+# no sane way to use OpenGL from within tests?
+RESTRICT="test"
+
+DESCRIPTION="Modern Video Toolkit"
+HOMEPAGE="http://movit.sesse.net/"
+# Tests need gtest, makefile unconditionally builds tests, so ... yey!
+SRC_URI="http://movit.sesse.net/${P}.tar.gz
+	https://googletest.googlecode.com/files/gtest-1.7.0.zip"
+LICENSE="GPL-2+"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/mesa
+	>=dev-cpp/eigen-3.2.0:3
+	media-libs/libepoxy
+	sci-libs/fftw
+	media-libs/libsdl2
+	"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/movit-fix-locale.patch"
+}
+
+src_compile() {
+	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake
+}
+
+src_test() {
+	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake check
+}
diff --git a/media-video/movit/movit-1.3.2.ebuild b/media-video/movit/movit-1.3.2.ebuild
new file mode 100644
index 000000000000..cce8b8f3392b
--- /dev/null
+++ b/media-video/movit/movit-1.3.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+# no sane way to use OpenGL from within tests?
+RESTRICT="test"
+
+DESCRIPTION="Modern Video Toolkit"
+HOMEPAGE="http://movit.sesse.net/"
+# Tests need gtest, makefile unconditionally builds tests, so ... yey!
+SRC_URI="http://movit.sesse.net/${P}.tar.gz
+	https://googletest.googlecode.com/files/gtest-1.7.0.zip"
+LICENSE="GPL-2+"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/mesa
+	>=dev-cpp/eigen-3.2.0:3
+	media-libs/libepoxy
+	>=sci-libs/fftw-3
+	media-libs/libsdl2
+	"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake
+}
+
+src_test() {
+	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake check
+}
diff --git a/media-video/movit/movit-1.4.0.ebuild b/media-video/movit/movit-1.4.0.ebuild
new file mode 100644
index 000000000000..cce8b8f3392b
--- /dev/null
+++ b/media-video/movit/movit-1.4.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+# no sane way to use OpenGL from within tests?
+RESTRICT="test"
+
+DESCRIPTION="Modern Video Toolkit"
+HOMEPAGE="http://movit.sesse.net/"
+# Tests need gtest, makefile unconditionally builds tests, so ... yey!
+SRC_URI="http://movit.sesse.net/${P}.tar.gz
+	https://googletest.googlecode.com/files/gtest-1.7.0.zip"
+LICENSE="GPL-2+"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/mesa
+	>=dev-cpp/eigen-3.2.0:3
+	media-libs/libepoxy
+	>=sci-libs/fftw-3
+	media-libs/libsdl2
+	"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake
+}
+
+src_test() {
+	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake check
+}
diff --git a/media-video/movit/movit-1.5.0.ebuild b/media-video/movit/movit-1.5.0.ebuild
new file mode 100644
index 000000000000..299342f9b077
--- /dev/null
+++ b/media-video/movit/movit-1.5.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+# no sane way to use OpenGL from within tests?
+RESTRICT="test"
+
+DESCRIPTION="Modern Video Toolkit"
+HOMEPAGE="http://movit.sesse.net/"
+# Tests need gtest, makefile unconditionally builds tests, so ... yey!
+SRC_URI="http://movit.sesse.net/${P}.tar.gz
+	https://googletest.googlecode.com/files/gtest-1.7.0.zip"
+LICENSE="GPL-2+"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/mesa
+	>=dev-cpp/eigen-3.2.0:3
+	media-libs/libepoxy
+	>=sci-libs/fftw-3
+	media-libs/libsdl2
+	"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake
+}
+
+src_test() {
+	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake check
+}
diff --git a/media-video/movit/movit-1.5.1.ebuild b/media-video/movit/movit-1.5.1.ebuild
new file mode 100644
index 000000000000..299342f9b077
--- /dev/null
+++ b/media-video/movit/movit-1.5.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+# no sane way to use OpenGL from within tests?
+RESTRICT="test"
+
+DESCRIPTION="Modern Video Toolkit"
+HOMEPAGE="http://movit.sesse.net/"
+# Tests need gtest, makefile unconditionally builds tests, so ... yey!
+SRC_URI="http://movit.sesse.net/${P}.tar.gz
+	https://googletest.googlecode.com/files/gtest-1.7.0.zip"
+LICENSE="GPL-2+"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/mesa
+	>=dev-cpp/eigen-3.2.0:3
+	media-libs/libepoxy
+	>=sci-libs/fftw-3
+	media-libs/libsdl2
+	"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake
+}
+
+src_test() {
+	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake check
+}
diff --git a/media-video/movit/movit-1.5.2.ebuild b/media-video/movit/movit-1.5.2.ebuild
new file mode 100644
index 000000000000..299342f9b077
--- /dev/null
+++ b/media-video/movit/movit-1.5.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+# no sane way to use OpenGL from within tests?
+RESTRICT="test"
+
+DESCRIPTION="Modern Video Toolkit"
+HOMEPAGE="http://movit.sesse.net/"
+# Tests need gtest, makefile unconditionally builds tests, so ... yey!
+SRC_URI="http://movit.sesse.net/${P}.tar.gz
+	https://googletest.googlecode.com/files/gtest-1.7.0.zip"
+LICENSE="GPL-2+"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/mesa
+	>=dev-cpp/eigen-3.2.0:3
+	media-libs/libepoxy
+	>=sci-libs/fftw-3
+	media-libs/libsdl2
+	"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake
+}
+
+src_test() {
+	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake check
+}
diff --git a/media-video/movit/movit-1.5.3.ebuild b/media-video/movit/movit-1.5.3.ebuild
new file mode 100644
index 000000000000..299342f9b077
--- /dev/null
+++ b/media-video/movit/movit-1.5.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+# no sane way to use OpenGL from within tests?
+RESTRICT="test"
+
+DESCRIPTION="Modern Video Toolkit"
+HOMEPAGE="http://movit.sesse.net/"
+# Tests need gtest, makefile unconditionally builds tests, so ... yey!
+SRC_URI="http://movit.sesse.net/${P}.tar.gz
+	https://googletest.googlecode.com/files/gtest-1.7.0.zip"
+LICENSE="GPL-2+"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/mesa
+	>=dev-cpp/eigen-3.2.0:3
+	media-libs/libepoxy
+	>=sci-libs/fftw-3
+	media-libs/libsdl2
+	"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake
+}
+
+src_test() {
+	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake check
+}
diff --git a/media-video/mpeg-tools/Manifest b/media-video/mpeg-tools/Manifest
new file mode 100644
index 000000000000..d2dcaaefc22c
--- /dev/null
+++ b/media-video/mpeg-tools/Manifest
@@ -0,0 +1,16 @@
+AUX mpeg-tools-1.5b-64bit_fixes.patch 6986 SHA256 76e8add6d8241898abf20c27ff93655df05ee90866632a0eb852ff6665078d4e SHA512 8d8f596cf39c1e9535ae21f8399136189e0775cbe69146208654bf394b8524932a4961e99061c76ba195c20909ab6dc2f420a12b72862ebbc6c81d7e7c7c6cc6 WHIRLPOOL 45348e3d70ee0f624ce8a16de52ec74164b728a56dad7695066dbae6314e37a4860cf2aca68e2674ec391c219470e53db3b621a4815d4c23a55f0d42e376f432
+AUX mpeg-tools-1.5b-as-needed.patch 1526 SHA256 204f1ca6fc2d30c1bd4c7ed69d2d0fc3792e819bcc31837c945ade680b333961 SHA512 5874d5241ffb9ed6d6bc35774f6e643c141c8ec63811d8f761700acef816911220df20a943c739f4df4ce95783502f8963235ae4ecc0b66bd116a6daaa2aa5d1 WHIRLPOOL 3a0e2fa95b222712c8fee82cdd8d07dc89118db6922d65602308ab8dcfde5ddb3c0513e805930060523e5f0b47d5720b6461e45ca49c6eb809e75f368a836d79
+AUX mpeg-tools-1.5b-build.patch 1414 SHA256 0cbcc0e0de74f02b069059588334ba0766bf74769fdd63d37c1702d2e47eb1e5 SHA512 f2bfe1126926c6473a149ea120898eb252c681808cd2745bed5428164ebeabfb33218cb7f98b4a9930af9d88055ca067129f1a4ffede824d5d6179762f27a4d7 WHIRLPOOL 7360fac65ff398cd0a2ff703c6f81d67b24487ce46e90a06594c888996f5f45d11758acf55a6165851f3ad101c31b09d95c42703c544aa5a788436ac42c16c9e
+AUX mpeg-tools-1.5b-jpeg.patch 1498 SHA256 de0fb57de46db6ee33d901782ffad666b70bfaa39b84277595837726d9486d6e SHA512 9bc509c603e825d94372f866fced352149d5d003c2ee247eb356db22f80bbf6cfbfcaaf03fb7a104ff84548e52f0f3034619e15598d0ae04df36d4b4332ea18b WHIRLPOOL 30fc5fc35fefd40baaa029073a73edbbfd8d50f23ffd989e81726109cde05e1abeeeafd599e0562f149e10a332077e9a0097cb00dd92e7025539d3d154b79617
+AUX mpeg-tools-1.5b-powerpc.patch 1041 SHA256 93c04d75cd216d2d24500db785f8c91821c46f579f8771f24c1ea9babbe5b0a1 SHA512 f0ee310dce12d9137186b7d99aa88282cb65838855820ad3642bf090194be07d5f6cfef509561d1e097a938e68a6c2f8c61536a1921d08df458c66b83c6eaeca WHIRLPOOL 373b714f251bd9538898b74bf701e1913729b6120b3260fcdc649093566813f6f86499d6b2484b36537c25e493102af3534bd82a18e877209f6bf3105b5eb845
+AUX mpeg-tools-1.5b-system-jpeg-7.patch 907 SHA256 de0815e2f9be14761b25cef0a6602d79eaed47411ce1148c4e64826c3cfd46dc SHA512 010460117a835092a42ab0a7b7f7d04dabe3ff691452541db204d34f1459e72060045af10dee4cb1c953235eb6ab2184fbe7aa032e8672454fc96c5f1d1ecde9 WHIRLPOOL 6977a36e027872bc662013fa30ef635b63c7458a6d57fd0c4d65ab7f8a7cc1306ef975716a045f7c15b31be33ed87ab5a998f140a88f9ab9527db8d161202bb9
+AUX mpeg-tools-1.5b-system-jpeg.patch 893 SHA256 f0e9f99bf42c12b91cebb0e17c1a8567629d522b269e11c2adc6fffaed43afa8 SHA512 243bc75aabcdcdd1024ad33edde6dbb48e3e4ded355b54f09244792d4d854a736b69d858da5b496c059cd5e28c7ac4a2e764129a0812025ab59caf59082de787 WHIRLPOOL b5d2498b6fbf8a050459ae7ee3012b441b46175a8349fd412590319f9e84ff586c1ba62c23951e5d7c068ec8a05083e464d4e1dbe9a3b229a19d32eff1a0601c
+AUX mpeg-tools-1.5b-tempfile-convert.patch 4097 SHA256 a8f67272493e7bd6536e020b75bcf2174a7ae1f453dc0bd3b09f134ed3f1a649 SHA512 b90879e884e9f5a5bd61149adda293c149e533b8fdb969b6e6d579917b2abed0fb848629f1567782d80c97dcf40eaf3c005731d216c02d1e97d54543c74e6e2d WHIRLPOOL cf010516b523c4031279da17282289bd16050218f48ea0450e607715f94ca9eee383ef09ebfe658243cb52834af9be6ba9868198f6134063d2def54845e61997
+AUX mpeg-tools-1.5b-tempfile-mpeg-encode.patch 2538 SHA256 2325ccdc43bce07d38522250c488f21db8010c7e5f27b244b107d05882e4a17b SHA512 229fcd4e28628fa8d45a20766e6b46bcf2e3a6ea9e69b2e8764b180b2766d539a701c64a7969a4020805a06188825c5fa5a5e1146052ee6a52edbb7d3d572f1e WHIRLPOOL 97beca3d5196cf84c41f0251953e2b067cf13b9e0369938afa5d995821c48c38e6c21612e81cc5b6cfa1e33e0fb26af4caa79bfac148eeb4f83b544b6c3eb626
+AUX mpeg-tools-1.5b-tempfile-tests.patch 5256 SHA256 ba156158d92dc6f3803b40ad3b0e8e248b0e74c5b59415a91f55c1e775a6e5a4 SHA512 ee616fc5b4b4bf15e547d737a00a4349fff98127c5ec836e63ae5b6b3e365c50b6cba1c535fd27de2ce6ee28ef5bd3872f5d3b7880f39fe23c7e8ebdc24508e8 WHIRLPOOL d7b13a803824991a76eec1f9acac1d67611366f344bc63dd71d0b789d95d5a2271d819432126f2448954950a6af2012c47b60d9fb22b43227f68320659acea17
+DIST mpeg_encode-1.5b-src.tar.gz 2028724 SHA256 dd8db42f88393bb0ff0d738defa271729a8aa9b8de24ed13bc6bd27014f2daf5 SHA512 df6f9def3ba05c752ebdc5311c512688d6fae380480009dad55b4183a378685eca79943c075166b21ed3bfd0cce7697761abc6ec795f57c0ed1c60c2a5cba469 WHIRLPOOL 9e1f06ffa4518903280bc1693fa6c8ae0b71ebcf4936889ed3e74ee6144d22a6de8e347797f61001b037d5148abf5a35edfd11968f12e565f06c8a0fdfb0d2b4
+EBUILD mpeg-tools-1.5b-r4.ebuild 1842 SHA256 469e2c778ccd3a397806fb5154c6e0ba2d512c9c8e8f15a387c6f50693dcd24b SHA512 c8e87b1d6a4b1383903356b0d861ac856ca05ac14208ce3655b9f4339a451765515f9d4f6d4ba2ae9e7e5c06723ef987988b3e73e5235e4fcf876155fa91a7d4 WHIRLPOOL e23cf7b95cfce59bc30ebc7827d2c048a89566199473b28e7e1594512efec008b1be0a32d33665ad355f747f266a0efb5aa7e04b7fea3a41e1f9344379b4c8a6
+EBUILD mpeg-tools-1.5b-r5.ebuild 1788 SHA256 da42d376c7de5ddc6a79eefb132bdc56931d3420f84056ba26ddfdff2e0bb3ad SHA512 f2f00e951318bf3dc3e2a628320e6f3885e9fe604ea926a97f17fc8b367f2530c47b3e2d899a6148a2b0836b99da24442a5b8015f26e0cbc52088d24ca11b77c WHIRLPOOL 8c3aecf97879832e71d32df3f2ab13594c2eb7d855a9ced567fd0562fe466e8425eed61c99460401fed7df2845e808b5f68d70666e10e98b5860669dc759f773
+MISC ChangeLog 2941 SHA256 d3e84b5197f92098726d90627825c57044dc7d5659b9efd13f6213db9aebd20e SHA512 4853a0ec95c6bde54782fcec917ef32325254e1cd5de5d598217ebc67d0532a017d47824572cc576e3cfa6f61492330694c08063227ac9683367df630d655f26 WHIRLPOOL faefb80b6b8d93bbb80e3970fc0f5c49c29eae0a2fa2a9b1484b50de0031cc228896b9db5a631a546e035b33c21ab799c95c16e9b15b0c9628a2ec2434ac30e9
+MISC ChangeLog-2015 5476 SHA256 0b9d92ba50deed4742357fadf514e880350ba21937b600669676f1491e0f504f SHA512 d94def6b2d27b082f8cca50ea387da1a384e3fb22f0e0da80626a43c11ab26ccbe6d794e703b585c601147a4687c216f49e677f8d1d7d1f3da0f2ff1f246c37a WHIRLPOOL 70ffb57b2cac662955114eefe43668890c0b69efadc1dd6a78beb02ce99f59cb378d085836416d49c537b85208738030d2e4643529691f06de0fe113fb0bab31
+MISC metadata.xml 221 SHA256 f9c43664acd23c026d227c13f3afb1a1e69d190689815295498c32604c8e0c22 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4 WHIRLPOOL 0c890eef9948116352ecd84ee44ecd07c741d7eb82b89aba4ac0d87757df3616d2170550d7b528cb9c359cf7e5cab95b494ebf92c3c1dc0ea96428603577047b
diff --git a/media-video/mpeg-tools/files/mpeg-tools-1.5b-64bit_fixes.patch b/media-video/mpeg-tools/files/mpeg-tools-1.5b-64bit_fixes.patch
new file mode 100644
index 000000000000..fa2e70304dbe
--- /dev/null
+++ b/media-video/mpeg-tools/files/mpeg-tools-1.5b-64bit_fixes.patch
@@ -0,0 +1,286 @@
+--- work/convert/eyuvtojpeg.c
++++ work/convert/eyuvtojpeg.c
+@@ -22,6 +22,7 @@
+ /*==============*
+  * HEADER FILES *
+  *==============*/
++#include <string.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <malloc.h>
+@@ -43,7 +44,7 @@
+ void AllocYCC(void);
+ 
+ 
+-void	main(int argc, char **argv)
++int	main(int argc, char **argv)
+ {
+     FILE *fpointer;
+     char command[256];
+@@ -105,6 +106,7 @@
+     fprintf(stdout, "Converting to JPEG %s\n", dest);
+     sprintf(command, "cjpeg /tmp/foobar > %s", dest);
+     system(command);
++    return 0;
+ }
+ 
+ 
+--- work/convert/eyuvtoppm.c
++++ work/convert/eyuvtoppm.c
+@@ -22,6 +22,7 @@
+ /*==============*
+  * HEADER FILES *
+  *==============*/
++#include <string.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <malloc.h>
+@@ -43,7 +44,7 @@
+ void AllocYCC(void);
+ 
+ 
+-void	main(int argc, char **argv)
++int	main(int argc, char **argv)
+ {
+     FILE *fpointer;
+     char src[256], dest[256];
+@@ -109,7 +110,7 @@
+ 
+     WritePPM(fpointer);
+     fclose(fpointer);
+-
++    return 0;
+ }
+ 
+ void Usage(void)
+--- work/convert/mtv/archdep.h
++++ work/convert/mtv/archdep.h
+@@ -45,16 +45,46 @@
+ 			    ((char *)(to))[5] = ((char *)(from))[2];	\
+ 			    ((char *)(to))[6] = ((char *)(from))[1];	\
+ 			    ((char *)(to))[7] = ((char *)(from))[0];
+-#endif /*little-endian*/
++#endif /*little-endian 32bit*/
++
++#if defined (__x86_64)
++#define	DECODE_SHORT(from, to)						\
++			    ((char *)(to))[0] = ((char *)(from))[1];	\
++			    ((char *)(to))[1] = ((char *)(from))[0];
++#define	DECODE_INT(from, to)						\
++			    ((char *)(to))[0] = ((char *)(from))[3];	\
++			    ((char *)(to))[1] = ((char *)(from))[2];	\
++			    ((char *)(to))[2] = ((char *)(from))[1];	\
++			    ((char *)(to))[3] = ((char *)(from))[0];
++
++#define	DECODE_LONG(from, to)						\
++			    ((char *)(to))[0] = ((char *)(from))[7];	\
++			    ((char *)(to))[1] = ((char *)(from))[6];	\
++			    ((char *)(to))[2] = ((char *)(from))[5];	\
++			    ((char *)(to))[3] = ((char *)(from))[4];    \
++			    ((char *)(to))[4] = ((char *)(from))[3];	\
++			    ((char *)(to))[5] = ((char *)(from))[2];	\
++			    ((char *)(to))[6] = ((char *)(from))[1];	\
++			    ((char *)(to))[7] = ((char *)(from))[0];
++
++#define	DECODE_FLOAT(from, to)		DECODE_INT((to), (from))
++
++#define	DECODE_DOUBLE(from, to)		DECODE_LONG((to), (from))
++
++#endif /*little-endian, 64bit*/
+ 
+ 
+ /* Most architectures are symmetrical with respect to conversions. */
+-#if defined (mc68000) || defined (sparc) || defined (i386)
++#if defined (mc68000) || defined (sparc) || defined (i386) || defined(__x86_64)
+ #define	ENCODE_SHORT(from, to)		DECODE_SHORT((from), (to))
+ #define	ENCODE_LONG(from, to)		DECODE_LONG((from), (to))
+ #define	ENCODE_FLOAT(from, to)		DECODE_FLOAT((from), (to))
+ #define	ENCODE_DOUBLE(from, to)		DECODE_DOUBLE((from), (to))
+ 
++#if defined(__x86_64)
++#define	ENCODE_INT(from, to)		DECODE_INT((from), (to))
++#endif
++
+ /* Define types of specific length */
+ typedef char		i_8;
+ typedef short		i_16;
+--- work/convert/mtv/movieToVid.c
++++ work/convert/mtv/movieToVid.c
+@@ -295,7 +295,7 @@
+     exit (0);
+ }
+ 
+-void
++int
+ main (argc, argv)
+ int argc;
+ char **argv;
+@@ -326,4 +326,5 @@
+     WriteScriptFile (argv[1], argv[2], argv[3], argv[4],
+ 		     &header, offsets, numFrames);
+     fprintf (stderr, "done\n");
++    return 0;
+ }
+--- work/convert/ppmtoeyuv.c
++++ work/convert/ppmtoeyuv.c
+@@ -39,6 +39,11 @@
+  * HEADER FILES *
+  *==============*/
+ 
++#include <malloc.h> 
++#include <unistd.h>
++#include <string.h>
++#include <stdlib.h>
++#include <ctype.h>
+ #include <stdio.h>
+ #include "ansi.h"
+ 
+@@ -65,7 +66,7 @@
+ static void PPMtoYUV _ANSI_ARGS_((void));
+ 
+ 
+-void	main(int argc, char **argv)
++int	main(int argc, char **argv)
+ {
+     if ( ! ReadPPM(stdin) )
+     {
+@@ -76,6 +77,7 @@
+     PPMtoYUV();
+ 
+     WriteYUV(stdout);
++    return 0;
+ }
+ 
+ 
+--- work/mpeg_encode/bitio.c
++++ work/mpeg_encode/bitio.c
+@@ -79,6 +79,8 @@
+  * HEADER FILES *
+  *==============*/
+ 
++#include <unistd.h>
++#include <time.h>
+ #include <assert.h>
+ #include "all.h"
+ #include "byteorder.h"
+--- work/mpeg_encode/jpeg.c
++++ work/mpeg_encode/jpeg.c
+@@ -65,6 +65,8 @@
+  *==============*/
+ 
+ #include <stdio.h>
++#include <sys/types.h>
++#include <unistd.h>
+ #include "all.h"
+ #include "mtypes.h"
+ #include "frames.h"
+--- work/mpeg_encode/headers/libpnmrw.h
++++ work/mpeg_encode/headers/libpnmrw.h
+@@ -20,9 +20,6 @@
+ ** that point here, feel free to tweak or remove these declarations.
+ */
+ #include <malloc.h>
+-#if !defined(sco)  &&  !defined(sgi) && !defined(IRIX)
+-extern char* malloc();
+-#endif
+ /* End of configurable definitions. */
+ 
+ 
+--- work/mpeg_encode/libpnmrw.c
++++ work/mpeg_encode/libpnmrw.c
+@@ -27,6 +27,9 @@
+ /* #define MSDOS */
+ #endif
+ 
++#include <stdlib.h>
++#include <unistd.h>
++#include <errno.h>
+ #include <stdio.h>
+ #include "libpnmrw.h"
+ 
+@@ -128,11 +128,9 @@
+   pm_perror( reason )
+ char* reason;
+ {
+-  extern char* sys_errlist[];
+-  extern int errno;
+   char* e;
+ 
+-  e = sys_errlist[errno];
++  e = strerror(errno);
+ 
+   if ( reason != 0 && reason[0] != '\0' )
+     (void) fprintf( stderr, "%s: %s - %s\n", progname, reason, e );
+@@ -361,7 +361,7 @@
+ int cols, format;
+ {
+   register int col, bitshift, b;
+-  register int item;
++  register int item = 0;
+   register bit* bP;
+ 
+   switch ( format )
+--- work/mpeg_encode/opts.c
++++ work/mpeg_encode/opts.c
+@@ -35,6 +35,7 @@
+  * HEADER FILES *
+  *==============*/
+ 
++#include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include "opts.h"
+--- work/mpeg_encode/iframe.c
++++ work/mpeg_encode/iframe.c
+@@ -235,6 +235,8 @@
+ int SetFCodeHelper _ANSI_ARGS_((int sr));
+ void CalcDistortion _ANSI_ARGS_((MpegFrame *current, int y, int x));
+ 
++void Mpost_UnQuantZigBlockLaplace _ANSI_ARGS_((FlatBlock in, Block out, int qscale, boolean iblock));
++
+ int
+   SetFCodeHelper(SR)
+ int SR;
+--- work/convert/jmovie2jpeg.c
++++ work/convert/jmovie2jpeg.c
+@@ -33,6 +33,9 @@
+ ************************************************************************/
+ 
+ #include <stdio.h>
++#include <string.h>
++#include <stdlib.h>
++#include <unistd.h>
+ 
+ #define HEADER_SIZE 607   /*JFIF header size used on output images*/
+ 
+@@ -54,7 +54,6 @@
+     FILE *inFile;         /* Jmovie file pointer */
+     FILE *outFile;        /* JPEG file pointer for output file */
+     FILE *audiooutfile;   /* SPARC .AU audio output file pointer*/
+-    extern char *malloc();
+     int fd, i;            /* input file descriptor and a counting variable*/
+     int start, end;       /* first and last frames to be extracted */
+     char ofname[256];     /* output filename string */
+@@ -283,12 +283,12 @@
+     if (fread (&(image_offset),sizeof(int),1,inFile) != 1)
+     {
+ 	perror("Error in reading image offset");
+-	exit();
++	exit(1);
+     }
+     if (fread (&(audio_tracks),sizeof(int),1,inFile) != 1)
+     {
+ 	perror("Error in reading audio tracks");
+-	exit();
++	exit(1);
+     }
+     if (audio_tracks != 1) 
+       { 
+@@ -373,6 +373,7 @@
+     fclose(inFile);
+     fclose(audiooutfile);
+     
++    return 0;
+ }
+ 
+ 
diff --git a/media-video/mpeg-tools/files/mpeg-tools-1.5b-as-needed.patch b/media-video/mpeg-tools/files/mpeg-tools-1.5b-as-needed.patch
new file mode 100644
index 000000000000..58c74e124f09
--- /dev/null
+++ b/media-video/mpeg-tools/files/mpeg-tools-1.5b-as-needed.patch
@@ -0,0 +1,47 @@
+--- convert/Makefile	2009-08-25 21:19:42.000000000 +0200
++++ convert/Makefile.new	2009-08-25 21:22:54.000000000 +0200
+@@ -53,13 +53,13 @@
+ all: $(TARGETS)
+ 
+ vidtoppm: vidtoppm.c
+-	$(CC) -lXvid -lX11 $(INCLUDE) -o vidtoppm vidtoppm.c 
++	$(CC) $(LDFLAGS) $(INCLUDE) $@.o -o $@  -lXvid -lX11
+ 
+ vidtojpeg: vidtojpeg.c
+-	$(CC) -lXvid -lX11 $(INCLUDE) -o vidtojpeg vidtojpeg.c
++	$(CC) $(LDFLAGS) $(INCLUDE) $@.o -o $@ -lXvid -lX11
+ 
+ vidtoeyuv: vidtoeyuv.c
+-	$(CC) -lXvid -lX11 $(INCLUDE) -o vidtoeyuv vidtoeyuv.c
++	$(CC) $(LDFLAGS) $(INCLUDE) $@.o -o $@ -lXvid -lX11
+ 
+ wc:;		wc -l *.[ch] *.pl *.table
+ clean:;		rm -f *.o core *~ gmon.out $(TARGETS)
+--- convert/mtv/Makefile	2009-08-25 21:19:42.000000000 +0200
++++ convert/mtv/Makefile.new	2009-08-25 21:24:31.000000000 +0200
+@@ -15,12 +15,12 @@
+ default: movieToVid
+ 
+ movieToVid: movieToVid.o
+-	$(CC) $(CFLAGS) -o movieToVid movieToVid.o
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $@.o
+ 
+ clean:
+ 	rm -f core lintout makeout tags Makefile.bak *.o \
+ 		movieToVid
+ 
+ purify:	$(OBJ)
+-	$(PURIFY) $(CC) $(OBJ) -o movieToVid.purify
++	$(PURIFY) $(CC) $(LDFLAGS) $(OBJ) -o movieToVid.purify
+ 
+--- mpeg_encode//Makefile	2009-08-25 21:19:43.000000000 +0200
++++ mpeg_encode//Makefile.new	2009-08-25 21:27:12.000000000 +0200
+@@ -203,7 +203,6 @@
+ ############
+ 
+ mpeg_encode: $(MP_ALL_OBJS) $(JPEG_LIB)
+-	$(PURIFY) $(CC) $(CFLAGS) -o $@ $(MP_ALL_OBJS) $(LIBDIRS) $(LIBS)
+-	strip mpeg_encode
++	$(PURIFY) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(MP_ALL_OBJS) $(LIBDIRS) $(LIBS)
+ 
+ profile: $(MP_ALL_OBJS)
diff --git a/media-video/mpeg-tools/files/mpeg-tools-1.5b-build.patch b/media-video/mpeg-tools/files/mpeg-tools-1.5b-build.patch
new file mode 100644
index 000000000000..70a96c439e9c
--- /dev/null
+++ b/media-video/mpeg-tools/files/mpeg-tools-1.5b-build.patch
@@ -0,0 +1,56 @@
+--- convert/Makefile
++++ convert/Makefile
+@@ -24,7 +24,7 @@
+ #CC = cc
+ 
+ # compiler flags
+-CFLAGS = -O -g -Wall -W -Wreturn-type -Wunused -Wmissing-prototypes $(PROFLAG)
++CFLAGS += -Wall -W -Wreturn-type -Wunused -Wmissing-prototypes $(PROFLAG)
+ 
+ # if you have an ANSI C Compiler, use the following line, otherwise
+ # uncomment the longer .c.o rule, also
+@@ -52,15 +52,6 @@
+ 
+ all: $(TARGETS)
+ 
+-ppmtoeyuv: ppmtoeyuv.c
+-	$(CC) -o ppmtoeyuv ppmtoeyuv.c
+-
+-jmovie2jpeg: jmovie2jpeg.c
+-	$(CC) -o jmovie2jpeg jmovie2jpeg.c
+-
+-mpeg_demux: mpeg_demux.c
+-	$(CC) -O -o mpeg_demux mpeg_demux.c
+-	
+ vidtoppm: vidtoppm.c
+ 	$(CC) -lXvid -lX11 $(INCLUDE) -o vidtoppm vidtoppm.c 
+ 
+--- convert/mtv/Makefile
++++ convert/mtv/Makefile
+@@ -4,7 +4,7 @@
+ 
+ PURIFY        = $(PURIFYHOME)/purify
+ 
+-CFLAGS= -g  -I.
++CFLAGS+=  -I.
+ 
+ #CFLAGS= -O -DLITTLE_ENDIEN
+ LFLAGS=
+@@ -15,7 +15,7 @@
+ default: movieToVid
+ 
+ movieToVid: movieToVid.o
+-	cc ${CFLAGS} -o movieToVid movieToVid.o
++	$(CC) $(CFLAGS) -o movieToVid movieToVid.o
+ 
+ clean:
+ 	rm -f core lintout makeout tags Makefile.bak *.o \
+--- mpeg_encode/Makefile.orig	2005-09-26 16:01:51.000000000 -0400
++++ mpeg_encode/Makefile	2005-09-26 16:02:11.000000000 -0400
+@@ -97,5 +97,5 @@
+ 
+ #	gcc
+-CFLAGS	      =  $(INCLUDEDIR) $(DEBUGFLAG) -Wall -Wmissing-prototypes $(PROFLAG) $(PROTOFLAG)
++CFLAGS	      +=  $(INCLUDEDIR) -Wall -Wmissing-prototypes $(PROFLAG) $(PROTOFLAG)
+ 
+ #	gcc-strict
diff --git a/media-video/mpeg-tools/files/mpeg-tools-1.5b-jpeg.patch b/media-video/mpeg-tools/files/mpeg-tools-1.5b-jpeg.patch
new file mode 100644
index 000000000000..633321879e8d
--- /dev/null
+++ b/media-video/mpeg-tools/files/mpeg-tools-1.5b-jpeg.patch
@@ -0,0 +1,56 @@
+--- jpeg.c
++++ jpeg.c
+@@ -77,13 +77,10 @@
+ 
+ /* make it happier.... */
+ #undef DCTSIZE2
+-#include "jpeg/jpeglib.h"
+-
++#include "jpeglib.h"
+ 
+ #define HEADER_SIZE 607   /*JFIF header size used on output images*/
+ 
+-
+-
+ /*=======================================================================*
+  *                                                                       *
+  * JMovie2JPEG                                                           *
+@@ -514,8 +511,12 @@
+ #ifdef JPEG4
+   buffer_height = 8;  /* could be 2, 4,8 rows high */
+ #else
+-  buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_scaled_size;
+-#endif
++  #if JPEG_LIB_VERSION >= 80
++    buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_v_scaled_size;
++  #else
++    buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_scaled_size;
++  #endif
++#endif /* JPEG4 */
+   
+   for(cp=0,compptr = cinfo.comp_info;cp<cinfo.num_components;
+       cp++,compptr++) {
+--- Makefile
++++ Makefile
+@@ -36,9 +36,9 @@
+ ##############
+ # JPEG STUFF #
+ ##############
+-JPEG_LIB = jpeg/libjpeg.a
+-JPEG_DIR = -Ijpeg
+-JPEG_LIB_DIR = -Ljpeg
++JPEG_LIB = -ljpeg
++JPEG_DIR = 
++JPEG_LIB_DIR = 
+ MP_JPEG_OBJS = jpeg.o
+ MP_JPEG_SRCS = jpeg.c
+ 
+@@ -57,7 +57,7 @@
+ #################
+ # INCLUDE FILES # 
+ #################
+-INCLUDEDIR = -Iheaders -I/usr/include $(JPEG_DIR)
++INCLUDEDIR = -Iheaders
+ 
+ ############################################################################
+ # LIBRARIES # specify library directories; need jpg lib and maybe pbm	   #
diff --git a/media-video/mpeg-tools/files/mpeg-tools-1.5b-powerpc.patch b/media-video/mpeg-tools/files/mpeg-tools-1.5b-powerpc.patch
new file mode 100644
index 000000000000..3eb2d5f15a60
--- /dev/null
+++ b/media-video/mpeg-tools/files/mpeg-tools-1.5b-powerpc.patch
@@ -0,0 +1,20 @@
+--- convert/mtv/archdep.h	2010-03-11 04:35:04.596642403 +0000
++++ convert/mtv/archdep.h	2010-03-11 04:34:38.949974604 +0000
+@@ -17,7 +17,7 @@
+  * Note that these macros *do not* work for in-place transformations.
+  */
+ 
+-#if defined (mc68000) || defined (sparc)
++#if defined (mc68000) || defined (sparc) || defined (__powerpc__) || defined(__POWERPC__)
+ #define	DECODE_SHORT(from, to)	*((short *)(to)) = *((short *)(from))
+ #define	DECODE_LONG(from, to)	*((long *)(to)) = *((long *)(from))
+ #define	DECODE_FLOAT(from, to)	*((float *)(to)) = *((float *)(from))
+@@ -75,7 +75,7 @@
+ 
+ 
+ /* Most architectures are symmetrical with respect to conversions. */
+-#if defined (mc68000) || defined (sparc) || defined (i386) || defined(__x86_64)
++#if defined (mc68000) || defined (sparc) || defined (i386) || defined(__x86_64) || defined(__powerpc__) || defined(__POWERPC__)
+ #define	ENCODE_SHORT(from, to)		DECODE_SHORT((from), (to))
+ #define	ENCODE_LONG(from, to)		DECODE_LONG((from), (to))
+ #define	ENCODE_FLOAT(from, to)		DECODE_FLOAT((from), (to))
diff --git a/media-video/mpeg-tools/files/mpeg-tools-1.5b-system-jpeg-7.patch b/media-video/mpeg-tools/files/mpeg-tools-1.5b-system-jpeg-7.patch
new file mode 100644
index 000000000000..3b0ad4792a54
--- /dev/null
+++ b/media-video/mpeg-tools/files/mpeg-tools-1.5b-system-jpeg-7.patch
@@ -0,0 +1,26 @@
+diff -ur mpeg_encode.orig/jpeg.c mpeg_encode/jpeg.c
+--- mpeg_encode.orig/jpeg.c	2009-08-24 21:33:18.000000000 +0300
++++ mpeg_encode/jpeg.c	2009-08-24 22:23:08.000000000 +0300
+@@ -80,13 +80,9 @@
+ /* make it happier.... */
+ #undef DCTSIZE2
+ #include "jpeglib.h"
+-#include "jpegint.h"
+-
+ 
+ #define HEADER_SIZE 607   /*JFIF header size used on output images*/
+ 
+-
+-
+ /*=======================================================================*
+  *                                                                       *
+  * JMovie2JPEG                                                           *
+@@ -517,7 +513,7 @@
+ #ifdef JPEG4
+   buffer_height = 8;  /* could be 2, 4,8 rows high */
+ #else
+-  buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_scaled_size;
++  buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_v_scaled_size;
+ #endif
+   
+   for(cp=0,compptr = cinfo.comp_info;cp<cinfo.num_components;
diff --git a/media-video/mpeg-tools/files/mpeg-tools-1.5b-system-jpeg.patch b/media-video/mpeg-tools/files/mpeg-tools-1.5b-system-jpeg.patch
new file mode 100644
index 000000000000..7be3905577c3
--- /dev/null
+++ b/media-video/mpeg-tools/files/mpeg-tools-1.5b-system-jpeg.patch
@@ -0,0 +1,38 @@
+Use the system jpeg rather than the bundled one
+
+--- mpeg_encode/Makefile
++++ mpeg_encode/Makefile
+@@ -36,9 +36,9 @@
+ ##############
+ # JPEG STUFF #
+ ##############
+-JPEG_LIB = jpeg/libjpeg.a
+-JPEG_DIR = -Ijpeg
+-JPEG_LIB_DIR = -Ljpeg
++JPEG_LIB = -ljpeg
++JPEG_DIR = 
++JPEG_LIB_DIR = 
+ MP_JPEG_OBJS = jpeg.o
+ MP_JPEG_SRCS = jpeg.c
+ 
+@@ -57,7 +57,7 @@
+ #################
+ # INCLUDE FILES # 
+ #################
+-INCLUDEDIR = -Iheaders -I/usr/include $(JPEG_DIR)
++INCLUDEDIR = -Iheaders
+ 
+ ############################################################################
+ # LIBRARIES # specify library directories; need jpg lib and maybe pbm	   #
+--- mpeg_encode/jpeg.c
++++ mpeg_encode/jpeg.c
+@@ -79,7 +79,8 @@
+ 
+ /* make it happier.... */
+ #undef DCTSIZE2
+-#include "jpeg/jpeglib.h"
++#include "jpeglib.h"
++#include "jpegint.h"
+ 
+ 
+ #define HEADER_SIZE 607   /*JFIF header size used on output images*/
diff --git a/media-video/mpeg-tools/files/mpeg-tools-1.5b-tempfile-convert.patch b/media-video/mpeg-tools/files/mpeg-tools-1.5b-tempfile-convert.patch
new file mode 100644
index 000000000000..2bab1511bf59
--- /dev/null
+++ b/media-video/mpeg-tools/files/mpeg-tools-1.5b-tempfile-convert.patch
@@ -0,0 +1,169 @@
+--- convert/eyuvtojpeg.c
++++ convert/eyuvtojpeg.c
+@@ -25,6 +25,7 @@
+ #include <string.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ #include <malloc.h>
+ 
+ typedef unsigned char uint8;
+@@ -47,8 +48,9 @@
+ int	main(int argc, char **argv)
+ {
+     FILE *fpointer;
+-    char command[256];
+-    char src[256], dest[256];
++    char command[4096];
++    char src[4096], dest[4096], tempfile[4096];
++    int ret;
+ 
+     if ((strcmp(argv[1],"-?") == 0) ||
+ 	(strcmp(argv[1],"-h") == 0) ||
+@@ -99,14 +101,16 @@
+     YUVtoPPM();
+ 
+     fprintf(stdout, "Writing PPM\n");
+-    fpointer = fopen("/tmp/foobar", "w");
++    sprintf(tempfile, "%s.tmp", dest);
++    fpointer = fopen(tempfile, "w");
+     WritePPM(fpointer);
+     fclose(fpointer);
+ 
+     fprintf(stdout, "Converting to JPEG %s\n", dest);
+-    sprintf(command, "cjpeg /tmp/foobar > %s", dest);
+-    system(command);
+-    return 0;
++    sprintf(command, "cjpeg %s > %s", tempfile, dest);
++    ret = system(command);
++    unlink(tempfile);
++    return ret;
+ }
+ 
+ 
+--- convert/vidtoeyuv.c
++++ convert/vidtoeyuv.c
+@@ -125,9 +125,9 @@
+   XImage *ximage;
+   char *tdata;
+   char *obase;
+-  char ofname[256];
++  char ofname[4096], tempfile[4096];
+   int height, width;
+-  char command[256];
++  char command[4096];
+   int nth;
+ 
+   if ((argc != 7) && (argc != 8))usage (argv[0]);
+@@ -223,9 +223,11 @@
+ 
+ 
+     sprintf(ofname, "%s%d.yuv", obase, i);
+-    outFile = fopen("/tmp/foobar", "w");
++    sprintf(tempfile, "%s%d.yuv.tmp", obase, i);
++    outFile = fopen(tempfile, "w");
+     if (!outFile) {
+       perror("Couldn't open output file.");
++      exit(1);
+     }
+ 
+     for (r=0; r<height; r++) {
+@@ -241,9 +243,10 @@
+ 
+     free(tdata);
+ 
+-    sprintf(command, "rawtoppm %d %d < /tmp/foobar | ppmtoyuv > %s",
+-	    width, height, ofname);
++    sprintf(command, "rawtoppm %d %d < %s | ppmtoyuv > %s",
++	    width, height, tempfile, ofname);
+     system(command);
++    unlink(tempfile);
+ 
+       for (j=0; j<nth-1; j++) {
+ 	if (read (fd, &image, sizeof(image)) != sizeof(image)) {
+--- convert/vidtojpeg.c
++++ convert/vidtojpeg.c
+@@ -123,9 +123,9 @@
+   XImage *ximage;
+   char *tdata;
+   char *obase;
+-  char ofname[256];
++  char ofname[4096], tempfile[4096];
+   int height, width;
+-  char command[256];
++  char command[4096];
+ 
+ 
+   if ((argc != 7) && (argc != 8))usage (argv[0]);
+@@ -221,9 +221,11 @@
+ 
+ 
+     sprintf(ofname, "%s.%d.jpeg", obase, i);
+-    outFile = fopen("/tmp/foobar", "w");
++    sprintf(tempfile, "%s.%d.jpeg.tmp", obase, i);
++    outFile = fopen(tempfile, "w");
+     if (!outFile) {
+       perror("Couldn't open output file.");
++      exit(1);
+     }
+ 
+     for (r=0; r<height; r++) {
+@@ -239,9 +241,10 @@
+ 
+     free(tdata);
+ 
+-    sprintf(command, "rawtoppm %d %d < /tmp/foobar | cjpeg > %s",
+-	    width, height, ofname);
++    sprintf(command, "rawtoppm %d %d < %s | cjpeg > %s",
++	    width, height, tempfile, ofname);
+     system(command);
++    unlink(tempfile);
+   }
+ }
+ 
+--- convert/vidtoppm.c
++++ convert/vidtoppm.c
+@@ -220,9 +220,11 @@
+ 
+ 
+     sprintf(ofname, "%s%d.ppm", obase, i);
+-    outFile = fopen("/tmp/foobar", "w");
++    sprintf(tempfile, "%s%d.ppm.tmp", obase, i);
++    outFile = fopen(tempfile, "w");
+     if (!outFile) {
+       perror("Couldn't open output file.");
++      exit(1);
+     }
+ 
+     for (r=0; r<height; r++) {
+@@ -238,8 +240,9 @@
+ 
+     free(tdata);
+ 
+-    sprintf(command, "rawtoppm %d %d < /tmp/foobar > %s",
+-	    width, height, ofname);
++    sprintf(command, "rawtoppm %d %d < %s > %s",
++	    width, height, tempfile, ofname);
+     system(command);
++    unlink(tempfile);
+   }
+ }
+--- convert/eyuvtoppm.c
++++ convert/eyuvtoppm.c
+@@ -100,13 +100,9 @@
+     fpointer = fopen(dest, "w");
+     if (fpointer == NULL) {
+       fprintf(stderr, "Problems opening %s!\n", dest);
+-      fprintf(stderr, "Trying /tmp/foobar instead\n");
+-      strcpy(dest, "/tmp/foobar");
+-      fpointer = fopen(dest, "w");
+-      if (fpointer == NULL) {
+-	fprintf(stderr, "Nope, exiting.\n");
+-	exit(1);
+-      }}
++      perror("");
++      exit(1);
++    }
+ 
+     WritePPM(fpointer);
+     fclose(fpointer);
diff --git a/media-video/mpeg-tools/files/mpeg-tools-1.5b-tempfile-mpeg-encode.patch b/media-video/mpeg-tools/files/mpeg-tools-1.5b-tempfile-mpeg-encode.patch
new file mode 100644
index 000000000000..1b33bc5dd1c8
--- /dev/null
+++ b/media-video/mpeg-tools/files/mpeg-tools-1.5b-tempfile-mpeg-encode.patch
@@ -0,0 +1,87 @@
+--- mpeg_encode/parallel.c
++++ mpeg_encode/parallel.c
+@@ -586,6 +586,8 @@
+  * SIDE EFFECTS:    none
+  *
+  *===========================================================================*/
++/* internal hook into the ReadFrame function */
++void _ReadFrame(MpegFrame *frame, char *fileName, FILE *fileHook, char *conversion, boolean addPath);
+ void
+   GetRemoteFrame(frame, frameNumber)
+ MpegFrame *frame;
+@@ -615,8 +617,13 @@
+ 
+   if ( frameNumber != -1 ) {
+     if ( separateConversion ) {
+-      sprintf(fileName, "/tmp/foobar%d", machineNumber);
+-      filePtr = fopen(fileName, "wb");
++      int fd;
++      snprintf(fileName, sizeof(fileName), "/tmp/mpeg_encode_foobar%dXXXXXX", machineNumber);
++      fd = mkstemp(fileName);
++      if (fd == -1 || (filePtr = fdopen(fd, "wb")) == NULL) {
++	perror("ERROR: mpeg_encode->GetRemoteFrame");
++	exit(1);
++      }
+ 
+       /* read in stuff, SafeWrite to file, perform local conversion */
+       do {
+@@ -628,10 +635,12 @@
+ 	fwrite(smallBuffer, 1, numBytes, filePtr);
+       } while ( numBytes == 1000 );
+       fflush(filePtr);
+-      fclose(filePtr);
++      rewind(filePtr);
+ 
+       /* now do slave conversion */
+-      ReadFrame(frame, fileName, slaveConversion, FALSE);
++      _ReadFrame(frame, NULL, filePtr, slaveConversion, FALSE);
++      /* _ReadFrame() will close the file pointer for us */
++      /* fclose(filePtr); */
+     } else {
+       Frame_AllocYCC(frame);
+ 
+--- mpeg_encode/readframe.c
++++ mpeg_encode/readframe.c
+@@ -227,14 +227,22 @@
+  * SIDE EFFECTS:    none
+  *
+  *===========================================================================*/
++void _ReadFrame(MpegFrame *frame, char *fileName, FILE *fileHook, char *conversion, boolean addPath);
++
++void ReadFrame(MpegFrame *frame, char *fileName, char *conversion, boolean addPath)
++{
++    _ReadFrame(frame, fileName, NULL, conversion, addPath);
++}
++
+ void
+-ReadFrame(frame, fileName, conversion, addPath)
++_ReadFrame(frame, fileName, fileHook, conversion, addPath)
+     MpegFrame *frame;
+     char *fileName;
++    FILE *fileHook;
+     char *conversion;
+     boolean addPath;
+ {
+-    FILE    *ifp;
++    FILE    *ifp = fileHook;
+     char    command[1024];
+     char    fullFileName[1024];
+     MpegFrame    tempFrame;
+@@ -274,6 +282,9 @@
+     }
+ #endif
+ 
++    if (fileHook)
++      goto file_is_already_opened;
++
+     if ( fileType == ANY_FILE_TYPE ) {
+     char *convertPtr, *commandPtr, *charPtr;
+ 
+@@ -325,6 +336,7 @@
+       exit(1);
+     }
+ 
++file_is_already_opened:
+     switch(baseFormat) {
+     case YUV_FILE_TYPE:
+ 
diff --git a/media-video/mpeg-tools/files/mpeg-tools-1.5b-tempfile-tests.patch b/media-video/mpeg-tools/files/mpeg-tools-1.5b-tempfile-tests.patch
new file mode 100644
index 000000000000..260f279d2d4b
--- /dev/null
+++ b/media-video/mpeg-tools/files/mpeg-tools-1.5b-tempfile-tests.patch
@@ -0,0 +1,204 @@
+When running tests, don't use /tmp for obvious reasons
+
+Also rewrite the diffscript in sh since csh isnt always available
+
+--- mepg_encode/Makefile
++++ mepg_encode/Makefile
+@@ -187,16 +187,16 @@
+ #########
+ 
+ test:
+-	rm -f /tmp/ts.stat
+-	./mpeg_encode -stat /tmp/ts.stat ./tst/ts.param
+-	csh ./tst/diffscript /tmp/ts.stat ./tst/ts.stat /tmp/ts.mpg ./tst/ts.mpg
++	rm -f ./tst/ts.stat.new
++	./mpeg_encode -stat ./tst/ts.stat.new ./tst/ts.param
++	sh ./tst/diffscript.sh ./tst/ts.stat.new ./tst/ts.stat ./tst/ts.mpg.new ./tst/ts.mpg
+ 
+ testd:
+-	rm -f /tmp/tsd.stat
+-	./mpeg_encode -stat /tmp/tsd.stat ./tst/tsd.param
+-	csh ./tst/diffscript /tmp/tsd.stat ./tst/tsd.stat /tmp/tsd.mpg ./tst/tsd.mpg
++	rm -f ./tst/tsd.stat.new
++	./mpeg_encode -stat ./tst/tsd.stat.new ./tst/tsd.param
++	sh ./tst/diffscript.sh ./tst/tsd.stat.new ./tst/tsd.stat ./tst/tsd.mpg.new ./tst/tsd.mpg
+ 
+-test_all: test testd
++test_all check: test testd
+ 
+ ############
+ # BINARIES #
+--- mepg_encode/tst/diffscript.sh
++++ mepg_encode/tst/diffscript.sh
+@@ -0,0 +1,16 @@
++diff $1 $2 > ./foobar
++egrep Blocks ./foobar > ./blockbar
++
++if test ! -s ./blockbar ; then
++	diff $3 $4 > ./foobar.mpg
++	if test -s ./foobar.mpg ; then
++		echo "FAILURE! (different output -- probably endian bug).  Please send bug report."
++		exit 1
++	else
++		echo "SUCCESS."
++		exit 0
++	fi
++else
++	echo "FAILURE! (different exection).  Please send bug report."
++	exit 1
++fi
+--- mpeg_encode/tst/test_all
++++ mpeg_encode/tst/test_all
+@@ -1,19 +1,19 @@
+-#!/bin/csh -f
++#!/bin/sh
+ cd ..
+-echo "First we encode three mpegs... (note requires 5MB on /tmp)"
+-rm -f /tmp/ts{,2,d}.{mpg,stat}
+-./mpeg_encode -stat /tmp/ts.stat ./tst/ts.param
+-./mpeg_encode -stat /tmp/ts2.stat ./tst/ts2.param
+-./mpeg_encode -stat /tmp/tsd.stat ./tst/tsd.param
++echo "First we encode three mpegs... (note requires 5MB in ./tst)"
++rm -f ./tst/ts{,2,d}.{mpg,stat}.new
++./mpeg_encode -stat ./tst/ts.stat.new ./tst/ts.param
++./mpeg_encode -stat ./tst/ts2.stat.new ./tst/ts2.param
++./mpeg_encode -stat ./tst/tsd.stat.new ./tst/tsd.param
+ 
+ cd tst
+ 
+ echo "Test one - tst/ts.param"
+-csh diffscript /tmp/ts.stat ts.stat /tmp/ts.mpg ts.mpg
++sh diffscript.sh ./ts.stat.new ts.stat ./ts.mpg.new ts.mpg
+ 
+ echo "Test two - tst/ts2.param (different pattern)"
+-csh diffscript /tmp/ts2.stat ts2.stat /tmp/ts2.mpg ts2.mpg
++sh diffscript.sh ./ts2.stat.new ts2.stat ./ts2.mpg.new ts2.mpg
+ 
+ echo "Test three - tst/tsd.param (uses decoded frames)"
+-csh diffscript /tmp/tsd.stat tsd.stat /tmp/tsd.mpg tsd.mpg
++sh diffscript.sh ./tsd.stat.new tsd.stat ./tsd.mpg.new tsd.mpg
+ 
+--- mpeg_encode/tst/diffscript
++++ mpeg_encode/tst/diffscript
+@@ -3,23 +3,23 @@
+ #
+ # NOTE:  if this script doesn't work, then basically all you need to know
+ # is that the stat files should be the same except for the times.
+-# So the /tmp/blockbar below should be empty if the test succeeded, and non-
++# So the ./blockbar below should be empty if the test succeeded, and non-
+ # empty if it failed.  Then the .mpg files are compared.
+ #
+ 
+-rm -f /tmp/foobar
+-rm -f /tmp/blockbar
++rm -f ./foobar
++rm -f ./blockbar
+ 
+-diff $1 $2 > /tmp/foobar
++diff $1 $2 > ./foobar
+ 
+-# /tmp/foobar must exist, since starting times will be different
++# ./foobar must exist, since starting times will be different
+ 
+-egrep Blocks /tmp/foobar > /tmp/blockbar
++egrep Blocks ./foobar > ./blockbar
+ 
+-# /tmp/blockbar may or may not exist
+-if ( -z /tmp/blockbar ) then
+-	diff $3 $4 > /tmp/foobar.mpg
+-	if ( -z /tmp/foobar.mpg ) then
++# ./blockbar may or may not exist
++if ( -z ./blockbar ) then
++	diff $3 $4 > ./foobar.mpg
++	if ( -z ./foobar.mpg ) then
+ 		echo "SUCCESS."
+ 	else
+ 		echo "FAILURE! (different output -- probably endian bug).  Please send bug report."
+--- mpeg_encode/tst/ts.param
++++ mpeg_encode/tst/ts.param
+@@ -1,7 +1,7 @@
+ # test suite parameter file
+ 
+ PATTERN		IBBPBBPBBP
+-OUTPUT		/tmp/ts.mpg
++OUTPUT		./tst/ts.mpg.new
+ 
+ YUV_SIZE	352x240
+ 
+--- mpeg_encode/tst/tsd.param
++++ mpeg_encode/tst/tsd.param
+@@ -1,7 +1,7 @@
+ # test suite parameter file
+ 
+ PATTERN		IBBBPBBBBP
+-OUTPUT		/tmp/tsd.mpg
++OUTPUT		./tst/tsd.mpg.new
+ 
+ YUV_SIZE	352x240
+ 
+--- mpeg_encode/tst/gop.param
++++ mpeg_encode/tst/gop.param
+@@ -1,7 +1,7 @@
+ # test suite parameter file
+ 
+ PATTERN		IBPBIBPBPB
+-OUTPUT		/tmp/ts.mpg
++OUTPUT		./tst/ts.mpg.new
+ 
+ YUV_SIZE	352x240
+ 
+--- mpeg_encode/tst/short.param
++++ mpeg_encode/tst/short.param
+@@ -1,7 +1,7 @@
+ # test suite parameter file
+ 
+ PATTERN		IBBBPBBB
+-OUTPUT		/tmp/ts.mpg
++OUTPUT		./tst/ts.mpg.new
+ 
+ YUV_SIZE	352x240
+ 
+--- mpeg_encode/tst/ts2.param
++++ mpeg_encode/tst/ts2.param
+@@ -2,7 +2,7 @@
+ 
+ PATTERN		IBBPBBPBB
+ 
+-OUTPUT		/tmp/ts2.mpg
++OUTPUT		./tst/ts2.mpg.new
+ 
+ YUV_SIZE	352x240
+ 
+--- mpeg_encode/tst/ts3.param
++++ mpeg_encode/tst/ts3.param
+@@ -1,7 +1,7 @@
+ # test suite parameter file
+ 
+ PATTERN		IBPB
+-OUTPUT		/tmp/ts.mpg
++OUTPUT		./tst/ts.mpg.new
+ 
+ YUV_SIZE	352x240
+ 
+--- mpeg_encode/tst/ts4.param
++++ mpeg_encode/tst/ts4.param
+@@ -1,7 +1,7 @@
+ # test suite parameter file
+ 
+ PATTERN		IBBBPBBBBP
+-OUTPUT		/tmp/ts.mpg
++OUTPUT		./tst/ts.mpg.new
+ 
+ YUV_SIZE	352x240
+ 
+--- mpeg_encode/tst/tstl.param
++++ mpeg_encode/tst/tstl.param
+@@ -1,7 +1,7 @@
+ # test suite parameter file
+ 
+ PATTERN		IBBBPBBBBP
+-OUTPUT		/tmp/ts.mpg
++OUTPUT		./tst/ts.mpg.new
+ 
+ YUV_SIZE	352x240
+ 
diff --git a/media-video/mpeg-tools/metadata.xml b/media-video/mpeg-tools/metadata.xml
new file mode 100644
index 000000000000..68b9a06fccf1
--- /dev/null
+++ b/media-video/mpeg-tools/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>media-video@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/media-video/mpeg-tools/mpeg-tools-1.5b-r4.ebuild b/media-video/mpeg-tools/mpeg-tools-1.5b-r4.ebuild
new file mode 100644
index 000000000000..70ceb15423d2
--- /dev/null
+++ b/media-video/mpeg-tools/mpeg-tools-1.5b-r4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+MY_PN=mpeg_encode
+DESCRIPTION="Tools for MPEG video"
+HOMEPAGE="http://bmrc.berkeley.edu/research/mpeg/mpeg_encode.html"
+SRC_URI="ftp://mm-ftp.cs.berkeley.edu/pub/multimedia/mpeg/encode/${MY_PN}-${PV}-src.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	virtual/jpeg:0"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_PN}
+
+src_prepare() {
+	cd "${WORKDIR}"
+	epatch "${FILESDIR}"/${P}-build.patch
+	epatch "${FILESDIR}"/${P}-64bit_fixes.patch
+	epatch "${FILESDIR}"/${P}-tempfile-convert.patch
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+	epatch "${FILESDIR}"/${P}-powerpc.patch
+	cd "${S}"
+	rm -r jpeg
+	epatch "${FILESDIR}"/${P}-system-jpeg.patch
+	epatch "${FILESDIR}"/${P}-system-jpeg-7.patch
+	epatch "${FILESDIR}"/${P}-tempfile-mpeg-encode.patch
+	epatch "${FILESDIR}"/${P}-tempfile-tests.patch
+	# don't include malloc.h, but use stdlib.h instead
+	sed -i -e 's:#include <malloc.h>:#include <stdlib.h>:' \
+		convert/*.c convert/mtv/*.c *.c headers/*.h || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+	emake -C convert CC="$(tc-getCC)"
+	emake -C convert/mtv CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin mpeg_encode
+	doman docs/*.1
+	dodoc BUGS CHANGES README TODO VERSION
+	dodoc docs/EXTENSIONS docs/INPUT.FORMAT docs/*.param docs/param-summary
+	docinto examples
+	dodoc examples/*
+
+	cd ../convert
+	dobin eyuvtojpeg jmovie2jpeg mpeg_demux mtv/movieToVid
+	newdoc README README.convert
+	newdoc mtv/README README.mtv
+}
+
+pkg_postinst() {
+	if [[ -z $(best_version media-libs/netpbm) ]]; then
+		elog "If you are looking for eyuvtoppm or ppmtoeyuv, please"
+		elog "emerge the netpbm package.  It has updated versions."
+	fi
+}
diff --git a/media-video/mpeg-tools/mpeg-tools-1.5b-r5.ebuild b/media-video/mpeg-tools/mpeg-tools-1.5b-r5.ebuild
new file mode 100644
index 000000000000..8da82cd441af
--- /dev/null
+++ b/media-video/mpeg-tools/mpeg-tools-1.5b-r5.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+MY_PN=mpeg_encode
+DESCRIPTION="Tools for MPEG video"
+HOMEPAGE="http://bmrc.berkeley.edu/research/mpeg/mpeg_encode.html"
+SRC_URI="ftp://mm-ftp.cs.berkeley.edu/pub/multimedia/mpeg/encode/${MY_PN}-${PV}-src.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	virtual/jpeg:0"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_PN}
+
+src_prepare() {
+	cd "${WORKDIR}"
+	epatch "${FILESDIR}"/${P}-build.patch
+	epatch "${FILESDIR}"/${P}-64bit_fixes.patch
+	epatch "${FILESDIR}"/${P}-tempfile-convert.patch
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+	epatch "${FILESDIR}"/${P}-powerpc.patch
+	cd "${S}"
+	rm -r jpeg
+	epatch "${FILESDIR}"/${P}-jpeg.patch
+	epatch "${FILESDIR}"/${P}-tempfile-mpeg-encode.patch
+	epatch "${FILESDIR}"/${P}-tempfile-tests.patch
+	# don't include malloc.h, but use stdlib.h instead
+	sed -i -e 's:#include <malloc.h>:#include <stdlib.h>:' \
+		convert/*.c convert/mtv/*.c *.c headers/*.h || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+	emake -C convert CC="$(tc-getCC)"
+	emake -C convert/mtv CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin mpeg_encode
+	doman docs/*.1
+	dodoc BUGS CHANGES README TODO VERSION
+	dodoc docs/EXTENSIONS docs/INPUT.FORMAT docs/*.param docs/param-summary
+	docinto examples
+	dodoc examples/*
+
+	cd ../convert
+	dobin eyuvtojpeg jmovie2jpeg mpeg_demux mtv/movieToVid
+	newdoc README README.convert
+	newdoc mtv/README README.mtv
+}
+
+pkg_postinst() {
+	if [[ -z $(best_version media-libs/netpbm) ]]; then
+		elog "If you are looking for eyuvtoppm or ppmtoeyuv, please"
+		elog "emerge the netpbm package.  It has updated versions."
+	fi
+}
diff --git a/media-video/mpeg2vidcodec/Manifest b/media-video/mpeg2vidcodec/Manifest
new file mode 100644
index 000000000000..34243e575fd3
--- /dev/null
+++ b/media-video/mpeg2vidcodec/Manifest
@@ -0,0 +1,5 @@
+DIST mpeg2vidcodec_v12.tar.gz 259790 SHA256 e59da9988b2e964026c8370658771954a724e8319cc266f75c6aef2a85c40076 SHA512 2a46f486102ac2a1ae99a0f75b196c5aa01f8a99a6230723a2000ca8411adbca6c3e07d70f7cb269b17ce5fa4bf318e6dd4bfa83ecf8e137e8efca2bb352735c WHIRLPOOL acc31a2d493245e30a5e91d001b8cb5e5a3f1d3aab00141664a39030e0a90e24454c7c676a4dd2ff881721d39540895d5da62ea0b4d3b1b0f69d24dac785ce69
+EBUILD mpeg2vidcodec-12-r1.ebuild 829 SHA256 5c71763e8ce18b947f5208c840bd22b3721e93084d35d5d0acbe84d204b91bf1 SHA512 21d76f1e88e56fe776a105844367efe1da0a8f765b5f84eed5b5d67c6483b2f5d5ddd60abd1d66a74034a1e256a99f56acfeda889f25227265cc9e6e848e8b16 WHIRLPOOL 158f6854e67213450b0f74a840a6f2941e422e47c5173b5cef79d2314aaba2be15800ac343fa8d66778b0c97f84cff520a71e2acf45d64dfd8b70f31a834ebbc
+MISC ChangeLog 2448 SHA256 7f48ad0969145018e17c8be037ae52a5dd0bb6dd2bd415889a8f5739c65e03d0 SHA512 31fea748b54ec169edbc5669424c13d0854ccf041b491812f6557cc32ef13f8b670e1f59de47b437e3c9dea1a22cdc4f689c9c0a4a2abeeb4e18ac56ce90237d WHIRLPOOL ac33f4981287b84d69500f5f884209f03609de2df180483e6488ea535f28dac4e4b8156d1afe99a4d41dbe055d939783fa2ad9773366f27eb989bf05ebc6d855
+MISC ChangeLog-2015 3116 SHA256 950d9c48fe0e1bf2b5715eb3511e8b39829739689100590a5ad50faf5a0a3b5a SHA512 3134614c865729708ff16ebec1116f96e68f9b83f231d30ee58650c4a585c19e7c219dc11bed6f4a2a0fe64a2d195af46fbe8b4843a83a4f811adadef16de82a WHIRLPOOL 135906a7f7ed625d65f11b08743928263b45cea5e63c36ac14c102e704043b15c975d0a3cfdd97c7e2547ef14dbb50dc04cb6c52fc0ebf1fca6e9fc6ade4e58e
+MISC metadata.xml 221 SHA256 f9c43664acd23c026d227c13f3afb1a1e69d190689815295498c32604c8e0c22 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4 WHIRLPOOL 0c890eef9948116352ecd84ee44ecd07c741d7eb82b89aba4ac0d87757df3616d2170550d7b528cb9c359cf7e5cab95b494ebf92c3c1dc0ea96428603577047b
diff --git a/media-video/mpeg2vidcodec/metadata.xml b/media-video/mpeg2vidcodec/metadata.xml
new file mode 100644
index 000000000000..68b9a06fccf1
--- /dev/null
+++ b/media-video/mpeg2vidcodec/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>media-video@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild b/media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild
new file mode 100644
index 000000000000..3f8cd99c1e7f
--- /dev/null
+++ b/media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit toolchain-funcs
+
+MY_P="${PN}_v${PV}"
+DESCRIPTION="MPEG Library"
+HOMEPAGE="http://www.mpeg.org/"
+SRC_URI="http://www.mpeg.org/pub_ftp/mpeg/mssg/${MY_P}.tar.gz"
+
+LICENSE="mpeg2enc"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE=""
+RESTRICT="mirror bindist" #465088
+
+S=${WORKDIR}/mpeg2
+
+src_prepare() {
+	sed -i -e 's:make:$(MAKE):' Makefile || die
+
+	sed -i -e 's:$(CC) $(CFLAGS):\0 $(LDFLAGS):' \
+		src/mpeg2enc/Makefile src/mpeg2dec/Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin src/mpeg2dec/mpeg2decode src/mpeg2enc/mpeg2encode
+	dodoc README doc/*
+}
diff --git a/media-video/mpglen/Manifest b/media-video/mpglen/Manifest
new file mode 100644
index 000000000000..fb2a2c71e833
--- /dev/null
+++ b/media-video/mpglen/Manifest
@@ -0,0 +1,5 @@
+DIST mpglen.tar.gz 10149 SHA256 2783dd1c1e6cd464ae637c638782e8b6bd575ec453297ec513736dc6cef884f8 SHA512 10c3550e14fb0d76360f8b99e8e82f7ca951cffc14921a6ffce5a949bf10d0c1d7d2dcafaf61c85123fecf5432139332a10f0f54e9c04ef99584578294d812a2 WHIRLPOOL 1162be46049e88dc2c9277e9d1a87484539fcdb184d6270246c1adb43afb0f7f91878bb741c156f48ec0ec6414bde5ccf8ec92ec51c3d793e2a8ea92773c6a0f
+EBUILD mpglen-0.1.ebuild 640 SHA256 bfcf5f8f5416150b4887c5d2155379c1de918853591be3252c9d2c865654542d SHA512 9c7293c02a18ca77d3f0ed3130ef93da66662a934c9948bb6b8684464f35b86795a5b6c8cd3011455a02741636390aa23236d9baac0be23d33ef26835f6f9baf WHIRLPOOL 73cf31a69504fd5232dab10308c004d6d0a11f661027ac6c83e53a9bfa800486a35a4358ba8ca9f1478d256d68a17905c2d29bc3fb6e4942781445578f7802a2
+MISC ChangeLog 2423 SHA256 23cae1627692401a1193ad5b43cf97b4b375fae27ca923992f8f2e235fefc541 SHA512 14e92edf2bab48d8f15164bed6912833f9285c985ff027f10408395483f081648d7fc88f15331cfd6d013a975edc3fc5d981f3a456c50a938ddb8ec447575885 WHIRLPOOL 67702ccba19a5a8c4e640af8144d975ef92f1c482e80471c03ba56a220960a0cef43f97deded56b9a0e0b86bbd1a1c53f764a4c759c3c0abf8387f3023fb62f1
+MISC ChangeLog-2015 1058 SHA256 0f86c3507e2212365b2be0267be45fe7fc3fd02cb8ede53b512e1a951b1a48db SHA512 7dda443268106b108fcb38580bd13546a10fb3ebc72e45a28a42d29dc68d7d511a06bfff645d0c43cb0a9fe0a4464668dfc1f014d65c0062210e17d9d1f1b6dc WHIRLPOOL 32708b117e43e08142979bbdbbcadcc4c14e3a921ae8db21b5d85d1698e5dabfb8a6b89591df2833fab236c8630c59e12605c039e20a43cb3d48527ef295d052
+MISC metadata.xml 219 SHA256 4246299710294d9f4c0c15b97e8ae7925e01785b962551c6aa27174e99980bcd SHA512 24793c7fd0e2cef8fa5a0efd9bd55fed1e62ff6810199a969d4c0b869bac9b9ec79b288105b73b1b99734320bb13569a8ee00516b5452dd67d91d14dd17038e2 WHIRLPOOL e7f42aba21f5637bb8774cc17a488ecca121e56d5e855a3e956792955b8253f3049e08b2ab258728002263967db02e27914c82ecafee07a6d317bf857d13095f
diff --git a/media-video/mpglen/metadata.xml b/media-video/mpglen/metadata.xml
new file mode 100644
index 000000000000..0427ec20bfd4
--- /dev/null
+++ b/media-video/mpglen/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+<email>media-video@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/media-video/mpglen/mpglen-0.1.ebuild b/media-video/mpglen/mpglen-0.1.ebuild
new file mode 100644
index 000000000000..9211ffaf64ce
--- /dev/null
+++ b/media-video/mpglen/mpglen-0.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="A program to scan through a MPEG file and count the number of GOPs and frames"
+HOMEPAGE="http://www.iamnota.net/mpglen/"
+SRC_URI="http://www.iamnota.net/mpglen/${PN}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	echo 'all: mpglen' > Makefile
+	append-lfs-flags
+}
+
+src_compile() {
+	tc-export CC
+	emake || die "emake failed"
+}
+
+src_install () {
+	dobin ${PN} || die
+	dodoc AUTHORS Changelog README
+}
diff --git a/media-video/mpgtx/Manifest b/media-video/mpgtx/Manifest
new file mode 100644
index 000000000000..10b13aa6b0e5
--- /dev/null
+++ b/media-video/mpgtx/Manifest
@@ -0,0 +1,7 @@
+AUX mpgtx-1.3.1-configure.patch 2414 SHA256 8825f978fdbf67af78722667b6971636da5f6dd1448eadc35b84cdd0c8ee23d3 SHA512 038ae7bb3ff09f65b01ebfe1d60c44d21f1c7347710191be86e65286de83b84ffe35c7f2a97795b4a6ac9eb50189e5a2b50bf452bb49cffa615c2bbc7ebfcad3 WHIRLPOOL ed755f6d3ac9c03c3407ef42e38a7055c1e27e55138eda7a7befd5b7a99aac0336ca31254cd7125c5331ad39a6d7b9d4939a144a299ba1f183999666a3f9f3b8
+AUX mpgtx-1.3.1-dont-ignore-cxx-flags.patch 364 SHA256 71352548c6b2e6cddb23811035e8238d4c2dd365b04f7882c2805d69c78bd46a SHA512 5845b7ad6d9ca7200074d8c90588b97cb623e08c2946c2902bca49e7861273468471db0b74d268d4ec458920f0c2c698208d768c6afd179c2ed9abd199e636aa WHIRLPOOL 589d95b3cdaa8468d76dfe09276fb0e299810d90809768d724c7045687bc8dfb44ec5d15f9bd8dea747e4b88518300c38a181a4193b022ed8fce2650d4c90e61
+DIST mpgtx-1.3.1.tar.gz 89170 SHA256 8815e73e98b862f12ba1ef5eaaf49407cf211c1f668c5ee325bf04af27f8e377 SHA512 0f568673811f709383b3f262b19d3ec69de6807671c05a98266b21f2bfa6a8b85d2a8b95c3cec38bb012afb9d8add19a3f38b74b3e90f66cf233a1d26aaca805 WHIRLPOOL 7e52a0f74609837c07d2b0792f862e05a37598c037c2828b1521220527fc08922250cd6974e932877f726cfc699fc884f615d0ad307db6aaa45e44a35d7e0d53
+EBUILD mpgtx-1.3.1-r2.ebuild 1216 SHA256 c5850ea2fd3a2f5b64393f032de33964b5d17f4f6fd3d44690d9e3cd25aa2fc8 SHA512 02e6b6af040c77e69ade0cc3d04e58f5c86a0a542839f7550adbbc2976796258bc08b06d0f6a693d2b1250fc3133bc11667d254299e42e9489bc4974848715c4 WHIRLPOOL ec23d954c0da1eea8b701b05698a6b93063358a030752fead545dedcdaa8ef0b927bdeb10b9866e13265f0635d66ce0fbe977ade03e69055791e76413c8d4ec4
+MISC ChangeLog 2518 SHA256 219a2579f96b46fd90f4ba7f4764bc55ed3c37c0ae328bf8929da5873e75dbba SHA512 952ca5642889d28bbc7a8db968d5f2bffc9dc7b61e80df5c8bc279c73365ae59e2581c74ad13a6186cace09d717bab1027c169d74822ce572d4873f5b0fbc888 WHIRLPOOL c5bee2ac88ed60381df2e65669fdaf608b44deb0aa3c1117d0d3cfb9c82b359b94196a30680225f4bd2bb2402c8b0a1102899c791f93189e033e293cb04fad56
+MISC ChangeLog-2015 3173 SHA256 37459d3d93b2785005c994225f17fe410cc75f81ffae53fbb887699fdd5ba280 SHA512 2f61f133cfdee7a15fba1c76484f3b3678f2a3c2ec77b7098aef3179091fb7f939c47d283220c094c703ca654b12e6f930d1497f918b44d887b8c7fb133ac0d1 WHIRLPOOL f361ea25b7d5c1de6f73d6973202dd2c8b50c199ef436148de7fd1fa3ec8b04505ac407e45f7c183b67800075b1b114b84d11e9c1fe6e45736aa9060a718f2b2
+MISC metadata.xml 306 SHA256 5cbd74f613b53c3c697b58c39cae3983d75d7be557b604de6665b973b2bd5272 SHA512 4ee62efce019bd77b49de68810efadafdd36db330b147d8bd24a4af29ba6a4e69a3ccb66545a4c42261ade86b3094b2e15d838ac8af7d06be1713b3b07193144 WHIRLPOOL 1a0a7b878bf6cb32eaabffc60023653014dfd0ca56631189a2bf6d127f6fb005b65d9ee979282963372378171fa00d47145bbc3dbfc63ce25461d177f9879fb9
diff --git a/media-video/mpgtx/files/mpgtx-1.3.1-configure.patch b/media-video/mpgtx/files/mpgtx-1.3.1-configure.patch
new file mode 100644
index 000000000000..ec36e76ba641
--- /dev/null
+++ b/media-video/mpgtx/files/mpgtx-1.3.1-configure.patch
@@ -0,0 +1,69 @@
+--- configure.old	2006-12-07 19:51:08.000000000 +0100
++++ configure	2006-12-07 19:51:02.000000000 +0100
+@@ -9,7 +9,6 @@
+ prefix="/usr/local"
+ manprefix='$(PREFIX)'
+ #compiler flags
+-CC="g++"
+ common_cflags="-Wall"
+ devel_cflags="-g -Werror -fno-builtin"
+ optimization_cflags="-O3"
+@@ -36,7 +35,6 @@
+ 
+ if [ "${HOSTNAME}" = "powerpc-apple-darwin6.0" ]; then
+ #compiler flags
+-CC="c++"
+ common_cflags="-pedantic -Wall"
+ #devel_cflags="-g -Werror -fno-builtin"
+ devel_cflags="-g -fno-builtin"
+@@ -153,8 +151,15 @@
+     if test "$gcc_minor" = "0" -o "$gcc_minor" = "1"; then
+ 	optimization_cflags="-O2";
+     fi
++    if test "$gcc_minor" -ge 4; then
++	optimization_cflags="$optimization_cflags -fno-unit-at-a-time"
++    fi
++elif test "$gcc_major" -ge "4"; then
++	optimization_cflags="$optimization_cflags -fno-unit-at-a-time"
+ fi
+ 
++
++
+ # Now check if the system handles large file support
+ # unless user has specified not to do so
+ if test $LFS = "yes"; then
+@@ -165,7 +170,7 @@
+ 		return (int)(fseeko(stdin,0,SEEK_SET));
+ 		}
+ EOF
+-	$CC __LFStest.cpp -o __LFStestPASSED -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE 1>__LFSout 2>__LFSerror
++	${CXX:-c++} __LFStest.cpp -o __LFStestPASSED -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE 1>__LFSout 2>__LFSerror
+ 	if test -f __LFStestPASSED; then
+ 		echo "PASSED";
+ 		cflags="$cflags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE";
+@@ -211,7 +211,6 @@
+ fi
+ 
+ if test $devel = "no" -a $debug = "no"; then
+-lflags="$lflags -s";
+ cflags="$cflags $optimization_cflags";
+ fi
+
+@@ -293,15 +298,15 @@
+ 	@echo ""
+ 
+ mpgtx : commandline.cxx mpegOut.o mpeg.o chunkTab.o id3command.o common.hh
+-	$CC \$(CFLAGS) \$(OFLAGS) -o mpgtx commandline.cxx mpegOut.o mpeg.o chunkTab.o id3command.o \$(LFLAGS)
++	\$(CXX) \$(CFLAGS) \$(OFLAGS) \$(LDFLAGS) -o mpgtx commandline.cxx mpegOut.o mpeg.o chunkTab.o id3command.o \$(LFLAGS)
+ mpegOut.o : mpegOut.cxx mpegOut.hh mpeg.hh common.hh
+-	$CC \$(CFLAGS) \$(OFLAGS) -c mpegOut.cxx 
++	\$(CXX) \$(CFLAGS) \$(OFLAGS) -c mpegOut.cxx 
+ mpeg.o : mpeg.cxx mpeg.hh mpegOut.hh common.hh
+-	$CC \$(CFLAGS) \$(OFLAGS) -c mpeg.cxx 
++	\$(CXX) \$(CFLAGS) \$(OFLAGS) -c mpeg.cxx 
+ chunkTab.o : chunkTab.cxx chunkTab.hh common.hh
+-	$CC \$(CFLAGS) \$(OFLAGS) -c chunkTab.cxx
++	\$(CXX) \$(CFLAGS) \$(OFLAGS) -c chunkTab.cxx
+ id3command.o : id3command.cxx id3command.hh common.hh
+-	$CC \$(CFLAGS) \$(OFLAGS) -c id3command.cxx
++	\$(CXX) \$(CFLAGS) \$(OFLAGS) -c id3command.cxx
diff --git a/media-video/mpgtx/files/mpgtx-1.3.1-dont-ignore-cxx-flags.patch b/media-video/mpgtx/files/mpgtx-1.3.1-dont-ignore-cxx-flags.patch
new file mode 100644
index 000000000000..3a7f5da67458
--- /dev/null
+++ b/media-video/mpgtx/files/mpgtx-1.3.1-dont-ignore-cxx-flags.patch
@@ -0,0 +1,11 @@
+--- mpgtx-1.3.1/configure.old	2006-12-09 00:26:18.000000000 +0100
++++ mpgtx-1.3.1/configure	2006-12-09 00:28:52.000000000 +0100
+@@ -11,7 +11,7 @@
+ #compiler flags
+ common_cflags="-Wall"
+ devel_cflags="-g -Werror -fno-builtin"
+-optimization_cflags="-O3"
++optimization_cflags="${CXXFLAGS}"
+ release_cflags=$optimization_cflags
+ OFLAGS="-ansi"
+ cflags=$common_cflags
diff --git a/media-video/mpgtx/metadata.xml b/media-video/mpgtx/metadata.xml
new file mode 100644
index 000000000000..b39193a1cd78
--- /dev/null
+++ b/media-video/mpgtx/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>media-video@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">mpgtx</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-video/mpgtx/mpgtx-1.3.1-r2.ebuild b/media-video/mpgtx/mpgtx-1.3.1-r2.ebuild
new file mode 100644
index 000000000000..91b95dde1ed1
--- /dev/null
+++ b/media-video/mpgtx/mpgtx-1.3.1-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Command line MPEG audio/video/system file toolbox"
+SRC_URI="mirror://sourceforge/mpgtx/${P}.tar.gz"
+HOMEPAGE="http://mpgtx.sourceforge.net/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-configure.patch \
+		"${FILESDIR}"/${P}-dont-ignore-cxx-flags.patch
+	tc-export CXX
+}
+
+src_configure() {
+	./configure --parachute || die
+}
+
+src_install() {
+	dobin mpgtx
+
+	dosym mpgtx /usr/bin/mpgjoin
+	dosym mpgtx /usr/bin/mpgsplit
+	dosym mpgtx /usr/bin/mpgcat
+	dosym mpgtx /usr/bin/mpginfo
+	dosym mpgtx /usr/bin/mpgdemux
+	dosym mpgtx /usr/bin/tagmp3
+
+	doman man/mpgtx.1 man/tagmp3.1
+
+	dosym /usr/share/man/man1/mpgtx.1 /usr/share/man/man1/mpgcat.1
+	dosym /usr/share/man/man1/mpgtx.1 /usr/share/man/man1/mpgjoin.1
+	dosym /usr/share/man/man1/mpgtx.1 /usr/share/man/man1/mpginfo.1
+	dosym /usr/share/man/man1/mpgtx.1 /usr/share/man/man1/mpgsplit.1
+	dosym /usr/share/man/man1/mpgtx.1 /usr/share/man/man1/mpgdemux.1
+
+	dodoc AUTHORS ChangeLog README TODO
+}
diff --git a/media-video/mplay-sh/Manifest b/media-video/mplay-sh/Manifest
new file mode 100644
index 000000000000..d15450f0a315
--- /dev/null
+++ b/media-video/mplay-sh/Manifest
@@ -0,0 +1,5 @@
+DIST mplay-0.5.3.tgz 26829 SHA256 2dee614796b97a1790ab58f0ee5f248d663376b2d2478061387535ddb6b5cc8e SHA512 68ed7821e1f926a5be5031dd464eae7b861f517eefdd78437adf366e83974ec6cedaa4e75b4098aff8d7526dea47bae60ab1942b13e0a986ba2e7f3bbbf50fdb WHIRLPOOL 7ab92ef56ffece999b884070dfff3a4a8844c3c4a66c9b1626ac3ee374e982bfb0dc6aba0fcfe474a377485ac4c9a01053e325dbc25da75badd9501c56d5b5f0
+EBUILD mplay-sh-0.5.3-r1.ebuild 1044 SHA256 0a442fe27424b59f912d447542bcb9c8496b445eaa2d01c6394b0d3e39e6dcf1 SHA512 ba160ee09462614db5a982c9b61f923176d7531f89311473083df191acee0dfe8bef6532d0f5b68045ab2daa583be2b9b90a384b64da13823f42fefef3cc9a7d WHIRLPOOL 8b6f96896fcf37a3bd43b2abb5e043546f0327fdc742ef3a38345836e913748232924d5a84d90d7d4da51f702ed0bc226ec28c25bbeab3fc2d14cadb42750cbf
+MISC ChangeLog 2860 SHA256 b076dbc0fc5f52c7412d7a917d196d711e94350fb9c1e1751d418718fd5f74f4 SHA512 260581e080656afd5166b36aaa8c320744687027f86e810781d636de1d23eea04b6230bbe8ed78cb6959aa08dce9d3c90a5be23c956c77fbccd7684fc33788ef WHIRLPOOL 3d91a2dbbd277d69b6ad1354ca056dc36dd76fbf5e42a520329a52713358d996d888dc29281893e7d1e4aa37d31ea94b1f21d8e32d242ae510757e99510dda8c
+MISC ChangeLog-2015 884 SHA256 cef7d0ea44f6dc1942ffe020f3af7b0d663cec3187a70f0e4a23b54f8f022e23 SHA512 b4a348777a689ca9b188110c4c4063c1c6f258628d6d77fbb3ad86262ca59830c21f2db060daf0b8717b20bcfca78f2b52618dfbea3642577b1c724509ceb66c WHIRLPOOL cbfe394b9f507e93071468ae2fb202328ec95e27fc500c7ac359cd83d19eb9bc3179b601b48d29f3c5b8b1a89c94255237900d23bf37e53639e841583d3a5776
+MISC metadata.xml 243 SHA256 161359b6e9eddec137a431eea66785e070bbc25fab3ae1b57f900e411fc37fe7 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06 WHIRLPOOL ebf59815181c251040396bb44206b875f6d996abcff030fdbf8355b47d6ea8c4f2669847ea1af194112de469258d7ca09ed77b682924ca495958a65f957dbf39
diff --git a/media-video/mplay-sh/metadata.xml b/media-video/mplay-sh/metadata.xml
new file mode 100644
index 000000000000..27f419c289c3
--- /dev/null
+++ b/media-video/mplay-sh/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+<email>vdr@gentoo.org</email>
+<name>Gentoo VDR Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-video/mplay-sh/mplay-sh-0.5.3-r1.ebuild b/media-video/mplay-sh/mplay-sh-0.5.3-r1.ebuild
new file mode 100644
index 000000000000..d9e424343ed1
--- /dev/null
+++ b/media-video/mplay-sh/mplay-sh-0.5.3-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils
+
+MY_P="mplay-${PV}"
+
+DESCRIPTION="mplayer wrapper script as backend for vdr-mplayer"
+HOMEPAGE="http://www.vdr-portal.de/board/thread.php?threadid=62306"
+SRC_URI="mirror://gentoo/${MY_P}.tgz
+	https://dev.gentoo.org/~zzam/distfiles/${MY_P}.tgz"
+
+KEYWORDS="x86 ~amd64"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+
+DEPEND="media-tv/gentoo-vdr-scripts"
+RDEPEND=">=media-video/mplayer-0.90_rc4"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i mplay.sh \
+		-e 's#$CONFDIR/silence.wav#/usr/share/vdr/mplay-sh/silence.wav#'
+	sed -i conf.examples/mplayrc \
+		-e 's#^MPLAY_PLAY.*#MPLAY_PLAY="/var/vdr/tmp/mplay.play"#'
+}
+
+src_install() {
+	exeinto /usr/share/vdr/mplayer/bin
+	doexe mplay.sh
+
+	insinto /etc/vdr/plugins/mplay
+	doins conf.examples/*.conf conf.examples/mplayrc
+
+	insinto /usr/share/vdr/mplay-sh
+	doins conf.examples/silence.wav
+
+	dodoc README* HISTORY
+	keepdir /var/vdr/tmp
+	chown vdr:vdr -R "${D}/var/vdr"
+}
diff --git a/media-video/mplayer-resume/Manifest b/media-video/mplayer-resume/Manifest
new file mode 100644
index 000000000000..5eaa5e70072a
--- /dev/null
+++ b/media-video/mplayer-resume/Manifest
@@ -0,0 +1,5 @@
+DIST mplayer-resume-2.0.tar.gz 5251 SHA256 482f5de621ff17baa3571eb6f5fccf4afa38c982bfb8c8fbd58178ae375c173b SHA512 38ba85b347fd0904e9bad7586e4dfcfd57c85fc2ff8cb9dc58c3961e15fd6500d1a6e0d7f51cb3b8c826aea290b9511be30406ef6bf5b26489788eaaa02deb69 WHIRLPOOL ce5b8fdfc6ceccb9ab0adec373ce9bccc875528d89ba87d4a0305932add20f5006613eab531ae17efdc873bc0217a43b6e3eee88e651599da64ca7c65b1188b7
+EBUILD mplayer-resume-2.0.ebuild 1040 SHA256 5524e4270f8710cb93fa8e24174a8d4a66f87692c0ccb686d5c7f0d108fad6fd SHA512 7bdf6621fc483a1cc1b7037f05b9b4c5dc37a56c23b074f45e1fe2509592dbf2563e521b7e8520ca0e2005f2e6a109f53888999bb2731f804c1f4b86ba430348 WHIRLPOOL 5abd278fce2cf19fdccc4ce02974365e8f1355fc9d536357a2f5a99f7d987605f38852bfbb2c95356c1b31bc842d9c45014018809f77d1695a8de10deea9bea1
+MISC ChangeLog 2447 SHA256 0bd77e2d0c42fa26063b27366e584cd59725f4d5a8c10d1b07f143acc81f8877 SHA512 38a69812ccb7a02d0144309f6226430b61bfb9d4b2872b46af2c76aff00d15bef5791ca400d2177ca56e76502cba52d2419b16ee40d1f45c10ad567518d32b27 WHIRLPOOL 7517340373eebafaecbcf40794f60254e8036d4cf57329f32d468a018c83bb5bb6f5467e8e097473bda8bf4b3f8b0690ff8768b99d9df432681da78ebc91f1dc
+MISC ChangeLog-2015 1659 SHA256 373c891820b4071d996b4c0ae4b34b1e9a704d02f678873aefb0f3bf27a8a6a5 SHA512 213b695209c03b7d78a2d47935d0ec1adcdaa769c838db3c8e81b5710c2be12071d02bcf806ab0cf6cef565345fb3411c1a7a8ff6c4584b8ea23b33333a41d87 WHIRLPOOL 6c948bd3827f9da28e2698c0eaf0f7fb1d4263fb067fb7e3a6d4e8b19975e572bb68016fe184a4ed3b8b6318be1ce601094185f72212efa46ab2cc166011222c
+MISC metadata.xml 255 SHA256 cfa2e7e4e1ad84d152c6b2f49467e2beb07d188dad704bc9887438f2b0d95f18 SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9 WHIRLPOOL 6fbb4f57853f7ac5b979c506736e63f571606215889abf768ddb44fc91b3491a846ea84d46c6984bd3cd230f4808f8f39fa83580e636576c7756fdb1564869da
diff --git a/media-video/mplayer-resume/metadata.xml b/media-video/mplayer-resume/metadata.xml
new file mode 100644
index 000000000000..2a705e39ce78
--- /dev/null
+++ b/media-video/mplayer-resume/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>media-video@gentoo.org</email>
+	<name>Gentoo Video project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-video/mplayer-resume/mplayer-resume-2.0.ebuild b/media-video/mplayer-resume/mplayer-resume-2.0.ebuild
new file mode 100644
index 000000000000..10d0f99dbff4
--- /dev/null
+++ b/media-video/mplayer-resume/mplayer-resume-2.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+DESCRIPTION="MPlayer wrapper script to save/resume playback position"
+HOMEPAGE="http://www.spaceparanoids.org/trac/bend/wiki/mplayer-resume"
+SRC_URI="http://spaceparanoids.org/downloads/mplayer-resume/${P}.tar.gz"
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+lirc"
+DEPEND=""
+RDEPEND="lirc? ( app-misc/lirc
+		media-video/mplayer[lirc] )
+		 dev-lang/php[cli]
+		 || ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )
+	media-video/mplayer"
+
+src_compile() {
+	return;
+}
+
+src_install() {
+	dobin mplayer-resume
+	dodoc ChangeLog README
+}
+
+pkg_postinst() {
+	elog "To get mplayer-resume to save playback position with LIRC,"
+	elog "you will need to setup an entry in ~/.lircrc to run "
+	elog "'get_time_pos' and then 'quit'.  More instructions are"
+	elog "detailed in the README, but the position will not be saved"
+	elog "until you set it up."
+	elog ""
+	elog "Playback position files are saved in ~/.mplayer/playback"
+}
diff --git a/media-video/mplayer-sh/Manifest b/media-video/mplayer-sh/Manifest
new file mode 100644
index 000000000000..a82f99174579
--- /dev/null
+++ b/media-video/mplayer-sh/Manifest
@@ -0,0 +1,9 @@
+AUX mplayer-sh-0.8.6-parameter-aid.diff 3541 SHA256 b63f1c0220b2a2fce8ad5a81767a756bfa91aca769c3a943058cbbf023f56dc5 SHA512 5e53a456eefd98c43c0e3adfd2ce2c3e688257d18b3cf76f74d48d94913450098427c308276f6b5831c93c93a5c4f6f0f36636777a99b9497556425ed8b09bd3 WHIRLPOOL 0b294378434ddeb14688abc026af9906cf218baf14f99b6478d53dd68cc332d6e88208104edfde09692264fd3a58f8b5d25e35ef30219beeac9f76770192123f
+AUX mplayer-sh-0.8.7-parameter-aid.diff 3570 SHA256 5d0079cb73baee2108ee1cb587988a09e6108b92361587b045a718215914858f SHA512 9783f779a09143faa89ef3de5d87ec415dd797af53d4b1da6b56ed28021a414768b4393e0fd8812c74805c17970eb24cbee3ebc12ee741e036a2f4276e449e5c WHIRLPOOL 42a6b1d9b5d78d7fd70b24cf33f94a0c3fe576d570bdbfa79f2050fa74a52387178e145719a6c55ffc97c5086bdf24e0e6882c950ad6183850c8c1701c986ed1
+DIST mplayer.sh-0.8.6.tar.gz 7568 SHA256 3d98b55f7b173296ac40d14b967f525459f415b340322de53cd8105cca4851ef SHA512 ff4a11f1b8dae014646f101fcab16d6cebc0c3250bc8d259500c2819b484913270051ed9ec9b1442e647e811030f927db07f71aa64edd6221a875e067e22e36a WHIRLPOOL fc3e54d76256dc0c4b5af7e67c6322073195a8613ec86690e6b5491e9776302301146d84a7f838193d6d10df8761a22dbadf1a7d6aeadccd31bd40bd77c7a6c2
+DIST mplayer.sh-0.8.7.tar.gz 7851 SHA256 271f1105efcc6292117d826255f873da4ef70cf517f523d65a36036c74c60dcf SHA512 5e83dd2f83b104f7043d828b713e34f47c9a42a93324424c802d4d448b770e36515accf67bd67ce7461201b5e9cd5596da2bbd182eccef9578c9b31b5fed50d9 WHIRLPOOL 7dfe74c54d455cad09963a31d7e28125c3e58c621632c0c41d8fbeec6dc78abe4fb5f9ff495602e82a1a71dde56cdee9d917bc9a914f9f2a82d8066441ee0132
+EBUILD mplayer-sh-0.8.6-r2.ebuild 1019 SHA256 e694bb352562d0b61dd2d640b78b102d0c4ef722b1410a7db16db46e5ded4e71 SHA512 90f5c6a0914280f03432514131b0353106f8eff78252ffc5e87ee7e7e7320f4e26d0ae2e733dd3fe86a80bc3c789827b81786ad42dc26a47fa525860cf7d1579 WHIRLPOOL 9c06310eae6c8baccbd5d11c22874a8342a0c009bebd3f2236d90fe5153915e939d75431b0d29955d997bfbf6d5fb442cb8831aaf6072b36e8cc6faca38d663c
+EBUILD mplayer-sh-0.8.7.ebuild 1043 SHA256 5d085ac92070b6f657f5fd50b4bd928885b78020621f4e306007eb1f22404cbc SHA512 493e799c0e40f6dc431a7412170ff503394ed06d3384271e75e2fe2b9e5bb9aa85cbbbb784148bdf6c672f1e7a2dde8ff220d659cf337d2224f129e9d153b131 WHIRLPOOL e4b67340188f22fe58ed33fd6ca73baa2df1e879a7e53ececbe752530fb3cc25c274c8ee0e06245031b9c5b18913c57596b618be112d962a2649aaa30810b2f5
+MISC ChangeLog 2595 SHA256 dd055b7c459c79ba4bc075c3c23b85fe1a93bf7aca8d43a08950a56b0f559b37 SHA512 877108aaeae866f6b36fbf1d20477bb9cf8cafafeefe1715e8b5ec974cb6227a74d07e84bef7492e9466a55a06bad3df60d04bbed4bfcfb1fd037f8bfe64e4d7 WHIRLPOOL ff604f9f50d0ae8f3ad398c9454403a6f288cf68c3f749d11a900c6911467d56b7ff17f7b57d76b6966cb936d933fbaf7aa4f11b1d9595528fd17248a0f7c067
+MISC ChangeLog-2015 1584 SHA256 5bab88015bf65ec4010835a5594337edc72ab236d65c82f1b2ef1b4f2abf1864 SHA512 7f9f23f56243138da98e209242137f7a15e0a8cf42cedd8afbc19fddc9d719c57005f666d5b76a05354906c61108fc1b9e13ba0baf097f7f9d079e37194fbfdf WHIRLPOOL 71f0b789e016dcb2813ce92dbfbbdf6cacf79cac2589afd124a5964e64250410f08d55d6e252f27b57b5908f4795b41680ae1cb6cb617bf186f061189b46f118
+MISC metadata.xml 352 SHA256 c13fb290aa7a0170d5ac7d25a96f02a39037f3510aa6aa2f7e313745a7622505 SHA512 0cfe165c67b3cf97eb5bf97b0783efcec1622e9fea10e6272a66c20c218663cff53d68cd8127048f8ec50897e5959eb4cdd0348f3cae8296c7ad82accc62bfe9 WHIRLPOOL f887fa281fc9d7a631c7cf4e90ba52fbd51ae2273402c6d5ccafa4eb9bc990f25d5505bce51ba6b252e614b1a93e2a7af6bf71f5b5fd7ecb5b6ad194acd658fd
diff --git a/media-video/mplayer-sh/files/mplayer-sh-0.8.6-parameter-aid.diff b/media-video/mplayer-sh/files/mplayer-sh-0.8.6-parameter-aid.diff
new file mode 100644
index 000000000000..3b329215564b
--- /dev/null
+++ b/media-video/mplayer-sh/files/mplayer-sh-0.8.6-parameter-aid.diff
@@ -0,0 +1,84 @@
+--- mplayer.sh.orig	2006-03-26 23:31:10.000000000 +0200
++++ mplayer.sh	2006-03-26 23:50:39.000000000 +0200
+@@ -6,6 +6,7 @@
+ declare VERSION="0.8.6"
+ 
+ # History (as always in the source code :-)
++#       - add -aid to mplayer when AID is given (Matthias Schwarzott <zzam@gentoo.org>)
+ # 0.8.6 - fixed a copy'n'paste bug regarding the subtitle background 
+ #	  alpha color (thanks to Christian Haider)
+ #	- changed the fps values from rational values to integer ones
+@@ -208,6 +209,11 @@
+   fi
+   debugvar REMOTE "$REMOTE"
+ 
++  if test -n "${AID}"; then
++    AUDIO="-aid ${AID}"
++  fi
++  debugvar AUDIO "${AUDIO}"
++
+   if ! test -z "$USERDEF"; then echolog "*** Use Option USERDEF at your own risk!"; fi
+   debugvar USERDEF "$USERDEF"
+ 
+@@ -478,15 +484,24 @@
+ declare -i NEW_X NEW_Y
+ declare -i HALF_Y FULL_Y
+ declare ORIG_FPS NEW_FPS ORIG_ASPECT VIDEO_FORMAT AUDIO_CODEC
+-declare CMDLINE AOUT REMOTE USERDEF SUFFIX
++declare CMDLINE AOUT REMOTE AUDIO USERDEF SUFFIX
+ declare FILE="$1"
+-declare SLAVE="$2"
++shift
+ declare -a XResPAL[0]
+ declare -a XResNTSC[0]
+ declare FDSTR=""
+ declare SUBTITLES=""
+ declare DETC=""
+ 
++while [[ -n $1 ]]; do
++	case ${1} in
++	SLAVE) SLAVE=SLAVE ;;
++	AID) AID=${2}; shift ;;
++	esac
++
++	shift
++done
++
+ echolog "*** Starting mplayer.sh Version $VERSION"
+ 
+ if test -z "$FILE"; then echolog "*** USAGE: mplayer.sh <File_to_be_played>"; exit; fi
+@@ -504,18 +519,18 @@
+ if test \( "$FILE" == "$DVDFiles/DVD" -o "$FILE" == "$DVDFiles/VCD" \) -a -n "$DVDFiles" -a -n "$DVD"; then
+     if test "$FILE" == "$DVDFiles/DVD"; then
+     	$USEAC3 && AOUT="$AC3AOUT"
+-        CMDLINE="$MPLAYER -vo $VO $AOUT -alang $DVDLANG $DVDOPTIONS $FDSTR $CACHESTR $REMOTE $USERDEF -dvd-device $DVD dvd://"
++        CMDLINE="$MPLAYER -vo $VO $AOUT -alang $DVDLANG $DVDOPTIONS $FDSTR $CACHESTR $AUDIO $REMOTE $USERDEF -dvd-device $DVD dvd://"
+     fi
+     if test "$FILE" == "$DVDFiles/VCD"; then
+-        CMDLINE="$MPLAYER -vo $VO $AOUT $VCDOPTIONS $FDSTR $CACHESTR $REMOTE $USERDEF -cdrom-device $DVD vcd://"
++        CMDLINE="$MPLAYER -vo $VO $AOUT $VCDOPTIONS $FDSTR $CACHESTR $AUDIO $REMOTE $USERDEF -cdrom-device $DVD vcd://"
+     fi
+     unset FILE
+ elif test "${SUFFIX}" == ".cue"; then
+     if $MPLAYER_V1; then      
+-        CMDLINE="$MPLAYER -vo $VO $AOUT $FDSTR $CACHESTR $REMOTE $USERDEF cue://$FILE:2"
++        CMDLINE="$MPLAYER -vo $VO $AOUT $FDSTR $CACHESTR $AUDIO $REMOTE $USERDEF cue://$FILE:2"
+ 	unset FILE
+     else
+-        CMDLINE="$MPLAYER -vo $VO $AOUT $FDSTR $CACHESTR $REMOTE $USERDEF -vcd 2 -cuefile"
++        CMDLINE="$MPLAYER -vo $VO $AOUT $FDSTR $CACHESTR $AUDIO $REMOTE $USERDEF -vcd 2 -cuefile"
+     fi
+ else
+     # Try to determine the video attributes
+@@ -545,9 +560,9 @@
+              \( $NTSC -a $NEW_FPS == "30" -a \( \( $ORIG_X == "352" -a $ORIG_Y == "240" \) -o \( $ORIG_Y == "480" -a \
+              \( $ORIG_X == "352" -o $ORIG_X == "480" -o $ORIG_X == "512" -o $ORIG_X == "640" -o $ORIG_X == "704" -o $ORIG_X == "720" \) \) \) \) \
+        \) ; then
+-      CMDLINE="$MPLAYER -vo $VO $AOUT $FDSTR $CACHESTR $REMOTE $USERDEF"
++      CMDLINE="$MPLAYER -vo $VO $AOUT $FDSTR $CACHESTR $AUDIO $REMOTE $USERDEF"
+     else
+-      CMDLINE="$MPLAYER -vo $VO $AOUT -vop $VOP:$NEW_FPS,expand=$NEW_X:$REAL_Y:-1:-1:1,scale=$NEW_X:${NEW_Y}${DETC} $SPEED $FDSTR $CACHESTR $REMOTE $SUBTITLES $USERDEF $FORCEIDX"
++      CMDLINE="$MPLAYER -vo $VO $AOUT -vop $VOP:$NEW_FPS,expand=$NEW_X:$REAL_Y:-1:-1:1,scale=$NEW_X:${NEW_Y}${DETC} $SPEED $FDSTR $CACHESTR $AUDIO $REMOTE $SUBTITLES $USERDEF $FORCEIDX"
+     fi
+ fi
+ 
diff --git a/media-video/mplayer-sh/files/mplayer-sh-0.8.7-parameter-aid.diff b/media-video/mplayer-sh/files/mplayer-sh-0.8.7-parameter-aid.diff
new file mode 100644
index 000000000000..3de61e76cd1b
--- /dev/null
+++ b/media-video/mplayer-sh/files/mplayer-sh-0.8.7-parameter-aid.diff
@@ -0,0 +1,84 @@
+--- mplayer.sh.orig	2007-02-11 16:34:07.000000000 +0100
++++ mplayer.sh	2007-05-05 18:17:48.000000000 +0200
+@@ -12,6 +12,7 @@
+ #	- calculate USE_SPEED with 30 fps instead of 29.97
+ #	- use '-vf' and '-af' instead of '-vop' and '-aop', as the
+ #	  latter are deprecated
++#       - add -aid to mplayer when AID is given (Matthias Schwarzott <zzam@gentoo.org>)
+ #
+ # 0.8.6 - fixed a copy'n'paste bug regarding the subtitle background 
+ #	  alpha color (thanks to Christian Haider)
+@@ -215,6 +216,11 @@
+   fi
+   debugvar REMOTE "$REMOTE"
+ 
++  if test -n "${AID}"; then
++    AUDIO="-aid ${AID}"
++  fi
++  debugvar AUDIO "${AUDIO}"
++
+   if ! test -z "$USERDEF"; then echolog "*** Use Option USERDEF at your own risk!"; fi
+   debugvar USERDEF "$USERDEF"
+ 
+@@ -485,15 +491,24 @@
+ declare -i NEW_X NEW_Y
+ declare -i HALF_Y FULL_Y
+ declare ORIG_FPS NEW_FPS ORIG_ASPECT VIDEO_FORMAT AUDIO_CODEC
+-declare CMDLINE AOUT REMOTE USERDEF SUFFIX
++declare CMDLINE AOUT REMOTE AUDIO USERDEF SUFFIX
+ declare FILE="$1"
+-declare SLAVE="$2"
++shift
+ declare -a XResPAL[0]
+ declare -a XResNTSC[0]
+ declare FDSTR=""
+ declare SUBTITLES=""
+ declare DETC=""
+ 
++while [[ -n $1 ]]; do
++	case ${1} in
++	SLAVE) SLAVE=SLAVE ;;
++	AID) AID=${2}; shift ;;
++	esac
++
++	shift
++done
++
+ echolog "*** Starting mplayer.sh Version $VERSION"
+ 
+ if test -z "$FILE"; then echolog "*** USAGE: mplayer.sh <File_to_be_played>"; exit; fi
+@@ -511,18 +526,18 @@
+ if test \( "$FILE" == "$DVDFiles/DVD" -o "$FILE" == "$DVDFiles/VCD" \) -a -n "$DVDFiles" -a -n "$DVD"; then
+     if test "$FILE" == "$DVDFiles/DVD"; then
+     	$USEAC3 && AOUT="$AC3AOUT"
+-        CMDLINE="$MPLAYER -vo $VO $AOUT -alang $DVDLANG $DVDOPTIONS $FDSTR $CACHESTR $REMOTE $USERDEF -dvd-device $DVD dvd://"
++        CMDLINE="$MPLAYER -vo $VO $AOUT -alang $DVDLANG $DVDOPTIONS $FDSTR $CACHESTR $AUDIO $REMOTE $USERDEF -dvd-device $DVD dvd://"
+     fi
+     if test "$FILE" == "$DVDFiles/VCD"; then
+-        CMDLINE="$MPLAYER -vo $VO $AOUT $VCDOPTIONS $FDSTR $CACHESTR $REMOTE $USERDEF -cdrom-device $DVD vcd://"
++        CMDLINE="$MPLAYER -vo $VO $AOUT $VCDOPTIONS $FDSTR $CACHESTR $AUDIO $REMOTE $USERDEF -cdrom-device $DVD vcd://"
+     fi
+     unset FILE
+ elif test "${SUFFIX}" == ".cue"; then
+     if $MPLAYER_V1; then      
+-        CMDLINE="$MPLAYER -vo $VO $AOUT $FDSTR $CACHESTR $REMOTE $USERDEF cue://$FILE:2"
++        CMDLINE="$MPLAYER -vo $VO $AOUT $FDSTR $CACHESTR $AUDIO $REMOTE $USERDEF cue://$FILE:2"
+ 	unset FILE
+     else
+-        CMDLINE="$MPLAYER -vo $VO $AOUT $FDSTR $CACHESTR $REMOTE $USERDEF -vcd 2 -cuefile"
++        CMDLINE="$MPLAYER -vo $VO $AOUT $FDSTR $CACHESTR $AUDIO $REMOTE $USERDEF -vcd 2 -cuefile"
+     fi
+ else
+     # Try to determine the video attributes
+@@ -552,9 +567,9 @@
+              \( $NTSC -a $NEW_FPS == "30" -a \( \( $ORIG_X == "352" -a $ORIG_Y == "240" \) -o \( $ORIG_Y == "480" -a \
+              \( $ORIG_X == "352" -o $ORIG_X == "480" -o $ORIG_X == "512" -o $ORIG_X == "544" -o $ORIG_X == "640" -o $ORIG_X == "704" -o $ORIG_X == "720" \) \) \) \) \
+        \) ; then
+-      CMDLINE="$MPLAYER -vo $VO $AOUT $FDSTR $CACHESTR $REMOTE $USERDEF"
++      CMDLINE="$MPLAYER -vo $VO $AOUT $FDSTR $CACHESTR $AUDIO $REMOTE $USERDEF"
+     else
+-      CMDLINE="$MPLAYER -vo $VO $AOUT -vf scale=$NEW_X:${NEW_Y}${DETC},expand=$NEW_X:$REAL_Y:-1:-1:1,$VOP:$NEW_FPS $SPEED $FDSTR $CACHESTR $REMOTE $SUBTITLES $USERDEF $FORCEIDX"
++      CMDLINE="$MPLAYER -vo $VO $AOUT -vf scale=$NEW_X:${NEW_Y}${DETC},expand=$NEW_X:$REAL_Y:-1:-1:1,$VOP:$NEW_FPS $SPEED $FDSTR $CACHESTR $AUDIO $REMOTE $SUBTITLES $USERDEF $FORCEIDX"
+     fi
+ fi
+ 
diff --git a/media-video/mplayer-sh/metadata.xml b/media-video/mplayer-sh/metadata.xml
new file mode 100644
index 000000000000..2e199ea15fcc
--- /dev/null
+++ b/media-video/mplayer-sh/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vdr@gentoo.org</email>
+		<name>Gentoo VDR Project</name>
+	</maintainer>
+	<longdescription lang="en">
+	  API script between Plugin vdr-mplayer and mplayer.
+	</longdescription>
+</pkgmetadata>
diff --git a/media-video/mplayer-sh/mplayer-sh-0.8.6-r2.ebuild b/media-video/mplayer-sh/mplayer-sh-0.8.6-r2.ebuild
new file mode 100644
index 000000000000..ba1d12f2242c
--- /dev/null
+++ b/media-video/mplayer-sh/mplayer-sh-0.8.6-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+RESTRICT="mirror bindist"
+
+inherit eutils
+
+DESCRIPTION="Video Disk Recorder Mplayer API Script"
+HOMEPAGE="http://batleth.sapienti-sat.org/"
+SRC_URI="http://batleth.sapienti-sat.org/projects/VDR/mplayer.sh-${PV}.tar.gz"
+
+KEYWORDS="x86 ~amd64"
+SLOT="0"
+LICENSE="all-rights-reserved"
+IUSE=""
+
+RDEPEND=">=media-video/mplayer-0.90_rc4"
+
+S=${WORKDIR}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-parameter-aid.diff"
+
+	sed -i "s:^declare CFGFIL.*$:declare CFGFIL=\"\/etc\/vdr\/plugins\/mplayer\/mplayer.sh.conf\":"  mplayer.sh
+	sed -i mplayer.sh.conf -e "s:^LIRCRC.*$:LIRCRC=\/etc\/lircd.conf:" \
+		-e "s:^MPLAYER=.*$:MPLAYER=\/usr\/bin\/mplayer:"
+}
+
+src_install() {
+
+	insinto /etc/vdr/plugins/mplayer
+	doins mplayer.sh.conf
+
+	into /usr/share/vdr/mplayer
+	dobin mplayer.sh
+
+	dodir /etc/vdr/plugins/DVD-VCD
+	touch "${D}"/etc/vdr/plugins/DVD-VCD/{DVD,VCD}
+	fowners vdr:video /etc/vdr/plugins/DVD-VCD/{DVD,VCD}
+}
diff --git a/media-video/mplayer-sh/mplayer-sh-0.8.7.ebuild b/media-video/mplayer-sh/mplayer-sh-0.8.7.ebuild
new file mode 100644
index 000000000000..8fd6e86d2590
--- /dev/null
+++ b/media-video/mplayer-sh/mplayer-sh-0.8.7.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils
+
+RESTRICT="mirror bindist"
+
+DESCRIPTION="Video Disk Recorder Mplayer API Script"
+HOMEPAGE="http://batleth.sapienti-sat.org/projects/VDR/"
+SRC_URI="http://batleth.sapienti-sat.org/projects/VDR/versions/mplayer.sh-${PV}.tar.gz"
+
+KEYWORDS="x86 ~amd64"
+SLOT="0"
+LICENSE="all-rights-reserved"
+IUSE=""
+
+RDEPEND=">=media-video/mplayer-0.1.20070321"
+
+S=${WORKDIR}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-parameter-aid.diff"
+
+	sed -i "s:^declare CFGFIL.*$:declare CFGFIL=\"\/etc\/vdr\/plugins\/mplayer\/mplayer.sh.conf\":"  mplayer.sh
+	sed -i mplayer.sh.conf -e "s:^LIRCRC.*$:LIRCRC=\/etc\/lircd.conf:" \
+		-e "s:^MPLAYER=.*$:MPLAYER=\/usr\/bin\/mplayer:"
+}
+
+src_install() {
+
+	insinto /etc/vdr/plugins/mplayer
+	doins mplayer.sh.conf
+
+	into /usr/share/vdr/mplayer
+	dobin mplayer.sh
+
+	dodir /etc/vdr/plugins/DVD-VCD
+	touch "${D}"/etc/vdr/plugins/DVD-VCD/{DVD,VCD}
+	fowners vdr:vdr /etc/vdr/plugins/DVD-VCD/{DVD,VCD}
+}
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
new file mode 100644
index 000000000000..22d72c22a719
--- /dev/null
+++ b/media-video/mplayer/Manifest
@@ -0,0 +1,19 @@
+AUX dump_ffmpeg.sh 2529 SHA256 fc26816195a1a5754a377c7ca9915823f599d8e33f4a6047413f217742cc7f50 SHA512 12c15efa5cdb99eac92ff808fa56c6137343cca48b73d5875a7a6b08cf36ebeda5022eb3bae0ba567ff9031d2a0f3b5dbe69ee191ae8ecf48b98a779504df66c WHIRLPOOL b8fe6da839579d0dfa94c77318d1713a73810960c914c8936100e091793ffedeec558565b2ce096138ad60cd7c18e690a0a8bd573e2b88b11a8399bab0ce224c
+AUX mplayer-1.2-get_buffer.patch 12054 SHA256 ffffa0672bead0e97d970e98dc9ed4d1b9de444ee1eac3e83a16aeb0cac5c148 SHA512 9180c1d8cb151ce2c31ef196cbc10fc0a9e694995f49bc560e3335c76e424441b53306283d6fe89ea7a3ca933ef6801d5f155942951754a217fee3d3f34ad2a0 WHIRLPOOL 3efe38e95952dea7b36f3caf981786aa72e1a052ac3729daa29b84a850ad549996c514ff303d7a34e074e6c11842a7bffb18fab40173515fbfee8eaf4efd5397
+AUX mplayer-1.2_pre20150730-chan.patch 966 SHA256 d92a18180b023833a748ec4186a5e2914781247f8840d57d41b564cbe06eed48 SHA512 9ea28c193d26feba870283d110a69d42e739696571ac13d40f983b4b6f0c83f01befd12fa7825b2dca10d5f3279d29d71dd07f2f53553f78e88b182fd8250df4 WHIRLPOOL 8368cf41f1c1ca82674fde7ca39c46a7ec95569fd56acde0caba55b848a1a2635ae0b4b8b5e39c9b6f5f79bb6ad6401c2d7920568aee9d0c24e2e2def8a1f5fb
+AUX mplayer-1.2_pre20150730-encode.patch 3022 SHA256 edf081f8704fdf3936be1971d2d1243b684f78772d4c2a9459ad56a2db9c87fa SHA512 c1da3944616205c92926910d93bf9ee39404f46cad07a68df28050aeab88a358480e9cfe09f41af8fa047b623d9400bcebc1a05c6982f704d5164a777e591792 WHIRLPOOL a928b0ff7bf40495a4a34a4f89f7c6cd17d76bf528ecc696828d9dd5b67a9121f455d22fd439d74dbe434b3e6c1c94e572023e694db8510fea3b6581bd95ab72
+AUX mplayer-1.3-CVE-2016-4352.patch 617 SHA256 3fac635945a9327b3e08d6707f7153966908df147b7bf3d06d0b72d2d3215ae5 SHA512 654bfa8368a02669ba249aa0c1a605f285d4d967b7038285df0ba7b83cd034ac3aff933a564fd6f33c7a153267be19d9eb517a52c8f4b53a6f81b6b2c5558512 WHIRLPOOL a7f36dbb623536ceeebdfc11f1389c97d51a7e5afba335345318b867bf2dbed9f8fdcfd695eb41de0b8fe648b3b40a04f61857c2845e43d46d8ad4ed0dfa08d5
+AUX prepare_mplayer.sh 757 SHA256 ee4c0765b2cbab5bcc99408c4864669647fb0ad42517e0a51a6524c12b55804f SHA512 0add0707e15d58cee331fc82f884a44b29908c503f9ddcbb63dc01e237e2f457f599bae8644ce49f1af2cc7b3183529364ce30e6748889355c17cb96cecee71a WHIRLPOOL a4de2ff8e6ecfe66e41881664a84bc8ad91147e7b559e2ec334f9ad6671d9892de01bddfdba514b9c2b0589956b38d22fc8d2ce6ff00c267bded4bfb6c3ef6f0
+DIST MPlayer-1.2.1.tar.xz 13029936 SHA256 831baf097d899bdfcdad0cb80f33cc8dff77fa52cb306bee5dee6843b5c52b5f SHA512 e6dd6de73ede9743855fab7f7316de2e957ac5a5b8fc8324ef3d57ca9796b0cb03676dee46b3827d932050836d43a6ad08f925cad3d28493a26933dbafdbb506 WHIRLPOOL d8f056a8a1d6cf2a7c99687bec9e34d123f574391df02a29959355c6e44f35f1f9a56ea5f2d0f6d1037d94de0897689429e78aa7e15f29f3df3042bbfc579c72
+DIST MPlayer-1.3.0.tar.xz 13278984 SHA256 3ad0846c92d89ab2e4e6fb83bf991ea677e7aa2ea775845814cbceb608b09843 SHA512 10007e471a941f8a3dabf6149e6e44fc1a364a9ccb5cd08c670fc22560e5053a15f3249e9d3e18cdda06b6b7e77e537026b5d33dc356e928c63747d6ed73dbae WHIRLPOOL 4aaa9609b0c27c0363671e32fb6b7cac8d2c0944c3425c8e76de0250fb76865d5f47c341b11704a0ea980401288d1d28fcd172a5f8469c9713ec37f977bcb088
+DIST font-arial-cp1250.tar.bz2 249705 SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12 SHA512 4f77ff5ceb8ec6e5d9f8f34d8950a6a6276d1fd5a947772fcbdb6554988b1ea665c12b82f45164f91fb7bd08000cb4afc26fa35beb4c760464160e22b9b8c340 WHIRLPOOL d635f54be65b0ca1047d943b6f6da433cda9fce6ed74fcab993501cf7f6b443eb711e182cd7fff09e553d251b5fd1c60196aa22e8370cba99fa175ed5ecdb47f
+DIST font-arial-iso-8859-1.tar.bz2 234242 SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029 WHIRLPOOL 8050362b125d3ca98214526cee2fa685e31487d13a6483c765bfc844bdc5e07beeba2c1ba313458096d43a63edd6c5e80b8b388c2792fc0ec7421e4072d8ca25
+DIST font-arial-iso-8859-2.tar.bz2 222208 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d WHIRLPOOL 08178087b4ea1dfb2250f4673785e31dd876b06af51c51b2bddc172b23e6e33cbc1b2c6b710a317e42dc05486974b26ed0ad3ca50a185567aa77d49bd1e72aee
+EBUILD mplayer-1.2.1-r1.ebuild 17429 SHA256 96024a2fc6ec79a8c8fc32c9fb2173e4287d10807f6371961b3c95aaeaf81b75 SHA512 b36f8bfb7eb246787af2779b27d3cd17825a5f9e944a12c71a751615567b0f4a1015ca344b4e4a4bc64acdb52fb99dd1462a867505b24792472f5919fa6389c3 WHIRLPOOL 8f8e334b08ff302eeeb164f0aa48f052ce144a108e1f5de9ff2e37bcdb1e721d20c91cb823a4f7b11d0e6191c75d7c7c19b88ea36a822ef00e3b9b1eabfad97b
+EBUILD mplayer-1.3.0-r2.ebuild 17194 SHA256 1424b2b4087e9f83d60f37a8f1fccae9f9818ef6372b1713670b08dda6b28ef9 SHA512 ec49627e9094314b6595a501c6057e5f0643b3035e92edebc6a2d778260a78c2553962b0cd72f56b290ceb80dffee891362786db18c2e948d295452eb0a9009d WHIRLPOOL 53a194edac6cf2520f9c4180f4f0741ce938a9c23fde391eb5cbc8452fe8be5b739e51c08cfd4587b35085b37142d26386b1424c90d25e3a6247a0ae8a12c393
+EBUILD mplayer-1.3.0-r3.ebuild 17293 SHA256 9c52d3314c6ea3a1ab50b9ab5e217e4360b80778fe83fe9e83f99fc4063c4ffb SHA512 e1f31085299fd1037f4a00f30a1d040ad09a7f14217f976475155feaa88b27ad056130d8a112c1b1a9ff2cc0c853fe7ba7de4337a3c3652047fdc044e86db35a WHIRLPOOL 852fd339e10315151ef83b134268fbc8de722c37a44471cdca0538f8fff4bff8beaa429000665adbae97938b6c4382744f27e2fad5a99541d512497158e774a5
+EBUILD mplayer-9999.ebuild 17206 SHA256 a8ce728287a09091c4d2917a3e91bc686e31eb7cb5bfbbbef6716d97ea64735e SHA512 b99dacae704b960366f0406bb5e99a9a34a3b454b29ce538ac8a46af48ecb86929ef0c59a80fd67b9187309fb7cca608a1385b6a229238fb114d0b2ebc9a723a WHIRLPOOL 1d23c6754b0c21f3eb3b515396a4a1dc4d2bcb3dee1b2472b38edf91fd987f31b7ee5fb7f229529f826a502d7ae4643b9d57df300cfcc21477a2c4aeb4591f47
+MISC ChangeLog 10735 SHA256 6c3dcfc43705566e97c1761d41f94e41aa26a6a1d7893c25b14e635979e2d267 SHA512 97d8be790bbc844cb59784d2b87dbf9ad0125e69949e502373a7e3cf230d6b5a964eea20b06648efc67634768af865ee5639aff155b61f4eecfa13e08ac93a73 WHIRLPOOL 28daecebbcea2937847c7c1122971327454dcc05ed41b01f1b4a79586c2d5d3db93226ed0ecf4870a2d43061d39192eb63b5fc05ef207ce9408c8b7873d5aa62
+MISC ChangeLog-2008 107064 SHA256 d9949e0e21fd6fd00f1417201455ee399240ef1010dcf56611ac0fc1f6f9505b SHA512 622543b379b4c44f5845566b4e697bd92dd3e864e2f01a1b0f303c8ae5c7fb5de24839f6503765d51b4a3bfa777d175a7e410383e62ef2bbacf3e87cdc28c705 WHIRLPOOL e731af47505ffa646c92386dfb14acaffc2bb14ab4da74520c0b4dbc15ca5c20aacadbb53c4b91ba8d126a75bf7d2fb61877eeda354064e20c48cf4137bf6a74
+MISC ChangeLog-2015 56770 SHA256 9f28ccd0477f9b944da1aa68615316746bda16974dfeee4b54831151e87c5bb6 SHA512 f84819c9ac53bd3d6226c490f18d27aa1b4f6c24476d338ae02b3fc4628a5d6ba295ef506a0ba9e6f1039b608d95a014ea27779aeb00417f55e82dc0ffa39c4c WHIRLPOOL 66af012bf54cb95287b79001f730b6c2d7b1034d460bf8d36484ece498463c17e14968e26202d06b4f1c9d899b2a0f507f50560c079b3c171078a6b730936cb7
+MISC metadata.xml 2530 SHA256 5cb25b11c6a110c0b1fe430a58f355760817d5616ee2f1e54165f4df787c60f4 SHA512 b650af6aa25ee064d81d3db5cc066d634eaf8c8ccdf8e1352d449f0579b0a310026be2ff873999767c5b82c25a76c138af722220892794b9c615ce477335a93b WHIRLPOOL 8e259e49d552aa40dce3f8df33900dfef3d6b509fd8e6158cc92c766d3be7311526e563fb51ea042ee3505326db7f3a4b7cd92bae515d13fc3033c6f8dc63ce9
diff --git a/media-video/mplayer/files/dump_ffmpeg.sh b/media-video/mplayer/files/dump_ffmpeg.sh
new file mode 100644
index 000000000000..885946df8cc7
--- /dev/null
+++ b/media-video/mplayer/files/dump_ffmpeg.sh
@@ -0,0 +1,74 @@
+#!/bin/sh
+
+FFMPEG_DIR=ffmpeg
+FFMPEG_MOVED_DIR=ffmpeg_removed
+SYSTEM_FFMPEG_DIR=${EPREFIX}/usr/include
+
+# Move directories
+
+[ -d "${FFMPEG_DIR}" ] && mv "${FFMPEG_DIR}" "${FFMPEG_MOVED_DIR}"
+[ -d "${FFMPEG_MOVED_DIR}" ] || exit 1
+[ -d "${FFMPEG_DIR}" ] || mkdir "${FFMPEG_DIR}"
+
+# Keep required files and check them
+
+SANITIZED_REGEXP='^\#[[:space:]]*include.*\".*[.]h\"'
+sanitize_includes() {
+        sed -e "s/^\#[[:space:]]*include.*\"config[.]h\"/#include <config.h>/" \
+                -e "s/^\#[[:space:]]*include.*\"\(libav.*\/.*[.]h\)\"/#include \<\1\>/" \
+                -e "/${SANITIZED_REGEXP}/{s:\"\(.*\)\":\<${2}\/\1\>:}" ${1}
+}
+
+check_sanitized_includes() {
+        grep -q "${SANITIZED_REGEXP}" $1
+}
+
+get_header_deps() {
+        grep "^#[[:space:]]*include.*\<libav.*[.]h\>" ${1} | \
+                sed -e "s/^#[[:space:]]*include.*\<\(libav.*[.]h\)\>/\1/" | \
+                tr -d '<>' | tr '\n' ' '
+}
+
+check_header_deps() {
+        for i ; do
+                printf "Checking for the presence of ${i}...\n"
+                if [ ! -f "${SYSTEM_FFMPEG_DIR}/${i}" -a ! -f "${FFMPEG_DIR}/${i}" ] ; then
+                        printf "Header depends on ${i}\n"
+                        printf "... but that file cannot be found, aborting\n"
+                        exit 1
+                fi
+        done
+}
+
+move_file() {
+        mydir="$(dirname $1)"
+        printf "Moving and checking file: ${1}\n"
+        [ -d "${FFMPEG_DIR}/${mydir}" ] || mkdir -p "${FFMPEG_DIR}/${mydir}"
+        if [ ! -f "${FFMPEG_DIR}/${1}" ] ; then
+                sanitize_includes "${FFMPEG_MOVED_DIR}/${1}" ${mydir} > "${FFMPEG_DIR}/${1}"
+        fi
+        if $(check_sanitized_includes "${FFMPEG_DIR}/${1}") ; then
+                printf "Error, found non sanitized file in ffmpeg:\n"
+                printf "${FFMPEG_DIR}/${1}\n"
+                printf "Please report it at bugs.gentoo.org\n"
+                exit 1
+        fi
+        if [ "${1%.h}" != "${1}" ] ; then
+                mydeps=$(get_header_deps "${FFMPEG_DIR}/${1}")
+                check_header_deps ${mydeps}
+        fi
+}
+
+# HEADERS (order matters for the consistency checks: leaves come first)
+FILES="libavutil/wchar_filename.h libavformat/os_support.h libavformat/internal.h libavutil/x86/asm.h"
+# Files that are sed'ed but not compiled, used to check for availability of
+# some codecs
+FILES="${FILES} libavcodec/allcodecs.c libavformat/allformats.c libavfilter/allfilters.c"
+
+for i in ${FILES} ; do
+        move_file $i
+done
+
+rm -rf "${FFMPEG_MOVED_DIR}"
+
+exit 0
diff --git a/media-video/mplayer/files/mplayer-1.2-get_buffer.patch b/media-video/mplayer/files/mplayer-1.2-get_buffer.patch
new file mode 100644
index 000000000000..3329b9803603
--- /dev/null
+++ b/media-video/mplayer/files/mplayer-1.2-get_buffer.patch
@@ -0,0 +1,327 @@
+r37476 | rtogni | 2015-09-05 18:20:27 +0200 (Sat, 05 Sep 2015) | 5 lines
+
+Replace deprecated get_buffer, buffer_hints, and others
+
+This is needed to compile with latest FFmpeg
+
+Index: libmpcodecs/vd_ffmpeg.c
+===================================================================
+--- libmpcodecs/vd_ffmpeg.c	(revision 37475)
++++ libmpcodecs/vd_ffmpeg.c	(revision 37476)
+@@ -40,6 +40,7 @@
+ #if CONFIG_VDPAU
+ #include "libavcodec/vdpau.h"
+ #endif
++#include "libavutil/pixdesc.h"
+ 
+ static const vd_info_t info = {
+     "FFmpeg's libavcodec codec family",
+@@ -95,8 +96,11 @@
+ 
+ #include "m_option.h"
+ 
+-static int get_buffer(AVCodecContext *avctx, AVFrame *pic);
++static int get_buffer(AVCodecContext *avctx, AVFrame *pic, int isreference);
++static int mpcodec_default_get_buffer(AVCodecContext *avctx, AVFrame *frame);
++static int get_buffer2(AVCodecContext *avctx, AVFrame *frame, int flags);
+ static void release_buffer(AVCodecContext *avctx, AVFrame *pic);
++static void mpcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic);
+ static void draw_slice(struct AVCodecContext *s, const AVFrame *src, int offset[4],
+                        int y, int type, int height);
+ 
+@@ -269,19 +273,10 @@
+     if (lavc_param_vismv || (lavc_param_debug & (FF_DEBUG_VIS_MB_TYPE|FF_DEBUG_VIS_QP))) {
+         ctx->do_slices = ctx->do_dr1 = 0;
+     }
+-#ifndef CODEC_FLAG_EMU_EDGE
+-#define CODEC_FLAG_EMU_EDGE 0
+-#endif
+     if(ctx->do_dr1){
+-        avctx->flags |= CODEC_FLAG_EMU_EDGE;
+-        avctx->  reget_buffer =
+-        avctx->    get_buffer =     get_buffer;
+-        avctx->release_buffer = release_buffer;
++        avctx->get_buffer2 = get_buffer2;
+     } else if (lavc_codec->capabilities & CODEC_CAP_DR1) {
+-        avctx->flags &= ~CODEC_FLAG_EMU_EDGE;
+-        avctx->  reget_buffer = avcodec_default_reget_buffer;
+-        avctx->    get_buffer = avcodec_default_get_buffer;
+-        avctx->release_buffer = avcodec_default_release_buffer;
++        avctx->get_buffer2 = avcodec_default_get_buffer2;
+     }
+     avctx->slice_flags = 0;
+ }
+@@ -309,9 +304,7 @@
+     if (IMGFMT_IS_HWACCEL(imgfmt)) {
+         ctx->do_dr1    = 1;
+         ctx->nonref_dr = 0;
+-        avctx->get_buffer      = get_buffer;
+-        avctx->release_buffer  = release_buffer;
+-        avctx->reget_buffer    = get_buffer;
++        avctx->get_buffer2 = get_buffer2;
+         mp_msg(MSGT_DECVIDEO, MSGL_V, IMGFMT_IS_XVMC(imgfmt) ?
+                MSGTR_MPCODECS_XVMCAcceleratedMPEG2 :
+                "[VD_FFMPEG] VDPAU accelerated decoding\n");
+@@ -384,7 +377,6 @@
+ #endif
+     avctx->flags2|= lavc_param_fast;
+     avctx->codec_tag= sh->format;
+-    avctx->stream_codec_tag= sh->video.fccHandler;
+     avctx->idct_algo= lavc_param_idct_algo;
+     avctx->error_concealment= lavc_param_error_concealment;
+     avctx->debug= lavc_param_debug;
+@@ -668,7 +660,7 @@
+     return 0;
+ }
+ 
+-static int get_buffer(AVCodecContext *avctx, AVFrame *pic){
++static int get_buffer(AVCodecContext *avctx, AVFrame *pic, int isreference){
+     sh_video_t *sh = avctx->opaque;
+     vd_ffmpeg_ctx *ctx = sh->context;
+     mp_image_t *mpi=NULL;
+@@ -677,27 +669,12 @@
+     int width = FFMAX(avctx->width,  -(-avctx->coded_width  >> avctx->lowres));
+     int height= FFMAX(avctx->height, -(-avctx->coded_height >> avctx->lowres));
+     // special case to handle reget_buffer
+-    if (pic->opaque && pic->data[0] && (!pic->buffer_hints || pic->buffer_hints & FF_BUFFER_HINTS_REUSABLE))
++    if (pic->opaque && pic->data[0])
+         return 0;
+     avcodec_align_dimensions(avctx, &width, &height);
+ //printf("get_buffer %d %d %d\n", pic->reference, ctx->ip_count, ctx->b_count);
+ 
+-    if (pic->buffer_hints) {
+-        mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "Buffer hints: %u\n", pic->buffer_hints);
+-        type = MP_IMGTYPE_TEMP;
+-        if (pic->buffer_hints & FF_BUFFER_HINTS_READABLE)
+-            flags |= MP_IMGFLAG_READABLE;
+-        if (pic->buffer_hints & FF_BUFFER_HINTS_PRESERVE ||
+-            pic->buffer_hints & FF_BUFFER_HINTS_REUSABLE) {
+-            ctx->ip_count++;
+-            type = MP_IMGTYPE_IP;
+-            flags |= MP_IMGFLAG_PRESERVE;
+-        }
+-        flags|=(avctx->skip_idct<=AVDISCARD_DEFAULT && avctx->skip_frame<=AVDISCARD_DEFAULT && ctx->do_slices) ?
+-                 MP_IMGFLAG_DRAW_CALLBACK:0;
+-        mp_msg(MSGT_DECVIDEO, MSGL_DBG2, type == MP_IMGTYPE_IP ? "using IP\n" : "using TEMP\n");
+-    } else {
+-        if(!pic->reference){
++        if(!isreference){
+             ctx->b_count++;
+             flags|=(avctx->skip_idct<=AVDISCARD_DEFAULT && avctx->skip_frame<=AVDISCARD_DEFAULT && ctx->do_slices) ?
+                      MP_IMGFLAG_DRAW_CALLBACK:0;
+@@ -711,11 +688,10 @@
+         }else{
+             type= MP_IMGTYPE_IP;
+         }
+-    }
+ 
+     if (ctx->nonref_dr) {
+         if (flags & MP_IMGFLAG_PRESERVE)
+-            return avcodec_default_get_buffer(avctx, pic);
++            return mpcodec_default_get_buffer(avctx, pic);
+         // Use NUMBERED since for e.g. TEMP vos assume there will
+         // be no other frames between the get_image and matching put_image.
+         type = MP_IMGTYPE_NUMBERED;
+@@ -722,7 +698,6 @@
+     }
+ 
+     if(init_vo(sh, avctx->pix_fmt, 1) < 0){
+-        avctx->release_buffer= avcodec_default_release_buffer;
+         goto disable_dr1;
+     }
+ 
+@@ -822,7 +797,6 @@
+ else
+     printf(".");
+ #endif
+-    pic->type= FF_BUFFER_TYPE_USER;
+     return 0;
+ 
+ disable_dr1:
+@@ -829,13 +803,11 @@
+     ctx->do_dr1 = 0;
+     // For frame-multithreading these contexts aren't
+     // the same and must both be updated.
+-    ctx->avctx->get_buffer   =
+-    avctx->get_buffer        = avcodec_default_get_buffer;
+-    ctx->avctx->reget_buffer =
+-    avctx->reget_buffer      = avcodec_default_reget_buffer;
++    ctx->avctx->get_buffer2   =
++    avctx->get_buffer2 = avcodec_default_get_buffer2;
+     if (pic->data[0])
+-        release_buffer(avctx, pic);
+-    return avctx->get_buffer(avctx, pic);
++        mpcodec_default_release_buffer(avctx, pic);
++    return avctx->get_buffer2(avctx, pic,0);
+ }
+ 
+ static void release_buffer(struct AVCodecContext *avctx, AVFrame *pic){
+@@ -843,8 +815,8 @@
+     sh_video_t *sh = avctx->opaque;
+     vd_ffmpeg_ctx *ctx = sh->context;
+     int i;
+-    if (pic->type != FF_BUFFER_TYPE_USER) {
+-        avcodec_default_release_buffer(avctx, pic);
++    if (pic->opaque == NULL) {
++        mpcodec_default_release_buffer(avctx, pic);
+         return;
+     }
+ 
+@@ -954,7 +926,7 @@
+     // even when we do dr we might actually get a buffer we had
+     // FFmpeg allocate - this mostly happens with nonref_dr.
+     // Ensure we treat it correctly.
+-    dr1= ctx->do_dr1 && pic->type == FF_BUFFER_TYPE_USER;
++    dr1= ctx->do_dr1 && pic->opaque != NULL;
+     if(ret<0) mp_msg(MSGT_DECVIDEO, MSGL_WARN, "Error while decoding frame!\n");
+ //printf("repeat: %d\n", pic->repeat_pict);
+ //-- vstats generation
+@@ -1128,3 +1100,148 @@
+     set_format_params(avctx, selected_format);
+     return selected_format;
+ }
++
++
++/*
++ FFWrapper
++*/
++static int mpcodec_default_get_buffer(AVCodecContext *avctx, AVFrame *frame)
++{
++    return avcodec_default_get_buffer2(avctx, frame, 0);
++}
++
++static void mpcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic)
++{
++    av_frame_unref(pic);
++}
++
++typedef struct CompatReleaseBufPriv {
++    AVCodecContext avctx;
++    AVFrame frame;
++    uint8_t avframe_padding[1024]; // hack to allow linking to a avutil with larger AVFrame
++} CompatReleaseBufPriv;
++
++static void compat_free_buffer(void *opaque, uint8_t *data)
++{
++    CompatReleaseBufPriv *priv = opaque;
++    release_buffer(&priv->avctx, &priv->frame);
++    av_freep(&priv);
++}
++
++static void compat_release_buffer(void *opaque, uint8_t *data)
++{
++    AVBufferRef *buf = opaque;
++    av_buffer_unref(&buf);
++}
++
++static int get_buffer2(AVCodecContext *avctx, AVFrame *frame, int flags)
++{
++    /*
++     * Wrap an old get_buffer()-allocated buffer in a bunch of AVBuffers.
++     * We wrap each plane in its own AVBuffer. Each of those has a reference to
++     * a dummy AVBuffer as its private data, unreffing it on free.
++     * When all the planes are freed, the dummy buffer's free callback calls
++     * release_buffer().
++     */
++    CompatReleaseBufPriv *priv = NULL;
++    AVBufferRef *dummy_buf = NULL;
++    int planes, i, ret;
++
++    ret = get_buffer(avctx, frame, flags & AV_GET_BUFFER_FLAG_REF);
++    if (ret < 0)
++        return ret;
++
++    /* return if the buffers are already set up
++     * this would happen e.g. when a custom get_buffer() calls
++     * avcodec_default_get_buffer
++     */
++    if (frame->buf[0])
++        goto end0;
++
++    priv = av_mallocz(sizeof(*priv));
++    if (!priv) {
++        ret = AVERROR(ENOMEM);
++        goto fail;
++    }
++    priv->avctx = *avctx;
++    priv->frame = *frame;
++
++    dummy_buf = av_buffer_create(NULL, 0, compat_free_buffer, priv, 0);
++    if (!dummy_buf) {
++        ret = AVERROR(ENOMEM);
++        goto fail;
++    }
++
++#define WRAP_PLANE(ref_out, data, data_size)                            \
++do {                                                                    \
++    AVBufferRef *dummy_ref = av_buffer_ref(dummy_buf);                  \
++    if (!dummy_ref) {                                                   \
++        ret = AVERROR(ENOMEM);                                          \
++        goto fail;                                                      \
++    }                                                                   \
++    ref_out = av_buffer_create(data, data_size, compat_release_buffer,  \
++                               dummy_ref, 0);                           \
++    if (!ref_out) {                                                     \
++        av_buffer_unref(&dummy_ref);                                    \
++        av_frame_unref(frame);                                          \
++        ret = AVERROR(ENOMEM);                                          \
++        goto fail;                                                      \
++    }                                                                   \
++} while (0)
++
++    if (avctx->codec_type == AVMEDIA_TYPE_VIDEO) {
++        const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(frame->format);
++
++        planes = av_pix_fmt_count_planes(frame->format);
++        /* workaround for AVHWAccel plane count of 0, buf[0] is used as
++           check for allocated buffers: make libavcodec happy */
++        if (desc && desc->flags & AV_PIX_FMT_FLAG_HWACCEL)
++            planes = 1;
++        if (!desc || planes <= 0) {
++            ret = AVERROR(EINVAL);
++            goto fail;
++        }
++
++        for (i = 0; i < planes; i++) {
++            int v_shift    = (i == 1 || i == 2) ? desc->log2_chroma_h : 0;
++            int plane_size = (frame->height >> v_shift) * frame->linesize[i];
++
++            WRAP_PLANE(frame->buf[i], frame->data[i], plane_size);
++        }
++    } else {
++        int planar = av_sample_fmt_is_planar(frame->format);
++        planes = planar ? avctx->channels : 1;
++
++        if (planes > FF_ARRAY_ELEMS(frame->buf)) {
++            frame->nb_extended_buf = planes - FF_ARRAY_ELEMS(frame->buf);
++            frame->extended_buf = av_malloc_array(sizeof(*frame->extended_buf),
++                                            frame->nb_extended_buf);
++            if (!frame->extended_buf) {
++                ret = AVERROR(ENOMEM);
++                goto fail;
++            }
++        }
++
++        for (i = 0; i < FFMIN(planes, FF_ARRAY_ELEMS(frame->buf)); i++)
++            WRAP_PLANE(frame->buf[i], frame->extended_data[i], frame->linesize[0]);
++
++        for (i = 0; i < frame->nb_extended_buf; i++)
++            WRAP_PLANE(frame->extended_buf[i],
++                       frame->extended_data[i + FF_ARRAY_ELEMS(frame->buf)],
++                       frame->linesize[0]);
++    }
++
++    av_buffer_unref(&dummy_buf);
++
++end0:
++    frame->width  = avctx->width;
++    frame->height = avctx->height;
++
++    return 0;
++
++fail:
++    release_buffer(avctx, frame);
++    av_freep(&priv);
++    av_buffer_unref(&dummy_buf);
++    return ret;
++}
diff --git a/media-video/mplayer/files/mplayer-1.2_pre20150730-chan.patch b/media-video/mplayer/files/mplayer-1.2_pre20150730-chan.patch
new file mode 100644
index 000000000000..a448d0849458
--- /dev/null
+++ b/media-video/mplayer/files/mplayer-1.2_pre20150730-chan.patch
@@ -0,0 +1,25 @@
+r37447 | rtogni | 2015-08-14 21:30:34 +0200 (Fri, 14 Aug 2015) | 3 lines
+
+Replace deprecated avctx->request_channels with request_channel_layout
+
+Index: libmpcodecs/ad_ffmpeg.c
+===================================================================
+--- libmpcodecs/ad_ffmpeg.c	(revision 37446)
++++ libmpcodecs/ad_ffmpeg.c	(revision 37447)
+@@ -46,6 +46,7 @@
+ 
+ #include "libavcodec/avcodec.h"
+ #include "libavutil/dict.h"
++#include "libavutil/channel_layout.h"
+ 
+ struct adctx {
+     int last_samplerate;
+@@ -127,7 +128,7 @@
+ 	lavc_context->bits_per_coded_sample = sh_audio->wf->wBitsPerSample;
+     }
+     lavc_context->channel_layout = sh_audio->channel_layout;
+-    lavc_context->request_channels = audio_output_channels;
++    lavc_context->request_channel_layout = av_get_default_channel_layout(audio_output_channels);
+     lavc_context->codec_tag = sh_audio->format; //FOURCC
+     lavc_context->codec_id = lavc_codec->id; // not sure if required, imho not --A'rpi
+ 
diff --git a/media-video/mplayer/files/mplayer-1.2_pre20150730-encode.patch b/media-video/mplayer/files/mplayer-1.2_pre20150730-encode.patch
new file mode 100644
index 000000000000..06a33f832f07
--- /dev/null
+++ b/media-video/mplayer/files/mplayer-1.2_pre20150730-encode.patch
@@ -0,0 +1,82 @@
+r37453 | rtogni | 2015-08-23 22:32:50 +0200 (Sun, 23 Aug 2015) | 3 lines
+
+Replace deprecated av_encode_video() with av_encode_video2()
+
+Index: libmpcodecs/vf_uspp.c
+===================================================================
+--- libmpcodecs/vf_uspp.c	(revision 37452)
++++ libmpcodecs/vf_uspp.c	(revision 37453)
+@@ -177,11 +177,16 @@
+         const int x1= offset[i+count-1][0];
+         const int y1= offset[i+count-1][1];
+         int offset;
++        AVPacket pkt;
++        int ret, got_pkt;
+         p->frame->data[0]= p->src[0] + x1 + y1 * p->frame->linesize[0];
+         p->frame->data[1]= p->src[1] + x1/2 + y1/2 * p->frame->linesize[1];
+         p->frame->data[2]= p->src[2] + x1/2 + y1/2 * p->frame->linesize[2];
+ 
+-        avcodec_encode_video(p->avctx_enc[i], p->outbuf, p->outbuf_size, p->frame);
++        av_init_packet(&pkt);
++        pkt.data = p->outbuf;
++        pkt.size = p->outbuf_size;
++        avcodec_encode_video2(p->avctx_enc[i], &pkt, p->frame, &got_pkt);
+         p->frame_dec = p->avctx_enc[i]->coded_frame;
+ 
+         offset= (BLOCK-x1) + (BLOCK-y1)*p->frame_dec->linesize[0];
+Index: libmpcodecs/vf_lavc.c
+===================================================================
+--- libmpcodecs/vf_lavc.c	(revision 37452)
++++ libmpcodecs/vf_lavc.c	(revision 37453)
+@@ -86,6 +86,8 @@
+     mp_image_t* dmpi;
+     int out_size;
+     AVFrame *pic= vf->priv->pic;
++    int ret, got_pkt;
++    AVPacket pkt;
+ 
+     pic->data[0]=mpi->planes[0];
+     pic->data[1]=mpi->planes[1];
+@@ -94,10 +96,14 @@
+     pic->linesize[1]=mpi->stride[1];
+     pic->linesize[2]=mpi->stride[2];
+ 
+-    out_size = avcodec_encode_video(&lavc_venc_context,
+-	vf->priv->outbuf, vf->priv->outbuf_size, pic);
++    av_init_packet(&pkt);
++    pkt.data = vf->priv->outbuf;
++    pkt.size = vf->priv->outbuf_size;
++    ret = avcodec_encode_video2(&lavc_venc_context, &pkt, pic, &got_pkt);
+ 
+-    if(out_size<=0) return 1;
++    if(ret<=0) return 1;
++    if(!got_pkt) return 1;
++    out_size =  pkt.size;
+ 
+     dmpi=vf_get_image(vf->next,IMGFMT_MPEGPES,
+ 	MP_IMGTYPE_EXPORT, 0,
+Index: libmpcodecs/vf_mcdeint.c
+===================================================================
+--- libmpcodecs/vf_mcdeint.c	(revision 37452)
++++ libmpcodecs/vf_mcdeint.c	(revision 37453)
+@@ -92,6 +92,8 @@
+ 
+ static void filter(struct vf_priv_s *p, uint8_t *dst[3], uint8_t *src[3], int dst_stride[3], int src_stride[3], int width, int height){
+     int x, y, i;
++    int got_pkt;
++    AVPacket pkt;
+ 
+     for(i=0; i<3; i++){
+         p->frame->data[i]= src[i];
+@@ -101,7 +103,10 @@
+     p->avctx_enc->me_cmp=
+     p->avctx_enc->me_sub_cmp= FF_CMP_SAD /*| (p->parity ? FF_CMP_ODD : FF_CMP_EVEN)*/;
+     p->frame->quality= p->qp*FF_QP2LAMBDA;
+-    avcodec_encode_video(p->avctx_enc, p->outbuf, p->outbuf_size, p->frame);
++    av_init_packet(&pkt);
++    pkt.data = p->outbuf;
++    pkt.size = p->outbuf_size;
++    avcodec_encode_video2(p->avctx_enc, &pkt, p->frame, &got_pkt);
+     p->frame_dec = p->avctx_enc->coded_frame;
+ 
+     for(i=0; i<3; i++){
diff --git a/media-video/mplayer/files/mplayer-1.3-CVE-2016-4352.patch b/media-video/mplayer/files/mplayer-1.3-CVE-2016-4352.patch
new file mode 100644
index 000000000000..4eabf8b5f28c
--- /dev/null
+++ b/media-video/mplayer/files/mplayer-1.3-CVE-2016-4352.patch
@@ -0,0 +1,24 @@
+https://trac.mplayerhq.hu/ticket/2295
+
+r37857
+
+--- old/libmpdemux/demux_gif.c
++++ new/libmpdemux/demux_gif.c
+@@ -304,6 +304,17 @@
+     return NULL;
+   }
+ 
++  // Validate image size, most code in this demuxer assumes w*h <= INT_MAX
++  if ((int64_t)gif->SWidth * gif->SHeight > INT_MAX) {
++    mp_msg(MSGT_DEMUX, MSGL_ERR,
++           "[demux_gif] Unsupported picture size %dx%d.\n", gif->SWidth,
++           gif->SHeight);
++    if (DGifCloseFile(gif) == GIF_ERROR)
++      print_gif_error(NULL);
++    free(priv);
++    return NULL;
++  }
++
+   // create a new video stream header
+   sh_video = new_sh_video(demuxer, 0);
+ 
diff --git a/media-video/mplayer/files/prepare_mplayer.sh b/media-video/mplayer/files/prepare_mplayer.sh
new file mode 100644
index 000000000000..57d47425689f
--- /dev/null
+++ b/media-video/mplayer/files/prepare_mplayer.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+VERSION=$(date +%Y%m%d)
+PACKAGE="mplayer-1.2_pre${VERSION}"
+DUMP_FFMPEG="$(dirname $0)/dump_ffmpeg.sh"
+
+svn checkout svn://svn.mplayerhq.hu/mplayer/trunk ${PACKAGE}
+
+pushd ${PACKAGE} > /dev/null
+	# ffmpeg is in git now so no svn external anymore
+	rm -rf ffmpeg
+	git clone git://source.ffmpeg.org/ffmpeg.git ffmpeg/
+        sh "$DUMP_FFMPEG"
+	STORE_VERSION=$(LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2)
+	printf "$STORE_VERSION" > snapshot_version
+popd > /dev/null
+
+find "${PACKAGE}" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf
+find "${PACKAGE}" -type d -name '.git' -prune -print0 | xargs -0 rm -rf
+
+tar cJf ${PACKAGE}.tar.xz ${PACKAGE}
+rm -rf ${PACKAGE}/
+
+echo "Tarball: \"${PACKAGE}.tar.xz\""
+
+echo "** all done **"
diff --git a/media-video/mplayer/metadata.xml b/media-video/mplayer/metadata.xml
new file mode 100644
index 000000000000..d6c05ce054c6
--- /dev/null
+++ b/media-video/mplayer/metadata.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>media-video@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="bl">Blinkenlights video output</flag>
+    <flag name="bluray">Enable playback of Blu-ray filesystems</flag>
+    <flag name="bs2b">Enable Bauer stereophonic-to-binaural headphone filter</flag>
+    <flag name="cdio">Use libcdio for CD support (instead of cdparanoia)</flag>
+    <flag name="cpudetection">Enables runtime CPU detection (useful for binpkgs, compatibility on other CPUs)</flag>
+    <flag name="dvdnav">Use forked libdvdnav, navigate menus in GUIs</flag>
+    <flag name="enca">Enables support for charset discovery and conversion</flag>
+    <flag name="faac">Use external faac library for AAC encoding</flag>
+    <flag name="faad">Use external faad library for AAC decoding</flag>
+    <flag name="libmpeg2">Build support for mpeg2 over media-libs/libmpeg2 rather than using ffmpeg.</flag>
+    <flag name="live">Enables live.com streaming media support</flag>
+    <flag name="md5sum">Enables md5sum video output</flag>
+    <flag name="mng">MNG input support</flag>
+    <flag name="network">Enables network streaming support</flag>
+    <flag name="nut">Enables support for the NUT container format</flag>
+    <flag name="osdmenu">Enables support for on-screen display (OSD) menus</flag>
+    <flag name="pnm">Add PNM video output option, to create PPM/PGM/PGMYUV images</flag>
+    <flag name="pvr">Enable Video4Linux2 MPEG PVR</flag>
+    <flag name="radio">Enable V4L2 radio interface and support</flag>
+    <flag name="rar">Enable Unique RAR File Library</flag>
+    <flag name="rtc">Enables usage of the linux real time clock. The alternative is software emulation of rtc</flag>
+    <flag name="rtmp">Enables RTMPDump Streaming Media support</flag>
+    <flag name="shm">Enable support for shm</flag>
+    <flag name="tga">Enables Targa video output</flag>
+    <flag name="toolame">Enable toolame MPEG-2 encoding</flag>
+    <flag name="tremor">Enable internal support for Vorbis</flag>
+    <flag name="twolame">Enable twolame MPEG-2 encoding</flag>
+    <flag name="vcd">Enables VCD support</flag>
+    <flag name="vidix">Support for vidix video output</flag>
+    <flag name="xvmc">Enables X-Video Motion Compensation support</flag>
+    <flag name="yuv4mpeg">Enables yuv4mpeg video output</flag>
+    <flag name="zoran">Enables ZR360[56]7/ZR36060 video output</flag>
+  </use>
+</pkgmetadata>
diff --git a/media-video/mplayer/mplayer-1.2.1-r1.ebuild b/media-video/mplayer/mplayer-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..da0d2b6068cb
--- /dev/null
+++ b/media-video/mplayer/mplayer-1.2.1-r1.ebuild
@@ -0,0 +1,632 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
+ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
+[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS=""
+
+inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
+
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
+bs2b cddb +cdio cdparanoia cpudetection debug dga
+directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
+ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
++libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
++network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
+radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
+tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix
+vorbis +X x264 xinerama +xscreensaver +xv xvid xvmc yuv4mpeg zoran"
+
+VIDEO_CARDS="s3virge mga tdfx"
+for x in ${VIDEO_CARDS}; do
+	IUSE+=" video_cards_${x}"
+done
+
+FONT_URI="
+	mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
+	mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
+	mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2
+"
+if [[ ${PV} == *9999* ]]; then
+	RELEASE_URI=""
+elif [ "${PV%_rc*}" = "${PV}" -a "${PV%_pre*}" = "${PV}" ]; then
+	MY_P="MPlayer-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	RELEASE_URI="mirror://mplayer/releases/${MY_P}.tar.xz"
+else
+	RELEASE_URI="mirror://gentoo/${P}.tar.xz"
+fi
+SRC_URI="${RELEASE_URI}
+	!truetype? ( ${FONT_URI} )"
+
+DESCRIPTION="Media Player for Linux"
+HOMEPAGE="http://www.mplayerhq.hu/"
+
+FONT_RDEPS="
+	virtual/ttf-fonts
+	media-libs/fontconfig
+	>=media-libs/freetype-2.2.1:2
+"
+X_RDEPS="
+	x11-libs/libXext
+	x11-libs/libXxf86vm
+"
+# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
+#	nemesi? ( net-libs/libnemesi )
+RDEPEND+="
+	sys-libs/ncurses:0=
+	app-arch/bzip2
+	sys-libs/zlib
+	>=media-video/ffmpeg-2.6:0=[vdpau?]
+	a52? ( media-libs/a52dec )
+	aalib? ( media-libs/aalib )
+	alsa? ( media-libs/alsa-lib )
+	bidi? ( dev-libs/fribidi )
+	bluray? ( >=media-libs/libbluray-0.2.1 )
+	bs2b? ( media-libs/libbs2b )
+	cdio? ( dev-libs/libcdio dev-libs/libcdio-paranoia )
+	cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
+	dga? ( x11-libs/libXxf86dga )
+	directfb? ( dev-libs/DirectFB )
+	dts? ( media-libs/libdca )
+	dv? ( media-libs/libdv )
+	dvb? ( virtual/linuxtv-dvb-headers )
+	dvd? ( >=media-libs/libdvdread-4.1.3 )
+	dvdnav? ( >=media-libs/libdvdnav-4.1.3 )
+	encode? (
+		!twolame? ( toolame? ( media-sound/toolame ) )
+		twolame? ( media-sound/twolame )
+		faac? ( media-libs/faac )
+		mp3? ( media-sound/lame )
+		x264? ( >=media-libs/x264-0.0.20100423:= )
+		xvid? ( media-libs/xvid )
+	)
+	enca? ( app-i18n/enca )
+	faad? ( media-libs/faad2 )
+	ggi? ( media-libs/libggi media-libs/libggiwmh )
+	gif? ( media-libs/giflib:0= )
+	gsm? ( media-sound/gsm )
+	iconv? ( virtual/libiconv )
+	jack? ( virtual/jack )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:0 )
+	ladspa? ( media-libs/ladspa-sdk )
+	libass? ( >=media-libs/libass-0.9.10:= )
+	libcaca? ( media-libs/libcaca )
+	libmpeg2? ( media-libs/libmpeg2 )
+	lirc? ( app-misc/lirc )
+	live? ( media-plugins/live )
+	lzo? ( >=dev-libs/lzo-2 )
+	mad? ( media-libs/libmad )
+	mng? ( media-libs/libmng:= )
+	mp3? ( media-sound/mpg123 )
+	nas? ( media-libs/nas )
+	nut? ( >=media-libs/libnut-661 )
+	openal? ( media-libs/openal )
+	opengl? ( virtual/opengl )
+	png? ( media-libs/libpng:0= )
+	pnm? ( media-libs/netpbm )
+	pulseaudio? ( media-sound/pulseaudio )
+	rar? (
+		|| (
+			app-arch/unrar
+			app-arch/rar
+		)
+	)
+	rtmp? ( media-video/rtmpdump )
+	samba? ( net-fs/samba )
+	sdl? ( media-libs/libsdl )
+	speex? ( media-libs/speex )
+	theora? ( media-libs/libtheora[encode?] )
+	tremor? ( media-libs/tremor )
+	truetype? ( ${FONT_RDEPS} )
+	vdpau? ( x11-libs/libvdpau )
+	vorbis? ( !tremor? ( media-libs/libvorbis ) )
+	X? ( ${X_RDEPS}	)
+	xinerama? ( x11-libs/libXinerama )
+	xscreensaver? ( x11-libs/libXScrnSaver )
+	xv? ( x11-libs/libXv )
+	xvmc? ( x11-libs/libXvMC )
+"
+
+X_DEPS="
+	x11-proto/videoproto
+	x11-proto/xf86vidmodeproto
+"
+ASM_DEP="dev-lang/yasm"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dga? ( x11-proto/xf86dgaproto )
+	X? ( ${X_DEPS} )
+	xinerama? ( x11-proto/xineramaproto )
+	xscreensaver? ( x11-proto/scrnsaverproto )
+	amd64? ( ${ASM_DEP} )
+	doc? (
+		dev-libs/libxslt app-text/docbook-xml-dtd
+		app-text/docbook-xsl-stylesheets
+	)
+	x86? ( ${ASM_DEP} )
+	x86-fbsd? ( ${ASM_DEP} )
+"
+RDEPEND+="
+	selinux? ( sec-policy/selinux-mplayer )
+"
+
+SLOT="0"
+LICENSE="GPL-2"
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+else
+	KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
+fi
+
+# faac codecs are nonfree
+# libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio
+# dvd navigation requires dvd read support
+# ass and freetype font require iconv and ass requires freetype fonts
+# unicode transformations are usefull only with iconv
+# radio requires oss or alsa backend
+# xvmc requires xvideo support
+REQUIRED_USE="
+	dga? ( X )
+	dvdnav? ( dvd )
+	enca? ( iconv )
+	ggi? ( X )
+	libass? ( truetype )
+	opengl? ( X )
+	osdmenu? ( X )
+	truetype? ( iconv )
+	vdpau? ( X )
+	vidix? ( X )
+	xinerama? ( X )
+	xscreensaver? ( X )
+	xv? ( X )
+	xvmc? ( xv )"
+RESTRICT="faac? ( bindist )"
+
+pkg_setup() {
+	if [[ ${PV} == *9999* ]]; then
+		elog
+		elog "This is a live ebuild which installs the latest from upstream's"
+		elog "subversion repository, and is unsupported by Gentoo."
+		elog "Everything but bugs in the ebuild itself will be ignored."
+		elog
+	fi
+
+	if use cpudetection; then
+		ewarn
+		ewarn "You've enabled the cpudetection flag. This feature is"
+		ewarn "included mainly for people who want to use the same"
+		ewarn "binary on another system with a different CPU architecture."
+		ewarn "MPlayer will already detect your CPU settings by default at"
+		ewarn "buildtime; this flag is used for runtime detection."
+		ewarn "You won't need this turned on if you are only building"
+		ewarn "mplayer for this system. Also, if your compile fails, try"
+		ewarn "disabling this use flag."
+	fi
+
+	if has_version 'media-video/libav' ; then
+		ewarn "Please note that upstream uses media-video/ffmpeg."
+		ewarn "media-video/libav should be fine in theory but if you"
+		ewarn "experience any problem, try to move to media-video/ffmpeg."
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} = *9999* ]]; then
+		subversion_src_unpack
+		cd "${WORKDIR}"
+		rm -rf "${WORKDIR}/${P}/ffmpeg/"
+		( S="${WORKDIR}/${P}/ffmpeg/" git-2_src_unpack )
+	else
+		unpack ${A}
+	fi
+
+	if [[ ${PV} = *9999* ]] || [[ "${PV%_rc*}" = "${PV}" ]]; then
+		cd "${S}"
+		cp "${FILESDIR}/dump_ffmpeg.sh" . || die
+		chmod +x dump_ffmpeg.sh
+		./dump_ffmpeg.sh || die
+	fi
+
+	if ! use truetype; then
+		unpack font-arial-iso-8859-1.tar.bz2 \
+			font-arial-iso-8859-2.tar.bz2 \
+			font-arial-cp1250.tar.bz2
+	fi
+}
+
+src_prepare() {
+	local svf=snapshot_version
+	if [[ ${PV} = *9999* ]]; then
+		# Set SVN version manually
+		subversion_wc_info
+		printf "${ESVN_WC_REVISION}" > $svf
+	fi
+	if [ ! -f VERSION ] ; then
+		[ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
+		local sv=$(<$svf)
+		printf "SVN-r${sv} (Gentoo)" > VERSION
+	fi
+
+	# fix path to bash executable in configure scripts
+	sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die
+
+	base_src_prepare
+
+	# Use sane default for >=virtual/udev-197
+	sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die
+
+	if has_version '>=media-video/ffmpeg-2.9'; then
+		epatch "${FILESDIR}/${PN}-1.2_pre20150730-chan.patch"
+		epatch "${FILESDIR}/${PN}-1.2-get_buffer.patch"
+		epatch "${FILESDIR}/${PN}-1.2_pre20150730-encode.patch"
+	fi
+}
+
+src_configure() {
+	local myconf=""
+	local uses i
+
+	# set LINGUAS
+	[[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/da/dk}"
+	[[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/zh/zh_CN}" #482968
+
+	# mplayer ebuild uses "use foo || --disable-foo" to forcibly disable
+	# compilation in almost every situation. The reason for this is
+	# because if --enable is used, it will force the build of that option,
+	# regardless of whether the dependency is available or not.
+
+	###################
+	#Optional features#
+	###################
+	# disable svga since we don't want it
+	# disable arts since we don't have kde3
+	# always disable internal ass
+	# disable opus and ilbc since it only controls support in internal
+	#         ffmpeg which we do not use
+	myconf+="
+		--disable-svga --disable-svgalib_helper
+		--disable-ass-internal
+		--disable-arts
+		--disable-kai
+		--disable-libopus
+		--disable-libilbc
+		$(use_enable network networking)
+		$(use_enable joystick)
+	"
+	uses="bl bluray enca ftp rtc vcd" # nemesi <- not working with in-tree ebuild
+	myconf+=" --disable-nemesi" # nemesi automagic disable
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use bidi  || myconf+=" --disable-fribidi"
+	use ipv6  || myconf+=" --disable-inet6"
+	use libass || myconf+=" --disable-ass"
+	use nut   || myconf+=" --disable-libnut"
+	use rar   || myconf+=" --disable-unrarexec"
+	use samba || myconf+=" --disable-smb"
+	use lirc  || myconf+=" --disable-lirc --disable-lircc --disable-apple-ir"
+
+	# libcdio support: prefer libcdio over cdparanoia
+	# don't check for cddb w/cdio
+	if use cdio; then
+		myconf+=" --disable-cdparanoia"
+	else
+		myconf+=" --disable-libcdio"
+		use cdparanoia || myconf+=" --disable-cdparanoia"
+		use cddb || myconf+=" --disable-cddb"
+	fi
+
+	################################
+	# DVD read, navigation support #
+	################################
+	#
+	# dvdread - accessing a DVD
+	# dvdnav - navigation of menus
+	use dvd || myconf+=" --disable-dvdread"
+	use dvdnav || myconf+=" --disable-dvdnav"
+
+	#############
+	# Subtitles #
+	#############
+	#
+	# SRT/ASS/SSA (subtitles) requires freetype support
+	# freetype support requires iconv
+	# iconv optionally can use unicode
+	use truetype || myconf+=" --disable-freetype"
+	use iconv || myconf+=" --disable-iconv --charset=noconv"
+	use iconv && use unicode && myconf+=" --charset=UTF-8"
+
+	#####################################
+	# DVB / Video4Linux / Radio support #
+	#####################################
+	myconf+=" --disable-tv-bsdbt848"
+	# broken upstream, won't work with recent kernels
+	myconf+=" --disable-ivtv"
+	# gone since linux-headers-2.6.38
+	myconf+=" --disable-tv-v4l1"
+	if { use dvb || use v4l || use pvr || use radio; }; then
+		use dvb || myconf+=" --disable-dvb"
+		use pvr || myconf+=" --disable-pvr"
+		use v4l || myconf+=" --disable-tv-v4l2"
+		if use radio && { use dvb || use v4l; }; then
+			myconf+="
+				--enable-radio
+				$(use_enable encode radio-capture)
+			"
+		else
+			myconf+="
+				--disable-radio-v4l2
+				--disable-radio-bsdbt848
+			"
+		fi
+	else
+		myconf+="
+			--disable-tv
+			--disable-tv-v4l2
+			--disable-radio
+			--disable-radio-v4l2
+			--disable-radio-bsdbt848
+			--disable-dvb
+			--disable-v4l2
+			--disable-pvr"
+	fi
+
+	##########
+	# Codecs #
+	##########
+	myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
+	myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2
+	use dts || myconf+=" --disable-libdca"
+	if ! use mp3; then
+		myconf+="
+			--disable-mp3lame
+			--disable-mpg123
+		"
+	fi
+	uses="a52 bs2b dv gsm lzo rtmp vorbis"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-lib${i}"
+	done
+
+	uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use jpeg2k || myconf+=" --disable-libopenjpeg"
+
+	# Encoding
+	uses="faac x264 xvid toolame twolame"
+	if use encode; then
+		for i in ${uses}; do
+			use ${i} || myconf+=" --disable-${i}"
+		done
+	else
+		myconf+=" --disable-mencoder"
+		for i in ${uses}; do
+			myconf+=" --disable-${i}"
+			use ${i} && elog "Useflag \"${i}\" will only be useful for encoding, i.e., with \"encode\" useflag enabled."
+		done
+	fi
+
+	#################
+	# Binary codecs #
+	#################
+	myconf+=" --disable-qtx --disable-real --disable-win32dll"
+
+	################
+	# Video Output #
+	################
+	uses="directfb md5sum sdl yuv4mpeg"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use aalib || myconf+=" --disable-aa"
+	use fbcon || myconf+=" --disable-fbdev"
+	use fbcon && use video_cards_s3virge && myconf+=" --enable-s3fb"
+	use libcaca || myconf+=" --disable-caca"
+	use zoran || myconf+=" --disable-zr"
+
+	if ! use kernel_linux || ! use video_cards_mga; then
+		 myconf+=" --disable-mga --disable-xmga"
+	fi
+
+	if use video_cards_tdfx; then
+		myconf+="
+			$(use_enable video_cards_tdfx tdfxvid)
+			$(use_enable fbcon tdfxfb)
+		"
+	else
+		myconf+="
+			--disable-3dfx
+			--disable-tdfxvid
+			--disable-tdfxfb
+		"
+	fi
+
+	# sun card, disable by default, see bug #258729
+	myconf+=" --disable-xvr100"
+
+	################
+	# Audio Output #
+	################
+	myconf+=" --disable-esd"
+	uses="alsa jack ladspa nas openal"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use pulseaudio || myconf+=" --disable-pulse"
+	if ! use radio; then
+		use oss || myconf+=" --disable-ossaudio"
+	fi
+
+	####################
+	# Advanced Options #
+	####################
+	# Platform specific flags, hardcoded on amd64 (see below)
+	use cpudetection && myconf+=" --enable-runtime-cpudetection"
+
+	uses="3dnow 3dnowext mmx mmxext sse sse2 ssse3"
+	for i in ${uses}; do
+		myconf+=" $(use_enable cpu_flags_x86_${i} ${i})"
+	done
+
+	uses="altivec shm"
+	for i in ${uses}; do
+		myconf+=" $(use_enable ${i})"
+	done
+
+	use debug && myconf+=" --enable-debug=3"
+
+	if use x86 && gcc-specs-pie; then
+		filter-flags -fPIC -fPIE
+		append-ldflags -nopie
+	fi
+
+	###########################
+	# X enabled configuration #
+	###########################
+	myconf+=" --disable-gui"
+	myconf+=" --disable-vesa"
+	uses="ggi vdpau xinerama xv"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use dga          || myconf+=" --disable-dga1 --disable-dga2"
+	use opengl       || myconf+=" --disable-gl"
+	use osdmenu      && myconf+=" --enable-menu"
+	use vidix        || myconf+=" --disable-vidix --disable-vidix-pcidb"
+	use xscreensaver || myconf+=" --disable-xss"
+	use X            || myconf+=" --disable-x11"
+	if use xvmc; then
+		myconf+=" --enable-xvmc --with-xvmclib=XvMCW"
+	else
+		myconf+=" --disable-xvmc"
+	fi
+
+	############################
+	# OSX (aqua) configuration #
+	############################
+	if use aqua; then
+		myconf+="
+			--enable-macosx-finder
+			--enable-macosx-bundle
+		"
+	fi
+
+	./configure \
+		--cc="$(tc-getCC)" \
+		--host-cc="$(tc-getBUILD_CC)" \
+		--prefix="${EPREFIX}/usr" \
+		--bindir="${EPREFIX}/usr/bin" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--confdir="${EPREFIX}/etc/mplayer" \
+		--datadir="${EPREFIX}/usr/share/mplayer${namesuf}" \
+		--mandir="${EPREFIX}/usr/share/man" \
+		--disable-ffmpeg_a \
+		${myconf} || die
+}
+
+src_compile() {
+	base_src_compile
+	# Build only user-requested docs if they're available.
+	if use doc ; then
+		# select available languages from $LINGUAS
+		local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
+		local BUILT_DOCS=""
+		for i in ${LINGUAS} ; do
+			has ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
+		done
+		if [[ -z $BUILT_DOCS ]]; then
+			emake -j1 html-chunked
+		else
+			for i in ${BUILT_DOCS}; do
+				emake -j1 html-chunked-${i}
+			done
+		fi
+	fi
+}
+
+src_install() {
+	local i
+
+	emake \
+		DESTDIR="${D}" \
+		INSTALLSTRIP="" \
+		install
+
+	dodoc AUTHORS Changelog Copyright README etc/codecs.conf
+
+	docinto tech/
+	dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist}
+	docinto TOOLS/
+	dodoc -r TOOLS
+	docinto tech/mirrors/
+	dodoc DOCS/tech/mirrors/*
+
+	if use doc; then
+		docinto html/
+		dohtml -r "${S}"/DOCS/HTML/*
+	fi
+
+	if ! use truetype; then
+		dodir /usr/share/mplayer/fonts
+		# Do this generic, as the mplayer people like to change the structure
+		# of their zips ...
+		for i in $(find "${WORKDIR}/" -type d -name 'font-arial-*'); do
+			cp -pPR "${i}" "${ED}/usr/share/mplayer/fonts"
+		done
+		# Fix the font symlink ...
+		rm -rf "${ED}/usr/share/mplayer/font"
+		dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
+	fi
+
+	insinto /etc/mplayer
+	newins "${S}/etc/example.conf" mplayer.conf
+	cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
+# Config options can be section specific, global
+# options should go in the default section
+[default]
+_EOF_
+	doins "${S}/etc/input.conf"
+	if use osdmenu; then
+		doins "${S}/etc/menu.conf"
+	fi
+
+	if use truetype; then
+		cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
+fontconfig=1
+subfont-osd-scale=4
+subfont-text-scale=3
+_EOF_
+	fi
+
+	# bug 256203
+	if use rar; then
+		cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
+unrarexec=${EPREFIX}/usr/bin/unrar
+_EOF_
+	fi
+
+	dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf
+	newbin "${S}/TOOLS/midentify.sh" midentify
+}
+
+pkg_preinst() {
+	[[ -d ${EROOT}/usr/share/mplayer/Skin/default ]] && \
+		rm -rf "${EROOT}/usr/share/mplayer/Skin/default"
+}
+
+pkg_postrm() {
+	# Cleanup stale symlinks
+	[ -L "${EROOT}/usr/share/mplayer/font" -a \
+			! -e "${EROOT}/usr/share/mplayer/font" ] && \
+		rm -f "${EROOT}/usr/share/mplayer/font"
+
+	[ -L "${EROOT}/usr/share/mplayer/subfont.ttf" -a \
+			! -e "${EROOT}/usr/share/mplayer/subfont.ttf" ] && \
+		rm -f "${EROOT}/usr/share/mplayer/subfont.ttf"
+}
diff --git a/media-video/mplayer/mplayer-1.3.0-r2.ebuild b/media-video/mplayer/mplayer-1.3.0-r2.ebuild
new file mode 100644
index 000000000000..d6bfb7e6ba2d
--- /dev/null
+++ b/media-video/mplayer/mplayer-1.3.0-r2.ebuild
@@ -0,0 +1,626 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
+ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
+[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS=""
+
+inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
+
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
+bs2b cddb +cdio cdparanoia cpudetection debug dga
+directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
+ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
++libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
++network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
+radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
+tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix
+vorbis +X x264 xinerama +xscreensaver +xv xvid xvmc yuv4mpeg zoran"
+
+VIDEO_CARDS="s3virge mga tdfx"
+for x in ${VIDEO_CARDS}; do
+	IUSE+=" video_cards_${x}"
+done
+
+FONT_URI="
+	mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
+	mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
+	mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2
+"
+if [[ ${PV} == *9999* ]]; then
+	RELEASE_URI=""
+elif [ "${PV%_rc*}" = "${PV}" -a "${PV%_pre*}" = "${PV}" ]; then
+	MY_P="MPlayer-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	RELEASE_URI="mirror://mplayer/releases/${MY_P}.tar.xz"
+else
+	RELEASE_URI="mirror://gentoo/${P}.tar.xz"
+fi
+SRC_URI="${RELEASE_URI}
+	!truetype? ( ${FONT_URI} )"
+
+DESCRIPTION="Media Player for Linux"
+HOMEPAGE="http://www.mplayerhq.hu/"
+
+FONT_RDEPS="
+	virtual/ttf-fonts
+	media-libs/fontconfig
+	>=media-libs/freetype-2.2.1:2
+"
+X_RDEPS="
+	x11-libs/libXext
+	x11-libs/libXxf86vm
+"
+# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
+#	nemesi? ( net-libs/libnemesi )
+RDEPEND+="
+	sys-libs/ncurses:0=
+	app-arch/bzip2
+	sys-libs/zlib
+	>=media-video/ffmpeg-3.0:0=[vdpau?]
+	a52? ( media-libs/a52dec )
+	aalib? ( media-libs/aalib )
+	alsa? ( media-libs/alsa-lib )
+	bidi? ( dev-libs/fribidi )
+	bluray? ( >=media-libs/libbluray-0.2.1:= )
+	bs2b? ( media-libs/libbs2b )
+	cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia )
+	cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
+	dga? ( x11-libs/libXxf86dga )
+	directfb? ( dev-libs/DirectFB )
+	dts? ( media-libs/libdca )
+	dv? ( media-libs/libdv )
+	dvb? ( virtual/linuxtv-dvb-headers )
+	dvd? ( >=media-libs/libdvdread-4.1.3 )
+	dvdnav? ( >=media-libs/libdvdnav-4.1.3 )
+	encode? (
+		!twolame? ( toolame? ( media-sound/toolame ) )
+		twolame? ( media-sound/twolame )
+		faac? ( media-libs/faac )
+		mp3? ( media-sound/lame )
+		x264? ( >=media-libs/x264-0.0.20100423:= )
+		xvid? ( media-libs/xvid )
+	)
+	enca? ( app-i18n/enca )
+	faad? ( media-libs/faad2 )
+	ggi? ( media-libs/libggi media-libs/libggiwmh )
+	gif? ( media-libs/giflib:0= )
+	gsm? ( media-sound/gsm )
+	iconv? ( virtual/libiconv )
+	jack? ( virtual/jack )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:0 )
+	ladspa? ( media-libs/ladspa-sdk )
+	libass? ( >=media-libs/libass-0.9.10:= )
+	libcaca? ( media-libs/libcaca )
+	libmpeg2? ( media-libs/libmpeg2 )
+	lirc? ( app-misc/lirc )
+	live? ( media-plugins/live )
+	lzo? ( >=dev-libs/lzo-2 )
+	mad? ( media-libs/libmad )
+	mng? ( media-libs/libmng:= )
+	mp3? ( media-sound/mpg123 )
+	nas? ( media-libs/nas )
+	nut? ( >=media-libs/libnut-661 )
+	openal? ( media-libs/openal )
+	opengl? ( virtual/opengl )
+	png? ( media-libs/libpng:0= )
+	pnm? ( media-libs/netpbm )
+	pulseaudio? ( media-sound/pulseaudio )
+	rar? (
+		|| (
+			app-arch/unrar
+			app-arch/rar
+		)
+	)
+	rtmp? ( media-video/rtmpdump )
+	samba? ( net-fs/samba )
+	sdl? ( media-libs/libsdl )
+	speex? ( media-libs/speex )
+	theora? ( media-libs/libtheora[encode?] )
+	tremor? ( media-libs/tremor )
+	truetype? ( ${FONT_RDEPS} )
+	vdpau? ( x11-libs/libvdpau )
+	vorbis? ( !tremor? ( media-libs/libvorbis ) )
+	X? ( ${X_RDEPS}	)
+	xinerama? ( x11-libs/libXinerama )
+	xscreensaver? ( x11-libs/libXScrnSaver )
+	xv? ( x11-libs/libXv )
+	xvmc? ( x11-libs/libXvMC )
+"
+
+X_DEPS="
+	x11-proto/videoproto
+	x11-proto/xf86vidmodeproto
+"
+ASM_DEP="dev-lang/yasm"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dga? ( x11-proto/xf86dgaproto )
+	X? ( ${X_DEPS} )
+	xinerama? ( x11-proto/xineramaproto )
+	xscreensaver? ( x11-proto/scrnsaverproto )
+	amd64? ( ${ASM_DEP} )
+	doc? (
+		dev-libs/libxslt app-text/docbook-xml-dtd
+		app-text/docbook-xsl-stylesheets
+	)
+	x86? ( ${ASM_DEP} )
+	x86-fbsd? ( ${ASM_DEP} )
+"
+RDEPEND+="
+	selinux? ( sec-policy/selinux-mplayer )
+"
+
+SLOT="0"
+LICENSE="GPL-2"
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+else
+	KEYWORDS="~alpha ~arm ~hppa ~ia64"
+fi
+
+# faac codecs are nonfree
+# libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio
+# dvd navigation requires dvd read support
+# ass and freetype font require iconv and ass requires freetype fonts
+# unicode transformations are usefull only with iconv
+# radio requires oss or alsa backend
+# xvmc requires xvideo support
+REQUIRED_USE="
+	dga? ( X )
+	dvdnav? ( dvd )
+	enca? ( iconv )
+	ggi? ( X )
+	libass? ( truetype )
+	opengl? ( X )
+	osdmenu? ( X )
+	truetype? ( iconv )
+	vdpau? ( X )
+	vidix? ( X )
+	xinerama? ( X )
+	xscreensaver? ( X )
+	xv? ( X )
+	xvmc? ( xv )"
+RESTRICT="faac? ( bindist )"
+
+pkg_setup() {
+	if [[ ${PV} == *9999* ]]; then
+		elog
+		elog "This is a live ebuild which installs the latest from upstream's"
+		elog "subversion repository, and is unsupported by Gentoo."
+		elog "Everything but bugs in the ebuild itself will be ignored."
+		elog
+	fi
+
+	if use cpudetection; then
+		ewarn
+		ewarn "You've enabled the cpudetection flag. This feature is"
+		ewarn "included mainly for people who want to use the same"
+		ewarn "binary on another system with a different CPU architecture."
+		ewarn "MPlayer will already detect your CPU settings by default at"
+		ewarn "buildtime; this flag is used for runtime detection."
+		ewarn "You won't need this turned on if you are only building"
+		ewarn "mplayer for this system. Also, if your compile fails, try"
+		ewarn "disabling this use flag."
+	fi
+
+	if has_version 'media-video/libav' ; then
+		ewarn "Please note that upstream uses media-video/ffmpeg."
+		ewarn "media-video/libav should be fine in theory but if you"
+		ewarn "experience any problem, try to move to media-video/ffmpeg."
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} = *9999* ]]; then
+		subversion_src_unpack
+		cd "${WORKDIR}"
+		rm -rf "${WORKDIR}/${P}/ffmpeg/"
+		( S="${WORKDIR}/${P}/ffmpeg/" git-2_src_unpack )
+	else
+		unpack ${A}
+	fi
+
+	if [[ ${PV} = *9999* ]] || [[ "${PV%_rc*}" = "${PV}" ]]; then
+		cd "${S}"
+		cp "${FILESDIR}/dump_ffmpeg.sh" . || die
+		chmod +x dump_ffmpeg.sh
+		./dump_ffmpeg.sh || die
+	fi
+
+	if ! use truetype; then
+		unpack font-arial-iso-8859-1.tar.bz2 \
+			font-arial-iso-8859-2.tar.bz2 \
+			font-arial-cp1250.tar.bz2
+	fi
+}
+
+src_prepare() {
+	local svf=snapshot_version
+	if [[ ${PV} = *9999* ]]; then
+		# Set SVN version manually
+		subversion_wc_info
+		printf "${ESVN_WC_REVISION}" > $svf
+	fi
+	if [ ! -f VERSION ] ; then
+		[ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
+		local sv=$(<$svf)
+		printf "SVN-r${sv} (Gentoo)" > VERSION
+	fi
+
+	# fix path to bash executable in configure scripts
+	sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die
+
+	base_src_prepare
+
+	# Use sane default for >=virtual/udev-197
+	sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die
+}
+
+src_configure() {
+	local myconf=""
+	local uses i
+
+	# set LINGUAS
+	[[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/da/dk}"
+	[[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/zh/zh_CN}" #482968
+
+	# mplayer ebuild uses "use foo || --disable-foo" to forcibly disable
+	# compilation in almost every situation. The reason for this is
+	# because if --enable is used, it will force the build of that option,
+	# regardless of whether the dependency is available or not.
+
+	###################
+	#Optional features#
+	###################
+	# disable svga since we don't want it
+	# disable arts since we don't have kde3
+	# always disable internal ass
+	# disable opus and ilbc since it only controls support in internal
+	#         ffmpeg which we do not use
+	myconf+="
+		--disable-svga --disable-svgalib_helper
+		--disable-ass-internal
+		--disable-arts
+		--disable-kai
+		--disable-libopus
+		--disable-libilbc
+		$(use_enable network networking)
+		$(use_enable joystick)
+	"
+	uses="bl bluray enca ftp rtc vcd" # nemesi <- not working with in-tree ebuild
+	myconf+=" --disable-nemesi" # nemesi automagic disable
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use bidi  || myconf+=" --disable-fribidi"
+	use ipv6  || myconf+=" --disable-inet6"
+	use libass || myconf+=" --disable-ass"
+	use nut   || myconf+=" --disable-libnut"
+	use rar   || myconf+=" --disable-unrarexec"
+	use samba || myconf+=" --disable-smb"
+	use lirc  || myconf+=" --disable-lirc --disable-lircc --disable-apple-ir"
+
+	# libcdio support: prefer libcdio over cdparanoia
+	# don't check for cddb w/cdio
+	if use cdio; then
+		myconf+=" --disable-cdparanoia"
+	else
+		myconf+=" --disable-libcdio"
+		use cdparanoia || myconf+=" --disable-cdparanoia"
+		use cddb || myconf+=" --disable-cddb"
+	fi
+
+	################################
+	# DVD read, navigation support #
+	################################
+	#
+	# dvdread - accessing a DVD
+	# dvdnav - navigation of menus
+	use dvd || myconf+=" --disable-dvdread"
+	use dvdnav || myconf+=" --disable-dvdnav"
+
+	#############
+	# Subtitles #
+	#############
+	#
+	# SRT/ASS/SSA (subtitles) requires freetype support
+	# freetype support requires iconv
+	# iconv optionally can use unicode
+	use truetype || myconf+=" --disable-freetype"
+	use iconv || myconf+=" --disable-iconv --charset=noconv"
+	use iconv && use unicode && myconf+=" --charset=UTF-8"
+
+	#####################################
+	# DVB / Video4Linux / Radio support #
+	#####################################
+	myconf+=" --disable-tv-bsdbt848"
+	# broken upstream, won't work with recent kernels
+	myconf+=" --disable-ivtv"
+	# gone since linux-headers-2.6.38
+	myconf+=" --disable-tv-v4l1"
+	if { use dvb || use v4l || use pvr || use radio; }; then
+		use dvb || myconf+=" --disable-dvb"
+		use pvr || myconf+=" --disable-pvr"
+		use v4l || myconf+=" --disable-tv-v4l2"
+		if use radio && { use dvb || use v4l; }; then
+			myconf+="
+				--enable-radio
+				$(use_enable encode radio-capture)
+			"
+		else
+			myconf+="
+				--disable-radio-v4l2
+				--disable-radio-bsdbt848
+			"
+		fi
+	else
+		myconf+="
+			--disable-tv
+			--disable-tv-v4l2
+			--disable-radio
+			--disable-radio-v4l2
+			--disable-radio-bsdbt848
+			--disable-dvb
+			--disable-v4l2
+			--disable-pvr"
+	fi
+
+	##########
+	# Codecs #
+	##########
+	myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
+	myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2
+	use dts || myconf+=" --disable-libdca"
+	if ! use mp3; then
+		myconf+="
+			--disable-mp3lame
+			--disable-mpg123
+		"
+	fi
+	uses="a52 bs2b dv gsm lzo rtmp vorbis"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-lib${i}"
+	done
+
+	uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use jpeg2k || myconf+=" --disable-libopenjpeg"
+
+	# Encoding
+	uses="faac x264 xvid toolame twolame"
+	if use encode; then
+		for i in ${uses}; do
+			use ${i} || myconf+=" --disable-${i}"
+		done
+	else
+		myconf+=" --disable-mencoder"
+		for i in ${uses}; do
+			myconf+=" --disable-${i}"
+			use ${i} && elog "Useflag \"${i}\" will only be useful for encoding, i.e., with \"encode\" useflag enabled."
+		done
+	fi
+
+	#################
+	# Binary codecs #
+	#################
+	myconf+=" --disable-qtx --disable-real --disable-win32dll"
+
+	################
+	# Video Output #
+	################
+	uses="directfb md5sum sdl yuv4mpeg"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use aalib || myconf+=" --disable-aa"
+	use fbcon || myconf+=" --disable-fbdev"
+	use fbcon && use video_cards_s3virge && myconf+=" --enable-s3fb"
+	use libcaca || myconf+=" --disable-caca"
+	use zoran || myconf+=" --disable-zr"
+
+	if ! use kernel_linux || ! use video_cards_mga; then
+		 myconf+=" --disable-mga --disable-xmga"
+	fi
+
+	if use video_cards_tdfx; then
+		myconf+="
+			$(use_enable video_cards_tdfx tdfxvid)
+			$(use_enable fbcon tdfxfb)
+		"
+	else
+		myconf+="
+			--disable-3dfx
+			--disable-tdfxvid
+			--disable-tdfxfb
+		"
+	fi
+
+	# sun card, disable by default, see bug #258729
+	myconf+=" --disable-xvr100"
+
+	################
+	# Audio Output #
+	################
+	myconf+=" --disable-esd"
+	uses="alsa jack ladspa nas openal"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use pulseaudio || myconf+=" --disable-pulse"
+	if ! use radio; then
+		use oss || myconf+=" --disable-ossaudio"
+	fi
+
+	####################
+	# Advanced Options #
+	####################
+	# Platform specific flags, hardcoded on amd64 (see below)
+	use cpudetection && myconf+=" --enable-runtime-cpudetection"
+
+	uses="3dnow 3dnowext mmx mmxext sse sse2 ssse3"
+	for i in ${uses}; do
+		myconf+=" $(use_enable cpu_flags_x86_${i} ${i})"
+	done
+
+	uses="altivec shm"
+	for i in ${uses}; do
+		myconf+=" $(use_enable ${i})"
+	done
+
+	use debug && myconf+=" --enable-debug=3"
+
+	if use x86 && gcc-specs-pie; then
+		filter-flags -fPIC -fPIE
+		append-ldflags -nopie
+	fi
+
+	###########################
+	# X enabled configuration #
+	###########################
+	myconf+=" --disable-gui"
+	myconf+=" --disable-vesa"
+	uses="ggi vdpau xinerama xv"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use dga          || myconf+=" --disable-dga1 --disable-dga2"
+	use opengl       || myconf+=" --disable-gl"
+	use osdmenu      && myconf+=" --enable-menu"
+	use vidix        || myconf+=" --disable-vidix --disable-vidix-pcidb"
+	use xscreensaver || myconf+=" --disable-xss"
+	use X            || myconf+=" --disable-x11"
+	if use xvmc; then
+		myconf+=" --enable-xvmc --with-xvmclib=XvMCW"
+	else
+		myconf+=" --disable-xvmc"
+	fi
+
+	############################
+	# OSX (aqua) configuration #
+	############################
+	if use aqua; then
+		myconf+="
+			--enable-macosx-finder
+			--enable-macosx-bundle
+		"
+	fi
+
+	./configure \
+		--cc="$(tc-getCC)" \
+		--host-cc="$(tc-getBUILD_CC)" \
+		--prefix="${EPREFIX}/usr" \
+		--bindir="${EPREFIX}/usr/bin" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--confdir="${EPREFIX}/etc/mplayer" \
+		--datadir="${EPREFIX}/usr/share/mplayer${namesuf}" \
+		--mandir="${EPREFIX}/usr/share/man" \
+		--disable-ffmpeg_a \
+		${myconf} || die
+}
+
+src_compile() {
+	base_src_compile
+	# Build only user-requested docs if they're available.
+	if use doc ; then
+		# select available languages from $LINGUAS
+		local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
+		local BUILT_DOCS=""
+		for i in ${LINGUAS} ; do
+			has ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
+		done
+		if [[ -z $BUILT_DOCS ]]; then
+			emake -j1 html-chunked
+		else
+			for i in ${BUILT_DOCS}; do
+				emake -j1 html-chunked-${i}
+			done
+		fi
+	fi
+}
+
+src_install() {
+	local i
+
+	emake \
+		DESTDIR="${D}" \
+		INSTALLSTRIP="" \
+		install
+
+	dodoc AUTHORS Changelog Copyright README etc/codecs.conf
+
+	docinto tech/
+	dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist}
+	docinto TOOLS/
+	dodoc -r TOOLS
+	docinto tech/mirrors/
+	dodoc DOCS/tech/mirrors/*
+
+	if use doc; then
+		docinto html/
+		dohtml -r "${S}"/DOCS/HTML/*
+	fi
+
+	if ! use truetype; then
+		dodir /usr/share/mplayer/fonts
+		# Do this generic, as the mplayer people like to change the structure
+		# of their zips ...
+		for i in $(find "${WORKDIR}/" -type d -name 'font-arial-*'); do
+			cp -pPR "${i}" "${ED}/usr/share/mplayer/fonts"
+		done
+		# Fix the font symlink ...
+		rm -rf "${ED}/usr/share/mplayer/font"
+		dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
+	fi
+
+	insinto /etc/mplayer
+	newins "${S}/etc/example.conf" mplayer.conf
+	cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
+# Config options can be section specific, global
+# options should go in the default section
+[default]
+_EOF_
+	doins "${S}/etc/input.conf"
+	if use osdmenu; then
+		doins "${S}/etc/menu.conf"
+	fi
+
+	if use truetype; then
+		cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
+fontconfig=1
+subfont-osd-scale=4
+subfont-text-scale=3
+_EOF_
+	fi
+
+	# bug 256203
+	if use rar; then
+		cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
+unrarexec=${EPREFIX}/usr/bin/unrar
+_EOF_
+	fi
+
+	dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf
+	newbin "${S}/TOOLS/midentify.sh" midentify
+}
+
+pkg_preinst() {
+	[[ -d ${EROOT}/usr/share/mplayer/Skin/default ]] && \
+		rm -rf "${EROOT}/usr/share/mplayer/Skin/default"
+}
+
+pkg_postrm() {
+	# Cleanup stale symlinks
+	[ -L "${EROOT}/usr/share/mplayer/font" -a \
+			! -e "${EROOT}/usr/share/mplayer/font" ] && \
+		rm -f "${EROOT}/usr/share/mplayer/font"
+
+	[ -L "${EROOT}/usr/share/mplayer/subfont.ttf" -a \
+			! -e "${EROOT}/usr/share/mplayer/subfont.ttf" ] && \
+		rm -f "${EROOT}/usr/share/mplayer/subfont.ttf"
+}
diff --git a/media-video/mplayer/mplayer-1.3.0-r3.ebuild b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
new file mode 100644
index 000000000000..68459860f46a
--- /dev/null
+++ b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
@@ -0,0 +1,628 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
+ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
+[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS=""
+
+inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
+
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
+bs2b cddb +cdio cdparanoia cpudetection debug dga
+directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
+ftp gif ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa
++libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
++network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
+radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
+tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix
+vorbis +X x264 xinerama +xscreensaver +xv xvid xvmc yuv4mpeg zoran"
+
+VIDEO_CARDS="s3virge mga tdfx"
+for x in ${VIDEO_CARDS}; do
+	IUSE+=" video_cards_${x}"
+done
+
+FONT_URI="
+	mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
+	mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
+	mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2
+"
+if [[ ${PV} == *9999* ]]; then
+	RELEASE_URI=""
+elif [ "${PV%_rc*}" = "${PV}" -a "${PV%_pre*}" = "${PV}" ]; then
+	MY_P="MPlayer-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	RELEASE_URI="mirror://mplayer/releases/${MY_P}.tar.xz"
+else
+	RELEASE_URI="mirror://gentoo/${P}.tar.xz"
+fi
+SRC_URI="${RELEASE_URI}
+	!truetype? ( ${FONT_URI} )"
+
+DESCRIPTION="Media Player for Linux"
+HOMEPAGE="http://www.mplayerhq.hu/"
+
+FONT_RDEPS="
+	virtual/ttf-fonts
+	media-libs/fontconfig
+	>=media-libs/freetype-2.2.1:2
+"
+X_RDEPS="
+	x11-libs/libXext
+	x11-libs/libXxf86vm
+"
+# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
+#	nemesi? ( net-libs/libnemesi )
+RDEPEND+="
+	sys-libs/ncurses:0=
+	app-arch/bzip2
+	sys-libs/zlib
+	>=media-video/ffmpeg-3.0:0=[vdpau?]
+	a52? ( media-libs/a52dec )
+	aalib? ( media-libs/aalib )
+	alsa? ( media-libs/alsa-lib )
+	bidi? ( dev-libs/fribidi )
+	bluray? ( >=media-libs/libbluray-0.2.1:= )
+	bs2b? ( media-libs/libbs2b )
+	cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia )
+	cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
+	dga? ( x11-libs/libXxf86dga )
+	directfb? ( dev-libs/DirectFB )
+	dts? ( media-libs/libdca )
+	dv? ( media-libs/libdv )
+	dvb? ( virtual/linuxtv-dvb-headers )
+	dvd? ( >=media-libs/libdvdread-4.1.3 )
+	dvdnav? ( >=media-libs/libdvdnav-4.1.3 )
+	encode? (
+		!twolame? ( toolame? ( media-sound/toolame ) )
+		twolame? ( media-sound/twolame )
+		faac? ( media-libs/faac )
+		mp3? ( media-sound/lame )
+		x264? ( >=media-libs/x264-0.0.20100423:= )
+		xvid? ( media-libs/xvid )
+	)
+	enca? ( app-i18n/enca )
+	faad? ( media-libs/faad2 )
+	ggi? ( media-libs/libggi media-libs/libggiwmh )
+	gif? ( media-libs/giflib:0= )
+	gsm? ( media-sound/gsm )
+	iconv? ( virtual/libiconv )
+	jack? ( virtual/jack )
+	jpeg? ( virtual/jpeg:0 )
+	ladspa? ( media-libs/ladspa-sdk )
+	libass? ( >=media-libs/libass-0.9.10:= )
+	libcaca? ( media-libs/libcaca )
+	libmpeg2? ( media-libs/libmpeg2 )
+	lirc? ( app-misc/lirc )
+	live? ( media-plugins/live )
+	lzo? ( >=dev-libs/lzo-2 )
+	mad? ( media-libs/libmad )
+	mng? ( media-libs/libmng:= )
+	mp3? ( media-sound/mpg123 )
+	nas? ( media-libs/nas )
+	nut? ( >=media-libs/libnut-661 )
+	openal? ( media-libs/openal )
+	opengl? ( virtual/opengl )
+	png? ( media-libs/libpng:0= )
+	pnm? ( media-libs/netpbm )
+	pulseaudio? ( media-sound/pulseaudio )
+	rar? (
+		|| (
+			app-arch/unrar
+			app-arch/rar
+		)
+	)
+	rtmp? ( media-video/rtmpdump )
+	samba? ( net-fs/samba )
+	sdl? ( media-libs/libsdl )
+	speex? ( media-libs/speex )
+	theora? ( media-libs/libtheora[encode?] )
+	tremor? ( media-libs/tremor )
+	truetype? ( ${FONT_RDEPS} )
+	vdpau? ( x11-libs/libvdpau )
+	vorbis? ( !tremor? ( media-libs/libvorbis ) )
+	X? ( ${X_RDEPS}	)
+	xinerama? ( x11-libs/libXinerama )
+	xscreensaver? ( x11-libs/libXScrnSaver )
+	xv? ( x11-libs/libXv )
+	xvmc? ( x11-libs/libXvMC )
+"
+
+X_DEPS="
+	x11-proto/videoproto
+	x11-proto/xf86vidmodeproto
+"
+ASM_DEP="dev-lang/yasm"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dga? ( x11-proto/xf86dgaproto )
+	X? ( ${X_DEPS} )
+	xinerama? ( x11-proto/xineramaproto )
+	xscreensaver? ( x11-proto/scrnsaverproto )
+	amd64? ( ${ASM_DEP} )
+	doc? (
+		dev-libs/libxslt app-text/docbook-xml-dtd
+		app-text/docbook-xsl-stylesheets
+	)
+	x86? ( ${ASM_DEP} )
+	x86-fbsd? ( ${ASM_DEP} )
+"
+RDEPEND+="
+	selinux? ( sec-policy/selinux-mplayer )
+"
+
+SLOT="0"
+LICENSE="GPL-2"
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+else
+	KEYWORDS="~alpha ~arm ~hppa ~ia64 ~ppc ~ppc64"
+fi
+
+# faac codecs are nonfree
+# libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio
+# dvd navigation requires dvd read support
+# ass and freetype font require iconv and ass requires freetype fonts
+# unicode transformations are usefull only with iconv
+# radio requires oss or alsa backend
+# xvmc requires xvideo support
+REQUIRED_USE="
+	dga? ( X )
+	dvdnav? ( dvd )
+	enca? ( iconv )
+	ggi? ( X )
+	libass? ( truetype )
+	opengl? ( X )
+	osdmenu? ( X )
+	truetype? ( iconv )
+	vdpau? ( X )
+	vidix? ( X )
+	xinerama? ( X )
+	xscreensaver? ( X )
+	xv? ( X )
+	xvmc? ( xv )"
+RESTRICT="faac? ( bindist )"
+
+pkg_setup() {
+	if [[ ${PV} == *9999* ]]; then
+		elog
+		elog "This is a live ebuild which installs the latest from upstream's"
+		elog "subversion repository, and is unsupported by Gentoo."
+		elog "Everything but bugs in the ebuild itself will be ignored."
+		elog
+	fi
+
+	if use cpudetection; then
+		ewarn
+		ewarn "You've enabled the cpudetection flag. This feature is"
+		ewarn "included mainly for people who want to use the same"
+		ewarn "binary on another system with a different CPU architecture."
+		ewarn "MPlayer will already detect your CPU settings by default at"
+		ewarn "buildtime; this flag is used for runtime detection."
+		ewarn "You won't need this turned on if you are only building"
+		ewarn "mplayer for this system. Also, if your compile fails, try"
+		ewarn "disabling this use flag."
+	fi
+
+	if has_version 'media-video/libav' ; then
+		ewarn "Please note that upstream uses media-video/ffmpeg."
+		ewarn "media-video/libav should be fine in theory but if you"
+		ewarn "experience any problem, try to move to media-video/ffmpeg."
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} = *9999* ]]; then
+		subversion_src_unpack
+		cd "${WORKDIR}"
+		rm -rf "${WORKDIR}/${P}/ffmpeg/"
+		( S="${WORKDIR}/${P}/ffmpeg/" git-2_src_unpack )
+	else
+		unpack ${A}
+	fi
+
+	if [[ ${PV} = *9999* ]] || [[ "${PV%_rc*}" = "${PV}" ]]; then
+		cd "${S}"
+		cp "${FILESDIR}/dump_ffmpeg.sh" . || die
+		chmod +x dump_ffmpeg.sh
+		./dump_ffmpeg.sh || die
+	fi
+
+	if ! use truetype; then
+		unpack font-arial-iso-8859-1.tar.bz2 \
+			font-arial-iso-8859-2.tar.bz2 \
+			font-arial-cp1250.tar.bz2
+	fi
+}
+
+src_prepare() {
+	local svf=snapshot_version
+	if [[ ${PV} = *9999* ]]; then
+		# Set SVN version manually
+		subversion_wc_info
+		printf "${ESVN_WC_REVISION}" > $svf
+	else
+		epatch "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch
+	fi
+	if [ ! -f VERSION ] ; then
+		[ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
+		local sv=$(<$svf)
+		printf "SVN-r${sv} (Gentoo)" > VERSION
+	fi
+
+	# fix path to bash executable in configure scripts
+	sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die
+
+	base_src_prepare
+
+	# Use sane default for >=virtual/udev-197
+	sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die
+}
+
+src_configure() {
+	local myconf=""
+	local uses i
+
+	# set LINGUAS
+	[[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/da/dk}"
+	[[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/zh/zh_CN}" #482968
+
+	# mplayer ebuild uses "use foo || --disable-foo" to forcibly disable
+	# compilation in almost every situation. The reason for this is
+	# because if --enable is used, it will force the build of that option,
+	# regardless of whether the dependency is available or not.
+
+	###################
+	#Optional features#
+	###################
+	# disable svga since we don't want it
+	# disable arts since we don't have kde3
+	# always disable internal ass
+	# disable opus and ilbc since it only controls support in internal
+	#         ffmpeg which we do not use
+	myconf+="
+		--disable-svga --disable-svgalib_helper
+		--disable-ass-internal
+		--disable-arts
+		--disable-kai
+		--disable-libopus
+		--disable-libilbc
+		$(use_enable network networking)
+		$(use_enable joystick)
+	"
+	uses="bl bluray enca ftp rtc vcd" # nemesi <- not working with in-tree ebuild
+	myconf+=" --disable-nemesi" # nemesi automagic disable
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use bidi  || myconf+=" --disable-fribidi"
+	use ipv6  || myconf+=" --disable-inet6"
+	use libass || myconf+=" --disable-ass"
+	use nut   || myconf+=" --disable-libnut"
+	use rar   || myconf+=" --disable-unrarexec"
+	use samba || myconf+=" --disable-smb"
+	use lirc  || myconf+=" --disable-lirc --disable-lircc --disable-apple-ir"
+
+	# libcdio support: prefer libcdio over cdparanoia
+	# don't check for cddb w/cdio
+	if use cdio; then
+		myconf+=" --disable-cdparanoia"
+	else
+		myconf+=" --disable-libcdio"
+		use cdparanoia || myconf+=" --disable-cdparanoia"
+		use cddb || myconf+=" --disable-cddb"
+	fi
+
+	################################
+	# DVD read, navigation support #
+	################################
+	#
+	# dvdread - accessing a DVD
+	# dvdnav - navigation of menus
+	use dvd || myconf+=" --disable-dvdread"
+	use dvdnav || myconf+=" --disable-dvdnav"
+
+	#############
+	# Subtitles #
+	#############
+	#
+	# SRT/ASS/SSA (subtitles) requires freetype support
+	# freetype support requires iconv
+	# iconv optionally can use unicode
+	use truetype || myconf+=" --disable-freetype"
+	use iconv || myconf+=" --disable-iconv --charset=noconv"
+	use iconv && use unicode && myconf+=" --charset=UTF-8"
+
+	#####################################
+	# DVB / Video4Linux / Radio support #
+	#####################################
+	myconf+=" --disable-tv-bsdbt848"
+	# broken upstream, won't work with recent kernels
+	myconf+=" --disable-ivtv"
+	# gone since linux-headers-2.6.38
+	myconf+=" --disable-tv-v4l1"
+	if { use dvb || use v4l || use pvr || use radio; }; then
+		use dvb || myconf+=" --disable-dvb"
+		use pvr || myconf+=" --disable-pvr"
+		use v4l || myconf+=" --disable-tv-v4l2"
+		if use radio && { use dvb || use v4l; }; then
+			myconf+="
+				--enable-radio
+				$(use_enable encode radio-capture)
+			"
+		else
+			myconf+="
+				--disable-radio-v4l2
+				--disable-radio-bsdbt848
+			"
+		fi
+	else
+		myconf+="
+			--disable-tv
+			--disable-tv-v4l2
+			--disable-radio
+			--disable-radio-v4l2
+			--disable-radio-bsdbt848
+			--disable-dvb
+			--disable-v4l2
+			--disable-pvr"
+	fi
+
+	##########
+	# Codecs #
+	##########
+	myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
+	myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2
+	use dts || myconf+=" --disable-libdca"
+	if ! use mp3; then
+		myconf+="
+			--disable-mp3lame
+			--disable-mpg123
+		"
+	fi
+	uses="a52 bs2b dv gsm lzo rtmp vorbis"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-lib${i}"
+	done
+
+	uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	# Pulls an outdated libopenjpeg, ffmpeg provides better support for it
+	myconf+=" --disable-libopenjpeg"
+
+	# Encoding
+	uses="faac x264 xvid toolame twolame"
+	if use encode; then
+		for i in ${uses}; do
+			use ${i} || myconf+=" --disable-${i}"
+		done
+	else
+		myconf+=" --disable-mencoder"
+		for i in ${uses}; do
+			myconf+=" --disable-${i}"
+			use ${i} && elog "Useflag \"${i}\" will only be useful for encoding, i.e., with \"encode\" useflag enabled."
+		done
+	fi
+
+	#################
+	# Binary codecs #
+	#################
+	myconf+=" --disable-qtx --disable-real --disable-win32dll"
+
+	################
+	# Video Output #
+	################
+	uses="directfb md5sum sdl yuv4mpeg"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use aalib || myconf+=" --disable-aa"
+	use fbcon || myconf+=" --disable-fbdev"
+	use fbcon && use video_cards_s3virge && myconf+=" --enable-s3fb"
+	use libcaca || myconf+=" --disable-caca"
+	use zoran || myconf+=" --disable-zr"
+
+	if ! use kernel_linux || ! use video_cards_mga; then
+		 myconf+=" --disable-mga --disable-xmga"
+	fi
+
+	if use video_cards_tdfx; then
+		myconf+="
+			$(use_enable video_cards_tdfx tdfxvid)
+			$(use_enable fbcon tdfxfb)
+		"
+	else
+		myconf+="
+			--disable-3dfx
+			--disable-tdfxvid
+			--disable-tdfxfb
+		"
+	fi
+
+	# sun card, disable by default, see bug #258729
+	myconf+=" --disable-xvr100"
+
+	################
+	# Audio Output #
+	################
+	myconf+=" --disable-esd"
+	uses="alsa jack ladspa nas openal"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use pulseaudio || myconf+=" --disable-pulse"
+	if ! use radio; then
+		use oss || myconf+=" --disable-ossaudio"
+	fi
+
+	####################
+	# Advanced Options #
+	####################
+	# Platform specific flags, hardcoded on amd64 (see below)
+	use cpudetection && myconf+=" --enable-runtime-cpudetection"
+
+	uses="3dnow 3dnowext mmx mmxext sse sse2 ssse3"
+	for i in ${uses}; do
+		myconf+=" $(use_enable cpu_flags_x86_${i} ${i})"
+	done
+
+	uses="altivec shm"
+	for i in ${uses}; do
+		myconf+=" $(use_enable ${i})"
+	done
+
+	use debug && myconf+=" --enable-debug=3"
+
+	if use x86 && gcc-specs-pie; then
+		filter-flags -fPIC -fPIE
+		append-ldflags -nopie
+	fi
+
+	###########################
+	# X enabled configuration #
+	###########################
+	myconf+=" --disable-gui"
+	myconf+=" --disable-vesa"
+	uses="ggi vdpau xinerama xv"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use dga          || myconf+=" --disable-dga1 --disable-dga2"
+	use opengl       || myconf+=" --disable-gl"
+	use osdmenu      && myconf+=" --enable-menu"
+	use vidix        || myconf+=" --disable-vidix --disable-vidix-pcidb"
+	use xscreensaver || myconf+=" --disable-xss"
+	use X            || myconf+=" --disable-x11"
+	if use xvmc; then
+		myconf+=" --enable-xvmc --with-xvmclib=XvMCW"
+	else
+		myconf+=" --disable-xvmc"
+	fi
+
+	############################
+	# OSX (aqua) configuration #
+	############################
+	if use aqua; then
+		myconf+="
+			--enable-macosx-finder
+			--enable-macosx-bundle
+		"
+	fi
+
+	./configure \
+		--cc="$(tc-getCC)" \
+		--host-cc="$(tc-getBUILD_CC)" \
+		--prefix="${EPREFIX}/usr" \
+		--bindir="${EPREFIX}/usr/bin" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--confdir="${EPREFIX}/etc/mplayer" \
+		--datadir="${EPREFIX}/usr/share/mplayer${namesuf}" \
+		--mandir="${EPREFIX}/usr/share/man" \
+		--disable-ffmpeg_a \
+		${myconf} || die
+}
+
+src_compile() {
+	base_src_compile
+	# Build only user-requested docs if they're available.
+	if use doc ; then
+		# select available languages from $LINGUAS
+		local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
+		local BUILT_DOCS=""
+		for i in ${LINGUAS} ; do
+			has ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
+		done
+		if [[ -z $BUILT_DOCS ]]; then
+			emake -j1 html-chunked
+		else
+			for i in ${BUILT_DOCS}; do
+				emake -j1 html-chunked-${i}
+			done
+		fi
+	fi
+}
+
+src_install() {
+	local i
+
+	emake \
+		DESTDIR="${D}" \
+		INSTALLSTRIP="" \
+		install
+
+	dodoc AUTHORS Changelog Copyright README etc/codecs.conf
+
+	docinto tech/
+	dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist}
+	docinto TOOLS/
+	dodoc -r TOOLS
+	docinto tech/mirrors/
+	dodoc DOCS/tech/mirrors/*
+
+	if use doc; then
+		docinto html/
+		dohtml -r "${S}"/DOCS/HTML/*
+	fi
+
+	if ! use truetype; then
+		dodir /usr/share/mplayer/fonts
+		# Do this generic, as the mplayer people like to change the structure
+		# of their zips ...
+		for i in $(find "${WORKDIR}/" -type d -name 'font-arial-*'); do
+			cp -pPR "${i}" "${ED}/usr/share/mplayer/fonts"
+		done
+		# Fix the font symlink ...
+		rm -rf "${ED}/usr/share/mplayer/font"
+		dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
+	fi
+
+	insinto /etc/mplayer
+	newins "${S}/etc/example.conf" mplayer.conf
+	cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
+# Config options can be section specific, global
+# options should go in the default section
+[default]
+_EOF_
+	doins "${S}/etc/input.conf"
+	if use osdmenu; then
+		doins "${S}/etc/menu.conf"
+	fi
+
+	if use truetype; then
+		cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
+fontconfig=1
+subfont-osd-scale=4
+subfont-text-scale=3
+_EOF_
+	fi
+
+	# bug 256203
+	if use rar; then
+		cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
+unrarexec=${EPREFIX}/usr/bin/unrar
+_EOF_
+	fi
+
+	dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf
+	newbin "${S}/TOOLS/midentify.sh" midentify
+}
+
+pkg_preinst() {
+	[[ -d ${EROOT}/usr/share/mplayer/Skin/default ]] && \
+		rm -rf "${EROOT}/usr/share/mplayer/Skin/default"
+}
+
+pkg_postrm() {
+	# Cleanup stale symlinks
+	[ -L "${EROOT}/usr/share/mplayer/font" -a \
+			! -e "${EROOT}/usr/share/mplayer/font" ] && \
+		rm -f "${EROOT}/usr/share/mplayer/font"
+
+	[ -L "${EROOT}/usr/share/mplayer/subfont.ttf" -a \
+			! -e "${EROOT}/usr/share/mplayer/subfont.ttf" ] && \
+		rm -f "${EROOT}/usr/share/mplayer/subfont.ttf"
+}
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
new file mode 100644
index 000000000000..61554438bfc0
--- /dev/null
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -0,0 +1,626 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
+ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
+[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS=""
+
+inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
+
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
+bs2b cddb +cdio cdparanoia cpudetection debug dga
+directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
+ftp gif ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa
++libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
++network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
+radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
+tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix
+vorbis +X x264 xinerama +xscreensaver +xv xvid xvmc yuv4mpeg zoran"
+
+VIDEO_CARDS="s3virge mga tdfx"
+for x in ${VIDEO_CARDS}; do
+	IUSE+=" video_cards_${x}"
+done
+
+FONT_URI="
+	mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
+	mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
+	mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2
+"
+if [[ ${PV} == *9999* ]]; then
+	RELEASE_URI=""
+elif [ "${PV%_rc*}" = "${PV}" -a "${PV%_pre*}" = "${PV}" ]; then
+	MY_P="MPlayer-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	RELEASE_URI="mirror://mplayer/releases/${MY_P}.tar.xz"
+else
+	RELEASE_URI="mirror://gentoo/${P}.tar.xz"
+fi
+SRC_URI="${RELEASE_URI}
+	!truetype? ( ${FONT_URI} )"
+
+DESCRIPTION="Media Player for Linux"
+HOMEPAGE="http://www.mplayerhq.hu/"
+
+FONT_RDEPS="
+	virtual/ttf-fonts
+	media-libs/fontconfig
+	>=media-libs/freetype-2.2.1:2
+"
+X_RDEPS="
+	x11-libs/libXext
+	x11-libs/libXxf86vm
+"
+# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
+#	nemesi? ( net-libs/libnemesi )
+RDEPEND+="
+	sys-libs/ncurses:0=
+	app-arch/bzip2
+	sys-libs/zlib
+	>=media-video/ffmpeg-3.0:0=[vdpau?]
+	a52? ( media-libs/a52dec )
+	aalib? ( media-libs/aalib )
+	alsa? ( media-libs/alsa-lib )
+	bidi? ( dev-libs/fribidi )
+	bluray? ( >=media-libs/libbluray-0.2.1:= )
+	bs2b? ( media-libs/libbs2b )
+	cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia )
+	cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
+	dga? ( x11-libs/libXxf86dga )
+	directfb? ( dev-libs/DirectFB )
+	dts? ( media-libs/libdca )
+	dv? ( media-libs/libdv )
+	dvb? ( virtual/linuxtv-dvb-headers )
+	dvd? ( >=media-libs/libdvdread-4.1.3 )
+	dvdnav? ( >=media-libs/libdvdnav-4.1.3 )
+	encode? (
+		!twolame? ( toolame? ( media-sound/toolame ) )
+		twolame? ( media-sound/twolame )
+		faac? ( media-libs/faac )
+		mp3? ( media-sound/lame )
+		x264? ( >=media-libs/x264-0.0.20100423:= )
+		xvid? ( media-libs/xvid )
+	)
+	enca? ( app-i18n/enca )
+	faad? ( media-libs/faad2 )
+	ggi? ( media-libs/libggi media-libs/libggiwmh )
+	gif? ( media-libs/giflib:0= )
+	gsm? ( media-sound/gsm )
+	iconv? ( virtual/libiconv )
+	jack? ( virtual/jack )
+	jpeg? ( virtual/jpeg:0 )
+	ladspa? ( media-libs/ladspa-sdk )
+	libass? ( >=media-libs/libass-0.9.10:= )
+	libcaca? ( media-libs/libcaca )
+	libmpeg2? ( media-libs/libmpeg2 )
+	lirc? ( app-misc/lirc )
+	live? ( media-plugins/live )
+	lzo? ( >=dev-libs/lzo-2 )
+	mad? ( media-libs/libmad )
+	mng? ( media-libs/libmng:= )
+	mp3? ( media-sound/mpg123 )
+	nas? ( media-libs/nas )
+	nut? ( >=media-libs/libnut-661 )
+	openal? ( media-libs/openal )
+	opengl? ( virtual/opengl )
+	png? ( media-libs/libpng:0= )
+	pnm? ( media-libs/netpbm )
+	pulseaudio? ( media-sound/pulseaudio )
+	rar? (
+		|| (
+			app-arch/unrar
+			app-arch/rar
+		)
+	)
+	rtmp? ( media-video/rtmpdump )
+	samba? ( net-fs/samba )
+	sdl? ( media-libs/libsdl )
+	speex? ( media-libs/speex )
+	theora? ( media-libs/libtheora[encode?] )
+	tremor? ( media-libs/tremor )
+	truetype? ( ${FONT_RDEPS} )
+	vdpau? ( x11-libs/libvdpau )
+	vorbis? ( !tremor? ( media-libs/libvorbis ) )
+	X? ( ${X_RDEPS}	)
+	xinerama? ( x11-libs/libXinerama )
+	xscreensaver? ( x11-libs/libXScrnSaver )
+	xv? ( x11-libs/libXv )
+	xvmc? ( x11-libs/libXvMC )
+"
+
+X_DEPS="
+	x11-proto/videoproto
+	x11-proto/xf86vidmodeproto
+"
+ASM_DEP="dev-lang/yasm"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dga? ( x11-proto/xf86dgaproto )
+	X? ( ${X_DEPS} )
+	xinerama? ( x11-proto/xineramaproto )
+	xscreensaver? ( x11-proto/scrnsaverproto )
+	amd64? ( ${ASM_DEP} )
+	doc? (
+		dev-libs/libxslt app-text/docbook-xml-dtd
+		app-text/docbook-xsl-stylesheets
+	)
+	x86? ( ${ASM_DEP} )
+	x86-fbsd? ( ${ASM_DEP} )
+"
+RDEPEND+="
+	selinux? ( sec-policy/selinux-mplayer )
+"
+
+SLOT="0"
+LICENSE="GPL-2"
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+else
+	KEYWORDS=""
+fi
+
+# faac codecs are nonfree
+# libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio
+# dvd navigation requires dvd read support
+# ass and freetype font require iconv and ass requires freetype fonts
+# unicode transformations are usefull only with iconv
+# radio requires oss or alsa backend
+# xvmc requires xvideo support
+REQUIRED_USE="
+	dga? ( X )
+	dvdnav? ( dvd )
+	enca? ( iconv )
+	ggi? ( X )
+	libass? ( truetype )
+	opengl? ( X )
+	osdmenu? ( X )
+	truetype? ( iconv )
+	vdpau? ( X )
+	vidix? ( X )
+	xinerama? ( X )
+	xscreensaver? ( X )
+	xv? ( X )
+	xvmc? ( xv )"
+RESTRICT="faac? ( bindist )"
+
+pkg_setup() {
+	if [[ ${PV} == *9999* ]]; then
+		elog
+		elog "This is a live ebuild which installs the latest from upstream's"
+		elog "subversion repository, and is unsupported by Gentoo."
+		elog "Everything but bugs in the ebuild itself will be ignored."
+		elog
+	fi
+
+	if use cpudetection; then
+		ewarn
+		ewarn "You've enabled the cpudetection flag. This feature is"
+		ewarn "included mainly for people who want to use the same"
+		ewarn "binary on another system with a different CPU architecture."
+		ewarn "MPlayer will already detect your CPU settings by default at"
+		ewarn "buildtime; this flag is used for runtime detection."
+		ewarn "You won't need this turned on if you are only building"
+		ewarn "mplayer for this system. Also, if your compile fails, try"
+		ewarn "disabling this use flag."
+	fi
+
+	if has_version 'media-video/libav' ; then
+		ewarn "Please note that upstream uses media-video/ffmpeg."
+		ewarn "media-video/libav should be fine in theory but if you"
+		ewarn "experience any problem, try to move to media-video/ffmpeg."
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} = *9999* ]]; then
+		subversion_src_unpack
+		cd "${WORKDIR}"
+		rm -rf "${WORKDIR}/${P}/ffmpeg/"
+		( S="${WORKDIR}/${P}/ffmpeg/" git-2_src_unpack )
+	else
+		unpack ${A}
+	fi
+
+	if [[ ${PV} = *9999* ]] || [[ "${PV%_rc*}" = "${PV}" ]]; then
+		cd "${S}"
+		cp "${FILESDIR}/dump_ffmpeg.sh" . || die
+		chmod +x dump_ffmpeg.sh
+		./dump_ffmpeg.sh || die
+	fi
+
+	if ! use truetype; then
+		unpack font-arial-iso-8859-1.tar.bz2 \
+			font-arial-iso-8859-2.tar.bz2 \
+			font-arial-cp1250.tar.bz2
+	fi
+}
+
+src_prepare() {
+	local svf=snapshot_version
+	if [[ ${PV} = *9999* ]]; then
+		# Set SVN version manually
+		subversion_wc_info
+		printf "${ESVN_WC_REVISION}" > $svf
+	fi
+	if [ ! -f VERSION ] ; then
+		[ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
+		local sv=$(<$svf)
+		printf "SVN-r${sv} (Gentoo)" > VERSION
+	fi
+
+	# fix path to bash executable in configure scripts
+	sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die
+
+	base_src_prepare
+
+	# Use sane default for >=virtual/udev-197
+	sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die
+}
+
+src_configure() {
+	local myconf=""
+	local uses i
+
+	# set LINGUAS
+	[[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/da/dk}"
+	[[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/zh/zh_CN}" #482968
+
+	# mplayer ebuild uses "use foo || --disable-foo" to forcibly disable
+	# compilation in almost every situation. The reason for this is
+	# because if --enable is used, it will force the build of that option,
+	# regardless of whether the dependency is available or not.
+
+	###################
+	#Optional features#
+	###################
+	# disable svga since we don't want it
+	# disable arts since we don't have kde3
+	# always disable internal ass
+	# disable opus and ilbc since it only controls support in internal
+	#         ffmpeg which we do not use
+	myconf+="
+		--disable-svga --disable-svgalib_helper
+		--disable-ass-internal
+		--disable-arts
+		--disable-kai
+		--disable-libopus
+		--disable-libilbc
+		$(use_enable network networking)
+		$(use_enable joystick)
+	"
+	uses="bl bluray enca ftp rtc vcd" # nemesi <- not working with in-tree ebuild
+	myconf+=" --disable-nemesi" # nemesi automagic disable
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use bidi  || myconf+=" --disable-fribidi"
+	use ipv6  || myconf+=" --disable-inet6"
+	use libass || myconf+=" --disable-ass"
+	use nut   || myconf+=" --disable-libnut"
+	use rar   || myconf+=" --disable-unrarexec"
+	use samba || myconf+=" --disable-smb"
+	use lirc  || myconf+=" --disable-lirc --disable-lircc --disable-apple-ir"
+
+	# libcdio support: prefer libcdio over cdparanoia
+	# don't check for cddb w/cdio
+	if use cdio; then
+		myconf+=" --disable-cdparanoia"
+	else
+		myconf+=" --disable-libcdio"
+		use cdparanoia || myconf+=" --disable-cdparanoia"
+		use cddb || myconf+=" --disable-cddb"
+	fi
+
+	################################
+	# DVD read, navigation support #
+	################################
+	#
+	# dvdread - accessing a DVD
+	# dvdnav - navigation of menus
+	use dvd || myconf+=" --disable-dvdread"
+	use dvdnav || myconf+=" --disable-dvdnav"
+
+	#############
+	# Subtitles #
+	#############
+	#
+	# SRT/ASS/SSA (subtitles) requires freetype support
+	# freetype support requires iconv
+	# iconv optionally can use unicode
+	use truetype || myconf+=" --disable-freetype"
+	use iconv || myconf+=" --disable-iconv --charset=noconv"
+	use iconv && use unicode && myconf+=" --charset=UTF-8"
+
+	#####################################
+	# DVB / Video4Linux / Radio support #
+	#####################################
+	myconf+=" --disable-tv-bsdbt848"
+	# broken upstream, won't work with recent kernels
+	myconf+=" --disable-ivtv"
+	# gone since linux-headers-2.6.38
+	myconf+=" --disable-tv-v4l1"
+	if { use dvb || use v4l || use pvr || use radio; }; then
+		use dvb || myconf+=" --disable-dvb"
+		use pvr || myconf+=" --disable-pvr"
+		use v4l || myconf+=" --disable-tv-v4l2"
+		if use radio && { use dvb || use v4l; }; then
+			myconf+="
+				--enable-radio
+				$(use_enable encode radio-capture)
+			"
+		else
+			myconf+="
+				--disable-radio-v4l2
+				--disable-radio-bsdbt848
+			"
+		fi
+	else
+		myconf+="
+			--disable-tv
+			--disable-tv-v4l2
+			--disable-radio
+			--disable-radio-v4l2
+			--disable-radio-bsdbt848
+			--disable-dvb
+			--disable-v4l2
+			--disable-pvr"
+	fi
+
+	##########
+	# Codecs #
+	##########
+	myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
+	myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2
+	use dts || myconf+=" --disable-libdca"
+	if ! use mp3; then
+		myconf+="
+			--disable-mp3lame
+			--disable-mpg123
+		"
+	fi
+	uses="a52 bs2b dv gsm lzo rtmp vorbis"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-lib${i}"
+	done
+
+	uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	# Pulls an outdated libopenjpeg, ffmpeg provides better support for it
+	myconf+=" --disable-libopenjpeg"
+
+	# Encoding
+	uses="faac x264 xvid toolame twolame"
+	if use encode; then
+		for i in ${uses}; do
+			use ${i} || myconf+=" --disable-${i}"
+		done
+	else
+		myconf+=" --disable-mencoder"
+		for i in ${uses}; do
+			myconf+=" --disable-${i}"
+			use ${i} && elog "Useflag \"${i}\" will only be useful for encoding, i.e., with \"encode\" useflag enabled."
+		done
+	fi
+
+	#################
+	# Binary codecs #
+	#################
+	myconf+=" --disable-qtx --disable-real --disable-win32dll"
+
+	################
+	# Video Output #
+	################
+	uses="directfb md5sum sdl yuv4mpeg"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use aalib || myconf+=" --disable-aa"
+	use fbcon || myconf+=" --disable-fbdev"
+	use fbcon && use video_cards_s3virge && myconf+=" --enable-s3fb"
+	use libcaca || myconf+=" --disable-caca"
+	use zoran || myconf+=" --disable-zr"
+
+	if ! use kernel_linux || ! use video_cards_mga; then
+		 myconf+=" --disable-mga --disable-xmga"
+	fi
+
+	if use video_cards_tdfx; then
+		myconf+="
+			$(use_enable video_cards_tdfx tdfxvid)
+			$(use_enable fbcon tdfxfb)
+		"
+	else
+		myconf+="
+			--disable-3dfx
+			--disable-tdfxvid
+			--disable-tdfxfb
+		"
+	fi
+
+	# sun card, disable by default, see bug #258729
+	myconf+=" --disable-xvr100"
+
+	################
+	# Audio Output #
+	################
+	myconf+=" --disable-esd"
+	uses="alsa jack ladspa nas openal"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use pulseaudio || myconf+=" --disable-pulse"
+	if ! use radio; then
+		use oss || myconf+=" --disable-ossaudio"
+	fi
+
+	####################
+	# Advanced Options #
+	####################
+	# Platform specific flags, hardcoded on amd64 (see below)
+	use cpudetection && myconf+=" --enable-runtime-cpudetection"
+
+	uses="3dnow 3dnowext mmx mmxext sse sse2 ssse3"
+	for i in ${uses}; do
+		myconf+=" $(use_enable cpu_flags_x86_${i} ${i})"
+	done
+
+	uses="altivec shm"
+	for i in ${uses}; do
+		myconf+=" $(use_enable ${i})"
+	done
+
+	use debug && myconf+=" --enable-debug=3"
+
+	if use x86 && gcc-specs-pie; then
+		filter-flags -fPIC -fPIE
+		append-ldflags -nopie
+	fi
+
+	###########################
+	# X enabled configuration #
+	###########################
+	myconf+=" --disable-gui"
+	myconf+=" --disable-vesa"
+	uses="ggi vdpau xinerama xv"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use dga          || myconf+=" --disable-dga1 --disable-dga2"
+	use opengl       || myconf+=" --disable-gl"
+	use osdmenu      && myconf+=" --enable-menu"
+	use vidix        || myconf+=" --disable-vidix --disable-vidix-pcidb"
+	use xscreensaver || myconf+=" --disable-xss"
+	use X            || myconf+=" --disable-x11"
+	if use xvmc; then
+		myconf+=" --enable-xvmc --with-xvmclib=XvMCW"
+	else
+		myconf+=" --disable-xvmc"
+	fi
+
+	############################
+	# OSX (aqua) configuration #
+	############################
+	if use aqua; then
+		myconf+="
+			--enable-macosx-finder
+			--enable-macosx-bundle
+		"
+	fi
+
+	./configure \
+		--cc="$(tc-getCC)" \
+		--host-cc="$(tc-getBUILD_CC)" \
+		--prefix="${EPREFIX}/usr" \
+		--bindir="${EPREFIX}/usr/bin" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--confdir="${EPREFIX}/etc/mplayer" \
+		--datadir="${EPREFIX}/usr/share/mplayer${namesuf}" \
+		--mandir="${EPREFIX}/usr/share/man" \
+		--disable-ffmpeg_a \
+		${myconf} || die
+}
+
+src_compile() {
+	base_src_compile
+	# Build only user-requested docs if they're available.
+	if use doc ; then
+		# select available languages from $LINGUAS
+		local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
+		local BUILT_DOCS=""
+		for i in ${LINGUAS} ; do
+			has ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
+		done
+		if [[ -z $BUILT_DOCS ]]; then
+			emake -j1 html-chunked
+		else
+			for i in ${BUILT_DOCS}; do
+				emake -j1 html-chunked-${i}
+			done
+		fi
+	fi
+}
+
+src_install() {
+	local i
+
+	emake \
+		DESTDIR="${D}" \
+		INSTALLSTRIP="" \
+		install
+
+	dodoc AUTHORS Changelog Copyright README etc/codecs.conf
+
+	docinto tech/
+	dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist}
+	docinto TOOLS/
+	dodoc -r TOOLS
+	docinto tech/mirrors/
+	dodoc DOCS/tech/mirrors/*
+
+	if use doc; then
+		docinto html/
+		dohtml -r "${S}"/DOCS/HTML/*
+	fi
+
+	if ! use truetype; then
+		dodir /usr/share/mplayer/fonts
+		# Do this generic, as the mplayer people like to change the structure
+		# of their zips ...
+		for i in $(find "${WORKDIR}/" -type d -name 'font-arial-*'); do
+			cp -pPR "${i}" "${ED}/usr/share/mplayer/fonts"
+		done
+		# Fix the font symlink ...
+		rm -rf "${ED}/usr/share/mplayer/font"
+		dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
+	fi
+
+	insinto /etc/mplayer
+	newins "${S}/etc/example.conf" mplayer.conf
+	cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
+# Config options can be section specific, global
+# options should go in the default section
+[default]
+_EOF_
+	doins "${S}/etc/input.conf"
+	if use osdmenu; then
+		doins "${S}/etc/menu.conf"
+	fi
+
+	if use truetype; then
+		cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
+fontconfig=1
+subfont-osd-scale=4
+subfont-text-scale=3
+_EOF_
+	fi
+
+	# bug 256203
+	if use rar; then
+		cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
+unrarexec=${EPREFIX}/usr/bin/unrar
+_EOF_
+	fi
+
+	dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf
+	newbin "${S}/TOOLS/midentify.sh" midentify
+}
+
+pkg_preinst() {
+	[[ -d ${EROOT}/usr/share/mplayer/Skin/default ]] && \
+		rm -rf "${EROOT}/usr/share/mplayer/Skin/default"
+}
+
+pkg_postrm() {
+	# Cleanup stale symlinks
+	[ -L "${EROOT}/usr/share/mplayer/font" -a \
+			! -e "${EROOT}/usr/share/mplayer/font" ] && \
+		rm -f "${EROOT}/usr/share/mplayer/font"
+
+	[ -L "${EROOT}/usr/share/mplayer/subfont.ttf" -a \
+			! -e "${EROOT}/usr/share/mplayer/subfont.ttf" ] && \
+		rm -f "${EROOT}/usr/share/mplayer/subfont.ttf"
+}
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
new file mode 100644
index 000000000000..58d7593e376e
--- /dev/null
+++ b/media-video/mpv/Manifest
@@ -0,0 +1,24 @@
+AUX 0.18.0/mpv-0.18.0-fix-doc-build.patch 831 SHA256 d8ff10b1acf5f37508c30d6fc62e122b7277f730c307dc36d9cd954219fa4b68 SHA512 6cc45a7cf6a46ab27d1d5e6385b6f63afe06e38d70711dbcb8fcc2bf84bbbda89b8da9d2385a3cbbf2f3520399a12c996246cda19d5bb06457b2fa5fda210f1e WHIRLPOOL 156f43137720b55d2ed8b3762267837698c059d8738a697e041e3dc1e47ac6bd53fdb7ca9343a92ceffb1e015337ff1e6130a9bab8327ba2e49929e29d914277
+AUX 0.18.0/mpv-0.18.0-fix-fbo-resize-memleak.patch 1210 SHA256 5e84f194abec69b14a69181df7b653c5fc2427891e9dc2aae5fd5e22830a4f3c SHA512 646cd1a2ba058d8103a912a62aea6f0c8f89ade398ea71c3a63bccfb7bf30d33e3833bf20e8d88b2fd47fd61a0839adeea0e8140d05093a67544522fd9882aaf WHIRLPOOL 5ba7c4a75d6f71a44e7d81c05841c94d182b84346103347f86ff5dda11dc39ca9c11659ddf40f09dafd756a37bd853559dd88f86749bc757d0872326f505c001
+AUX 0.18.0/mpv-0.18.0-fix-height-alignment-on-xv.patch 2936 SHA256 3191e8f392ad47ec047cd87972709dc002747cc89bb13d0b445501f460b80a5f SHA512 7bdaf3a416100b488279095067d8b4f63c11655223586724cbe0a1462b9c29866ba049f46c74e70abfe9871881ffc41d5f0348363806f2b4df259700d610bb4f WHIRLPOOL b4be50bae3ae2d2f12a6b1211482b960d91e9c06bec2da77826944e9cf22db1383fde559b63402867d5f13f655c77275aa84d77dd7eabc4461f4c66717a7c2a3
+AUX 0.18.0/mpv-0.18.0-fix-initial-av-sync.patch 1590 SHA256 6fbd1eac75511b843a384b27cf2c036c6c52c89738276d6456bad12e1c7c9151 SHA512 7c083b34c70bafb04fa19cad0562c5de7c5181239907a7671b0a8ec905d711fa7982e0de2954fc664148c1db063e85318665cb550db162961d4ef117410e39f1 WHIRLPOOL 6806933d8702eab70117ce1de2226f6472b6cd68997bc78e74637f0b3b9c8ad76b10d77b4c96b3eb23530387c835decbf36006e44d61a370c320faa6d47bd4b5
+AUX 0.27.0/mpv-0.27.0-fix-hwdec-autoprobing.patch 1456 SHA256 7fe56f7b006b5054557a9a8df83b8317208591c5e7eb41f69fc400656e399f7e SHA512 42cb00778b84157eff45d5143c3e1a232f7c98377d33aa9dbbb30122e678458168fe651b959656f00916a86069b727e814a6b8a9a7d10cd58f45dace2db32ef7 WHIRLPOOL 1fb8bd28daa4dfc8b250304cbdbb077185d9898712c180c08e2787beff69db932ff80b2ad174eafcfa90ff22f294b46094bbaa701a1c3812394ac8a87f8ffcac
+AUX 0.27.0/mpv-0.27.0-fix-wrong-colors-with-hwdec.patch 2102 SHA256 8c940821a7d58f9050fd4657ed2696c66d8bdf0319d7101a555de72b24390f16 SHA512 b2bfcb9529e2b90f786b3277a54018dedc3d8f38db5bf1f45c2df365ea297f05fc93524d225a308078b353f7be3c830e4091070a30a6ca30d767b8d207cb01bd WHIRLPOOL 6fca579cb6fae3bafd7764e8580a64c753e990c8ace081cc9c98dc5de1a08bec2c968e638041c50f8ed3c56a2dd31ea0f99662ed0ff3acf65eea6b0d5ff8570b
+AUX 0.27.0/mpv-0.27.0-remove-duplicate-android-option.patch 996 SHA256 94d13e16e87a5356b14c5ce701abd5b1d16727ea9ac83e16e284ea80ee894197 SHA512 cb2e04515da4f4d1154f489327ec282b75e71c8257477ac2f2602bb21b7c2765b2b6ebc7e5c7e1f6a57f271a804e694a9bf8dd25aa71b34fa13ab7a0ee21283e WHIRLPOOL 78ee0f3c741c015a8a10887b34064d234a26aa8249f814aa504e1f4657b90020625cc1ba35c73179242b6b6e02bb14870619ff9bbb1e3c13b741cb0521aa3f97
+AUX mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch 1456 SHA256 7c5af9ef80d6abb6b168063e037bad80c395e12c5f64726275f284714b4fde10 SHA512 f4865f5ed364012f1cba98c7522f43050c158e36f0100350e87db18636913bdad0b668c62283362366aba10f58db13297d21b111596475200283471d7da058a6 WHIRLPOOL cdd1cf4f9f83cdac07c02452a8b321a87e2b9eb70eae67d2e1b4f02f0cd645c4485dea2b67e7eeababa31835c0a383ee24349a2deceda89a0dda0bcf9e723f52
+AUX mpv-0.23.0-make-libavdevice-check-accept-libav.patch 694 SHA256 9f2e843f2291adf931e11c47d4b78c006496bfaf4ce8f7e2aeafd5e9a868ebc7 SHA512 15861e0f27598c626a5f39319b473483d5d1cec26ca2aad928f6cc751568d7c6eab9bac479665677da92c5c962a3060a8b7cc02899390702e7fed370c28d9a6e WHIRLPOOL ac42dadd05a77e96fd0662a115bb286172e9caf7e4b44f60d939ad16201746d6528521fde712a76e958e4e2e2f25add6898a68b5c3a08e485dafe405b243683d
+DIST mpv-0.18.0.tar.gz 2758960 SHA256 b656638d4f6bce2621baaacb60d8be384aa492fcd86dfd43996aaa2c16fee02b SHA512 5a899ea680b4da6d668a6e77a254e623bafef16f376ee46639e40f151da5a000de84b382f2b07f3a1e87b60fc8e524132767fdf243e36474966af11a88277437 WHIRLPOOL c491e61cb2d7f453cfc23605120048e81c2b7621b8d9591cad6415d3b550f55db6a6c8c6f90d27c7ce214ff89f92a9861d202b457c2de25c5b7de11d8d1d40af
+DIST mpv-0.25.0-patches-r2.tar.xz 11036 SHA256 34440d419e95983f50dc97c323737c19891234478566bdf613ec9db81fb0e0e7 SHA512 fc8d2a23dff27131d2c18d3f91861ec6e6d5240e6531d1a04c06ebef8d5467250c4f131d9faee802842e1ea485dbf350b43a3eebcc13c230cd45ff875fc855e2 WHIRLPOOL 9e1540e8e4b2a2a8e70861dd9eb7f32281549b9c418ea716da697e5de39118b0806998f40958e84d868e00854a4bead929ef9958de0becc120fa5f525b34ccab
+DIST mpv-0.25.0.tar.gz 2874584 SHA256 07423ffad6921ec4da32f703cd7fbfb27012301dcb736ac8542ac8e6083b0bce SHA512 eefc574e2995ddf6bd15c9b62986a5ca277c30949b036d57a11bbfb796c11c1e6dd7c313abd91a909dd98ca0f2b0be29ec6b980d0287a5891b42b0ffba926cbf WHIRLPOOL 4c5225040ed8793de5daa00a4bb5cf2754fb877c73055dbe4bed92d9fa1bb3f5e67d341c698658e9f10e183084bbe691c8bbb90960e16358b9ffdaa58b11bf2b
+DIST mpv-0.26.0.tar.gz 2916212 SHA256 daf3ef358d5f260f2269f7caabce27f446c291457ec330077152127133b71b46 SHA512 fd772b4765317eb1ea3b54f12b86e0ac6c4d5e9d16895eb5bebe2e074a01f6b790981b9b34a87d9b23e4291149d3a7154b09fba4a259cec1949a6aa88d6ddec7 WHIRLPOOL b3648d3f67565c54923fda0c1989dfa94b02b844152a558d531d936c94563ab32654cc59576c39fef8614901fe51afafd2029f9465ec1a15696a093d1bdb563f
+DIST mpv-0.27.0.tar.gz 2956816 SHA256 341d8bf18b75c1f78d5b681480b5b7f5c8b87d97a0d4f53a5648ede9c219a49c SHA512 22738f907d84d362095773972f685e3b03ab4c8172a22ddede290fc221a83ab9135b96f8b18191dabe842b2963f68983929cf065097287fc1a054a7d5f1d0ae4 WHIRLPOOL 53ea0f8f1995b9517954860f4a0c2c1acb797bbd8bf9311c2f6a5998d45869a202e45aa1c3198e2b489b3efe210f58654e690a8a9ec15b4fd88f320ad48c8cb4
+DIST waf-1.8.12 97567 SHA256 01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b SHA512 8e47112abb134f965f15a27a600b4453cad3075afb5dadc17f2f6dac33d80ec68b679ac0ebc5f8a0245cbd07ae9fc7b899e69afc1bd021cce74e7af2ab457939 WHIRLPOOL c36d37c2d8c08e4048b4800f511611af5cf534304fcb58388ca491ff308bfcbcdd959d153edfd6ff8c118404e7293d8b786e43b07486139bf915a82aa75d792b
+DIST waf-1.9.8 100685 SHA256 167dc42bab6d5bd823b798af195420319cb5c9b571e00db7d83df2a0fe1f4dbf SHA512 e7493767f65deeb38aa162adef22adf60ebbd038410e9cdf4fe6f0de8c43395dbbba14962aa2c3855e1277136085fc22ad12ebfb8ac4e76f16358296039b8ea2 WHIRLPOOL 447b6936b8bd5904d85001a96bdcfd0d517f92ff0a859f8a63efd032a418c1b335578266d0f7ce0c5f71ffc7b81643d18e21c14981502153e2d586a9ce152c3a
+EBUILD mpv-0.18.0-r1.ebuild 8452 SHA256 1113b8fed411f5dd3d3c4a0826f227550653bc6cbde5c6159c234dd377100f18 SHA512 67506868d59230a1333fb89822e7c3d6e8652bc43c53c1c41afd980d5b6f76e01a64ee39a9f0debcb57cad000aa141b8f2dd5d909157072f1abc2ca00600725e WHIRLPOOL 7a11ea0d25382abd3bdbc0be597e24cf13969bbeeac6c6fb8291106155f0bb86cbdf3b0facf5a65cf9d8320b0a775f3eedef47aa1c653539752654be7d17fff5
+EBUILD mpv-0.25.0-r2.ebuild 10839 SHA256 b490c7b8c8e5eb1da76d61de699fe7ab317c955df8b7bd5bc08a0e795d615f29 SHA512 04dcdc8d8e53bcb765ac3a0526fb5832e9f18b8b2616dd92a1ffa06dd4471343a46a3e2faaf14e85c477828a0e4bf91fdeeec13b87cdc253fb5b88a9bdf28007 WHIRLPOOL d5f980a2870295f12bad3546fd25aeb042b5abab1baf8bd7d629f90092f20f3287d949488f2f3a19dd3c1367354cbdf47748e8fbd40770970ccaa31adc92f992
+EBUILD mpv-0.26.0.ebuild 10557 SHA256 f67bf34142f9d20a0107e7e16036e31d63f6c462e53dd2438e6dad10e27239b9 SHA512 ffda8bdf4691643e6619334fe1b401c367c8ce7a0a3bc61494a27ad888c8121d045d22111bb98c72551a15d5dbf6e3b34252681a8642be8fa92785cb2b40944e WHIRLPOOL e6e04843b78433e096e7a36525892c2603441730bdf457286b15746e051062031373342dd046b02033d08527d010761a46536b0ab64615ddb99c208ecda6ed79
+EBUILD mpv-0.27.0.ebuild 10540 SHA256 07953548001ba9013172cfe5abed1ff6df06c6281076bb37462ebdcc5f743be1 SHA512 6ce840488391688bcb034f1dfd5f8f481c2e910f4c3fdfecb83700d890a3d4776687162afb9bd60bf6562af663a440f3dc48946bffa6fe60ad62c0d4d048032e WHIRLPOOL e6a084ebd10f8f752b176b93391417b199aa21a1f30db89ccc62c94fd112c2c298e1ff9f0bd7b8225ee2cd876ccd3b2188070b3a6da13efe1cadb70549d7bd38
+EBUILD mpv-9999.ebuild 10512 SHA256 81bb3152e0e3fd608bbf222eaa2f2a8f5953ae2e9a3d05da113f34136e07cf31 SHA512 0e4464a132d8823c154b41da707a34899a8a09d2cab38e89bf96523129c95f850a0076b35288f5f268e3e82139d6b6e1b7d61b4202041baa36b7023a0c7926a5 WHIRLPOOL b2644a782625d7cbdabc2d157eb42992fdf2eae7fb548de87d96a91a5eddfeb84dab63da2d0370e69a4e078e1a81b7ba6a2c2c60706f8ec494f0cba005738aed
+MISC ChangeLog 48965 SHA256 d95e15045be3d79ef0ace6d692812334e9697ba7774baab2dcdc8a97f76dde97 SHA512 78581aa03d45585f41b6dc36507cdbfd7b8988e91e27d511c18e33b3805df7b090489bfa639e34c1126ce980ae008d4ae4d2a8c3e0983c1c74ac4ff22b613e5d WHIRLPOOL d83453527ea927072f94290201f5e551bf1e9a64ad8524db4ca1fcdd8445a83b90282a04208ce12ee6058dc4f02fa03ecc0f6ad3144f5379e864468e0eb33ae4
+MISC ChangeLog-2015 22373 SHA256 fdd3f85ec978ab48e4fa303b0c208cebe282154811e048b587dd5c3f59d3090d SHA512 19b4cff14ab6ffa124f150f9846a50ea83967a8c0c60818a95203cc28b8a24d681b4b51a5fb63b64b0360373f891a01f63fb5ff57e3544b596ff7122ab9c72a8 WHIRLPOOL 698e23043b869f81ce186e06f6ba684fdf6301b49bd964b76fd82819bd27de6b8ba38d02287bc39ded1832da94cecfda9560a14250831f48340fc033dadfbb59
+MISC metadata.xml 2605 SHA256 17337869e777215804da7bacd8f1ee765f44a73738dda112a9aa93ebc9dcb578 SHA512 44088b7e21ef2adb8b69cdb9b7bb3db9874f5c4cf5668d8adca219f0ae7e3b8ae6c0d329ad8489bbf3a95ec5333455d95209d897f239a9c015c6c97acb7f8826 WHIRLPOOL 047a07da6d66e79587865e990d633d9ca6f59faa7181cafce99cd72d9b662d1656a9ee02594c6bc943cebe5a30a6fce341755bc3ea9020523b26022db6ac71de
diff --git a/media-video/mpv/files/0.18.0/mpv-0.18.0-fix-doc-build.patch b/media-video/mpv/files/0.18.0/mpv-0.18.0-fix-doc-build.patch
new file mode 100644
index 000000000000..26c8f72d4dae
--- /dev/null
+++ b/media-video/mpv/files/0.18.0/mpv-0.18.0-fix-doc-build.patch
@@ -0,0 +1,23 @@
+commit 4a4a9f330281ad11eb39a013bf7308063767bab8
+Author: Martin Herkt <lachs0r@srsfckn.biz>
+Date:   Fri Jul 15 12:57:12 2016 +0200
+
+man: fix PDF build error
+
+ReportLab really doesn’t like breaking inline literals, so insert an
+explicit line break.
+
+Fixes #3338
+
+diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
+index 9a251ae..74d17a6 100644
+--- a/DOCS/man/options.rst
++++ b/DOCS/man/options.rst
+@@ -588,6 +588,7 @@ Video
+     :videotoolbox: requires ``--vo=opengl`` (OS X 10.8 and up only)
+     :videotoolbox-copy: copies video back into system RAM (OS X 10.8 and up only)
+     :dxva2: requires ``--vo=opengl:backend=angle`` or
++
+         ``--vo=opengl:backend=dxinterop`` (Windows only)
+     :dxva2-copy: copies video back to system RAM (Windows only)
+     :d3d11va: requires ``--vo=opengl:backend=angle`` (Windows only)
diff --git a/media-video/mpv/files/0.18.0/mpv-0.18.0-fix-fbo-resize-memleak.patch b/media-video/mpv/files/0.18.0/mpv-0.18.0-fix-fbo-resize-memleak.patch
new file mode 100644
index 000000000000..9407f15283d5
--- /dev/null
+++ b/media-video/mpv/files/0.18.0/mpv-0.18.0-fix-fbo-resize-memleak.patch
@@ -0,0 +1,27 @@
+commit 3abf9c9204e2fcbc1910deb102efab4ab9d8c149
+Author: Niklas Haas <git@nand.wakku.to>
+Date:   Wed Jun 8 17:32:40 2016 +0200
+
+vo_opengl: don't constantly resize the output FBO
+
+Commit 883d3114 seems to have (accidentally?) dropped the FBOTEX_FUZZY
+from the output_fbo resize, which means that current master will keep
+resizing and resizing the FBO as you change the window size, introducing
+severe memory leaking after a while. (Not sure why that would cause
+memory leaks, but I blame nvidia)
+
+Either way, it's bad for performance too, so it's worth fixing.
+
+diff --git a/video/out/opengl/video.c b/video/out/opengl/video.c
+index bd1eb89..6c7646b 100644
+--- a/video/out/opengl/video.c
++++ b/video/out/opengl/video.c
+@@ -2791,7 +2791,7 @@ void gl_video_render_frame(struct gl_video *p, struct vo_frame *frame, int fbo)
+                 {
+                     fbotex_change(&p->output_fbo, p->gl, p->log,
+                                   p->vp_w, abs(p->vp_h),
+-                                  p->opts.fbo_format, 0);
++                                  p->opts.fbo_format, FBOTEX_FUZZY);
+                     dest_fbo = p->output_fbo.fbo;
+                     p->output_fbo_valid = true;
+                 }
diff --git a/media-video/mpv/files/0.18.0/mpv-0.18.0-fix-height-alignment-on-xv.patch b/media-video/mpv/files/0.18.0/mpv-0.18.0-fix-height-alignment-on-xv.patch
new file mode 100644
index 000000000000..5033157251fb
--- /dev/null
+++ b/media-video/mpv/files/0.18.0/mpv-0.18.0-fix-height-alignment-on-xv.patch
@@ -0,0 +1,66 @@
+commit 22c76e85db88a772e3360892cd3a673a89c6fc7a
+Author: wm4 <wm4@nowhere>
+Date:   Sat Jun 25 12:44:42 2016 +0200
+
+vo_xv: fix behavior with odd sizes
+
+The size check introduced in commit d941a57b did not consider that Xv
+can round up the image size to the next chroma boundary. Doing that
+makes sense, so it can't certainly be considered server misbehavior.
+
+Do 2 things against this: allow if the server returns a larger image (we
+just crop it then), and also allocate a properly aligned image in the
+first place.
+
+diff --git a/video/out/vo_xv.c b/video/out/vo_xv.c
+index 1e7ae7c..a5a4728 100644
+--- a/video/out/vo_xv.c
++++ b/video/out/vo_xv.c
+@@ -533,6 +533,8 @@ static bool allocate_xvimage(struct vo *vo, int foo)
+     struct vo_x11_state *x11 = vo->x11;
+     // align it for faster OSD rendering (draw_bmp.c swscale usage)
+     int aligned_w = FFALIGN(ctx->image_width, 32);
++    // round up the height to next chroma boundary too
++    int aligned_h = FFALIGN(ctx->image_height, 2);
+ #if HAVE_SHM && HAVE_XEXT
+     if (x11->display_is_local && XShmQueryExtension(x11->display)) {
+         ctx->Shmem_Flag = 1;
+@@ -546,7 +548,7 @@ static bool allocate_xvimage(struct vo *vo, int foo)
+         ctx->xvimage[foo] =
+             (XvImage *) XvShmCreateImage(x11->display, ctx->xv_port,
+                                          ctx->xv_format, NULL,
+-                                         aligned_w, ctx->image_height,
++                                         aligned_w, aligned_h,
+                                          &ctx->Shminfo[foo]);
+         if (!ctx->xvimage[foo])
+             return false;
+@@ -569,7 +571,7 @@ static bool allocate_xvimage(struct vo *vo, int foo)
+         ctx->xvimage[foo] =
+             (XvImage *) XvCreateImage(x11->display, ctx->xv_port,
+                                       ctx->xv_format, NULL, aligned_w,
+-                                      ctx->image_height);
++                                      aligned_h);
+         if (!ctx->xvimage[foo])
+             return false;
+         ctx->xvimage[foo]->data = av_malloc(ctx->xvimage[foo]->data_size);
+@@ -578,16 +580,16 @@ static bool allocate_xvimage(struct vo *vo, int foo)
+         XSync(x11->display, False);
+     }
+
+-    if ((ctx->xvimage[foo]->width != aligned_w) ||
+-        (ctx->xvimage[foo]->height != ctx->image_height)) {
+-        MP_ERR(vo, "Got XvImage with incorrect size: %ux%u (expected %ux%u)\n",
++    if ((ctx->xvimage[foo]->width < aligned_w) ||
++        (ctx->xvimage[foo]->height < aligned_h)) {
++        MP_ERR(vo, "Got XvImage with too small size: %ux%u (expected %ux%u)\n",
+                ctx->xvimage[foo]->width, ctx->xvimage[foo]->height,
+                aligned_w, ctx->image_height);
+         return false;
+     }
+
+     struct mp_image img = get_xv_buffer(vo, foo);
+-    img.w = aligned_w;
++    mp_image_set_size(&img, aligned_w, aligned_h);
+     mp_image_clear(&img, 0, 0, img.w, img.h);
+     return true;
+ }
diff --git a/media-video/mpv/files/0.18.0/mpv-0.18.0-fix-initial-av-sync.patch b/media-video/mpv/files/0.18.0/mpv-0.18.0-fix-initial-av-sync.patch
new file mode 100644
index 000000000000..c2cacc3bff7a
--- /dev/null
+++ b/media-video/mpv/files/0.18.0/mpv-0.18.0-fix-initial-av-sync.patch
@@ -0,0 +1,42 @@
+commit 614efea3e67a435f3330820c3dc8b402535641e8
+Author: wm4 <wm4@nowhere>
+Date:   Fri Jul 1 15:51:34 2016 +0200
+
+ad_lavc: work around braindead ffmpeg behavior
+
+The libavcodec wmapro decoder will skip some bytes at the start of the
+first packet and return each time. It will not return any audio data in
+this state.
+
+Our own code as well as libavcodec's new API handling
+(avcodec_send_packet() etc.) discard the PTS on the first return, which
+means the PTS is never known for the first packet. This results in a
+"Failed audio resync." message.
+
+Fixy it by remember the PTS in next_pts. This field is used only if the
+decoder outputs no PTS, and is updated after each frame - and thus
+should be safe to set.
+
+(Possibly this should be fixed in libavcodec new API handling by not
+setting the PTS to NOPTS as long as no real data has been output. It
+could even interpolate the PTS if the timebase is known.)
+
+Fixes the failure message seen in #3297.
+
+diff --git a/audio/decode/ad_lavc.c b/audio/decode/ad_lavc.c
+index f48993f..0316f6b 100644
+--- a/audio/decode/ad_lavc.c
++++ b/audio/decode/ad_lavc.c
+@@ -186,6 +186,12 @@ static int decode_packet(struct dec_audio *da, struct demux_packet *mpkt,
+     struct priv *priv = da->priv;
+     AVCodecContext *avctx = priv->avctx;
+
++    // If the decoder discards the timestamp for some reason, we use the
++    // interpolated PTS. Initialize it so that it works for the initial
++    // packet as well.
++    if (mpkt && priv->next_pts == MP_NOPTS_VALUE)
++        priv->next_pts = mpkt->pts;
++
+     int in_len = mpkt ? mpkt->len : 0;
+
+     AVPacket pkt;
diff --git a/media-video/mpv/files/0.27.0/mpv-0.27.0-fix-hwdec-autoprobing.patch b/media-video/mpv/files/0.27.0/mpv-0.27.0-fix-hwdec-autoprobing.patch
new file mode 100644
index 000000000000..e83be2250e72
--- /dev/null
+++ b/media-video/mpv/files/0.27.0/mpv-0.27.0-fix-hwdec-autoprobing.patch
@@ -0,0 +1,50 @@
+commit b881881dbd38a1720a9f8401fd1baafdd0dfccc0
+Author: wm4 <wm4@nowhere>
+Date:   Tue Sep 19 18:33:37 2017 +0200
+
+Revert "vd_lavc: change auto-probe order to prefer cuda over vdpau-copy"
+
+This reverts commit 96462040ec79b353457b64949f96fad30bd6e988.
+
+I guess the autoprobing is still too primitive to handle this well. What
+it really should be trying is initializing the wrapper decoder, and if
+that doesn't work, try another method. This is complicated by hwaccels
+initializing in a delayed way, so there is no easy solution yet.
+
+Probably fixes #4865.
+
+diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c
+index 476beeb9e..e08246a29 100644
+--- a/video/decode/vd_lavc.c
++++ b/video/decode/vd_lavc.c
+@@ -261,11 +261,16 @@ static const struct vd_lavc_hwdec *const hwdec_list[] = {
+ #endif
+ #if HAVE_VDPAU_HWACCEL
+     &mp_vd_lavc_vdpau,
++    &mp_vd_lavc_vdpau_copy,
+ #endif
+ #if HAVE_VIDEOTOOLBOX_HWACCEL
+     &mp_vd_lavc_videotoolbox,
+     &mp_vd_lavc_videotoolbox_copy,
+ #endif
++#if HAVE_VAAPI_HWACCEL
++    &mp_vd_lavc_vaapi,
++    &mp_vd_lavc_vaapi_copy,
++#endif
+ #if HAVE_D3D_HWACCEL
+     &mp_vd_lavc_d3d11va,
+
+@@ -285,13 +290,6 @@ static const struct vd_lavc_hwdec *const hwdec_list[] = {
+     &mp_vd_lavc_cuda_old,
+  #endif
+     &mp_vd_lavc_cuda_copy,
+-#endif
+-#if HAVE_VDPAU_HWACCEL
+-    &mp_vd_lavc_vdpau_copy,
+-#endif
+-#if HAVE_VAAPI_HWACCEL
+-    &mp_vd_lavc_vaapi,
+-    &mp_vd_lavc_vaapi_copy,
+ #endif
+     &mp_vd_lavc_crystalhd,
+     NULL
diff --git a/media-video/mpv/files/0.27.0/mpv-0.27.0-fix-wrong-colors-with-hwdec.patch b/media-video/mpv/files/0.27.0/mpv-0.27.0-fix-wrong-colors-with-hwdec.patch
new file mode 100644
index 000000000000..f7d3129d8559
--- /dev/null
+++ b/media-video/mpv/files/0.27.0/mpv-0.27.0-fix-wrong-colors-with-hwdec.patch
@@ -0,0 +1,44 @@
+commit 810990a7465f31ee5ff5e29ebea1fb783e5ed502
+Author: wm4 <wm4@nowhere>
+Date:   Tue Sep 19 18:59:01 2017 +0200
+
+mp_image: always copy color attributes on hw download
+
+It was noticed that -copy hwdec modes typically dropped the
+chroma_location field. This happened because the attributes on hw
+download are copied with mp_image_copy_attributes(), which tries to copy
+these parameters only if src and dst were both YUV (in an attempt to
+copy parameters only if it makes sense).
+
+But hardware formats did not have the YUV flag set (anymore?), and code
+shouldn't attempt to check the flag in this way anyway. Drop the check,
+and always copy the whole color metadata struct. There is a call to
+mp_image_params_guess_csp() below, which tries to unset nonsense
+metadata if it was copied from a YUV format to RGB. This function would
+also do the right thing for hw formats (although for the cited bug only
+the software case matters).
+
+Fixes #4804.
+
+diff --git a/video/mp_image.c b/video/mp_image.c
+index 7180e2be5..5aa564775 100644
+--- a/video/mp_image.c
++++ b/video/mp_image.c
+@@ -525,15 +525,8 @@ void mp_image_copy_attributes(struct mp_image *dst, struct mp_image *src)
+         dst->params.p_w = src->params.p_w;
+         dst->params.p_h = src->params.p_h;
+     }
+-    dst->params.color.primaries = src->params.color.primaries;
+-    dst->params.color.gamma = src->params.color.gamma;
+-    dst->params.color.sig_peak = src->params.color.sig_peak;
+-    dst->params.color.light = src->params.color.light;
+-    if ((dst->fmt.flags & MP_IMGFLAG_YUV) == (src->fmt.flags & MP_IMGFLAG_YUV)) {
+-        dst->params.color.space = src->params.color.space;
+-        dst->params.color.levels = src->params.color.levels;
+-        dst->params.chroma_location = src->params.chroma_location;
+-    }
++    dst->params.color = src->params.color;
++    dst->params.chroma_location = src->params.chroma_location;
+     dst->params.spherical = src->params.spherical;
+     mp_image_params_guess_csp(&dst->params); // ensure colorspace consistency
+     if ((dst->fmt.flags & MP_IMGFLAG_PAL) && (src->fmt.flags & MP_IMGFLAG_PAL)) {
diff --git a/media-video/mpv/files/0.27.0/mpv-0.27.0-remove-duplicate-android-option.patch b/media-video/mpv/files/0.27.0/mpv-0.27.0-remove-duplicate-android-option.patch
new file mode 100644
index 000000000000..3f2a5d1f56a3
--- /dev/null
+++ b/media-video/mpv/files/0.27.0/mpv-0.27.0-remove-duplicate-android-option.patch
@@ -0,0 +1,27 @@
+commit 8810c1fc050347e1bef0d3eb89edd30c8e840648
+Author: Ilya Tumaykin <itumaykin@gmail.com>
+Date:   Sun Sep 17 21:54:37 2017 +0300
+
+build: remove duplicate android option after 72a8120da
+
+The first one (line 140) comes from 69650851f8 and is the correct one.
+The second one (line 731) comes from 72a8120daa and slipped in with the
+revert commit.
+
+Remove the second one.
+
+diff --git a/wscript b/wscript
+index 9d885884d..9fe5b0bc8 100644
+--- a/wscript
++++ b/wscript
+@@ -727,10 +727,6 @@ video_output_features = [
+         'desc': 'Direct3D support',
+         'deps': [ 'win32-desktop' ],
+         'func': check_cc(header_name='d3d9.h'),
+-    }, {
+-        'name': '--android',
+-        'desc': 'Android support',
+-        'func': check_statement('android/api-level.h', '(void)__ANDROID__'),  # arbitrary android-specific header
+     }, {
+         # We need MMAL/bcm_host/dispmanx APIs. Also, most RPI distros require
+         # every project to hardcode the paths to the include directories. Also,
diff --git a/media-video/mpv/files/mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch b/media-video/mpv/files/mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch
new file mode 100644
index 000000000000..7c8d5b44c825
--- /dev/null
+++ b/media-video/mpv/files/mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch
@@ -0,0 +1,28 @@
+player: make ffmpeg/libav version check non-fatal
+
+We already enforce mpv rebuilds when ffmpeg/libav SONAME changes.
+
+diff --git a/player/main.c b/player/main.c
+index 67dde3449..696d2e716 100644
+--- a/player/main.c
++++ b/player/main.c
+@@ -419,13 +419,12 @@ int mp_initialize(struct MPContext *mpctx, char **options)
+     if (!print_libav_versions(mp_null_log, 0)) {
+         // Using mismatched libraries can be legitimate, but even then it's
+         // a bad idea. We don't acknowledge its usefulness and stability.
+-        print_libav_versions(mpctx->log, MSGL_FATAL);
+-        MP_FATAL(mpctx, "\nmpv was compiled against a different version of "
+-                 "FFmpeg/Libav than the shared\nlibrary it is linked against. "
+-                 "This is most likely a broken build and could\nresult in "
+-                 "misbehavior and crashes.\n\nmpv does not support this "
+-                 "configuration and will not run - rebuild mpv instead.\n");
+-        return -1;
++        print_libav_versions(mpctx->log, MSGL_WARN);
++        MP_WARN(mpctx, "\nmpv was compiled against a different version of "
++                "FFmpeg/Libav than the shared\nlibrary it is linked against. "
++                "This could result in misbehavior and crashes.\n\n"
++                "Upstream does not support this configuration.\n"
++                "Please rebuild mpv in case of any problems.\n");
+     }
+
+     if (opts->dump_stats && opts->dump_stats[0]) {
diff --git a/media-video/mpv/files/mpv-0.23.0-make-libavdevice-check-accept-libav.patch b/media-video/mpv/files/mpv-0.23.0-make-libavdevice-check-accept-libav.patch
new file mode 100644
index 000000000000..de70a4f5cf78
--- /dev/null
+++ b/media-video/mpv/files/mpv-0.23.0-make-libavdevice-check-accept-libav.patch
@@ -0,0 +1,20 @@
+build: make libavdevice configure check accept libav-12
+
+libav-12 is supported, but configure script expects
+a higher libavdevice version than libav-12 provides.
+
+Gentoo-Bug: 603122
+
+diff --git a/wscript b/wscript
+index 94db7e296..7f61f54cc 100644
+--- a/wscript
++++ b/wscript
+@@ -444,7 +444,7 @@ FFmpeg/Libav libraries. You need at least {0}. Aborting.".format(libav_versions_
+     }, {
+         'name': '--libavdevice',
+         'desc': 'libavdevice',
+-        'func': check_pkg_config('libavdevice', '>= 57.0.0'),
++        'func': check_pkg_config('libavdevice', '>= 56.1.0'),
+     }, {
+         'name': 'avcodec-chroma-pos-api',
+         'desc': 'libavcodec avcodec_enum_to_chroma_pos API',
diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml
new file mode 100644
index 000000000000..d04429058905
--- /dev/null
+++ b/media-video/mpv/metadata.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>itumaykin+gentoo@gmail.com</email>
+		<name>Coacher</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="archive">Enable support for various archive formats via <pkg>app-arch/libarchive</pkg></flag>
+		<flag name="bluray">Enable playback of Blu-ray filesystems</flag>
+		<flag name="cli">Build mpv CLI player</flag>
+		<flag name="cplugins">Enable C plugins support</flag>
+		<flag name="cuda">Enable hardware video decoding via Nvidia CUDA</flag>
+		<flag name="drm">Enable Kernel Mode Setting / Direct Rendering Manager based video output</flag>
+		<flag name="egl">Enable support for various EGL-based video outputs / backends</flag>
+		<flag name="enca">Enable subtitles charset discovery via <pkg>app-i18n/enca</pkg></flag>
+		<flag name="gbm">Enable Graphics Buffer Manager based EGL video backend</flag>
+		<flag name="jpeg">Enable support for saving screenshots in JPEG format</flag>
+		<flag name="libass">Enable OSD (On Screen Display) and subtitles support via <pkg>media-libs/libass</pkg></flag>
+		<flag name="libguess">Enable subtitles charset discovery via <pkg>app-i18n/libguess</pkg></flag>
+		<flag name="libmpv">Build mpv shared library</flag>
+		<flag name="lua">Enable Lua scripting, OSC (On Screen Controller) GUI and <pkg>net-misc/youtube-dl</pkg> hook-script</flag>
+		<flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
+		<flag name="opengl" restrict="&gt;=media-video/mpv-0.25.0">Enable the recommended 'opengl' video output</flag>
+		<flag name="raspberry-pi">Enable support for the Raspberry Pi</flag>
+		<flag name="rubberband">Enable high quality pitch correction via <pkg>media-libs/rubberband</pkg></flag>
+		<flag name="sdl">Enable <pkg>media-libs/libsdl2</pkg> based video and audio outputs
+			(Note: these outputs exist for compatibility reasons only, avoid if possible)</flag>
+		<flag name="tools">Install extra tools: mpv_identify.sh, mpv_idet.sh, and umpv</flag>
+		<flag name="uchardet">Enable subtitles charset discovery via <pkg>app-i18n/uchardet</pkg></flag>
+		<flag name="vf-dlopen">Install additional video filters to be used with -vf dlopen</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">mpv-player/mpv</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/mpv/mpv-0.18.0-r1.ebuild b/media-video/mpv/mpv-0.18.0-r1.ebuild
new file mode 100644
index 000000000000..b13860ffdf49
--- /dev/null
+++ b/media-video/mpv/mpv-0.18.0-r1.ebuild
@@ -0,0 +1,306 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE='threads(+)'
+
+WAF_PV=1.8.12
+
+inherit fdo-mime gnome2-utils pax-utils python-any-r1 toolchain-funcs waf-utils
+
+DESCRIPTION="Media player based on MPlayer and mplayer2"
+HOMEPAGE="https://mpv.io/"
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://github.com/mpv-player/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux"
+	DOCS=( RELEASE_NOTES )
+else
+	EGIT_REPO_URI="https://github.com/mpv-player/${PN}.git"
+	inherit git-r3
+fi
+SRC_URI+=" https://waf.io/waf-${WAF_PV}"
+DOCS+=( README.md )
+
+# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
+LICENSE="GPL-2+ BSD ISC"
+SLOT="0"
+IUSE="+alsa aqua archive bluray cdda +cli coreaudio doc drm dvb dvd +egl +enca
+	encode gbm +iconv jack jpeg lcms +libass libav libcaca libguess libmpv lua
+	luajit openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl
+	selinux test uchardet v4l vaapi vdpau vf-dlopen wayland +X xinerama
+	+xscreensaver +xv zsh-completion"
+
+REQUIRED_USE="
+	|| ( cli libmpv )
+	aqua? ( opengl )
+	egl? ( || ( gbm X wayland ) )
+	enca? ( iconv )
+	gbm? ( drm egl )
+	lcms? ( || ( opengl egl ) )
+	libguess? ( iconv )
+	luajit? ( lua )
+	test? ( || ( opengl egl ) )
+	uchardet? ( iconv )
+	v4l? ( || ( alsa oss ) )
+	vaapi? ( || ( gbm X wayland ) )
+	vdpau? ( X )
+	wayland? ( egl )
+	xinerama? ( X )
+	xscreensaver? ( X )
+	xv? ( X )
+	zsh-completion? ( cli )
+"
+
+COMMON_DEPEND="
+	!libav? ( >=media-video/ffmpeg-2.4:0=[encode?,threads,vaapi?,vdpau?] )
+	libav? ( >=media-video/libav-11:0=[encode?,threads,vaapi?,vdpau?] )
+	sys-libs/zlib
+	alsa? ( >=media-libs/alsa-lib-1.0.18 )
+	archive? ( >=app-arch/libarchive-3.0.0:= )
+	bluray? ( >=media-libs/libbluray-0.3.0 )
+	cdda? ( dev-libs/libcdio-paranoia )
+	drm? ( x11-libs/libdrm )
+	dvb? ( virtual/linuxtv-dvb-headers )
+	dvd? (
+		>=media-libs/libdvdnav-4.2.0
+		>=media-libs/libdvdread-4.1.0
+	)
+	egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] )
+	iconv? (
+		virtual/libiconv
+		enca? ( app-i18n/enca )
+		libguess? ( >=app-i18n/libguess-1.0 )
+		uchardet? ( app-i18n/uchardet )
+	)
+	jack? ( virtual/jack )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( >=media-libs/lcms-2.6:2 )
+	libass? (
+		>=media-libs/libass-0.12.1:=[fontconfig,harfbuzz]
+		virtual/ttf-fonts
+	)
+	libcaca? ( >=media-libs/libcaca-0.99_beta18 )
+	lua? (
+		!luajit? ( <dev-lang/lua-5.3:= )
+		luajit? ( dev-lang/luajit:2 )
+	)
+	openal? ( >=media-libs/openal-1.13 )
+	opengl? ( !aqua? ( virtual/opengl ) )
+	pulseaudio? ( media-sound/pulseaudio )
+	raspberry-pi? (
+		>=media-libs/raspberrypi-userland-0_pre20160305-r1
+		media-libs/mesa[egl,gles2]
+	)
+	rubberband? ( >=media-libs/rubberband-1.8.0 )
+	samba? ( net-fs/samba[smbclient(+)] )
+	sdl? ( media-libs/libsdl2[sound,threads,video,X?,wayland?] )
+	v4l? ( media-libs/libv4l )
+	vaapi? ( >=x11-libs/libva-1.4.0[drm?,X?,wayland?] )
+	wayland? (
+		>=dev-libs/wayland-1.6.0
+		>=x11-libs/libxkbcommon-0.3.0
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		>=x11-libs/libXrandr-1.2.0
+		opengl? ( x11-libs/libXdamage )
+		vdpau? ( >=x11-libs/libvdpau-0.2 )
+		xinerama? ( x11-libs/libXinerama )
+		xscreensaver? ( x11-libs/libXScrnSaver )
+		xv? ( x11-libs/libXv )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	>=dev-lang/perl-5.8
+	dev-python/docutils
+	virtual/pkgconfig
+	doc? ( dev-python/rst2pdf )
+	test? ( >=dev-util/cmocka-1.0.0 )
+	v4l? ( virtual/os-headers )
+"
+RDEPEND="${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-mplayer )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PV}/${P}-fix-height-alignment-on-xv.patch"
+	"${FILESDIR}/${PV}/${P}-fix-initial-av-sync.patch"
+	"${FILESDIR}/${PV}/${P}-fix-fbo-resize-memleak.patch"
+	"${FILESDIR}/${PV}/${P}-fix-doc-build.patch"
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && ! tc-has-tls && use vaapi && use egl; then
+		die "Your compiler lacks C++11 TLS support. Use GCC>=4.8.0 or Clang>=3.3."
+	fi
+}
+
+src_prepare() {
+	cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
+	chmod +x "${S}"/waf || die
+	default_src_prepare
+}
+
+src_configure() {
+	local mywafargs=(
+		--confdir="${EPREFIX}/etc/${PN}"
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+
+		$(usex cli '' '--disable-cplayer')
+		$(use_enable libmpv libmpv-shared)
+
+		# See deep down below for build-date.
+		--disable-libmpv-static
+		--disable-static-build
+		--disable-optimize		# Don't add '-O2' to CFLAGS.
+		--disable-debug-build	# Don't add '-g' to CFLAGS.
+
+		$(use_enable doc html-build)
+		$(use_enable doc pdf-build)
+		$(use_enable vf-dlopen vf-dlopen-filters)
+		$(use_enable zsh-completion zsh-comp)
+		$(use_enable test)
+
+		$(use_enable iconv)
+		$(use_enable samba libsmbclient)
+		$(use_enable lua)
+		$(usex luajit '--lua=luajit' '')
+		$(use_enable libass)
+		$(use_enable libass libass-osd)
+		$(use_enable encode encoding)
+		$(use_enable bluray libbluray)
+		$(use_enable dvd dvdread)
+		$(use_enable dvd dvdnav)
+		$(use_enable cdda)
+		$(use_enable enca)
+		$(use_enable libguess)
+		$(use_enable uchardet)
+		$(use_enable rubberband)
+		$(use_enable lcms lcms2)
+		--disable-vapoursynth	# Only available in overlays.
+		--disable-vapoursynth-lazy
+		$(use_enable archive libarchive)
+
+		--enable-libavdevice
+
+		# Audio outputs:
+		$(use_enable sdl sdl2)	# Listed under audio, but also includes video.
+		--disable-sdl1
+		$(use_enable oss oss-audio)
+		--disable-rsound		# Only available in overlays.
+		$(use_enable pulseaudio pulse)
+		$(use_enable jack)
+		$(use_enable openal)
+		--disable-opensles
+		$(use_enable alsa)
+		$(use_enable coreaudio)
+
+		# Video outputs:
+		$(use_enable aqua cocoa)
+		$(use_enable drm)
+		$(use_enable gbm)
+		$(use_enable wayland)
+		$(use_enable X x11)
+		$(use_enable xscreensaver xss)
+		$(use_enable X xext)
+		$(use_enable xv)
+		$(use_enable xinerama)
+		$(use_enable X xrandr)
+		$(usex opengl "$(use_enable aqua gl-cocoa)" '--disable-gl-cocoa')
+		$(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11')
+		$(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
+		$(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm')
+		$(use_enable wayland gl-wayland)
+		$(use_enable vdpau)
+		$(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
+		$(use_enable vaapi)		# See below for vaapi-glx, vaapi-x-egl.
+		$(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
+		$(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
+		$(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm')
+		$(use_enable libcaca caca)
+		$(use_enable jpeg)
+		--disable-android
+		$(use_enable raspberry-pi rpi)
+		$(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl')
+
+		# HWaccels:
+		# Automagic Video Toolbox HW acceleration. See Gentoo bug 577332.
+		$(use_enable vaapi vaapi-hwaccel)
+		# Automagic VDPAU HW acceleration. See Gentoo bug 558870.
+
+		# TV features:
+		$(use_enable v4l tv)
+		$(use_enable v4l tv-v4l2)
+		$(use_enable v4l libv4l2)
+		$(use_enable v4l audio-input)
+		$(use_enable dvb dvbin)
+
+		# Miscellaneous features:
+		--disable-apple-remote	# Needs testing first. See Gentoo bug 577332.
+	)
+
+	if use vaapi && use X; then
+		mywafargs+=(
+			$(use_enable opengl vaapi-glx)
+			$(use_enable egl vaapi-x-egl)
+		)
+	fi
+
+	if ! use egl && ! use opengl && ! use raspberry-pi; then
+		mywafargs+=(--disable-gl)
+	fi
+
+	# Create reproducible non-live builds.
+	[[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date)
+
+	waf-utils_src_configure "${mywafargs[@]}"
+}
+
+src_install() {
+	waf-utils_src_install
+
+	if use cli && use luajit; then
+		pax-mark -m "${ED}"usr/bin/${PN}
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+
+	# bash-completion < 2.3-r1 already installs (mostly broken) mpv completion.
+	if use cli && ! has_version '<app-shells/bash-completion-2.3-r1' && \
+		! has_version 'app-shells/mpv-bash-completion'; then
+		elog "If you want to have command-line completion via bash-completion,"
+		elog "please install app-shells/mpv-bash-completion."
+	fi
+
+	if use cli && [[ -n ${REPLACING_VERSIONS} ]] && \
+		has_version 'app-shells/mpv-bash-completion'; then
+		elog "If command-line completion doesn't work after mpv update,"
+		elog "please rebuild app-shells/mpv-bash-completion."
+	fi
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+src_test() {
+	cd "${S}"/build/test || die
+	for test in *; do
+		if [[ -x ${test} ]]; then
+			./"${test}" || die "Test suite failed"
+		fi
+	done
+}
diff --git a/media-video/mpv/mpv-0.25.0-r2.ebuild b/media-video/mpv/mpv-0.25.0-r2.ebuild
new file mode 100644
index 000000000000..0eccb745b95d
--- /dev/null
+++ b/media-video/mpv/mpv-0.25.0-r2.ebuild
@@ -0,0 +1,382 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE='threads(+)'
+
+WAF_PV=1.9.8
+
+inherit gnome2-utils pax-utils python-r1 toolchain-funcs versionator waf-utils xdg-utils
+
+DESCRIPTION="Media player based on MPlayer and mplayer2"
+HOMEPAGE="https://mpv.io/"
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="
+		https://github.com/mpv-player/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~kensington/distfiles/${P}-patches-${PR}.tar.xz
+	"
+	KEYWORDS="alpha amd64 ~arm ~hppa ppc ppc64 ~x86 ~amd64-linux"
+	DOCS=( RELEASE_NOTES )
+else
+	EGIT_REPO_URI="https://github.com/mpv-player/${PN}.git"
+	inherit git-r3
+fi
+SRC_URI+=" https://waf.io/waf-${WAF_PV}"
+DOCS+=( README.md DOCS/{client-api,interface}-changes.rst )
+
+# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
+LICENSE="LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )"
+SLOT="0"
+IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb
+	dvd +egl encode gbm +iconv jack jpeg lcms +libass libav libcaca libmpv +lua
+	luajit openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl
+	selinux test tools +uchardet v4l vaapi vdpau vf-dlopen wayland +X +xv
+	zsh-completion"
+IUSE+=" cpu_flags_x86_sse4_1"
+
+REQUIRED_USE="
+	|| ( cli libmpv )
+	aqua? ( opengl )
+	cuda? ( !libav opengl )
+	egl? ( || ( gbm X wayland ) )
+	gbm? ( drm egl opengl )
+	lcms? ( opengl )
+	luajit? ( lua )
+	opengl? ( || ( aqua egl X raspberry-pi !cli ) )
+	raspberry-pi? ( opengl )
+	test? ( opengl )
+	tools? ( cli )
+	uchardet? ( iconv )
+	v4l? ( || ( alsa oss ) )
+	vaapi? ( || ( gbm X wayland ) )
+	vdpau? ( X )
+	wayland? ( egl )
+	X? ( egl? ( opengl ) )
+	xv? ( X )
+	zsh-completion? ( cli )
+	${PYTHON_REQUIRED_USE}
+"
+
+COMMON_DEPEND="
+	!libav? ( >=media-video/ffmpeg-3.2.2:0=[encode?,threads,vaapi?,vdpau?] )
+	libav? ( >=media-video/libav-12:0=[encode?,threads,vaapi?,vdpau?] )
+	sys-libs/zlib
+	alsa? ( >=media-libs/alsa-lib-1.0.18 )
+	archive? ( >=app-arch/libarchive-3.0.0:= )
+	bluray? ( >=media-libs/libbluray-0.3.0:= )
+	cdda? ( dev-libs/libcdio-paranoia )
+	cuda? ( >=media-video/ffmpeg-3.3:0 )
+	drm? ( x11-libs/libdrm )
+	dvd? (
+		>=media-libs/libdvdnav-4.2.0
+		>=media-libs/libdvdread-4.1.0
+	)
+	egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] )
+	iconv? (
+		virtual/libiconv
+		uchardet? ( app-i18n/uchardet )
+	)
+	jack? ( virtual/jack )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( >=media-libs/lcms-2.6:2 )
+	libass? (
+		>=media-libs/libass-0.12.1:=[fontconfig,harfbuzz]
+		virtual/ttf-fonts
+	)
+	libcaca? ( >=media-libs/libcaca-0.99_beta18 )
+	lua? (
+		!luajit? ( <dev-lang/lua-5.3:= )
+		luajit? ( dev-lang/luajit:2 )
+	)
+	openal? ( >=media-libs/openal-1.13 )
+	pulseaudio? ( media-sound/pulseaudio )
+	raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 )
+	rubberband? ( >=media-libs/rubberband-1.8.0 )
+	samba? ( net-fs/samba[smbclient(+)] )
+	sdl? ( media-libs/libsdl2[sound,threads,video] )
+	v4l? ( media-libs/libv4l )
+	vaapi? ( >=x11-libs/libva-1.4.0[drm?,X?,wayland?] )
+	vdpau? ( >=x11-libs/libvdpau-0.2 )
+	wayland? (
+		>=dev-libs/wayland-1.6.0
+		>=x11-libs/libxkbcommon-0.3.0
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libXScrnSaver
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		opengl? (
+			x11-libs/libXdamage
+			virtual/opengl
+		)
+		xv? ( x11-libs/libXv )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	dev-python/docutils
+	virtual/pkgconfig
+	doc? ( dev-python/rst2pdf )
+	dvb? ( virtual/linuxtv-dvb-headers )
+	test? ( >=dev-util/cmocka-1.0.0 )
+	v4l? ( virtual/os-headers )
+	zsh-completion? ( dev-lang/perl )
+"
+RDEPEND="${COMMON_DEPEND}
+	cuda? ( x11-drivers/nvidia-drivers[X] )
+	selinux? ( sec-policy/selinux-mplayer )
+	tools? ( ${PYTHON_DEPS} )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch"
+	"${FILESDIR}/${PN}-0.23.0-make-libavdevice-check-accept-libav.patch"
+)
+
+mpv_check_compiler() {
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		if ! tc-is-gcc && use vaapi && use cpu_flags_x86_sse4_1 && \
+				{ has_version '<media-video/ffmpeg-3.3:0' || has_version '<media-video/libav-13:0'; }; then
+			die "${PN} requires GCC for SSE4.1 intrinsics."
+		fi
+	fi
+}
+
+pkg_pretend() {
+	mpv_check_compiler
+}
+
+pkg_setup() {
+	mpv_check_compiler
+	[[ ${MERGE_TYPE} != "binary" ]] && python_setup
+}
+
+src_prepare() {
+	cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
+	chmod +x "${S}"/waf || die
+	default_src_prepare
+	eapply "${WORKDIR}/${PV}"
+}
+
+src_configure() {
+	tc-export CC PKG_CONFIG AR
+
+	if tc-is-cross-compiler && use raspberry-pi; then
+		export EXTRA_PKG_CONFIG_LIBDIR="${SYSROOT%/}${EPREFIX}/opt/vc/lib/pkgconfig"
+		# Drop next line when Gentoo bug 607344 is fixed or if you fixed it locally.
+		die "${PN} can't be cross built with raspberry-pi USE enabled. See Gentoo bug 607344."
+	fi
+
+	local mywafargs=(
+		--confdir="${EPREFIX}/etc/${PN}"
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+
+		$(usex cli '' '--disable-cplayer')
+		$(use_enable libmpv libmpv-shared)
+
+		--disable-libmpv-static
+		--disable-static-build
+		# See deep down below for build-date.
+		--disable-optimize		# Don't add '-O2' to CFLAGS.
+		--disable-debug-build	# Don't add '-g' to CFLAGS.
+		--enable-html-build
+
+		$(use_enable doc pdf-build)
+		$(use_enable cplugins)
+		$(use_enable vf-dlopen vf-dlopen-filters)
+		$(use_enable zsh-completion zsh-comp)
+		$(use_enable test)
+
+		$(use_enable iconv)
+		$(use_enable samba libsmbclient)
+		$(use_enable lua)
+		$(usex luajit '--lua=luajit' '')
+		$(use_enable libass)
+		$(use_enable libass libass-osd)
+		$(use_enable encode encoding)
+		$(use_enable bluray libbluray)
+		$(use_enable dvd dvdread)
+		$(use_enable dvd dvdnav)
+		$(use_enable cdda)
+		$(use_enable uchardet)
+		$(use_enable rubberband)
+		$(use_enable lcms lcms2)
+		--disable-vapoursynth	# Only available in overlays.
+		--disable-vapoursynth-lazy
+		$(use_enable archive libarchive)
+
+		--enable-libavdevice
+
+		# Audio outputs:
+		$(use_enable sdl sdl2)	# Listed under audio, but also includes video.
+		--disable-sdl1
+		$(use_enable oss oss-audio)
+		--disable-rsound		# Only available in overlays.
+		--disable-sndio			# Only available in overlays.
+		$(use_enable pulseaudio pulse)
+		$(use_enable jack)
+		$(use_enable openal)
+		--disable-opensles
+		$(use_enable alsa)
+		$(use_enable coreaudio)
+
+		# Video outputs:
+		$(use_enable aqua cocoa)
+		$(use_enable drm)
+		$(use_enable gbm)
+		$(use_enable wayland)
+		$(use_enable X x11)
+		$(use_enable xv)
+		$(usex opengl "$(use_enable aqua gl-cocoa)" '--disable-gl-cocoa')
+		$(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11')
+		$(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
+		$(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm')
+		$(usex opengl "$(use_enable wayland gl-wayland)" '--disable-gl-wayland')
+		$(use_enable vdpau)
+		$(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
+		$(use_enable vaapi)		# See below for vaapi-glx, vaapi-x-egl.
+		$(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
+		$(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
+		$(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm')
+		$(use_enable libcaca caca)
+		$(use_enable jpeg)
+		--disable-android
+		$(use_enable raspberry-pi rpi)
+		$(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl')
+		--disable-mali-fbdev	# Only available in overlays.
+		$(usex opengl '' '--disable-gl')
+
+		# HWaccels:
+		# Automagic Video Toolbox HW acceleration. See Gentoo bug 577332.
+		$(use_enable vaapi vaapi-hwaccel)
+		$(use_enable vdpau vdpau-hwaccel)
+		$(use_enable cuda cuda-hwaccel)
+
+		# TV features:
+		$(use_enable v4l tv)
+		$(use_enable v4l tv-v4l2)
+		$(use_enable v4l libv4l2)
+		$(use_enable v4l audio-input)
+		$(use_enable dvb dvbin)
+
+		# Miscellaneous features:
+		--disable-apple-remote	# Needs testing first. See Gentoo bug 577332.
+	)
+
+	if use vaapi && use X; then
+		mywafargs+=(
+			$(use_enable opengl vaapi-glx)
+			$(use_enable egl vaapi-x-egl)
+		)
+	fi
+
+	# Create reproducible non-live builds.
+	[[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date)
+
+	waf-utils_src_configure "${mywafargs[@]}"
+}
+
+src_install() {
+	waf-utils_src_install
+
+	if use lua; then
+		insinto /usr/share/${PN}
+		doins -r TOOLS/lua
+	fi
+
+	if use cli && use luajit; then
+		pax-mark -m "${ED}"usr/bin/${PN}
+	fi
+
+	if use tools; then
+		dobin TOOLS/{mpv_identify.sh,umpv}
+		newbin TOOLS/idet.sh mpv_idet.sh
+		python_replicate_script "${ED}"usr/bin/umpv
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	local rv softvol_0_18_1=0 osc_0_21_0=0 txtsubs_0_24_0=0 opengl_0_25_0=0
+
+	for rv in ${REPLACING_VERSIONS}; do
+		version_compare ${rv} 0.18.1
+		[[ $? -eq 1 ]] && softvol_0_18_1=1
+		version_compare ${rv} 0.21.0
+		[[ $? -eq 1 ]] && osc_0_21_0=1
+		version_compare ${rv} 0.24.0
+		[[ $? -eq 1 ]] && txtsubs_0_24_0=1
+		version_compare ${rv} 0.25.0
+		[[ $? -eq 1 ]] && ! use opengl && opengl_0_25_0=1
+	done
+
+	if [[ ${softvol_0_18_1} -eq 1 ]]; then
+		elog "Since version 0.18.1 the software volume control is always enabled."
+		elog "This means that volume controls don't change the system volume,"
+		elog "e.g. per-application volume with PulseAudio."
+		elog "If you want to restore the previous behaviour, please refer to"
+		elog
+		elog "https://wiki.gentoo.org/wiki/Mpv#Volume_in_0.18.1"
+		elog
+	fi
+
+	if [[ ${osc_0_21_0} -eq 1 ]]; then
+		elog "In version 0.21.0 the default OSC layout was changed."
+		elog "If you want to restore the previous layout, please refer to"
+		elog
+		elog "https://wiki.gentoo.org/wiki/Mpv#OSC_in_0.21.0"
+		elog
+	fi
+
+	if [[ ${txtsubs_0_24_0} -eq 1 ]]; then
+		elog "Since version 0.24.0 subtitles with .txt extension aren't autoloaded."
+		elog "If you want to restore the previous behaviour, please refer to"
+		elog
+		elog "https://wiki.gentoo.org/wiki/Mpv#Subtitles_with_.txt_extension_in_0.24.0"
+		elog
+	fi
+
+	if [[ ${opengl_0_25_0} -eq 1 ]]; then
+		elog "Since version 0.25.0 the 'opengl' USE flag is mapped to"
+		elog "the 'opengl' video output and no longer explicitly requires"
+		elog "X11 or Mac OS Aqua. Consider enabling the 'opengl' USE flag."
+	fi
+
+	if use cli && ! has_version 'app-shells/mpv-bash-completion'; then
+		elog "If you want to have command-line completion via bash-completion,"
+		elog "please install app-shells/mpv-bash-completion."
+	fi
+
+	if use cli && [[ -n ${REPLACING_VERSIONS} ]] && \
+		has_version 'app-shells/mpv-bash-completion'; then
+		elog "If command-line completion doesn't work after mpv update,"
+		elog "please rebuild app-shells/mpv-bash-completion."
+	fi
+
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+src_test() {
+	cd "${S}"/build/test || die
+	local test
+	for test in *; do
+		if [[ -x ${test} ]]; then
+			./"${test}" || die "Test suite failed"
+		fi
+	done
+}
diff --git a/media-video/mpv/mpv-0.26.0.ebuild b/media-video/mpv/mpv-0.26.0.ebuild
new file mode 100644
index 000000000000..164672738f85
--- /dev/null
+++ b/media-video/mpv/mpv-0.26.0.ebuild
@@ -0,0 +1,373 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE='threads(+)'
+
+WAF_PV=1.9.8
+
+inherit gnome2-utils pax-utils python-r1 toolchain-funcs versionator waf-utils xdg-utils
+
+DESCRIPTION="Media player based on MPlayer and mplayer2"
+HOMEPAGE="https://mpv.io/"
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://github.com/mpv-player/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+	DOCS=( RELEASE_NOTES )
+else
+	EGIT_REPO_URI="https://github.com/mpv-player/${PN}.git"
+	inherit git-r3
+fi
+SRC_URI+=" https://waf.io/waf-${WAF_PV}"
+DOCS+=( README.md DOCS/{client-api,interface}-changes.rst )
+
+# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
+LICENSE="LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )"
+SLOT="0"
+IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb
+	dvd +egl encode gbm +iconv jack javascript jpeg lcms +libass libav libcaca
+	libmpv +lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband
+	samba sdl selinux test tools +uchardet v4l vaapi vdpau wayland +X +xv zlib
+	zsh-completion"
+
+REQUIRED_USE="
+	|| ( cli libmpv )
+	aqua? ( opengl )
+	cuda? ( !libav opengl )
+	egl? ( || ( gbm X wayland ) )
+	gbm? ( drm egl opengl )
+	lcms? ( opengl )
+	luajit? ( lua )
+	opengl? ( || ( aqua egl X raspberry-pi !cli ) )
+	raspberry-pi? ( opengl )
+	test? ( opengl )
+	tools? ( cli )
+	uchardet? ( iconv )
+	v4l? ( || ( alsa oss ) )
+	vaapi? ( || ( gbm X wayland ) )
+	vdpau? ( X )
+	wayland? ( egl )
+	X? ( egl? ( opengl ) )
+	xv? ( X )
+	zsh-completion? ( cli )
+	${PYTHON_REQUIRED_USE}
+"
+
+COMMON_DEPEND="
+	!libav? ( >=media-video/ffmpeg-3.2.2:0=[encode?,threads,vaapi?,vdpau?] )
+	libav? ( >=media-video/libav-12:0=[encode?,threads,vaapi?,vdpau?] )
+	alsa? ( >=media-libs/alsa-lib-1.0.18 )
+	archive? ( >=app-arch/libarchive-3.0.0:= )
+	bluray? ( >=media-libs/libbluray-0.3.0:= )
+	cdda? ( dev-libs/libcdio-paranoia )
+	cuda? ( >=media-video/ffmpeg-3.3:0 )
+	drm? ( x11-libs/libdrm )
+	dvd? (
+		>=media-libs/libdvdnav-4.2.0
+		>=media-libs/libdvdread-4.1.0
+	)
+	egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] )
+	iconv? (
+		virtual/libiconv
+		uchardet? ( app-i18n/uchardet )
+	)
+	jack? ( virtual/jack )
+	javascript? ( >=dev-lang/mujs-1.0.0 )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( >=media-libs/lcms-2.6:2 )
+	libass? (
+		>=media-libs/libass-0.12.1:=[fontconfig,harfbuzz]
+		virtual/ttf-fonts
+	)
+	libcaca? ( >=media-libs/libcaca-0.99_beta18 )
+	lua? (
+		!luajit? ( <dev-lang/lua-5.3:= )
+		luajit? ( dev-lang/luajit:2 )
+	)
+	openal? ( >=media-libs/openal-1.13 )
+	pulseaudio? ( media-sound/pulseaudio )
+	raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 )
+	rubberband? ( >=media-libs/rubberband-1.8.0 )
+	samba? ( net-fs/samba )
+	sdl? ( media-libs/libsdl2[sound,threads,video] )
+	v4l? ( media-libs/libv4l )
+	vaapi? (
+		!libav? ( >=media-video/ffmpeg-3.3:0 )
+		libav? ( >=media-video/libav-13:0 )
+		x11-libs/libva[drm?,X?,wayland?]
+	)
+	vdpau? (
+		!libav? ( >=media-video/ffmpeg-3.3:0 )
+		libav? ( >=media-video/libav-13:0 )
+		x11-libs/libvdpau
+	)
+	wayland? (
+		>=dev-libs/wayland-1.6.0
+		>=x11-libs/libxkbcommon-0.3.0
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libXScrnSaver
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		opengl? (
+			x11-libs/libXdamage
+			virtual/opengl
+		)
+		xv? ( x11-libs/libXv )
+	)
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	dev-python/docutils
+	virtual/pkgconfig
+	doc? ( dev-python/rst2pdf )
+	dvb? ( virtual/linuxtv-dvb-headers )
+	test? ( >=dev-util/cmocka-1.0.0 )
+	v4l? ( virtual/os-headers )
+	zsh-completion? ( dev-lang/perl )
+"
+RDEPEND="${COMMON_DEPEND}
+	cuda? ( x11-drivers/nvidia-drivers[X] )
+	selinux? ( sec-policy/selinux-mplayer )
+	tools? ( ${PYTHON_DEPS} )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch"
+	"${FILESDIR}/${PN}-0.23.0-make-libavdevice-check-accept-libav.patch"
+)
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != "binary" ]] && python_setup
+}
+
+src_prepare() {
+	cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
+	chmod +x "${S}"/waf || die
+	default_src_prepare
+}
+
+src_configure() {
+	tc-export CC PKG_CONFIG AR
+
+	if tc-is-cross-compiler && use raspberry-pi; then
+		export EXTRA_PKG_CONFIG_LIBDIR="${SYSROOT%/}${EPREFIX}/opt/vc/lib/pkgconfig"
+		# Drop next line when Gentoo bug 607344 is fixed or if you fixed it locally.
+		die "${PN} can't be cross built with raspberry-pi USE enabled. See Gentoo bug 607344."
+	fi
+
+	local mywafargs=(
+		--confdir="${EPREFIX}/etc/${PN}"
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+
+		$(usex cli '' '--disable-cplayer')
+		$(use_enable libmpv libmpv-shared)
+
+		--disable-libmpv-static
+		--disable-static-build
+		# See deep down below for build-date.
+		--disable-optimize		# Don't add '-O2' to CFLAGS.
+		--disable-debug-build	# Don't add '-g' to CFLAGS.
+		--enable-html-build
+
+		$(use_enable doc pdf-build)
+		$(use_enable cplugins)
+		$(use_enable zsh-completion zsh-comp)
+		$(use_enable test)
+
+		$(use_enable iconv)
+		$(use_enable samba libsmbclient)
+		$(use_enable lua)
+		$(usex luajit '--lua=luajit' '')
+		$(use_enable javascript)
+		$(use_enable libass)
+		$(use_enable libass libass-osd)
+		$(use_enable zlib)
+		$(use_enable encode encoding)
+		$(use_enable bluray libbluray)
+		$(use_enable dvd dvdread)
+		$(use_enable dvd dvdnav)
+		$(use_enable cdda)
+		$(use_enable uchardet)
+		$(use_enable rubberband)
+		$(use_enable lcms lcms2)
+		--disable-vapoursynth	# Only available in overlays.
+		--disable-vapoursynth-lazy
+		$(use_enable archive libarchive)
+
+		--enable-libavdevice
+
+		# Audio outputs:
+		$(use_enable sdl sdl2)	# Listed under audio, but also includes video.
+		--disable-sdl1
+		$(use_enable oss oss-audio)
+		--disable-rsound		# Only available in overlays.
+		--disable-sndio			# Only available in overlays.
+		$(use_enable pulseaudio pulse)
+		$(use_enable jack)
+		$(use_enable openal)
+		--disable-opensles
+		$(use_enable alsa)
+		$(use_enable coreaudio)
+
+		# Video outputs:
+		$(use_enable aqua cocoa)
+		$(use_enable drm)
+		$(use_enable gbm)
+		$(use_enable wayland)
+		$(use_enable X x11)
+		$(use_enable xv)
+		$(usex opengl "$(use_enable aqua gl-cocoa)" '--disable-gl-cocoa')
+		$(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11')
+		$(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
+		$(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm')
+		$(usex opengl "$(use_enable wayland gl-wayland)" '--disable-gl-wayland')
+		$(use_enable vdpau)
+		$(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
+		$(use_enable vaapi)		# See below for vaapi-glx, vaapi-x-egl.
+		$(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
+		$(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
+		$(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm')
+		$(use_enable libcaca caca)
+		$(use_enable jpeg)
+		--disable-android
+		$(use_enable raspberry-pi rpi)
+		$(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl')
+		--disable-mali-fbdev	# Only available in overlays.
+		$(usex opengl '' '--disable-gl')
+
+		# HWaccels:
+		# Automagic Video Toolbox HW acceleration. See Gentoo bug 577332.
+		$(use_enable vaapi vaapi-hwaccel)
+		$(use_enable vdpau vdpau-hwaccel)
+		$(use_enable cuda cuda-hwaccel)
+
+		# TV features:
+		$(use_enable v4l tv)
+		$(use_enable v4l tv-v4l2)
+		$(use_enable v4l libv4l2)
+		$(use_enable v4l audio-input)
+		$(use_enable dvb dvbin)
+
+		# Miscellaneous features:
+		--disable-apple-remote	# Needs testing first. See Gentoo bug 577332.
+	)
+
+	if use vaapi && use X; then
+		mywafargs+=(
+			$(use_enable opengl vaapi-glx)
+			$(use_enable egl vaapi-x-egl)
+		)
+	fi
+
+	# Create reproducible non-live builds.
+	[[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date)
+
+	waf-utils_src_configure "${mywafargs[@]}"
+}
+
+src_install() {
+	waf-utils_src_install
+
+	if use lua; then
+		insinto /usr/share/${PN}
+		doins -r TOOLS/lua
+	fi
+
+	if use cli && use luajit; then
+		pax-mark -m "${ED}"usr/bin/${PN}
+	fi
+
+	if use tools; then
+		dobin TOOLS/{mpv_identify.sh,umpv}
+		newbin TOOLS/idet.sh mpv_idet.sh
+		python_replicate_script "${ED}"usr/bin/umpv
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	local rv softvol_0_18_1=0 osc_0_21_0=0 txtsubs_0_24_0=0 opengl_0_25_0=0
+
+	for rv in ${REPLACING_VERSIONS}; do
+		version_compare ${rv} 0.18.1
+		[[ $? -eq 1 ]] && softvol_0_18_1=1
+		version_compare ${rv} 0.21.0
+		[[ $? -eq 1 ]] && osc_0_21_0=1
+		version_compare ${rv} 0.24.0
+		[[ $? -eq 1 ]] && txtsubs_0_24_0=1
+		version_compare ${rv} 0.25.0
+		[[ $? -eq 1 ]] && ! use opengl && opengl_0_25_0=1
+	done
+
+	if [[ ${softvol_0_18_1} -eq 1 ]]; then
+		elog "Since version 0.18.1 the software volume control is always enabled."
+		elog "This means that volume controls don't change the system volume,"
+		elog "e.g. per-application volume with PulseAudio."
+		elog "If you want to restore the previous behaviour, please refer to"
+		elog
+		elog "https://wiki.gentoo.org/wiki/Mpv#Volume_in_0.18.1"
+		elog
+	fi
+
+	if [[ ${osc_0_21_0} -eq 1 ]]; then
+		elog "In version 0.21.0 the default OSC layout was changed."
+		elog "If you want to restore the previous layout, please refer to"
+		elog
+		elog "https://wiki.gentoo.org/wiki/Mpv#OSC_in_0.21.0"
+		elog
+	fi
+
+	if [[ ${txtsubs_0_24_0} -eq 1 ]]; then
+		elog "Since version 0.24.0 subtitles with .txt extension aren't autoloaded."
+		elog "If you want to restore the previous behaviour, please refer to"
+		elog
+		elog "https://wiki.gentoo.org/wiki/Mpv#Subtitles_with_.txt_extension_in_0.24.0"
+		elog
+	fi
+
+	if [[ ${opengl_0_25_0} -eq 1 ]]; then
+		elog "Since version 0.25.0 the 'opengl' USE flag is mapped to"
+		elog "the 'opengl' video output and no longer explicitly requires"
+		elog "X11 or Mac OS Aqua. Consider enabling the 'opengl' USE flag."
+	fi
+
+	if use cli && ! has_version 'app-shells/mpv-bash-completion'; then
+		elog "If you want to have command-line completion via bash-completion,"
+		elog "please install app-shells/mpv-bash-completion."
+	fi
+
+	if use cli && [[ -n ${REPLACING_VERSIONS} ]] && \
+		has_version 'app-shells/mpv-bash-completion'; then
+		elog "If command-line completion doesn't work after mpv update,"
+		elog "please rebuild app-shells/mpv-bash-completion."
+	fi
+
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+src_test() {
+	cd "${S}"/build/test || die
+	local test
+	for test in *; do
+		if [[ -x ${test} ]]; then
+			./"${test}" || die "Test suite failed"
+		fi
+	done
+}
diff --git a/media-video/mpv/mpv-0.27.0.ebuild b/media-video/mpv/mpv-0.27.0.ebuild
new file mode 100644
index 000000000000..00e654a222a5
--- /dev/null
+++ b/media-video/mpv/mpv-0.27.0.ebuild
@@ -0,0 +1,370 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE='threads(+)'
+
+WAF_PV=1.9.8
+
+inherit gnome2-utils pax-utils python-r1 toolchain-funcs versionator waf-utils xdg-utils
+
+DESCRIPTION="Media player based on MPlayer and mplayer2"
+HOMEPAGE="https://mpv.io/"
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+	DOCS=( RELEASE_NOTES )
+else
+	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
+	inherit git-r3
+fi
+SRC_URI+=" https://waf.io/waf-${WAF_PV}"
+DOCS+=( README.md DOCS/{client-api,interface}-changes.rst )
+
+# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
+LICENSE="LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )"
+SLOT="0"
+IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb
+	dvd +egl encode gbm +iconv jack javascript jpeg lcms +libass libav libcaca
+	libmpv +lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband
+	samba sdl selinux test tools +uchardet v4l vaapi vdpau wayland +X +xv zlib
+	zsh-completion"
+
+REQUIRED_USE="
+	|| ( cli libmpv )
+	aqua? ( opengl )
+	cuda? ( !libav opengl )
+	egl? ( || ( gbm X wayland ) )
+	gbm? ( drm egl opengl )
+	lcms? ( opengl )
+	luajit? ( lua )
+	opengl? ( || ( aqua egl X raspberry-pi !cli ) )
+	raspberry-pi? ( opengl )
+	test? ( opengl )
+	tools? ( cli )
+	uchardet? ( iconv )
+	v4l? ( || ( alsa oss ) )
+	vaapi? ( || ( gbm X wayland ) )
+	vdpau? ( X )
+	wayland? ( egl )
+	X? ( egl? ( opengl ) )
+	xv? ( X )
+	zsh-completion? ( cli )
+	${PYTHON_REQUIRED_USE}
+"
+
+COMMON_DEPEND="
+	!libav? ( >=media-video/ffmpeg-3.2.2:0=[encode?,threads,vaapi?,vdpau?] )
+	libav? ( >=media-video/libav-12:0=[encode?,threads,vaapi?,vdpau?] )
+	alsa? ( >=media-libs/alsa-lib-1.0.18 )
+	archive? ( >=app-arch/libarchive-3.0.0:= )
+	bluray? ( >=media-libs/libbluray-0.3.0:= )
+	cdda? ( dev-libs/libcdio-paranoia )
+	cuda? ( >=media-video/ffmpeg-3.3:0 )
+	drm? ( x11-libs/libdrm )
+	dvd? (
+		>=media-libs/libdvdnav-4.2.0
+		>=media-libs/libdvdread-4.1.0
+	)
+	egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] )
+	iconv? (
+		virtual/libiconv
+		uchardet? ( app-i18n/uchardet )
+	)
+	jack? ( virtual/jack )
+	javascript? ( >=dev-lang/mujs-1.0.0 )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( >=media-libs/lcms-2.6:2 )
+	libass? (
+		>=media-libs/libass-0.12.1:=[fontconfig,harfbuzz]
+		virtual/ttf-fonts
+	)
+	libcaca? ( >=media-libs/libcaca-0.99_beta18 )
+	lua? (
+		!luajit? ( <dev-lang/lua-5.3:= )
+		luajit? ( dev-lang/luajit:2 )
+	)
+	openal? ( >=media-libs/openal-1.13 )
+	pulseaudio? ( media-sound/pulseaudio )
+	raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 )
+	rubberband? ( >=media-libs/rubberband-1.8.0 )
+	samba? ( net-fs/samba )
+	sdl? ( media-libs/libsdl2[sound,threads,video] )
+	v4l? ( media-libs/libv4l )
+	vaapi? (
+		!libav? ( >=media-video/ffmpeg-3.3:0 )
+		libav? ( >=media-video/libav-13:0 )
+		x11-libs/libva[drm?,X?,wayland?]
+	)
+	vdpau? (
+		!libav? ( >=media-video/ffmpeg-3.3:0 )
+		libav? ( >=media-video/libav-13:0 )
+		x11-libs/libvdpau
+	)
+	wayland? (
+		>=dev-libs/wayland-1.6.0
+		>=x11-libs/libxkbcommon-0.3.0
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libXScrnSaver
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		opengl? (
+			x11-libs/libXdamage
+			virtual/opengl
+		)
+		xv? ( x11-libs/libXv )
+	)
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	dev-python/docutils
+	virtual/pkgconfig
+	doc? ( dev-python/rst2pdf )
+	dvb? ( virtual/linuxtv-dvb-headers )
+	test? ( >=dev-util/cmocka-1.0.0 )
+	v4l? ( virtual/os-headers )
+	zsh-completion? ( dev-lang/perl )
+"
+RDEPEND="${COMMON_DEPEND}
+	cuda? ( x11-drivers/nvidia-drivers[X] )
+	selinux? ( sec-policy/selinux-mplayer )
+	tools? ( ${PYTHON_DEPS} )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch"
+	"${FILESDIR}/${PN}-0.23.0-make-libavdevice-check-accept-libav.patch"
+)
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != "binary" ]] && python_setup
+}
+
+src_prepare() {
+	cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
+	chmod +x "${S}"/waf || die
+	eapply "${FILESDIR}/${PV}"
+	default_src_prepare
+}
+
+src_configure() {
+	tc-export CC PKG_CONFIG AR
+
+	if tc-is-cross-compiler && use raspberry-pi; then
+		export EXTRA_PKG_CONFIG_LIBDIR="${SYSROOT%/}${EPREFIX}/opt/vc/lib/pkgconfig"
+		# Drop next line when Gentoo bug 607344 is fixed or if you fixed it locally.
+		die "${PN} can't be cross built with raspberry-pi USE enabled. See Gentoo bug 607344."
+	fi
+
+	local mywafargs=(
+		--confdir="${EPREFIX}/etc/${PN}"
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+
+		$(usex cli '' '--disable-cplayer')
+		$(use_enable libmpv libmpv-shared)
+
+		--disable-libmpv-static
+		--disable-static-build
+		# See deep down below for build-date.
+		--disable-optimize		# Don't add '-O2' to CFLAGS.
+		--disable-debug-build	# Don't add '-g' to CFLAGS.
+		--enable-html-build
+
+		$(use_enable doc pdf-build)
+		$(use_enable cplugins)
+		$(use_enable zsh-completion zsh-comp)
+		$(use_enable test)
+
+		--disable-android
+		$(use_enable iconv)
+		$(use_enable samba libsmbclient)
+		$(use_enable lua)
+		$(usex luajit '--lua=luajit' '')
+		$(use_enable javascript)
+		$(use_enable libass)
+		$(use_enable libass libass-osd)
+		$(use_enable zlib)
+		$(use_enable encode encoding)
+		$(use_enable bluray libbluray)
+		$(use_enable dvd dvdread)
+		$(use_enable dvd dvdnav)
+		$(use_enable cdda)
+		$(use_enable uchardet)
+		$(use_enable rubberband)
+		$(use_enable lcms lcms2)
+		--disable-vapoursynth	# Only available in overlays.
+		--disable-vapoursynth-lazy
+		$(use_enable archive libarchive)
+
+		--enable-libavdevice
+
+		# Audio outputs:
+		$(use_enable sdl sdl2)	# Listed under audio, but also includes video.
+		--disable-sdl1
+		$(use_enable oss oss-audio)
+		--disable-rsound		# Only available in overlays.
+		--disable-sndio			# Only available in overlays.
+		$(use_enable pulseaudio pulse)
+		$(use_enable jack)
+		$(use_enable openal)
+		--disable-opensles
+		$(use_enable alsa)
+		$(use_enable coreaudio)
+
+		# Video outputs:
+		$(use_enable aqua cocoa)
+		$(use_enable drm)
+		$(use_enable gbm)
+		$(use_enable wayland)
+		$(use_enable X x11)
+		$(use_enable xv)
+		$(usex opengl "$(use_enable aqua gl-cocoa)" '--disable-gl-cocoa')
+		$(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11')
+		$(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
+		$(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm')
+		$(usex opengl "$(use_enable wayland gl-wayland)" '--disable-gl-wayland')
+		$(use_enable vdpau)
+		$(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
+		$(use_enable vaapi)		# See below for vaapi-glx, vaapi-x-egl.
+		$(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
+		$(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
+		$(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm')
+		$(use_enable libcaca caca)
+		$(use_enable jpeg)
+		$(use_enable raspberry-pi rpi)
+		$(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl')
+		--disable-mali-fbdev	# Only available in overlays.
+		$(usex opengl '' '--disable-gl')
+
+		# HWaccels:
+		# Automagic Video Toolbox HW acceleration. See Gentoo bug 577332.
+		$(use_enable vaapi vaapi-hwaccel)
+		$(use_enable vdpau vdpau-hwaccel)
+		$(use_enable cuda cuda-hwaccel)
+
+		# TV features:
+		$(use_enable v4l tv)
+		$(use_enable v4l tv-v4l2)
+		$(use_enable v4l libv4l2)
+		$(use_enable v4l audio-input)
+		$(use_enable dvb dvbin)
+
+		# Miscellaneous features:
+		--disable-apple-remote	# Needs testing first. See Gentoo bug 577332.
+	)
+
+	if use vaapi && use X; then
+		mywafargs+=(
+			$(use_enable opengl vaapi-glx)
+			$(use_enable egl vaapi-x-egl)
+		)
+	fi
+
+	# Create reproducible non-live builds.
+	[[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date)
+
+	waf-utils_src_configure "${mywafargs[@]}"
+}
+
+src_install() {
+	waf-utils_src_install
+
+	if use lua; then
+		insinto /usr/share/${PN}
+		doins -r TOOLS/lua
+	fi
+
+	if use cli && use luajit; then
+		pax-mark -m "${ED}"usr/bin/${PN}
+	fi
+
+	if use tools; then
+		dobin TOOLS/{mpv_identify.sh,umpv}
+		newbin TOOLS/idet.sh mpv_idet.sh
+		python_replicate_script "${ED}"usr/bin/umpv
+	fi
+}
+
+pkg_postinst() {
+	local rv softvol_0_18_1=0 osc_0_21_0=0 txtsubs_0_24_0=0 opengl_0_25_0=0
+
+	for rv in ${REPLACING_VERSIONS}; do
+		version_compare ${rv} 0.18.1
+		[[ $? -eq 1 ]] && softvol_0_18_1=1
+		version_compare ${rv} 0.21.0
+		[[ $? -eq 1 ]] && osc_0_21_0=1
+		version_compare ${rv} 0.24.0
+		[[ $? -eq 1 ]] && txtsubs_0_24_0=1
+		version_compare ${rv} 0.25.0
+		[[ $? -eq 1 ]] && ! use opengl && opengl_0_25_0=1
+	done
+
+	if [[ ${softvol_0_18_1} -eq 1 ]]; then
+		elog "Since version 0.18.1 the software volume control is always enabled."
+		elog "This means that volume controls don't change the system volume,"
+		elog "e.g. per-application volume with PulseAudio."
+		elog "If you want to restore the previous behaviour, please refer to"
+		elog
+		elog "https://wiki.gentoo.org/wiki/Mpv#Volume_in_0.18.1"
+		elog
+	fi
+
+	if [[ ${osc_0_21_0} -eq 1 ]]; then
+		elog "In version 0.21.0 the default OSC layout was changed."
+		elog "If you want to restore the previous layout, please refer to"
+		elog
+		elog "https://wiki.gentoo.org/wiki/Mpv#OSC_in_0.21.0"
+		elog
+	fi
+
+	if [[ ${txtsubs_0_24_0} -eq 1 ]]; then
+		elog "Since version 0.24.0 subtitles with .txt extension aren't autoloaded."
+		elog "If you want to restore the previous behaviour, please refer to"
+		elog
+		elog "https://wiki.gentoo.org/wiki/Mpv#Subtitles_with_.txt_extension_in_0.24.0"
+		elog
+	fi
+
+	if [[ ${opengl_0_25_0} -eq 1 ]]; then
+		elog "Since version 0.25.0 the 'opengl' USE flag is mapped to"
+		elog "the 'opengl' video output and no longer explicitly requires"
+		elog "X11 or Mac OS Aqua. Consider enabling the 'opengl' USE flag."
+	fi
+
+	if use cli && ! has_version 'app-shells/mpv-bash-completion'; then
+		elog "If you want to have command-line completion via bash-completion,"
+		elog "please install app-shells/mpv-bash-completion."
+	fi
+
+	if use cli && [[ -n ${REPLACING_VERSIONS} ]] && \
+		has_version 'app-shells/mpv-bash-completion'; then
+		elog "If command-line completion doesn't work after mpv update,"
+		elog "please rebuild app-shells/mpv-bash-completion."
+	fi
+
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+src_test() {
+	cd "${S}"/build/test || die
+	local test
+	for test in *; do
+		if [[ -x ${test} ]]; then
+			./"${test}" || die "Test suite failed"
+		fi
+	done
+}
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
new file mode 100644
index 000000000000..0323a501e934
--- /dev/null
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -0,0 +1,369 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE='threads(+)'
+
+WAF_PV=1.9.8
+
+inherit gnome2-utils pax-utils python-r1 toolchain-funcs versionator waf-utils xdg-utils
+
+DESCRIPTION="Media player based on MPlayer and mplayer2"
+HOMEPAGE="https://mpv.io/"
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+	DOCS=( RELEASE_NOTES )
+else
+	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
+	inherit git-r3
+fi
+SRC_URI+=" https://waf.io/waf-${WAF_PV}"
+DOCS+=( README.md DOCS/{client-api,interface}-changes.rst )
+
+# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
+LICENSE="LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )"
+SLOT="0"
+IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb
+	dvd +egl encode gbm +iconv jack javascript jpeg lcms +libass libav libcaca
+	libmpv +lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband
+	samba sdl selinux test tools +uchardet v4l vaapi vdpau wayland +X +xv zlib
+	zsh-completion"
+
+REQUIRED_USE="
+	|| ( cli libmpv )
+	aqua? ( opengl )
+	cuda? ( !libav opengl )
+	egl? ( || ( gbm X wayland ) )
+	gbm? ( drm egl opengl )
+	lcms? ( opengl )
+	luajit? ( lua )
+	opengl? ( || ( aqua egl X raspberry-pi !cli ) )
+	raspberry-pi? ( opengl )
+	test? ( opengl )
+	tools? ( cli )
+	uchardet? ( iconv )
+	v4l? ( || ( alsa oss ) )
+	vaapi? ( || ( gbm X wayland ) )
+	vdpau? ( X )
+	wayland? ( egl )
+	X? ( egl? ( opengl ) )
+	xv? ( X )
+	zsh-completion? ( cli )
+	${PYTHON_REQUIRED_USE}
+"
+
+COMMON_DEPEND="
+	!libav? ( >=media-video/ffmpeg-3.2.2:0=[encode?,threads,vaapi?,vdpau?] )
+	libav? ( >=media-video/libav-12:0=[encode?,threads,vaapi?,vdpau?] )
+	alsa? ( >=media-libs/alsa-lib-1.0.18 )
+	archive? ( >=app-arch/libarchive-3.0.0:= )
+	bluray? ( >=media-libs/libbluray-0.3.0:= )
+	cdda? ( dev-libs/libcdio-paranoia )
+	cuda? ( >=media-video/ffmpeg-3.3:0 )
+	drm? ( x11-libs/libdrm )
+	dvd? (
+		>=media-libs/libdvdnav-4.2.0
+		>=media-libs/libdvdread-4.1.0
+	)
+	egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] )
+	iconv? (
+		virtual/libiconv
+		uchardet? ( app-i18n/uchardet )
+	)
+	jack? ( virtual/jack )
+	javascript? ( >=dev-lang/mujs-1.0.0 )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( >=media-libs/lcms-2.6:2 )
+	libass? (
+		>=media-libs/libass-0.12.1:=[fontconfig,harfbuzz]
+		virtual/ttf-fonts
+	)
+	libcaca? ( >=media-libs/libcaca-0.99_beta18 )
+	lua? (
+		!luajit? ( <dev-lang/lua-5.3:= )
+		luajit? ( dev-lang/luajit:2 )
+	)
+	openal? ( >=media-libs/openal-1.13 )
+	pulseaudio? ( media-sound/pulseaudio )
+	raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 )
+	rubberband? ( >=media-libs/rubberband-1.8.0 )
+	samba? ( net-fs/samba )
+	sdl? ( media-libs/libsdl2[sound,threads,video] )
+	v4l? ( media-libs/libv4l )
+	vaapi? (
+		!libav? ( >=media-video/ffmpeg-3.3:0 )
+		libav? ( >=media-video/libav-13:0 )
+		x11-libs/libva[drm?,X?,wayland?]
+	)
+	vdpau? (
+		!libav? ( >=media-video/ffmpeg-3.3:0 )
+		libav? ( >=media-video/libav-13:0 )
+		x11-libs/libvdpau
+	)
+	wayland? (
+		>=dev-libs/wayland-1.6.0
+		>=x11-libs/libxkbcommon-0.3.0
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libXScrnSaver
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		opengl? (
+			x11-libs/libXdamage
+			virtual/opengl
+		)
+		xv? ( x11-libs/libXv )
+	)
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	dev-python/docutils
+	virtual/pkgconfig
+	doc? ( dev-python/rst2pdf )
+	dvb? ( virtual/linuxtv-dvb-headers )
+	test? ( >=dev-util/cmocka-1.0.0 )
+	v4l? ( virtual/os-headers )
+	zsh-completion? ( dev-lang/perl )
+"
+RDEPEND="${COMMON_DEPEND}
+	cuda? ( x11-drivers/nvidia-drivers[X] )
+	selinux? ( sec-policy/selinux-mplayer )
+	tools? ( ${PYTHON_DEPS} )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch"
+	"${FILESDIR}/${PN}-0.23.0-make-libavdevice-check-accept-libav.patch"
+)
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != "binary" ]] && python_setup
+}
+
+src_prepare() {
+	cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
+	chmod +x "${S}"/waf || die
+	default_src_prepare
+}
+
+src_configure() {
+	tc-export CC PKG_CONFIG AR
+
+	if tc-is-cross-compiler && use raspberry-pi; then
+		export EXTRA_PKG_CONFIG_LIBDIR="${SYSROOT%/}${EPREFIX}/opt/vc/lib/pkgconfig"
+		# Drop next line when Gentoo bug 607344 is fixed or if you fixed it locally.
+		die "${PN} can't be cross built with raspberry-pi USE enabled. See Gentoo bug 607344."
+	fi
+
+	local mywafargs=(
+		--confdir="${EPREFIX}/etc/${PN}"
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+
+		$(usex cli '' '--disable-cplayer')
+		$(use_enable libmpv libmpv-shared)
+
+		--disable-libmpv-static
+		--disable-static-build
+		# See deep down below for build-date.
+		--disable-optimize		# Don't add '-O2' to CFLAGS.
+		--disable-debug-build	# Don't add '-g' to CFLAGS.
+		--enable-html-build
+
+		$(use_enable doc pdf-build)
+		$(use_enable cplugins)
+		$(use_enable zsh-completion zsh-comp)
+		$(use_enable test)
+
+		--disable-android
+		$(use_enable iconv)
+		$(use_enable samba libsmbclient)
+		$(use_enable lua)
+		$(usex luajit '--lua=luajit' '')
+		$(use_enable javascript)
+		$(use_enable libass)
+		$(use_enable libass libass-osd)
+		$(use_enable zlib)
+		$(use_enable encode encoding)
+		$(use_enable bluray libbluray)
+		$(use_enable dvd dvdread)
+		$(use_enable dvd dvdnav)
+		$(use_enable cdda)
+		$(use_enable uchardet)
+		$(use_enable rubberband)
+		$(use_enable lcms lcms2)
+		--disable-vapoursynth	# Only available in overlays.
+		--disable-vapoursynth-lazy
+		$(use_enable archive libarchive)
+
+		--enable-libavdevice
+
+		# Audio outputs:
+		$(use_enable sdl sdl2)	# Listed under audio, but also includes video.
+		--disable-sdl1
+		$(use_enable oss oss-audio)
+		--disable-rsound		# Only available in overlays.
+		--disable-sndio			# Only available in overlays.
+		$(use_enable pulseaudio pulse)
+		$(use_enable jack)
+		$(use_enable openal)
+		--disable-opensles
+		$(use_enable alsa)
+		$(use_enable coreaudio)
+
+		# Video outputs:
+		$(use_enable aqua cocoa)
+		$(use_enable drm)
+		$(use_enable gbm)
+		$(use_enable wayland)
+		$(use_enable X x11)
+		$(use_enable xv)
+		$(usex opengl "$(use_enable aqua gl-cocoa)" '--disable-gl-cocoa')
+		$(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11')
+		$(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
+		$(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm')
+		$(usex opengl "$(use_enable wayland gl-wayland)" '--disable-gl-wayland')
+		$(use_enable vdpau)
+		$(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
+		$(use_enable vaapi)		# See below for vaapi-glx, vaapi-x-egl.
+		$(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
+		$(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
+		$(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm')
+		$(use_enable libcaca caca)
+		$(use_enable jpeg)
+		$(use_enable raspberry-pi rpi)
+		$(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl')
+		--disable-mali-fbdev	# Only available in overlays.
+		$(usex opengl '' '--disable-gl')
+
+		# HWaccels:
+		# Automagic Video Toolbox HW acceleration. See Gentoo bug 577332.
+		$(use_enable vaapi vaapi-hwaccel)
+		$(use_enable vdpau vdpau-hwaccel)
+		$(use_enable cuda cuda-hwaccel)
+
+		# TV features:
+		$(use_enable v4l tv)
+		$(use_enable v4l tv-v4l2)
+		$(use_enable v4l libv4l2)
+		$(use_enable v4l audio-input)
+		$(use_enable dvb dvbin)
+
+		# Miscellaneous features:
+		--disable-apple-remote	# Needs testing first. See Gentoo bug 577332.
+	)
+
+	if use vaapi && use X; then
+		mywafargs+=(
+			$(use_enable opengl vaapi-glx)
+			$(use_enable egl vaapi-x-egl)
+		)
+	fi
+
+	# Create reproducible non-live builds.
+	[[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date)
+
+	waf-utils_src_configure "${mywafargs[@]}"
+}
+
+src_install() {
+	waf-utils_src_install
+
+	if use lua; then
+		insinto /usr/share/${PN}
+		doins -r TOOLS/lua
+	fi
+
+	if use cli && use luajit; then
+		pax-mark -m "${ED}"usr/bin/${PN}
+	fi
+
+	if use tools; then
+		dobin TOOLS/{mpv_identify.sh,umpv}
+		newbin TOOLS/idet.sh mpv_idet.sh
+		python_replicate_script "${ED}"usr/bin/umpv
+	fi
+}
+
+pkg_postinst() {
+	local rv softvol_0_18_1=0 osc_0_21_0=0 txtsubs_0_24_0=0 opengl_0_25_0=0
+
+	for rv in ${REPLACING_VERSIONS}; do
+		version_compare ${rv} 0.18.1
+		[[ $? -eq 1 ]] && softvol_0_18_1=1
+		version_compare ${rv} 0.21.0
+		[[ $? -eq 1 ]] && osc_0_21_0=1
+		version_compare ${rv} 0.24.0
+		[[ $? -eq 1 ]] && txtsubs_0_24_0=1
+		version_compare ${rv} 0.25.0
+		[[ $? -eq 1 ]] && ! use opengl && opengl_0_25_0=1
+	done
+
+	if [[ ${softvol_0_18_1} -eq 1 ]]; then
+		elog "Since version 0.18.1 the software volume control is always enabled."
+		elog "This means that volume controls don't change the system volume,"
+		elog "e.g. per-application volume with PulseAudio."
+		elog "If you want to restore the previous behaviour, please refer to"
+		elog
+		elog "https://wiki.gentoo.org/wiki/Mpv#Volume_in_0.18.1"
+		elog
+	fi
+
+	if [[ ${osc_0_21_0} -eq 1 ]]; then
+		elog "In version 0.21.0 the default OSC layout was changed."
+		elog "If you want to restore the previous layout, please refer to"
+		elog
+		elog "https://wiki.gentoo.org/wiki/Mpv#OSC_in_0.21.0"
+		elog
+	fi
+
+	if [[ ${txtsubs_0_24_0} -eq 1 ]]; then
+		elog "Since version 0.24.0 subtitles with .txt extension aren't autoloaded."
+		elog "If you want to restore the previous behaviour, please refer to"
+		elog
+		elog "https://wiki.gentoo.org/wiki/Mpv#Subtitles_with_.txt_extension_in_0.24.0"
+		elog
+	fi
+
+	if [[ ${opengl_0_25_0} -eq 1 ]]; then
+		elog "Since version 0.25.0 the 'opengl' USE flag is mapped to"
+		elog "the 'opengl' video output and no longer explicitly requires"
+		elog "X11 or Mac OS Aqua. Consider enabling the 'opengl' USE flag."
+	fi
+
+	if use cli && ! has_version 'app-shells/mpv-bash-completion'; then
+		elog "If you want to have command-line completion via bash-completion,"
+		elog "please install app-shells/mpv-bash-completion."
+	fi
+
+	if use cli && [[ -n ${REPLACING_VERSIONS} ]] && \
+		has_version 'app-shells/mpv-bash-completion'; then
+		elog "If command-line completion doesn't work after mpv update,"
+		elog "please rebuild app-shells/mpv-bash-completion."
+	fi
+
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+src_test() {
+	cd "${S}"/build/test || die
+	local test
+	for test in *; do
+		if [[ -x ${test} ]]; then
+			./"${test}" || die "Test suite failed"
+		fi
+	done
+}
diff --git a/media-video/noad/Manifest b/media-video/noad/Manifest
new file mode 100644
index 000000000000..6c31225c6ca1
--- /dev/null
+++ b/media-video/noad/Manifest
@@ -0,0 +1,19 @@
+AUX confd_vdraddon.noad 1353 SHA256 a005321a684f5e7585b269eebc4e89e2240e512572716f349b00243abd8ba780 SHA512 7d516aa290451ed79e010ba5f084ff120d1bb4e9cda68ff3a66a3b35786856dc9a6ebbf84df9f1d8d33f9ab3287018032377f675523b93edb89523fea456b29b WHIRLPOOL f337fc6487fa7e140294054f96dc4e99d67785dcbe5424f4ae7b708224ae490e38a3467d0dae84865bdfcb5c2c972712d0a432c79975380003bda96c59402c94
+AUX noad-reccmd 145 SHA256 f9d3c963f1c745cd671925c1a48c5e4785cfc913c416dc0fd5963ff625e4a653 SHA512 83e53b1ff4af56ab188ea43ec34b843447101bd71f4eaa93b88892df8c5ff66160fbd441f13e19f7e73a5f6e193aacc003465ae174ad06ee3ae49a5c0977a60d WHIRLPOOL 2f10953c98ded5a0d21d43e39cb279fa21a1a4927b80c2f9a7b07405a415ccc45f632bacb1894bb623753d2e523b00bda4ccb087a0a5ead2b5e714b7800ec328
+AUX patches-0.7.x/noad-0.7.3-ffmpeg_detection.diff 603 SHA256 f17857969d8dd121b9f92671977abce3a3b986bd2ecc15b7529ff4ada42d8083 SHA512 32bbefe976fbe556d468365fb96dd10137178c58aab8f996d7312afddad9e99000e08ab2b93a411f6a1dac7542619eec49d9287ef2d613b2ad35fb62b327df45 WHIRLPOOL 80a6d71f9a8fec3854be89cc3a87d4237b4bdfb8f609ebb09cc706d2c632263736a273140809c65f8e3d9c4802f010a07ec6ce5e3b170f8990f09e4aba507935
+AUX patches-0.7.x/noad-0.7.3-hangcheck.diff 617 SHA256 0919ce88b855a026db642e5071d7cf6a81c90068ce1703bdd28d1551fee34f46 SHA512 b426c4999f534b2940849f5f647c06d76c282d6f4f74e44c729de847b8ffd2699e242a29762a4407615ed44394495775df0aaf8220238c5baf9bf548111103ff WHIRLPOOL 8a268951d3f40ad49aa65529b4c880c89d691ecc637f8d43e8967fc67a250a73565a6d88d73b37e804af6221eef3084f89984940cc7f0750ad7d599612efc7b1
+AUX patches-0.7.x/noad-0.7.3_gcc-4.7.diff 527 SHA256 571a5b208370ce1336b6ccb4d60a0b27f216c4682548f1d9097ef05463a2ae3f SHA512 ddcaea8a324cd634a294881cf272be211a42edb317e3342f28166b211584a5599b1f8ab9869dfa56983d50ff78e3e27a163ca7d752fd8efca009ba3a01e539d4 WHIRLPOOL 58dd60e895fbd16cf71bc6af26fd3a401d5f1a4a88964775a8b56b8c0f9b5f1c46316d2841db888f5204e231f87f44f6fc058d5d8196cee4216a019c43ee0702
+AUX patches-0.7.x/noad-0.7.3_missing_include.diff 277 SHA256 23d1e0bafdf120ce6e38393054d64ba7807e5579b93d3daf96179531dc4c431f SHA512 6c0c03597f71d71efbcd80ec3d4c2df8f38ff8e46140232c95e4d0ed354da9932b80ab9587dfe9376fd29670b7154cef1a33974c739eaf5981048f21844208c3 WHIRLPOOL d4fac30d385b76482e981368eb7fbf5444c4b0ba084be43c70b61ea6673147927b727992680eb5eefae99001b54cec42edab93982b3b19867e3877901a79bca7
+AUX patches-0.8.x/noad-0.8.6-ffmpeg25.patch 459 SHA256 47ffe91cd2d467edbd2cd681165e09551b7a11ae0697ab306ba122a1431cd0c4 SHA512 13bd88c67d9e5a0b452cfa46fd8b66108404f2b3efd1fa23563f7d8456318495a5c15916bd81422cffab948673a29cfb15da2e217c4f58d454c460caaad59a3b WHIRLPOOL a784be0f0dce614562071d5c0e70d6eb20abb92bbafa4cfd3605b2dba2ec630c753a04a33eaf733fa8543e4ea7eb98fc3780edd9f4e29380b95906b0f52c75f9
+AUX patches-0.8.x/noad-0.8.6-libav9.diff 3036 SHA256 22e29a5ad94875856bf1a7e5bc5696881db804e5f7a6f760cbe01b5d5d0d28d8 SHA512 f7ecc4e8d2c30a77588cbf5a0977575a0a2a9c44aaca1f061e34795302f56f77bcddb096e6a8ec2d3398829faabcb78a29825e1c0bc28f2350d7a4a7d1f8e64e WHIRLPOOL 658ec0ed907a89004a74fe7d7cbaa0f1c6b5d748b4e1743794073d3402279846a070f3d1eebf8457c5dbd1b9addea8381cc4563a75f299d0ff1e026a29882761
+AUX pre-shutdown-15-noad.sh 771 SHA256 c5a711256fc48bf8edd7b28f23ae61aa365370cec9b0470ca1c017a5e36e66c2 SHA512 d40625e0704bc228879bd5d19d7a62eed4e56d1a688699dde8f628aedf320e86b4bfca474b42edc3f6a93e7f8528ba15d654a818d9b19bd3ac196c1ca8324910 WHIRLPOOL 35d341678eebd70759a64874049d5e64282bea6ed5d3c77330ac4c98784d62d342c02c1164d4760bf1dca0cff650d34be23c4e6a3bcfe37ae31b2eab88230f69
+AUX reccmds.noad.conf 61 SHA256 41dbc62f88429710b92f6d7cc45c49a967ae1376fc01b5b485b51f7e077ed20d SHA512 953af51444af1e4a853e2a501fe0fb31ef0b982795e8a7b350cf0851f6f572884de87d74b71ce0630fcd59082290ce8b9730e343032fea6512da96f1a934fddb WHIRLPOOL be348899b9a66713b83d5ffc4af414eadecebefa631910826382bcd82efcb20715bb55310173fb77e4980ab110bbd1513acc6c36c6aef65e93f0504ca3b40db7
+AUX record-50-noad.sh 1443 SHA256 bfbfc9254b993602def7b01a9d72e2ec1c246d260a229576db2b2b6d2ab27011 SHA512 6ef839ad9c4d7b238e9e02dfdca486623902a5e9f3de722f18b9f50eff03888d58d03f8a17448903bbec2f04d1abcee22d6672798dd23eee024339a6474b98c9 WHIRLPOOL 9a1faa1588bb89f5724652548e2a2ac8ddd8b3fb212663616e247c4e44b30286a174c2026a694a1a40d192f44d253c890c57cbca569651b31ad5114abb19dea2
+DIST noad-0.7.3.tar.bz2 174036 SHA256 6fb597fb0ae0e4c4c954f2feb89dcc88c4852a0f0845aa214606996abb29f6cb SHA512 0edc81c9b689c49b99cd68b80bf7acbb0af9757b4d5439edd0610ca96bf0ee4783844aa0dfe52e3303b21f5794af3ad9a216371d4e698bbf26f24bc31be43c66 WHIRLPOOL cfa03475dc657502fb4ccd67ddb8139edac4b4693e98c9897eb2ac99b38fc5cbe678f975244cd06a8d9464b5c4da9bd1b4354938d4e833e05fae5c2d7e220be2
+DIST noad-0.8.6.tar.bz2 188085 SHA256 4b087c9688d0c8e86e248c1bc775c09541625a7b7ae13a85ec000266e3b69780 SHA512 ffca9e8bc78719350ffdfe59a4f258033f843ddf761ca5d8893cde5a4968a644c0318fd86b60e7b9e78b0650f8f02c68e6f7a95f4dfb702ab30d84ad3750c9e9 WHIRLPOOL c9c5ce710021965743eb1fcad18d6d9946101e78ca802eeb2b146a214f03e3a765be72fd356dcd209b5e43414585db2b3ef43a104d6bdef76ebaa0b29baa2ab1
+EBUILD noad-0.7.3-r1.ebuild 2209 SHA256 7c83f7d18b2e9bc0f2b82c9b38834b39fcb57f4963be1b8a2fe21f5108e3c668 SHA512 b065e6d6681dab66d5397613a9a35499513b5de40016f10f686d51441e452c6aa4ed5d475da52c86942ae95b1be9ff6f56676d61a5c1ede766bc23eb1e6e7e2b WHIRLPOOL a5e04a4cc9a6ea01ec898c3e8e2310eb70574fde8f995346de779ce92b7f6a32eb5b8435b10051939bef0a50f0cc711bbe910afc5d76a9f43953bd6bd1f2ebc0
+EBUILD noad-0.8.6-r1.ebuild 1890 SHA256 91b5ec315b1cf9a546f2c1dcefa7d552a5eb511fa4bd0d5cb966335668a84562 SHA512 36123fab1ead711ec002e1f031839bf82e0d10eea73916cc0306ee49f4fd93e860661aa43f71d85f1170d931ffca9aa6b40aa502ada898119d87cdd6e8cc5704 WHIRLPOOL cf0c4294d4af8b639a8c9c0ea2e7f25a07e600705ad9a19ff084308d02ed2428b7d05cd2b0ed57799a6f0926609546092a141905c4c305d90d125dc6ec332a3c
+EBUILD noad-0.8.6-r2.ebuild 2038 SHA256 d6a9651c6d0ca16f30262bef25260e528591ffc8d06253ce5069e80820c61ff8 SHA512 ec02b138a507039e175d6456ee9e4f66f624a0cc0f484c18245be25802b477fb506435a2faab24a332a75ac79167fb0e17f0066eda1a711efa4c39459886be63 WHIRLPOOL e11d9fccfaa73404c5e5edaec3216ad85b6cf9202a686e6374aad5cb7498e47c4246c506e49c62b50c00ab779272dc39ed8d67e94065a05c0aacf0ca1d9d6eb6
+MISC ChangeLog 3231 SHA256 47403af36b0a270e8f1f46d5f0ab0a0b6bf6bd1ccb747799440112c0ad1d09f2 SHA512 7b8f03d49c06c9c75f3285336176253a6ba386b8f51cbb9c54177ed15c7e72a1103dcd119b546fa835978e1f6c5ff1ff1cdefacb343f09764ea72101d32421b1 WHIRLPOOL 2d4778365e70a4672ea68e955a7821f1e7d93d56332962af2b134068cb3ea7a5d39aba0e4302e2aea99108ce3aebf797e21c2f5171e3d69c33db405ab302e6c1
+MISC ChangeLog-2015 14048 SHA256 f4a6cbc6be8781a0f305291a33d771f2a1feb6f6317fd03da75a796898239404 SHA512 4e98518b8aaefdeb989c241fec6c8cf53b6e954ce5ddb09aae24bc32d1c3d27ddcbe99d620c3219bcb9f931ecb4301b5667a99b380e3c440b0b939bcda02fd54 WHIRLPOOL 9e203b018fcedea65edf6cefce69acdc9a35a952388fc63e469263eede9a1b12730369123c3694ca84961a93de62081fc865e93cf1ea4ecb7211a913891a7b96
+MISC metadata.xml 535 SHA256 eb1e1164eb0f443f3ec977e60e4536a4362fdaac924d2f20e96827b3f9d250fe SHA512 fc9fa7cd96b12452c50e75602da047582e3e8a10377555ea363db1662278199c62f4ed3844ba9d1eef3979a896e1953fbf0efa73123a9f16d88cabb2114c82eb WHIRLPOOL c4d9713accd37e293014f19d51f51b246c59b655f7e2772cf2eb73a93f5d97e101e128d48ae86cfc98043eadd42cd175236abef2ec6d9c32c78aa0db3b952afc
diff --git a/media-video/noad/files/confd_vdraddon.noad b/media-video/noad/files/confd_vdraddon.noad
new file mode 100644
index 000000000000..693e4c7fe3a1
--- /dev/null
+++ b/media-video/noad/files/confd_vdraddon.noad
@@ -0,0 +1,71 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+#########
+##
+# 	run Noad
+# 	available Parameter
+# 	no | yes
+#
+VDR_USE_NOAD="yes"
+
+##	do online scan while recording
+#	you can choose between
+#		no   - disable online scan
+#		live - scan only live recordings online (named @...)
+#		all  - scan all recordings with online mode
+#	available Parameter
+#	no | live | all
+#
+NOAD_ONLINE="no"
+
+##	Use this nice-level when running noad / or no-niceness
+#	available Parameter
+#	no | 0 ... 19
+#NOAD_NICE_LEVEL="no"
+NOAD_NICE_LEVEL="18"
+
+##	use ac3 detection
+# 	available Parameter
+# 	yes | no
+#
+NOAD_AC3="yes"
+
+##	detect jumping logos
+# 	available Parameter
+# 	yes | no
+#
+NOAD_JUMP="yes"
+
+##	detect overlaps
+#	available Parameter
+#	yes | no
+#
+NOAD_OVERLAP="yes"
+
+##	send an OSD-Message to localhost:2001 ( >=vdr-1.7.15 localhost:6419 )
+#	for start and end 
+# 	available Parameter
+# 	yes | no
+#
+NOAD_MESSAGES="yes"
+
+##	only scan if sharemarks did not produce an ptsmarks.vdr file
+#	available Parameter
+#	yes | no
+NOAD_ONLY_SCAN_IF_NO_PTSMARKS="yes"
+
+##	only scan if there are no cut-marks already there (cutting while vdr still records)
+#	available Parameter
+#	yes | no
+NOAD_ONLY_SCAN_IF_NO_MARKS="yes"
+
+##	add your own parameter here,
+# 	yust run 'noad' in konsole for more parameter
+NOAD_PARAMETER=""
+
+
+
+
+
+
diff --git a/media-video/noad/files/noad-reccmd b/media-video/noad/files/noad-reccmd
new file mode 100644
index 000000000000..3979baa574f9
--- /dev/null
+++ b/media-video/noad/files/noad-reccmd
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+VDR_RECORD_STATE=reccmd
+VDR_RECORD_NAME="${1}"
+
+. /usr/share/vdr/record/record-50-noad.sh "${VDR_RECORD_STATE}" "${VDR_RECORD_NAME}"
+
diff --git a/media-video/noad/files/patches-0.7.x/noad-0.7.3-ffmpeg_detection.diff b/media-video/noad/files/patches-0.7.x/noad-0.7.3-ffmpeg_detection.diff
new file mode 100644
index 000000000000..e757aeb884b0
--- /dev/null
+++ b/media-video/noad/files/patches-0.7.x/noad-0.7.3-ffmpeg_detection.diff
@@ -0,0 +1,13 @@
+Index: noad-0.7.3/configure.ac
+===================================================================
+--- noad-0.7.3.orig/configure.ac
++++ noad-0.7.3/configure.ac
+@@ -158,7 +158,7 @@ dnl check that libavcodec is usable
+ dnl ---------------------------------------------------------------------------
+ if test "$withffmpeg" == "1"; then
+   AC_SUBST(LIBAVCODEC,"-lavcodec")
+-  AC_CHECK_LIB([avcodec],[avcodec_init],[AC_SUBST(HAVE_LIBAVCODEC,1) AC_SUBST(LIBS,"$LIBS $LIBAVCODEC ") ])
++  AC_CHECK_LIB([avcodec],[avcodec_register_all],[AC_SUBST(HAVE_LIBAVCODEC,1) AC_SUBST(LIBS,"$LIBS $LIBAVCODEC ") ])
+ fi
+ 
+ 
diff --git a/media-video/noad/files/patches-0.7.x/noad-0.7.3-hangcheck.diff b/media-video/noad/files/patches-0.7.x/noad-0.7.3-hangcheck.diff
new file mode 100644
index 000000000000..37788a197fd7
--- /dev/null
+++ b/media-video/noad/files/patches-0.7.x/noad-0.7.3-hangcheck.diff
@@ -0,0 +1,21 @@
+diff -ru noad-0.6.0-orig/main.cpp noad-0.6.0/main.cpp
+--- noad-0.6.0-orig/main.cpp	2007-05-12 17:28:01.000000000 +0200
++++ noad-0.6.0/main.cpp	2007-05-12 18:20:30.000000000 +0200
+@@ -566,10 +566,17 @@
+     signal(SIGABRT, signal_handler);
+     signal(SIGSEGV, signal_handler);
+     signal(SIGUSR1, signal_handler);
++    signal(SIGALRM, signal_handler);
+     
+     // do cleanup at exit...
+     atexit(cleanUp);
+     
++   
++    if (!bOnline) {
++       // now start alarm timer to kill hanging noad (hardcoded 30min timeout)
++       alarm(30*60);
++    }
++    
+     // now do the work..,
+     doNoad(bBefore, recDir);
+ 
diff --git a/media-video/noad/files/patches-0.7.x/noad-0.7.3_gcc-4.7.diff b/media-video/noad/files/patches-0.7.x/noad-0.7.3_gcc-4.7.diff
new file mode 100644
index 000000000000..ca37f8e22a87
--- /dev/null
+++ b/media-video/noad/files/patches-0.7.x/noad-0.7.3_gcc-4.7.diff
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/show_bug.cgi?id=423623
+compilefix gcc-4.7.x
+
+signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> (2012/06/27)
+
+diff -Naur noad-0.7.3.orig/vdr_cl.h noad-0.7.3/vdr_cl.h
+--- noad-0.7.3.orig/vdr_cl.h	2012-06-27 20:27:57.000000000 +0200
++++ noad-0.7.3/vdr_cl.h	2012-06-27 20:30:56.000000000 +0200
+@@ -287,7 +287,7 @@
+ 				{
+ 					T *l = new T;
+                if (l->Parse(s))
+-						Add(l);
++						this->Add(l);
+                else 
+ 					{
+ 						esyslog("ERROR: error in %s, line %d", fileName, line);
diff --git a/media-video/noad/files/patches-0.7.x/noad-0.7.3_missing_include.diff b/media-video/noad/files/patches-0.7.x/noad-0.7.3_missing_include.diff
new file mode 100644
index 000000000000..c3c335c2663b
--- /dev/null
+++ b/media-video/noad/files/patches-0.7.x/noad-0.7.3_missing_include.diff
@@ -0,0 +1,14 @@
+Add missing includes for ressource limits.
+
+Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
+
+--- main.cpp
++++ main.cpp
+@@ -22,6 +22,7 @@
+ 
+ #include <stdlib.h>
+ #include <time.h>
++#include <sys/resource.h>
+ #include <sys/wait.h>
+ #include <signal.h>
+ #include <execinfo.h>
diff --git a/media-video/noad/files/patches-0.8.x/noad-0.8.6-ffmpeg25.patch b/media-video/noad/files/patches-0.8.x/noad-0.8.6-ffmpeg25.patch
new file mode 100644
index 000000000000..455252a74c8a
--- /dev/null
+++ b/media-video/noad/files/patches-0.8.x/noad-0.8.6-ffmpeg25.patch
@@ -0,0 +1,16 @@
+Index: noad-0.8.6/ffmpeg_decoder.cpp
+===================================================================
+--- noad-0.8.6.orig/ffmpeg_decoder.cpp
++++ noad-0.8.6/ffmpeg_decoder.cpp
+@@ -253,7 +253,11 @@ int FFMPegDecoder::decoder_exit()
+ 	// close the file

+ 	if( pFormatCtx )

+ 	{

++#if LIBAVFORMAT_VERSION_MAJOR < 54

+ 		av_close_input_file(pFormatCtx);

++#else

++		avformat_close_input(&pFormatCtx);

++#endif

+ 		pFormatCtx = NULL;

+ 	}

+ 	// Close the codec

diff --git a/media-video/noad/files/patches-0.8.x/noad-0.8.6-libav9.diff b/media-video/noad/files/patches-0.8.x/noad-0.8.6-libav9.diff
new file mode 100644
index 000000000000..a9b6c89d9f8c
--- /dev/null
+++ b/media-video/noad/files/patches-0.8.x/noad-0.8.6-libav9.diff
@@ -0,0 +1,106 @@
+compile fix noad-0.8.6
+testet with libav-9 ffmpeg-2.2.9
+Signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.o> (22 Oct 2014)
+diff -Naur noad-0.8.6.orig/audiotools.cpp noad-0.8.6/audiotools.cpp
+--- noad-0.8.6.orig/audiotools.cpp	2014-10-22 14:26:57.809249955 +0200
++++ noad-0.8.6/audiotools.cpp	2014-10-22 14:28:06.830249955 +0200
+@@ -50,9 +50,9 @@
+ uint8_t *outbuf=NULL;
+ AVCodec *codec=NULL;
+ AVCodecContext *codecContext= NULL;
+-#if LIBAVCODEC_VERSION_MAJOR > 54
++//#if LIBAVCODEC_VERSION_MAJOR > 54
+ AVDictionary *avDictionary = NULL;                // "create" an empty dictionary
+-#endif
++//#endif
+ int64_t basepts=0;
+ int64_t audiobasepts=0;
+ //int64_t audiopts=0;
+@@ -108,13 +108,13 @@
+   codecContext = avcodec_alloc_context3(codec);
+ #endif
+ 
+-#if LIBAVCODEC_VERSION_MAJOR > 54
++//#if LIBAVCODEC_VERSION_MAJOR > 54
+    /* open it */
+    if (avcodec_open2(codecContext, codec, &avDictionary) < 0)
+-#else
++//#else
+   /* open it */
+-  if (avcodec_open(codecContext, codec) < 0)
+-#endif
++//  if (avcodec_open(codecContext, codec) < 0)
++//#endif
+   {
+     fprintf(stderr, "could not open codec\n");
+   }
+@@ -129,9 +129,9 @@
+ {
+   free(outbuf);
+   avcodec_close(codecContext);
+-#if LIBAVCODEC_VERSION_MAJOR > 54
++//#if LIBAVCODEC_VERSION_MAJOR > 54
+   av_dict_free(&avDictionary);
+-#endif
++//#endif
+   av_free(codecContext);
+   av_codec_initialised = false;
+ }
+diff -Naur noad-0.8.6.orig/ffmpeg_decoder.cpp noad-0.8.6/ffmpeg_decoder.cpp
+--- noad-0.8.6.orig/ffmpeg_decoder.cpp	2014-10-22 14:26:57.808249955 +0200
++++ noad-0.8.6/ffmpeg_decoder.cpp	2014-10-22 14:38:26.366249955 +0200
+@@ -184,7 +184,7 @@
+ 

+ 	// Retrieve stream information

+ 	resetDecoder();

+-   int openCode2 = av_find_stream_info(pFormatCtx);

++   int openCode2 = avformat_find_stream_info(pFormatCtx, NULL);

+ 	if(openCode2<0)

+ 		return -1; // Couldn't find stream information

+ 

+@@ -222,13 +222,13 @@
+ 	if(pCodec->capabilities & CODEC_CAP_TRUNCATED)

+ 		pCodecCtx->flags|=CODEC_FLAG_TRUNCATED;

+ 

+-#if LIBAVCODEC_VERSION_MAJOR > 54

++//#if LIBAVCODEC_VERSION_MAJOR > 54

+ 	// Open codec

+ 	if(avcodec_open2(pCodecCtx, pCodec,&avDictionary) < 0)

+-#else

++//#else

+ 	// Open codec

+-	if(avcodec_open(pCodecCtx, pCodec)<0)

+-#endif

++//	if(avcodec_open(pCodecCtx, pCodec)<0)

++//#endif

+ 		return -1; // Could not open codec

+ 

+ 

+@@ -270,10 +270,10 @@
+       pIOContext = NULL;

+ 	}

+ #endif

+-#if LIBAVCODEC_VERSION_MAJOR > 54

++//#if LIBAVCODEC_VERSION_MAJOR > 54

+    av_dict_free(&avDictionary);

+    avDictionary = NULL;

+-#endif

++//#endif

+ 	return 0;

+ }

+ 

+diff -Naur noad-0.8.6.orig/ffmpeg_decoder.h noad-0.8.6/ffmpeg_decoder.h
+--- noad-0.8.6.orig/ffmpeg_decoder.h	2014-10-22 14:26:57.807249955 +0200
++++ noad-0.8.6/ffmpeg_decoder.h	2014-10-22 14:36:27.213249955 +0200
+@@ -22,9 +22,9 @@
+ 	int             i, videoStream;

+ 	AVCodecContext  *pCodecCtx;

+ 	AVCodec         *pCodec;

+-#if LIBAVCODEC_VERSION_MAJOR > 54

++//#if LIBAVCODEC_VERSION_MAJOR > 54

+    AVDictionary    *avDictionary;

+-#endif

++//#endif

+ 	AVFrame         *pFrame;

+ 

+ public:

diff --git a/media-video/noad/files/pre-shutdown-15-noad.sh b/media-video/noad/files/pre-shutdown-15-noad.sh
new file mode 100644
index 000000000000..476741e7bac7
--- /dev/null
+++ b/media-video/noad/files/pre-shutdown-15-noad.sh
@@ -0,0 +1,41 @@
+#
+# pre-shutdown script to abort shutdown in case noad is running
+
+check_runtime() {
+	local PID="$1"
+
+	# Max runtime of 30m = 1800s
+	local NOAD_MAX_TIME=1800
+	local NOW="$(date +%s)"
+	local START="$(stat --format "%Z" /proc/${PID}/)"
+	local DIFF=$(( $NOW - $START ))
+	if [ "${DIFF}" -ge "${NOAD_MAX_TIME}" ]; then
+		kill ${PID}
+		sleep 2
+		kill -9 ${PID}
+		return 0
+	else
+		# There still is a running noad process
+		return 1
+	fi
+}
+
+check_noad() {
+	local PIDOF=pidof
+	local NOAD=/usr/bin/noad
+
+	local PIDS=$(${PIDOF} ${NOAD})
+	local PID
+	local still_running=0
+	for PID in $PIDS; do
+		check_runtime "${PID}"
+		[ "$?" = "1" ] && still_running=1
+	done
+
+	if [ "${still_running}" -gt "0" ]; then
+		# stop shutdown
+		shutdown_abort_can_force "noad is running"
+	fi
+}
+
+check_noad
diff --git a/media-video/noad/files/reccmds.noad.conf b/media-video/noad/files/reccmds.noad.conf
new file mode 100644
index 000000000000..5d35495a90b8
--- /dev/null
+++ b/media-video/noad/files/reccmds.noad.conf
@@ -0,0 +1 @@
+Scan for Commercials (noad)		:/usr/share/vdr/bin/noad-reccmd
diff --git a/media-video/noad/files/record-50-noad.sh b/media-video/noad/files/record-50-noad.sh
new file mode 100644
index 000000000000..c2e92a1d9a66
--- /dev/null
+++ b/media-video/noad/files/record-50-noad.sh
@@ -0,0 +1,66 @@
+#
+# Joerg Bornkessel <hd_brummy@gentoo.org>
+# Mathias Schwarzott <zzam@gentoo.org>
+#
+
+. /etc/conf.d/vdraddon.noad
+
+CMD="/usr/bin/noad"
+
+# Parameter to start NoAd
+# parameter are "no | yes"
+
+FORCE_OFFLINE_SCAN=no
+
+if [ "${VDR_RECORD_STATE}" = "reccmd" ]; then
+	# script started from reccmd
+	FORCE_OFFLINE_SCAN=yes
+	VDR_RECORD_STATE=after
+fi
+
+
+if [ "${FORCE_OFFLINE_SCAN}" != "yes" ]; then
+	# allow it to abort on certain conditions
+
+	# automatic noad scan disabled
+	[ "${VDR_USE_NOAD}" = "yes" ] || return
+
+	# ptsmarks existing
+	if [ "${NOAD_ONLY_SCAN_IF_NO_PTSMARKS}" = "yes" ]; then
+		[ -f "${VDR_RECORD_NAME}/ptsmarks.vdr" ] && return
+	fi
+
+	# marks existing
+	if [ "${NOAD_ONLY_SCAN_IF_NO_MARKS}" = "yes" ]; then
+		[ -f "${VDR_RECORD_NAME}/marks.vdr" ] && return
+	fi
+
+	# Add Online-scanning parameter
+	case "${NOAD_ONLINE}" in
+		live|yes)
+			CMD="${CMD} --online=1"
+			;;
+		all)
+			CMD="${CMD} --online=2"
+			;;
+		no)
+			# abort stage "before" here
+			[ "${VDR_RECORD_STATE}" = "before" ] && return
+			;;
+	esac
+fi
+
+[ "${NOAD_AC3}" = "yes" ] && CMD="${CMD} -a"
+[ "${NOAD_JUMP}" = "yes" ] && CMD="${CMD} -j"
+[ "${NOAD_OVERLAP}" = "yes" ] && CMD="${CMD} -o"
+[ "${NOAD_MESSAGES}" = "yes" ] && CMD="${CMD} -O"
+
+: ${NOAD_NICE_LEVEL:=18}
+if [ "${NOAD_NICE_LEVEL}" != "no" ]; then
+	NOAD_NICE_LEVEL=$(($NOAD_NICE_LEVEL+0))
+	CMD="nice -n ${NOAD_NICE_LEVEL} ${CMD}"
+fi
+
+CMD="${CMD} ${NOAD_PARAMETER}"
+${CMD} "${VDR_RECORD_STATE}" "${VDR_RECORD_NAME}" 
+
diff --git a/media-video/noad/metadata.xml b/media-video/noad/metadata.xml
new file mode 100644
index 000000000000..b76754b18b74
--- /dev/null
+++ b/media-video/noad/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vdr@gentoo.org</email>
+		<name>Gentoo VDR Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+	<use>
+		<flag name="libmpeg2">Support for libmpeg2 library</flag>
+	</use>
+	<longdescription lang="en">
+		Mark commercial Breaks in VDR records. 
+	</longdescription>
+</pkgmetadata>
diff --git a/media-video/noad/noad-0.7.3-r1.ebuild b/media-video/noad/noad-0.7.3-r1.ebuild
new file mode 100644
index 000000000000..2a433cde6db5
--- /dev/null
+++ b/media-video/noad/noad-0.7.3-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="Mark commercial Breaks in VDR records"
+HOMEPAGE="http://noad.heliohost.org/"
+SRC_URI="http://noad.heliohost.org/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="ffmpeg"
+
+RDEPEND="media-gfx/imagemagick
+	media-libs/libmpeg2:=
+	ffmpeg? ( virtual/ffmpeg )
+	!media-plugins/vdr-markad"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	EPATCH_FORCE=yes EPATCH_SUFFIX=diff EPATCH_SOURCE="${FILESDIR}"/patches-${PV%.*}.x epatch
+
+	if has_version '>=media-video/vdr-1.7.15'; then
+		sed -i -e 's:2001:6419:' -i svdrpc.cpp || die
+	fi
+
+	sed -i -e '/CXXFLAGS.*O3/d' configure.ac || die #426746
+
+	sed -i \
+		-e "s:-lMagick++:$($(tc-getPKG_CONFIG) --libs-only-l Magick++):" \
+		Makefile.am || die #467134
+
+	# FIXME: --with-tools, markpics will compile but showindex won't!
+	sed -i \
+		-e '/^noinst_PROGRAMS/s:@TOOLSRC@::' \
+		-e '/^EXTRA_PROGRAMS/s:showindex::' \
+		Makefile.am || die
+
+	# ld: audiotools.o: undefined reference to symbol 'av_free@@LIBAVUTIL_51'
+	if use ffmpeg; then
+		sed -i -e 's:-lavcodec:& -lavutil:' configure.ac || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-magick \
+		--with-mpeginclude=/usr/include/mpeg2dec \
+		--with-tools \
+		$(usex ffmpeg '--with-ffmpeg --with-ffmpeginclude=/usr/include' '')
+}
+
+src_install() {
+	dobin noad markpics # showindex
+
+	dodoc README INSTALL
+	# example scripts are installed as dokumentation
+	dodoc allnewnoad allnoad allnoadnice clearlogos noadifnew stat2html
+
+	newconfd "${FILESDIR}"/confd_vdraddon.noad vdraddon.noad
+
+	insinto /usr/share/vdr/record
+	doins "${FILESDIR}"/record-50-noad.sh
+
+	insinto /usr/share/vdr/shutdown
+	doins "${FILESDIR}"/pre-shutdown-15-noad.sh
+
+	insinto /etc/vdr/reccmds
+	doins "${FILESDIR}"/reccmds.noad.conf
+
+	exeinto /usr/share/vdr/bin
+	doexe "${FILESDIR}"/noad-reccmd
+}
+
+pkg_postinst() {
+	elog
+	elog "To integrate noad in VDR you should do this:"
+	elog
+	elog "start and set Parameter in /etc/conf.d/vdraddon.noad"
+	elog
+	elog "Note: You can use here all pararmeters for noad,"
+	elog "please look in the documentation of noad."
+}
diff --git a/media-video/noad/noad-0.8.6-r1.ebuild b/media-video/noad/noad-0.8.6-r1.ebuild
new file mode 100644
index 000000000000..ae96bfd4fd50
--- /dev/null
+++ b/media-video/noad/noad-0.8.6-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="Mark commercial breaks in VDR recordings"
+HOMEPAGE="http://noad.net23.net/"
+SRC_URI="http://noad.net23.net/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+ffmpeg imagemagick libmpeg2"
+
+RDEPEND="
+	libmpeg2? ( media-libs/libmpeg2:= )
+	ffmpeg? ( virtual/ffmpeg )
+	imagemagick? ( media-gfx/imagemagick )
+	!media-plugins/vdr-markad"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+REQUIRED_USE="|| ( ffmpeg libmpeg2 )"
+
+src_prepare() {
+	sed -i -e 's:2001:6419:' svdrpc.cpp main.cpp
+
+	# tested libav-9, ffmepg-2.2.9
+	epatch "${FILESDIR}/patches-0.8.x/${P}-libav9.diff" \
+		"${FILESDIR}/patches-0.8.x/${P}-ffmpeg25.patch"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(usex imagemagick '--with-magick') \
+		$(usex ffmpeg '' '--without-ffmpeg') \
+		$(usex libmpeg2 '' '--without-libmpeg2') \
+		--with-tools
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"		# see bug #469810
+}
+
+src_install() {
+	dobin noad showindex checkMarks
+	use imagemagick && dobin markpics
+
+	dodoc README INSTALL
+	# example scripts are installed as dokumentation
+	dodoc allnewnoad allnoad allnoadnice clearlogos noadcall.sh noadifnew stat2html statupd
+
+	newconfd "${FILESDIR}"/confd_vdraddon.noad vdraddon.noad
+
+	insinto /usr/share/vdr/record
+	doins "${FILESDIR}"/record-50-noad.sh
+
+	insinto /usr/share/vdr/shutdown
+	doins "${FILESDIR}"/pre-shutdown-15-noad.sh
+
+	insinto /etc/vdr/reccmds
+	doins "${FILESDIR}"/reccmds.noad.conf
+
+	exeinto /usr/share/vdr/bin
+	doexe "${FILESDIR}"/noad-reccmd
+}
+
+pkg_postinst() {
+	elog
+	elog "To integrate noad in VDR you should do this:"
+	elog
+	elog "start and set Parameter in /etc/conf.d/vdraddon.noad"
+	elog
+	elog "Note: You can use here all parameters for noad,"
+	elog "please look in the documentation of noad."
+}
diff --git a/media-video/noad/noad-0.8.6-r2.ebuild b/media-video/noad/noad-0.8.6-r2.ebuild
new file mode 100644
index 000000000000..cd819660440a
--- /dev/null
+++ b/media-video/noad/noad-0.8.6-r2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="Mark commercial breaks in VDR recordings"
+HOMEPAGE="http://noad.net23.net/"
+SRC_URI="http://noad.net23.net/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ffmpeg imagemagick libmpeg2"
+
+RDEPEND="
+	libmpeg2? ( media-libs/libmpeg2:= )
+	ffmpeg? ( virtual/ffmpeg )
+	imagemagick? ( media-gfx/imagemagick )
+	!media-plugins/vdr-markad"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+REQUIRED_USE="|| ( ffmpeg libmpeg2 )"
+
+src_prepare() {
+	sed -i -e 's:2001:6419:' svdrpc.cpp main.cpp
+
+	# wrt bug 575494
+	sed -e "s:CODEC_ID_MP3:AV_CODEC_ID_MP3:" -i audiotools.cpp
+	sed -e "sCODEC_ID_PROBE:AV_CODEC_ID_PROBE:" -i ffmpeg_decoder.cpp
+
+	# tested libav-9, ffmepg-2.2.9
+	epatch "${FILESDIR}/patches-0.8.x/${P}-libav9.diff" \
+		"${FILESDIR}/patches-0.8.x/${P}-ffmpeg25.patch"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(usex imagemagick '--with-magick') \
+		$(usex ffmpeg '' '--without-ffmpeg') \
+		$(usex libmpeg2 '' '--without-libmpeg2') \
+		--with-tools
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"		# see bug #469810
+}
+
+src_install() {
+	dobin noad showindex checkMarks
+	use imagemagick && dobin markpics
+
+	dodoc README INSTALL
+	# example scripts are installed as dokumentation
+	dodoc allnewnoad allnoad allnoadnice clearlogos noadcall.sh noadifnew stat2html statupd
+
+	newconfd "${FILESDIR}"/confd_vdraddon.noad vdraddon.noad
+
+	insinto /usr/share/vdr/record
+	doins "${FILESDIR}"/record-50-noad.sh
+
+	insinto /usr/share/vdr/shutdown
+	doins "${FILESDIR}"/pre-shutdown-15-noad.sh
+
+	insinto /etc/vdr/reccmds
+	doins "${FILESDIR}"/reccmds.noad.conf
+
+	exeinto /usr/share/vdr/bin
+	doexe "${FILESDIR}"/noad-reccmd
+}
+
+pkg_postinst() {
+	elog
+	elog "To integrate noad in VDR you should do this:"
+	elog
+	elog "start and set Parameter in /etc/conf.d/vdraddon.noad"
+	elog
+	elog "Note: You can use here all parameters for noad,"
+	elog "please look in the documentation of noad."
+}
diff --git a/media-video/nvidia-settings/Manifest b/media-video/nvidia-settings/Manifest
new file mode 100644
index 000000000000..68bf16cfb055
--- /dev/null
+++ b/media-video/nvidia-settings/Manifest
@@ -0,0 +1,10 @@
+DIST nvidia-settings-340.58.tar.bz2 1549850 SHA256 21cd29fea50e62766d1985c84f6d6de8efa911e32abcbff8e7ccf0e43ebe25c0 SHA512 4c581a940c99fac28564ab6154f47cae496ebfda6339b7f10c5decf8fea52b6c12e5b63dfcf78f8365909e49539560a50338edb17117881b6a03c196bd51836c WHIRLPOOL b486032339c4f8c4767239e3a4b001667bceb2c3ef5f3e94f08d1c54c60a958e1c76456415769ce9ff0503b6eb3d903aa89599a0234e08447c33671c598e66c8
+DIST nvidia-settings-355.11.tar.bz2 1570699 SHA256 999ebc9e12ca1a6b6195d439f08aac0b9420f8117e42cac62dccd2872dabb74b SHA512 7565e3d809c5f27ec9ca092a6369cf89ca7571e0cb1b1285c50192cc1cc763e95316d9c71d06ed2333077b97946318e825c6d672f48549b58bd41faa673fb49c WHIRLPOOL 700a0c70fe63d4379d4ccb9dc7aa4350fbdc8b0c67d0a2d13c117d06b81fdf3fc7f1a690f9293b20f03a1876494d63ad5d4ec2536573f726d23cdbfa49c36c4e
+DIST nvidia-settings-358.16.tar.bz2 1571104 SHA256 8cd78df738a824e282771755ae9a41d5b194b15f9df96b9fd23fcf3005967d35 SHA512 0438aa2599e98f68a04c9f663f4ef9b05092df512fbca40ad0fe17e25ca4d940d02cc55e9fd44a2551950a2a30782d1e48553c4bebd071bfff280869a6dde556 WHIRLPOOL 60b7e9abba3163ac877a3a9d944cf72352e28d2fd1a3af0996d3b7d40ef48be7f057c1063f9ca61c693cbf1bff57be61704f13d941220bf74a8049954f87154d
+EBUILD nvidia-settings-340.58-r1.ebuild 1604 SHA256 1c447180ff3b5890638f77d22b6591f0f341049969626e74cd7b249c79395b61 SHA512 321b2f33a852b56979b9460fbe9334e2d72761ddf903e517193c85da2a604d50ed0001364a388048b5030564d099fd6b36286249721b493090849f98ea609c8b WHIRLPOOL 25550c69deb86ff341f107312bf8adb791d3623b5fc8de6fc622ed3fd41fc96eaf6c2e8f00566ae6744ab9aca7e7c096f7b831b2bd04c5cb70fd6a07750503b2
+EBUILD nvidia-settings-340.58.ebuild 1604 SHA256 437d1db6ab42c7787aedef62d1a61ff609c3326f1fc1279afbc11e9030477673 SHA512 b80c396749fbc44ad31d0077b929445af7f54fccde79a85549dc8186235251f0ab14594a162111774f923e1ebee630c2ef5639add127677b626f75947260e6e3 WHIRLPOOL cfa7cbf22e1035c95c0ffaa0f50c0665b9ea9bc86732db99b4261a9a21aba1272ead88a12ba35daf88493a718d9c9c6da50ea81563c99c5730818b094710bc00
+EBUILD nvidia-settings-355.11.ebuild 1747 SHA256 c9751b9e4189f17704bb80ff0ce2170f626f8fcedcee2cfa47a2701aae0c4e06 SHA512 f781d7819c68c213f8ad9ed1bab1b79ebb89cc51c75320a237dca8cab317d3fa83f27955e888ed20f044c244e9fa803caab687440e502c7e4a2443352db0e06e WHIRLPOOL 38b6a985a312eba40c6421d7ad741d7f378858f8d6a6c5348822717b47956a5f4247154d5dd271c0daa660958d19c456de8ca4739ea794305ff6a6790384929a
+EBUILD nvidia-settings-358.16.ebuild 1747 SHA256 4ec528494635fe8750be7c21377c0830a55990973cd2e45df3ce555ce8bc62a5 SHA512 ccf2c17f322da4fc98ce30747d27e3360133c2f8a6d9cc131dfd0e95ac2da446d411f9030082c09308924d91740d122d075ec29981f700b55aee832f93a6a8bf WHIRLPOOL 959348c7d6199f9bcf691ad0d8f2c2e62120f42104b334d760f4503ccc956393af702af1caed3812bab46eff16b9b59221c9d00909d7df9fa60a81435b93665e
+MISC ChangeLog 3802 SHA256 b4cb575fdf79eb9b03742bb9e21bcf000a46946137bf635d3cc132bd6a451299 SHA512 d53b7fc2e1ca5fbb7994b6eae5b382a9db7bc4074a64b47465e6bb5d16854992814c17eca1f51e4b1e6e7f2ca563beca275e6cd3e84e1c917600405cf8685263 WHIRLPOOL b9b03d0bbd6bda98a71b892808ab9fcab7030ec9340502829cf8eef4e4ad39d10c11d61e60ff980e8d071f7a01286cc65fb98ea1eda992b68bcff6b87167563a
+MISC ChangeLog-2015 27808 SHA256 8b8cd7aaf2ebf9f00e45d9f0c80e04f7581bfcab0ee4a5f60bf7265f61dffb21 SHA512 a345aa8912e38a5397177e5da8ca2bb123c955a329f86e6b05736e2a53b4476eff1b7bc954d82ef76d96bcaef31cb5ba88de4c2625ef0ea53e0f3e4b0b8855ef WHIRLPOOL 551d137bedcb0147c9250017635c8eaddaca6430e3ce52fadd9bc92a0665aebac81025337b974d64d20bdd943d1dbce586352da34177ac1daf60998bc06f89cb
+MISC metadata.xml 246 SHA256 ff9f9ebd2b3419f67605917ffebc8e7d7711a9e84b3cc9d6c08f8167894d384b SHA512 c21e6c80b2ebfaad5808238bdadb375dfc148dc6a649c40a631798e07066e58210f7a44ee95803c02a7b0e36e724424e7606d91203c12c13b36d030eceb5f77e WHIRLPOOL e54e9f71abb899ac14912676a81dc0505f9405b526cebcccf81be1bc7665ae2c4aab2c5ea84bf3be717db084928462adec527441fd1a781f4c5e88a29fb7ef19
diff --git a/media-video/nvidia-settings/metadata.xml b/media-video/nvidia-settings/metadata.xml
new file mode 100644
index 000000000000..c2b094fe3acf
--- /dev/null
+++ b/media-video/nvidia-settings/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<use>
+		<flag name="gtk3">Additionally build the GTK 3 library</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-video/nvidia-settings/nvidia-settings-340.58-r1.ebuild b/media-video/nvidia-settings/nvidia-settings-340.58-r1.ebuild
new file mode 100644
index 000000000000..5062a31c59b6
--- /dev/null
+++ b/media-video/nvidia-settings/nvidia-settings-340.58-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="NVIDIA Linux X11 Settings Utility"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+IUSE="examples"
+
+COMMON_DEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXxf86vm
+	x11-libs/gtk+:2
+	x11-libs/gdk-pixbuf[X]
+	media-libs/mesa
+	x11-libs/pango[X]
+	x11-libs/libXv
+	x11-libs/libXrandr
+	dev-libs/glib:2
+	dev-libs/jansson"
+
+RDEPEND="
+	x11-drivers/nvidia-drivers:0/340
+	${COMMON_DEPEND}
+	x11-libs/libvdpau"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/xproto"
+
+src_compile() {
+	einfo "Building libXNVCtrl..."
+	emake -C src/ \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)" \
+		build-xnvctrl
+
+	einfo "Building nvidia-settings..."
+	emake -C src/ \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getLD)" \
+		STRIP_CMD="$(type -P true)" \
+		NV_VERBOSE=1 \
+		NV_USE_BUNDLED_LIBJANSSON=0
+}
+
+src_install() {
+	emake -C src/ DESTDIR="${D}" PREFIX=/usr NV_USE_BUNDLED_LIBJANSSON=0 install
+
+	insinto /usr/$(get_libdir)
+	doins src/libXNVCtrl/libXNVCtrl.a
+
+	insinto /usr/include/NVCtrl
+	doins src/libXNVCtrl/*.h
+
+#	doicon doc/${PN}.png # Installed through nvidia-drivers
+	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Settings
+
+	# bug 412569 - Installed through nvidia-drivers
+#	rm -rf "${D}"/usr/share/man
+
+	dodoc doc/*.txt
+
+	if use examples; then
+		docinto examples/
+		dodoc samples/*.c
+		dodoc samples/README
+	fi
+}
diff --git a/media-video/nvidia-settings/nvidia-settings-340.58.ebuild b/media-video/nvidia-settings/nvidia-settings-340.58.ebuild
new file mode 100644
index 000000000000..c20dca0ad414
--- /dev/null
+++ b/media-video/nvidia-settings/nvidia-settings-340.58.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="NVIDIA Linux X11 Settings Utility"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* amd64 x86 ~x86-fbsd"
+IUSE="examples"
+
+COMMON_DEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXxf86vm
+	x11-libs/gtk+:2
+	x11-libs/gdk-pixbuf[X]
+	media-libs/mesa
+	x11-libs/pango[X]
+	x11-libs/libXv
+	x11-libs/libXrandr
+	dev-libs/glib:2
+	dev-libs/jansson"
+
+RDEPEND="
+	~x11-drivers/nvidia-drivers-340.93
+	${COMMON_DEPEND}
+	x11-libs/libvdpau"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/xproto"
+
+src_compile() {
+	einfo "Building libXNVCtrl..."
+	emake -C src/ \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)" \
+		build-xnvctrl
+
+	einfo "Building nvidia-settings..."
+	emake -C src/ \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getLD)" \
+		STRIP_CMD="$(type -P true)" \
+		NV_VERBOSE=1 \
+		NV_USE_BUNDLED_LIBJANSSON=0
+}
+
+src_install() {
+	emake -C src/ DESTDIR="${D}" PREFIX=/usr NV_USE_BUNDLED_LIBJANSSON=0 install
+
+	insinto /usr/$(get_libdir)
+	doins src/libXNVCtrl/libXNVCtrl.a
+
+	insinto /usr/include/NVCtrl
+	doins src/libXNVCtrl/*.h
+
+#	doicon doc/${PN}.png # Installed through nvidia-drivers
+	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Settings
+
+	# bug 412569 - Installed through nvidia-drivers
+#	rm -rf "${D}"/usr/share/man
+
+	dodoc doc/*.txt
+
+	if use examples; then
+		docinto examples/
+		dodoc samples/*.c
+		dodoc samples/README
+	fi
+}
diff --git a/media-video/nvidia-settings/nvidia-settings-355.11.ebuild b/media-video/nvidia-settings/nvidia-settings-355.11.ebuild
new file mode 100644
index 000000000000..373cf95cc307
--- /dev/null
+++ b/media-video/nvidia-settings/nvidia-settings-355.11.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="NVIDIA Linux X11 Settings Utility"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+IUSE="examples gtk3"
+
+COMMON_DEPEND="
+	x11-libs/gtk+:2
+	gtk3? ( x11-libs/gtk+:3 )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXxf86vm
+	x11-libs/gdk-pixbuf[X]
+	media-libs/mesa
+	x11-libs/pango[X]
+	x11-libs/libXv
+	x11-libs/libXrandr
+	dev-libs/glib:2
+	dev-libs/jansson
+	x11-libs/cairo
+	>=x11-libs/libvdpau-1.0"
+
+RDEPEND="${COMMON_DEPEND}
+	x11-drivers/nvidia-drivers:0/355"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/xproto"
+
+src_compile() {
+	einfo "Building libXNVCtrl..."
+	emake -C src/ \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)" \
+		build-xnvctrl
+
+	einfo "Building nvidia-settings..."
+	emake -C src/ \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getLD)" \
+		STRIP_CMD="$(type -P true)" \
+		NV_VERBOSE=1 \
+		NV_USE_BUNDLED_LIBJANSSON=0 \
+		NVML_AVAILABLE=0 \
+		GTK3_AVAILABLE=$(usex gtk3 1 0)
+}
+
+src_install() {
+	emake -C src/ DESTDIR="${D}" PREFIX=/usr NV_USE_BUNDLED_LIBJANSSON=0 GTK3_AVAILABLE=$(usex gtk3 1 0) install
+
+	insinto /usr/$(get_libdir)
+	doins src/libXNVCtrl/libXNVCtrl.a
+
+	insinto /usr/include/NVCtrl
+	doins src/libXNVCtrl/*.h
+
+#	doicon doc/${PN}.png # Installed through nvidia-drivers
+	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Settings
+
+	# bug 412569 - Installed through nvidia-drivers
+#	rm -rf "${D}"/usr/share/man
+
+	dodoc doc/*.txt
+
+	if use examples; then
+		docinto examples/
+		dodoc samples/*.c
+		dodoc samples/README
+	fi
+}
diff --git a/media-video/nvidia-settings/nvidia-settings-358.16.ebuild b/media-video/nvidia-settings/nvidia-settings-358.16.ebuild
new file mode 100644
index 000000000000..c2b74e3d2af7
--- /dev/null
+++ b/media-video/nvidia-settings/nvidia-settings-358.16.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="NVIDIA Linux X11 Settings Utility"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+IUSE="examples gtk3"
+
+COMMON_DEPEND="
+	x11-libs/gtk+:2
+	gtk3? ( x11-libs/gtk+:3 )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXxf86vm
+	x11-libs/gdk-pixbuf[X]
+	media-libs/mesa
+	x11-libs/pango[X]
+	x11-libs/libXv
+	x11-libs/libXrandr
+	dev-libs/glib:2
+	dev-libs/jansson
+	x11-libs/cairo
+	>=x11-libs/libvdpau-1.0"
+
+RDEPEND="${COMMON_DEPEND}
+	x11-drivers/nvidia-drivers:0/358"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/xproto"
+
+src_compile() {
+	einfo "Building libXNVCtrl..."
+	emake -C src/ \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)" \
+		build-xnvctrl
+
+	einfo "Building nvidia-settings..."
+	emake -C src/ \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getLD)" \
+		STRIP_CMD="$(type -P true)" \
+		NV_VERBOSE=1 \
+		NV_USE_BUNDLED_LIBJANSSON=0 \
+		NVML_AVAILABLE=0 \
+		GTK3_AVAILABLE=$(usex gtk3 1 0)
+}
+
+src_install() {
+	emake -C src/ DESTDIR="${D}" PREFIX=/usr NV_USE_BUNDLED_LIBJANSSON=0 GTK3_AVAILABLE=$(usex gtk3 1 0) install
+
+	insinto /usr/$(get_libdir)
+	doins src/libXNVCtrl/libXNVCtrl.a
+
+	insinto /usr/include/NVCtrl
+	doins src/libXNVCtrl/*.h
+
+#	doicon doc/${PN}.png # Installed through nvidia-drivers
+	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Settings
+
+	# bug 412569 - Installed through nvidia-drivers
+#	rm -rf "${D}"/usr/share/man
+
+	dodoc doc/*.txt
+
+	if use examples; then
+		docinto examples/
+		dodoc samples/*.c
+		dodoc samples/README
+	fi
+}
diff --git a/media-video/nvidia-video-codec/Manifest b/media-video/nvidia-video-codec/Manifest
new file mode 100644
index 000000000000..c39bbcdca243
--- /dev/null
+++ b/media-video/nvidia-video-codec/Manifest
@@ -0,0 +1,7 @@
+DIST nvidia-video-codec-7.0.1.tar.gz 44283 SHA256 c2e4c3404750ccdc9fedd050398e636f6016457adcc1280db8cc64f22cc8a9b9 SHA512 246e7fee4430f755ca93f1343d2628c5a6de8fdb5826694eabb777ec693f5fa944147a582a96fce38f318d1a9e60e94ca94ef4e27313e3b38970b750fa17d3b4 WHIRLPOOL cde180735508f2f61504ff9ec02a852e56e9888320b4846ea6de7fd2b3c23accc42734faa52a6dd65bbddd40d03d8bab0c6c0898078cdcafaa0dae44ef28f1e8
+DIST nvidia-video-codec-7.1.9.tar.gz 44547 SHA256 91e5af19839b49a72bbb005ea5d2b08637419ff3aca1fc91565be21181055c02 SHA512 8890c668b1ee73de9c6447c0d2ae9ab857927694c7de038d6028ac5a5205c95c0c3629ad8a3950269c7693cd877cf9c9e24f5c4d332a46d27ac79747f2383685 WHIRLPOOL 9f5a31fd86ec6c40989227d01e83bab50b9ad8fce30f41442a75a98a8fca0d52f69fdb4f46837452526207792336148772b599d1b2b15badb6e0692a8ba73e85
+DIST nvidia-video-codec-8.0.14.tar.gz 47388 SHA256 4973e3205a2f4b6b7313521f6df6006f35c21bfc2a085b879b364b2760f5545d SHA512 08f8ff6b9c4a595716d423262f96e4647df1e2fa3d57a98ac2c26da031a15d61600aeb84c97c7d05fdfd42cfcf5800be58aff49ae1379f02c0b4408ddda2269c WHIRLPOOL 2ffa8273019cd4575578610898c9f1efead1f359ee9c233cc7acde50085d148a925605ce6c6a0030656b73a26b410c4ee6ee866a49eb90eef9a96396801d5fa9
+EBUILD nvidia-video-codec-7.0.1.ebuild 543 SHA256 0de1a56231e7907c2b3017d9d6a2c6b21033decf15beddafe228056297ac56f2 SHA512 450fc1260cea3a1295ad49c56718398f1711917169b3d51b7596725ccefccf6b898d3d5a6f73e9d4c0366d21d53ba257c44af31260894f61135392eea18b8a9a WHIRLPOOL be3d5764597e742a9603eeb0f39e1ed2cce95689b72b345f5b30aa5625fcce4095583f2d50078d952c63a7a07cb89a054bdd956a3bdf09e0c450e185a02a352e
+EBUILD nvidia-video-codec-7.1.9.ebuild 543 SHA256 0de1a56231e7907c2b3017d9d6a2c6b21033decf15beddafe228056297ac56f2 SHA512 450fc1260cea3a1295ad49c56718398f1711917169b3d51b7596725ccefccf6b898d3d5a6f73e9d4c0366d21d53ba257c44af31260894f61135392eea18b8a9a WHIRLPOOL be3d5764597e742a9603eeb0f39e1ed2cce95689b72b345f5b30aa5625fcce4095583f2d50078d952c63a7a07cb89a054bdd956a3bdf09e0c450e185a02a352e
+EBUILD nvidia-video-codec-8.0.14.ebuild 543 SHA256 0de1a56231e7907c2b3017d9d6a2c6b21033decf15beddafe228056297ac56f2 SHA512 450fc1260cea3a1295ad49c56718398f1711917169b3d51b7596725ccefccf6b898d3d5a6f73e9d4c0366d21d53ba257c44af31260894f61135392eea18b8a9a WHIRLPOOL be3d5764597e742a9603eeb0f39e1ed2cce95689b72b345f5b30aa5625fcce4095583f2d50078d952c63a7a07cb89a054bdd956a3bdf09e0c450e185a02a352e
+MISC metadata.xml 322 SHA256 8a9354103a4a17b54131768ef2aa76a9586b142b3c2ace896c044a4b4581a796 SHA512 605ce8c99fd9be9627fd9b3afd491df585b9e5aff955af1964fb51482c4fa0b18e8047cc3715be2977bad4ace03cfe0330eed44fdaa5267feb9c2840cd233870 WHIRLPOOL 478ad44443ab65d88ff1ffea36d6b95fcdfee4f2303ea2ffe84b69179b76ee1c8913579babd4cbac05ce05da54bb1e0ca9742eeb8beab0d9974db1c4988b3961
diff --git a/media-video/nvidia-video-codec/metadata.xml b/media-video/nvidia-video-codec/metadata.xml
new file mode 100644
index 000000000000..004fbed2edda
--- /dev/null
+++ b/media-video/nvidia-video-codec/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>media-video@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">lu-zero/nvidia-video-codec</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-video/nvidia-video-codec/nvidia-video-codec-7.0.1.ebuild b/media-video/nvidia-video-codec/nvidia-video-codec-7.0.1.ebuild
new file mode 100644
index 000000000000..e1e943fe0b47
--- /dev/null
+++ b/media-video/nvidia-video-codec/nvidia-video-codec-7.0.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Redistributable headers to build cuvid and nvenc"
+HOMEPAGE="https://github.com/lu-zero/nvidia-video-codec"
+SRC_URI="https://github.com/lu-zero/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-util/nvidia-cuda-toolkit-7.5
+		>=x11-drivers/nvidia-drivers-367.35"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	insinto /opt/${PN}/include
+	doins *.h
+	dodoc README.md
+}
diff --git a/media-video/nvidia-video-codec/nvidia-video-codec-7.1.9.ebuild b/media-video/nvidia-video-codec/nvidia-video-codec-7.1.9.ebuild
new file mode 100644
index 000000000000..e1e943fe0b47
--- /dev/null
+++ b/media-video/nvidia-video-codec/nvidia-video-codec-7.1.9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Redistributable headers to build cuvid and nvenc"
+HOMEPAGE="https://github.com/lu-zero/nvidia-video-codec"
+SRC_URI="https://github.com/lu-zero/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-util/nvidia-cuda-toolkit-7.5
+		>=x11-drivers/nvidia-drivers-367.35"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	insinto /opt/${PN}/include
+	doins *.h
+	dodoc README.md
+}
diff --git a/media-video/nvidia-video-codec/nvidia-video-codec-8.0.14.ebuild b/media-video/nvidia-video-codec/nvidia-video-codec-8.0.14.ebuild
new file mode 100644
index 000000000000..e1e943fe0b47
--- /dev/null
+++ b/media-video/nvidia-video-codec/nvidia-video-codec-8.0.14.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Redistributable headers to build cuvid and nvenc"
+HOMEPAGE="https://github.com/lu-zero/nvidia-video-codec"
+SRC_URI="https://github.com/lu-zero/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-util/nvidia-cuda-toolkit-7.5
+		>=x11-drivers/nvidia-drivers-367.35"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	insinto /opt/${PN}/include
+	doins *.h
+	dodoc README.md
+}
diff --git a/media-video/nvidia_video_sdk/Manifest b/media-video/nvidia_video_sdk/Manifest
new file mode 100644
index 000000000000..4bbaf7d7b3d2
--- /dev/null
+++ b/media-video/nvidia_video_sdk/Manifest
@@ -0,0 +1,4 @@
+DIST nvidia_video_sdk_6.0.1.zip 21310785 SHA256 05227ee4015dc9bdf52b4fe8b3ba5a077d80962f35fa3b76d25288adb1dd0122 SHA512 1ab398010f5018482170bf722d84278b1920f003119143911fbb0a811e6f1237a039b4120011cc141728f3fd3d7667295ce8703717eafad82b4675bb3211df87 WHIRLPOOL 4af12758753221975dddc917fc9753b065f526b8cceacd0ab8d82ad3fd88ae7a8c53d4d49f0cce3be4073f6fd4f7ec7261a0d700d0b93f914b263c4c5403ff35
+EBUILD nvidia_video_sdk-6.0.1.ebuild 1144 SHA256 34e3d11c1968e8934753dbea1916b2d1043a2d7daacca8d46778d806843fc656 SHA512 d5a6878d631ef430b42673b3898f27d5cae06e3831e0a3f13994441be74ecf9c92fe0e8ebec1d1e72bf8763f841617bc59c0610d0fe71cab1bc732a9db672509 WHIRLPOOL 22fb429aa9d5f24b6c9d0db177e11564cf25764c306c4b6cb54478e6f2ab9211e948fa6462c2e368bb1501b72737d356ec61ce7ba8027609b13908aa4c8f4f39
+MISC ChangeLog 991 SHA256 ca103985008cdef749061fb162f69b775cf385ce0fbde5e688d3dba441f97404 SHA512 675f67b287a16d5b09aec50ced642175a491ee1639e18c4cdc80505c4ae938a915ee53863262d029249d185bb7479c9098b7ae196486aceadb7d0e3f9df2a425 WHIRLPOOL 870cadf1f8bc8d3f1e5c1c7d60e3745809438f49f32668341dce617754151900c162469c0bc0fbf840d79f16982c334141b728694118b9950873a00d40f92ec7
+MISC metadata.xml 304 SHA256 167927f1007d93dfba4cdf4a27c6e3221440bbdb51e17fc0a8c345b4c5bdc35e SHA512 df63226896147be1912321f5b73e1b1d1e34447c7bd6f7b6eefbe7b63e65fe9000e01234aa5a93ea1bb65c83ad7d3134ad17a19d3470daae568b1be13dc36aef WHIRLPOOL c47e8c64c5e84f4c1b29af905217928a6d46395c2e775de61031f1d78734f646fe8fc73ead097c4c58e4e63389092e2393074c2cf02095902ba1fbe703bbaf39
diff --git a/media-video/nvidia_video_sdk/metadata.xml b/media-video/nvidia_video_sdk/metadata.xml
new file mode 100644
index 000000000000..3ccfba292b0d
--- /dev/null
+++ b/media-video/nvidia_video_sdk/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>media-video@gentoo.org</email>
+  </maintainer>
+  <use>
+	<flag name="tools">Build and install example tools.</flag>
+  </use>
+</pkgmetadata>
diff --git a/media-video/nvidia_video_sdk/nvidia_video_sdk-6.0.1.ebuild b/media-video/nvidia_video_sdk/nvidia_video_sdk-6.0.1.ebuild
new file mode 100644
index 000000000000..01f9d9e605a7
--- /dev/null
+++ b/media-video/nvidia_video_sdk/nvidia_video_sdk-6.0.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit versionator toolchain-funcs
+
+MY_P="${PN}_${PV}"
+
+DESCRIPTION="NVIDIA Video Codec SDK"
+HOMEPAGE="https://developer.nvidia.com/nvidia-video-codec-sdk"
+SRC_URI="https://developer.nvidia.com/video-sdk-$(replace_all_version_separators '') -> ${MY_P}.zip"
+
+LICENSE="MIT tools? ( NVIDIA-CODEC-SDK )"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="tools"
+
+RDEPEND="
+	!media-video/nvenc
+	>=x11-drivers/nvidia-drivers-347.09"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S="${WORKDIR}/${MY_P}"
+
+TOOLS="NvEncoder NvEncoderPerf NvTranscoder NvEncoderLowLatency"
+
+src_compile() {
+	if use tools ; then
+		export EXTRA_LDFLAGS="${LDFLAGS}"
+		for i in ${TOOLS} ; do
+			pushd "${S}/Samples/${i}" || die
+			emake GCC="$(tc-getCXX)" CCFLAGS="${CXXFLAGS}"
+			popd
+		done
+	fi
+}
+
+src_install() {
+	if use tools ; then
+		for i in ${TOOLS}; do
+			dobin "${S}/Samples/${i}/${i}"
+		done
+		dodoc "${S}/Samples/NVIDIA_Video_Codec_SDK_Samples_Guide.pdf"
+	fi
+
+	dodoc doc/*.pdf ReadMe.txt Release_notes.txt
+
+	insinto /usr/include
+	doins Samples/common/inc/nvEncodeAPI.h
+}
diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
new file mode 100644
index 000000000000..7bc2e87b5dfe
--- /dev/null
+++ b/media-video/obs-studio/Manifest
@@ -0,0 +1,9 @@
+DIST obs-studio-18.0.2.tar.gz 6073678 SHA256 1cfbad3439b1d581b4f5b47792ccc4dae231acaf37178808811ff4e2b68feb0a SHA512 5d03791438e73e1b7689b319d4a7bb2235a178655061e816309a115026207db11053e3c27c08c5dde4f3638b3bb424ebb3bf3748bbbe828374a06abe75b2e39d WHIRLPOOL 66e3a425dd4029f3649e50fcc88d57f7e85133e16ae65e56b69d5e7ad584df37f6d51079419d47ec79397e321388c762715bab14f797f1fc40d1980cafa9c785
+DIST obs-studio-19.0.2.tar.gz 5509958 SHA256 c7846e09f13061587d844588c538276aec6d498c8f9a4518fc3d8bb206776f01 SHA512 8e2c720d713f6b3fdfb0ce64252cba3129644155be75e0942250bb616700ba62acdb04265a7a6d0ce9406282fbbf85d662d7bdc36736c36be89fd726c8bbf5a9 WHIRLPOOL 7200a787ef1afc848fabf52193210a3309456b799da8cbd083d5914723e2c721dc3f7269d5b23edee3fd61c61314c96f11c683b5585d13d8b19536e3480f1f5c
+DIST obs-studio-20.0.1.tar.gz 5610534 SHA256 3241667f180816b860622fd9ac572a86375a9a766ac45c69a886dcbdaf524643 SHA512 891be96bbe18a2de4af8efd2eaeb54c388332ac7d93a66efcc18208af9ef2dfe3981f81ba351bdb16a93b2d66bcfef4f5277d3d8746261f0beb1f324ed9a7534 WHIRLPOOL d43526496775a409c75212ab53c30ebe3d55250583761c58ab5bf9cbe958c5ac4174ea7a3692a133d0be58265862b9e4a62515afa85b429d4d601b0b102a1ec6
+EBUILD obs-studio-18.0.2.ebuild 2521 SHA256 6dae8e8027b9508804764ebaa541fdabad3bd83e3d1d45a02caae4e210f8b0f3 SHA512 a38744046a22b585760a7bb595216b52d7b4eb0068f61a6b7eb4c8638e1673911e1341fdf089d30363396dd95becef0794dd0066811db759d8859b7740afa319 WHIRLPOOL 3a8302fe33bdc6ca453f11c277edc25d61bf2630e332022e6dc329729ab72f724c66f6d620bb2080b33b6be1282d1e4939669e4862e99660bd08ccf06a3d6ab0
+EBUILD obs-studio-19.0.2.ebuild 2521 SHA256 6dae8e8027b9508804764ebaa541fdabad3bd83e3d1d45a02caae4e210f8b0f3 SHA512 a38744046a22b585760a7bb595216b52d7b4eb0068f61a6b7eb4c8638e1673911e1341fdf089d30363396dd95becef0794dd0066811db759d8859b7740afa319 WHIRLPOOL 3a8302fe33bdc6ca453f11c277edc25d61bf2630e332022e6dc329729ab72f724c66f6d620bb2080b33b6be1282d1e4939669e4862e99660bd08ccf06a3d6ab0
+EBUILD obs-studio-20.0.1.ebuild 2521 SHA256 6dae8e8027b9508804764ebaa541fdabad3bd83e3d1d45a02caae4e210f8b0f3 SHA512 a38744046a22b585760a7bb595216b52d7b4eb0068f61a6b7eb4c8638e1673911e1341fdf089d30363396dd95becef0794dd0066811db759d8859b7740afa319 WHIRLPOOL 3a8302fe33bdc6ca453f11c277edc25d61bf2630e332022e6dc329729ab72f724c66f6d620bb2080b33b6be1282d1e4939669e4862e99660bd08ccf06a3d6ab0
+EBUILD obs-studio-9999.ebuild 2490 SHA256 6f72bde787721014c790a9af4368df45c83a5a2ff0d55861b65bebeb6b2c0785 SHA512 ff53f57440c881f59f4652d89baa9fb67932990e915e4b652962abe9901810c8174d7eabae1ea854364bf65f94d0b9edef2eec01887e620ac1dca9e98c01ec17 WHIRLPOOL 010e3c4d5ab5b31a8288a66aee71e198cf73bc73f62f1af0e10d8a919391a0116946b662e573a7c58b5153805e2f69612d47311d76443865c4f07ffe5508810f
+MISC ChangeLog 2578 SHA256 0b32345d309d129d538db25a3de7c29a842fa90e96dd7512d29ccfe72cea3dbd SHA512 e1beab278a575b4059dad958ca01c03bb09cd839cc53b6345ed048bed591ba4222612828f676528877cbf42a2bd7e0eb564891ed7ecd50508f6d367307239cee WHIRLPOOL 93cb13b159a9282db547bc7bbedf159e1e585bbdc4e6a50ef96e8d3d6120b40d2131788373bef15b1521f005c6826b7eda66ce5c79151a3bc59535e101aba74e
+MISC metadata.xml 909 SHA256 55f67f48fe98631bfc8b02782383bad96c275c71fb24e7517b70329b3a04e1f7 SHA512 4f6d22797545b133c0783c97761d2cb4a4da1b251f39f586f4901023f09ad7b6f1bcdc841990b931740849c168d8ca2f91975f9f6fd59feff64895145cc6bd5e WHIRLPOOL 049025abd31fb656fd0bdcdbb449920eb3f50fdd2489ce7288f1c98d5f85d1b0813ca4c3615239351e184646eea25c732b8f0b4da978b039ad0597140b7e607c
diff --git a/media-video/obs-studio/metadata.xml b/media-video/obs-studio/metadata.xml
new file mode 100644
index 000000000000..2ab91340693d
--- /dev/null
+++ b/media-video/obs-studio/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chiitoo@gentoo.org</email>
+    <name>Jimi Huotari</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <longdescription>
+    A rewrite of what was formerly known as "Open Broadcaster Software",
+    software originally designed for recording and streaming live video
+    content, efficiently.  Aims to be multi-platform, and improved upon
+    internally.
+  </longdescription>
+  <use>
+    <flag name="fdk">Enable libfdk support for AAC encoding.</flag>
+    <flag name="imagemagick">Use ImageMagick for image loading instead of FFmpeg.</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">jp9000/obs-studio</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-video/obs-studio/obs-studio-18.0.2.ebuild b/media-video/obs-studio/obs-studio-18.0.2.ebuild
new file mode 100644
index 000000000000..07c1a8007eb9
--- /dev/null
+++ b/media-video/obs-studio/obs-studio-18.0.2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/jp9000/obs-studio.git"
+	EGIT_SUBMODULES=()
+else
+	SRC_URI="https://github.com/jp9000/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Software for Recording and Streaming Live Video Content"
+HOMEPAGE="https://obsproject.com"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+alsa fdk imagemagick jack pulseaudio truetype v4l"
+
+DEPEND="
+	>=dev-libs/jansson-2.5
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtsql:5
+	dev-qt/qttest:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-video/ffmpeg:=[x264]
+	net-misc/curl
+	x11-libs/libXcomposite
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	alsa? ( media-libs/alsa-lib )
+	fdk? ( media-libs/fdk-aac:= )
+	imagemagick? ( media-gfx/imagemagick:= )
+	jack? ( virtual/jack )
+	pulseaudio? ( media-sound/pulseaudio )
+	truetype? (
+		media-libs/fontconfig
+		media-libs/freetype
+	)
+	v4l? ( media-libs/libv4l )
+"
+RDEPEND="${DEPEND}"
+
+CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
+
+src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DDISABLE_ALSA=$(usex !alsa)
+		-DDISABLE_FREETYPE=$(usex !truetype)
+		-DDISABLE_JACK=$(usex !jack)
+		-DDISABLE_LIBFDK=$(usex !fdk)
+		-DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
+		-DDISABLE_V4L2=$(usex !v4l)
+		-DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick)
+		-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
+		-DOBS_VERSION_OVERRIDE=${PV}
+		-DUNIX_STRUCTURE=1
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	if ! use alsa && ! use pulseaudio; then
+		elog
+		elog "For the audio capture features to be available,"
+		elog "either the 'alsa' or the 'pulseaudio' USE-flag needs to"
+		elog "be enabled."
+		elog
+	fi
+
+	if ! has_version "sys-apps/dbus"; then
+		elog
+		elog "The 'sys-apps/dbus' package is not installed, but"
+		elog "could be used for disabling hibernating, screensaving,"
+		elog "and sleeping.  Where it is not installed,"
+		elog "'xdg-screensaver reset' is used instead"
+		elog "(if 'x11-misc/xdg-utils' is installed)."
+		elog
+	fi
+
+	if ! has_version "media-libs/speex"; then
+		elog
+		elog "For the speexdsp-based noise suppression filter"
+		elog "to be available, the 'media-libs/speex' package needs"
+		elog "to be installed."
+		elog
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-video/obs-studio/obs-studio-19.0.2.ebuild b/media-video/obs-studio/obs-studio-19.0.2.ebuild
new file mode 100644
index 000000000000..07c1a8007eb9
--- /dev/null
+++ b/media-video/obs-studio/obs-studio-19.0.2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/jp9000/obs-studio.git"
+	EGIT_SUBMODULES=()
+else
+	SRC_URI="https://github.com/jp9000/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Software for Recording and Streaming Live Video Content"
+HOMEPAGE="https://obsproject.com"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+alsa fdk imagemagick jack pulseaudio truetype v4l"
+
+DEPEND="
+	>=dev-libs/jansson-2.5
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtsql:5
+	dev-qt/qttest:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-video/ffmpeg:=[x264]
+	net-misc/curl
+	x11-libs/libXcomposite
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	alsa? ( media-libs/alsa-lib )
+	fdk? ( media-libs/fdk-aac:= )
+	imagemagick? ( media-gfx/imagemagick:= )
+	jack? ( virtual/jack )
+	pulseaudio? ( media-sound/pulseaudio )
+	truetype? (
+		media-libs/fontconfig
+		media-libs/freetype
+	)
+	v4l? ( media-libs/libv4l )
+"
+RDEPEND="${DEPEND}"
+
+CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
+
+src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DDISABLE_ALSA=$(usex !alsa)
+		-DDISABLE_FREETYPE=$(usex !truetype)
+		-DDISABLE_JACK=$(usex !jack)
+		-DDISABLE_LIBFDK=$(usex !fdk)
+		-DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
+		-DDISABLE_V4L2=$(usex !v4l)
+		-DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick)
+		-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
+		-DOBS_VERSION_OVERRIDE=${PV}
+		-DUNIX_STRUCTURE=1
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	if ! use alsa && ! use pulseaudio; then
+		elog
+		elog "For the audio capture features to be available,"
+		elog "either the 'alsa' or the 'pulseaudio' USE-flag needs to"
+		elog "be enabled."
+		elog
+	fi
+
+	if ! has_version "sys-apps/dbus"; then
+		elog
+		elog "The 'sys-apps/dbus' package is not installed, but"
+		elog "could be used for disabling hibernating, screensaving,"
+		elog "and sleeping.  Where it is not installed,"
+		elog "'xdg-screensaver reset' is used instead"
+		elog "(if 'x11-misc/xdg-utils' is installed)."
+		elog
+	fi
+
+	if ! has_version "media-libs/speex"; then
+		elog
+		elog "For the speexdsp-based noise suppression filter"
+		elog "to be available, the 'media-libs/speex' package needs"
+		elog "to be installed."
+		elog
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-video/obs-studio/obs-studio-20.0.1.ebuild b/media-video/obs-studio/obs-studio-20.0.1.ebuild
new file mode 100644
index 000000000000..07c1a8007eb9
--- /dev/null
+++ b/media-video/obs-studio/obs-studio-20.0.1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/jp9000/obs-studio.git"
+	EGIT_SUBMODULES=()
+else
+	SRC_URI="https://github.com/jp9000/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Software for Recording and Streaming Live Video Content"
+HOMEPAGE="https://obsproject.com"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+alsa fdk imagemagick jack pulseaudio truetype v4l"
+
+DEPEND="
+	>=dev-libs/jansson-2.5
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtsql:5
+	dev-qt/qttest:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-video/ffmpeg:=[x264]
+	net-misc/curl
+	x11-libs/libXcomposite
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	alsa? ( media-libs/alsa-lib )
+	fdk? ( media-libs/fdk-aac:= )
+	imagemagick? ( media-gfx/imagemagick:= )
+	jack? ( virtual/jack )
+	pulseaudio? ( media-sound/pulseaudio )
+	truetype? (
+		media-libs/fontconfig
+		media-libs/freetype
+	)
+	v4l? ( media-libs/libv4l )
+"
+RDEPEND="${DEPEND}"
+
+CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
+
+src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DDISABLE_ALSA=$(usex !alsa)
+		-DDISABLE_FREETYPE=$(usex !truetype)
+		-DDISABLE_JACK=$(usex !jack)
+		-DDISABLE_LIBFDK=$(usex !fdk)
+		-DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
+		-DDISABLE_V4L2=$(usex !v4l)
+		-DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick)
+		-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
+		-DOBS_VERSION_OVERRIDE=${PV}
+		-DUNIX_STRUCTURE=1
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	if ! use alsa && ! use pulseaudio; then
+		elog
+		elog "For the audio capture features to be available,"
+		elog "either the 'alsa' or the 'pulseaudio' USE-flag needs to"
+		elog "be enabled."
+		elog
+	fi
+
+	if ! has_version "sys-apps/dbus"; then
+		elog
+		elog "The 'sys-apps/dbus' package is not installed, but"
+		elog "could be used for disabling hibernating, screensaving,"
+		elog "and sleeping.  Where it is not installed,"
+		elog "'xdg-screensaver reset' is used instead"
+		elog "(if 'x11-misc/xdg-utils' is installed)."
+		elog
+	fi
+
+	if ! has_version "media-libs/speex"; then
+		elog
+		elog "For the speexdsp-based noise suppression filter"
+		elog "to be available, the 'media-libs/speex' package needs"
+		elog "to be installed."
+		elog
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild
new file mode 100644
index 000000000000..5753b7708bdc
--- /dev/null
+++ b/media-video/obs-studio/obs-studio-9999.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/jp9000/obs-studio.git"
+	EGIT_SUBMODULES=()
+else
+	SRC_URI="https://github.com/jp9000/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Software for Recording and Streaming Live Video Content"
+HOMEPAGE="https://obsproject.com"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+alsa fdk imagemagick jack pulseaudio truetype v4l"
+
+DEPEND="
+	>=dev-libs/jansson-2.5
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtsql:5
+	dev-qt/qttest:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-video/ffmpeg:=[x264]
+	net-misc/curl
+	x11-libs/libXcomposite
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	alsa? ( media-libs/alsa-lib )
+	fdk? ( media-libs/fdk-aac:= )
+	imagemagick? ( media-gfx/imagemagick:= )
+	jack? ( virtual/jack )
+	pulseaudio? ( media-sound/pulseaudio )
+	truetype? (
+		media-libs/fontconfig
+		media-libs/freetype
+	)
+	v4l? ( media-libs/libv4l )
+"
+RDEPEND="${DEPEND}"
+
+CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
+
+src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DDISABLE_ALSA=$(usex !alsa)
+		-DDISABLE_FREETYPE=$(usex !truetype)
+		-DDISABLE_JACK=$(usex !jack)
+		-DDISABLE_LIBFDK=$(usex !fdk)
+		-DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
+		-DDISABLE_V4L2=$(usex !v4l)
+		-DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick)
+		-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
+		-DUNIX_STRUCTURE=1
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	if ! use alsa && ! use pulseaudio; then
+		elog
+		elog "For the audio capture features to be available,"
+		elog "either the 'alsa' or the 'pulseaudio' USE-flag needs to"
+		elog "be enabled."
+		elog
+	fi
+
+	if ! has_version "sys-apps/dbus"; then
+		elog
+		elog "The 'sys-apps/dbus' package is not installed, but"
+		elog "could be used for disabling hibernating, screensaving,"
+		elog "and sleeping.  Where it is not installed,"
+		elog "'xdg-screensaver reset' is used instead"
+		elog "(if 'x11-misc/xdg-utils' is installed)."
+		elog
+	fi
+
+	if ! has_version "media-libs/speex"; then
+		elog
+		elog "For the speexdsp-based noise suppression filter"
+		elog "to be available, the 'media-libs/speex' package needs"
+		elog "to be installed."
+		elog
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-video/ogmrip/Manifest b/media-video/ogmrip/Manifest
new file mode 100644
index 000000000000..053b873d546a
--- /dev/null
+++ b/media-video/ogmrip/Manifest
@@ -0,0 +1,5 @@
+DIST ogmrip-1.0.1.tar.gz 3276396 SHA256 1c7bb9a346f94a0b6ba783d71df7d21ce021b2f179f5c1a2ebf870366d53ed56 SHA512 22261b1a5086fc05139e8b9924b75d9a5a5e85b18e245e32545687e72273b485fe1c5041b89db653c6e2e9714518e17ea955435a20ac26fcc875fa8d1a90994c WHIRLPOOL 7b0f34763c4cbd5d0295a08fceaca1b230d817b4dbff490c4fbc9593ab9ec3aaa1c7f2287f37fbc07d874eeff136021bf7fdb5fd8204601487890e9a23a1a251
+EBUILD ogmrip-1.0.1.ebuild 2204 SHA256 b97615645d4c8fb0a48e2d9fba593993ddd569cee5d25911b5ca0039a3812c6c SHA512 0ddb02a08cde5a8d833c990e06c151c4e6e5499ac3ee7683871b31187891b88d8b00fe6aae10046d9f27fee22660318cbff45513f3db7f88738acd34551a4d02 WHIRLPOOL 1fd145bdaeecc00f3955ab63e1e8bb212ec248ab8b8bf0b944321162c6e80c4ca9ed03f6e7801a583185fe297d1fbf640e33ea9edab6b2a1e70413d621783fc2
+MISC ChangeLog 2427 SHA256 024ecd2c8a126a9fb60cc1eed2525e64d2cbfd81062b5dc31aa0c89e06af3f7a SHA512 e16584aa5ccf1d0ee3563aef7cc3727a71e6ce423747cfb5ca0dcb4d7d1b2064d87925b65d443c8efdf70aa75ec64377e6af3735be0e242c6aea91c68a0500ce WHIRLPOOL c5ea768e3df1f3ccd4e87598bc0f1ba3ae798c56d36fc0c03a2a2e97e05dede7bc3fc4f9ba1cd6f2c55a8f68e952a520924a6ea2224616185842a727f8f5bfc2
+MISC ChangeLog-2015 9853 SHA256 10766fa014338b061e60bdd5bf4d620785dc004b393d31be54ee501cbd950424 SHA512 a3ef1607debbf3a3df2715b2a5c3adba52b2b8575b640c5179109e001d808e91eb3153ba5a7be276bbbd8f57ec78d518e0a8ed31c7ea5704834dfd4e448a0dc1 WHIRLPOOL 7d352cffa27d415b97f4e6760a7a718ccd5d046ea95a3fe5c1732e89f9f7cd974f8e5c2f3203acfd0a1c656a4bc6728eb26abde6472ded924756947e1ffd599f
+MISC metadata.xml 483 SHA256 e29d3c9d630602f3af2f94f3851ef9e471346b92920494eea3b11e2f3a1dc792 SHA512 d9f2ee066c340d53245070f9b4c6af3217817a128c054a074f02ccfd92e4a804cb5731454dc8892cbb79e85480e9be31db6eb280ed3954356111e8b33db94ad3 WHIRLPOOL 34c31714e4a4a2a299b0daba0d0cb8e156509e64a106f9cd6da37657a3abc8363d3f76078acbe440c77cc0e94952b594693bfeef2698e2ab08e0cc4502d0f384
diff --git a/media-video/ogmrip/metadata.xml b/media-video/ogmrip/metadata.xml
new file mode 100644
index 000000000000..e52e7abde8f5
--- /dev/null
+++ b/media-video/ogmrip/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>media-video@gentoo.org</email>
+    <name>Gentoo Video project</name>
+  </maintainer>
+  <use>
+    <flag name="ogm">Support for OGM container format</flag>
+    <flag name="srt">Support for SRT subtitle format</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">ogmrip</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-video/ogmrip/ogmrip-1.0.1.ebuild b/media-video/ogmrip/ogmrip-1.0.1.ebuild
new file mode 100644
index 000000000000..ee450b86fafa
--- /dev/null
+++ b/media-video/ogmrip/ogmrip-1.0.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+GCONF_DEBUG=no
+
+inherit gnome2
+
+DESCRIPTION="Graphical frontend and libraries for ripping DVDs and encoding to AVI/OGM/MKV/MP4"
+HOMEPAGE="http://ogmrip.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ogmrip/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="aac dbus debug dts gtk libnotify matroska mp3 mp4 nls ogm spell srt static-libs theora vorbis x264 xvid"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.16:2
+	>=app-i18n/enca-1.9
+	dev-libs/libxml2
+	media-libs/libdvdread
+	>=media-video/mplayer-1.0_rc2[dvd,encode,xvid?,dts?,x264?]
+	aac? ( >=media-libs/faac-1.24 )
+	gtk? (
+		>=x11-libs/gtk+-2.12:2
+		gnome-base/libglade
+		gnome-base/gconf
+		dbus? ( dev-libs/dbus-glib )
+		libnotify? ( >=x11-libs/libnotify-0.4.3 )
+		media-video/mplayer[jpeg]
+		)
+	matroska? ( media-video/mkvtoolnix )
+	mp3? ( media-sound/lame )
+	mp4? ( >=media-video/gpac-0.4.2 )
+	ogm? ( media-sound/ogmtools )
+	spell? ( >=app-text/enchant-1.1.0 )
+	srt? ( ||
+		(
+			( >=app-text/tesseract-2 media-libs/tiff )
+			>=app-text/gocr-0.39
+			>=app-text/ocrad-0.15
+		)
+		media-libs/libpng )
+	theora? ( media-libs/libtheora )
+	vorbis? ( media-sound/vorbis-tools )
+"
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gvfs
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gtk-doc-am
+	nls? ( sys-devel/gettext
+		dev-util/intltool )
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable debug maintainer-mode) \
+		$(use_enable gtk gtk-support) \
+		$(use_enable dbus dbus-support) \
+		$(use_enable spell enchant-support) \
+		$(use_enable ogm ogm-support) \
+		$(use_enable matroska mkv-support) \
+		$(use_enable mp4 mp4-support) \
+		$(use_enable xvid xvid-support) \
+		$(use_enable x264 x264-support) \
+		$(use_enable theora theora-support) \
+		$(use_enable vorbis vorbis-support) \
+		$(use_enable mp3 mp3-support) \
+		$(use_enable aac aac-support) \
+		$(use_enable srt srt-support) \
+		$(use_enable static-libs static) \
+		$(use_enable libnotify libnotify-support) \
+		$(use_enable nls) \
+		--with-html-dir=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install #528670
+}
diff --git a/media-video/openshot/Manifest b/media-video/openshot/Manifest
new file mode 100644
index 000000000000..65190895e174
--- /dev/null
+++ b/media-video/openshot/Manifest
@@ -0,0 +1,11 @@
+DIST openshot-1.4.3.tar.gz 31990991 SHA256 5bebf1c59a8667b0263599544f2d23ce6be3ab79ce24a85b766e1e39cab859d0 SHA512 f3221c3e508ccf61d4fd2771de47f42ddb1a78996853011ee336e8ccf842a0fd97707a60c677e1465a89e6eb67911b6eb98b002959f8a29ac9e31924bbb6fcda WHIRLPOOL 4fd8d5b5db2923c8b7349032847087b9cf4ccdbade206c5c6cc9aac27ace6e99c6053bd1184cf14b20c80b4f666baf356798a5b6a8d6c7c737a9a986894943af
+DIST openshot-qt-2.2.0.tar.gz 94924926 SHA256 8de6e193784af3b9149ea13c0552d4556df33396452360d5f9ac30682148e6f7 SHA512 696a95fe1438b8a62261c41e5d495ef1e5107c5e4ee0ab80a980ba5e0e3b7fb5002f1bb780120f9f46a9f3c1fed2de858b61dc38d897bd4235358d617b2406b0 WHIRLPOOL 08a8861b8893c94821bc4dfbf81bfa54101fb34af1f30f15cb26b284f1970bc9d2901e05f7b3a1f159a0690806e64c2ca345f3a56d37f016ec17e1db3e7d6204
+DIST openshot-qt-2.3.4.tar.gz 60646277 SHA256 b110eb144a3d3dcfe08f112c66ccc9265620b6fcf540cb690441bc47bf91eaec SHA512 06faaaf1e3e3d996fafca8c7bde5a7fe8b9c66efb03c85448ab19bba85508d7c6334ba43a1368b20d7608cd34526c653e1956aa51ce05099be314538682fd484 WHIRLPOOL dbed47fa4b9d220c75b8cec2e314beca4ba5f2cca687d016b3950aedd93e6e6f1b4d243ddf31b41d5a22d652f2257f725b6e4b85a2882ad1d5938409e1469b20
+DIST openshot-qt-2.4.0.tar.gz 60710408 SHA256 ca6b746671c931dd76af93f31fe3d85ce7f122002013b3a24e45e8222fdbb348 SHA512 95778effa5b02a467c44741384b0f43bf90343d4f450d5fcc2319ff1c3bee212338435dd8c781e0ff111a704aacdce3dbfb6bdcf62afa1f59bbb0668b58074ca WHIRLPOOL 7d0736a2b58fee3af6a54c65da89b8c33b7bdb73d73d708e3e0b48865c981b4f5fa1ec43a9d521e25b72242b1c75cb06731382edbcdc1f5f1575ab8ed5fa752c
+EBUILD openshot-1.4.3-r1.ebuild 1579 SHA256 f9af7f749b4faaa9eea594ebd7bd6dcc8e025f364df1e57544e1558a472c73a1 SHA512 04836459956b6950f799f2eb0974849c51ce0c1fc7640b21211eeaf5f05231439141421ce3a9afb87cb7976880cde47bb316c07c2209905e19bba830dc3a08f6 WHIRLPOOL ccb985d10a0860774f19dc54ce987a168938be4965655d90e4781f7c779dc134b7c4215cc3c7491359dfdd604acbe6430b47bfad53e1a5612bd31668beb034e4
+EBUILD openshot-2.2.0.ebuild 1203 SHA256 3efad3f9b11b7da966bfbf770a076960c27ec1eb35813ecef413fa7e3d90c33e SHA512 8caeb2192ebd50d822467cacff2036c805fbe6489fa965d88ad2ce0d65dcd0c37d3cd621000b92b0d9b90fdce598f3ba82b1cb1d6d3fd8426ac2dd761cf494ff WHIRLPOOL 0854b822adfefffb2bad8d2f040bbe82497647dffc30e52ab9d7b4c722ec17ece0299ee78a0cfe5ce13a38a6ff729a9eeed2ebfa84f7224b6cf04a6279d331e3
+EBUILD openshot-2.3.4.ebuild 1211 SHA256 0c2e96f23c4a7d121fb3a64bf3e90491b23fbe9a9445798d5924fe7681737d5d SHA512 953a544be29b8fc3c5a849e3da7dedd40fcde1414113ac03715a8e614535f185821de84b64674198f2b69a103b59aff0a4b623b27ac648fdcccad1c6df093eef WHIRLPOOL 03e72b1cf64d990a679c91bd182ead637ba3a1636874f51ea0542b5e4b907fa3c5b1c3b6979d728187b5de80b81992d88ef89562f102f67826a42b3803a42bc5
+EBUILD openshot-2.4.0.ebuild 1242 SHA256 e8c1b820cdc6611d15ac7db02167658ec91b8e04cda2b186a525407dbe86e14f SHA512 4c00b5c765d7583bb6a7d6ef03bd1d3bc49109419b8e513ded52a81ad105c464d6316c7f42cf2d0d8bdf1ed7c6e5f2a96d11c40b85ebefc4b39391b29b2551bd WHIRLPOOL 075f20f2fadb42c87e84fba9bd967f37fdd1f9f608bdc0de8d9e6f4f67be1f85e2e692b47716386258c1f0e2641da98db422d453716574e8cdab03404bc91819
+MISC ChangeLog 5648 SHA256 0d25a9fea9146e0acb8d7841d4b16cef688afc464cbafd13a219ae8d2e8b16ee SHA512 8c0535c5697b93ed6a3b7109016078800c5f2bec83387fa92234b48dc988f1cf5c0e86d162bc046ba975b39675ca935dba0d2d56d2d7f3a720ca395e69558506 WHIRLPOOL fcec9082ee862ad1742daec291c897d3c3b82b34c5d06e5e565ad4d7189039f650083b75fe6f0ac46a5fd06d031670a36d9c0525bd52d0ed42896e3ad2be32c1
+MISC ChangeLog-2015 1021 SHA256 5d90c9d11b23c032461ed3e91252fb76d4dfd40a614e57b25d59829e0fb9044f SHA512 c7a6b35f806e47ced48d2d62df5e3ba0844f520d6be0cbcc3f10224245944e58bfe8a0e2f3731e8bb672e0114aff005071733573857f5f787dc417d3f71e6c77 WHIRLPOOL bfebfeae8dd295fe5d47f5e51f464c9d13aad07466f61020009f39bd4fe2423deb8a7865398f7996981340fab478cb0db38a3198b4b571c979ba9fa1a4520296
+MISC metadata.xml 487 SHA256 2752aeb89beeeb0919a9212bb2668654226312817209b4b42d632123150fed4b SHA512 3b1dc5bc39de8b46ccea5497b228675c7d379ec627e12630d8914d9d35e316f4818bc165551dd271b24d377b3bcc2b97d528b43219765460058d123bde078149 WHIRLPOOL 28e5be2e1d073a5e4ccfdf9c27424f6205bc0784681186da38574d8cc108845504bf19189d2f72020748fbb751eb6f70a440e9e537166d2a974353064a063672
diff --git a/media-video/openshot/metadata.xml b/media-video/openshot/metadata.xml
new file mode 100644
index 000000000000..6dbde2947b33
--- /dev/null
+++ b/media-video/openshot/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>Free, open-source, non-linear video editor to create and edit videos and movies</longdescription>
+	<upstream>
+		<remote-id type="launchpad">openshot</remote-id>
+		<remote-id type="github">OpenShot/openshot-qt</remote-id>
+		<bugs-to>https://github.com/OpenShot/openshot-qt/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/openshot/openshot-1.4.3-r1.ebuild b/media-video/openshot/openshot-1.4.3-r1.ebuild
new file mode 100644
index 000000000000..144217aa0706
--- /dev/null
+++ b/media-video/openshot/openshot-1.4.3-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_REQ_USE=xml
+PYTHON_COMPAT=( python2_7 )
+
+inherit versionator distutils-r1 python-r1 fdo-mime
+
+DESCRIPTION="Free, open-source, non-linear video editor to create and edit videos and movies"
+HOMEPAGE="http://www.openshotvideo.com"
+SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="+python +ffmpeg libav"
+REQUIRED_USE="|| ( python ffmpeg )"
+
+RDEPEND="
+	dev-python/pygoocanvas[${PYTHON_USEDEP}]
+	dev-python/pygtk[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	>=media-libs/mlt-0.8.2[ffmpeg,frei0r,gtk,melt,python,sdl,xml]
+	ffmpeg? (
+		libav? ( media-video/libav:=[encode,sdl,x264,mp3,theora,vpx] )
+		!libav? ( media-video/ffmpeg:0=[encode,sdl,x264,mp3,theora,vpx] )
+	)
+	python? (
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		dev-python/librsvg-python
+	)
+	x11-libs/gtk+:2
+"
+
+src_prepare() {
+	sed -ie '/launcher/,+1d' setup.py || die
+	sed -ie '/FAILED = /,$d' setup.py || die
+
+	# Fix up launchers to not throw an error.
+	sed -i 's/\(from \)\(openshot import main\)/\1openshot.\2/' bin/openshot || die
+	sed -i 's/\(from \)\(openshot_render import main\)/\1openshot.\2/' bin/openshot-render || die
+}
+
+python_install() {
+	distutils-r1_python_install
+}
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+}
diff --git a/media-video/openshot/openshot-2.2.0.ebuild b/media-video/openshot/openshot-2.2.0.ebuild
new file mode 100644
index 000000000000..baf9025ad1ee
--- /dev/null
+++ b/media-video/openshot/openshot-2.2.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_REQ_USE=xml
+PYTHON_COMPAT=( python3_{4,5} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 gnome2-utils versionator xdg
+
+MY_PN="${PN}-qt"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Free, open-source, non-linear video editor to create and edit videos and movies"
+HOMEPAGE="http://www.openshot.org/ https://launchpad.net/openshot"
+SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+download/${MY_P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/PyQt5[svg,webkit,${PYTHON_USEDEP}]
+	media-libs/libopenshot[python,${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/pyzmq[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	# prevent setup.py from trying to update MIME databases
+	sed -i 's/^ROOT =.*/ROOT = False/' setup.py || die
+	xdg_src_prepare
+	distutils-r1_src_prepare
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/media-video/openshot/openshot-2.3.4.ebuild b/media-video/openshot/openshot-2.3.4.ebuild
new file mode 100644
index 000000000000..6b1bf1de7174
--- /dev/null
+++ b/media-video/openshot/openshot-2.3.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_REQ_USE=xml
+PYTHON_COMPAT=( python3_{4,5,6} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 gnome2-utils versionator xdg-utils
+
+MY_PN="${PN}-qt"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Free, open-source, non-linear video editor to create and edit videos and movies"
+HOMEPAGE="http://www.openshot.org/ https://launchpad.net/openshot"
+SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+download/${MY_P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/PyQt5[svg,webkit,${PYTHON_USEDEP}]
+	>=media-libs/libopenshot-0.1.7[python,${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/pyzmq[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+	# prevent setup.py from trying to update MIME databases
+	sed -i 's/^ROOT =.*/ROOT = False/' setup.py || die
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-video/openshot/openshot-2.4.0.ebuild b/media-video/openshot/openshot-2.4.0.ebuild
new file mode 100644
index 000000000000..0ed0f8455c6f
--- /dev/null
+++ b/media-video/openshot/openshot-2.4.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_REQ_USE=xml
+PYTHON_COMPAT=( python3_{4,5,6} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 gnome2-utils versionator xdg-utils
+
+MY_PN="${PN}-qt"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Free, open-source, non-linear video editor to create and edit videos and movies"
+HOMEPAGE="http://www.openshot.org/ https://launchpad.net/openshot"
+SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+download/${MY_P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/PyQt5[svg,webkit,${PYTHON_USEDEP}]
+	>=media-libs/libopenshot-0.1.8[python,${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/pyzmq[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	# prevent setup.py from trying to update MIME databases
+	sed -i 's/^ROOT =.*/ROOT = False/' setup.py || die
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-video/orion/Manifest b/media-video/orion/Manifest
new file mode 100644
index 000000000000..a0d696b1cebc
--- /dev/null
+++ b/media-video/orion/Manifest
@@ -0,0 +1,9 @@
+AUX orion-1.6.1-fix_desktop.patch 491 SHA256 1c5c9b6f1823671c4124a7e5c59ec39445f0cee80a2919f6a38721eefafbc223 SHA512 82b6a12d3fac7e0283154c961684bef1ae34490b8a1ec065ee1f1876bfeaa7eb9bc5d4e2c6d5b10291af80126c790c5bed1d8d796d81f98e112a419e449cd961 WHIRLPOOL 1492fd4710d72a3a99bf86e8dee80f8ecf8f73112a8385cc69461443d24a57423fbe5d3fe65f5277c007013a64f0dfb590d500d253bd5537461e2a9828d9b1c4
+DIST orion-1.3.5.tar.gz 3213988 SHA256 0094b3202a7cfe0bc5139fd30e0cd371fce76abad3eb019d355dce67b715c8c6 SHA512 afd5540b2a61181c3db051fd39dd42f8a96799d19aab814f5846c5270f13bb0cb8305cd69e09e69cf215aeafb66682cc6d70379e791d6bffc551a38a8c751d0d WHIRLPOOL 8267cf6e261f33161cdadc527bd1ae23f830f903a010a1d58c59cde685a31827e554e992dd26b8ed5c712dcd6548c8500264a3c72c70506962b02dc76bd93593
+DIST orion-1.4.0.tar.gz 3375433 SHA256 4adb8ff6a3c24aed14a31d9c17474ee88df52b3cde5d5d1b48b41b4f7a0ae4a0 SHA512 0dadd66f806d9f4bf464e855b38e35cb762ba9cbc1c51a135e5fd489f3a5ebf80117f502eaa8225d0a4a72f15bc8e4858b92866148dc73ecc0d18fd1e1717bed WHIRLPOOL 638ccf87f11eb7c96c949e12d1a97333e156fde5dfb8e1abd315b362e2ddb49748c33a261deb32c531c40f544c8bbb26de681c35b2a32c0cee49888662dabab8
+DIST orion-1.6.1.tar.gz 614216 SHA256 eaa8ace822d3381a1915db82c4203d4ce4e56ec324d4ee18544bd68b00bce749 SHA512 3db0b59a89d2364f2d0586c3f318fc793f73a17d767adb0f44b89830e397be6f24c2ab662b7c84e7d857bc42b952fdf7fa280090313f5e39e37205eb8fb6dc9e WHIRLPOOL d46ed23d9661e2021ad03d5af6a5e50084fca87895649b515fd75ddc4c5afe34382fd0f21c6781abf3760751430aa7c022004897e69b9053e7b62e853036635a
+EBUILD orion-1.3.5.ebuild 849 SHA256 54f8a60596eb2e8ffbf735b1246ac1cc97cc95860f40085a1030882c59c8217f SHA512 dcee0f9084783001baa6b6e9fbe99714e5e1d5f8535febb0fc96faae0a6401919b9bcba2dace4251ea919b19cfef65272cb592fcfcd49b6dae33d6c5f6b9d59b WHIRLPOOL a5dd9ddc88025d1cb194ea5577431de1d53aca7498b6eaa1942134066f3fc6c5fd8883b0f4b9a77df8ebf4031020f1e217bb39b513bb870599592988fb228c6b
+EBUILD orion-1.4.0.ebuild 1114 SHA256 f717793b53b65dbf22ba9d43ff1c0034faabb513742f3bce18d88e7cad2d80bf SHA512 10383b8e2a14a259a16be826e883893d4595b9a078751626fe18749fb96b80709f95f679cd4bd9ea62b821a0f5ed9b8761ac199066dffac02fe0cddf6dd452a3 WHIRLPOOL 7be1e5b6afc873c949dd8210abd84e814aaf28bd182cd1c260e769e5cdcd06ffc862bd711851d93cf1954c2610ef7d831ac91acaba535bf31c3fa2be5bdac1fb
+EBUILD orion-1.6.1.ebuild 972 SHA256 a060d5eea90ca69dd5fc0e0ce50a4dcc923eb724e3bd2a7b0b748bc4934f8c98 SHA512 b6eb5de3734dbae9c8cbcb2f61cf0baf50f83a10b7f8bfa03a0cbabbd5c2985d628df544024e9c45dc282d1f2a5dd7e89b0f473dc8c6a1894032836b76108ffc WHIRLPOOL 1c5372ae3720090158b10cee41a0a28861ef316f823a3101e94f4715ef2eefbd4c9e699398cf2d71bb8cdf7e39a471275a401497ae0cde3126fe313c62ffbbaa
+MISC ChangeLog 310 SHA256 cd40468a592674609a5d86b3297c1c0d2ea547ba4d5b473db9156b6404172013 SHA512 c6c92a22fb9c2caae87228e54a979f1625cceeea004be6e26a84cdac892dca84616131b08c58611e70836f7e10fb31bc21bacbe097b727f166094b5433038696 WHIRLPOOL 9ef86c99bbb4407dcc29c96dca0bf2b9557a45b339f8fb9f84cfcee79f6cee6d0c1a2b9486500d2fd60c8e7e8a259cd54040c76bd16381c6e374a3d4ebf0ec64
+MISC metadata.xml 486 SHA256 bacac8622e37341f4837cabfa73ed4f2d6b1b05829b2c95fa5b3c56f965ec588 SHA512 da5a7a2f3f51661f0c21efd0fe8a9f99b29cb8c4c94f89771c69bc70b678010d74a2959baa1cde4fb457f225005cfa4afc06bcb9d2dbc8b1563e227099b91776 WHIRLPOOL 8ce94456b13f0b2d83c4ad2d9abd7e4c4ea461695280ac9c4ba055b8e0d7bf96824e378cde239ad85745fde04e937e9c62bbbf09e5c7fa9c97584a61523c8eea
diff --git a/media-video/orion/files/orion-1.6.1-fix_desktop.patch b/media-video/orion/files/orion-1.6.1-fix_desktop.patch
new file mode 100644
index 000000000000..78103fbabea0
--- /dev/null
+++ b/media-video/orion/files/orion-1.6.1-fix_desktop.patch
@@ -0,0 +1,15 @@
+diff -Naur orion-1.6.1.orig/distfiles/Orion.desktop orion-1.6.1/distfiles/Orion.desktop
+--- orion-1.6.1.orig/distfiles/Orion.desktop	2017-07-06 22:26:29.000000000 +0200
++++ orion-1.6.1/distfiles/Orion.desktop	2017-09-19 13:36:49.754743707 +0200
+@@ -2,9 +2,9 @@
+ Version=1.0
+ Type=Application
+ Name=Orion
+-Icon=/usr/local/share/icons/orion.svg
++Icon=orion
+ Exec=/usr/bin/orion
+ Comment=Seek and watch streams on Twitch
+-Categories=Games
++Categories=Game
+ Terminal=false
+ StartupWMClass=orion
diff --git a/media-video/orion/metadata.xml b/media-video/orion/metadata.xml
new file mode 100644
index 000000000000..98d88483f290
--- /dev/null
+++ b/media-video/orion/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<use>
+		<flag name="mpv">Use the <pkg>media-video/mpv</pkg> player (upstream default) instead of the <pkg>dev-qt/qtmultimedia</pkg> one</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">alamminsalo/orion</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/orion/orion-1.3.5.ebuild b/media-video/orion/orion-1.3.5.ebuild
new file mode 100644
index 000000000000..59d5d8702da3
--- /dev/null
+++ b/media-video/orion/orion-1.3.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qmake-utils
+
+DESCRIPTION="Cross-platform Twitch client"
+HOMEPAGE="https://alamminsalo.github.io/orion/"
+SRC_URI="https://github.com/alamminsalo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+mpv"
+
+DEPEND="dev-qt/qtquickcontrols:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebengine:5
+	mpv? ( media-video/mpv[libmpv] )
+	!mpv? ( dev-qt/qtmultimedia:5 )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	# TODO: also supports qtav, not yet in portage
+	local PLAYER
+	if use mpv; then
+		PLAYER=mpv
+	else
+		PLAYER=multimedia
+	fi
+	eqmake5 ${PN}.pro CONFIG+=${PLAYER}
+}
+
+src_install() {
+	dobin ${PN}
+	domenu distfiles/*.desktop
+
+	insinto /usr/share/icons/hicolor/scalable/apps
+	doins distfiles/${PN}.svg
+}
diff --git a/media-video/orion/orion-1.4.0.ebuild b/media-video/orion/orion-1.4.0.ebuild
new file mode 100644
index 000000000000..804460e26d8f
--- /dev/null
+++ b/media-video/orion/orion-1.4.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qmake-utils eutils
+
+DESCRIPTION="Cross-platform Twitch client"
+HOMEPAGE="https://alamminsalo.github.io/orion/"
+SRC_URI="https://github.com/alamminsalo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+mpv"
+
+DEPEND="dev-qt/qtquickcontrols:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebengine:5
+	mpv? ( media-video/mpv[libmpv] )
+	!mpv? ( dev-qt/qtmultimedia:5 )"
+RDEPEND="${DEPEND}
+	!mpv? ( media-plugins/gst-plugins-hls )"
+
+src_prepare() {
+	sed -i \
+		-e 's:^Icon=/usr/local/share/icons/orion.svg$:Icon=/usr/share/icons/hicolor/scalable/apps/orion.svg:' \
+		-e 's:^Categories=Games$:Categories=Game;:' \
+		distfiles/*.desktop
+	eapply_user
+}
+
+src_configure() {
+	# TODO: also supports qtav, not yet in portage
+	local PLAYER
+	if use mpv; then
+		PLAYER=mpv
+	else
+		PLAYER=multimedia
+	fi
+	eqmake5 ${PN}.pro CONFIG+=${PLAYER}
+}
+
+src_install() {
+	dobin ${PN}
+	domenu distfiles/*.desktop
+
+	insinto /usr/share/icons/hicolor/scalable/apps
+	doins distfiles/${PN}.svg
+}
diff --git a/media-video/orion/orion-1.6.1.ebuild b/media-video/orion/orion-1.6.1.ebuild
new file mode 100644
index 000000000000..d099513bb932
--- /dev/null
+++ b/media-video/orion/orion-1.6.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils qmake-utils
+
+DESCRIPTION="Cross-platform Twitch client"
+HOMEPAGE="https://alamminsalo.github.io/orion/"
+SRC_URI="https://github.com/alamminsalo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+mpv"
+
+DEPEND=">=dev-qt/qtquickcontrols2-5.8:5
+	>=dev-qt/qtsvg-5.8:5
+	>=dev-qt/qtwebengine-5.8:5
+	mpv? ( media-video/mpv[libmpv] )
+	!mpv? ( >=dev-qt/qtmultimedia-5.8:5 )"
+RDEPEND="${DEPEND}
+	!mpv? ( media-plugins/gst-plugins-hls )"
+
+PATCHES=( "${FILESDIR}"/${P}-fix_desktop.patch )
+
+src_configure() {
+	# TODO: also supports qtav, not yet in portage
+	local PLAYER
+	if use mpv; then
+		PLAYER=mpv
+	else
+		PLAYER=multimedia
+	fi
+	eqmake5 ${PN}.pro CONFIG+=${PLAYER}
+}
+
+src_install() {
+	dobin ${PN}
+	domenu distfiles/*.desktop
+
+	insinto /usr/share/icons/hicolor/scalable/apps
+	doins distfiles/${PN}.svg
+}
diff --git a/media-video/oxine/Manifest b/media-video/oxine/Manifest
new file mode 100644
index 000000000000..472f0da83721
--- /dev/null
+++ b/media-video/oxine/Manifest
@@ -0,0 +1,5 @@
+DIST oxine-0.7.1.tar.gz 3653511 SHA256 bfe9e4f49996234eabf788397969c90901197b2b1823cdb9a61e529f5c0f6a7d SHA512 96f6851f6277d97530b1f4d95d0f0843c9c3262d1a97ccc431e8a674441e06ca8fc24a65f83be5735f54e089d636e60fb297fa7958279b24004eecbc1711a257 WHIRLPOOL 6e8c91ceb889dfa97daaa6f291987d0becb622c6755f82d01d9489016aa2699c0de1b499e274c0129fd440b821b840e05f7c3a2c7a9ed9539a2c13b230f00880
+EBUILD oxine-0.7.1-r2.ebuild 1765 SHA256 7b8811d05fa2295165956a0c9634df3935bb9289587fc7ccc1e24fbdc427a0c6 SHA512 bf4c890950b5b4de26d686dd93b43b8dd3eaa25aa732a5762fe428a05bd80d67a51e82b3b106bd285eb30c0c85b2a33cf31f5c455c98b1393532f561a0d26e48 WHIRLPOOL 21555547e23b1d2752deae7e97d7d722c6bf09462d2cff1d0ab0eec5d173b49a5ede9dcfe73cc25f568d83a405b9264d7a9fab617856224e8fc79a88e614561a
+MISC ChangeLog 2652 SHA256 f607cb2219169e3fcfd8819dd57030d72beee894e334ba93c4718bba9d018e9b SHA512 9cb8065ebe20fecf4fe0e1a1cfac589eec947b381be8fa818303f5583f539315c243fc77e88a85b45e29654eb8db7e5f8321632aadefa1becdfc4dad2037e68c WHIRLPOOL e808353b4bd8a9f3b9a54db69800bbadfeef6df859a3255c3aee66b3eb2351a86334f6f3799cd1d501510a105059adf5aaaf5ae371f90a0a23d39a609ff31a99
+MISC ChangeLog-2015 4789 SHA256 4df7ec98784ef3ae60f18b4bd1fe5eba11ba666b68acd6a9f43051404f84a164 SHA512 12af8a1a4d4c86d4042939cc76422daee7024c99ce2beeb7a7ae1f6ebac43a53b2fee16e17b185c227fb27ee3ca2a899a90dae03b7490a5d7ee88f6a7c9f9982 WHIRLPOOL d49446664845ca974c826fe6257cb7394915086292d57060579f41cc2f879f69b9aec35756a3d4477bbfcaecf2ad58f2dcd9359f730b16eaa6c196efe6d9952d
+MISC metadata.xml 306 SHA256 91e146b0bdfc89ed421ab48ee53d21b6424b0059d4a81a0e410eda86073cf2b5 SHA512 eac1b6e169636bff97d29cf4de2b7c47d25f7ccdffc31807bd0d8b4e0c6ac9314e7f1de8759f8506a4c49aba696ae4dc8d5995806a1f3f4dfcbcc9dfef7bebd5 WHIRLPOOL 7ec3159442e4b3174420fc044216ac64b9e112720864c379055c68cc7d9d1f957f752aa3dd4e73a4384cbcd33c1c91e0a676720d8c5fcab55d4c00939b352b21
diff --git a/media-video/oxine/metadata.xml b/media-video/oxine/metadata.xml
new file mode 100644
index 000000000000..38365496f1c3
--- /dev/null
+++ b/media-video/oxine/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>media-video@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">oxine</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-video/oxine/oxine-0.7.1-r2.ebuild b/media-video/oxine/oxine-0.7.1-r2.ebuild
new file mode 100644
index 000000000000..1f5259e238f6
--- /dev/null
+++ b/media-video/oxine/oxine-0.7.1-r2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+DESCRIPTION="OSD frontend for Xine"
+HOMEPAGE="http://oxine.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+SLOT="0"
+IUSE="curl debug dvb exif joystick jpeg lirc nls png v4l X"
+
+COMMON_DEPEND="
+	dev-libs/libcdio
+	media-libs/xine-lib[v4l?,X,imagemagick]
+	curl? ( net-misc/curl )
+	dvb? ( media-libs/xine-lib[v4l] )
+	joystick? ( media-libs/libjsw )
+	jpeg? (
+		media-gfx/imagemagick
+		media-libs/netpbm[jpeg,zlib]
+		media-video/mjpegtools
+	)
+	lirc? ( app-misc/lirc )
+	nls? (
+		virtual/libintl
+		sys-devel/gettext
+	)
+	png? (
+		media-gfx/imagemagick
+		media-libs/netpbm[png,zlib]
+		media-video/mjpegtools
+	)
+	X? (
+		x11-libs/libXext
+		x11-libs/libX11
+	)"
+RDEPEND="${COMMON_DEPEND}
+	virtual/eject"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+HTML_DOCS=( doc/README.html )
+
+src_configure() {
+	# Fix underlinking by falling back to
+	# GNU89 inline semantics, bug 590946
+	append-cflags -std=gnu89
+
+	# Note on images: Image support will be automatically disabled if
+	# netpbm, imagemagick or mjpegtools is not installed, regardless
+	# of what the USE flags are set to.
+	# If one of the image USE flags is unset, disable image support
+	local myconf=()
+	if use !png || use !jpeg; then
+		myconf+=( --disable-images )
+	fi
+
+	econf \
+		--disable-hal \
+		--disable-rpath \
+		--disable-extractor \
+		$(use_with curl) \
+		$(use_enable debug) \
+		$(use_enable dvb) \
+		$(use_enable exif) \
+		$(use_enable joystick) \
+		$(use_enable lirc) \
+		$(use_enable nls) \
+		$(use_enable v4l) \
+		$(use_with X x) \
+		"${myconf[@]}"
+}
+
+src_install() {
+	default
+	dodoc doc/keymapping.pdf
+}
diff --git a/media-video/parole/Manifest b/media-video/parole/Manifest
new file mode 100644
index 000000000000..7c74e8a62d90
--- /dev/null
+++ b/media-video/parole/Manifest
@@ -0,0 +1,7 @@
+DIST parole-0.8.1.tar.bz2 814827 SHA256 4b216f5200490f8d2a9bf1b3fcd9a8b20834c95249bf13b9170c82e1fcbd80f4 SHA512 73c27022331828adb7b5805245ce97f03f4848c569125529436e82651da61e28f4d4a834468d6e4c165754f2fd9664eded9a7e15fc86f067d9b2c7c54afff3ee WHIRLPOOL b1b7d422abdc293361199e1aaef9b98cb883503e1289da3d71933dfcb32d5e5b5f8bc1fbbb5fa41305b2753d5527b92fc2e952c20742676d3da7ebe43edcace5
+DIST parole-0.9.2.tar.bz2 922024 SHA256 fdd3cbe7b8a74cba6176694e742b44734ee435bb937ec94f59e69b957857c79d SHA512 c3eee9501648bbb058a22398f2b8ae3727036718052b9e93ebb6f7dc3eb88ce1cfe8d443a5abf7d0cebc2853e14f42fed520ce17d8c7e03dacdcafb57247fb4d WHIRLPOOL 33b21556f0338480ce8761a91e1472cbb6624b2fe15ebc680fee8c049b54c54bb0bf27bc119ab69855b2f7dc4fd8cf503051e7790565a5b6426cb7ba6065545b
+EBUILD parole-0.8.1.ebuild 1270 SHA256 87c870bfe363367229fdb1f689d693f1f01ae55b50b74bed15ce2f46559f40f2 SHA512 dced0c4718135bc2572ef9a08a7ab36cebc018d6dd5cbcbb9fe93384d86c7c72925c1236b0096b5d5f4c0cb2f62c85e89675766f7fadc13633059d04c6349a29 WHIRLPOOL 9aeeccd93b197902d891593f35864efe0d260ba2a28e21c1ee67e26e8bd57bd39cc32897badcccc1334a12302acf40a5e10a9b75e4fd74a0755d443df380cf3a
+EBUILD parole-0.9.2.ebuild 1477 SHA256 ff0d3411373b8d9314e7c7d8708af4ce1b366e62f65be95b4e879e3577717f0b SHA512 dc13e5a8febc839c3a2c1685b9d7eb3d26ca01e4f2dceb339df4bfa23cc1fd277b88661b1ae7e5aec184d304846c6e70d70b49ebd32fcd72f446ebfe3f4078e4 WHIRLPOOL 1989eb71df544f369debea77a78446f2641923d16d18cd170294658367ab45ff7940d333fc820e99ce0ac570fe6379b94b8a3fd06fa28509217cbc2bf8b6ff6f
+MISC ChangeLog 3036 SHA256 161826fbe4cae1ca4af107b9576acaee90b95adf791e3b9d9e5f5ba35b34dcf7 SHA512 273eff052c85fd7d297046403f0eade0b2ce8d0fe88e3c0e51e54b1ce582139b4d611e0a9976dc0bd060665865b7a3acaea214075b537479a44e5e3531c3db18 WHIRLPOOL 1cbb980d0923825c9b2f51b2a155475e4266b60729212252ac15a090716ea559f2ce684d48b4583fae131d02b5ed0a6e8592cabcf3ae82eac339f84c113cbf3a
+MISC ChangeLog-2015 7594 SHA256 5312ec5417c6304f0cd8e18522b8648bf783a54c71625cfce622edf9a6431732 SHA512 d4a520f0bd2c9e2727059c526154294e4bf87d980e6beeec15ae4181fbf9c1c1053d38e0d85bbe44a761593834957204841f0dd4f1474fb28a589a1b4194c962 WHIRLPOOL 6bd9d56c7b65dd5063b3e44faebea7c048eccbc776da036e583e34f29d017cda6573983c921d61e365c536a829e1ce5e6b7d192b81e14a17675759961cc01850
+MISC metadata.xml 318 SHA256 42553711a62efab9b07f12900494d0cb06efbc6eb33af4be763affa18425cbf5 SHA512 412b57b034604b0b6d532fadf5eba6478222b30fe4a003ff1486b59ec1136f440343c4524951cee33b235dfa782c09380326d9cbee17e1406408947d12fc430e WHIRLPOOL 35a3f854e6e4f7643f165d52fb9ffb0ce35c02aedd856978b923512a8a715983fad1ea424b5ff5bc7c378b260bdf537c492d1cb6cc03e57e92250bd824fd2082
diff --git a/media-video/parole/metadata.xml b/media-video/parole/metadata.xml
new file mode 100644
index 000000000000..83d49ac20cb7
--- /dev/null
+++ b/media-video/parole/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>xfce@gentoo.org</email>
+		<name>XFCE Team</name>
+	</maintainer>
+	<use>
+		<flag name="clutter">Compile in Clutter GTK+ support</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-video/parole/parole-0.8.1.ebuild b/media-video/parole/parole-0.8.1.ebuild
new file mode 100644
index 000000000000..a8dd869c52d7
--- /dev/null
+++ b/media-video/parole/parole-0.8.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="a simple media player based on the GStreamer framework for the Xfce4 desktop"
+HOMEPAGE="https://docs.xfce.org/apps/parole/start"
+SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~mips x86"
+IUSE="clutter debug libnotify taglib"
+
+COMMON_DEPEND=">=dev-libs/dbus-glib-0.100:=
+	>=dev-libs/glib-2.32:2=
+	media-libs/gstreamer:1.0=
+	media-libs/gst-plugins-base:1.0=
+	sys-apps/dbus:0=
+	>=x11-libs/gtk+-3.2:3=
+	x11-libs/libX11:0=
+	>=xfce-base/libxfce4ui-4.11:0=[gtk3(+)]
+	>=xfce-base/libxfce4util-4.11:0=
+	>=xfce-base/xfconf-4.10:0=
+	clutter? (
+		>=media-libs/clutter-1.16.4:1.0=
+		>=media-libs/clutter-gtk-1.4.4:1.0=
+		)
+	libnotify? ( >=x11-libs/libnotify-0.7:0= )
+	taglib? ( >=media-libs/taglib-1.6:0= )"
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/gst-plugins-meta:1.0"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xproto"
+
+pkg_setup() {
+	XFCONF=(
+		$(use_enable clutter)
+		$(use_enable taglib)
+		$(use_enable libnotify notify-plugin)
+		$(xfconf_use_debug)
+		--with-gstreamer=1.0
+		)
+
+	DOCS=( AUTHORS ChangeLog README THANKS TODO )
+}
diff --git a/media-video/parole/parole-0.9.2.ebuild b/media-video/parole/parole-0.9.2.ebuild
new file mode 100644
index 000000000000..2f1e710f27aa
--- /dev/null
+++ b/media-video/parole/parole-0.9.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils xdg-utils
+
+DESCRIPTION="A simple Xfce4 media player using GStreamer"
+HOMEPAGE="https://docs.xfce.org/apps/parole/start"
+SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86"
+IUSE="clutter libnotify taglib"
+
+COMMON_DEPEND=">=dev-libs/dbus-glib-0.100:=
+	>=dev-libs/glib-2.32:2=
+	media-libs/gstreamer:1.0=
+	media-libs/gst-plugins-base:1.0=
+	sys-apps/dbus:0=
+	>=x11-libs/gtk+-3.20:3=
+	x11-libs/libX11:0=
+	>=xfce-base/libxfce4ui-4.11:0=[gtk3(+)]
+	>=xfce-base/libxfce4util-4.11:0=
+	>=xfce-base/xfconf-4.10:0=
+	clutter? (
+		>=media-libs/clutter-1.16.4:1.0=
+		>=media-libs/clutter-gtk-1.4.4:1.0=
+		<x11-libs/gtk+-3.22:3
+	)
+	libnotify? ( >=x11-libs/libnotify-0.7:0= )
+	taglib? ( >=media-libs/taglib-1.6:0= )"
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/gst-plugins-meta:1.0"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xproto"
+
+DOCS=( AUTHORS ChangeLog README THANKS TODO )
+
+src_configure() {
+	local myconf=(
+		$(use_enable clutter)
+		$(use_enable taglib)
+		$(use_enable libnotify notify-plugin)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-video/peek/Manifest b/media-video/peek/Manifest
new file mode 100644
index 000000000000..2aa1283916c9
--- /dev/null
+++ b/media-video/peek/Manifest
@@ -0,0 +1,5 @@
+DIST peek-1.0.1.tar.gz 2602750 SHA256 7913664d33756b0e94fc190e1762eba581fcb4bf7100965df3417e90d6254ae3 SHA512 c021e6e686de25afdd2e66bea9f2d50c08909847bf2e4d8dfbda8e18975febb2ed247a86d46c7f2a954768f8683cfc218be75ad8f495cd729e787e16f09b2dfe WHIRLPOOL ac6143f2fb71c5cfa36c8b820330decc319ee362513229596c1f1c3060bcaaba101caa97e3456001cd14035d6131fdebec86ff6006899526e45f989b16350628
+DIST peek-1.0.3.tar.gz 2620773 SHA256 bedb23a4da0b6f5c9e247a383435202ff7307347f39cd8816d256b3390a4c1ae SHA512 92e7d61fdd32b4525991a45a0781c304160dbbdaf518ffbc6389d3df2829593a830e8b1cf499b10c02ab1809984c945770c3394221dc31b29041da45ca291ab7 WHIRLPOOL b21e04690066910fc3073f91249ea9cee793c4c9c6eb0cbd1cdcd0e98d181a53f58ec8138532e09d650552701e8362c9b875617c6d66efce3363ce711f6e8ac3
+EBUILD peek-1.0.1.ebuild 810 SHA256 218402c3f6953fbde6a67bf98c52c97685807bc558b922d4c1b241fe9bf32e9a SHA512 099234d0943401d7d55b3a01a055f7b7e0a6c588effdb480c1d3df06ffeab53bd860c78eb515005e6f72cc4107cae6b085df5565118501d612c4053450e7cd3d WHIRLPOOL 18602aa3edb3c818922d4e373e0dcee323f3f3199953411977cd115df65b83be7ae00237fabcee464c115c89c529974cf03ebcc4b8fdc7571406fb84953db6dc
+EBUILD peek-1.0.3.ebuild 828 SHA256 773a2d64ff1768acec5de5eec793542930d22a35bc8ed6d59fbae9eb450ef463 SHA512 427c2aa225f5f4e746269991c40631e60bfc5236129b8e9b91c66a2c1ae29eb3b6ec96f99ae79ac23440e3cc18212f10dcedfbee5df9a12fc4dcaaa210521009 WHIRLPOOL 39c10cfdb4a43796747ad0927f76f116adb85f001cafc9f95dacab9ce5f0ccc547d52760202ce8644bec955dc7f47e405189352f34afd590106dc8c3823588b6
+MISC metadata.xml 325 SHA256 25a5a76e5669006b25c5671a64d30000ed863e521810f6785924fcddd90e1667 SHA512 88370fc35f06586fe1b050cf48b88a598b40cc0b14c72b14fdf0cdfb4275ffac8e71694ecdf0babfbeaa09a3b688a41d326dde5933773d3728ec14e5d98deb2c WHIRLPOOL 87185a73541f950b1fd5c0b5f7166031b2ae870c074dec4b59f8090138ec83d807f92c2b6249666bb5be8d1bb81e6e675d4c0332a2a4dc64b42523f1b88c141c
diff --git a/media-video/peek/metadata.xml b/media-video/peek/metadata.xml
new file mode 100644
index 000000000000..f7b4c866d5c9
--- /dev/null
+++ b/media-video/peek/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">phw/peek</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/peek/peek-1.0.1.ebuild b/media-video/peek/peek-1.0.1.ebuild
new file mode 100644
index 000000000000..94e00bcb32f0
--- /dev/null
+++ b/media-video/peek/peek-1.0.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_MIN_API_VERSION="0.22"
+
+inherit gnome2 vala cmake-utils
+
+DESCRIPTION="Simple animated Gif screen recorder"
+HOMEPAGE="https://github.com/phw/peek"
+SRC_URI="https://github.com/phw/peek/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.38:2
+	dev-libs/keybinder:3
+	media-video/ffmpeg[X,encode]
+	virtual/imagemagick-tools
+	>=x11-libs/gtk+-3.14:3"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	>=sys-devel/gettext-0.19"
+
+src_prepare() {
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DGSETTINGS_COMPILE=OFF
+		-DVALA_EXECUTABLE="${VALAC}"
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/media-video/peek/peek-1.0.3.ebuild b/media-video/peek/peek-1.0.3.ebuild
new file mode 100644
index 000000000000..1e4e2893c204
--- /dev/null
+++ b/media-video/peek/peek-1.0.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_MIN_API_VERSION="0.22"
+
+inherit gnome2 vala cmake-utils
+
+DESCRIPTION="Simple animated Gif screen recorder"
+HOMEPAGE="https://github.com/phw/peek"
+SRC_URI="https://github.com/phw/peek/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.38:2
+	dev-libs/keybinder:3
+	media-video/ffmpeg[X,encode]
+	virtual/imagemagick-tools
+	>=x11-libs/gtk+-3.14:3"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	app-text/txt2man
+	>=sys-devel/gettext-0.19"
+
+src_prepare() {
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DGSETTINGS_COMPILE=OFF
+		-DVALA_EXECUTABLE="${VALAC}"
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/media-video/pgmfindclip/Manifest b/media-video/pgmfindclip/Manifest
new file mode 100644
index 000000000000..31e60844d017
--- /dev/null
+++ b/media-video/pgmfindclip/Manifest
@@ -0,0 +1,5 @@
+DIST pgmfindclip-1.13.tgz 4971 SHA256 eaa0f3d4e4904b14fba45ca45b06511839331c37c3c08463c633f4d3f12dbdf2 SHA512 1b1acb76bc97dfc227ad9f797670b1dd286c16a3d76aeeb74f7326ac89b3ed3f16432d765ea238b477c90527b955d3d03bb835f8c668c6ce48be49ce0d5f0e0d WHIRLPOOL 8a90607cb18644d67ddf9f449262e6a6ba2ae89dfb9ca67a543b3afbe245fa8d6d00f3e0ecc659e9684581cf891837ef1779cf8ad6129aec1ed0f7ec44b21cc8
+EBUILD pgmfindclip-1.13.ebuild 590 SHA256 852e0c79c44c1228319f0aaf81230b102c244dfc8a3523e293c97964dcd45577 SHA512 e8c8e8d3ac09274ea4ea3ffbc7c2236d15999dce9ca9d5d5005629b8ff75048bf99247093aae6f27c09edf3f2ffa731317fe55d82c37232e27cbcbc92eab7558 WHIRLPOOL fb57a4bbd5634534a72da7342801c0d605bc9beb5c546ee43ec41a5ac9fc989675c9006f248fb07377fde8ae68e19ed6c6ace6264f0eda3098b5c43788942627
+MISC ChangeLog 2440 SHA256 3f5c80cfaceafda10f3ef455948e3f41679ce145b94abaeadb7a8d7501ecbd68 SHA512 93ed7dd768b62be222d7265f89f0fdea0b3b3c64d82ae8d7053f617acb3f7efcebd6505b6c1c4117e845a2be0ab3a0c06d72c2466c228e8c39b1f68243a41aad WHIRLPOOL 3a42eb9b82e5eefe14c5b7f4766b48db5e569f82d3c494c45d9f09078b78233dcbfcc4744d91ce0ee7727d3c9d9b087e042b6ce4c817c5fe4fe408816863079a
+MISC ChangeLog-2015 983 SHA256 ef77041b9e98cd8e6eb2997eaff3fb209f319b6d0dd25a0e7cbad555ec8da8a5 SHA512 b3c12a980876a3af5c4a064479578a81b75506ce3c17a657da3a535035a7febe1213cd569f891a69970d4ac57365697456437f37a68466b95b3669a3fdbaee09 WHIRLPOOL d8f17e432850f7392fd1e0d24f2c044101d02b8d33b4dc86f75296073dbfd67169e2f6ecf0ef2e4bbd5d87828300e6c6d0d9583c2578d409aa0509946c05f9ed
+MISC metadata.xml 219 SHA256 4246299710294d9f4c0c15b97e8ae7925e01785b962551c6aa27174e99980bcd SHA512 24793c7fd0e2cef8fa5a0efd9bd55fed1e62ff6810199a969d4c0b869bac9b9ec79b288105b73b1b99734320bb13569a8ee00516b5452dd67d91d14dd17038e2 WHIRLPOOL e7f42aba21f5637bb8774cc17a488ecca121e56d5e855a3e956792955b8253f3049e08b2ab258728002263967db02e27914c82ecafee07a6d317bf857d13095f
diff --git a/media-video/pgmfindclip/metadata.xml b/media-video/pgmfindclip/metadata.xml
new file mode 100644
index 000000000000..0427ec20bfd4
--- /dev/null
+++ b/media-video/pgmfindclip/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+<email>media-video@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/media-video/pgmfindclip/pgmfindclip-1.13.ebuild b/media-video/pgmfindclip/pgmfindclip-1.13.ebuild
new file mode 100644
index 000000000000..7222fcde83da
--- /dev/null
+++ b/media-video/pgmfindclip/pgmfindclip-1.13.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit toolchain-funcs
+
+IUSE=""
+
+S="${WORKDIR}"
+
+DESCRIPTION="automatically find a clipping border for a sequence of pgm images"
+HOMEPAGE="http://www.lallafa.de/bp/pgmfindclip.html"
+SRC_URI="http://www.lallafa.de/bp/files/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+src_unpack() {
+	unpack ${A}
+
+	sed -i -e 's:gcc .* -o:$(CC) $(CFLAGS) $(LDFLAGS) -o:' "${S}"/Makefile
+}
+
+src_compile () {
+	emake CC="$(tc-getCC)" || die
+}
+
+src_install () {
+	dobin ${PN} || die
+}
diff --git a/media-video/photofilmstrip/Manifest b/media-video/photofilmstrip/Manifest
new file mode 100644
index 000000000000..59bd79ae9be8
--- /dev/null
+++ b/media-video/photofilmstrip/Manifest
@@ -0,0 +1,7 @@
+AUX photofilmstrip-2.1.0-PIL_modules_imports_fix.patch 3432 SHA256 163d5124a8cc1cf524ebd18ca15f7d4ab6a62d7128c606b777401ad651b7f600 SHA512 d37c31f89d421014023a1b9bb7be1a78731a056a6332e2d1040e1bdc90c7e5652e53b8708e23f68e5ae289063c27e7a05d7c8369845a36d8665297babd23f68a WHIRLPOOL 8a8a753d86b935503f8114a4cbd82c6094650b5f0189a899e9933c2d331db108c47a38139a8120d756d2fd2416cfd47e2bc6bf1373710443dc89341afb4c80e2
+AUX photofilmstrip-2.1.0-PIL_tostring_fix.patch 1479 SHA256 a14c910a25dda90fa4d9a1fc8c3ec735274c136845d7423e86e3cc2570f79d84 SHA512 d08bfc7b77dd6a7e6ef38b74cb40bb9817fd272d22f598318a1313b08901fd042808cbfba25d3a748f8f9fba1c900b9c920db28cc95ac9d2424d5e3cb971ffaf WHIRLPOOL a666343d8a31ca4e478a8f7b974a5dd17167b6f89eb2b788ea207deee089895e8dd401fb92909b59f0e71b82b26aa3a0bdb7e9b70bc17babe612f2cb1504b9c2
+DIST photofilmstrip-2.1.0.tar.gz 243163 SHA256 6889ea2f909a6f5115ddcf14b9b69a7c3cee2bb0277e5093ece750b3018882d5 SHA512 e3cbf19d73d6cc16dcef23c11d84e5bfd1d0721cb72bb4d775390152be2fb20cab14912a9e0e73ef2d9dba9c041883591df2708cdeb7e7447cbcb18e750ea142 WHIRLPOOL 6bf4626e705a296a58ef13d463100c773e274a582b235935bb9aeb6d0aaef1ec052ed51084513ec94a93fe3ef426d9999ae7ec00b9e91855d202d0fa692ac117
+EBUILD photofilmstrip-2.1.0-r2.ebuild 1485 SHA256 088980a75f8c07ebaed3e406670fd66a01a88f5f642d62769ce9a8950605a4ec SHA512 d33f7b219a450b1f6517075420675c23b4176763171bbdf4b7baa37f350c9b4a3e80f4c04fc667b80f3aee69d797a97261f8ecf3776418b2b10868becab7c762 WHIRLPOOL 7f5b370c6d2cf728ab93a2a2bc16dae3d0285d20f58bbb6d0497cacad1d5d7ff4404f5312b82d861456c314e826c59090d562245b86104d7f4aa9d05604f6a01
+MISC ChangeLog 3386 SHA256 c19ffc09e801841f67156a5e7fe252fde6a45136b25d9c23273343542da5001c SHA512 d22b905830bcd7547adb5b5b95fb4397d9508f7e067135b829b1bf1671db5547983de9ebda13465fee67f063485f79b6b0f5072f45d730515760332a19d29d86 WHIRLPOOL fdf2d440afb3bf55064ce02e4d1bcd33ab52ae0096f0a4b3568fc83e83d41be867f855858b974deee6eab60ee9b28b3d678fba926d4a0d859ea4eb6d55dffc98
+MISC ChangeLog-2015 948 SHA256 245d897ae53b9ff3fd92942c97e5236b55bd1fa677beb1b073148a8a68c0ee8c SHA512 64dbf92c2ebffe10876fae2645e1cbba91fb6b02fb3ca75678975a6ec728776b85a577f6c47c2c84853b57dbfd7e190f82be8f7e4a42561b38ba13f0310b12ee WHIRLPOOL 536074effc4ab0ca842bf0cb2cc6a5f2fbd3352054cc5b7ff82fb453a0e65bc199573a20c10b6352a9fda30b0df7287e83cd7b2a4c78399c59cb2de8dc8b73a8
+MISC metadata.xml 683 SHA256 eebd70738f4bda6f3f1d51fb94e419b67dd8590c34ba9992f38aef5a01b1d56c SHA512 58801972ef5326f757ce11964e47267df3b199f36290d0d81d3fecc97f59f678a110c107082d8d8bdebd54fc7268dd75a463a089aa22361157f4770f0d6b7251 WHIRLPOOL c228b10206c0b29912e514d8705389cdba6127eb73a95c6c1d937bd2e4ed65ee356b16fa30c40d7e0b30ecfc0bd0b5d5107e61ba395953fef334b2277978e5ad
diff --git a/media-video/photofilmstrip/files/photofilmstrip-2.1.0-PIL_modules_imports_fix.patch b/media-video/photofilmstrip/files/photofilmstrip-2.1.0-PIL_modules_imports_fix.patch
new file mode 100644
index 000000000000..989459775413
--- /dev/null
+++ b/media-video/photofilmstrip/files/photofilmstrip-2.1.0-PIL_modules_imports_fix.patch
@@ -0,0 +1,91 @@
+--- photofilmstrip-2.1.0-orig/photofilmstrip/core/__init__.py
++++ photofilmstrip-2.1.0/photofilmstrip/core/__init__.py
+@@ -22,47 +22,47 @@
+ # WA: py2exe and PIL
+ import os
+ if os.name == "nt":
+-    import Image
++    import PIL.Image as Image
+ 
+-    import ArgImagePlugin
+-    import BmpImagePlugin
+-    import BufrStubImagePlugin
+-    import CurImagePlugin
+-    import DcxImagePlugin
+-    import EpsImagePlugin
+-    import FitsStubImagePlugin
+-    import FliImagePlugin
+-    import FpxImagePlugin
+-    import GbrImagePlugin
+-    import GifImagePlugin
+-    import GribStubImagePlugin
+-    import Hdf5StubImagePlugin
+-    import IcnsImagePlugin
+-    import IcoImagePlugin
+-    import ImImagePlugin
+-    import ImtImagePlugin
+-    import IptcImagePlugin
+-    import JpegImagePlugin
+-    import McIdasImagePlugin
+-    import MicImagePlugin
+-    import MpegImagePlugin
+-    import MspImagePlugin
+-    import PalmImagePlugin
+-    import PcdImagePlugin
+-    import PcxImagePlugin
+-    import PdfImagePlugin
+-    import PixarImagePlugin
+-    import PngImagePlugin
+-    import PpmImagePlugin
+-    import PsdImagePlugin
+-    import SgiImagePlugin
+-    import SpiderImagePlugin
+-    import SunImagePlugin
+-    import TgaImagePlugin
+-    import TiffImagePlugin
+-    import WmfImagePlugin
+-    import XbmImagePlugin
+-    import XpmImagePlugin
+-    import XVThumbImagePlugin
++    import PIL.ArgImagePlugin as ArgImagePlugin
++    import PIL.BmpImagePlugin as BmpImagePlugin
++    import PIL.BufrStubImagePlugin as BufrStubImagePlugin
++    import PIL.CurImagePlugin as CurImagePlugin
++    import PIL.DcxImagePlugin as DcxImagePlugin
++    import PIL.EpsImagePlugin as EpsImagePlugin
++    import PIL.FitsStubImagePlugin as FitsStubImagePlugin
++    import PIL.FliImagePlugin as FliImagePlugin
++    import PIL.FpxImagePlugin as FpxImagePlugin
++    import PIL.GbrImagePlugin as GbrImagePlugin
++    import PIL.GifImagePlugin as GifImagePlugin
++    import PIL.GribStubImagePlugin as GribStubImagePlugin
++    import PIL.Hdf5StubImagePlugin as Hdf5StubImagePlugin
++    import PIL.IcnsImagePlugin as IcnsImagePlugin
++    import PIL.IcoImagePlugin as IcoImagePlugin
++    import PIL.ImImagePlugin as ImImagePlugin
++    import PIL.ImtImagePlugin as ImtImagePlugin
++    import PIL.IptcImagePlugin as IptcImagePlugin
++    import PIL.JpegImagePlugin as JpegImagePlugin
++    import PIL.McIdasImagePlugin as McIdasImagePlugin
++    import PIL.MicImagePlugin as MicImagePlugin
++    import PIL.MpegImagePlugin as MpegImagePlugin
++    import PIL.MspImagePlugin as MspImagePlugin
++    import PIL.PalmImagePlugin as PalmImagePlugin
++    import PIL.PcdImagePlugin as PcdImagePlugin
++    import PIL.PcxImagePlugin as PcxImagePlugin
++    import PIL.PdfImagePlugin as PdfImagePlugin
++    import PIL.PixarImagePlugin as PixarImagePlugin
++    import PIL.PngImagePlugin as PngImagePlugin
++    import PIL.PpmImagePlugin as PpmImagePlugin
++    import PIL.PsdImagePlugin as PsdImagePlugin
++    import PIL.SgiImagePlugin as SgiImagePlugin
++    import PIL.SpiderImagePlugin as SpiderImagePlugin
++    import PIL.SunImagePlugin as SunImagePlugin
++    import PIL.TgaImagePlugin as TgaImagePlugin
++    import PIL.TiffImagePlugin as TiffImagePlugin
++    import PIL.WmfImagePlugin as WmfImagePlugin
++    import PIL.XbmImagePlugin as XbmImagePlugin
++    import PIL.XpmImagePlugin as XpmImagePlugin
++    import PIL.XVThumbImagePlugin as XVThumbImagePlugin
+     Image._initialized=2
+ # WA: end
diff --git a/media-video/photofilmstrip/files/photofilmstrip-2.1.0-PIL_tostring_fix.patch b/media-video/photofilmstrip/files/photofilmstrip-2.1.0-PIL_tostring_fix.patch
new file mode 100644
index 000000000000..dc29c9c8e14f
--- /dev/null
+++ b/media-video/photofilmstrip/files/photofilmstrip-2.1.0-PIL_tostring_fix.patch
@@ -0,0 +1,35 @@
+Gentoo-Bug: https://bugs.gentoo.org/584128
+
+--- a/photofilmstrip/core/ProjectFile.py
++++ b/photofilmstrip/core/ProjectFile.py
+@@ -196,7 +196,7 @@
+     def __ThumbToQuery(self, picId, pic):
+         pilThumb = PILBackend.GetThumbnail(pic, height=120)
+         thumbWidth, thumbHeight = pilThumb.size
+-        thumbData = buffer(pilThumb.tostring())
++        thumbData = buffer(pilThumb.tobytes())
+         
+         query = "INSERT INTO `thumbnail` (" \
+                     "picture_id, width, height, data" \
+--- a/photofilmstrip/core/renderer/CairoRenderer.py
++++ b/photofilmstrip/core/renderer/CairoRenderer.py
+@@ -121,7 +121,7 @@
+     def _PilToCairo(self, pilImg):
+         pilImg = pilImg.copy()
+         w, h = pilImg.size  
+-        data = pilImg.convert('RGBA').tostring()
++        data = pilImg.convert('RGBA').tobytes()
+         buff = array.array('B', data)
+         cairoImage = cairo.ImageSurface.create_for_data(buff, cairo.FORMAT_ARGB32, w, h)
+ #        cairoImage = cairo.ImageSurface.create_for_data(buff, cairo.FORMAT_RGB24, w, h)
+--- a/photofilmstrip/core/renderer/PyGameRenderer.py
++++ b/photofilmstrip/core/renderer/PyGameRenderer.py
+@@ -100,7 +100,7 @@
+     def _PilToPyGame(self, pilImg):
+         mode = pilImg.mode
+         assert mode in "RGB", "RGBA"
+-        return pygame.image.fromstring(pilImg.tostring(), pilImg.size, mode)
++        return pygame.image.frombytes(pilImg.tobytes(), pilImg.size, mode)
+ 
+ 
+ #    def CropAndResize(self, ctx, rect):
diff --git a/media-video/photofilmstrip/metadata.xml b/media-video/photofilmstrip/metadata.xml
new file mode 100644
index 000000000000..e317c382d289
--- /dev/null
+++ b/media-video/photofilmstrip/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>
+PhotoFilmStrip creates movies out of your pictures in just three steps.
+There are several output possibilities for VCD, SVCD, DVD up to FULL-HD.
+First select your photos, customize the motion path of the Ken Burns effect and
+render the video. Comments of the pictures are generated into a subtitle file. 
+Furthermore an audio file can be specified to setup the background music for the
+slideshow.
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">photostoryx</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/photofilmstrip/photofilmstrip-2.1.0-r2.ebuild b/media-video/photofilmstrip/photofilmstrip-2.1.0-r2.ebuild
new file mode 100644
index 000000000000..d20fa98d7060
--- /dev/null
+++ b/media-video/photofilmstrip/photofilmstrip-2.1.0-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="Movie slideshow creator using Ken Burns effect"
+HOMEPAGE="http://www.photofilmstrip.org"
+SRC_URI="mirror://sourceforge/photostoryx/${PN}/${PV}/${P}.tar.gz"
+LICENSE="GPL-2+"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="cairo sdl"
+
+RDEPEND="
+	dev-python/wxpython:3.0[cairo?,${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	media-video/mplayer[encode]
+	sdl? ( dev-python/pygame[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+# Fix bug #472774 (https://bugs.gentoo.org/show_bug.cgi?id=472774)
+PATCHES=(
+	"${FILESDIR}/${P}-PIL_modules_imports_fix.patch"
+	"${FILESDIR}/${P}-PIL_tostring_fix.patch"
+)
+
+DOCS=( CHANGES COPYING README )
+
+src_prepare() {
+	# Remove unneeded icon resources update needing running X
+	# Fix app doc/help files paths
+	sed -i \
+		-e '/self\._make_resources\(\)/d' \
+		-e "s:\(os\.path\.join(\"share\", \"doc\", \"\)photofilmstrip:\1${PF}:" \
+		setup.py || die
+
+	sed -i \
+		 -e "s:\"photofilmstrip\":\"${PF}\":" \
+		 photofilmstrip/gui/HelpViewer.py || die
+
+	# Fix desktop file entry
+	sed -i \
+		-e '/^Version.*/d' \
+		data/photofilmstrip.desktop || die
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	doman docs/manpage/*
+
+	# Do not compress the apps help files
+	docompress -x /usr/share/doc/${PF}/${PN}.hh{c,k,p}
+
+	distutils-r1_src_install
+}
diff --git a/media-video/pitivi/Manifest b/media-video/pitivi/Manifest
new file mode 100644
index 000000000000..f131e218091b
--- /dev/null
+++ b/media-video/pitivi/Manifest
@@ -0,0 +1,9 @@
+AUX pitivi-0.97.1-optional-tests.patch 677 SHA256 b44a1fb10019656c5393ccf4afd92aab5b03526ee93e499c67dc2b827bf51076 SHA512 a56b8e67410301e83a5559481ded4c50fcc81b8ba148c936623d36e59c9a8db3b6215adfb25f48e75edc821b4d8befdb023da0c15dc8b998531bc7551946c5bd WHIRLPOOL 0d5f9b021cd149af3e90a00b8a66abdc1a574abdf30ed2c1ca908e4c8fef821305335d6fc92a53cf02b0c8937be45c0672d8941d3d001bce2f350db17a93f1bd
+AUX pitivi-0.98.1-optional-tests.patch 742 SHA256 3f830ab085d8d866ca41ad46636da6951c174e7e39618df366ab418b4003f6e0 SHA512 fce5ae7ac4fdd4c340b233529564e20da1dd965261cc2c79d3368ef83ac23931cdee6b492e59a628beaaa25362b81a604ec5bd7bb6270bdb72c15dabb83feac2 WHIRLPOOL ee496bb7031e60dfdbc3e67b07b022b2ab5a8526427244e4af60dfcb317bb3b92cc49035d88c99424ed872a8fd4ed92836ffa30f4dac5468f31540f95f024148
+DIST pitivi-0.97.1.tar.xz 5096672 SHA256 41b23cfd21353647e55a0b2e86bab368b61d6f1a76cc132e80ca0dd27f000e77 SHA512 be5fcf5148349f685f0ee23a82b36d90fe0b7ff6d1d8cdcaf73272b8e5c29ddfe1d6c21353eb95f2d786fe4922a93c747403e5e27141d815f5b46f846a1d95ba WHIRLPOOL dae38565e8665abdf4eacb76ecc87530f2a429266572bbd5db3138e31fa1ae949dafb077dcfffb75fe094c3b55839fba2259690aa5faa1258647b546f661e2e0
+DIST pitivi-0.98.1.tar.xz 5112280 SHA256 10a8e23600681af5f7aed0412400d48e5b5e0fbfb609658ff2c636010f27f32d SHA512 b6530b1b5429c4379699d7492c31ec60ddc514c94a003fe240f7e390b6349093d2f4f72abb1edb4253bd938620c73dfb361abf21915d36ff3b75332e8612bcb3 WHIRLPOOL 4ad31d1499ba2dd7c880f7ba4728439535f2f6dc4bfcdfa58992e48f4d7456f87e31107382935bbea22c9b105f5a4df32bfbab218eab41809b3c008e02e42ae3
+EBUILD pitivi-0.97.1.ebuild 2570 SHA256 1d2f8d31bc0f2e38b128a91bc3bfeade9631a62c2b38735ed8ab913184c82c5f SHA512 736396c684b3f935a90adf744eb33887679a087f43dd95635f02c5e91151b370d9d0af47ae382f865357e10dd395fa994b5cb2caf1d767980cb3563e20107c9f WHIRLPOOL 30682027dd546bd456a5dda61cf50830004e45bd7103b17a3d5519b444111974083b2f45b9a4e83d82f9b80dfb92e414ce5c27f41927c305990096bc62efaf09
+EBUILD pitivi-0.98.1.ebuild 2280 SHA256 a4dc214735baf88624a3cb6ba9653d3db6f9acd11a1ec4b422a0163a6b0007f5 SHA512 156c118be198b7a9ef28a282ea458ad7cf25f1bf77cc4f9345fb02662c5ea2e1fcfe0b6af9e9bbb3f343322ad3c296bc90397dbbe9e6697be5c4b62dd2654a46 WHIRLPOOL 567840e91ab8b41037a37f3b1b0bc39dd29bde4a04cbc695c1efc303ef30dd51a07d0eb6b3564b025f5405b4a20691742225d63290a321f7de3d33a3545e659c
+MISC ChangeLog 4861 SHA256 0af0893ea933091321615fc0796508cfcf88536136c8e80b0afaa6e14bb16941 SHA512 e768eb66febde77ebf123bb774598a5f537a82510c8961055bea8e7cf48e55d1fa63771cfdd49abed58fee971afd8618e216e9ef446a73dbe72ac8f8f509093f WHIRLPOOL fbaa5f167694c0c2a32bae8c6a46c19cc4b0afa6490767f9c3f590160ee11a4b8f282f37f7947a1c46dbdf483478d210c836d5a40a5425177b7f61e6b3c3e0de
+MISC ChangeLog-2015 5966 SHA256 784308c2647ef8a867600668b0f7ff0769faba7d5c34d0f8bde2a6547b1bd490 SHA512 0cc9a7b432c93185560a333c3b40da1c7f9fcd883cdef4f692fb749aa021999580255eae78aaad622aa99f309b1e3a4ee7bb785c843f2879799173f7ef95c571 WHIRLPOOL 858272d2141b2030256b832437d5e1945ee724b1cab94bc7047e1e10e2413e155ff3905169e6b43228d894599bf54ca191d95851781c61451f0d007d07bc7e77
+MISC metadata.xml 379 SHA256 c6797bf15e2b9641bce6d5d1934ffdac7c57ca01d90cf62e9aaa332e2e722a24 SHA512 30023299fba3c7c3743e24223d36366e7b59b01540a874ff432b8431ab29b240fdcd4ac4066b228af5421b009cfe4f67fdb69f7d1030c0fa409a4d545ffd43d1 WHIRLPOOL 3ae7178f229edf3d295cdb09043e6d858d8a75add68098354da4e423ef16a4f7f6021c1f6ba4009a64bd583a1eed04e947bc2c130aa721d1984a412d07aefa79
diff --git a/media-video/pitivi/files/pitivi-0.97.1-optional-tests.patch b/media-video/pitivi/files/pitivi-0.97.1-optional-tests.patch
new file mode 100644
index 000000000000..cfc86dccb1d6
--- /dev/null
+++ b/media-video/pitivi/files/pitivi-0.97.1-optional-tests.patch
@@ -0,0 +1,21 @@
+make tests optional
+
+--- a/meson_options.txt	2016-09-19 23:35:54.944511834 +0200
++++ b/meson_options.txt	2016-09-19 23:36:10.693485976 +0200
+@@ -1,2 +1,3 @@
+ option('enable-xunit', type : 'boolean', value : false)
+ option('disable-help', type : 'boolean', value : false)
++option('enable-tests', type : 'boolean', value : false)
+--- a/meson.build	2016-09-19 23:35:06.694590798 +0200
++++ b/meson.build	2016-09-19 23:35:45.092527990 +0200
+@@ -57,7 +57,9 @@
+ if not get_option('disable-help')
+     subdir('help')
+ endif
+-subdir('tests')
++if get_option('enable-tests')
++    subdir('tests')
++endif
+ 
+ archiver = find_program('git-archive-all', required : false)
+ if archiver.found()
diff --git a/media-video/pitivi/files/pitivi-0.98.1-optional-tests.patch b/media-video/pitivi/files/pitivi-0.98.1-optional-tests.patch
new file mode 100644
index 000000000000..e5f55ffe765f
--- /dev/null
+++ b/media-video/pitivi/files/pitivi-0.98.1-optional-tests.patch
@@ -0,0 +1,23 @@
+Make tests optional
+
+--- a/meson_options.txt	2016-09-19 23:35:54.944511834 +0200
++++ b/meson_options.txt	2016-09-19 23:36:10.693485976 +0200
+@@ -1,2 +1,3 @@
+ option('enable-xunit', type : 'boolean', value : false)
+ option('disable-help', type : 'boolean', value : false)
++option('enable-tests', type : 'boolean', value : false)
+--- a/meson.build	2017-09-03 22:52:39.681974053 +0200
++++ b/meson.build	2017-09-03 22:53:29.934556188 +0200
+@@ -71,8 +71,10 @@
+ if not get_option('disable-help')
+     subdir('help')
+ endif
+-subdir('tests')
+-subdir('tests/validate-tests')
++if get_option('enable-tests')
++  subdir('tests')
++  subdir('tests/validate-tests')
++endif
+ 
+ archiver = find_program('git-archive-all', required : false)
+ if archiver.found()
diff --git a/media-video/pitivi/metadata.xml b/media-video/pitivi/metadata.xml
new file mode 100644
index 000000000000..61fafb069dd2
--- /dev/null
+++ b/media-video/pitivi/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+<maintainer type="project">
+		<email>gstreamer@gentoo.org</email>
+		<name>GStreamer package maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-video/pitivi/pitivi-0.97.1.ebuild b/media-video/pitivi/pitivi-0.97.1.ebuild
new file mode 100644
index 000000000000..c9cb37226068
--- /dev/null
+++ b/media-video/pitivi/pitivi-0.97.1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{3_4,3_5} )
+PYTHON_REQ_USE="sqlite"
+
+inherit gnome2 python-single-r1 virtualx
+
+DESCRIPTION="A non-linear video editor using the GStreamer multimedia framework"
+HOMEPAGE="http://www.pitivi.org"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE="v4l test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# XXX: recommends gst-plugins-libav and frei0r-plugins
+
+# Do not forget to check pitivi/check.py for dependencies!!!
+# pycanberra, gnome-desktop, libav, libnotify and liwnck are optional
+GST_VER="1.8.2"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/pycairo-1.10[${PYTHON_USEDEP}]
+	>=x11-libs/cairo-1.10
+
+	>=media-libs/gstreamer-${GST_VER}:1.0[introspection]
+	>=media-plugins/gst-transcoder-1.8.2-r1
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-libs/glib-2.30.0:2
+
+	>=dev-libs/gobject-introspection-1.34:=
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	>=dev-python/gst-python-1.4:1.0[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pycanberra[${PYTHON_USEDEP}]
+	>=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}]
+
+	gnome-base/librsvg:=
+	gnome-base/gnome-desktop:3=[introspection]
+
+	>=media-libs/gstreamer-editing-services-${GST_VER}:1.0[introspection]
+	>=media-libs/gst-plugins-base-${GST_VER}:1.0[introspection]
+	>=media-libs/gst-plugins-bad-${GST_VER}:1.0[gtk]
+	>=media-libs/gst-plugins-good-${GST_VER}:1.0
+	>=media-plugins/gst-plugins-libav-${GST_VER}:1.0
+
+	x11-libs/libnotify[introspection]
+	x11-libs/libwnck:3[introspection]
+	>=x11-libs/gtk+-3.20.0:3[introspection]
+
+	v4l? ( >=media-plugins/gst-plugins-v4l2-${GST_VER}:1.0 )
+"
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	dev-python/setuptools
+	>=dev-util/intltool-0.35.5
+	>=dev-util/meson-0.28.0
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+PATCHES=(
+	# Make tests optional, bug #594096
+	"${FILESDIR}"/${P}-optional-tests.patch
+)
+
+src_configure() {
+	# Not a normal configure
+	# --buildtype=plain needed for honoring CFLAGS/CXXFLAGS and not
+	# defaulting to debug
+	./configure \
+		--prefix="${EPREFIX}/usr" \
+		--buildtype=plain \
+		--libdir="$(get_libdir)" \
+		-Denable-tests=$(usex test true false) \
+		|| die
+}
+
+src_compile() {
+	# We cannot use 'make' as it won't allow us to build verbosely
+	cd mesonbuild && ninja -v
+}
+
+src_test() {
+	export PITIVI_TOP_LEVEL_DIR="${S}"
+	virtx emake check
+}
+
+src_install() {
+	gnome2_src_install
+	python_fix_shebang "${D}"
+}
diff --git a/media-video/pitivi/pitivi-0.98.1.ebuild b/media-video/pitivi/pitivi-0.98.1.ebuild
new file mode 100644
index 000000000000..99a1d08352ec
--- /dev/null
+++ b/media-video/pitivi/pitivi-0.98.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{3_4,3_5} )
+PYTHON_REQ_USE="sqlite"
+
+inherit gnome.org meson python-single-r1 virtualx
+
+DESCRIPTION="A non-linear video editor using the GStreamer multimedia framework"
+HOMEPAGE="http://www.pitivi.org"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="v4l test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# XXX: recommends gst-plugins-libav and frei0r-plugins
+
+# Do not forget to check pitivi/check.py for dependencies!!!
+# pycanberra, libav, libnotify and liwnck are optional
+GST_VER="1.10.2"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/pycairo-1.10[${PYTHON_USEDEP}]
+	>=x11-libs/cairo-1.10
+
+	>=media-libs/gstreamer-${GST_VER}:1.0[introspection]
+	>=media-plugins/gst-transcoder-1.8.2-r1
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-libs/glib-2.30.0:2
+
+	>=dev-libs/gobject-introspection-1.34:=
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	>=dev-python/gst-python-1.4:1.0[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pycanberra[${PYTHON_USEDEP}]
+	>=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}]
+
+	gnome-base/librsvg:=
+
+	>=media-libs/gstreamer-editing-services-${GST_VER}:1.0[introspection]
+	>=media-libs/gst-plugins-base-${GST_VER}:1.0[introspection]
+	>=media-libs/gst-plugins-bad-${GST_VER}:1.0[gtk]
+	>=media-libs/gst-plugins-good-${GST_VER}:1.0
+	>=media-plugins/gst-plugins-libav-${GST_VER}:1.0
+	>=media-plugins/gst-plugins-gdkpixbuf-${GST_VER}:1.0
+
+	x11-libs/libnotify[introspection]
+	x11-libs/libwnck:3[introspection]
+	>=x11-libs/gtk+-3.20.0:3[introspection]
+
+	v4l? ( >=media-plugins/gst-plugins-v4l2-${GST_VER}:1.0 )
+"
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	dev-python/setuptools
+	>=dev-util/intltool-0.35.5
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( dev-python/nose2[${PYTHON_USEDEP}] )
+"
+
+PATCHES=(
+	# Make tests optional, bug #594096
+	"${FILESDIR}"/${P}-optional-tests.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		-Denable-tests=$(usex test true false)
+	)
+	meson_src_configure
+}
+
+src_compile() {
+	meson_src_compile
+}
+
+src_test() {
+	export PITIVI_TOP_LEVEL_DIR="${S}"
+	virtx meson_src_test
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${D}"
+}
diff --git a/media-video/plasma-mediacenter/Manifest b/media-video/plasma-mediacenter/Manifest
new file mode 100644
index 000000000000..e40ca1ae06b1
--- /dev/null
+++ b/media-video/plasma-mediacenter/Manifest
@@ -0,0 +1,5 @@
+DIST plasma-mediacenter-5.7.5.tar.xz 162076 SHA256 dd0df7dbc3e51ec4e329a6365c25b2b2e3d6e4dd7fd8e0aa916f3f9559a863bf SHA512 47a5b015364a1ffd1fd1b1dd3720e5ae8ebc38e4aee03e55d042c6b9aeea2579e1b7a31f1b0fcef74c4c19c470c7a380694d9c93624a75337eb58080f5b8d09b WHIRLPOOL be95dbb31046495d1cfca4f21417b1766ccd622308b60653cc1e46b8e4d17a9474b0dd8fac523a3b4f2a821936314a202490edc29ad9883f4edd60c9a09fddfb
+EBUILD plasma-mediacenter-5.7.5.ebuild 1205 SHA256 71159aeaab2af5a9831d15652c0f45ab3ddafe72caee45999a64fb5d86671b73 SHA512 d6ec74cf4e6d77984b9d099f66e14f8874781c416102e329c2299c9bbca3de7cabdaaf6ed4dd011cf1952b7b0951200ad33762536a7ebebaac972a117f80efc8 WHIRLPOOL 287ef3994b280e514648d79cc10e8f60bf95a007ee15f5252b7dfaeb1be60be3bbd08dbc8c42073b02716383c02a911aa9eec70a4dd2f182f6bbfaa8befbaa00
+MISC ChangeLog 3130 SHA256 0c05d728fd292b97a62f2eec1652861b43d34626016a8b3f0c5a4da934189c1c SHA512 26909e7b6db6ffd0cba2c8a4255b8ebfdb2290377b23e5b34f92b48cd5e642453a5b9e6b5174bbacf2fcc6c786832b951757bbc62c1032f77f52a3836e266fdc WHIRLPOOL 7e1f3a82ede9b21ecbf85f9e55e54fe576bc6a03c270bce1ad4bf418c46f0cf3a52befd8db9410a602e92066f74e37a783cd3ab7f2df25b6003e22e7e7af501a
+MISC ChangeLog-2015 1696 SHA256 64cdc28ebab069af3e00b66255c02e1c92a211976595f7cf498f54d30843d635 SHA512 9b9862599e2b979e13f90edbc5e37611c37e9875b845b3b35fe10370a062ce6d174f5403c1b011e02d7e40a1897f40e336adda422467e3aaef5dfd3913bd46a2 WHIRLPOOL 8da92807ee783cc8a1948926705da4b7cf8c8bd3e2809f742579db774e45b6962000f640dae1c7fc09f4091273be2d90ca38096779890dd10044fe4940eafced
+MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/media-video/plasma-mediacenter/metadata.xml b/media-video/plasma-mediacenter/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/media-video/plasma-mediacenter/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-video/plasma-mediacenter/plasma-mediacenter-5.7.5.ebuild b/media-video/plasma-mediacenter/plasma-mediacenter-5.7.5.ebuild
new file mode 100644
index 000000000000..81d5579d3d99
--- /dev/null
+++ b/media-video/plasma-mediacenter/plasma-mediacenter-5.7.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Unified media experience for any device capable of running KDE Plasma"
+SRC_URI="mirror://kde/stable/plasma-mediacenter/${PV}/${P}.tar.xz"
+KEYWORDS="amd64 ~arm x86"
+IUSE="semantic-desktop"
+
+DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep plasma)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtxml)
+	media-libs/taglib
+	semantic-desktop? (
+		$(add_frameworks_dep baloo)
+		$(add_frameworks_dep kfilemetadata)
+	)
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep plasma-workspace)
+	$(add_qt_dep qtmultimedia 'qml')
+	!media-video/plasma-mediacenter:0
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+		$(cmake-utils_use_find_package semantic-desktop KF5FileMetadata)
+	)
+
+	kde5_src_configure
+}
diff --git a/media-video/projectx/Manifest b/media-video/projectx/Manifest
new file mode 100644
index 000000000000..660bcf26a6de
--- /dev/null
+++ b/media-video/projectx/Manifest
@@ -0,0 +1,13 @@
+AUX build-0.90.4.00_p33.xml 2026 SHA256 2fbce2f8fff686f705b41ba8e79754e76073c0f294a6ace9ef5720f37e7dd1fe SHA512 6fbe6fdb00f814c5fa72dc52542c3d9950ff4229939090161a208c0013ec0e2867ff6fc656249f2de68c58a26ef2bd059ffe767be1498318a8cb9eddadbb72ea WHIRLPOOL a424a622b14abde921a5eeb9eb462c97e453d58f222eef4dfe968f2b5b522687ea7819605f810032d6eeb93216fdd08eb43607ce9cb705700cfbeb553a679d32
+AUX projectx-0.90.4.00_p33-bl2.patch 515 SHA256 b54d4db6d0c3a25b38fae22d788f5dea45c037a9ff43dddee88e34a501d65425 SHA512 0538f36fed3bb26badea0e38d350717851395274d960b63469198c1ab6ac33e70eb517cbe5281017f8233237c7235eeff58842493476d536beb99727c623fde3 WHIRLPOOL 3a2758dd3ca73b7607b86a822608799b9536a59d97c04d7b6f9c68e5f25ba918b21413edaa7361bac4426001ab446a2a87870d88b9329d73632a60434c49d7b5
+AUX projectx-0.90.4.00_p33-idctfast.patch 1069 SHA256 ebf32d8d288d704cdcaf7333d0fd2768161418cfe423b79e74f1133ed8eb0708 SHA512 696241ab0589132a8286de50a384aff626275aad971429f6a7bef51d912cde31da03eb47f68a001479001cc31c33d1f1670a883900097f9c569e7f4fa4b395ae WHIRLPOOL 0beb2e5f8a07fec59044f14c8e38eea26d389400598876fc99868ca568a0f598e7bf8702436421a39f52ccfdb740c0a43e4d890f037466fa626c8b4233699c62
+AUX projectx-0.90.4.00_p33-stdout-corrupt.patch 358 SHA256 b0aca3638faab72fb9f4dca6341834d66f7e54c3960401fd094b0f740537a3a1 SHA512 b3d6a5c278929c6e6cd60c76a708b5df6cfa0f3772725ddcd6a9334aa5d91c3f2fefc9162381456f4594bd7ffdbf041177968feda82ca513dc9fbd53bc5b23ca WHIRLPOOL ddae3cc594810bb1c4a8b7a190410d721ab10de9e7dff6e99e98a3bacf0dddb47814215ef2b50d6ee3f3cdf0c99fa18f08c531144b8fdfeba296d92d44b66956
+AUX projectx-0.90.4.00_p33-xdg.patch 1062 SHA256 3cfe281805420ec64cec6b571c7db7a5e1f672b806bb9283f653b3a04c874f00 SHA512 661c2577d83845464ae1669b401780ddc312857292e97c962f8fe52463d543b920e66b8ce779193b4ffa66a522f771d78861606ad1f7c915f4ce51fdbeefb3a0 WHIRLPOOL eee95af4350665760ff82e3db5346daaec5e1dbaaab0c69a1dd075f3e57997d13f40b49e370157bf64e6e447aa0bc82779c25629eb9dadd69029a0e657eeb710
+DIST projectx-0.91.0.10.tar.xz 830104 SHA256 7650e4992773c53ea2fb552ee030da8cee62cba4ca63d0f32a4551551f31ad04 SHA512 681dae4fd368a00a7ada37f8e64271c838a9c3737008b6fcd7f74679ca9fdf2cce140b0627a4c77a9a00baea76659bad0d2d710511b66026f9597ad153a2e725 WHIRLPOOL ca5aab50ce4606bb8aee6500ecca3169b2fcd319436781e3da8f2b848e049df1d4daeb6b70cda8722c4d8f64ff1405aab31e70e33ae4b56716d39fdf1ec5d188
+DIST projectx-icon.png 1692 SHA256 0736e4320fbdb211a69e839b768175f18b0b2ef91636a9b382b4024a095dd4cf SHA512 33d9e505140d2dd22d34f87ebff040530130bbb7d1e9958d7345f442bd3d6e17dff8d243e22f374217aed20139871e406e46ca6f03ca48eb338dc3630af2417a WHIRLPOOL f88d7ab5cad4e5dfb893efbaafdc64a518a5f473115f9ef3e9f8a808f88ee71b22c6fbc6fc3a2e8a1885b2b9696ca0136c05d4f4d5cd513dacc6c4851c304f33
+DIST projectx-idctfast.tar.xz 12444 SHA256 d05b86b05c4924b434a6a9bb443c05d5421f6df7a2b19616a53ef1e4b4dada45 SHA512 85dd6dd0011c166aaefd47a47c4455dda68ba6da65c9eda5a996f7d078ce3900168714c0c72c6250f7b99181fda84c6d81e3afb392ace9c12c3c5690de01c1d8 WHIRLPOOL 0a44b37eaf79be8df356a6bc7bc1119bee151c6f7949a09f8b834bd785e242ffda907fbf36ff83e182249f450d835ad58cf3a81d6dceb404634cb01474ce908a
+DIST xdg-20100731.java.xz 648 SHA256 b6a189323fcc25ae5bebc006d870b4191a3bec34c80de7e337e5ed8a39f332c6 SHA512 8b5d8e695f3f052f889002dc93742da8ba9eada173cb10ad1db525e1ad89d1c8f44200d79dc02068ccf93fdbf2e8daa5bb359dae77bacbc89cb6d4895732774b WHIRLPOOL 8a79fe5a73fae9662f0c74d293dbbe43d034484601649f170232e1b79ad0bb337fa8a6b3160683839893cc9e83171ad77e645fc64724c75321b02ef9f47efc85
+EBUILD projectx-0.91.0.10.ebuild 3222 SHA256 f62f92f29fec35fc7128bbcf6e8c26bf1dc5450513a66dc7930fd99c21ace6ef SHA512 8ba93b3cb9bd02b79bb004dcb31741ca9b165650f5e9e3dcb704df4fca9c8f66b95f0bc307b54a0be6f417630579c6fb0ed89d14fb762433d5dd1481ebfc1009 WHIRLPOOL 304d90c3b551f2ef185d6d6b8afca8eda7dfab74307eb4fde868e4f6350d68533d735523f83b2f0eaef2c9befef0f0d6031f8bc6cf43bcdc0c2f2b306e113dc0
+MISC ChangeLog 3379 SHA256 4d3d9cab8b491a627a4336948286de33c869bfa83ef7485c71ff34f718355d91 SHA512 43ddcd757cf306d061987b93fbf74bde9c40b653989ee49da4478283d13dcfbbf2da15e263d8c82df6283f27923a02b5822d910c65907f8531e1b20449097db0 WHIRLPOOL c11fe5b1f05d76998110e589b1c8786182182727e01ab992c9ba7ef2642ce4352528d391e88d02531ffc974d6eb4eda0ef43bb83c744dff7674e16f7e9442eb6
+MISC ChangeLog-2015 11527 SHA256 26a298d35a83c0b35ead2278847c2bf82011d0404634e910daee66dc1ab7cd6e SHA512 017b8e71a632f88f4e046f8c8dc4fd9219869ee0113f1abde7983a8384aa8129d7ffa871d989c92755ceaede2a5495195628b1943b74138053a5a6265887338b WHIRLPOOL e009d15ae1f7d258fca03bd6a8544c1b43541c2ad6abf25e7f44e060ec0b7f3d04cd0db9c44cbfe72bdadd4df97ab909a355349e17ae762af6c6a1f2821b5ce5
+MISC metadata.xml 742 SHA256 3b772b61389bd44f5c2632abf39836c128a236ea58c42dce0f46eb8953bd6a4b SHA512 3a5546c1efbafa335ee5d05ff24c2b22f0f49d8944e242348bef9627ac5e72205d9bd3e697b3d89c7d0ef3e34d98fe19b58c021f41bcaff872c74373a6803341 WHIRLPOOL 93ad95ed34a89d57330800f2e493d32f2207dec1587ef77d1811cb4af8740cac5206e3b92ae1a5ce690b17276cfa47ececb0469309ab4b67d6a01620ea9fb297
diff --git a/media-video/projectx/files/build-0.90.4.00_p33.xml b/media-video/projectx/files/build-0.90.4.00_p33.xml
new file mode 100644
index 000000000000..f35638733b13
--- /dev/null
+++ b/media-video/projectx/files/build-0.90.4.00_p33.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0"?>
+
+<project name="projectx" default="jar">
+	<!-- some properties -->
+	<property name="src.dir" value="src" />
+	<property name="build.dir" value="build" />
+	<property name="docs.dir" value="apidocs" />
+	<property name="dist.dir" value="dist" />
+	<property name="lib.dir" value="lib" />
+	<property name="resources.dir" value="resources" />
+	<property name="project.jar" value="${dist.dir}/${ant.project.name}.jar" />
+	<property name="target.jdk" value="1.5" />
+
+	<!-- classpath -->
+	<path id="refcp">
+		<fileset dir="${lib.dir}">
+			<include name="**/*.jar" />
+		</fileset>
+	</path>
+	
+	<!-- init -->
+	<target name="init">
+		<mkdir dir="${dist.dir}" />
+		<mkdir dir="${docs.dir}" />
+		<mkdir dir="${build.dir}" />
+	</target>	
+
+	<!-- compile everything -->
+	<target name="compile" depends="init">
+		<javac srcdir="${src.dir}"
+			destdir="${build.dir}"
+			source="${target.jdk}"
+			target="${target.jdk}"
+			classpathref="refcp"
+			encoding="ISO-8859-1"/>
+		<copy todir="${build.dir}">
+			<fileset dir="${resources.dir}" />
+		</copy>
+	</target>
+
+	<!-- build the jar files -->
+	<target name="build" depends="compile">
+		<jar jarfile="${project.jar}" basedir="${build.dir}">
+			<manifest>
+				<attribute name="Main-Class" value="${manifest.mainclass}" />
+			</manifest>
+		</jar>
+	</target>
+	
+	<!-- generate javadocs -->
+	<target name="javadoc" depends="init">
+		<javadoc sourcepath="${src.dir}"
+			packagenames="*"
+           		destdir="${docs.dir}"
+           		author="true"
+           		version="true"
+			use="true"
+			charset="UTF-8"
+			encoding="ISO-8859-1"
+           		windowtitle="${ant.project.name} API" />
+	</target>
+	
+	<!-- clean up -->
+	<target name="clean">
+		<delete dir="${build.dir}" />
+		<delete dir="${docs.dir}" />
+		<delete dir="${dist.dir}" />
+	</target>
+
+        <!-- zip the sources -->
+        <target name="sourcezip">
+		<zip destfile="${dist.dir}/${ant.project.name}-src.zip">
+                        <zipfileset dir="${src.dir}" />
+                </zip>
+        </target>
+
+</project>
diff --git a/media-video/projectx/files/projectx-0.90.4.00_p33-bl2.patch b/media-video/projectx/files/projectx-0.90.4.00_p33-bl2.patch
new file mode 100644
index 000000000000..7c5b48263cec
--- /dev/null
+++ b/media-video/projectx/files/projectx-0.90.4.00_p33-bl2.patch
@@ -0,0 +1,15 @@
+--- src/net/sourceforge/dvb/projectx/gui/Html.java	2006-11-25 22:28:52.000000000 +0100
++++ src/net/sourceforge/dvb/projectx/gui/Html.java	2007-06-10 13:37:59.000000000 +0200
+@@ -159,9 +159,10 @@
+ 		{
+ 			try 
+ 			{
+-				BrowserLauncher.openURL(u.toString());
++				BrowserLauncher launcher = new BrowserLauncher();
++				launcher.openURLinBrowser(u.toString());
+ 			} 
+-			catch (IOException e) 
++			catch (Exception e) 
+ 			{
+ 				Common.setMessage(Resource.getString("msg.browser.launcher.error") + " " + e);
+ 			}
diff --git a/media-video/projectx/files/projectx-0.90.4.00_p33-idctfast.patch b/media-video/projectx/files/projectx-0.90.4.00_p33-idctfast.patch
new file mode 100644
index 000000000000..8421dd36ae94
--- /dev/null
+++ b/media-video/projectx/files/projectx-0.90.4.00_p33-idctfast.patch
@@ -0,0 +1,37 @@
+--- src/net/sourceforge/dvb/projectx/video/MpvDecoder.java	2009-12-31 15:24:13.000000000 +0100
++++ src/net/sourceforge/dvb/projectx/video/MpvDecoder.java	2010-07-31 14:32:19.945223425 +0200
+@@ -72,7 +72,7 @@
+ 
+ public class MpvDecoder extends Object {
+ 
+-	private IDCTRefNative idct;
++	private IDCTFast idct;
+ 	private IDCTSseNative idctsse;
+ 
+ 	private int preview_horizontal_size = 512;
+@@ -134,13 +134,13 @@
+ 	{
+ 		Arrays.fill(pixels2, 0xFF505050);
+ 
+-		idct = new IDCTRefNative();
++		idct = new IDCTFast();
+ 		idctsse = new IDCTSseNative();
+ 
+-		if (IDCTRefNative.isLibraryLoaded())
++		if (IDCTFast.isLibraryLoaded())
+ 			idct.init();
+ 
+-		if (IDCTRefNative.isLibraryLoaded() || IDCTSseNative.isLibraryLoaded())
++		if (IDCTFast.isLibraryLoaded() || IDCTSseNative.isLibraryLoaded())
+ 			acceleration = true;
+ 	}
+ 
+@@ -2399,7 +2399,7 @@
+ 			}
+ 		}
+ 
+-		else if (IDCTRefNative.isLibraryLoaded() && isAccelerated())
++		else if (IDCTFast.isLibraryLoaded() && isAccelerated())
+ 		{
+ 			/* copy or add block data into picture */
+ 			for (comp=0; comp<block_count; comp++)
diff --git a/media-video/projectx/files/projectx-0.90.4.00_p33-stdout-corrupt.patch b/media-video/projectx/files/projectx-0.90.4.00_p33-stdout-corrupt.patch
new file mode 100644
index 000000000000..47f7d71c04cb
--- /dev/null
+++ b/media-video/projectx/files/projectx-0.90.4.00_p33-stdout-corrupt.patch
@@ -0,0 +1,11 @@
+--- src/net/sourceforge/dvb/projectx/common/GuiInterface.java	2008-12-04 01:47:03.000000000 +0100
++++ src/net/sourceforge/dvb/projectx/common/GuiInterface.java	2008-12-04 02:21:11.342918380 +0100
+@@ -190,7 +190,7 @@
+ 			impl.updateProgressBar(percent);
+ 
+ 		else
+-			System.out.print("\r" + percent + " %");
++			System.out.print(percent + " %");
+ 	}
+ 
+ 	/**
diff --git a/media-video/projectx/files/projectx-0.90.4.00_p33-xdg.patch b/media-video/projectx/files/projectx-0.90.4.00_p33-xdg.patch
new file mode 100644
index 000000000000..1cb675af4ebb
--- /dev/null
+++ b/media-video/projectx/files/projectx-0.90.4.00_p33-xdg.patch
@@ -0,0 +1,44 @@
+--- src/net/sourceforge/dvb/projectx/common/Settings.java	2008-02-18 19:34:48.000000000 +0100
++++ src/net/sourceforge/dvb/projectx/common/Settings.java	2010-07-31 19:44:59.151224244 +0200
+@@ -46,6 +46,8 @@
+ import java.util.Set;
+ import java.util.TreeMap;
+ 
++import xdg.*;
++
+ import net.sourceforge.dvb.projectx.xinput.XInputDirectory;
+ 
+ /**
+@@ -56,7 +58,7 @@
+ public class Settings extends Object {
+ 
+ 	/** the default ini filename */
+-	private static final String DEFAULT_INI = "X.ini";
++	private static final String DEFAULT_INI = "Project-X.ini";
+ 
+ 	/** the current ini filename */
+ 	private String inifile = "";
+@@ -75,7 +77,7 @@
+ 	 */
+ 	public Settings()
+ 	{
+-		this(Resource.workdir + Resource.filesep + DEFAULT_INI);
++		this(xdg.config_home() + Resource.filesep + DEFAULT_INI);
+ 	}
+ 
+ 	/**
+@@ -161,6 +163,7 @@
+ 			str = inifile;
+ 
+ 		try {
++			xdg.mkdirs_file(str);
+ 			PrintWriter w = new PrintWriter(new FileWriter(str));
+ 
+ 			String base_key = "# Project-X INI";
+@@ -714,4 +717,4 @@
+ 		return inifile;
+ 	}
+ 
+-}
+\ Kein Zeilenumbruch am Dateiende.
++}
diff --git a/media-video/projectx/metadata.xml b/media-video/projectx/metadata.xml
new file mode 100644
index 000000000000..fd8e5c95aa85
--- /dev/null
+++ b/media-video/projectx/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>billie@gentoo.org</email>
+		<name>Daniel Pielmeier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+	<longdescription lang="en">
+		European digital radio &amp; television uses the DVB standard to broadcast
+		its data. Project X gives you a look behind the transmissions and tries
+		its best to handle &amp; repair many stream types and shows what went
+		wrong on reception.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">project-x</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/projectx/projectx-0.91.0.10.ebuild b/media-video/projectx/projectx-0.91.0.10.ebuild
new file mode 100644
index 000000000000..fb44f2af60bd
--- /dev/null
+++ b/media-video/projectx/projectx-0.91.0.10.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils toolchain-funcs java-pkg-2 java-ant-2
+
+XDG_P="xdg-20100731"
+
+DESCRIPTION="Converts, splits and demuxes DVB and other MPEG recordings"
+HOMEPAGE="http://project-x.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~billie/distfiles/${P}.tar.xz
+	http://sbriesen.de/gentoo/distfiles/${PN}-idctfast.tar.xz
+	http://sbriesen.de/gentoo/distfiles/${XDG_P}.java.xz
+	http://sbriesen.de/gentoo/distfiles/${PN}-icon.png"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE="X cpu_flags_x86_mmx cpu_flags_x86_sse"
+
+COMMON_DEP="dev-java/commons-net
+	X? ( =dev-java/browserlauncher2-1* )"
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+
+DEPEND=">=virtual/jdk-1.5
+	app-arch/xz-utils
+	virtual/libiconv
+	${COMMON_DEP}"
+
+S="${WORKDIR}/Project-X"
+
+mainclass() {
+	# read Main-Class from MANIFEST.MF
+	sed -n "s/^Main-Class: \([^ ]\+\).*/\1/p" "${S}/MANIFEST.MF" || die
+}
+
+java_prepare() {
+	local X
+
+	# apply stdout corruption patch (zzam@gentoo.org)
+	epatch "${FILESDIR}/${PN}-0.90.4.00_p33-stdout-corrupt.patch"
+
+	# apply BrowserLauncher2 patch
+	use X && epatch "${FILESDIR}/${PN}-0.90.4.00_p33-bl2.patch"
+	rm -rf src/edu || die
+
+	# apply IDCTFast patch
+	epatch "${FILESDIR}/${PN}-0.90.4.00_p33-idctfast.patch"
+
+	# apply XDG patch
+	cp -f "${WORKDIR}/${XDG_P}.java" "${S}/src/xdg.java" || die
+	epatch "${FILESDIR}/${PN}-0.90.4.00_p33-xdg.patch"
+
+	# copy build.xml
+	cp -f "${FILESDIR}/build-0.90.4.00_p33.xml" build.xml || die
+
+	# patch executable and icon
+	sed -i -e "s:^\(Exec=\).*:\1${PN}_gui:g" \
+		-e "s:^\(Icon=\).*:\1${PN}:g" *.desktop || die
+
+	# convert CRLF to LF
+	edos2unix *.txt MANIFEST.MF
+
+	# convert docs to utf-8
+	if [ -x "$(type -p iconv)" ]; then
+		for X in zutun.txt; do
+			iconv -f LATIN1 -t UTF8 -o "${X}~" "${X}" && mv -f "${X}~" "${X}" || die
+		done
+	fi
+
+	# merge/remove resources depending on USE="X"
+	if use X; then
+		mv -f htmls resources/ || die
+	else
+		rm -rf src/net/sourceforge/dvb/projectx/gui || die
+		rm resources/*.gif || die
+	fi
+
+	# update library packages
+	cd lib || die
+	rm -f {commons-net,jakarta-oro}*.jar || die
+	java-pkg_jar-from commons-net
+	use X && java-pkg_jar-from browserlauncher2-1.0
+	java-pkg_ensure-no-bundled-jars
+}
+
+src_compile() {
+	local IDCT="idct-mjpeg"  # default IDCT implementation
+	if use x86 || use amd64; then
+		use cpu_flags_x86_mmx && IDCT="idct-mjpeg-mmx"
+		use cpu_flags_x86_sse && IDCT="idct-mjpeg-sse"
+	fi
+
+	eant build $(use_doc) -Dmanifest.mainclass=$(mainclass)
+
+	cd lib/PORTABLE || die
+	emake CC=$(tc-getCC) IDCT="${IDCT}" LDFLAGS="${LDFLAGS}" \
+		CPLAT="${CFLAGS} -O3 -ffast-math -fPIC"
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+	java-pkg_doso lib/PORTABLE/libidctfast.so
+
+	java-pkg_dolauncher ${PN}_cli --main $(mainclass) \
+		--java_args "-Djava.awt.headless=true -Xmx256m"
+
+	if use X; then
+		java-pkg_dolauncher ${PN}_gui --main $(mainclass) \
+			--java_args "-Xmx256m"
+		dosym ${PN}_gui /usr/bin/${PN}
+		newicon "${DISTDIR}/${PN}-icon.png" "${PN}.png"
+		domenu *.desktop
+	else
+		dosym ${PN}_cli /usr/bin/${PN}
+	fi
+
+	dodoc *.txt
+	use doc && java-pkg_dojavadoc apidocs
+	use source && java-pkg_dosrc src
+}
diff --git a/media-video/pymp/Manifest b/media-video/pymp/Manifest
new file mode 100644
index 000000000000..209d802d6c47
--- /dev/null
+++ b/media-video/pymp/Manifest
@@ -0,0 +1,5 @@
+DIST pymp-1.1.tar.bz2 132710 SHA256 924c7d0a40d349f4dfc9a0bae2126a432185dc210f740dfc6ab68fd3ec892cd8 SHA512 10647af1233c5a030cc32f5efb7790fb93568832547f8c886d49597cff36f5d5606b7b06c00c0206e9eacd6331dbb40bc2331dc30230052b4510be1ffec34500 WHIRLPOOL 1a99e46f94cc1af7bddae4cfc182f4d94530664e324322663534f187a28beb3c7610d9c4bd790142e5ad59d7ec5ddd9e22d153e60aa8181b91be64216334528f
+EBUILD pymp-1.1-r1.ebuild 1014 SHA256 518ea05d1a46ee33ff4183e4ef5ac9eaf0d5e7cf10f6a123eea9c48b377179d0 SHA512 212212b4dc63d8b83603fcdebf9ba4d78e76f53f5cd5b99378bc5799504e948f891215adaeac747d3158b59c97c50715279034a62c87af421f2ab48fe87a7f8e WHIRLPOOL 5ef9d1f28fc66877cc556d7e29d73bd4d6e6e90fe1a4cbb0ee15abbeee8040cc55dd6c3dbfd486792e5efd6c197e819349cd59d5986b44a7293191f504395866
+MISC ChangeLog 2417 SHA256 9d59cd5362ad89d70a82288404fbbc8cec6790a9b166cd22f4f686f32275008f SHA512 e0a84efc6c773ce225a55ba607948c9eba9adbdadb843b58f04eeed1788743a56089cf97b4097b13f3097fac30021f12d8c6f71db955c0346cf278aed62ae1c7 WHIRLPOOL 069d043b6fde9284e7538eed444f3c98a2c742a77bc6ef2fee0a57f2adaf9ae97cd62c1c1af7dfbc4cd3c89304a6373f19347d6598d5adf0f4ee00a2971783ec
+MISC ChangeLog-2015 1300 SHA256 8f96a60ef0603eeeb9b9588c12aa04518b348c49594b9bdd29aeb878dd6dbd62 SHA512 ca534d797a1e813610d0298945df331f0886460fd59ae52a4e7b9cb7fdd9847194afa9414abbb02f1a55da41928f5a21b12bd75805b274c6b3097a91327d0d1b WHIRLPOOL ed481708fcccdd6f8e234b976d7b91b6525629cc1c763c942bef701eee36238bacbf8a8306333d599c5edbad1926217ca7a1e31d3408ec1a3ec6654dae957f8a
+MISC metadata.xml 223 SHA256 7d0451c70b262d8928fbd11c938e6b5663794345ad10f7be8533ab42b521e42c SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db WHIRLPOOL 0b20f52f85830d008257e03325b74780038fc6e0bf6cc3917aa7f0d8621673c87bebcf201ca0cd876276febe9fcf785fe8f80de1889f2009fdd5bd05c2615d17
diff --git a/media-video/pymp/metadata.xml b/media-video/pymp/metadata.xml
new file mode 100644
index 000000000000..811585329983
--- /dev/null
+++ b/media-video/pymp/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-video/pymp/pymp-1.1-r1.ebuild b/media-video/pymp/pymp-1.1-r1.ebuild
new file mode 100644
index 000000000000..304dbf15c50f
--- /dev/null
+++ b/media-video/pymp/pymp-1.1-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit eutils python-single-r1
+
+DESCRIPTION="a lean, flexible frontend to mplayer written in python"
+HOMEPAGE="http://jdolan.dyndns.org/trac/wiki/Pymp"
+SRC_URI="http://jdolan.dyndns.org/jaydolan/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND="media-video/mplayer
+	dev-python/pygtk[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}"
+DEPEND="sys-apps/sed"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+src_compile() {
+	python_fix_shebang pymp.py
+}
+
+src_install() {
+	python_moduleinto /usr/lib/pymp
+	python_domodule *.py
+
+	# note: pymp script is a horrible unnecessary wrapper
+	# a) with a dependency on sys-apps/which;
+	# b) that invokes compiled .pyc directly
+	# do not use it
+	dodir /usr/bin
+	dosym ../lib/pymp/pymp.py /usr/bin/pymp
+	fperms +x /usr/lib/pymp/pymp.py
+
+	dodoc CHANGELOG README
+	doicon pymp.png
+	make_desktop_entry pymp Pymp pymp
+}
diff --git a/media-video/qgifer/Manifest b/media-video/qgifer/Manifest
new file mode 100644
index 000000000000..152dd5415bf7
--- /dev/null
+++ b/media-video/qgifer/Manifest
@@ -0,0 +1,9 @@
+AUX qgifer-0.2.1-desktop.patch 526 SHA256 dd0a723dd7fb4479f1a5dfc927d41681aa43d6ef20ed180a938cfddb1e5ef57a SHA512 a5b58befb04339fc871e5cb33503996f536275da749ca6211d88ad519900a949c19883b646954c378d6bacaad0a43befbdeedf5b0504af9f82ea9483975fa69a WHIRLPOOL a6d28f537506136fc9f3432c345da19a2edba909980f126c32c2211f0c3610b433b73180f8cdc6956a6cb7ada03cfd70a04841cc45329f45339749073052cd13
+AUX qgifer-0.2.1-giflib5.patch 4549 SHA256 2cacf218767ef7a568177120363398429c259afa1fb6c317619f59b3e43fd5cf SHA512 2c82545722353f5db74ad7c2e96c6a7529701cd5728d331c3c5cb83181ce482e8abdf1b552dd42b32b9cde624d370dd2b9df81c31160b62d29a6aa75baec1814 WHIRLPOOL 48b72a211ff553fd194a0ee9fdf24ae58f6164c2781f56bbb9ff07cb60ee563b81cc91bebaa6ee076d45ad377d37425f3d2ea927a6d50caaa725a4526b6393e6
+AUX qgifer-0.2.1-opencv3.patch 2516 SHA256 3c558c5a612454a8ace78580713cd2697f22886221c850f236588b3aca5623a1 SHA512 95fc605f034a1bd9177dadc0a53505073b253e8b3265b7f07552212b0920225604946f5b711260a9e463e6926795f0867dbb8bfa41bdfd7ce3c247166e5c905a WHIRLPOOL cd1499d9a4d8db5c066fda72890cbb34b064efed87dfce27297bdd087aa0343fac0ed5a0a69f78e26dd072629c449aff9f9fbd7e2e27646bed75402810c53bcb
+DIST qgifer-0.2.1-source.tar.gz 373441 SHA256 b05f2b44faad2a94a746eb7de411875f133e6038ec81a5f3247c86a25a41e9f0 SHA512 ce48e5756cbab283d5894ddb369114e52c9cedc2fe15aed5d22aeeacc822058123d3a2f3c9a6eddf94a1eef992c3ddcad77d6941c76ba0c795c8b44209fac7df WHIRLPOOL 4095c8a6a373b234007b3015cef9ce9d4a023cf80e2701cec7ad5b2df1ab51e28cf63becb412d25e7305571e284b332542b8e15a7d49bd2d40ffe239753be5e4
+EBUILD qgifer-0.2.1-r4.ebuild 1022 SHA256 7214f9550597c46f543148550457a863c058ecba8291600dcbd427a93789ae69 SHA512 1d29a943158e3fffbf184b694b0a6b932c781ad6daf62c0bbb8765b7bda3078aaf5230dd9a5f42e421973bba432c7cc4c8ff97311aad389b4a16c5b1819d4bc5 WHIRLPOOL 15decdbe6da7b7c751f5a9f5a8c1ad599a96798648a3440d51f51cbf13704dfac4fce75154d2deef39b2ec922bb4ed7b55bcc08b5c22bc1909eac289a56f8189
+EBUILD qgifer-0.2.1-r5.ebuild 1075 SHA256 2e837609f86da13ade195ad1094197a436a83d4fe6dc98b8772b815d977a1363 SHA512 d25e9c0bf7587b2cc13662dddbf8c424e9e7a9a18a12d271611c140b62fd32d56b3a325508b2fecd0d3f38dfeafffa48acb1b0db4de5cfddbc3003be00f8d9d1 WHIRLPOOL 4d56e10227bbc056694f3a327ae50cc04497c1abee3830028eb8c47aa5f567dde1f97d98ab247c93d910237541a826677364972b02b34006181b44161f1078cc
+MISC ChangeLog 4688 SHA256 519f38389621f396e73ce5bc3e66ce8819426c6f0154c945a1ea12324cec9059 SHA512 eef3b41af2c53a4c0482c52e413cb00cb6d7cf205c94b300262d43b32ea1bac47a921924129b3da4e4c127494a4b7e2efd67e91f48e634d44d79a78c227076b5 WHIRLPOOL fbb39f71ee305cd03700184d4fa1ad0624662abd94001be32cf1bb3ccbd07f2c6123e1bd7e55f939d30de58393408536a99eb26884f88e7f73e83f3b4c1a8184
+MISC ChangeLog-2015 1012 SHA256 70e9dde07460f1a533d342c6e5e34e6c3220ecf108a0ae8c0e93312c3a818952 SHA512 88ec870d8936b6f236cdc01d655603335a7583fbf58570db125565cbfffd2541d96291778da963f675908c3f6539938d9b0913bcf2c57816c13da3cb4efcb641 WHIRLPOOL 3f15b53f7fd470827761be6a8e9fec200d8ff5b1c7b54d9da414c401fedacc72e53c50bc76a81d7cfc3915cf23926f5434ef98489877293dd60a2f777d461631
+MISC metadata.xml 766 SHA256 632085b989ce7f3546928021f2bd0ff0db67681a23328eaab3acf5873cee7653 SHA512 25d3caf9f629f38e78519e224871b7319141097fc38337419ea743b548e4ce750579c550dfd2aef9f7811f416e2ce02a8e7772c3fb31505205b3eb8eb6162146 WHIRLPOOL 81dbe30a5a722c8dbe481bd404db60176d3aab288edf1c18badcbefd5aa2c55ddc23a11a5f62b6679797760bd22ca63033ac24bfb147274bce43fe2440d781fc
diff --git a/media-video/qgifer/files/qgifer-0.2.1-desktop.patch b/media-video/qgifer/files/qgifer-0.2.1-desktop.patch
new file mode 100644
index 000000000000..8e021630f13a
--- /dev/null
+++ b/media-video/qgifer/files/qgifer-0.2.1-desktop.patch
@@ -0,0 +1,13 @@
+Index: doc/qgifer.desktop
+===================================================================
+--- a/doc/qgifer.desktop	(revision 91)
++++ b/doc/qgifer.desktop	(working copy)
+@@ -3,7 +3,7 @@
+ Name=QGifer
+ Icon=/usr/share/icons/qgifer.xpm
+ Type=Application
+-Categories=Graphics;2DGraphics;RasterGraphics;Video;
++Categories=Graphics;2DGraphics;RasterGraphics;Video;AudioVideo;
+ Comment=A video-based animated GIF creator
+ GenericName=A video-based animated GIF creator
+ Comment[pl]=Narzędzie do tworzenia animowanych plików GIF
diff --git a/media-video/qgifer/files/qgifer-0.2.1-giflib5.patch b/media-video/qgifer/files/qgifer-0.2.1-giflib5.patch
new file mode 100644
index 000000000000..9ddfdac80641
--- /dev/null
+++ b/media-video/qgifer/files/qgifer-0.2.1-giflib5.patch
@@ -0,0 +1,157 @@
+Port qgifer to giflib 5 API.
+See also: https://bugs.gentoo.org/show_bug.cgi?id=536634
+
+--- a/src/gifcreator.cpp
++++ b/src/gifcreator.cpp
+@@ -38,7 +38,7 @@
+ 		    j--;
+ 	       }
+      for(int i=0;i<cmaps.size();i++)
+-	  FreeMapObject(cmaps[i]);
++	  GifFreeMapObject(cmaps[i]);
+ }
+ 
+ 
+@@ -52,7 +52,7 @@
+      }
+   
+   
+-     GifFileType *GifFile = EGifOpenFileName(filename, FALSE);
++     GifFileType *GifFile = EGifOpenFileName(filename, 0, NULL);
+   
+      if (!GifFile){
+ 	  PrintGifError();
+@@ -74,7 +74,7 @@
+      {
+ 	  char nsle[12] = "NETSCAPE2.0";
+ 	  char subblock[3];
+-	  if (EGifPutExtensionFirst(GifFile, APPLICATION_EXT_FUNC_CODE, 11, nsle) == GIF_ERROR) {
++	  if (EGifPutExtension(GifFile, APPLICATION_EXT_FUNC_CODE, 11, nsle) == GIF_ERROR) {
+ 	       PrintGifError();
+ 	       return false;
+ 	  }
+@@ -82,7 +82,7 @@
+ 	  subblock[2] = loop_count % 256;
+ 	  subblock[1] = loop_count / 256;
+ 
+-	  if (EGifPutExtensionLast(GifFile, APPLICATION_EXT_FUNC_CODE, 3, subblock) == GIF_ERROR) {
++	  if (EGifPutExtension(GifFile, APPLICATION_EXT_FUNC_CODE, 3, subblock) == GIF_ERROR) {
+ 	       PrintGifError();
+ 	       return false;
+ 	  }
+@@ -111,7 +111,7 @@
+             
+ 	  if (EGifPutImageDesc(
+ 		   GifFile,
+-		   0, 0, w, h, FALSE, cmaps.size() > ni ? cmaps.at(ni) : cmaps.at(cmaps.size()-1)
++		   0, 0, w, h, 0, cmaps.size() > ni ? cmaps.at(ni) : cmaps.at(cmaps.size()-1)
+ 		   ) == GIF_ERROR) {
+ 	       PrintGifError();
+ 	       endProgress();
+@@ -135,7 +135,7 @@
+ 	  return false;
+      }
+    
+-     if (EGifCloseFile(GifFile) == GIF_ERROR) {
++     if (EGifCloseFile(GifFile, NULL) == GIF_ERROR) {
+ 	  PrintGifError();
+ 	  endProgress();
+ 	  return false;
+--- a/src/gifcreator.h
++++ b/src/gifcreator.h
+@@ -31,6 +31,12 @@
+ typedef vector<GifByteType> Frame;
+ typedef unsigned char Byte;
+ 
++static inline void
++PrintGifError()
++{
++	fprintf(stderr, "\nGIF-LIB error: %s.\n", GifErrorString(GIF_ERROR));
++}
++
+ class GifCreator
+ {
+ 
+--- a/src/palettewidget.cpp
++++ b/src/palettewidget.cpp
+@@ -34,7 +34,7 @@
+ 
+ PaletteWidget::~PaletteWidget()
+ {
+-     FreeMapObject(palette);
++     GifFreeMapObject(palette);
+ }
+ 
+ void PaletteWidget::paintEvent(QPaintEvent*)
+@@ -117,7 +117,7 @@
+      if(palette && mindiff > 1)
+      {
+ 	  qDebug() << "deleting old palette, size: " << size << ", colors: " << palette->ColorCount;
+-	  FreeMapObject(palette);
++	  GifFreeMapObject(palette);
+ 	  qDebug() << "done";
+ 	  palette = NULL;
+      }
+@@ -157,7 +157,7 @@
+      }
+ 
+      ColorMapObject* previous = palette;
+-     palette = MakeMapObject(size, NULL);
++     palette = GifMakeMapObject(size, NULL);
+      if (!palette) 
+      {
+ 	  qDebug() << "NULL palette!";
+@@ -165,7 +165,7 @@
+      }
+      
+ 
+-     if (QuantizeBuffer(fimg.width(), fimg.height(), &size, 
++     if (GifQuantizeBuffer(fimg.width(), fimg.height(), &size, 
+      			&(r[0]),&(g[0]),&(b[0]), &(output[0]), 
+      			palette->Colors) == GIF_ERROR) 
+      {
+@@ -178,11 +178,11 @@
+      //qDebug() << "difference: " << df;
+      if(previous && df < mindiff)
+      {
+-	  FreeMapObject(palette);
++	  GifFreeMapObject(palette);
+ 	  palette = previous;
+      }
+      else if(df >= mindiff)
+-	  FreeMapObject(previous);
++	  GifFreeMapObject(previous);
+ 
+      // qDebug() << "palette (" << palette->ColorCount << ") :";
+      // for(int i=0;i<size;i++)
+@@ -230,8 +230,8 @@
+ {
+      QStringList rgb = QString(str).split(";", QString::SkipEmptyParts);
+      if(palette)
+-	  FreeMapObject(palette);
+-     palette = MakeMapObject(rgb.size(), NULL);
++	  GifFreeMapObject(palette);
++     palette = GifMakeMapObject(rgb.size(), NULL);
+      if(!palette)
+ 	  return false;
+      size = rgb.size();
+--- a/src/palettewidget.h
++++ b/src/palettewidget.h
+@@ -30,7 +30,7 @@
+      PaletteWidget(QWidget* parent=0, Qt::WindowFlags f=0);
+      virtual ~PaletteWidget();
+      ColorMapObject* map() {return palette;}
+-     ColorMapObject* mapCopy() {return MakeMapObject(palette->ColorCount, palette->Colors);}
++     ColorMapObject* mapCopy() {return GifMakeMapObject(palette->ColorCount, palette->Colors);}
+      bool fromImage(const QImage& img, int palette_size, float mindiff = 2);
+      void setColumnCount(int cc){cols = cc;}
+      bool toFile(const QString& path);
+@@ -38,7 +38,7 @@
+      QString toString();
+      bool fromString(const QString& str);
+      int getSize() const {return size;}
+-     void clear() {if(palette) FreeMapObject(palette); palette = NULL; update();}
++     void clear() {if(palette) GifFreeMapObject(palette); palette = NULL; update();}
+ private:
+      int size;
+      int cols;
diff --git a/media-video/qgifer/files/qgifer-0.2.1-opencv3.patch b/media-video/qgifer/files/qgifer-0.2.1-opencv3.patch
new file mode 100644
index 000000000000..89c79ff17943
--- /dev/null
+++ b/media-video/qgifer/files/qgifer-0.2.1-opencv3.patch
@@ -0,0 +1,44 @@
+diff -Naur qgifer-0.2.1-source/CMakeLists.txt qgifer-0.2.1-modified/CMakeLists.txt
+--- qgifer-0.2.1-source/CMakeLists.txt	2013-06-04 18:33:16.000000000 +0200
++++ qgifer-0.2.1-modified/CMakeLists.txt	2015-12-19 20:58:13.772808845 +0100
+@@ -35,7 +35,7 @@
+ 	SET(GIF_INCLUDE_DIR "C:\\Program Files\\GnuWin32\\include")
+ ENDIF(WIN32)
+ 
+-FIND_PACKAGE( OpenCV REQUIRED core highgui imgproc )
++FIND_PACKAGE( OpenCV REQUIRED core highgui imgproc videoio)
+ FIND_PACKAGE(Qt4 REQUIRED)
+ FIND_PACKAGE(GIF REQUIRED)
+ 
+@@ -148,9 +148,9 @@
+ QT4_ADD_RESOURCES(RESOURCES_RCC ${RESOURCES})
+ 
+ IF(WIN32)
+-	SET( OPENCV_LIBS "-lopencv_core244 -lopencv_highgui244 -lopencv_imgproc244" )
++	SET( OPENCV_LIBS "-lopencv_core244 -lopencv_highgui244 -lopencv_imgproc244 -lopencv_videoio244" )
+ ELSE(WIN32)
+-	SET( OPENCV_LIBS "-lopencv_core -lopencv_highgui -lopencv_imgproc" )
++	SET( OPENCV_LIBS "-lopencv_core -lopencv_highgui -lopencv_imgproc -lopencv_videoio" )
+ ENDIF(WIN32)
+ 
+ SET( GIF_LIBS "-lgif" )	
+@@ -207,7 +207,7 @@
+ #SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${PACKAGE_NAME}_${QGIFER_VERSION_MAJOR}.${QGIFER_VERSION_MINOR}.${QGIFER_VERSION_PATCH}")
+  
+ #set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) #za pierwszym razem, pozniej dodano | dla nowszych opencv
+-SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.1.3), libc6 (>= 2.3.6-6~), libgcc1 (>= 1:4.1.1), libgif4 (>= 4.1.4), libopencv-core2.3 | libopencv-core2.4, libopencv-highgui2.3 | libopencv-highgui2.4, libopencv-imgproc2.3 | libopencv-imgproc2.4, libqtcore4 (>= 4:4.7.0~beta1), libqtgui4 (>= 4:4.6.1), libstdc++6 (>= 4.1.1)")
++SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.1.3), libc6 (>= 2.3.6-6~), libgcc1 (>= 1:4.1.1), libgif4 (>= 4.1.4), libopencv-core2.3 | libopencv-core2.4 | libopencv-core3.0, libopencv-highgui2.3 | libopencv-highgui2.4 | libopencv-highgui3.0, libopencv-imgproc2.3 | libopencv-imgproc2.4 | libopencv-imgproc3.0, libqtcore4 (>= 4:4.7.0~beta1), libqtgui4 (>= 4:4.6.1), libstdc++6 (>= 4.1.1)")
+  
+ SET(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
+ SET(CPACK_DEBIAN_PACKAGE_SECTION "video")
+diff -Naur qgifer-0.2.1-source/src/frameplayer.h qgifer-0.2.1-modified/src/frameplayer.h
+--- qgifer-0.2.1-source/src/frameplayer.h	2013-06-04 18:14:55.000000000 +0200
++++ qgifer-0.2.1-modified/src/frameplayer.h	2015-12-19 21:01:44.419870869 +0100
+@@ -23,6 +23,7 @@
+ #include <opencv2/core/core.hpp>
+ #include <opencv2/highgui/highgui.hpp>
+ #include <opencv2/imgproc/imgproc.hpp>
++#include <opencv2/videoio/videoio.hpp>
+ #include <QWidget>
+ #include <QImage>
+ #include <QStatusBar>
diff --git a/media-video/qgifer/metadata.xml b/media-video/qgifer/metadata.xml
new file mode 100644
index 000000000000..ec2e60d4c66c
--- /dev/null
+++ b/media-video/qgifer/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrzej.pauli@gmail.com</email>
+		<name>Andrzej Pauli</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		QGifer is a tool for extracting part of a video to an animated GIF file.
+	</longdescription>
+	<use>
+		<flag name="imagemagick">Use imagemagick for image operations</flag>
+		<flag name="opencv3">Use media-libs/opencv:0/3.0 for video operations instead media-libs/opencv:0/2.4</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">qgifer</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/qgifer/qgifer-0.2.1-r4.ebuild b/media-video/qgifer/qgifer-0.2.1-r4.ebuild
new file mode 100644
index 000000000000..02e746bc7713
--- /dev/null
+++ b/media-video/qgifer/qgifer-0.2.1-r4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils
+
+DESCRIPTION="A video-based animated GIF creator"
+HOMEPAGE="https://sourceforge.net/projects/qgifer/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-source.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug imagemagick opencv3"
+
+RDEPEND="<media-libs/giflib-4.2.3:0
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	imagemagick? ( media-gfx/imagemagick:0 )
+	!opencv3? ( <media-libs/opencv-3.0.0:0[ffmpeg] )
+	opencv3? ( >=media-libs/opencv-3.0.0:0[ffmpeg] )
+	virtual/ffmpeg:0"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}-source"
+
+PATCHES=( "${FILESDIR}/${P}-desktop.patch" )
+
+src_prepare(){
+	use opencv3 && PATCHES+=( "${FILESDIR}/${P}-opencv3.patch" )
+
+	cmake-utils_src_prepare
+
+	# Fix the doc path
+	sed -i -e "s|share/doc/qgifer|share/doc/${PF}|" CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs
+
+	use debug && mycmakeargs=( -DRELEASE_MODE=OFF )
+
+	cmake-utils_src_configure
+}
diff --git a/media-video/qgifer/qgifer-0.2.1-r5.ebuild b/media-video/qgifer/qgifer-0.2.1-r5.ebuild
new file mode 100644
index 000000000000..a027d20e16d8
--- /dev/null
+++ b/media-video/qgifer/qgifer-0.2.1-r5.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="A video-based animated GIF creator"
+HOMEPAGE="https://sourceforge.net/projects/qgifer/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-source.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug imagemagick opencv3"
+
+RDEPEND="
+	>=media-libs/giflib-5.1:=
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	virtual/ffmpeg:0
+	imagemagick? ( media-gfx/imagemagick:0 )
+	!opencv3? ( <media-libs/opencv-3.0.0:0=[ffmpeg] )
+	opencv3? ( >=media-libs/opencv-3.0.0:0=[ffmpeg] )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}-source"
+
+PATCHES=(
+	"${FILESDIR}/${P}-desktop.patch"
+	# Port to giflib 5 API
+	"${FILESDIR}/${P}-giflib5.patch"
+)
+
+src_prepare(){
+	use opencv3 && PATCHES+=( "${FILESDIR}/${P}-opencv3.patch" )
+	cmake-utils_src_prepare
+
+	# Fix the doc path
+	sed -i -e "s|share/doc/qgifer|share/doc/${PF}|" CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		 $(usex debug '-DRELEASE_MODE=OFF' '')
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-video/qt-recordmydesktop/Manifest b/media-video/qt-recordmydesktop/Manifest
new file mode 100644
index 000000000000..984303464d3f
--- /dev/null
+++ b/media-video/qt-recordmydesktop/Manifest
@@ -0,0 +1,8 @@
+AUX qt-recordmydesktop-0.3.8-check-for-jack.patch 1081 SHA256 69891d151b36d601db84b58e1f0d5b11bf867708350167a43c3833137b29130f SHA512 5ed03448afbb3e9c0f7c038f92342df0b727abfcb32c073a555322f3afe7d355b34a72383653bbdcf75cc2f71017caaca98b65c29da88356cb5b5d8b62c91ba2 WHIRLPOOL 3ad0dd9331af9d27c7df9a8cb10e46bbe160579acac24ccf06c8cf6d8cb61d32b0733b3ee27cd74894099454310862fa433c768d03b0c4e902de8b77b3565433
+AUX qt-recordmydesktop-0.3.8-desktopfile.patch 461 SHA256 ef9242ddd08389820eaddf9036b3c4deb1b80e7e2d683c9ce2c90b0a0979b5c4 SHA512 5bac70def84c8dec555c712b1e936e638ae5e54023e7857fa2bfcbf9ea1f5eae75276ee3297c7ed8fa4c95560042b6af702f732cc10ba5d8a643bf27f8d5bd6d WHIRLPOOL bfbcc2a431e0df860f49e0808828dd48d3a2df07fb6759a09663868e0ec3b7fbd30b8bbe3f48b6b09f73a6e9dd89ea32ef558b7f6c114a05d6c5f6f073f5d588
+AUX qt-recordmydesktop-0.3.8-pyqt4.patch 452 SHA256 1e24e8f8a572ae43b8f35012a069abab69a127c66af69be8a84e5f1b5565c9f7 SHA512 61dd69db21302667980e271cea2fe36add27ae8728b4d1b126ac1b1a883301238179735e2299f5c20b450099b1dc865152eaa40541642d1204f33fc8ed57b011 WHIRLPOOL c6058facc2ec93c848c960a41bf43830d0497f19bb7c7b40573eaf53f377214b57d9b52bc9c26063f063babe6926af239e35f4e0c87ca52de0f8127aa368ee65
+DIST qt-recordmydesktop-0.3.8.tar.gz 185528 SHA256 84e43332ea1974edd8da3edb67456e57a40d3083a23c8d19d8f76b098a226f61 SHA512 bdbdfc898e7a463547701b22af94e8b86c48037e3d644afcb0465001922c9cf9e722d0b929868237bd2800edd14df78d6eed93303cdcd19d98ec864934488fe5 WHIRLPOOL cae5c5e8e8ede866c211332f6403a687792e6f7b42be222c680ca3a0af979737665059f6ae224dc95648a8507b8b8bb6a7dca9a0781fb3d3276731c5b9a75e48
+EBUILD qt-recordmydesktop-0.3.8-r3.ebuild 1220 SHA256 3418552fc78be34c9701730e84b298f3ca51f9a86181cd249979ad3205caeb3a SHA512 8cd2bb373d35377ba7086b456aeab8a564c9ac0feab8d48d5c6eda75960c31e6305b6f04c9f4ce7ad086ebc6f4f09b89c8c1e6c491e8122e2c6fad2e09ed777b WHIRLPOOL 86fa141f58721840462479ae4009fbcba9bbe36f495fabd8ea04842dc0161dc5b1a8183e8324329334b19b424c0a8fe7efcb3dbe5fd0c9628c428149b19b9684
+MISC ChangeLog 2625 SHA256 3ac26c299468823459d62bcd054eb4beb76856af11203a581ab2a61d09a08375 SHA512 a7cb7c0a2c643c8500ad64fca18754dd54e44f1d65c2c741e4774e9b67115a9cc79166c8a57d35256e137993c2b50621f7709a7175e803ee8e163243a19dbc9d WHIRLPOOL 4a7150fd18951baa330c37f2af421f66339fbd80fd9ee51fcce879515bf2b3f73bcbff91be2e46b964e8be5e37af76371a4c89b065bc4af8a336c1952cb23123
+MISC ChangeLog-2015 4347 SHA256 00f208719657538521d61c401d7d6f1bc6e8bc52bd1f4665a2940295f5aab144 SHA512 8915444c1abc981e20b5f6e3433ab5218dec4ee3a6ab215366362e938a15d276744774ce0a7a01294e7bd3763340adc3230cef2ddde4c7ae24cf21b5c2524595 WHIRLPOOL f436e5460eb82090f3c0965f17bd6651fee00987dc09987fe695c8e38f0b868fadc272519b156bf9b5e6439a7ca3f0a27dc8a685fab3fdb39d0c7eaec2d58639
+MISC metadata.xml 452 SHA256 fd55538b6cc0d052c764873160faa872030b6ca9e024ec103d2cddb974e31b98 SHA512 931f7bd1ecd2aeb53a02682096eb623bcc5360ed0dc1ea3de65209fc9542989c4446094d7f8f8741e2e983456df270a081d61c5e1fc816f173726f66c96cfa38 WHIRLPOOL 279506944d53dd66f662927faa059a7df3d3921eaae0c532d00207bab96a1b09c902073486dc7816193b579495ac44acd9b2b00d8b392449aed62d85014b3f67
diff --git a/media-video/qt-recordmydesktop/files/qt-recordmydesktop-0.3.8-check-for-jack.patch b/media-video/qt-recordmydesktop/files/qt-recordmydesktop-0.3.8-check-for-jack.patch
new file mode 100644
index 000000000000..d27db3abbcf8
--- /dev/null
+++ b/media-video/qt-recordmydesktop/files/qt-recordmydesktop-0.3.8-check-for-jack.patch
@@ -0,0 +1,32 @@
+--- a/src/rmdPrefsWidget.py	2008-11-23 16:09:14.000000000 +0100
++++ b/src/rmdPrefsWidget.py	2010-05-24 16:23:30.255865721 +0200
+@@ -302,9 +302,29 @@
+     def remPort(self,lwi):
+         self.jack_lsp_listSave.takeItem(self.jack_lsp_listSave.row(lwi))
+ 
++    def which(self,program):
++        import os
++        def is_exe(fpath):
++            return os.path.exists(fpath) and os.access(fpath, os.X_OK)
++
++        fpath, fname = os.path.split(program)
++        if fpath:
++            if is_exe(program):
++                return program
++        else:
++            for path in os.environ["PATH"].split(os.pathsep):
++                exe_file = os.path.join(path, program)
++                if is_exe(exe_file):
++                    return exe_file
++
++        return None
++
+     def __runJackLSP__(self,button=None):
+         self.ports=[]
+         failed=0
++        if self.which('jack_lsp') == None:
++            self.jack_button.setEnabled(False)
++            return
+         (stdin,stdout,stderr)=os.popen3(['jack_lsp'],'t')
+         ports=stdout.readlines()
+         stdin.close()
diff --git a/media-video/qt-recordmydesktop/files/qt-recordmydesktop-0.3.8-desktopfile.patch b/media-video/qt-recordmydesktop/files/qt-recordmydesktop-0.3.8-desktopfile.patch
new file mode 100644
index 000000000000..1ea843a8733a
--- /dev/null
+++ b/media-video/qt-recordmydesktop/files/qt-recordmydesktop-0.3.8-desktopfile.patch
@@ -0,0 +1,18 @@
+Fixes errors reported by desktop-file-validate.
+
+--- a/src/qt-recordmydesktop.desktop
++++ b/src/qt-recordmydesktop.desktop
+@@ -1,12 +1,11 @@
+ [Desktop Entry]
+ Version=1.0
+-Encoding=UTF-8
+ Name=qt-recordMyDesktop
+ Comment=Frontend for recordMyDesktop
+ Comment[fr]=Interface pour recordmydesktop
+ Exec=qt-recordMyDesktop
+ Terminal=false
+ Type=Application
+-Icon=qt-recordmydesktop.png
++Icon=qt-recordmydesktop
+ Categories=AudioVideo;Recorder;
+ StartupNotify=false
diff --git a/media-video/qt-recordmydesktop/files/qt-recordmydesktop-0.3.8-pyqt4.patch b/media-video/qt-recordmydesktop/files/qt-recordmydesktop-0.3.8-pyqt4.patch
new file mode 100644
index 000000000000..9b2368cfd660
--- /dev/null
+++ b/media-video/qt-recordmydesktop/files/qt-recordmydesktop-0.3.8-pyqt4.patch
@@ -0,0 +1,14 @@
+Index: qt-recordmydesktop-0.3.8/configure.ac
+===================================================================
+--- qt-recordmydesktop-0.3.8.orig/configure.ac
++++ qt-recordmydesktop-0.3.8/configure.ac
+@@ -50,8 +50,7 @@ fi
+ b=$(echo "$PYQT4_VERSION" | awk 'BEGIN{ FS="." } { print $1 "\n" $2 "\n" $3 }')
+ c=($b)
+ 
+-
+-export PYQT4_MAJOR=${c[[0]]}
++export PYQT4_MAJOR=${c[[0]]/snapshot-/}
+ export PYQT4_MINOR=${c[[1]]}
+ 
+ if test $PYQT4_MAJOR != 4; then
diff --git a/media-video/qt-recordmydesktop/metadata.xml b/media-video/qt-recordmydesktop/metadata.xml
new file mode 100644
index 000000000000..5fe329f2068f
--- /dev/null
+++ b/media-video/qt-recordmydesktop/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">recordmydesktop</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/qt-recordmydesktop/qt-recordmydesktop-0.3.8-r3.ebuild b/media-video/qt-recordmydesktop/qt-recordmydesktop-0.3.8-r3.ebuild
new file mode 100644
index 000000000000..765398caddc5
--- /dev/null
+++ b/media-video/qt-recordmydesktop/qt-recordmydesktop-0.3.8-r3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit autotools python-single-r1
+
+DESCRIPTION="Qt4 interface for RecordMyDesktop"
+HOMEPAGE="http://recordmydesktop.sourceforge.net/"
+SRC_URI="mirror://sourceforge/recordmydesktop/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+# Test is buggy : bug #186752
+# Tries to run intl-toolupdate without it being substituted from
+# configure, make test tries run make check in flumotion/test what
+# makes me think that this file has been copied from flumotion without
+# much care...
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/PyQt4-4.1[X,${PYTHON_USEDEP}]
+	>=media-video/recordmydesktop-0.3.8
+	x11-apps/xwininfo
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+PATCHES=(
+	"${FILESDIR}/${P}-check-for-jack.patch"
+	"${FILESDIR}/${P}-desktopfile.patch"
+	"${FILESDIR}/${P}-pyqt4.patch"
+)
+
+src_prepare() {
+	default
+
+	# these deps are required by PyQt4, not this package
+	sed -e '/^PKG_CHECK_MODULES/d' -i configure.ac || die "sed failed"
+	eautoreconf
+
+	python_fix_shebang src/qt-recordMyDesktop.in
+}
diff --git a/media-video/qx11grab/Manifest b/media-video/qx11grab/Manifest
new file mode 100644
index 000000000000..1b107b5de838
--- /dev/null
+++ b/media-video/qx11grab/Manifest
@@ -0,0 +1,6 @@
+AUX qx11grab-0.4.12-ffmpeg3.patch 868 SHA256 89f3c0e21b45e4ba4cda49c1627fb712a43022c9283b64d1ffcd28b0ef3d0ee6 SHA512 63018b4524bc8f7c8d87d817a1a8e946f8175a198dd223594dabbb12fc62a51985f2763e6e0e08203a09b35b946dc4fb1fd61c64d7fc5f21658a4ac6fc9f1356 WHIRLPOOL 26b516f25fe1cf05e8bfd7fa8cef79614d4a28383686fd8cc0aa54cfed13174b152998d8c950f8ed6bd9c2212c15bd0bc16c367548bffcdbea72f8915d38928a
+DIST qx11grab-0.4.12.tar.xz 392304 SHA256 0f3d7ecb2e9d6fed3fd0c48cbc527c15f46a0f1befa666d0f6941f49df3ed7ca SHA512 6731d2bfc4fa889cf14da597408d86ddb68a33c5ed1ede3f4c49ed2746cebb71c2dd23cab17c2c03e52a60cfbbce928519a21d86fb5572fd88934e8bdf29cdb9 WHIRLPOOL 32663033215268f2bbe556332e95166539aaf95a740e634c6c6238aa322907dd0d4896c36eb0eea7a1b2378e54ef7a105e3d6327df06978ba8e15cdb1023e789
+EBUILD qx11grab-0.4.12.ebuild 1327 SHA256 b44cf292b249d03df0758928f7a07e16e0cdac25621f653f4e1be7a9d4536611 SHA512 cba879366f5e680a48c5fd924d78d2f0b1ffff17d38f319f84e67bf3779b3e928083198a0b75552fb988674a1bb17a628ee427e2dd41a52579ad812dae25d763 WHIRLPOOL 0455717ee938aebe0b45dfba796de0aef27ae51d8e20c4c0d269cc03ad3f89096976b0f9d5fc796026e9cbb9c761a515580ae9c1bfe88e000a0af508f3a282a7
+MISC ChangeLog 3778 SHA256 f61351dae191b5767b6b3fd458348ec0db46d11f09924c2e0388f502c9be98ae SHA512 99b92a11a77728c3963aa9462aedc7bc5b64fc0880b93fc458c3353a064c64c7b25b8f1fde2f5b2c14b889f5c0a3b678209379eb0a31eeff6256fd8433565935 WHIRLPOOL 3596014a650c3aa362bbaeb7bbfcdfb8dffc0fc1f2cc7feb52dc62c0a267ecb62efe37a58eba3d5a31b437ca7210401cad0e2ac827ca99c95c9060b2e97989b5
+MISC ChangeLog-2015 7648 SHA256 3233eba947d1b907ddcaea10affa8e1beecaf4d6bfcd64fc0ddcecc655e2074f SHA512 7b866bbf7b4a5e26b470385c32aa21471721094c9be36699c3583b21a2c3f8bfab6a6acae2c9ba5ee16ba5ebf3a633fe42ebb3a2068de32e9299b6f2855c5b6b WHIRLPOOL cde33350373ed292e592a40cc0dbbf808e06332d3af0079557eacfd3e0d252f302d2336b816b141de8a4cc7fcc5fbb46579d38ad2ee056b6f62d39dd43594c27
+MISC metadata.xml 247 SHA256 690d3e08cdd71b405f5361dfa3f33007ce9ec9d0ae7628e9271891da9e2bda92 SHA512 b43c8e84c3c753b49b203921a5aca792639a36d6efdbe16c069ff9abfbce0585718bb3824c03abdd7bd19ada13fb0a98a378c85ed369ac5fdc53ad3b3d5465d2 WHIRLPOOL dffc398d6bdbe8a8afc8863675a819a7bd69ae4d098ffbddad4c21ab8f1a850ab8ede71f98e34999b0605ad01ea93c8864cd681b50d3e153aa3d0901ddb10743
diff --git a/media-video/qx11grab/files/qx11grab-0.4.12-ffmpeg3.patch b/media-video/qx11grab/files/qx11grab-0.4.12-ffmpeg3.patch
new file mode 100644
index 000000000000..a5d20ed5161d
--- /dev/null
+++ b/media-video/qx11grab/files/qx11grab-0.4.12-ffmpeg3.patch
@@ -0,0 +1,22 @@
+Index: qx11grab-0.4.12/src/avoptions/avoptions.cpp
+===================================================================
+--- qx11grab-0.4.12.orig/src/avoptions/avoptions.cpp
++++ qx11grab-0.4.12/src/avoptions/avoptions.cpp
+@@ -178,14 +178,14 @@ namespace QX11Grab
+   {
+     QList<FFOption> list;
+     avcodec_register_all();
+-    for ( int i = 0; i < PIX_FMT_NB; i++ )
++    int i = 0;
++    for ( const AVPixFmtDescriptor* pix_desc = av_pix_fmt_desc_next(NULL); pix_desc != NULL; pix_desc = av_pix_fmt_desc_next(pix_desc))
+     {
+-      const AVPixFmtDescriptor* pix_desc = &av_pix_fmt_descriptors[ static_cast<PixelFormat> ( i ) ];
+       if ( ! pix_desc->name )
+         continue;
+ 
+       FFOption opt;
+-      opt.id = i;
++      opt.id = i++;
+       opt.name = QString::fromUtf8 ( pix_desc->name );
+       opt.value = QVariant ( pix_desc->name );
+       /*: ToolTip */
diff --git a/media-video/qx11grab/metadata.xml b/media-video/qx11grab/metadata.xml
new file mode 100644
index 000000000000..17237689dcfd
--- /dev/null
+++ b/media-video/qx11grab/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-video/qx11grab/qx11grab-0.4.12.ebuild b/media-video/qx11grab/qx11grab-0.4.12.ebuild
new file mode 100644
index 000000000000..236df54b6bc3
--- /dev/null
+++ b/media-video/qx11grab/qx11grab-0.4.12.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="X11 desktop video grabber tray"
+HOMEPAGE="http://qx11grab.hjcms.de/"
+SRC_URI="http://qx11grab.hjcms.de/downloads/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="libav opengl pulseaudio"
+
+RDEPEND="
+	dev-libs/qjson
+	>=dev-qt/qtcore-4.7.4:4
+	>=dev-qt/qtdbus-4.7.4:4
+	>=dev-qt/qtgui-4.7.4:4[accessibility]
+	>=media-libs/alsa-lib-1.0.26
+	>=media-libs/fontconfig-2.4
+	>=media-libs/freetype-2.4:2
+	>=sys-apps/dbus-1.6.4
+	>=x11-libs/libX11-1.3.4
+	>=x11-libs/libXrandr-1.3
+	libav? ( >=media-video/libav-9:0=[X,encode,truetype] )
+	!libav? ( >=media-video/ffmpeg-1.1:0=[X,encode,truetype] )
+	opengl? ( >=dev-qt/qtopengl-4.7.4:4 )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+PDEPEND="virtual/freedesktop-icon-theme"
+
+PATCHES=( "${FILESDIR}/${P}-ffmpeg3.patch" )
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# install docs into standard Gentoo location
+	sed -i -e "/DESTINATION share/ s:\${CMAKE_PROJECT_NAME}:doc/${PF}:" \
+		CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_KDE_SUPPORT=OFF
+		$(cmake-utils_use_enable opengl)
+		$(cmake-utils_use_enable pulseaudio PULSE)
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-video/raspberrypi-omxplayer/Manifest b/media-video/raspberrypi-omxplayer/Manifest
new file mode 100644
index 000000000000..9f5bad7deba0
--- /dev/null
+++ b/media-video/raspberrypi-omxplayer/Manifest
@@ -0,0 +1,12 @@
+AUX Makefile-0_p20160217.patch 1567 SHA256 8cd84c471a216a5e15c4ba9aa6b31bba4576f6911ca97725b18ccc4767a98e31 SHA512 c32de32fbbe39b004c428aee9bd65574704c02cd5a7470ceaeba5a039ffb1b78f288f6394a2aa2a544072704ee6d1d2eff10689d15ea16ba8350c6c71bba11eb WHIRLPOOL 954ec37b0c464a387945743f7942b2afc7261d308912c6ae5d694366957fc31359ec615dd5286ac994e298913b36b74756ab208f1de7b7ece37df5512f668d25
+AUX Makefile-0_p20160528.patch 1578 SHA256 0dbafdc5a5a79eae46562b9841c911b589f97d9118172acacca35801e28ab224 SHA512 6831719329d6900dd65c7fa6961790300bb8c204b59b81f2d0c6c31e6410bbf89f206d852cd5fb364e2945f36d6fc6be9f25f34158d1c1831581ff05162f900b WHIRLPOOL 2f567a946e28ca07be262de96ed454878bc19e6d111379ef59fee4f5228f7790e3f4302450dd94b8b4645939632e8a79726fa0d23a27013b51682a6dd71f49c6
+AUX cross-0_p20160528.patch 520 SHA256 7998b200ea72d11895b60aee21571f3c18cd5db590dab9fe881c5f4048f52164 SHA512 7ac3f7b3cda31ff6277da792d49e18b792646108faa28154bbad719f0181187e22d9ac7065a685edfcbc28076fc8a37d95b9381cc68e39a469a15c85622dec58 WHIRLPOOL 58c073703df57bfc8a79a481309906c6ebdd970199279cf551803258d6559bc5f2fa073e6076f59e0d873b95bb879f4ec45d53287a4e8e9cec66db3a154204a2
+AUX fonts-path.patch 881 SHA256 15838174c8fba07b5df2249f721203842827cd08b8f820b43c3f0f3e8abb4462 SHA512 995e9b5850a240e07814697054178fc19e94483d51b11a3786b8eff6c609619be2d7caa97c63ebdc1d194acb1d24a85b8acd34bbb4d5c0c7cc92a14da7b368dd WHIRLPOOL 7eb04d48d3e675410354e66f9f2624669b998a76bd644a0207121f710769de014b12e6f0dc753dbe8066267c545738e2b9b293de6b5d8809c4523406e2f9446c
+DIST raspberrypi-omxplayer-0_p20160217.tar.gz 1204486 SHA256 eba2c6ea0843db8105fe4fe9c1f345db38952e4b96bf83ba15b1a3fd0e05effa SHA512 5137ba534ce3b0698c6ace8f570594c97ef978aaa97e6cc902f7895412c5d0282c7c4fa1f7b03f043d5281f0a282caf494602e45aae6a12d6d35bc26aaa4000f WHIRLPOOL 377b53ab0f4308ff600c8cf7af5939e79a942cca22d458b00fb38cebac8cb8760a3be22ad6ad0719890b61f7aa131e623067c96d1846b4aff8e38210e39770b6
+DIST raspberrypi-omxplayer-0_p20160528.tar.gz 1207624 SHA256 8c53d309144e9668092d1c51d32d0719cbc19295f714349655b17c9aa2a71d7f SHA512 c7b00908f52159745dda94f35b9150122ca1e4e97ad1578a89f6db917b1579a8ed94c4ef1592a7c2590240e0fd1e7e0617e3ee8dec7f532368205ee63ce42572 WHIRLPOOL 38d59c1ef076933466acd01186734d44b3d0f1602d415cb51ff82934ad69eac379c24f6d731c79b1cb8daea96148ff96e99c8f74577edbfaaf751fad434f4b18
+EBUILD raspberrypi-omxplayer-0_p20160217.ebuild 1067 SHA256 edc1ecd4a981577ae1d00e6f165cd0bb219562473d36daacb7b59e6b6a424c87 SHA512 62213cc1fc99dcac836e2254314070752143037f739f995f9ba173a0bed016518b0b1b24837ec07b17decfdf8054f938019480ed8e2c7aa84cf092905eaf3bed WHIRLPOOL 36c666d483af261bd2d6be53b673941d568891f98862ce6d2ee5c3f000266b8919980b7e5dd822b0757eddfa487824afb122428de350a772a753761651bb1716
+EBUILD raspberrypi-omxplayer-0_p20160528-r1.ebuild 1200 SHA256 5d8ed5e6f2ace286b9e5f570d24844a38b3fea8c3a8e63c579917cda99f3ef91 SHA512 02752cc2c3b6b27b115355d1ee88a493cd5dd2323b70cc41817ca6da06cd8346521c3adaf1b93239b7a5c0fc82e8e84c2510542a5a3b654af6dbf687ebe37bc5 WHIRLPOOL f3e1048d1cb9e6453d7a1a35b13c22545c7b3fa16b6031e31f019091a29cec77a3190ca1bfe5968931e054d8e6ae4ebd029ee7a6c68c9806ab3eaf8e00901c3c
+EBUILD raspberrypi-omxplayer-0_p20160528.ebuild 1129 SHA256 fbb445171daae8a174625b10ed8956b1c821f35fb518806df535f1e74e435648 SHA512 a96c8bf14e56605c9ce5a0d436e9ec36e981f4222a5377b0ea9d52f6e44b67fe1cc8580716551c3c34a7364e2595bf3a610227cb2bddf06f459bca5f951eebc4 WHIRLPOOL ecff455a2c819406d9c424281a723a35869c4ea1c76ae1f7af28d8d04eb2e292ae1901508a7708bcf53b4802128732c06222f584849749ca682fc14630f03ea1
+EBUILD raspberrypi-omxplayer-9999.ebuild 1022 SHA256 b88cd805f5d86324c2c34055db357c29b3f6996a051417a3b0d593e52628f113 SHA512 2c1441c7254ec193c8c7dbe2186af6aa24a7be6617fe3850606bd5643ea48cb9667c0cad1418fe3c53ff65d2aa08413979f58f1f190e53a1b831479ef1abb1ce WHIRLPOOL 863f9a68cc8573645299995008866a23c9614bf970c21adb514a43e2136bc925cea8c7e3a92cb2998aa2b2d370453343e62773ea6a4c61b19d7ca1a9b64d5b8c
+MISC ChangeLog 1917 SHA256 80ee59143c4b92ca8e91664b2edf6f40411a07c10c0225a3cd3a0ea7e9bd2c5d SHA512 4bea357d6b582545bb344741220ab73b9f67becac7bd937ed303b6fd822ae91d83440a7fbaa52032c9722326da92125ce3e10c4cd33dc45b950bdfdcf52a40b5 WHIRLPOOL 9c4bc9ea46a54de01679c983f6efc0ff5dd2219871469180037f47a762f7ed5d81537a947d1f2bf26ecf3d2466cc87de5d6cbdee8978609fba658c44822d90d5
+MISC metadata.xml 417 SHA256 32d0520299bafeb8b2f88e040fc8cc51353e6eeb4a5695acf8c3af76ac5bd3d7 SHA512 9558aefbd95a7ffef7c3714d41582531eadee6b1d6579338f036f7964ffbec1d217460d3a5cfff674cd0f915ad5efec9c97670769fb5abf19c57e5ccaa88c9b5 WHIRLPOOL 321e3964d4b7e0cb991e8d3414839598ff9c450aed9a8e041de6f736bc2ebf2b479611f65ede5ddc34194154228be5efe26a2969101be1eee0d76c7f48e177df
diff --git a/media-video/raspberrypi-omxplayer/files/Makefile-0_p20160217.patch b/media-video/raspberrypi-omxplayer/files/Makefile-0_p20160217.patch
new file mode 100644
index 000000000000..c6f945209b95
--- /dev/null
+++ b/media-video/raspberrypi-omxplayer/files/Makefile-0_p20160217.patch
@@ -0,0 +1,26 @@
+--- omxplayer-9999/Makefile
++++ omxplayer-9999/Makefile
+@@ -2,9 +2,11 @@
+ 
+ CFLAGS+=-std=c++0x -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -DTARGET_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CMAKE_CONFIG -D__VIDEOCORE4__ -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG  -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_OPT_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DHAVE_LIBSWRESAMPLE_SWRESAMPLE_H -DOMX -DOMX_SKIP64BIT -ftree-vectorize -DUSE_EXTERNAL_OMX -DTARGET_RASPBERRY_PI -DUSE_EXTERNAL_LIBBCM_HOST
+ 
+-LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz
++PKGS=freetype2 dbus-1 libavcodec libavutil libavformat libswresample libswscale libpcre
++
++LIBS+=-lrt -lpthread $(shell pkg-config --libs $(PKGS)) -L/opt/vc/lib
+ 
+-INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/ -I /usr/include/dbus-1.0 -I /usr/lib/arm-linux-gnueabihf/dbus-1.0/include
++INCLUDES+=$(shell pkg-config --cflags $(PKGS)) -I/opt/vc/include -I. -Ilinux
+ 
+ DIST ?= omxplayer-dist
+ 
+@@ -51,8 +47,7 @@
+ 	bash gen_version.sh > version.h 
+ 
+ omxplayer.bin: version $(OBJS)
+-	$(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) -lvchiq_arm -lvcos -ldbus-1 -lrt -lpthread -lavutil -lavcodec -lavformat -lswscale -lswresample -lpcre
+-	$(STRIP) omxplayer.bin
++	$(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) $(LIBS)
+ 
+ help.h: README.md Makefile
+ 	awk '/SYNOPSIS/{p=1;print;next} p&&/KEY BINDINGS/{p=0};p' $< \
diff --git a/media-video/raspberrypi-omxplayer/files/Makefile-0_p20160528.patch b/media-video/raspberrypi-omxplayer/files/Makefile-0_p20160528.patch
new file mode 100644
index 000000000000..eb65f5d7ad70
--- /dev/null
+++ b/media-video/raspberrypi-omxplayer/files/Makefile-0_p20160528.patch
@@ -0,0 +1,26 @@
+--- omxplayer-9999/Makefile
++++ omxplayer-9999/Makefile
+@@ -2,9 +2,11 @@
+ 
+ CFLAGS+=-std=c++0x -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -DTARGET_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CMAKE_CONFIG -D__VIDEOCORE4__ -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG  -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_OPT_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DHAVE_LIBSWRESAMPLE_SWRESAMPLE_H -DOMX -DOMX_SKIP64BIT -ftree-vectorize -DUSE_EXTERNAL_OMX -DTARGET_RASPBERRY_PI -DUSE_EXTERNAL_LIBBCM_HOST
+ 
+-LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz
++PKGS=freetype2 dbus-1 libavcodec libavutil libavformat libswresample libswscale libpcre
++
++LIBS+=-lrt -lpthread $(shell pkg-config --libs $(PKGS)) -L/opt/vc/lib
+ 
+-INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/ -I /usr/include/dbus-1.0 -I /usr/lib/arm-linux-gnueabihf/dbus-1.0/include
++INCLUDES+=$(shell pkg-config --cflags $(PKGS)) -I/opt/vc/include -I. -Ilinux
+ 
+ DIST ?= omxplayer-dist
+ 
+@@ -51,8 +47,7 @@
+ 	bash gen_version.sh > version.h 
+ 
+ omxplayer.bin: version $(OBJS)
+-	$(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) -lvchiq_arm -lvchostif -lvcos -ldbus-1 -lrt -lpthread -lavutil -lavcodec -lavformat -lswscale -lswresample -lpcre
+-	$(STRIP) omxplayer.bin
++	$(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) $(LIBS)
+ 
+ help.h: README.md Makefile
+ 	awk '/SYNOPSIS/{p=1;print;next} p&&/KEY BINDINGS/{p=0};p' $< \
diff --git a/media-video/raspberrypi-omxplayer/files/cross-0_p20160528.patch b/media-video/raspberrypi-omxplayer/files/cross-0_p20160528.patch
new file mode 100644
index 000000000000..bd35d6283d21
--- /dev/null
+++ b/media-video/raspberrypi-omxplayer/files/cross-0_p20160528.patch
@@ -0,0 +1,15 @@
+--- a/Makefile
++++ b/Makefile
+@@ -4,9 +4,11 @@
+ 
+ PKGS=freetype2 dbus-1 libavcodec libavutil libavformat libswresample libswscale libpcre
+ 
+-LIBS+=-lrt -lpthread $(shell pkg-config --libs $(PKGS)) -L/opt/vc/lib
++PKG_CONFIG ?= pkg-config
+ 
+-INCLUDES+=$(shell pkg-config --cflags $(PKGS)) -I/opt/vc/include -I. -Ilinux
++LIBS+=-lrt -lpthread $(shell $(PKG_CONFIG) --libs $(PKGS)) -L${SYSROOT}/opt/vc/lib
++
++INCLUDES+=$(shell $(PKG_CONFIG) --cflags $(PKGS)) -I${SYSROOT}/opt/vc/include -I. -Ilinux
+ 
+ DIST ?= omxplayer-dist
diff --git a/media-video/raspberrypi-omxplayer/files/fonts-path.patch b/media-video/raspberrypi-omxplayer/files/fonts-path.patch
new file mode 100644
index 000000000000..6683145f6833
--- /dev/null
+++ b/media-video/raspberrypi-omxplayer/files/fonts-path.patch
@@ -0,0 +1,15 @@
+diff --git a/omxplayer.cpp b/omxplayer.cpp
+index 0626e2e..8450bf2 100644
+--- a/omxplayer.cpp
++++ b/omxplayer.cpp
+@@ -83,8 +83,8 @@ bool              m_osd                 = true;
+ bool              m_no_keys             = false;
+ std::string       m_external_subtitles_path;
+ bool              m_has_external_subtitles = false;
+-std::string       m_font_path           = "/usr/share/fonts/truetype/freefont/FreeSans.ttf";
+-std::string       m_italic_font_path    = "/usr/share/fonts/truetype/freefont/FreeSansOblique.ttf";
++std::string       m_font_path           = "/usr/share/fonts/freefont/FreeSans.ttf";
++std::string       m_italic_font_path    = "/usr/share/fonts/freefont/FreeSansOblique.ttf";
+ std::string       m_dbus_name           = "org.mpris.MediaPlayer2.omxplayer";
+ bool              m_asked_for_font      = false;
+ bool              m_asked_for_italic_font = false;
diff --git a/media-video/raspberrypi-omxplayer/metadata.xml b/media-video/raspberrypi-omxplayer/metadata.xml
new file mode 100644
index 000000000000..8cad57807703
--- /dev/null
+++ b/media-video/raspberrypi-omxplayer/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>fordfrog@gentoo.org</email>
+		<name>Miroslav Šulc</name>
+	</maintainer>
+	<longdescription>Command line media player for the Raspberry Pi</longdescription>
+	<upstream>
+		<remote-id type="github">popcornmix/omxplayer</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160217.ebuild b/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160217.ebuild
new file mode 100644
index 000000000000..4a1c214969f9
--- /dev/null
+++ b/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160217.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs flag-o-matic
+
+GIT_COMMIT="15a490b"
+DESCRIPTION="Command line media player for the Raspberry Pi"
+HOMEPAGE="https://github.com/popcornmix/omxplayer"
+SRC_URI="https://github.com/popcornmix/omxplayer/tarball/${GIT_COMMIT} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~arm"
+IUSE=""
+
+RDEPEND="dev-libs/libpcre
+	media-fonts/freefont
+	|| ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin )
+	sys-apps/dbus
+	sys-apps/fbset
+	virtual/ffmpeg
+	x11-apps/xrefresh
+	x11-apps/xset"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/popcornmix-omxplayer-${GIT_COMMIT}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/Makefile-0_p20160217.patch \
+		"${FILESDIR}"/fonts-path.patch
+
+	cat > Makefile.include << EOF
+LIBS=-lvchiq_arm -lvcos -lbcm_host -lEGL -lGLESv2 -lopenmaxil -lrt -lpthread
+EOF
+
+	tc-export CXX
+}
+
+src_compile() {
+	emake omxplayer.bin
+}
+
+src_install() {
+	dobin omxplayer omxplayer.bin
+	dodoc README.md
+}
diff --git a/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160528-r1.ebuild b/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160528-r1.ebuild
new file mode 100644
index 000000000000..5592e2b50c30
--- /dev/null
+++ b/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160528-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+GIT_COMMIT="791d7df"
+DESCRIPTION="Command line media player for the Raspberry Pi"
+HOMEPAGE="https://github.com/popcornmix/omxplayer"
+SRC_URI="https://github.com/popcornmix/omxplayer/tarball/${GIT_COMMIT} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~arm"
+IUSE="X"
+
+RDEPEND="dev-libs/libpcre
+	media-fonts/freefont
+	|| ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin )
+	sys-apps/dbus
+	sys-apps/fbset
+	virtual/ffmpeg
+	dev-libs/boost
+	media-libs/freetype:2
+	X? (
+		x11-apps/xrefresh
+		x11-apps/xset
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/Makefile-0_p20160528.patch
+	"${FILESDIR}"/fonts-path.patch
+	"${FILESDIR}"/cross-0_p20160528.patch
+)
+
+DOCS=( README.md )
+
+S="${WORKDIR}/popcornmix-omxplayer-${GIT_COMMIT}"
+
+src_prepare() {
+	default
+	cat > Makefile.include << EOF
+LIBS=-lvchostif -lvchiq_arm -lvcos -lbcm_host -lEGL -lGLESv2 -lopenmaxil -lrt -lpthread
+EOF
+
+	tc-export CXX PKG_CONFIG
+}
+
+src_compile() {
+	emake omxplayer.bin
+}
+
+src_install() {
+	dobin omxplayer omxplayer.bin
+	einstalldocs
+}
diff --git a/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160528.ebuild b/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160528.ebuild
new file mode 100644
index 000000000000..da741441c5d4
--- /dev/null
+++ b/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160528.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs flag-o-matic
+
+GIT_COMMIT="791d7df"
+DESCRIPTION="Command line media player for the Raspberry Pi"
+HOMEPAGE="https://github.com/popcornmix/omxplayer"
+SRC_URI="https://github.com/popcornmix/omxplayer/tarball/${GIT_COMMIT} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~arm"
+IUSE="X"
+
+RDEPEND="dev-libs/libpcre
+	media-fonts/freefont
+	|| ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin )
+	sys-apps/dbus
+	sys-apps/fbset
+	virtual/ffmpeg
+	dev-libs/boost
+	media-libs/freetype:2
+	X? (
+		x11-apps/xrefresh
+		x11-apps/xset
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/popcornmix-omxplayer-${GIT_COMMIT}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/Makefile-0_p20160528.patch \
+		"${FILESDIR}"/fonts-path.patch
+
+	cat > Makefile.include << EOF
+LIBS=-lvchostif -lvchiq_arm -lvcos -lbcm_host -lEGL -lGLESv2 -lopenmaxil -lrt -lpthread
+EOF
+
+	tc-export CXX
+}
+
+src_compile() {
+	emake omxplayer.bin
+}
+
+src_install() {
+	dobin omxplayer omxplayer.bin
+	dodoc README.md
+}
diff --git a/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-9999.ebuild b/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-9999.ebuild
new file mode 100644
index 000000000000..2cac67b90a01
--- /dev/null
+++ b/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-9999.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils git-r3 toolchain-funcs flag-o-matic
+
+DESCRIPTION="Command line media player for the Raspberry Pi"
+HOMEPAGE="https://github.com/popcornmix/omxplayer"
+EGIT_REPO_URI="https://github.com/popcornmix/omxplayer.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="X"
+
+RDEPEND="dev-libs/libpcre
+	media-fonts/freefont
+	|| ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin )
+	sys-apps/dbus
+	sys-apps/fbset
+	virtual/ffmpeg
+	dev-libs/boost
+	media-libs/freetype:2
+	X? (
+		x11-apps/xrefresh
+		x11-apps/xset
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/Makefile-0_p20160217.patch \
+		"${FILESDIR}"/fonts-path.patch
+
+	cat > Makefile.include << EOF
+LIBS=-lvchiq_arm -lvcos -lbcm_host -lEGL -lGLESv2 -lopenmaxil -lrt -lpthread
+EOF
+
+	tc-export CXX
+}
+
+src_compile() {
+	emake omxplayer.bin
+}
+
+src_install() {
+	dobin omxplayer omxplayer.bin
+	dodoc README.md
+}
diff --git a/media-video/recmpeg/Manifest b/media-video/recmpeg/Manifest
new file mode 100644
index 000000000000..489907f1b5aa
--- /dev/null
+++ b/media-video/recmpeg/Manifest
@@ -0,0 +1,5 @@
+DIST recmpeg-1.0.5.tar.gz 56561 SHA256 907a8a27a3cb36925828fa156e7e5a2b3340400cdda20cb383a0923e3c87bcbb SHA512 95bd18fb7a2698e006b69d52805a0378cbbb17475189abe4cc3b69b1523a4df226e294915ce51e48b258cc01c6eb2bed0faa305590f8cdb85a80b96950d5b439 WHIRLPOOL 4c2a921d21370571a2f19c7db4340acddcf02d37e498bb334c6ac6aa66cc8b9fb07152e11e8ebebb32ca31dfcb97ffd634156d9801f2af28ea94a12b9b6a1e37
+EBUILD recmpeg-1.0.5.ebuild 603 SHA256 2bbda0d28521a4bbd1cf2d3d62715c68b0ee05d555bd6632983d40c1a95e6589 SHA512 daca668b552a6627a7b6ccc372ce121b3e978ab5f8cf04c3665694520f72ff73080461236a373c169ed696240b7525a3ca82e3c5c2bc9853546b639a47ce0cdd WHIRLPOOL dbdb86dc54f415fc43865294ed0f4ee8cbbac114b1d3bd66a02bc13ffa83682ef13ad1a24debbbac40e85b7e37a45e2151178629bc89e75736b4053ef6c93077
+MISC ChangeLog 2430 SHA256 41606f004ba02131bd0400ca85e69409b5cbe49cb69773339e404294def313a7 SHA512 5256c02fcb13f1989256c21e0a0994eea91c1fc73a5dea9d437cc7f234d14be662c2b4f9e43a8a202d46acbb40395104bc5089c1855af0cd1b05b92f918216b9 WHIRLPOOL 1dd5357eb48a4152dbd8a686d250946cfb9f115f31752893d53717cb47ec63ee2ff6e73cd355ec68dede22db0697dafcb326a35a8be9ea59c4505225d0db1bad
+MISC ChangeLog-2015 1265 SHA256 1104f901d988c7c3eb885b2643649b663e82dcdbb2928b2139eb0c0615774efb SHA512 3b3564a76ba460f7b869e1e9481fd450e63a0b299179c34a42cb38f2170b409e2ab727a4a3bb03fad340c5313943082b550614e393fcf6ac08b8a129b1335c47 WHIRLPOOL 6f2e95775202416da953a2b647fd709bcf41af97e22c8b6cfba480ad4efe095ea1ca42290e10400e497864d768a09038d6a5c52fe1b10ab32aa2ef505b861448
+MISC metadata.xml 297 SHA256 7020eb7533b7e76e9e86af386288b96dbd361ae578e5e04d80020ce76576ee64 SHA512 6fad09bf8ac2d08c4e255fc2ae8a95afd410a7dbaaa91fc7467a78ace5a9a9a9cef1ec25ddd676a3c696a5a2714bb3c3f5b180cbfb0fd8a254bab9a5e310212f WHIRLPOOL cf019e9a5bcee71cd483e9c68b9c6aeb49bf9c83c520c8f855d81c803b20ff915eb916609e2c8bf1ad7c6baf145e3d6dcfc86d42f815370255587e71c450e6a4
diff --git a/media-video/recmpeg/metadata.xml b/media-video/recmpeg/metadata.xml
new file mode 100644
index 000000000000..e6b79f1c7b33
--- /dev/null
+++ b/media-video/recmpeg/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">fame</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/recmpeg/recmpeg-1.0.5.ebuild b/media-video/recmpeg/recmpeg-1.0.5.ebuild
new file mode 100644
index 000000000000..1b02e5f6781c
--- /dev/null
+++ b/media-video/recmpeg/recmpeg-1.0.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Simple libfame-based video encoder, compresses raw video sequences to MPEG video"
+HOMEPAGE="http://fame.sourceforge.net/"
+SRC_URI="mirror://sourceforge/fame/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc x86"
+
+IUSE="cpu_flags_x86_mmx cpu_flags_x86_sse"
+
+RDEPEND=">=media-libs/libfame-0.9.0"
+DEPEND="${DEPEND}"
+
+DOCS=( CHANGES README )
+
+src_configure() {
+	econf \
+		$(use cpu_flags_x86_mmx && echo "--enable-mmx") \
+		$(use cpu_flags_x86_sse && echo "--enable-sse")
+}
diff --git a/media-video/recordmydesktop/Manifest b/media-video/recordmydesktop/Manifest
new file mode 100644
index 000000000000..b9e19b0b9c14
--- /dev/null
+++ b/media-video/recordmydesktop/Manifest
@@ -0,0 +1,7 @@
+AUX 0.3.8.1-fix-libjack-check.patch 518 SHA256 2da92f1801688e5f7e172e6f408a427a008aceadab256ead991bfe52aafe0b58 SHA512 f726f82843f190a8d346b3d22709131da2767f4ad4199a6fe848d1339da3ef010b6c55563bb8dc71553003bd2f8246f16ba16a0899baf2fce3dc92ddb02db778 WHIRLPOOL 2e849326b4bb1dd393d9fb44bca722c10e984a3680f24380999c6390dbb5c3cdf0aa713717089df15555741855fdd5300851c465b789e62a32ee718bbc5f558b
+AUX 0.3.8.1-fix_new_theora.patch 2212 SHA256 8df5f6cce5e9fdd4f000f70a1da7a2762255bd627287b42d779285fee667cad4 SHA512 f504d9c889344be7f44a06b6125acf73fc32573256356afd99093af92ee3268267616b5956c0ada7a8484dcfb9f482ffa9c6c6d6f54b4080bc17a12cd2f21761 WHIRLPOOL ae36e8ca197af1d8a3ca48da0ecf678a338676edec524980728b91c61a954cc610fbe1f01d07467470da54e14352f0ed38c41c3e56ab6c8fa6043dd79fc0e5cf
+DIST recordmydesktop-0.3.8.1.tar.gz 198732 SHA256 33a2e208186ae78e2db2a27b0f5047b50fb7819c47fe15483b0765200b9d738c SHA512 a32df1257d7d8928123437b38abcbdf623a9a65d313df5bec9bc06ef7229ebe4664a3cbea1fe5f6f1f9b89efb939873adc020f4ac072477f6df9481a37e7c350 WHIRLPOOL f25bc42f81bafeb17e4d1e542eb7fb7effad9861614d3095078af06ab1704c46e9ad6d04fe0dd180e8a1a98bc1ad4fa43864a13eb3affde9f4e52dfb60e927b5
+EBUILD recordmydesktop-0.3.8.1-r4.ebuild 1273 SHA256 a2b4f76a7c6fefd79c6654dae6d4562619c596d8cb6c699776e1190c82acc0e6 SHA512 ba40ada7f254adc555d09fe4a92a3a7bccf6ae088a70b7fac8dc771c17c5fb0229780d9453e54445b8089cd2ed36ec2d6080312e11816d4ccd6bdcdfee48ef42 WHIRLPOOL a63ebc5ebefa6e2ea582b2b539ce685829998b080a3396e9dc2413bab13cc70281eedd52d903b7093947f19fccdebbef237ab399b016c328224425cf3b2780fd
+MISC ChangeLog 2543 SHA256 a7831f8a59a9af1f4cfd6aadd710dce998076783b7cd0d6ba0e098b155171bca SHA512 b9fa7b5935647d8c0ea554ad6846c198423c987dac245592eaf4c74955857b992faa16cdabd4ac3e88e029ea633baf5faace8f35264878c0833d187e28dfbe05 WHIRLPOOL ad4ecb5e53afae260e20a1e79e25b39c19724d736cf950f7def395f1931ac12135cd8c0f686944ed563099d5ddd2e10431ca86be0e22cd5d04f087682acd2108
+MISC ChangeLog-2015 6382 SHA256 caf225a504284c87ab5536a4c9b010183433752e01a58e631c29b63934331a17 SHA512 a5c814b51d5517e621f7faa72b15a4039de87e92922376108556f08c5d21ebfd5e67565a07cc1a68ee6abb5883d07b1cd8062509d8102ac659939d4bc73da2a4 WHIRLPOOL 4f4bd6be07b9384b8b0086729760b4a3a9c4505f5da004d42d5025a37de23b63c746f186cba2c45b5231ae586b0ca658a7a61cfd78a7422ce14471d871a7b167
+MISC metadata.xml 316 SHA256 2cdd2fd34653a7708f85d21f2effd9465ccd1e98cbe4ba49d6fafebc7538f48d SHA512 b2b2172a9a6fe5c1b1677138e045a24ec1922838e0ed7c2a958b41b73864c8a35f4dc6717468f0d2231763521b9b067d5123c930ec48c51789a7ea962629e1a8 WHIRLPOOL 2832d65e74d4f9373d071432f80d651503da897997daad112ec9046b7c1e8c8398404bee225c557f62259b448b0825075433cd7d0e5a387fc5476666364e2ad4
diff --git a/media-video/recordmydesktop/files/0.3.8.1-fix-libjack-check.patch b/media-video/recordmydesktop/files/0.3.8.1-fix-libjack-check.patch
new file mode 100644
index 000000000000..cb8a3b473484
--- /dev/null
+++ b/media-video/recordmydesktop/files/0.3.8.1-fix-libjack-check.patch
@@ -0,0 +1,14 @@
+--- trunk/recordmydesktop/configure.ac	2008/12/13 17:46:41	584
++++ trunk/recordmydesktop/configure.ac	2009/01/10 11:35:06	587
+@@ -95,7 +95,10 @@
+              AC_MSG_ERROR([Can't find libpthread]))
+ 
+ if test x$jack = xtrue ; then
+-AC_CHECK_LIB([jack],[jack_activate],jack_lib_found=true,)
++AC_CHECK_LIB([jack],[jack_activate],
++             [LIBS="$LIBS -ljack"
++              AC_DEFINE([HAVE_LIBJACK], [1], [Define to 1 if you have libjack.])
++              jack_lib_found=true])
+ fi
+ 
+ if test x$oss = xfalse; then
diff --git a/media-video/recordmydesktop/files/0.3.8.1-fix_new_theora.patch b/media-video/recordmydesktop/files/0.3.8.1-fix_new_theora.patch
new file mode 100644
index 000000000000..dfa829778963
--- /dev/null
+++ b/media-video/recordmydesktop/files/0.3.8.1-fix_new_theora.patch
@@ -0,0 +1,48 @@
+--- recordmydesktop-0.3.8.1.old/src/rmd_initialize_data.c	2009-11-25 10:05:58.708779029 -0500
++++ recordmydesktop-0.3.8.1.old/src/rmd_initialize_data.c	2009-11-25 09:28:07.629507987 -0500
+@@ -224,7 +224,7 @@ 
+     args->channels             = 1;
+     args->frequency            = 22050;
+     args->buffsize             = 4096;
+-    args->v_bitrate            = 45000;
++    args->v_bitrate            = 0;
+     args->v_quality            = 63;
+     args->s_quality            = 10;
+ 
+--- recordmydesktop-0.3.8.1.old/src/rmd_parseargs.c	2009-11-25 10:06:07.409777969 -0500
++++ recordmydesktop-0.3.8.1.old/src/rmd_parseargs.c	2009-11-25 09:39:32.786757292 -0500
+@@ -104,10 +104,10 @@ 
+     "Encoding Options\n"
+     "\t--on-the-fly-encoding\tEncode the audio-video data, while recording.\n"
+     "\t--v_quality n\t\tA number from 0 to 63 for"
+-    " desired encoded video quality(default 63).\n"
++    " desired encoded video quality(default 63).\n\t               (set quality to zero for bitrate controlled usage)\n"
+ 
+-    "\t--v_bitrate n\t\tA number from 45000 to 2000000"
+-    " for desired encoded video bitrate(default 45000).\n"
++    "\t--v_bitrate n\t\tA number from 0 to 200000000"
++    " for desired encoded video bitrate(default 0 = not rate controlled).\n"
+ 
+     "\t--s_quality n\t\tDesired audio quality(-1 to 10).\n\n"
+ 
+@@ -327,17 +327,17 @@ 
+                  strcmp(argv[i], "-v_bitrate")  == 0) {
+             if(i+1<argc){
+                 int num=atoi(argv[i+1]);
+-                if((num>=45000)&&(num<=2000000))
++                if((num>=0)&&(num<=200000000))
+                     arg_return->v_bitrate=num;
+                 else{
+                     fprintf(stderr,"Argument Usage:"
+-                                   " --v_bitrate n(number 45000-2000000)\n");
++                                   " --v_bitrate n(number 0-200000000)\n");
+                     return FALSE;
+                 }
+             }
+             else{
+                 fprintf(stderr,"Argument Usage:"
+-                               " --v_bitrate n(number 45000-2000000)\n");
++                               " --v_bitrate n(number 0-200000000)\n");
+                 return FALSE;
+             }
+             i++;
diff --git a/media-video/recordmydesktop/metadata.xml b/media-video/recordmydesktop/metadata.xml
new file mode 100644
index 000000000000..cd0bf6d9d5f2
--- /dev/null
+++ b/media-video/recordmydesktop/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>media-video@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">recordmydesktop</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r4.ebuild b/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r4.ebuild
new file mode 100644
index 000000000000..51d0a0b43c44
--- /dev/null
+++ b/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+inherit eutils autotools
+
+DESCRIPTION="A desktop session recorder producing Ogg video/audio files"
+HOMEPAGE="http://recordmydesktop.sourceforge.net/"
+SRC_URI="mirror://sourceforge/recordmydesktop/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="alsa jack"
+
+RDEPEND="sys-libs/zlib
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXdamage
+	media-libs/libvorbis
+	media-libs/libogg
+	media-libs/libtheora[encode]
+	x11-libs/libICE
+	x11-libs/libSM
+	alsa? ( media-libs/alsa-lib )
+	jack? ( media-sound/jack-audio-connection-kit )"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto"
+
+src_prepare() {
+	if has_version ">=x11-proto/xextproto-7.1.1"; then
+		sed -i \
+			-e 's:shmstr.h:shmproto.h:g' \
+			src/rmd_{getzpixmap.c,update_image.c} || die
+	fi
+
+	# fix weird Framerates with new libtheora
+	epatch "${FILESDIR}/${PV}-fix_new_theora.patch"
+
+	# fix check for jack support
+	epatch "${FILESDIR}/${PV}-fix-libjack-check.patch"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-dependency-tracking \
+		$(use_enable !alsa oss) \
+		$(use_enable jack)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog README || die
+}
diff --git a/media-video/replex/Manifest b/media-video/replex/Manifest
new file mode 100644
index 000000000000..1c670a0dc8cc
--- /dev/null
+++ b/media-video/replex/Manifest
@@ -0,0 +1,7 @@
+DIST replex-0.1.4.tar.gz 43292 SHA256 7539079ec824a0795d845918bf61c2465803a6c3da870ca745e3406333eec08c SHA512 59cb54ee2420666d1cd51cc42413d58ba91c16c286205b28aa9c58b74c0d8a8c15062226585fba2c88ffa34917273ef66c6dcb4d88a02904f809372b23054370 WHIRLPOOL c8e415a00019d92e7cc168d4d1577e2d24cdb4be3ae37e77c644ed22328ec734ffc9469084aae035d4adc33eaa9988e1faefebd65adac48307181f31aba6f2f8
+DIST replex-0.1.6.8.tar.gz 49587 SHA256 68718d6671570815e8576b6e0b595195f5cea435194209ee5528721cb8737b63 SHA512 cddbc00a4f882eabcfd32fddddd8a087fa7aa27a42546cb187baa496c59622122b77e90d662b2fc57d065d882370c2671fad5e10680e34b9f88b8075064b392c WHIRLPOOL 273538ce63e6bf2fe476f18446a7f459ec9c21b5bad593219747d18ecf6bb006ffeef9d039c02ffe7a549265a599a157c36f95c444bec07948f0f1718667b952
+EBUILD replex-0.1.4.ebuild 548 SHA256 e66b3deba31a151029e95ef96c99dea777f470b4245cf443ebee3b85a7d35fcf SHA512 7af0acec8c6544fc437edd43155150e0c7a5a12c3de6e6bc311417e7a0307e22949ca757f3ad1cdc7fa0a571e53491b63f671f7f354e5805294443aeb2ebde62 WHIRLPOOL a35434adc01e6e31f873abc0af41cb3233dd113e270a4e6fff3be1f09b09bb2caafd649bd367a286def6a4c2475f2798b0c7b7c25a5c188d280f1c44a3891e5c
+EBUILD replex-0.1.6.8.ebuild 623 SHA256 e08ad3e5fcd4c64663b8a93e1f21e39c90f8ef9315c8ba5463dd18be1c5c82d1 SHA512 1f7b911255a7b07635afd6533dca5da649c5aaeab73b2596efd9a7fd910ca3764e3c697d044d0378357ada1e5c2134b9c9df01841d75a727a1924b319872081f WHIRLPOOL 084d2b6a21b3c629575961f4832612b8238341365524ea955ee327b4933f0033a110fc0868ca14621c8d4b6b76a36990b31c26fe58964dd5a05fb5c592b61acb
+MISC ChangeLog 2481 SHA256 14e284767d5c1a38db1f3d928c23c44ad54b7e1942a15b3ccefb211ddc0a0285 SHA512 772d0db69ca848452d755623624394b4b537e342a9f9f207e3153c68879d3118a349ad317ff315ad2ed13c4fd9a6e1bed3e4ede57bef9aa3b679dd0b0d6c7c8b WHIRLPOOL edec0def962a2e829ccb44ad47123268b89021d6afe751993bb77d63e1e34a57ddf597595f8d89375d8cd57f1d0a697edfa3b9608729ba3a6801d5b23224239d
+MISC ChangeLog-2015 965 SHA256 1f04fac8226c3a4716b0497ba48770b2c408da89a21c5196c1bdcc61cecd95c8 SHA512 083d392740ca5912b037cd1a36ec4c3b80bb4c17669afd807f200e0bacf6b35772a1b45963de1fbe5ed46797598d993392702466ae9d8d14500686688c5ed75b WHIRLPOOL 4ddd907f23038839fec07d533d5a35be28132197bf8744f99ab87e986fe3961e41c9bc9d271da31dda49839e32f11c35eb5c4cfc68ed9196177bfe34a414dbdb
+MISC metadata.xml 219 SHA256 4246299710294d9f4c0c15b97e8ae7925e01785b962551c6aa27174e99980bcd SHA512 24793c7fd0e2cef8fa5a0efd9bd55fed1e62ff6810199a969d4c0b869bac9b9ec79b288105b73b1b99734320bb13569a8ee00516b5452dd67d91d14dd17038e2 WHIRLPOOL e7f42aba21f5637bb8774cc17a488ecca121e56d5e855a3e956792955b8253f3049e08b2ab258728002263967db02e27914c82ecafee07a6d317bf857d13095f
diff --git a/media-video/replex/metadata.xml b/media-video/replex/metadata.xml
new file mode 100644
index 000000000000..0427ec20bfd4
--- /dev/null
+++ b/media-video/replex/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+<email>media-video@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/media-video/replex/replex-0.1.4.ebuild b/media-video/replex/replex-0.1.4.ebuild
new file mode 100644
index 000000000000..f51c22970624
--- /dev/null
+++ b/media-video/replex/replex-0.1.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils
+
+DESCRIPTION="REPLEX remuxes MPEG-2 transport streams into program streams"
+HOMEPAGE="http://www.metzlerbros.org/dvb/"
+SRC_URI="http://www.metzlerbros.org/dvb/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~x86"
+IUSE=""
+
+src_compile() {
+	emake CFLAGS="${CFLAGS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE" || die "emake failed"
+}
+
+src_install() {
+	dobin replex
+	dodoc README CHANGES TODO
+}
diff --git a/media-video/replex/replex-0.1.6.8.ebuild b/media-video/replex/replex-0.1.6.8.ebuild
new file mode 100644
index 000000000000..8cd3408e4056
--- /dev/null
+++ b/media-video/replex/replex-0.1.6.8.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="REPLEX remuxes MPEG-2 transport streams into program streams"
+HOMEPAGE="http://www.metzlerbros.org/dvb/"
+SRC_URI="http://www.metzlerbros.org/dvb/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+src_compile() {
+	tc-export CC
+	emake CFLAGS="${CFLAGS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DVERSION=\\\"${PV}\\\"" LDFLAGS="${LDFLAGS}"|| die "emake failed"
+}
+
+src_install() {
+	dobin replex
+	dodoc README CHANGES TODO
+}
diff --git a/media-video/rovclock/Manifest b/media-video/rovclock/Manifest
new file mode 100644
index 000000000000..59325adbe3e7
--- /dev/null
+++ b/media-video/rovclock/Manifest
@@ -0,0 +1,7 @@
+AUX rovclock-0.6e-ldflags.patch 279 SHA256 dbe79cca89ccbe59f76f820821bbef384a7b68497437a0b0509d7017a3bdfbf4 SHA512 19fd4e6ca973ba1067bc68d4b6719259b88e49b3ea59270095827518ea2da688750d932c2af3319231b007a80ed3bd268bc5ff22bd942e5249b40bd4f8f9718a WHIRLPOOL 44d2bbc039640a12da75eb29b08485283ee4d4eb8a512e37d10b5f943eb7e84b1af8855c1f6570dd50a1b82f41adc66e874af050ae583f0af7103c451390453d
+DIST rovclock-0.6e.tar.bz2 29648 SHA256 f2601b3a823752d51cf27b25c8b57efb66e1295848877c962f0c680430e200f7 SHA512 b6db578d305e6110287a0881a3a8b16bb76e662380698493c704e84705de7a6da608843c1056d6f84e7275f9f5159c0436a580beb72f795b571a5d4784123e7a WHIRLPOOL 77c7b6f56dad3f228feccfb24a1b66e381698fdb47d7cf72fdee7fe88539429dd9ff3e4238812884ac5dfe8ca48af2bb51f703b1d865c1b53cf6ed645b96625f
+EBUILD rovclock-0.6e-r1.ebuild 532 SHA256 6f0ba6c6a3eab9e0eece2c959f9d68c427e71856647055e423168918ace503e6 SHA512 21d8df7208a5e42e99910e43d5ac3870723572e80e55afbf810c5cd6668690a23790856e7732676d89ed2a39dd39ae36913ccb56c455e1f40bbc861fb42c7fe1 WHIRLPOOL 387a6d760903999bf94875810259a47dee1528a2e8d358f6830005580c8c4659c0b8cdccdad46a53375bd9a1108edffb22e22724dea743b6168b6c8339846966
+EBUILD rovclock-0.6e.ebuild 572 SHA256 e5f7275e8b45609e380e5386b36b670c44dbeca077f6c0f162d527a8ed3cf330 SHA512 9d878956d4327a868990ba23775ef9c191664084dae9b44c4f53affe8e12e3e0d0659dc67d52cdbd6517af9d4a655b92c3f82524ad5098c69bddc390cbd3e2fb WHIRLPOOL b2b510e615de9b6fc0718466c27ed1c1a64a583c49e3d3a47f88a89da6b7cc57c17164e6c39d31b78a6382a65a8be0d21024f18d2bfc14aa47bc85e7a2c8d4d8
+MISC ChangeLog 2784 SHA256 b62e453970beff8b2141e097fbfec0d9f296502f78e42d11c5aa93f2a2dd19df SHA512 30f0a49702745806ba04ae6110e06970c1054a5fc215b29cc443b074646e80021d20892dd1584754a47c30cd20d2477c993e5ba1a7b7e4aa97e62bbdc3b61056 WHIRLPOOL fc4f306b2342b607a2130c7abdc7d13b61c5d32eaf26d1eda1d0ef6942df17abdbf0a5657ad851cb11ffe139d181a0e2143dc538fcefc5b8f66b1dba9ebf410f
+MISC ChangeLog-2015 1212 SHA256 38d8548bfbcb847b1dd06f1e38867b37ae2384d830e0a8cb77664e7115230a68 SHA512 95a6504c80cd54cd1e0e014899f6bc1731e22689db7a8db19332cd9635630a7959ac2d466c391878017b99f3ce1cf838ec8ed3674b6b77a483a1d41d90da9048 WHIRLPOOL bb32bb35b19997c837df41f0b29dadf969aa67539b3e6d5a9543f0781527275e6191d58ae97d1ec9e2c47d3916f6050a7340f5d3fc0e5a83c527428cf88a50a6
+MISC metadata.xml 358 SHA256 c71c31bd5ac545584fd6de8b529b10f1a70c7fdc579aebc1a4ce2a640e82e09e SHA512 d89a94b77c87e59624239584efb82cd64e56cba5cb6e5de911b1d045a31efb70178ddbefc4731abc3178bf4690796be8052478811cd205f7b9cbffaf06f1e1c5 WHIRLPOOL 2ef257ede7dbc95fdaa686a92bd70f49dadaf8ba28bfd58d55023e8e2e1fc166eaef670df7750cda792a13bb17d7741d74501737af4b932974f6403360d804c9
diff --git a/media-video/rovclock/files/rovclock-0.6e-ldflags.patch b/media-video/rovclock/files/rovclock-0.6e-ldflags.patch
new file mode 100644
index 000000000000..ad7e809b0fcd
--- /dev/null
+++ b/media-video/rovclock/files/rovclock-0.6e-ldflags.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 7d2a21e..5912f71 100644
+--- a/Makefile
++++ b/Makefile
+@@ -13,7 +13,7 @@ CFLAGS = -O2 -Wall -Wstrict-prototypes $(DEFS)
+ all: $(PROG)
+ 
+ $(PROG): $(SRCS)
+-	$(CC) $(CFLAGS) -o $@ $^
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ 
+ $(SRCS): $(HDRS)
+ 
diff --git a/media-video/rovclock/metadata.xml b/media-video/rovclock/metadata.xml
new file mode 100644
index 000000000000..cf27bc86144d
--- /dev/null
+++ b/media-video/rovclock/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>se.witt@gmx.net</email>
+  <name>Sebastian Witt</name>
+</maintainer>
+<maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-video/rovclock/rovclock-0.6e-r1.ebuild b/media-video/rovclock/rovclock-0.6e-r1.ebuild
new file mode 100644
index 000000000000..99e6304df25b
--- /dev/null
+++ b/media-video/rovclock/rovclock-0.6e-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Overclocking utility for ATI Radeon cards"
+HOMEPAGE="http://www.hasw.net/linux/"
+SRC_URI="http://www.hasw.net/linux/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_prepare() {
+	eapply "${FILESDIR}"/${P}-ldflags.patch
+	default
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dosbin rovclock
+	dodoc ChangeLog README
+}
diff --git a/media-video/rovclock/rovclock-0.6e.ebuild b/media-video/rovclock/rovclock-0.6e.ebuild
new file mode 100644
index 000000000000..32a44b71f26b
--- /dev/null
+++ b/media-video/rovclock/rovclock-0.6e.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=3
+inherit toolchain-funcs eutils
+
+DESCRIPTION="Overclocking utility for ATI Radeon cards"
+HOMEPAGE="http://www.hasw.net/linux/"
+SRC_URI="http://www.hasw.net/linux/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	dosbin rovclock || die "dosbin failed"
+	dodoc ChangeLog README
+}
diff --git a/media-video/rtmpdump/Manifest b/media-video/rtmpdump/Manifest
new file mode 100644
index 000000000000..e40206cf44a8
--- /dev/null
+++ b/media-video/rtmpdump/Manifest
@@ -0,0 +1,7 @@
+DIST rtmpdump-2.4_p20161210.tar.gz 142837 SHA256 d6da3b683f1045f02d94a81b0c583318dba021f69bdab970c5d5d73e8c38860f SHA512 76617f02c13d7e8e3a7cf2734c6174e56fb321a881c9e4869bf6393786b193e0c01a8c530ecbf0679cc888c523af5712f2dcb2031fbd09729b7ddeebc3a4b133 WHIRLPOOL 06fd296825c06339dd9210d626f503ab8f7bc929fa363106a166882bff3e7531ce11636dd716c1259558301c258c190a7f6e550fd39dae51dea809526b566d8d
+EBUILD rtmpdump-2.4_p20161210-r1.ebuild 2405 SHA256 e5ba8fb84e70388af1db37a62fac305848efa338f64e59f19e62e438d359e43b SHA512 1fbf3d7f6ff0589128c985f88418ce6a6e2dd023ef481fde03dff2561b17ec922b8f492fa7d9afc010598253e19e44a3bf9b358c093d830e9702e548789ecf7b WHIRLPOOL b485d0b72892ec5a395447c22369507d3a5c38b31b0ddb66d4cac111e191d744c56167b55aae4ffe0648fcfa7482ecaa6c42246a03ee5ee2346a9281ba765b36
+EBUILD rtmpdump-2.4_p20161210.ebuild 2384 SHA256 6bae6973ae0f8c0c7910e6f6c6a8ca41d317d94f4fc57b9856a860df21333b37 SHA512 4c7e1e855d6900561a837ed67359a9613a2612951d623de935f44dd92c96cd389a58dbb042d240abfb2ed1eef3be1c97a4cdd3f2c8e3b7fe1b687baae41f1a5e WHIRLPOOL fc866f1966ac8e59729502413c52b685bea15d32a44862824ee32439e0531188daba7a8c31f2c3d69bc584495af24e2cbdaf9e5a6f4083a8235e7357d2563709
+EBUILD rtmpdump-9999.ebuild 2201 SHA256 5481a43f01674566470098fa36485f1b5e1503705f36a99d9eece5d2113f20c7 SHA512 673b263d74786088fe1b823e8be42573ebcf724471004a8cd43ac8c204f6910c3c36fb16740a8167515ee04aad370c5d8e51b38b90776664ea8234030e9e9802 WHIRLPOOL 21676ebe937eaff055936d2fe395136a3d586e9ae278a4a8adda154c4bc27470b2d07aa701a2cdb62feaf8163e9ed0129a824c90fa755f0393c59e910f8c4564
+MISC ChangeLog 5800 SHA256 615426803f182e5e04497bae1880117c8a7fb68b7777881aa1a58367400c22d4 SHA512 03089524161311d4109a4d13ff6f21f71986fb511565947fd2099513c5e74ba820259bf1d21b9f6c0a15eb3618519989b447632b0ed204369f97a1a03664d89c WHIRLPOOL 7febbdf7d5531d275969bb2442a3b36c1b2aed86b941a6147bbbb523d7f65638a40e17231360020e77ea509fc0dacef40ff228ec0b5c818b72a322a0dee84876
+MISC ChangeLog-2015 5697 SHA256 605c94792e832d5820f25e7d8fe41dd7fde5ccd3269579c7c8d9cfbe3221a0a4 SHA512 ad8aeff6ca00fda0145fdb099b99d4afdbb8b8897f943b4f21a6e96698cec0ebbc4fc8b028fc920a9f75e78ac7e732cc413a5f7a120101e6d9896c49dc882ece WHIRLPOOL 2cd753f31e15ed15ee8a7315c75a186da6e41f48cc5a7c204ee15a6ea66895389c60d1d2e72316d0e9f9be1f303a11af6480c516aaf14c2c0633519f08a7bbc2
+MISC metadata.xml 417 SHA256 eb0fb9ba4db50ecdbaf3fd19a969b1d55118ffd711acca9ac570eaa68bbee2ab SHA512 27ef2a72216f581ffc6dbcdd1b1bfd1fbdf435bcd30c03e2e4de79dc6a33d77e989465c309c0bbe452d9b84b967b48c447193faa896629433b85bbf891f49d9c WHIRLPOOL 960d74a375b5e738876c91af1d002b37a98dc1917549a32085578ffd3cc8bb1b756b3582316ac1e141faed66d5ef1eb0534dc3c81693dd00d34ece7a723fdeed
diff --git a/media-video/rtmpdump/metadata.xml b/media-video/rtmpdump/metadata.xml
new file mode 100644
index 000000000000..1abcb135fb33
--- /dev/null
+++ b/media-video/rtmpdump/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>hwoarang@gentoo.org</email>
+<name>Markos Chandras</name>
+</maintainer>
+<use>
+	<flag name="gnutls">Use GnuTLS library instead of the default OpenSSL</flag>
+	<flag name="polarssl">Use PolarSSL library instead of the default OpenSSL</flag>
+</use>
+</pkgmetadata>
diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild
new file mode 100644
index 000000000000..13ae3a45a589
--- /dev/null
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit multilib toolchain-funcs multilib-minimal flag-o-matic
+
+DESCRIPTION="RTMP client intended to stream audio or video flash content"
+HOMEPAGE="http://rtmpdump.mplayerhq.hu/"
+SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
+
+# the library is LGPL-2.1, the command is GPL-2
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="gnutls polarssl ssl libressl"
+
+DEPEND="ssl? (
+		gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)] )
+		polarssl? ( !gnutls? ( >=net-libs/polarssl-1.3.4[${MULTILIB_USEDEP}] ) )
+		!gnutls? ( !polarssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl ) ) )
+		>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	)"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	if ! use ssl && { use gnutls || use polarssl; }; then
+		ewarn "USE='gnutls polarssl' are ignored without USE='ssl'."
+		ewarn "Please review the local USE flags for this package."
+	fi
+}
+
+src_unpack() {
+	mkdir -p "${S}" || die "Can't create source directory"
+	cd "${S}" || die
+	unpack ${A}
+}
+
+src_prepare() {
+	# fix #571106 by restoring pre-GCC5 inline semantics
+	append-cflags -std=gnu89
+	# fix Makefile ( bug #298535 , bug #318353 and bug #324513 )
+	sed -i 's/\$(MAKEFLAGS)//g' Makefile \
+		|| die "failed to fix Makefile"
+	sed -i -e 's:OPT=:&-fPIC :' \
+		-e 's:OPT:OPTS:' \
+		-e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \
+		|| die "failed to fix Makefile"
+	eapply_user
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	if use ssl ; then
+		if use gnutls ;	then
+			crypto="GNUTLS"
+		elif use polarssl ; then
+			crypto="POLARSSL"
+		else
+			crypto="OPENSSL"
+		fi
+	fi
+	#fix multilib-script support. Bug #327449
+	sed -i "/^libdir/s:lib$:$(get_libdir):" librtmp/Makefile || die
+	if ! multilib_is_native_abi; then
+		cd librtmp || die
+	fi
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" \
+		OPT="${CFLAGS}" XLDFLAGS="${LDFLAGS}" CRYPTO="${crypto}" SYS=posix
+}
+
+multilib_src_install() {
+	mkdir -p "${ED}"/usr/$(get_libdir) || die
+	if multilib_is_native_abi; then
+		dodoc README ChangeLog rtmpdump.1.html rtmpgw.8.html
+	else
+		cd librtmp || die
+	fi
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir='$(prefix)/share/man' \
+		CRYPTO="${crypto}" install
+}
diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild
new file mode 100644
index 000000000000..89a24d3c7872
--- /dev/null
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit multilib toolchain-funcs multilib-minimal flag-o-matic
+
+DESCRIPTION="RTMP client intended to stream audio or video flash content"
+HOMEPAGE="http://rtmpdump.mplayerhq.hu/"
+SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
+
+# the library is LGPL-2.1, the command is GPL-2
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="gnutls polarssl ssl libressl"
+
+DEPEND="ssl? (
+		gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)] )
+		polarssl? ( !gnutls? ( >=net-libs/polarssl-1.3.4[${MULTILIB_USEDEP}] ) )
+		!gnutls? ( !polarssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl ) ) )
+		>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	)"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	if ! use ssl && { use gnutls || use polarssl; }; then
+		ewarn "USE='gnutls polarssl' are ignored without USE='ssl'."
+		ewarn "Please review the local USE flags for this package."
+	fi
+}
+
+src_unpack() {
+	mkdir -p "${S}" || die "Can't create source directory"
+	cd "${S}" || die
+	unpack ${A}
+}
+
+src_prepare() {
+	# fix #571106 by restoring pre-GCC5 inline semantics
+	append-cflags -std=gnu89
+	# fix Makefile ( bug #298535 , bug #318353 and bug #324513 )
+	sed -i 's/\$(MAKEFLAGS)//g' Makefile \
+		|| die "failed to fix Makefile"
+	sed -i -e 's:OPT=:&-fPIC :' \
+		-e 's:OPT:OPTS:' \
+		-e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \
+		|| die "failed to fix Makefile"
+	multilib_copy_sources
+	eapply_user
+}
+
+multilib_src_compile() {
+	if use ssl ; then
+		if use gnutls ;	then
+			crypto="GNUTLS"
+		elif use polarssl ; then
+			crypto="POLARSSL"
+		else
+			crypto="OPENSSL"
+		fi
+	fi
+	#fix multilib-script support. Bug #327449
+	sed -i "/^libdir/s:lib$:$(get_libdir):" librtmp/Makefile || die
+	if ! multilib_is_native_abi; then
+		cd librtmp || die
+	fi
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" \
+		OPT="${CFLAGS}" XLDFLAGS="${LDFLAGS}" CRYPTO="${crypto}" SYS=posix
+}
+
+multilib_src_install() {
+	mkdir -p "${ED}"/usr/$(get_libdir) || die
+	if multilib_is_native_abi; then
+		dodoc README ChangeLog rtmpdump.1.html rtmpgw.8.html
+	else
+		cd librtmp || die
+	fi
+	emake DESTDIR="${ED}" prefix="/usr" mandir="/usr/share/man" \
+	CRYPTO="${crypto}" install
+}
diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
new file mode 100644
index 000000000000..4d69e6e3a3c4
--- /dev/null
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit git-r3 multilib toolchain-funcs multilib-minimal flag-o-matic
+
+DESCRIPTION="RTMP client intended to stream audio or video flash content"
+HOMEPAGE="http://rtmpdump.mplayerhq.hu/"
+EGIT_REPO_URI="https://git.ffmpeg.org/rtmpdump.git"
+
+# the library is LGPL-2.1, the command is GPL-2
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS=""
+IUSE="gnutls polarssl ssl libressl"
+
+DEPEND="ssl? (
+		gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)] )
+		polarssl? ( !gnutls? ( >=net-libs/polarssl-1.3.4[${MULTILIB_USEDEP}] ) )
+		!gnutls? ( !polarssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl ) ) )
+		>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	)"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	if ! use ssl && { use gnutls || use polarssl; }; then
+		ewarn "USE='gnutls polarssl' are ignored without USE='ssl'."
+		ewarn "Please review the local USE flags for this package."
+	fi
+}
+
+src_prepare() {
+	# fix #571106 by restoring pre-GCC5 inline semantics
+	append-cflags -std=gnu89
+	# fix Makefile ( bug #298535 , bug #318353 and bug #324513 )
+	sed -i 's/\$(MAKEFLAGS)//g' Makefile \
+		|| die "failed to fix Makefile"
+	sed -i -e 's:OPT=:&-fPIC :' \
+		-e 's:OPT:OPTS:' \
+		-e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \
+		|| die "failed to fix Makefile"
+	eapply_user
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	if use ssl ; then
+		if use gnutls ; then
+			crypto="GNUTLS"
+		elif use polarssl ; then
+			crypto="POLARSSL"
+		else
+			crypto="OPENSSL"
+		fi
+	fi
+	#fix multilib-script support. Bug #327449
+	sed -i "/^libdir/s:lib$:$(get_libdir):" librtmp/Makefile || die
+	if ! multilib_is_native_abi; then
+		cd librtmp || die
+	fi
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" \
+		OPT="${CFLAGS}" XLDFLAGS="${LDFLAGS}" CRYPTO="${crypto}" SYS=posix
+}
+
+multilib_src_install() {
+	mkdir -p "${ED}"/usr/$(get_libdir) || die
+	if multilib_is_native_abi; then
+		dodoc README ChangeLog rtmpdump.1.html rtmpgw.8.html
+	else
+		cd librtmp || die
+	fi
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir='$(prefix)/share/man' \
+		CRYPTO="${crypto}" install
+}
diff --git a/media-video/setpwc/Manifest b/media-video/setpwc/Manifest
new file mode 100644
index 000000000000..33d9734e695f
--- /dev/null
+++ b/media-video/setpwc/Manifest
@@ -0,0 +1,5 @@
+DIST setpwc-1.3.tgz 9681 SHA256 4d32d4d54d584cd42aaf52dfa1ba874122e825ad39e4493d45f89b85de4e95cf SHA512 17766dcd05003f30183b87dc37a105c26efcc387e77479259ebdbb565011533ca97909ea3b61d979578616b1269db53ffa74475b8b91a6e250cfedb161f535b5 WHIRLPOOL 650f3455dac049e6e19414858772b959aa0eb86e422c52da59dc76fd8ae99d29795fb62952e5850d560bb4b37c8fecf5ff9d38f07e315d16eb519d97a90b4cfe
+EBUILD setpwc-1.3.ebuild 614 SHA256 0d117e7c6daa988ab345c9a88249dfb6b5bbe7b26832a685ff53561bf9d6ea94 SHA512 883102b11d7d0711bbe5bbb8bda4fb4a7bfb2a427dd06b7daed13b44172b764643af4f77a4e19b02d22a42b02ccfb0da965da0259308824683bb3bd32750e19f WHIRLPOOL c889d8f75514061bf38e00c6c465b3cfc2dbe8322703bf795d9c006a684b5d09e76c629c5f66aadaef6a217cb5fe18b660bec5f4dfbc2dda246b89a58a4f28cc
+MISC ChangeLog 2423 SHA256 182fc199be9134d84001425a1bf23feb0f61aa39b70474ca68441246d6a3926f SHA512 ddc211531e9b9a4d50e4b661644bee1bc5afeb583b748afa467f29775ff1efa3dbde2595f3e2c31c555f7f0e45fa77b236933270294c725247942fb73e20a836 WHIRLPOOL 205643cd4de85f1f4053668df63b68ba1ba6c494eab432baeb7bd71679bc3a9f543d54536d03393bf19c878cce7795a00b05069acdfafe131f32e6c2c30af988
+MISC ChangeLog-2015 2509 SHA256 4ffe27ad92e5497e7fc71f6860a374d7bed58dfa599a1b8f89e03552620d288e SHA512 0fc08f03d90b9a9639049dc7a14fa88fece6061e61d35e5f86214428c85bfc7a13876da3bcb55e090198d08fc93ca2c38ccd68a5cc5e0490ded397f7ffab1015 WHIRLPOOL 12adfc15d02da3c5f4c86b5f4eb26b3f1e3315e4dbcc95acf0180ab9fa9762573e64d90a7e1cadc92aeff91d1a56e7634eee476886274f4b7ec9d60602229d2d
+MISC metadata.xml 255 SHA256 cfa2e7e4e1ad84d152c6b2f49467e2beb07d188dad704bc9887438f2b0d95f18 SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9 WHIRLPOOL 6fbb4f57853f7ac5b979c506736e63f571606215889abf768ddb44fc91b3491a846ea84d46c6984bd3cd230f4808f8f39fa83580e636576c7756fdb1564869da
diff --git a/media-video/setpwc/metadata.xml b/media-video/setpwc/metadata.xml
new file mode 100644
index 000000000000..2a705e39ce78
--- /dev/null
+++ b/media-video/setpwc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>media-video@gentoo.org</email>
+	<name>Gentoo Video project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-video/setpwc/setpwc-1.3.ebuild b/media-video/setpwc/setpwc-1.3.ebuild
new file mode 100644
index 000000000000..562a6b7419a6
--- /dev/null
+++ b/media-video/setpwc/setpwc-1.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit toolchain-funcs
+
+DESCRIPTION="Control various aspects of Philips (and compatible) webcams"
+HOMEPAGE="http://www.vanheusden.com/setpwc/"
+SRC_URI="http://www.vanheusden.com/setpwc/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="sys-kernel/linux-headers"
+
+src_prepare() {
+	sed -i -e '/CFLAGS/s: -O2::' Makefile || die
+}
+
+src_compile() {
+	tc-export CC
+	emake LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin setpwc
+	dodoc readme.txt
+	doman setpwc.1
+}
diff --git a/media-video/shrip/Manifest b/media-video/shrip/Manifest
new file mode 100644
index 000000000000..45a70424fed2
--- /dev/null
+++ b/media-video/shrip/Manifest
@@ -0,0 +1,5 @@
+DIST shrip-0.6.0.tar.gz 337393 SHA256 883a8a64af61edbb8de71e4207d47d1e04c227d2a6c713de1ee5db7740e3d05f SHA512 fbc00fd3f436d7ff4adac29d552393bef9523817866cdfb3f3c2d8073dcf38914e6b5b5566fbf655f0716f2bb89b76e2329109b822280702d0e38cb6a1470645 WHIRLPOOL 0a43cb014a5e443764407e0207522cac9db195582e2754a77dd0d4a950a77f10bb8f3194c313363da6ff3ede0ac221f57547398e64291340656701922486e05d
+EBUILD shrip-0.6.0-r1.ebuild 802 SHA256 a9bff6c5fe5ff580f596e325bca2ec80d618799797f6307525980fb71f776d78 SHA512 0adf01f13c4ee190e304b64a31420793da73761b3a09c31ddc08d6ac2b583f1476ee6674188df938c1d506819b68196e7209e811c08a5f32a8e03c81527606d4 WHIRLPOOL 8d070b83d3cda689f05429792ca34290d37efb6264f570bd312ce01d830b67b4e97ed94e38fb31da0e861f2a3f6d418c44032b4dbf9478df2e3ef3624eb23ac4
+MISC ChangeLog 2424 SHA256 05645d025c37194da7122939f832994904b328ec8a23a5bc264d73f1b41f9a5a SHA512 3b9a1b8b83d12f45d073a6c704360102d6ed958831bb6604adf3096355fdfd35ee99b82b7c7cd1cc44347464c7cc5c30d8a497217aa6dc5526ec9978680533dd WHIRLPOOL 2f419b75c5b06759c73df6a58eedd9279ac8e8267bafe2a9b308939746ce947b82d7ced14364a98d0a4043a1335ac1323c724f458752ceb39732b346282f2331
+MISC ChangeLog-2015 1458 SHA256 5b90d70ade053d499f361e53d0847e618c61e951820b77062cd2f9574a2999ed SHA512 64eff769a111e7897439337d05d93a7118ed6df7fdd234bc5205a8385e46ced2917b2ccd084cdb35baca4f0522049b23d12e685a64a1b23250df2ef58711e0a7 WHIRLPOOL 1555b5cc7319803f462ecc0a9d7642842d10056967ecc31d37b3e8fd2b30189b94d486d5e5146508a6e284684c817da84c88bc5479c08968e8803f8f5196dd3f
+MISC metadata.xml 335 SHA256 3ccc0bf41fd10e71c4f04e5c26264a5e527446cb76838216c1ccbeb5e401db86 SHA512 c27b43dadd7995ca90de6000ccee64c8a6686a8b48eee052e5691e5c8e37bfe7be9fb6dd62d74c8ad94c4546dc550150727463380e935eecb460d724d6e76c13 WHIRLPOOL ce0417a9bacd1f8a7f7dec8747c138f7fd52ff81df280a28fd203b526b00a7ac96183081375231d7fce9466707b3439d0a174a1ccae3b6d7e97ccc0a5b7ea6b7
diff --git a/media-video/shrip/metadata.xml b/media-video/shrip/metadata.xml
new file mode 100644
index 000000000000..dfef1a9125bb
--- /dev/null
+++ b/media-video/shrip/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">ogmrip</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/shrip/shrip-0.6.0-r1.ebuild b/media-video/shrip/shrip-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..c39bbd4530d9
--- /dev/null
+++ b/media-video/shrip/shrip-0.6.0-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Command line tool for ripping DVDs and encoding to AVI/OGM/MKV/MP4"
+HOMEPAGE="http://ogmrip.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ogmrip/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND=">=dev-libs/glib-2.14:2
+	>=media-video/ogmrip-0.13.4"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( dev-util/intltool
+		sys-devel/gettext )"
+
+src_prepare() {
+	default
+	sed -i \
+		-e '/CFLAGS/s:-Werror::' \
+		configure || die
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable nls)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog README TODO
+
+	insinto /etc
+	doins shrip.conf || die
+}
diff --git a/media-video/simplescreenrecorder/Manifest b/media-video/simplescreenrecorder/Manifest
new file mode 100644
index 000000000000..4081ae7a6792
--- /dev/null
+++ b/media-video/simplescreenrecorder/Manifest
@@ -0,0 +1,4 @@
+DIST simplescreenrecorder-0.3.8.tar.gz 2037017 SHA256 ef05f1b4c36e1d82a4e96f59c5f29aaae986ad6711ccc311d0e21c8e6c191c6d SHA512 f94c7ac7d5f6fdebd1c68da7469b6c46a21b399e2ad8744c52d3e9959d2ec74d15e6ac061d7fe41f02ebb9ee9a89fbd8feecf4e0a10110975f3857a7fbb66365 WHIRLPOOL 23a811f5af9921bfdaf8d5546b9497e4a46d923d6eeb38d572b4d243ca55e75f0528df4b31936f23684e9a3cd54f47c1289682d196a04d97927501e19362013b
+EBUILD simplescreenrecorder-0.3.8.ebuild 2610 SHA256 7abbf2de35cbc0f36254b1772b59c1b4adf81b578ff1cd5f85ed9567d78f898d SHA512 d3f0af48d44419b4483502ffa0e09f679fedc6273b8ebbe81a184ac253a41230fb2e35b6cc9367b1d48d46f713a19f88f2f2c3a0e30243b817d4bdd527275167 WHIRLPOOL 1d37c25e9d48ac2e65ee6f8e6df8c91095e9218d5e7038abb311ddeafa2f084845debab89239d4435f069146a48264a5bd74c57076a22fcb19599bc835396a39
+EBUILD simplescreenrecorder-9999.ebuild 2610 SHA256 7abbf2de35cbc0f36254b1772b59c1b4adf81b578ff1cd5f85ed9567d78f898d SHA512 d3f0af48d44419b4483502ffa0e09f679fedc6273b8ebbe81a184ac253a41230fb2e35b6cc9367b1d48d46f713a19f88f2f2c3a0e30243b817d4bdd527275167 WHIRLPOOL 1d37c25e9d48ac2e65ee6f8e6df8c91095e9218d5e7038abb311ddeafa2f084845debab89239d4435f069146a48264a5bd74c57076a22fcb19599bc835396a39
+MISC metadata.xml 508 SHA256 981dc9fc3f67ce9eb1296497b135bbe7eaf0c4aa0dde62c0a3fda16eff59cacf SHA512 d4879cb7f57f23d273e45b429ab5548d30a0a6eefe63e28c2c60e7cef9a44b295d8455bfedaf9d9294ff4cf16b4f841f0ddb34541c62c25cbf190f7b6c7538ce WHIRLPOOL bd590b199c5912857041f371760d04f74b7efc00532dc9c4d652127f8a82f1bcb57e2ad5f9babe62453121c2e7670f478a4a672dae87e39d60f00c5568b24e9b
diff --git a/media-video/simplescreenrecorder/metadata.xml b/media-video/simplescreenrecorder/metadata.xml
new file mode 100644
index 000000000000..9778ada8fb0f
--- /dev/null
+++ b/media-video/simplescreenrecorder/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>polynomial-c@gentoo.org</email>
+    <name>Lars Wendler</name>
+  </maintainer>
+  <use>
+    <flag name="asm">Enable x86 assembly optimisation.</flag>
+    <flag name="vpx">Enable VP8 codec support via <pkg>media-libs/libvpx</pkg>.</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">MaartenBaert/ssr</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.8.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.3.8.ebuild
new file mode 100644
index 000000000000..22b763bb40ea
--- /dev/null
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-0.3.8.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic multilib-minimal
+
+if [[ ${PV} = 9999 ]]; then
+	inherit git-r3
+fi
+
+DESCRIPTION="A Simple Screen Recorder"
+HOMEPAGE="https://www.maartenbaert.be/simplescreenrecorder"
+LICENSE="GPL-3"
+PKGNAME="ssr"
+if [[ ${PV} = 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/MaartenBaert/${PKGNAME}.git"
+	EGIT_BOOTSTRAP=""
+else
+	SRC_URI="https://github.com/MaartenBaert/${PKGNAME}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PKGNAME}-${PV}"
+fi
+
+SLOT="0"
+IUSE="+asm debug jack mp3 pulseaudio theora vorbis vpx x264"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/alsa-lib:0=
+	media-libs/mesa[${MULTILIB_USEDEP}]
+	|| (
+		media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?]
+		media-video/libav[vorbis?,vpx?,x264?,mp3?,theora?]
+	)
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXext
+	x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	virtual/glu[${MULTILIB_USEDEP}]
+	jack? ( virtual/jack )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	if [[ ${ABI} == amd64 ]]; then
+		elog "You may want to add USE flag 'abi_x86_32' when running a 64bit system"
+		elog "When added 32bit GLInject libraries are also included. This is"
+		elog "required if you want to use OpenGL recording on 32bit applications."
+		elog
+	fi
+
+	if { has_version media-video/ffmpeg[x264] || has_version media-video/libav[x264] ; } && has_version media-libs/x264[10bit] ; then
+		ewarn
+		ewarn "media-libs/x264 is currently built with 10bit useflag."
+		ewarn "This is known to prevent simplescreenrecorder from recording x264 videos"
+		ewarn "correctly. Please build media-libs/x264 without 10bit if you want to "
+		ewarn "record videos with x264."
+		ewarn
+	fi
+
+	# QT requires -fPIC. Compile fails otherwise.
+	# Recently removed from the default compile options upstream
+	# https://github.com/MaartenBaert/ssr/commit/25fe1743058f0d1f95f6fbb39014b6ac146b5180
+	append-flags -fPIC
+}
+
+multilib_src_configure() {
+	local myconf=(
+		$(multilib_native_use_enable debug assert)
+		$(multilib_native_use_with pulseaudio)
+		$(multilib_native_use_with jack)
+		$(use_enable asm x86-asm)
+	)
+
+	# libav doesn't have AVFrame::channels
+	# https://github.com/MaartenBaert/ssr/issues/195#issuecomment-45646159
+	if has_version media-video/libav; then
+		myconf+=( --disable-ffmpeg-versions )
+	fi
+
+	if multilib_is_native_abi ; then
+		myconf+=( --with-qt5 )
+	else
+		myconf+=( --disable-ssrprogram )
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
new file mode 100644
index 000000000000..22b763bb40ea
--- /dev/null
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic multilib-minimal
+
+if [[ ${PV} = 9999 ]]; then
+	inherit git-r3
+fi
+
+DESCRIPTION="A Simple Screen Recorder"
+HOMEPAGE="https://www.maartenbaert.be/simplescreenrecorder"
+LICENSE="GPL-3"
+PKGNAME="ssr"
+if [[ ${PV} = 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/MaartenBaert/${PKGNAME}.git"
+	EGIT_BOOTSTRAP=""
+else
+	SRC_URI="https://github.com/MaartenBaert/${PKGNAME}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PKGNAME}-${PV}"
+fi
+
+SLOT="0"
+IUSE="+asm debug jack mp3 pulseaudio theora vorbis vpx x264"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/alsa-lib:0=
+	media-libs/mesa[${MULTILIB_USEDEP}]
+	|| (
+		media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?]
+		media-video/libav[vorbis?,vpx?,x264?,mp3?,theora?]
+	)
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXext
+	x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	virtual/glu[${MULTILIB_USEDEP}]
+	jack? ( virtual/jack )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	if [[ ${ABI} == amd64 ]]; then
+		elog "You may want to add USE flag 'abi_x86_32' when running a 64bit system"
+		elog "When added 32bit GLInject libraries are also included. This is"
+		elog "required if you want to use OpenGL recording on 32bit applications."
+		elog
+	fi
+
+	if { has_version media-video/ffmpeg[x264] || has_version media-video/libav[x264] ; } && has_version media-libs/x264[10bit] ; then
+		ewarn
+		ewarn "media-libs/x264 is currently built with 10bit useflag."
+		ewarn "This is known to prevent simplescreenrecorder from recording x264 videos"
+		ewarn "correctly. Please build media-libs/x264 without 10bit if you want to "
+		ewarn "record videos with x264."
+		ewarn
+	fi
+
+	# QT requires -fPIC. Compile fails otherwise.
+	# Recently removed from the default compile options upstream
+	# https://github.com/MaartenBaert/ssr/commit/25fe1743058f0d1f95f6fbb39014b6ac146b5180
+	append-flags -fPIC
+}
+
+multilib_src_configure() {
+	local myconf=(
+		$(multilib_native_use_enable debug assert)
+		$(multilib_native_use_with pulseaudio)
+		$(multilib_native_use_with jack)
+		$(use_enable asm x86-asm)
+	)
+
+	# libav doesn't have AVFrame::channels
+	# https://github.com/MaartenBaert/ssr/issues/195#issuecomment-45646159
+	if has_version media-video/libav; then
+		myconf+=( --disable-ffmpeg-versions )
+	fi
+
+	if multilib_is_native_abi ; then
+		myconf+=( --with-qt5 )
+	else
+		myconf+=( --disable-ssrprogram )
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
new file mode 100644
index 000000000000..7141b27e11b3
--- /dev/null
+++ b/media-video/smplayer/Manifest
@@ -0,0 +1,13 @@
+AUX smplayer-14.9.0.6690-zero-bidi.patch 410 SHA256 b1dc553f744fdbeddbdf3cc250122785e61b48a35b318426ad6c367b06e0d653 SHA512 0498e2519fbaf5f217e0ae7b47660f26e5a25a99aa8500c6e82716540d348d679628d061552e75afbf70dbe38e5ce3a433c553119d1ab8180e6fe7d9640433e7 WHIRLPOOL 87890c3052910b83af8e0f6273a951f82fd7b1904dcadeba7565dc9dd3c30659564cf09fa693541592c358971e7bf9bb5071986fa3190569034137129cb4becd
+AUX smplayer-14.9.0.6966-unbundle-qtsingleapplication.patch 566 SHA256 98b2691eac48a50fe851366f225a7a1017ac3769f9478639bf292bb9c45142db SHA512 9c757a1eaca358c9fb712801c0a17d084ea9dd3be26dd43f9b2c83bf39d2bbe4b458ba9432aba9e76cb83b56fb698a2976951be2074acfaa787cbfbed2a54fa9 WHIRLPOOL fe60ee7fd20ab4cc3c9286295163413c8e798bcae6c25930b501094c25545235cf92aae9d50f4f9694bb0ed5c47ae9d8a1c9ba776f180c23c6bbe3ac3f3a00a2
+AUX smplayer-16.4.0-zero-bidi.patch 489 SHA256 a61d2b36d9fd3fba0f7c1a6ad8a2fc8a1e76e70e13e8b58a1d2f21a6c53a94c6 SHA512 acde9545bc1a0659673f6e747291c837ab36b9894bde6d03e419acf579c2f8f581127424dde786496f37308676754319c4f4402f52b620e97a63cdccd1af80d6 WHIRLPOOL 2cb7d823e612aa7caded97fb0872764fe11f8d145b1056228d039be2d376b2cf0cb521fcf8aaec92d76e899e61139e4d7a555ec931352ff43b1b5558f990b831
+AUX smplayer-17.1.0-advertisement_crap.patch 1982 SHA256 dcd18b9d67c3655a835515f80b7e96f8937587f564cb1d4a717c3ef902100d99 SHA512 7bc1a3e9fb916d3a7e0c4f9bba8bb2adb7a3822e34694f79501e228f700b27633cac2eba237ab4af221c50f07295ecab3093c2a7033578a3e0a91a1e6449570d WHIRLPOOL 2889a475da62c88efd698447a9f39ed5b54c36a22fa100b5bee202e50e3aae498890dd618ab22e77af78aa70124687653d0c73dc8a32ea980f8be050b95c8cbc
+DIST smplayer-16.1.0.tar.bz2 3966243 SHA256 d25c9b62d36c5ee63fb360e9a45566601d49d707e1364294a54967b956bdd8c9 SHA512 2c240a6cc392b84c7d6f725a02af33788ce7dbfae9d765d309e3b958fa9e2475e45c56b260e056118362848f64e478aa0ef9c67478fc44d9e42c568b4892e6ed WHIRLPOOL 8a7c989e3c77e6e7a696a958f848e8649f49131be80f26139b2aef17f3534cc18ab778def5083fee5a12c1e8291891e6c9d90ae26395c13a04e889ab2e4f616e
+DIST smplayer-16.11.0.tar.bz2 4254170 SHA256 e53a5d8b4d66fb0b7eb73053ef0bfdd2d942b79a16f8cc8d3d0b0771c7c80b5a SHA512 13776ff134c4c91747fa9432080a4ea876d5d5a134b91dde48d0f0e75c280ef6d19067906e4e850da3b1b2287214914528743495cccf7cbda310bc51682b478c WHIRLPOOL eadbf8af0247892dcaa38fd278b2316457626d573f10319d986e77aa0a58ef42cdc783efa95feffe292a38ebbb4b65d7203cabbc57f0332be711f9683c161139
+DIST smplayer-17.10.0.tar.bz2 5050760 SHA256 3d40a999343c647cc758a8d5026be9d355dcc84317700128578e51db9f982375 SHA512 c06f8e6043a870291cc29eba57b8bb5034fbceb19b24987751467e874a00d4e95f57933708d71375fdc38fdc32de68d77a7d9180c3eee1f9011eb1cfa421bbb0 WHIRLPOOL b4738ce430fadf60c743a05dcf1e491ec37d88a4ff83db75ac238f479a6031efe8bfd1a70af389cf2bd22cfd5236adb4e22e7c7a23321a53966e9a1f738d0db2
+EBUILD smplayer-16.1.0.ebuild 3747 SHA256 5495cb5c8c79801add78e516b552076bf02098677d7275178156e3eb7fdaff74 SHA512 072e6535c97787f9b2da55c948c594b44ac8cd2941f821c24b765ad6e5c8c2e9d3cdc8d69053040cda130ecad3459de00ae3ad307bb3ba4da40485724f8bc7bf WHIRLPOOL 652c6519800a5cd7beb13605cbb79171a695c5db776a4ad40d52262265710816e81187c312083523b9424e3ee7424f9d50ef855e4169922c7a031c5e843b51da
+EBUILD smplayer-16.11.0.ebuild 3501 SHA256 8b8576a541dd209193044852c8fe75c9a4bd155f27214cf8389bb84e29dfdf8c SHA512 0e28a728350d06be20f0be25a2a11b4a3b4aae59208bbc0c9ade099fdea35bc74ae0186a64faba4d06470ce6a6269b40c597c86f02bc903dd0f6cc113dfd2f54 WHIRLPOOL 22a97e4306915b17c120da2378d2322ca7b9522405dcaa58db0a877b7a9da0209acfac8f4e9b6c96de579b41efa91cb6c70345ac85a2c63380408462605f38a4
+EBUILD smplayer-17.10.0.ebuild 2913 SHA256 bc604aa435419ac39a913848bc4c6a9d244bddf46d26cdbd892c4bd6d10d0272 SHA512 3c82575cebed11917065588c76bfb6aa0e63c95c96b59121f8d64dc14ae539d9d5184ff009d24248ca818d2ed4e2818fa91e843c4d082f29fcee1b541ae26eac WHIRLPOOL 1fed048d96edffadfd46506780f8077b3f971e7e5d19b2aa084a2c5d9419670d9ac57d9a0db064f9218039c97a946ec630316a0c9440df207506ac4120dff024
+MISC ChangeLog 7960 SHA256 ae73b7751f8bbeb9d6e3298ad09b35ed72435a19d157a67795a88175a78be567 SHA512 df862a10ff236132e9fcb7e481aab18a25f1de1798b0e46110a3e0f15d404b2c2a9de57c435bf2a5cb821bd1f5e7ed34bfc5c6c4d1968bccb2caec6d85fc3ba4 WHIRLPOOL e646e8a204529826ce1a5801c438d4397f0d582b235e59e9ffba4939133b6978aa876dd374e592685c532071f481d9bdbd0f0c53a364745d8d7f4d74352b6478
+MISC ChangeLog-2015 24285 SHA256 83c4080cff45223afbf5a54fca18b206de66bbfab917ad9147d9b99d1d6155a6 SHA512 9e3a4d8b82ee7fd8ec1f903eda0f6689d9fd7c04e453c93c9db3b9c4a952ccdbf9239d522a9fe3d2e96c56874902544fcdb761fb4661746d52d65de8610de77c WHIRLPOOL 8c82ed1af5e6c22458c715987f81ec3f769e23d7fd33d275aa087889e96662f57d50ef88fd9b7096c5962988d58e0df4b1133a09a2c65e3c213d7686aecbaf89
+MISC metadata.xml 1016 SHA256 f45b4e0471580f7af66e6314d87ae2d6046413fd40c39873ecc16bbe374fca5e SHA512 04fb5a1a6c330b847e43a6e6a635be5180e4bb353b28c551f39ca74c663874e36f697204d01fb0267775c04ec452fbb5409e7d5611b61bd7f883ee1f9c8b82fc WHIRLPOOL 6b113852ebdbf619c55e09127c2168ae75721113851da126fd41046ea696eccc1712ea37ecbf6f4698956c28b2663009729477629f9c08d97bbc628ec89a0f0a
diff --git a/media-video/smplayer/files/smplayer-14.9.0.6690-zero-bidi.patch b/media-video/smplayer/files/smplayer-14.9.0.6690-zero-bidi.patch
new file mode 100644
index 000000000000..650dcd79c4b4
--- /dev/null
+++ b/media-video/smplayer/files/smplayer-14.9.0.6690-zero-bidi.patch
@@ -0,0 +1,13 @@
+--- a/src/core.cpp
++++ b/src/core.cpp
+@@ -1811,10 +1811,6 @@
+ 
+ 		proc->setOption("ass-font-scale", QString::number(mset.sub_scale_ass));
+ 
+-		if (!pref->mplayer_is_mplayer2) {
+-			proc->setOption("flip-hebrew",false); // It seems to be necessary to display arabic subtitles correctly when using -ass
+-		}
+-
+ 		if (pref->enable_ass_styles) {
+ 			if (!pref->force_ass_styles) {
+ 				// Load the styles.ass file
diff --git a/media-video/smplayer/files/smplayer-14.9.0.6966-unbundle-qtsingleapplication.patch b/media-video/smplayer/files/smplayer-14.9.0.6966-unbundle-qtsingleapplication.patch
new file mode 100644
index 000000000000..e7fca64e450e
--- /dev/null
+++ b/media-video/smplayer/files/smplayer-14.9.0.6966-unbundle-qtsingleapplication.patch
@@ -0,0 +1,15 @@
+--- smplayer-14.9.0.6966.orig/src/smplayer.pro	2015-04-18 10:11:32.000000000 +0800
++++ smplayer-14.9.0.6966/src/smplayer.pro	2015-07-01 13:18:39.283850646 +0800
+@@ -285,11 +285,7 @@
+ 
+ # qtsingleapplication
+ contains( DEFINES, SINGLE_INSTANCE ) {
+-	INCLUDEPATH += qtsingleapplication
+-	DEPENDPATH += qtsingleapplication
+-
+-	SOURCES += qtsingleapplication/qtsingleapplication.cpp qtsingleapplication/qtlocalpeer.cpp
+-	HEADERS += qtsingleapplication/qtsingleapplication.h qtsingleapplication/qtlocalpeer.h
++	CONFIG += qtsingleapplication
+ }
+ 
+ # Find subtitles dialog
diff --git a/media-video/smplayer/files/smplayer-16.4.0-zero-bidi.patch b/media-video/smplayer/files/smplayer-16.4.0-zero-bidi.patch
new file mode 100644
index 000000000000..d36f0720cd0a
--- /dev/null
+++ b/media-video/smplayer/files/smplayer-16.4.0-zero-bidi.patch
@@ -0,0 +1,16 @@
+--- smplayer-16.4.0/src/core.cpp
++++ smplayer-16.4.0/src/core.cpp
+@@ -1832,13 +1832,6 @@
+ 
+ 		proc->setOption("ass-font-scale", QString::number(mset.sub_scale_ass));
+ 
+-		#ifdef MPLAYER2_SUPPORT
+-		if (!pref->mplayer_is_mplayer2)
+-		#endif
+-		{
+-			proc->setOption("flip-hebrew",false); // It seems to be necessary to display arabic subtitles correctly when using -ass
+-		}
+-
+ 		if (pref->enable_ass_styles) {
+ 			QString ass_force_style;
+ 			if (!pref->user_forced_ass_style.isEmpty()) {
diff --git a/media-video/smplayer/files/smplayer-17.1.0-advertisement_crap.patch b/media-video/smplayer/files/smplayer-17.1.0-advertisement_crap.patch
new file mode 100644
index 000000000000..2792d189b097
--- /dev/null
+++ b/media-video/smplayer/files/smplayer-17.1.0-advertisement_crap.patch
@@ -0,0 +1,85 @@
+--- smplayer-17.1.0/src/basegui.cpp
++++ smplayer-17.1.0/src/basegui.cpp
+@@ -906,9 +906,11 @@
+ 	connect( showConfigAct, SIGNAL(triggered()),
+              this, SLOT(helpShowConfig()) );
+ 
++#ifdef DONATE_REMINDER
+ 	donateAct = new MyAction( this, "donate" );
+ 	connect( donateAct, SIGNAL(triggered()),
+              this, SLOT(helpDonate()) );
++#endif
+ 
+ 	aboutThisAct = new MyAction( this, "about_smplayer" );
+ 	connect( aboutThisAct, SIGNAL(triggered()),
+@@ -1846,8 +1848,10 @@
+ #ifdef SHARE_ACTIONS
+ 	donateAct->change( Images::icon("donate"), tr("&Donate / Share with your friends") );
+ #else
++#ifdef DONATE_REMINDER
+ 	donateAct->change( Images::icon("donate"), tr("&Donate") );
+ #endif
++#endif
+ 	aboutThisAct->change( Images::icon("logo"), tr("About &SMPlayer") );
+ 
+ #ifdef SHARE_MENU
+@@ -2993,8 +2997,10 @@
+ 		helpMenu->addAction(showConfigAct);
+ 		helpMenu->addSeparator();
+ 	}
++	#ifdef DONATE_REMINDER
+ 	helpMenu->addAction(donateAct);
+ 	helpMenu->addSeparator();
++	#endif
+ 	helpMenu->addAction(aboutThisAct);
+ 
+ 	// Access menu
+@@ -4489,6 +4495,7 @@
+ 	}
+ }
+ #else
++#ifdef DONATE_REMINDER
+ void BaseGui::helpDonate() {
+ 	qDebug("BaseGui::helpDonate");
+ 
+@@ -4530,6 +4537,7 @@
+ 	if (accepted != 0) *accepted = result;
+ }
+ #endif
++#endif
+ 
+ void BaseGui::helpAbout() {
+ 	About d(this);
+--- smplayer-17.1.0/src/basegui.h
++++ smplayer-17.1.0/src/basegui.h
+@@ -73,10 +73,6 @@
+ class ShareWidget;
+ #endif
+ 
+-#ifndef SHARE_WIDGET
+-#define DONATE_REMINDER
+-#endif
+-
+ class BaseGui : public QMainWindow
+ {
+ 	Q_OBJECT
+@@ -129,8 +125,8 @@
+ 	virtual void helpFAQ();
+ 	virtual void helpCLOptions();
+ 	virtual void helpCheckUpdates();
++#ifdef DONATE_REMINDER
+ 	virtual void helpDonate();
+-#ifndef SHARE_ACTIONS
+ 	void showHelpDonateDialog(bool * accepted = 0);
+ #endif
+ 	virtual void helpShowConfig();
+@@ -574,7 +570,9 @@
+ 	MyAction * updateYTAct;
+ #endif
+ 	MyAction * showConfigAct;
++#ifdef DONATE_REMINDER
+ 	MyAction * donateAct;
++#endif
+ 	MyAction * aboutThisAct;
+ 
+ #ifdef SHARE_MENU
diff --git a/media-video/smplayer/metadata.xml b/media-video/smplayer/metadata.xml
new file mode 100644
index 000000000000..9f32889eaddc
--- /dev/null
+++ b/media-video/smplayer/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>qt@gentoo.org</email>
+    <name>Gentoo Qt Project</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>media-video@gentoo.org</email>
+    <name>Gentoo Video project</name>
+  </maintainer>
+  <use>
+    <flag name="autoshutdown">
+      Enable the option to shutdown your computer after finishing the playlist.
+      This requires <pkg>dev-qt/qtdbus</pkg> as dependency.
+    </flag>
+    <flag name="mpris">Enable support for MPRIS2 (Media Player Remote
+      Interfacing Specification, version 2), a DBus interface for remote
+      control, which requires <pkg>dev-qt/qtdbus</pkg> as dependency.
+    </flag>
+    <flag name="streaming">Support for streaming video sites through
+      <pkg>net-misc/youtube-dl</pkg> (MPV only).
+    </flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">smplayer</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-video/smplayer/smplayer-16.1.0.ebuild b/media-video/smplayer/smplayer-16.1.0.ebuild
new file mode 100644
index 000000000000..274d93b77475
--- /dev/null
+++ b/media-video/smplayer/smplayer-16.1.0.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar ar_SY bg ca cs da de el_GR en_GB en_US es et eu fi fr gl he_IL hr
+hu id it ja ka ko ku lt mk ms_MY nl nn_NO pl pt pt_BR ro_RO ru_RU sk sl_SI sq_AL
+sr sv th tr uk_UA uz vi_VN zh_CN zh_TW"
+PLOCALE_BACKUP="en_US"
+inherit l10n qmake-utils
+
+DESCRIPTION="Great Qt GUI front-end for mplayer/mpv"
+HOMEPAGE="http://www.smplayer.info/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ BSD-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux"
+IUSE="autoshutdown bidi debug mpris +qt4 qt5 streaming"
+
+REQUIRED_USE="^^ ( qt4 qt5 )"
+
+COMMON_DEPEND="
+	sys-libs/zlib
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		dev-qt/qtsingleapplication[X,qt4]
+		autoshutdown? ( dev-qt/qtdbus:4 )
+		mpris? ( dev-qt/qtdbus:4 )
+		streaming? ( dev-qt/qtcore:4[ssl] )
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		>=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5]
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+		autoshutdown? ( dev-qt/qtdbus:5 )
+		mpris? ( dev-qt/qtdbus:5 )
+		streaming? (
+			dev-qt/qtnetwork:5[ssl]
+			dev-qt/qtscript:5
+		)
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	qt5? ( dev-qt/linguist-tools:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	|| (
+		media-video/mplayer[bidi?,libass,png,X]
+		(
+			>=media-video/mpv-0.6.2[libass,X]
+			streaming? ( >=net-misc/youtube-dl-2014.11.26 )
+		)
+	)
+"
+
+src_prepare() {
+	default
+
+	eapply "${FILESDIR}"/${PN}-14.9.0.6966-unbundle-qtsingleapplication.patch # bug 487544
+	use bidi || eapply "${FILESDIR}"/${PN}-14.9.0.6690-zero-bidi.patch
+
+	# Upstream Makefile sucks
+	sed -i -e "/^PREFIX=/s:${EPREFIX}/usr/local:${EPREFIX}/usr:" \
+		-e "/^DOC_PATH=/s:packages/smplayer:${PF}:" \
+		-e '/\.\/get_svn_revision\.sh/,+2c\
+	cd src && $(DEFS) $(MAKE)' \
+		"${S}"/Makefile || die "sed failed"
+
+	# Toggle autoshutdown option which pulls in dbus, bug #524392
+	if ! use autoshutdown ; then
+		sed -e 's:DEFINES += AUTO_SHUTDOWN_PC:#DEFINES += AUTO_SHUTDOWN_PC:' \
+			-i "${S}"/src/smplayer.pro || die "sed failed"
+	fi
+
+	# Turn debug message flooding off
+	if ! use debug ; then
+		sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' \
+			"${S}"/src/smplayer.pro || die "sed failed"
+	fi
+
+	# MPRIS2 pulls in dbus, bug #553710
+	if ! use mpris ; then
+		sed -e 's:DEFINES += MPRIS2:#DEFINES += MPRIS2:' \
+			-i "${S}"/src/smplayer.pro || die "sed failed"
+	fi
+
+	# Turn off online update checker, bug #479902
+	sed -e 's:DEFINES += UPDATE_CHECKER:#DEFINES += UPDATE_CHECKER:' \
+		-e 's:DEFINES += CHECK_UPGRADED:#DEFINES += CHECK_UPGRADED:' \
+		-i "${S}"/src/smplayer.pro || die "sed failed"
+
+	# Turn off nasty share widget
+	sed -e 's:DEFINES += SHAREWIDGET:#DEFINES += SHAREWIDGET:' \
+		-i "${S}"/src/smplayer.pro || die "sed failed"
+
+	# Turn off youtube support (which pulls in extra dependencies) if unwanted
+	if ! use streaming ; then
+		sed -e 's:DEFINES += YOUTUBE_SUPPORT:#DEFINES += YOUTUBE_SUPPORT:' \
+		-i "${S}"/src/smplayer.pro || die "sed failed"
+	fi
+
+	l10n_find_plocales_changes "${S}/src/translations" "${PN}_" '.ts'
+}
+
+src_configure() {
+	pushd src > /dev/null || die
+	use qt4 && eqmake4
+	use qt5 && eqmake5
+	popd > /dev/null || die
+}
+
+gen_translation() {
+	local mydir
+	if use qt4; then
+		mydir="$(qt4_get_bindir)"
+	elif use qt5; then
+		mydir="$(qt5_get_bindir)"
+	fi
+	ebegin "Generating $1 translation"
+	"${mydir}"/lrelease ${PN}_${1}.ts
+	eend $? || die "failed to generate $1 translation"
+}
+
+src_compile() {
+	emake
+
+	cd "${S}"/src/translations
+	l10n_for_each_locale_do gen_translation
+}
+
+src_install() {
+	# remove unneeded copies of licenses
+	rm Copying* docs/{cs,en,hu,it,ja,pt,ru,zh_CN}/gpl.html || die
+	rm -r docs/{de,es,fr,nl,ro} || die
+
+	emake DESTDIR="${D}" install
+}
diff --git a/media-video/smplayer/smplayer-16.11.0.ebuild b/media-video/smplayer/smplayer-16.11.0.ebuild
new file mode 100644
index 000000000000..62806f4d7de7
--- /dev/null
+++ b/media-video/smplayer/smplayer-16.11.0.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="am ar_SY ar bg ca cs da de el en_GB en en_US es et eu fa fi fr gl
+he_IL hr hu id it ja ka ko ku lt mk ms_MY nl nn_NO pl pt_BR pt ro_RO ru_RU
+sk sl_SI sq_AL sr sv th tr uk_UA uz vi_VN zh_CN zh_TW"
+PLOCALE_BACKUP="en_US"
+
+inherit l10n qmake-utils
+
+DESCRIPTION="Great Qt GUI front-end for mplayer/mpv"
+HOMEPAGE="http://www.smplayer.eu/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ BSD-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux"
+IUSE="autoshutdown bidi debug mpris qt5 streaming"
+
+COMMON_DEPEND="
+	sys-libs/zlib
+	!qt5? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		dev-qt/qtsingleapplication[X,qt4]
+		autoshutdown? ( dev-qt/qtdbus:4 )
+		mpris? ( dev-qt/qtdbus:4 )
+		streaming? (
+			dev-qt/qtcore:4[ssl]
+			dev-qt/qtscript:4
+		)
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtsingleapplication[X,qt5]
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+		autoshutdown? ( dev-qt/qtdbus:5 )
+		mpris? ( dev-qt/qtdbus:5 )
+		streaming? (
+			dev-qt/qtnetwork:5[ssl]
+			dev-qt/qtscript:5
+		)
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	qt5? ( dev-qt/linguist-tools:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	|| (
+		media-video/mplayer[bidi?,libass,png,X]
+		(
+			>=media-video/mpv-0.10.0[libass,X]
+			streaming? ( >=net-misc/youtube-dl-2014.11.26 )
+		)
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-14.9.0.6966-unbundle-qtsingleapplication.patch" # bug 487544
+)
+
+src_prepare() {
+	use bidi || PATCHES+=( "${FILESDIR}"/${PN}-16.4.0-zero-bidi.patch )
+
+	default
+
+	# Upstream Makefile sucks
+	sed -i -e "/^PREFIX=/ s:/usr/local:${EPREFIX}/usr:" \
+		-e "/^DOC_PATH=/ s:packages/smplayer:${PF}:" \
+		-e '/\.\/get_svn_revision\.sh/,+2c\
+	cd src && $(DEFS) $(MAKE)' \
+		Makefile || die
+
+	# Turn off online update checker, bug #479902
+	sed -e 's:DEFINES += UPDATE_CHECKER:#&:' \
+		-e 's:DEFINES += CHECK_UPGRADED:#&:' \
+		-i src/smplayer.pro || die
+
+	# Turn off intrusive share widget
+	sed -e 's:DEFINES += SHARE_WIDGET:#&:' \
+		-i src/smplayer.pro || die
+
+	# Toggle autoshutdown option which pulls in dbus, bug #524392
+	if ! use autoshutdown ; then
+		sed -e 's:DEFINES += AUTO_SHUTDOWN_PC:#&:' \
+			-i src/smplayer.pro || die
+	fi
+
+	# Turn debug message flooding off
+	if ! use debug ; then
+		sed -e 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' \
+			-i src/smplayer.pro || die
+	fi
+
+	# MPRIS2 pulls in dbus, bug #553710
+	if ! use mpris ; then
+		sed -e 's:DEFINES += MPRIS2:#&:' \
+			-i src/smplayer.pro || die
+	fi
+
+	# Turn off youtube support (which pulls in extra dependencies) if unwanted
+	if ! use streaming ; then
+		sed -e 's:DEFINES += YOUTUBE_SUPPORT:#&:' \
+			-i src/smplayer.pro || die
+		sed -e 's:^#define PLAYLIST_DOWNLOAD://&:' \
+			-i src/playlist.h || die
+	fi
+
+	# Commented out because it gives false positives
+	#l10n_find_plocales_changes "${S}"/src/translations ${PN}_ .ts
+}
+
+src_configure() {
+	cd src || die
+	use qt5 && eqmake5 || eqmake4
+}
+
+gen_translation() {
+	local mydir="$(qt4_get_bindir)"
+	if use qt5; then
+		mydir="$(qt5_get_bindir)"
+	fi
+
+	ebegin "Generating $1 translation"
+	"${mydir}"/lrelease ${PN}_${1}.ts
+	eend $? || die "failed to generate $1 translation"
+}
+
+src_compile() {
+	default
+
+	cd src/translations || die
+	l10n_for_each_locale_do gen_translation
+}
+
+src_install() {
+	# remove unneeded copies of the GPL
+	rm -f Copying* docs/*/gpl.html || die
+	# don't install empty dirs
+	rmdir --ignore-fail-on-non-empty docs/* || die
+
+	default
+}
diff --git a/media-video/smplayer/smplayer-17.10.0.ebuild b/media-video/smplayer/smplayer-17.10.0.ebuild
new file mode 100644
index 000000000000..13741f5b2b12
--- /dev/null
+++ b/media-video/smplayer/smplayer-17.10.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="am ar_SY ar bg ca cs da de el en_GB en en_US es et eu fa fi fr gl
+he_IL hr hu id it ja ka ko ku lt mk ms_MY nl nn_NO pl pt_BR pt ro_RO ru_RU
+sk sl_SI sq_AL sr sv th tr uk_UA uz vi_VN zh_CN zh_TW"
+PLOCALE_BACKUP="en_US"
+
+inherit l10n qmake-utils
+
+DESCRIPTION="Great Qt GUI front-end for mplayer/mpv"
+HOMEPAGE="http://www.smplayer.eu/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux"
+IUSE="autoshutdown bidi debug mpris"
+
+COMMON_DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtscript:5
+	dev-qt/qtsingleapplication[X,qt5]
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-libs/zlib
+	autoshutdown? ( dev-qt/qtdbus:5 )
+	mpris? ( dev-qt/qtdbus:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+"
+RDEPEND="${COMMON_DEPEND}
+	|| (
+		media-video/mplayer[bidi?,libass,png,X]
+		(
+			>=media-video/mpv-0.15.0[libass,X]
+			>=net-misc/youtube-dl-2014.11.26
+		)
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-14.9.0.6966-unbundle-qtsingleapplication.patch" # bug 487544
+	"${FILESDIR}/${PN}-17.1.0-advertisement_crap.patch"
+)
+
+src_prepare() {
+	use bidi || PATCHES+=( "${FILESDIR}"/${PN}-16.4.0-zero-bidi.patch )
+
+	default
+
+	# Upstream Makefile sucks
+	sed -i -e "/^PREFIX=/ s:/usr/local:${EPREFIX}/usr:" \
+		-e "/^DOC_PATH=/ s:packages/smplayer:${PF}:" \
+		-e '/\.\/get_svn_revision\.sh/,+2c\
+	cd src && $(DEFS) $(MAKE)' \
+		Makefile || die
+
+	# Turn off online update checker, bug #479902
+	sed -e 's:DEFINES += UPDATE_CHECKER:#&:' \
+		-e 's:DEFINES += CHECK_UPGRADED:#&:' \
+		-i src/smplayer.pro || die
+
+	# Turn off intrusive share widget
+	sed -e 's:DEFINES += SHARE_WIDGET:#&:' \
+		-i src/smplayer.pro || die
+
+	# Toggle autoshutdown option which pulls in dbus, bug #524392
+	if ! use autoshutdown ; then
+		sed -e 's:DEFINES += AUTO_SHUTDOWN_PC:#&:' \
+			-i src/smplayer.pro || die
+	fi
+
+	# Turn debug message flooding off
+	if ! use debug ; then
+		sed -e 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' \
+			-i src/smplayer.pro || die
+	fi
+
+	# MPRIS2 pulls in dbus, bug #553710
+	if ! use mpris ; then
+		sed -e 's:DEFINES += MPRIS2:#&:' \
+			-i src/smplayer.pro || die
+	fi
+
+	# Commented out because it gives false positives
+	#l10n_find_plocales_changes "${S}"/src/translations ${PN}_ .ts
+}
+
+src_configure() {
+	cd src || die
+	eqmake5
+}
+
+gen_translation() {
+	local mydir="$(qt5_get_bindir)"
+
+	ebegin "Generating $1 translation"
+	"${mydir}"/lrelease ${PN}_${1}.ts
+	eend $? || die "failed to generate $1 translation"
+}
+
+src_compile() {
+	default
+
+	cd src/translations || die
+	l10n_for_each_locale_do gen_translation
+}
+
+src_install() {
+	# remove unneeded copies of the GPL
+	rm -f Copying* docs/*/gpl.html || die
+	# don't install empty dirs
+	rmdir --ignore-fail-on-non-empty docs/* || die
+
+	default
+}
diff --git a/media-video/smtube/Manifest b/media-video/smtube/Manifest
new file mode 100644
index 000000000000..abc5a8b8bad7
--- /dev/null
+++ b/media-video/smtube/Manifest
@@ -0,0 +1,4 @@
+DIST smtube-17.5.0.tar.bz2 748559 SHA256 8dca5245e2d2be4cb472b7a6e9e7ccafa52f25b0ef2c924944aa058b02a5a08e SHA512 bda1d166fe03eb85e5a9971b0d5422ea3e72ea91293c4dd14cdb447788635971a1d9977fd2dda60bfcda68183511b5c6ca6b39a229960fbd4c7c5f125882140b WHIRLPOOL 26f0e3a5f0c992d6abe5058b426178c7c930a6b64171d4db1fc6dd6e1d0d96ca5eef04ac13745be61788e845d5be7abd3cad81e0c2a46e003c3421b5c2db3db4
+EBUILD smtube-17.5.0-r1.ebuild 1434 SHA256 c59848eb21b0f19d4d492b0520db4a66005da3bb4dff2b7c09f05218978a435d SHA512 ce27dfa686cdbde4d043e3d5fcf77a0e519321272eee4fc006d9bba5562e9b96f9f094b9f54601453a64925131a159490e4ef3433d91c5c9624f8d4aefc44a5a WHIRLPOOL ed01006da59a3ab367ce5fb0ce59cd08e98a7431c6cf0e83e2b2e912bbf276f2145d67b54d3e363829d8ff559b51763639ffbf61bb40ceb24e765fed735d06d0
+MISC ChangeLog 2696 SHA256 d95ace741053d63bdd84043baa5efbb16a73b43279609eacb8c6c232628f9711 SHA512 49922c042ba2071cfafa784663292d97f39a380a5d286786232f17f8baa0ef92797db95ac6cb17bd1da9f987b00d8e7a0a5a72fb4e36965635f8a56e6b23490b WHIRLPOOL 1d1a4358905302a5513f54f767ad33cb63a1bc8d75657b3969e0314c179409fd55aa83c91f20e9ad704a885df130025faead52040f9bb21925ed573b98608403
+MISC metadata.xml 631 SHA256 31a7ec879c0b8aa264fc9fb62b55b283a4c2acec3bc96055a50c5fcdb385aaf5 SHA512 6e34f98aa3d8bf2304fb3b2f83c6d470f829bcf6dd311fbce7f765f641133547d6ca724f60cedd85fe039ca77147b54710f85ef3d2cdb4806645b55952cebcf3 WHIRLPOOL 31ca3438f7c95bb0cdb1809a18e9521ab4b0edf05def331be0a0d5f8fb910a8268915f0d5ff9c32b6b5bf93361f4d1c55970698abbeacf9067acb3cd54174517
diff --git a/media-video/smtube/metadata.xml b/media-video/smtube/metadata.xml
new file mode 100644
index 000000000000..aa2b0ea848ca
--- /dev/null
+++ b/media-video/smtube/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zlg@gentoo.org</email>
+		<name>Daniel Campbell</name>
+	</maintainer>
+	<longdescription lang="en">
+		SMTube is a Qt-based frontend to Youtube and other video services
+		that allows you to play videos directly in a variety of media players.
+	</longdescription>
+	<upstream>
+		<maintainer status="active">
+			<email>ricardo@smplayer.info</email>
+			<name>Ricardo Villalba</name>
+		</maintainer>
+		<remote-id type="sourceforge">smtube</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/smtube/smtube-17.5.0-r1.ebuild b/media-video/smtube/smtube-17.5.0-r1.ebuild
new file mode 100644
index 000000000000..3ef1ff562459
--- /dev/null
+++ b/media-video/smtube/smtube-17.5.0-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="bg cs da de en_GB en es eu fr gl he_IL hr hu it ja ko ms nn_NO pl pt_BR pt ru sq sr tr uk zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit eutils l10n qmake-utils
+
+DESCRIPTION="YouTube Browser for SMPlayer"
+HOMEPAGE="http://smplayer.sourceforge.net/smtube"
+SRC_URI="mirror://sourceforge/smtube/${P}.tar.bz2"
+KEYWORDS="amd64 x86"
+LICENSE="GPL-2+"
+SLOT="0"
+
+# Deps in makefile seemed to be -core, -network, -script, -gui, -webkit, but the
+# given packages seem to be deprecated...
+CDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtscript:5
+"
+DEPEND="
+	${CDEPEND}
+	dev-qt/linguist-tools:5
+"
+RDEPEND="
+	${CDEPEND}
+	|| ( media-video/smplayer[streaming] media-video/mpv media-video/mplayer media-video/vlc media-video/totem media-video/gnome-mplayer )
+"
+
+gen_translation() {
+	"$(qt5_get_bindir)"/lrelease ${PN}_${1}.ts
+	eend $? || die "failed to generate $1 translation"
+}
+
+src_compile() {
+	eqmake5 src/${PN}.pro
+	emake
+
+	cd "${S}"/src/translations
+	l10n_for_each_locale_do gen_translation
+}
+
+install_locale() {
+	insinto /usr/share/${PN}/translations
+	doins "${S}"/src/translations/${PN}_${1}.qm
+	eend $? || die "failed to install $1 translation"
+}
+
+src_install() {
+	dobin ${PN}
+	domenu ${PN}.desktop
+	newicon icons/${PN}_64.png ${PN}.png
+	dodoc Changelog
+
+	l10n_for_each_locale_do install_locale
+}
diff --git a/media-video/snappy/Manifest b/media-video/snappy/Manifest
new file mode 100644
index 000000000000..e3467d4a2e5f
--- /dev/null
+++ b/media-video/snappy/Manifest
@@ -0,0 +1,11 @@
+AUX snappy-1.0-clutter-1.22.patch 721 SHA256 01b4bf0b3000c4d8d91a76319b62eb1537ade46e3e9ff119b1d69382542fe2c2 SHA512 3d808cb79cfec5486726999586a307db0b7426d3250291120ec0e91c35ac8a1fdc5c9545fd58562160d836643396b094d1cbbdb4f1bca6d361c39f9662b203fe WHIRLPOOL 181b8fce9bada41873fd017ac592c771f11012f51a264a0dc0a0bebd8a614ef4fe7776e26659ea1b28f8cdd9c494e79b644ed89573f30233e5f499a0a3015d0b
+AUX snappy-1.0-clutter-gst-3.patch 3951 SHA256 597cec4abf73cc431cb65df858358a968bb1e1a7d3a3f6176f456eab9ad3e084 SHA512 18f550d91d84fc0cd350cee600454ff7b7103e9e17db877b3773817819fe8fcbb24882e3da84b83d3f0c2fd18c9494c34a9dd60a3712d2e0174bca3e49779104 WHIRLPOOL 5e438d18517f52c8946ab408d67cf9c33297b7daad7f79860376255f22180053ecb65979f543baae8197d2c899b09e5409727a6c1c7f07e3c6cd9ff1276e0500
+AUX snappy-1.0-configure1.patch 630 SHA256 19962a6d1566a9fd17ea19a68b8e476c0115ce8cb05d29ea8217dac45fa06dd9 SHA512 ce3a2fa09141bc99becf806c6c45895e785014bc2de877a53c710a9a7cbd5193990e623af75a07300f325770efc3fca2b357f94a18f2ce871800b231d3d84f1d WHIRLPOOL 296014b9ea94d6481910c13f340ec1d194072b0fa784268bf782151aeb01487db0017ce354a275ac41dfc295065b3d1690a46c7cd9c35fb2cb4e12b307259046
+AUX snappy-1.0-configure2.patch 699 SHA256 adbf9363966aca672f189462ecbf85face6c76d2e08ef41c3a5126348057a1b5 SHA512 71bcf47ee1e263a2e14af991f1aa134690df9db2b4279ae1de8a6100db4ad0c0083466a5f88f36d38e72b0389d1081442a0884f346710c42e211b6a2aa4f95b0 WHIRLPOOL db5c1152103ff8f4d204b6e715b603e66041d185807d645ec7f6de87458a5c94a3ee4fd52d1549f2953c11a056aba8041b7fdb0ab7cc5d3168173030e7d89431
+AUX snappy-1.0-string-concatenation.patch 921 SHA256 d8ba9b91bfb8816435365edd7d4c43f4e7dc97914f23cf851297903fba3358df SHA512 4ad47d7907ec77de2ffa866305ff23390915f7f6f27883e4a035e862116cd3e418addbd600954d2a52b8a8ae1c22803e57d672fddaf5e955da6e3110a950671e WHIRLPOOL 6644d189aa4285855b4b65e385adc5dcd600afd7b214ac58ba33c608d1f5b67dd4d6853967598b71119163a416940bc632a4fc08d0662371f47aaf6de74c5783
+AUX snappy-1.0-video-texture.patch 1126 SHA256 d98d35204ec97871fe025a63b76228c3b2cfcf2f21d5fb8a12c09e1939103267 SHA512 b139b5ed43ce85240015467330f17f244bcca59533d203c29d60955ba9992d8cca9f2715d928551fdb5cc92c0618ba60df6a51ffe798d19bbc0532dccf58a810 WHIRLPOOL b8991cf1b0d989c472ca319474156062308ef65b8d2cf7664a4e7cea4e0234f2cff3531d304a1ed4f7d3b1b896be2f9738f5bbaf6e0b0d5bd0b9df5a1d92a529
+DIST snappy-1.0.tar.xz 282964 SHA256 0d33a05c1ad3cc075b8b9bf38d45634ea5204159454597b0882dd6a8d9763f58 SHA512 d8a3fd3a598efde4d699cc8fa13bee1239917a877627b26d5d278af5fd1824f02acf5ce685f8bf994087b3374de9917a5aa4f6f6ebe94f385c8d3bf91887eca9 WHIRLPOOL 0dd3b30e6208b37af4e8476604c80718a1939481bb105f54338559f952f1cf78d5110b0dde8ba389a8bfe065a268ef6595b308a5c38289ae0f4b76c684969340
+EBUILD snappy-1.0-r1.ebuild 1360 SHA256 5b172a82277f77bdc31727102e63db34a280045a3951f978f61635944cf30db7 SHA512 e40cee3f9d1a7bcb0bee096b876e36afc7eef9f09fdeb43497b6ba2a1a8b471f30352d866324bd788dad45273f584389eb3cba7a88f499563999bc7676c0be26 WHIRLPOOL 26c72bcc10ec1146d39dba98109dffc5c34e90a92906847bdb1474720728c295c7f87157542a001aca1eb72d73c7804e17e74ebf8fe37fa0e70ce5367b403138
+MISC ChangeLog 3336 SHA256 fed9397d29a8802aee826c589434ee680f5009d7f2c76f6482f8189ef7df5c0a SHA512 7172f97a8e9899452a46443a70d66ee4a02933dc7b9adcc783ba0dca3640625ab34cd134cbc62204eb20faee00138259c7f323ddbc75855b326532c696b20eeb WHIRLPOOL ae9ae05f764707539a052fd69a77f10c7d6b7038cd7b20b7f70d904a77590017a78aa8b524ccb23fb2662674d55c7331072064917ef4eb540294a20ceb3dcfed
+MISC ChangeLog-2015 1599 SHA256 1f3c02fe3cda2b8e718502a97cf18e97cf08f9e0592fa5c548afc1ed2d0134be SHA512 07ad8328cf5fa604424236004e4b62f5aeac4262d28d0dc70dbfad0ae07df4a87d7be848579d42bcaa0b7294ecb2797868f637c59920eca5bdde4a43bff6daf3 WHIRLPOOL 4cd3b0e63ef4c2bc4cf893e39f1be158c40bcc4266689ffa28cdbe3bcd23fca482a55b976827a641a6b32b6e3c451b3f4967b081f7047db3451eb9f3f1fd081a
+MISC metadata.xml 393 SHA256 cfa267a9d71dbf2753d1694cbe9ef380fad34a1e66f83146092e4f13244db6dd SHA512 511964afd47b90bb56df75a1fffbbb39c0f6143e3677a7454338e731638099ee24593b0b7049c3d9ba6cf5e56b6dc655d8253f35cd184cc927395e0f871579f1 WHIRLPOOL 93be972a6b988ef0aa8ab07b21e22bef26fb362093ec348248086df974caf0f7dc3f861f2e934a6d65f6fd9dc0dd67b3d39040e5ef28fbe151ce2364ffd81ceb
diff --git a/media-video/snappy/files/snappy-1.0-clutter-1.22.patch b/media-video/snappy/files/snappy-1.0-clutter-1.22.patch
new file mode 100644
index 000000000000..f79d26786732
--- /dev/null
+++ b/media-video/snappy/files/snappy-1.0-clutter-1.22.patch
@@ -0,0 +1,25 @@
+From 529445d6fc5da3ea6e5c81051248b9d4818a1224 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 15 Apr 2015 15:46:14 +0200
+Subject: Set windowing backend to X11
+
+This required to work with Clutter 1.22.
+---
+ src/snappy.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/snappy.c b/src/snappy.c
+index 6054c88..c2bb2d0 100644
+--- a/src/snappy.c
++++ b/src/snappy.c
+@@ -179,6 +179,7 @@ main (int argc, char *argv[])
+ 
+   context = g_option_context_new ("<media file> - Play movie files");
+ 
++  clutter_set_windowing_backend (CLUTTER_WINDOWING_X11);
+   ci_err = gtk_clutter_init (&argc, &argv);
+   if (ci_err != CLUTTER_INIT_SUCCESS)
+     goto quit;
+-- 
+cgit v0.11.2
+
diff --git a/media-video/snappy/files/snappy-1.0-clutter-gst-3.patch b/media-video/snappy/files/snappy-1.0-clutter-gst-3.patch
new file mode 100644
index 000000000000..c914b028d1dd
--- /dev/null
+++ b/media-video/snappy/files/snappy-1.0-clutter-gst-3.patch
@@ -0,0 +1,128 @@
+From 872fc2ed3d0339559e4023523fa0935f168f631a Mon Sep 17 00:00:00 2001
+From: Luis de Bethencourt <luis@debethencourt.com>
+Date: Tue, 28 Jul 2015 12:06:16 +0100
+Subject: clutter: upgrade to clutter-gst-3.0
+
+---
+ configure.ac         | 4 ++--
+ src/gst_engine.c     | 2 +-
+ src/gst_engine.h     | 5 +++--
+ src/snappy.c         | 7 ++-----
+ src/user_interface.h | 4 ++++
+ 5 files changed, 12 insertions(+), 10 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b2986c6..75ffb8d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -35,7 +35,7 @@ AC_CANONICAL_HOST
+ # keep one single GST_REQ, core/base should be same versions anyway
+ GST_REQ=1.4.0
+ CLUTTER_REQS=1.20.0
+-CLUTTER_GST_REQS=2.0.12
++CLUTTER_GST_REQS=2.99.2
+ CLUTTER_GTK_REQS=1.6.0
+ GTK_REQS=3.5.0
+ GIO_REQ=2.32
+@@ -55,7 +55,7 @@ PKG_CHECK_MODULES([CLUTTER],
+ AC_SUBST(CLUTTER_CFLAGS)
+ AC_SUBST(CLUTTER_LIBS)
+ 
+-PKG_CHECK_MODULES([CLUTTER_GST], [clutter-gst-2.0 >= $CLUTTER_GST_REQS])
++PKG_CHECK_MODULES([CLUTTER_GST], [clutter-gst-3.0 >= $CLUTTER_GST_REQS])
+ AC_SUBST(CLUTTER_GST_CFLAGS)
+ AC_SUBST(CLUTTER_GST_LIBS)
+ 
+diff --git a/src/gst_engine.c b/src/gst_engine.c
+index 8fc16d4..431d77c 100644
+--- a/src/gst_engine.c
++++ b/src/gst_engine.c
+@@ -724,7 +724,7 @@ cycle_streams (GstEngine * engine, guint streamid)
+ 
+ /*            Init GstEngine variables           */
+ gboolean
+-engine_init (GstEngine * engine, GstElement * sink)
++engine_init (GstEngine * engine, ClutterGstVideoSink * sink)
+ {
+   engine->playing = FALSE;
+   engine->direction_foward = TRUE;
+diff --git a/src/gst_engine.h b/src/gst_engine.h
+index 70dce63..1c044eb 100644
+--- a/src/gst_engine.h
++++ b/src/gst_engine.h
+@@ -24,6 +24,7 @@
+ #define __GST_ENGINE_H__
+ 
+ #include <gst/gst.h>
++#include <clutter-gst/clutter-gst.h>
+ 
+ /* GStreamer Interfaces */
+ #include <gst/video/navigation.h>
+@@ -50,7 +51,7 @@ struct _GstEngine
+   gchar *uri;
+ 
+   GstElement *player;
+-  GstElement *sink;
++  ClutterGstVideoSink *sink;
+ 
+   GstBus *bus;
+ 
+@@ -64,7 +65,7 @@ gboolean bus_call (GstBus * bus, GstMessage * msg, gpointer data);
+ gboolean change_state (GstEngine * engine, gchar * state);
+ gboolean check_missing_plugins_error (GstEngine * engine, GstMessage * msg);
+ gboolean cycle_streams (GstEngine * engine, guint streamid);
+-gboolean engine_init (GstEngine * engine, GstElement * sink);
++gboolean engine_init (GstEngine * engine, ClutterGstVideoSink * sink);
+ gboolean engine_change_offset (GstEngine * engine, gint64 av_offest);
+ gboolean engine_change_speed (GstEngine * engine, gdouble rate);
+ void engine_load_uri (GstEngine * engine, gchar * uri);
+diff --git a/src/snappy.c b/src/snappy.c
+index c2bb2d0..c06fd10 100644
+--- a/src/snappy.c
++++ b/src/snappy.c
+@@ -29,9 +29,6 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <string.h>
+-#include <clutter/clutter.h>
+-#include <clutter-gst/clutter-gst.h>
+-#include <clutter-gtk/clutter-gtk.h>
+ 
+ #include "user_interface.h"
+ 
+@@ -160,7 +157,7 @@ main (int argc, char *argv[])
+   UserInterface *ui = NULL;
+   GstEngine *engine = NULL;
+   ClutterActor *video_texture;
+-  GstElement *sink;
++  ClutterGstVideoSink *sink;
+ 
+   gboolean ok, blind = FALSE, fullscreen = FALSE, hide = FALSE, loop = FALSE;
+   gboolean secret = FALSE, tags = FALSE;
+@@ -230,7 +227,7 @@ main (int argc, char *argv[])
+ 
+   /* Gstreamer engine */
+   engine = g_new (GstEngine, 1);
+-  sink = gst_element_factory_make ("cluttersink", "video-sink");
++  sink = clutter_gst_video_sink_new ();
+   if (sink == NULL) {
+     g_print ("ERROR: Failed to create clutter-gst sink element\n");
+     return FALSE;
+diff --git a/src/user_interface.h b/src/user_interface.h
+index 6fe43c5..b011da0 100644
+--- a/src/user_interface.h
++++ b/src/user_interface.h
+@@ -23,6 +23,10 @@
+ #ifndef __USER_INTERFACE_H__
+ #define __USER_INTERFACE_H__
+ 
++#include <clutter/clutter.h>
++#include <clutter-gst/clutter-gst.h>
++#include <clutter-gtk/clutter-gtk.h>
++
+ #include <gtk/gtk.h>
+ 
+ #include "gst_engine.h"
+-- 
+cgit v0.11.2
+
diff --git a/media-video/snappy/files/snappy-1.0-configure1.patch b/media-video/snappy/files/snappy-1.0-configure1.patch
new file mode 100644
index 000000000000..cd499d7197ab
--- /dev/null
+++ b/media-video/snappy/files/snappy-1.0-configure1.patch
@@ -0,0 +1,25 @@
+From 259bebe65f0f108726d5a0504b23c85525199b15 Mon Sep 17 00:00:00 2001
+From: Luis de Bethencourt <luis.bg@samsung.com>
+Date: Tue, 2 Jun 2015 16:47:31 +0100
+Subject: configure: update GStreamer version
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index b628f33..430647f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -33,7 +33,7 @@ AC_LIBTOOL_WIN32_DLL
+ AC_CANONICAL_HOST
+ 
+ # keep one single GST_REQ, core/base should be same versions anyway
+-GST_REQ=1.0.0
++GST_REQ=1.4.0
+ CLUTTER_REQS=1.12.0
+ CLUTTER_GST_REQS=2.0.0
+ CLUTTER_GTK_REQS=1.0.2
+-- 
+cgit v0.11.2
+
diff --git a/media-video/snappy/files/snappy-1.0-configure2.patch b/media-video/snappy/files/snappy-1.0-configure2.patch
new file mode 100644
index 000000000000..c4787d846a8d
--- /dev/null
+++ b/media-video/snappy/files/snappy-1.0-configure2.patch
@@ -0,0 +1,29 @@
+From c0eacf30b2a0476488004c6000de659ce4380534 Mon Sep 17 00:00:00 2001
+From: Luis de Bethencourt <luis.bg@samsung.com>
+Date: Tue, 2 Jun 2015 16:56:14 +0100
+Subject: configure: update Clutter version
+
+---
+ configure.ac | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 430647f..b2986c6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -34,9 +34,9 @@ AC_CANONICAL_HOST
+ 
+ # keep one single GST_REQ, core/base should be same versions anyway
+ GST_REQ=1.4.0
+-CLUTTER_REQS=1.12.0
+-CLUTTER_GST_REQS=2.0.0
+-CLUTTER_GTK_REQS=1.0.2
++CLUTTER_REQS=1.20.0
++CLUTTER_GST_REQS=2.0.12
++CLUTTER_GTK_REQS=1.6.0
+ GTK_REQS=3.5.0
+ GIO_REQ=2.32
+ 
+-- 
+cgit v0.11.2
+
diff --git a/media-video/snappy/files/snappy-1.0-string-concatenation.patch b/media-video/snappy/files/snappy-1.0-string-concatenation.patch
new file mode 100644
index 000000000000..bafaa164a2d8
--- /dev/null
+++ b/media-video/snappy/files/snappy-1.0-string-concatenation.patch
@@ -0,0 +1,28 @@
+From f2d51cde0e72853050495b3d995db4aee14c66a6 Mon Sep 17 00:00:00 2001
+From: Jan Schmidt <jan@centricular.com>
+Date: Tue, 13 May 2014 14:30:34 -0400
+Subject: ui: string concatenation to use corect format
+
+---
+ src/user_interface.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/user_interface.c b/src/user_interface.c
+index c29c688..8e3894a 100644
+--- a/src/user_interface.c
++++ b/src/user_interface.c
+@@ -1052,9 +1052,9 @@ position_ns_to_str (UserInterface * ui, gint64 nanoseconds)
+   seconds = seconds - (minutes * SEC_IN_MIN);
+ 
+   if (hours >= 1)
+-    return g_strdup_printf ("%d:%02d:%02ld", hours, minutes, seconds);
++    return g_strdup_printf ("%d:%02d:%02" G_GINT64_FORMAT, hours, minutes, seconds);
+   else
+-    return g_strdup_printf ("%02d:%02ld", minutes, seconds);
++    return g_strdup_printf ("%02d:%02" G_GINT64_FORMAT, minutes, seconds);
+ }
+ 
+ static void
+-- 
+cgit v0.11.2
+
diff --git a/media-video/snappy/files/snappy-1.0-video-texture.patch b/media-video/snappy/files/snappy-1.0-video-texture.patch
new file mode 100644
index 000000000000..eed0bd491ae4
--- /dev/null
+++ b/media-video/snappy/files/snappy-1.0-video-texture.patch
@@ -0,0 +1,36 @@
+From f33f7a5e9424544884a37b264bf88ee1866a56ac Mon Sep 17 00:00:00 2001
+From: Luis de Bethencourt <luis@debethencourt.com>
+Date: Tue, 28 Jul 2015 14:02:44 +0100
+Subject: clutter: update method to create video texture
+
+---
+ src/snappy.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/snappy.c b/src/snappy.c
+index c06fd10..94b6e5b 100644
+--- a/src/snappy.c
++++ b/src/snappy.c
+@@ -222,8 +222,6 @@ main (int argc, char *argv[])
+   ui->tags = tags;
+   ui->data_dir = data_dir;
+   interface_init (ui);
+-  video_texture = g_object_new (CLUTTER_TYPE_TEXTURE, "disable-slicing", TRUE,
+-      NULL);
+ 
+   /* Gstreamer engine */
+   engine = g_new (GstEngine, 1);
+@@ -232,7 +230,9 @@ main (int argc, char *argv[])
+     g_print ("ERROR: Failed to create clutter-gst sink element\n");
+     return FALSE;
+   }
+-  g_object_set (G_OBJECT (sink), "texture", video_texture, NULL);
++  video_texture = g_object_new (CLUTTER_TYPE_ACTOR, "content",
++      g_object_new (CLUTTER_GST_TYPE_CONTENT, "sink", sink, NULL),
++      "name", "texture", NULL);
+ 
+   ok = engine_init (engine, sink);
+   if (!ok)
+-- 
+cgit v0.11.2
+
diff --git a/media-video/snappy/metadata.xml b/media-video/snappy/metadata.xml
new file mode 100644
index 000000000000..96905b59e4ed
--- /dev/null
+++ b/media-video/snappy/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gstreamer@gentoo.org</email>
+		<name>GStreamer package maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		Snappy is a gstreamer + clutter media player with powerful features in mind
+	</longdescription>
+</pkgmetadata>
diff --git a/media-video/snappy/snappy-1.0-r1.ebuild b/media-video/snappy/snappy-1.0-r1.ebuild
new file mode 100644
index 000000000000..aa41637c6525
--- /dev/null
+++ b/media-video/snappy/snappy-1.0-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+GCONF_DEBUG="no"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="A simple media player written using GStreamer and Clutter"
+HOMEPAGE="https://wiki.gnome.org/Apps/Snappy"
+
+KEYWORDS="amd64 x86"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=media-libs/clutter-1.20.0:1.0
+	media-libs/clutter-gst:3.0
+	>=media-libs/clutter-gtk-1.6.0:1.0
+	>=x11-libs/gtk+-3.5.0:3
+	x11-libs/libXtst
+
+	>=media-libs/gstreamer-1.4.0:1.0
+	>=media-libs/gst-plugins-base-1.4.0:1.0
+
+	media-plugins/gst-plugins-meta:1.0
+
+	!!<net-misc/spice-gtk-0.19
+" # File collision -- /usr/bin/snappy with older versions
+
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# Fix compat with clutter-1.22 (from 'master')
+	epatch "${FILESDIR}"/${P}-clutter-1.22.patch
+
+	# ui: string concatenation to use corect format (from 'master')
+	epatch "${FILESDIR}"/${P}-string-concatenation.patch
+
+	# clutter: update method to create video texture (from 'master')
+	epatch "${FILESDIR}"/${P}-video-texture.patch
+
+	# Move to clutter-gst-3 (from 'master')
+	epatch "${FILESDIR}"/${P}-configure{1,2}.patch
+	epatch "${FILESDIR}"/${P}-clutter-gst-3.patch
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS README THANKS ToDo docs/*"
+	gnome2_src_configure --enable-dbus
+}
diff --git a/media-video/sonic-snap/Manifest b/media-video/sonic-snap/Manifest
new file mode 100644
index 000000000000..b36db427f3f8
--- /dev/null
+++ b/media-video/sonic-snap/Manifest
@@ -0,0 +1,6 @@
+DIST sonic-snap-1.7.tar.gz 16760 SHA256 013a1f480d2f205caa2d2ceb8fe82e2af9ed6c86ecca4124760322e4b3dd9e9c SHA512 0c2fe5a7403ac003aad308d064a4d981a25f52e478943125090cb96d337aebe0a9fef160217b4f37cfd1991c0517f5f869f60f4c93a6abe9a127821f7906a664 WHIRLPOOL da2b6dfd37ce5f182619d3f8141cd4d888b26b36ee06b7f7152d3497ab6fd3f54834370cebf58c1422705420bde3d647966ab5860cc542ea52af86060c82e26e
+EBUILD sonic-snap-1.7-r1.ebuild 1720 SHA256 f34c0856bb5ff293140aa91fba3fe766ce22ca54a7b93db70e33cca74cece321 SHA512 b986c0b5656afa101fab3254559c0243a583720884300b7be7896a2acd6d0051afcc5f95445ec97a2d2b79cf8fef76bcdb5f7b5573bf2c90a1d3e62786bfbf39 WHIRLPOOL a77d087bb3e190421e10aa700b418a0c1c1ef95b514540130eca102647a0689b89db90b81386e6b6dafdd3cdf9077fa636a1fe520249048d9053d5facebc3a9f
+EBUILD sonic-snap-1.7.ebuild 1676 SHA256 12073e4b9eb5a35e02311ae64ce6cebdf57735c183bd8372742d0af05058c7f9 SHA512 b18244ba1d135865ba5fe647344b7e4c3322b8d013754b311ffbb71a456b23d199e991c43c7e2fddf00ea68e869a5ab9320d239082e7f515d91609494e8fbcbc WHIRLPOOL 44f9054d515ff6e5a000392aa2d4aab5b08878a18076da53b6f39897597f3a6d3e9fd1b282545d85f20d745a9e0c8616be5c8ff88081ac1a500d7af5d0256a48
+MISC ChangeLog 2435 SHA256 f8bffe051cb24804a8fa7fa0c4f9947a925ed8c2e1d2a58a2b95ec0a7398f975 SHA512 a550260c6b89cfaca37a25d2d6c9ecee2dec766649ff0bac0227a6624466cc8746ba96db27a3d084f7edd0f98233ba64f08b967d8b3dbd351a115f52c471fc0f WHIRLPOOL f20cab7b132daad0346e45248488890c42e0c0bd5eda5192365d39dbd9147511b0bc73f2e6c91164f5b3eb86123e7b93cd9a256b2d0701f829abcb589799af45
+MISC ChangeLog-2015 1906 SHA256 74a30e849010c8470a48f0544c796f581c4ac81b68e23121951b162927ec72aa SHA512 0d822d71cd7c5766f806e2e62ecd684dea947b6680210d85ac1bad05d12c2f0f871c7fbbf79647d4610cdfed37d4196d204947ae957f293b57a398837fc95ad8 WHIRLPOOL 9c3f49f7d724d445d1dbd22081e6c8bdea2424ad958dc4a69393454668be82578085d1a4896aa8aadcd9baaf080a96e7005abd0471e8a2b885fa2ae57a1dc855
+MISC metadata.xml 389 SHA256 fbe72d1958c9dcc707bb038cd7a3c0b4e7ac86e48fe40beecd4ba72ee8813117 SHA512 231e6383dd068d1b4a52f8cee7293a4adb9c7f527f16c1023fb9cb8f8407c758cb694c4166c55b5494eb9ed5fef7a368ed1ccde52210d77cae4cb71901fcbcd8 WHIRLPOOL af352e073d385ea02273113a8ec5dbea84351fb2fd70955285f071f2f7d455d87868b9a2c54aa2d64c3e9df8eb19aebfc66032aed5ec0f58685aaa03f9002899
diff --git a/media-video/sonic-snap/metadata.xml b/media-video/sonic-snap/metadata.xml
new file mode 100644
index 000000000000..ee0dade075ae
--- /dev/null
+++ b/media-video/sonic-snap/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>media-video@gentoo.org</email>
+	<name>Gentoo Video project</name>
+</maintainer>
+<longdescription>Minimal webcam app for sn9c10x based camera controllers (mostly USB), with optional MPEG4 support.</longdescription>
+</pkgmetadata>
diff --git a/media-video/sonic-snap/sonic-snap-1.7-r1.ebuild b/media-video/sonic-snap/sonic-snap-1.7-r1.ebuild
new file mode 100644
index 000000000000..753cb9d0be30
--- /dev/null
+++ b/media-video/sonic-snap/sonic-snap-1.7-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils linux-info multilib toolchain-funcs
+
+DESCRIPTION="Webcam app for sn9c10x based camera controllers (with optional MPEG4 support)"
+HOMEPAGE="http://www.stolk.org/sonic-snap/"
+SRC_URI="http://www.stolk.org/${PN}/downloads/${P}.tar.gz"
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="mpeg"
+
+DEPEND="
+	x11-libs/fltk:1
+	mpeg? ( >=media-libs/libfame-0.9.1 )
+	sys-libs/zlib
+	x11-libs/libXdmcp
+	x11-libs/libXau
+	x11-libs/libXrender
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft
+"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~USB_SN9C102"
+ERROR_USB_SN9C102="Please make sure the SN9C1xx PC Camera Controller driver is \
+enabled, under V4L USB devices, as a module in your kernel."
+
+src_prepare() {
+	# fix bad assumptions
+	sed -i \
+		-e "s|\$(HOME)/include|/usr/include|" \
+		-e "s|\$(HOME)/lib|/usr/$(get_libdir)|" \
+		-e "s|CFLAGS=|CFLAGS= ${CXXFLAGS} |" \
+		-e "s|LFLAGS=|LFLAGS= ${LDFLAGS} |" \
+		-e "s/g++-4.0 -O3/$(tc-getCXX)/" \
+		Makefile || die
+
+	use mpeg || sed -i -e "s?USE_FAME=1?USE_FAME=0?g" Makefile || die
+
+	default
+}
+
+src_compile() {
+	make || die '"make" failed.'
+}
+
+src_install() {
+	dodir /usr/bin
+	make DESTDIR="${D}" install || die '"make install" failed.'
+
+	dodoc ChangeLog README
+	doman debian/sonic-snap.1
+}
+
+pkg_postinst() {
+	elog
+	elog "This driver is V4L v2 only, so V4L v1 apps will not work."
+	elog "Finally, only a few image sensors are supported, eg, PAS106B"
+	elog "so (check dmesg or /var/log/messages for USB device info when"
+	elog "you plug the cam in)."
+	elog
+	elog "Now try sonic-snap-gui /dev/videoX (where X is 0, 1 , etc)."
+	elog
+}
diff --git a/media-video/sonic-snap/sonic-snap-1.7.ebuild b/media-video/sonic-snap/sonic-snap-1.7.ebuild
new file mode 100644
index 000000000000..48a5f4180085
--- /dev/null
+++ b/media-video/sonic-snap/sonic-snap-1.7.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="3"
+inherit eutils linux-info multilib toolchain-funcs
+
+DESCRIPTION="Webcam app for sn9c10x based camera controllers (with optional MPEG4 support)"
+HOMEPAGE="http://www.stolk.org/sonic-snap/"
+SRC_URI="http://www.stolk.org/${PN}/downloads/${P}.tar.gz"
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="mpeg"
+
+DEPEND="x11-libs/fltk:1
+	mpeg? ( >=media-libs/libfame-0.9.1 )
+	sys-libs/zlib
+	x11-libs/libXdmcp
+	x11-libs/libXau
+	x11-libs/libXrender
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft"
+
+CONFIG_CHECK="~USB_SN9C102"
+ERROR_USB_SN9C102="Please make sure the SN9C1xx PC Camera Controller driver is \
+enabled, under V4L USB devices, as a module in your kernel."
+
+src_prepare() {
+	# fix bad assumptions
+	sed -i \
+		-e "s|\$(HOME)/include|/usr/include|" \
+		-e "s|\$(HOME)/lib|/usr/$(get_libdir)|" \
+		-e "s|CFLAGS=|CFLAGS= ${CXXFLAGS} |" \
+		-e "s|LFLAGS=|LFLAGS= ${LDFLAGS} |" \
+		-e "s/g++-4.0 -O3/$(tc-getCXX)/" \
+		Makefile
+
+	use mpeg || sed -i -e "s?USE_FAME=1?USE_FAME=0?g" Makefile
+}
+
+src_compile() {
+	make || die '"make" failed.'
+}
+
+src_install() {
+	dodir /usr/bin
+	make DESTDIR="${D}" install || die '"make install" failed.'
+
+	dodoc ChangeLog README
+	doman debian/sonic-snap.1
+}
+
+pkg_postinst() {
+
+	elog
+	elog "This driver is V4L v2 only, so V4L v1 apps will not work."
+	elog "Finally, only a few image sensors are supported, eg, PAS106B"
+	elog "so (check dmesg or /var/log/messages for USB device info when"
+	elog "you plug the cam in)."
+	elog
+	elog "Now try sonic-snap-gui /dev/videoX (where X is 0, 1 , etc)."
+	elog
+}
diff --git a/media-video/sswf/Manifest b/media-video/sswf/Manifest
new file mode 100644
index 000000000000..ec22fcfbd92a
--- /dev/null
+++ b/media-video/sswf/Manifest
@@ -0,0 +1,9 @@
+DIST sswf-1.8.2-doc.tar.bz2 4330593 SHA256 ecad0f67f5de945ca62e6974986b124d33c43fc60262817f2f5d502b36490e84 SHA512 b59664e6a4dd4066b722c951d2f9d74e0cf743d99f9afb8e619dc08d46168c84385802193b9b3d218780b09fac6a9607c40e2af544c00b5e459f2bd42477e211 WHIRLPOOL e22e8ee8809b4403bfb230dcbcb36b94c797c147ac54784a12979a4f7b3360f61301cb7e69c8681b5d155f34121e1496867143b5fc35ebf25007974a0c5b2748
+DIST sswf-1.8.2-src.tar.bz2 3064805 SHA256 5f6927996d243d62955a512725b9a184098fadae9d0eba8437f398d17e86e8fd SHA512 fe955742dfc8146cc398acc7bb46a3b0626a2ded64fe4061abf654ec6ef26b6c1cbafb8d418daef9a2ea789b171a7b410cee1fb58ef8b9faf660122f307ab622 WHIRLPOOL d8eca1babd1552646a92e3b56a0866985c2d575a17c7a8f160ed426989b2761ba4080c4dbb43c59ae90f6db587876c0cd65c02ae13a6f62fc4bb0a2ae35558bf
+DIST sswf-1.8.4-doc.tar.bz2 10242097 SHA256 30a3676b035eb2da8258657082747519466ce40f430861269e4645f04df9f312 SHA512 1b756931e8b0f5af4a77d920f77db467822642edf9f03d66130f0d6b88c95162cfc75278531f1e35132e213b03c755126ec646aa2b181231d6bc82e63ac25650 WHIRLPOOL 32dafc3dac658f641a0fa55cbb13267aac9a06589d28625e525ef619919aad7124108489b3c69a4c7406ed102860449995dd26358aeb7b1a7756f30bbbc34897
+DIST sswf-1.8.4-src.tar.bz2 3087054 SHA256 bf901ecb43a5dba2947394f9b16a40f6d81a055ace85d411c7e8369cb8a5fe68 SHA512 5d82e805c69fb86873d088be017df3e3157f0c230d7635329cd1a088b74932870e51772801d3feb4cae3f31a4b646fa773c0a3154ea78b16fae7a253887f2077 WHIRLPOOL f7e5b83135a33da09bc83fa58b667062aea3589d70463e28be869420fac333235dea0a47aa3337db832873b70189c2414b27d78d1945f86c77be9a2b41d95f69
+EBUILD sswf-1.8.2-r1.ebuild 1060 SHA256 3a96444ff51288b20fdc1abca8bfe793e3a0290d4cb0d1e854f8a9f7e3ca9e1c SHA512 6788e19fb3f77de273b2d7c5a33f31e018649928547aea79e0da3c05aa1ff1c42da362aa15072a0c500b828082df3cdbff087fae463dceaf0267f1b050d1b8cf WHIRLPOOL 604ee690b90757450e2b0b9e5cfffe6550f2bd9565c9a528f95d8bfbb98d9ff8617133e5a0c9c71ff63964f0580c50ba0eaf825229dace885453567c8fb59f03
+EBUILD sswf-1.8.4-r1.ebuild 1060 SHA256 3a96444ff51288b20fdc1abca8bfe793e3a0290d4cb0d1e854f8a9f7e3ca9e1c SHA512 6788e19fb3f77de273b2d7c5a33f31e018649928547aea79e0da3c05aa1ff1c42da362aa15072a0c500b828082df3cdbff087fae463dceaf0267f1b050d1b8cf WHIRLPOOL 604ee690b90757450e2b0b9e5cfffe6550f2bd9565c9a528f95d8bfbb98d9ff8617133e5a0c9c71ff63964f0580c50ba0eaf825229dace885453567c8fb59f03
+MISC ChangeLog 2479 SHA256 d6286e286fbda4383e38ed19e9d62eb77f51a7a9edf77ee377d9963fe56edf36 SHA512 ed5b9eaa76c9d63df983f05d38ba62179e61a1d00ebeab345c1a6bb76241c048b7eb820becea1902f1669bf8a39359264390368dca9770a07f4eab3a40264283 WHIRLPOOL be47977ae1bc01aa1b00a0e0d1194b6afed4f25d73b23bcb62e18921373d79e5c464ab8e18ebf9da63d46aa60a72e62a228eb43161c7f77a0fcf179903c23f63
+MISC ChangeLog-2015 2694 SHA256 d59bf39d1ff13bd4ed3c191154e741fb500245e187f6b2750dc9919928e3d985 SHA512 b993b8449cdc209183ee240e6f1ff75b59c820fb4fb1bf11f49b2b5390d02293ae4704066b5bb3967de93a0b363e742fe37a450e5778eb13c4212678a843ff59 WHIRLPOOL ffec9866415e82614cd05be638c3c88d1acd99a0592781535c72eb0212f76012c8d747b28181562c2af58f54f3544e4acac691f37a1ac833d1f1b5d393b2d237
+MISC metadata.xml 305 SHA256 ffc48cf99db4ed2914874e8b410a687a61118b1cbbe5062733f90867212f5c7d SHA512 e8f4672570af16ef824da298222eb2f52a07e255e6869aab59ae3271f32d82e382970328b74748baa0f7b5f0cf982e80f0eb361ba92aebe186efb40ef5862d32 WHIRLPOOL 84f505617def3889b2080ec6af89c5c104c22a7c485ffe97c2cdf464d1d0cf8aa30e51f28eb2b663d255ad98e9e9bdd7de6063e8ee4370b7b6fb72f2dbeb735a
diff --git a/media-video/sswf/metadata.xml b/media-video/sswf/metadata.xml
new file mode 100644
index 000000000000..b17ce31cce8f
--- /dev/null
+++ b/media-video/sswf/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>media-video@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">sswf</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-video/sswf/sswf-1.8.2-r1.ebuild b/media-video/sswf/sswf-1.8.2-r1.ebuild
new file mode 100644
index 000000000000..09b12077b5c1
--- /dev/null
+++ b/media-video/sswf/sswf-1.8.2-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="A C++ Library and a script language tool to create Flash (SWF) movies up to version 8"
+HOMEPAGE="http://www.m2osw.com/sswf.html"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2
+	mirror://sourceforge/${PN}/${P}-doc.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug doc examples"
+
+RDEPEND="virtual/jpeg
+	media-libs/freetype"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	econf --disable-dependency-tracking --disable-docs \
+		$(use_enable debug) $(use_enable debug yydebug)
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake install failed."
+
+	dodoc README.txt doc/{ASC-TODO,AUTHORS,CHANGES,LINKS,NOTES,TODO}.txt
+	rm -f "${D}"/usr/share/${PN}/*.txt
+
+	use examples || rm -rf "${D}"/usr/share/${PN}/samples
+
+	doman doc/man/man1/*.1
+
+	if use doc; then
+		doman doc/man/man3/action_script_v3.3
+		doman doc/man/man3/libsswf*.3
+		doman doc/man/man3/sswf*.3
+		dohtml -r doc/html/*
+	fi
+}
diff --git a/media-video/sswf/sswf-1.8.4-r1.ebuild b/media-video/sswf/sswf-1.8.4-r1.ebuild
new file mode 100644
index 000000000000..09b12077b5c1
--- /dev/null
+++ b/media-video/sswf/sswf-1.8.4-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="A C++ Library and a script language tool to create Flash (SWF) movies up to version 8"
+HOMEPAGE="http://www.m2osw.com/sswf.html"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2
+	mirror://sourceforge/${PN}/${P}-doc.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug doc examples"
+
+RDEPEND="virtual/jpeg
+	media-libs/freetype"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	econf --disable-dependency-tracking --disable-docs \
+		$(use_enable debug) $(use_enable debug yydebug)
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake install failed."
+
+	dodoc README.txt doc/{ASC-TODO,AUTHORS,CHANGES,LINKS,NOTES,TODO}.txt
+	rm -f "${D}"/usr/share/${PN}/*.txt
+
+	use examples || rm -rf "${D}"/usr/share/${PN}/samples
+
+	doman doc/man/man1/*.1
+
+	if use doc; then
+		doman doc/man/man3/action_script_v3.3
+		doman doc/man/man3/libsswf*.3
+		doman doc/man/man3/sswf*.3
+		dohtml -r doc/html/*
+	fi
+}
diff --git a/media-video/streamdvd/Manifest b/media-video/streamdvd/Manifest
new file mode 100644
index 000000000000..3c69fb7a4192
--- /dev/null
+++ b/media-video/streamdvd/Manifest
@@ -0,0 +1,11 @@
+AUX streamdvd-0.4-gcc41.patch 463 SHA256 ca4e20daddb00e232db67024d90bfa483d979f028e28602cfa4c5110b885f44f SHA512 30a9bb075935f46d7d32293817937ea3c71145a30b7ce48d5a57ff105a27bd55ee19e7ee0ad4558fb571ae91c7bb24262d3b19cd87ff32211d2feea783f6e3db WHIRLPOOL ad31a4b8b090873d3c71f55fc242af0b02c3e6b518ea6312562c389bd137ecd523668376932c351c47da584a3869f5db88c04ac8d233f07aca98be3ce079e469
+AUX streamdvd-0.4-gcc43.patch 1249 SHA256 e8ee2d5d11bed1493fdf32ec40462250720bc9edf0b751bee390de8fa01d61ef SHA512 02a6c89829b8d41c52305bfef56e43a56db33b2b7f6396f73a3f1f688207fa225f266dd0841c4e5748f44bed4bfa3595b298751f45db22ea92f3a1ac2817847c WHIRLPOOL 3074ecdc02c4b7cf1ed435e33ff5f5a888b9626ce309bc6e49058aa9b5cd28de263f1d5e6a975ee9f6813df064f40b0e5570d5142be7dfc86e596a9c28ae4799
+AUX streamdvd-0.4-gcc44.patch 977 SHA256 3329636342222803ecc370af5113ac9bd5df6aac677a122aab7c145c7129e8bf SHA512 1090361522dbbe58da3884a9bc7a44729a0f27e306a0c0ce5475c57ab0a8aa693b15caef33c28b1f7e8106db662e88616a05bd840999a54d0597cb230f4af95a WHIRLPOOL b39db5b844f1036e9eb6ccf80099a1c104ca2f9284822602d8cb91d59b2ceb6bd67ec0455f5ad8b6e7b7ab716df8d84ff99c0cd5ba9e8b59e5fddf8cd47b4c0f
+AUX streamdvd-0.4-libdvdread.patch 1460 SHA256 eb900706e0c10198c8bf322b67788b0ca4cea2155b4cce6cbf42052756c35c21 SHA512 79ed54fcb7b3b3ac4be7cc14978f126288a39428796a61954eb36fce89764561419ba32bd2a0de7819e9f3a72283fcf71691ac93922c2ab7df7a1e7658c4b0cf WHIRLPOOL fb0133db50596cb3c78ba83627e60b455c8db6953ecc16c57c38c6a3a68c4b3b3bee62e2a0c0bf6f17b1fdab1e528478755c5dc179b922f90d3b65f59bbf7925
+AUX streamdvd-0.4-makefile.patch 1378 SHA256 ae86f76792f02af0e660540de44e90e5f59a0ffcb8f28610e81043f24df372ce SHA512 5234433fd985ef561c43420a6f7a1ee30c4748ce5a4c04e3a6864e95f42fae1b97c8c0e1a6adb0c6c395500a7f007263621cab8779dc57535287a6ba81a32988 WHIRLPOOL fba2eca9ad3c847211f89a505eb14788c0669d6818459f09ce7d9be7dead39d0bd12620f8b737ad3db59581290851ef90506b866cbe786c31a956b068628fb4e
+AUX streamdvd-0.4.patch 787 SHA256 42fc345e70ea021442fa21521abc212eeb93377d71d0ca221126cbae82affcfc SHA512 a70535c05292bba30f211a576f6e93a2408a5c2285ded0208da9757f9c4e88e605eb572e3cbe61f02752a198849ff805dd93dcd3457d78c0f9c9294a6de7bf53 WHIRLPOOL bfec1bc1b406da688d58378b5d37a77939e49f7804060de33aa664f0f9246bc9eae397bfd38f8a835b7831e3086336ff9a94715d68a2f6b356a0f5baa327080b
+DIST streamdvd-0.4.tar.gz 152669 SHA256 0eac9d0d5a901076ee8e832403f3cf7e0ce3a011d7930787a3aebea8acbaf2ec SHA512 81e8fdaf028799be7269c239ec5717bd5da58254b7eeef35ee5d436c4408fb02f9badbc5ff8a661903d10ec43bbaca68d8792f729293f6330c2a9e92ee0c48a5 WHIRLPOOL e2c88ee05bd795c26b0a0dc5428a6cf8a1c8d02a1f85773d96cb0c7c8c89e896e6725e353ed54163e9a4bf57ead719f4d687ad855b2d261018ecc13885548e59
+EBUILD streamdvd-0.4-r1.ebuild 1518 SHA256 8368eca5ac12f11a6e9251538752a73c6fd90688ccad6fe0810e17861ecf8cb6 SHA512 f5faf64cfc225475c3dcd9f67f6b9871f74b97dd448414462ed995c83fbffa01ffac71e702fc7d20f3068756ec7490b802d89ccfd1d24013dbc116d1e21e1f3e WHIRLPOOL 748a42918065d9951392acc2cc0335440ce88e40d2e5592c1f9bae5c23e68bc3c64556f672ce46739e97cc95ca1d7b77cf30e361d5e126b3892fe27b8b89cffe
+MISC ChangeLog 2802 SHA256 8e5a5d6073c8a959e11ad8228a194062a39ca4525a3d76009a379abb4d68dc4b SHA512 e70a3c55f3bf4175e0834e2f93d7b9ed743f6532aa1002b9c531a11cf36caaa82bfc403c729ab9206500a7620910d2e1f511909a752dcf46aaf0eda736dd3856 WHIRLPOOL 07c68c639230bea3f490c7e097e192cfa98bc672140f8bf5dfea4d7f3d3e976ce4e432721877197939e93f6fcaa4f7c59d624f5d5a4fdc93784d7f9f48c48194
+MISC ChangeLog-2015 2981 SHA256 18f28d4194001c3e9104445034b69b794a4178457ab5dc5294ed752e143b2be3 SHA512 0bc52aacf82b99437327aa588a93bac476ded3b10de45ec97bce5be2e5fa9ffafe976affed5cf4eb5c07cb79ee566cfa0fc8a94c0ca005dd73199686ba5e4ce8 WHIRLPOOL 35e3acd1056018ddadfe2612a57336e4b2f22518c6eb859996521494dcb3a40ab5628d83dd80bd6eb5c756d8ef9e74eae22d7619f1393f1210c96211caacf6a2
+MISC metadata.xml 559 SHA256 77b787f2be97a2ad63c57a601db1f9d2f8c358acc76313ff7434e6bc5f858e50 SHA512 17ff5079ade1e6a7c74298fe8e6f5737cb3fd0822f3318b198c32af761043c218739bb90865c616229ffba5698711a970d48f83df02716e7f82ab819c3c8fa98 WHIRLPOOL d71ff70d9be684c34356d7a4d704d1b5818cb292670e2a37ef8388631c82cb8e0a99ff9afe9c59b52e3302d9c523282b79b7aea971e3cbb17b67018596df8225
diff --git a/media-video/streamdvd/files/streamdvd-0.4-gcc41.patch b/media-video/streamdvd/files/streamdvd-0.4-gcc41.patch
new file mode 100644
index 000000000000..2dbbd7117f3d
--- /dev/null
+++ b/media-video/streamdvd/files/streamdvd-0.4-gcc41.patch
@@ -0,0 +1,13 @@
+Index: StreamDVD-0.4/mplex/zalphastrm.hpp
+===================================================================
+--- StreamDVD-0.4.orig/mplex/zalphastrm.hpp
++++ StreamDVD-0.4/mplex/zalphastrm.hpp
+@@ -45,7 +45,7 @@ protected:
+     virtual bool AUBufferNeedsRefill();
+ 	virtual void NextDTSPTS( clockticks &DTS, clockticks &PTS);
+ 	virtual void ScanFirstSeqHeader();
+-    bool ZAlphaStream::RunOutComplete();
++    bool RunOutComplete();
+ 
+ private:
+     float z_min; 
diff --git a/media-video/streamdvd/files/streamdvd-0.4-gcc43.patch b/media-video/streamdvd/files/streamdvd-0.4-gcc43.patch
new file mode 100644
index 000000000000..89e33f58db4b
--- /dev/null
+++ b/media-video/streamdvd/files/streamdvd-0.4-gcc43.patch
@@ -0,0 +1,44 @@
+diff -aur mplex.old/inputstrm.cpp mplex/inputstrm.cpp
+--- mplex.old/inputstrm.cpp	2004-03-08 23:10:53.000000000 +0100
++++ mplex/inputstrm.cpp	2008-07-07 23:28:19.000000000 +0200
+@@ -23,6 +23,7 @@
+ 
+ #include "config.h"
+ #include <assert.h>
++#include <climits>
+ 
+ #include "mjpeg_types.h"
+ #include "fastintfns.h"
+diff -aur mplex.old/multiplexor.cpp mplex/multiplexor.cpp
+--- mplex.old/multiplexor.cpp	2004-03-08 23:10:53.000000000 +0100
++++ mplex/multiplexor.cpp	2008-07-07 23:28:19.000000000 +0200
+@@ -22,6 +22,7 @@
+ #include "config.h"
+ #include <math.h>
+ #include <stdlib.h>
++#include <cstring>
+ 
+ #include "mjpeg_types.h"
+ #include "mjpeg_logging.h"
+diff -aur mplex.old/padstrm.cpp mplex/padstrm.cpp
+--- mplex.old/padstrm.cpp	2004-03-08 23:10:53.000000000 +0100
++++ mplex/padstrm.cpp	2008-07-07 23:28:19.000000000 +0200
+@@ -25,6 +25,7 @@
+ #endif
+ 
+ #include "padstrm.hpp"
++#include <cstring>
+ 
+ 
+ 
+diff -aur mplex.old/zalphastrm_in.cpp mplex/zalphastrm_in.cpp
+--- mplex.old/zalphastrm_in.cpp	2004-03-08 23:10:53.000000000 +0100
++++ mplex/zalphastrm_in.cpp	2008-07-07 23:28:19.000000000 +0200
+@@ -23,6 +23,7 @@
+ #include "config.h"
+ #include <math.h>
+ #include <stdlib.h>
++#include <cstring>
+ 
+ #include "zalphastrm.hpp"
+ #include "interact.hpp"
diff --git a/media-video/streamdvd/files/streamdvd-0.4-gcc44.patch b/media-video/streamdvd/files/streamdvd-0.4-gcc44.patch
new file mode 100644
index 000000000000..2ca12ff29f69
--- /dev/null
+++ b/media-video/streamdvd/files/streamdvd-0.4-gcc44.patch
@@ -0,0 +1,24 @@
+diff -ur StreamDVD-0.4.orig/mplex/lpcmstrm_in.cpp StreamDVD-0.4/mplex/lpcmstrm_in.cpp
+--- StreamDVD-0.4.orig/mplex/lpcmstrm_in.cpp	2004-03-09 00:10:53.000000000 +0200
++++ StreamDVD-0.4/mplex/lpcmstrm_in.cpp	2009-08-05 22:05:48.000000000 +0300
+@@ -52,7 +52,7 @@
+ 
+ bool LPCMStream::Probe(IBitStream &bs )
+ {
+-    char *last_dot = strrchr( bs.StreamName(), '.' );
++    const char *last_dot = strrchr( bs.StreamName(), '.' );
+     return 
+         last_dot != NULL 
+         && strcmp( last_dot+1, "lpcm") == 0;
+diff -ur StreamDVD-0.4.orig/mplex/yuv4mpeg_ratio.c StreamDVD-0.4/mplex/yuv4mpeg_ratio.c
+--- StreamDVD-0.4.orig/mplex/yuv4mpeg_ratio.c	2004-03-09 00:10:53.000000000 +0200
++++ StreamDVD-0.4/mplex/yuv4mpeg_ratio.c	2009-08-05 22:07:49.000000000 +0300
+@@ -104,7 +104,7 @@
+ 
+ int y4m_parse_ratio(y4m_ratio_t *r, const char *s)
+ {
+-  char *t = strchr(s, ':');
++  const char *t = strchr(s, ':');
+   if (t == NULL) return Y4M_ERR_RANGE;
+   r->n = atoi(s);
+   r->d = atoi(t+1);
diff --git a/media-video/streamdvd/files/streamdvd-0.4-libdvdread.patch b/media-video/streamdvd/files/streamdvd-0.4-libdvdread.patch
new file mode 100644
index 000000000000..b8f59ee54dba
--- /dev/null
+++ b/media-video/streamdvd/files/streamdvd-0.4-libdvdread.patch
@@ -0,0 +1,36 @@
+diff -N -r -u StreamDVD-0.4/contrib/lsdvd/lsdvd.c new/contrib/lsdvd/lsdvd.c
+--- StreamDVD-0.4/contrib/lsdvd/lsdvd.c	2004-03-08 23:10:53.000000000 +0100
++++ new/contrib/lsdvd/lsdvd.c	2006-03-31 12:57:43.000000000 +0200
+@@ -14,6 +14,8 @@
+  *              output info structures in form of a Perl module, by Henk Vergonet.
+  *  2004-02-25  now prints the stream-id's for audio and subpicture streams, by Reinhardt Wolf
+  */
++#define __STDC_LIMIT_MACROS
++#include <stdint.h>
+ #include <dvdread/ifo_read.h>
+ #include <string.h>
+ #include <sys/stat.h>
+diff -N -r -u StreamDVD-0.4/contrib/StreamAnalyze/streamanalyze.c new/contrib/StreamAnalyze/streamanalyze.c
+--- StreamDVD-0.4/contrib/StreamAnalyze/streamanalyze.c	2004-03-08 23:10:53.000000000 +0100
++++ new/contrib/StreamAnalyze/streamanalyze.c	2006-03-31 12:57:27.000000000 +0200
+@@ -19,6 +19,8 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <getopt.h>
++#define __STDC_LIMIT_MACROS
++#include <stdint.h>
+ #include <dvdread/ifo_read.h>
+ #include <dvdread/ifo_types.h>
+ #include <dvdread/dvd_reader.h>
+diff -N -r -u StreamDVD-0.4/streamdvd.c new/streamdvd.c
+--- StreamDVD-0.4/streamdvd.c	2004-03-08 23:10:53.000000000 +0100
++++ new/streamdvd.c	2006-03-31 12:50:45.000000000 +0200
+@@ -19,6 +19,8 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <getopt.h>
++#define __STDC_LIMIT_MACROS
++#include <stdint.h>
+ #include <dvdread/ifo_read.h>
+ #include <dvdread/ifo_types.h>
+ #include <dvdread/dvd_reader.h>
diff --git a/media-video/streamdvd/files/streamdvd-0.4-makefile.patch b/media-video/streamdvd/files/streamdvd-0.4-makefile.patch
new file mode 100644
index 000000000000..84608d80a689
--- /dev/null
+++ b/media-video/streamdvd/files/streamdvd-0.4-makefile.patch
@@ -0,0 +1,27 @@
+Index: StreamDVD-0.4/Makefile
+===================================================================
+--- StreamDVD-0.4.orig/Makefile
++++ StreamDVD-0.4/Makefile
+@@ -1,16 +1,16 @@
+ INSTALLDIR = /usr/local/bin/
+ 
+ all:
+-	g++ -g -Wall -ldvdread -lm -o streamdvd -I. -Implex streamdvd.c requant.c mplex/*.c mplex/*.cpp
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o streamdvd -I. -Implex streamdvd.c requant.c mplex/*.c mplex/*.cpp -ldvdread -lm
+ 
+ addon:
+-	gcc -g -Wall -ldvdread -o streamanalyze contrib/StreamAnalyze/streamanalyze.c
+-	gcc -g -Wall -ldvdread -DVERSION=\"0.9\" -o lsdvd contrib/lsdvd/lsdvd.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -o streamanalyze contrib/StreamAnalyze/streamanalyze.c -ldvdread
++	$(CC) $(CFLAGS) $(LDFLAGS) -DVERSION=\"0.9\" -o lsdvd contrib/lsdvd/lsdvd.c -ldvdread
+ 
+ gui:
+-	g++ -g -Wall -ldvdread -lm -o streamdvd -I. -Implex streamdvd.c requant.c mplex/*.c mplex/*.cpp
+-	gcc -g -Wall -ldvdread -o streamanalyze contrib/StreamAnalyze/streamanalyze.c
+-	gcc -g -Wall -ldvdread -DVERSION=\"0.9\" -o lsdvd contrib/lsdvd/lsdvd.c
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o streamdvd -I. -Implex streamdvd.c requant.c mplex/*.c mplex/*.cpp -ldvdread -lm
++	$(CC) $(CFLAGS) $(LDFLAGS) -o streamanalyze contrib/StreamAnalyze/streamanalyze.c -ldvdread
++	$(CC) $(CFLAGS) $(LDFLAGS) -DVERSION=\"0.9\" -o lsdvd contrib/lsdvd/lsdvd.c -ldvdread
+ 
+ clean: 
+ 	rm -f streamdvd streamanalyze lsdvd
diff --git a/media-video/streamdvd/files/streamdvd-0.4.patch b/media-video/streamdvd/files/streamdvd-0.4.patch
new file mode 100644
index 000000000000..d078aa7059a3
--- /dev/null
+++ b/media-video/streamdvd/files/streamdvd-0.4.patch
@@ -0,0 +1,22 @@
+--- Gui/StreamDVD/Gui.pm.orig	2004-03-08 23:10:53.000000000 +0100
++++ Gui/StreamDVD/Gui.pm	2004-05-30 13:24:38.342490078 +0200
+@@ -18,7 +18,7 @@
+ use Tk::BrowseEntry;
+ use Tk::LabFrame;
+ use Tk::Photo;
+-use Tk::JPEG::Lite;
++use Tk::JPEG;
+ use StreamDVD::Defs;
+ use StreamDVD::Calc;
+ use strict;
+--- Gui/StreamDVD/Config.pm.orig	2004-03-08 23:10:53.000000000 +0100
++++ Gui/StreamDVD/Config.pm	2004-05-30 13:24:28.314195864 +0200
+@@ -284,7 +284,7 @@
+    $self->{MOUNT}          = "/dvd";
+    $self->{TEMPDIR}        = "/tmp";
+    $self->{DATADIR}        = $ENV{HOME};
+-   $self->{LSDVD}          = "lsdvd";
++   $self->{LSDVD}          = "lsdvd-streamdvd";
+    $self->{STREAMANALYZE}  = "streamanalyze";
+    $self->{STREAMDVD}      = "streamdvd";
+    $self->{DVDAUTHOR}      = "dvdauthor";
diff --git a/media-video/streamdvd/metadata.xml b/media-video/streamdvd/metadata.xml
new file mode 100644
index 000000000000..b0ae398c0f0d
--- /dev/null
+++ b/media-video/streamdvd/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>media-video@gentoo.org</email>
+</maintainer>
+<longdescription>
+StreamDVD is a fast tool to backup Video DVDs 'on the fly', there will
+be no ripping, demultiplexing, recoding, remultiplexing .... You can
+select the wanted title, chapters, video, audio and subpicture streams
+and also a resize factor and StreamDVD will write a 'ready to author'
+vob file to stdout.
+</longdescription>
+</pkgmetadata>
diff --git a/media-video/streamdvd/streamdvd-0.4-r1.ebuild b/media-video/streamdvd/streamdvd-0.4-r1.ebuild
new file mode 100644
index 000000000000..5a14fa0a0a3c
--- /dev/null
+++ b/media-video/streamdvd/streamdvd-0.4-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="fast tool to backup Video DVDs 'on the fly'"
+HOMEPAGE="http://www.badabum.de/streamdvd.html"
+SRC_URI="http://www.badabum.de/down/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+
+IUSE="X"
+
+DEPEND="media-libs/libdvdread
+	media-video/lsdvd
+	X? ( dev-perl/Tk
+	dev-perl/Tk-JPEG-Lite
+	virtual/cdrtools
+	>=media-video/dvdauthor-0.6.5
+	>=app-cdr/dvd+rw-tools-5.13.4.7.4 )"
+
+S=${WORKDIR}/StreamDVD-${PV}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	use X && epatch "${FILESDIR}"/${P}.patch
+
+	epatch "${FILESDIR}"/${P}-makefile.patch
+	epatch "${FILESDIR}"/${P}-gcc41.patch
+	epatch "${FILESDIR}"/${P}-libdvdread.patch
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+	epatch "${FILESDIR}"/${P}-gcc44.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" all addon || die  # compile also optional packages
+}
+
+src_install() {
+	dobin streamdvd streamanalyze
+	newbin lsdvd lsdvd-streamdvd  # patched lsdvd, rename to avoid conflict with media-video/lsdvd
+	dodoc README
+	newdoc contrib/lsdvd/AUTHORS AUTHORS.lsdvd
+	newdoc contrib/lsdvd/README README.lsdvd
+	newdoc contrib/StreamAnalyze/README README.streamanalyze
+	if use X
+	then
+		eval `perl '-V:installvendorlib'`
+		insinto "$installvendorlib/StreamDVD"
+		doins Gui/StreamDVD/*.pm
+		dobin Gui/StreamDVD.pl
+		dosym StreamDVD.pl /usr/bin/streamdvd_gui  # convinience symlink
+		newdoc Gui/README README.gui
+	fi
+}
diff --git a/media-video/sub2srt/Manifest b/media-video/sub2srt/Manifest
new file mode 100644
index 000000000000..5ca2621d7164
--- /dev/null
+++ b/media-video/sub2srt/Manifest
@@ -0,0 +1,5 @@
+DIST sub2srt-0.5.3.tar.gz 10737 SHA256 777fbd9d78cc8a47b926ad03a9b05bf3b1ec09055b9694edeac8b5b4475dc63e SHA512 21e75f7664d2892c49fa76021283f0705f7c8d888a6d8fffa0335184ca139e18378facb521d0ff1e15d6de0061eafe34c01103fdbe3ddd863f6d3653565a525f WHIRLPOOL 8005de5e45806e0efd2abf404901250a730b3fb45f4642d547f5a23c25bd5e155e3d207bdf26c879ac7e7a827651a3545911395d1660f3e37c6daff476acdf84
+EBUILD sub2srt-0.5.3.ebuild 419 SHA256 1d72f12ece43804459939a561c6195d92b046edce23228e583fc87f8c1d2e5e6 SHA512 395142f0a95c18dc37aa063b34d6e3df7b1b2628addf953b264a2534b402d2e568f4d1c8c48916dbc258569bf524c3274e6b3b8b1fdaac6e0007eda422ad9cc8 WHIRLPOOL 02ae41019cdbdf30dc95671c853602b08e36429955bb8362dbc7c13e88133cc4731d8e37bd7c0c9d44f09b8d166ec380f3949733b7ece01d8af933c55b5fda45
+MISC ChangeLog 2430 SHA256 6205d10ea223aea259036ef82492c38c4daaa9258483a3509437b3a1dccee872 SHA512 6d6ea3a700bfb09582a18904dca007760337b75c74aef5c0737551b8982a5324e2ec89d8398ceb476d4bbeda7a93b9f9c3816a7adb56751cae8befbe5889dd7a WHIRLPOOL 5d705fa9e539904b9c9cc255bb9c52a03a884756f684777ff5a90a734032809cc83a304a856676a2fec1531b20248b84231de209660c1f91abb1489c0873102f
+MISC ChangeLog-2015 1127 SHA256 682f771df853ebd61bbbf4e3a758fa4df416699ffe8a42dfda78afe85420b7a3 SHA512 3e5c922ebaafd37b7a3098c96d36286509a3ac18662a09c18064928e2a96d8b1ed28cf8be7314ad190c25b33aefa83b5a1c744e183206d202ff815ef78c55d63 WHIRLPOOL af9414bf8d5d5666cee131e5f692049e8ce3df52678fc4f0c78ebb9835e4d02ce95f5e9b7ab0aa7de466de027faeb8e873f511ed48058fbdfb00497a2b6aa087
+MISC metadata.xml 219 SHA256 4246299710294d9f4c0c15b97e8ae7925e01785b962551c6aa27174e99980bcd SHA512 24793c7fd0e2cef8fa5a0efd9bd55fed1e62ff6810199a969d4c0b869bac9b9ec79b288105b73b1b99734320bb13569a8ee00516b5452dd67d91d14dd17038e2 WHIRLPOOL e7f42aba21f5637bb8774cc17a488ecca121e56d5e855a3e956792955b8253f3049e08b2ab258728002263967db02e27914c82ecafee07a6d317bf857d13095f
diff --git a/media-video/sub2srt/metadata.xml b/media-video/sub2srt/metadata.xml
new file mode 100644
index 000000000000..0427ec20bfd4
--- /dev/null
+++ b/media-video/sub2srt/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+<email>media-video@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/media-video/sub2srt/sub2srt-0.5.3.ebuild b/media-video/sub2srt/sub2srt-0.5.3.ebuild
new file mode 100644
index 000000000000..e80e98db1b1c
--- /dev/null
+++ b/media-video/sub2srt/sub2srt-0.5.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Tool to convert several subtitle formats into subviewer srt"
+HOMEPAGE="http://www.robelix.com/sub2srt/"
+SRC_URI="http://www.robelix.com/sub2srt/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+IUSE=""
+RDEPEND="dev-lang/perl"
+
+src_install() {
+	dobin sub2srt
+	dodoc README
+}
diff --git a/media-video/subcheck/Manifest b/media-video/subcheck/Manifest
new file mode 100644
index 000000000000..b0fac3235567
--- /dev/null
+++ b/media-video/subcheck/Manifest
@@ -0,0 +1,5 @@
+DIST subcheck-0.78.2.tar.gz 9542 SHA256 267e8925e0f474252116425b9bddbabc8fed8e7adebb27737f725d1af3359c57 SHA512 1cee792b22870d6e881549c5a6e758c8926cd243d56d4a637371419662670e566f909602eeef6c4427e19666052f332cd8333db81b1cce20eeb168d69c201684 WHIRLPOOL 6b5ea3f1420ecbabd9d41095261ae3dd823416490ba0b8c92c490d2f5a7359f4a9a19a65015cbc02cbdd370587868ac9c7f6e474d6ede227cf97955ba8fbf2b1
+EBUILD subcheck-0.78.2.ebuild 653 SHA256 f807d805e9a9152405770252ec0831f9eb7efd0ff74fc64f1c5aea7d6ea4bb87 SHA512 ab7e818a8adc6180ee7f20d5e6ff0f0b28189edac31bda14ea04c8cbb8906cf72a221a63007f7b8b773990cf22d42855cba716d1c7b799c1a64a5b2b4ac0af50 WHIRLPOOL 561bbbaa06d158c7255bfb1164d59ebd8596862aef7b655ea31288900011c14395317d060e3a983c07eeb6d72c6f3a058ff233665a6a65b452828c8d9eab30f5
+MISC ChangeLog 2435 SHA256 b3148a9ec3e7b42b24186b33e9f626097dd5283b40a74235606ded5a7ae5fffb SHA512 612abfdbff96e11deec0457b1d96aec781d8e9a61100e8723594374f7c5ed84e2d196525dc76770d94512149a53e4de08891924e0f8656be00228f5b7a9a90b1 WHIRLPOOL bda0a7fb2b41b62ac48391fc42ce92fa85ef78b5b394e4b6737b0ca6b59ae71eeac0a24da09dd4d222172107074af917e877ebbb58eb11b99ab5c79e067f97ff
+MISC ChangeLog-2015 582 SHA256 127e1b98d6ed771f982947b69856136feef7bb8761898612c409413090e6e08e SHA512 fec6a9276e6ea95e078419b732d8375a8f922e2ba5525ac32bc86c77d3b062eedcc3d9835fcd3ba83906b23ac31166311ca00c3400939e168a4f81eb490fb6ee WHIRLPOOL 19dad90c84eb109dd487e946239f1137abe8fa4839291348579201df45e1ed49c834474957d5ec541059cc9f37db63216f257ca8dadaa801eb29636896975bcf
+MISC metadata.xml 678 SHA256 12abf0545c3e6a2c8291b4bd401f35a92a1d1f39ae0e50c5e3b6405243afbe48 SHA512 7d49cbdc873e3431915aa9fac1b66a11e97415686ef663ba9eb493d402d866507d2c53ceef12ac38f21ed7fc7e668b183465dd10ba36025ba9c581fdf0e81205 WHIRLPOOL 389982b2b62528c97570c43749838a34b311c9a47203e70a206d3610526c789c49717a6ebf3491e19be7bc2048cb009e8f443c082975b7d9f81429fc961fe102
diff --git a/media-video/subcheck/metadata.xml b/media-video/subcheck/metadata.xml
new file mode 100644
index 000000000000..2c794141ea8f
--- /dev/null
+++ b/media-video/subcheck/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Subcheck is a perl script which checks srt (SubRip) subtitle files for
+		errors. Such as overlapping, negative duration, to short displaytime,
+		rewrite subtitle lines with another character length (useful for Yamada,
+		KISS and other hardware divxplayers), etc. It is highly configurable.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">subcheck</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/subcheck/subcheck-0.78.2.ebuild b/media-video/subcheck/subcheck-0.78.2.ebuild
new file mode 100644
index 000000000000..50a06a20ebdd
--- /dev/null
+++ b/media-video/subcheck/subcheck-0.78.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+inherit eutils
+
+DESCRIPTION="Subcheck checks srt subtitle files for errors"
+HOMEPAGE="http://subcheck.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="!sci-biology/ncbi-tools++"  # bug 377093
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	sed -i -e "s:${PN}.pl:${PN}:g" all-checksub
+}
+
+src_compile() {
+	:  # nothing to do
+}
+
+src_install() {
+	doman man/subcheck.8.gz
+	newbin subcheck.pl subcheck
+	dobin all-checksub
+	dodoc Changes
+}
diff --git a/media-video/subdl/Manifest b/media-video/subdl/Manifest
new file mode 100644
index 000000000000..6aae4cf2c75e
--- /dev/null
+++ b/media-video/subdl/Manifest
@@ -0,0 +1,5 @@
+DIST subdl-1.0.3.zip 17212 SHA256 ba56d0f65ccce575295a65d1374f164d4f1cc69c874ae8593f5daa688562c154 SHA512 d3c0e036bece8c6cad7b37543f8e2f00906ce83738aa3d751e463d316ee97292d696c0eae01d71f28fd67b942b9d28c00c8e580036d19933dbd4143e9865078c WHIRLPOOL 84418baa515a707b7e41d1823708ddfdad7e66d6f431872862de4c4de7c44d2cff18f1d75a3ae45977fa49271c7184fe8fe225d5e6b44c3d64bde25a58033603
+EBUILD subdl-1.0.3.ebuild 611 SHA256 0930c83ac1bd8280db8551f7569e1ec01869a0e923583aeef62f34489c3702c0 SHA512 34d19e20b00d525b70fcb891bb3bb3f362ac4ba7260a9bc68472c1e57147f1ca0f28aec778531d1f6e346506014c229a413d7f33afc9e67ae4e34107d33c374e WHIRLPOOL bb3adcf6de9f6c843db55811833a143b87a9b8b5684e99af834a01d87e1e39be735f8a2ce0c63b2f950323971a2d4e513dd06f1ce0f6a6512a73a1591daae819
+MISC ChangeLog 3049 SHA256 26d441be9860e300104638faa0f8baf1c193bf6d160527766b960673d9ea2c45 SHA512 ca592c79527fa9df2bcb409ae36bfc976c44d474f11e0c027fa319533f9acc468cf0301a60f4802034de48fe0d65e43ddb6a0a6e49828624c26754b0da6a5594 WHIRLPOOL 297ac496dc68dabccf6186d3d9ad8d4d604546500a9a9decc46cf0bd5909d9a8b792fd9754af2fbd8030906061bafd00527ba2818416d18c94e7684693283edd
+MISC ChangeLog-2015 700 SHA256 b4c57e93c1a90d490bf23c8b9d7081fac553cbe4b93d64e7bfe0a51c8ca1f13c SHA512 690b7b8f47435e5760a9f9b29df5e6252a7f6a32c07e1ed33b46a0ec8f2b9c4f4c5cb04532985f70c7a2868762e47251b5cf2788ba2fedf861e3bb88e95fbef2 WHIRLPOOL 1fba137ed9108f92ea43f4d617e246328de84f08e97fc63614dd2691ce9c8ddd76a940fe8bdb30c05d6bcab322caf016847655c5a1fb8f3d9579512fd762b996
+MISC metadata.xml 352 SHA256 6b8b7a4e43f928505be90abf93f72d8d84a0fc992b97a5754423df8c90aa7869 SHA512 18e50d559f7b6b101c14161731a8d4bdedcd3350eb2cd3afa26f2caf615c8bd558214fdad8daff4e7feb4eca435fc6b2a0ed535b554fa1025640c21840746ae5 WHIRLPOOL 8008f35b9d5887b4797e501c953b1be28c1831bdb7ad849782c1a10509659d514512882896c7d05d081154bb0d021f2524f220f2ad36346edef31a2ee36f6f42
diff --git a/media-video/subdl/metadata.xml b/media-video/subdl/metadata.xml
new file mode 100644
index 000000000000..9a30ccded04f
--- /dev/null
+++ b/media-video/subdl/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">subdl</remote-id>
+		<remote-id type="github">akexakex/subdl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/subdl/subdl-1.0.3.ebuild b/media-video/subdl/subdl-1.0.3.ebuild
new file mode 100644
index 000000000000..c2b2ee203bd6
--- /dev/null
+++ b/media-video/subdl/subdl-1.0.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1
+
+DESCRIPTION="A command-line tool for downloading subs from opensubtitles.org"
+HOMEPAGE="https://github.com/akexakex/subdl"
+SRC_URI="https://${PN}.googlecode.com/files/${P}.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+S=${WORKDIR}
+
+src_prepare() {
+	python_fix_shebang ${PN}
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc README.txt
+}
diff --git a/media-video/subdownloader/Manifest b/media-video/subdownloader/Manifest
new file mode 100644
index 000000000000..eb0e27ad2914
--- /dev/null
+++ b/media-video/subdownloader/Manifest
@@ -0,0 +1,5 @@
+DIST subdownloader-2.0.18.tar.gz 1259520 SHA256 2f9ec46d1537cb5677b717dcaf5668cdc61a84456bc52178b40595759ba35655 SHA512 ecddf606ce374af43fff39c225ee896af4d8bd2384a2f300dcbb4b443377807edd5233a0531e95d338b0f9c84a274b3afd4109d9216510a5a4bc8fa17485b999 WHIRLPOOL 2b735f0c25a19a49444011a81b28b855d3ce4b2ba01f1efbc65d9f4fe3f541081db13805d99d9a8e52cbb3ef3b95dae3fa80c3f9a06023c629285f4dd9dca5ac
+EBUILD subdownloader-2.0.18-r1.ebuild 978 SHA256 f722d190cd5f4f665ab6951a974bedf8fff977f89693e334f317289e51ee6667 SHA512 94d57b0a379be5ebbae07fa8ab92480d3e6245f976cf6ad57918b1557d75427271fa044b1371684fac2572e218bee5c2cfdaafd7cafb589621d40d545c070b23 WHIRLPOOL 31939a78fcf2c92544c81e4b0efbbb2f91f7a4feb779fcd7626a2234af7610868d4451ae74531e12afdbf278638178665469e8a62d96db7aff65370120f1784c
+MISC ChangeLog 3055 SHA256 9370d9baa02346a86ccbbc37bda8aeb301692537c1e8f9ace4a62d8e04145281 SHA512 924d6072297146e7351267a2b7a4fab4bf1e31b71f0538b75ffed48eb3fd96195a1dedc2b1a352b3fcbd629c6039c974ac0cad7634b514cecc8166cc2c3eb5c2 WHIRLPOOL d98591911b21455aba0255df0406626c2a8c88e4dac2e4b15f51abeab6347eb28cbe3aa8e334666f1c06cc409d540990f4fe29b46ee7619b083eb5dc00883b7f
+MISC ChangeLog-2015 1637 SHA256 735760f63334e7a41ce07eed8b810d47e188814a1dd46ef6ec66d362ffb6a5e2 SHA512 f379d4111ade6d964037e62b64e1b74f82236f55a549d64731119e883234d20370c1c47cb5887c756862d88d3ac9c195e2fcf8e0694373908505d90187f4bafa WHIRLPOOL 4d96cd6b64f9e015b9a4fec82ace53d4d12da9dc76d4977214038b49ad9179b3088549a0da883fdeb8391868916a17bfb967934814d7b8341bc5d51050a45b60
+MISC metadata.xml 649 SHA256 bc9314b506f9718fa9e9053bd4b3f0bad37587ceab371ec89092925cdd3782c6 SHA512 95f94664006d3dcf24c48fa77177bcd611a10c04793c96c6582847d905c8169dfaefd713047e7539d00d08947bbc7fc9c6601a5a0586658e53de3172c9b21409 WHIRLPOOL 2950ed69ee63741f1d2f521445aad6055f6ab921b2d9cdd662dc8890834da1ebd469691ae443ff61662177b66a7b8c18573184c2a5dd2cdf4bd64c970cb56ba0
diff --git a/media-video/subdownloader/metadata.xml b/media-video/subdownloader/metadata.xml
new file mode 100644
index 000000000000..9a00093051a0
--- /dev/null
+++ b/media-video/subdownloader/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ThyArmageddon+Gentoo@Gmail.com</email>
+		<name>Elijah El Lazkani</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		SubDownloader is a program for automatic download/upload subtitles for
+		videofiles (DIVX,MPEG,AVI,VOB,etc) and DVD's using fast hashing
+	</longdescription>
+	<upstream>
+		<remote-id type="launchpad">subdownloader</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/subdownloader/subdownloader-2.0.18-r1.ebuild b/media-video/subdownloader/subdownloader-2.0.18-r1.ebuild
new file mode 100644
index 000000000000..0237c1ee661f
--- /dev/null
+++ b/media-video/subdownloader/subdownloader-2.0.18-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 eutils
+
+DESCRIPTION="GUI application for automatic downloading/uploading of subtitles for videofiles"
+HOMEPAGE="http://www.subdownloader.net/"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${PN}_2.0.18.orig.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}
+	dev-python/PyQt4[${PYTHON_USEDEP}]
+	dev-python/kaa-metadata[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_install() {
+	python_fix_shebang "${S}"/run.py
+	insinto /usr/share/"${PN}"
+	doins -r cli FileManagement gui languages locale modules run.py
+	fperms 755 /usr/share/"${PN}"/run.py
+	dosym /usr/share/"${PN}"/run.py /usr/bin/"${PN}"
+	doman subdownloader.1
+	dodoc README ChangeLog
+	doicon gui/images/subdownloader.png
+	domenu subdownloader.desktop
+}
diff --git a/media-video/subliminal/Manifest b/media-video/subliminal/Manifest
new file mode 100644
index 000000000000..6843e0148956
--- /dev/null
+++ b/media-video/subliminal/Manifest
@@ -0,0 +1,8 @@
+AUX subliminal-2.0.5-add-missing-comma.patch 1196 SHA256 e046931ec43b70294529d348bbb51ab47214f9b17d6022a2aa68b75ade219422 SHA512 82cabee6a7bdc701f73e7115edc975fbde8f0008dff2e4dcf7fcb27b9203dc9efd42b54aa31a632501e3e3ed405638fcb3fb273eff4bf19cbc8085d710d3763b WHIRLPOOL 397a133f5ee218b6962cac33d6b349db25cc75aec3859c26c15a91852179f28fc41e28971c6e42a4096cb0f23343fbb234f7254d46313bafd33a0a14cffdd487
+DIST matroska_test_w1_1.zip 184550509 SHA256 d86f96e165e695e6cf5324ebca184f2df723872f02965b565820d265b53004eb SHA512 f170a8e83dab15228f992b3692330163da2402b8e436c7fa195ac1ecc06cf1eaf1a48d8c99a85c031122c158c2d4006023aae75d5b7805385ba25a6d601cb78f WHIRLPOOL 3d0a16871fc7df0a3ef3f34f7c496eff188400a9796a2ad66667112ef0de7deecf025196898bd24ea395f8c44e75156a8b8c09d40a92e98d833d995473eefa9e
+DIST subliminal-2.0.5-r1.tar.gz 4442435 SHA256 b7a54377937810842cf9e9f06d9c9affd1e02c591f3f9a1ddf76c25a9b51a434 SHA512 b0f99c6b2fa6bc3860c86592bb428c7b4b34836df7a619b19d69b15532a68b4d05369f724131e120d4b390bd91f430aea442aef72ebc00ae8e3d31a457925eec WHIRLPOOL eae38af4612576fa6903ab23aeab6d1c769ee1c3a95709c23e265819159d83e0624c53527cf86d58e059aca51f2ba7f27820e413ac9dcb584c58d0066a38067a
+EBUILD subliminal-2.0.5-r1.ebuild 2393 SHA256 629d0d062212b167c8e71adbeca27407d0246f9bb9ca9da2fad40bb2743b49a7 SHA512 5cf6009a724b8cd77ba5850a02bd39b8533658c7ca0a0ccd7485e471f575fc0000eb9ff738e3f6c9de3b91a07596a228baaef5646b5f39c020c8d4fbb70d528b WHIRLPOOL b31b09446d229d3d843766ea2a07e973bbbd9cdd06fecd70df6f1facc591a8feef2b6c3aa6fb131e74ff73ae7ec5aadfd15a4f643b5be1900a9c9c43541fdafd
+EBUILD subliminal-9999.ebuild 2204 SHA256 6123c6ae667bda8a324896dc3a009315429151abcd56d127f72bbb3ef6a89839 SHA512 20522d85033a0eacdd76b0ff9483c187a0865ff93e01e20243bcd9e7a704bfa7161854537a74e4c28f1e418e2821fc2e0482282dc6b9f52e2887c742a0e73fd7 WHIRLPOOL bddd75ca7c624aa120eaa41be00e11ebb7b5cf9def9e43090750955bf767960c338fc116aabebeee6de131dbde2644691a07344371b7529747384f8f1d500b80
+MISC ChangeLog 5967 SHA256 00543bbca7280f769dc250d485fef8cbf23e3f822536918c9205358edd0c6e65 SHA512 acafc1f24db3ff2fcd4190f6e02e6fe68ea7b81f24594a9d796a6151ae18b111f425ccc0e3ae77457dffa3446f2f21dd95cfd7bc4fe3961ccf139029e7163539 WHIRLPOOL 6cf23d01a3d7225483f479533235e9cc163c7baa134dae3262e151b769b457e120997fa366d43cbde10a1d77523e56ad33f3564f2b3b932c88f8a988f17766c7
+MISC ChangeLog-2015 1839 SHA256 f602ce12b2feb44237088a9cd2ea53cd94590247b95af4d1709f95b757e589b2 SHA512 d95b27753b7889674b5d14e5302dd334d282853ae169a752a47a5266a5da9b585bc0cdfe84c575709d7588321b545885c03463e9f52f3d00772792a97ba0e69c WHIRLPOOL 9983bf27d8e4a4d20a8ad9caabf02f6b7c28d003a59ebd49ce854d744da1448e02f921c96c658eae791806a063e175385dfeb9212470977cb3525c0ba8fa5c4f
+MISC metadata.xml 549 SHA256 6f233fb04e6ea6ef6428a3bfba5b9f948f54251ed425fd73706f223ad9a14aff SHA512 cccd163878caccdee339a2e19f9cd5b0954477e767284c4183f9e589c0b5fe59353dfec14982e6dea83d91fc2f2d66904f8f40a1e69c7abab4a6d6baabfdc0c4 WHIRLPOOL 721f24af333222389048c4f0f6016b897c5dd8fa06092d0584d576c522a292c50b7a076450e227d87ce7b2a95dbfa0945d771ff5e92b449cea31fe39e077da72
diff --git a/media-video/subliminal/files/subliminal-2.0.5-add-missing-comma.patch b/media-video/subliminal/files/subliminal-2.0.5-add-missing-comma.patch
new file mode 100644
index 000000000000..148307781b71
--- /dev/null
+++ b/media-video/subliminal/files/subliminal-2.0.5-add-missing-comma.patch
@@ -0,0 +1,19 @@
+commit 9c2cfa23b3eedad64cfd4133c40bb73e6be0139f
+Author: Fernando <fernandog@users.noreply.github.com>
+Date:   Thu Sep 29 22:57:51 2016 -0300
+
+Fix missing comma
+
+diff --git a/subliminal/video.py b/subliminal/video.py
+index 00304e9..b79570f 100644
+--- a/subliminal/video.py
++++ b/subliminal/video.py
+@@ -13,7 +13,7 @@ VIDEO_EXTENSIONS = ('.3g2', '.3gp', '.3gp2', '.3gpp', '.60d', '.ajp', '.asf', '.
+                     '.bix', '.box', '.cam', '.dat', '.divx', '.dmf', '.dv', '.dvr-ms', '.evo', '.flc', '.fli',
+                     '.flic', '.flv', '.flx', '.gvi', '.gvp', '.h264', '.m1v', '.m2p', '.m2ts', '.m2v', '.m4e',
+                     '.m4v', '.mjp', '.mjpeg', '.mjpg', '.mkv', '.moov', '.mov', '.movhd', '.movie', '.movx', '.mp4',
+-                    '.mpe', '.mpeg', '.mpg', '.mpv', '.mpv2', '.mxf', '.nsv', '.nut', '.ogg', '.ogm' '.ogv', '.omf',
++                    '.mpe', '.mpeg', '.mpg', '.mpv', '.mpv2', '.mxf', '.nsv', '.nut', '.ogg', '.ogm', '.ogv', '.omf',
+                     '.ps', '.qt', '.ram', '.rm', '.rmvb', '.swf', '.ts', '.vfw', '.vid', '.video', '.viv', '.vivo',
+                     '.vob', '.vro', '.wm', '.wmv', '.wmx', '.wrap', '.wvx', '.wx', '.x264', '.xvid')
+
diff --git a/media-video/subliminal/metadata.xml b/media-video/subliminal/metadata.xml
new file mode 100644
index 000000000000..dbddc2e56ab1
--- /dev/null
+++ b/media-video/subliminal/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>itumaykin+gentoo@gmail.com</email>
+		<name>Coacher</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Diaoul/subliminal</remote-id>
+		<remote-id type="pypi">subliminal</remote-id>
+		<remote-id type="sourceforge">matroska</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/subliminal/subliminal-2.0.5-r1.ebuild b/media-video/subliminal/subliminal-2.0.5-r1.ebuild
new file mode 100644
index 000000000000..0d8139e55f62
--- /dev/null
+++ b/media-video/subliminal/subliminal-2.0.5-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE='xml(+)'
+COMMIT_ID='dd74383d1cba82829ce720f2e439a65d13ffe7ef'
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Python library to search and download subtitles"
+HOMEPAGE="https://github.com/Diaoul/subliminal https://pypi.python.org/pypi/subliminal"
+SRC_URI="
+	https://github.com/Diaoul/${PN}/archive/${COMMIT_ID}.tar.gz -> ${PF}.tar.gz
+	test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/guessit-2.0.1[${PYTHON_USEDEP}]
+	>=dev-python/babelfish-0.5.2[${PYTHON_USEDEP}]
+	>=dev-python/enzyme-0.4.1[${PYTHON_USEDEP}]
+	>=dev-python/beautifulsoup-4.4.0:4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
+	>=dev-python/click-4.0[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/chardet-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pysrt-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/appdirs-1.3[${PYTHON_USEDEP}]
+	>=dev-python/rarfile-2.7[compressed,${PYTHON_USEDEP}]
+	>=dev-python/pytz-2012c[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		app-arch/unzip
+		>=dev-python/vcrpy-1.6.1[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		dev-python/sympy[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+	)
+"
+
+# Tests don't work in 2.0.5. Recheck in later versions. See Gentoo bug 630114.
+RESTRICT=test
+
+PATCHES=( "${FILESDIR}/${P}-add-missing-comma.patch" )
+
+S="${WORKDIR}/${PF}"
+
+python_prepare_all() {
+	# Disable code checkers as they require unavailable dependencies.
+	sed -i -e 's/--\(pep8\|flakes\)//g' pytest.ini || die
+	sed -i -e "s/'pytest-\(pep8\|flakes\)',//g" setup.py || die
+
+	# Disable unconditional dependency on dev-python/pytest-runner.
+	sed -i -e "s|'pytest-runner'||g" setup.py || die
+
+	if use test; then
+		mkdir -p tests/data/mkv || die
+		ln -s "${WORKDIR}"/test*.mkv tests/data/mkv/ || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/media-video/subliminal/subliminal-9999.ebuild b/media-video/subliminal/subliminal-9999.ebuild
new file mode 100644
index 000000000000..ca35900d1778
--- /dev/null
+++ b/media-video/subliminal/subliminal-9999.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE='xml(+)'
+
+inherit distutils-r1 git-r3
+
+DESCRIPTION="Python library to search and download subtitles"
+HOMEPAGE="https://github.com/Diaoul/subliminal https://pypi.python.org/pypi/subliminal"
+EGIT_REPO_URI="https://github.com/Diaoul/${PN}.git"
+EGIT_BRANCH="develop"
+SRC_URI="test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/guessit-2.0.1[${PYTHON_USEDEP}]
+	>=dev-python/babelfish-0.5.2[${PYTHON_USEDEP}]
+	>=dev-python/enzyme-0.4.1[${PYTHON_USEDEP}]
+	>=dev-python/beautifulsoup-4.4.0:4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
+	>=dev-python/click-4.0[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/chardet-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pysrt-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/appdirs-1.3[${PYTHON_USEDEP}]
+	>=dev-python/rarfile-2.7[compressed,${PYTHON_USEDEP}]
+	>=dev-python/pytz-2012c[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		app-arch/unzip
+		>=dev-python/vcrpy-1.6.1[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		dev-python/sympy[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+	)
+"
+
+src_unpack() {
+	default_src_unpack
+	git-r3_src_unpack
+}
+
+python_prepare_all() {
+	# Disable code checkers as they require unavailable dependencies.
+	sed -i -e 's/--\(pep8\|flakes\)//g' pytest.ini || die
+	sed -i -e "s/'pytest-\(pep8\|flakes\)',//g" setup.py || die
+
+	# Disable unconditional dependency on dev-python/pytest-runner.
+	sed -i -e "s|'pytest-runner'||g" setup.py || die
+
+	if use test; then
+		mkdir -p tests/data/mkv || die
+		ln -s "${WORKDIR}"/test*.mkv tests/data/mkv/ || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/media-video/submux-dvd/Manifest b/media-video/submux-dvd/Manifest
new file mode 100644
index 000000000000..765cc2fbbd18
--- /dev/null
+++ b/media-video/submux-dvd/Manifest
@@ -0,0 +1,5 @@
+DIST submux-dvd-0.5.2.tgz 42223 SHA256 394dd464f1f39313110bccf2acf0decba8e606df8f499f0792a8496c918c4fa6 SHA512 960a6634650c68a8194138155fac2b8e3840e1f77d7160461341c6b5342ee13d7575f09437543fbf25f303ef6a1a071004ae913ec54fb13f36e09636176d7906 WHIRLPOOL 0ea64d511da1b1052be9198457261c3f856481719fc800a640ef3305ca0e670659156b561c9737906e4ced93e571717fcbe3b817915bb4a28041d21542df728e
+EBUILD submux-dvd-0.5.2.ebuild 620 SHA256 71c6afd2145649c11c258d553ab70959ab6eacb25723e91c9934fe1f125a2a5d SHA512 0eb68bb6da4f163ae8ce159fd539080c6a42b0b6671f5086f15f8ee42028c389c24e7822c23bca77aab15736b438663d291f9ea6b1c0f38e8d416ad50e85759e WHIRLPOOL d40f9eaf67f9cb68f3ae437a0c1734b3cf83dedd09b80c3a5be59865e93ecdfe7b5f774493d54672f1ec5501953da4964ce6187573e5fb38d87e795110f58eff
+MISC ChangeLog 2468 SHA256 a0081b8bf8f8866e021b2f75a49579401ad3c82877a1e15db86413199902a8b4 SHA512 88c4f299620912fb44c7f859895d09f43717b044ff4fefff439b786a503e98c854354b5080fa986904e6baab8436edb49d0f6dc6e7fba8970b20277ca2cb3c52 WHIRLPOOL d94ee00f6611d32cfa68ccd0aba90d5ab12dac723c71806bdbeca4957f418197aef70c694ade73664b559196e5764ba243b52ca10f7051d2a4c5dc1c29e79755
+MISC ChangeLog-2015 2041 SHA256 2f68019bd94b93389bf549661d049a946760530b923b28285ff650bd1b31fe10 SHA512 4e73d3664bc23e4f6db0b1f8b3de689a5ceac5d7b025568b6addcf7a63ae10519416c85381033fb2d318a9c6831bf062b3095c3c7e5d0d4408365505dfc6160e WHIRLPOOL 7bb42ad8a55d5a48272651b2caa49e93937cfe6732285d0f5abf8f8fadbdfaed1bb94a449f22d811b52e10515a18d7b066dff0481d20eb33a13ebf03065364fc
+MISC metadata.xml 334 SHA256 1b61d5baf9df2aebda9834fb60e1786d79c49a54cf1af65d776aa811c5279805 SHA512 ea6800418e6612cab28cc5d0fb977d8227deaef467662b6c8619b974062c47b0658ff1e621b8fb85309c0f87f04afe3903053af1c21c629018a27eeec7f6c8de WHIRLPOOL 1e0db80c7c174d63a4d2f65998ca482e9b9d86e29b999c918c37345d3b7dbb767f925ca1ca449e6725bd30464307577d9b948a8cca0f6900c8857c62083ec7cf
diff --git a/media-video/submux-dvd/metadata.xml b/media-video/submux-dvd/metadata.xml
new file mode 100644
index 000000000000..eded805f8eed
--- /dev/null
+++ b/media-video/submux-dvd/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>lordvan@gentoo.org</email>
+</maintainer>
+<maintainer type="project">
+  <email>media-video@gentoo.org</email>
+  <name>Gentoo Video project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-video/submux-dvd/submux-dvd-0.5.2.ebuild b/media-video/submux-dvd/submux-dvd-0.5.2.ebuild
new file mode 100644
index 000000000000..8fdc525a7e84
--- /dev/null
+++ b/media-video/submux-dvd/submux-dvd-0.5.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A subtitle multiplexer, muxes subtitles into .vob"
+HOMEPAGE="http://panteltje.com/panteltje/dvd/"
+SRC_URI="http://panteltje.com/panteltje/dvd/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	# just 2 files not worth a makefile patch
+	dobin submux-dvd vob2sub || die
+	dodoc CHANGES FORMAT INSTALL README ${P}.lsm || die
+	dohtml spu.html || die
+}
diff --git a/media-video/subsync/Manifest b/media-video/subsync/Manifest
new file mode 100644
index 000000000000..913db95e5a6d
--- /dev/null
+++ b/media-video/subsync/Manifest
@@ -0,0 +1,5 @@
+DIST subsync-0.0.1.tar.bz2 60335 SHA256 c6c9c9e506232528b0b1fa3b7929fc3517d5eeafcbd06cf40e18a7fb27a0bfba SHA512 a8f4c037c97924a173cf0cc9cd007edfb38614f9b112c275724a57b8e127c15408ab7a10a13172984a80f92db820b8c0583f6ced9f7432140b109cb9f8c8b6af WHIRLPOOL ff806ea37e265cdb9fea5e136e80290895b2f7920fd8a8e974d6eac70d5e16dd13d76f5aa3b225b4b1907234b7172a8d3c4805dab81e36565483eb6abbe46bd1
+EBUILD subsync-0.0.1.ebuild 502 SHA256 0e7ff8c0b72ce1daa8f458a52fe0dd3fbdd72402d13af5d2ae0c98bdd0d52aef SHA512 32f8c8a6e37efd4cf0eb181ce75cb2ad4e05ffe443186a224e16298186fe3743dd29861c84f79dbfe89e522c27185ae2cc60a033565055e230233c524620d743 WHIRLPOOL ec7a0acafa9da87b4a575d7c081b311e12dbbe147ba30e03decd53b741be494f73c72f01065cb7837e38f76227caab6d1f41613ec62e36b976b34c5958dee074
+MISC ChangeLog 2542 SHA256 eccdd3064640beb9a60ed47748b2fe3876f65b28ff86ad0f161870d740c5e875 SHA512 d8675627f73b04b3c38c6159c9f6427867caf6ca481c7cf77304440136a54b5edbeab2065bb24eae7ef694569b7918224b47c36cde1980db34d8f7515a64d168 WHIRLPOOL e5dbd4e90c1423a0541888bc87c9a4f04f40ac6a976beca578379aa4f6b1ca4904dc6f52e5a146075a875a87b5cbaa5e502825cfe30c2948d9a79a9cbe292c87
+MISC ChangeLog-2015 435 SHA256 04a16717cd98039a97bcf033460017b59b9d9c7d7af673c8b0f286c935c573e8 SHA512 e8d32918a6cc149c4d631f630dc7d39a4df52585e84b457be0022c7ef3c36c5f78629fedfa90045800e31e40bd07374f68b6d1853af95a14fedb36043a47c5ea WHIRLPOOL 62b1a5db09dac176c6d987e904aaa4b3c90bcc15b6c27868441fbea5dd643338d89cebc6b03eb6cb01144250e704145c2841a4b4c84d84d85b405e2616eb970f
+MISC metadata.xml 521 SHA256 41f1c6baf1c342e0000ec5d0e5c96da4b0f771dbcd45c42d870945c29b149908 SHA512 b6b7d0baf8305c7d495fdaf4455ce268890f0aaafcc03a97b7126e65ff9f820753eac946662187f2709edc4818c66a842fbb5300e08f3cd03114bf6a8c945681 WHIRLPOOL a370bf5a8870e84a6c6d3b913bdaf7c5e663e14432f0f431aa4b985d743a33e8a2f9ef113897574dc69886e42ee94f1c018ca88d0eedb2e6b81b7d22a25da8bb
diff --git a/media-video/subsync/metadata.xml b/media-video/subsync/metadata.xml
new file mode 100644
index 000000000000..a339c1f59f31
--- /dev/null
+++ b/media-video/subsync/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Subtitle Synchronizer is a easy command-line utility that synchronizes
+		subrip(srt) subtitles that use time format to given timings.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">subsync</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/subsync/subsync-0.0.1.ebuild b/media-video/subsync/subsync-0.0.1.ebuild
new file mode 100644
index 000000000000..7d686ec8a23d
--- /dev/null
+++ b/media-video/subsync/subsync-0.0.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="subsync is an program that synchronizes srt subtitle files"
+HOMEPAGE="https://sourceforge.net/projects/subsync/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog
+}
diff --git a/media-video/subtitlecomposer/Manifest b/media-video/subtitlecomposer/Manifest
new file mode 100644
index 000000000000..c230e0a9fca3
--- /dev/null
+++ b/media-video/subtitlecomposer/Manifest
@@ -0,0 +1,5 @@
+DIST subtitlecomposer-0.6.4.tar.gz 1638176 SHA256 030f3a33dccdc95b890c06de6f2566c4e6ec85264c8bc47430c72c137ce74f91 SHA512 585471b7fbcbe21da31fc5f67b7803bac5820ba1dd13135ab17d86121b105926712fd2c726541153e0223ca9a72a717f80229f3a32f526319357ae0ef47af18e WHIRLPOOL dd8d230e010fce0099fff13b421e2df27f3f74799b542dd9f61c0b9cb08ae6973e3aa3f8d8d49a278a85e0e022524ec3bdd7473136a77b5169d0c0e2ab1305cf
+EBUILD subtitlecomposer-0.6.4.ebuild 1612 SHA256 5be4a03ffa8f7887922bfa3acd0d0ce16c810f45fefb542c4ea76171e9c26b05 SHA512 63989c9933fd7f2b97ba37afaefa42eaf7d30f1e6bf842401726f52d19caacaf8a10843f59324e3235af70e5875ccc8f16264c1e3f649e45803718db71512034 WHIRLPOOL 9bd094a9f1d982ac62b50a4c030ec475a4b7d6bd625bed9959827adc77627adae1bccec3555a920ed1c14fd97c5d3e72906492d06fb7431aac035b08be3e36a9
+MISC ChangeLog 2680 SHA256 aa5163bc7f4e6bac687c48582573c4f910cd2209b86c57a8a3c8752aec178aeb SHA512 f309dee6c3c5c0ea9563c5a1465c115cacd2f446b9f6aa3d20cf4e38c4da1bf4a4badbd449d357888639d5b4718a9760182a6c5955d104ab08f7ee0d973326c4 WHIRLPOOL 368081c4a4471e4df6a8cb2274418575c6c4c1f7387bcb513df38b5558a333b1623fb7de5a0c48584e8492611cab46fd6a8c7d1a72914e328c9f692f35ce2a46
+MISC ChangeLog-2015 4303 SHA256 8fbf6df920152c7a6953cda30519cb39003c6935ecbf978a1a794fedebbb321d SHA512 051769557133ad778f806c21c6eeaa7fcfbc260eafbd582899db8290f670b8ec893420cc5468bca3c54be5886d2cf8c97693527c763b6272f792509ee9ce1682 WHIRLPOOL d16444385880b5ee96bb89f40deb0208fc59fea21c6bb3da2ec32a2e504f26bcd9bf89ab1d4e789fc4653d8c9c808ad106ddfa72655e596e6c3899dde65fd370
+MISC metadata.xml 524 SHA256 0223aeb186e341e81fb32f4688d26f686d80baddfb14d0374b868f5199bfa77c SHA512 c2ef5d88d2b12534ba76ba4949c4ceee405f88b546f3b749704d8f7529d1b19b3ce8b20b18b496203259dcbde74ba7bf948ae9e4fa4601984554f8f0664a6efe WHIRLPOOL 1deec3d27f03dc880ca628ceae9fdb5c834b83a72829e04899ded18b304269ccbbc72655703894df30d3e48fbc4cb2164cd7f753873f48ab08a1089deae66cf2
diff --git a/media-video/subtitlecomposer/metadata.xml b/media-video/subtitlecomposer/metadata.xml
new file mode 100644
index 000000000000..bd0879e135d9
--- /dev/null
+++ b/media-video/subtitlecomposer/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<use>
+		<flag name="mpv">Build mpv backend support</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">maxrd2/subtitlecomposer</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.6.4.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.6.4.ebuild
new file mode 100644
index 000000000000..0e0cd925cc05
--- /dev/null
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.6.4.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Text-based subtitles editor"
+HOMEPAGE="https://github.com/maxrd2/subtitlecomposer"
+SRC_URI="https://github.com/maxrd2/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86"
+IUSE="mpv unicode xine"
+
+CDEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kross)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/glib:2
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	media-libs/phonon[qt5(+)]
+	mpv? ( media-video/mpv )
+	unicode? ( dev-libs/icu:= )
+	xine? (
+		media-libs/xine-lib
+		x11-libs/libxcb
+	)
+"
+RDEPEND="${CDPEEND}
+	!media-video/subtitlecomposer:4
+"
+DEPEND="${CDEPEND}
+	sys-devel/gettext
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PocketSphinx=ON # bug 616706
+		$(cmake-utils_use_find_package mpv MPV)
+		$(cmake-utils_use_find_package unicode ICU)
+		$(cmake-utils_use_find_package xine Xine)
+		$(cmake-utils_use_find_package xine XCB)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	echo
+	elog "Some example scripts provided by ${PV} require dev-lang/ruby"
+	elog "or dev-lang/python to be installed."
+	echo
+}
diff --git a/media-video/subtitleeditor/Manifest b/media-video/subtitleeditor/Manifest
new file mode 100644
index 000000000000..95332d209d76
--- /dev/null
+++ b/media-video/subtitleeditor/Manifest
@@ -0,0 +1,9 @@
+AUX subtitleeditor-0.52.1-build-fix.patch 2193 SHA256 dd5ac3b27f1068ea00a666c595bbe1ba4be81730079df600027e8b1949267b9c SHA512 424a5b6ab459d3e5b3363e9f58987b4e11e18258e7019c975967eef3b05f3c9525f34d8a29ad9077e0e16668a253c51487fab152b5951b702f77f6b81b1a0555 WHIRLPOOL fc1221678e44ec2b49f0402416f84e49d36c5ecffd46c9c80fe2aab17f867b8827d5f1f676ad8c3032edf66f866339c9316f5348053b7d98b7fabee37b452306
+AUX subtitleeditor-0.52.1-disable-nls-fix.patch 1080 SHA256 54c8592c328f03deca7e1a60f903f6f4e0d9b8ce10649c84c9489fb1f5a6b71f SHA512 7775e9527a5e1b7f2a469eb3ea5f3d5422797c4ca61f02b486578f60e5a118ab1d6479079cae35ed29324a1579ed3363ed77b18ceda1dad5b10f8def1a11b650 WHIRLPOOL 6103520de7be5f1a423816e61195fb506a21824468ed196dfde46ba210819e0d9bbc07384746c3f10d8c66ffc2629815ca20dd938184448ca451be956cf4e028
+DIST subtitleeditor-0.53.0.tar.gz 1778388 SHA256 8fac7430fb552438d075ef3809d4a0f04a764d4dd0723a3ef18b2b695fecf920 SHA512 8787831947785885befb50221869169eda73489851389e72f34edac7a9c2c59d05ba69e86d4d2d5b3a13b2678377ee2520c110ffa472b718884dd2e711603b8b WHIRLPOOL cfd7bfd2324fe10dadd6e8c7c60487072d15dee3c6f0a57358abee4e5f92c945ba95efb036516ecadc0beebf52380b835cb35ae8af389110597ab5305a979639
+DIST subtitleeditor-0.54.0.tar.gz 1783077 SHA256 aa9c539f3a0984deef257339e2b9f5c8728b8245113695cf6d42459f011aa2ab SHA512 4458d579775a504b22f955c41d0e95ed722c1cb6bcf715ef493988a85397d5e0d4c3327e129f49b160d398dc73257026a92bbe5104c30d2004c16b7e12dd113c WHIRLPOOL e67f2d94ec004e40855b440af3eafc7d78c859326b46a69c11fb633e650fdb3c0f44da9a9e3dadcf0a87ff598984d7cc1eabdf6fecb625b6357f4ec2dae4fb6d
+EBUILD subtitleeditor-0.53.0.ebuild 1387 SHA256 0235613f150a38c1169636a63d9ca8adbac7f2a2b0f8224204bba90b13093135 SHA512 99c258091145a9de25744e763e806f2b00a7a90162d897b1f90eb34dba9048731c9ff0fadd5f4d700e6b8d88121a2b0ce39a5f1a6c2ae8cb4a32d28aa9210269 WHIRLPOOL fa873aaf78e441cba66a3ebd4edd15c8428073fdeb8ad2a04c418513c4ef86b0e4197d7e7043f12dfadfbf1b5f6963c351732178fbb431846015002b48cb3d55
+EBUILD subtitleeditor-0.54.0.ebuild 1372 SHA256 9f5ee6481f9c2943fec3218caeb1d38477adbe84797982b178465959b5140d08 SHA512 9d1c084d5ad657299efb27558a0ebb06b455d7a08edb1fe580fab1db157f73e7b831821bbe3ad7c908d2bc939001cfa28bd534cd8c5492fe2315cfa40760f7eb WHIRLPOOL 82a0e5804854b61de664f423444447b020b7ee1a2f8c6e9f5bfa9a991250b987134706c059d9176c0d09e63d7abb529346fe4d904d3706bde7b7f55197e01069
+MISC ChangeLog 4817 SHA256 083fa542231eac275bf15db012226fa8f2f8dced4d83a7323c727a6173a98be2 SHA512 a5cd18c1de1f79f4ab73bbe256e66991be9ac7ee0022d08dcaa48d0bdec8e94bd6d7e103995d523f0e621e182b69a29004c5643b18976584f86ce2771bc2099d WHIRLPOOL 13ddd35da163c8dcce729a140c83743b05c7e22472e2a0c8e6499e1d9a7062bd2c59e6e753ca99e4200b53fd84146a8c1a311850eb19191fa31efaed6bae43f4
+MISC ChangeLog-2015 6226 SHA256 d946945af3541ab856d3f0ce7d61ef979358c855600ff29cf12f96e7cfcbac4f SHA512 0a7c4bc6a440d083bdc2c4320e1dda79ca1775ab6c81a1d143180c20fe1fcf8c03356f208dd6e22d1388896953ee62fb0f75c0118f01489f9ac2195a8c8ebffe WHIRLPOOL 6b9b73f49dafa1f57cfbd4e6f9e9df1ece2433ed7765394b5213c0ac552e2a5cf7bcb6120982fee213e9c69a4ad019b4a7056427fffc02b9bfc37f12d7647ad3
+MISC metadata.xml 673 SHA256 a4b978e59951227a2503ef0e95e4214f0686c1f98358de03dd512b050cf4d94a SHA512 8f1eedec13ae0cbce853aa0172c214c9f3a3b9515a029297db8a2c68013b375bb9c3a5cbe3dc2bec09c9a4cb40f836b610d1533d7b59a2b31175c57de401d4e9 WHIRLPOOL 38801318e4f6c8a54f823431fc59eccd515cc261c5bab4a0dee298490360cf5b1a0d01880a55cf93e0193c90ca2735031b8e698ec4efdaac35793d7f4703648e
diff --git a/media-video/subtitleeditor/files/subtitleeditor-0.52.1-build-fix.patch b/media-video/subtitleeditor/files/subtitleeditor-0.52.1-build-fix.patch
new file mode 100644
index 000000000000..9cce5d2d98f2
--- /dev/null
+++ b/media-video/subtitleeditor/files/subtitleeditor-0.52.1-build-fix.patch
@@ -0,0 +1,55 @@
+Fix build errors with gcc-4.9.3 -std=c++11 (after disabling -ansi)
+
+https://gna.org/bugs/?23714
+
+https://bugs.gentoo.org/show_bug.cgi?id=550764
+https://bugs.gentoo.org/show_bug.cgi?id=566328
+
+--- a/src/subtitleview.cc	2015-12-24 01:52:29.322622155 +0100
++++ b/src/subtitleview.cc	2015-12-24 01:52:44.210491213 +0100
+@@ -1363,7 +1363,7 @@
+ 	{
+ 		int num;
+ 		std::istringstream ss(event->string);
+-		bool is_num = ss >> num != 0; 
++		bool is_num = static_cast<bool>(ss >> num) != 0; 
+ 		// Update only if it's different
+ 		if(is_num != get_enable_search())
+ 			set_enable_search(is_num);
+--- a/src/utility.h	2015-12-24 01:49:42.205104858 +0100
++++ b/src/utility.h	2015-12-24 01:50:23.387737071 +0100
+@@ -91,7 +91,7 @@
+ 	std::istringstream s(src);
+ 	// return s >> dest != 0;
+ 
+-	bool state = s >> dest != 0;
++	bool state = static_cast<bool>(s >> dest) != 0;
+ 
+ 	if(!state)
+ 		se_debug_message(SE_DEBUG_UTILITY, "string:'%s'failed.", src.c_str());
+--- a/plugins/actions/dialoguize/dialoguize.cc	2015-12-24 01:06:24.125428454 +0100
++++ b/plugins/actions/dialoguize/dialoguize.cc	2015-12-24 01:06:42.630277006 +0100
+@@ -23,7 +23,7 @@
+  *	along with this program. If not, see <http://www.gnu.org/licenses/>.
+  */
+  
+-#include <auto_ptr.h>
++#include <memory>
+ #include "extension/action.h"
+ #include "i18n.h"
+ #include "debug.h"
+--- a/plugins/actions/documentmanagement/documentmanagement.old	2015-12-24 01:17:13.914730337 +0100
++++ b/plugins/actions/documentmanagement/documentmanagement.cc	2015-12-24 01:17:23.339640430 +0100
+@@ -178,9 +178,9 @@
+ 
+ 		ui_id = ui->new_merge_id();
+ 
+-		#define ADD_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/"name, name, name);
+-		#define ADD_OPEN_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/menu-open/"name, name, name);
+-		#define ADD_SAVE_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/menu-save/"name, name, name);
++		#define ADD_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/" name, name, name);
++		#define ADD_OPEN_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/menu-open/" name, name, name);
++		#define ADD_SAVE_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/menu-save/" name, name, name);
+ 
+ 		ADD_UI("new-document");
+ 		ADD_OPEN_UI("open-document");
diff --git a/media-video/subtitleeditor/files/subtitleeditor-0.52.1-disable-nls-fix.patch b/media-video/subtitleeditor/files/subtitleeditor-0.52.1-disable-nls-fix.patch
new file mode 100644
index 000000000000..08e1558e06b8
--- /dev/null
+++ b/media-video/subtitleeditor/files/subtitleeditor-0.52.1-disable-nls-fix.patch
@@ -0,0 +1,34 @@
+From 0f8700f022c9917336919b35a93883a660144516 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Mon, 17 Oct 2016 00:07:59 +0200
+Subject: [PATCH] Fix compilation with --disable-nls
+
+---
+ src/i18n.h | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/src/i18n.h b/src/i18n.h
+index c8134a7..efce469 100644
+--- a/src/i18n.h
++++ b/src/i18n.h
+@@ -31,6 +31,17 @@
+ 	#include <libintl.h>
+ 	#include <glib/gi18n.h>
+ #else /* NLS is disabled */
++	// In certain environments, some standard headers like <iomanip>
++	// and <locale> include libintl.h. If libintl.h is included after
++	// gettext macros below are defined, it causes a syntax error
++	// at the declaration of the gettext function in libintl.h.
++	//
++	// Fix this by including such a header before defining the macro.
++	//
++	// Note that libintl.h cannot be included directly since in the
++	// ENABLE_NLS=0 case it cannot be assumed that gettext is installed.
++	#include <locale>
++
+ 	#define _(String) (String)
+ 	#define N_(String) (String)
+ 	#define textdomain(String) (String)
+-- 
+2.10.0
+
diff --git a/media-video/subtitleeditor/metadata.xml b/media-video/subtitleeditor/metadata.xml
new file mode 100644
index 000000000000..51a0e86f0f0e
--- /dev/null
+++ b/media-video/subtitleeditor/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>eva@gentoo.org</email>
+	<name>Gilles Dartiguelongue</name>
+</maintainer>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<longdescription lang="en">
+Subtitle Editor is a GTK+3 tool to edit subtitles for GNU/Linux/*BSD. It can be used for new subtitles or as a tool to transform, edit, correct and refine existing subtitle. This program also shows sound waves, which makes it easier to synchronise subtitles to voices.
+</longdescription>
+</pkgmetadata>
diff --git a/media-video/subtitleeditor/subtitleeditor-0.53.0.ebuild b/media-video/subtitleeditor/subtitleeditor-0.53.0.ebuild
new file mode 100644
index 000000000000..d0934d7c5c9f
--- /dev/null
+++ b/media-video/subtitleeditor/subtitleeditor-0.53.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit flag-o-matic gnome2 versionator
+
+DESCRIPTION="GTK+3 subtitle editing tool"
+HOMEPAGE="http://home.gna.org/subtitleeditor/"
+SRC_URI="http://download.gna.org/${PN}/$(get_version_component_range 1-2)/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug nls"
+# opengl would mix gtk+:2 and :3 which is not possible
+
+RDEPEND="
+	>=app-text/enchant-1.4
+	app-text/iso-codes
+	>=dev-cpp/cairomm-1.12
+	>=dev-cpp/glibmm-2.46:2
+	>=dev-cpp/gtkmm-3.18:3.0
+	>=dev-cpp/gstreamermm-1.0:1.0
+	>=dev-cpp/libxmlpp-2.40:2.6
+	dev-libs/glib:2
+	>=dev-libs/libsigc++-2.6:2
+	media-libs/gst-plugins-base:1.0[X,pango]
+	media-libs/gst-plugins-good:1.0
+	media-libs/gstreamer:1.0
+	media-plugins/gst-plugins-meta:1.0
+	x11-libs/gtk+:3
+	nls? ( virtual/libintl )
+"
+#	opengl? (
+#		>=dev-cpp/gtkglextmm-1.2.0-r2:1.0
+#		virtual/opengl )
+# X needed for video output and pango needed for text overlay
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.52.1-disable-nls-fix.patch
+)
+
+src_configure() {
+	# Avoid using --enable-debug as it mocks with CXXFLAGS and LDFLAGS
+	use debug && append-cxxflags -DDEBUG
+
+	gnome2_src_configure \
+		--disable-debug \
+		--disable-gl \
+		$(use_enable nls)
+#		$(use_enable opengl gl)
+}
diff --git a/media-video/subtitleeditor/subtitleeditor-0.54.0.ebuild b/media-video/subtitleeditor/subtitleeditor-0.54.0.ebuild
new file mode 100644
index 000000000000..5c53d4f63b02
--- /dev/null
+++ b/media-video/subtitleeditor/subtitleeditor-0.54.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit flag-o-matic gnome2
+
+DESCRIPTION="GTK+3 subtitle editing tool"
+HOMEPAGE="https://kitone.github.io/subtitleeditor"
+SRC_URI="https://github.com/kitone/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug nls"
+# opengl would mix gtk+:2 and :3 which is not possible
+
+RDEPEND="
+	>=app-text/enchant-1.4
+	app-text/iso-codes
+	>=dev-cpp/cairomm-1.12
+	>=dev-cpp/glibmm-2.46:2
+	>=dev-cpp/gtkmm-3.18:3.0
+	>=dev-cpp/gstreamermm-1.0:1.0
+	>=dev-cpp/libxmlpp-2.40:2.6
+	dev-libs/glib:2
+	>=dev-libs/libsigc++-2.6:2
+	media-libs/gst-plugins-base:1.0[X,pango]
+	media-libs/gst-plugins-good:1.0
+	media-libs/gstreamer:1.0
+	media-plugins/gst-plugins-meta:1.0
+	x11-libs/gtk+:3
+	nls? ( virtual/libintl )
+"
+#	opengl? (
+#		>=dev-cpp/gtkglextmm-1.2.0-r2:1.0
+#		virtual/opengl )
+# X needed for video output and pango needed for text overlay
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.52.1-disable-nls-fix.patch
+)
+
+src_configure() {
+	# Avoid using --enable-debug as it mocks with CXXFLAGS and LDFLAGS
+	use debug && append-cxxflags -DDEBUG
+
+	gnome2_src_configure \
+		--disable-debug \
+		--disable-gl \
+		$(use_enable nls)
+#		$(use_enable opengl gl)
+}
diff --git a/media-video/subtitler-yuv/Manifest b/media-video/subtitler-yuv/Manifest
new file mode 100644
index 000000000000..4709ef2962c3
--- /dev/null
+++ b/media-video/subtitler-yuv/Manifest
@@ -0,0 +1,5 @@
+DIST subtitler-yuv-0.6.5.tgz 568408 SHA256 0e76f76b3cb001c0ed2d1ec51472fde594002c640960c489b6876dda549cbcc9 SHA512 2dabb720896ef0c1bd54a7b8fdf4ab7097d95ba9e81608b713f4dd62c0f8a156d41bb7fe74cb5113f70f5390186fdea3e7d2e9add5d5748b677657ef356117dc WHIRLPOOL 86e6d959750551f08e69391d0d96efcd4f2321cbb4ed96af31ee4628c5fb1e15d3761b96df936ea0ebba6cbac4258ebe9dcf285e74d9661cbadb21faf00ff77a
+EBUILD subtitler-yuv-0.6.5.ebuild 828 SHA256 3602f611b76d9bedd3a34ca3d0814ba891dde87d5ebba3952a7a8df966e38635 SHA512 4821e3e58a397cecbd6e26ae6987b5186c79c7e9b4671a52857b81e5a00886fb7c0d91820ac235345b6acb8f3f7f796b803138b47c477afe2f1b94578dc2ffd7 WHIRLPOOL b96e24c7cce2ef8bce7cdc541393d0da4f32f47309e50e97395080387caf568c91e011691b1baafd5420f1f22f0949878c70df343f6b1819ec6ed01d9ed6c752
+MISC ChangeLog 2448 SHA256 c403dfcf05e5c6eac14bfd7f678e52ca13f6f58b9ea0cc8b7fe2df266fca003e SHA512 a0ef90d49eff40aba8d09835004af5dd84f09bc221e33959e0e7f8a52a53e4a6fd6d07f3a9eeddc636f5026c8da881899ee923de37f453bc086a50e473715279 WHIRLPOOL 04b12974dca37b686a80040b91916644bfaf513086b4d52f3132d7f94b9671810af120ba13c5ef8119ac828d86dab3dc7a73f17fcb918d6a3a5b9d8db2a4b56b
+MISC ChangeLog-2015 1669 SHA256 ec0b09af86d45e8e8e14961c6378eeaef40c5a1ec1f0ccb7bb5f84233a22ba03 SHA512 fccd3c3a4b34018f38a007f7eab575d006c7250cde2a899bf4b077f879cb1e1a1ad29643d5900d03434ab40d9afd5b66156e39b5f8c2fea67502ffe62fa07feb WHIRLPOOL 241ef32df8fd2895466ce907eda96c6f6542f582ff0c3b58419252126b079095fd8c69050485acf9e56f1c430c835fb052e5a4f06eaebacadf20bb9a7259cd2a
+MISC metadata.xml 334 SHA256 1b61d5baf9df2aebda9834fb60e1786d79c49a54cf1af65d776aa811c5279805 SHA512 ea6800418e6612cab28cc5d0fb977d8227deaef467662b6c8619b974062c47b0658ff1e621b8fb85309c0f87f04afe3903053af1c21c629018a27eeec7f6c8de WHIRLPOOL 1e0db80c7c174d63a4d2f65998ca482e9b9d86e29b999c918c37345d3b7dbb767f925ca1ca449e6725bd30464307577d9b948a8cca0f6900c8857c62083ec7cf
diff --git a/media-video/subtitler-yuv/metadata.xml b/media-video/subtitler-yuv/metadata.xml
new file mode 100644
index 000000000000..eded805f8eed
--- /dev/null
+++ b/media-video/subtitler-yuv/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>lordvan@gentoo.org</email>
+</maintainer>
+<maintainer type="project">
+  <email>media-video@gentoo.org</email>
+  <name>Gentoo Video project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-video/subtitler-yuv/subtitler-yuv-0.6.5.ebuild b/media-video/subtitler-yuv/subtitler-yuv-0.6.5.ebuild
new file mode 100644
index 000000000000..d1e7738874fe
--- /dev/null
+++ b/media-video/subtitler-yuv/subtitler-yuv-0.6.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit toolchain-funcs
+
+DESCRIPTION="for mjpegtools for adding subtitles, pictures, and effects embedded in the picture"
+HOMEPAGE="http://panteltje.com/panteltje/subtitles/"
+SRC_URI="mirror://gentoo/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXt"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -i \
+		-e '/^CFLAGS/s:= -O2:+=:' \
+		-e '/CFLAGS/s:gcc:$(CC):' \
+		-e 's:gcc -o:$(CC) $(LDFLAGS) -o:' \
+		-e 's:-L/usr/X11R6/lib/::' \
+		-e 's:-lXpm:-lX11:' \
+		Makefile || die
+}
+
+src_compile() {
+	tc-export CC
+	emake
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc CHANGES HOWTO_USE_THIS README*
+	insinto /usr/share/${PN}
+	doins *.{ppm,ppml,zip}
+}
diff --git a/media-video/subtitleripper/Manifest b/media-video/subtitleripper/Manifest
new file mode 100644
index 000000000000..f8c7afbe3fdf
--- /dev/null
+++ b/media-video/subtitleripper/Manifest
@@ -0,0 +1,9 @@
+AUX subtitleripper-0.3.4-glibc210.patch 772 SHA256 9881dbdca45a896984ce9e2f3c774e2e5acd9d0cd2e8779366a2ff4ac604aada SHA512 ff29a8523aa666d403671d300fd02ce0cc6216c231b35c8599a99195003365bb127ba168d866d7c53657edc38a692128042c53ec2f7f6e8503f36625657f3624 WHIRLPOOL 0fb6004bc911868a40449d166cff61287902470932cab2d9a225b0175751e0ebfea380612ac4b3582bde63cbd4eb351960aa30d8d1a97e38f3fc7e24957e0b47
+AUX subtitleripper-0.3.4-libpng.patch 574 SHA256 1c95f9e59da924e9bb88287ac63b29567651440036c7f0c4d9614ab3f9fd581f SHA512 1d1a4c03c4949bc0da805fd49c955a8a9c64751a78e45e9592e559449cf92e54e99bff1ea667e742eb37fdab71ea4813ee99d078ea693df2d8f0e82f2e6444cd WHIRLPOOL 9d1706e6ece7d15764e2dd530e64ae8519d7952ccf98454b651dda21c2bcffc8fcc03a3c8998ff47ab4725d013a45c65e43b3385e83e50625ac8e5d45f035610
+AUX subtitleripper-0.3.4-linkingorder.patch 732 SHA256 fe79f5aa9626cd39346f805d2514e3253ed0e5c239741a01c30e715b1b57fd54 SHA512 27d84a80217917986f945735bf66e725120e29aa88885207e8a619e372fd8bfd65c4240d98df93b51f69e83969cc0e9996debe7de87aca16853c85c752c8ca3a WHIRLPOOL ce7a9f177e72f69a5ade9ab5746881217c0032727f4e6ae96aedcb1cea94ee4d423a61ee6e5a67adaf511d148ee854a7fd0e2e23f3d9ca80c25add4e122a7a23
+AUX subtitleripper-0.3.4-respect-ldflags.patch 762 SHA256 3e31fa7baac3c1ca929e2601d08a7e2cc68baf18791d2daedc7cea3132029944 SHA512 a3de917412395689bd3870ba0e1406b24d04a5080b57c05fb0f2ef0716e84e4f8d4693d6448a4a5415133729469cb32a06e858e6ba69984252e34d031974c328 WHIRLPOOL 099e1e3f9be96ba028674d27c22027c6274d25adae2e424bcad340162dc7f9b2585618a62d6b307654866aa648954f0521e7de3fb62cab94ffa594450031ec9b
+DIST subtitleripper-0.3-4.tgz 47299 SHA256 8af6c2ebe55361900871c731ea1098b1a03efa723cd29ee1d471435bd21f3ac4 SHA512 6d25a43b5b1bf8a6c69200c8bab995265356d1235a872bb641d30dbf27b765be9280325b4dd8aa625c25a865563bd7525dd277682d5baeff3c54951da7b9a86a WHIRLPOOL fd5f2703cb509cd6cad4158b2883ddcd974996591c9367d18a811ee5f9bf79139e77362067e97b9c691c14af7e94be2093d15fb6248a847be26eee95176347d8
+EBUILD subtitleripper-0.3.4-r4.ebuild 1374 SHA256 d0a92198bb6fe40520cdff65b2f79705ab4381aac212ef341d1a6274147636ab SHA512 91f7b54ed7c24d3a6c756e03de2cfa73ea458123182c51e5ed41f296eabd6ff2a02f0ceec2ac8005bb437a0c11822a4d998e848bb87f3b66d9b733c0fc12cbcc WHIRLPOOL 3828bee780a4599593f4b456fcf0e14b097a515aa9c803f0361b9380d333f1cd220e937b66b02f0bc3850914906519606fe82e67f4b5a9fb1aed8ce75416c461
+MISC ChangeLog 2650 SHA256 d3ba7a3b83ee83bc4383e1182c039910c8c9cd37173e0348321da1936e410a08 SHA512 92d7095681f838cafc57f7217d7e299f67cde07fffa55f97b73e668fc6618f594892094becef400cc9a87d39ba9b2f0a7c700ad9cdbcca80be7942bf02d979b2 WHIRLPOOL 568a0a257225845eb5b8c9d33aec44d883f0a6ad0aeac00f8ef23f565e9d045fc0e9199ed43746f361a78d847e87aa0bda25877e2f50c7233bed44735a8a7e22
+MISC ChangeLog-2015 4412 SHA256 7d433d5d328e62a19d6c1233f72f68592b66796e217f72fe3e217e40eff673ed SHA512 3935e249eebc4daea93d10e53784477957c5c12f6ce5d54d46644f0ba693252ca89c3702374c596cc3289f437b36730b3843742627ef8e431a4b757b5412536c WHIRLPOOL a808b13c4c0cab489331887f01b8d992163ddc4cb55d1e04e3cc35c1656625073cdb9ecddab648e249c68218e5a9aedf6dc6c0f289cd919182716aaa501bfd36
+MISC metadata.xml 343 SHA256 2bd3bd28a45b94aad903fec20fef70d5f6687bedb9fa5acc2ff40d02cc39f92a SHA512 7de9a159e7ed1c33d3c48b39b380f41464aa3db757a6ea222eae8162fa78898fc6ed4403f4cd86643676885a294bc0cad438884fcc10fc63a69f2856cffa5e14 WHIRLPOOL 34beb09ae5c2441b1ba31423b48c907ce28b9ecaf7797d367407b08f8ba683bd324bb1e2f243817629051f9fa3c339f6722e31e0893a50fedf661466124f8868
diff --git a/media-video/subtitleripper/files/subtitleripper-0.3.4-glibc210.patch b/media-video/subtitleripper/files/subtitleripper-0.3.4-glibc210.patch
new file mode 100644
index 000000000000..8dc2b24f9f6a
--- /dev/null
+++ b/media-video/subtitleripper/files/subtitleripper-0.3.4-glibc210.patch
@@ -0,0 +1,21 @@
+diff -Naurp subtitleripper-orig/vobsub.c subtitleripper/vobsub.c
+--- subtitleripper-orig/vobsub.c	2003-12-08 03:28:02.000000000 -0600
++++ subtitleripper/vobsub.c	2009-05-30 19:09:13.266973499 -0600
+@@ -56,7 +56,7 @@ extern ssize_t getline(char **, size_t *
+ /* FIXME This should go into a general purpose library or even a
+    separate file. */
+ static ssize_t
+-getline (char **lineptr, size_t *n, FILE *stream)
++get_line (char **lineptr, size_t *n, FILE *stream)
+ {
+     size_t res = 0;
+     int c;
+@@ -753,7 +753,7 @@ vobsub_parse_one_line(vobsub_t *vob, FIL
+     do {
+ 	size_t line_reserve = 0;
+ 	char *line = NULL;
+-	line_size = getline(&line, &line_reserve, fd);
++	line_size = get_line(&line, &line_reserve, fd);
+ 	if (line_size < 0) {
+ 	    if (line)
+ 		free(line);
diff --git a/media-video/subtitleripper/files/subtitleripper-0.3.4-libpng.patch b/media-video/subtitleripper/files/subtitleripper-0.3.4-libpng.patch
new file mode 100644
index 000000000000..e9869b3bd5dd
--- /dev/null
+++ b/media-video/subtitleripper/files/subtitleripper-0.3.4-libpng.patch
@@ -0,0 +1,25 @@
+diff -NrU5 subtitleripper.orig/spudec.c subtitleripper/spudec.c
+--- subtitleripper.orig/spudec.c	2009-05-20 03:06:23.000000000 -0600
++++ subtitleripper/spudec.c	2009-05-20 03:07:47.000000000 -0600
+@@ -34,17 +34,18 @@
+ 
+ #ifdef _HAVE_ZLIB_
+ #include <zlib.h>
+ #endif
+ 
++#ifdef _HAVE_PNG_
++#include <png.h>
++#endif
++
+ #ifdef _HAVE_LIB_PPM_
+ #include <netpbm/ppm.h>
+ #endif
+ 
+-#ifdef _HAVE_PNG_
+-#include "png.h"
+-#endif
+ 
+ static void spudec_handle_rest(spudec_handle_t *this);
+ 
+ // read a big endian 16 bit value
+ static inline unsigned int get_be16(const unsigned char *p)
diff --git a/media-video/subtitleripper/files/subtitleripper-0.3.4-linkingorder.patch b/media-video/subtitleripper/files/subtitleripper-0.3.4-linkingorder.patch
new file mode 100644
index 000000000000..7efe223460fc
--- /dev/null
+++ b/media-video/subtitleripper/files/subtitleripper-0.3.4-linkingorder.patch
@@ -0,0 +1,28 @@
+Index: subtitleripper/Makefile
+===================================================================
+--- subtitleripper.orig/Makefile
++++ subtitleripper/Makefile
+@@ -70,19 +70,19 @@ vobsub2pgm.o: vobsub2pgm.c vobsub.h spud
+ # Target
+ subtitle2pgm: subtitle2pgm.o spudec.o
+ 	@echo "Linking $@"
+-	@$(CC) $(LIBS) $^ -o $@  
++	@$(CC) $^ -o $@ $(LIBS)
+ 
+ subtitle2vobsub: subtitle2vobsub.o vobsub.o 
+ 	@echo "Linking $@"
+-	@$(CC) $(LIBS) $^ -o $@  
++	@$(CC) $^ -o $@ $(LIBS)
+ 
+ srttool: srttool.o
+ 	@echo "Linking $@"
+-	@$(CC) $(LIBS) -g $^ -o $@  
++	@$(CC) -g $^ -o $@ $(LIBS)
+ 
+ vobsub2pgm: vobsub2pgm.o vobsub.o spudec.o
+ 	@echo "Linking $@"
+-	@$(CC) $(LIBS) -g $^ -o $@  
++	@$(CC) -g $^ -o $@ $(LIBS)
+ 
+ .PHONY: clean dist rpm
+ clean:
diff --git a/media-video/subtitleripper/files/subtitleripper-0.3.4-respect-ldflags.patch b/media-video/subtitleripper/files/subtitleripper-0.3.4-respect-ldflags.patch
new file mode 100644
index 000000000000..2af11d257929
--- /dev/null
+++ b/media-video/subtitleripper/files/subtitleripper-0.3.4-respect-ldflags.patch
@@ -0,0 +1,28 @@
+Index: subtitleripper/Makefile
+===================================================================
+--- subtitleripper.orig/Makefile
++++ subtitleripper/Makefile
+@@ -70,19 +70,19 @@ vobsub2pgm.o: vobsub2pgm.c vobsub.h spud
+ # Target
+ subtitle2pgm: subtitle2pgm.o spudec.o
+ 	@echo "Linking $@"
+-	@$(CC) $^ -o $@ $(LIBS)
++	@$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
+ 
+ subtitle2vobsub: subtitle2vobsub.o vobsub.o 
+ 	@echo "Linking $@"
+-	@$(CC) $^ -o $@ $(LIBS)
++	@$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
+ 
+ srttool: srttool.o
+ 	@echo "Linking $@"
+-	@$(CC) -g $^ -o $@ $(LIBS)
++	@$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
+ 
+ vobsub2pgm: vobsub2pgm.o vobsub.o spudec.o
+ 	@echo "Linking $@"
+-	@$(CC) -g $^ -o $@ $(LIBS)
++	@$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
+ 
+ .PHONY: clean dist rpm
+ clean:
diff --git a/media-video/subtitleripper/metadata.xml b/media-video/subtitleripper/metadata.xml
new file mode 100644
index 000000000000..0534c8e39ec8
--- /dev/null
+++ b/media-video/subtitleripper/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">subtitleripper</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/subtitleripper/subtitleripper-0.3.4-r4.ebuild b/media-video/subtitleripper/subtitleripper-0.3.4-r4.ebuild
new file mode 100644
index 000000000000..7f4c7d7be0ca
--- /dev/null
+++ b/media-video/subtitleripper/subtitleripper-0.3.4-r4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit versionator eutils toolchain-funcs
+
+MY_PV="$(replace_version_separator 2 "-")"
+
+DESCRIPTION="DVD Subtitle Ripper for Linux"
+HOMEPAGE="http://subtitleripper.sourceforge.net/"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc ppc64 x86"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tgz"
+SLOT="0"
+IUSE=""
+RDEPEND=">=media-libs/netpbm-10.41.0
+	media-libs/libpng
+	sys-libs/zlib
+	>=app-text/gocr-0.39"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# PPM library is libnetppm
+	sed -i -e "s:ppm:netpbm:g" Makefile
+	# fix for bug 210435
+	sed -i -e "s:#include <ppm.h>:#include <netpbm/ppm.h>:g" spudec.c subtitle2pgm.c
+	# we will install the gocrfilters into /usr/share/subtitleripper
+	sed -i -e 's:~/sourceforge/subtitleripper/src/:/usr/share/subtitleripper:' pgm2txt
+
+	epatch "${FILESDIR}/${P}-linkingorder.patch"
+	epatch "${FILESDIR}"/${P}-libpng.patch
+	epatch "${FILESDIR}"/${P}-glibc210.patch
+	# respect CC and LDFLAGS
+	sed -i -e "s:CC =.*:CC = $(tc-getCC):" \
+		-e "/^CFLAGS/s: = :& ${CFLAGS} :" "${S}"/Makefile
+	epatch "${FILESDIR}"/${P}-respect-ldflags.patch
+}
+
+src_install () {
+	dobin pgm2txt srttool subtitle2pgm subtitle2vobsub vobsub2pgm
+
+	insinto /usr/share/subtitleripper
+	doins gocrfilter_*.sed
+
+	dodoc ChangeLog README*
+}
diff --git a/media-video/super_demux/Manifest b/media-video/super_demux/Manifest
new file mode 100644
index 000000000000..ad056b5236aa
--- /dev/null
+++ b/media-video/super_demux/Manifest
@@ -0,0 +1,6 @@
+AUX super_demux-0.3.diff 410 SHA256 3ee9ebf5ab6a49d0c0784f3e453fe2a1c846fe15a06f4da4c8ae1bbe7d9aed64 SHA512 b698c913f0b0708d9634096aa5c0c30037f2ef73a9a81a81e58596ae4fecccbbe05794d066fb3e913b245dafccd4f32a97c615f2f0ca020c485c16af1b75feb8 WHIRLPOOL 7d0429c33e2659b450ba79e7709737d00c8a61a38a551de23d66d7dcd8f082724143d939d30ea64bf758e9324c0d9528506226747b681c250475e62892ef8c93
+DIST super_demux-0.3.tgz 10884 SHA256 189a4a2415afcaa2cdd0b188d537c1d2cc32e29e6d95da10dac4f1f339c1db76 SHA512 c11835a41b2ff1703dc67d7cc253d70cfd07085dd1fcb088ecd5d08a87836397d86d896fb939f1b10aefae2344c0b17fe5f267ca41eb1f2e6ea5d75e48493928 WHIRLPOOL 11da6942c02a59c9f676c6e1de4eeb2fc627909a7a3fc3401dd4d1f74ce2655c6d1c5a305719bd0bd4b3aabfaf925089e5527fab167bbc4956175d051aa310af
+EBUILD super_demux-0.3.ebuild 654 SHA256 89630e417067be741500914423b1a4e67e6b47d4f48922fb4690729873325f19 SHA512 c598cf6a6d3ba3093f15f8abfaee1984ae59c86c65221b9cf19f3b86d46e537352b64252b62472ebfd00d2176cce9e4ea1432c82c8f722f8521db53065cc9076 WHIRLPOOL 78023888c590e365f853bb8496cab002fce80dcaf1b79a3fd075436240f108a83e8f9afcebb5b4e89b09bc1072611d2651b4fde2263f0de934f92518094b2ddb
+MISC ChangeLog 2467 SHA256 71e88582794a1a3b5728a0d7b013b138f0d9ffb514d430b85c0e0cf3bf99611c SHA512 75da40611515d88aa30889dad3e41425ea5f8cd62f7edd69e256aaa700b7bd817b6af10cb84e09adb656c7aac70ef047e95e9f510485bc4ad8e113669b2536e1 WHIRLPOOL 02d5f2c750cf95f0d34491a8bc36b46b45a28c80520d6b6e242b515aff6865afe9fd84fbb25dec9d83156f3bcfa1ad60b1a124b3984634e6b707972fe97eaf40
+MISC ChangeLog-2015 502 SHA256 8c11b8ebec927e7e59798f3831bcae47c4825c65f06116de52b3d203e5e7b034 SHA512 4b8ca3f512d9577ad9f14cba459f4e5a6718bca88c52abdfcd1602c87f9aa5e9f9e3b033ed182711d7e039c7b4d67510019da8522ef616630797f2754f4703c6 WHIRLPOOL 93f31243879d225efd3b9d8ca354ec3eb813ddd02b34025230d4842ab3e88432ee09ce1e3a3b71e86dd968a8ab0850a8f3db44219b63b63b6791990f00180396
+MISC metadata.xml 219 SHA256 4246299710294d9f4c0c15b97e8ae7925e01785b962551c6aa27174e99980bcd SHA512 24793c7fd0e2cef8fa5a0efd9bd55fed1e62ff6810199a969d4c0b869bac9b9ec79b288105b73b1b99734320bb13569a8ee00516b5452dd67d91d14dd17038e2 WHIRLPOOL e7f42aba21f5637bb8774cc17a488ecca121e56d5e855a3e956792955b8253f3049e08b2ab258728002263967db02e27914c82ecafee07a6d317bf857d13095f
diff --git a/media-video/super_demux/files/super_demux-0.3.diff b/media-video/super_demux/files/super_demux-0.3.diff
new file mode 100644
index 000000000000..80555cecdc71
--- /dev/null
+++ b/media-video/super_demux/files/super_demux-0.3.diff
@@ -0,0 +1,12 @@
+diff -Naur super_demux-0.3.orig/Makefile super_demux-0.3/Makefile
+--- super_demux-0.3.orig/Makefile	2004-12-15 22:01:31.000000000 +0100
++++ super_demux-0.3/Makefile	2007-10-06 16:58:19.000000000 +0200
+@@ -13,7 +13,7 @@
+ all:
+ 	$(CC) $(CFLAGS) -c $(SRC1)
+ 
+-	$(CC) -o super_demux   $(OBJECT1) $(LIBRARY)
++	$(CC) $(LDFLAGS) -o super_demux   $(OBJECT1) $(LIBRARY)
+ 
+ # DEPENDENCIES
+ super_demux.o : super_demux.c
diff --git a/media-video/super_demux/metadata.xml b/media-video/super_demux/metadata.xml
new file mode 100644
index 000000000000..0427ec20bfd4
--- /dev/null
+++ b/media-video/super_demux/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+<email>media-video@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/media-video/super_demux/super_demux-0.3.ebuild b/media-video/super_demux/super_demux-0.3.ebuild
new file mode 100644
index 000000000000..9e79e39bedcb
--- /dev/null
+++ b/media-video/super_demux/super_demux-0.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit eutils toolchain-funcs flag-o-matic
+
+IUSE=""
+
+DESCRIPTION="DVB transport stream TS to ES demultiplexer"
+HOMEPAGE="http://panteltje.com/panteltje/dvd/"
+SRC_URI="http://panteltje.com/panteltje/dvd/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}.diff"
+}
+
+src_compile() {
+	append-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE	-D_LARGEFILE64_SOURCE
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	dobin super_demux
+	dodoc CHANGES README
+}
diff --git a/media-video/syncplay/Manifest b/media-video/syncplay/Manifest
new file mode 100644
index 000000000000..812724a98062
--- /dev/null
+++ b/media-video/syncplay/Manifest
@@ -0,0 +1,5 @@
+DIST syncplay-1.4.0.tar.gz 539743 SHA256 37fc2b3d1d6d49e2289dcdeffcf24ebdafbc24398411cff4666e09d49405759d SHA512 2266ffafe3b15730a43e3ddd8aa24e99c65ce5a4e95d05bcac745262d310cb846c84c6e5bb061ebb96e89faa0f10e22aacee286db6cbe53cd5f521cb2e5eee1a WHIRLPOOL 68ea8b437c379e2a049efbb9a4258c9d85bdb2d26841ed1100ee7a0083b4e66687bf21826daffd12102acb236b9bede9037f63ead0eba67dbbc5142db309d183
+EBUILD syncplay-1.4.0.ebuild 1358 SHA256 0e6a4996b29b4ab0136cfc169768d713cb2e0d236d46c2b0a6375228ae5d0c09 SHA512 143e8591a326e05a3f07fe70f1df67e54bebaa180e703d8102d5556299fe3e637f5b0ce086c0f16a4757cbbaa87a42502364b2187d923502c7fa0841b3c2fb1b WHIRLPOOL b542e1032d52bee34ab63634442a02bb4d02b94275f847944ea67b71e668e869e2f6d3b589124f2a60ab5274853cb3d72d1799dc612b5924cd744a436a6ecb4e
+EBUILD syncplay-9999.ebuild 1309 SHA256 6aadf78c712c7b90fd2e2eea9afdc800dcf9362bce5def64ced8898d79c5632e SHA512 20927635cf3f40ff0be4c4150c894e2e7b5093b2b0504a3ff0fe0abc6dbe9809a52e445593f06c8a97c3249b7c6fc53a215b7afe9bb1cb2df75a4fe10cdc8ddb WHIRLPOOL dda95c65cad3579c6a41ef2f987a09028472550102217c617babd21bcb0f07b1a2d365da034e7e55977e372e93fd1356492703355f0bb7c6044e93e20132bb1f
+MISC ChangeLog 660 SHA256 1ed9c00f7085a1c3258996731070237b931a0ea6a3657e6bfbd7a693bc9861f2 SHA512 b60cb14a3e25725d362f81bc1611fb03bc002059fb162d3982b268d531bfeea4013b0aa8d80ff0f7dede180690472f1f4da989bdea76951966e1e07f0b79d4fd WHIRLPOOL 49253f8235fe1fb98a0ea5a8981ed7bf16836c1fcf18a5391f4cea752a627a865f5d4feffef75d424db039765792bfe2b3ebe9cbf748498cec82d27396747823
+MISC metadata.xml 679 SHA256 dd3a1a62c1874d252c4260b55f30d85f3cc309d0de861995b99ace5eeef0ed16 SHA512 e997de8e604c16977c8a3dec989c50e9cbfba327e8447277bdaee835e442d77565c2b2092bede04e64babe34f62e1fcd640cc01d6ef56d4c7572bacb1718b714 WHIRLPOOL b7f02f423835c640c974c7554ad5df19a9d1428ac58284993c07a12c4f8767bbe35ce896674af3a1898a6fd48da32a17825f8dbfb0850ee2354137f133e659b7
diff --git a/media-video/syncplay/metadata.xml b/media-video/syncplay/metadata.xml
new file mode 100644
index 000000000000..1ad1d49790cb
--- /dev/null
+++ b/media-video/syncplay/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hilobakho@gmail.com</email>
+		<name>Mykyta Holubakha</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Gentoo Proxy Maintainers Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Syncplay/syncplay</remote-id>
+	</upstream>
+	<use>
+		<flag name="client">Install Syncplay client</flag>
+		<flag name="server">Install Syncplay server</flag>
+		<flag name="gui">Enable gui support</flag>
+		<flag name="vlc">Enable VLC2.x support</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-video/syncplay/syncplay-1.4.0.ebuild b/media-video/syncplay/syncplay-1.4.0.ebuild
new file mode 100644
index 000000000000..a2c620036d4d
--- /dev/null
+++ b/media-video/syncplay/syncplay-1.4.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-r1
+
+MY_PV=${PV/_rc/-RC}
+
+DESCRIPTION="Client/server to synchronize media playback"
+HOMEPAGE="http://syncplay.pl"
+SRC_URI="https://github.com/Syncplay/syncplay/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+client +server gui vlc"
+REQUIRED_USE="vlc? ( client )
+	gui? ( client )
+	${PYTHON_REQUIRED_USE}"
+
+DEPEND=""
+RDEPEND="${PYTHON_DEPS}
+	|| (
+		>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
+		dev-python/twisted-core[${PYTHON_USEDEP}]
+	)
+	gui? ( dev-python/pyside[${PYTHON_USEDEP}] )
+	vlc? ( media-video/vlc[lua] )"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+	default
+	if ! use gui; then
+		sed -i 's/"noGui": False,/"noGui": True,/' \
+			syncplay/ui/ConfigurationGetter.py \
+		|| die "Failed to patch ConfigurationGetter.py"
+	fi
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local MY_MAKEOPTS=( DESTDIR="${D}" PREFIX=/usr )
+	use client && \
+		emake "${MY_MAKEOPTS[@]}" VLC_SUPPORT=$(usex vlc true false) install-client
+	use server && \
+		emake "${MY_MAKEOPTS[@]}" install-server
+}
+
+pkg_postinst() {
+	if use client; then
+		einfo "Syncplay supports the following players:"
+		einfo "media-video/mpv, media-video/mplayer2, media-video/vlc"
+	fi
+}
diff --git a/media-video/syncplay/syncplay-9999.ebuild b/media-video/syncplay/syncplay-9999.ebuild
new file mode 100644
index 000000000000..eec07d40d080
--- /dev/null
+++ b/media-video/syncplay/syncplay-9999.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit git-r3 python-r1
+
+MY_PV=${PV/_rc/-RC}
+
+DESCRIPTION="Client/server to synchronize media playback"
+HOMEPAGE="http://syncplay.pl"
+EGIT_REPO_URI="https://github.com/Syncplay/${PN}.git"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+client +server gui vlc"
+REQUIRED_USE="vlc? ( client )
+	gui? ( client )
+	${PYTHON_REQUIRED_USE}"
+
+DEPEND=""
+RDEPEND="${PYTHON_DEPS}
+	|| (
+		>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
+		dev-python/twisted-core[${PYTHON_USEDEP}]
+	)
+	gui? ( dev-python/pyside[${PYTHON_USEDEP}] )
+	vlc? ( media-video/vlc[lua] )"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+	default
+	if ! use gui; then
+		sed -i 's/"noGui": False,/"noGui": True,/' \
+			syncplay/ui/ConfigurationGetter.py \
+		|| die "Failed to patch ConfigurationGetter.py"
+	fi
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local MY_MAKEOPTS=( DESTDIR="${D}" PREFIX=/usr )
+	use client && \
+		emake "${MY_MAKEOPTS[@]}" VLC_SUPPORT=$(usex vlc true false) install-client
+	use server && \
+		emake "${MY_MAKEOPTS[@]}" install-server
+}
+
+pkg_postinst() {
+	if use client; then
+		einfo "Syncplay supports the following players:"
+		einfo "media-video/mpv, media-video/mplayer2, media-video/vlc"
+	fi
+}
diff --git a/media-video/tcmplex-panteltje/Manifest b/media-video/tcmplex-panteltje/Manifest
new file mode 100644
index 000000000000..8ba245543596
--- /dev/null
+++ b/media-video/tcmplex-panteltje/Manifest
@@ -0,0 +1,6 @@
+DIST tcmplex-panteltje-0.4.7.tgz 81185 SHA256 29c1ea339551fa0acdf078e7a3dcaae857ba6b35bc3381f0741730d07f34380d SHA512 d8e9d802ff9d6a9df5ae9d0c0f5392cbaddcce4dc0977ff587406dd8449903941bd60ceda6b48df812f66f51e2e8cf451f9b23a006eebc736ba64b21bd0d293c WHIRLPOOL be5a02803113533b974d67185dbfde9dd57105118c88f0313252a525ab42ab47705097b8947271d23ff9d916a07b1d3f0239029f2cb6a5aeb193031cd0fa7e97
+EBUILD tcmplex-panteltje-0.4.7-r1.ebuild 549 SHA256 bebec025960ffa249a665865eb57b7ed9acbce3f57497413b40afdb23ef6cad4 SHA512 0378d5dcdd58651e42315543c42c1abe7f441d3e7c95f3eb036b06111475057c43c1158eb013076f16e9bc567e41ec4a2a73497dbd587792b5b21af81061c5e5 WHIRLPOOL 8f1923fe476619e4b8337f4bd837638f2007dd44b3ba4ae9623734802d91d385f59bc0122a7c1077424108f2ba5d751b84d9fa85fb06cd5f341d54c6bad429cf
+EBUILD tcmplex-panteltje-0.4.7.ebuild 551 SHA256 523042574e843b37bed77cd95d428413d568cbaafe8cdde717a4ad2fe312641b SHA512 06bdf7020d45676ad2980db536b63e6f6fc8a0e0771e28632a59a3644145ee625af589dbd5f2eed84dd880f1c4f923314812308a6c4b47bae8c1f2427f09a964 WHIRLPOOL 26460371ad9714c0e73c43829b53332aaeb728725c980420765103ad1d35ceaf3ebaadd06932785a740b72664fa7561786c4ae64739caab34482a3eeae09e930
+MISC ChangeLog 2460 SHA256 4b41e43de7398d4e2c77d30b46d10a4b47019d2fd4cb5d3202ef434afb52b2bc SHA512 71dedcfc2135b3d97faf9b4443d61809bd88c413221c28ec78c1c15b373ebb7162b6d693301457833628932546a8d77d7d7ac3271bfe581387e37187fdcc3fcc WHIRLPOOL 57e7e496540fe5e1f287108412f5901fe22dd8432ab3241429069eba72357eb84f7195b5f10042f001daf11e040cc7184e073204c05ddf39a9b356b2a69da8d2
+MISC ChangeLog-2015 2136 SHA256 c76cc3f0175c9ae78d07cfb059eb58c3a42a2c5cc8067d50b968ce691285e448 SHA512 55096b12410b5c53a350f96bc539f8017a23378f4d6b90e53fdf0f2cbb4e54a581bd724c70d3dd327c93bfcc09fb77a33a96012d07143d3bfc092876d94b9e7a WHIRLPOOL eec0c37ed8cc4e80dc2dfba9bdd469f17298f52afdf69180b9092f5389b4b38c987188f2ed6c98dc956abd7145a2c1b4da2f7cf9314fbdb0cd721a100c027f3c
+MISC metadata.xml 445 SHA256 02f352b99dd02acd18b8d9a39ea807980050213f9b090af1090ab10cc4e4abef SHA512 94b5e8d81a6a63427566d34974ebcfd237b360711122d18c9eae15ae82edb4a2799af75cadb71d2e70e75618e67d8ec5c456eee4ba5da31354c59cb8b3d158e1 WHIRLPOOL 19d6a9feb82e737ec9d166441d844f1a52daed541ba4f1706985844c6ff5961a483022b3bc6050d224e088ebe563664311aa37ead1f8ba9bf8f04f646851b5cc
diff --git a/media-video/tcmplex-panteltje/metadata.xml b/media-video/tcmplex-panteltje/metadata.xml
new file mode 100644
index 000000000000..e4a826d781f5
--- /dev/null
+++ b/media-video/tcmplex-panteltje/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>lordvan@gentoo.org</email>
+</maintainer>
+<maintainer type="person">
+  <email>hd_brummy@gentoo.org</email>
+  <name>Joerg Bornkessel</name>
+</maintainer>
+<maintainer type="project">
+  <email>media-video@gentoo.org</email>
+  <name>Gentoo Video project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-video/tcmplex-panteltje/tcmplex-panteltje-0.4.7-r1.ebuild b/media-video/tcmplex-panteltje/tcmplex-panteltje-0.4.7-r1.ebuild
new file mode 100644
index 000000000000..2d0a5c45d5fb
--- /dev/null
+++ b/media-video/tcmplex-panteltje/tcmplex-panteltje-0.4.7-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Audio video multiplexer for 8 audio channels"
+HOMEPAGE="http://panteltje.com/panteltje/dvd/"
+SRC_URI="http://panteltje.com/panteltje/dvd/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+src_prepare() {
+	sed -e "s:CFLAGS = -O2:CFLAGS +=:" \
+		-e "s:\$(LIBRARY):\$(LIBRARY) \$(LDFLAGS):" \
+		-i Makefile || die
+	default
+}
+
+src_install() {
+	dobin tcmplex-panteltje
+	dodoc CHANGES COPYRIGHT README
+}
diff --git a/media-video/tcmplex-panteltje/tcmplex-panteltje-0.4.7.ebuild b/media-video/tcmplex-panteltje/tcmplex-panteltje-0.4.7.ebuild
new file mode 100644
index 000000000000..1ede98b5f33d
--- /dev/null
+++ b/media-video/tcmplex-panteltje/tcmplex-panteltje-0.4.7.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="3"
+
+inherit eutils
+
+DESCRIPTION="audio video multiplexer for 8 audio channels"
+HOMEPAGE="http://panteltje.com/panteltje/dvd/"
+SRC_URI="http://panteltje.com/panteltje/dvd/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+src_prepare() {
+	sed -e "s:CFLAGS = -O2:CFLAGS +=:" \
+		-e "s:\$(LIBRARY):\$(LIBRARY) \$(LDFLAGS):" \
+		-i Makefile
+}
+
+src_install() {
+	dobin tcmplex-panteltje
+	dodoc CHANGES COPYRIGHT README
+}
diff --git a/media-video/tivodecode/Manifest b/media-video/tivodecode/Manifest
new file mode 100644
index 000000000000..d5cc6f21741d
--- /dev/null
+++ b/media-video/tivodecode/Manifest
@@ -0,0 +1,5 @@
+DIST tivodecode-0.2pre4.tar.gz 124685 SHA256 788839cc4ad66f5b20792e166514411705e8564f9f050584c54c3f1f452e9cdf SHA512 98ccca7b0dcf6dfac127b66ffa86f3c7010f46b324562b9785b9ed1932c518f46353823b95cef9623279c7a07fc2876dc4a09c602bd31568ad0ded0aaf7281a1 WHIRLPOOL 1fe3750e2fa76c24331ac68740adb17dbd28e011d79082b40bb464bec1b794cf74a87b883d85fe7728ff894e08452ab543ff3ca01bd8749967d5db16c6bb67b8
+EBUILD tivodecode-0.2_pre4.ebuild 533 SHA256 958e8102a5cc3e921fc71d9e7c2db366753552196c7755a1f0ed256f45c3f9e4 SHA512 8f8d1928922ca3347133f093d9dfa17719083b5bba05ecd7e385fb4d515e6c85baa27cac94c4e9945d853fd6703b0c73e08f0a3f07a36af49f1f37e25dac6d80 WHIRLPOOL d458c0b8cc11dc521e6a2535d2c9e300615cad9c25b8ac993fb3e948d95042d00fdea336e9f5596e0dbb3dd2790564363d3339d49af2d47668b19aa9b18a8d8a
+MISC ChangeLog 2445 SHA256 851fedda80c9c6aa7f3059af5625b5716c270cb8c591ea9e6181b5fd38a0dcc8 SHA512 8d693369481bca98ce6cfd19813d51a16d01828ff4ee64322dd3c75b6e3da45a45366cee50e4e295c205557d4c58a3d878cda4e04288fdfb09b4c181700a08b4 WHIRLPOOL 269ace95e71202798814f00828b87e6214831d986a663f46c3ce67643cd68c5f38f1cc1e10598a13cbf16aeded5f8a2f1a3ddb47d827505c98ab65bb127afaae
+MISC ChangeLog-2015 601 SHA256 1f0b50e2dd9ca7b2ac5480b953a8f832a1119195162feb3f6df0ebb7abdfa1a2 SHA512 8f9ee8342bf9aa693458ae344533995d71bce5513a67d3f0406a0c72eb93742fb3cd64793a623071f7fd031fcbd6e79982b8ade69d033c74796cff6eceff1e4a WHIRLPOOL a805179095703d7799cb0be86f9332e307ae1f9de0044c74ba47853c136432257f1c06d1a1cddb4c8a96ddb0f4fae4a14f3eacb434964257b8fc14363ccf6896
+MISC metadata.xml 543 SHA256 a7de826981f1a532eac33b7ba3fc697a758f3fe678dfc5f890d4918dca895e8b SHA512 273e54c3d5f42f7afa0eb93d63930ea9f76dbf2573814a0a11b5cd974e32dc406f8f99d555f20012bc2e0337b86e31aef0d4493934201df0b0d14498b4bd4abe WHIRLPOOL bf3d296a77116c1213b85d4e8867a9fb5055af8288017e996b9c39771af026d5861d65848100453cf46c196b7e8c4f9fad8a715b8485672a641e6661a99d7d37
diff --git a/media-video/tivodecode/metadata.xml b/media-video/tivodecode/metadata.xml
new file mode 100644
index 000000000000..e2ad4358bf75
--- /dev/null
+++ b/media-video/tivodecode/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>media-video@gentoo.org</email>
+  </maintainer>
+  <longdescription lang="en">This software converts a .TiVo file (produced by the TiVoToGo functionality on recent TiVo software releases, or from files downloaded through the web interface) to a normal MPEG file.</longdescription>
+  <upstream>
+    <remote-id type="sourceforge">tivodecode</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-video/tivodecode/tivodecode-0.2_pre4.ebuild b/media-video/tivodecode/tivodecode-0.2_pre4.ebuild
new file mode 100644
index 000000000000..1ba29803a1c7
--- /dev/null
+++ b/media-video/tivodecode/tivodecode-0.2_pre4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils versionator
+
+MY_PV="$(delete_version_separator '_')"
+
+DESCRIPTION="TiVo File Decoder"
+HOMEPAGE="http://tivodecode.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc README ChangeLog
+}
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
new file mode 100644
index 000000000000..888b193785dc
--- /dev/null
+++ b/media-video/totem/Manifest
@@ -0,0 +1,7 @@
+DIST totem-3.22.1.tar.xz 1982788 SHA256 10a509d7797b59cda57b324a426f77e567729545459a64afe4a5ac986bd7c53b SHA512 919f313d2af1d72256ccfa1fe41fe897427b7558c2308da8c257e5b5439f90af9a47a905dd692ab4cabec730a5be0e55710932f91bc6e2f63949f5d83c840e97 WHIRLPOOL 71d3785342f971727b78699e8597b94eb2f11fc47dc57848e72dc1d2d9866fe2243c41fb1dcf92b8880a10b8cd303aa28013b956c54ab2501f843dacef42933a
+DIST totem-3.24.0.tar.xz 1987260 SHA256 9bd78f7b940e886b5c809acdfe00a610a834de5080dd40272b92835528a58d01 SHA512 488db91e09b7f5947e81cb5474444c753367542820777faab561582707b012e664f232d3810d543dfbe0823adf3d8302c2fe6cc387f4225a362d15a6df8b4342 WHIRLPOOL 76a796632ce46db085602a54f1adb68bb269ca3d2c3007b4d3a801b4895c3a226666777884bda14f786b6d30ca8accc4f6822c2bd280d42a28cd5c1503db468c
+EBUILD totem-3.22.1-r1.ebuild 3878 SHA256 3e054024863890ddd850ec0209debb8a942f8f78280cbc3c7b045cc4bf5a088b SHA512 b74fb308090d9dc823aab3e83d835c75aa462238a6ebec1f0257386424f15d57b36efdf66dd7ec52f77ecb5c5717d442dafff48ea49da1aeed2bfb2ca6a093e6 WHIRLPOOL 41c0e1a2df72f1d0978a160cfc3f809a8a5344606b57bbc8bc6765a28dd14afe98f8db4e005071d2aa21f573bc070f26be6bc4ff7e28236d2517a5a95f23067d
+EBUILD totem-3.24.0.ebuild 3880 SHA256 622bb94abf2326d6bcc6b92580d7f484b4f21d700ee09c5c5cbabc1ba7a245e8 SHA512 a403eabdd774d6e5d2627fd8894b2f21cdc80231f235766acd5733a68774e3de06e444e50f630ca457ad635d2cf1732d50f1a0ab0b0dac756b889a2256c011d4 WHIRLPOOL 535588c2a639bd6e724f5a4c9b46637a48979e651b636d1883ad46b06b70ce70bd322bf5d062455edfcbc93cbb7b5a842d95771d69e442be9126333e49399b37
+MISC ChangeLog 5290 SHA256 b33e4ccd3dafd164a4ee8ca29befe8fb83904b97d2e9af4dea7bc8d6634e5655 SHA512 d5632c33032821c0be85b489a583d346935345cb26e80d668d9f23158af313e0fdafa28b9d2fdabc072c8aa6c267dfc706d9cb3bacf3e43eee14d437470d7b69 WHIRLPOOL 2b58da8610dbac3009be1c342f220211c1f14fc91e7b23084e22531dcd6bce44d1c6fcccde3d8a425d9165233439fd402ddd024a4e73bbceb2c24a474c8a3900
+MISC ChangeLog-2015 58934 SHA256 63fe8652c34f53872a6876fe55762a81ad5b7976c3f87984d7a024802c52fd34 SHA512 c04a8dba70053e8e4f0227eb6ba0b4d2989316829248434670525b774c9f99056672d20eb18c74c0564c52f2709546ba11b81cdfd54bf30a3598e67d55adfc71 WHIRLPOOL d0ca3a1608dc85ad76b8063c53c7f20861973ba6db1c9086f7d75b2f39398c5eddd88df7c0f266b66beb89c868f8d9061135916d044b14f9313a9c8aed8d5709
+MISC metadata.xml 1203 SHA256 337943e1c466e5a02b80f293b449adff6b7568a4190d3cf9c163b7ac7b757da1 SHA512 d361035197d6ecbd6f2ad3cabc641cae06144148f468b5311c778950806fb0fffc9f2f4685ea557b64c7da67e08830b3ae4d11535849a01b9c06bb1c813b3b08 WHIRLPOOL 82f7a986ad17e744ed85f693467ea167b80eaef457d3a8e0bba5690fec67e875cad561bde073bafb94b6ed1631900ab2fbb11de9c531e87872ec449695c03dfd
diff --git a/media-video/totem/metadata.xml b/media-video/totem/metadata.xml
new file mode 100644
index 000000000000..317e469b5df6
--- /dev/null
+++ b/media-video/totem/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>gstreamer@gentoo.org</email>
+		<name>GStreamer package maintainers</name>
+	</maintainer>
+	<longdescription>
+Totem is movie player for the GNOME desktop. It features a playlist, fullscreen mode, seek and volume controls, as well as a pretty complete keyboard navigation. It comes with added functionality such as a video thumbnailer for Nautilus, Nautilus properties tab and a webcam utility.
+	</longdescription>
+	<use>
+		<flag name="lirc">Enable support for controlling Totem with a remote control
+			using <pkg>app-misc/lirc</pkg></flag>
+		<flag name="nautilus">Enable the nautilus extension</flag>
+		<flag name="python">Build support for <pkg>dev-lang/python</pkg> plugins</flag>
+		<flag name="zeitgeist">Build the plugin to inject events to <pkg>gnome-extra/zeitgeist</pkg></flag>
+	</use>
+</pkgmetadata>
diff --git a/media-video/totem/totem-3.22.1-r1.ebuild b/media-video/totem/totem-3.22.1-r1.ebuild
new file mode 100644
index 000000000000..4728c94373a9
--- /dev/null
+++ b/media-video/totem/totem-3.22.1-r1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes" # plugins are dlopened
+PYTHON_COMPAT=( python{3_4,3_5} )
+PYTHON_REQ_USE="threads"
+
+inherit autotools gnome2 python-single-r1
+
+DESCRIPTION="Media player for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Videos"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="debug +introspection lirc nautilus +python test zeitgeist"
+# see bug #359379
+REQUIRED_USE="
+	python? ( introspection ${PYTHON_REQUIRED_USE} )
+	zeitgeist? ( introspection )
+"
+
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd"
+
+# FIXME:
+# Runtime dependency on gnome-session-2.91
+COMMON_DEPEND="
+	>=dev-libs/glib-2.35:2[dbus]
+	>=dev-libs/libpeas-1.1[gtk]
+	>=dev-libs/libxml2-2.6:2
+	>=dev-libs/totem-pl-parser-3.10.1:0=[introspection?]
+	>=media-libs/clutter-1.17.3:1.0[gtk]
+	>=media-libs/clutter-gst-2.99.2:3.0
+	>=media-libs/clutter-gtk-1.8.1:1.0
+	>=x11-libs/cairo-1.14
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=x11-libs/gtk+-3.19.4:3[introspection?]
+
+	>=media-libs/grilo-0.3.0:0.3[playlist]
+	>=media-libs/gstreamer-1.6.0:1.0
+	>=media-libs/gst-plugins-base-1.6.0:1.0[X,introspection?,pango]
+	media-libs/gst-plugins-good:1.0
+
+	x11-libs/libX11
+
+	gnome-base/gnome-desktop:3=
+	gnome-base/gsettings-desktop-schemas
+
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
+	lirc? ( app-misc/lirc )
+	nautilus? ( >=gnome-base/nautilus-2.91.3 )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}] )
+	zeitgeist? ( >=gnome-extra/zeitgeist-0.9.12 )
+"
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/grilo-plugins:0.3
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/gst-plugins-taglib:1.0
+	x11-themes/adwaita-icon-theme
+	python? (
+		>=dev-libs/libpeas-1.1.0[python,${PYTHON_USEDEP}]
+		dev-python/pyxdg[${PYTHON_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		>=x11-libs/gtk+-3.5.2:3[introspection] )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.5
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.50.1
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xextproto
+	x11-proto/xproto
+
+	dev-libs/gobject-introspection-common
+	gnome-base/gnome-common
+"
+# eautoreconf needs:
+#	app-text/yelp-tools
+#	dev-libs/gobject-introspection-common
+#	gnome-base/gnome-common
+# docbook-xml-dtd is needed for user doc
+# Prevent dev-python/pylint dep, bug #482538
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Prevent pylint usage by tests, bug #482538
+	sed -i -e 's/ check-pylint//' src/plugins/Makefile.plugins || die
+
+	eautoreconf
+	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
+}
+
+src_configure() {
+	# Disabled: sample-python, sample-vala
+	local plugins="apple-trailers,autoload-subtitles,brasero-disc-recorder"
+	plugins+=",im-status,gromit,media-player-keys,ontop"
+	plugins+=",properties,recent,rotation,screensaver,screenshot"
+	plugins+=",skipto,variable-rate,vimeo"
+	use lirc && plugins+=",lirc"
+	use nautilus && plugins+=",save-file"
+	use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
+	use zeitgeist && plugins+=",zeitgeist-dp"
+
+	# pylint is checked unconditionally, but is only used for make check
+	# appstream-util overriding necessary until upstream fixes their macro
+	# to respect configure switch
+	gnome2_src_configure \
+		--disable-run-in-source-tree \
+		--disable-static \
+		--enable-easy-codec-installation \
+		--enable-vala \
+		$(use_enable introspection) \
+		$(use_enable nautilus) \
+		$(use_enable python) \
+		PYLINT=$(type -P true) \
+		VALAC=$(type -P true) \
+		APPSTREAM_UTIL=$(type -P true) \
+		--with-plugins=${plugins}
+}
diff --git a/media-video/totem/totem-3.24.0.ebuild b/media-video/totem/totem-3.24.0.ebuild
new file mode 100644
index 000000000000..34631fb0dd97
--- /dev/null
+++ b/media-video/totem/totem-3.24.0.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes" # plugins are dlopened
+PYTHON_COMPAT=( python{3_4,3_5} )
+PYTHON_REQ_USE="threads"
+
+inherit autotools gnome2 python-single-r1
+
+DESCRIPTION="Media player for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Videos"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="debug +introspection lirc nautilus +python test zeitgeist"
+# see bug #359379
+REQUIRED_USE="
+	python? ( introspection ${PYTHON_REQUIRED_USE} )
+	zeitgeist? ( introspection )
+"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+
+# FIXME:
+# Runtime dependency on gnome-session-2.91
+COMMON_DEPEND="
+	>=dev-libs/glib-2.35:2[dbus]
+	>=dev-libs/libpeas-1.1[gtk]
+	>=dev-libs/libxml2-2.6:2
+	>=dev-libs/totem-pl-parser-3.10.1:0=[introspection?]
+	>=media-libs/clutter-1.17.3:1.0[gtk]
+	>=media-libs/clutter-gst-2.99.2:3.0
+	>=media-libs/clutter-gtk-1.8.1:1.0
+	>=x11-libs/cairo-1.14
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=x11-libs/gtk+-3.19.4:3[introspection?]
+
+	>=media-libs/grilo-0.3.0:0.3[playlist]
+	>=media-libs/gstreamer-1.6.0:1.0
+	>=media-libs/gst-plugins-base-1.6.0:1.0[X,introspection?,pango]
+	media-libs/gst-plugins-good:1.0
+
+	x11-libs/libX11
+
+	gnome-base/gnome-desktop:3=
+	gnome-base/gsettings-desktop-schemas
+
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
+	lirc? ( app-misc/lirc )
+	nautilus? ( >=gnome-base/nautilus-2.91.3 )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}] )
+	zeitgeist? ( >=gnome-extra/zeitgeist-0.9.12 )
+"
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/grilo-plugins:0.3
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/gst-plugins-taglib:1.0
+	x11-themes/adwaita-icon-theme
+	python? (
+		>=dev-libs/libpeas-1.1.0[python,${PYTHON_USEDEP}]
+		dev-python/pyxdg[${PYTHON_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		>=x11-libs/gtk+-3.5.2:3[introspection] )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.5
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.50.1
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xextproto
+	x11-proto/xproto
+
+	dev-libs/gobject-introspection-common
+	gnome-base/gnome-common
+"
+# eautoreconf needs:
+#	app-text/yelp-tools
+#	dev-libs/gobject-introspection-common
+#	gnome-base/gnome-common
+# docbook-xml-dtd is needed for user doc
+# Prevent dev-python/pylint dep, bug #482538
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Prevent pylint usage by tests, bug #482538
+	sed -i -e 's/ check-pylint//' src/plugins/Makefile.plugins || die
+
+	eautoreconf
+	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
+}
+
+src_configure() {
+	# Disabled: sample-python, sample-vala
+	local plugins="apple-trailers,autoload-subtitles,brasero-disc-recorder"
+	plugins+=",im-status,gromit,media-player-keys,ontop"
+	plugins+=",properties,recent,rotation,screensaver,screenshot"
+	plugins+=",skipto,variable-rate,vimeo"
+	use lirc && plugins+=",lirc"
+	use nautilus && plugins+=",save-file"
+	use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
+	use zeitgeist && plugins+=",zeitgeist-dp"
+
+	# pylint is checked unconditionally, but is only used for make check
+	# appstream-util overriding necessary until upstream fixes their macro
+	# to respect configure switch
+	gnome2_src_configure \
+		--disable-run-in-source-tree \
+		--disable-static \
+		--enable-easy-codec-installation \
+		--enable-vala \
+		$(use_enable introspection) \
+		$(use_enable nautilus) \
+		$(use_enable python) \
+		PYLINT=$(type -P true) \
+		VALAC=$(type -P true) \
+		APPSTREAM_UTIL=$(type -P true) \
+		--with-plugins=${plugins}
+}
diff --git a/media-video/tovid/Manifest b/media-video/tovid/Manifest
new file mode 100644
index 000000000000..6fd622e9f1ed
--- /dev/null
+++ b/media-video/tovid/Manifest
@@ -0,0 +1,5 @@
+DIST tovid-0.35.2.tar.gz 527332 SHA256 c1be87b78832093dad31ef3613bbe31575ff60299850abb8bfd449b8b6ef0e89 SHA512 35e1d2a9584127498ee7d4b772fff0643860270dd38018a7fd9c20ef2875bf037235c341b0a001b0fe9a020fb74f9d348729dec0ccb7d97ccdeec508e6fa674e WHIRLPOOL 7c61a51b879bde0724973d2e166f7e1140544bf819c17dea962ca0f409420ccafe5589f7e5ad5f5b1306822cb26df10aa2573317778eed6292b37ed8e8602cc1
+EBUILD tovid-0.35.2-r1.ebuild 1587 SHA256 90f692e07bb2e1e9b67ce257d936bb992b32d48051c50b6d128d5e92bf5056f1 SHA512 db34f1cd1180a58cf83e433e6a2295c376d19c2a3dfc0315e427b19c6d1755bb266992a205b39e1bd98b22f2481f3abed8336007c72156c4403059e6393984be WHIRLPOOL d493d6807c0685ef7d977541209508c53faaedcfcbadead45fca8b694f6903030edfdd63d5fcbf064a5eb9bc5b278c02d26cffb9f45596503ff79f813a1af26d
+MISC ChangeLog 3458 SHA256 3f8f8226bd89ca24e7a66954ee0cbb9c8c2dd891248fc3d5f1c4642acf1ea83d SHA512 47d2d44d1ccfd251bd4e64c7e0870dd53a94ad89fae7ed98a97003b75efe833b9e66f478c41f840de81884a0aeffcb2bbc95968bfb7dd7936f361c8555a62801 WHIRLPOOL ba1e349d8b567f905fb7dc7736769d02419b97b28c3953166bafcefc70f73257b94b89b1696e081079e9c0fa1c7b5279e540ec435e56109277aefaebb6260db5
+MISC ChangeLog-2015 5632 SHA256 aae2f6056030eb756867cfe5a5e77d2d8bb7ce387540d261e97e36aefc5b9ebc SHA512 86fd18236328ba62d7e9d5e0d077d6f24fd43774ee8e48338d30223153d94744d21e14e268271f35eb1044ef288048bc3d13c4ac6e22b7db2e05b2eb3f972a37 WHIRLPOOL 14d60fe281e6253a27b390568b69db06e03fd0386adb7d0a6e86986a79398185536c32a372aa835f4390b93bf114eef2e453118443d0c90fa2e7972e002bcb2a
+MISC metadata.xml 391 SHA256 7b863e6c3048a14775bebbe6a84b9dd901e851479ec90d8c9a099eb0983e5532 SHA512 e1096231249166eeb2536b9f9fad1f9391f4c43abc658f7bc56afb375b4ca9213b6e287ac65c48e6980b674c18a5a222ed2ee6e256611fcc758ec0d93b1ba681 WHIRLPOOL 04c234a7ee085fe607f20616367bf8d42e578b04c150e7131c8d9834f6f919df60cc16e97b8130445eb4ed8510f6ec5a91969c71e3fb098703e2d99788e0bc12
diff --git a/media-video/tovid/metadata.xml b/media-video/tovid/metadata.xml
new file mode 100644
index 000000000000..e755d3397531
--- /dev/null
+++ b/media-video/tovid/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">tovid</remote-id>
+		<remote-id type="github">tovid-suite/tovid</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/tovid/tovid-0.35.2-r1.ebuild b/media-video/tovid/tovid-0.35.2-r1.ebuild
new file mode 100644
index 000000000000..4ad27d6a1211
--- /dev/null
+++ b/media-video/tovid/tovid-0.35.2-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="tk"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 gnome2-utils
+
+DESCRIPTION="A collection of DVD authoring tools"
+HOMEPAGE="http://tovid.wikia.com/wiki/Tovid_Wiki"
+SRC_URI="https://github.com/tovid-suite/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="app-cdr/dvd+rw-tools
+	dev-tcltk/tix
+	media-sound/normalize
+	>=media-sound/sox-14.3.2
+	media-video/dvdauthor
+	>=media-video/mjpegtools-2.0.0
+	|| ( >=media-video/mplayer-1.0_rc4_p20110101[dvdnav] media-video/mpv[libmpv,dvdnav] )
+	sys-devel/bc
+	virtual/ffmpeg
+	virtual/imagemagick-tools[png]"
+DEPEND="app-text/txt2tags"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_install() {
+	distutils-r1_src_install
+	python_optimize
+
+	# punt at least .install.log
+	find "${D}" -name '*.log' -exec rm -f {} +
+}
+
+pkg_preinst() {
+#	REPLACING_VERSIONS="media-video/tovid-0.34"
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	elog "######################################################################"
+	elog "You can install media-video/transcode for additional functionality. It"
+	elog "will speed up the creation of animated submenus with faster seeking."
+	elog "Otherwise FFmpeg/Libav will be used."
+	elog "######################################################################"
+	elog""
+	gnome2_icon_cache_update
+}
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest
new file mode 100644
index 000000000000..7a51679dd9f7
--- /dev/null
+++ b/media-video/transcode/Manifest
@@ -0,0 +1,17 @@
+AUX transcode-1.1.7-ffmpeg-0.10.patch 406 SHA256 9a479ec638a135e43edd65f139f21a9b6700b3555dfdd40fbf01db74a0a18d9f SHA512 2a0607ddec6f2000ef51e82fa2ce5e8e2eb79b07ce7b6a43c0bd986825151f0d37ef4968ba1c960016239ca42f549e9311c201d73a087cb2d3b4ede8274c8810 WHIRLPOOL 7507c1c60c66f0c8792532052471df896bb1368abaaf0e5dc4c6ff5d3f92b4cd8aad9a44585b16b4ba75d79e9aee6d0f4592f880a9f463999ba2264161f482d0
+AUX transcode-1.1.7-ffmpeg-0.11.patch 12718 SHA256 52f62257ad3abcaf72b306549f66b3aee2a38d2b84713b42be26b7fdcd5f203d SHA512 9b39f15d20830fb57f86750a54a5a7c6025ad69733d668df45a06fd1134e0a6ee76a495a883797b41870b156b4b8895a4dcedbd5e28712d69a98baa7b5934663 WHIRLPOOL 11905b35e3b4b24e8e779945d81743520c554c0c8653d466db095d0d02510c2f6a00ce8d632f8993d829607d37ec8887e79401f6da230f1e8352bad7e55b0fe1
+AUX transcode-1.1.7-ffmpeg.patch 2286 SHA256 cbc7514fd85c1c06723b2899530dd743671a5ddb84e371a64a15fd8291d6fd23 SHA512 6c8ca791aba58427f40792b7b24cc85e89951d84e5b77dff02125a3c00934fd0319e8fcab9199eafea604c06b6f5d86e2f296c16b45cc33a28d4e17cd26dc12d WHIRLPOOL ff92e3910da98658cc2f2d3cfdd74ce87345d7134763fe2153b70686f3a1cb77e467e920d491e0dd73edf1d1444bce8cabf9206acf3fb7d9633c0a052feefba2
+AUX transcode-1.1.7-ffmpeg2.patch 21823 SHA256 47dd5d276cf9accf9b7210cb0a94b792629b542833499435fc266c88dc244e5e SHA512 d1ee8c3d22a34930665857f63cef3925e0dfe50aef0bd15b0a1c835d182ec3e33c615915b4cb202fb201fad7edfe1c960466bb399803f4a9eb097b87d2b26605 WHIRLPOOL d6dea0550e49229f25005da380deeec00e810abb50762490326d9f2f71c71ac395f9d7e420d1a7cd9d8e1fe43c754ef5429caa84e2c12be12657fc0602ac60e8
+AUX transcode-1.1.7-ffmpeg24.patch 544 SHA256 d54c943bb088f2457b69919ed97fa7cb0fd1a6700d4c67fdeafff3f14f726fcb SHA512 2d3a10b8022b8bc67678d303ecefea05e4fa95c4c376264e2ef45446b4e7b48485672cb370b5aff7127ad80c1331dd3e422dad17124b099b20e368d4d57259a1 WHIRLPOOL e388afa480b54626d7bc2f5fed91bca1aa3dae2a7d645e12f7a709aca553a3b32cded3f858b29b545c9cc0987df8664c1b769dba84532c28f9d010c1ca7ce169
+AUX transcode-1.1.7-ffmpeg29.patch 14716 SHA256 5588fb722edf51b28725d1b45bb0ffa7bf9b8bf39c37b1ccfbfaa76a0ef9a1b4 SHA512 f581fb587331a45c54f5ef7463391c61af87a515af7c368720261d9ca0fff4a43081479a672801676ecf7fafd4c3b88226c681d4d624f5614d57927ef3b44692 WHIRLPOOL 730d53fa373752565797375107b35ea166a9e1add342045c77dd66636d28821ea7ada7a59c47ec1f27137d99cca5e99243cfa307b7e65f9513a4969820eb6b93
+AUX transcode-1.1.7-freetype251.patch 273 SHA256 0dd6baea9fc401a59fab3f848f256015ccf4e420224969647f2a79fb208621f1 SHA512 40b672e15de03d2f9f9150a3edb61de65f2d37f6fa9c8b0fc5f47d5a8c8dc6feb714163689947e8997ff4d6c243aa5a5ec860ef8c50bf4648166aa64a7396285 WHIRLPOOL 8f03d793695cb9d3e7e5d7c54c70a21dab2367cd472730b898ef758116a1c14951348333a8c1fcde5ec6d2330242c55c8d08cdd0821deee147b133604b438128
+AUX transcode-1.1.7-libav-10.patch 1187 SHA256 99a439ffb4c37f1c2019aed202f0b662e96ded32e4bd4f4515e6035dc63612c8 SHA512 19d64521bc08e1217234e32ec593b1af007b3af4c3728dcaef0ffb3dab2687c0b674b9c0c9fa9f0586422007548b37ada8a452ae5f97ac9a9460b52eaef4bae8 WHIRLPOOL 7a32c615962af8eefb74a2cc26c02080438f8b659a5f0dca63be717a476b443caf93b7a0cedd9581ae34be73aac0f3cdc6b2c9fa7e2afc3576e228ae4ba98161
+AUX transcode-1.1.7-libav-9.patch 1251 SHA256 61f4c6be8cd1d7a3147d57f1d341dfe69356480672ec1b15879d07b150fc9ef3 SHA512 dcdd541bcac70901bc9bd099429c0b1389bf2fdc6c36395133bfab0d6d21f75fb9e2d9b1b2affd510b76e6de4da0d47668ccbedff09fd06ad84f82a1936dfcb6 WHIRLPOOL a798e6466fe8b84cc96b05512f3eb86b565897121daed6389e92e1d3856ae4ad7dd9de8e68d5d320b8df511da27d47d20ee64d5f9d9a2b59c1097e20e25f8c7d
+AUX transcode-1.1.7-preset-force.patch 1199 SHA256 fe95e83093761924ba0fa5b3214e169812f7740c6c3c434845b1b563d4a37241 SHA512 b2406841674b0d021b1a116e3ef1d16a7206db0930d10d98f3a86923040fbe306296acbac1e14020557c0e9b7e9b28bd0de1f9e1ce20c7fb2c190d15adc6decc WHIRLPOOL e7742ba9dd8a9355f64d640d1005f8713dde5d0ec896583792e73ef0143087d0bbd09673df97c7b65bfe637dbc9ddd2afa1c9786725061440de93b94f7500781
+AUX transcode-1.1.7-preset-free.patch 1370 SHA256 2219fe618be2b2c3fbd6e3545cdbd8db8d1c268a0b37bfe867514f871d7d91ef SHA512 46514728ea0970bf69ef0341ea64dae495a1a571a0416cf20cfaa7c922ded0ae8dcfd717c720c53e457a16585722973266e5cc0b509034ed2549338dc9bac912 WHIRLPOOL d7247d7e506bc5fd2ed579d934ceb121a54c93683de143b7c4ffbdd4b33799acc9c1b4e93e90db4788c84bc4320be05ae90d2760a86a979ae1f57fd4e3bf3750
+DIST transcode-1.1.7-imagemagick7.patch 34353 SHA256 4ede15540ea6932954ac332c12dde130bf48e7e4773d1e04d3c3f23038c6ac51 SHA512 4eface4bbeb41bf6b44f4efa9bb6e77a0dbb6e22d881261a5884ab843c98ffaf1f40c180d819db6fd48ff81046032b90d11f771d98ba366d2ee4fab94bb99b18 WHIRLPOOL dbd356b24c62d071f989f42969bacbc851782c5125f30724f673b2e50c0be56a15a38d2c63032ee96f0f184b4affe62ef11323a9ddb6fca0955160dec7cb96ba
+DIST transcode-1.1.7.tar.bz2 2183627 SHA256 1e4e72d8e0dd62a80b8dd90699f5ca64c9b0cb37a5c9325c184166a9654f0a92 SHA512 d6f9674f3f5c3346194120585741ca660eb9ee133085cfce9460a14eaa0cf16fdf291761bd1db78e1c784e4d69a9481c7470cf8357dc7638ee3017620500f45f WHIRLPOOL ccd085b3a2638de92c2d589ff93038fed3d1a760d3513fde2946a805f7efed87813850f5e9eee306ed8efd3608ad9492d16f4c41bd6278379995deb22f92354e
+EBUILD transcode-1.1.7-r3.ebuild 3917 SHA256 a61673fc6f4993342e88fe0c3ecb91633fc1c21ed209993097ea8a62dc2130f7 SHA512 f7fc07a912413723b41f69039e66b13167ae5935a2b70878547c412d13e238ba45c1b9c4be9a686fd35ba3ea79aff3746eb19f081ef359c175344364aa667f61 WHIRLPOOL 7a166440d02df5fc557a313ac623bb9924bff36c19f23feaee5d4d4d9cbeaa492933f476600c97410a17449c239b2bfa32a7c6cc752223f6bfde7854a33ed020
+MISC ChangeLog 3741 SHA256 9a28cdada24b251764468ae7c0d5491572a47bcce8b42f1e662509c4feae3ada SHA512 0fad2b30950b93eb1020b86987d84b77e8957e59366fa88a2218c0067e974094d23bfce2574c0ae5920b3d4abd9c041df5b4e905ee048d6d665f56148859be68 WHIRLPOOL 4263ea198d884c31ffcdad9332c7a8c6874c3250f3a7f271d02bf403df06604c9e51b89b6cf1a4c060e40122b029451e7aa7a82fa0ab375e2b2f41641f4d70ba
+MISC ChangeLog-2015 54077 SHA256 4353c93c26cff4ccb63189eb8d76e221e977f3b206e4eb5875dc041825ef8828 SHA512 ef5c5bd5e11b3b1692824719f38ce9e5360be8639ab5fc6f5d8790c3e3eddbbcb7035d26c4c302f3ee039b690faa55db75db865f037e52dce8b4125c43dd3aa5 WHIRLPOOL 092c6db48b241f3fd25d34ef7672c99bf694aa9eaa7fc2e46a6c816a821840118974c643d77627afd939f5b1addbd1678f037230b25853f63333b2135fcae4da
+MISC metadata.xml 619 SHA256 f3e66b121200ed2cfb79031d8e1d0004982f3438a01af17b970bf17562db71df SHA512 043d39001850f8088e33e7277a579af7cb45b6fd2b3fe4483eb7771340dae8eab14927184f0fab9aedc8934a6d2599ce6231726308079d0ae16e7710f826ad1b WHIRLPOOL f3a85121033a4498fc16f1d2dff81679a5e4e59496ab7d33b8dd712551510d6ae410dd18b132bd93a0b8e253f4b830ff32cb51370fd719bee99e3578062ba2f7
diff --git a/media-video/transcode/files/transcode-1.1.7-ffmpeg-0.10.patch b/media-video/transcode/files/transcode-1.1.7-ffmpeg-0.10.patch
new file mode 100644
index 000000000000..5879b24d2674
--- /dev/null
+++ b/media-video/transcode/files/transcode-1.1.7-ffmpeg-0.10.patch
@@ -0,0 +1,15 @@
+http://bugs.gentoo.org/401287
+
+--- a/filter/filter_pp.c
++++ b/filter/filter_pp.c
+@@ -38,8 +38,8 @@
+ 
+ /* FIXME: these use the filter ID as an index--the ID can grow
+  * arbitrarily large, so this needs to be fixed */
+-static pp_mode_t *mode[100];
+-static pp_context_t *context[100];
++static pp_mode *mode[100];
++static pp_context *context[100];
+ static int width[100], height[100];
+ static int pre[100];
+ 
diff --git a/media-video/transcode/files/transcode-1.1.7-ffmpeg-0.11.patch b/media-video/transcode/files/transcode-1.1.7-ffmpeg-0.11.patch
new file mode 100644
index 000000000000..871d073feade
--- /dev/null
+++ b/media-video/transcode/files/transcode-1.1.7-ffmpeg-0.11.patch
@@ -0,0 +1,303 @@
+Fix build with ffmpeg 0.11.
+https://bugs.gentoo.org/show_bug.cgi?id=419551
+Author: Brennan Shacklett
+
+diff -urN transcode-1.1.7-orig/encode/encode_lavc.c transcode-1.1.7/encode/encode_lavc.c
+--- transcode-1.1.7-orig/encode/encode_lavc.c	2011-11-19 08:50:27.000000000 -0800
++++ transcode-1.1.7/encode/encode_lavc.c	2012-07-03 10:47:03.528009149 -0700
+@@ -114,6 +114,7 @@
+ 
+     AVFrame ff_venc_frame;
+     AVCodecContext ff_vcontext;
++    AVDictionary ** ff_opts;
+ 
+     AVCodec *ff_vcodec;
+ 
+@@ -1036,14 +1037,10 @@
+     SET_FLAG(pd, mv0);
+     SET_FLAG(pd, cbp);
+     SET_FLAG(pd, qpel);
+-    SET_FLAG(pd, alt);
+-    SET_FLAG(pd, vdpart);
+     SET_FLAG(pd, naq);
+     SET_FLAG(pd, ilme);
+     SET_FLAG(pd, ildct);
+     SET_FLAG(pd, aic);
+-    SET_FLAG(pd, aiv);
+-    SET_FLAG(pd, umv);
+     SET_FLAG(pd, psnr);
+     SET_FLAG(pd, trell);
+     SET_FLAG(pd, gray);
+@@ -1064,6 +1061,18 @@
+         pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_DCT;
+         pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME;
+     }
++    if (pd->confdata.flags.alt) {
++        av_dict_set(pd->ff_opts, "alternate_scan", "1", 0);
++    }
++    if (pd->confdata.flags.vdpart) {
++        av_dict_set(pd->ff_opts, "data_partitioning", "1", 0);
++    }
++    if (pd->confdata.flags.umv) {
++        av_dict_set(pd->ff_opts, "umv", "1", 0);
++    }
++    if (pd->confdata.flags.aiv) {
++        av_dict_set(pd->ff_opts, "aiv", "1", 0);
++    }
+ }
+ 
+ #undef SET_FLAG
+@@ -1184,18 +1193,18 @@
+         { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 },
+         { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD },
+         { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL },
+-        { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN },
++        { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 },
+         { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME },
+         { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_DCT },
+         { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_NORMALIZE_AQP },
+-        { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART },
++        { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, 1 },
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+         { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC },
+ #else        
+         { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED },
+ #endif
+-        { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIV },
+-        { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV },
++        { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, 1 },
++        { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, 1 },
+         { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR },
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+         { "trell", PAUX(flags.trell), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT },
+@@ -1387,7 +1396,7 @@
+                     pd->confdata.thread_count,
+                     (pd->confdata.thread_count > 1) ?"s" :"");
+     }
+-    avcodec_thread_init(&pd->ff_vcontext, pd->confdata.thread_count);
++    pd->ff_vcontext.thread_count = pd->confdata.thread_count;
+ 
+     pd->ff_vcodec = avcodec_find_encoder(FF_VCODEC_ID(pd));
+     if (pd->ff_vcodec == NULL) {
+@@ -1397,11 +1406,11 @@
+     }
+ 
+     TC_LOCK_LIBAVCODEC;
+-    ret = avcodec_open(&pd->ff_vcontext, pd->ff_vcodec);
++    ret = avcodec_open2(&pd->ff_vcontext, pd->ff_vcodec, pd->ff_opts);
+     TC_UNLOCK_LIBAVCODEC;
+ 
+     if (ret < 0) {
+-        tc_log_error(MOD_NAME, "avcodec_open() failed");
++        tc_log_error(MOD_NAME, "avcodec_open2() failed");
+         goto failed;
+     }
+     /* finally, pass up the extradata, if any */
+diff -urN transcode-1.1.7-orig/export/export_ffmpeg.c transcode-1.1.7/export/export_ffmpeg.c
+--- transcode-1.1.7-orig/export/export_ffmpeg.c	2011-11-19 08:50:27.000000000 -0800
++++ transcode-1.1.7/export/export_ffmpeg.c	2012-07-03 13:15:23.918019415 -0700
+@@ -122,6 +122,7 @@
+ static AVFrame             *lavc_convert_frame = NULL;
+ 
+ static AVCodec             *lavc_venc_codec = NULL;
++static AVDictionary        **lavc_venc_opts = NULL;
+ static AVFrame             *lavc_venc_frame = NULL;
+ static AVCodecContext      *lavc_venc_context;
+ static avi_t               *avifile = NULL;
+@@ -180,7 +181,7 @@
+ 
+ 
+ /* START: COPIED FROM ffmpeg-0.5_p22846(ffmpeg.c, cmdutils.c) */
+-#include <libavcodec/opt.h>
++#include <libavutil/opt.h>
+ #include <libavutil/avstring.h>
+ #include <libswscale/swscale.h>
+ 
+@@ -470,7 +471,6 @@
+     }
+ 
+     TC_LOCK_LIBAVCODEC;
+-    avcodec_init();
+     avcodec_register_all();
+     TC_UNLOCK_LIBAVCODEC;
+ 
+@@ -634,7 +634,7 @@
+         lavc_param_rc_max_rate = 2516;
+         lavc_param_rc_buffer_size = 224 * 8;
+         lavc_param_rc_buffer_aggressivity = 99;
+-        lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET;
++        lavc_param_scan_offset = 1;
+ 
+         break;
+ 
+@@ -674,7 +674,7 @@
+ 
+         lavc_param_rc_buffer_size = 224 * 8;
+         lavc_param_rc_buffer_aggressivity = 99;
+-        lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET;
++        lavc_param_scan_offset = 1;
+ 
+         break;
+ 
+@@ -887,7 +887,7 @@
+ 		    lavc_venc_context->thread_count);
+     }
+ 
+-    avcodec_thread_init(lavc_venc_context, lavc_param_threads);
++    lavc_venc_context->thread_count = lavc_param_threads;
+ 
+     if (lavc_param_intra_matrix) {
+         char *tmp;
+@@ -1065,15 +1065,10 @@
+     lavc_venc_context->flags |= lavc_param_closedgop;
+     lavc_venc_context->flags |= lavc_param_trunc;
+     lavc_venc_context->flags |= lavc_param_aic;
+-    lavc_venc_context->flags |= lavc_param_umv;
+     lavc_venc_context->flags |= lavc_param_v4mv;
+-    lavc_venc_context->flags |= lavc_param_data_partitioning;
+     lavc_venc_context->flags |= lavc_param_cbp;
+     lavc_venc_context->flags |= lavc_param_mv0;
+     lavc_venc_context->flags |= lavc_param_qp_rd;
+-    lavc_venc_context->flags |= lavc_param_scan_offset;
+-    lavc_venc_context->flags |= lavc_param_ss;
+-    lavc_venc_context->flags |= lavc_param_alt;
+     lavc_venc_context->flags |= lavc_param_ilme;
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)   
+     lavc_venc_context->flags |= lavc_param_trell;
+@@ -1203,7 +1198,6 @@
+ 
+     lavc_venc_context->me_method = ME_ZERO + lavc_param_vme;
+ 
+-
+ 	/* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */
+ 	if (lavc_param_video_preset) {
+ 		avcodec_opts[AVMEDIA_TYPE_VIDEO] = lavc_venc_context;
+@@ -1241,20 +1235,39 @@
+ 		}
+ 	}
+ 
++    if (lavc_param_scan_offset) {
++      av_dict_set(lavc_venc_opts, "scan_offset", "1", 0);
++    }
++
++    if (lavc_param_ss) {
++      av_dict_set(lavc_venc_opts, "structured_slices", "1", 0);
++    }
++
++    if (lavc_param_alt) {
++      av_dict_set(lavc_venc_opts, "alternate_scan", "1", 0);
++    }
++
++    if (lavc_param_umv) {
++      av_dict_set(lavc_venc_opts, "umv", "1", 0);
++    }
++
++    if (lavc_param_data_partitioning) {
++      av_dict_set(lavc_venc_opts, "vdpart", "1", 0);
++    }
+ 
+     //-- open codec --
+     //----------------
+     TC_LOCK_LIBAVCODEC;
+-    ret = avcodec_open(lavc_venc_context, lavc_venc_codec);
++    ret = avcodec_open2(lavc_venc_context, lavc_venc_codec, lavc_venc_opts);
+     TC_UNLOCK_LIBAVCODEC;
+     if (ret < 0) {
+       tc_log_warn(MOD_NAME, "could not open FFMPEG codec");
+       return TC_EXPORT_ERROR;
+     }
+ 
+-    if (lavc_venc_context->codec->encode == NULL) {
++    if (av_codec_is_encoder(lavc_venc_context->codec) == 0) {
+       tc_log_warn(MOD_NAME, "could not open FFMPEG codec "
+-              "(lavc_venc_context->codec->encode == NULL)");
++              "(av_codec_is_encoder(lavc_venc_context->codec) == 0)");
+       return TC_EXPORT_ERROR;
+     }
+ 
+diff -urN transcode-1.1.7-orig/export/ffmpeg_cfg.c transcode-1.1.7/export/ffmpeg_cfg.c
+--- transcode-1.1.7-orig/export/ffmpeg_cfg.c	2011-11-19 08:50:27.000000000 -0800
++++ transcode-1.1.7/export/ffmpeg_cfg.c	2012-07-03 10:09:25.011003254 -0700
+@@ -160,9 +160,9 @@
+     {"vcelim", &lavc_param_chroma_elim_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99},
+     {"vpsize", &lavc_param_packet_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000},
+     {"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99},
+-    {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART},
++    {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, 1},
+ //    {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0},
+-    {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART},
++    {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY},
+     {"mpeg_quant", &lavc_param_mpeg_quant, TCCONF_TYPE_FLAG, 0, 0, 1},
+     {"vi_qfactor", &lavc_param_vi_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0},
+     {"vi_qoffset", &lavc_param_vi_qoffset, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0},
+@@ -211,7 +211,7 @@
+ #else
+     {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED},
+ #endif    
+-    {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV},
++    {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, 1},
+     {"ibias", &lavc_param_ibias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512},
+     {"pbias", &lavc_param_pbias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512},
+     {"coder", &lavc_param_coder, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10},
+@@ -223,9 +223,9 @@
+     {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000},
+     {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QP_RD},
+     {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16},
+-    {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_SLICE_STRUCT},
+-    {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_SVCD_SCAN_OFFSET},
+-    {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN},
++    {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, 1},
++    {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, 1},
++    {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, 1},
+     {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME},
+     {"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000},
+     {"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000},
+diff -urN transcode-1.1.7-orig/import/decode_lavc.c transcode-1.1.7/import/decode_lavc.c
+--- transcode-1.1.7-orig/import/decode_lavc.c	2011-11-19 08:50:27.000000000 -0800
++++ transcode-1.1.7/import/decode_lavc.c	2012-07-03 10:21:46.085005182 -0700
+@@ -181,7 +181,7 @@
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+   lavc_dec_context->error_resilience  = 2;
+ #else
+-  lavc_dec_context->error_recognition = 2;
++  lavc_dec_context->err_recognition = 2;
+ #endif
+   lavc_dec_context->error_concealment = 3;
+   lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT;
+diff -urN transcode-1.1.7-orig/import/import_ffmpeg.c transcode-1.1.7/import/import_ffmpeg.c
+--- transcode-1.1.7-orig/import/import_ffmpeg.c	2011-11-19 08:50:27.000000000 -0800
++++ transcode-1.1.7/import/import_ffmpeg.c	2012-07-03 10:19:36.936004841 -0700
+@@ -314,7 +314,7 @@
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+     lavc_dec_context->error_resilience  = 2;
+ #else
+-    lavc_dec_context->error_recognition = 2;
++    lavc_dec_context->err_recognition = 2;
+ #endif
+     lavc_dec_context->error_concealment = 3;
+     lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT;
+diff -urN transcode-1.1.7-orig/import/probe_ffmpeg.c transcode-1.1.7/import/probe_ffmpeg.c
+--- transcode-1.1.7-orig/import/probe_ffmpeg.c	2011-11-19 08:50:27.000000000 -0800
++++ transcode-1.1.7/import/probe_ffmpeg.c	2012-07-03 10:41:42.782008306 -0700
+@@ -99,8 +99,8 @@
+ 
+     TC_INIT_LIBAVCODEC;
+ 
+-    ret = av_open_input_file(&lavf_dmx_context, ipipe->name,
+-                             NULL, 0, NULL);
++    ret = avformat_open_input(&lavf_dmx_context, ipipe->name,
++                             NULL, NULL);
+     if (ret != 0) {
+         tc_log_error(__FILE__, "unable to open '%s'"
+                                " (libavformat failure)",
+diff -urN transcode-1.1.7-orig/libtc/tcavcodec.h transcode-1.1.7/libtc/tcavcodec.h
+--- transcode-1.1.7-orig/libtc/tcavcodec.h	2011-11-19 08:50:27.000000000 -0800
++++ transcode-1.1.7/libtc/tcavcodec.h	2012-07-03 10:34:43.648007213 -0700
+@@ -53,7 +53,6 @@
+ 
+ #define TC_INIT_LIBAVCODEC do { \
+     TC_LOCK_LIBAVCODEC; \
+-    avcodec_init(); \
+     avcodec_register_all(); \
+     TC_UNLOCK_LIBAVCODEC; \
+ } while (0)
diff --git a/media-video/transcode/files/transcode-1.1.7-ffmpeg.patch b/media-video/transcode/files/transcode-1.1.7-ffmpeg.patch
new file mode 100644
index 000000000000..1e7459830c16
--- /dev/null
+++ b/media-video/transcode/files/transcode-1.1.7-ffmpeg.patch
@@ -0,0 +1,51 @@
+--- a/encode/encode_lavc.c
++++ b/encode/encode_lavc.c
+@@ -955,8 +955,6 @@
+     /* 
+      * context *transcode* (not libavcodec) defaults
+      */
+-    pd->ff_vcontext.mb_qmin                 = 2;
+-    pd->ff_vcontext.mb_qmax                 = 31;
+     pd->ff_vcontext.max_qdiff               = 3;
+     pd->ff_vcontext.max_b_frames            = 0;
+     pd->ff_vcontext.me_range                = 0;
+@@ -1116,8 +1114,6 @@
+         //  handled by transcode core
+         //  { "vqmax", PCTX(qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },
+         //  handled by transcode core
+-        { "mbqmin", PCTX(mb_qmin), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },
+-        { "mbqmax", PCTX(mb_qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },
+         { "lmin", PAUX(lmin), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 },
+         { "lmax", PAUX(lmax), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 },
+         { "vqdiff", PCTX(max_qdiff), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31 },
+--- a/export/ffmpeg_cfg.c
++++ b/export/ffmpeg_cfg.c
+@@ -34,8 +34,6 @@
+ //int lavc_param_vqscale = 0;
+ //int lavc_param_vqmin = 2;
+ //int lavc_param_vqmax = 31;
+-int lavc_param_mb_qmin = 2;
+-int lavc_param_mb_qmax = 31;
+ int lavc_param_lmin = 2;
+ int lavc_param_lmax = 31;
+ int lavc_param_vqdiff = 3;
+@@ -143,8 +141,6 @@
+ //    {"vqscale", &lavc_param_vqscale, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
+ //    {"vqmin", &lavc_param_vqmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
+ //    {"vqmax", &lavc_param_vqmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
+-    {"mbqmin", &lavc_param_mb_qmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
+-    {"mbqmax", &lavc_param_mb_qmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
+     {"lmin", &lavc_param_lmin, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0},
+     {"lmax", &lavc_param_lmax, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0},
+     {"vqdiff", &lavc_param_vqdiff, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
+--- a/export/ffmpeg_cfg.h
++++ b/export/ffmpeg_cfg.h
+@@ -13,8 +13,6 @@
+ //extern int lavc_param_vqscale;
+ //extern int lavc_param_vqmin;
+ //extern int lavc_param_vqmax;
+-extern int lavc_param_mb_qmin;
+-extern int lavc_param_mb_qmax;
+ extern int lavc_param_lmin;
+ extern int lavc_param_lmax;
+ extern int lavc_param_vqdiff;
diff --git a/media-video/transcode/files/transcode-1.1.7-ffmpeg2.patch b/media-video/transcode/files/transcode-1.1.7-ffmpeg2.patch
new file mode 100644
index 000000000000..9a770a6a0def
--- /dev/null
+++ b/media-video/transcode/files/transcode-1.1.7-ffmpeg2.patch
@@ -0,0 +1,557 @@
+Fix build with ffmpeg-2.0.
+Fix segfaults introduced by wrong usage of the av_dict API.
+Fix forgotten parts in the libav9 patch.
+
+Index: transcode-1.1.7/encode/encode_lavc.c
+===================================================================
+--- transcode-1.1.7.orig/encode/encode_lavc.c
++++ transcode-1.1.7/encode/encode_lavc.c
+@@ -74,6 +74,9 @@ struct tclavcconfigdata_ {
+     int lmin;
+     int lmax;
+     int me_method;
++    int luma_elim_threshold;
++    int chroma_elim_threshold;
++    int quantizer_noise_shaping;
+ 
+     /* same as above for flags */
+     struct {
+@@ -114,7 +117,7 @@ struct tclavcprivatedata_ {
+ 
+     AVFrame ff_venc_frame;
+     AVCodecContext ff_vcontext;
+-    AVDictionary ** ff_opts;
++    AVDictionary * ff_opts;
+ 
+     AVCodec *ff_vcodec;
+ 
+@@ -165,6 +168,7 @@ static const TCCodecID tc_lavc_codecs_ou
+     TC_CODEC_ERROR
+ };
+ 
++#if LIBAVCODEC_VERSION_MAJOR < 55
+ static const enum CodecID tc_lavc_internal_codecs[] = {
+     CODEC_ID_MPEG1VIDEO, CODEC_ID_MPEG2VIDEO, CODEC_ID_MPEG4,
+     CODEC_ID_H263I, CODEC_ID_H263P,
+@@ -177,6 +181,20 @@ static const enum CodecID tc_lavc_intern
+     CODEC_ID_MSMPEG4V2, CODEC_ID_MSMPEG4V3,
+     CODEC_ID_NONE
+ };
++#else
++static const enum AVCodecID tc_lavc_internal_codecs[] = {
++    AV_CODEC_ID_MPEG1VIDEO, AV_CODEC_ID_MPEG2VIDEO, AV_CODEC_ID_MPEG4,
++    AV_CODEC_ID_H263I, AV_CODEC_ID_H263P,
++    AV_CODEC_ID_H264,
++    AV_CODEC_ID_WMV1, AV_CODEC_ID_WMV2,
++    AV_CODEC_ID_RV10,
++    AV_CODEC_ID_HUFFYUV, AV_CODEC_ID_FFV1,
++    AV_CODEC_ID_DVVIDEO,
++    AV_CODEC_ID_MJPEG, AV_CODEC_ID_LJPEG,
++    AV_CODEC_ID_MSMPEG4V2, AV_CODEC_ID_MSMPEG4V3,
++    AV_CODEC_ID_NONE
++};
++#endif
+ 
+ static const TCFormatID tc_lavc_formats[] = { TC_FORMAT_ERROR };
+ 
+@@ -938,7 +956,11 @@ static int tc_lavc_settings_from_vob(TCL
+ static void tc_lavc_config_defaults(TCLavcPrivateData *pd)
+ {
+     /* first of all reinitialize lavc data */
++#if LIBAVCODEC_VERSION_MAJOR < 55
+     avcodec_get_context_defaults(&pd->ff_vcontext);
++#else
++    avcodec_get_context_defaults3(&pd->ff_vcontext, NULL);
++#endif
+ 
+     pd->confdata.thread_count = 1;
+ 
+@@ -976,8 +998,8 @@ static void tc_lavc_config_defaults(TCLa
+     pd->ff_vcontext.mpeg_quant              = 0;
+     pd->ff_vcontext.rc_initial_cplx         = 0.0;
+     pd->ff_vcontext.rc_qsquish              = 1.0;
+-    pd->ff_vcontext.luma_elim_threshold     = 0;
+-    pd->ff_vcontext.chroma_elim_threshold   = 0;
++    pd->confdata.luma_elim_threshold     = 0;
++    pd->confdata.chroma_elim_threshold   = 0;
+     pd->ff_vcontext.strict_std_compliance   = 0;
+     pd->ff_vcontext.dct_algo                = FF_DCT_AUTO;
+     pd->ff_vcontext.idct_algo               = FF_IDCT_AUTO;
+@@ -1001,7 +1023,7 @@ static void tc_lavc_config_defaults(TCLa
+     pd->ff_vcontext.intra_quant_bias        = FF_DEFAULT_QUANT_BIAS;
+     pd->ff_vcontext.inter_quant_bias        = FF_DEFAULT_QUANT_BIAS;
+     pd->ff_vcontext.noise_reduction         = 0;
+-    pd->ff_vcontext.quantizer_noise_shaping = 0;
++    pd->confdata.quantizer_noise_shaping = 0;
+     pd->ff_vcontext.flags                   = 0;
+ }
+ 
+@@ -1033,7 +1055,6 @@ static void tc_lavc_dispatch_settings(TC
+ 
+     pd->ff_vcontext.flags = 0;
+     SET_FLAG(pd, mv0);
+-    SET_FLAG(pd, cbp);
+     SET_FLAG(pd, qpel);
+     SET_FLAG(pd, naq);
+     SET_FLAG(pd, ilme);
+@@ -1060,17 +1081,29 @@ static void tc_lavc_dispatch_settings(TC
+         pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME;
+     }
+     if (pd->confdata.flags.alt) {
+-        av_dict_set(pd->ff_opts, "alternate_scan", "1", 0);
++        av_dict_set(&(pd->ff_opts), "alternate_scan", "1", 0);
+     }
+     if (pd->confdata.flags.vdpart) {
+-        av_dict_set(pd->ff_opts, "data_partitioning", "1", 0);
++        av_dict_set(&(pd->ff_opts), "data_partitioning", "1", 0);
+     }
+     if (pd->confdata.flags.umv) {
+-        av_dict_set(pd->ff_opts, "umv", "1", 0);
++        av_dict_set(&(pd->ff_opts), "umv", "1", 0);
+     }
+     if (pd->confdata.flags.aiv) {
+-        av_dict_set(pd->ff_opts, "aiv", "1", 0);
++        av_dict_set(&(pd->ff_opts), "aiv", "1", 0);
+     }
++    if (pd->confdata.flags.cbp) {
++    	av_dict_set(&(pd->ff_opts), "mpv_flags", "+cbp_rd", 0);
++    }
++
++    char buf[1024];
++#define set_dict_opt(val, opt) \
++    snprintf(buf, sizeof(buf), "%i", pd->confdata.val);\
++    av_dict_set(&(pd->ff_opts), opt, buf, 0)
++
++    set_dict_opt(luma_elim_threshold, "luma_elim_threshold");
++    set_dict_opt(chroma_elim_threshold, "chroma_elim_threshold");
++    set_dict_opt(quantizer_noise_shaping, "quantizer_noise_shaping");
+ }
+ 
+ #undef SET_FLAG
+@@ -1155,8 +1188,8 @@ static int tc_lavc_read_config(TCLavcPri
+         { "vrc_init_cplx", PCTX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 },
+         //  { "vrc_init_occupancy",   }, // not yet supported
+         { "vqsquish", PCTX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 },
+-        { "vlelim", PCTX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
+-        { "vcelim", PCTX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
++        { "vlelim", PAUX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
++        { "vcelim", PAUX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
+         { "vstrict", PCTX(strict_std_compliance), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
+         { "vpsize", PCTX(rtp_payload_size), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000 },
+         { "dct", PCTX(dct_algo), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 },
+@@ -1182,12 +1215,12 @@ static int tc_lavc_read_config(TCLavcPri
+         { "ibias", PCTX(intra_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
+         { "pbias", PCTX(inter_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
+         { "nr", PCTX(noise_reduction), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000},
+-        { "qns", PCTX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 },
++        { "qns", PAUX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 },
+         { "inter_matrix_file", inter_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 },
+         { "intra_matrix_file", intra_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 },
+     
+         { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 },
+-        { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD },
++        { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, 1 },
+         { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL },
+         { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 },
+         { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME },
+@@ -1350,6 +1383,8 @@ static int tc_lavc_configure(TCModuleIns
+ 
+     pd = self->userdata;
+ 
++    pd->ff_opts = NULL;
++
+     pd->flush_flag = vob->encoder_flush;
+     
+     /* FIXME: move into core? */
+@@ -1402,7 +1437,7 @@ static int tc_lavc_configure(TCModuleIns
+     }
+ 
+     TC_LOCK_LIBAVCODEC;
+-    ret = avcodec_open2(&pd->ff_vcontext, pd->ff_vcodec, pd->ff_opts);
++    ret = avcodec_open2(&pd->ff_vcontext, pd->ff_vcodec, &(pd->ff_opts));
+     TC_UNLOCK_LIBAVCODEC;
+ 
+     if (ret < 0) {
+Index: transcode-1.1.7/export/export_ffmpeg.c
+===================================================================
+--- transcode-1.1.7.orig/export/export_ffmpeg.c
++++ transcode-1.1.7/export/export_ffmpeg.c
+@@ -122,7 +122,7 @@ static uint8_t             *img_buffer =
+ static AVFrame             *lavc_convert_frame = NULL;
+ 
+ static AVCodec             *lavc_venc_codec = NULL;
+-static AVDictionary        **lavc_venc_opts = NULL;
++static AVDictionary        *lavc_venc_opts = NULL;
+ static AVFrame             *lavc_venc_frame = NULL;
+ static AVCodecContext      *lavc_venc_context;
+ static avi_t               *avifile = NULL;
+@@ -486,7 +486,7 @@ MOD_init
+ 		            codec->name, codec->fourCC, codec->comments);
+     }
+ 
+-    lavc_venc_context = avcodec_alloc_context();
++    lavc_venc_context = avcodec_alloc_context3(lavc_venc_codec);
+     lavc_venc_frame   = avcodec_alloc_frame();
+ 
+     lavc_convert_frame= avcodec_alloc_frame();
+@@ -838,8 +838,13 @@ MOD_init
+     lavc_venc_context->rc_strategy        = lavc_param_vrc_strategy;
+     lavc_venc_context->b_frame_strategy   = lavc_param_vb_strategy;
+     lavc_venc_context->b_quant_offset     = lavc_param_vb_qoffset;
+-    lavc_venc_context->luma_elim_threshold= lavc_param_luma_elim_threshold;
+-    lavc_venc_context->chroma_elim_threshold= lavc_param_chroma_elim_threshold;
++
++    char buf[1024];
++#define set_dict_opt(val, opt) \
++	snprintf(buf, sizeof(buf), "%i", val); \
++	av_dict_set(&lavc_venc_opts, opt, buf, 0)
++    set_dict_opt(lavc_param_luma_elim_threshold, "luma_elim_threshold");
++    set_dict_opt(lavc_param_chroma_elim_threshold, "chroma_elim_threshold");
+     lavc_venc_context->rtp_payload_size   = lavc_param_packet_size;
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)   
+     if (lavc_param_packet_size)
+@@ -870,7 +875,7 @@ MOD_init
+     lavc_venc_context->context_model      = lavc_param_context;
+     lavc_venc_context->scenechange_threshold= lavc_param_sc_threshold;
+     lavc_venc_context->noise_reduction    = lavc_param_noise_reduction;
+-    lavc_venc_context->inter_threshold    = lavc_param_inter_threshold;
++    set_dict_opt(lavc_param_inter_threshold, "inter_threshold");
+     lavc_venc_context->intra_dc_precision = lavc_param_intra_dc_precision;
+     lavc_venc_context->skip_top           = lavc_param_skip_top;
+     lavc_venc_context->skip_bottom        = lavc_param_skip_bottom;
+@@ -1066,9 +1071,11 @@ MOD_init
+     lavc_venc_context->flags |= lavc_param_trunc;
+     lavc_venc_context->flags |= lavc_param_aic;
+     lavc_venc_context->flags |= lavc_param_v4mv;
+-    lavc_venc_context->flags |= lavc_param_cbp;
++    if(lavc_param_cbp)
++    	av_dict_set(&lavc_venc_opts, "mpv_flags", "+cbp_rd", 0);
+     lavc_venc_context->flags |= lavc_param_mv0;
+-    lavc_venc_context->flags |= lavc_param_qp_rd;
++    if(lavc_param_qp_rd)
++    	av_dict_set(&lavc_venc_opts, "mpv_flags", "+qp_rd", 0);
+     lavc_venc_context->flags |= lavc_param_ilme;
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)   
+     lavc_venc_context->flags |= lavc_param_trell;
+@@ -1238,29 +1245,29 @@ MOD_init
+ 	}
+ 
+     if (lavc_param_scan_offset) {
+-      av_dict_set(lavc_venc_opts, "scan_offset", "1", 0);
++      av_dict_set(&lavc_venc_opts, "scan_offset", "1", 0);
+     }
+ 
+     if (lavc_param_ss) {
+-      av_dict_set(lavc_venc_opts, "structured_slices", "1", 0);
++      av_dict_set(&lavc_venc_opts, "structured_slices", "1", 0);
+     }
+ 
+     if (lavc_param_alt) {
+-      av_dict_set(lavc_venc_opts, "alternate_scan", "1", 0);
++      av_dict_set(&lavc_venc_opts, "alternate_scan", "1", 0);
+     }
+ 
+     if (lavc_param_umv) {
+-      av_dict_set(lavc_venc_opts, "umv", "1", 0);
++      av_dict_set(&lavc_venc_opts, "umv", "1", 0);
+     }
+ 
+     if (lavc_param_data_partitioning) {
+-      av_dict_set(lavc_venc_opts, "vdpart", "1", 0);
++      av_dict_set(&lavc_venc_opts, "vdpart", "1", 0);
+     }
+ 
+     //-- open codec --
+     //----------------
+     TC_LOCK_LIBAVCODEC;
+-    ret = avcodec_open2(lavc_venc_context, lavc_venc_codec, lavc_venc_opts);
++    ret = avcodec_open2(lavc_venc_context, lavc_venc_codec, &lavc_venc_opts);
+     TC_UNLOCK_LIBAVCODEC;
+     if (ret < 0) {
+       tc_log_warn(MOD_NAME, "could not open FFMPEG codec");
+Index: transcode-1.1.7/export/ffmpeg_cfg.c
+===================================================================
+--- transcode-1.1.7.orig/export/ffmpeg_cfg.c
++++ transcode-1.1.7/export/ffmpeg_cfg.c
+@@ -214,10 +214,10 @@ TCConfigEntry lavcopts_conf[]={
+     {"context", &lavc_param_context, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10},
+     {"intra_matrix", &lavc_param_intra_matrix, TCCONF_TYPE_STRING, 0, 0, 0},
+     {"inter_matrix", &lavc_param_inter_matrix, TCCONF_TYPE_STRING, 0, 0, 0},
+-    {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD},
++    {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, 1},
+     {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0},
+     {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000},
+-    {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QP_RD},
++    {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, 1},
+     {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16},
+     {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, 1},
+     {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, 1},
+Index: transcode-1.1.7/export/aud_aux.c
+===================================================================
+--- transcode-1.1.7.orig/export/aud_aux.c
++++ transcode-1.1.7/export/aud_aux.c
+@@ -326,10 +326,18 @@ static int tc_audio_init_ffmpeg(vob_t *vob, int o_codec)
+ 
+     switch (o_codec) {
+       case   0x50:
++#if LIBAVCODEC_VERSION_MAJOR < 55
+         codeid = CODEC_ID_MP2;
++#else
++        codeid = AV_CODEC_ID_MP2;
++#endif
+         break;
+       case 0x2000:
++#if LIBAVCODEC_VERSION_MAJOR < 55
+         codeid = CODEC_ID_AC3;
++#else
++        codeid = AV_CODEC_ID_AC3;
++#endif
+         break;
+       default:
+         tc_warn("cannot init ffmpeg with %x", o_codec);
+@@ -346,7 +346,7 @@ static int tc_audio_init_ffmpeg(vob_t *v
+ 
+     //-- set parameters (bitrate, channels and sample-rate) --
+     //--------------------------------------------------------
+-    avcodec_get_context_defaults(&mpa_ctx);
++    avcodec_get_context_defaults3(&mpa_ctx, mpa_codec);
+ #if LIBAVCODEC_VERSION_MAJOR < 53
+     mpa_ctx.codec_type  = CODEC_TYPE_AUDIO;
+ #else
+@@ -359,7 +359,7 @@ static int tc_audio_init_ffmpeg(vob_t *v
+     //-- open codec --
+     //----------------
+     TC_LOCK_LIBAVCODEC;
+-    ret = avcodec_open(&mpa_ctx, mpa_codec);
++    ret = avcodec_open2(&mpa_ctx, mpa_codec, NULL);
+     TC_UNLOCK_LIBAVCODEC;
+     if (ret < 0) {
+         tc_warn("tc_audio_init_ffmpeg: could not open %s codec !",
+@@ -371,7 +371,12 @@ static int tc_audio_init_ffmpeg(vob_t *vob, int o_codec)
+     TC_UNLOCK_LIBAVCODEC;
+     if (ret < 0) {
+         tc_warn("tc_audio_init_ffmpeg: could not open %s codec !",
+-                (codeid == CODEC_ID_MP2) ?"mpa" :"ac3");
++#if LIBAVCODEC_VERSION_MAJOR < 55
++                (codeid == CODEC_ID_MP2)
++#else
++                (codeid == AV_CODEC_ID_MP2)
++#endif
++                ?"mpa" :"ac3");
+         return(TC_EXPORT_ERROR);
+     }
+ 
+Index: transcode-1.1.7/import/import_ffmpeg.c
+===================================================================
+--- transcode-1.1.7.orig/import/import_ffmpeg.c
++++ transcode-1.1.7/import/import_ffmpeg.c
+@@ -58,6 +58,7 @@ struct ffmpeg_codec {
+ };
+ 
+ // fourCC to ID mapping taken from MPlayer's codecs.conf
++#if LIBAVCODEC_VERSION_MAJOR < 55
+ static struct ffmpeg_codec ffmpeg_codecs[] = {
+   {CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41",
+     {"MP41", "DIV1", ""}},
+@@ -106,6 +107,56 @@ static struct ffmpeg_codec ffmpeg_codecs[] = {
+   {CODEC_ID_RAWVIDEO, TC_CODEC_YUV422P, "raw",
+     {"Y42B", ""}},
+   {0, TC_CODEC_UNKNOWN, NULL, {""}}};
++#else
++static struct ffmpeg_codec ffmpeg_codecs[] = {
++  {AV_CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41",
++    {"MP41", "DIV1", ""}},
++  {AV_CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42",
++    {"MP42", "DIV2", ""}},
++  {AV_CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4",
++    {"DIV3", "DIV5", "AP41", "MPG3", "MP43", ""}},
++  {AV_CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4",
++    {"DIVX", "XVID", "MP4S", "M4S2", "MP4V", "UMP4", "DX50", ""}},
++  {AV_CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg",
++    {"MJPG", "AVRN", "AVDJ", "JPEG", "MJPA", "JFIF", ""}},
++  {AV_CODEC_ID_MPEG1VIDEO, TC_CODEC_MPG1, "mpeg1video",
++    {"MPG1", ""}},
++  {AV_CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo",
++    {"DVSD", ""}},
++  {AV_CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1",
++    {"WMV1", ""}},
++  {AV_CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2",
++    {"WMV2", ""}},
++  {AV_CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu",
++    {"HFYU", ""}},
++  {AV_CODEC_ID_H263I, TC_CODEC_H263I, "h263i",
++    {"I263", ""}},
++  {AV_CODEC_ID_H263P, TC_CODEC_H263P, "h263p",
++    {"H263", "U263", "VIV1", ""}},
++  {AV_CODEC_ID_H264, TC_CODEC_H264, "h264",
++    {"H264", "h264", "X264", "x264", "avc1", ""}},
++  {AV_CODEC_ID_RV10, TC_CODEC_RV10, "rv10",
++    {"RV10", "RV13", ""}},
++  {AV_CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1",
++    {"SVQ1", ""}},
++  {AV_CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3",
++    {"SVQ3", ""}},
++  {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video",
++    {"MPG2", ""}},
++  {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG, "mpeg2video",
++    {"MPG2", ""}},
++  {AV_CODEC_ID_ASV1, TC_CODEC_ASV1, "asv1",
++    {"ASV1", ""}},
++  {AV_CODEC_ID_ASV2, TC_CODEC_ASV2, "asv2",
++    {"ASV2", ""}},
++  {AV_CODEC_ID_FFV1, TC_CODEC_FFV1, "ffv1",
++    {"FFV1", ""}},
++  {AV_CODEC_ID_RAWVIDEO, TC_CODEC_YUV420P, "raw",
++    {"I420", "IYUV", ""}},
++  {AV_CODEC_ID_RAWVIDEO, TC_CODEC_YUV422P, "raw",
++    {"Y42B", ""}},
++  {0, TC_CODEC_UNKNOWN, NULL, {""}}};
++#endif
+ 
+ #define BUFFER_SIZE SIZE_RGB_FRAME
+ 
+@@ -302,7 +302,7 @@ do_avi:
+ 
+     // Set these to the expected values so that ffmpeg's decoder can
+     // properly detect interlaced input.
+-    lavc_dec_context = avcodec_alloc_context();
++    lavc_dec_context = avcodec_alloc_context3(lavc_dec_codec);
+     if (lavc_dec_context == NULL) {
+       tc_log_error(MOD_NAME, "Could not allocate enough memory.");
+       return TC_IMPORT_ERROR;
+@@ -324,6 +375,7 @@ do_avi:
+     // XXX: some codecs need extra data
+     switch (codec->id)
+     {
++#if LIBAVCODEC_VERSION_MAJOR < 55
+       case CODEC_ID_MJPEG: extra_data_size  = 28; break;
+       case CODEC_ID_LJPEG: extra_data_size  = 28; break;
+       case CODEC_ID_HUFFYUV: extra_data_size = 1000; break;
+@@ -331,6 +383,15 @@ do_avi:
+       case CODEC_ID_ASV2: extra_data_size = 8; break;
+       case CODEC_ID_WMV1: extra_data_size = 4; break;
+       case CODEC_ID_WMV2: extra_data_size = 4; break;
++#else
++      case AV_CODEC_ID_MJPEG: extra_data_size  = 28; break;
++      case AV_CODEC_ID_LJPEG: extra_data_size  = 28; break;
++      case AV_CODEC_ID_HUFFYUV: extra_data_size = 1000; break;
++      case AV_CODEC_ID_ASV1: extra_data_size = 8; break;
++      case AV_CODEC_ID_ASV2: extra_data_size = 8; break;
++      case AV_CODEC_ID_WMV1: extra_data_size = 4; break;
++      case AV_CODEC_ID_WMV2: extra_data_size = 4; break;
++#endif
+       default: extra_data_size = 0; break;
+     }
+ 
+@@ -344,7 +344,7 @@ do_avi:
+     }
+ 
+     TC_LOCK_LIBAVCODEC;
+-    ret = avcodec_open(lavc_dec_context, lavc_dec_codec);
++    ret = avcodec_open2(lavc_dec_context, lavc_dec_codec, NULL);
+     TC_UNLOCK_LIBAVCODEC;
+     if (ret < 0) {
+       tc_log_warn(MOD_NAME, "Could not initialize the '%s' codec.",
+@@ -360,7 +421,11 @@ do_avi:
+         frame_size = x_dim*y_dim + 2*UV_PLANE_SIZE(IMG_YUV_DEFAULT,x_dim,y_dim);
+ 
+ 	// we adapt the color space
++#if LIBAVCODEC_VERSION_MAJOR < 55
+         if(codec->id == CODEC_ID_MJPEG) {
++#else
++        if(codec->id == AV_CODEC_ID_MJPEG) {
++#endif
+ 	  enable_levels_filter();
+         }
+         break;
+@@ -434,7 +499,11 @@ do_dv:
+       }
+ 
+       // we adapt the color space
++#if LIBAVCODEC_VERSION_MAJOR < 55
+       if(codec->id == CODEC_ID_MJPEG) {
++#else
++      if(codec->id == AV_CODEC_ID_MJPEG) {
++#endif
+         enable_levels_filter();
+       }
+ 
+@@ -504,13 +573,25 @@ MOD_decode {
+       int bkey = 0;
+ 
+       // check for keyframes
++#if LIBAVCODEC_VERSION_MAJOR < 55
+       if (codec->id == CODEC_ID_MSMPEG4V3) {
++#else
++      if (codec->id == AV_CODEC_ID_MSMPEG4V3) {
++#endif
+ 	if (divx3_is_key(buffer)) bkey = 1;
+       }
++#if LIBAVCODEC_VERSION_MAJOR < 55
+       else if (codec->id == CODEC_ID_MPEG4) {
++#else
++      else if (codec->id == AV_CODEC_ID_MPEG4) {
++#endif
+ 	if (mpeg4_is_key(buffer, bytes_read)) bkey = 1;
+       }
++#if LIBAVCODEC_VERSION_MAJOR < 55
+       else if (codec->id == CODEC_ID_MJPEG) {
++#else
++      else if (codec->id == AV_CODEC_ID_MJPEG) {
++#endif
+ 	bkey = 1;
+       }
+ 
+--- a/import/decode_lavc.c
++++ b/import/decode_lavc.c
+@@ -57,6 +57,7 @@ struct ffmpeg_codec {
+ };
+ 
+ // fourCC to ID mapping taken from MPlayer's codecs.conf
++#if LIBAVCODEC_VERSION_MAJOR < 55
+ static struct ffmpeg_codec ffmpeg_codecs[] = {
+   {CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41",
+     {"MP41", "DIV1", ""}},
+@@ -91,6 +92,42 @@ static struct ffmpeg_codec ffmpeg_codecs[] = {
+   {CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video",
+     {"MPG2", ""}},
+   {0, TC_CODEC_UNKNOWN, NULL, {""}}};
++#else
++static struct ffmpeg_codec ffmpeg_codecs[] = {
++  {AV_CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41",
++    {"MP41", "DIV1", ""}},
++  {AV_CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42",
++    {"MP42", "DIV2", ""}},
++  {AV_CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4",
++    {"DIV3", "DIV5", "AP41", "MPG3", "MP43", ""}},
++  {AV_CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4",
++    {"DIVX", "XVID", "MP4S", "M4S2", "MP4V", "UMP4", "DX50", ""}},
++  {AV_CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg",
++    {"MJPG", "AVRN", "AVDJ", "JPEG", "MJPA", "JFIF", ""}},
++  {AV_CODEC_ID_MPEG1VIDEO, TC_CODEC_MPEG1VIDEO, "mpeg1video",
++    {"MPG1", ""}},
++  {AV_CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo",
++    {"DVSD", ""}},
++  {AV_CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1",
++    {"WMV1", ""}},
++  {AV_CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2",
++    {"WMV2", ""}},
++  {AV_CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu",
++    {"HFYU", ""}},
++  {AV_CODEC_ID_H263I, TC_CODEC_H263I, "h263i",
++    {"I263", ""}},
++  {AV_CODEC_ID_H263P, TC_CODEC_H263P, "h263p",
++    {"H263", "U263", "VIV1", ""}},
++  {AV_CODEC_ID_RV10, TC_CODEC_RV10, "rv10",
++    {"RV10", "RV13", ""}},
++  {AV_CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1",
++    {"SVQ1", ""}},
++  {AV_CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3",
++    {"SVQ3", ""}},
++  {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video",
++    {"MPG2", ""}},
++  {0, TC_CODEC_UNKNOWN, NULL, {""}}};
++#endif
+ 
+ 
+ static struct ffmpeg_codec *find_ffmpeg_codec_id(unsigned int transcode_id)
diff --git a/media-video/transcode/files/transcode-1.1.7-ffmpeg24.patch b/media-video/transcode/files/transcode-1.1.7-ffmpeg24.patch
new file mode 100644
index 000000000000..57a91774abc5
--- /dev/null
+++ b/media-video/transcode/files/transcode-1.1.7-ffmpeg24.patch
@@ -0,0 +1,18 @@
+https://bugs.gentoo.org/show_bug.cgi?id=520190
+
+Index: transcode-1.1.7/import/probe_ffmpeg.c
+===================================================================
+--- transcode-1.1.7.orig/import/probe_ffmpeg.c
++++ transcode-1.1.7/import/probe_ffmpeg.c
+@@ -120,7 +120,11 @@ void probe_ffmpeg(info_t *ipipe)
+ 
+     translate_info(lavf_dmx_context, ipipe->probe_info);
+ 
++#if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(53,25,0)
++    avformat_close_input(&lavf_dmx_context);
++#else
+     av_close_input_file(lavf_dmx_context);
++#endif
+     return;
+ }
+ 
diff --git a/media-video/transcode/files/transcode-1.1.7-ffmpeg29.patch b/media-video/transcode/files/transcode-1.1.7-ffmpeg29.patch
new file mode 100644
index 000000000000..7901fc3cc341
--- /dev/null
+++ b/media-video/transcode/files/transcode-1.1.7-ffmpeg29.patch
@@ -0,0 +1,352 @@
+Index: transcode-1.1.7/encode/encode_lavc.c
+===================================================================
+--- transcode-1.1.7.orig/encode/encode_lavc.c
++++ transcode-1.1.7/encode/encode_lavc.c
+@@ -233,7 +233,7 @@ static void pre_encode_video_yuv420p(TCL
+                                      vframe_list_t *vframe)
+ {
+     avpicture_fill((AVPicture *)&pd->ff_venc_frame, vframe->video_buf,
+-                    PIX_FMT_YUV420P,
++                    AV_PIX_FMT_YUV420P,
+                     pd->ff_vcontext.width, pd->ff_vcontext.height);
+ }
+ 
+@@ -247,7 +247,7 @@ static void pre_encode_video_yuv420p_huf
+                     IMG_YUV_DEFAULT,
+                     pd->ff_vcontext.width, pd->ff_vcontext.height);
+     avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf,
+-                   PIX_FMT_YUV422P,
++                   AV_PIX_FMT_YUV422P,
+                    pd->ff_vcontext.width, pd->ff_vcontext.height);
+     ac_imgconvert(src, IMG_YUV_DEFAULT,
+                   pd->ff_venc_frame.data, IMG_YUV422P,
+@@ -263,7 +263,7 @@ static void pre_encode_video_yuv422p(TCL
+                     IMG_YUV422P,
+                     pd->ff_vcontext.width, pd->ff_vcontext.height);
+     avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf,
+-                   PIX_FMT_YUV420P,
++                   AV_PIX_FMT_YUV420P,
+                    pd->ff_vcontext.width, pd->ff_vcontext.height);
+     ac_imgconvert(src, IMG_YUV422P,
+                   pd->ff_venc_frame.data, IMG_YUV420P,
+@@ -275,7 +275,7 @@ static void pre_encode_video_yuv422p_huf
+                                              vframe_list_t *vframe)
+ {
+     avpicture_fill((AVPicture *)&pd->ff_venc_frame, vframe->video_buf,
+-                   PIX_FMT_YUV422P,
++                   AV_PIX_FMT_YUV422P,
+                    pd->ff_vcontext.width, pd->ff_vcontext.height);
+ 
+ }
+@@ -285,7 +285,7 @@ static void pre_encode_video_rgb24(TCLav
+                                    vframe_list_t *vframe)
+ {
+     avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf,
+-                   PIX_FMT_YUV420P,
++                   AV_PIX_FMT_YUV420P,
+                    pd->ff_vcontext.width, pd->ff_vcontext.height);
+     ac_imgconvert(&vframe->video_buf, IMG_RGB_DEFAULT,
+                   pd->ff_venc_frame.data, IMG_YUV420P,
+@@ -610,21 +610,21 @@ static int tc_lavc_set_pix_fmt(TCLavcPri
+       case CODEC_YUV:
+         if (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV) {
+             pd->tc_pix_fmt = TC_CODEC_YUV422P;
+-            pd->ff_vcontext.pix_fmt = PIX_FMT_YUV422P;
++            pd->ff_vcontext.pix_fmt = AV_PIX_FMT_YUV422P;
+             pd->pre_encode_video = pre_encode_video_yuv420p_huffyuv;
+         } else {
+             pd->tc_pix_fmt = TC_CODEC_YUV420P;
+             pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG) 
+-                                       ? PIX_FMT_YUVJ420P
+-                                       : PIX_FMT_YUV420P;
++                                       ? AV_PIX_FMT_YUVJ420P
++                                       : AV_PIX_FMT_YUV420P;
+             pd->pre_encode_video = pre_encode_video_yuv420p;
+         }
+         break;
+       case CODEC_YUV422:
+         pd->tc_pix_fmt = TC_CODEC_YUV422P;
+         pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG) 
+-                                   ? PIX_FMT_YUVJ422P
+-                                   : PIX_FMT_YUV422P;
++                                   ? AV_PIX_FMT_YUVJ422P
++                                   : AV_PIX_FMT_YUV422P;
+         if (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV) {
+             pd->pre_encode_video = pre_encode_video_yuv422p_huffyuv;
+         } else {
+@@ -634,10 +634,10 @@ static int tc_lavc_set_pix_fmt(TCLavcPri
+       case CODEC_RGB:
+         pd->tc_pix_fmt = TC_CODEC_RGB;
+         pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV)
+-                                        ? PIX_FMT_YUV422P
++                                        ? AV_PIX_FMT_YUV422P
+                                         : (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG) 
+-                                           ? PIX_FMT_YUVJ420P
+-                                           : PIX_FMT_YUV420P;
++                                           ? AV_PIX_FMT_YUVJ420P
++                                           : AV_PIX_FMT_YUV420P;
+         pd->pre_encode_video = pre_encode_video_rgb24;
+         break;
+       default:
+@@ -1390,7 +1390,7 @@ static int tc_lavc_configure(TCModuleIns
+     /* FIXME: move into core? */
+     TC_INIT_LIBAVCODEC;
+ 
+-    avcodec_get_frame_defaults(&pd->ff_venc_frame);
++    av_frame_unref(&pd->ff_venc_frame);
+     /*
+      * auxiliary config data needs to be blanked too
+      * before any other operation
+@@ -1523,6 +1523,8 @@ static int tc_lavc_encode_video(TCModule
+                                 vframe_list_t *outframe)
+ {
+     TCLavcPrivateData *pd = NULL;
++    AVPacket pkt;
++    int ret, got_packet = 0;
+ 
+     TC_MODULE_SELF_CHECK(self, "encode_video");
+ 
+@@ -1537,12 +1539,15 @@ static int tc_lavc_encode_video(TCModule
+ 
+     pd->pre_encode_video(pd, inframe); 
+ 
++    av_init_packet(&pkt);
++    pkt.data = outframe->video_buf;
++    pkt.size = inframe->video_size;
++
+     TC_LOCK_LIBAVCODEC;
+-    outframe->video_len = avcodec_encode_video(&pd->ff_vcontext,
+-                                               outframe->video_buf,
+-                                               inframe->video_size,
+-                                               &pd->ff_venc_frame);
++    ret = avcodec_encode_video2(&pd->ff_vcontext,   &pkt,
++    				&pd->ff_venc_frame, &got_packet);
+     TC_UNLOCK_LIBAVCODEC;
++    outframe->video_len = ret ? ret : pkt.size;
+ 
+     if (outframe->video_len < 0) {
+         tc_log_warn(MOD_NAME, "encoder error: size (%i)",
+Index: transcode-1.1.7/export/export_ffmpeg.c
+===================================================================
+--- transcode-1.1.7.orig/export/export_ffmpeg.c
++++ transcode-1.1.7/export/export_ffmpeg.c
+@@ -250,9 +250,9 @@ int opt_default(const char *opt, const c
+     for(type=0; type<AVMEDIA_TYPE_NB && ret>= 0; type++){
+ 		/* GLUE: +if */
+ 		if (type == AVMEDIA_TYPE_VIDEO) {
+-        const AVOption *o2 = av_find_opt(avcodec_opts[0], opt, NULL, opt_types[type], opt_types[type]);
+-        if(o2)
+-            ret = av_set_string3(avcodec_opts[type], opt, arg, 1, &o);
++        o = av_opt_find(avcodec_opts[0], opt, NULL, opt_types[type], opt_types[type]);
++        if(o)
++            ret = av_opt_set(avcodec_opts[type], opt, arg, 0);
+ 		/* GLUE: +if */
+ 		}
+     }
+@@ -267,7 +267,10 @@ int opt_default(const char *opt, const c
+         if(opt[0] == 'a')
+             ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_AUDIO], opt+1, arg, 1, &o);
+         else */ if(opt[0] == 'v')
+-            ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_VIDEO], opt+1, arg, 1, &o);
++	{
++	    o = av_opt_find(avcodec_opts[AVMEDIA_TYPE_VIDEO], opt+1, NULL, 0, 0);
++            ret = av_opt_set(avcodec_opts[AVMEDIA_TYPE_VIDEO], opt+1, arg, 0);
++	}
+ 		/* GLUE: disabling
+         else if(opt[0] == 's')
+             ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_SUBTITLE], opt+1, arg, 1, &o);
+@@ -487,10 +490,10 @@ MOD_init
+     }
+ 
+     lavc_venc_context = avcodec_alloc_context3(lavc_venc_codec);
+-    lavc_venc_frame   = avcodec_alloc_frame();
++    lavc_venc_frame   = av_frame_alloc();
+ 
+-    lavc_convert_frame= avcodec_alloc_frame();
+-    size = avpicture_get_size(PIX_FMT_RGB24, vob->ex_v_width, vob->ex_v_height);
++    lavc_convert_frame= av_frame_alloc();
++    size = avpicture_get_size(AV_PIX_FMT_RGB24, vob->ex_v_width, vob->ex_v_height);
+     enc_buffer = tc_malloc(size);
+ 
+     if (lavc_venc_context == NULL || !enc_buffer || !lavc_convert_frame) {
+@@ -1114,7 +1117,7 @@ MOD_init
+     lavc_venc_context->prediction_method = lavc_param_prediction_method;
+ 
+     if(is_huffyuv)
+-        lavc_venc_context->pix_fmt = PIX_FMT_YUV422P;
++        lavc_venc_context->pix_fmt = AV_PIX_FMT_YUV422P;
+     else
+     {
+         switch(pix_fmt)
+@@ -1123,18 +1126,18 @@ MOD_init
+             case CODEC_RGB:
+             {
+                 if(is_mjpeg)
+-                    lavc_venc_context->pix_fmt = PIX_FMT_YUVJ420P;
++                    lavc_venc_context->pix_fmt = AV_PIX_FMT_YUVJ420P;
+                 else
+-                    lavc_venc_context->pix_fmt = PIX_FMT_YUV420P;
++                    lavc_venc_context->pix_fmt = AV_PIX_FMT_YUV420P;
+                 break;
+             }
+ 
+             case CODEC_YUV422:
+             {
+                 if(is_mjpeg)
+-                    lavc_venc_context->pix_fmt = PIX_FMT_YUVJ422P;
++                    lavc_venc_context->pix_fmt = AV_PIX_FMT_YUVJ422P;
+                 else
+-                    lavc_venc_context->pix_fmt = PIX_FMT_YUV422P;
++                    lavc_venc_context->pix_fmt = AV_PIX_FMT_YUV422P;
+                 break;
+             }
+ 
+@@ -1596,6 +1599,8 @@ MOD_encode
+ 
+   int out_size;
+   const char pict_type_char[5]= {'?', 'I', 'P', 'B', 'S'};
++  AVPacket pkt;
++  int ret, got_packet = 0;
+ 
+   if (param->flag == TC_VIDEO) {
+ 
+@@ -1620,7 +1625,7 @@ MOD_encode
+ 	        	YUV_INIT_PLANES(src, param->buffer, IMG_YUV_DEFAULT,
+ 			                	lavc_venc_context->width, lavc_venc_context->height);
+                 avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer,
+-                               PIX_FMT_YUV422P, lavc_venc_context->width,
++                               AV_PIX_FMT_YUV422P, lavc_venc_context->width,
+                                lavc_venc_context->height);
+         		/* FIXME: can't use tcv_convert (see decode_lavc.c) */
+                 ac_imgconvert(src, IMG_YUV_DEFAULT,
+@@ -1650,7 +1655,7 @@ MOD_encode
+ 		                		lavc_venc_context->width,
+                                 lavc_venc_context->height);
+                 avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer,
+-                               PIX_FMT_YUV420P, lavc_venc_context->width,
++                               AV_PIX_FMT_YUV420P, lavc_venc_context->width,
+                                lavc_venc_context->height);
+                 ac_imgconvert(src, IMG_YUV422P,
+                               lavc_venc_frame->data, IMG_YUV420P,
+@@ -1661,7 +1666,7 @@ MOD_encode
+ 
+         case CODEC_RGB:
+             avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer,
+-                           PIX_FMT_YUV420P, lavc_venc_context->width,
++                           AV_PIX_FMT_YUV420P, lavc_venc_context->width,
+                            lavc_venc_context->height);
+     	    ac_imgconvert(&param->buffer, IMG_RGB_DEFAULT,
+                               lavc_venc_frame->data, IMG_YUV420P,
+@@ -1674,13 +1679,17 @@ MOD_encode
+               return TC_EXPORT_ERROR;
+     }
+ 
++    av_init_packet(&pkt);
++    pkt.data = enc_buffer;
++    pkt.size = size;
+ 
+     TC_LOCK_LIBAVCODEC;
+-    out_size = avcodec_encode_video(lavc_venc_context,
+-                                    enc_buffer, size,
+-                                    lavc_venc_frame);
++    ret = avcodec_encode_video2(lavc_venc_context, &pkt,
++                                    lavc_venc_frame, &got_packet);
+     TC_UNLOCK_LIBAVCODEC;
+ 
++    out_size = ret ? ret : pkt.size;
++
+     if (out_size < 0) {
+       tc_log_warn(MOD_NAME, "encoder error: size (%d)", out_size);
+       return TC_EXPORT_ERROR;
+Index: transcode-1.1.7/import/decode_lavc.c
+===================================================================
+--- transcode-1.1.7.orig/import/decode_lavc.c
++++ transcode-1.1.7/import/decode_lavc.c
+@@ -327,8 +327,8 @@ void decode_lavc(decode_t *decode)
+ 
+       // Convert avcodec image to the requested YUV or RGB format
+       switch (lavc_dec_context->pix_fmt) {
+-	case PIX_FMT_YUVJ420P:
+-	case PIX_FMT_YUV420P:
++	case AV_PIX_FMT_YUVJ420P:
++	case AV_PIX_FMT_YUV420P:
+ 	    // Remove "dead space" at right edge of planes, if any
+ 	    if (picture.linesize[0] != lavc_dec_context->width) {
+ 		int y;
+@@ -352,7 +352,7 @@ void decode_lavc(decode_t *decode)
+ 			  pix_fmt==TC_CODEC_YUV420P ? IMG_YUV420P : IMG_RGB_DEFAULT,
+ 			  lavc_dec_context->width, lavc_dec_context->height);
+ 	    break;
+-	case PIX_FMT_YUV411P:
++	case AV_PIX_FMT_YUV411P:
+ 	    if (picture.linesize[0] != lavc_dec_context->width) {
+ 		int y;
+ 		for (y = 0; y < lavc_dec_context->height; y++) {
+@@ -371,8 +371,8 @@ void decode_lavc(decode_t *decode)
+ 			  pix_fmt==TC_CODEC_YUV420P ? IMG_YUV420P : IMG_RGB_DEFAULT,
+ 			  lavc_dec_context->width, lavc_dec_context->height);
+ 	    break;
+-	case PIX_FMT_YUVJ422P:
+-	case PIX_FMT_YUV422P:
++	case AV_PIX_FMT_YUVJ422P:
++	case AV_PIX_FMT_YUV422P:
+ 	    if (picture.linesize[0] != lavc_dec_context->width) {
+ 		int y;
+ 		for (y = 0; y < lavc_dec_context->height; y++) {
+@@ -391,8 +391,8 @@ void decode_lavc(decode_t *decode)
+ 			  pix_fmt==TC_CODEC_YUV420P ? IMG_YUV420P : IMG_RGB_DEFAULT,
+ 			  lavc_dec_context->width, lavc_dec_context->height);
+ 	    break;
+-	case PIX_FMT_YUVJ444P:
+-	case PIX_FMT_YUV444P:
++	case AV_PIX_FMT_YUVJ444P:
++	case AV_PIX_FMT_YUV444P:
+ 	    if (picture.linesize[0] != lavc_dec_context->width) {
+ 		int y;
+ 		for (y = 0; y < lavc_dec_context->height; y++) {
+Index: transcode-1.1.7/import/import_ffmpeg.c
+===================================================================
+--- transcode-1.1.7.orig/import/import_ffmpeg.c
++++ transcode-1.1.7/import/import_ffmpeg.c
+@@ -661,8 +661,8 @@ retry:
+ 
+     // Convert avcodec image to our internal YUV or RGB format
+     switch (lavc_dec_context->pix_fmt) {
+-      case PIX_FMT_YUVJ420P:
+-      case PIX_FMT_YUV420P:
++      case AV_PIX_FMT_YUVJ420P:
++      case AV_PIX_FMT_YUV420P:
+         src_fmt = IMG_YUV420P;
+         YUV_INIT_PLANES(src_planes, frame, src_fmt,
+                         lavc_dec_context->width, lavc_dec_context->height);
+@@ -693,7 +693,7 @@ retry:
+ 	}
+         break;
+ 
+-      case PIX_FMT_YUV411P:
++      case AV_PIX_FMT_YUV411P:
+         src_fmt = IMG_YUV411P;
+         YUV_INIT_PLANES(src_planes, frame, src_fmt,
+                         lavc_dec_context->width, lavc_dec_context->height);
+@@ -721,8 +721,8 @@ retry:
+         }
+         break;
+ 
+-      case PIX_FMT_YUVJ422P:
+-      case PIX_FMT_YUV422P:
++      case AV_PIX_FMT_YUVJ422P:
++      case AV_PIX_FMT_YUV422P:
+         src_fmt = IMG_YUV422P;
+         YUV_INIT_PLANES(src_planes, frame, src_fmt,
+                         lavc_dec_context->width, lavc_dec_context->height);
+@@ -750,8 +750,8 @@ retry:
+         }
+ 	break;
+ 
+-      case PIX_FMT_YUVJ444P:
+-      case PIX_FMT_YUV444P:
++      case AV_PIX_FMT_YUVJ444P:
++      case AV_PIX_FMT_YUV444P:
+         src_fmt = IMG_YUV444P;
+         YUV_INIT_PLANES(src_planes, frame, src_fmt,
+                         lavc_dec_context->width, lavc_dec_context->height);
diff --git a/media-video/transcode/files/transcode-1.1.7-freetype251.patch b/media-video/transcode/files/transcode-1.1.7-freetype251.patch
new file mode 100644
index 000000000000..59c6ab35a514
--- /dev/null
+++ b/media-video/transcode/files/transcode-1.1.7-freetype251.patch
@@ -0,0 +1,12 @@
+--- transcode-1.1.7/filter/subtitler/load_font.c
++++ transcode-1.1.7/filter/subtitler/load_font.c
+@@ -47,8 +47,8 @@
+ // FreeType specific includes
+ #include <ft2build.h>
+ #include FT_FREETYPE_H
++#include FT_GLYPH_H
+ 
+-#include <freetype/ftglyph.h>
+ 
+ /**
+  * @file bswap.h
diff --git a/media-video/transcode/files/transcode-1.1.7-libav-10.patch b/media-video/transcode/files/transcode-1.1.7-libav-10.patch
new file mode 100644
index 000000000000..1f4a24039d79
--- /dev/null
+++ b/media-video/transcode/files/transcode-1.1.7-libav-10.patch
@@ -0,0 +1,36 @@
+fix building w/libav-10
+
+https://wiki.libav.org/Migration/10
+
+--- a/filter/filter_resample.c
++++ b/filter/filter_resample.c
+@@ -37,6 +37,7 @@
+ #include "libtc/optstr.h"
+ #include "libtc/tcavcodec.h"
+ #include "libtc/tcmodule-plugin.h"
++#include <libavresample/avresample.h>
+ 
+ 
+ typedef struct {
+@@ -45,7 +46,7 @@ typedef struct {
+ 
+     int bytes_per_sample;
+ 
+-    ReSampleContext *resample_ctx;
++    AVAudioResampleContext *resample_ctx;
+ } ResamplePrivateData;
+ 
+ static const char resample_help[] = ""
+--- a/import/probe_ffmpeg.c
++++ b/import/probe_ffmpeg.c
+@@ -51,8 +51,8 @@ static void translate_info(const AVFormatContext *ctx, ProbeInfo *info)
+             info->bitrate = st->codec->bit_rate / 1000;
+             info->width = st->codec->width;
+             info->height = st->codec->height;
+-            if (st->r_frame_rate.num > 0 && st->r_frame_rate.den > 0) {
+-                info->fps = av_q2d(st->r_frame_rate);
++            if (st->avg_frame_rate.num > 0 && st->avg_frame_rate.den > 0) {
++                info->fps = av_q2d(st->avg_frame_rate);
+             } else {
+                 /* watch out here */
+                 info->fps = 1.0/av_q2d(st->codec->time_base);
diff --git a/media-video/transcode/files/transcode-1.1.7-libav-9.patch b/media-video/transcode/files/transcode-1.1.7-libav-9.patch
new file mode 100644
index 000000000000..a67fb68c6986
--- /dev/null
+++ b/media-video/transcode/files/transcode-1.1.7-libav-9.patch
@@ -0,0 +1,31 @@
+--- a/import/probe_ffmpeg.c
++++ b/import/probe_ffmpeg.c
+@@ -109,7 +109,7 @@ void probe_ffmpeg(info_t *ipipe)
+         return;
+     }
+ 
+-    ret = av_find_stream_info(lavf_dmx_context);
++    ret = avformat_find_stream_info(lavf_dmx_context, NULL);
+     if (ret < 0) {
+         tc_log_error(__FILE__, "unable to fetch informations from '%s'"
+                                " (libavformat failure)",
+--- a/import/decode_lavc.c
++++ b/import/decode_lavc.c
+@@ -170,7 +170,7 @@ void decode_lavc(decode_t *decode)
+ 
+   // Set these to the expected values so that ffmpeg's decoder can
+   // properly detect interlaced input.
+-  lavc_dec_context = avcodec_alloc_context();
++  lavc_dec_context = avcodec_alloc_context3(NULL);
+   if (lavc_dec_context == NULL) {
+       tc_log_error(__FILE__, "Could not allocate enough memory.");
+       goto decoder_error;
+@@ -186,7 +186,7 @@ void decode_lavc(decode_t *decode)
+   lavc_dec_context->error_concealment = 3;
+   lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT;
+ 
+-  if (avcodec_open(lavc_dec_context, lavc_dec_codec) < 0) {
++  if (avcodec_open2(lavc_dec_context, lavc_dec_codec, NULL) < 0) {
+       tc_log_error(__FILE__, "Could not initialize the '%s' codec.",
+ 		   codec->name);
+       goto decoder_error;
diff --git a/media-video/transcode/files/transcode-1.1.7-preset-force.patch b/media-video/transcode/files/transcode-1.1.7-preset-force.patch
new file mode 100644
index 000000000000..0d1da8b4f666
--- /dev/null
+++ b/media-video/transcode/files/transcode-1.1.7-preset-force.patch
@@ -0,0 +1,28 @@
+Do not force using a preset. Do not try to open non-existant preset by default.
+
+Index: transcode-1.1.7/export/export_ffmpeg.c
+===================================================================
+--- transcode-1.1.7.orig/export/export_ffmpeg.c
++++ transcode-1.1.7/export/export_ffmpeg.c
+@@ -1206,7 +1206,7 @@ MOD_init
+     lavc_venc_context->me_method = ME_ZERO + lavc_param_vme;
+ 
+ 	/* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */
+-	if (lavc_param_video_preset) {
++	if (lavc_param_video_preset && strcmp(lavc_param_video_preset, "none")) {
+ 		avcodec_opts[AVMEDIA_TYPE_VIDEO] = lavc_venc_context;
+ 		video_codec_name = av_strdup(ffmpeg_codec_name(codec->name));
+ 
+Index: transcode-1.1.7/export/ffmpeg_cfg.c
+===================================================================
+--- transcode-1.1.7.orig/export/ffmpeg_cfg.c
++++ transcode-1.1.7/export/ffmpeg_cfg.c
+@@ -124,7 +124,7 @@ int lavc_param_gmc = 0;
+ //int lavc_param_atag = 0;
+ //int lavc_param_abitrate = 224;
+ 
+-char *lavc_param_video_preset = "medium";
++char *lavc_param_video_preset = "none";
+ char *lavc_param_ffmpeg_datadir = "/usr/share/ffmpeg";
+ 
+ TCConfigEntry lavcopts_conf[]={
diff --git a/media-video/transcode/files/transcode-1.1.7-preset-free.patch b/media-video/transcode/files/transcode-1.1.7-preset-free.patch
new file mode 100644
index 000000000000..00494b94ba9f
--- /dev/null
+++ b/media-video/transcode/files/transcode-1.1.7-preset-free.patch
@@ -0,0 +1,34 @@
+Fix invalid free when preset file not found
+https://bugs.gentoo.org/show_bug.cgi?id=322945
+Author: Brennan Shacklett
+
+diff -urN transcode-1.1.7-orig/export/export_ffmpeg.c transcode-1.1.7/export/export_ffmpeg.c
+--- transcode-1.1.7-orig/export/export_ffmpeg.c	2011-11-19 08:50:27.000000000 -0800
++++ transcode-1.1.7/export/export_ffmpeg.c	2012-07-03 20:07:05.669083945 -0700
+@@ -321,7 +321,7 @@
+     }
+ 
+     if(!f){
+-        fprintf(stderr, "File for preset '%s' not found\n", arg);
++        tc_log_error(MOD_NAME, "File for preset '%s' not found", arg);
+         av_exit(1);
+     }
+ 
+@@ -1207,7 +1207,7 @@
+ 	/* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */
+ 	if (lavc_param_video_preset) {
+ 		avcodec_opts[AVMEDIA_TYPE_VIDEO] = lavc_venc_context;
+-		video_codec_name = ffmpeg_codec_name(codec->name);
++		video_codec_name = av_strdup(ffmpeg_codec_name(codec->name));
+ 
+ 		const char *preset_start = lavc_param_video_preset;
+ 		while (preset_start) {
+@@ -1225,6 +1225,8 @@
+ 			if (opt_preset("vpre", preset_name) != 0) {
+ 				tc_log_warn(MOD_NAME, "Parsing ffmpeg preset '%s' failed", preset_name);
+ 			}
++      av_free(video_codec_name);
++      video_codec_name = NULL;
+ 			if (verbose) {
+ 				int i;
+ 				tc_log_info(MOD_NAME, "After parsing preset '%s', %i options are overridden:", preset_name, opt_name_count);
diff --git a/media-video/transcode/metadata.xml b/media-video/transcode/metadata.xml
new file mode 100644
index 000000000000..dbaa4a3acbb9
--- /dev/null
+++ b/media-video/transcode/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>media-video@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="mjpeg">Enables mjpegtools support</flag>
+    <flag name="nuv">NuppelVideo container format demuxing</flag>
+    <flag name="pic">disable optimized assembly code that is not PIC friendly</flag>
+    <flag name="postproc">Build with ffmpeg libpostproc support</flag>
+  </use>
+  <upstream>
+    <remote-id type="bitbucket">france/transcode-tcforge</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-video/transcode/transcode-1.1.7-r3.ebuild b/media-video/transcode/transcode-1.1.7-r3.ebuild
new file mode 100644
index 000000000000..3c0ba6e98ecf
--- /dev/null
+++ b/media-video/transcode/transcode-1.1.7-r3.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools libtool multilib
+
+DESCRIPTION="A suite of utilities for transcoding video and audio codecs in different containers"
+HOMEPAGE="http://www.transcoding.org/ https://bitbucket.org/france/transcode-tcforge"
+SRC_URI="https://www.bitbucket.org/france/${PN}-tcforge/downloads/${P}.tar.bz2
+	https://dev.gentoo.org/~polynomial-c/${P}-imagemagick7.patch"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+IUSE="cpu_flags_x86_3dnow a52 aac alsa altivec dv dvd +iconv imagemagick jpeg lzo mjpeg cpu_flags_x86_mmx mp3 mpeg nuv ogg oss pic postproc quicktime sdl cpu_flags_x86_sse cpu_flags_x86_sse2 theora truetype v4l vorbis X x264 xml xvid"
+
+RDEPEND="
+	>=virtual/ffmpeg-0.10
+	a52? ( media-libs/a52dec )
+	aac? ( media-libs/faac )
+	alsa? ( media-libs/alsa-lib )
+	dv? ( media-libs/libdv )
+	dvd? ( media-libs/libdvdread )
+	iconv? ( virtual/libiconv )
+	imagemagick? ( media-gfx/imagemagick:= )
+	jpeg? ( virtual/jpeg:0= )
+	lzo? ( >=dev-libs/lzo-2 )
+	mjpeg? ( media-video/mjpegtools )
+	mp3? ( media-sound/lame )
+	mpeg? ( media-libs/libmpeg2 )
+	ogg? ( media-libs/libogg )
+	postproc? ( >=virtual/ffmpeg-0.10 )
+	quicktime? ( >=media-libs/libquicktime-1 )
+	sdl? ( >=media-libs/libsdl-1.2.5[X?] )
+	theora? ( media-libs/libtheora )
+	truetype? ( >=media-libs/freetype-2 )
+	v4l? ( media-libs/libv4l )
+	vorbis? ( media-libs/libvorbis )
+	X? ( x11-libs/libXpm x11-libs/libXaw x11-libs/libXv )
+	x264? ( media-libs/x264:= )
+	xml? ( dev-libs/libxml2 )
+	xvid? ( media-libs/xvid )
+	"
+
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	v4l? ( >=sys-kernel/linux-headers-2.6.11 )
+	"
+
+REQUIRED_USE="
+	cpu_flags_x86_sse? ( cpu_flags_x86_mmx )
+	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx cpu_flags_x86_sse )
+	cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
+	nuv? ( lzo )
+	"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-ffmpeg.patch
+	"${FILESDIR}"/${P}-ffmpeg-0.10.patch
+	"${FILESDIR}"/${P}-ffmpeg-0.11.patch
+	"${FILESDIR}"/${P}-preset-free.patch
+	"${FILESDIR}"/${P}-libav-9.patch
+	"${FILESDIR}"/${P}-libav-10.patch
+	"${FILESDIR}"/${P}-preset-force.patch
+	"${FILESDIR}"/${P}-ffmpeg2.patch
+	"${FILESDIR}"/${P}-freetype251.patch
+	"${FILESDIR}"/${P}-ffmpeg24.patch
+)
+
+src_prepare() {
+	if has_version '>=media-video/ffmpeg-2.8' ||
+		has_version '>=media-video/libav-12'; then
+		PATCHES+=( "${FILESDIR}"/${P}-ffmpeg29.patch )
+	fi
+
+	if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
+		PATCHES+=( "${DISTDIR}"/${P}-imagemagick7.patch )
+	fi
+
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	use x86 && myconf="$(use_enable !pic x86-textrels)" #271476
+
+	local myeconfargs=(
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_3dnow 3dnow)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable cpu_flags_x86_sse2 sse2)
+		$(use_enable altivec)
+		$(use_enable v4l libv4l2)
+		$(use_enable v4l libv4lconvert)
+		$(use_enable mpeg libmpeg2)
+		$(use_enable mpeg libmpeg2convert)
+		--enable-experimental
+		--enable-deprecated
+		$(use_enable v4l)
+		$(use_enable oss)
+		$(use_enable alsa)
+		$(use_enable postproc libpostproc)
+		$(use_enable truetype freetype2)
+		$(use_enable mp3 lame)
+		$(use_enable xvid)
+		$(use_enable x264)
+		$(use_enable ogg)
+		$(use_enable vorbis)
+		$(use_enable theora)
+		$(use_enable dvd libdvdread)
+		$(use_enable dv libdv)
+		$(use_enable quicktime libquicktime)
+		$(use_enable lzo)
+		$(use_enable a52)
+		$(use_enable aac faac)
+		$(use_enable xml libxml2)
+		$(use_enable mjpeg mjpegtools)
+		$(use_enable sdl)
+		$(use_enable imagemagick)
+		$(use_enable jpeg libjpeg)
+		$(use_enable iconv)
+		$(use_enable nuv)
+		$(use_with X x)
+		--with-mod-path=/usr/$(get_libdir)/transcode
+		${myconf}
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" docsdir=/usr/share/doc/${PF} install
+	dodoc AUTHORS ChangeLog README STYLE TODO
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/media-video/tsmuxer/Manifest b/media-video/tsmuxer/Manifest
new file mode 100644
index 000000000000..b2d7b6154f69
--- /dev/null
+++ b/media-video/tsmuxer/Manifest
@@ -0,0 +1,8 @@
+DIST tsMuxeR_shared_1.10.6.tar.gz 640010 SHA256 40871629da0968488c90600a0870b6f9e3ed09d30522c56a97d7397365af0910 SHA512 64d5214a84ae1d2fdbaad214ff9586007ed1d88e7d0e18d866dfe4e75cf371de52e4c05eb1d67d0b9c7c2f9cd5ca87b4dbb2b113e81361ba658aa1fecca115d6 WHIRLPOOL ca4993cf04a22051f9a5c8b7cbe8537156263d2b3e0c9f27a889a519eb7b171df7dbca5841a7345237b1623ce46c547ace886ce07bba3e92717513f87fd1cd15
+DIST tsmuxer-2.6.11.tar.gz 538798 SHA256 815a383aebc67e59b6e541b927ce14480efed9d103fe99e74ced9ea381f61764 SHA512 25b552153b76231ac1b88858d2178564d22edd18c6b08dc872765ac214ca6fd1ff6df5c5fff0f24647ea35f3f990e364bfb8adff5dd79c69cc12875fafb4f137 WHIRLPOOL b798cb5413c521a3d4034d434dbcc1fcb0b203abc71d92e4351c323e5ed15bcf19951eeb86bac6a703fe9ffa5d189124664dfad0f06a8e4f5dfc4fad1604cab1
+DIST tsmuxer-icon.png 1634 SHA256 ff166c09d7e5218ee566d876c20873e26ccf6242a3f37a7f01e6514c4396a753 SHA512 4af3b1bd0e1a2c8379773e16121aa1c0ae749a3a9b9fdef0622991ea4ea632f51fbd91af0f6b5a415c28b375bd71adde2e9aacfb8b495242168cc97e1c8bf4ff WHIRLPOOL 265eed8149ce9de8e8695bdc8a4e726cdb4cf4514f30263384d60edcfb896b37fc8cfdb707b16d11672cb302f8300f8790415db3f6b4ced11dd4d5bcd4859b96
+EBUILD tsmuxer-1.10.6-r1.ebuild 1847 SHA256 9733426c136a3d65946893d1d24815cb072166d22143a450dcb8120d9a228ccd SHA512 c83969d2f7d050010b8ac2d78b2a231140955f854e09a58feb8b7be299fd7affcee4f4ea38b899b6d8538f56562822d61fec717ec96ba5f0b671af1c14f991e6 WHIRLPOOL 4a18fbfe781032d344d707ceff638f0b26b55af95a401a394f94fe1467b0d29930420dd15d5c0f6d3f5ff2b34e64d2b32e8d66104c0f9c59df7c0054398f7aa2
+EBUILD tsmuxer-2.6.11.ebuild 1579 SHA256 d4fe2d7141e341135f551edcb69e8cfa63a17e9d310314eec08c93a79c2cbe80 SHA512 8c381c1db6dfa56dd668a9963bd6dde4b8221382f8455a99f49fa7db91f3fe3bcaffefb0eb6ea59461d8fb97ebd185968fad446ee43a919a23302c1b1bd733a3 WHIRLPOOL 2b5f0c82579629da226f6003ffaa12e0a8211ed347d83051590f75191326c43d17cdf370bf7f9640b24ce7cbde3774879cea57a45e22f70b62d81329d71f969f
+MISC ChangeLog 3023 SHA256 2711ed3d2ec7bf5569c45dcdd82a4609e8e2e1d8b21ea8cf0d8e41c6ab0419b5 SHA512 dcd19e3693b7161544ba5f39d5690a4ac6209561bfb8698036414dd8cc5c449ecdfcd9c1b0177b0753ec83d8cc1240420f65c9a6013580cf2b97db41f112b98a WHIRLPOOL d5d19ce386b783ee578f0e9d9fe89996939e6709ed05e3ee6aede3c9219583238713382f48236890451864f5efaed616a5ec5bbe26fce23df9e2a3d74df54566
+MISC ChangeLog-2015 2547 SHA256 2d39aad42fd0c490223e6f6c5960d15e824c8624635523df6bc71d3b2d5cc2ed SHA512 c7a6a178f4e4c7d05221eca8f6e61b2cb72d3c51b207db9105a9b8224b0db63dbea2fba62c3e83f941bc4a683853c109a602a817c37451730a6dd6f7ed0852a9 WHIRLPOOL 9af3164522ce469dc1c262415fda9781847558250b54330c2939ac2e1f3b8ca94ac58aeb2ec4fcffd53e3d5ffcb868e657976a14b093085730b34e5a4f0a6928
+MISC metadata.xml 645 SHA256 58c355352353c708dd0dd9f33c18e26e27e1b2e6cb12ee42227e56ad843f6343 SHA512 66d7f11ae0acb6082f91b40fc3c5990f0f957a82d722bee2958b9cc3ea0bcd2e094f4be0e1984397c6664267328ef5212a2131a1fb20d191b3a81b6cf9d524a1 WHIRLPOOL d6a61194e4f8935d52456146d4a76ff55b1e48f184d816aa3f76bf6ef9905fcad79d1c411e37ee554daf273292f67a50f146aa862eef5c1dbb6283a1f36d03e7
diff --git a/media-video/tsmuxer/metadata.xml b/media-video/tsmuxer/metadata.xml
new file mode 100644
index 000000000000..fde90f475508
--- /dev/null
+++ b/media-video/tsmuxer/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+	<longdescription lang="en">
+		SmartLabs tsMuxeR - the software utility to create TS and M2TS files for
+		IP broadcasting as well as for viewing at hardware video players (i.e.,
+		Dune HD Ultra, Sony Playstation3 and others). tsMuxeR is a part of
+		SmartCONTENT, content preparation solution.
+	</longdescription>
+	<use>
+		<flag name="qt4">Installs tsMuxerGUI (needs Qt4)</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-video/tsmuxer/tsmuxer-1.10.6-r1.ebuild b/media-video/tsmuxer/tsmuxer-1.10.6-r1.ebuild
new file mode 100644
index 000000000000..f01350190c79
--- /dev/null
+++ b/media-video/tsmuxer/tsmuxer-1.10.6-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils base qt4-r2
+
+DESCRIPTION="Utility to create and demux TS and M2TS files"
+HOMEPAGE="http://www.smlabs.net/en/products/tsmuxer/"
+SRC_URI="http://www.smlabs.net/tsMuxer/tsMuxeR_shared_${PV}.tar.gz
+	http://gentoo.sbriesen.de/distfiles/tsmuxer-icon.png"
+LICENSE="SmartLabs"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="qt4 linguas_ru"
+
+QA_FLAGS_IGNORED="opt/${PN}/bin/tsMuxeR opt/${PN}/bin/tsMuxerGUI"
+
+DEPEND="|| (
+	>=app-arch/upx-ucl-3.01
+	>=app-arch/upx-bin-3.01
+)"
+RDEPEND="
+	x86? (
+		media-libs/freetype:2
+		qt4? (
+			dev-libs/glib:2
+			dev-qt/qtcore:4
+			dev-qt/qtgui:4
+			media-libs/fontconfig
+			x11-libs/libICE
+			x11-libs/libSM
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXrender
+		)
+	)
+	amd64? (
+		>=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)]
+		qt4? (
+			>=dev-libs/glib-2.34.3:2[abi_x86_32(-)]
+			>=dev-qt/qtcore-4.8.5-r1:4[abi_x86_32(-)]
+			>=dev-qt/qtgui-4.8.5-r2:4[abi_x86_32(-)]
+			>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+			>=media-libs/libpng-1.2.51:1.2[abi_x86_32(-)]
+			>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
+			>=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)]
+			>=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)]
+			>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+			>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+			>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
+		)
+	)"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	upx -d tsMuxeR tsMuxerGUI || die
+}
+
+src_install() {
+	dodir /opt/bin
+	exeinto /opt/${PN}/bin
+
+	doexe tsMuxeR
+	dosym ../${PN}/bin/tsMuxeR /opt/bin/tsMuxeR
+
+	if use qt4; then
+		doexe tsMuxerGUI
+		dosym ../${PN}/bin/tsMuxerGUI /opt/bin/tsMuxerGUI
+		newicon "${DISTDIR}/${PN}-icon.png" "${PN}.png"
+		make_desktop_entry tsMuxerGUI "tsMuxeR GUI" "${PN}" "Qt;AudioVideo;Video"
+	fi
+
+	use linguas_ru && dodoc readme.rus.txt
+}
diff --git a/media-video/tsmuxer/tsmuxer-2.6.11.ebuild b/media-video/tsmuxer/tsmuxer-2.6.11.ebuild
new file mode 100644
index 000000000000..65f1d359bc6e
--- /dev/null
+++ b/media-video/tsmuxer/tsmuxer-2.6.11.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils qt4-r2
+
+DESCRIPTION="Utility to create and demux TS and M2TS files"
+HOMEPAGE="http://forum.doom9.org/showthread.php?t=168539"
+SRC_URI="https://drive.google.com/uc?export=download&id=0B0VmPcEZTp8NekJxLUVJRWMwejQ -> ${P}.tar.gz
+	http://gentoo.sbriesen.de/distfiles/tsmuxer-icon.png"
+LICENSE="SmartLabs"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="qt4"
+
+QA_FLAGS_IGNORED="opt/${PN}/bin/tsMuxeR opt/${PN}/bin/tsMuxerGUI"
+
+DEPEND="|| (
+	>=app-arch/upx-ucl-3.01[lzma]
+	>=app-arch/upx-bin-3.01
+)"
+RDEPEND="
+	>=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)]
+	qt4? (
+		>=dev-libs/glib-2.34.3:2[abi_x86_32(-)]
+		>=dev-qt/qtcore-4.8.5-r1:4[abi_x86_32(-)]
+		>=dev-qt/qtgui-4.8.5-r2:4[abi_x86_32(-)]
+		>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+		>=media-libs/libpng-1.2.51:1.2[abi_x86_32(-)]
+		>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
+		>=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)]
+		>=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)]
+		>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+		>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+		>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
+	)
+"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	upx -d tsMuxeR tsMuxerGUI || die
+}
+
+src_install() {
+	dodir /opt/bin
+	exeinto /opt/${PN}/bin
+
+	doexe tsMuxeR
+	dosym ../${PN}/bin/tsMuxeR /opt/bin/tsMuxeR
+
+	if use qt4; then
+		doexe tsMuxerGUI
+		dosym ../${PN}/bin/tsMuxerGUI /opt/bin/tsMuxerGUI
+		newicon "${DISTDIR}/${PN}-icon.png" "${PN}.png"
+		make_desktop_entry tsMuxerGUI "tsMuxeR GUI" "${PN}" "Qt;AudioVideo;Video"
+	fi
+}
diff --git a/media-video/ttcut/Manifest b/media-video/ttcut/Manifest
new file mode 100644
index 000000000000..0a760efcab7c
--- /dev/null
+++ b/media-video/ttcut/Manifest
@@ -0,0 +1,10 @@
+AUX ttcut-0.19.6-deprecated.patch 15006 SHA256 165b51f4e65aa9cb81d76b7858e37aa1fe3de5674fc8a0beec0373390c20a11f SHA512 c10a0146296026bd1ed26ae1bfbce8e78e8e80649bf7b648dc2a07530978e8513f2a3dc3f96e4774b6e78560fdc3dbb9605359a90ad83a792873c024e6b6dbd9 WHIRLPOOL a495bab385250612e6bf3de9e84281d27aa7ec5dddd077a56845301314683a6fd1b90ebcdbda02309a355f4be2f2e96c62a4b069e254fb8618b736b3d4064049
+AUX ttcut-0.19.6-ffmpeg-vf-setdar.patch 7161 SHA256 c73ef34c54cccf408f90f6afb18c25de1518b2836d35df097684e47006c17b66 SHA512 92bdbfaceac2a3ddab306a8f7c1fc25feb2fecea518405bc857e01dc70ca122392c6f431d358dd0b52bf161b762fc098e18a795aa7ec399faac3b95146ddd012 WHIRLPOOL 8cd1aba8d619b097febb2cf79939d2edfb080426942911621366393f1e792babec61bc348d6212e7aed869b312d4d3c47d44547be0beef93841dc5ef96025c8d
+AUX ttcut-0.19.6-no_implicit_GLU.patch 682 SHA256 baadca16adce7f47686b26202e183ac9d86ef11efe0c10a68ddb318415f06b38 SHA512 8c0b64c566d65a98d7a1b2ca673018131d1294d7d1f338bb0f680c7ac79d9dee8080ca7f6c86fcd64b9f19b7333397386ca9942f34dd6a3c114383375e5adace WHIRLPOOL 67d3c821b397da2fbeb5b6987a53c6de25e5238d59398337f43e32c6e61cd48ba2fb7a1c245de08cd6a7c1fe7bdb903f0eb92df44e757f733cee6b8021ed866d
+AUX ttcut-0.19.6-ntsc-fps.patch 4284 SHA256 cd18f17334f3a282c7c3e3e1878d925b9156d3361ab5bfef28c641f359907c6d SHA512 16b07df7b1352ec19ed8261a54575c1087ae078422b00e634a8d74bb1d14749d04273d09a968b9c4fb72b1fefa80c4bebc01d7978bef7a1afb60650983f69fca WHIRLPOOL aa4eaea267e8c25cb2c629aa38860975075d12a044967f420262438d3e82f7c2fd1536384c2174ff0eeb0aeead4be0fdfc12c632b06cdee6bf68605239befbd7
+AUX ttcut.desktop 304 SHA256 c0abf96602f80da68b88b35721838ae29e2708de009e78b522a5164d818f424a SHA512 82f004f65755ea24ba6b379f18e15c5fe8736da0afe4854cc5ed3e8ceeb55b0b8b6c4f3def3e4a09c25b179a3415d0a47dfcd5d8b92cb34fb7270c6a24c714ad WHIRLPOOL 34a23aa4a3397b613678e7fc9785aa57c5aa4ae8d19fea97ae5dade1beda1d955004a5cbb5e8e3d52a8ca1b781d7c441db0121c7f26aae62b04532d71bfaaa1c
+DIST ttcut-0.19.6.tar.gz 283977 SHA256 e0f3f55fdcd67096de5588ddfb4a455cff731a9723923b34c283546c42c2ae11 SHA512 796dfb6759f7e9c96f8a8481cb280044c1744a43935f226f352b9e867ebdbaeaed90c3d96acf00b5ae8afb7b2350cbd6a384eb2d38136fef38c2983467d25cf6 WHIRLPOOL e660404f1bf2eb9a5936d53f3e0e9478d743c1e3af28f8d9d4d2c66d494e07df03226a1ca3fb008c90bb8ea05bba13a95ddd4ed2137e4e71a5e5ab29bbdb2365
+EBUILD ttcut-0.19.6-r3.ebuild 862 SHA256 045141f720c27deb53022f2e3310a5b0e612a65ff5e1f4de7fb876b20d014d14 SHA512 3cdffa3004495a7ad6521e9112760b8a8186d197aaa508d809aec50130bee36c80bc55540498dbfc18df58a8e95eb0e5d43518536792769a90538bd15d8824e6 WHIRLPOOL e9196618aa758fb799f571ae1291ae41c7aaed0d813756ee6167d2d96cf6963a7cbe65f406a7a9c79ada81fac2f1ae8c9d7cbe3782e1f6288edd618ec42b468b
+MISC ChangeLog 2623 SHA256 8cfdbef0f8446dcec77131cf1280aac3a6fce15a282bf10f4aad30e4df84aee9 SHA512 d5f3600a39c4185d52a2b368ac021d11f4cc2f6893e7c605c50dfd471a26d78d584c1720b64537f99d559bc5694e73d5b79b5fde9770080d68dcaeed51d7660d WHIRLPOOL 83bfe1e65d682275ee4ec590ac931b709a5e384af55279becdaa883ac13dfa55da41076e7c7ca81b7ab952c975f8b95966d81cd0df139638127c424e6523e425
+MISC ChangeLog-2015 5971 SHA256 ea320a4fd2907db9188b1b84c69801904afd7338cd6b0abfc0dace50ca57d9bd SHA512 53a7a24aa4640b64ad575ca627b1a983313de7c4d892a4667ca3aeb83b34b0b25bcb69db0a3b512bd0d1c9f6b9bc8423b10c017e411dbf8ac0e5680d2eb85625 WHIRLPOOL 2d8895538abb1909e6e3c2f9ae8d755e271aa47c78d9000ee978ca4c68b91bf340847e4638dd7bcf8ba95dd1dd83b4f1fc940fb9f71e92b835bb67a4cf240c0d
+MISC metadata.xml 929 SHA256 6677c3a143d5eac4ff4c166555b612befed2cde1e68a448f783f1e8da47336fe SHA512 b22ede083a2bec13d32c88a9f503a7ceddd13892c521bd0532168d4d7fdf8537415f256fa7548240e19ca1c949ad3215c28f6533a0eaa5ee37fcfa7093fde0ca WHIRLPOOL f860b32d56818c2d5f589c667257b673df0afc2065201642dbc6213576e11d5825790f335633c85d211bc58b9decd565b2d82228ed9b7f4e45571abd1d325a1a
diff --git a/media-video/ttcut/files/ttcut-0.19.6-deprecated.patch b/media-video/ttcut/files/ttcut-0.19.6-deprecated.patch
new file mode 100644
index 000000000000..95c466372f29
--- /dev/null
+++ b/media-video/ttcut/files/ttcut-0.19.6-deprecated.patch
@@ -0,0 +1,376 @@
+diff -Naur ttcut-old/avstream/ttac3audioheader.h ttcut/avstream/ttac3audioheader.h
+--- ttcut-old/avstream/ttac3audioheader.h	2006-02-03 21:32:50.000000000 +0100
++++ ttcut/avstream/ttac3audioheader.h	2009-09-20 02:13:04.000000000 +0200
+@@ -116,7 +116,7 @@
+   2,1,2,3,3,4,4,5

+ };

+ 

+-__attribute__ ((unused))static char* AC3Mode[8] =

++__attribute__ ((unused))static const char* AC3Mode[8] =

+ {

+   "1+1", "1/0", "2/0", "3/0",

+   "2/1", "3/1", "2/2", "3/2"

+diff -Naur ttcut-old/avstream/ttac3audiostream.cpp ttcut/avstream/ttac3audiostream.cpp
+--- ttcut-old/avstream/ttac3audiostream.cpp	2007-04-30 11:06:19.000000000 +0200
++++ ttcut/avstream/ttac3audiostream.cpp	2009-09-20 02:13:04.000000000 +0200
+@@ -108,7 +108,7 @@
+ 

+   audio_header->setHeaderOffset( stream_buffer->currentOffset() - 8 ); // +Syncwort

+ 

+-  audio_header->crc1            = daten[0]<<8+daten[1];

++  audio_header->crc1            = daten[0]<<(8+daten[1]);

+   audio_header->fscod           = (uint8_t)((daten[2]&0xc0)>>6);

+   audio_header->frmsizecod      = (uint8_t)(daten[2]&0x3f);

+   audio_header->syncframe_words = AC3FrameLength[audio_header->fscod][audio_header->frmsizecod];

+diff -Naur ttcut-old/avstream/ttaviwriter.cpp ttcut/avstream/ttaviwriter.cpp
+--- ttcut-old/avstream/ttaviwriter.cpp	2007-04-27 10:32:20.000000000 +0200
++++ ttcut/avstream/ttaviwriter.cpp	2009-09-20 02:13:04.000000000 +0200
+@@ -126,7 +126,7 @@
+   //qDebug( "%sAVI frame info: width: %d x height: %d",c_name,frameInfo->width,frameInfo->height );

+ 

+   //TODO: avoid setting hard coded frame rate!

+-  AVI_set_video(avi_file, frameInfo->width, frameInfo->height, 25.0, "YV12");

++  AVI_set_video(avi_file, frameInfo->width, frameInfo->height, 25.0, (char*)"YV12");

+   

+   ref_data = new uint8_t [frameInfo->size+2*frameInfo->chroma_size];

+ 

+diff -Naur ttcut-old/avstream/ttdtsaudioheader.h ttcut/avstream/ttdtsaudioheader.h
+--- ttcut-old/avstream/ttdtsaudioheader.h	2006-02-02 20:43:48.000000000 +0100
++++ ttcut/avstream/ttdtsaudioheader.h	2009-09-20 02:13:04.000000000 +0200
+@@ -78,7 +78,7 @@
+   2048000, 3072000, 3840000, 4096000, 0, 0 

+ }; 

+ 

+-__attribute__ ((unused))static char* dts_acmod[64] =

++__attribute__ ((unused))static const char* dts_acmod[64] =

+ { 

+   "1","DM","2/0","2/0", 

+   "2/0","3/0","2.1/0","3.1/0", 

+diff -Naur ttcut-old/avstream/ttfilebuffer.cpp ttcut/avstream/ttfilebuffer.cpp
+--- ttcut-old/avstream/ttfilebuffer.cpp	2007-09-02 13:15:09.000000000 +0200
++++ ttcut/avstream/ttfilebuffer.cpp	2009-09-20 02:13:04.000000000 +0200
+@@ -773,8 +773,8 @@
+   /* new position outside buffer*/

+   else

+   {

+-    if ( new_pos > -1             &&

+-        (file_mode  == fm_open_read && new_pos < stream_length) ||

++    if ( (new_pos > -1             &&

++        (file_mode  == fm_open_read && new_pos < stream_length)) ||

+         ((file_mode == fm_open_write || file_mode == fm_create) &&

+          new_pos < stream_length + 1) )

+     {

+diff -Naur ttcut-old/gui/ttcutmainwindow.cpp ttcut/gui/ttcutmainwindow.cpp
+--- ttcut-old/gui/ttcutmainwindow.cpp	2007-09-02 13:15:09.000000000 +0200
++++ ttcut/gui/ttcutmainwindow.cpp	2009-09-20 02:13:04.000000000 +0200
+@@ -1030,8 +1030,8 @@
+     int num_header = current_audio_stream->createHeaderList();
+ 
+     // error reading audio stream or user abort during operation
+-    if ( num_header == 0 && audio_type->avStreamType() != TTAVTypes::pcm_audio ||
+-        num_header == 1 && audio_type->avStreamType() == TTAVTypes::pcm_audio    ) {
++    if ( (num_header == 0 && audio_type->avStreamType() != TTAVTypes::pcm_audio) ||
++        (num_header == 1 && audio_type->avStreamType() == TTAVTypes::pcm_audio)    ) {
+ 
+       log->errorMsg( oName, "error reading audio stream; no header list (!)" );
+       delete current_audio_stream;
+diff -Naur ttcut-old/ui/pixmaps/addtolist_18.xpm ttcut/ui/pixmaps/addtolist_18.xpm
+--- ttcut-old/ui/pixmaps/addtolist_18.xpm	2006-02-27 18:05:47.000000000 +0100
++++ ttcut/ui/pixmaps/addtolist_18.xpm	2009-09-20 02:13:04.000000000 +0200
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * addtolist_18_xpm[] = {
++static const char * addtolist_18_xpm[] = {
+ "18 18 163 2",
+ "  	c None",
+ ". 	c #3E98E5",
+diff -Naur ttcut-old/ui/pixmaps/apply_18.xpm ttcut/ui/pixmaps/apply_18.xpm
+--- ttcut-old/ui/pixmaps/apply_18.xpm	2006-02-27 18:05:47.000000000 +0100
++++ ttcut/ui/pixmaps/apply_18.xpm	2009-09-20 02:13:04.000000000 +0200
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * apply_18_xpm[] = {
++static const char * apply_18_xpm[] = {
+ "18 18 46 1",
+ " 	c None",
+ ".	c #707070",
+diff -Naur ttcut-old/ui/pixmaps/bframe_18.xpm ttcut/ui/pixmaps/bframe_18.xpm
+--- ttcut-old/ui/pixmaps/bframe_18.xpm	2006-02-27 18:05:47.000000000 +0100
++++ ttcut/ui/pixmaps/bframe_18.xpm	2009-09-20 02:13:04.000000000 +0200
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char* const b_frame_18_xpm[] = { 
++static const char * b_frame_18_xpm[] = { 
+ "18 18 16 1",
+ ". c None",
+ "d c #faf515",
+diff -Naur ttcut-old/ui/pixmaps/button_ok.xpm ttcut/ui/pixmaps/button_ok.xpm
+--- ttcut-old/ui/pixmaps/button_ok.xpm	2007-04-27 10:32:20.000000000 +0200
++++ ttcut/ui/pixmaps/button_ok.xpm	2009-09-20 02:13:04.000000000 +0200
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * button_ok_xpm[] = {
++static const char * button_ok_xpm[] = {
+ "32 32 132 2",
+ "  	c None",
+ ". 	c #18AD00",
+diff -Naur ttcut-old/ui/pixmaps/chapter_18.xpm ttcut/ui/pixmaps/chapter_18.xpm
+--- ttcut-old/ui/pixmaps/chapter_18.xpm	2006-02-27 18:05:47.000000000 +0100
++++ ttcut/ui/pixmaps/chapter_18.xpm	2009-09-20 02:13:04.000000000 +0200
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * chapter_18_xpm[] = {
++static const char * chapter_18_xpm[] = {
+ "18 18 157 2",
+ "  	c None",
+ ". 	c #9EAAD6",
+diff -Naur ttcut-old/ui/pixmaps/clock_16.xpm ttcut/ui/pixmaps/clock_16.xpm
+--- ttcut-old/ui/pixmaps/clock_16.xpm	2006-02-27 18:05:47.000000000 +0100
++++ ttcut/ui/pixmaps/clock_16.xpm	2009-09-20 02:13:04.000000000 +0200
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * clock_16_xpm[] = {
++static const char * clock_16_xpm[] = {
+ "16 16 168 2",
+ "  	c None",
+ ". 	c #2A6AC0",
+diff -Naur ttcut-old/ui/pixmaps/clock_18.xpm ttcut/ui/pixmaps/clock_18.xpm
+--- ttcut-old/ui/pixmaps/clock_18.xpm	2006-02-27 18:05:47.000000000 +0100
++++ ttcut/ui/pixmaps/clock_18.xpm	2009-09-20 02:13:04.000000000 +0200
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * clock_18_xpm[] = {
++static const char * clock_18_xpm[] = {
+ "18 18 202 2",
+ "  	c None",
+ ". 	c #2360BB",
+diff -Naur ttcut-old/ui/pixmaps/cutaudio_18.xpm ttcut/ui/pixmaps/cutaudio_18.xpm
+--- ttcut-old/ui/pixmaps/cutaudio_18.xpm	2006-02-27 18:05:47.000000000 +0100
++++ ttcut/ui/pixmaps/cutaudio_18.xpm	2009-09-20 02:13:04.000000000 +0200
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * cutaudio_18_xpm[] = {
++static const char * cutaudio_18_xpm[] = {
+ "11 18 2 1",
+ " 	c None",
+ ".	c #000000",
+diff -Naur ttcut-old/ui/pixmaps/cutav_18.xpm ttcut/ui/pixmaps/cutav_18.xpm
+--- ttcut-old/ui/pixmaps/cutav_18.xpm	2006-02-27 18:05:47.000000000 +0100
++++ ttcut/ui/pixmaps/cutav_18.xpm	2009-09-20 02:13:04.000000000 +0200
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * cutav_18_xpm[] = {
++static const char * cutav_18_xpm[] = {
+ "18 18 105 2",
+ "  	c None",
+ ". 	c #CDCDD9",
+diff -Naur ttcut-old/ui/pixmaps/exit_16.xpm ttcut/ui/pixmaps/exit_16.xpm
+--- ttcut-old/ui/pixmaps/exit_16.xpm	2006-02-27 18:05:47.000000000 +0100
++++ ttcut/ui/pixmaps/exit_16.xpm	2009-09-20 02:13:04.000000000 +0200
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * exit_16_xpm[] = {
++static const char * exit_16_xpm[] = {
+ "16 16 174 2",
+ "  	c None",
+ ". 	c #AE3725",
+diff -Naur ttcut-old/ui/pixmaps/fileclose_18.xpm ttcut/ui/pixmaps/fileclose_18.xpm
+--- ttcut-old/ui/pixmaps/fileclose_18.xpm	2006-02-27 18:05:47.000000000 +0100
++++ ttcut/ui/pixmaps/fileclose_18.xpm	2009-09-20 02:13:04.000000000 +0200
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * fileclose_18_xpm[] = {
++static const char * fileclose_18_xpm[] = {
+ "18 18 138 2",
+ "  	c None",
+ ". 	c #3D3D5D",
+diff -Naur ttcut-old/ui/pixmaps/filenew_16.xpm ttcut/ui/pixmaps/filenew_16.xpm
+--- ttcut-old/ui/pixmaps/filenew_16.xpm	2006-02-27 18:05:47.000000000 +0100
++++ ttcut/ui/pixmaps/filenew_16.xpm	2009-09-20 02:13:04.000000000 +0200
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * filenew_16_xpm[] = {
++static const char * filenew_16_xpm[] = {
+ "16 16 121 2",
+ "  	c None",
+ ". 	c #C5CAD6",
+diff -Naur ttcut-old/ui/pixmaps/fileopen_16.xpm ttcut/ui/pixmaps/fileopen_16.xpm
+--- ttcut-old/ui/pixmaps/fileopen_16.xpm	2006-02-27 18:05:47.000000000 +0100
++++ ttcut/ui/pixmaps/fileopen_16.xpm	2009-09-20 02:13:04.000000000 +0200
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * fileopen_16_xpm[] = {
++static const char * fileopen_16_xpm[] = {
+ "16 16 183 2",
+ "  	c None",
+ ". 	c #9BA1D9",
+diff -Naur ttcut-old/ui/pixmaps/filesave_16.xpm ttcut/ui/pixmaps/filesave_16.xpm
+--- ttcut-old/ui/pixmaps/filesave_16.xpm	2006-02-27 18:05:47.000000000 +0100
++++ ttcut/ui/pixmaps/filesave_16.xpm	2009-09-20 02:13:04.000000000 +0200
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * filesave_16_xpm[] = {
++static const char * filesave_16_xpm[] = {
+ "16 16 174 2",
+ "  	c None",
+ ". 	c #B8B8CC",
+diff -Naur ttcut-old/ui/pixmaps/filesaveas_16.xpm ttcut/ui/pixmaps/filesaveas_16.xpm
+--- ttcut-old/ui/pixmaps/filesaveas_16.xpm	2006-02-27 18:05:47.000000000 +0100
++++ ttcut/ui/pixmaps/filesaveas_16.xpm	2009-09-20 02:13:04.000000000 +0200
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * filesaveas_16_xpm[] = {
++static const char * filesaveas_16_xpm[] = {
+ "16 16 180 2",
+ "  	c None",
+ ". 	c #F2C14C",
+diff -Naur ttcut-old/ui/pixmaps/goto_18.xpm ttcut/ui/pixmaps/goto_18.xpm
+--- ttcut-old/ui/pixmaps/goto_18.xpm	2006-02-27 18:05:47.000000000 +0100
++++ ttcut/ui/pixmaps/goto_18.xpm	2009-09-20 02:13:04.000000000 +0200
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * goto_18_xpm[] = {
++static const char * goto_18_xpm[] = {
+ "18 18 82 1",
+ " 	c None",
+ ".	c #127DFF",
+diff -Naur ttcut-old/ui/pixmaps/iframe_18.xpm ttcut/ui/pixmaps/iframe_18.xpm
+--- ttcut-old/ui/pixmaps/iframe_18.xpm	2006-02-27 18:05:47.000000000 +0100
++++ ttcut/ui/pixmaps/iframe_18.xpm	2009-09-20 02:13:04.000000000 +0200
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char* const i_frame_18_xpm[] = { 
++static const char * i_frame_18_xpm[] = { 
+ "18 18 9 1",
+ ". c None",
+ "d c #000096",
+diff -Naur ttcut-old/ui/pixmaps/next_18.xpm ttcut/ui/pixmaps/next_18.xpm
+--- ttcut-old/ui/pixmaps/next_18.xpm	2006-02-27 18:05:47.000000000 +0100
++++ ttcut/ui/pixmaps/next_18.xpm	2009-09-20 02:13:04.000000000 +0200
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * next_18_xpm[] = {
++static const char * next_18_xpm[] = {
+ "18 18 59 1",
+ " 	c None",
+ ".	c #000000",
+diff -Naur ttcut-old/ui/pixmaps/note_18.xpm ttcut/ui/pixmaps/note_18.xpm
+--- ttcut-old/ui/pixmaps/note_18.xpm	2006-02-27 18:05:47.000000000 +0100
++++ ttcut/ui/pixmaps/note_18.xpm	2009-09-20 02:13:04.000000000 +0200
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * note_18_xpm[] = {
++static const char * note_18_xpm[] = {
+ "18 18 93 2",
+ "  	c None",
+ ". 	c #C5AD09",
+diff -Naur ttcut-old/ui/pixmaps/pause_18.xpm ttcut/ui/pixmaps/pause_18.xpm
+--- ttcut-old/ui/pixmaps/pause_18.xpm	2006-02-27 18:05:47.000000000 +0100
++++ ttcut/ui/pixmaps/pause_18.xpm	2009-09-20 02:13:04.000000000 +0200
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * pause_18_xpm[] = {
++static const char * pause_18_xpm[] = {
+ "18 18 67 1",
+ " 	c None",
+ ".	c #000000",
+diff -Naur ttcut-old/ui/pixmaps/pframe_18.xpm ttcut/ui/pixmaps/pframe_18.xpm
+--- ttcut-old/ui/pixmaps/pframe_18.xpm	2006-02-27 18:05:47.000000000 +0100
++++ ttcut/ui/pixmaps/pframe_18.xpm	2009-09-20 02:13:04.000000000 +0200
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char* const p_frame_18_xpm[] = { 
++static const char * const p_frame_18_xpm[] = { 
+ "18 18 15 1",
+ ". c None",
+ "e c #fa0150",
+diff -Naur ttcut-old/ui/pixmaps/play_18.xpm ttcut/ui/pixmaps/play_18.xpm
+--- ttcut-old/ui/pixmaps/play_18.xpm	2006-02-27 18:05:47.000000000 +0100
++++ ttcut/ui/pixmaps/play_18.xpm	2009-09-20 02:13:04.000000000 +0200
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * play_18_xpm[] = {
++static const char * play_18_xpm[] = {
+ "18 18 38 1",
+ " 	c None",
+ ".	c #000000",
+diff -Naur ttcut-old/ui/pixmaps/prev_18.xpm ttcut/ui/pixmaps/prev_18.xpm
+--- ttcut-old/ui/pixmaps/prev_18.xpm	2006-02-27 18:05:47.000000000 +0100
++++ ttcut/ui/pixmaps/prev_18.xpm	2009-09-20 02:13:04.000000000 +0200
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * prev_18_xpm[] = {
++static const char * prev_18_xpm[] = {
+ "18 18 64 1",
+ " 	c None",
+ ".	c #0E0E0E",
+diff -Naur ttcut-old/ui/pixmaps/preview_18.xpm ttcut/ui/pixmaps/preview_18.xpm
+--- ttcut-old/ui/pixmaps/preview_18.xpm	2006-02-27 18:05:47.000000000 +0100
++++ ttcut/ui/pixmaps/preview_18.xpm	2009-09-20 02:13:04.000000000 +0200
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * preview_18_xpm[] = {
++static const char * preview_18_xpm[] = {
+ "18 18 134 2",
+ "  	c None",
+ ". 	c #A9ACB6",
+diff -Naur ttcut-old/ui/pixmaps/saveimage_16.xpm ttcut/ui/pixmaps/saveimage_16.xpm
+--- ttcut-old/ui/pixmaps/saveimage_16.xpm	2006-02-27 18:05:47.000000000 +0100
++++ ttcut/ui/pixmaps/saveimage_16.xpm	2009-09-20 02:13:04.000000000 +0200
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * saveimage_16_xpm[] = {
++static const char * saveimage_16_xpm[] = {
+ "17 18 80 1",
+ " 	c None",
+ ".	c #000000",
+diff -Naur ttcut-old/ui/pixmaps/search_18.xpm ttcut/ui/pixmaps/search_18.xpm
+--- ttcut-old/ui/pixmaps/search_18.xpm	2006-02-27 18:05:47.000000000 +0100
++++ ttcut/ui/pixmaps/search_18.xpm	2009-09-20 02:13:04.000000000 +0200
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * search_18_xpm[] = {
++static const char * search_18_xpm[] = {
+ "18 18 126 2",
+ "  	c None",
+ ". 	c #000000",
+diff -Naur ttcut-old/ui/pixmaps/settings_16.xpm ttcut/ui/pixmaps/settings_16.xpm
+--- ttcut-old/ui/pixmaps/settings_16.xpm	2006-02-27 18:05:47.000000000 +0100
++++ ttcut/ui/pixmaps/settings_16.xpm	2009-09-20 02:13:04.000000000 +0200
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * settings_16_xpm[] = {
++static const char * settings_16_xpm[] = {
+ "16 16 102 2",
+ "  	c None",
+ ". 	c #C1C1CE",
+diff -Naur ttcut-old/ui/pixmaps/_settings_18.xpm ttcut/ui/pixmaps/_settings_18.xpm
+--- ttcut-old/ui/pixmaps/_settings_18.xpm	2006-02-27 18:05:47.000000000 +0100
++++ ttcut/ui/pixmaps/_settings_18.xpm	2009-09-20 02:13:04.000000000 +0200
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * settings_18_xpm[] = {
++static const char * settings_18_xpm[] = {
+ "16 16 102 2",
+ "  	c None",
+ ". 	c #C1C1CE",
+diff -Naur ttcut-old/ui/pixmaps/settings_18.xpm ttcut/ui/pixmaps/settings_18.xpm
+--- ttcut-old/ui/pixmaps/settings_18.xpm	2006-02-27 18:05:47.000000000 +0100
++++ ttcut/ui/pixmaps/settings_18.xpm	2009-09-20 02:13:04.000000000 +0200
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * settings_18_xpm[] = {
++static const char * settings_18_xpm[] = {
+ "16 16 102 2",
+ "  	c None",
+ ". 	c #C1C1CE",
+diff -Naur ttcut-old/ui/pixmaps/stop_18.xpm ttcut/ui/pixmaps/stop_18.xpm
+--- ttcut-old/ui/pixmaps/stop_18.xpm	2006-02-27 18:05:47.000000000 +0100
++++ ttcut/ui/pixmaps/stop_18.xpm	2009-09-20 02:13:04.000000000 +0200
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * stop_18_xpm[] = {
++static const char * stop_18_xpm[] = {
+ "18 18 39 1",
+ " 	c None",
+ ".	c #1D1D1C",
diff --git a/media-video/ttcut/files/ttcut-0.19.6-ffmpeg-vf-setdar.patch b/media-video/ttcut/files/ttcut-0.19.6-ffmpeg-vf-setdar.patch
new file mode 100644
index 000000000000..6f5b05b228a0
--- /dev/null
+++ b/media-video/ttcut/files/ttcut-0.19.6-ffmpeg-vf-setdar.patch
@@ -0,0 +1,184 @@
+diff -Naur ttcut-old/avstream/ttcommon.cpp ttcut/avstream/ttcommon.cpp
+--- ttcut-old/avstream/ttcommon.cpp	2011-05-05 00:00:33.936254667 +0200
++++ ttcut/avstream/ttcommon.cpp	2011-05-05 00:03:27.396254667 +0200
+@@ -51,6 +51,18 @@
+   return sNewFileName;

+ }

+ 

++// return the aspect ratio as string value

++QString ttAspectRatioText(int aspect_ratio_information)

++{

++  QString szTemp;

++

++  if ( aspect_ratio_information == 1 ) szTemp = "1:1";

++  if ( aspect_ratio_information == 2 ) szTemp = "4:3";

++  if ( aspect_ratio_information == 3 ) szTemp = "16:9";

++  if ( aspect_ratio_information == 4 ) szTemp = "2.21:1";

++

++  return szTemp;

++}

+ 

+ // check if file fName exists

+ bool ttFileExists( QString fName )

+diff -Naur ttcut-old/avstream/ttcommon.h ttcut/avstream/ttcommon.h
+--- ttcut-old/avstream/ttcommon.h	2011-05-05 00:00:33.936254667 +0200
++++ ttcut/avstream/ttcommon.h	2011-05-05 00:03:58.412921334 +0200
+@@ -11,6 +11,7 @@
+ extern "C" bool    ttDeleteFile( QString fName );

+ extern "C" QString ttAddFileExt( QString fName, const char* cExt );

+ extern "C" QString ttChangeFileExt( QString fName, const char* cExt );

++extern "C" QString ttAspectRatioText(int aspect_ratio_information);

+ extern "C" QTime   ttMsecToTime( int msec );

+ extern "C" QTime   ttMsecToTimeD( double msec );

+ extern "C" QTime   ttFramesToTime(long lFrames, float fps);

+diff -Naur ttcut-old/avstream/ttmpeg2videoheader.cpp ttcut/avstream/ttmpeg2videoheader.cpp
+--- ttcut-old/avstream/ttmpeg2videoheader.cpp	2011-05-05 00:00:33.936254667 +0200
++++ ttcut/avstream/ttmpeg2videoheader.cpp	2011-05-05 00:05:42.999588000 +0200
+@@ -170,18 +170,11 @@
+ }

+ 

+ /* /////////////////////////////////////////////////////////////////////////////

+- * Returns the aspect ration as string value

++ * Returns the aspect ratio as string value

+  */

+ QString TTSequenceHeader::aspectRatioText()

+ {

+-  QString szTemp;

+-

+-  if ( aspect_ratio_information == 1 ) szTemp = "1:1";

+-  if ( aspect_ratio_information == 2 ) szTemp = "4:3";

+-  if ( aspect_ratio_information == 3 ) szTemp = "16:9";

+-  if ( aspect_ratio_information == 4 ) szTemp = "2.21:1";

+-

+-  return szTemp;

++  return ttAspectRatioText(aspect_ratio_information);

+ }

+ 

+ /* /////////////////////////////////////////////////////////////////////////////

+diff -Naur ttcut-old/avstream/ttmpeg2videostream.cpp ttcut/avstream/ttmpeg2videostream.cpp
+--- ttcut-old/avstream/ttmpeg2videostream.cpp	2011-05-05 00:00:33.936254667 +0200
++++ ttcut/avstream/ttmpeg2videostream.cpp	2011-05-05 00:00:43.579588002 +0200
+@@ -1505,7 +1505,7 @@
+ 

+   QDir    temp_dir( TTCut::tempDirPath );

+   QString avi_out_file   = "encode.avi";

+-  QString mpeg2_out_file = "encode";          // extension is added by transcode (!)

++  QString mpeg2_out_file = "encode.m2v";

+   new_file_info.setFile( temp_dir, avi_out_file );

+   

+   TTPicturesHeader* start_pic = header_list->pictureHeaderAt( start );

+@@ -1538,7 +1538,7 @@
+   TTTranscodeProvider* transcode_prov = new TTTranscodeProvider( );

+   transcode_prov->setParameter( enc_par );

+ 

+-  // encode the part with transcode

++  // encode the part with ffmpeg

+   if ( transcode_prov->encodePart() )

+   {

+     new_file_info.setFile( temp_dir, "encode.m2v" );

+@@ -1565,7 +1565,7 @@
+   }

+   else

+   {

+-    log->errorMsg(c_name, "Error in transcode part (!)");

++    log->errorMsg(c_name, "Error in ffmpeg part (!)");

+   }

+ 

+   // remove temporary files

+diff -Naur ttcut-old/extern/tttranscode.cpp ttcut/extern/tttranscode.cpp
+--- ttcut-old/extern/tttranscode.cpp	2011-05-05 00:00:33.939588000 +0200
++++ ttcut/extern/tttranscode.cpp	2011-05-05 00:02:27.062921334 +0200
+@@ -49,9 +49,9 @@
+   // message logger instance
+   log = TTMessageLogger::getInstance();
+   
+-  QString str_head = "starting encoder >>>transcode -y ffmpeg<<<";
++  QString str_head = "starting encoder >>>ffmpeg<<<";
+ 
+-  str_command       = "transcode";
++  str_command       = "ffmpeg";
+   transcode_success = false;
+ 
+   setModal( true );
+@@ -76,7 +76,7 @@
+ {
+ #if defined (TTTRANSCODE_DEBUG)
+   log->debugMsg( c_name, "----------------------------------------------------" );
+-  log->debugMsg( c_name, "transcode parameter:" );
++  log->debugMsg( c_name, "ffmpeg parameter:" );
+   log->debugMsg( c_name, "----------------------------------------------------" );
+   log->debugMsg( c_name, "avi-file    : %s",    qPrintable(enc_par.avi_input_finfo.absoluteFilePath()) );
+   log->debugMsg( c_name, "mpeg-file   : %s",    qPrintable(enc_par.mpeg2_output_finfo.absoluteFilePath()) );
+@@ -86,32 +86,32 @@
+   log->debugMsg( c_name, "----------------------------------------------------" );
+ #endif
+ 
+-  //transcode -i encode.avi --pre_clip 0 -y ffmpeg --export_prof dvd-pal --export_asr 2 -o encode
+   QString str_aspect;
+-  str_aspect.sprintf("%d",enc_par.video_aspect_code );
++  str_aspect = ttAspectRatioText(enc_par.video_aspect_code);
+ 
+   QString str_format;
+   str_format.sprintf("%dx%d", enc_par.video_width, enc_par.video_height);
+ 
+   QString str_bitrate;
+-  str_bitrate.sprintf("%f", enc_par.video_bitrate);
++  str_bitrate.sprintf("%.0f", enc_par.video_bitrate);
++
++  QString str_aspect_opt;
++  str_aspect_opt = "setdar=";
++
++  str_aspect_opt += str_aspect;
+ 
+   strl_command_line.clear();
+ 
+   strl_command_line << "-i"
+-		    << enc_par.avi_input_finfo.absoluteFilePath()
+-		    << "--pre_clip"
+-		    << "0"
+-		    //<< "-y"               // isn't neccessary unless --export_prof is specified!
+-		    //<< "mpeg2enc,mp2enc"  // mpeg2enc->video, mp2enc->audio!
+-        //<< "-F"
+-        //<< "8,\"-v 1 -q 3\""
+-		    << "--export_prof"
+-		    << "dvd"            // dvd-pal
+-		    << "--export_asr"
+-		    << str_aspect
+-		    << "-o"
+-		    << enc_par.mpeg2_output_finfo.absoluteFilePath();
++            << enc_par.avi_input_finfo.absoluteFilePath()
++            << "-y"
++            << "-target"
++            << "dvd" //autodetects pal/ntsc
++            << "-f"
++            << "mpeg2video" //else ffmpeg creates an mpegps stream that mplex can not handle
++            << "-vf"
++            << str_aspect_opt //workaround for mpeg2video not preserving aspect ratio in combination with --enable-avfilter
++            << enc_par.mpeg2_output_finfo.absoluteFilePath();
+ 
+   log->infoMsg(c_name, strl_command_line.join(" "));
+ }
+@@ -124,7 +124,7 @@
+   int update        = EVENT_LOOP_INTERVALL;     //update intervall for local event loop
+   transcode_success = false;      
+   
+-  // create the process object for transcode
++  // create the process object for ffmpeg
+   proc = new QProcess();
+   
+   // read both channels: stderr and stdout
+@@ -197,12 +197,12 @@
+   switch (e_status) {
+     case QProcess::NormalExit:
+       //log->debugMsg(c_name, "The process ecxited normally: %d", e_code);
+-      procMsg = tr("Transcode exit normally ... done(0)");
++      procMsg = tr("ffmpeg exit normally ... done(0)");
+       transcode_success = true;
+       break;
+     case QProcess::CrashExit:
+       //log->debugMsg(c_name, "The process crashed: %d", e_code);
+-      procMsg = tr("Transcode crashed");
++      procMsg = tr("ffmpeg crashed");
+       transcode_success = false;
+       break;
+     default:
diff --git a/media-video/ttcut/files/ttcut-0.19.6-no_implicit_GLU.patch b/media-video/ttcut/files/ttcut-0.19.6-no_implicit_GLU.patch
new file mode 100644
index 000000000000..afb83aa296db
--- /dev/null
+++ b/media-video/ttcut/files/ttcut-0.19.6-no_implicit_GLU.patch
@@ -0,0 +1,24 @@
+Stop relying on implicit usage of GLU for compability with >=x11-libs/qt-opengl-4.8
+See, http://bugs.gentoo.org/407391
+
+--- mpeg2window/ttmpeg2window.cpp
++++ mpeg2window/ttmpeg2window.cpp
+@@ -33,6 +33,7 @@
+ // qApplication for the qApp pointer
+ #include <QApplication>
+ #include <QPixmap>
++#include <GL/glu.h>
+ 
+ // -----------------------------------------------------------------------------
+ // class declaration
+--- ttcut.pro
++++ ttcut.pro
+@@ -15,7 +15,7 @@
+ DEFINES     += _FILE_OFFSET_BITS=64
+ DIST        = TTCut
+ TARGET      = ttcut
+-LIBS        = -lmpeg2 -lmpeg2convert
++LIBS        = -lmpeg2 -lmpeg2convert -lGLU
+ OBJECTS_DIR = obj
+ MOC_DIR     = moc
+ UI_DIR      = ui_h 
diff --git a/media-video/ttcut/files/ttcut-0.19.6-ntsc-fps.patch b/media-video/ttcut/files/ttcut-0.19.6-ntsc-fps.patch
new file mode 100644
index 000000000000..0af76de1d095
--- /dev/null
+++ b/media-video/ttcut/files/ttcut-0.19.6-ntsc-fps.patch
@@ -0,0 +1,99 @@
+diff -upr ttcut-old/avstream/ttac3audiostream.cpp ttcut/avstream/ttac3audiostream.cpp
+--- ttcut-old/avstream/ttac3audiostream.cpp	2011-05-01 21:51:10.865817426 -0400
++++ ttcut/avstream/ttac3audiostream.cpp	2011-05-01 21:45:34.213440925 -0400
+@@ -256,6 +256,7 @@ void TTAC3AudioStream::cut( TTFileBuffer
+   float   audio_start_time;

+   float   audio_end_time;

+   float   local_audio_offset = 0.0;

++  float   fps = cut_list->videoStream()->frameRate();

+ 

+ #if defined(AC3STREAM_DEBUG)

+   log->debugMsg(c_name, "-----------------------------------------------");

+@@ -286,7 +287,7 @@ void TTAC3AudioStream::cut( TTFileBuffer
+ 

+     //qDebug( "%sstart / end  : %d / %d",c_name,start_pos,end_pos );

+     //search 

+-    video_frame_length = 1000.0 / 25.0; //TODO: replace with fps

++    video_frame_length = 1000.0 / fps;

+ 

+     //qDebug( "%slocal audio offset: %f",c_name,local_audio_offset );

+ 

+diff -upr ttcut-old/avstream/ttmpeg2videoheader.cpp ttcut/avstream/ttmpeg2videoheader.cpp
+--- ttcut-old/avstream/ttmpeg2videoheader.cpp	2011-05-01 21:20:42.675440912 -0400
++++ ttcut/avstream/ttmpeg2videoheader.cpp	2011-04-29 23:06:29.684768509 -0400
+@@ -193,6 +193,7 @@ QString TTSequenceHeader::frameRateText(
+ 

+   if ( frame_rate_code == 2 ) szTemp = "24 fps";

+   if ( frame_rate_code == 3 ) szTemp = "25 fps";

++  if ( frame_rate_code == 4 ) szTemp = "29.970 fps";

+   if ( frame_rate_code == 5 ) szTemp = "30 fps";

+ 

+   return szTemp;

+@@ -207,6 +208,7 @@ float TTSequenceHeader::frameRateValue()
+ 

+   if ( frame_rate_code == 2 ) value = 24.0;

+   if ( frame_rate_code == 3 ) value = 25.0;

++  if ( frame_rate_code == 4 ) value = 29.970;

+   if ( frame_rate_code == 5 ) value = 30.0;

+ 

+   if ( frame_rate_code < 2 || frame_rate_code > 5 )

+diff -upr ttcut-old/avstream/ttmpegaudiostream.cpp ttcut/avstream/ttmpegaudiostream.cpp
+--- ttcut-old/avstream/ttmpegaudiostream.cpp	2011-05-01 21:20:42.679440927 -0400
++++ ttcut/avstream/ttmpegaudiostream.cpp	2011-05-01 21:45:55.036441412 -0400
+@@ -308,6 +308,7 @@ void TTMPEGAudioStream::cut( TTFileBuffe
+   float   audio_start_time;

+   float   audio_end_time;

+   float   local_audio_offset = 0.0;

++  float   fps = cut_list->videoStream()->frameRate();

+ 

+ #if defined MPEGAUDIO_DEBUG

+   log->infoMsg(c_name, "-----------------------------------------------");

+@@ -338,7 +339,7 @@ void TTMPEGAudioStream::cut( TTFileBuffe
+ 

+     //qDebug( "%sstart / end  : %d / %d",c_name,start_pos,end_pos );

+     //search 

+-    video_frame_length = 1000.0 / 25.0; //TODO: replace with fps

++    video_frame_length = 1000.0 / fps;

+ 

+     //qDebug( "%slocal audio offset: %f",c_name,local_audio_offset );

+ 

+diff -upr ttcut-old/avstream/ttaviwriter.cpp ttcut/avstream/ttaviwriter.cpp
+--- ttcut-old/avstream/ttaviwriter.cpp	2011-05-01 22:05:47.307819446 -0400
++++ ttcut/avstream/ttaviwriter.cpp	2011-05-01 22:08:27.427839373 -0400
+@@ -49,6 +49,7 @@ TTAVIWriter::TTAVIWriter( TTProgressBar*
+ 

+    file_size    = 0;

+    file_offset  = 0;

++   fps          = 0.0;

+ }

+ 

+ 

+@@ -78,6 +79,7 @@ bool TTAVIWriter::initAVIWriter( TTVideo
+    index_list      = v_stream->indexList();

+    header_list     = v_stream->headerList();

+    file_size       = v_stream->streamLengthByte();

++   fps             = v_stream->frameRate();

+ 

+    //create the decoder object

+    decoder = new TTMpeg2Decoder( qPrintable(video_file_name), index_list, header_list );

+@@ -125,8 +127,7 @@ int TTAVIWriter::writeAVI( int start_fra
+ 

+   //qDebug( "%sAVI frame info: width: %d x height: %d",c_name,frameInfo->width,frameInfo->height );

+ 

+-  //TODO: avoid setting hard coded frame rate!

+-  AVI_set_video(avi_file, frameInfo->width, frameInfo->height, 25.0, (char*)"YV12");

++  AVI_set_video(avi_file, frameInfo->width, frameInfo->height, fps, (char*)"YV12");

+   

+   ref_data = new uint8_t [frameInfo->size+2*frameInfo->chroma_size];

+ 

+diff -upr ttcut-old/avstream/ttaviwriter.h ttcut/avstream/ttaviwriter.h
+--- ttcut-old/avstream/ttaviwriter.h	2011-05-01 22:05:47.308819943 -0400
++++ ttcut/avstream/ttaviwriter.h	2011-05-01 22:06:17.162739403 -0400
+@@ -72,6 +72,7 @@ class TTAVIWriter
+    off64_t            file_offset;
+    uint8_t*           ref_data;
+    avi_t*             avi_file;
++   float              fps;
+ };
+ 
+ #endif //TTAVIWRITER_H
diff --git a/media-video/ttcut/files/ttcut.desktop b/media-video/ttcut/files/ttcut.desktop
new file mode 100644
index 000000000000..b2f1325a2f73
--- /dev/null
+++ b/media-video/ttcut/files/ttcut.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=TTCut
+Comment=Removes commercials from DVB recordings
+Comment[de]=Entfernt Werbeeinblendungen aus DVB-Mitschnitten
+TryExec=ttcut
+Exec=ttcut
+Icon=ttcut
+Terminal=false
+StartupNotify=false
+MimeType=video/mpeg;
+Categories=AudioVideo;Video;AudioVideoEditing;
diff --git a/media-video/ttcut/metadata.xml b/media-video/ttcut/metadata.xml
new file mode 100644
index 000000000000..4d3d2c4c394a
--- /dev/null
+++ b/media-video/ttcut/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>billie@gentoo.org</email>
+		<name>Daniel Pielmeier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+	<longdescription><pkg>media-video/ttcut</pkg> is a tool designed to remove commercials from
+	DVB (European standard for digital radio and television broadcast)
+	recordings. It only accepts the elementary video and audio streams. This is
+	because the MPEG transport stream is slightly different to the MPEG Program
+	stream used on DVD media. Also it may contain errors that tools like
+	<pkg>media-video/projectx</pkg> can correct while demuxing the stream.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">ttcut.berlios</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/ttcut/ttcut-0.19.6-r3.ebuild b/media-video/ttcut/ttcut-0.19.6-r3.ebuild
new file mode 100644
index 000000000000..99b5e6857847
--- /dev/null
+++ b/media-video/ttcut/ttcut-0.19.6-r3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils fdo-mime qt4-r2
+
+DESCRIPTION="Tool for cutting MPEG files especially for removing commercials"
+HOMEPAGE="http://www.tritime.de/ttcut/"
+SRC_URI="mirror://sourceforge/${PN}.berlios/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=">=media-libs/libmpeg2-0.4.0
+	dev-qt/qtgui:4
+	dev-qt/qtopengl:4
+	virtual/glu
+	virtual/opengl"
+RDEPEND="${DEPEND}
+	media-video/mplayer
+	>=media-video/ffmpeg-1.0.8[encode]"
+
+S=${WORKDIR}/${PN}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-deprecated.patch
+	"${FILESDIR}"/${P}-ntsc-fps.patch
+	"${FILESDIR}"/${P}-ffmpeg-vf-setdar.patch
+	"${FILESDIR}"/${P}-no_implicit_GLU.patch
+	)
+
+src_install() {
+	dobin ttcut
+
+	domenu "${FILESDIR}"/${PN}.desktop
+
+	dodoc AUTHORS BUGS CHANGELOG README.* TODO
+}
diff --git a/media-video/ushare/Manifest b/media-video/ushare/Manifest
new file mode 100644
index 000000000000..d650e51a8b1e
--- /dev/null
+++ b/media-video/ushare/Manifest
@@ -0,0 +1,18 @@
+AUX 01_all_ushare_build_system.patch 4276 SHA256 6455181cd32b9962de2dddc0140201a56c0dc21e161f8a24bf9f037de012e3f9 SHA512 14029031996c030509d2850571bdd94a7bca951d0809c4a034bb2d021a76cc9c15ff3229452ab28322bda25e9e09814bc3dae5fff6cee4ac056eb7a76375a670 WHIRLPOOL 0fd353364a8021d5f75ee32d1dc81236b346f44d7327e300d20b10789c68c46b0c51660b4e7bca982c8bb2b6f285cd63047308f72c595b98f777e0e81fdfa3c7
+AUX 02_all_ushare_build_warnings.patch 989 SHA256 5c35ace53d189726459eb4d45f05430eeb854eec411bd0f46b0b3fcb4ad682ce SHA512 236beb2283762d17dc1efa994a8580c8606b1bca0059fd78643f062fa6cdc4df31281cd0b46c2df90b4d1c0cca9b6c4fff93d493084423e91c25809a52a1175d WHIRLPOOL e324c599aa140c11c3646f6c694f8fc296e92207bfacd71c5b988cfd77e8b7864f2073146203eaaeef54f669e00673bdba37540d92bb196138ea30671b1c10f5
+AUX 03_all_ushare_mp4_video_mime.patch 971 SHA256 b44ea6fdde6af5e978cc9c76945feed8ed0cdac76be9b1777e0849dae44fb0f0 SHA512 9eb4d34c7dcb2aaa9b97d74515933a1a31793d4f1630caab23b2243952a908ad257c9fc4304798ee9b5837049e367ae26344745bbcce1e58426c4704278c8d4a WHIRLPOOL 77f92096cbcc0bf3658aca9bbd30510ac9741801016b29238fbbf23feb8e53af5b859209b8b66612ae1c1e49639d6ef033f250e410220fa14af5829aad90841f
+AUX 04_all_ushare_upnp_build_fix.patch 4617 SHA256 0ceb221da7bf28b9f84191c02bb45f6c034818c6dd57652b42bfc6efefe32ffa SHA512 87166b7bf3b371cfaed628dcca3e59a3f0e93efdb5e67bd78f3c3f5930b9fa7bdabbce8849163d3874befb2d248c28f214dc4c63d264673f83e279c077c158e4 WHIRLPOOL e3fa8a487a9cd4f5b52a6f8c37ff6aedd3c5caee8c9f639ba4f1539d1c06f05203960819804fa9d1f8cef6d2828c914c555eff3e0051672836f3ec49c2d8dc98
+AUX 05_all_missing_headers.patch 1801 SHA256 3465d4e9f42ea48454b5cc595da267b1471f308ce8783b570851597cfe77d1fa SHA512 0426664cf06e0f1ecf19523bc00c52bded8f4850934484dee0a1dbdd1f4e38a755095046ef155297bfac9938d3784df5e6cf04be95e936b6af38e6096575d87d WHIRLPOOL 94a2617a80e88aad8e220443315ef03070a12f02230046c0396ef6a9cc115b4fb23c2932ab50fad40e1b639b7666a3ae2eabf49a169916fe283a0c042a079f67
+AUX 06_all_ushare_disable_sysconf.patch 656 SHA256 16226297ea6148608c7bc12ae61069b72ef2907a5f0a580e431ae660b7549080 SHA512 9f2d5a107f42c6259530e1dd6ff06301c69c904974dc14632409c1cd18e7064de8663c56f0da2b5e4329217af36b564c75fa5f76c0191ca1c64db6e1ebdf12dd WHIRLPOOL 70b754c61c46c2635f6578ab50b3f03f78bb4bbab737e06f659b664abc60e2ef49d1d2c3d500e89e4bdbb7cc44d9035632cbac3df97c653e7be3db22b9b8c0e8
+AUX 07_all_drop_optimizations.patch 516 SHA256 a3871598281fdcd6a4e597d668b81ae1eee5dcc4a2b4a95415379a7a5b075bd4 SHA512 0b2fd04608fe74949d7a18d172c66596570c042a204f7665ceac09202d504138813ed700d1f327e1cb5b0601931f34bdb00efbac61979ff9f88735c54ae89770 WHIRLPOOL 9696145f5dea7bb2d33833a671a8274863bc0bc537ccf2bacc9fb158c1aff462600fbe33048adee1b0bb4dbd3ab85a05f1500302ec5304b2d52523abac3d1f9b
+AUX 08_all_gcc5.patch 1244 SHA256 0bf336fd52a76926228eed42fce437fe6091adb32a2c8dc9aa87a3d9e958e1e2 SHA512 97439026ed47d5fbac93bb865091129c317805dcb0705eb1edf270c367cd0509bba7dcd56bdbaa757b6ff7cc03a0821511329dc087d83d28976c991edbd5158b WHIRLPOOL 5ee8a528e194e8c4aeafea3c8147a9a564d18374cf9c391a95d816a4a21c4576d9665d7e038f365a4e7227dad4defa024241088148226cc8b3b812dfe3ca3f01
+AUX ushare.conf.d 781 SHA256 49b767880868709ea10fae04f2bf1ebfbd38c29215ce427ebb6ebd515d52e4ff SHA512 86c7459952f5bfbad3daa960c2412f5dd32d4047db7714d0c990aad77f9aa9e68a49ddc46e8653276c3216f2834aa4334d4bc8c71770866b1a1c124848977dd0 WHIRLPOOL 0b281a86afed0641483212888464d3569cc87857504247d28557fdbd017c9c4b99993c2922d89dcfcc460fb9333723c05c08233da1d8a295c0ddeec7b1822fb0
+AUX ushare.init.d 2050 SHA256 878057a32ba6b5c6bd809ff36f93c156535b0c88b2b3529b2c61a76a607e902e SHA512 1bb8efbbb29cf468f90329b8dbed3dd6896734907ad90c1bb2bdb99b11b2d17148fafc971569b2c06d7fe86efb7ab289711cb73b1522a1fd207a38577e6f714b WHIRLPOOL 52e5243734fefedab93902586a4ed8a19c1865312a6b07884f95d1652abacec859a99cb641c6049c5ad0f62edab9a36a3d3d6c6266174d82f6f7d0ae4cd1c93e
+AUX ushare.init.d.ng 954 SHA256 0024da77fd6b2f9a4d19c8acfe9fd8199779db6adcf04e1156e74633d5e66edf SHA512 c70e6f47f29a9d555821c3bc2000ebd6533778208b46a7bbe823454e4b26408ab9b6e31ce7449dc84ae32fcc6754c3ca2a5afa0a0393a59888bda294f0e78c98 WHIRLPOOL 74e2d8a41a280d41267e96c1fa147c309351d8dc8e85e8b520bb6381a2717bf423d993578ef1a10fc0beaa0b7ca6dcfb1ef21d031bb855aab721434b721aca57
+AUX ushare.service 189 SHA256 1967fd7ce1a8ce0018258dc743d951e2ff991d26597578f64f2d732c4d4606c9 SHA512 141b1f592220d3785af821f085f9c03811a2370e1a8c6bb5d2739b4ae74421323df437d2a6672d943ab8371b6d5ccfb395a4943a10eb5c1e8bc0ff16a3177b15 WHIRLPOOL 8c40cad1cf41605548852202946adf70bc5bd8937555dd0b427c57c5a5e80f0921e5e7d7b5f92b3ddeb7523a6001f84af8a1e56554e7438a86c0b9a575c797f4
+DIST ushare-1.1a.tar.bz2 65864 SHA256 7b9b85c79968d4f4560f02a99e33c6a33ff58f9d41d8faea79e31cce2ee78665 SHA512 2144ef96e58960d4d11bcefcd857c7eb7adab8df4ff815772d3b9d668f9f9daa1312707eb00a770c461b2a316e094e6697a004723ea02e86ee872fbe60b4797c WHIRLPOOL de9043c34edfd9ff3a1220968496e2ce42fae43cf1b190c40a14f11a6e4297689d2d800878e698a9f57edbe35dbb5c7ca82d81a67029df648a0d6e6c75966471
+EBUILD ushare-1.1a-r6.ebuild 1682 SHA256 c2fbef1f22aa128af4782fc527ac54f11b3bc396b9033a379511e00dc606abd2 SHA512 c93023e3d535c06f9f70a5d72a26773ef14d22bb035d805f22636e4d0e0be5a2dde96f269fdc4e5de7fde2ecb73270f6f1f45ef4ed89f0176922ab53d9c95da3 WHIRLPOOL c21e2f9ba803575873cd0270b6e7f476bd6a2fb9e968fecfa9a716c7822ecb74b06cc82f68611f5d48ec0517c352b2a6aa0b70316abb166792cac7ef9ac969f1
+EBUILD ushare-1.1a-r8.ebuild 1684 SHA256 530c0997b85fbc3ef90272f1d86938e09882f7f46682137111319ca83ba8d25e SHA512 d14fee0c9502a503d411c5435c1b9a758e0054e5e5c1abf0fec23b0981f3412a13a7e0e614a60ca966e0d2314bb3b5e7bdcbfa18a89f2cd6e33bd1622e508876 WHIRLPOOL 726323a9ac7175733b8f94a8b97ddcb25a0ab4a4ddf1984368f159a6dd85ba1371464619d0c64a0c02f62a648f5b82e5a18a3969e961a6733f9f01295dbfa03e
+MISC ChangeLog 3952 SHA256 f0dd801f4ac211ffc12edc6441e1b0617e1cbe5bb4fa7724639c81fe33a1137e SHA512 61320d8afb455897c8d2b0ea71c603db7efbbf27505c62516d6c4f520f0cb44967311619dc57857f1d23dc16676597ff6636595cc9ddb4db4406ffaf58d58ea8 WHIRLPOOL 690a4e62df4f0c55b033f904bcfdc8b2a8e32ed4a3294f18afa7743102630a2770533674ade50ceb3ecd0e365dd21e6421eba96253ea2a92e46125169fdef106
+MISC ChangeLog-2015 4698 SHA256 6d589b0cfc2636533cd7e99f65a2b564bed3a5faf2c20c6fcd6ffda8a368aeec SHA512 137691c279c69b6423fa7ca4b4e478b607f5337b3f71699c4a1fe4fe8c5f35da37b387d435482d05bcd437973108003c802458cfe2ab608f12b36835a3feaf47 WHIRLPOOL 9d3ae7b28b7871f3cbfe968aaefcba3f227d23d6d967cfea73239ba186832447d2a878699e909cd49ce4b432a598d98c8bc2e95653c6b78a46049ce289c47ffd
+MISC metadata.xml 246 SHA256 64ed482a33b3a866b5a4d2b8238b53182ae933373516d09f4823805425e44ad2 SHA512 ae23d702d83f56528c1f09a14f7f5643e28d91fe80a5af5cfa1126288bb1c66f1dc8262a06e4d539921d1564cc4ef33302d5d5db77bfad1bb0391f6bbab66653 WHIRLPOOL 84d307b97d9f7b16d134b722efbce4b8be4a22983d3ba5c09e003f7344d7141279aecae93347fc014a45d2b1a4aaad480fbd83e8d7bc424461e1bd058811f1a0
diff --git a/media-video/ushare/files/01_all_ushare_build_system.patch b/media-video/ushare/files/01_all_ushare_build_system.patch
new file mode 100644
index 000000000000..c635bd7d52f4
--- /dev/null
+++ b/media-video/ushare/files/01_all_ushare_build_system.patch
@@ -0,0 +1,170 @@
+diff -uNr ushare-1.1a/configure ushare-1.1b/configure
+--- ushare-1.1a/configure	2007-12-09 08:03:36.000000000 -0500
++++ ushare-1.1b/configure	2012-03-25 17:35:07.000000000 -0400
+@@ -42,6 +42,9 @@
+   echo "  --with-libdlna-dir=DIR      check for libdlna installed in DIR"
+   echo ""
+   echo "Advanced options (experts only):"
++  echo "  --disable-sysconf           disable installation of init files"
++  echo "  --enable-developer          enable developer options"
++  echo "  --disable-developer         disable developer options"
+   echo "  --enable-debug              enable debugging symbols"
+   echo "  --disable-debug             disable debugging symbols"
+   echo "  --disable-strip             disable stripping of executables at installation"
+@@ -164,6 +167,11 @@
+     echo "#define $1 \"$2\"" >> $CONFIG_H
+ }
+ 
++check_cmd_exists(){
++	log check_cmd_exists "$@"
++	which "$@" >>$logfile 2>&1
++}
++
+ check_cmd(){
+     log "$@"
+     "$@" >>$logfile 2>&1
+@@ -300,13 +308,15 @@
+ strip="strip"
+ cpu=`uname -m`
+ optimize="yes"
++sysconf="yes"
++developer="no"
+ debug="no"
+ dostrip="yes"
+ extralibs=""
+ installstrip="-s"
+ cross_compile="no"
+ INSTALL="/usr/bin/install -c"
+-VERSION="1.1a"
++VERSION="1.2.0"
+ system_name=`uname -s 2>&1`
+ 
+ #################################################
+@@ -420,6 +430,12 @@
+   ;;
+   --disable-dlna) dlna="no"
+   ;;
++  --disable-sysconf) sysconf="no"
++  ;;
++  --enable-developer) developer="yes"
++  ;;
++  --disable-developer) developer="no"
++  ;;
+   --enable-debug) debug="yes"
+   ;;
+   --disable-debug) debug="no"
+@@ -584,6 +600,25 @@
+ linux && add_cflags -D_GNU_SOURCE
+ 
+ #################################################
++#   check for developer options
++#################################################
++if enabled developer; then
++  add_cflags -Werror
++  add_cflags -DHAVE_DEVELOPER
++  
++  have_ctags='no'
++  if check_cmd_exists 'ctags'; then
++    have_ctags='yes'
++  fi
++
++  have_etags='no'
++  if check_cmd_exists 'etags'; then
++  	have_etags='yes'
++  fi
++
++fi
++
++#################################################
+ #   check for debug symbols
+ #################################################
+ if enabled debug; then
+@@ -684,6 +719,8 @@
+ echolog "  STRIP              $strip"
+ echolog "  make               $make"
+ echolog "  CPU                $cpu ($tune)"
++echolog "  install sysconf    $sysconf"
++echolog "  developer options  $developer"
+ echolog "  debug symbols      $debug"
+ echolog "  strip symbols      $dostrip"
+ echolog "  optimize           $optimize"
+@@ -724,6 +761,10 @@
+ append_config "LDFLAGS=$LDFLAGS"
+ append_config "INSTALL=$INSTALL"
+ 
++append_config "INSTALL_SYSCONF=$sysconf"
++append_config "DEVELOPER=$developer"
++append_config "HAVE_CTAGS=$have_ctags"
++append_config "HAVE_ETAGS=$have_etags"
+ append_config "DEBUG=$debug"
+ 
+ 
+diff -uNr ushare-1.1a/scripts/Makefile ushare-1.1b/scripts/Makefile
+--- ushare-1.1a/scripts/Makefile	2007-12-09 08:03:36.000000000 -0500
++++ ushare-1.1b/scripts/Makefile	2012-03-25 17:35:07.000000000 -0400
+@@ -3,6 +3,11 @@
+ endif
+ include ../config.mak
+ 
++INSTALL_RULES = 
++ifeq ($(INSTALL_SYSCONF),yes)
++  INSTALL_RULES   += install-sysconf
++endif
++
+ CONF_FILE  = "ushare.conf"
+ INITD_FILE = "ushare"
+ 
+@@ -14,7 +19,9 @@
+ 
+ distclean:
+ 
+-install:
++install: $(INSTALL_RULES)
++
++install-sysconf:
+ 	$(INSTALL) -d $(sysconfdir)
+ 	$(INSTALL) -m 644 $(CONF_FILE) $(sysconfdir)
+ 	$(INSTALL) -d $(sysconfdir)/init.d
+diff -uNr ushare-1.1a/src/Makefile ushare-1.1b/src/Makefile
+--- ushare-1.1a/src/Makefile	2007-12-09 08:03:36.000000000 -0500
++++ ushare-1.1b/src/Makefile	2012-03-25 17:35:07.000000000 -0400
+@@ -3,6 +3,15 @@
+ endif
+ include ../config.mak
+ 
++ifeq ($(DEVELOPER),yes)
++  ifeq ($(HAVE_ETAGS),yes)
++    BUILD_RULES   += TAGS
++  endif
++  ifeq ($(HAVE_CTAGS),yes)
++    BUILD_RULES   += tags
++  endif
++endif
++
+ PROG = ushare
+ 
+ EXTRADIST = ushare.1 \
+@@ -50,7 +59,7 @@
+ 
+ .SUFFIXES: .c .o
+ 
+-all: depend $(PROG)
++all: depend $(BUILD_RULES) $(PROG)
+ 
+ .c.o:
+ 	$(CC) -c $(CFLAGS) $(OPTFLAGS) -o $@ $<
+@@ -58,6 +67,14 @@
+ $(PROG): $(OBJS)
+ 	$(CC) $(OBJS) $(LDFLAGS) $(EXTRALIBS) -o $@
+ 
++TAGS:
++	@rm -f $@; \
++	 ( find -name '*.[chS]' -print ) | xargs etags -a
++
++tags:
++	@rm -f $@; \
++	 ( find -name '*.[chS]' -print ) | xargs ctags -a;
++
+ clean:
+ 	-$(RM) -f *.o $(PROG)
+ 	-$(RM) -f .depend
diff --git a/media-video/ushare/files/02_all_ushare_build_warnings.patch b/media-video/ushare/files/02_all_ushare_build_warnings.patch
new file mode 100644
index 000000000000..f79e7890f8c0
--- /dev/null
+++ b/media-video/ushare/files/02_all_ushare_build_warnings.patch
@@ -0,0 +1,35 @@
+diff --git a/src/ctrl_telnet.c b/src/ctrl_telnet.c
+index 0849d80..b3e9e8d 100644
+--- a/src/ctrl_telnet.c
++++ b/src/ctrl_telnet.c
+@@ -202,6 +202,7 @@ ctrl_telnet_start (int port)
+ void
+ ctrl_telnet_stop (void)
+ {
++  ssize_t tmp;
+   pthread_mutex_lock (&startstop_lock);
+ 
+   if (!started)
+@@ -211,7 +212,7 @@ ctrl_telnet_stop (void)
+   }
+ 
+   /* yes is int, which is bigger then char, so this should be safe */
+-  write (ttd.killer[1], &yes, sizeof (char));
++  tmp = write (ttd.killer[1], &yes, sizeof (char));
+ 
+   pthread_mutex_unlock (&startstop_lock);
+   pthread_join (ttd.thread, NULL);
+diff --git a/src/mime.c b/src/mime.c
+index 66c48ab..bf0121b 100644
+--- a/src/mime.c
++++ b/src/mime.c
+@@ -144,7 +144,8 @@ char *mime_get_protocol (struct mime_type_t *mime)
+   if (!mime)
+     return NULL;
+ 
+-  sprintf (protocol, mime->mime_protocol);
++  //sprintf (protocol, mime->mime_protocol);
++  strcpy (protocol, mime->mime_protocol);
+   strcat (protocol, "*");
+   return strdup (protocol);
+ }
diff --git a/media-video/ushare/files/03_all_ushare_mp4_video_mime.patch b/media-video/ushare/files/03_all_ushare_mp4_video_mime.patch
new file mode 100644
index 000000000000..0edba22cba94
--- /dev/null
+++ b/media-video/ushare/files/03_all_ushare_mp4_video_mime.patch
@@ -0,0 +1,20 @@
+diff --git a/src/mime.c b/src/mime.c
+index bf0121b..f38deca 100644
+--- a/src/mime.c
++++ b/src/mime.c
+@@ -53,6 +53,7 @@ const struct mime_type_t MIME_Type_List[] = {
+   { "mpeg2", UPNP_VIDEO, "http-get:*:video/mpeg2:"},
+   { "m4v",   UPNP_VIDEO, "http-get:*:video/mp4:"},
+   { "m4p",   UPNP_VIDEO, "http-get:*:video/mp4:"},
++  { "mp4",   UPNP_VIDEO, "http-get:*:video/mp4:"},
+   { "mp4ps", UPNP_VIDEO, "http-get:*:video/x-nerodigital-ps:"},
+   { "ts",    UPNP_VIDEO, "http-get:*:video/mpeg2:"},
+   { "ogm",   UPNP_VIDEO, "http-get:*:video/mpeg:"},
+@@ -79,7 +80,6 @@ const struct mime_type_t MIME_Type_List[] = {
+   { "mp1",  UPNP_AUDIO, "http-get:*:audio/mp1:"},
+   { "mp2",  UPNP_AUDIO, "http-get:*:audio/mp2:"},
+   { "mp3",  UPNP_AUDIO, "http-get:*:audio/mpeg:"},
+-  { "mp4",  UPNP_AUDIO, "http-get:*:audio/mp4:"},
+   { "m4a",  UPNP_AUDIO, "http-get:*:audio/mp4:"},
+   { "ogg",  UPNP_AUDIO, "http-get:*:audio/x-ogg:"},
+   { "wav",  UPNP_AUDIO, "http-get:*:audio/wav:"},
diff --git a/media-video/ushare/files/04_all_ushare_upnp_build_fix.patch b/media-video/ushare/files/04_all_ushare_upnp_build_fix.patch
new file mode 100644
index 000000000000..c3ec37a324c5
--- /dev/null
+++ b/media-video/ushare/files/04_all_ushare_upnp_build_fix.patch
@@ -0,0 +1,156 @@
+diff -wbBur ushare-1.1a/src/http.c ushare-1.1a.my/src/http.c
+--- ushare-1.1a/src/http.c	2007-12-09 13:03:36.000000000 +0000
++++ ushare-1.1a.my/src/http.c	2010-10-29 11:13:07.000000000 +0000
+@@ -77,8 +77,7 @@
+   info->content_type = ixmlCloneDOMString (content_type);
+ }
+ 
+-static int
+-http_get_info (const char *filename, struct File_Info *info)
++int http_get_info (const char *filename, struct File_Info *info)
+ {
+   extern struct ushare_t *ut;
+   struct upnp_entry_t *entry = NULL;
+@@ -197,8 +196,7 @@
+   return ((UpnpWebFileHandle) file);
+ }
+ 
+-static UpnpWebFileHandle
+-http_open (const char *filename, enum UpnpOpenFileMode mode)
++UpnpWebFileHandle http_open (const char *filename, enum UpnpOpenFileMode mode)
+ {
+   extern struct ushare_t *ut;
+   struct upnp_entry_t *entry = NULL;
+@@ -251,8 +249,7 @@
+   return ((UpnpWebFileHandle) file);
+ }
+ 
+-static int
+-http_read (UpnpWebFileHandle fh, char *buf, size_t buflen)
++int http_read (UpnpWebFileHandle fh, char *buf, size_t buflen)
+ {
+   struct web_file_t *file = (struct web_file_t *) fh;
+   ssize_t len = -1;
+@@ -286,8 +283,7 @@
+   return len;
+ }
+ 
+-static int
+-http_write (UpnpWebFileHandle fh __attribute__((unused)),
++int http_write (UpnpWebFileHandle fh __attribute__((unused)),
+             char *buf __attribute__((unused)),
+             size_t buflen __attribute__((unused)))
+ {
+@@ -296,8 +292,7 @@
+   return 0;
+ }
+ 
+-static int
+-http_seek (UpnpWebFileHandle fh, off_t offset, int origin)
++int http_seek (UpnpWebFileHandle fh, off_t offset, int origin)
+ {
+   struct web_file_t *file = (struct web_file_t *) fh;
+   off_t newpos = -1;
+@@ -371,8 +366,7 @@
+   return 0;
+ }
+ 
+-static int
+-http_close (UpnpWebFileHandle fh)
++int http_close (UpnpWebFileHandle fh)
+ {
+   struct web_file_t *file = (struct web_file_t *) fh;
+ 
+@@ -402,13 +396,3 @@
+ 
+   return 0;
+ }
+-
+-struct UpnpVirtualDirCallbacks virtual_dir_callbacks =
+-  {
+-    http_get_info,
+-    http_open,
+-    http_read,
+-    http_write,
+-    http_seek,
+-    http_close
+-  };
+diff -wbBur ushare-1.1a/src/http.h ushare-1.1a.my/src/http.h
+--- ushare-1.1a/src/http.h	2007-12-09 13:03:36.000000000 +0000
++++ ushare-1.1a.my/src/http.h	2010-10-29 11:13:11.000000000 +0000
+@@ -25,6 +25,13 @@
+ #include <upnp/upnp.h>
+ #include <upnp/upnptools.h>
+ 
+-struct UpnpVirtualDirCallbacks virtual_dir_callbacks;
++int http_close (UpnpWebFileHandle fh);
++int http_write (UpnpWebFileHandle fh __attribute__((unused)),
++            char *buf __attribute__((unused)),
++            size_t buflen __attribute__((unused)));
++int http_seek (UpnpWebFileHandle fh, off_t offset, int origin);
++UpnpWebFileHandle http_open (const char *filename, enum UpnpOpenFileMode mode);
++int http_read (UpnpWebFileHandle fh, char *buf, size_t buflen);
++int http_get_info (const char *filename, struct File_Info *info);
+ 
+ #endif /* _HTTP_H_ */
+diff -wbBur ushare-1.1a/src/ushare.c ushare-1.1a.my/src/ushare.c
+--- ushare-1.1a/src/ushare.c	2007-12-09 13:03:36.000000000 +0000
++++ ushare-1.1a.my/src/ushare.c	2010-10-29 11:17:45.000000000 +0000
+@@ -188,7 +188,7 @@
+   if (strcmp (request->DevUDN + 5, ut->udn))
+     return;
+ 
+-  ip = request->CtrlPtIPAddr.s_addr;
++  ip = (*(struct sockaddr_in*)&request->CtrlPtIPAddr).sin_addr.s_addr;
+   ip = ntohl (ip);
+   sprintf (val, "%d.%d.%d.%d",
+            (ip >> 24) & 0xFF, (ip >> 16) & 0xFF, (ip >> 8) & 0xFF, ip & 0xFF);
+@@ -348,7 +348,47 @@
+ 
+   UpnpEnableWebserver (TRUE);
+ 
+-  res = UpnpSetVirtualDirCallbacks (&virtual_dir_callbacks);
++  res = UpnpVirtualDir_set_WriteCallback(http_write);
++  if (res != UPNP_E_SUCCESS)
++  {
++    log_error (_("Cannot set virtual directory callbacks\n"));
++    free (description);
++    return -1;
++  }
++
++  res = UpnpVirtualDir_set_GetInfoCallback(http_get_info);
++  if (res != UPNP_E_SUCCESS)
++  {
++    log_error (_("Cannot set virtual directory callbacks\n"));
++    free (description);
++    return -1;
++  }
++
++  res = UpnpVirtualDir_set_ReadCallback(http_read);
++  if (res != UPNP_E_SUCCESS)
++  {
++    log_error (_("Cannot set virtual directory callbacks\n"));
++    free (description);
++    return -1;
++  }
++
++  res = UpnpVirtualDir_set_OpenCallback(http_open);
++  if (res != UPNP_E_SUCCESS)
++  {
++    log_error (_("Cannot set virtual directory callbacks\n"));
++    free (description);
++    return -1;
++  }
++
++  res = UpnpVirtualDir_set_SeekCallback(http_seek);
++  if (res != UPNP_E_SUCCESS)
++  {
++    log_error (_("Cannot set virtual directory callbacks\n"));
++    free (description);
++    return -1;
++  }
++
++  res = UpnpVirtualDir_set_CloseCallback(http_close);
+   if (res != UPNP_E_SUCCESS)
+   {
+     log_error (_("Cannot set virtual directory callbacks\n"));
diff --git a/media-video/ushare/files/05_all_missing_headers.patch b/media-video/ushare/files/05_all_missing_headers.patch
new file mode 100644
index 000000000000..0d2f0e8faff9
--- /dev/null
+++ b/media-video/ushare/files/05_all_missing_headers.patch
@@ -0,0 +1,59 @@
+diff -uNr ushare-1.1a.a/src/cds.c ushare-1.1a.b/src/cds.c
+--- ushare-1.1a.a/src/cds.c	2007-12-09 08:03:36.000000000 -0500
++++ ushare-1.1a.b/src/cds.c	2012-05-27 11:28:42.000000000 -0400
+@@ -19,7 +19,9 @@
+  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+  */
+ 
++#include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <upnp/upnp.h>
+ #include <upnp/upnptools.h>
+ 
+diff -uNr ushare-1.1a.a/src/cms.c ushare-1.1a.b/src/cms.c
+--- ushare-1.1a.a/src/cms.c	2007-12-09 08:03:36.000000000 -0500
++++ ushare-1.1a.b/src/cms.c	2012-05-27 11:25:03.000000000 -0400
+@@ -20,6 +20,7 @@
+  */
+ 
+ #include <stdlib.h>
++#include <string.h>
+ #include <upnp/upnp.h>
+ #include <upnp/upnptools.h>
+ 
+diff -uNr ushare-1.1a.a/src/http.c ushare-1.1a.b/src/http.c
+--- ushare-1.1a.a/src/http.c	2012-05-27 11:23:32.000000000 -0400
++++ ushare-1.1a.b/src/http.c	2012-05-27 11:25:13.000000000 -0400
+@@ -25,6 +25,7 @@
+ #include <errno.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <unistd.h>
+ #include <errno.h>
+ 
+diff -uNr ushare-1.1a.a/src/presentation.c ushare-1.1a.b/src/presentation.c
+--- ushare-1.1a.a/src/presentation.c	2007-12-09 08:03:36.000000000 -0500
++++ ushare-1.1a.b/src/presentation.c	2012-05-27 11:30:08.000000000 -0400
+@@ -18,7 +18,9 @@
+  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+  */
+ 
++#include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ #if HAVE_LANGINFO_CODESET
+ # include <langinfo.h>
+diff -uNr ushare-1.1a.a/src/services.c ushare-1.1a.b/src/services.c
+--- ushare-1.1a.a/src/services.c	2007-12-09 08:03:36.000000000 -0500
++++ ushare-1.1a.b/src/services.c	2012-05-27 11:25:26.000000000 -0400
+@@ -20,6 +20,7 @@
+  */
+ 
+ #include <stdlib.h>
++#include <string.h>
+ #include <upnp/upnp.h>
+ #include <upnp/upnptools.h>
+ 
diff --git a/media-video/ushare/files/06_all_ushare_disable_sysconf.patch b/media-video/ushare/files/06_all_ushare_disable_sysconf.patch
new file mode 100644
index 000000000000..c3adf8e54287
--- /dev/null
+++ b/media-video/ushare/files/06_all_ushare_disable_sysconf.patch
@@ -0,0 +1,20 @@
+Do not try to parse the default configuration file as everyting
+should be handled by the /etc/conf.d/ushare file in Gentoo
+Index: ushare-1.1a/src/ushare.c
+===================================================================
+--- ushare-1.1a.orig/src/ushare.c
++++ ushare-1.1a/src/ushare.c
+@@ -813,13 +813,6 @@ main (int argc, char **argv)
+     return EXIT_SUCCESS;
+   }
+ 
+-  if (parse_config_file (ut) < 0)
+-  {
+-    /* fprintf here, because syslog not yet ready */
+-    fprintf (stderr, _("Warning: can't parse file \"%s\".\n"),
+-             ut->cfg_file ? ut->cfg_file : SYSCONFDIR "/" USHARE_CONFIG_FILE);
+-  }
+-
+   if (ut->xbox360)
+   {
+     char *name;
diff --git a/media-video/ushare/files/07_all_drop_optimizations.patch b/media-video/ushare/files/07_all_drop_optimizations.patch
new file mode 100644
index 000000000000..7a5029f79519
--- /dev/null
+++ b/media-video/ushare/files/07_all_drop_optimizations.patch
@@ -0,0 +1,20 @@
+Index: ushare-1.1a/configure
+===================================================================
+--- ushare-1.1a.orig/configure
++++ ushare-1.1a/configure
+@@ -627,15 +627,6 @@ if enabled debug; then
+   dostrip=no
+ fi
+ 
+-if enabled optimize; then
+-  if test -n "`$cc -v 2>&1 | grep xlc`"; then
+-    add_cflags  "-O5"
+-    add_ldflags "-O5"
+-  else
+-    add_cflags "-O3"
+-  fi
+-fi
+-
+ #################################################
+ #   check for locales (optional)
+ #################################################
diff --git a/media-video/ushare/files/08_all_gcc5.patch b/media-video/ushare/files/08_all_gcc5.patch
new file mode 100644
index 000000000000..d76f8771f5d9
--- /dev/null
+++ b/media-video/ushare/files/08_all_gcc5.patch
@@ -0,0 +1,45 @@
+Various gcc-5 fixes
+
+https://gcc.gnu.org/gcc-5/porting_to.html
+
+Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
+Index: ushare-1.1a/src/trace.h
+===================================================================
+--- ushare-1.1a.orig/src/trace.h
++++ ushare-1.1a/src/trace.h
+@@ -29,7 +29,7 @@ typedef enum {
+ 
+ void print_log (log_level level, const char *format, ...)
+   __attribute__ ((format (printf, 2, 3)));
+-inline void start_log (void);
++extern inline void start_log (void);
+ 
+ /* log_info
+  * Normal print, to replace printf
+Index: ushare-1.1a/src/ushare.h
+===================================================================
+--- ushare-1.1a.orig/src/ushare.h
++++ ushare-1.1a/src/ushare.h
+@@ -127,6 +127,6 @@ struct action_event_t {
+   struct service_t *service;
+ };
+ 
+-inline void display_headers (void);
++extern inline void display_headers (void);
+ 
+ #endif /* _USHARE_H_ */
+Index: ushare-1.1a/src/ushare.c
+===================================================================
+--- ushare-1.1a.orig/src/ushare.c
++++ ushare-1.1a/src/ushare.c
+@@ -49,6 +49,10 @@
+ #include <ifaddrs.h>
+ #endif
+ 
++#ifdef HAVE_LOCALE_H
++#include <locale.h>
++#endif
++
+ #if (defined(__unix__) || defined(unix)) && !defined(USG)
+ #include <sys/param.h>
+ #endif
diff --git a/media-video/ushare/files/ushare.conf.d b/media-video/ushare/files/ushare.conf.d
new file mode 100644
index 000000000000..e87d6a1763ba
--- /dev/null
+++ b/media-video/ushare/files/ushare.conf.d
@@ -0,0 +1,37 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# User to run ushare daemon (if none, root will be used)
+USHARE_USER="ushare"
+
+# UPNP Friendly Name:
+USHARE_NAME="uShare"
+
+# The interface to bind to:
+USHARE_IFACE="eth0"
+
+# Static ushare port:
+USHARE_PORT=""
+
+# Enable/Disable telnet:
+USHARE_TELNET="yes"
+
+# Choose different telnet port:
+USHARE_TELNET_PORT=""
+
+# Enable/Disable web component:
+USHARE_WEB="yes"
+
+# A List of directories to share, each precieded by '-c':
+USHARE_DIRS=""
+
+# Enable/Disable XboX 360 compliant profile:
+USHARE_XBOX="no"
+
+# Enable/Disable DLNA compliant profile (Playstation3 requires this):
+USHARE_DLNA="no"
+
+# Misc. options:
+USHARE_OPTS=""
+
+# Check ushare --help or man ushare for more options.
diff --git a/media-video/ushare/files/ushare.init.d b/media-video/ushare/files/ushare.init.d
new file mode 100644
index 000000000000..c1d94b6a9c98
--- /dev/null
+++ b/media-video/ushare/files/ushare.init.d
@@ -0,0 +1,78 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	use net
+}
+
+start() {
+	ebegin "Starting uShare"
+	
+	# Sanity check to avoid ushare failling on booting with no
+	# shared dirs
+	if [[ -z "${USHARE_DIRS}" ]] ; then
+		eerror "Please set shared dirs in /etc/conf.d/ushare"
+		return 1
+	fi
+
+	if [[ -z "${USHARE_PORT}" ]] ; then
+		einfo "${USHARE_NAME} runs on a dynamic port"
+		local ushare_port=
+	else
+		local ushare_port="--port ${USHARE_PORT}"
+		einfo "${USHARE_NAME} using port ${USHARE_PORT}"
+	fi
+
+	if [[ "${USHARE_TELNET}" == "yes" ]] ; then
+                local ushare_telnet=
+        else
+                local ushare_telnet="--no-telnet"
+        fi
+
+	if [[ -z "${ushare_telnet}" ]] ; then
+		if [[ -z "${USHARE_TELNET_PORT}" ]] ; then
+                	local ushare_telnet_port=
+			einfo "${USHARE_NAME} runs telnet on the default port"
+		else
+			local ushare_telnet_port="--telnet-port ${USHARE_TELNET_PORT}"
+			einfo "${USHARE_NAME} runs telnet on port ${USHARE_TELNET_PORT}"
+		fi
+        else
+                local ushare_telnet_port=
+        fi
+
+	if [[ "${USHARE_WEB}" == "yes" ]] ; then
+                local ushare_web=
+        else
+                local ushare_web="--no-web"
+        fi
+
+	if [[ "${USHARE_XBOX}" == "yes" ]] ; then
+		local ushare_xbox="--xbox"
+	else
+		local ushare_xbox=
+	fi
+
+	if [[ "${USHARE_DLNA}" == "yes" ]] ; then
+		local ushare_dlna="--dlna"
+	else
+		local ushare_dlna=
+	fi
+
+	start-stop-daemon --start --quiet -u ${USHARE_USER:-root} \
+	--exec /usr/bin/ushare -- -D -i ${USHARE_IFACE}           \
+	-n ${USHARE_NAME} ${USHARE_OPTS} ${USHARE_DIRS}           \
+	${ushare_port}                                            \
+	${ushare_telnet} ${ushare_telnet_port}                    \
+	${ushare_web}                                             \
+	${ushare_xbox}                                            \
+	${ushare_dlna}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping uShare"
+	start-stop-daemon --stop --quiet --exec /usr/bin/ushare
+	eend $?
+}
diff --git a/media-video/ushare/files/ushare.init.d.ng b/media-video/ushare/files/ushare.init.d.ng
new file mode 100644
index 000000000000..8bc21d01750b
--- /dev/null
+++ b/media-video/ushare/files/ushare.init.d.ng
@@ -0,0 +1,35 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	use net
+}
+
+start() {
+	ebegin "Starting uShare"
+
+	if [ ! -f /etc/ushare.conf -a -f /etc/conf.d/ushare ]; then
+		ewarn "Please migrate your settings from"
+		ewarn "/etc/conf.d/ushare to the new /etc/ushare.conf file"
+		ewarn "and then delete the /etc/conf.d/ushare file."
+		eerror "User migration steps are needed!"
+	fi
+
+	if [ -f /etc/ushare.conf -a -f /etc/conf.d/ushare ]; then
+		ewarn "Old configuration file /etc/conf.d/ushare detected!"
+		ewarn "Please migrate your settings to the new /etc/ushare.conf file"
+		ewarn "and then delete the old one."
+		eerror "User migration steps are needed!"
+	fi
+
+	start-stop-daemon --start --quiet -u ushare \
+	--exec /usr/bin/ushare -- -D --cfg=/etc/ushare.conf
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping uShare"
+	start-stop-daemon --stop --quiet --exec /usr/bin/ushare
+	eend $?
+}
diff --git a/media-video/ushare/files/ushare.service b/media-video/ushare/files/ushare.service
new file mode 100644
index 000000000000..a1ea1080fce6
--- /dev/null
+++ b/media-video/ushare/files/ushare.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Ushare Media Server
+Requires=network.target
+
+[Service]
+Type=forking
+User=ushare
+ExecStart=/usr/bin/ushare -D --cfg=/etc/ushare.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/media-video/ushare/metadata.xml b/media-video/ushare/metadata.xml
new file mode 100644
index 000000000000..ccb32db02551
--- /dev/null
+++ b/media-video/ushare/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>hwoarang@gentoo.org</email>
+	<name>Markos Chandras</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-video/ushare/ushare-1.1a-r6.ebuild b/media-video/ushare/ushare-1.1a-r6.ebuild
new file mode 100644
index 000000000000..b49031658f23
--- /dev/null
+++ b/media-video/ushare/ushare-1.1a-r6.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils multilib readme.gentoo toolchain-funcs user systemd
+
+DESCRIPTION="uShare is a UPnP (TM) A/V & DLNA Media Server"
+HOMEPAGE="http://ushare.geexbox.org/"
+SRC_URI="http://ushare.geexbox.org/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="nls"
+
+RDEPEND=">=net-libs/libupnp-1.6.14:0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	EPATCH_EXCLUDE="06_all_ushare_disable_sysconf.patch"
+	EPATCH_SOURCE="${FILESDIR}" EPATCH_SUFFIX="patch" \
+		EPATCH_OPTS="-p1" epatch
+
+	DOC_CONTENTS="Please edit /etc/ushare.conf to set the shared directories
+		and other important settings. Check system log if ushare is
+		not booting."
+}
+
+src_configure() {
+	local myconf
+	myconf="--prefix=/usr --sysconfdir=/etc --disable-strip --disable-dlna"
+	# nls can only be disabled, on by default.
+	use nls || myconf="${myconf} --disable-nls"
+
+	# I can't use econf
+	# --host is not implemented in ./configure file
+	tc-export CC CXX
+
+	./configure ${myconf} || die "./configure failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	doman src/ushare.1
+	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
+	newinitd "${FILESDIR}"/${PN}.init.d.ng ${PN}
+	dodoc NEWS README TODO THANKS AUTHORS
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	enewuser ushare
+	readme.gentoo_print_elog
+	elog
+	elog "The config file has been moved to /etc/ushare.conf"
+	elog "Please migrate your settings from /etc/conf.d/ushare"
+	elog "to /etc/ushare.conf in order to use the ushare init script"
+	elog "and systemd unit service."
+	elog
+}
diff --git a/media-video/ushare/ushare-1.1a-r8.ebuild b/media-video/ushare/ushare-1.1a-r8.ebuild
new file mode 100644
index 000000000000..9cc622f9ac63
--- /dev/null
+++ b/media-video/ushare/ushare-1.1a-r8.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils multilib readme.gentoo toolchain-funcs user systemd
+
+DESCRIPTION="uShare is a UPnP (TM) A/V & DLNA Media Server"
+HOMEPAGE="http://ushare.geexbox.org/"
+SRC_URI="http://ushare.geexbox.org/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND=">=net-libs/libupnp-1.6.14:0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	EPATCH_EXCLUDE="06_all_ushare_disable_sysconf.patch"
+	EPATCH_SOURCE="${FILESDIR}" EPATCH_SUFFIX="patch" \
+		EPATCH_OPTS="-p1" epatch
+
+	DOC_CONTENTS="Please edit /etc/ushare.conf to set the shared directories
+		and other important settings. Check system log if ushare is
+		not booting."
+}
+
+src_configure() {
+	local myconf
+	myconf="--prefix=/usr --sysconfdir=/etc --disable-strip --disable-dlna"
+	# nls can only be disabled, on by default.
+	use nls || myconf="${myconf} --disable-nls"
+
+	# I can't use econf
+	# --host is not implemented in ./configure file
+	tc-export CC CXX
+
+	./configure ${myconf} || die "./configure failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	doman src/ushare.1
+	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
+	newinitd "${FILESDIR}"/${PN}.init.d.ng ${PN}
+	dodoc NEWS README TODO THANKS AUTHORS
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	enewuser ushare
+	readme.gentoo_print_elog
+	elog
+	elog "The config file has been moved to /etc/ushare.conf"
+	elog "Please migrate your settings from /etc/conf.d/ushare"
+	elog "to /etc/ushare.conf in order to use the ushare init script"
+	elog "and systemd unit service."
+	elog
+}
diff --git a/media-video/v4l2loopback/Manifest b/media-video/v4l2loopback/Manifest
new file mode 100644
index 000000000000..f2599e97fccc
--- /dev/null
+++ b/media-video/v4l2loopback/Manifest
@@ -0,0 +1,6 @@
+DIST v4l2loopback-0.10.0.tar.gz 46976 SHA256 61f840708dcbea21906c9a02469ea3f23b03e32420c6b650450ea57377956b06 SHA512 990b83cc592bf66861483d5ed8ebd7aba9d23f8ab54dc11d82ac3c88588cbd340d9cc49f7b758095e76bf9c5f02822700074506439ba51bcafc5cc7c1c979cb8 WHIRLPOOL 08c524ad9f540fe5d5b2ead1dd6bc814b8aa8eb0a49d9e3b734e90a14497e4d104972442f95bfc80bc3ba007d3728edb9c14a0423d2fbb6c1218f95534e5142a
+EBUILD v4l2loopback-0.10.0.ebuild 1074 SHA256 f234bfd567ce23f59ce5eeb6da5625d1ff2b2aeb003add1c5b3b01ab759ebb89 SHA512 e1f29959ef17b013f5b593f6621d4e8e459a1474e6b1b5d35ad82a7c9ccd56a43782fdc259d1b241d9c1a2868eb8b872f7b06b9fcafb45ad98e11a5474c2e9d8 WHIRLPOOL fd10ce6b5f5e513f8b31a09c26212e55f86537b82d3eecfa4339db1ed92a3d1ac888107fc17f03927209c0b60de2f8c85f7becac13521c37774b3a94b0ff0283
+EBUILD v4l2loopback-9999.ebuild 1074 SHA256 f234bfd567ce23f59ce5eeb6da5625d1ff2b2aeb003add1c5b3b01ab759ebb89 SHA512 e1f29959ef17b013f5b593f6621d4e8e459a1474e6b1b5d35ad82a7c9ccd56a43782fdc259d1b241d9c1a2868eb8b872f7b06b9fcafb45ad98e11a5474c2e9d8 WHIRLPOOL fd10ce6b5f5e513f8b31a09c26212e55f86537b82d3eecfa4339db1ed92a3d1ac888107fc17f03927209c0b60de2f8c85f7becac13521c37774b3a94b0ff0283
+MISC ChangeLog 2514 SHA256 cb36781aafc803be0d460a18b8496ddb2d1be7e69a43880cec48052f9c56d416 SHA512 68b7d0ce93d8be8558424367025d5576ec57889042c80c1fbc85876e1f49914db5210fc952f105f09004e8797a7f8268f7862bf5fce4e7a22c1c1095fad6bd82 WHIRLPOOL 3837f02e1eb0ec868fa4d43be84999209964ca84a94b54c97d4504b6d67be4b2f215ac62602d611869a977604d0c994a189ab0ad21f3f4e194bfb215549662fb
+MISC ChangeLog-2015 1332 SHA256 c8a8f27600996767ed789d271b50e1cfc912ba30fe5101b577f849cc9416cc2f SHA512 57d0257bc7bb5cacdb9eda7816b308bbc4a3d6c010826f0ecb6d0b22a7e36a67ca692f030b3201dd842f8ad454cc219a532727092fbde6ea3e8742c19ea5c294 WHIRLPOOL eae0d7045d51b0a6b4a79433143cf57a68753340ad1d17d759f67fd83f63d511bfc41f650a33c97f9cc6f3cc1a5a46db05e9f0f66f5bad174724093ec05b320b
+MISC metadata.xml 409 SHA256 c32357ee0f74727fde47cafe55ac5af52c62351379de6fd546afc2cb26fffc3c SHA512 49c5467e89452ca7499d6653dd519a5aff28f80a1b50c26e1332ee1f5ee24b6dbd87af5089da443d0e30571e9e7a72befcf1bbfc561d6503f84b9148084ce851 WHIRLPOOL 10349b5a9cc54829a2a5f459e9e1bc1f08ebfb0d1b03cff1fb8c0b9c6fc97cdc53eab00ede134f544407b65e83f2cdf0de10b00565052231b16e046924162d01
diff --git a/media-video/v4l2loopback/metadata.xml b/media-video/v4l2loopback/metadata.xml
new file mode 100644
index 000000000000..04c233e404cb
--- /dev/null
+++ b/media-video/v4l2loopback/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>naota@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>grknight@gentoo.org</email>
+		<name>Brian Evans</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">umlaeute/v4l2loopback</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/v4l2loopback/v4l2loopback-0.10.0.ebuild b/media-video/v4l2loopback/v4l2loopback-0.10.0.ebuild
new file mode 100644
index 000000000000..7c408014c5c4
--- /dev/null
+++ b/media-video/v4l2loopback/v4l2loopback-0.10.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-mod
+
+case ${PV} in
+9999)
+	inherit git-r3
+	KEYWORDS=""
+	EGIT_REPO_URI="git://github.com/umlaeute/v4l2loopback.git"
+	;;
+*)
+	inherit vcs-snapshot
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/umlaeute/v4l2loopback/tarball/v${PV} -> ${P}.tar.gz"
+	;;
+esac
+
+DESCRIPTION="v4l2 loopback device which output is it's own input"
+HOMEPAGE="https://github.com/umlaeute/v4l2loopback"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="examples"
+
+CONFIG_CHECK="VIDEO_DEV"
+MODULE_NAMES="v4l2loopback(video:)"
+BUILD_TARGETS="all"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	export KERNELRELEASE=${KV_FULL}
+}
+
+src_compile() {
+	linux-mod_src_compile
+	if use examples; then
+		cd "${S}"/examples
+		emake
+	fi
+}
+
+src_install() {
+	linux-mod_src_install
+	dosbin utils/v4l2loopback-ctl
+	dodoc doc/kernel_debugging.txt
+	dodoc doc/docs.txt
+	if use examples; then
+		dosbin examples/yuv4mpeg_to_v4l2
+		docinto examples
+		dodoc examples/{*.sh,*.c,Makefile}
+	fi
+}
diff --git a/media-video/v4l2loopback/v4l2loopback-9999.ebuild b/media-video/v4l2loopback/v4l2loopback-9999.ebuild
new file mode 100644
index 000000000000..7c408014c5c4
--- /dev/null
+++ b/media-video/v4l2loopback/v4l2loopback-9999.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-mod
+
+case ${PV} in
+9999)
+	inherit git-r3
+	KEYWORDS=""
+	EGIT_REPO_URI="git://github.com/umlaeute/v4l2loopback.git"
+	;;
+*)
+	inherit vcs-snapshot
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/umlaeute/v4l2loopback/tarball/v${PV} -> ${P}.tar.gz"
+	;;
+esac
+
+DESCRIPTION="v4l2 loopback device which output is it's own input"
+HOMEPAGE="https://github.com/umlaeute/v4l2loopback"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="examples"
+
+CONFIG_CHECK="VIDEO_DEV"
+MODULE_NAMES="v4l2loopback(video:)"
+BUILD_TARGETS="all"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	export KERNELRELEASE=${KV_FULL}
+}
+
+src_compile() {
+	linux-mod_src_compile
+	if use examples; then
+		cd "${S}"/examples
+		emake
+	fi
+}
+
+src_install() {
+	linux-mod_src_install
+	dosbin utils/v4l2loopback-ctl
+	dodoc doc/kernel_debugging.txt
+	dodoc doc/docs.txt
+	if use examples; then
+		dosbin examples/yuv4mpeg_to_v4l2
+		docinto examples
+		dodoc examples/{*.sh,*.c,Makefile}
+	fi
+}
diff --git a/media-video/vamps/Manifest b/media-video/vamps/Manifest
new file mode 100644
index 000000000000..347b57a94d78
--- /dev/null
+++ b/media-video/vamps/Manifest
@@ -0,0 +1,7 @@
+AUX vamps-0.99.2-premature-eof.patch 1247 SHA256 a740c0dd04e2b296fed9efaf34edd67bf463d4411f40786d81cbb8a6a289787e SHA512 9f6422a8583cfeaedf1f5fb97ccac44f9631af7498daccd172b85140b21705d2f80d1769fa994478e8353874a2a24ac9d26460adab1078b08465575460bcfb07 WHIRLPOOL 0ce3be1274cf4fbe5ad91dbceb8b2e4d89ae384e4793c16032c653fc60d2d11639e90235d6234d7c2572dd199db15160e745db93661d0b31d0474c825ba5b246
+DIST vamps-0.99.2.tar.gz 47062 SHA256 9bac71441db55c04a642c786d6427efdb65aa27f4b1719ffa34ebc3869572694 SHA512 27d26a5b63982e3b68b69b6e4f739e93a8eff2ca2e433e07a1350cafe9733f0b6a684e6bc51bce97612bc85fef9d4bf4ea0e781e493b227896de4cce4cd4662b WHIRLPOOL ae00b5d17dc79e84e398063a4eb82588ec062dfe4ddcd878d4139a270c74a5c8ab5a01f26fa1d02eca0fa5fe43ddd52ae8e707fca62a0091331307eeb4a5e212
+EBUILD vamps-0.99.2-r1.ebuild 709 SHA256 cd75eb028bba66f799ec5a821b5f2a25ece1c3cdeb618b51c10ec26cc42459fa SHA512 5b2c8ce4747c2d10a353f395695bcebdfb781abadec7fe22b7c8e11cba2d619f5aca53c5e1fdfaf097b3bdafab20b17797cac8b2773e7eaaf8b2420a2bd39eb8 WHIRLPOOL 8b2d09f0df713a6695c9545ff49ce6b635cf176d08a4d00a83e8f40901daa7649cf1830aa0f762080c555145c44d211fedd24965ae9d0acbb749fc63bd58b8f8
+EBUILD vamps-0.99.2.ebuild 629 SHA256 6eff3d9bc394405aadad84be9b37b6579bd5449c1340802e768b5b7c2128df20 SHA512 8ccfe302ae0e4c9fdf4e84a8cba3bec50f45f744b287fa61a0dedbf01a1b06a335532f1c56e0a199e76c21bb1e4cb837cf0c3ab1bd1776012779c2122eb3bebc WHIRLPOOL deca6391fc3ec43bf8d5b30fa43c81b58171b75e61f29d2dc30120fd894c25d4357460186390f2caca7aaa5a3bcea7dd13638645ece9e8cd3c855e401330c16c
+MISC ChangeLog 2525 SHA256 f6af06c61a4d8bd37a0fcaf2e142fe9bd4363d35d533752416483cd2f2f68ff8 SHA512 2cc6167fbbbf95802a09a990d45b8a07ff0578806c94532a59b11d588d987c8a296ef56ef0cf1fd5829b3372a3a4eeff910c2cf9d0b30776d4c4fb5317ecb3f2 WHIRLPOOL 600b04d5468137ac0f471a8c1e9625795e0d6162d572d986f0acca3341ef0d4a42c8475346d6f1fc517226346e104a3552199bff06a08cc7e30cdd6f9a88e608
+MISC ChangeLog-2015 2914 SHA256 fd74c5337759c3e318093f9339bda8df9c9bee030988eb136967606af916d700 SHA512 99b7498854b03157502e78e93ee7ffc97b5ba4fa8620dc0f7920e762b815ca3c2898a38a884f252c15cb85b80e0d690c8f7f249d9a8603506d1397ce5f47fbd3 WHIRLPOOL f9d8095974bed90afde5d8fbf439fc22cdcd275deeace944c9068163de7b6c811404ebeaac6f999544d299b1fa3f4acea087c6b42572c65a11decd68cc68513f
+MISC metadata.xml 298 SHA256 077db775dc9b47b83598dcc15a3d2f05f1c83e5f9e624c68446aa98cc42ee727 SHA512 87cf92360391d9de17a06231e42001d4b7a9b4f866806855f108a7d43621ac72e7aad63acab0708c13cf1aedc64d8fa9a0e21761da5ec6ab7408ebffcb77fdc6 WHIRLPOOL c0fb3d61fcfc1da0f13d2cee70d46f0edd11ad5fe27794f445aef12707cae1d86ded8290b4faefcd656b641876694d8d86b2dc02d08f125483e30b86123781ea
diff --git a/media-video/vamps/files/vamps-0.99.2-premature-eof.patch b/media-video/vamps/files/vamps-0.99.2-premature-eof.patch
new file mode 100644
index 000000000000..48340498d9bc
--- /dev/null
+++ b/media-video/vamps/files/vamps-0.99.2-premature-eof.patch
@@ -0,0 +1,46 @@
+--- vamps-0.99.2/vamps/vamps.c.orig	2006-04-15 08:00:07.000000000 -0400
++++ vamps-0.99.2/vamps/vamps.c	2007-01-26 06:54:27.000000000 -0500
+@@ -18,6 +18,9 @@
+ //
+ // Revision history (latest first):
+ //
++// 2007/01/26: V0.99.3: Fixed assumptions in lock() which do not hold for pipes.
++//                      This cures the "Premature EOF" problem.
++//
+ // 2006/04/15: V0.99.2: Fixed some signed/unsigned issues which caused compiler
+ //                      warnings on some platforms. No funtional changes.
+ //
+@@ -396,13 +399,24 @@
+     rhwp = rptr + avail;
+   }
+ 
+-  n = read (0, rhwp, RBUF_SIZE - avail);
+-
+-  if (n % SECT_SIZE)
+-    fatal ("Premature EOF");
+-
+-  rhwp       += n;
+-  bytes_read += n;
++  while (avail < size)  
++  {
++    // read; reads from an open pipe will return any non-zero amount of data
++    //       (not necessarily the amount we wanted!)
++    n = read (0, rhwp, RBUF_SIZE - avail);
++    if (!n)
++    {
++      if (avail % SECT_SIZE)
++        // we got an EOF and only a partial sector
++        fatal ("Premature EOF");
++      break;
++    }
++    else if (n == -1)
++      fatal ("Read from stdin: %s", strerror (errno));
++    rhwp       += n;
++    bytes_read += n;
++    avail      += n;
++  }
+ 
+   return !n;
+ }
+
+ 	  	 
diff --git a/media-video/vamps/metadata.xml b/media-video/vamps/metadata.xml
new file mode 100644
index 000000000000..263213a3910c
--- /dev/null
+++ b/media-video/vamps/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">vamps</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/vamps/vamps-0.99.2-r1.ebuild b/media-video/vamps/vamps-0.99.2-r1.ebuild
new file mode 100644
index 000000000000..531907a03626
--- /dev/null
+++ b/media-video/vamps/vamps-0.99.2-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Very fast requantisizing tool for backup DVDs"
+HOMEPAGE="http://vamps.sourceforge.net/"
+SRC_URI="mirror://sourceforge/vamps/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+DEPEND=">=media-libs/libdvdread-0.9.4"
+
+RDEPEND="${DEPEND}
+	>=media-video/dvdauthor-0.6.10"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}/${P}-premature-eof.patch"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	dobin vamps/vamps play_cell/play_cell || die "install failed"
+}
diff --git a/media-video/vamps/vamps-0.99.2.ebuild b/media-video/vamps/vamps-0.99.2.ebuild
new file mode 100644
index 000000000000..72ff4a5f3eb7
--- /dev/null
+++ b/media-video/vamps/vamps-0.99.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Very fast requantisizing tool for backup DVDs"
+HOMEPAGE="http://vamps.sourceforge.net/"
+SRC_URI="mirror://sourceforge/vamps/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+DEPEND=">=media-libs/libdvdread-0.9.4"
+
+RDEPEND="${DEPEND}
+	>=media-video/dvdauthor-0.6.10"
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	dobin vamps/vamps play_cell/play_cell || die "install failed"
+}
diff --git a/media-video/vcdgear/Manifest b/media-video/vcdgear/Manifest
new file mode 100644
index 000000000000..3500b1037526
--- /dev/null
+++ b/media-video/vcdgear/Manifest
@@ -0,0 +1,5 @@
+DIST vcdgear176-040415_linux.tar.gz 442937 SHA256 d6fc156b5c4960cf5e7cf047ae1101da772e13255ec02f71cbc07b2a8ca567a7 SHA512 c6fbefc2a5f96a629f70611da61245f7b23b03a524e67f75db5a873952abcb1db226f4b9bdee18298a8a21d0ae14ffee816ffcd7a732605c0a445015b7507b19 WHIRLPOOL 0aa2b1a1fcfc1a74ed62a0546cf465deb97dfd584086c081198310615feb6242e8450b22641e1848f3bc5384e3d2f2fe9fdfcac618e25d1258070f28283fe604
+EBUILD vcdgear-1.76-r2.ebuild 748 SHA256 ada657432baaa032826ac67ca9faace627a991fd7f8138d49a725dd6906677f7 SHA512 58a841064cb949e2a959725f87c2b564ba201b993b907835dba86e87c5bac8756213203e36c4b7489061b01c7eaa9cf51269f994b035d2c04c3d9c7908684662 WHIRLPOOL 620fb7e823450efddd228d1e923e4f1967029e603258d98060a40c01c55c14875dae253fb0d7b78c51dbf66fd0b5000035444a4032fedc2d26f705894c543dfc
+MISC ChangeLog 2434 SHA256 4a3ede5de739bd7ce87dd9685e2a5cb2991a07df89799e9fb6500a419bdddf28 SHA512 fee3e99436bd0930d00b059f7ba0562c91f9dd42b51053336936a33327fa5788b4f89a4858a243417e1137f95929ae9ffdaeb90e42bebe5ac12ffce646b51958 WHIRLPOOL e63894f7ca8d6fc106ac6ba876fb48dc504975ba93cc7f73f7035d551705a7babea18d3d0ce59f1ba3490182f816072e6b77ccaa2ba84a216929010c7c7b7f3e
+MISC ChangeLog-2015 2476 SHA256 2c0af0a7a4e9cf1841e9f966312cb424ef54f69df4a975d39a733e5724d3fbff SHA512 104b96c665db61b5999d7090d9fa171adc4586b3bfe311dd9bbfed84ee24054dfa0bc0b5686fa3c36175eb75155d6802775aeaa9cd7738521585b61fdb7c1487 WHIRLPOOL 20aca4805a4af85fe3a3b0404db5447f2f511a8c611c0b8f4cc6712a9ac4dfb4112002fb061699e8cb2039fd23300e2c7fc2ce03261adb3dfdcc680cab601374
+MISC metadata.xml 221 SHA256 f9c43664acd23c026d227c13f3afb1a1e69d190689815295498c32604c8e0c22 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4 WHIRLPOOL 0c890eef9948116352ecd84ee44ecd07c741d7eb82b89aba4ac0d87757df3616d2170550d7b528cb9c359cf7e5cab95b494ebf92c3c1dc0ea96428603577047b
diff --git a/media-video/vcdgear/metadata.xml b/media-video/vcdgear/metadata.xml
new file mode 100644
index 000000000000..68b9a06fccf1
--- /dev/null
+++ b/media-video/vcdgear/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>media-video@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/media-video/vcdgear/vcdgear-1.76-r2.ebuild b/media-video/vcdgear/vcdgear-1.76-r2.ebuild
new file mode 100644
index 000000000000..7fdc8cdde9d3
--- /dev/null
+++ b/media-video/vcdgear/vcdgear-1.76-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+QA_PRESTRIPPED=/opt/vcdgear/vcdgear
+QA_FLAGS_IGNORED=/opt/vcdgear/vcdgear
+
+STAMP=040415
+DESCRIPTION="extract MPEG streams from CD images, convert VCD files to MPEG, correct MPEG errors, and more"
+HOMEPAGE="http://www.vcdgear.com/"
+SRC_URI="http://www.vcdgear.com/files/vcdgear${PV//.}-${STAMP}_linux.tar.gz"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE=""
+RESTRICT="mirror bindist"
+
+RDEPEND="virtual/libstdc++:3.3"
+DEPEND=""
+
+S=${WORKDIR}/${PN}
+
+src_install() {
+	insinto /opt/vcdgear
+	doins -r * || die "doins"
+	fperms a+rx /opt/vcdgear/vcdgear
+	dodir /opt/bin
+	dosym /opt/vcdgear/vcdgear /opt/bin/vcdgear
+}
diff --git a/media-video/vcdimager/Manifest b/media-video/vcdimager/Manifest
new file mode 100644
index 000000000000..a88ca6066c06
--- /dev/null
+++ b/media-video/vcdimager/Manifest
@@ -0,0 +1,5 @@
+DIST vcdimager-0.7.24.tar.gz 1066815 SHA256 075d7a67353ff3004745da781435698b6bc4a053838d0d4a3ce0516d7d974694 SHA512 162f361d3c871c85887f0b25e70c207c511dcf597f337633be3ce925e8c589a8ba26275b8378d1002b8c5eb56995eda017f5f1cf52e52a38e9ff900acba7a214 WHIRLPOOL b94f3937415ec1b178484adfc653b1846e9f52ed95fd0677fa5f7b077b345f4cbd3b11526bb9b9011b76f74a916644e9d60dec3ce37571ed97523db04cb5ec42
+EBUILD vcdimager-0.7.24.ebuild 1423 SHA256 80ecfbcec5913b4338e7fe5d6f23e14868c1241e2be1c273e344c4393af7f15d SHA512 1377de57d124ebea3bfece0603ad1c213d708f7309e28177c01e8f2add398e9c1128d3a4e20942682ba8af7f32dca134025671276f1de56c520cc8757b0550a1 WHIRLPOOL 3de919eb7fb14b0f21166fd296687083b2a515ecfb6d4dd51517126d2d5c5f2c1b53a285b2b3042ac1100badb3a1e6b6359d31fcdf112cd4d10718cdbe881056
+MISC ChangeLog 2438 SHA256 ebc3a3546b9ac7d03b80c7d000291670c9c886a4c968185f4ae5ac29ef9c5f55 SHA512 5da9ce985dcdc67cfff4196a68687c06798c2dc47fee2995e707d27b330f57aa76fd8d49370d2afb2a1b89a8026f6144cb658c8ad2bbb63861ad73aed67cb76d WHIRLPOOL e6efc4c47e85982c93aee14e82f39b8fa35c456d055c55c1ed643cff1546e912b92e2bf1f1cde4912c0d45cadcf209197c73b93451643d6e0a9c29813c42a416
+MISC ChangeLog-2015 11165 SHA256 3b5ce1c44546e9f4ac0e2a1652641634bb7e72526d906381bb0aa95998e50ff7 SHA512 6b6ddf5e95b863893935d1ae20e008a92a63db9e539c1598a46dae7ec6fa776048310561f420dbe5eb775e43f8e0f8baad50d8ceb6f446401b0c93b914152c26 WHIRLPOOL c5cb08d3e2f597a6f853c730946c782d062963ff1083c3738358c74beb76dd92950e4b351490099ada30de66310362864ec5646546d27424b93c865d4352e817
+MISC metadata.xml 223 SHA256 7d0451c70b262d8928fbd11c938e6b5663794345ad10f7be8533ab42b521e42c SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db WHIRLPOOL 0b20f52f85830d008257e03325b74780038fc6e0bf6cc3917aa7f0d8621673c87bebcf201ca0cd876276febe9fcf785fe8f80de1889f2009fdd5bd05c2615d17
diff --git a/media-video/vcdimager/metadata.xml b/media-video/vcdimager/metadata.xml
new file mode 100644
index 000000000000..811585329983
--- /dev/null
+++ b/media-video/vcdimager/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-video/vcdimager/vcdimager-0.7.24.ebuild b/media-video/vcdimager/vcdimager-0.7.24.ebuild
new file mode 100644
index 000000000000..9de4050771a7
--- /dev/null
+++ b/media-video/vcdimager/vcdimager-0.7.24.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils multilib-minimal
+
+DESCRIPTION="GNU VCDimager"
+HOMEPAGE="http://www.vcdimager.org/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="+xml static-libs"
+
+RDEPEND="
+	>=dev-libs/libcdio-0.90-r1:0=[-minimal,${MULTILIB_USEDEP}]
+	dev-libs/popt
+	xml? ( dev-libs/libxml2:2 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS="AUTHORS BUGS ChangeLog FAQ HACKING NEWS README THANKS TODO"
+
+src_prepare() {
+	# Avoid building useless programs. Bug #226249
+	sed -i \
+		-e 's/check_PROGRAMS =/check_PROGRAMS +=/' \
+		-e 's/noinst_PROGRAMS =/check_PROGRAMS =/' \
+		test/Makefile.in || die
+	sed -i \
+		-e 's/noinst_PROGRAMS =/check_PROGRAMS =/' \
+		example/Makefile.in || die
+}
+
+multilib_src_configure() {
+	# We disable the xmltest because the configure script includes differently
+	# than the actual XML-frontend C files.
+	local myconf
+	if use xml && multilib_is_native_abi ; then
+		myconf="--with-xml-prefix=${EPREFIX}/usr --disable-xmltest"
+	else
+		myconf="--without-xml-frontend"
+	fi
+	multilib_is_native_abi || myconf="${myconf} --without-cli-frontend"
+	ECONF_SOURCE="${S}" \
+		econf $(use_enable static-libs static) ${myconf}
+}
+
+multilib_src_install_all() {
+	prune_libtool_files
+	einstalldocs
+}
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
new file mode 100644
index 000000000000..7f74653a9e2e
--- /dev/null
+++ b/media-video/vdr/Manifest
@@ -0,0 +1,17 @@
+AUX channel_alternative.conf 332 SHA256 30fb0a5147c01429c2813505cc69658cf1bfa1b70537bce07365017f653be5ce SHA512 738de5d5d99b54a516f41683834509b477590732db4e00b13b2f26e22c7349cb8517965a21251c08d29b0f368b2bb3fa64a1de71da09ffbedc5a401314a0eb5d WHIRLPOOL 96ead1c37c9e88e6593536a2182b813d3ae86c8e55e79a4cc5ff2d29ec0694405d26c82cb2295bb3f1e7e61c0ec93a646acc518e35ed6eff4d66c9219cc35677
+AUX vdr-2.0.6-r2_gentoo.patch 2518 SHA256 02f20c8bcf0c0d686fbaad19a76025db6e5bed00ee0f191c2096533d42554d38 SHA512 01416b5825595d5a8c813297dd1791978f0d4ffe1b06d2254772c3dc2d76d0c09720ada64dc332df156196d73b8500ae1dcdb08d95502a8c940baf4590ece545 WHIRLPOOL 1fdeb47b5919d96f729a79185c020b8d0a49866a6b28c0296859eb671da30f49085c62c803853209f98b405466c0cc684e9d673c5f7713cadfd2c1d96e32802b
+AUX vdr-2.0.6_gentoo.patch 2255 SHA256 486b513f8ab723685e72b041b546d1cda799f743ef8020f5742aefee7a1b1660 SHA512 7bb087d2f362e28700a6f22b2649bd61742a7967344f0132abaaa2ae30d4aef3e9a7afd06d80d2a4a97248abfa273cb5d7e20e419c8409a5a83744fd043fb7e9 WHIRLPOOL 20f1b870305e55d4c2cfc2fad0968b6232b22585218a60378aa95bb420228e0704a2b42699daff84a36f92d4b2937a1ada9db5514a0789f5c47b66001a9ed1ed
+AUX vdr-2.0.7_systemd_argsdir.patch 14827 SHA256 bf4b955eca4f2d02419cab5c0ad4f527938bbd6b6c07a096a92be40dcab28da5 SHA512 f0510d27d4b5ff2bbc3f400e5e8e4aae165f665bc7455742e12ebe6f9c6e46985b2ac9fd4089fd3c33c71d975afe73a6e9e089fc6fd9f226c5d53e3fe0553317 WHIRLPOOL 6f7ae8d7609115fc4213e252e641a17fe6a24c7983c49cfce1ac8d372d57f02ea1c0ecbfbc5d8e07ffdd547486e2f8712177c9eff050db6fe7bf39147a4627e0
+AUX vdr-2.0.7_systemd_argsdir_vanilla.patch 14825 SHA256 febec104f10ba46bd3839d0d3f3571740b500f531d2bb0f50930e5faeed3f651 SHA512 1270abaca1bed4a1dfc7756aaa9d1e3b17c5f35b69f3ff333988192ceddb10bbe03aa1973f878537d750b92a0a277213de193f98d6f113a2f447e342867639f3 WHIRLPOOL 68d06303f5899f6bfb86ff67403c5ddd8aed260c06edc6a72b411f19d0e9f59c88ec6f93051822bfe0d00ee39741480ddec5a5118592bf72f4f3dd27c34a0b19
+AUX vdr-2.2.0_gentoo.patch 2322 SHA256 8088a4f314e0b8d908f82cfe2a7392a18db679a7324bfa92dce49431c50313ec SHA512 c6953a7fb77717fdaa8ca05550496e25f4bc60d91c13ed0fb23d27e1a1ec433ec2d5cfb019717cf09eb7b67c9ebb91664b1b731dc28bc4f25e815871f6de0bc7 WHIRLPOOL 88d4e8407b085604525d9bae1f34a957ae5f168ac657a99c45dcba5f08185351ccb03736cfc464960d3f2157ac6357ffbf8b602dd1da49ee94efb403f71731d8
+DIST extpng-vdr-2.0.6-gentoo-edition-v6.patch.bz2 69472 SHA256 f2ea1371b88898acfde5fa390f5b13a5c23065a877bbba5658a194e64d6553e5 SHA512 f4ecb786ec5a026fa75fcf539518e80273bf43fc325c13a380c70eb85351910efa991b3ee71ca477e597bc2b4598a18620b6cf00fc02714acfcc4e6112d84b6c WHIRLPOOL 13bb3697afa4b2665d9de3de8892a0baf877991642a94d3305e15d98cbcba73aa743f80bdd76f9a3297653c92e99ec6ae629ed7919c26c730cef2fa2fd608ef1
+DIST extpng-vdr-2.2.0-gentoo-edition-v1.patch.bz2 34664 SHA256 eebc812b160f5f44d665efa7bacd5abc57b27815deb28eb3d83ea3129d43b2b5 SHA512 16d6fbb8201f003dfe653b6a49424b794d7e697e27ad6f2383dbe17b76712ea5a3da88a676900b84d75ff7425bf3eb9084d60a89a4598758f482dc1f013f7b3e WHIRLPOOL 702ec541dcdb075ba9e9df450312c7a5ca3b34e9520edaf85a89426734d184b3cc8138a2ed8ad0c34fb7599d99d48c7538842c7f8126751f3b3ebeb6702cac4d
+DIST vdr-2.0.6.tar.bz2 839575 SHA256 c33c6431726378d5af575d8cfcacd34a50d17334e091dc4a095b6b75bc99b972 SHA512 070ebbfb85478887088567872a71744305dbf9c75de8b095a8fe46d883b0b4fe140539caeb2243715f42793a45790a127542655f549f7ea3cb71c4f9912fa07d WHIRLPOOL c9d1cf47473299617d1eeca7b5445450448c558b17a20193260bf3a01030eb81e29f210dc349e9b3a51137acd6d866201d07860a79954ae2da2b87159db3e511
+DIST vdr-2.0.7.tar.bz2 841511 SHA256 5c81418dc97d70ae965af5bdf641057cb64a7e76ecf9c94f72e417cc6c73fb13 SHA512 cba35f62162cd681179872915023890f492e95cc94d65aadd3cb4d03d7e3c7e2f197e7f35149cdf872169af35c2b841e1042e054f28164860b7cea8367793ce0 WHIRLPOOL 262e8e96d399c34ae492d92491720346c29c3d84bfb1c8b4a1e992f3586514f698d9f33f5a3b8e8204a054ee41767547ad4510a6a7637c1b27e917655481ab5a
+DIST vdr-2.2.0.tar.bz2 922708 SHA256 7c259e1ed1f39d93d23df1d5d0f85dd2a1fa9ec1dadff79e5833e2ff3ebf6c4e SHA512 183f58133915c6c0fe8ec2b88becbcb2a36418210e6dcf7931053d3771d727c3581593f9eb5c9693abf39e22e728f7b41c42079cd704610c3636ec05134ea93d WHIRLPOOL 2ce98f242e7ae3e7969005fde7214a2707749ab06622e78d56764c50c9a3f1e6e06a693091f19d45dc537b1702d365d3f9cfa4af24fb61aa8a0c64c5385fa19e
+EBUILD vdr-2.0.6-r1.ebuild 6921 SHA256 2bb88039b1b1b305c788f906146d6b16cb41d767a507a32793a90da096e95f9d SHA512 10997c095cb8af5f0ffa00e07247a790cb038f42a9705a4e6b2e5ca715431dd51749dc5faf9beadf899a4170d9e01de92ff61cf1cdf6e21fe87e6dd60afab07b WHIRLPOOL 1eda72d44543ec82db3754a4b1f3114c04babbfe7cfdd3afb476f148f1cc3823afc88b0633b693ac6935f22c9a3800c17611c51e48d0f6e6ea8a17df844dd20d
+EBUILD vdr-2.0.7.ebuild 7275 SHA256 9448be106b4456acf8be73b95018ebb4cf8b7d0d23677d9eae7f57477e2a3111 SHA512 c43dd5e9d776ff640eb04b3064f77ead2931194642eb2b541a0add7e3df1c4d6291bfcf4996a450af5a4e979566ae6b374f4cbe20dca71e797fea29bdf5d8520 WHIRLPOOL 62c97035886a210f1dcaa34a8cd2bc190a0bc5d332927db07700665f3f1c43c45ce6ec8f729968b0a3fc3c7a43cd6c19cf9760e48ea46cf3f93cb8d61eda58c4
+EBUILD vdr-2.2.0-r1.ebuild 7538 SHA256 03babb92b13736a1cb3450df28b20eb9a3f0baa7f4b8b367cc17438608dd0e8a SHA512 641e41abcabaae613a2d6f0a6ba55194b04ee412ed48461869dc0e4c705a02bb7cfe7ae9c64cc7efadfd3a4ed9dd7a06661874bbbbf3a5e213269899a6b6d572 WHIRLPOOL f4176bad93506c64b30f0e13fa1397fd117e58909799562aaca50681e7ec5f60ad92cee837c557c0d7ceb47560b8a8666dbb817a884d69c170f13e8f1ffaa5fa
+MISC ChangeLog 3932 SHA256 be26e30976c39fbddf22c1e37c93a551683bb0d28cdab6bbdfb7139fd1d19e6e SHA512 86a0268cfddadaffaad44663b1c6ef253c460e01fc752eb9014cad94a4dd09646e36497583692ea51844f161c11b095361f405387ecda9a57eaa836fb5947179 WHIRLPOOL 6131e6e327a27cec47d7b6790346d3f8db32cd44dbad736e557ce980c7bfe311ad75c054109f9586cdf5ad133969b63a8c9ac8934f2e019277593235bfceb54b
+MISC ChangeLog-2015 35518 SHA256 6057b52a036032db0d24f349dee65608aaf047fbf90cde2db624da21923f5e3e SHA512 155549b59efbbdc1720d7802263e6959bc2db6b18d148b39b998ac5812d7a9063d1c6001af9800a4ee02fffaab0768252b351db2a53208b007b77ae09027d851 WHIRLPOOL 755b5c5617a59e3cfc758813f569f2c237867986dcc99e94def1b66f7cef05db546d0e269e7d8dd4cf9fad8e7aa4077f7269403562bbc2c0484499e6b856610f
+MISC metadata.xml 2188 SHA256 17020dd73920f9b0941ed582b86bb0c201e9f7e770f9caa4a812111b25bbe378 SHA512 c7e36a284d3b2fddf93b4abfd84fe65a4420b88330d0c395de0fb74564c3606a9e9e0402f5853898432f6d9d68c70e59c55249b8b79dacbe17a84eea24f1f2cc WHIRLPOOL eb0ede89293fa1ecccab51b81bd60eb39c025034826ba57d1a319cffc5c61338126b250645fcac66c9916f2efe8b74f71c0a20cf2cb3a6adf6d3f41c633610ea
diff --git a/media-video/vdr/files/channel_alternative.conf b/media-video/vdr/files/channel_alternative.conf
new file mode 100644
index 000000000000..fb9088f0c439
--- /dev/null
+++ b/media-video/vdr/files/channel_alternative.conf
@@ -0,0 +1,11 @@
+# Alternative channel configuration file
+#
+# Syntax:  original channel id;alternative channel id
+# Example: C-62499-10007-12003;C-0-196-14
+#          this means, if channel C-62499-10007-12003 is
+#          not available for a recording, vdr will try to
+#          use channel C-0-196-14
+#
+# lines beginning with '#' are ignored
+#
+
diff --git a/media-video/vdr/files/vdr-2.0.6-r2_gentoo.patch b/media-video/vdr/files/vdr-2.0.6-r2_gentoo.patch
new file mode 100644
index 000000000000..516bb7b7254f
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.0.6-r2_gentoo.patch
@@ -0,0 +1,73 @@
+disabled plugin install from vdr source, we dont support this way
+patch to support LINGUAS variable
+fixed install on multicore cpu, creating CONFDIR on later time
+install libsi includes in own dir
+Signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> 20/Jan/2015
+diff -Naur vdr-2.0.6.orig/Makefile vdr-2.0.6/Makefile
+--- vdr-2.0.6.orig/Makefile	2014-09-22 22:17:23.000000000 +0200
++++ vdr-2.0.6/Makefile	2014-09-24 15:22:43.000000000 +0200
+@@ -109,7 +109,7 @@
+ VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
+ APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
+ 
+-all: vdr i18n plugins
++all: vdr i18n
+ 
+ # Implicit rules:
+ 
+@@ -162,7 +162,7 @@
+ 
+ PODIR     = po
+ LOCALEDIR = locale
+-I18Npo    = $(wildcard $(PODIR)/*.po)
++I18Npo    = $(foreach dir,$(LINGUAS),$(wildcard $(PODIR)/$(dir)*.po))
+ I18Nmo    = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
+ I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
+ I18Npot   = $(PODIR)/vdr.pot
+@@ -185,7 +185,7 @@
+ 
+ install-i18n: i18n
+ 	@mkdir -p $(DESTDIR)$(LOCDIR)
+-	cp -r $(LOCALEDIR)/* $(DESTDIR)$(LOCDIR)
++	@(cd $(LOCALEDIR); for linguas in $(LINGUAS); do [ "$$linguas" = "en" ] && continue; cp -r --parents $$linguas* $(DESTDIR)$(LOCDIR); done)
+ 
+ # The 'include' directory (for plugins):
+ 
+@@ -247,7 +247,7 @@
+ 
+ # Install the files (note that 'install-pc' must be first!):
+ 
+-install: install-pc install-bin install-dirs install-conf install-doc install-plugins install-i18n install-includes
++install: install-pc install-bin install-dirs install-conf install-doc install-i18n install-includes
+ 
+ # VDR binary:
+ 
+@@ -259,11 +259,12 @@
+ 
+ install-dirs:
+ 	@mkdir -p $(DESTDIR)$(VIDEODIR)
+-	@mkdir -p $(DESTDIR)$(CONFDIR)
+-	@mkdir -p $(DESTDIR)$(CACHEDIR)
++#	@mkdir -p $(DESTDIR)$(CONFDIR)
++#	@mkdir -p $(DESTDIR)$(CACHEDIR)
+ 	@mkdir -p $(DESTDIR)$(RESDIR)
+ 
+ install-conf:
++	@mkdir -p $(DESTDIR)$(CONFDIR)
+ 	@cp -pn *.conf $(DESTDIR)$(CONFDIR)
+ 
+ # Documentation:
+@@ -290,8 +291,11 @@
+ # Includes:
+ 
+ install-includes: include-dir
+-	@mkdir -p $(DESTDIR)$(INCDIR)
+-	@cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
++#	@mkdir -p $(DESTDIR)$(INCDIR)
++#	@cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
++	@mkdir -p $(DESTDIR)$(INCDIR)/vdr $(DESTDIR)$(INCDIR)/vdr/libsi
++	@cp -pLR include/vdr $(DESTDIR)$(INCDIR)
++	@cp -pLR include/libsi Make.config $(DESTDIR)$(INCDIR)/vdr
+ 
+ # pkg-config file:
+ 
diff --git a/media-video/vdr/files/vdr-2.0.6_gentoo.patch b/media-video/vdr/files/vdr-2.0.6_gentoo.patch
new file mode 100644
index 000000000000..1641fc8e2ee6
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.0.6_gentoo.patch
@@ -0,0 +1,68 @@
+diff -Naur vdr-2.0.6.orig/Makefile vdr-2.0.6/Makefile
+--- vdr-2.0.6.orig/Makefile	2014-09-22 22:17:23.000000000 +0200
++++ vdr-2.0.6/Makefile	2014-09-24 15:22:43.000000000 +0200
+@@ -109,7 +109,7 @@
+ VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
+ APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
+ 
+-all: vdr i18n plugins
++all: vdr i18n
+ 
+ # Implicit rules:
+ 
+@@ -162,7 +162,7 @@
+ 
+ PODIR     = po
+ LOCALEDIR = locale
+-I18Npo    = $(wildcard $(PODIR)/*.po)
++I18Npo    = $(foreach dir,$(LINGUAS),$(wildcard $(PODIR)/$(dir)*.po))
+ I18Nmo    = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
+ I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
+ I18Npot   = $(PODIR)/vdr.pot
+@@ -185,7 +185,7 @@
+ 
+ install-i18n: i18n
+ 	@mkdir -p $(DESTDIR)$(LOCDIR)
+-	cp -r $(LOCALEDIR)/* $(DESTDIR)$(LOCDIR)
++	@(cd $(LOCALEDIR); for linguas in $(LINGUAS); do [ "$$linguas" = "en" ] && continue; cp -r --parents $$linguas* $(DESTDIR)$(LOCDIR); done)
+ 
+ # The 'include' directory (for plugins):
+ 
+@@ -247,7 +247,7 @@
+ 
+ # Install the files (note that 'install-pc' must be first!):
+ 
+-install: install-pc install-bin install-dirs install-conf install-doc install-plugins install-i18n install-includes
++install: install-pc install-bin install-dirs install-conf install-doc install-i18n install-includes
+ 
+ # VDR binary:
+ 
+@@ -259,11 +259,12 @@
+ 
+ install-dirs:
+ 	@mkdir -p $(DESTDIR)$(VIDEODIR)
+-	@mkdir -p $(DESTDIR)$(CONFDIR)
+-	@mkdir -p $(DESTDIR)$(CACHEDIR)
++#	@mkdir -p $(DESTDIR)$(CONFDIR)
++#	@mkdir -p $(DESTDIR)$(CACHEDIR)
+ 	@mkdir -p $(DESTDIR)$(RESDIR)
+ 
+ install-conf:
++	@mkdir -p $(DESTDIR)$(CONFDIR)
+ 	@cp -pn *.conf $(DESTDIR)$(CONFDIR)
+ 
+ # Documentation:
+@@ -290,8 +291,11 @@
+ # Includes:
+ 
+ install-includes: include-dir
+-	@mkdir -p $(DESTDIR)$(INCDIR)
+-	@cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
++#	@mkdir -p $(DESTDIR)$(INCDIR)
++#	@cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
++	@mkdir -p $(DESTDIR)$(INCDIR)/vdr $(DESTDIR)$(INCDIR)/vdr/libsi
++	@cp -pLR include/vdr $(DESTDIR)$(INCDIR)
++	@cp -pLR include/libsi Make.config $(DESTDIR)$(INCDIR)/vdr
+ 
+ # pkg-config file:
+ 
diff --git a/media-video/vdr/files/vdr-2.0.7_systemd_argsdir.patch b/media-video/vdr/files/vdr-2.0.7_systemd_argsdir.patch
new file mode 100644
index 000000000000..de9f4b90163f
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.0.7_systemd_argsdir.patch
@@ -0,0 +1,438 @@
+diff -Naur vdr-2.0.7.orig/HISTORY vdr-2.0.7/HISTORY
+--- vdr-2.0.7.orig/HISTORY	2015-01-23 09:16:13.735620000 +0100
++++ vdr-2.0.7/HISTORY	2015-01-23 09:17:29.038614491 +0100
+@@ -7916,6 +7916,16 @@
+ - The APIVERSION has been increased to 2.0.6 due to the changes to pat.h, sdt.h and
+   the functional modification to cFont::CreateFont().
+ 
++2015-01-18: Version 2.0.6 + backport of systemd support from versions 2.1.6 and 2.1.7
++
++- Added support for systemd (thanks to Christopher Reimer). To activate this you
++  need to add "SDNOTIFY=1" to the 'make' call.
++
++2015-01-18: Version 2.0.6 + backport of reading command line arguments from files, from version 2.1$
++
++- VDR now reads command line options from *.conf files in /etc/vdr/conf.d (thanks
++  to Lars Hanisch). See vdr.1 and vdr.5 for details.
++
+ 2015-01-20: Version 2.0.7
+ 
+ - Fixed a possible division by zero in frame rate detection.
+diff -Naur vdr-2.0.7.orig/Make.config.template vdr-2.0.7/Make.config.template
+--- vdr-2.0.7.orig/Make.config.template	2015-01-23 09:16:13.736620000 +0100
++++ vdr-2.0.7/Make.config.template	2015-01-23 09:16:34.199618503 +0100
+@@ -38,6 +38,7 @@
+ 
+ #VIDEODIR  = /srv/vdr/video
+ #CONFDIR   = /var/lib/vdr
++#ARGSDIR   = /etc/vdr/conf.d
+ #CACHEDIR  = /var/cache/vdr
+ 
+ # Overrides for preset/legacy configurations:
+diff -Naur vdr-2.0.7.orig/Makefile vdr-2.0.7/Makefile
+--- vdr-2.0.7.orig/Makefile	2015-01-23 09:16:13.724620001 +0100
++++ vdr-2.0.7/Makefile	2015-01-23 09:17:58.588612330 +0100
+@@ -31,6 +31,7 @@
+ DESTDIR   ?=
+ VIDEODIR  ?= /srv/vdr/video
+ CONFDIR   ?= /var/lib/vdr
++ARGSDIR   ?= /etc/vdr/conf.d
+ CACHEDIR  ?= /var/cache/vdr
+ 
+ PREFIX    ?= /usr/local
+@@ -66,7 +67,7 @@
+ 
+ SILIB    = $(LSIDIR)/libsi.a
+ 
+-OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbci.o\
++OBJS = args.o audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbci.o\
+        dvbplayer.o dvbspu.o dvbsubtitle.o eit.o eitscan.o epg.o filter.o font.o i18n.o interface.o keys.o\
+        lirc.o menu.o menuitems.o nit.o osdbase.o osd.o pat.o player.o plugin.o\
+        receiver.o recorder.o recording.o remote.o remux.o ringbuffer.o sdt.o sections.o shutdown.o\
+@@ -111,12 +112,18 @@
+ DEFINES += -DBIDI
+ LIBS += $(shell pkg-config --libs fribidi)
+ endif
++ifdef SDNOTIFY
++INCLUDES += $(shell pkg-config --cflags libsystemd-daemon)
++DEFINES += -DSDNOTIFY
++LIBS += $(shell pkg-config --libs libsystemd-daemon)
++endif
+ 
+ LIRC_DEVICE ?= /var/run/lirc/lircd
+ 
+ DEFINES += -DLIRC_DEVICE=\"$(LIRC_DEVICE)\"
+ DEFINES += -DVIDEODIR=\"$(VIDEODIR)\"
+ DEFINES += -DCONFDIR=\"$(CONFDIR)\"
++DEFINES += -DARGSDIR=\"$(ARGSDIR)\"
+ DEFINES += -DCACHEDIR=\"$(CACHEDIR)\"
+ DEFINES += -DRESDIR=\"$(RESDIR)\"
+ DEFINES += -DPLUGINDIR=\"$(LIBDIR)\"
+@@ -161,6 +168,7 @@
+ 	@echo "mandir=$(MANDIR)" >> $@
+ 	@echo "configdir=$(CONFDIR)" >> $@
+ 	@echo "videodir=$(VIDEODIR)" >> $@
++	@echo "argsdir=$(ARGSDIR)" >> $@
+ 	@echo "cachedir=$(CACHEDIR)" >> $@
+ 	@echo "resdir=$(RESDIR)" >> $@
+ 	@echo "libdir=$(LIBDIR)" >> $@
+@@ -278,6 +286,7 @@
+ install-dirs:
+ 	@mkdir -p $(DESTDIR)$(VIDEODIR)
+ #	@mkdir -p $(DESTDIR)$(CONFDIR)
++	@mkdir -p $(DESTDIR)$(ARGSDIR)
+ #	@mkdir -p $(DESTDIR)$(CACHEDIR)
+ 	@mkdir -p $(DESTDIR)$(RESDIR)
+ 
+diff -Naur vdr-2.0.7.orig/args.c vdr-2.0.7/args.c
+--- vdr-2.0.7.orig/args.c	1970-01-01 01:00:00.000000000 +0100
++++ vdr-2.0.7/args.c	2015-01-23 09:16:34.199618503 +0100
+@@ -0,0 +1,129 @@
++/*
++ * args.c: Read arguments from files
++ *
++ * See the main source file 'vdr.c' for copyright information and
++ * how to reach the author.
++ *
++ * Original version written by Lars Hanisch <dvb@flensrocker.de>.
++ *
++ * $Id$
++ */
++
++#include "args.h"
++#include <unistd.h>
++
++cArgs::cArgs(const char *Argv0)
++{
++  argv0 = Argv0;
++  argc = 0;
++  argv = NULL;
++}
++
++cArgs::~cArgs(void)
++{
++  if (argv != NULL)
++     delete [] argv;
++}
++
++bool cArgs::AddArg(const char *s)
++{
++  if (inVdrSection)
++     args.Append(strdup(s));
++  else if (*lastArg == NULL)
++     return false;
++  else
++     lastArg = cString::sprintf("%s %s", *lastArg, s);
++  return true;
++}
++
++bool cArgs::ReadDirectory(const char *Directory)
++{
++  if (argv != NULL)
++     delete [] argv;
++  argc = 0;
++  argv = NULL;
++  args.Clear();
++  lastArg = NULL;
++  inVdrSection = false;
++  cFileNameList files(Directory, false);
++  if (files.Size() == 0)
++     return false;
++  for (int i = 0; i < files.Size(); i++) {
++      const char *fileName = files.At(i);
++      if (startswith(fileName, ".") || !endswith(fileName, ".conf"))
++         continue;
++      cString fullFileName = AddDirectory(Directory, fileName);
++      struct stat fs;
++      if ((access(*fullFileName, F_OK) != 0) || (stat(*fullFileName, &fs) != 0) || S_ISDIR(fs.st_mode))
++         continue;
++      bool ok = true;
++      int line = 0;
++      FILE *f = fopen(*fullFileName, "r");
++      if (f) {
++         char *s;
++         cReadLine ReadLine;
++         while ((s = ReadLine.Read(f)) != NULL) {
++               line++;
++               s = stripspace(skipspace(s));
++               if (!isempty(s) && (s[0] != '#')) {
++                  if (startswith(s, "[") && endswith(s, "]")) {
++                     s[strlen(s) - 1] = 0;
++                     s++;
++                     if (*lastArg) {
++                        args.Append(strdup(*lastArg));
++                        lastArg = NULL;
++                        }
++                     if (strcmp(s, "vdr") == 0)
++                        inVdrSection = true;
++                     else {
++                        inVdrSection = false;
++                        lastArg = cString::sprintf("--plugin=%s", s);
++                        }
++                     }
++                  else {
++                     if ((strlen(s) > 2) && (s[0] == '-') && (s[1] != '-')) { // short option, split at first space
++                        char *p = strchr(s, ' ');
++                        if (p == NULL) {
++                           ok = AddArg(s);
++                           if (!ok)
++                              break;
++                           }
++                        else {
++                           *p = 0;
++                           p++;
++                           ok = AddArg(s);
++                           if (!ok)
++                              break;
++                           ok = AddArg(p);
++                           if (!ok)
++                              break;
++                           }
++                        }
++                     else {
++                        ok = AddArg(s);
++                        if (!ok)
++                           break;
++                        }
++                     }
++                  }
++               }
++         fclose(f);
++         }
++       if (!ok) {
++          esyslog("ERROR: args file %s, line %d", *fullFileName, line);
++          return false;
++          }
++      }
++  if (*lastArg) {
++     args.Append(strdup(*lastArg));
++     lastArg = NULL;
++     }
++  argv = new char*[args.Size() + 1];
++  argv[0] = strdup(*argv0);
++  argc = 1;
++  for (int i = 0; i < args.Size(); i++) {
++      argv[argc] = args.At(i);
++      argc++;
++      }
++  return true;
++}
+diff -Naur vdr-2.0.7.orig/args.h vdr-2.0.7/args.h
+--- vdr-2.0.7.orig/args.h	1970-01-01 01:00:00.000000000 +0100
++++ vdr-2.0.7/args.h	2015-01-23 09:16:34.199618503 +0100
+@@ -0,0 +1,34 @@
++/*
++ * args.h: Read arguments from files
++ *
++ * See the main source file 'vdr.c' for copyright information and
++ * how to reach the author.
++ *
++ * Original version written by Lars Hanisch <dvb@flensrocker.de>.
++ *
++ * $Id$
++ */
++
++#ifndef __ARGS_H
++#define __ARGS_H
++
++#include "tools.h"
++
++class cArgs {
++private:
++  cString argv0;
++  cStringList args;
++  cString lastArg;
++  bool inVdrSection;
++  int argc;
++  char **argv;
++  bool AddArg(const char *s);
++public:
++  cArgs(const char *Argv0);
++  ~cArgs(void);
++  bool ReadDirectory(const char *Directory);
++  int GetArgc(void) const { return argc; };
++  char **GetArgv(void) const { return argv; };
++  };
++
++#endif //__ARGS_H
+diff -Naur vdr-2.0.7.orig/interface.c vdr-2.0.7/interface.c
+--- vdr-2.0.7.orig/interface.c	2015-01-23 09:16:13.725620001 +0100
++++ vdr-2.0.7/interface.c	2015-01-23 09:16:34.199618503 +0100
+@@ -10,6 +10,9 @@
+ #include "interface.h"
+ #include <ctype.h>
+ #include <stdlib.h>
++#ifdef SDNOTIFY
++#include <systemd/sd-daemon.h>
++#endif
+ #include <unistd.h>
+ #include "i18n.h"
+ #include "status.h"
+@@ -159,6 +162,9 @@
+       bool known = Keys.KnowsRemote(Remote->Name());
+       dsyslog("remote control %s - %s", Remote->Name(), known ? "keys known" : "learning keys");
+       if (!known) {
++#ifdef SDNOTIFY
++         sd_notify(0, "READY=1\nSTATUS=Learning keys...");
++#endif
+          cSkinDisplayMenu *DisplayMenu = Skins.Current()->DisplayMenu();
+          DisplayMenu->SetMenuCategory(mcUnknown);
+          char Headline[256];
+diff -Naur vdr-2.0.7.orig/vdr.1 vdr-2.0.7/vdr.1
+--- vdr-2.0.7.orig/vdr.1	2015-01-23 09:16:13.730620000 +0100
++++ vdr-2.0.7/vdr.1	2015-01-23 09:16:34.200618503 +0100
+@@ -178,6 +178,10 @@
+ Read resource files from \fIdir\fR
+ (default is to read them from the config directory).
+ .TP
++.BI \-\-showargs[= dir ]
++Read command line arguments from \fIdir\fR (default is \fI/etc/vdr/conf.d\fR),
++display them to the console and exit.
++.TP
+ .BI \-s\  cmd ,\ \-\-shutdown= cmd
+ Call \fIcmd\fR to shutdown the computer. See the file \fIINSTALL\fR for more
+ information.
+@@ -213,6 +217,10 @@
+ .BI \-w\  sec ,\ \-\-watchdog= sec
+ Activate the watchdog timer with a timeout of \fIsec\fR seconds.
+ A value of \fB0\fR (default) disables the watchdog.
++.P
++If started without any options, vdr tries to read command line options
++from files named '*.conf' in the directory /etc/vdr/conf.d. Files are
++read in alphabetical order. See vdr(5) for details.
+ .SH SIGNALS
+ .TP
+ .B SIGINT, SIGTERM
+diff -Naur vdr-2.0.7.orig/vdr.5 vdr-2.0.7/vdr.5
+--- vdr-2.0.7.orig/vdr.5	2015-01-23 09:16:13.732620000 +0100
++++ vdr-2.0.7/vdr.5	2015-01-23 09:16:34.200618503 +0100
+@@ -895,6 +895,33 @@
+ just 16 bit wide. The internal representation in VDR allows for 32 bit to
+ be used, so that external tools can generate EPG data that is guaranteed
+ not to collide with the ids of existing data.
++.SS COMMANDLINE OPTIONS
++If started without any options, vdr tries to read any files in the directory
++/etc/vdr/conf.d with names that do not begin with a '.' and that end with '.conf'.
++These files are read in alphabetical order. The format of these files is
++
++# comment
++.br
++[name]
++.br
++-a
++.br
++-b 123
++.br
++--long
++.br
++--longarg=123
++.br
++
++Any lines that begin with '#' as the first non-whitespace character are considered
++comments and are ignored.
++A command line option file consists of one or more sections, indicated by '[name]',
++where 'name' is either the fixed word 'vdr' (if this section contains options for
++the main VDR program) or the name of the plugin this section applies to.
++Each option must be written on a separate line, including the leading '-' (for
++a short option) or '--' (for a long option). If the option has additional arguments,
++they have to be written on the same line as the option itself, separated from the
++option with a blank (short option) or equal sign (long option).
+ .SH SEE ALSO
+ .BR vdr (1)
+ .SH AUTHOR
+diff -Naur vdr-2.0.7.orig/vdr.c vdr-2.0.7/vdr.c
+--- vdr-2.0.7.orig/vdr.c	2015-01-23 09:16:13.732620000 +0100
++++ vdr-2.0.7/vdr.c	2015-01-23 09:16:34.200618503 +0100
+@@ -34,8 +34,12 @@
+ #include <stdlib.h>
+ #include <sys/capability.h>
+ #include <sys/prctl.h>
++#ifdef SDNOTIFY
++#include <systemd/sd-daemon.h>
++#endif
+ #include <termios.h>
+ #include <unistd.h>
++#include "args.h"
+ #include "audio.h"
+ #include "channels.h"
+ #include "config.h"
+@@ -192,6 +196,7 @@
+ #define DEFAULTWATCHDOG     0 // seconds
+ #define DEFAULTVIDEODIR VIDEODIR
+ #define DEFAULTCONFDIR dd(CONFDIR, VideoDirectory)
++#define DEFAULTARGSDIR dd(ARGSDIR, "/etc/vdr/conf.d")
+ #define DEFAULTCACHEDIR dd(CACHEDIR, VideoDirectory)
+ #define DEFAULTRESDIR dd(RESDIR, ConfigDirectory)
+ #define DEFAULTPLUGINDIR PLUGINDIR
+@@ -229,6 +234,15 @@
+   VdrUser = VDR_USER;
+ #endif
+ 
++  cArgs *Args = NULL;
++  if (argc == 1) {
++     Args = new cArgs(argv[0]);
++     if (Args->ReadDirectory(DEFAULTARGSDIR)) {
++        argc = Args->GetArgc();
++        argv = Args->GetArgv();
++        }
++     }
++
+   SetVideoDirectory(VideoDirectory);
+   cPluginManager PluginManager(DEFAULTPLUGINDIR);
+ 
+@@ -256,6 +270,7 @@
+       { "port",     required_argument, NULL, 'p' },
+       { "record",   required_argument, NULL, 'r' },
+       { "resdir",   required_argument, NULL, 'r' | 0x100 },
++      { "showargs", optional_argument, NULL, 's' | 0x200 },
+       { "shutdown", required_argument, NULL, 's' },
+       { "split",    no_argument,       NULL, 's' | 0x100 },
+       { "terminal", required_argument, NULL, 't' },
+@@ -428,6 +443,19 @@
+           case 's' | 0x100:
+                     Setup.SplitEditedFiles = 1;
+                     break;
++          case 's' | 0x200: {
++                    const char *ArgsDir = optarg ? optarg : DEFAULTARGSDIR;
++                    cArgs Args(argv[0]);
++                    if (!Args.ReadDirectory(ArgsDir)) {
++                       fprintf(stderr, "vdr: can't read arguments from directory: %s\n", ArgsDir);
++                       return 2;
++                       }
++                    int c = Args.GetArgc();
++                    char **v = Args.GetArgv();
++                    for (int i = 1; i < c; i++)
++                        printf("%s\n", v[i]);
++                    return 0;
++                    }
+           case 't': Terminal = optarg;
+                     if (access(Terminal, R_OK | W_OK) < 0) {
+                        fprintf(stderr, "vdr: can't access terminal: %s\n", Terminal);
+@@ -541,6 +569,8 @@
+                "  -s CMD,   --shutdown=CMD call CMD to shutdown the computer\n"
+                "            --split        split edited files at the editing marks (only\n"
+                "                           useful in conjunction with --edit)\n"
++               "            --showargs[=DIR] print the arguments read from DIR and exit\n"
++               "                           (default: %s)\n"
+                "  -t TTY,   --terminal=TTY controlling tty\n"
+                "  -u USER,  --user=USER    run as user USER; only applicable if started as\n"
+                "                           root\n"
+@@ -563,6 +593,7 @@
+                DEFAULTLOCDIR,
+                DEFAULTSVDRPPORT,
+                DEFAULTRESDIR,
++               DEFAULTARGSDIR,
+                DEFAULTVIDEODIR,
+                DEFAULTWATCHDOG
+                );
+@@ -848,6 +879,10 @@
+      alarm(WatchdogTimeout); // Initial watchdog timer start
+      }
+ 
++#ifdef SDNOTIFY
++  sd_notify(0, "READY=1\nSTATUS=Ready");
++#endif
++
+   // Main program loop:
+ 
+ #define DELETE_MENU ((IsInfoMenu &= (Menu == NULL)), delete Menu, Menu = NULL)
diff --git a/media-video/vdr/files/vdr-2.0.7_systemd_argsdir_vanilla.patch b/media-video/vdr/files/vdr-2.0.7_systemd_argsdir_vanilla.patch
new file mode 100644
index 000000000000..f7bae16fdd40
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.0.7_systemd_argsdir_vanilla.patch
@@ -0,0 +1,438 @@
+diff -Naur vdr-2.0.7.orig/HISTORY vdr-2.0.7/HISTORY
+--- vdr-2.0.7.orig/HISTORY	2015-01-23 09:07:52.777656645 +0100
++++ vdr-2.0.7/HISTORY	2015-01-23 09:09:57.798647500 +0100
+@@ -7916,6 +7916,16 @@
+ - The APIVERSION has been increased to 2.0.6 due to the changes to pat.h, sdt.h and
+   the functional modification to cFont::CreateFont().
+ 
++2015-01-18: Version 2.0.6 + backport of systemd support from versions 2.1.6 and 2.1.7
++
++- Added support for systemd (thanks to Christopher Reimer). To activate this you
++  need to add "SDNOTIFY=1" to the 'make' call.
++
++2015-01-18: Version 2.0.6 + backport of reading command line arguments from files, from version 2.1$
++
++- VDR now reads command line options from *.conf files in /etc/vdr/conf.d (thanks
++  to Lars Hanisch). See vdr.1 and vdr.5 for details.
++
+ 2015-01-20: Version 2.0.7
+ 
+ - Fixed a possible division by zero in frame rate detection.
+diff -Naur vdr-2.0.7.orig/Make.config.template vdr-2.0.7/Make.config.template
+--- vdr-2.0.7.orig/Make.config.template	2015-01-23 09:07:52.765656646 +0100
++++ vdr-2.0.7/Make.config.template	2015-01-23 09:08:15.775654963 +0100
+@@ -38,6 +38,7 @@
+ 
+ #VIDEODIR  = /srv/vdr/video
+ #CONFDIR   = /var/lib/vdr
++#ARGSDIR   = /etc/vdr/conf.d
+ #CACHEDIR  = /var/cache/vdr
+ 
+ # Overrides for preset/legacy configurations:
+diff -Naur vdr-2.0.7.orig/Makefile vdr-2.0.7/Makefile
+--- vdr-2.0.7.orig/Makefile	2015-01-23 09:07:52.778656645 +0100
++++ vdr-2.0.7/Makefile	2015-01-23 09:11:11.158642134 +0100
+@@ -31,6 +31,7 @@
+ DESTDIR   ?=
+ VIDEODIR  ?= /srv/vdr/video
+ CONFDIR   ?= /var/lib/vdr
++ARGSDIR   ?= /etc/vdr/conf.d
+ CACHEDIR  ?= /var/cache/vdr
+ 
+ PREFIX    ?= /usr/local
+@@ -66,7 +67,7 @@
+ 
+ SILIB    = $(LSIDIR)/libsi.a
+ 
+-OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbci.o\
++OBJS = args.o audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbci.o\
+        dvbplayer.o dvbspu.o dvbsubtitle.o eit.o eitscan.o epg.o filter.o font.o i18n.o interface.o keys.o\
+        lirc.o menu.o menuitems.o nit.o osdbase.o osd.o pat.o player.o plugin.o\
+        receiver.o recorder.o recording.o remote.o remux.o ringbuffer.o sdt.o sections.o shutdown.o\
+@@ -93,12 +94,18 @@
+ DEFINES += -DBIDI
+ LIBS += $(shell pkg-config --libs fribidi)
+ endif
++ifdef SDNOTIFY
++INCLUDES += $(shell pkg-config --cflags libsystemd-daemon)
++DEFINES += -DSDNOTIFY
++LIBS += $(shell pkg-config --libs libsystemd-daemon)
++endif
+ 
+ LIRC_DEVICE ?= /var/run/lirc/lircd
+ 
+ DEFINES += -DLIRC_DEVICE=\"$(LIRC_DEVICE)\"
+ DEFINES += -DVIDEODIR=\"$(VIDEODIR)\"
+ DEFINES += -DCONFDIR=\"$(CONFDIR)\"
++DEFINES += -DARGSDIR=\"$(ARGSDIR)\"
+ DEFINES += -DCACHEDIR=\"$(CACHEDIR)\"
+ DEFINES += -DRESDIR=\"$(RESDIR)\"
+ DEFINES += -DPLUGINDIR=\"$(LIBDIR)\"
+@@ -143,6 +150,7 @@
+ 	@echo "mandir=$(MANDIR)" >> $@
+ 	@echo "configdir=$(CONFDIR)" >> $@
+ 	@echo "videodir=$(VIDEODIR)" >> $@
++	@echo "argsdir=$(ARGSDIR)" >> $@
+ 	@echo "cachedir=$(CACHEDIR)" >> $@
+ 	@echo "resdir=$(RESDIR)" >> $@
+ 	@echo "libdir=$(LIBDIR)" >> $@
+@@ -260,6 +268,7 @@
+ install-dirs:
+ 	@mkdir -p $(DESTDIR)$(VIDEODIR)
+ #	@mkdir -p $(DESTDIR)$(CONFDIR)
++	@mkdir -p $(DESTDIR)$(ARGSDIR)
+ #	@mkdir -p $(DESTDIR)$(CACHEDIR)
+ 	@mkdir -p $(DESTDIR)$(RESDIR)
+ 
+diff -Naur vdr-2.0.7.orig/args.c vdr-2.0.7/args.c
+--- vdr-2.0.7.orig/args.c	1970-01-01 01:00:00.000000000 +0100
++++ vdr-2.0.7/args.c	2015-01-23 09:08:15.775654963 +0100
+@@ -0,0 +1,129 @@
++/*
++ * args.c: Read arguments from files
++ *
++ * See the main source file 'vdr.c' for copyright information and
++ * how to reach the author.
++ *
++ * Original version written by Lars Hanisch <dvb@flensrocker.de>.
++ *
++ * $Id$
++ */
++
++#include "args.h"
++#include <unistd.h>
++
++cArgs::cArgs(const char *Argv0)
++{
++  argv0 = Argv0;
++  argc = 0;
++  argv = NULL;
++}
++
++cArgs::~cArgs(void)
++{
++  if (argv != NULL)
++     delete [] argv;
++}
++
++bool cArgs::AddArg(const char *s)
++{
++  if (inVdrSection)
++     args.Append(strdup(s));
++  else if (*lastArg == NULL)
++     return false;
++  else
++     lastArg = cString::sprintf("%s %s", *lastArg, s);
++  return true;
++}
++
++bool cArgs::ReadDirectory(const char *Directory)
++{
++  if (argv != NULL)
++     delete [] argv;
++  argc = 0;
++  argv = NULL;
++  args.Clear();
++  lastArg = NULL;
++  inVdrSection = false;
++  cFileNameList files(Directory, false);
++  if (files.Size() == 0)
++     return false;
++  for (int i = 0; i < files.Size(); i++) {
++      const char *fileName = files.At(i);
++      if (startswith(fileName, ".") || !endswith(fileName, ".conf"))
++         continue;
++      cString fullFileName = AddDirectory(Directory, fileName);
++      struct stat fs;
++      if ((access(*fullFileName, F_OK) != 0) || (stat(*fullFileName, &fs) != 0) || S_ISDIR(fs.st_mode))
++         continue;
++      bool ok = true;
++      int line = 0;
++      FILE *f = fopen(*fullFileName, "r");
++      if (f) {
++         char *s;
++         cReadLine ReadLine;
++         while ((s = ReadLine.Read(f)) != NULL) {
++               line++;
++               s = stripspace(skipspace(s));
++               if (!isempty(s) && (s[0] != '#')) {
++                  if (startswith(s, "[") && endswith(s, "]")) {
++                     s[strlen(s) - 1] = 0;
++                     s++;
++                     if (*lastArg) {
++                        args.Append(strdup(*lastArg));
++                        lastArg = NULL;
++                        }
++                     if (strcmp(s, "vdr") == 0)
++                        inVdrSection = true;
++                     else {
++                        inVdrSection = false;
++                        lastArg = cString::sprintf("--plugin=%s", s);
++                        }
++                     }
++                  else {
++                     if ((strlen(s) > 2) && (s[0] == '-') && (s[1] != '-')) { // short option, split at first space
++                        char *p = strchr(s, ' ');
++                        if (p == NULL) {
++                           ok = AddArg(s);
++                           if (!ok)
++                              break;
++                           }
++                        else {
++                           *p = 0;
++                           p++;
++                           ok = AddArg(s);
++                           if (!ok)
++                              break;
++                           ok = AddArg(p);
++                           if (!ok)
++                              break;
++                           }
++                        }
++                     else {
++                        ok = AddArg(s);
++                        if (!ok)
++                           break;
++                        }
++                     }
++                  }
++               }
++         fclose(f);
++         }
++       if (!ok) {
++          esyslog("ERROR: args file %s, line %d", *fullFileName, line);
++          return false;
++          }
++      }
++  if (*lastArg) {
++     args.Append(strdup(*lastArg));
++     lastArg = NULL;
++     }
++  argv = new char*[args.Size() + 1];
++  argv[0] = strdup(*argv0);
++  argc = 1;
++  for (int i = 0; i < args.Size(); i++) {
++      argv[argc] = args.At(i);
++      argc++;
++      }
++  return true;
++}
+diff -Naur vdr-2.0.7.orig/args.h vdr-2.0.7/args.h
+--- vdr-2.0.7.orig/args.h	1970-01-01 01:00:00.000000000 +0100
++++ vdr-2.0.7/args.h	2015-01-23 09:08:15.775654963 +0100
+@@ -0,0 +1,34 @@
++/*
++ * args.h: Read arguments from files
++ *
++ * See the main source file 'vdr.c' for copyright information and
++ * how to reach the author.
++ *
++ * Original version written by Lars Hanisch <dvb@flensrocker.de>.
++ *
++ * $Id$
++ */
++
++#ifndef __ARGS_H
++#define __ARGS_H
++
++#include "tools.h"
++
++class cArgs {
++private:
++  cString argv0;
++  cStringList args;
++  cString lastArg;
++  bool inVdrSection;
++  int argc;
++  char **argv;
++  bool AddArg(const char *s);
++public:
++  cArgs(const char *Argv0);
++  ~cArgs(void);
++  bool ReadDirectory(const char *Directory);
++  int GetArgc(void) const { return argc; };
++  char **GetArgv(void) const { return argv; };
++  };
++
++#endif //__ARGS_H
+diff -Naur vdr-2.0.7.orig/interface.c vdr-2.0.7/interface.c
+--- vdr-2.0.7.orig/interface.c	2015-01-23 09:07:52.765656646 +0100
++++ vdr-2.0.7/interface.c	2015-01-23 09:08:15.775654963 +0100
+@@ -10,6 +10,9 @@
+ #include "interface.h"
+ #include <ctype.h>
+ #include <stdlib.h>
++#ifdef SDNOTIFY
++#include <systemd/sd-daemon.h>
++#endif
+ #include <unistd.h>
+ #include "i18n.h"
+ #include "status.h"
+@@ -159,6 +162,9 @@
+       bool known = Keys.KnowsRemote(Remote->Name());
+       dsyslog("remote control %s - %s", Remote->Name(), known ? "keys known" : "learning keys");
+       if (!known) {
++#ifdef SDNOTIFY
++         sd_notify(0, "READY=1\nSTATUS=Learning keys...");
++#endif
+          cSkinDisplayMenu *DisplayMenu = Skins.Current()->DisplayMenu();
+          DisplayMenu->SetMenuCategory(mcUnknown);
+          char Headline[256];
+diff -Naur vdr-2.0.7.orig/vdr.1 vdr-2.0.7/vdr.1
+--- vdr-2.0.7.orig/vdr.1	2015-01-23 09:07:52.770656646 +0100
++++ vdr-2.0.7/vdr.1	2015-01-23 09:08:15.776654963 +0100
+@@ -178,6 +178,10 @@
+ Read resource files from \fIdir\fR
+ (default is to read them from the config directory).
+ .TP
++.BI \-\-showargs[= dir ]
++Read command line arguments from \fIdir\fR (default is \fI/etc/vdr/conf.d\fR),
++display them to the console and exit.
++.TP
+ .BI \-s\  cmd ,\ \-\-shutdown= cmd
+ Call \fIcmd\fR to shutdown the computer. See the file \fIINSTALL\fR for more
+ information.
+@@ -213,6 +217,10 @@
+ .BI \-w\  sec ,\ \-\-watchdog= sec
+ Activate the watchdog timer with a timeout of \fIsec\fR seconds.
+ A value of \fB0\fR (default) disables the watchdog.
++.P
++If started without any options, vdr tries to read command line options
++from files named '*.conf' in the directory /etc/vdr/conf.d. Files are
++read in alphabetical order. See vdr(5) for details.
+ .SH SIGNALS
+ .TP
+ .B SIGINT, SIGTERM
+diff -Naur vdr-2.0.7.orig/vdr.5 vdr-2.0.7/vdr.5
+--- vdr-2.0.7.orig/vdr.5	2015-01-23 09:07:52.772656646 +0100
++++ vdr-2.0.7/vdr.5	2015-01-23 09:08:15.776654963 +0100
+@@ -889,6 +889,33 @@
+ just 16 bit wide. The internal representation in VDR allows for 32 bit to
+ be used, so that external tools can generate EPG data that is guaranteed
+ not to collide with the ids of existing data.
++.SS COMMANDLINE OPTIONS
++If started without any options, vdr tries to read any files in the directory
++/etc/vdr/conf.d with names that do not begin with a '.' and that end with '.conf'.
++These files are read in alphabetical order. The format of these files is
++
++# comment
++.br
++[name]
++.br
++-a
++.br
++-b 123
++.br
++--long
++.br
++--longarg=123
++.br
++
++Any lines that begin with '#' as the first non-whitespace character are considered
++comments and are ignored.
++A command line option file consists of one or more sections, indicated by '[name]',
++where 'name' is either the fixed word 'vdr' (if this section contains options for
++the main VDR program) or the name of the plugin this section applies to.
++Each option must be written on a separate line, including the leading '-' (for
++a short option) or '--' (for a long option). If the option has additional arguments,
++they have to be written on the same line as the option itself, separated from the
++option with a blank (short option) or equal sign (long option).
+ .SH SEE ALSO
+ .BR vdr (1)
+ .SH AUTHOR
+diff -Naur vdr-2.0.7.orig/vdr.c vdr-2.0.7/vdr.c
+--- vdr-2.0.7.orig/vdr.c	2015-01-23 09:07:52.772656646 +0100
++++ vdr-2.0.7/vdr.c	2015-01-23 09:08:15.776654963 +0100
+@@ -34,8 +34,12 @@
+ #include <stdlib.h>
+ #include <sys/capability.h>
+ #include <sys/prctl.h>
++#ifdef SDNOTIFY
++#include <systemd/sd-daemon.h>
++#endif
+ #include <termios.h>
+ #include <unistd.h>
++#include "args.h"
+ #include "audio.h"
+ #include "channels.h"
+ #include "config.h"
+@@ -186,6 +190,7 @@
+ #define DEFAULTWATCHDOG     0 // seconds
+ #define DEFAULTVIDEODIR VIDEODIR
+ #define DEFAULTCONFDIR dd(CONFDIR, VideoDirectory)
++#define DEFAULTARGSDIR dd(ARGSDIR, "/etc/vdr/conf.d")
+ #define DEFAULTCACHEDIR dd(CACHEDIR, VideoDirectory)
+ #define DEFAULTRESDIR dd(RESDIR, ConfigDirectory)
+ #define DEFAULTPLUGINDIR PLUGINDIR
+@@ -223,6 +228,15 @@
+   VdrUser = VDR_USER;
+ #endif
+ 
++  cArgs *Args = NULL;
++  if (argc == 1) {
++     Args = new cArgs(argv[0]);
++     if (Args->ReadDirectory(DEFAULTARGSDIR)) {
++        argc = Args->GetArgc();
++        argv = Args->GetArgv();
++        }
++     }
++
+   SetVideoDirectory(VideoDirectory);
+   cPluginManager PluginManager(DEFAULTPLUGINDIR);
+ 
+@@ -250,6 +264,7 @@
+       { "port",     required_argument, NULL, 'p' },
+       { "record",   required_argument, NULL, 'r' },
+       { "resdir",   required_argument, NULL, 'r' | 0x100 },
++      { "showargs", optional_argument, NULL, 's' | 0x200 },
+       { "shutdown", required_argument, NULL, 's' },
+       { "split",    no_argument,       NULL, 's' | 0x100 },
+       { "terminal", required_argument, NULL, 't' },
+@@ -422,6 +437,19 @@
+           case 's' | 0x100:
+                     Setup.SplitEditedFiles = 1;
+                     break;
++          case 's' | 0x200: {
++                    const char *ArgsDir = optarg ? optarg : DEFAULTARGSDIR;
++                    cArgs Args(argv[0]);
++                    if (!Args.ReadDirectory(ArgsDir)) {
++                       fprintf(stderr, "vdr: can't read arguments from directory: %s\n", ArgsDir);
++                       return 2;
++                       }
++                    int c = Args.GetArgc();
++                    char **v = Args.GetArgv();
++                    for (int i = 1; i < c; i++)
++                        printf("%s\n", v[i]);
++                    return 0;
++                    }
+           case 't': Terminal = optarg;
+                     if (access(Terminal, R_OK | W_OK) < 0) {
+                        fprintf(stderr, "vdr: can't access terminal: %s\n", Terminal);
+@@ -535,6 +563,8 @@
+                "  -s CMD,   --shutdown=CMD call CMD to shutdown the computer\n"
+                "            --split        split edited files at the editing marks (only\n"
+                "                           useful in conjunction with --edit)\n"
++               "            --showargs[=DIR] print the arguments read from DIR and exit\n"
++               "                           (default: %s)\n"
+                "  -t TTY,   --terminal=TTY controlling tty\n"
+                "  -u USER,  --user=USER    run as user USER; only applicable if started as\n"
+                "                           root\n"
+@@ -557,6 +587,7 @@
+                DEFAULTLOCDIR,
+                DEFAULTSVDRPPORT,
+                DEFAULTRESDIR,
++               DEFAULTARGSDIR,
+                DEFAULTVIDEODIR,
+                DEFAULTWATCHDOG
+                );
+@@ -837,6 +868,10 @@
+      alarm(WatchdogTimeout); // Initial watchdog timer start
+      }
+ 
++#ifdef SDNOTIFY
++  sd_notify(0, "READY=1\nSTATUS=Ready");
++#endif
++
+   // Main program loop:
+ 
+ #define DELETE_MENU ((IsInfoMenu &= (Menu == NULL)), delete Menu, Menu = NULL)
diff --git a/media-video/vdr/files/vdr-2.2.0_gentoo.patch b/media-video/vdr/files/vdr-2.2.0_gentoo.patch
new file mode 100644
index 000000000000..37ffd3c7b2ca
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.2.0_gentoo.patch
@@ -0,0 +1,70 @@
+diff -Naur vdr-2.1.7.orig/Makefile vdr-2.1.7/Makefile
+--- vdr-2.1.7.orig/Makefile	2015-01-18 12:37:45.506034673 +0100
++++ vdr-2.1.7/Makefile	2015-01-18 12:38:34.086037162 +0100
+@@ -116,7 +116,7 @@
+ VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
+ APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
+ 
+-all: vdr i18n plugins
++all: vdr i18n
+ 
+ # Implicit rules:
+ 
+@@ -170,7 +170,7 @@
+ 
+ PODIR     = po
+ LOCALEDIR = locale
+-I18Npo    = $(wildcard $(PODIR)/*.po)
++I18Npo    = $(foreach dir,$(LINGUAS),$(wildcard $(PODIR)/$(dir)*.po))
+ I18Nmo    = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
+ I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
+ I18Npot   = $(PODIR)/vdr.pot
+@@ -193,7 +193,7 @@
+ 
+ install-i18n: i18n
+ 	@mkdir -p $(DESTDIR)$(LOCDIR)
+-	cp -r $(LOCALEDIR)/* $(DESTDIR)$(LOCDIR)
++	@(cd $(LOCALEDIR); for linguas in $(LINGUAS); do [ "$$linguas" = "en" ] && continue; cp -r --parents $$linguas* $(DESTDIR)$(LOCDIR); done)
+ 
+ # The 'include' directory (for plugins):
+ 
+@@ -255,7 +255,7 @@
+ 
+ # Install the files (note that 'install-pc' must be first!):
+ 
+-install: install-pc install-bin install-dirs install-conf install-doc install-plugins install-i18n install-includes
++install: install-pc install-bin install-dirs install-conf install-doc install-i18n install-includes
+ 
+ # VDR binary:
+ 
+@@ -267,12 +267,13 @@
+ 
+ install-dirs:
+ 	@mkdir -p $(DESTDIR)$(VIDEODIR)
+-	@mkdir -p $(DESTDIR)$(CONFDIR)
+-	@mkdir -p $(DESTDIR)$(ARGSDIR)
+-	@mkdir -p $(DESTDIR)$(CACHEDIR)
++#	@mkdir -p $(DESTDIR)$(CONFDIR)
++#	@mkdir -p $(DESTDIR)$(ARGSDIR)
++#	@mkdir -p $(DESTDIR)$(CACHEDIR)
+ 	@mkdir -p $(DESTDIR)$(RESDIR)
+ 
+ install-conf:
++	@mkdir -p $(DESTDIR)$(CONFDIR)
+ 	@cp -pn *.conf $(DESTDIR)$(CONFDIR)
+ 
+ # Documentation:
+@@ -299,8 +300,11 @@
+ # Includes:
+ 
+ install-includes: include-dir
+-	@mkdir -p $(DESTDIR)$(INCDIR)
+-	@cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
++#	@mkdir -p $(DESTDIR)$(INCDIR)
++#	@cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
++	@mkdir -p $(DESTDIR)$(INCDIR)/vdr $(DESTDIR)$(INCDIR)/vdr/libsi
++	@cp -pLR include/vdr $(DESTDIR)$(INCDIR)
++	@cp -pLR include/libsi Make.config $(DESTDIR)$(INCDIR)/vdr
+ 
+ # pkg-config file:
+ 
diff --git a/media-video/vdr/metadata.xml b/media-video/vdr/metadata.xml
new file mode 100644
index 000000000000..21e13471eada
--- /dev/null
+++ b/media-video/vdr/metadata.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vdr@gentoo.org</email>
+		<name>Gentoo VDR Project</name>
+	</maintainer>
+	<use>
+		<flag name="alternatechannel">Use alternate channel on record</flag>
+		<flag name="bidi">fribidi support, for languages, written from right to left</flag>
+		<flag name="ddepgentry">remove duplicate EPG entries</flag>
+		<flag name="dvlvidprefer">controls video-dir choice on recording</flag>
+		<flag name="graphtft">support for <pkg>media-plugins/vdr-graphtft</pkg>plugin up from version 0.1.7</flag>
+		<flag name="html">Install HTML documentation</flag>
+		<flag name="jumpplay">Enables automatic jumping over cut marks while watching a recording</flag>
+		<flag name="jumpingseconds">skip seconds in played records</flag>
+		<flag name="kbd">enable keyboard support as remote device</flag>
+		<flag name="mainmenuhooks">Allows to replace main menu entries by some special plugins (like epgsearch, extrecmenu, ...)</flag>
+		<flag name="menuorg">Enables support for the <pkg>media-plugins/vdr-menuorg</pkg></flag>
+		<flag name="menuselection">adds support for menu hotkeys of double digits</flag>
+		<flag name="naludump">Removes NALU fill data from h.264-Streams of TS files</flag>
+		<flag name="permashift">permanent timeshift by recording live TV on hard disk, need plugin <pkg>media-plugins/vdr-permashift</pkg></flag>
+		<flag name="permashift_v1">permanent timeshift by recording live TV on RAM, need plugin &gt;=mediaplugins/vdr-permashift-1</flag>
+		<flag name="pinplugin">Support for <pkg>media-plugins/vdr-pin</pkg></flag>
+		<flag name="resumereset">rreset resume of EOF</flag>
+		<flag name="rotor">Enable support for plugin <pkg>media-plugins/vdr-rotor</pkg> for dish-positioner.</flag>
+		<flag name="ttxtsubs">support for <pkg>media-plugins/vdr-ttxtsubs</pkg></flag>
+		<flag name="vasarajanauloja">replacement for the liemikuutio patch, adds some nice must haves features</flag>
+		<flag name="wareagleicon">Replace original icon set in menu</flag>
+		<flag name="yaepg">Enables support for the vdr-yaepg plugin</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-video/vdr/vdr-2.0.6-r1.ebuild b/media-video/vdr/vdr-2.0.6-r1.ebuild
new file mode 100644
index 000000000000..63de150c12f6
--- /dev/null
+++ b/media-video/vdr/vdr-2.0.6-r1.ebuild
@@ -0,0 +1,277 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+# Switches supported by extensions-patch
+EXT_PATCH_FLAGS="alternatechannel ddepgentry dvlvidprefer graphtft
+	jumpplay jumpingseconds mainmenuhooks menuorg naludump permashift permashift_v1
+	pinplugin rotor ttxtsubs vasarajanauloja wareagleicon yaepg"
+
+# names of the use-flags
+EXT_PATCH_FLAGS_RENAMED=""
+
+# names ext-patch uses internally, here only used for maintainer checks
+EXT_PATCH_FLAGS_RENAMED_EXT_NAME=""
+
+IUSE="bidi debug html vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
+
+MY_PV="${PV%_p*}"
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+
+EXT_P="extpng-${P}-gentoo-edition-v6"
+
+DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
+HOMEPAGE="http://www.tvdr.de/"
+SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2"
+
+KEYWORDS="amd64 ~arm ~ppc x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+REQUIRED_USE="
+	permashift? ( !permashift_v1 )
+	permashift_v1? ( !permashift )"
+
+COMMON_DEPEND="virtual/jpeg:*
+	sys-libs/libcap
+	>=media-libs/fontconfig-2.4.2
+	>=media-libs/freetype-2"
+
+DEPEND="${COMMON_DEPEND}
+	>=virtual/linuxtv-dvb-headers-5.3
+	sys-devel/gettext"
+
+RDEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	>=media-tv/gentoo-vdr-scripts-2.5_rc1
+	media-fonts/corefonts
+	bidi? ( dev-libs/fribidi )"
+
+CONF_DIR=/etc/vdr
+CAP_FILE=${S}/capabilities.sh
+CAPS="# Capabilities of the vdr-executable for use by startscript etc."
+
+pkg_setup() {
+	use debug && append-flags -g
+
+	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
+
+	tc-export CC CXX AR
+}
+
+add_cap() {
+	local arg
+	for arg; do
+		CAPS="${CAPS}\n${arg}=1"
+	done
+}
+
+enable_patch() {
+	local arg ARG_UPPER
+	for arg; do
+		ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
+		echo "${ARG_UPPER} = 1" >> Make.config
+
+		# codesnippet to bring the extpng defines into the vdr.pc CXXFLAGS CFLAGS
+		echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp
+		cat "${T}"/defines.tmp | tr \\\012 ' '  > "${T}"/defines.IUSE
+		export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
+	done
+}
+
+extensions_add_make_conf()
+{
+	# copy all ifdef for extensions-patch to Make.config
+	sed -e '1,/need to touch the following:/d' \
+		-e '/need to touch the following/,/^$/d' \
+		Make.config.template >> Make.config
+}
+
+extensions_all_defines() {
+	# extract all possible settings for extensions-patch
+	sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
+		Make.config.template \
+		| sort \
+		| tr '[:upper:]' '[:lower:]'
+}
+
+lang_po() {
+	LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
+}
+
+src_prepare() {
+	# apply maintainace-patches
+	ebegin "Changing paths for gentoo"
+
+	local DVBDIR=/usr/include
+	local i
+	for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
+		[[ -d ${i} ]] || continue
+		if [[ -f ${i}/linux/dvb/dmx.h ]]; then
+			einfo "Found DVB header files in ${i}"
+			DVBDIR=${i}
+			break
+		fi
+	done
+
+	# checking for s2api headers
+	local api_version
+	api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
+	api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
+
+	if [[ ${api_version:-0} -lt 5*3 ]]; then
+		eerror "DVB header files do not contain s2api support or too old for ${P}"
+		eerror "You cannot compile VDR against old dvb-header"
+		die "DVB headers too old"
+	fi
+
+	cat > Make.config <<-EOT
+		#
+		# Generated by ebuild ${PF}
+		#
+		PREFIX			= /usr
+		DVBDIR			= ${DVBDIR}
+		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
+		CONFDIR			= ${CONF_DIR}
+		VIDEODIR		= /var/vdr/video
+		LOCDIR			= \$(PREFIX)/share/locale
+		INCDIR			= \$(PREFIX)/include
+
+		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
+		INCLUDES		+= -I\$(DVBDIR)
+
+		# >=vdr-1.7.36-r1; parameter only used for compiletime on vdr
+		# PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new)
+		LIBDIR			= ${PLUGIN_LIBDIR}
+		PCDIR			= /usr/$(get_libdir)/pkgconfig
+	EOT
+	eend 0
+
+	# support languages, written from right to left
+	BUILD_PARAMS+=" BIDI=$(usex bidi 1 0)"
+
+	epatch "${FILESDIR}/${PN}-2.0.6_gentoo.patch"
+
+	if ! use vanilla; then
+
+		# Now apply extensions patch
+		epatch "${WORKDIR}/${EXT_P}.patch"
+
+		# This allows us to start even if some plugin does not exist
+		# or is not loadable.
+		enable_patch PLUGINMISSING
+		enable_patch CHANNELBIND
+
+		if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
+			einfo "Doing maintainer checks:"
+
+			# we do not support these patches
+			# (or have them already hard enabled)
+			local IGNORE_PATCHES="pluginmissing  channelbind"
+
+			extensions_all_defines > "${T}"/new.IUSE
+			echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
+					$IGNORE_PATCHES | \
+				tr ' ' '\n' |sort > "${T}"/old.IUSE
+			local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
+			if [[ -z ${DIFFS} ]]; then
+				einfo "EXT_PATCH_FLAGS is up to date."
+			else
+				ewarn "IUSE differences!"
+				local diff
+				for diff in $DIFFS; do
+					ewarn "$diff"
+				done
+			fi
+		fi
+
+		ebegin "Enabling selected patches"
+		local flag
+		for flag in $EXT_PATCH_FLAGS; do
+			use $flag && enable_patch ${flag}
+		done
+
+		eend 0
+
+		extensions_add_make_conf
+
+		# add defined use-flags compile options to vdr.pc
+		sed -e "s:\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR):\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR) \$(DEFINES_IUSE):" \
+			-i Makefile
+
+		ebegin "Make depend"
+		emake .dependencies >/dev/null
+		eend $? "make depend failed"
+	fi
+
+	epatch_user
+
+	add_cap CAP_UTF8
+
+	add_cap CAP_IRCTRL_RUNTIME_PARAM \
+			CAP_VFAT_RUNTIME_PARAM \
+			CAP_CHUID \
+			CAP_SHUTDOWN_AUTO_RETRY
+
+	echo -e ${CAPS} > "${CAP_FILE}"
+
+	# LINGUAS support
+	einfo "\n \t VDR supports the LINGUAS values"
+
+	lang_po
+
+	einfo "\t Please set one of this values in your sytem make.conf"
+	einfo "\t LINGUAS=\"${LING_PO}\"\n"
+
+	if [[ -z ${LINGUAS} ]]; then
+		einfo "\n \t No values in LINGUAS="
+		einfo "\t You will get only english text on OSD \n"
+	fi
+
+	strip-linguas ${LING_PO} en
+}
+
+src_install() {
+#	# trick makefile not to create a videodir by supplying it with an existing
+#	# directory
+	emake \
+	VIDEODIR="/" \
+	DESTDIR="${D}" install || die "emake install failed"
+
+	keepdir "${PLUGIN_LIBDIR}"
+
+	keepdir "${CONF_DIR}"/plugins
+	keepdir "${CONF_DIR}"/themes
+
+	if use html; then
+		dohtml *.html
+	fi
+
+	dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
+
+	insinto /usr/share/vdr
+	doins "${CAP_FILE}"
+
+	if use alternatechannel; then
+		insinto /etc/vdr
+		doins "${FILESDIR}"/channel_alternative.conf
+	fi
+
+	chown -R vdr:vdr "${D}/${CONF_DIR}"
+}
+
+pkg_postinst() {
+	elog "It is a good idea to run vdrplugin-rebuild now."
+
+	elog "To get nice symbols in OSD we recommend to install"
+	elog "\t1. emerge media-fonts/vdrsymbols-ttf"
+	elog "\t2. select font VDRSymbolsSans in Setup"
+	elog ""
+	elog "To get an idea how to proceed now, have a look at our vdr-guide:"
+	elog "\thttps://wiki.gentoo.org/wiki/VDR"
+}
diff --git a/media-video/vdr/vdr-2.0.7.ebuild b/media-video/vdr/vdr-2.0.7.ebuild
new file mode 100644
index 000000000000..f5d9d5ed815d
--- /dev/null
+++ b/media-video/vdr/vdr-2.0.7.ebuild
@@ -0,0 +1,288 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+# Switches supported by extensions-patch
+EXT_PATCH_FLAGS="alternatechannel ddepgentry dvlvidprefer graphtft
+	jumpplay jumpingseconds mainmenuhooks menuorg naludump permashift permashift_v1
+	pinplugin rotor ttxtsubs vasarajanauloja wareagleicon yaepg"
+
+# names of the use-flags
+EXT_PATCH_FLAGS_RENAMED=""
+
+# names ext-patch uses internally, here only used for maintainer checks
+EXT_PATCH_FLAGS_RENAMED_EXT_NAME=""
+
+IUSE="bidi debug html systemd vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
+
+MY_PV="${PV%_p*}"
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+
+EXT_P="extpng-${PN}-2.0.6-gentoo-edition-v6"
+
+DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
+HOMEPAGE="http://www.tvdr.de/"
+SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2"
+
+KEYWORDS="~arm ~amd64 ~ppc ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+REQUIRED_USE="
+	permashift? ( !permashift_v1 )
+	permashift_v1? ( !permashift )"
+
+COMMON_DEPEND="virtual/jpeg:*
+	sys-libs/libcap
+	>=media-libs/fontconfig-2.4.2
+	>=media-libs/freetype-2"
+
+DEPEND="${COMMON_DEPEND}
+	>=virtual/linuxtv-dvb-headers-5.3
+	sys-devel/gettext"
+
+RDEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	>=media-tv/gentoo-vdr-scripts-2.5
+	media-fonts/corefonts
+	bidi? ( dev-libs/fribidi )
+	systemd? ( sys-apps/systemd )"
+
+CONF_DIR=/etc/vdr
+CAP_FILE=${S}/capabilities.sh
+CAPS="# Capabilities of the vdr-executable for use by startscript etc."
+
+pkg_setup() {
+	use debug && append-flags -g
+
+	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
+
+	tc-export CC CXX AR
+}
+
+add_cap() {
+	local arg
+	for arg; do
+		CAPS="${CAPS}\n${arg}=1"
+	done
+}
+
+enable_patch() {
+	local arg ARG_UPPER
+	for arg; do
+		ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
+		echo "${ARG_UPPER} = 1" >> Make.config
+
+		# codesnippet to bring the extpng defines into the vdr.pc CXXFLAGS CFLAGS
+		echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp
+		cat "${T}"/defines.tmp | tr \\\012 ' '  > "${T}"/defines.IUSE
+		export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
+	done
+}
+
+extensions_add_make_conf()
+{
+	# copy all ifdef for extensions-patch to Make.config
+	sed -e '1,/need to touch the following:/d' \
+		-e '/need to touch the following/,/^$/d' \
+		Make.config.template >> Make.config
+}
+
+extensions_all_defines() {
+	# extract all possible settings for extensions-patch
+	sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
+		Make.config.template \
+		| sort \
+		| tr '[:upper:]' '[:lower:]'
+}
+
+lang_po() {
+	LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
+}
+
+src_prepare() {
+	# apply maintainace-patches
+	ebegin "Changing paths for gentoo"
+
+	local DVBDIR=/usr/include
+	local i
+	for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
+		[[ -d ${i} ]] || continue
+		if [[ -f ${i}/linux/dvb/dmx.h ]]; then
+			einfo "Found DVB header files in ${i}"
+			DVBDIR=${i}
+			break
+		fi
+	done
+
+	# checking for s2api headers
+	local api_version
+	api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
+	api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
+
+	if [[ ${api_version:-0} -lt 5*3 ]]; then
+		eerror "DVB header files do not contain s2api support or too old for ${P}"
+		eerror "You cannot compile VDR against old dvb-header"
+		die "DVB headers too old"
+	fi
+
+	cat > Make.config <<-EOT
+		#
+		# Generated by ebuild ${PF}
+		#
+		PREFIX			= /usr
+		DVBDIR			= ${DVBDIR}
+		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
+		CONFDIR			= ${CONF_DIR}
+		VIDEODIR		= /var/vdr/video
+		LOCDIR			= \$(PREFIX)/share/locale
+		INCDIR			= \$(PREFIX)/include
+
+		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
+		INCLUDES		+= -I\$(DVBDIR)
+
+		# >=vdr-1.7.36-r1; parameter only used for compiletime on vdr
+		# PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new)
+		LIBDIR			= ${PLUGIN_LIBDIR}
+		PCDIR			= /usr/$(get_libdir)/pkgconfig
+	EOT
+	eend 0
+
+	# support languages, written from right to left
+	BUILD_PARAMS+=" BIDI=$(usex bidi 1 0)"
+
+	# systemd support
+	use systemd && BUILD_PARAMS+=" SDNOTIFY=$(usex systemd 1 0)"
+
+	if ! use vanilla; then
+
+		# Now apply extensions patch
+		epatch "${WORKDIR}/${EXT_P}.patch"
+
+		# This allows us to start even if some plugin does not exist
+		# or is not loadable.
+		enable_patch PLUGINMISSING
+		enable_patch CHANNELBIND
+
+		if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
+			einfo "Doing maintainer checks:"
+
+			# we do not support these patches
+			# (or have them already hard enabled)
+			local IGNORE_PATCHES="pluginmissing  channelbind"
+
+			extensions_all_defines > "${T}"/new.IUSE
+			echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
+					$IGNORE_PATCHES | \
+				tr ' ' '\n' |sort > "${T}"/old.IUSE
+			local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
+			if [[ -z ${DIFFS} ]]; then
+				einfo "EXT_PATCH_FLAGS is up to date."
+			else
+				ewarn "IUSE differences!"
+				local diff
+				for diff in $DIFFS; do
+					ewarn "$diff"
+				done
+			fi
+		fi
+
+		ebegin "Enabling selected patches"
+		local flag
+		for flag in $EXT_PATCH_FLAGS; do
+			use $flag && enable_patch ${flag}
+		done
+
+		eend 0
+
+		extensions_add_make_conf
+
+		# add defined use-flags compile options to vdr.pc
+		sed -e "s:\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR):\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR) \$(DEFINES_IUSE):" \
+			-i Makefile
+
+		ebegin "Make depend"
+		emake .dependencies >/dev/null
+		eend $? "make depend failed"
+	fi
+
+	epatch "${FILESDIR}/${PN}-2.0.6-r2_gentoo.patch"
+
+	# backport from vdr-2.1.7 for better systemd support
+	if use vanilla; then
+		epatch "${FILESDIR}/${P}_systemd_argsdir_vanilla.patch"
+	else
+		epatch "${FILESDIR}/${P}_systemd_argsdir.patch"
+	fi
+
+	epatch_user
+
+	add_cap CAP_UTF8
+
+	add_cap CAP_IRCTRL_RUNTIME_PARAM \
+			CAP_VFAT_RUNTIME_PARAM \
+			CAP_CHUID \
+			CAP_SHUTDOWN_AUTO_RETRY
+
+	echo -e ${CAPS} > "${CAP_FILE}"
+
+	# LINGUAS support
+	einfo "\n \t VDR supports the LINGUAS values"
+
+	lang_po
+
+	einfo "\t Please set one of this values in your sytem make.conf"
+	einfo "\t LINGUAS=\"${LING_PO}\"\n"
+
+	if [[ -z ${LINGUAS} ]]; then
+		einfo "\n \t No values in LINGUAS="
+		einfo "\t You will get only english text on OSD \n"
+	fi
+
+	strip-linguas ${LING_PO} en
+}
+
+src_install() {
+#	# trick makefile not to create a videodir by supplying it with an existing
+#	# directory
+	emake \
+	VIDEODIR="/" \
+	DESTDIR="${D}" install || die "emake install failed"
+
+	keepdir "${PLUGIN_LIBDIR}"
+
+	# backup for plugins they don't be able to create this dir
+	keepdir "${CONF_DIR}"/plugins
+
+	if use html; then
+		dohtml *.html
+	fi
+
+	dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
+
+	insinto /usr/share/vdr
+	doins "${CAP_FILE}"
+
+	if use alternatechannel; then
+		insinto /etc/vdr
+		doins "${FILESDIR}"/channel_alternative.conf
+	fi
+
+	chown -R vdr:vdr "${D}/${CONF_DIR}"
+}
+
+pkg_postinst() {
+	elog "It is a good idea to run vdrplugin-rebuild now."
+
+	elog "To get nice symbols in OSD we recommend to install"
+	elog "\t1. emerge media-fonts/vdrsymbols-ttf"
+	elog "\t2. select font VDRSymbolsSans in Setup"
+	elog ""
+	elog "To get an idea how to proceed now, have a look at our vdr-guide:"
+	elog "\thttps://wiki.gentoo.org/wiki/VDR"
+}
diff --git a/media-video/vdr/vdr-2.2.0-r1.ebuild b/media-video/vdr/vdr-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..ce73df6b100e
--- /dev/null
+++ b/media-video/vdr/vdr-2.2.0-r1.ebuild
@@ -0,0 +1,299 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+#inherit eutils flag-o-matic multilib toolchain-funcs
+inherit flag-o-matic toolchain-funcs
+
+# Switches supported by extensions-patch
+EXT_PATCH_FLAGS="alternatechannel graphtft naludump permashift_v1 pinplugin
+				mainmenuhooks menuorg menuselection resumereset ttxtsubs"
+
+# names of the use-flags
+EXT_PATCH_FLAGS_RENAMED=""
+
+# names ext-patch uses internally, here only used for maintainer checks
+EXT_PATCH_FLAGS_RENAMED_EXT_NAME="bidi no_kbd sdnotify"
+
+IUSE="bidi debug +kbd html systemd vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
+
+MY_PV="${PV%_p*}"
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+
+EXT_P="extpng-${P}-gentoo-edition-v1"
+
+DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
+HOMEPAGE="http://www.tvdr.de/"
+SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2"
+
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+COMMON_DEPEND="virtual/jpeg:*
+	sys-libs/libcap
+	>=media-libs/fontconfig-2.4.2
+	>=media-libs/freetype-2"
+
+DEPEND="${COMMON_DEPEND}
+	>=virtual/linuxtv-dvb-headers-5.3
+	sys-devel/gettext"
+
+RDEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	>=media-tv/gentoo-vdr-scripts-2.7
+	media-fonts/corefonts
+	bidi? ( dev-libs/fribidi )
+	systemd? ( sys-apps/systemd )"
+
+CONF_DIR=/etc/vdr
+CAP_FILE=${S}/capabilities.sh
+CAPS="# Capabilities of the vdr-executable for use by startscript etc."
+
+pkg_setup() {
+
+	use debug && append-flags -g
+
+	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
+
+	tc-export CC CXX AR
+}
+
+add_cap() {
+	local arg
+	for arg; do
+		CAPS="${CAPS}\n${arg}=1"
+	done
+}
+
+enable_patch() {
+	local arg ARG_UPPER
+	for arg; do
+		ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
+		echo "${ARG_UPPER} = 1" >> Make.config
+
+		# codesnippet to bring the extpng defines into the vdr.pc CXXFLAGS CFLAGS
+		echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp
+		cat "${T}"/defines.tmp | tr \\\012 ' '  > "${T}"/defines.IUSE
+		export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
+	done
+}
+
+extensions_add_make_conf()
+{
+	# copy all ifdef for extensions-patch to Make.config
+	sed -e '1,/need to touch the following:/d' \
+		-e '/need to touch the following/,/^$/d' \
+		Make.config.template >> Make.config
+}
+
+extensions_all_defines() {
+	# extract all possible settings for extensions-patch
+	sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
+		Make.config.template \
+		| sort \
+		| tr '[:upper:]' '[:lower:]'
+}
+
+lang_po() {
+	LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
+}
+
+src_configure() {
+	# support languages, written from right to left
+	export "BIDI=$(usex bidi 1 0)"
+	# systemd notification support
+	export "SDNOTIFY=$(usex systemd 1 0)"
+	# with/without keyboard
+	export "USE_KBD=$(usex kbd 1 0)"
+}
+
+src_prepare() {
+	# apply maintainace-patches
+	ebegin "Changing paths for gentoo"
+
+	local DVBDIR=/usr/include
+	local i
+	for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
+		[[ -d ${i} ]] || continue
+		if [[ -f ${i}/linux/dvb/dmx.h ]]; then
+			einfo "Found DVB header files in ${i}"
+			DVBDIR=${i}
+			break
+		fi
+	done
+
+	# checking for s2api headers
+	local api_version
+	api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
+	api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
+
+	if [[ ${api_version:-0} -lt 5*3 ]]; then
+		eerror "DVB header files do not contain s2api support or too old for ${P}"
+		eerror "You cannot compile VDR against old dvb-header"
+		die "DVB headers too old"
+	fi
+
+	cat > Make.config <<-EOT
+		#
+		# Generated by ebuild ${PF}
+		#
+		PREFIX			= /usr
+		DVBDIR			= ${DVBDIR}
+		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
+		CONFDIR			= ${CONF_DIR}
+		VIDEODIR		= /var/vdr/video
+		LOCDIR			= \$(PREFIX)/share/locale
+		INCDIR			= \$(PREFIX)/include
+
+		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
+		INCLUDES		+= -I\$(DVBDIR)
+
+		# >=vdr-1.7.36-r1; parameter only used for compiletime on vdr
+		# PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new)
+		LIBDIR			= ${PLUGIN_LIBDIR}
+		PCDIR			= /usr/$(get_libdir)/pkgconfig
+
+	EOT
+	eend 0
+
+	# wrt bug 586070
+	if has_version ">=sys-apps/systemd-230"; then
+		sed -e "s:libsystemd-daemon:libsystemd:g" -i Makefile || die "sed libsystemd failed"
+	fi
+
+	if ! use vanilla; then
+
+		# Now apply extensions patch
+		eapply "${WORKDIR}/${EXT_P}.patch"
+
+		# This allows us to start even if some plugin does not exist
+		# or is not loadable.
+		enable_patch PLUGINMISSING
+
+		if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
+			einfo "Doing maintainer checks:"
+
+			# we do not support these patches
+			# (or have them already hard enabled)
+			local IGNORE_PATCHES="pluginmissing"
+
+			extensions_all_defines > "${T}"/new.IUSE
+			echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
+					$IGNORE_PATCHES | \
+				tr ' ' '\n' |sort > "${T}"/old.IUSE
+			local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
+			if [[ -z ${DIFFS} ]]; then
+				einfo "EXT_PATCH_FLAGS is up to date."
+			else
+				ewarn "IUSE differences!"
+				local diff
+				for diff in $DIFFS; do
+					ewarn "$diff"
+				done
+			fi
+		fi
+
+		ebegin "Enabling selected patches"
+		local flag
+		for flag in $EXT_PATCH_FLAGS; do
+			use $flag && enable_patch ${flag}
+		done
+
+		eend 0
+
+		extensions_add_make_conf
+
+		# add defined use-flags compile options to vdr.pc
+		sed -e "s:\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR):\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR) \$(DEFINES_IUSE):" \
+			-i Makefile
+
+		ebegin "Make depend"
+		emake .dependencies >/dev/null
+		eend $? "make depend failed"
+	fi
+
+	eapply "${FILESDIR}/${P}_gentoo.patch"
+
+	# fix some makefile issues
+	sed -e "s:ifndef NO_KBD:ifeq (\$(USE_KBD),1):" \
+		-e "s:ifdef BIDI:ifeq (\$(BIDI),1):" \
+		-e "s:ifdef SDNOTIFY:ifeq (\$(SDNOTIFY),1):" \
+		-i "${S}"/Makefile
+
+	eapply_user
+
+	add_cap CAP_UTF8
+
+	add_cap CAP_IRCTRL_RUNTIME_PARAM \
+			CAP_VFAT_RUNTIME_PARAM \
+			CAP_CHUID \
+			CAP_SHUTDOWN_AUTO_RETRY
+
+	echo -e ${CAPS} > "${CAP_FILE}"
+
+	# LINGUAS support
+	einfo "\n \t VDR supports the LINGUAS values"
+
+	lang_po
+
+	einfo "\t Please set one of this values in your sytem make.conf"
+	einfo "\t LINGUAS=\"${LING_PO}\"\n"
+
+	if [[ -z ${LINGUAS} ]]; then
+		einfo "\n \t No values in LINGUAS="
+		einfo "\t You will get only english text on OSD \n"
+	fi
+
+	strip-linguas ${LING_PO} en
+}
+
+src_install() {
+	# trick makefile not to create a videodir by supplying it with an existing
+	# directory
+	emake install \
+	VIDEODIR="/" \
+	DESTDIR="${D}" install || die "emake install failed"
+
+	keepdir "${PLUGIN_LIBDIR}"
+
+	# backup for plugins they don't be able to create this dir
+	keepdir "${CONF_DIR}"/plugins
+
+	if use html; then
+		local HTML_DOCS=( *.html )
+	fi
+
+	local DOCS=( MANUAL INSTALL README* HISTORY CONTRIBUTORS )
+
+	einstalldocs
+
+	insinto /usr/share/vdr
+	doins "${CAP_FILE}"
+
+	if use alternatechannel; then
+		insinto /etc/vdr
+		doins "${FILESDIR}"/channel_alternative.conf
+	fi
+
+	chown -R vdr:vdr "${D}/${CONF_DIR}"
+}
+
+pkg_postinst() {
+
+	elog "\n\t---- 15 YEARS ANNIVERSARY EDITON ----\n"
+	elog "\tA lot of thanks to Klaus Schmidinger"
+	elog "\tfor this nice piece of Software...\n"
+
+	elog "It is a good idea to run vdrplugin-rebuild now."
+
+	elog "To get nice symbols in OSD we recommend to install"
+	elog "\t1. emerge media-fonts/vdrsymbols-ttf"
+	elog "\t2. select font VDRSymbolsSans in Setup"
+	elog ""
+	elog "To get an idea how to proceed now, have a look at our vdr-guide:"
+	elog "\thttps://wiki.gentoo.org/wiki/VDR"
+}
diff --git a/media-video/vdr2jpeg/Manifest b/media-video/vdr2jpeg/Manifest
new file mode 100644
index 000000000000..e4c79e9c0867
--- /dev/null
+++ b/media-video/vdr2jpeg/Manifest
@@ -0,0 +1,10 @@
+AUX vdr2jpeg-0.1.9-ffmpeg.patch 13036 SHA256 7e476ffb59c6ee464360ec8ad02413da5b0d4adc7959a6ea568c4ecd121cfef3 SHA512 0a7d261dffe1960bb69366b0645b0f5543a2ee82f821f34b3d70606689e971e29981ea5888870e0de9515da5e7419f6a919fc9ac9d82043cff587f0399de1070 WHIRLPOOL a0af8389c08cc6b8f79849ace9e41e5abe59812a27e3b12a0f4a7eabaa074a21ba24c5200bbc719a0cc6f2503e26ba7b2ec330ce6bfec301050b63141d778b3a
+AUX vdr2jpeg-0.1.9-ffmpeg1.patch 8787 SHA256 4865aa2d9a9df25edee5dd270beeb9b0575360239a0720ce0bf346e52880d49a SHA512 d7ab3a5d5dff70d914036da98c42fa6931e71f54b88580bcfac84a81a2c256811d8c59e25b55e3bf3f2cfed1d6c3997c68e24b81b9d5ac7bc0c13b97693a5ee3 WHIRLPOOL 2b70797f0b25dc52e07e397d8217105d860f279106c37c4b42c365c27394773d27272fc5fe8f383b1db64597d44d5bedaea7c0d88980a615d59daab165265b88
+AUX vdr2jpeg-0.1.9-libav9.patch 2072 SHA256 aa491d377f6773faec0b42f2a7304af326ccde4bd13dcab85d10eb216020c65e SHA512 d8122499f7f5db79f359bd38801fcc3b72b9ddce1305a854260d40d6f55e2162fb1a23b2a8acd3902c3a93aab1ee66bce418fcd6f5ad72363d98c4bf5f68400a WHIRLPOOL d911dabc8f4a37a80d1d8acfeb10b19a547364235a60b066d2a7e020056aa078d0f51fe5cbdece0a9c385d4212bfce43e3afa6dd9fb020e50f3218ca11b9705d
+DIST vdr2jpeg-0.1.9.tgz 31160 SHA256 869250e411def669aa89170ceff6bfbfd08c522bee9a8967799b4af60010ea79 SHA512 e2309fd08591d5efa08246c2ecde70811036ea293e21f7e5ae989af5acef5e795216cbc31455d2f0b65de575a876863efe55ddf4397ab4eadf3d67a627579d99 WHIRLPOOL 1009060f15563d1b0c4d75f2e965f188efcc021cb28a12a7750096b2aa32e5d83fc8601b6246f29c35f87df39b1cf64f34be180b13275442a80d38301a3e03b1
+DIST vdr2jpeg-0.2.0.tgz 20027 SHA256 988f19c5d84e345ad5cc2beab55570d340495c54b507d83ff0b9c5d3e01e7356 SHA512 65f3e0acb2ecd3a5341e527c45fafd454266841f1369c89b10750fce86f2326fba76329abd17a05d67aea3b43a7b1299a49cfa9eee9a784bb99c940253ca5952 WHIRLPOOL 614ddabbbac0306aaa2c0d16e06b2407b646ab08f4fae22913c875954ccad48c4c237d0a04391bb003561c28a7b95175548ebd45cb25d41dfce611985dc1bd93
+EBUILD vdr2jpeg-0.1.9-r1.ebuild 914 SHA256 fe2d25c2d1f7599361b19e4867c5e9e65fdc69b6fc9ea90c85bda8b04067e325 SHA512 9d3ede8b7280006d7b0ea2dce6c852369fd6a181814492c59c431c54e4efceffe9a2147613f6ddad817ab3627f9d9bb73004088e936c2305f0377a89ef81f6c7 WHIRLPOOL 23bb3046dfefbd34febc9f3f5a127d4c032264deeb217c8cff6acecfabf2765a84bea2258a2d30fa84fb82c93513e5f7a04605a47eec14bb12d34dc2ec7f1f67
+EBUILD vdr2jpeg-0.2.0.ebuild 895 SHA256 d6ba9fe53c16bf2408f2b14dc314f29ede48be07bbe85de7c5370141e4af80c0 SHA512 b3fd37a96098a49770a7109671d30abc1866b227bc541072281805fcdbe931bef70429fa56cac0db1e212e33d79412a5c04389d361974ae947e88fc45c84e6fc WHIRLPOOL 55ab73d194309ea250c422183e3fb63baa8628c6f98478d1e55dab1b59afd92772204f323941e464684ea6d53a11e61d5b6deba441403073daaf9b77283f9f27
+MISC ChangeLog 2641 SHA256 82a3c16b502dc2751836d61652e108a9ef62cdbac8cbe393d534ec823b57c556 SHA512 7f789a13381bbc63a92b7132d64b3a9233f531cf37300916dd26bf5f1dc7e8d9e85a0e601bdd38c7d647176e76e5a7860eb421df3749742c5d2d4d9f523bef5c WHIRLPOOL 68ea3f4bdcae09a2b0aea3ade4a22805419dade0dcd85cb4ef8b81185c5b99e546e18c4fda0826fbaa3cdcb1ef3a03f662a8564e92f3353357e9d5da3ff7daba
+MISC ChangeLog-2015 5946 SHA256 875d221e44b6bed5916d7c01918083066b845743cef232356c0a9e7c36a16bf9 SHA512 d82de7095fae325d599983165e5250675681e9abf232cf39457227d353eafa30dced614d1fbab55f2fb9a2a8de4fa071181b1153bf7e138dfb363eb7ff280079 WHIRLPOOL 392364aee7506b51eb2ad8fec0821acb5297f88b0b1a65164528c8824e028a4018ba570d768cd237aba525f91497e91d658c22ed7999108d6c3111ff800938c4
+MISC metadata.xml 536 SHA256 6887812e44b287a4b1c19f78c314e8e6190b488dd0a949d6e182579fe530674f SHA512 5e6be6b01884093e88882c9e6809c2c9d09434eec99ed2b88df9b008a01539847c48db59979fe5273699c792c732361477848ab6f7a891ce2c7ae69adcc3731a WHIRLPOOL 264eb5176334be49c084946953a446a30d46c44af0351ece77d36b34023da3653c1e6baabca077c0484bbf5f3b7435e92c3647a8bf03ddb8a1e68878997f32e8
diff --git a/media-video/vdr2jpeg/files/vdr2jpeg-0.1.9-ffmpeg.patch b/media-video/vdr2jpeg/files/vdr2jpeg-0.1.9-ffmpeg.patch
new file mode 100644
index 000000000000..549a6c8f60ee
--- /dev/null
+++ b/media-video/vdr2jpeg/files/vdr2jpeg-0.1.9-ffmpeg.patch
@@ -0,0 +1,326 @@
+diff -urN vdr2jpeg-0.1.9.old/ffm.cpp vdr2jpeg-0.1.9/ffm.cpp
+--- vdr2jpeg-0.1.9.old/ffm.cpp	2012-04-21 09:53:26.727892390 +0200
++++ vdr2jpeg-0.1.9/ffm.cpp	2012-04-21 09:57:25.555890271 +0200
+@@ -21,6 +21,7 @@
+ 
+ extern "C" {
+ #include <libavutil/avutil.h>
++#include <libavutil/mathematics.h>
+ #include <libavcodec/avcodec.h>
+ #include <libavformat/avformat.h>
+ #include <libswscale/swscale.h>
+@@ -185,7 +186,7 @@
+     }else
+         ost->sync_opts= lrintf(get_sync_ipts(ost) / av_q2d(enc->time_base));
+ 
+-    nb_frames= FFMIN(nb_frames, max_frames[CODEC_TYPE_VIDEO] - ost->frame_number);
++    nb_frames= FFMIN(nb_frames, max_frames[AVMEDIA_TYPE_VIDEO] - ost->frame_number);
+     if (nb_frames <= 0)
+         return true;
+ 
+@@ -221,7 +222,7 @@
+             if(dec->coded_frame && enc->coded_frame->pts != AV_NOPTS_VALUE)
+                 pkt.pts= av_rescale_q(enc->coded_frame->pts, enc->time_base, ost->st->time_base);
+             if(dec->coded_frame && dec->coded_frame->key_frame)
+-                pkt.flags |= PKT_FLAG_KEY;
++                pkt.flags |= AV_PKT_FLAG_KEY;
+ 
+             av_interleaved_write_frame(s, &pkt);
+             enc->coded_frame = old_frame;
+@@ -245,7 +246,7 @@
+                 big_picture.quality = (int)ist->st->quality;
+             }else
+                 big_picture.quality = (int)ost->st->quality;
+-                big_picture.pict_type = 0;
++                big_picture.pict_type = (AVPictureType) 0;
+ //            big_picture.pts = AV_NOPTS_VALUE;
+             big_picture.pts= ost->sync_opts;
+ //            big_picture.pts= av_rescale(ost->sync_opts, AV_TIME_BASE*(int64_t)enc->time_base.num, enc->time_base.den);
+@@ -268,7 +269,7 @@
+    pkt.dts != AV_NOPTS_VALUE ? av_rescale(pkt.dts, enc->time_base.den, AV_TIME_BASE*(int64_t)enc->time_base.num) : -1);*/
+ 
+                 if(enc->coded_frame && enc->coded_frame->key_frame)
+-                    pkt.flags |= PKT_FLAG_KEY;
++                    pkt.flags |= AV_PKT_FLAG_KEY;
+                 av_interleaved_write_frame(s, &pkt);
+                 *frame_size = ret;
+             }
+@@ -316,13 +317,17 @@
+         data_size = 0;
+         if (ist->decoding_needed) {
+             switch(ist->st->codec->codec_type) {
+-            case CODEC_TYPE_VIDEO:
++            case AVMEDIA_TYPE_VIDEO:
+                     data_size = (ist->st->codec->width * ist->st->codec->height * 3) / 2;
+                     /* XXX: allocate picture correctly */
+                     avcodec_get_frame_defaults(&picture);
++		    AVPacket pkt;
++		    av_init_packet( &pkt );
++		    pkt.data = ptr;
++		    pkt.size = len;
+ 
+-                    ret = avcodec_decode_video(ist->st->codec,
+-                                               &picture, &got_picture, ptr, len);
++                    ret = avcodec_decode_video2(ist->st->codec,
++                                               &picture, &got_picture, &pkt);
+                     ist->st->quality= picture.quality;
+                     if (ret < 0)
+                         goto fail_decode;
+@@ -341,7 +346,7 @@
+                 goto fail_decode;
+             }
+         } else {
+-            if(ist->st->codec->codec_type == CODEC_TYPE_VIDEO) {
++            if(ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
+                 if (ist->st->codec->time_base.num != 0) {
+                     ist->next_pts += ((int64_t)AV_TIME_BASE *
+                                       ist->st->codec->time_base.num) /
+@@ -354,16 +359,6 @@
+             len = 0;
+         }
+ 
+-        /* frame rate emulation */
+-        if (ist->st->codec->rate_emu) {
+-            int64_t pts = av_rescale((int64_t) ist->frame * ist->st->codec->time_base.num, 1000000, ist->st->codec->time_base.den);
+-            int64_t now = av_gettime() - ist->start;
+-            if (pts > now)
+-                usleep(pts - now);
+-
+-            ist->frame++;
+-        }
+-
+ #if 0
+         /* mpeg PTS deordering : if it is a P or I frame, the PTS
+            is the one of the next displayed one */
+@@ -398,7 +393,7 @@
+ 
+                     if (ost->encoding_needed) {
+                         switch(ost->st->codec->codec_type) {
+-                        case CODEC_TYPE_VIDEO:
++                        case AVMEDIA_TYPE_VIDEO:
+                             if(!do_video_out(os, ost, ist, &picture, &frame_size))
+                                return -1;
+                             break;
+@@ -415,9 +410,9 @@
+ 
+                         avcodec_get_frame_defaults(&avframe);
+                         ost->st->codec->coded_frame= &avframe;
+-                        avframe.key_frame = pkt->flags & PKT_FLAG_KEY;
++                        avframe.key_frame = pkt->flags & AV_PKT_FLAG_KEY;
+ 
+-                        if (ost->st->codec->codec_type == CODEC_TYPE_VIDEO) {
++                        if (ost->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
+                             ost->sync_opts++;
+                         }
+ 
+@@ -438,7 +433,7 @@
+                         opkt.flags= pkt->flags;
+ 
+                         //FIXME remove the following 2 lines they shall be replaced by the bitstream filters
+-                        if(av_parser_change(ist->st->parser, ost->st->codec, &opkt.data, &opkt.size, data_buf, data_size, pkt->flags & PKT_FLAG_KEY))
++                        if(av_parser_change(ist->st->parser, ost->st->codec, &opkt.data, &opkt.size, data_buf, data_size, pkt->flags & AV_PKT_FLAG_KEY))
+                             opkt.destruct= av_destruct_packet;
+ 
+                         av_interleaved_write_frame(os, &opkt);
+@@ -459,7 +454,7 @@
+                 AVCodecContext *enc= ost->st->codec;
+                 os = output_files[ost->file_index];
+ 
+-                if(ost->st->codec->codec_type == CODEC_TYPE_VIDEO && (os->oformat->flags & AVFMT_RAWPICTURE))
++                if(ost->st->codec->codec_type == AVMEDIA_TYPE_VIDEO && (os->oformat->flags & AVFMT_RAWPICTURE))
+                     continue;
+ 
+                 if (ost->encoding_needed) {
+@@ -469,10 +464,10 @@
+                         pkt.stream_index= ost->index;
+ 
+                         switch(ost->st->codec->codec_type) {
+-                        case CODEC_TYPE_VIDEO:
++                        case AVMEDIA_TYPE_VIDEO:
+                             ret = avcodec_encode_video(enc, bit_buffer, bit_buffer_size, NULL);
+                             if(enc->coded_frame && enc->coded_frame->key_frame)
+-                                pkt.flags |= PKT_FLAG_KEY;
++                                pkt.flags |= AV_PKT_FLAG_KEY;
+                             break;
+                         default:
+                             ret=-1;
+@@ -547,11 +542,6 @@
+             ist->index = k;
+             ist->discard = 1; /* the stream is discarded by default
+                                  (changed later) */
+-
+-            if (ist->st->codec->rate_emu) {
+-                ist->start = av_gettime();
+-                ist->frame = 0;
+-            }
+         }
+     }
+ 
+@@ -641,20 +631,20 @@
+             else
+                 codec->time_base = ist->st->time_base;
+             switch(codec->codec_type) {
+-            case CODEC_TYPE_VIDEO:
++            case AVMEDIA_TYPE_VIDEO:
+                 codec->pix_fmt = icodec->pix_fmt;
+                 codec->width = icodec->width;
+                 codec->height = icodec->height;
+                 codec->has_b_frames = icodec->has_b_frames;
+                 break;
+-            case CODEC_TYPE_SUBTITLE:
++            case AVMEDIA_TYPE_SUBTITLE:
+                 break;
+             default:
+                 return false;
+             }
+         } else {
+             switch(codec->codec_type) {
+-            case CODEC_TYPE_VIDEO:
++            case AVMEDIA_TYPE_VIDEO:
+                 ost->video_resample = ((codec->width != icodec->width) ||
+                         (codec->height != icodec->height) ||
+                         (codec->pix_fmt != icodec->pix_fmt));
+@@ -686,7 +676,7 @@
+                 return false;
+             }
+         }
+-        if(codec->codec_type == CODEC_TYPE_VIDEO){
++        if(codec->codec_type == AVMEDIA_TYPE_VIDEO){
+             int size= codec->width * codec->height;
+             bit_buffer_size= FFMAX(bit_buffer_size, 4*size);
+         }
+@@ -738,7 +728,7 @@
+                         ist->file_index, ist->index);
+                 return false;
+             }
+-            //if (ist->st->codec->codec_type == CODEC_TYPE_VIDEO)
++            //if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
+             //    ist->st->codec->flags |= CODEC_FLAG_REPEAT_FIELD;
+         }
+     }
+@@ -786,7 +776,7 @@
+             ost = ost_table[i];
+             os = output_files[ost->file_index];
+             ist = ist_table[ost->source_index];
+-            if(ost->st->codec->codec_type == CODEC_TYPE_VIDEO)
++            if(ost->st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
+                 opts = ost->sync_opts * av_q2d(ost->st->codec->time_base);
+             else
+                 opts = ost->st->pts.val * av_q2d(ost->st->time_base);
+@@ -924,22 +914,22 @@
+ void print_error(const char *filename, int err)
+ {
+     switch(err) {
+-    case AVERROR_NUMEXPECTED:
++    case AVERROR(EINVAL):
+         fprintf(stderr, "%s: Incorrect image filename syntax.\n", 
+                 filename);
+         break;
+     case AVERROR_INVALIDDATA:
+         fprintf(stderr, "%s: Error while parsing header\n", filename);
+         break;
+-    case AVERROR_NOFMT:
++    case AVERROR(EILSEQ):
+         fprintf(stderr, "%s: Unknown format\n", filename);
+         break;
+-    case AVERROR_IO:
++    case AVERROR(EIO):
+         fprintf(stderr, "%s: I/O error occured\n"
+ 	        "Usually that means that input file is truncated and/or corrupted.\n",
+ 		filename);
+         break;
+-    case AVERROR_NOMEM:
++    case AVERROR(ENOMEM):
+         fprintf(stderr, "%s: memory allocation error occured\n", filename);
+         break;
+     default:
+@@ -968,9 +958,9 @@
+     ap->pix_fmt = frame_pix_fmt;
+     ap->channel = 0;
+     ap->standard = 0;
+-    ap->video_codec_id = CODEC_ID_NONE;
++    ic->video_codec_id = CODEC_ID_NONE;
+     if(pgmyuv_compatibility_hack)
+-        ap->video_codec_id= CODEC_ID_PGMYUV;
++        ic->video_codec_id= CODEC_ID_PGMYUV;
+ 
+     /* open the input file with generic libav function */
+     err = av_open_input_file(&ic, filename, file_iformat, 0, ap);
+@@ -999,7 +989,7 @@
+         AVCodecContext *enc = ic->streams[i]->codec;
+         enc->thread_count= 1;
+         switch(enc->codec_type) {
+-        case CODEC_TYPE_VIDEO:
++        case AVMEDIA_TYPE_VIDEO:
+             frame_height = enc->height;
+             frame_width = enc->width;
+             frame_aspect_ratio = av_q2d(enc->sample_aspect_ratio) * enc->width / enc->height;
+@@ -1020,13 +1010,12 @@
+             frame_rate      = rfps;
+             frame_rate_base = rfps_base;
+ 
+-            enc->rate_emu = 0;
+             break;
+-        case CODEC_TYPE_DATA:
++        case AVMEDIA_TYPE_DATA:
+             break;
+-        case CODEC_TYPE_SUBTITLE:
++        case AVMEDIA_TYPE_SUBTITLE:
+             break;
+-        case CODEC_TYPE_UNKNOWN:
++        case AVMEDIA_TYPE_UNKNOWN:
+             break;
+         default:
+             //av_abort();
+@@ -1058,12 +1047,12 @@
+         for(i=0;i<ic->nb_streams;i++) {
+             AVCodecContext *enc = ic->streams[i]->codec;
+             switch(enc->codec_type) {
+-            case CODEC_TYPE_VIDEO:
++            case AVMEDIA_TYPE_VIDEO:
+                 has_video = 1;
+                 break;
+-            case CODEC_TYPE_DATA:
+-            case CODEC_TYPE_UNKNOWN:
+-            case CODEC_TYPE_SUBTITLE:
++            case AVMEDIA_TYPE_DATA:
++            case AVMEDIA_TYPE_UNKNOWN:
++            case AVMEDIA_TYPE_SUBTITLE:
+                 break;
+             default:
+                 //av_abort();
+@@ -1086,14 +1075,14 @@
+         fprintf(stderr, "Could not alloc stream\n");
+         return false;
+     }
+-    avcodec_get_context_defaults2(st->codec, CODEC_TYPE_VIDEO);
++    avcodec_get_context_defaults2(st->codec, AVMEDIA_TYPE_VIDEO);
+ 
+     video_enc = st->codec;
+ 
+     {
+         AVCodec *codec;
+ 
+-        codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, CODEC_TYPE_VIDEO);
++        codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, AVMEDIA_TYPE_VIDEO);
+ 
+         video_enc->codec_id = codec_id;
+         codec = avcodec_find_encoder(codec_id);
+@@ -1203,7 +1192,7 @@
+     oc = avformat_alloc_context();
+ 
+     if (!file_oformat) {
+-        file_oformat = guess_format(NULL, filename, NULL);
++        file_oformat = av_guess_format(NULL, filename, NULL);
+         if (!file_oformat) {
+             fprintf(stderr, "Unable for find a suitable output format for '%s'\n",
+                     filename);
+@@ -1239,7 +1228,7 @@
+     /* check filename in case of an image number is expected */
+     if (oc->oformat->flags & AVFMT_NEEDNUMBER) {
+         if (!av_filename_number_test(oc->filename)) {
+-            print_error(oc->filename, AVERROR_NUMEXPECTED);
++            print_error(oc->filename, AVERROR(EINVAL));
+             return false;
+         }
+     }
diff --git a/media-video/vdr2jpeg/files/vdr2jpeg-0.1.9-ffmpeg1.patch b/media-video/vdr2jpeg/files/vdr2jpeg-0.1.9-ffmpeg1.patch
new file mode 100644
index 000000000000..4d032d89235e
--- /dev/null
+++ b/media-video/vdr2jpeg/files/vdr2jpeg-0.1.9-ffmpeg1.patch
@@ -0,0 +1,238 @@
+Index: vdr2jpeg-0.1.9/ffm.cpp
+===================================================================
+--- vdr2jpeg-0.1.9.orig/ffm.cpp
++++ vdr2jpeg-0.1.9/ffm.cpp
+@@ -22,6 +22,7 @@
+ extern "C" {
+ #include <libavutil/avutil.h>
+ #include <libavutil/mathematics.h>
++#include <libavutil/pixdesc.h>
+ #include <libavcodec/avcodec.h>
+ #include <libavformat/avformat.h>
+ #include <libswscale/swscale.h>
+@@ -55,14 +56,12 @@ static int video_qdiff = 3;
+ static const char *video_rc_eq="tex^qComp";
+ static int me_method = ME_EPZS;
+ 
+-static int same_quality = 1;
+ 
+ static int top_field_first = -1;
+ 
+ 
+ 
+ 
+-static float mux_preload= 0.5;
+ static float mux_max_delay= 0.7;
+ 
+ static int64_t input_ts_offset = 0;
+@@ -150,7 +149,7 @@ static bool do_video_out(AVFormatContext
+                          int *frame_size)
+ {
+     int nb_frames, i, ret;
+-    AVFrame *final_picture, *formatted_picture, *resampling_dst, *padding_src;
++    AVFrame *final_picture, *formatted_picture, *resampling_dst;
+     AVFrame picture_crop_temp, picture_pad_temp;
+     AVCodecContext *enc, *dec;
+ 
+@@ -195,11 +194,9 @@ static bool do_video_out(AVFormatContext
+     }
+ 
+     final_picture = formatted_picture;
+-    padding_src = formatted_picture;
+     resampling_dst = &ost->pict_tmp;
+ 
+     if (ost->video_resample) {
+-        padding_src = NULL;
+         final_picture = &ost->pict_tmp;
+         sws_scale(ost->img_resample_ctx, formatted_picture->data, formatted_picture->linesize,
+               0, ost->resample_height, resampling_dst->data, resampling_dst->linesize);
+@@ -242,10 +239,7 @@ static bool do_video_out(AVFormatContext
+ 
+             /* handles sameq here. This is not correct because it may
+                not be a global option */
+-            if (same_quality) {
+-                big_picture.quality = (int)ist->st->quality;
+-            }else
+-                big_picture.quality = (int)ost->st->quality;
++            big_picture.quality = ist->st->codec->global_quality;
+                 big_picture.pict_type = (AVPictureType) 0;
+ //            big_picture.pts = AV_NOPTS_VALUE;
+             big_picture.pts= ost->sync_opts;
+@@ -328,7 +322,7 @@ static int output_packet(AVInputStream *
+ 
+                     ret = avcodec_decode_video2(ist->st->codec,
+                                                &picture, &got_picture, &pkt);
+-                    ist->st->quality= picture.quality;
++                    ist->st->codec->global_quality= picture.quality;
+                     if (ret < 0)
+                         goto fail_decode;
+                     if (!got_picture) {
+@@ -618,31 +612,6 @@ static bool av_encode(AVFormatContext **
+         codec = ost->st->codec;
+         icodec = ist->st->codec;
+ 
+-        if (ost->st->stream_copy) {
+-            /* if stream_copy is selected, no need to decode or encode */
+-            codec->codec_id = icodec->codec_id;
+-            codec->codec_type = icodec->codec_type;
+-            if(!codec->codec_tag) codec->codec_tag = icodec->codec_tag;
+-            codec->bit_rate = icodec->bit_rate;
+-            codec->extradata= icodec->extradata;
+-            codec->extradata_size= icodec->extradata_size;
+-            if(av_q2d(icodec->time_base) > av_q2d(ist->st->time_base) && av_q2d(ist->st->time_base) < 1.0/1000)
+-                codec->time_base = icodec->time_base;
+-            else
+-                codec->time_base = ist->st->time_base;
+-            switch(codec->codec_type) {
+-            case AVMEDIA_TYPE_VIDEO:
+-                codec->pix_fmt = icodec->pix_fmt;
+-                codec->width = icodec->width;
+-                codec->height = icodec->height;
+-                codec->has_b_frames = icodec->has_b_frames;
+-                break;
+-            case AVMEDIA_TYPE_SUBTITLE:
+-                break;
+-            default:
+-                return false;
+-            }
+-        } else {
+             switch(codec->codec_type) {
+             case AVMEDIA_TYPE_VIDEO:
+                 ost->video_resample = ((codec->width != icodec->width) ||
+@@ -675,7 +644,6 @@ static bool av_encode(AVFormatContext **
+             default:
+                 return false;
+             }
+-        }
+         if(codec->codec_type == AVMEDIA_TYPE_VIDEO){
+             int size= codec->width * codec->height;
+             bit_buffer_size= FFMAX(bit_buffer_size, 4*size);
+@@ -690,7 +658,7 @@ static bool av_encode(AVFormatContext **
+     /* dump the file output parameters - cannot be done before in case
+        of stream copy */
+     for(i=0;i<nb_output_files;i++) {
+-        dump_format(output_files[i], i, output_files[i]->filename, 1);
++        av_dump_format(output_files[i], i, output_files[i]->filename, 1);
+     }
+ 
+     /* open each encoder */
+@@ -749,7 +717,7 @@ static bool av_encode(AVFormatContext **
+     /* open files and write file headers */
+     for(i=0;i<nb_output_files;i++) {
+         os = output_files[i];
+-        if (av_write_header(os) < 0) {
++        if (avformat_write_header(os,NULL) < 0) {
+             fprintf(stderr, "Could not write header for output file #%d (incorrect codec parameters ?)\n", i);
+             ret = false; //AVERROR(EINVAL);
+             goto fail;
+@@ -941,36 +909,32 @@ void print_error(const char *filename, i
+ static bool opt_input_file(const char *filename)
+ {
+     AVFormatContext *ic;
+-    AVFormatParameters params, *ap = &params;
+     int err, ret, rfps, rfps_base;
+     unsigned int i;
+     int64_t timestamp;
++    AVDictionary *opts = NULL;
++    char buf[1024];
+ 
+     /* get default parameters from command line */
+     ic = avformat_alloc_context();
+ 
+-    memset(ap, 0, sizeof(*ap));
+-    ap->prealloced_context = 1;
+-    ap->time_base.den = frame_rate;
+-    ap->time_base.num = frame_rate_base;
+-    ap->width = frame_width + 0 + 0;
+-    ap->height = frame_height + 0 + 0;
+-    ap->pix_fmt = frame_pix_fmt;
+-    ap->channel = 0;
+-    ap->standard = 0;
++    snprintf(buf, sizeof(buf), "%d/%d", frame_rate, frame_rate_base);
++    av_dict_set(&opts, "framerate", buf, 0);
++    snprintf(buf, sizeof(buf), "%dx%d", frame_width, frame_height);
++    av_dict_set(&opts, "video_size", buf, 0);
++    av_dict_set(&opts, "pixel_format", av_get_pix_fmt_name(frame_pix_fmt), 0);
++
+     ic->video_codec_id = CODEC_ID_NONE;
+     if(pgmyuv_compatibility_hack)
+         ic->video_codec_id= CODEC_ID_PGMYUV;
+ 
+     /* open the input file with generic libav function */
+-    err = av_open_input_file(&ic, filename, file_iformat, 0, ap);
++    err = avformat_open_input(&ic, filename, file_iformat, &opts);
+     if (err < 0) {
+         print_error(filename, err);
+         return 0;
+     }
+ 
+-    ic->loop_input = 0;
+-
+     /* If not enough info to get the stream parameters, we decode the
+        first frames to get it. (used in mpeg case for example) */
+     ret = av_find_stream_info(ic);
+@@ -1027,7 +991,7 @@ static bool opt_input_file(const char *f
+     input_files_ts_offset[nb_input_files] = input_ts_offset - timestamp;
+     /* dump the file content */
+     if (verbose >= 0)
+-        dump_format(ic, nb_input_files, filename, 0);
++        av_dump_format(ic, nb_input_files, filename, 0);
+ 
+     nb_input_files++;
+     file_iformat = NULL;
+@@ -1133,11 +1097,8 @@ static bool new_video_stream(AVFormatCon
+ 
+ /*      if (intra_only)
+             video_enc->gop_size = 0;*/
+-        if (same_quality) {
+             video_enc->flags |= CODEC_FLAG_QSCALE;
+-            st->quality = FF_QP2LAMBDA;
+-            video_enc->global_quality= (int)st->quality;
+-        }
++            video_enc->global_quality= FF_QP2LAMBDA;
+ 
+         video_enc->max_qdiff = video_qdiff;
+         video_enc->rc_eq = video_rc_eq;
+@@ -1187,7 +1148,6 @@ static bool opt_output_file(const char *
+ {
+     AVFormatContext *oc;
+     int use_video, input_has_video = 0;
+-    AVFormatParameters params, *ap = &params;
+ 
+     oc = avformat_alloc_context();
+ 
+@@ -1219,8 +1179,6 @@ static bool opt_output_file(const char *
+                 return false;
+         }
+ 
+-        oc->timestamp = 0;
+-
+     }
+ 
+     output_files[nb_output_files++] = oc;
+@@ -1233,16 +1191,7 @@ static bool opt_output_file(const char *
+         }
+     }
+ 
+-    memset(ap, 0, sizeof(*ap));
+-    if (av_set_parameters(oc, ap) < 0) {
+-        fprintf(stderr, "%s: Invalid encoding parameters\n",
+-                oc->filename);
+-        return false;
+-    }
+-
+-    oc->preload= (int)(mux_preload*AV_TIME_BASE);
+     oc->max_delay= (int)(mux_max_delay*AV_TIME_BASE);
+-    oc->loop_output = AVFMT_NOOUTPUTLOOP;
+ 
+     /* reset some options */
+     file_oformat = NULL;
+@@ -1323,7 +1272,7 @@ bool decode (const char* szMPVfile, /* c
+         AVFormatContext *s = output_files[i];
+ 
+         if (!(s->oformat->flags & AVFMT_NOFILE))
+-	    url_fclose(s->pb);
++	    avio_close(s->pb);
+ 	for(j=0;j<s->nb_streams;j++)
+ 	    av_free(s->streams[j]);
+         av_free(s);
diff --git a/media-video/vdr2jpeg/files/vdr2jpeg-0.1.9-libav9.patch b/media-video/vdr2jpeg/files/vdr2jpeg-0.1.9-libav9.patch
new file mode 100644
index 000000000000..c984cfc4cff5
--- /dev/null
+++ b/media-video/vdr2jpeg/files/vdr2jpeg-0.1.9-libav9.patch
@@ -0,0 +1,54 @@
+--- ffm.cpp.old	2013-06-22 20:12:27.972712290 +0200
++++ ffm.cpp	2013-06-22 20:13:33.586709956 +0200
+@@ -672,7 +672,7 @@
+                         ost->file_index, ost->index);
+                 return false;
+             }
+-            if (avcodec_open(ost->st->codec, codec) < 0) {
++            if (avcodec_open2(ost->st->codec, codec, NULL) < 0) {
+                 fprintf(stderr, "Error while opening codec for output stream #%d.%d - maybe incorrect parameters such as bit_rate, rate, width or height\n",
+                         ost->file_index, ost->index);
+                 return false;
+@@ -691,7 +691,7 @@
+                         ist->st->codec->codec_id, ist->file_index, ist->index);
+                 return false;
+             }
+-            if (avcodec_open(ist->st->codec, codec) < 0) {
++            if (avcodec_open2(ist->st->codec, codec, NULL) < 0) {
+                 fprintf(stderr, "Error while opening codec for input stream #%d.%d\n",
+                         ist->file_index, ist->index);
+                 return false;
+@@ -937,7 +937,7 @@
+ 
+     /* If not enough info to get the stream parameters, we decode the
+        first frames to get it. (used in mpeg case for example) */
+-    ret = av_find_stream_info(ic);
++    ret = avformat_find_stream_info(ic, NULL);
+     if (ret < 0 && verbose >= 0) {
+         fprintf(stderr, "%s: could not find codec parameters\n", filename);
+         return false;
+@@ -1034,12 +1034,13 @@
+     AVCodecContext *video_enc;
+     CodecID codec_id;
+ 
+-    st = av_new_stream(oc, oc->nb_streams);
++    st = avformat_new_stream(oc, NULL);
+     if (!st) {
+         fprintf(stderr, "Could not alloc stream\n");
+         return false;
+     }
+-    avcodec_get_context_defaults2(st->codec, AVMEDIA_TYPE_VIDEO);
++    st->id = oc->nb_streams;
++    avcodec_get_context_defaults3(st->codec, NULL);
+ 
+     video_enc = st->codec;
+ 
+@@ -1204,7 +1205,7 @@
+ {
+     av_log_set_level(verbose);
+     av_register_all();
+-    avctx_opts= avcodec_alloc_context();
++    avctx_opts= avcodec_alloc_context3(NULL);
+ }
+ 
+ void ffm_deinitalize(void)
diff --git a/media-video/vdr2jpeg/metadata.xml b/media-video/vdr2jpeg/metadata.xml
new file mode 100644
index 000000000000..b7c52134a436
--- /dev/null
+++ b/media-video/vdr2jpeg/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+			<email>hd_brummy@gentoo.org</email>
+			<name>Joerg Bornkessel</name>
+		</maintainer>
+		<maintainer type="project">
+			<email>media-video@gentoo.org</email>
+			<name>Gentoo Video project</name>
+		</maintainer>
+		<longdescription lang="en">
+			Addon needed for XXV - WWW Admin for the Video Disk Recorder
+			Creating jpeg pics from *.vdr files			
+		</longdescription>
+</pkgmetadata>
diff --git a/media-video/vdr2jpeg/vdr2jpeg-0.1.9-r1.ebuild b/media-video/vdr2jpeg/vdr2jpeg-0.1.9-r1.ebuild
new file mode 100644
index 000000000000..d6fb8356fa41
--- /dev/null
+++ b/media-video/vdr2jpeg/vdr2jpeg-0.1.9-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+VERSION="717" # every bump, new version
+
+RESTRICT="strip"
+
+DESCRIPTION="Addon needed for XXV - WWW Admin for the Video Disk Recorder"
+HOMEPAGE="http://projects.vdr-developer.org/projects/xxv"
+SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz
+		mirror://gentoo/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="virtual/ffmpeg"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -i \
+		-e "s:usr/local:usr:" \
+		-e "s:-o vdr2jpeg:\$(LDFLAGS) -o vdr2jpeg:" \
+		Makefile || die
+	epatch "${FILESDIR}/${P}-ffmpeg.patch" \
+		"${FILESDIR}/${P}-ffmpeg1.patch" \
+		"${FILESDIR}/${P}-libav9.patch"
+
+	if has_version ">=media-video/ffmpeg-2"; then
+		sed -e "s:CodecID:AVCodecID:" -i ffm.cpp
+	fi
+}
+
+src_install() {
+	dobin vdr2jpeg
+	dodoc README LIESMICH
+}
diff --git a/media-video/vdr2jpeg/vdr2jpeg-0.2.0.ebuild b/media-video/vdr2jpeg/vdr2jpeg-0.2.0.ebuild
new file mode 100644
index 000000000000..43e97e267891
--- /dev/null
+++ b/media-video/vdr2jpeg/vdr2jpeg-0.2.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+VERSION="1911" # every bump, new version
+
+RESTRICT="strip"
+
+DESCRIPTION="Addon needed for XXV - WWW Admin for the Video Disk Recorder"
+HOMEPAGE="http://projects.vdr-developer.org/projects/xxv"
+SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz
+		mirror://gentoo/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="libav"
+
+RDEPEND="
+	libav? ( media-video/libav )
+	!libav? ( media-video/ffmpeg:0 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	sed -i \
+		-e "s:usr/local:usr:" \
+		-e "s:-o vdr2jpeg:\$(LDFLAGS) -o vdr2jpeg:" \
+		Makefile || die
+}
+
+src_install() {
+	if use libav; then
+		emake DESTDIR="${D}" install FFMPEG_BIN=/usr/bin/avconv
+	else
+		emake DESTDIR="${D}" install FFMPEG_BIN=/usr/bin/ffmpeg
+	fi
+
+	dodoc README LIESMICH
+}
diff --git a/media-video/vdrsync/Manifest b/media-video/vdrsync/Manifest
new file mode 100644
index 000000000000..8a1a1e6317c6
--- /dev/null
+++ b/media-video/vdrsync/Manifest
@@ -0,0 +1,6 @@
+AUX vdrsync-0.1.3_pre050322-path.diff 1378 SHA256 945cc2bc9e069a1acd0034700866c3d2ffc90304170d9a23d11eab517d601a2f SHA512 e147082f6606ccc9a85dd8336976f2c10427ddb1418f7233969a8d6a3a40061847aaa24156c10d71b6dde772f1a6cf03d660edc299217b83d467c4ce285a72cf WHIRLPOOL 423668a07ba4d7767dc57ba5517667ce46d03a49b5991afcb4a135cfca4e12d002d0275aea0caa5f4ca516ff95b6349b94909b701ce84b54557a7c42393be43c
+DIST vdrsync-050322.tgz 295498 SHA256 7b6209c547323474187bc9706084012601e5bf3eb39fad1a374a8ed8799c0384 SHA512 112dc3cb84511fcd8c61144378931dfb6af5a1650b728dd3dbd9004dc783c24fc26125d31fe02ba5b3c26174c82ac7fb2f74fd444b8c390640fcbc45e30c7a21 WHIRLPOOL 3d4a1e8662b556e1d9cdb4e8b8622a26b1ca7dba6f1ac4daaf5d0e2539b500093592d15f964906971f7c7058472de6a014bd96eddc18c64dffcca8abdf4a7f3e
+EBUILD vdrsync-0.1.3_pre050322-r1.ebuild 1230 SHA256 dabfc758e29eb9002f07cf61146b746ebc2631aec138bcd56c8eb082e2aa26ee SHA512 9c8e05f84dfaad60da79409b27b38f876a5cf01df2f59d1365e6692763813ea88b01ef49a6083ff28f3f1e1284470f26f35adfb2edb1e0a3b1914723dcc6db9f WHIRLPOOL 41f40382b1ea8b21d3a8ecdb0f919e05b7545ba22e8e0d3ba0b77957e030184effa3ad1e880235503ceb8dce7fab07370aaef8be1506f3e97464e65a0feb2be1
+MISC ChangeLog 2893 SHA256 ea79063aca60d07c580c6b3689c53e346375ee345c4bac613de4f0ad562fea5d SHA512 4eabc1a03ec54ebfd87501e8fc9e44c58a8e474354eedfd9bbecd7c954f0500b47bd0c07274bfcd66ad034f7dc0dbb66d68c2307a37430424af2290eb5f6ac4f WHIRLPOOL 361dc62b304b875752f3e6d8ca2375c0038b3c07d305cdb025df57a0213a8de9f1d55216a30a1b502c77d965d79c3fbfd61c86ad26d7a5bc7e0f11d7657fcedb
+MISC ChangeLog-2015 1681 SHA256 de57df9dd85e66eba26343f17302fc331ef15acba6f917e5ffb40164f8127889 SHA512 57641f4332ac634b9527c19c32cf53aa4c8de2fc26b4437ae071e8a8d6dc814b93ffc0df822387716d9e74d24f2374ef55da6c144718926ca6acdfb48ad017d8 WHIRLPOOL a8b6ae542f639577cce493591b607be378737829c025b3b9429a06d495612481fd5fd71eeb449c7bb8adf625efb05caeb94986ac08dc30474009d9c8e811cbe3
+MISC metadata.xml 357 SHA256 5404f8e98a7d7ea3252ac4efa915b5d0917473ccf0adc35a8c6944e3adb7b826 SHA512 c301a1bb051eefde7856ef1462d13343fba21acfabde35a2fd9feba5c00f3aaf697b9e358132cc56114f59af0b785ffb07998d8a6d084369275cbf1b616a7fa4 WHIRLPOOL de3ca44c2da1758d934ca3285b6370bba3b5e78917d6e0d6b1c9be0639552d8f934cb992857de82d98e7900bdc9e9aa8e949e87f265efd6b04db757aed0383b1
diff --git a/media-video/vdrsync/files/vdrsync-0.1.3_pre050322-path.diff b/media-video/vdrsync/files/vdrsync-0.1.3_pre050322-path.diff
new file mode 100644
index 000000000000..768665be62a8
--- /dev/null
+++ b/media-video/vdrsync/files/vdrsync-0.1.3_pre050322-path.diff
@@ -0,0 +1,39 @@
+fix not founded path to some progs
+
+Joerg Bornkessel <hd_brummy@gentoo.org> ( 29 May 2005 )
+
+--- vdrsync.pl.orig	2006-05-29 19:10:25.146198500 +0200
++++ vdrsync.pl	2006-05-29 19:09:06.937310750 +0200
+@@ -37,19 +37,19 @@
+ # Hash that lists potential helper Programs
+ #########################################################################
+ my %progs = (
+-    tcmplex           => "",
+-    mplex             => "",
+-    tcmplex_panteltje => "",
+-    dvdauthor         => "",
+-    mkisofs           => "",
+-    transcode         => "",
+-    tcrequant         => "",
+-    requant           => "",
+-    mpg123            => "",
+-    mp2enc            => "",
+-    "dvd-menu.pl"     => "",
+-    "vdrsync-buffer.pl"=>"",
+-    "vdrsync.pl"      =>"",
++    tcmplex           => "/usr/bin/tcmplex",
++    mplex             => "/usr/bin/mplex",
++    tcmplex_panteltje => "/usr/bin/tcmplex-panteltje",
++    dvdauthor         => "/usr/bin/dvdauthor",
++    mkisofs           => "/usr/bin/mkisofs",
++    transcode         => "/usr/bin/transcode",
++    tcrequant         => "/usr/bin/tcrequant",
++    requant           => "/usr/bin/requant",
++    mpg123            => "/usr/bin/mp123",
++    mp2enc            => "/usr/bin/mp2enc",
++    "dvd-menu.pl"     => "/usr/bin/dvd-menu.pl",
++    "vdrsync-buffer.pl"=>"/usr/bin/vdrsync-buffer.pl",
++    "vdrsync.pl"      => "/usr/bin/vdrsync.pl",
+ );
+ 
+ 
diff --git a/media-video/vdrsync/metadata.xml b/media-video/vdrsync/metadata.xml
new file mode 100644
index 000000000000..82041cfbab6e
--- /dev/null
+++ b/media-video/vdrsync/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+<email>vdr@gentoo.org</email>
+<name>Gentoo VDR Project</name>
+</maintainer>
+<maintainer type="project">
+<email>media-video@gentoo.org</email>
+<name>Gentoo Video project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-video/vdrsync/vdrsync-0.1.3_pre050322-r1.ebuild b/media-video/vdrsync/vdrsync-0.1.3_pre050322-r1.ebuild
new file mode 100644
index 000000000000..966724d872ca
--- /dev/null
+++ b/media-video/vdrsync/vdrsync-0.1.3_pre050322-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils
+
+MY_P="${PN}-${PV#*_pre}"
+
+S=${WORKDIR}/vdrsync-${MY_SNAPSHOT}
+
+DESCRIPTION="converting vdr-recordings to mpeg2, dvd or other similar formats"
+HOMEPAGE="http://vdrsync.vdr-portal.de/"
+SRC_URI="http://vdrsync.vdr-portal.de/releases/${MY_P}.tgz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ~amd64"
+IUSE="dvdr"
+
+DEPEND=""
+RDEPEND=">=dev-lang/perl-5.8.0
+		media-fonts/corefonts
+		dvdr? (
+			>=media-libs/gd-2.0.15
+			>=dev-perl/GD-2.0.7
+			>=dev-perl/GDTextUtil-0.86
+			>=media-video/dvdauthor-0.6.8
+		)"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	sed -e "s:/usr/X11R6/lib/X11/fonts/truetype/arial.ttf:/usr/share/fonts/corefonts/arial.ttf:g" \
+		-i dvd-menu.pl
+
+	epatch "${FILESDIR}/${P}-path.diff"
+}
+# vdrsync/dvd-menu use hardcoded tmp-directory for large (up to and
+# greater than 1G). Uncomment and change the next two lines to your
+# needs if you need another tmp-Dir
+#sed -e 's:"/tmp/":"/temp/":g' /usr/bin/dvd-menu.pl
+#sed -e 's:"/tmp/":"/temp/":g' /usr/bin/vdrsync.pl
+
+src_install() {
+	dobin check-vdrsync.pl vdrsync.pl vdrsync_buffer.pl
+	use dvdr && dobin dvd-menu.pl
+	dodoc CHANGES
+}
diff --git a/media-video/vdrtools-genindex/Manifest b/media-video/vdrtools-genindex/Manifest
new file mode 100644
index 000000000000..8a112e0cc286
--- /dev/null
+++ b/media-video/vdrtools-genindex/Manifest
@@ -0,0 +1,6 @@
+AUX ldflags.diff 410 SHA256 18c27e7bf635a4c0db792fd9cb55c42f538b9b9f2a20cc5d17bd40365b2195ac SHA512 dd5b68ce2c0712e84522c336ff15067dc0a95a93696d1349273b160e7013d478d92d78867c9a9bafdf4e1e77ee3ca2e4edf33ea6f960ae86131e104076dd27e6 WHIRLPOOL 165eea0fc6eea78d5117d0407328ccd1599b5bbdafa09709970f0498030cfeccd5f640b23785bca221cffaa8e03ab35781b2f2dee4c65e4d25f3537906f9d692
+DIST genindex-0.1.3.tar.gz 20958 SHA256 1bc98ba54b9c4cb03b1ed1cfcf78a5d07c818228252155e664b2afbf1abdc1bd SHA512 1fb95fa99128a9cc62c684cf44383fbb837918d6911a3a34a107cf62eb73c16275128100d8eedc05c044382910584b2dd1c2dd94ecd3a896363d900e9b185972 WHIRLPOOL 4507a808b7d05e37f382a589f3f3e12dbab5981c765397619a9f71031b67052d3218cbbf331a58f8fda12bb2d7411dda277180815df486ef83fb0dce6ed3f740
+EBUILD vdrtools-genindex-0.1.3-r1.ebuild 484 SHA256 c26223d3e13f152b05f66cd2b7cd17a8dcc1d31881fb2ed342c4f3fca56d8d5d SHA512 7912206db442a3b213714cff853aab8a108f1c83c6833af725727e915e512e257b1443baa48a7ce7ef485c6ab716fdea98f72be27ac8d5257eb54fdf59d18332 WHIRLPOOL eaad1180f546b00eef31dea66904644567f1ef80d1d1b9ee75ef8cb38aa34c81523202039b4810588c2b64b76637f976d4cd303d7091547be33f873e00a868aa
+MISC ChangeLog 2487 SHA256 1479bf7ccee14a8e6c499bfd64b238728642e0e76127716814c6ce7d88fcc843 SHA512 30596f13cbad6c8941883e67f4b444e8b7fec7073a80e1eceeb6b538b091682e6fa6ff425aff8a633051b37248a01d6e92862c26186bf388448aa9e2756939d1 WHIRLPOOL 4a4361e8ee904906b1df8717f8cf5a5cfbd677a4cb5542dd201fcc47280d4cdef7ad264f20b69ff210af07c569812fecb3a6b2998549372b5ffb6feb124f483c
+MISC ChangeLog-2015 1375 SHA256 17054ff67cdca6aa7ee6c0a1686889eea4528954fa2841e76b1ec01148e0af4c SHA512 7e60584bf42881b6152f77b97ebb2d24e51f4effd16da8741f645be0d29392b8bc0f8c82d72bec1045ac79be12a622441b1da029007a4695e066bbd34af4829d WHIRLPOOL dcc2c87c299585f0158b0ee2a7577b0511dc9f27b77c50fae66c5100d725c4ef0c83fd1621b9f88541c57a20b7a573c499dda0118cce23062e9e4c61f6518683
+MISC metadata.xml 365 SHA256 2763c2eb176dc48246da3ef61cbbbd80a393f84e408e63c0e6a3f6ff51cbb82d SHA512 6fab8091df4f66b5c3c09c45a17ed4872143d1763377cd5cd816210c051cb1176950f644b31fdba8988852958fb832c1efceac13a0bba8643a767275c17e0f5b WHIRLPOOL faf1a6a0facee5385f53b174801e1e8d41364240ff20951b99dd727e2775b4436d206538965cc8519ef7127fc5cf375a789086c44b3d4cf102f3689725cbd937
diff --git a/media-video/vdrtools-genindex/files/ldflags.diff b/media-video/vdrtools-genindex/files/ldflags.diff
new file mode 100644
index 000000000000..7ec062e3ddcb
--- /dev/null
+++ b/media-video/vdrtools-genindex/files/ldflags.diff
@@ -0,0 +1,12 @@
+diff -Naur genindex-0.1.3.orig/Makefile genindex-0.1.3/Makefile
+--- genindex-0.1.3.orig/Makefile	2010-09-24 14:55:48.000000000 +0200
++++ genindex-0.1.3/Makefile	2010-09-24 14:56:06.000000000 +0200
+@@ -52,7 +52,7 @@
+ # The main program:
+ 
+ genindex: $(OBJS)
+-	$(CXX) $(CXXFLAGS) $^ -o $@
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -o $@
+ 
+ rmstream: rmstream.o thread.o ringbuffer.o pes.o
+ 	$(CXX) $(CXXFLAGS) $^ -o $@
diff --git a/media-video/vdrtools-genindex/metadata.xml b/media-video/vdrtools-genindex/metadata.xml
new file mode 100644
index 000000000000..3a9a3d772a0d
--- /dev/null
+++ b/media-video/vdrtools-genindex/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>vdr@gentoo.org</email>
+  <name>Gentoo VDR Project</name>
+</maintainer>
+<maintainer type="project">
+  <email>media-video@gentoo.org</email>
+  <name>Gentoo Video project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-video/vdrtools-genindex/vdrtools-genindex-0.1.3-r1.ebuild b/media-video/vdrtools-genindex/vdrtools-genindex-0.1.3-r1.ebuild
new file mode 100644
index 000000000000..97399b70be66
--- /dev/null
+++ b/media-video/vdrtools-genindex/vdrtools-genindex-0.1.3-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit eutils
+
+SCRIPT="genindex"
+
+DESCRIPTION="VDR: genindex Script"
+HOMEPAGE="http://www.cadsoft.de/vdr/"
+SRC_URI="http://www.muempf.de/down/${SCRIPT}-${PV}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=""
+
+S=${WORKDIR}/${SCRIPT}-${PV}
+
+src_prepare() {
+	epatch "${FILESDIR}"/ldflags.diff
+}
+
+src_install() {
+	dodoc README
+	dobin genindex
+}
diff --git a/media-video/videocut/Manifest b/media-video/videocut/Manifest
new file mode 100644
index 000000000000..4d71e7bd8940
--- /dev/null
+++ b/media-video/videocut/Manifest
@@ -0,0 +1,7 @@
+AUX 01-fix-hardened-ftbfs.diff 430 SHA256 237d16f4a6156f7500da221d0db0785dd4112eb7bf45e3522793be8f48856379 SHA512 d3f08e83e07ff0c4aa1adffd693c27bf1d3fe5657852c20c06a4148e684adfde125d3be8add5cb9e1c9a2edbd794c43dfbbe32a53870261fdd6188cc055183e5 WHIRLPOOL a271890b941b52c625fe6582f18158454881ced9c4a6ada176652bc88866ed2c8efb0f190386307eca408e3e4332c6ee90fd1f02faab4a02d38870f1a3cd029e
+AUX videocut 60 SHA256 cc70d4d53acaca4dcdbb5d14b83687c73081759c9253ea25f6c9663d2a279fef SHA512 3dbf593688ae8516a896a33b7f9611af2ea859b87d43e99ebb97cd8e2041f1ba859dd7c40310fe0b837ecf637b27b97ce2445577ec6a38da8b120867a5e4942b WHIRLPOOL 026d8feddd1d220346df0b0257768dd04ffe443cddd7e4335ff642fb1d7a481995981ff65cdc2b18aaf62ffce84c4eaaef2a4924f7df2fbc12858a7908296bee
+DIST videocut_0.2.0.tar.gz 146915 SHA256 234abbf01848150a1a74cb3b886a6021ec77c7f936991db26c082778c93ce1e1 SHA512 878f42a8ffe19cd5d9e3f9380eb549ea7eeb6fc378b00a883c98760b7d6bba36bcd31477a21799c92c288b421538e17e42d641593f691f528f24b209eab21478 WHIRLPOOL efa574ecbe9c3fac7f54429e48fb81d0ab90b9c03f78a987d58b46d415d9f08dd0d7773df38fe349b3562aa0d7cdd865a5ef9836e953795f01820a307652ab48
+EBUILD videocut-0.2.0.ebuild 823 SHA256 8f381309fa45bfc1529ef89eabc44dabdb270abefc36bd09380c42d6f8c918d4 SHA512 0cb51cea17fac95119512a0b3838423f1fcb501643a86ca6a7e6e4b528b4dbe35e8d52f318c5ef60f90802ef2f42d96944252cb084c509b7d61c80a446beeeb4 WHIRLPOOL e2b8aa40f4565232754c22a84175da5ce1c6c8a2c80ea3c617514f3b87ca4551d6c015f57585e7f72f9293173edda7330bcae166919300881c51741ad35b7314
+MISC ChangeLog 2938 SHA256 6b4c40256ab85750bcb689d858227ac135fd65cf9a68b3c3a6fe19e86d9a2c7b SHA512 d7d7c2c4e506ea6cd517afeb069ea82827a4f89f78f0303ae1bc54dfd8e457315de1057b05141e498a2f9732f725d6b52c267ee466e8c818fbe2666e7bb0cbb3 WHIRLPOOL b5d9a42318a9af4956ee0587c7a15dd4973838afeaa0c96d1b95b7f2241b6d12416ad4877ae5d231a0932e03137cca2829c989afa50e3e1f07c5a03f639356f1
+MISC ChangeLog-2015 823 SHA256 c7dd5c53f31b5cd01cef9fe66ff29cbddd2732f585bc66f1233a4397423bd599 SHA512 79e5d607fd938afdb4fe24a8feb8b7997baf63afb3535bc7bcdcd245d57428c82a8d435669107ccabc8a6be49e5697ecc735b97b542a254091f5d42a68799e34 WHIRLPOOL e4f10ce2db8256766cae545422dc6123df3223257b8d07bd1561cdc79b8f0ac073b46c3c0dc31751cf9d00cf58b23f47b277ac2f214cc22c4079dc994cefe77c
+MISC metadata.xml 301 SHA256 088adb5fcba1f7c03491242919afea1e1f35be9def36ac788c03bc54440a22ed SHA512 08d8d487403d8f7f5c85c499faf72ea758f79412e93ae980ef061ca7ffc96b13f5033191d52a725c16388eefea6400a5f3abbb94f1251f0110427903666b7f8f WHIRLPOOL 89ba0d493a590d4a2b7f95250aabcd3e8c4afa4a295aeaae2bbda62592e14868467e29b1935dba301b512b7f0546263fce62f5be090b7624219e49e3fe5bbd18
diff --git a/media-video/videocut/files/01-fix-hardened-ftbfs.diff b/media-video/videocut/files/01-fix-hardened-ftbfs.diff
new file mode 100644
index 000000000000..47fe7f97842c
--- /dev/null
+++ b/media-video/videocut/files/01-fix-hardened-ftbfs.diff
@@ -0,0 +1,16 @@
+# Fix FTBFS with enabled hardened flags and gcc-4.6 failure
+# https://bugs.gentoo.org/show_bug.cgi?id=380439
+
+--- a/src/TPreviewPanel/TPreviewPanel.cpp
++++ b/src/TPreviewPanel/TPreviewPanel.cpp
+@@ -167,7 +167,9 @@
+ 
+ void TPreviewPanel::adjustItems()
+ {
+-	backgroundRect->setSize(&QRectF(0, 0, 1, 1));
++	QRectF myRect(0, 0, 1, 1);
++	backgroundRect->setSize(&myRect);
++
+ 	logo->setSize(QRect(0, 0, 1, 1));
+ 	
+ 	// adjust meta text
diff --git a/media-video/videocut/files/videocut b/media-video/videocut/files/videocut
new file mode 100644
index 000000000000..5a33c7232fcb
--- /dev/null
+++ b/media-video/videocut/files/videocut
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd /usr/share/videocut
+exec /usr/libexec/videocut
diff --git a/media-video/videocut/metadata.xml b/media-video/videocut/metadata.xml
new file mode 100644
index 000000000000..4f5dd18f15c1
--- /dev/null
+++ b/media-video/videocut/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">videocut</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/videocut/videocut-0.2.0.ebuild b/media-video/videocut/videocut-0.2.0.ebuild
new file mode 100644
index 000000000000..4e980534dda8
--- /dev/null
+++ b/media-video/videocut/videocut-0.2.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+inherit eutils qt4-r2
+
+DESCRIPTION="A program to create compositions from video files"
+HOMEPAGE="https://code.google.com/p/videocut/"
+SRC_URI="https://${PN}.googlecode.com/files/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-qt/qtgui:4
+	dev-qt/qtsvg:4
+	media-libs/xine-lib"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${P}.orig
+
+PATCHES=( "${FILESDIR}"/01-fix-hardened-ftbfs.diff )
+
+src_compile() {
+	emake || die
+	lrelease i18n/*.ts
+}
+
+src_install() {
+	exeinto /usr/libexec
+	doexe build/result/${PN} || die
+	dobin "${FILESDIR}"/${PN} || die
+	insinto /usr/share/${PN}/i18n
+	doins -r i18n/*.qm || die
+	domenu ${PN}.desktop
+	doicon videocut.svg
+	dodoc ABOUT AUTHORS THANKSTO
+}
diff --git a/media-video/videotrans/Manifest b/media-video/videotrans/Manifest
new file mode 100644
index 000000000000..36c099b8da96
--- /dev/null
+++ b/media-video/videotrans/Manifest
@@ -0,0 +1,7 @@
+AUX videotrans-1.6.1-libav.patch 2171 SHA256 573e9ceb24a1aee86781c8f58c69afae95254ef20f3da04c3914cfcb0ef07adb SHA512 0e51b01f0ed54dc9f2d7952c8d0cd2574ce7122bafc1baf7288d7a57f7dd6999fae9aa1ca85dc3d6a20969d79aaf9c22a6e3dbfa6314b377ea6fd29cfd630626 WHIRLPOOL 1bb884e83340808562738d436db38de9863058c3e7523f7cd4df20fcc20c274890593a1c5541c64337c0b1b1a536ec239d7c5014d59697b370978bf4fe61ab72
+DIST videotrans-1.6.1.tar.bz2 98091 SHA256 a6509efdf6cd22353217207b7004ec2b8d8c32feb248e06ff93f55e01af00c99 SHA512 8d2ab30316d099d7bf37e712eab04089bcc24d2f8b59cb1fd464970a66ca1c480e4b9bb67b0a3e26b509c7711e92ea346713e3ec5d2fd3e8d4ff0a4372e2787a WHIRLPOOL d80245e091d1b78bf33a18305c6d8632723fa3b61df7790920e47c4abadaf6b480620590c480b7d17f106f5f6be8c597af38f3c2eb410574f9d962bfee80feab
+EBUILD videotrans-1.6.1-r1.ebuild 734 SHA256 7485756d1fa5ab9de36fe50b1c5ae7831dcc898cce8b580e8fcea382e2c9dc51 SHA512 448840f3d40d7715357984fd2dc908afa4f1e530c3bc639486e1368728147980c9224c6da4ae7156eaa16f0fcadd30e2ec3bb6e479deb46058ef3a88f968564c WHIRLPOOL cbb478845ed426bd78c740b246e3a6b7744fe08a0ca25886c11efcbfc1b3f5b6d0d68f587dfdf838a0737077604b8863288922c5076d783d4f1f1bb68d235291
+EBUILD videotrans-1.6.1-r2.ebuild 871 SHA256 3e4a8ffd0a631df6cdebab78d684e4c074ec6a992a4dd01acbd9fb03dd56366d SHA512 bd71a23229b503d6d6c7f1d0e774d6f3df4a4a325604347e3a2812fe3aef6195d4b30b86a6c27ebfef40c4e47ae9039c1c6571e3e20ab2fa956f78864de2fc7d WHIRLPOOL 73c907c1a5c52737b8ed2e481ffcddfb54e01f93e77b99b17f5b96b02389d4edff33464d6f8b58847bbc20d3885dfffd41bc036c9fae6bb52afabfdfc4187310
+MISC ChangeLog 2655 SHA256 6ab089cbf64d681eb77511383e3be529329c419589fdf02af3a6cd4b87c73539 SHA512 b4608f66d3174825e972fff30bf18acf90d53a52406df9099ccf48b4bc068714f43ad649f02a5b82182358e5dc4867a98691b2e8eaea442482aea4234570fbea WHIRLPOOL 86d323186b9c1b301a3e502b82510fc1bc8143cb3ae1eab80f646f4e8cbaeeafeb658e0ee71e28b8b1a77cdc47b90886eb02b8031f6cfd6a5a5864fb2b613690
+MISC ChangeLog-2015 1877 SHA256 f03ca85ea9d28eb93550afa43c45f82e4c4d9bb887fdb5a6a189290b936adcc8 SHA512 7fc58d71e31faeecea461b28784000834c2cb196d5f02a8d5065f1ccbd7abb0d720848d34568008c9f3f97bc8f72c5c39c621da06ea1bbddca011fcbeec2b0b8 WHIRLPOOL 3abb0f211d3276fe326eeab487ae8ee589f56f261f0c209362d5e6e7c1c6a433f8f54b57cb8b4702f573e9247ba97b68873abe5b910ae7d896eb12a5c05f7cce
+MISC metadata.xml 626 SHA256 8e8847ca22e2b0652ae70433115b39db092da70a3709a2e55baba451a6fcb767 SHA512 f5ffbd260504fbd9c4594b42494b809c9341ec93786958ce06e6e866b83c6f23645e3a8a69d4739bf4d43b224100a48381b45e172f453202972b1a71a76e31f0 WHIRLPOOL 189ebfc51d3e40ba388606a9f77d788cb223dbf4f738203dc094fd975514fdb572ee55fed0a4553962efbbd10e77b7a2b88fc3a894a9a6827a5081d8de130e6f
diff --git a/media-video/videotrans/files/videotrans-1.6.1-libav.patch b/media-video/videotrans/files/videotrans-1.6.1-libav.patch
new file mode 100644
index 000000000000..2b4cd0a15b8e
--- /dev/null
+++ b/media-video/videotrans/files/videotrans-1.6.1-libav.patch
@@ -0,0 +1,52 @@
+Description: Migrate from ffmpeg to avconv.
+Author: Alessio Treglia <alessio@debian.org>
+---
+ data/library.sh.in  |    8 ++++----
+ src/movie-title.in  |    2 +-
+ src/movie-to-dvd.in |    2 +-
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+--- videotrans.orig/data/library.sh.in
++++ videotrans/data/library.sh.in
+@@ -250,15 +250,15 @@ audio_params()
+ 	then
+ 		if [ "${force_or_auto}" = "ac3" ]
+ 		then
+-			msg="${msg}Converting the audio from WAV to AC3 with ${new_ch} channels using ffmpeg. "
++			msg="${msg}Converting the audio from WAV to AC3 with ${new_ch} channels using avconv. "
+ 			if [ "${audio_bitrate_override}" != "auto" -a "${audio_bitrate_override}" != "" ]
+ 			then
+-				audio_encode="ffmpeg -y -v 0 -f wav -i /dev/stdin -ab ${audio_bitrate_override}k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`"
++				audio_encode="avconv -y -v 0 -f wav -i /dev/stdin -b:a ${audio_bitrate_override}k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`"
+ 			elif [ "${new_ch}" = "2" ]
+ 			then
+-				audio_encode="ffmpeg -y -v 0 -f wav -i /dev/stdin -ab 192k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`"
++				audio_encode="avconv -y -v 0 -f wav -i /dev/stdin -b:a 192k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`"
+ 			else
+-				audio_encode="ffmpeg -y -v 0 -f wav -i /dev/stdin -ab 448k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`"
++				audio_encode="avconv -y -v 0 -f wav -i /dev/stdin -b:a 448k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`"
+ 			fi
+ 			audio_ext="ac3"
+ 		else
+--- videotrans.orig/src/movie-title.in
++++ videotrans/src/movie-title.in
+@@ -961,7 +961,7 @@ else
+ 			\> "${TEMP}.mplayer" 2\>\&1 \< /dev/null \&
+ 		mplayer_pid="$!"
+ 
+-		# Start mp2enc or ffmpeg to encode the audio
++		# Start mp2enc or avconv to encode the audio
+ 
+ 		{
+ 			< "${TEMP}.wav" $audio_filter_cmd | eval ${audio_encode}
+--- videotrans.orig/src/movie-to-dvd.in
++++ videotrans/src/movie-to-dvd.in
+@@ -698,7 +698,7 @@ do
+ 	} > "${TEMP}.video" 2>&1 &
+ 	video_enc_pid="$!"
+ 
+-	# Start mp2enc or ffmpeg to encode the audio
++	# Start mp2enc or avconv to encode the audio
+ 
+ 	{
+ 		< "${TEMP}.wav" $audio_filter_cmd | eval ${audio_encode}
diff --git a/media-video/videotrans/metadata.xml b/media-video/videotrans/metadata.xml
new file mode 100644
index 000000000000..3b8573940c73
--- /dev/null
+++ b/media-video/videotrans/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Videotrans is a set of scripts that convert a movie file in any format
+		that mplayer understands to a DVD-compatible VOB file, doing all the
+		necessary conversions automatically. Videotrans provides an automatic
+		DVD menu generator.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">videotrans</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/videotrans/videotrans-1.6.1-r1.ebuild b/media-video/videotrans/videotrans-1.6.1-r1.ebuild
new file mode 100644
index 000000000000..1dd248ee9bdc
--- /dev/null
+++ b/media-video/videotrans/videotrans-1.6.1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit base eutils
+
+DESCRIPTION="A package to convert movies to DVD format and to build DVDs with"
+HOMEPAGE="http://videotrans.sourceforge.net/"
+SRC_URI="mirror://sourceforge/videotrans/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE=""
+
+DEPEND="virtual/ffmpeg
+	media-video/mplayer
+	media-video/mjpegtools[png]
+	media-video/dvdauthor
+	virtual/imagemagick-tools"
+
+RDEPEND="${DEPEND}
+	www-client/lynx
+	app-shells/bash
+	sys-devel/bc"
+
+DOCS="aspects.txt CHANGES THANKS TODO"
+
+src_prepare() {
+	# fixing LDFLAGS usage
+	sed -i -e 's|^\(LDFLAGS.*=\).*\( @LIBS@.*\)|\1\2 @LDFLAGS@|' src/Makefile.in
+}
diff --git a/media-video/videotrans/videotrans-1.6.1-r2.ebuild b/media-video/videotrans/videotrans-1.6.1-r2.ebuild
new file mode 100644
index 000000000000..969d72bc3b7f
--- /dev/null
+++ b/media-video/videotrans/videotrans-1.6.1-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="A package to convert movies to DVD format and to build DVDs with"
+HOMEPAGE="http://videotrans.sourceforge.net/"
+SRC_URI="mirror://sourceforge/videotrans/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="libav"
+
+DEPEND="
+	media-video/mplayer
+	media-video/mjpegtools[png]
+	media-video/dvdauthor
+	virtual/imagemagick-tools
+	libav? ( media-video/libav )
+	!libav? ( media-video/ffmpeg:0 )
+"
+
+RDEPEND="${DEPEND}
+	www-client/lynx
+	app-shells/bash
+	sys-devel/bc
+"
+
+DOCS="aspects.txt CHANGES THANKS TODO"
+
+src_prepare() {
+	# fixing LDFLAGS usage
+	sed -i -e 's|^\(LDFLAGS.*=\).*\( @LIBS@.*\)|\1\2 @LDFLAGS@|' src/Makefile.in
+
+	# Debian patch to support libav
+	use libav && epatch "${FILESDIR}"/${P}-libav.patch
+}
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
new file mode 100644
index 000000000000..87d4991267b0
--- /dev/null
+++ b/media-video/vlc/Manifest
@@ -0,0 +1,22 @@
+AUX qt4-select.patch 2171 SHA256 30c76f06553d0a341224009c3130e54624a266cd77a034340e39d2b922c60d69 SHA512 0c3fab4457f1b8c9f1c2c9b690c1a137e1544a09a710e24ba9c8e228f0490ec27030846974610b8976bfca77e03054c5254719836cabc695a527f095659a651d WHIRLPOOL a4d8a2689a0e034f26f0e2d52275004f21a20f0a553050ce7483b1ab5d42faa8f465ff4dfed08a5defc25917d8f225922d14eaea5adb53d3556b6e41c5704a37
+AUX vlc-2.1.0-TomWij-bisected-PA-broken-underflow.patch 700 SHA256 91752f1ed1fbe8a2fcc78336a0725e1450946bab8085a4efce85a076dff40b87 SHA512 c3aa82ba9252f87d8f87c0bbfed7e0cdbd93c4f454e0ca6a9d73346e2efa294864af7eea1ea76b504354fb1baf5378cf626b35dcbfba3d888dbf0168ddfbed13 WHIRLPOOL 87c5017c8cdc1ad8cb313b6342f89af7ca7e90b20f151dd226ad8863407dae4cefb5934040154020778d3eb5dc78c5be43ae1e8e33fd0e823628c69c8cac7e61
+AUX vlc-2.1.0-fix-libtremor-libs.patch 453 SHA256 5b2d4272b0258b30d1e34717ad83ebe2bcea78a5247798a74c0b86ace6d39463 SHA512 6c25995a518aeb1d501fa217d897962e1e81f66a4f28b6bb164dde3afe7f91772bb608f946d802857fa9a272cab1f88d3990d582be89ab8e37b1a8b6681798ae WHIRLPOOL 39d9d1670e244169087ecc81654b1d6407c9e5f0f0da1bb1b15d7c89a7dab232b9a174c2a5e9ed2586a57a370f3cd9d2c9434381387a1fbc70b7f7bd8de2ef85
+AUX vlc-2.2.2-qt5widgets.patch 603 SHA256 b23c3bf441ac9bef25ca053a8bccec2652c9a251889d38624877ffc5562218ca SHA512 b5d8946406e84bce240376015ed994d6265d07fe9b777fd05c0f722142e99502bd129ec4acfe2cafa7a6dd98c9612913fa8644109489fa48dab6dc5522601050 WHIRLPOOL a00159f261e617f8e0e5c6b51b94428ba1080eb6107f13ce5b9506ae460437f9246ab79795a3443289cba2db36c7a6c2d5f585f6f888ca4881625856ce0ffaf3
+AUX vlc-2.2.4-alsa-large-buffers.patch 1805 SHA256 1c31b7778b6f7249bc80de4e17ed1bad9ea8586f17cb7c990928842d702cdd01 SHA512 7376c79b935d56b51a3e039728764885b531435da92dad7d9f499bb47aff5363adb06405b86809cb5371ea45c34a28cf020a10d1edde4a16e59161c8bae2a7fd WHIRLPOOL 17d3969640a7ced8030497d89fd26c97923ace6918180a30a517915f0a7a7b436e06f795b90feae5b87be1b32b3bebcc28013f104b66b5eadcbfbe2bb26e4776
+AUX vlc-2.2.4-cxx0x.patch 598 SHA256 d7f4bd01278c1dfda8c72b41cdf54b7938b7e00ba5b537e6e3c367b4f0f3d94b SHA512 543357fdf86b56a236f2ff3f855e6ca3a3af2f5f6625539e923705671adcf29f8e3c967adf7f11bcec0e0d6646fcdb0c159bf70758bc2542b85f72eab8c280e4 WHIRLPOOL 6007ee11d3e1b9e68d50f553eef1b609df905f9356ee4f9140b14a0e4d6aefaae2b9b66d6e11f9b400250a0cc209f1d4a59c4f60f490d6993fa71d0ef9d1579b
+AUX vlc-2.2.4-decoder-lock-scope.patch 1337 SHA256 612460a2d8eb1f32412d1857fb62aa31d5dac0f0dca91700f1cbd7cf81a5cca3 SHA512 a81704adf25aa54cc8fa7c2f97117ef6c300af15c5b78b74b0df5ee4eba1d8e0f9d9b3b99e2793f7362d1727de24990fb555222bd5f73cce31df2c49371063a1 WHIRLPOOL 1161c4640213d96b8f4f295d44aafd3b0db111d614ccf50da2923204cdb05b21aab841082ef711386e47daecfcfa17f911d7035dae0e21d55af80b04e363f766
+AUX vlc-2.2.4-ffmpeg3.patch 6377 SHA256 61c21d875d3ea5e0475194cfb199e2a95f20a5357bb2a0001d86dd1f4a5d3652 SHA512 efede86f7d4c8a475f14c88405d4f9810784b93b8dbee8a21ca2f59b4a62ba008996fbd72ad77300b76a6faa328720a7b99afdd753480f2a17dc25204e52d2ee WHIRLPOOL 49286dda70c1e510c8727f77bfec43786d0ae2b477f528032bf45e1fb9f34f9943e4a213c26f3c06e370c1e4856c16acb5d933cc91590d145a985fde81acbd09
+AUX vlc-2.2.4-libav-11.7.patch 291 SHA256 21fa395ee76954181de78113c786015b65c7f3495cc0a3a58c4188ff4cf83b50 SHA512 f216833dc1ad5ddbf6a19b497238e9c850582f16eae452862a4c7c9acd110a0033879b3e3555177ac0ef30663cdd3f72d1a1020999c44e1f577ef665dd658315 WHIRLPOOL 66954f1ed951694bfaf92543cd4fec2bc6dd57f282b09a28434a32f8505f242b9c0cf2295fc841ac75b54afb4b1769aee09ab82d202c446280df8ea5d01eaf2c
+AUX vlc-2.2.4-qt57.patch 8624 SHA256 21f838efafed172bfdeab8ac6249cb5a965a7c74600705a987b7cbdfc5309e3e SHA512 4f7bf09fe6721c7bbaf26761c7f868dfe66b7b63e50892ee9b107a036c743331f14be9820cf0415ac5463b223699c86efe104092d13cda8d436073d0d76dad00 WHIRLPOOL a9a34ce734190b7f791efe0edf66f1c926ab7782f74a7a1679910edd6cd5e25e752deee3d2dfe239bdd312b8fa9974e0c455da6e7e064cfa9c6a9105b733e889
+AUX vlc-2.2.4-relax_ffmpeg.patch 1686 SHA256 3b76abff4553f581457252b6b98d3c3a537c91cd7b981f2f5a6772eb6597fd18 SHA512 a15862d6ac60575c0c338faff6052e3c28c4bd75f86f37ff8fbe36a64bc1a82689c56b2dc19f05109fc0913b85aab7ba28a94bfdd5fdd0e3c87cb7e6e58d1caa WHIRLPOOL aefdcf024869e7b074f3bc64ca12d187967edcbe31f03bb72a9d9dbb82be8453ec4866fae655a77ce4f500f8cae80e583de6e33b012c1f5ff1cc549a298a0596
+AUX vlc-2.2.6-decoder-lock-scope.patch 973 SHA256 7c6294f228b4bd67f2b3a400a92e4087d19ef612764e4da8ef13afee1d4c5250 SHA512 b6d360f4eb6923332a67605118c5a47ed2e54bedcc68625eb5f78313e971da66ab19998f3037dcc0ce588287da1510c93cf68247c47ae25d0b1305af931794e3 WHIRLPOOL a62009e9e088d8a0089f0fd4c8f5057ae9ee34c2011b24c01e4ca39752b56a146f514e50d2118ec70cfd4001b9b9cfb63eac1a711407d82f8b7c939d5f1122d5
+AUX vlc-9999-libva-1.2.1-compat.patch 291 SHA256 54eb34b32afe6876fa40abac2cb97097030f1d372bb81b63ef88231a17e5f237 SHA512 47b9d3f7a5e7c90045acac3b3253feb927da26646b6a457655669c1ab18f6a0e027160285695dc06642e6117ed1fcd87db90ae1f409e8fee737a2a41e80e1968 WHIRLPOOL df5cfdb4ba36ccd92e79de7b913b14c5416aca0834025dc51f8178db6c88f5eecb332ae7096800607d6f7526a56c7fb94e2f593bc0c0e19f643428bcd3eb5868
+DIST vlc-2.2.6.tar.xz 22198720 SHA256 c403d3accd9a400eb2181c958f3e7bc5524fe5738425f4253d42883b425a42a8 SHA512 9aff5922eb8b3c6a24e6153c367b0170dbc67602ae3e9304f52d2da00c9081d66cc98abd722b7c95b6c7d2e6cc7c86f21f9cba42c7d4bf29ca97d0f2d3553f8d WHIRLPOOL a2747219e4b12b4274468348c47c543f3266bb1ebc222d02f34d6679dfb8e56a6f2eebda4e1749de0eb91a84e3358700ea2e5ed1a6871ddfc9f19ef1e191cbc8
+EBUILD vlc-2.2.6-r2.ebuild 15134 SHA256 804fc96b79b99a02f61b208abedb08c170df0b3735ea28dce82bc8d101d30c7b SHA512 dd67d770e647236292a59212841addcb45ba9420b355c8f28c25493e9588f8513c7f05abf5fd05510d89ea544c227144c6322d3d97c8722aeba4fde5bcb2226e WHIRLPOOL ac3069096540ee23629a60d235f96d062561da4c4dd143285f06b164fe5744c8ee6cb761c8720aa5b9be94e4764ced13f8d5dbd3d075ed6814335f852a2b6d31
+EBUILD vlc-2.2.6.ebuild 15609 SHA256 e55f00b58026b01c6ef9c5e25d09c0ecc30cb43f03c50729eb34886e52eb0b78 SHA512 d096a788aadebe0494bf355e50da62405e0eeaaefd1870a98ffc30075ac2048b7237e1243f9bf092481122f11242bba838a41f6f5443ec51e973e40c8968e3e4 WHIRLPOOL 8fcc69f843ccd2d9708fc614ad0092ee1cf9429a67e37797ea41e91bbe9d2f5f96972bedbcced5954657949187b5970729bcbb618a4472b65ee531f92ffc9761
+EBUILD vlc-2.2.9999.ebuild 15130 SHA256 256dfc3a41f114002f8922c398389e50fbdf00db057750f24b635b9e730232d8 SHA512 92f703830575bd46c916ee3485cd0a51a13e331785f62033d5dc7229a78d229b7b9b2f9c6dbdfffc87b5c6902c6c1a079edf8f59a48869aaed01c6a621c010a1 WHIRLPOOL 1ac211c4901040dee387cb1cd33997aaa295e3439e99bcbcc76b78343f6e58c01109a54e322d888d62bceb620b9b938bb67d47eca8264d710782fa5838b92916
+EBUILD vlc-9999.ebuild 14422 SHA256 7b339733bdaf7f1af541d4b853c96d5abeecef74761768f1f3bb551add72b42a SHA512 ad69e3ea17c28faf9b001e8e9f32ff83d14f69d1ce8f9fe5f43f05b3eda8a8a4a7e79fe4ca6ed3157481c0f33df5a342317b0d6460d0f1ad67c35eb7eb617ea8 WHIRLPOOL 73b0046dd1b8b54d0c87bf624850223fe751b637d5a72a6d4a325ab8883f5d0c1a366046971de6909454b6c802bc4f78449e45c243bc2d6416f57e7deb6712c2
+MISC ChangeLog 13321 SHA256 f45f6f47a72e501ec9944e5f1e28abbf5de8d804eb4cf45c8c07703a3cc732df SHA512 e08dc2d7e9fa1804b123a670b61dde48284c4ea203c646515c0afaf5b153d80671c0908c8d96ec99ae1a3cdd909293b815807d7e3b587b4538667693da2f6aa8 WHIRLPOOL a2a04ba8047ede435df04a2e3a55c6c3041a9c362a4f6c65201be9bd97862f25e790acc2de11f6636a89c109c7d37f8ac2f1136de49fca4328e6d4b455a98957
+MISC ChangeLog-2011 113818 SHA256 34efd4743fdaa4b24df7042e0cff14ab00cc5fae0838bf489b2eea620654fcc2 SHA512 9b1060fc57d0a8912a38c269b7ec140287c883798f6f3528f0f2d43b5772817f31e0addf4f88f139b82cda4e094d2f9a30e3b9d1933022b81b974436ed158d9d WHIRLPOOL bfe449ace05bac74b195d82eb2b3648b2240f92dabf6446f6ba93ca51b7ecd999ab5b9247dfd1f1a7cdab8d309684ffcd1c829773a471d862c19814a18db7ffe
+MISC ChangeLog-2015 39367 SHA256 d9a2012ec353502b05977c190ed321f2c912e42f8fb46fc74841ab804a8f3afd SHA512 4c6d7f2eac460ffb22dc4c51bb28406ea3e2b24ac25601149441288fb2ab7b7bcca3c6ef0514b0da23c236625831352e0ab39242fca87c07eee242b175a27f90 WHIRLPOOL 40f38d620ec15e07e4da6ef5100c11c01c4b45f8184ea54530053dbce5e407a13ba6b623788a22c937550a39036b2f06f53554b751530b8cd1cf539978a44c57
+MISC metadata.xml 6325 SHA256 9fcd49f26f702a9fea65f92daff539e330ea244f2874a9aca725b1630e720fb2 SHA512 737cc412a5b4832df066631792744c3e8cecd217634af6cc8feed4c0ab89a3ba324312af73c6da545eeb7f861896c0237c0f47397cdfbcd6cf08de33293e1ea9 WHIRLPOOL b11b33c7f6bed2c1104bee34fc83013d44d6380fefdc4786b09b0855bd0233a11dae4ccf5cbf7d6438a3000af2f9bb79aa6d08f7c9c87050c9ae12d035fba9cf
diff --git a/media-video/vlc/files/qt4-select.patch b/media-video/vlc/files/qt4-select.patch
new file mode 100644
index 000000000000..fb1526a30a7a
--- /dev/null
+++ b/media-video/vlc/files/qt4-select.patch
@@ -0,0 +1,51 @@
+https://gist.github.com/karolherbst/fb9e3d8f6ba05f1f5d54
+For use until upstream ever accepts this patch or fixes it themsleves
+--- a/configure.ac
++++ b/configure.ac
+@@ -3709,7 +3709,8 @@
+   ])
+ ])
+ AS_IF([test "${enable_qt}" != "no"], [
+-  PKG_CHECK_MODULES([QT], [Qt5Core >= 5.1.0 Qt5Widgets Qt5Gui], [
++  AS_IF([test "${enable_qt}" != "4"], [
++    PKG_CHECK_MODULES([QT], [Qt5Core >= 5.1.0 Qt5Widgets Qt5Gui], [
+       PKG_CHECK_MODULES([QTX11], [Qt5X11Extras], [
+           VLC_ADD_LIBS([qt4],[${QTX11_LIBS}])
+           VLC_ADD_CXXFLAGS([qt4],[${QTX11_CFLAGS} -DQT5_HAS_X11])
+@@ -3721,20 +3722,23 @@
+       AC_PATH_PROGS(MOC, [moc-qt5 moc], moc, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
+       AC_PATH_PROGS(RCC, [rcc-qt5 rcc], rcc, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
+       AC_PATH_PROGS(UIC, [uic-qt5 uic], uic, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
++      enable_qt="5"
+-    ], [
+-      PKG_CHECK_MODULES([QT], [QtCore QtGui >= 4.6.0],, [
+-        AS_IF([test -n "${enable_qt}"],[
+-          AC_MSG_ERROR([${QT_PKG_ERRORS}.])
+-        ],[
+-          AC_MSG_WARN([${QT_PKG_ERRORS}.])
+-        ])
+-        enable_qt="no"
++    ])
++  ])
++  AS_IF([test "${enable_qt}" != "5"], [
++    PKG_CHECK_MODULES([QT], [QtCore QtGui >= 4.6.0],, [
++      AS_IF([test -n "${enable_qt}"],[
++        AC_MSG_ERROR([${QT_PKG_ERRORS}.])
++      ],[
++        AC_MSG_WARN([${QT_PKG_ERRORS}.])
+       ])
+-      QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix QtCore)"
+-      AC_PATH_PROGS(MOC, [moc-qt4 moc], moc, ["${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
+-      AC_PATH_PROG(RCC, rcc, rcc, [${QT_PATH}/bin ${CONTRIB_DIR}/bin])
+-      AC_PATH_PROGS(UIC, [uic-qt4 uic], uic, ["${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
++      enable_qt="no"
+     ])
++    QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix QtCore)"
++    AC_PATH_PROGS(MOC, [moc-qt4 moc], moc, ["${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
++    AC_PATH_PROG(RCC, rcc, rcc, [${QT_PATH}/bin ${CONTRIB_DIR}/bin])
++    AC_PATH_PROGS(UIC, [uic-qt4 uic], uic, ["${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
++  ])
+ ])
+ AS_IF([test "${enable_qt}" != "no"], [
+   VLC_ADD_PLUGIN([qt4])
+
diff --git a/media-video/vlc/files/vlc-2.1.0-TomWij-bisected-PA-broken-underflow.patch b/media-video/vlc/files/vlc-2.1.0-TomWij-bisected-PA-broken-underflow.patch
new file mode 100644
index 000000000000..3163410353a2
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.1.0-TomWij-bisected-PA-broken-underflow.patch
@@ -0,0 +1,23 @@
+index 2debbcd..72e7fcf 100644
+--- a/modules/audio_output/pulse.c
++++ b/modules/audio_output/pulse.c
+@@ -472,8 +472,17 @@ static void stream_underflow_cb(pa_stream *s, void *userdata)
+ {
++    uint32_t rate = pa_stream_get_sample_spec(s)->rate;
+     audio_output_t *aout = userdata;
+ 
+-    msg_Dbg(aout, "underflow");
+-    (void) s;
++    msg_Warn(aout, "underflow");
++    stream_stop(s, aout);
++
++    aout_sys_t *sys = aout->sys;
++    sys->first_pts = VLC_TS_INVALID;
++
++    pa_operation *op = pa_stream_update_sample_rate(s, rate, NULL, NULL);
++    if (unlikely(op == NULL))
++        return;
++    pa_operation_unref(op);
+ }
+ 
+ static int stream_wait(pa_stream *stream, pa_threaded_mainloop *mainloop)
diff --git a/media-video/vlc/files/vlc-2.1.0-fix-libtremor-libs.patch b/media-video/vlc/files/vlc-2.1.0-fix-libtremor-libs.patch
new file mode 100644
index 000000000000..8a58969d0d8e
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.1.0-fix-libtremor-libs.patch
@@ -0,0 +1,11 @@
+--- a/modules/codec/Makefile.am
++++ b/modules/codec/Makefile.am
+@@ -215,7 +215,7 @@
+ libtremor_plugin_la_SOURCES = codec/vorbis.c
+ libtremor_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DMODULE_NAME_IS_tremor
+ libtremor_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
+-libtremor_plugin_la_LIBADD = -lvorbisdec -logg
++libtremor_plugin_la_LIBADD = $(VORBIS_LIBS) $(OGG_LIBS)
+ EXTRA_LTLIBRARIES += libtremor_plugin.la
+ codec_LTLIBRARIES += $(LTLIBtremor)
+ 
diff --git a/media-video/vlc/files/vlc-2.2.2-qt5widgets.patch b/media-video/vlc/files/vlc-2.2.2-qt5widgets.patch
new file mode 100644
index 000000000000..a024d0032b6d
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.2.2-qt5widgets.patch
@@ -0,0 +1,13 @@
+--- vlc-2.2.2/configure.ac
++++ vlc-2.2.2/configure.ac
+@@ -3754,10 +3754,6 @@
+           AC_MSG_WARN([Not building Qt Interface with X11 helpers.])
+       ])
+ 
+-      PKG_CHECK_EXISTS([Qt5Core >= 5.5.0 Qt5Core < 5.6.0], [
+-        AC_MSG_ERROR(["You cannot build VLC with Qt-5.5.0. You need to backport I78ef29975181ee22429c9bd4b11d96d9e68b7a9c"])
+-      ])
+-
+       QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix Qt5Core)"
+       QT_HOST_PATH="$(eval $PKG_CONFIG --variable=host_bins Qt5Core)"
+       AC_PATH_PROGS(MOC, [moc-qt5 moc], moc, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
diff --git a/media-video/vlc/files/vlc-2.2.4-alsa-large-buffers.patch b/media-video/vlc/files/vlc-2.2.4-alsa-large-buffers.patch
new file mode 100644
index 000000000000..b5a9ff7267fb
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.2.4-alsa-large-buffers.patch
@@ -0,0 +1,47 @@
+X-Git-Url: https://git.videolan.org/?p=vlc.git;a=blobdiff_plain;f=modules%2Faudio_output%2Falsa.c;h=4e9fd53592d048baa8b57f30df15ab5806139d07;hp=2d1f99e9cb743bca12c6bdf32cc84a92d07fda8b;hb=47f74a83c161173b0d15e95dab8ceb7c97de51b4;hpb=6ae2905ef7fbc7de3a3a4a1bdf8ad6df46ce570a
+
+diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c
+index 2d1f99e..4e9fd53 100644
+--- a/modules/audio_output/alsa.c
++++ b/modules/audio_output/alsa.c
+@@ -495,6 +495,15 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt)
+     }
+     sys->rate = fmt->i_rate;
+ 
++#if 1 /* work-around for period-long latency outputs (e.g. PulseAudio): */
++    param = AOUT_MIN_PREPARE_TIME;
++    val = snd_pcm_hw_params_set_period_time_near (pcm, hw, &param, NULL);
++    if (val)
++    {
++        msg_Err (aout, "cannot set period: %s", snd_strerror (val));
++        goto error;
++    }
++#endif
+     /* Set buffer size */
+     param = AOUT_MAX_ADVANCE_TIME;
+     val = snd_pcm_hw_params_set_buffer_time_near (pcm, hw, &param, NULL);
+@@ -503,14 +512,22 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt)
+         msg_Err (aout, "cannot set buffer duration: %s", snd_strerror (val));
+         goto error;
+     }
+-
+-    param = AOUT_MIN_PREPARE_TIME;
++#if 0
++    val = snd_pcm_hw_params_get_buffer_time (hw, &param, NULL);
++    if (val)
++    {
++        msg_Warn (aout, "cannot get buffer time: %s", snd_strerror(val));
++        param = AOUT_MIN_PREPARE_TIME;
++    }
++    else
++        param /= 2;
+     val = snd_pcm_hw_params_set_period_time_near (pcm, hw, &param, NULL);
+     if (val)
+     {
+         msg_Err (aout, "cannot set period: %s", snd_strerror (val));
+         goto error;
+     }
++#endif
+ 
+     /* Commit hardware parameters */
+     val = snd_pcm_hw_params (pcm, hw);
diff --git a/media-video/vlc/files/vlc-2.2.4-cxx0x.patch b/media-video/vlc/files/vlc-2.2.4-cxx0x.patch
new file mode 100644
index 000000000000..cb3d63522de3
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.2.4-cxx0x.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac	2016-09-21 07:10:58.885508665 +0200
++++ b/configure.ac	2016-09-21 07:19:17.835725004 +0200
+@@ -3746,7 +3746,7 @@
+     PKG_CHECK_MODULES([QT], [Qt5Core >= 5.1.0 Qt5Widgets Qt5Gui], [
+       PKG_CHECK_MODULES([QTX11], [Qt5X11Extras], [
+           VLC_ADD_LIBS([qt4],[${QTX11_LIBS}])
+-          VLC_ADD_CXXFLAGS([qt4],[${QTX11_CFLAGS} -DQT5_HAS_X11])
++          VLC_ADD_CXXFLAGS([qt4],[${QTX11_CFLAGS} -DQT5_HAS_X11 -std=c++0x])
+           PKG_CHECK_MODULES([XI], [xi], [
+             VLC_ADD_LIBS([qt4], [${XI_LIBS}])
+             VLC_ADD_CXXFLAGS([qt4], [${XI_CFLAGS} -DHAVE_XI])
diff --git a/media-video/vlc/files/vlc-2.2.4-decoder-lock-scope.patch b/media-video/vlc/files/vlc-2.2.4-decoder-lock-scope.patch
new file mode 100644
index 000000000000..51a2cdcb16da
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.2.4-decoder-lock-scope.patch
@@ -0,0 +1,47 @@
+X-Git-Url: https://git.videolan.org/?p=vlc.git;a=blobdiff_plain;f=src%2Finput%2Fdecoder.c;h=fe3cd428c65c18bfbdadb55baf11521afdc2bfc7;hp=83aa5bf54e2c29ad93fae803117558e4fcd0f658;hb=6ae2905ef7fbc7de3a3a4a1bdf8ad6df46ce570a;hpb=5b2de76965ee8b1ab5e3257f8b6d71bbb4e9e3f9
+
+--- a/src/input/decoder.c
++++ b/src/input/decoder.c
+@@ -1162,7 +1162,10 @@
+         b_paused = p_owner->b_paused;
+ 
+         if (!p_audio)
++        {
++            vlc_mutex_unlock( &p_owner->lock );
+             break;
++        }
+ 
+         /* */
+         int i_rate = INPUT_RATE_DEFAULT;
+@@ -1180,6 +1183,9 @@
+ 
+         if( unlikely(p_owner->b_paused != b_paused) )
+             continue; /* race with input thread? retry... */
++
++        vlc_mutex_unlock( &p_owner->lock );
++
+         if( p_aout == NULL )
+             b_reject = true;
+ 
+@@ -1199,7 +1205,6 @@
+ 
+         break;
+     }
+-    vlc_mutex_unlock( &p_owner->lock );
+ }
+ 
+ static void DecoderDecodeAudio( decoder_t *p_dec, block_t *p_block )
+@@ -1961,11 +1966,10 @@
+ 
+         /* Parameters changed, restart the aout */
+         vlc_mutex_lock( &p_owner->lock );
+-
+-        aout_DecDelete( p_owner->p_aout );
+         p_owner->p_aout = NULL;
+-
+         vlc_mutex_unlock( &p_owner->lock );
++        aout_DecDelete( p_owner->p_aout );
++
+         input_resource_PutAout( p_owner->p_resource, p_aout );
+     }
+ 
diff --git a/media-video/vlc/files/vlc-2.2.4-ffmpeg3.patch b/media-video/vlc/files/vlc-2.2.4-ffmpeg3.patch
new file mode 100644
index 000000000000..3bc5954920d0
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.2.4-ffmpeg3.patch
@@ -0,0 +1,160 @@
+Index: vlc-2.2.4/configure.ac
+===================================================================
+--- vlc-2.2.4.orig/configure.ac
++++ vlc-2.2.4/configure.ac
+@@ -2323,8 +2323,8 @@ AC_ARG_ENABLE(avcodec,
+ [  --enable-avcodec        libavcodec codec (default enabled)])
+ AS_IF([test "${enable_avcodec}" != "no"], [
+   PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [
+-    PKG_CHECK_EXISTS([libavutil < 55],, [
+-      AC_MSG_ERROR([libavutil versions 55 and later are not supported.])
++    PKG_CHECK_EXISTS([libavutil < 56],, [
++      AC_MSG_ERROR([libavutil versions 56 and later are not supported.])
+     ])
+     VLC_SAVE_FLAGS
+     CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
+Index: vlc-2.2.4/modules/codec/avcodec/audio.c
+===================================================================
+--- vlc-2.2.4.orig/modules/codec/avcodec/audio.c
++++ vlc-2.2.4/modules/codec/avcodec/audio.c
+@@ -39,8 +39,6 @@
+ #include <libavcodec/avcodec.h>
+ #include <libavutil/mem.h>
+ 
+-#include <libavutil/audioconvert.h>
+-
+ #include "avcodec.h"
+ 
+ /*****************************************************************************
+Index: vlc-2.2.4/modules/codec/avcodec/encoder.c
+===================================================================
+--- vlc-2.2.4.orig/modules/codec/avcodec/encoder.c
++++ vlc-2.2.4/modules/codec/avcodec/encoder.c
+@@ -41,7 +41,6 @@
+ #include <vlc_cpu.h>
+ 
+ #include <libavcodec/avcodec.h>
+-#include <libavutil/audioconvert.h>
+ 
+ #include "avcodec.h"
+ #include "avcommon.h"
+@@ -311,7 +310,7 @@ int OpenEncoder( vlc_object_t *p_this )
+     else if( !GetFfmpegCodec( p_enc->fmt_out.i_codec, &i_cat, &i_codec_id,
+                              &psz_namecodec ) )
+     {
+-        if( FindFfmpegChroma( p_enc->fmt_out.i_codec ) == PIX_FMT_NONE )
++        if( FindFfmpegChroma( p_enc->fmt_out.i_codec ) == AV_PIX_FMT_NONE )
+             return VLC_EGENERIC; /* handed chroma output */
+ 
+         i_cat      = VIDEO_ES;
+@@ -555,7 +554,7 @@ int OpenEncoder( vlc_object_t *p_this )
+ 
+         if( p_codec->pix_fmts )
+         {
+-            const enum PixelFormat *p = p_codec->pix_fmts;
++            const enum AVPixelFormat *p = p_codec->pix_fmts;
+             for( ; *p != -1; p++ )
+             {
+                 if( *p == p_context->pix_fmt ) break;
+@@ -1017,7 +1016,7 @@ errmsg:
+         }
+     }
+ 
+-    p_sys->frame = avcodec_alloc_frame();
++    p_sys->frame = av_frame_alloc();
+     if( !p_sys->frame )
+     {
+         goto error;
+@@ -1088,7 +1087,7 @@ static block_t *EncodeVideo( encoder_t *
+     AVFrame *frame = NULL;
+     if( likely(p_pict) ) {
+         frame = p_sys->frame;
+-        avcodec_get_frame_defaults( frame );
++        av_frame_unref( frame );
+         for( i_plane = 0; i_plane < p_pict->i_planes; i_plane++ )
+         {
+             p_sys->frame->data[i_plane] = p_pict->p[i_plane].p_pixels;
+@@ -1329,7 +1328,7 @@ static block_t *handle_delay_buffer( enc
+     //How much we need to copy from new packet
+     const int leftover = leftover_samples * p_sys->p_context->channels * p_sys->i_sample_bytes;
+ 
+-    avcodec_get_frame_defaults( p_sys->frame );
++    av_frame_unref( p_sys->frame );
+     p_sys->frame->format     = p_sys->p_context->sample_fmt;
+     p_sys->frame->nb_samples = leftover_samples + p_sys->i_samples_delay;
+ 
+@@ -1451,7 +1450,7 @@ static block_t *EncodeAudio( encoder_t *
+     while( ( p_aout_buf->i_nb_samples >= p_sys->i_frame_size ) ||
+            ( p_sys->b_variable && p_aout_buf->i_nb_samples ) )
+     {
+-        avcodec_get_frame_defaults( p_sys->frame );
++        av_frame_unref( p_sys->frame );
+         if( p_sys->b_variable )
+             p_sys->frame->nb_samples = p_aout_buf->i_nb_samples;
+         else
+Index: vlc-2.2.4/modules/codec/avcodec/vaapi.c
+===================================================================
+--- vlc-2.2.4.orig/modules/codec/avcodec/vaapi.c
++++ vlc-2.2.4/modules/codec/avcodec/vaapi.c
+@@ -598,7 +598,7 @@ static int Create( vlc_va_t *p_va, AVCod
+         return err;
+ 
+     /* Only VLD supported */
+-    p_va->pix_fmt = PIX_FMT_VAAPI_VLD;
++    p_va->pix_fmt = AV_PIX_FMT_VAAPI_VLD;
+     p_va->setup = Setup;
+     p_va->get = Get;
+     p_va->release = Release;
+Index: vlc-2.2.4/modules/codec/avcodec/video.c
+===================================================================
+--- vlc-2.2.4.orig/modules/codec/avcodec/video.c
++++ vlc-2.2.4/modules/codec/avcodec/video.c
+@@ -108,8 +108,8 @@ static int lavc_GetFrame(struct AVCodecC
+ static int  ffmpeg_GetFrameBuf    ( struct AVCodecContext *, AVFrame * );
+ static void ffmpeg_ReleaseFrameBuf( struct AVCodecContext *, AVFrame * );
+ #endif
+-static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *,
+-                                          const enum PixelFormat * );
++static enum AVPixelFormat ffmpeg_GetFormat( AVCodecContext *,
++                                          const enum AVPixelFormat * );
+ 
+ static uint32_t ffmpeg_CodecTag( vlc_fourcc_t fcc )
+ {
+@@ -234,7 +234,7 @@ int InitVideoDec( decoder_t *p_dec, AVCo
+     p_sys->p_codec = p_codec;
+     p_sys->i_codec_id = i_codec_id;
+     p_sys->psz_namecodec = psz_namecodec;
+-    p_sys->p_ff_pic = avcodec_alloc_frame();
++    p_sys->p_ff_pic = av_frame_alloc();
+     p_sys->b_delayed_open = true;
+     p_sys->p_va = NULL;
+     vlc_sem_init( &p_sys->sem_mt, 0 );
+@@ -446,7 +446,7 @@ int InitVideoDec( decoder_t *p_dec, AVCo
+     if( ffmpeg_OpenCodec( p_dec ) < 0 )
+     {
+         msg_Err( p_dec, "cannot open codec (%s)", p_sys->psz_namecodec );
+-        avcodec_free_frame( &p_sys->p_ff_pic );
++        av_frame_free( &p_sys->p_ff_pic );
+         vlc_sem_destroy( &p_sys->sem_mt );
+         free( p_sys );
+         return VLC_EGENERIC;
+@@ -826,7 +826,7 @@ void EndVideoDec( decoder_t *p_dec )
+     wait_mt( p_sys );
+ 
+     if( p_sys->p_ff_pic )
+-        avcodec_free_frame( &p_sys->p_ff_pic );
++        av_frame_free( &p_sys->p_ff_pic );
+ 
+     if( p_sys->p_va )
+         vlc_va_Delete( p_sys->p_va );
+@@ -1313,8 +1313,8 @@ static void ffmpeg_ReleaseFrameBuf( stru
+ }
+ #endif
+ 
+-static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
+-                                          const enum PixelFormat *pi_fmt )
++static enum AVPixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
++                                          const enum AVPixelFormat *pi_fmt )
+ {
+     decoder_t *p_dec = p_context->opaque;
+     decoder_sys_t *p_sys = p_dec->p_sys;
diff --git a/media-video/vlc/files/vlc-2.2.4-libav-11.7.patch b/media-video/vlc/files/vlc-2.2.4-libav-11.7.patch
new file mode 100644
index 000000000000..932223632d73
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.2.4-libav-11.7.patch
@@ -0,0 +1,10 @@
+--- a/modules/codec/avcodec/audio.c	2016-09-10 13:46:51.066453337 -0700
++++ a/modules/codec/avcodec/audio.c	2016-09-10 13:42:26.061451090 -0700
+@@ -38,6 +38,7 @@ 
+ 
+ #include <libavcodec/avcodec.h>
+ #include <libavutil/mem.h>
++#include <libavutil/channel_layout.h>
+ 
+ #include "avcodec.h"
+ 
diff --git a/media-video/vlc/files/vlc-2.2.4-qt57.patch b/media-video/vlc/files/vlc-2.2.4-qt57.patch
new file mode 100644
index 000000000000..97472a64c398
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.2.4-qt57.patch
@@ -0,0 +1,284 @@
+As the 2.2 headers are still using vlc_atomics (picture)
+we cannot have a way to avoid collisions with early
+or late <atomic> inclusion when using GCC >= 4.7
+
+Conditionals in vlc_atomic won't work.
+
+Happens in ProjectM and Qt5.
+---
+ modules/gui/qt4/actions_manager.cpp                |  2 ++
+ modules/gui/qt4/adapters/seekpoints.cpp            |  4 +--
+ modules/gui/qt4/adapters/seekpoints.hpp            |  4 +--
+ modules/gui/qt4/components/controller.cpp          |  2 ++
+ .../gui/qt4/components/playlist/playlist_model.hpp |  4 +--
+ modules/gui/qt4/components/playlist/views.cpp      |  6 ++++
+ modules/gui/qt4/dialogs/messages.cpp               |  2 ++
+ modules/gui/qt4/dialogs/vlm.cpp                    |  4 ---
+ modules/gui/qt4/dialogs/vlm.hpp                    |  4 ++-
+ modules/gui/qt4/input_manager.cpp                  |  2 ++
+ modules/gui/qt4/input_manager.hpp                  |  3 +-
+ modules/gui/qt4/menus.cpp                          |  2 ++
+ modules/gui/qt4/qt4.hpp                            | 32 ++++++++++++++++++----
+ modules/gui/qt4/util/pictureflow.cpp               |  2 ++
+ modules/visualization/projectm.cpp                 |  4 +++
+ 15 files changed, 56 insertions(+), 21 deletions(-)
+
+diff --git a/modules/gui/qt4/actions_manager.cpp b/modules/gui/qt4/actions_manager.cpp
+index eff40d9..b7ca967 100644
+--- a/modules/gui/qt4/actions_manager.cpp
++++ b/modules/gui/qt4/actions_manager.cpp
+@@ -25,6 +25,8 @@
+ # include "config.h"
+ #endif
+ 
++#include "qt4.hpp"
++
+ #include <vlc_vout.h>
+ #include <vlc_keys.h>
+ 
+diff --git a/modules/gui/qt4/adapters/seekpoints.cpp b/modules/gui/qt4/adapters/seekpoints.cpp
+index fbf2957..a3564bb 100644
+--- a/modules/gui/qt4/adapters/seekpoints.cpp
++++ b/modules/gui/qt4/adapters/seekpoints.cpp
+@@ -19,14 +19,12 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+  *****************************************************************************/
+ 
++#include "seekpoints.hpp"
+ 
+ #include "recents.hpp"
+ #include "dialogs_provider.hpp"
+ #include "menus.hpp"
+ 
+-#include "seekpoints.hpp"
+-
+-#include "qt4.hpp"
+ #include "input_manager.hpp"
+ 
+ SeekPoints::SeekPoints( QObject *parent, intf_thread_t *p_intf_ ) :
+diff --git a/modules/gui/qt4/adapters/seekpoints.hpp b/modules/gui/qt4/adapters/seekpoints.hpp
+index 0083989..bbb9214 100644
+--- a/modules/gui/qt4/adapters/seekpoints.hpp
++++ b/modules/gui/qt4/adapters/seekpoints.hpp
+@@ -22,9 +22,7 @@
+ #ifndef SEEKPOINTS_HPP
+ #define SEEKPOINTS_HPP
+ 
+-#ifdef HAVE_CONFIG_H
+-#include "config.h"
+-#endif
++#include "qt4.hpp"
+ 
+ #include <vlc_common.h>
+ #include <vlc_interface.h>
+diff --git a/modules/gui/qt4/components/controller.cpp b/modules/gui/qt4/components/controller.cpp
+index d93e0db..c43d929 100644
+--- a/modules/gui/qt4/components/controller.cpp
++++ b/modules/gui/qt4/components/controller.cpp
+@@ -26,6 +26,8 @@
+ # include "config.h"
+ #endif
+ 
++#include "qt4.hpp"
++
+ #include <vlc_vout.h>                       /* vout_thread_t for FSC */
+ 
+ /* Widgets */
+diff --git a/modules/gui/qt4/components/playlist/playlist_model.hpp b/modules/gui/qt4/components/playlist/playlist_model.hpp
+index f9d1d0c..1f71ac9 100644
+--- a/modules/gui/qt4/components/playlist/playlist_model.hpp
++++ b/modules/gui/qt4/components/playlist/playlist_model.hpp
+@@ -25,9 +25,7 @@
+ #ifndef _PLAYLIST_MODEL_H_
+ #define _PLAYLIST_MODEL_H_
+ 
+-#ifdef HAVE_CONFIG_H
+-# include "config.h"
+-#endif
++#include "qt4.hpp"
+ 
+ #include <vlc_input.h>
+ #include <vlc_playlist.h>
+diff --git a/modules/gui/qt4/components/playlist/views.cpp b/modules/gui/qt4/components/playlist/views.cpp
+index 59f6535..0066205 100644
+--- a/modules/gui/qt4/components/playlist/views.cpp
++++ b/modules/gui/qt4/components/playlist/views.cpp
+@@ -21,6 +21,12 @@
+  * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+  *****************************************************************************/
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
++#include "qt4.hpp"
++
+ #include "components/playlist/views.hpp"
+ #include "components/playlist/vlc_model.hpp"      /* VLCModel */
+ #include "components/playlist/sorting.h"          /* Columns List */
+diff --git a/modules/gui/qt4/dialogs/messages.cpp b/modules/gui/qt4/dialogs/messages.cpp
+index 30793a2..9c79c99 100644
+--- a/modules/gui/qt4/dialogs/messages.cpp
++++ b/modules/gui/qt4/dialogs/messages.cpp
+@@ -24,6 +24,8 @@
+ # include "config.h"
+ #endif
+ 
++#include "qt4.hpp"
++
+ #include "dialogs/messages.hpp"
+ 
+ #include <QPlainTextEdit>
+diff --git a/modules/gui/qt4/dialogs/vlm.cpp b/modules/gui/qt4/dialogs/vlm.cpp
+index 0da88cc..595f015 100644
+--- a/modules/gui/qt4/dialogs/vlm.cpp
++++ b/modules/gui/qt4/dialogs/vlm.cpp
+@@ -23,10 +23,6 @@
+  * Foundation, Inc., 51 Franklin street, Fifth Floor, Boston MA 02110-1301, USA.
+  *****************************************************************************/
+ 
+-#ifdef HAVE_CONFIG_H
+-# include "config.h"
+-#endif
+-
+ #include "dialogs/vlm.hpp"
+ 
+ #ifdef ENABLE_VLM
+diff --git a/modules/gui/qt4/dialogs/vlm.hpp b/modules/gui/qt4/dialogs/vlm.hpp
+index a3c6e5d..dcf7110 100644
+--- a/modules/gui/qt4/dialogs/vlm.hpp
++++ b/modules/gui/qt4/dialogs/vlm.hpp
+@@ -25,8 +25,10 @@
+ #ifndef QVLC_VLM_DIALOG_H_
+ #define QVLC_VLM_DIALOG_H_ 1
+ 
++#include "qt4.hpp"
++
+ #ifdef HAVE_CONFIG_H
+-# include "config.h"
++#include "config.h"
+ #endif
+ 
+ #ifdef ENABLE_VLM
+diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
+index fd45f4a..c50cb6c 100644
+--- a/modules/gui/qt4/input_manager.cpp
++++ b/modules/gui/qt4/input_manager.cpp
+@@ -30,6 +30,8 @@
+ # include "config.h"
+ #endif
+ 
++#include "qt4.hpp"
++
+ #include "input_manager.hpp"
+ #include "recents.hpp"
+ 
+diff --git a/modules/gui/qt4/input_manager.hpp b/modules/gui/qt4/input_manager.hpp
+index 7d3b76a..4fbecbb 100644
+--- a/modules/gui/qt4/input_manager.hpp
++++ b/modules/gui/qt4/input_manager.hpp
+@@ -29,9 +29,10 @@
+ # include "config.h"
+ #endif
+ 
++#include "qt4.hpp"
++
+ #include <vlc_input.h>
+ 
+-#include "qt4.hpp"
+ #include "util/singleton.hpp"
+ #include "adapters/variables.hpp"
+ 
+diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
+index 116e98c..46240b0 100644
+--- a/modules/gui/qt4/menus.cpp
++++ b/modules/gui/qt4/menus.cpp
+@@ -34,6 +34,8 @@
+ # include "config.h"
+ #endif
+ 
++#include "qt4.hpp"
++
+ #include <vlc_common.h>
+ #include <vlc_intf_strings.h>
+ #include <vlc_vout.h>                             /* vout_thread_t */
+diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp
+index 44d7db6..5aec957 100644
+--- a/modules/gui/qt4/qt4.hpp
++++ b/modules/gui/qt4/qt4.hpp
+@@ -29,12 +29,7 @@
+ # include "config.h"
+ #endif
+ 
+-#include <vlc_common.h>    /* VLC_COMMON_MEMBERS for vlc_interface.h */
+-#include <vlc_interface.h> /* intf_thread_t */
+-#include <vlc_playlist.h>  /* playlist_t */
+-
+-#define QT_NO_CAST_TO_ASCII
+-#include <QString>
++#include <QtGlobal>
+ 
+ #if ( QT_VERSION < 0x040600 )
+ # error Update your Qt version to at least 4.6.0
+@@ -43,6 +38,31 @@
+ #define HAS_QT47 ( QT_VERSION >= 0x040700 )
+ #define HAS_QT5  ( QT_VERSION >= 0x050000 )
+ 
++#if HAS_QT5
++  #include <QtCore/qcompilerdetection.h>
++  #if defined(Q_COMPILER_ATOMICS) && \
++             ( __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7 ) )
++   #define VLC_ATOMIC_H
++   #include <atomic>
++   using namespace std;
++   #  define atomic_store(object,desired) \
++      do { \
++          *(object) = (desired); \
++          __sync_synchronize(); \
++      } while (0)
++
++   #  define atomic_load(object) \
++       (__sync_synchronize(), *(object))
++  #endif
++#endif
++
++#include <vlc_common.h>    /* VLC_COMMON_MEMBERS for vlc_interface.h */
++#include <vlc_interface.h> /* intf_thread_t */
++#include <vlc_playlist.h>  /* playlist_t */
++
++#define QT_NO_CAST_TO_ASCII
++#include <QString>
++
+ enum {
+     DialogEventTypeOffset = 0,
+     IMEventTypeOffset     = 100,
+diff --git a/modules/gui/qt4/util/pictureflow.cpp b/modules/gui/qt4/util/pictureflow.cpp
+index 9318953..a7e6a01 100644
+--- a/modules/gui/qt4/util/pictureflow.cpp
++++ b/modules/gui/qt4/util/pictureflow.cpp
+@@ -29,6 +29,8 @@
+   THE SOFTWARE.
+ */
+ 
++#include "qt4.hpp"
++
+ #include "pictureflow.hpp"
+ 
+ #include <QApplication>
+diff --git a/modules/visualization/projectm.cpp b/modules/visualization/projectm.cpp
+index e80fbf4..96d532d 100644
+--- a/modules/visualization/projectm.cpp
++++ b/modules/visualization/projectm.cpp
+@@ -30,6 +30,10 @@
+ #endif
+ 
+ #include <assert.h>
++#if defined(__GNUC__) && \
++           ( __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7 ) )
++  #define VLC_ATOMIC_H /* Ensure C atomics wont collide with old intrinsics */
++#endif
+ 
+ #include <vlc_common.h>
+ #include <vlc_plugin.h>
+-- 
+2.7.4
diff --git a/media-video/vlc/files/vlc-2.2.4-relax_ffmpeg.patch b/media-video/vlc/files/vlc-2.2.4-relax_ffmpeg.patch
new file mode 100644
index 000000000000..218af58281fa
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.2.4-relax_ffmpeg.patch
@@ -0,0 +1,45 @@
+commit b8869f97ea66ac7ec9912a74c2e8b5e15daf7752
+Author: Rafaël Carré <funman@videolan.org>
+Date:   Fri Feb 26 00:36:26 2016 +0000
+
+    Relax requirements for FFmpeg hwaccel
+    
+    It doesn't error out anymore since 5edd1f62ca1
+
+Index: vlc-2.2.4/configure.ac
+===================================================================
+--- vlc-2.2.4.orig/configure.ac
++++ vlc-2.2.4/configure.ac
+@@ -2383,7 +2383,9 @@ AS_IF([test "${have_vaapi}" = "yes" -a "
+   case "${avfork}" in
+     ffmpeg)
+       PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
+-        AC_MSG_ERROR([VA API requires FFmpeg libavcodec < 57.10 or libav.])
++        PKG_CHECK_EXISTS([libavcodec <= 57.12.100], [
++          AC_MSG_ERROR([VA API requires FFmpeg libavcodec < 57.10 or > 57.12 or libav.])
++        ])
+       ])
+       ;;
+   esac
+@@ -2417,7 +2419,9 @@ AS_IF([test "${enable_dxva2}" != "no"],
+     case "${avfork}" in
+       ffmpeg)
+         PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
+-          AC_MSG_ERROR([DXVA2 requires FFmpeg libavcodec < 57.10 or libav.])
++          PKG_CHECK_EXISTS([libavcodec <= 57.12.100], [
++            AC_MSG_ERROR([DXVA2 requires FFmpeg libavcodec < 57.10 or > 57.12 or libav.])
++          ])
+         ])
+         ;;
+     esac
+@@ -3181,7 +3185,9 @@ AS_IF([test "${have_vdpau}" = "yes" -a "
+     libav) av_vdpau_ver="55.26.0" ;;
+     ffmpeg) av_vdpau_ver="55.42.100"
+       PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
+-        AC_MSG_ERROR([VDPAU requires FFmpeg libavcodec < 57.10 or libav.])
++        PKG_CHECK_EXISTS([libavcodec <= 57.12.100], [
++          AC_MSG_ERROR([VDPAU requires FFmpeg libavcodec < 57.10 or > 57.12 or libav.])
++        ])
+       ])
+       ;;
+   esac
diff --git a/media-video/vlc/files/vlc-2.2.6-decoder-lock-scope.patch b/media-video/vlc/files/vlc-2.2.6-decoder-lock-scope.patch
new file mode 100644
index 000000000000..2e8064446d05
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.2.6-decoder-lock-scope.patch
@@ -0,0 +1,34 @@
+X-Git-Url: https://git.videolan.org/?p=vlc.git;a=blobdiff_plain;f=src%2Finput%2Fdecoder.c;h=fe3cd428c65c18bfbdadb55baf11521afdc2bfc7;hp=83aa5bf54e2c29ad93fae803117558e4fcd0f658;hb=6ae2905ef7fbc7de3a3a4a1bdf8ad6df46ce570a;hpb=5b2de76965ee8b1ab5e3257f8b6d71bbb4e9e3f9
+
+--- a/src/input/decoder.c
++++ b/src/input/decoder.c
+@@ -1162,7 +1162,10 @@
+         b_paused = p_owner->b_paused;
+ 
+         if (!p_audio)
++        {
++            vlc_mutex_unlock( &p_owner->lock );
+             break;
++        }
+ 
+         /* */
+         int i_rate = INPUT_RATE_DEFAULT;
+@@ -1180,6 +1183,9 @@
+ 
+         if( unlikely(p_owner->b_paused != b_paused) )
+             continue; /* race with input thread? retry... */
++
++        vlc_mutex_unlock( &p_owner->lock );
++
+         if( p_aout == NULL )
+             b_reject = true;
+ 
+@@ -1199,7 +1205,6 @@
+ 
+         break;
+     }
+-    vlc_mutex_unlock( &p_owner->lock );
+ }
+ 
+ static void DecoderDecodeAudio( decoder_t *p_dec, block_t *p_block )
+ 
diff --git a/media-video/vlc/files/vlc-9999-libva-1.2.1-compat.patch b/media-video/vlc/files/vlc-9999-libva-1.2.1-compat.patch
new file mode 100644
index 000000000000..adfdefec56af
--- /dev/null
+++ b/media-video/vlc/files/vlc-9999-libva-1.2.1-compat.patch
@@ -0,0 +1,12 @@
+--- a/modules/codec/avcodec/vaapi.c
++++ b/modules/codec/avcodec/vaapi.c
+@@ -34,6 +34,9 @@
+ #ifdef VLC_VA_BACKEND_XLIB
+ # include <vlc_xlib.h>
+ # include <va/va_x11.h>
++#if VA_MINOR_VERSION >= 34
++# include <va/va_compat.h>
++#endif
+ #endif
+ #ifdef VLC_VA_BACKEND_DRM
+ # include <sys/types.h>
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
new file mode 100644
index 000000000000..688bffbb09ad
--- /dev/null
+++ b/media-video/vlc/metadata.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+	<use>
+		<flag name="atmo">Enables support for AtmoLight (homebrew Ambient Lighting Technology)</flag>
+		<flag name="audioqueue">Enables AudioQueue audio module for Mac OS X.</flag>
+		<flag name="avcodec">Enables libavcodec support for video/audio encoding/decoding. libavcodec is part of FFmpeg.</flag>
+		<flag name="avformat">Enables libformat support for reading and writing various media containers. libavformat is part of FFmpeg.</flag>
+		<flag name="bluray">Enables libbluray for Blu-ray disc support.</flag>
+		<flag name="chromaprint">Enables libchromaprint for Chromaprint based audio fingerprinter support.</flag>
+		<flag name="chromecast">Enable experimental support for Google Chromecast.</flag>
+		<flag name="dc1394">Enables IIDC cameras support.</flag>
+		<flag name="directx">Enable Win32 DirectX support.</flag>
+		<flag name="dvbpsi">Enables support for Mpeg-TS files (.ts, .m2ts, .mts) via <pkg>media-libs/libdvbpsi</pkg>.</flag>
+		<flag name="dxva2">Enables Win32 DxVA2 support.</flag>
+		<flag name="faad">Enable AAC audio decoding library support via media-libs/faad2.</flag>
+		<flag name="fdk">Enables the Fraunhofer AAC codec library.</flag>
+		<flag name="fluidsynth">Enables Fluidsynth MIDI software synthesis (with external sound fonts).</flag>
+		<flag name="gcrypt">Enables cryptography support via libgcrypt.</flag>
+		<flag name="gme">Enables support for <pkg>media-libs/game-music-emu</pkg> for playing various video game music formats.</flag>
+		<flag name="gnome">Adds support for GNOME's filesystem abstraction layer, <pkg>gnome-base/gnome-vfs</pkg>. This flag is not GUI-related.</flag>
+		<flag name="growl">Enables growl notification support (over UDP for remote access and native on OSX)</flag>
+		<flag name="gstreamer">Enables GStreamer based decoding support (currently supports only video decoding)</flag>
+		<flag name="httpd">Enables a web based interface for vlc.</flag>
+		<flag name="kate">Adds support for Ogg Kate subtitles via libkate.</flag>
+		<flag name="libtar">Uses libtar instead of the built-in tar reader for reading custom skins.</flag>
+		<flag name="libtiger">Enables Ogg Kate subtitles rendering using libtiger.</flag>
+		<flag name="linsys">Enables support for Linux Linear Systems Ltd. SDI and HD-SDI input cards.</flag>
+		<flag name="live">Enables live555 streaming media support (client support for rtsp).</flag>
+		<flag name="lua">Enable Lua scripting support, needed for including support for Jamendo (online music platform) and similar things.</flag>
+		<flag name="macosx-dialog-provider">Enables Mac OS X dialog module.</flag>
+		<flag name="macosx-eyetv">Enables Mac OS X EyeTV (TNT Tuner) module.</flag>
+		<flag name="macosx-notifications">Enables Mac OS X notifications module (formerly growl).</flag>
+		<flag name="macosx-quartztext">Enables Mac OS X quartz text module.</flag>
+		<flag name="macosx-qtkit">Enables Mac OS X qtkit module: qtcapture (video) and qtsound (audio) module.</flag>
+		<flag name="matroska">Enables matroska support using reference libraries (fallback on other existing matroska support if disabled, i.e., matroska enabled FFmpeg)</flag>
+		<flag name="mpeg">Add libmpeg2 support for mpeg-1 and mpeg-2 video streams</flag>
+		<flag name="omxil">Enables OpenMAX Integration Layer codec module.</flag>
+		<flag name="optimisememory">Enable optimisation for memory rather than performance.</flag>
+		<flag name="opencv">Enabled OpenCV (computer vision) filter module.</flag>
+		<flag name="opus">Support opus decoding via libopus.</flag>
+		<flag name="postproc">Enables image post-processing via libpostproc (part of FFmpeg).</flag>
+		<flag name="projectm">Enables the projectM visualization plugin.</flag>
+		<flag name="qt4" restrict="&gt;=media-video/vlc-0.9">Builds a Qt4 based frontend, a graphical interface.</flag>
+		<flag name="qt5" restrict="&gt;=media-video/vlc-2.2">Builds a Qt5 based frontend, a graphical interface (overrides qt4).</flag>
+		<flag name="rtsp">Enables real audio and RTSP modules.</flag>
+		<flag name="run-as-root">Allows vlc to start for root. Don't enable this unless you have a very specific (e.g. embedded) need for it!</flag>
+		<flag name="schroedinger">Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec).</flag>
+		<flag name="sid">Adds support for playing C64 SID files through <pkg>media-libs/libsidplay</pkg>:2.</flag>
+		<flag name="sdl-image">Enables sdl image video decoder (depends on sdl)</flag>
+		<flag name="sftp">Enables libssh2 to support SFTP file transfer.</flag>
+		<flag name="shout">Enables libshout output.</flag>
+		<flag name="skins">Enables support for the skins2 interface.</flag>
+		<flag name="swscale">Enables image scaling and conversion via libswscale (part of FFmpeg).</flag>
+		<flag name="tremor">Enables tremor, a fixed-point version of the Ogg Vorbis decoder.</flag>
+		<flag name="twolame">Enables twolame support (MPEG Audio Layer 2 encoder).</flag>
+		<flag name="upnp">Enables support for the Intel SDK stack based UPnP discovery module instead of CyberLink.</flag>
+		<flag name="vcdx">Enables VCD with navigation via libvcdinfo (depends on cdio)</flag>
+		<flag name="vlm">New videolan (media) manager (vlm), a little manager designed to launch and manage multiple streams from within one instance of VLC.</flag>
+		<flag name="vpx">Enables the decoder(s) from the WebM VP8 / VP9 Codec SDK.</flag>
+		<flag name="wma-fixed">Enables fixed point WMA decoder.</flag>
+		<flag name="X">Enables support for, e.g., fullscreen mode via the X Window System. By itself, this flag does not build a graphical interface.</flag>
+		<flag name="xcb">Support the X C-language Binding, a replacement for Xlib; !!! you will need this option to be able to integrate video in the Qt interface, see bug #500678.</flag>
+		<flag name="x265">Support X265 Encoder.</flag>
+		<flag name="zeroconf">Enables support for zero-configuration networking via avahi.</flag>
+		<flag name="zvbi">Enables support for teletext subtitles via the zvbi library.</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-video/vlc/vlc-2.2.6-r2.ebuild b/media-video/vlc/vlc-2.2.6-r2.ebuild
new file mode 100644
index 000000000000..62e7d7e9ef21
--- /dev/null
+++ b/media-video/vlc/vlc-2.2.6-r2.ebuild
@@ -0,0 +1,485 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-beta/-test}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = *9999 ]] ; then
+	if [[ ${PV%.9999} != ${PV} ]] ; then
+		EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git"
+	else
+		EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
+	fi
+	SCM="git-r3"
+else
+	if [[ ${MY_P} = ${P} ]] ; then
+		SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
+	else
+		SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
+	fi
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd"
+fi
+inherit autotools flag-o-matic toolchain-funcs versionator virtualx ${SCM}
+
+DESCRIPTION="VLC media player - Video player and streamer"
+HOMEPAGE="https://www.videolan.org/vlc/"
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0/5-8" # vlc - vlccore
+
+IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec +avformat bidi bluray cdda
+	cddb chromaprint dbus dc1394 debug directfb directx dts dvb +dvbpsi dvd dxva2
+	elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt gme
+	gnome gnutls growl gstreamer httpd ieee1394 jack jpeg kate kde libass libav
+	libcaca libnotify +libsamplerate libtiger linsys libtar lirc live lua
+	macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit
+	matroska cpu_flags_x86_mmx modplug mp3 mpeg mtp musepack ncurses neon ogg
+	omxil opencv opengl optimisememory opus png postproc projectm pulseaudio
+	qt4 +qt5 rdp rtsp run-as-root samba schroedinger sdl sdl-image sftp shout
+	sid skins speex cpu_flags_x86_sse svg +swscale taglib theora tremor truetype
+	twolame udev upnp vaapi v4l vcdx vdpau vlm vnc vorbis vpx wma-fixed +X
+	x264 x265 +xcb xml xv zeroconf zvbi
+"
+REQUIRED_USE="
+	aalib? ( X )
+	bidi? ( truetype )
+	cddb? ( cdda )
+	dvb? ( dvbpsi )
+	dxva2? ( avcodec )
+	ffmpeg? ( avcodec avformat swscale )
+	fontconfig? ( truetype )
+	gnutls? ( gcrypt )
+	httpd? ( lua )
+	libcaca? ( X )
+	libtar? ( skins )
+	libtiger? ( kate )
+	qt4? ( X )
+	qt5? ( X )
+	sdl? ( X )
+	skins? ( truetype X xml || ( qt4 qt5 ) )
+	vaapi? ( avcodec X )
+	vdpau? ( X )
+	vlm? ( encode )
+	xv? ( xcb )
+"
+RDEPEND="
+	dev-libs/libgpg-error:0
+	net-dns/libidn:0
+	sys-libs/zlib:0[minizip]
+	virtual/libintl:0
+	a52? ( >=media-libs/a52dec-0.7.4-r3:0 )
+	aalib? ( media-libs/aalib:0 )
+	alsa? ( >=media-libs/alsa-lib-1.0.24:0 )
+	avcodec? (
+		!libav? ( media-video/ffmpeg:0= )
+		libav? ( media-video/libav:0= )
+	)
+	avformat? (
+		!libav? ( media-video/ffmpeg:0= )
+		libav? ( media-video/libav:0= )
+	)
+	bidi? ( dev-libs/fribidi:0 )
+	bluray? ( >=media-libs/libbluray-0.3:0= )
+	cddb? ( >=media-libs/libcddb-1.2:0 )
+	chromaprint? ( >=media-libs/chromaprint-0.6:0 )
+	dbus? ( >=sys-apps/dbus-1.6:0 )
+	dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 )
+	directfb? ( dev-libs/DirectFB:0 sys-libs/zlib:0 )
+	dts? ( >=media-libs/libdca-0.0.5:0 )
+	dvbpsi? ( >=media-libs/libdvbpsi-1.0.0:0= )
+	dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 )
+	elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 )
+	faad? ( >=media-libs/faad2-2.6.1:0 )
+	fdk? ( media-libs/fdk-aac:0 )
+	flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 )
+	fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= )
+	gme? ( media-libs/game-music-emu:0 )
+	gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 )
+	gnutls? ( >=net-libs/gnutls-3.0.20:0 )
+	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
+	ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 )
+	jack? ( virtual/jack )
+	jpeg? ( virtual/jpeg:0 )
+	kate? ( >=media-libs/libkate-0.3:0 )
+	libass? ( >=media-libs/libass-0.9.8:0= media-libs/fontconfig:1.0 )
+	libcaca? ( >=media-libs/libcaca-0.99_beta14:0 )
+	libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 )
+	libsamplerate? ( media-libs/libsamplerate:0 )
+	libtar? ( >=dev-libs/libtar-1.2.11-r3:0 )
+	libtiger? ( >=media-libs/libtiger-0.3.1:0 )
+	linsys? ( >=media-libs/zvbi-0.2.28:0 )
+	lirc? ( app-misc/lirc:0 )
+	live? ( >=media-plugins/live-2011.12.23:0 )
+	lua? ( >=dev-lang/lua-5.1:0 )
+	matroska? (	>=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= )
+	modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 )
+	mp3? ( media-libs/libmad:0 )
+	mpeg? ( >=media-libs/libmpeg2-0.3.2:0 )
+	mtp? ( >=media-libs/libmtp-1:0 )
+	musepack? ( >=media-sound/musepack-tools-444:0 )
+	ncurses? ( sys-libs/ncurses:0=[unicode] )
+	ogg? ( >=media-libs/libogg-1:0 )
+	opencv? ( >media-libs/opencv-2:0= )
+	opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 )
+	opus? ( >=media-libs/opus-1.0.3:0 )
+	png? ( media-libs/libpng:0= sys-libs/zlib:0 )
+	postproc? (
+		!libav? ( >=media-video/ffmpeg-2.2:0= )
+		libav? ( media-libs/libpostproc:0= )
+	)
+	projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
+	pulseaudio? ( >=media-sound/pulseaudio-1:0 )
+	!qt5? ( qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) )
+	qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
+	rdp? ( =net-misc/freerdp-1*:0=[client] )
+	samba? ( >=net-fs/samba-4.0.0_alpha1:0[client] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
+	sdl? ( >=media-libs/libsdl-1.2.10:0
+		sdl-image? ( >=media-libs/sdl-image-1.2.10:0 sys-libs/zlib:0 ) )
+	sftp? ( net-libs/libssh2:0 )
+	shout? ( >=media-libs/libshout-2.1:0 )
+	sid? ( media-libs/libsidplay:2 )
+	skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 )
+	speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 )
+	svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 )
+	swscale? (
+		!libav? ( media-video/ffmpeg:0= )
+		libav? ( media-video/libav:0= )
+	)
+	taglib? ( >=media-libs/taglib-1.9:0 sys-libs/zlib:0 )
+	theora? ( >=media-libs/libtheora-1.0_beta3:0 )
+	tremor? ( media-libs/tremor:0 )
+	truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0
+		!fontconfig? ( media-fonts/dejavu:0 ) )
+	twolame? ( media-sound/twolame:0 )
+	udev? ( >=virtual/udev-142:0 )
+	upnp? ( net-libs/libupnp:0 )
+	v4l? ( media-libs/libv4l:0 )
+	vaapi? (
+		x11-libs/libva:0[X,drm]
+		!libav? ( media-video/ffmpeg:0=[vaapi] )
+		libav? ( media-video/libav:0=[vaapi] )
+	)
+	vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 )
+	vdpau? (
+		x11-libs/libvdpau:0
+		!libav? ( media-video/ffmpeg:0= )
+		libav? ( >=media-video/libav-10:0= )
+	)
+	vnc? ( >=net-libs/libvncserver-0.9.9:0 )
+	vorbis? ( media-libs/libvorbis:0 )
+	vpx? ( media-libs/libvpx:0= )
+	X? ( x11-libs/libX11:0 )
+	x264? ( media-libs/x264:0= )
+	x265? ( media-libs/x265:0= )
+	xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 )
+	xml? ( dev-libs/libxml2:2 )
+	zeroconf? ( >=net-dns/avahi-0.6:0[dbus] )
+	zvbi? ( media-libs/zvbi:0 )
+"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils:0
+	>=sys-devel/gettext-0.18.3:*
+	virtual/pkgconfig:*
+	!qt5? ( kde? ( kde-frameworks/kdelibs:4 ) )
+	amd64? ( dev-lang/yasm:* )
+	x86?   ( dev-lang/yasm:* )
+	xcb? ( x11-proto/xproto:0 )
+"
+
+PATCHES=(
+	# Fix build system mistake.
+	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch
+
+	# Patch up incompatibilities and reconfigure autotools.
+# 	"${FILESDIR}"/${PN}-9999-libva-1.2.1-compat.patch
+
+	# Fix up broken audio when skipping using a fixed reversed bisected commit.
+# 	"${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch
+
+	# Bug #541678
+	"${FILESDIR}"/qt4-select.patch
+
+	# Allow QT5.5 since Gentoo has a patched QTwidgets
+	"${FILESDIR}"/${PN}-2.2.2-qt5widgets.patch
+
+	# Bug #575072
+	"${FILESDIR}"/${PN}-2.2.4-relax_ffmpeg.patch
+	"${FILESDIR}"/${PN}-2.2.4-ffmpeg3.patch
+
+	# Bug #589396
+	"${FILESDIR}"/${PN}-2.2.4-cxx0x.patch
+
+	# Bug #594126, #629294
+	"${FILESDIR}"/${PN}-2.2.6-decoder-lock-scope.patch
+	"${FILESDIR}"/${PN}-2.2.4-alsa-large-buffers.patch
+
+	# Bug #593460
+	"${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch
+)
+
+DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt )
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	if [[ ${PV} = *9999 ]] ; then
+		git-r3_src_unpack
+	else
+		unpack ${A}
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Remove unnecessary warnings about unimplemented pragmas on gcc for now.
+	# Need to recheck this with gcc 4.9 and every subsequent minor bump of gcc.
+	#
+	# config.h:792: warning: ignoring #pragma STDC FENV_ACCESS [-Wunknown-pragmas]
+	# config.h:793: warning: ignoring #pragma STDC FP_CONTRACT [-Wunknown-pragmas]
+	#
+	# https://gcc.gnu.org/c99status.html
+	if tc-is-gcc ; then
+		sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die
+	fi
+
+	# Bootstrap when we are on a git checkout.
+	if [[ ${PV} = *9999 ]] ; then
+		./bootstrap
+	fi
+
+	# Make it build with libtool 1.5
+	rm -f m4/lt* m4/libtool.m4 || die
+
+	# We are not in a real git checkout due to the absence of a .git directory.
+	touch src/revision.txt || die
+
+	# Don't use --started-from-file when not using dbus.
+	if ! use dbus ; then
+		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
+	fi
+
+	eautoreconf
+
+	# Disable automatic running of tests.
+	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
+
+	# If qtchooser is installed, it may break the build, because moc,rcc and uic binaries for wrong qt
+	# version may be used. Setting QT_SELECT environment variable will enforce correct binaries.
+	if use qt5; then
+		export QT_SELECT=qt5
+	elif use qt4; then
+		export QT_SELECT=qt4
+	fi
+}
+
+src_configure() {
+	local myconf
+
+	# Compatibility fix for Samba 4.
+	use samba && append-cppflags "-I/usr/include/samba-4.0"
+
+	# We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
+	use x86 && append-cflags $(test-flags-CC -fno-stack-check)
+
+	# FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
+
+	if use truetype || use projectm ; then
+		local dejavu="/usr/share/fonts/dejavu/"
+		myconf="--with-default-font=${dejavu}/DejaVuSans.ttf \
+				--with-default-font-family=Sans \
+				--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
+				--with-default-monospace-font-family=Monospace"
+	fi
+
+	if use qt5 ; then
+		myconf+=" --enable-qt=5"
+	else
+		if use qt4 ; then
+			myconf+=" --enable-qt=4"
+		else
+			myconf+=" --disable-qt"
+		fi
+		use kde && myconf+=" --with-kde-solid"
+	fi
+
+	econf \
+		${myconf} \
+		--enable-vlc \
+		--docdir=/usr/share/doc/${PF} \
+		--disable-dependency-tracking \
+		--disable-optimizations \
+		--disable-update-check \
+		--enable-fast-install \
+		--enable-screen \
+		$(use_enable a52) \
+		$(use_enable aalib aa) \
+		$(use_enable alsa) \
+		$(use_enable altivec) \
+		$(use_enable atmo) \
+		$(use_enable audioqueue) \
+		$(use_enable avcodec) \
+		$(use_enable avformat) \
+		$(use_enable bidi fribidi) \
+		$(use_enable bluray) \
+		$(use_enable cdda vcd) \
+		$(use_enable cddb libcddb) \
+		$(use_enable chromaprint) \
+		$(use_enable dbus) \
+		$(use_enable directfb) \
+		$(use_enable directx) \
+		$(use_enable dc1394) \
+		$(use_enable debug) \
+		$(use_enable dts dca) \
+		$(use_enable dvbpsi) \
+		$(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
+		$(use_enable dxva2) \
+		$(use_enable encode sout) \
+		$(use_enable faad) \
+		$(use_enable fdk fdkaac) \
+		$(use_enable flac) \
+		$(use_enable fluidsynth) \
+		$(use_enable fontconfig) \
+		$(use_enable gcrypt libgcrypt) \
+		$(use_enable gme) \
+		$(use_enable gnome gnomevfs) \
+		$(use_enable gnutls) \
+		$(use_enable growl) \
+		$(use_enable gstreamer gst-decode) \
+		$(use_enable httpd) \
+		$(use_enable ieee1394 dv1394) \
+		$(use_enable jack) \
+		$(use_enable jpeg) \
+		$(use_enable kate) \
+		$(use_enable libass) \
+		$(use_enable libcaca caca) \
+		$(use_enable libnotify notify) \
+		$(use_enable libsamplerate samplerate) \
+		$(use_enable libtar) \
+		$(use_enable libtiger tiger) \
+		$(use_enable linsys) \
+		$(use_enable lirc) \
+		$(use_enable live live555) \
+		$(use_enable lua) \
+		$(use_enable macosx-dialog-provider) \
+		$(use_enable macosx-eyetv) \
+		$(use_enable macosx-qtkit) \
+		$(use_enable macosx-quartztext) \
+		$(use_enable matroska mkv) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable modplug mod) \
+		$(use_enable mp3 mad) \
+		$(use_enable mpeg libmpeg2) \
+		$(use_enable mtp) \
+		$(use_enable musepack mpc) \
+		$(use_enable ncurses) \
+		$(use_enable neon) \
+		$(use_enable ogg) $(use_enable ogg mux_ogg) \
+		$(use_enable omxil) \
+		$(use_enable omxil omxil-vout) \
+		$(use_enable opencv) \
+		$(use_enable opengl glspectrum) \
+		$(use_enable opus) \
+		$(use_enable optimisememory optimize-memory) \
+		$(use_enable png) \
+		$(use_enable postproc) \
+		$(use_enable projectm) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable rdp freerdp) \
+		$(use_enable rtsp realrtsp) \
+		$(use_enable run-as-root) \
+		$(use_enable samba smbclient) \
+		$(use_enable schroedinger) \
+		$(use_enable sdl) \
+		$(use_enable sdl-image) \
+		$(use_enable sid) \
+		$(use_enable sftp) \
+		$(use_enable shout) \
+		$(use_enable skins skins2) \
+		$(use_enable speex) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable svg) \
+		$(use_enable svg svgdec) \
+		$(use_enable swscale) \
+		$(use_enable taglib) \
+		$(use_enable theora) \
+		$(use_enable tremor) \
+		$(use_enable truetype freetype) \
+		$(use_enable twolame) \
+		$(use_enable udev) \
+		$(use_enable upnp) \
+		$(use_enable v4l v4l2) \
+		$(use_enable vaapi libva) \
+		$(use_enable vcdx) \
+		$(use_enable vdpau) \
+		$(use_enable vlm) \
+		$(use_enable vnc) \
+		$(use_enable vorbis) \
+		$(use_enable vpx) \
+		$(use_enable wma-fixed) \
+		$(use_with X x) \
+		$(use_enable x264) \
+		$(use_enable x265) \
+		$(use_enable xcb) \
+		$(use_enable xml libxml2) \
+		$(use_enable xv xvideo) \
+		$(use_enable zeroconf bonjour) \
+		$(use_enable zvbi) $(use_enable !zvbi telx) \
+		--disable-asdcp \
+		--disable-coverage \
+		--disable-cprof \
+		--disable-crystalhd \
+		--disable-decklink \
+		--disable-gles1 \
+		--disable-gles2 \
+		--disable-goom \
+		--disable-kai \
+		--disable-kva \
+		--disable-maintainer-mode \
+		--disable-merge-ffmpeg \
+		--disable-mfx \
+		--disable-mmal-codec \
+		--disable-mmal-vout \
+		--disable-opensles \
+		--disable-oss \
+		--disable-quicktime \
+		--disable-rpi-omxil \
+		--disable-shine \
+		--disable-sndio \
+		--disable-vda \
+		--disable-vsxu \
+		--disable-wasapi
+
+		# ^ We don't have these disabled libraries in the Portage tree yet.
+
+	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
+	# Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h.
+	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file
+	sed -i '1i#undef _FORTIFY_SOURCE' "${S}"/config.h || die
+}
+
+src_test() {
+	virtx emake check-TESTS
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if [[ "$ROOT" = "/" ]] && [[ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
+		einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
+		"/usr/$(get_libdir)/vlc/vlc-cache-gen" -f "/usr/$(get_libdir)/vlc/plugins/"
+	else
+		ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
+		ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
+		ewarn "If you do not do it, vlc will take a long time to load."
+	fi
+}
diff --git a/media-video/vlc/vlc-2.2.6.ebuild b/media-video/vlc/vlc-2.2.6.ebuild
new file mode 100644
index 000000000000..f821f2168cc0
--- /dev/null
+++ b/media-video/vlc/vlc-2.2.6.ebuild
@@ -0,0 +1,513 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SCM=""
+if [[ ${PV} = *9999 ]] ; then
+	SCM="git-r3"
+
+	if [ "${PV%.9999}" != "${PV}" ] ; then
+		EGIT_REPO_URI="git://git.videolan.org/vlc/vlc-${PV%.9999}.git"
+	else
+		EGIT_REPO_URI="git://git.videolan.org/vlc.git"
+	fi
+fi
+
+inherit autotools flag-o-matic toolchain-funcs versionator virtualx ${SCM}
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-beta/-test}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="VLC media player - Video player and streamer"
+HOMEPAGE="https://www.videolan.org/vlc/"
+if [[ ${PV} = *9999 ]] ; then # Live ebuild
+	SRC_URI=""
+elif [[ "${MY_P}" == "${P}" ]]; then
+	SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
+else
+	SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
+fi
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0/5-8" # vlc - vlccore
+
+if [[ ${PV} != *9999 ]] ; then
+	KEYWORDS="amd64 arm ppc ppc64 -sparc x86 ~x86-fbsd"
+fi
+
+IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec
+	+avformat bidi bluray cdda cddb chromaprint dbus dc1394 debug
+	directfb directx dts dvb +dvbpsi dvd dxva2 elibc_glibc +encode faad fdk
+	fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls
+	growl gstreamer httpd ieee1394 jack jpeg kate kde libass libav libcaca libnotify
+	+libsamplerate libtiger linsys libtar lirc live lua
+	macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit
+	matroska cpu_flags_x86_mmx modplug mp3 mpeg
+	mtp musepack ncurses neon ogg omxil opencv opengl optimisememory opus
+	png postproc projectm pulseaudio +qt4 qt5 rdp rtsp run-as-root samba
+	schroedinger sdl sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg +swscale
+	taglib theora tremor truetype twolame udev upnp vaapi v4l vcdx vdpau
+	vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi"
+
+RDEPEND="
+	dev-libs/libgpg-error:0
+	net-dns/libidn:0
+	sys-libs/zlib:0[minizip]
+	virtual/libintl:0
+	a52? ( >=media-libs/a52dec-0.7.4-r3:0 )
+	aalib? ( media-libs/aalib:0 )
+	alsa? ( >=media-libs/alsa-lib-1.0.24:0 )
+	avcodec? (
+		!libav? ( media-video/ffmpeg:0= )
+		libav? ( media-video/libav:0= )
+	)
+	avformat? (
+		!libav? ( media-video/ffmpeg:0= )
+		libav? ( media-video/libav:0= )
+	)
+	bidi? ( dev-libs/fribidi:0 )
+	bluray? ( >=media-libs/libbluray-0.3:0= )
+	cddb? ( >=media-libs/libcddb-1.2:0 )
+	chromaprint? ( >=media-libs/chromaprint-0.6:0 )
+	dbus? ( >=sys-apps/dbus-1.6:0 )
+	dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 )
+	directfb? ( dev-libs/DirectFB:0 sys-libs/zlib:0 )
+	dts? ( >=media-libs/libdca-0.0.5:0 )
+	dvbpsi? ( >=media-libs/libdvbpsi-1.0.0:0= )
+	dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 )
+	elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 )
+	faad? ( >=media-libs/faad2-2.6.1:0 )
+	fdk? ( media-libs/fdk-aac:0 )
+	flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 )
+	fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= )
+	gme? ( media-libs/game-music-emu:0 )
+	gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 )
+	gnutls? ( >=net-libs/gnutls-3.0.20:0 )
+	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
+	ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 )
+	jack? ( virtual/jack )
+	jpeg? ( virtual/jpeg:0 )
+	kate? ( >=media-libs/libkate-0.3:0 )
+	libass? ( >=media-libs/libass-0.9.8:0= media-libs/fontconfig:1.0 )
+	libcaca? ( >=media-libs/libcaca-0.99_beta14:0 )
+	libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 )
+	libsamplerate? ( media-libs/libsamplerate:0 )
+	libtar? ( >=dev-libs/libtar-1.2.11-r3:0 )
+	libtiger? ( >=media-libs/libtiger-0.3.1:0 )
+	linsys? ( >=media-libs/zvbi-0.2.28:0 )
+	lirc? ( app-misc/lirc:0 )
+	live? ( >=media-plugins/live-2011.12.23:0 )
+	lua? ( >=dev-lang/lua-5.1:0 )
+	matroska? (	>=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= )
+	modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 )
+	mp3? ( media-libs/libmad:0 )
+	mpeg? ( >=media-libs/libmpeg2-0.3.2:0 )
+	mtp? ( >=media-libs/libmtp-1:0 )
+	musepack? ( >=media-sound/musepack-tools-444:0 )
+	ncurses? ( sys-libs/ncurses:0=[unicode] )
+	ogg? ( >=media-libs/libogg-1:0 )
+	opencv? ( >media-libs/opencv-2:0= )
+	opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 )
+	opus? ( >=media-libs/opus-1.0.3:0 )
+	png? ( media-libs/libpng:0= sys-libs/zlib:0 )
+	postproc? (
+		!libav? ( >=media-video/ffmpeg-2.2:0= )
+		libav? ( media-libs/libpostproc:0= )
+	)
+	projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
+	pulseaudio? ( >=media-sound/pulseaudio-1:0 )
+	!qt5? ( qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) )
+	qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
+	rdp? ( =net-misc/freerdp-1*:0=[client] )
+	samba? ( >=net-fs/samba-4.0.0_alpha1:0[client] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
+	sdl? ( >=media-libs/libsdl-1.2.10:0
+		sdl-image? ( >=media-libs/sdl-image-1.2.10:0 sys-libs/zlib:0 ) )
+	sftp? ( net-libs/libssh2:0 )
+	shout? ( >=media-libs/libshout-2.1:0 )
+	sid? ( media-libs/libsidplay:2 )
+	skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 )
+	speex? ( media-libs/speex:0 )
+	svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 )
+	swscale? (
+		!libav? ( media-video/ffmpeg:0= )
+		libav? ( media-video/libav:0= )
+	)
+	taglib? ( >=media-libs/taglib-1.9:0 sys-libs/zlib:0 )
+	theora? ( >=media-libs/libtheora-1.0_beta3:0 )
+	tremor? ( media-libs/tremor:0 )
+	truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0
+		!fontconfig? ( media-fonts/dejavu:0 ) )
+	twolame? ( media-sound/twolame:0 )
+	udev? ( >=virtual/udev-142:0 )
+	upnp? ( net-libs/libupnp:0 )
+	v4l? ( media-libs/libv4l:0 )
+	vaapi? (
+		x11-libs/libva:0[X,drm]
+		!libav? ( media-video/ffmpeg:0=[vaapi] )
+		libav? ( media-video/libav:0=[vaapi] )
+	)
+	vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 )
+	zeroconf? ( >=net-dns/avahi-0.6:0[dbus] )
+"
+
+# Temporarily block non-live FFMPEG versions as they break vdpau, 9999 works;
+# thus we'll have to wait for a new release there.
+RDEPEND="${RDEPEND}
+	vdpau? (
+		x11-libs/libvdpau:0
+		!libav? ( media-video/ffmpeg:0= )
+		libav? ( >=media-video/libav-10:0= )
+	)
+	vnc? ( >=net-libs/libvncserver-0.9.9:0 )
+	vorbis? ( media-libs/libvorbis:0 )
+	vpx? ( media-libs/libvpx:0= )
+	X? ( x11-libs/libX11:0 )
+	x264? ( media-libs/x264:0= )
+	x265? ( media-libs/x265:0= )
+	xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 )
+	xml? ( dev-libs/libxml2:2 )
+	zvbi? ( media-libs/zvbi:0 )
+"
+
+DEPEND="${RDEPEND}
+	!qt5? ( kde? ( kde-frameworks/kdelibs:4 ) )
+	amd64? ( dev-lang/yasm:* )
+	x86?   ( dev-lang/yasm:* )
+	xcb? ( x11-proto/xproto:0 )
+	app-arch/xz-utils:0
+	>=sys-devel/gettext-0.18.3:*
+	virtual/pkgconfig:*
+"
+
+REQUIRED_USE="
+	aalib? ( X )
+	bidi? ( truetype )
+	cddb? ( cdda )
+	dvb? ( dvbpsi )
+	dxva2? ( avcodec )
+	ffmpeg? ( avcodec avformat swscale )
+	fontconfig? ( truetype )
+	gnutls? ( gcrypt )
+	httpd? ( lua )
+	libcaca? ( X )
+	libtar? ( skins )
+	libtiger? ( kate )
+	qt4? ( X )
+	qt5? ( X )
+	sdl? ( X )
+	skins? ( truetype X xml || ( qt4 qt5 ) )
+	vaapi? ( avcodec X )
+	vdpau? ( X )
+	vlm? ( encode )
+	xv? ( xcb )
+"
+
+PATCHES=(
+	# Fix build system mistake.
+	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch
+
+	# Patch up incompatibilities and reconfigure autotools.
+	"${FILESDIR}"/${PN}-9999-libva-1.2.1-compat.patch
+
+	# Fix up broken audio when skipping using a fixed reversed bisected commit.
+	"${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch
+
+	# Bug #541678
+	"${FILESDIR}"/qt4-select.patch
+
+	# Allow QT5.5 since Gentoo has a patched QTwidgets
+	"${FILESDIR}"/${PN}-2.2.2-qt5widgets.patch
+
+	# Bug #575072
+	"${FILESDIR}"/${PN}-2.2.4-relax_ffmpeg.patch
+	"${FILESDIR}"/${PN}-2.2.4-ffmpeg3.patch
+
+	# Bug #589396
+	"${FILESDIR}"/${PN}-2.2.4-cxx0x.patch
+
+	# Bug #594126
+	"${FILESDIR}"/${PN}-2.2.4-decoder-lock-scope.patch
+	"${FILESDIR}"/${PN}-2.2.4-alsa-large-buffers.patch
+
+	# Bug #593460
+	"${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch
+)
+
+DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt )
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if [[ "${MERGE_TYPE}" != "binary" ]] && tc-is-gcc ; then
+		if ! version_is_at_least 4.5 $(gcc-version) ; then
+			die "You need to have at least >=sys-devel/gcc-4.5 to build and/or have a working vlc, see bug #426754."
+		fi
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} = *9999 ]] ; then
+		git-r3_src_unpack
+	else
+		unpack ${A}
+	fi
+}
+
+src_prepare() {
+	# Remove unnecessary warnings about unimplemented pragmas on gcc for now.
+	# Need to recheck this with gcc 4.9 and every subsequent minor bump of gcc.
+	#
+	# config.h:792: warning: ignoring #pragma STDC FENV_ACCESS [-Wunknown-pragmas]
+	# config.h:793: warning: ignoring #pragma STDC FP_CONTRACT [-Wunknown-pragmas]
+	#
+	# https://gcc.gnu.org/c99status.html
+	if tc-is-gcc ; then
+		sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die
+	fi
+
+	# Bootstrap when we are on a git checkout.
+	if [[ ${PV} = *9999 ]] ; then
+		./bootstrap
+	fi
+
+	# Make it build with libtool 1.5
+	rm -f m4/lt* m4/libtool.m4 || die
+
+	# We are not in a real git checkout due to the absence of a .git directory.
+	touch src/revision.txt || die
+
+	default
+
+	# Don't use --started-from-file when not using dbus.
+	if ! use dbus ; then
+		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
+	fi
+
+	eautoreconf
+
+	# Disable automatic running of tests.
+	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
+
+	# If qtchooser is installed, it may break the build, because moc,rcc and uic binaries for wrong qt
+	# version may be used. Setting QT_SELECT environment variable will enforce correct binaries.
+	if use qt5; then
+		export QT_SELECT=qt5
+	elif use qt4; then
+		export QT_SELECT=qt4
+	fi
+}
+
+src_configure() {
+	local myconf
+
+	# Compatibility fix for Samba 4.
+	use samba && append-cppflags "-I/usr/include/samba-4.0"
+
+	# We need to disable -fstack-check if use >=gcc 4.8.0.
+	# See bug #499996
+	use x86 && append-cflags $(test-flags-CC -fno-stack-check)
+
+	# Needs libresid-builder from libsidplay:2 which is in another directory...
+	# FIXME!
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
+
+	if use truetype || use projectm ; then
+		local dejavu="/usr/share/fonts/dejavu/"
+		myconf="--with-default-font=${dejavu}/DejaVuSans.ttf \
+				--with-default-font-family=Sans \
+				--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
+				--with-default-monospace-font-family=Monospace"
+	fi
+
+	if use qt5 ; then
+		myconf+=" --enable-qt=5"
+	else
+		if use qt4 ; then
+			myconf+=" --enable-qt=4"
+		else
+			myconf+=" --disable-qt"
+		fi
+		use kde && myconf+=" --with-kde-solid"
+	fi
+
+	econf \
+		${myconf} \
+		--enable-vlc \
+		--docdir=/usr/share/doc/${PF} \
+		--disable-dependency-tracking \
+		--disable-optimizations \
+		--disable-update-check \
+		--enable-fast-install \
+		--enable-screen \
+		$(use_enable a52) \
+		$(use_enable aalib aa) \
+		$(use_enable alsa) \
+		$(use_enable altivec) \
+		$(use_enable atmo) \
+		$(use_enable audioqueue) \
+		$(use_enable avcodec) \
+		$(use_enable avformat) \
+		$(use_enable bidi fribidi) \
+		$(use_enable bluray) \
+		$(use_enable cdda vcd) \
+		$(use_enable cddb libcddb) \
+		$(use_enable chromaprint) \
+		$(use_enable dbus) \
+		$(use_enable directfb) \
+		$(use_enable directx) \
+		$(use_enable dc1394) \
+		$(use_enable debug) \
+		$(use_enable dts dca) \
+		$(use_enable dvbpsi) \
+		$(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
+		$(use_enable dxva2) \
+		$(use_enable encode sout) \
+		$(use_enable faad) \
+		$(use_enable fdk fdkaac) \
+		$(use_enable flac) \
+		$(use_enable fluidsynth) \
+		$(use_enable fontconfig) \
+		$(use_enable gcrypt libgcrypt) \
+		$(use_enable gme) \
+		$(use_enable gnome gnomevfs) \
+		$(use_enable gnutls) \
+		$(use_enable growl) \
+		$(use_enable gstreamer gst-decode) \
+		$(use_enable httpd) \
+		$(use_enable ieee1394 dv1394) \
+		$(use_enable jack) \
+		$(use_enable jpeg) \
+		$(use_enable kate) \
+		$(use_enable libass) \
+		$(use_enable libcaca caca) \
+		$(use_enable libnotify notify) \
+		$(use_enable libsamplerate samplerate) \
+		$(use_enable libtar) \
+		$(use_enable libtiger tiger) \
+		$(use_enable linsys) \
+		$(use_enable lirc) \
+		$(use_enable live live555) \
+		$(use_enable lua) \
+		$(use_enable macosx-dialog-provider) \
+		$(use_enable macosx-eyetv) \
+		$(use_enable macosx-qtkit) \
+		$(use_enable macosx-quartztext) \
+		$(use_enable matroska mkv) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable modplug mod) \
+		$(use_enable mp3 mad) \
+		$(use_enable mpeg libmpeg2) \
+		$(use_enable mtp) \
+		$(use_enable musepack mpc) \
+		$(use_enable ncurses) \
+		$(use_enable neon) \
+		$(use_enable ogg) $(use_enable ogg mux_ogg) \
+		$(use_enable omxil) \
+		$(use_enable omxil omxil-vout) \
+		$(use_enable opencv) \
+		$(use_enable opengl glspectrum) \
+		$(use_enable opus) \
+		$(use_enable optimisememory optimize-memory) \
+		$(use_enable png) \
+		$(use_enable postproc) \
+		$(use_enable projectm) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable rdp freerdp) \
+		$(use_enable rtsp realrtsp) \
+		$(use_enable run-as-root) \
+		$(use_enable samba smbclient) \
+		$(use_enable schroedinger) \
+		$(use_enable sdl) \
+		$(use_enable sdl-image) \
+		$(use_enable sid) \
+		$(use_enable sftp) \
+		$(use_enable shout) \
+		$(use_enable skins skins2) \
+		$(use_enable speex) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable svg) \
+		$(use_enable svg svgdec) \
+		$(use_enable swscale) \
+		$(use_enable taglib) \
+		$(use_enable theora) \
+		$(use_enable tremor) \
+		$(use_enable truetype freetype) \
+		$(use_enable twolame) \
+		$(use_enable udev) \
+		$(use_enable upnp) \
+		$(use_enable v4l v4l2) \
+		$(use_enable vaapi libva) \
+		$(use_enable vcdx) \
+		$(use_enable vdpau) \
+		$(use_enable vlm) \
+		$(use_enable vnc) \
+		$(use_enable vorbis) \
+		$(use_enable vpx) \
+		$(use_enable wma-fixed) \
+		$(use_with X x) \
+		$(use_enable x264) \
+		$(use_enable x265) \
+		$(use_enable xcb) \
+		$(use_enable xml libxml2) \
+		$(use_enable xv xvideo) \
+		$(use_enable zeroconf bonjour) \
+		$(use_enable zvbi) $(use_enable !zvbi telx) \
+		--disable-asdcp \
+		--disable-coverage \
+		--disable-cprof \
+		--disable-crystalhd \
+		--disable-decklink \
+		--disable-gles1 \
+		--disable-gles2 \
+		--disable-goom \
+		--disable-kai \
+		--disable-kva \
+		--disable-maintainer-mode \
+		--disable-merge-ffmpeg \
+		--disable-mfx \
+		--disable-mmal-codec \
+		--disable-mmal-vout \
+		--disable-opensles \
+		--disable-oss \
+		--disable-quicktime \
+		--disable-rpi-omxil \
+		--disable-shine \
+		--disable-sndio \
+		--disable-vda \
+		--disable-vsxu \
+		--disable-wasapi
+
+		# ^ We don't have these disabled libraries in the Portage tree yet.
+
+	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
+	# Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h.
+	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file
+	sed -i '1i#undef _FORTIFY_SOURCE' "${S}"/config.h || die
+}
+
+src_test() {
+	virtx emake check-TESTS
+}
+
+src_install() {
+	default
+
+	# Punt useless libtool's .la files
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if [ "$ROOT" = "/" ] && [ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ] ; then
+		einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
+		"/usr/$(get_libdir)/vlc/vlc-cache-gen" -f "/usr/$(get_libdir)/vlc/plugins/"
+	else
+		ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
+		ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
+		ewarn "If you do not do it, vlc will take a long time to load."
+	fi
+}
diff --git a/media-video/vlc/vlc-2.2.9999.ebuild b/media-video/vlc/vlc-2.2.9999.ebuild
new file mode 100644
index 000000000000..069a19e151fa
--- /dev/null
+++ b/media-video/vlc/vlc-2.2.9999.ebuild
@@ -0,0 +1,485 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-beta/-test}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = *9999 ]] ; then
+	if [[ ${PV%.9999} != ${PV} ]] ; then
+		EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git"
+	else
+		EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
+	fi
+	SCM="git-r3"
+else
+	if [[ ${MY_P} = ${P} ]] ; then
+		SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
+	else
+		SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
+	fi
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd"
+fi
+inherit autotools flag-o-matic toolchain-funcs versionator virtualx ${SCM}
+
+DESCRIPTION="VLC media player - Video player and streamer"
+HOMEPAGE="https://www.videolan.org/vlc/"
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0/5-8" # vlc - vlccore
+
+IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec +avformat bidi bluray cdda
+	cddb chromaprint dbus dc1394 debug directfb directx dts dvb +dvbpsi dvd dxva2
+	elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt gme
+	gnome gnutls growl gstreamer httpd ieee1394 jack jpeg kate kde libass libav
+	libcaca libnotify +libsamplerate libtiger linsys libtar lirc live lua
+	macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit
+	matroska cpu_flags_x86_mmx modplug mp3 mpeg mtp musepack ncurses neon ogg
+	omxil opencv opengl optimisememory opus png postproc projectm pulseaudio
+	qt4 +qt5 rdp rtsp run-as-root samba schroedinger sdl sdl-image sftp shout
+	sid skins speex cpu_flags_x86_sse svg +swscale taglib theora tremor truetype
+	twolame udev upnp vaapi v4l vcdx vdpau vlm vnc vorbis vpx wma-fixed +X
+	x264 x265 +xcb xml xv zeroconf zvbi
+"
+REQUIRED_USE="
+	aalib? ( X )
+	bidi? ( truetype )
+	cddb? ( cdda )
+	dvb? ( dvbpsi )
+	dxva2? ( avcodec )
+	ffmpeg? ( avcodec avformat swscale )
+	fontconfig? ( truetype )
+	gnutls? ( gcrypt )
+	httpd? ( lua )
+	libcaca? ( X )
+	libtar? ( skins )
+	libtiger? ( kate )
+	qt4? ( X )
+	qt5? ( X )
+	sdl? ( X )
+	skins? ( truetype X xml || ( qt4 qt5 ) )
+	vaapi? ( avcodec X )
+	vdpau? ( X )
+	vlm? ( encode )
+	xv? ( xcb )
+"
+RDEPEND="
+	dev-libs/libgpg-error:0
+	net-dns/libidn:0
+	sys-libs/zlib:0[minizip]
+	virtual/libintl:0
+	a52? ( >=media-libs/a52dec-0.7.4-r3:0 )
+	aalib? ( media-libs/aalib:0 )
+	alsa? ( >=media-libs/alsa-lib-1.0.24:0 )
+	avcodec? (
+		!libav? ( media-video/ffmpeg:0= )
+		libav? ( media-video/libav:0= )
+	)
+	avformat? (
+		!libav? ( media-video/ffmpeg:0= )
+		libav? ( media-video/libav:0= )
+	)
+	bidi? ( dev-libs/fribidi:0 )
+	bluray? ( >=media-libs/libbluray-0.3:0= )
+	cddb? ( >=media-libs/libcddb-1.2:0 )
+	chromaprint? ( >=media-libs/chromaprint-0.6:0 )
+	dbus? ( >=sys-apps/dbus-1.6:0 )
+	dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 )
+	directfb? ( dev-libs/DirectFB:0 sys-libs/zlib:0 )
+	dts? ( >=media-libs/libdca-0.0.5:0 )
+	dvbpsi? ( >=media-libs/libdvbpsi-1.0.0:0= )
+	dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 )
+	elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 )
+	faad? ( >=media-libs/faad2-2.6.1:0 )
+	fdk? ( media-libs/fdk-aac:0 )
+	flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 )
+	fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= )
+	gme? ( media-libs/game-music-emu:0 )
+	gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 )
+	gnutls? ( >=net-libs/gnutls-3.0.20:0 )
+	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
+	ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 )
+	jack? ( virtual/jack )
+	jpeg? ( virtual/jpeg:0 )
+	kate? ( >=media-libs/libkate-0.3:0 )
+	libass? ( >=media-libs/libass-0.9.8:0= media-libs/fontconfig:1.0 )
+	libcaca? ( >=media-libs/libcaca-0.99_beta14:0 )
+	libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 )
+	libsamplerate? ( media-libs/libsamplerate:0 )
+	libtar? ( >=dev-libs/libtar-1.2.11-r3:0 )
+	libtiger? ( >=media-libs/libtiger-0.3.1:0 )
+	linsys? ( >=media-libs/zvbi-0.2.28:0 )
+	lirc? ( app-misc/lirc:0 )
+	live? ( >=media-plugins/live-2011.12.23:0 )
+	lua? ( >=dev-lang/lua-5.1:0 )
+	matroska? (	>=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= )
+	modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 )
+	mp3? ( media-libs/libmad:0 )
+	mpeg? ( >=media-libs/libmpeg2-0.3.2:0 )
+	mtp? ( >=media-libs/libmtp-1:0 )
+	musepack? ( >=media-sound/musepack-tools-444:0 )
+	ncurses? ( sys-libs/ncurses:0=[unicode] )
+	ogg? ( >=media-libs/libogg-1:0 )
+	opencv? ( >media-libs/opencv-2:0= )
+	opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 )
+	opus? ( >=media-libs/opus-1.0.3:0 )
+	png? ( media-libs/libpng:0= sys-libs/zlib:0 )
+	postproc? (
+		!libav? ( >=media-video/ffmpeg-2.2:0= )
+		libav? ( media-libs/libpostproc:0= )
+	)
+	projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
+	pulseaudio? ( >=media-sound/pulseaudio-1:0 )
+	!qt5? ( qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) )
+	qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
+	rdp? ( =net-misc/freerdp-1*:0=[client] )
+	samba? ( >=net-fs/samba-4.0.0_alpha1:0[client] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
+	sdl? ( >=media-libs/libsdl-1.2.10:0
+		sdl-image? ( >=media-libs/sdl-image-1.2.10:0 sys-libs/zlib:0 ) )
+	sftp? ( net-libs/libssh2:0 )
+	shout? ( >=media-libs/libshout-2.1:0 )
+	sid? ( media-libs/libsidplay:2 )
+	skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 )
+	speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 )
+	svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 )
+	swscale? (
+		!libav? ( media-video/ffmpeg:0= )
+		libav? ( media-video/libav:0= )
+	)
+	taglib? ( >=media-libs/taglib-1.9:0 sys-libs/zlib:0 )
+	theora? ( >=media-libs/libtheora-1.0_beta3:0 )
+	tremor? ( media-libs/tremor:0 )
+	truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0
+		!fontconfig? ( media-fonts/dejavu:0 ) )
+	twolame? ( media-sound/twolame:0 )
+	udev? ( >=virtual/udev-142:0 )
+	upnp? ( net-libs/libupnp:0 )
+	v4l? ( media-libs/libv4l:0 )
+	vaapi? (
+		x11-libs/libva:0[X,drm]
+		!libav? ( media-video/ffmpeg:0=[vaapi] )
+		libav? ( media-video/libav:0=[vaapi] )
+	)
+	vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 )
+	vdpau? (
+		x11-libs/libvdpau:0
+		!libav? ( media-video/ffmpeg:0= )
+		libav? ( >=media-video/libav-10:0= )
+	)
+	vnc? ( >=net-libs/libvncserver-0.9.9:0 )
+	vorbis? ( media-libs/libvorbis:0 )
+	vpx? ( media-libs/libvpx:0= )
+	X? ( x11-libs/libX11:0 )
+	x264? ( media-libs/x264:0= )
+	x265? ( media-libs/x265:0= )
+	xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 )
+	xml? ( dev-libs/libxml2:2 )
+	zeroconf? ( >=net-dns/avahi-0.6:0[dbus] )
+	zvbi? ( media-libs/zvbi:0 )
+"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils:0
+	>=sys-devel/gettext-0.18.3:*
+	virtual/pkgconfig:*
+	!qt5? ( kde? ( kde-frameworks/kdelibs:4 ) )
+	amd64? ( dev-lang/yasm:* )
+	x86?   ( dev-lang/yasm:* )
+	xcb? ( x11-proto/xproto:0 )
+"
+
+PATCHES=(
+	# Fix build system mistake.
+	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch
+
+	# Patch up incompatibilities and reconfigure autotools.
+	"${FILESDIR}"/${PN}-9999-libva-1.2.1-compat.patch
+
+	# Fix up broken audio when skipping using a fixed reversed bisected commit.
+	"${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch
+
+	# Bug #541678
+	"${FILESDIR}"/qt4-select.patch
+
+	# Allow QT5.5 since Gentoo has a patched QTwidgets
+	"${FILESDIR}"/${PN}-2.2.2-qt5widgets.patch
+
+	# Bug #575072
+	"${FILESDIR}"/${PN}-2.2.4-relax_ffmpeg.patch
+	"${FILESDIR}"/${PN}-2.2.4-ffmpeg3.patch
+
+	# Bug #589396
+	"${FILESDIR}"/${PN}-2.2.4-cxx0x.patch
+
+	# Bug #594126, #629294
+	"${FILESDIR}"/${PN}-2.2.6-decoder-lock-scope.patch
+	"${FILESDIR}"/${PN}-2.2.4-alsa-large-buffers.patch
+
+	# Bug #593460
+	"${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch
+)
+
+DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt )
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	if [[ ${PV} = *9999 ]] ; then
+		git-r3_src_unpack
+	else
+		unpack ${A}
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Remove unnecessary warnings about unimplemented pragmas on gcc for now.
+	# Need to recheck this with gcc 4.9 and every subsequent minor bump of gcc.
+	#
+	# config.h:792: warning: ignoring #pragma STDC FENV_ACCESS [-Wunknown-pragmas]
+	# config.h:793: warning: ignoring #pragma STDC FP_CONTRACT [-Wunknown-pragmas]
+	#
+	# https://gcc.gnu.org/c99status.html
+	if tc-is-gcc ; then
+		sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die
+	fi
+
+	# Bootstrap when we are on a git checkout.
+	if [[ ${PV} = *9999 ]] ; then
+		./bootstrap
+	fi
+
+	# Make it build with libtool 1.5
+	rm -f m4/lt* m4/libtool.m4 || die
+
+	# We are not in a real git checkout due to the absence of a .git directory.
+	touch src/revision.txt || die
+
+	# Don't use --started-from-file when not using dbus.
+	if ! use dbus ; then
+		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
+	fi
+
+	eautoreconf
+
+	# Disable automatic running of tests.
+	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
+
+	# If qtchooser is installed, it may break the build, because moc,rcc and uic binaries for wrong qt
+	# version may be used. Setting QT_SELECT environment variable will enforce correct binaries.
+	if use qt5; then
+		export QT_SELECT=qt5
+	elif use qt4; then
+		export QT_SELECT=qt4
+	fi
+}
+
+src_configure() {
+	local myconf
+
+	# Compatibility fix for Samba 4.
+	use samba && append-cppflags "-I/usr/include/samba-4.0"
+
+	# We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
+	use x86 && append-cflags $(test-flags-CC -fno-stack-check)
+
+	# FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
+
+	if use truetype || use projectm ; then
+		local dejavu="/usr/share/fonts/dejavu/"
+		myconf="--with-default-font=${dejavu}/DejaVuSans.ttf \
+				--with-default-font-family=Sans \
+				--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
+				--with-default-monospace-font-family=Monospace"
+	fi
+
+	if use qt5 ; then
+		myconf+=" --enable-qt=5"
+	else
+		if use qt4 ; then
+			myconf+=" --enable-qt=4"
+		else
+			myconf+=" --disable-qt"
+		fi
+		use kde && myconf+=" --with-kde-solid"
+	fi
+
+	econf \
+		${myconf} \
+		--enable-vlc \
+		--docdir=/usr/share/doc/${PF} \
+		--disable-dependency-tracking \
+		--disable-optimizations \
+		--disable-update-check \
+		--enable-fast-install \
+		--enable-screen \
+		$(use_enable a52) \
+		$(use_enable aalib aa) \
+		$(use_enable alsa) \
+		$(use_enable altivec) \
+		$(use_enable atmo) \
+		$(use_enable audioqueue) \
+		$(use_enable avcodec) \
+		$(use_enable avformat) \
+		$(use_enable bidi fribidi) \
+		$(use_enable bluray) \
+		$(use_enable cdda vcd) \
+		$(use_enable cddb libcddb) \
+		$(use_enable chromaprint) \
+		$(use_enable dbus) \
+		$(use_enable directfb) \
+		$(use_enable directx) \
+		$(use_enable dc1394) \
+		$(use_enable debug) \
+		$(use_enable dts dca) \
+		$(use_enable dvbpsi) \
+		$(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
+		$(use_enable dxva2) \
+		$(use_enable encode sout) \
+		$(use_enable faad) \
+		$(use_enable fdk fdkaac) \
+		$(use_enable flac) \
+		$(use_enable fluidsynth) \
+		$(use_enable fontconfig) \
+		$(use_enable gcrypt libgcrypt) \
+		$(use_enable gme) \
+		$(use_enable gnome gnomevfs) \
+		$(use_enable gnutls) \
+		$(use_enable growl) \
+		$(use_enable gstreamer gst-decode) \
+		$(use_enable httpd) \
+		$(use_enable ieee1394 dv1394) \
+		$(use_enable jack) \
+		$(use_enable jpeg) \
+		$(use_enable kate) \
+		$(use_enable libass) \
+		$(use_enable libcaca caca) \
+		$(use_enable libnotify notify) \
+		$(use_enable libsamplerate samplerate) \
+		$(use_enable libtar) \
+		$(use_enable libtiger tiger) \
+		$(use_enable linsys) \
+		$(use_enable lirc) \
+		$(use_enable live live555) \
+		$(use_enable lua) \
+		$(use_enable macosx-dialog-provider) \
+		$(use_enable macosx-eyetv) \
+		$(use_enable macosx-qtkit) \
+		$(use_enable macosx-quartztext) \
+		$(use_enable matroska mkv) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable modplug mod) \
+		$(use_enable mp3 mad) \
+		$(use_enable mpeg libmpeg2) \
+		$(use_enable mtp) \
+		$(use_enable musepack mpc) \
+		$(use_enable ncurses) \
+		$(use_enable neon) \
+		$(use_enable ogg) $(use_enable ogg mux_ogg) \
+		$(use_enable omxil) \
+		$(use_enable omxil omxil-vout) \
+		$(use_enable opencv) \
+		$(use_enable opengl glspectrum) \
+		$(use_enable opus) \
+		$(use_enable optimisememory optimize-memory) \
+		$(use_enable png) \
+		$(use_enable postproc) \
+		$(use_enable projectm) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable rdp freerdp) \
+		$(use_enable rtsp realrtsp) \
+		$(use_enable run-as-root) \
+		$(use_enable samba smbclient) \
+		$(use_enable schroedinger) \
+		$(use_enable sdl) \
+		$(use_enable sdl-image) \
+		$(use_enable sid) \
+		$(use_enable sftp) \
+		$(use_enable shout) \
+		$(use_enable skins skins2) \
+		$(use_enable speex) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable svg) \
+		$(use_enable svg svgdec) \
+		$(use_enable swscale) \
+		$(use_enable taglib) \
+		$(use_enable theora) \
+		$(use_enable tremor) \
+		$(use_enable truetype freetype) \
+		$(use_enable twolame) \
+		$(use_enable udev) \
+		$(use_enable upnp) \
+		$(use_enable v4l v4l2) \
+		$(use_enable vaapi libva) \
+		$(use_enable vcdx) \
+		$(use_enable vdpau) \
+		$(use_enable vlm) \
+		$(use_enable vnc) \
+		$(use_enable vorbis) \
+		$(use_enable vpx) \
+		$(use_enable wma-fixed) \
+		$(use_with X x) \
+		$(use_enable x264) \
+		$(use_enable x265) \
+		$(use_enable xcb) \
+		$(use_enable xml libxml2) \
+		$(use_enable xv xvideo) \
+		$(use_enable zeroconf bonjour) \
+		$(use_enable zvbi) $(use_enable !zvbi telx) \
+		--disable-asdcp \
+		--disable-coverage \
+		--disable-cprof \
+		--disable-crystalhd \
+		--disable-decklink \
+		--disable-gles1 \
+		--disable-gles2 \
+		--disable-goom \
+		--disable-kai \
+		--disable-kva \
+		--disable-maintainer-mode \
+		--disable-merge-ffmpeg \
+		--disable-mfx \
+		--disable-mmal-codec \
+		--disable-mmal-vout \
+		--disable-opensles \
+		--disable-oss \
+		--disable-quicktime \
+		--disable-rpi-omxil \
+		--disable-shine \
+		--disable-sndio \
+		--disable-vda \
+		--disable-vsxu \
+		--disable-wasapi
+
+		# ^ We don't have these disabled libraries in the Portage tree yet.
+
+	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
+	# Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h.
+	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file
+	sed -i '1i#undef _FORTIFY_SOURCE' "${S}"/config.h || die
+}
+
+src_test() {
+	virtx emake check-TESTS
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if [[ "$ROOT" = "/" ]] && [[ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
+		einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
+		"/usr/$(get_libdir)/vlc/vlc-cache-gen" -f "/usr/$(get_libdir)/vlc/plugins/"
+	else
+		ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
+		ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
+		ewarn "If you do not do it, vlc will take a long time to load."
+	fi
+}
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
new file mode 100644
index 000000000000..11808b476de3
--- /dev/null
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -0,0 +1,458 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-beta/-test}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = *9999 ]] ; then
+	if [[ ${PV%.9999} != ${PV} ]] ; then
+		EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git"
+	else
+		EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
+	fi
+	SCM="git-r3"
+else
+	if [[ ${MY_P} = ${P} ]] ; then
+		SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
+	else
+		SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
+	fi
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd"
+fi
+inherit autotools flag-o-matic toolchain-funcs versionator virtualx ${SCM}
+
+DESCRIPTION="VLC media player - Video player and streamer"
+HOMEPAGE="https://www.videolan.org/vlc/"
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0/5-8" # vlc - vlccore
+
+IUSE="a52 aalib alsa altivec +audioqueue +avcodec +avformat bidi bluray cddb
+	chromaprint chromecast dbus dc1394 debug directfb directx dts dvb +dvbpsi dvd
+	dxva2 elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt
+	gme gnutls gstreamer httpd ieee1394 jack jpeg kate kde libass libav libcaca
+	libnotify +libsamplerate libtiger linsys libtar lirc live lua macosx-eyetv
+	macosx-notifications macosx-qtkit matroska cpu_flags_x86_mmx modplug mp3
+	mpeg mtp musepack ncurses neon ogg omxil opencv opengl optimisememory opus
+	png postproc projectm pulseaudio qt4 +qt5 rdp rtsp run-as-root samba
+	schroedinger sdl sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg
+	+swscale taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau
+	vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi
+"
+REQUIRED_USE="
+	aalib? ( X )
+	bidi? ( truetype )
+	dvb? ( dvbpsi )
+	dxva2? ( avcodec )
+	ffmpeg? ( avcodec avformat swscale )
+	fontconfig? ( truetype )
+	gnutls? ( gcrypt )
+	httpd? ( lua )
+	libcaca? ( X )
+	libtar? ( skins )
+	libtiger? ( kate )
+	qt4? ( X )
+	qt5? ( X )
+	sdl? ( X )
+	skins? ( truetype X xml || ( qt4 qt5 ) )
+	vaapi? ( avcodec X )
+	vdpau? ( X )
+	vlm? ( encode )
+	xv? ( xcb )
+"
+RDEPEND="
+	dev-libs/libgpg-error:0
+	net-dns/libidn:0
+	sys-libs/zlib:0[minizip]
+	virtual/libintl:0
+	a52? ( >=media-libs/a52dec-0.7.4-r3:0 )
+	aalib? ( media-libs/aalib:0 )
+	alsa? ( >=media-libs/alsa-lib-1.0.24:0 )
+	avcodec? (
+		!libav? ( media-video/ffmpeg:0= )
+		libav? ( media-video/libav:0= )
+	)
+	avformat? (
+		!libav? ( media-video/ffmpeg:0= )
+		libav? ( media-video/libav:0= )
+	)
+	bidi? ( dev-libs/fribidi:0 )
+	bluray? ( >=media-libs/libbluray-0.6.2:0= )
+	cddb? ( >=media-libs/libcddb-1.2:0 )
+	chromaprint? ( >=media-libs/chromaprint-0.6:0 )
+	chromecast? ( >=dev-libs/protobuf-2.5.0 )
+	dbus? ( >=sys-apps/dbus-1.6:0 )
+	dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 )
+	directfb? ( dev-libs/DirectFB:0 sys-libs/zlib:0 )
+	dts? ( >=media-libs/libdca-0.0.5:0 )
+	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= )
+	dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 )
+	elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 )
+	faad? ( >=media-libs/faad2-2.6.1:0 )
+	fdk? ( media-libs/fdk-aac:0 )
+	flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 )
+	fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.6.0:0= )
+	gme? ( media-libs/game-music-emu:0 )
+	gnutls? ( >=net-libs/gnutls-3.2.0:0 )
+	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
+	ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 )
+	jack? ( virtual/jack )
+	jpeg? ( virtual/jpeg:0 )
+	kate? ( >=media-libs/libkate-0.3:0 )
+	libass? ( >=media-libs/libass-0.9.8:0= media-libs/fontconfig:1.0 )
+	libcaca? ( >=media-libs/libcaca-0.99_beta14:0 )
+	libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 )
+	libsamplerate? ( media-libs/libsamplerate:0 )
+	libtar? ( >=dev-libs/libtar-1.2.11-r3:0 )
+	libtiger? ( >=media-libs/libtiger-0.3.1:0 )
+	linsys? ( >=media-libs/zvbi-0.2.28:0 )
+	lirc? ( app-misc/lirc:0 )
+	live? ( >=media-plugins/live-2011.12.23:0 )
+	lua? ( >=dev-lang/lua-5.1:0 )
+	matroska? (	>=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= )
+	modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 )
+	mp3? ( media-libs/libmad:0 )
+	mpeg? ( >=media-libs/libmpeg2-0.3.2:0 )
+	mtp? ( >=media-libs/libmtp-1:0 )
+	musepack? ( >=media-sound/musepack-tools-444:0 )
+	ncurses? ( sys-libs/ncurses:0=[unicode] )
+	ogg? ( >=media-libs/libogg-1:0 )
+	opencv? ( >media-libs/opencv-2:0= )
+	opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 )
+	opus? ( >=media-libs/opus-1.0.3:0 )
+	png? ( media-libs/libpng:0= sys-libs/zlib:0 )
+	postproc? (
+		!libav? ( >=media-video/ffmpeg-3.1.3:0= )
+		libav? ( media-libs/libpostproc:0= )
+	)
+	projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
+	pulseaudio? ( >=media-sound/pulseaudio-1:0 )
+	!qt5? ( qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) )
+	qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
+	rdp? ( =net-misc/freerdp-1*:0=[client] )
+	samba? ( >=net-fs/samba-4.0.0_alpha1:0[client] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
+	sdl? ( >=media-libs/libsdl-1.2.10:0
+		sdl-image? ( >=media-libs/sdl-image-1.2.10:0 sys-libs/zlib:0 ) )
+	sftp? ( net-libs/libssh2:0 )
+	shout? ( >=media-libs/libshout-2.1:0 )
+	sid? ( media-libs/libsidplay:2 )
+	skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 )
+	speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 )
+	svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 )
+	swscale? (
+		!libav? ( media-video/ffmpeg:0= )
+		libav? ( media-video/libav:0= )
+	)
+	taglib? ( >=media-libs/taglib-1.9:0 sys-libs/zlib:0 )
+	theora? ( >=media-libs/libtheora-1.0_beta3:0 )
+	tremor? ( media-libs/tremor:0 )
+	truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0
+		!fontconfig? ( media-fonts/dejavu:0 ) )
+	twolame? ( media-sound/twolame:0 )
+	udev? ( >=virtual/udev-142:0 )
+	upnp? ( net-libs/libupnp:0 )
+	v4l? ( media-libs/libv4l:0 )
+	vaapi? (
+		x11-libs/libva:0[X,drm]
+		!libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi] )
+		libav? ( media-video/libav:0=[vaapi] )
+	)
+	vcd? ( >=dev-libs/libcdio-0.78.2:0 )
+	vdpau? (
+		x11-libs/libvdpau:0
+		!libav? ( media-video/ffmpeg:0= )
+		libav? ( >=media-video/libav-10:0= )
+	)
+	vnc? ( >=net-libs/libvncserver-0.9.9:0 )
+	vorbis? ( media-libs/libvorbis:0 )
+	vpx? ( media-libs/libvpx:0= )
+	X? ( x11-libs/libX11:0 )
+	x264? ( media-libs/x264:0= )
+	x265? ( media-libs/x265:0= )
+	xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 )
+	xml? ( dev-libs/libxml2:2 )
+	zeroconf? ( >=net-dns/avahi-0.6:0[dbus] )
+	zvbi? ( media-libs/zvbi:0 )
+"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils:0
+	>=sys-devel/gettext-0.19.6:*
+	virtual/pkgconfig:*
+	!qt5? ( kde? ( kde-frameworks/kdelibs:4 ) )
+	amd64? ( dev-lang/yasm:* )
+	x86?   ( dev-lang/yasm:* )
+	xcb? ( x11-proto/xproto:0 )
+"
+
+PATCHES=(
+	# Fix build system mistake.
+	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch
+
+	# Patch up incompatibilities and reconfigure autotools.
+	"${FILESDIR}"/${PN}-9999-libva-1.2.1-compat.patch
+
+	# Fix up broken audio when skipping using a fixed reversed bisected commit.
+	"${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch
+
+	# Bug #593460
+	"${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch
+)
+
+DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	if [[ ${PV} = *9999 ]] ; then
+		git-r3_src_unpack
+	else
+		unpack ${A}
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Remove unnecessary warnings about unimplemented pragmas on gcc for now.
+	# Need to recheck this with gcc 4.9 and every subsequent minor bump of gcc.
+	#
+	# config.h:792: warning: ignoring #pragma STDC FENV_ACCESS [-Wunknown-pragmas]
+	# config.h:793: warning: ignoring #pragma STDC FP_CONTRACT [-Wunknown-pragmas]
+	#
+	# https://gcc.gnu.org/c99status.html
+	if tc-is-gcc ; then
+		sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die
+	fi
+
+	# Bootstrap when we are on a git checkout.
+	if [[ ${PV} = *9999 ]] ; then
+		./bootstrap
+	fi
+
+	# Make it build with libtool 1.5
+	rm -f m4/lt* m4/libtool.m4 || die
+
+	# We are not in a real git checkout due to the absence of a .git directory.
+	touch src/revision.txt || die
+
+	# Don't use --started-from-file when not using dbus.
+	if ! use dbus ; then
+		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
+	fi
+
+	eautoreconf
+
+	# Disable automatic running of tests.
+	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
+
+	# If qtchooser is installed, it may break the build, because moc,rcc and uic binaries for wrong qt
+	# version may be used. Setting QT_SELECT environment variable will enforce correct binaries.
+	if use qt5; then
+		export QT_SELECT=qt5
+	elif use qt4; then
+		export QT_SELECT=qt4
+	fi
+}
+
+src_configure() {
+	local myconf
+
+	# Compatibility fix for Samba 4.
+	use samba && append-cppflags "-I/usr/include/samba-4.0"
+
+	# We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
+	use x86 && append-cflags $(test-flags-CC -fno-stack-check)
+
+	# VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8
+	append-cxxflags -std=c++11
+
+	# FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
+
+	if use truetype || use projectm ; then
+		local dejavu="/usr/share/fonts/dejavu/"
+		myconf="--with-default-font=${dejavu}/DejaVuSans.ttf \
+				--with-default-font-family=Sans \
+				--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
+				--with-default-monospace-font-family=Monospace"
+	fi
+
+	if use qt4 || use qt5 ; then
+		myconf+=" --enable-qt"
+	fi
+
+	if ! use qt5 && use kde ; then
+		myconf+=" --with-kde-solid"
+	fi
+
+	econf \
+		${myconf} \
+		--enable-vlc \
+		--docdir=/usr/share/doc/${PF} \
+		--disable-dependency-tracking \
+		--disable-optimizations \
+		--disable-update-check \
+		--enable-fast-install \
+		--enable-screen \
+		$(use_enable a52) \
+		$(use_enable aalib aa) \
+		$(use_enable alsa) \
+		$(use_enable altivec) \
+		$(use_enable audioqueue) \
+		$(use_enable avcodec) \
+		$(use_enable avformat) \
+		$(use_enable bidi fribidi) \
+		$(use_enable bluray) \
+		$(use_enable cddb libcddb) \
+		$(use_enable chromaprint) \
+		$(use_enable chromecast) \
+		$(use_enable dbus) \
+		$(use_enable directfb) \
+		$(use_enable directx) \
+		$(use_enable dc1394) \
+		$(use_enable debug) \
+		$(use_enable dts dca) \
+		$(use_enable dvbpsi) \
+		$(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
+		$(use_enable dxva2) \
+		$(use_enable encode sout) \
+		$(use_enable faad) \
+		$(use_enable fdk fdkaac) \
+		$(use_enable flac) \
+		$(use_enable fluidsynth) \
+		$(use_enable fontconfig) \
+		$(use_enable gcrypt libgcrypt) \
+		$(use_enable gme) \
+		$(use_enable gnutls) \
+		$(use_enable gstreamer gst-decode) \
+		$(use_enable httpd) \
+		$(use_enable ieee1394 dv1394) \
+		$(use_enable jack) \
+		$(use_enable jpeg) \
+		$(use_enable kate) \
+		$(use_enable libass) \
+		$(use_enable libcaca caca) \
+		$(use_enable libnotify notify) \
+		$(use_enable libsamplerate samplerate) \
+		$(use_enable libtar) \
+		$(use_enable libtiger tiger) \
+		$(use_enable linsys) \
+		$(use_enable lirc) \
+		$(use_enable live live555) \
+		$(use_enable lua) \
+		$(use_enable macosx-eyetv) \
+		$(use_enable macosx-notifications osx-notifications) \
+		$(use_enable macosx-qtkit) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable modplug mod) \
+		$(use_enable mp3 mad) \
+		$(use_enable mpeg libmpeg2) \
+		$(use_enable mtp) \
+		$(use_enable musepack mpc) \
+		$(use_enable ncurses) \
+		$(use_enable neon) \
+		$(use_enable ogg) $(use_enable ogg) \
+		$(use_enable omxil) \
+		$(use_enable omxil omxil-vout) \
+		$(use_enable opencv) \
+		$(use_enable opus) \
+		$(use_enable optimisememory optimize-memory) \
+		$(use_enable png) \
+		$(use_enable postproc) \
+		$(use_enable projectm) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable rdp freerdp) \
+		$(use_enable rtsp realrtsp) \
+		$(use_enable run-as-root) \
+		$(use_enable samba smbclient) \
+		$(use_enable schroedinger) \
+		$(use_enable sdl) \
+		$(use_enable sdl-image) \
+		$(use_enable sid) \
+		$(use_enable sftp) \
+		$(use_enable shout) \
+		$(use_enable skins skins2) \
+		$(use_enable speex) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable svg) \
+		$(use_enable svg svgdec) \
+		$(use_enable swscale) \
+		$(use_enable taglib) \
+		$(use_enable theora) \
+		$(use_enable tremor) \
+		$(use_enable truetype freetype) \
+		$(use_enable twolame) \
+		$(use_enable udev) \
+		$(use_enable upnp) \
+		$(use_enable v4l v4l2) \
+		$(use_enable vaapi libva) \
+		$(use_enable vcd) \
+		$(use_enable vdpau) \
+		$(use_enable vlm) \
+		$(use_enable vnc) \
+		$(use_enable vorbis) \
+		$(use_enable vpx) \
+		$(use_enable wma-fixed) \
+		$(use_with X x) \
+		$(use_enable x264) \
+		$(use_enable xcb) \
+		$(use_enable xml libxml2) \
+		$(use_enable xv xvideo) \
+		$(use_enable x265) \
+		$(use_enable zeroconf avahi) \
+		$(use_enable zvbi) $(use_enable !zvbi telx) \
+		--disable-asdcp \
+		--disable-coverage \
+		--disable-cprof \
+		--disable-crystalhd \
+		--disable-decklink \
+		--disable-gles1 \
+		--disable-gles2 \
+		--disable-goom \
+		--disable-kai \
+		--disable-kva \
+		--disable-maintainer-mode \
+		--disable-merge-ffmpeg \
+		--disable-mfx \
+		--disable-mmal \
+		--disable-opensles \
+		--disable-oss \
+		--disable-rpi-omxil \
+		--disable-shine \
+		--disable-sndio \
+		--disable-vda \
+		--disable-vsxu \
+		--disable-wasapi
+
+		# ^ We don't have these disabled libraries in the Portage tree yet.
+
+	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
+	# Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h.
+	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file
+	sed -i '1i#undef _FORTIFY_SOURCE' "${S}"/config.h || die
+}
+
+src_test() {
+	virtx emake check-TESTS
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if [[ "$ROOT" = "/" ]] && [[ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
+		einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
+		"/usr/$(get_libdir)/vlc/vlc-cache-gen" -f "/usr/$(get_libdir)/vlc/plugins/"
+	else
+		ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
+		ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
+		ewarn "If you do not do it, vlc will take a long time to load."
+	fi
+}
diff --git a/media-video/vobcopy/Manifest b/media-video/vobcopy/Manifest
new file mode 100644
index 000000000000..a8f2d76a6421
--- /dev/null
+++ b/media-video/vobcopy/Manifest
@@ -0,0 +1,5 @@
+DIST vobcopy-1.2.0.tar.bz2 60102 SHA256 892504d195d06a80ab283db642eb2ccbf9f1dc6ba5ff0fdfcf7a9cb660f48106 SHA512 442849e0e4d379d6289011baa9074b89d579323d1d01faa1531f642d5dd4d25bd76b0286741e79da6e13f71b13ae8f86795c67059b47067d108b00a7b77945a5 WHIRLPOOL 56bbec426672228bb762fde06233bf0d0793167e1a0ae96c89bd8a7d7cfeee7795a7e553cf5a9c96ea999fd0cd22501ce544ce91cfa3bbc7fb1d04054f6c35a2
+EBUILD vobcopy-1.2.0.ebuild 665 SHA256 d6679e610004e8d5510a76dd5f63731ec8cad64f7dd52e15ac1298e05cead43d SHA512 c404d952748996a0a73c5c001f395e3cef860bb060dd7eaa9ec5827f8db7cff500d7de6ed0cf7e8cd26921e7ff49176bbf9d588cf3edaba4fcd354c25dffe62c WHIRLPOOL 5e497b7998aec66326433aa074f0bb3b50182749c5afaa1a09577a2357e5588b1b4a18e88acb3f56718a93fd7215febca0c50aaf9b50b09e004dd0e0bc126ebe
+MISC ChangeLog 2430 SHA256 0e955c20ce00bbf8e2fea6a10b32ab24ee3b29afe798f5dce58783be3149161c SHA512 0c8ac404b66579a6331571dbf26163a41329951dc45a6cf2a9472aa16e9c87a6c6f64729b0b9b030f367d344caf3054706f83ca72c7f2ea081df4eb6ee83302c WHIRLPOOL d50cd887adf7011100665f7a4a44ac1428ec2a02716c3bd1d12a6775ece1cac2f1b8a3c165de54fd0b2d2b7af6a1cb72aeb53dd2df0ab0d4924a065e94a79ffb
+MISC ChangeLog-2015 5884 SHA256 d4c3243df27315e8d76e268bb5a665322ea1954ece6800d77be26c1688492f6f SHA512 e3f898b86336726e9359a236fe5888e59077148bd4901e75a825ac546d6b61a32e26b472906bf9ab94a3de4ae06fc111764a6aca4cc46c003da40e3c8905640d WHIRLPOOL a3b2fd41f73c362494734c355623b5819fd1c02c0f7e14a5da7c7c81eb1dd05a88a5b5aff48a0f3aeb8da2d8410caf94a81e2f1d254d3eaec36bb1bd117e4eca
+MISC metadata.xml 255 SHA256 cfa2e7e4e1ad84d152c6b2f49467e2beb07d188dad704bc9887438f2b0d95f18 SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9 WHIRLPOOL 6fbb4f57853f7ac5b979c506736e63f571606215889abf768ddb44fc91b3491a846ea84d46c6984bd3cd230f4808f8f39fa83580e636576c7756fdb1564869da
diff --git a/media-video/vobcopy/metadata.xml b/media-video/vobcopy/metadata.xml
new file mode 100644
index 000000000000..2a705e39ce78
--- /dev/null
+++ b/media-video/vobcopy/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>media-video@gentoo.org</email>
+	<name>Gentoo Video project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-video/vobcopy/vobcopy-1.2.0.ebuild b/media-video/vobcopy/vobcopy-1.2.0.ebuild
new file mode 100644
index 000000000000..fe6ab57ce9e7
--- /dev/null
+++ b/media-video/vobcopy/vobcopy-1.2.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit toolchain-funcs
+
+IUSE=""
+
+DESCRIPTION="copies DVD .vob files to harddisk, decrypting them on the way"
+HOMEPAGE="http://lpn.rnbhq.org/"
+SRC_URI="http://lpn.rnbhq.org/download/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+
+DEPEND=">=media-libs/libdvdread-0.9.4"
+
+src_configure() {
+	tc-export CC
+	./configure.sh --with-lfs
+}
+
+src_install() {
+	dobin vobcopy || die "dobin failed"
+	doman vobcopy.1 || die "doman failed"
+	dodoc Changelog README Release-Notes TODO alternative_programs.txt \
+		|| die "dodoc failed"
+}
diff --git a/media-video/vstrip/Manifest b/media-video/vstrip/Manifest
new file mode 100644
index 000000000000..d6296d71c0cf
--- /dev/null
+++ b/media-video/vstrip/Manifest
@@ -0,0 +1,6 @@
+AUX vstrip-0.8f-gentoo.patch 2035 SHA256 8b861a3278397dc67f0a00e49be4b1a61915351951acb2799e732eab3f889760 SHA512 c304726b9575975125888abb82e0099715e4f54ba6193844072e02986ea363b852114b704caba963cae4680f762c88bed77f4584a7865b825e4a23f1ee3a31f7 WHIRLPOOL eb5c7acd4c27ddf2cb38945e87e4287559648a5561a8c05e0e080323e5bd599f14fce2968c65bb83c12b420e77c00613f942efb302904f64c6382172bab808e9
+DIST vStrip_08f.zip 409157 SHA256 0813be0b20ab7eeacd7213df7fe1704ef6070471c953a705391d82bba78e8fff SHA512 5b8fa07e923709aa0defcbe3ad6fced02eddd5cacc7c33a5ec777e1d64d1e33f3163c82c7fd74eb80f02833c75593e7fe544fa93a56271926a51dbc663f39276 WHIRLPOOL b367dd3df8491789190d931df38779d935ac5e653e671442fe791195401e61758151f06c65689348e03d0628ea3ca20b7880a45c5fbe18e4bfbdcb051c3594f8
+EBUILD vstrip-0.8f.ebuild 735 SHA256 bdc60b5121f041d09b2be48fdfcc866967121f35a25ad1156e3c9f516edc5dd8 SHA512 4322863fd6df0c37ac11c8e918ac37c878f2b9e9fdc18bb4323b6d105226be661766239935ec648932548647318d9eeb17773e0193d49b42a58c5ddbb90cb48f WHIRLPOOL e7a5d02de2131408c3731ed120fb8801b1c3d64c8e742ffcb020a26918cf35fbf3f9b1195dc499a147bfccc12e2af0e3ff373ad2082be88b9834cd498ebceb24
+MISC ChangeLog 2851 SHA256 6dd1739a1a09d7200612234319883b5c9ab53db12d1056d0fed7075aca9e8e08 SHA512 ee4b71ca8dc57f493875e07d9bc50562aec80fe8b78fdc902a3ce4b1c14243ccaf122f2b9ef170f1ded103d0c6751cd1785c21c4ed173d0596bcf4b771086b6c WHIRLPOOL 8e110b06ae20759cdefb269e66691e6d0561e51b13e5b2ba1350efc94842991db5bd32e009ca606181b7bc49d81b1b9a615cafac36e99c6220c7c7cb309dd09c
+MISC ChangeLog-2015 1140 SHA256 5d0a471d892085508cc5a1420db4f90706a706c529b68aad59e2281ed6e99b5c SHA512 a9d5a18ee32c9f6857714c890bcc71295e15ff3470eebfdfe4eca45177a5cbfcfe29c8e3c57df322487dd1b1b366657ca4e317f135bbff1e049b75e4dad36968 WHIRLPOOL 07e7c953c37e3b4afcd4f14e94cd3fa07c23b4002bf1494751eea91b8033bde9666ac2364ff4267c5419976196f304c965a5305acb5dc215acc00479f04d9060
+MISC metadata.xml 331 SHA256 a181f0d9cb5e82f244810aa5a99a4cb75bc07a6d0b2309fd9368482be5567d0e SHA512 b01bf58ac5f7ecdc703ffc83ca687e07153770a7880084c245e6d8b868329dcca116680d3d7e41f1637343f9d825417f615f18a117952222f82f7d655f5d9d0b WHIRLPOOL b9656c546a56a678c05e4220753737af093141935be0932e7b70e60fcbc6704564957461117cd0b20badff0b45ad7742d90f962416197d3ad620cdce07cbad59
diff --git a/media-video/vstrip/files/vstrip-0.8f-gentoo.patch b/media-video/vstrip/files/vstrip-0.8f-gentoo.patch
new file mode 100644
index 000000000000..77328b091247
--- /dev/null
+++ b/media-video/vstrip/files/vstrip-0.8f-gentoo.patch
@@ -0,0 +1,63 @@
+--- Makefile
++++ Makefile	2003-10-12 02:25:31.000000000 +0000
+@@ -4,7 +4,7 @@
+ 

+ ### Sources

+ 

+-SOURCE_FILES=file_io.h file_io.c in_buffer.h in_buffer.c parse_ifo.h parse_ifo.c s_types.h main.c vstrip.h vstrip.c

++SOURCE_FILES=file_io.h file_io.c in_buffer.h in_buffer.c parse_ifo.h parse_ifo.c s_types.h main.c vstrip.h vstrip.c dvd2avi_plugin.c

+ 

+ ### Objects and executables

+ 

+@@ -27,8 +27,8 @@
+ 

+ ### Details

+ 

+-vstrip :	 file_io.o in_buffer.o main.o parse_ifo.o vstrip.o

+-	$(CC)	-g  file_io.o in_buffer.o main.o parse_ifo.o vstrip.o -o vstrip

++vstrip :	 file_io.o in_buffer.o main.o parse_ifo.o vstrip.o dvd2avi_plugin.o

++	$(CC)	$(LDFLAGS) file_io.o in_buffer.o main.o parse_ifo.o vstrip.o dvd2avi_plugin.o -o vstrip -lm 

+ file_io.o : s_types.h file_io.h file_io.c

+ in_buffer.o : s_types.h file_io.h in_buffer.h in_buffer.c

+ main.o : s_types.h file_io.h vstrip.h main.c

+--- dvd2avi_plugin.c
++++ dvd2avi_plugin.c	2003-10-12 02:29:23.000000000 +0000
+@@ -6,13 +6,17 @@
+   

+ *************************************************************************/

+ 

++#include <string.h>

++#include <stdlib.h>

+ #include <stdio.h>

+-#include <io.h>

++#include <sys/io.h>

+ #include <fcntl.h>

+ #include "s_types.h"

+ #include "vstrip.h"

+ #include "dvd2avi_plugin.h"

+ 

++#define max(a,b) a < b ? b : a

++

+ bool dvd2avi_process(byte *data, tp_vs_streaminfo const si, void *user_data)

+ {

+ 	t_dvd2avi* d2v = (t_dvd2avi *)user_data;

+@@ -206,7 +210,7 @@
+ 	fp = _open(fname, _O_BINARY | _O_RDONLY); // check size

+ 	if (fp != -1)

+ 	{

+-		__int64 fposition = _filelengthi64(fp);

++		__int64_t fposition = lseek64(fp, 0, SEEK_END);

+ 		

+ 		lba = (dword)(fposition / fio_SECTOR_SIZE);

+ 		_close(fp);

+--- file_io.c
++++ file_io.c	2003-10-12 02:24:46.000000000 +0000
+@@ -32,7 +32,7 @@
+ 		fp = _open(name, _O_BINARY | _O_RDONLY); // check size

+ 		if (fp != -1)

+ 		{

+-			__int64 fposition = _filelengthi64(fp);

++			__int64_t fposition = lseek64(fp, 0, SEEK_END);

+ 			

+ 			f->written_to = fposition > 0;

+ 			if (fposition > 0)

diff --git a/media-video/vstrip/metadata.xml b/media-video/vstrip/metadata.xml
new file mode 100644
index 000000000000..346d6849468e
--- /dev/null
+++ b/media-video/vstrip/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>media-video@gentoo.org</email>
+</maintainer>
+<longdescription lang="en">
+A program to divide a non encrypted vob by individiual chapters
+</longdescription>
+</pkgmetadata>
diff --git a/media-video/vstrip/vstrip-0.8f.ebuild b/media-video/vstrip/vstrip-0.8f.ebuild
new file mode 100644
index 000000000000..ac2ff90773a0
--- /dev/null
+++ b/media-video/vstrip/vstrip-0.8f.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A program to split non-css dvd vobs into individual chapters"
+HOMEPAGE="http://www.maven.de/code"
+SRC_URI="http://files.digital-digest.com/downloads/files/encode/vStrip_${PV/./}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	edos2unix *.c *.h
+
+	for file in *.c *.h ; do
+		echo >>$file
+	done
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS} -D__UNIX__" CC="$(tc-getCC)" || die "emake failed."
+}
+
+src_install() {
+	dobin vstrip
+}
diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest
new file mode 100644
index 000000000000..3a7c158242a6
--- /dev/null
+++ b/media-video/x264-encoder/Manifest
@@ -0,0 +1,9 @@
+AUX gpac.patch 507 SHA256 e5707e103597b2f631bac3e3d85b5ea931bfeeec9b40ed0201c50ee410ee6d86 SHA512 9da7a1ffe637e39863e5828547923424b9c072d194d3ddadcc9a6c31f7803f5456b3ba88d470458a84d37b0c07374983adc124f3710ae7122a81a13ea9b4ae0e WHIRLPOOL 198150f569a4da1b48fc9b393145d6393c28ed5be3b3ab1576173fe1465fd70b3cfdf496bd138255154e45ff5552c108e1e6a096958bc3d3edca6430816d6a16
+DIST x264-snapshot-20160712-2245.tar.bz2 730644 SHA256 d5033882bbc7e2908f74970931c7dc2044191cc9fa7c7435dc85ad334f23078e SHA512 ac97730611e6194701a891a7e73c739696664de2411a7937ab0c36a3ce843f22bf2bd2defe053c2506d95652842b99a905b6f16a2f016a9d73059c2c75b71963 WHIRLPOOL d42459a93e8ff1b69d16f7adecaf3486d102e6fe4ee0d8dd991cdbb7a233bb9975faabc79ff7d2dfd2f67fa1f69a729e617ae868ee127cc0306dfc897db7053b
+DIST x264-snapshot-20170701-2245.tar.bz2 750527 SHA256 6ca4863cda3c7c24923ebd2c062c001a05283d50922292ee55dfda7811782380 SHA512 28fc9850c36ac385fced6dec9a0f68a5605a68805e1ef7b8cedcd78917eaa1ad6e47e57fe5a74fee0a6e482f3a33de6011f675e6c77b5db94c8fe01d5c5f3e9f WHIRLPOOL 063c0d3685d961b96101c98110345d1b283dbfe2b2098be51b4cb55f9d0551e80d01d449a2622ebba457a5a8374f5c2783351e2e1f0bfabf150be27dbcc07965
+EBUILD x264-encoder-0.0.20160712.ebuild 2172 SHA256 c14a7132460c9850f655b176fb781ccea4f3618b000294e2f03fa9c8bb51df47 SHA512 94d003d2096750d5b333315a805858b403c09c0bb20f271cfcdeb1bd3d035b7353611c76c9c475ee3675762cc178c2e4db8eaa2ca92ca10477a36c5446582a33 WHIRLPOOL 1c59f319303a4e9cd183f73457a6fb9c11291e178c3cdc3c7dec0c9e67f5b38ebecc4be67798c633be2d8d37e1163160615aa248d93011ba6e33d7e2f7d16f02
+EBUILD x264-encoder-0.0.20170701.ebuild 2175 SHA256 bf3172b428e6d02760e27029092188ad862d77d24938e03ca85f2be262c35b0a SHA512 1929a387d51bd0ea89b333f5dcce3d23accce43835710f4837fcfe61303475ae47d0e08559e7f51bb40f721b1efe95b7eb9a8df375ebba3409d92beeee025557 WHIRLPOOL 87d75e877bfa71d4c6e1c2dc93918eab7819672bc6c6ee15db61127e9680aefc95a20f8adb989c1bdaf76aaf4cfba7da09686d2ea7d952b96193f7f8e308d59b
+EBUILD x264-encoder-9999.ebuild 2175 SHA256 bf3172b428e6d02760e27029092188ad862d77d24938e03ca85f2be262c35b0a SHA512 1929a387d51bd0ea89b333f5dcce3d23accce43835710f4837fcfe61303475ae47d0e08559e7f51bb40f721b1efe95b7eb9a8df375ebba3409d92beeee025557 WHIRLPOOL 87d75e877bfa71d4c6e1c2dc93918eab7819672bc6c6ee15db61127e9680aefc95a20f8adb989c1bdaf76aaf4cfba7da09686d2ea7d952b96193f7f8e308d59b
+MISC ChangeLog 4456 SHA256 1e95f6c9e4dc138f6ea0baf544cb7f13568c849a6f03683778e317db54da2dd0 SHA512 ab7671873342e73dd1b6accfb1b5b9edb1f5362ddf3281c052de2cd91ad44f9dab38f343864c33e988a136f7757113bf3e4ab33bbe31a82bc2ceb68fead5254b WHIRLPOOL 1b274cd01f63a09fd90849d5b1dd1e6994533b05dd91241684a2edfa25a0be227b89a6971c08c364ccdb39b28a421d092ba27743b74f3d5aa51bcb559a757019
+MISC ChangeLog-2015 13717 SHA256 0d304d08d08fc05fbc3566967789d8c8ae9ac92e8ee8396cd0a783ca72eee203 SHA512 01c80d1de54e15acc232ec441c8c1d960b218a7464d45f3566f16c12a6a64e352aafbac8f8668ac16cd0b9f1e0407c08f48a2bc70e9dba084eeb0eea56cce803 WHIRLPOOL cc8b175a6ec7e228470fb6fd2ba6f78f1dc6166b1eab80c9c01103f8df66c1b5a18d0c6eabd73467e1e1f5b419774c51cbf6fe04ae623798d33be861b0c0707e
+MISC metadata.xml 587 SHA256 867f446d7573f371ffc300b8cf789459eba5deca624c07a149992c3cc32d7fe5 SHA512 383e8540e2bde9190f48030956ff00eebb86f02781dfeffee9507198e00ee9d7f6cba6e05e5b9c7e8c692b0d5935531c162d7b5efe61a7f1ce2a88458ae2ec04 WHIRLPOOL c4d92917acb234eb49a1c3e3dceed6db1c3c2a62f393e4c90e75e6106698a22b23b4580007348a423e89f19a8df7fc3b21efcb1b573229f1477f1aa48833885f
diff --git a/media-video/x264-encoder/files/gpac.patch b/media-video/x264-encoder/files/gpac.patch
new file mode 100644
index 000000000000..94da64cf9d40
--- /dev/null
+++ b/media-video/x264-encoder/files/gpac.patch
@@ -0,0 +1,13 @@
+Index: x264-snapshot-20150820-2245/configure
+===================================================================
+--- x264-snapshot-20150820-2245.orig/configure
++++ x264-snapshot-20150820-2245/configure
+@@ -1086,7 +1086,7 @@ fi
+ 
+ if [ "$gpac" = "auto" -a "$lsmash" != "yes" ] ; then
+     gpac="no"
+-    GPAC_LIBS="-lgpac_static"
++    GPAC_LIBS="-lgpac"
+     cc_check "" -lz && GPAC_LIBS="$GPAC_LIBS -lz"
+     if [ "$SYS" = "WINDOWS" ] ; then
+         cc_check "" -lws2_32 && GPAC_LIBS="$GPAC_LIBS -lws2_32"
diff --git a/media-video/x264-encoder/metadata.xml b/media-video/x264-encoder/metadata.xml
new file mode 100644
index 000000000000..b78e7f5a76e2
--- /dev/null
+++ b/media-video/x264-encoder/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>media-video@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="10bit">Set output bit depth to 10</flag>
+    <flag name="avs">enable AvxSynth support in the AviSynth input module</flag>
+    <flag name="ffmpegsource">Enable ffmpegsource aka ffms support, disables lavf</flag>
+    <flag name="interlaced">Enable interlaced encoding support, this can decrease encoding speed by up to 2%</flag>
+  </use>
+</pkgmetadata>
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20160712.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20160712.ebuild
new file mode 100644
index 000000000000..0f3b0b91384d
--- /dev/null
+++ b/media-video/x264-encoder/x264-encoder-0.0.20160712.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit flag-o-matic multilib toolchain-funcs eutils
+
+DESCRIPTION="A free commandline encoder for X264/AVC streams"
+HOMEPAGE="http://www.videolan.org/developers/x264.html"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://git.videolan.org/x264.git"
+	SRC_URI=""
+else
+	inherit versionator
+	MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
+	SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
+	KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="10bit avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
+
+REQUIRED_USE="ffmpegsource? ( ffmpeg )"
+
+RDEPEND="ffmpeg? ( virtual/ffmpeg )
+	~media-libs/x264-${PV}[10bit=,interlaced=,threads=]
+	ffmpegsource? ( media-libs/ffmpegsource )
+	mp4? ( >=media-video/gpac-0.5.2 )"
+
+ASM_DEP=">=dev-lang/yasm-1.2.0"
+DEPEND="${RDEPEND}
+	amd64? ( ${ASM_DEP} )
+	x86? ( ${ASM_DEP} )
+	x86-fbsd? ( ${ASM_DEP} )
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}/gpac.patch"
+}
+
+src_configure() {
+	tc-export CC
+
+	# let upstream pick the optimization level by default
+	use custom-cflags || filter-flags -O?
+
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--system-libx264 \
+		--host="${CHOST}" \
+		--disable-lsmash \
+		$(usex 10bit "--bit-depth=10" "") \
+		$(usex avs "" "--disable-avs") \
+		$(usex ffmpeg "" "--disable-lavf --disable-swscale") \
+		$(usex ffmpegsource "" "--disable-ffms") \
+		$(usex interlaced "" "--disable-interlaced") \
+		$(usex mp4 "" "--disable-gpac") \
+		$(usex threads "" "--disable-thread") || die
+
+	# this is a nasty workaround for bug #376925 for x264 that also applies
+	# here, needed because as upstream doesn't like us fiddling with their CFLAGS
+	if use custom-cflags; then
+		local cflags
+		cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
+		cflags="${cflags//$(get-flag O)/}"
+		cflags="${cflags//-O? /$(get-flag O) }"
+		cflags="${cflags//-g /}"
+		sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
+	fi
+}
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild
new file mode 100644
index 000000000000..96667a601b46
--- /dev/null
+++ b/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit flag-o-matic multilib toolchain-funcs eutils
+
+DESCRIPTION="A free commandline encoder for X264/AVC streams"
+HOMEPAGE="http://www.videolan.org/developers/x264.html"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://git.videolan.org/x264.git"
+	SRC_URI=""
+else
+	inherit versionator
+	MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
+	SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="10bit avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
+
+REQUIRED_USE="ffmpegsource? ( ffmpeg )"
+
+RDEPEND="ffmpeg? ( virtual/ffmpeg )
+	~media-libs/x264-${PV}[10bit=,interlaced=,threads=]
+	ffmpegsource? ( media-libs/ffmpegsource )
+	mp4? ( >=media-video/gpac-0.5.2:= )"
+
+ASM_DEP=">=dev-lang/nasm-2.13"
+DEPEND="${RDEPEND}
+	amd64? ( ${ASM_DEP} )
+	x86? ( ${ASM_DEP} )
+	x86-fbsd? ( ${ASM_DEP} )
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}/gpac.patch"
+}
+
+src_configure() {
+	tc-export CC
+
+	# let upstream pick the optimization level by default
+	use custom-cflags || filter-flags -O?
+
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--system-libx264 \
+		--host="${CHOST}" \
+		--disable-lsmash \
+		$(usex 10bit "--bit-depth=10" "") \
+		$(usex avs "" "--disable-avs") \
+		$(usex ffmpeg "" "--disable-lavf --disable-swscale") \
+		$(usex ffmpegsource "" "--disable-ffms") \
+		$(usex interlaced "" "--disable-interlaced") \
+		$(usex mp4 "" "--disable-gpac") \
+		$(usex threads "" "--disable-thread") || die
+
+	# this is a nasty workaround for bug #376925 for x264 that also applies
+	# here, needed because as upstream doesn't like us fiddling with their CFLAGS
+	if use custom-cflags; then
+		local cflags
+		cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
+		cflags="${cflags//$(get-flag O)/}"
+		cflags="${cflags//-O? /$(get-flag O) }"
+		cflags="${cflags//-g /}"
+		sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
+	fi
+}
diff --git a/media-video/x264-encoder/x264-encoder-9999.ebuild b/media-video/x264-encoder/x264-encoder-9999.ebuild
new file mode 100644
index 000000000000..96667a601b46
--- /dev/null
+++ b/media-video/x264-encoder/x264-encoder-9999.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit flag-o-matic multilib toolchain-funcs eutils
+
+DESCRIPTION="A free commandline encoder for X264/AVC streams"
+HOMEPAGE="http://www.videolan.org/developers/x264.html"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://git.videolan.org/x264.git"
+	SRC_URI=""
+else
+	inherit versionator
+	MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
+	SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="10bit avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
+
+REQUIRED_USE="ffmpegsource? ( ffmpeg )"
+
+RDEPEND="ffmpeg? ( virtual/ffmpeg )
+	~media-libs/x264-${PV}[10bit=,interlaced=,threads=]
+	ffmpegsource? ( media-libs/ffmpegsource )
+	mp4? ( >=media-video/gpac-0.5.2:= )"
+
+ASM_DEP=">=dev-lang/nasm-2.13"
+DEPEND="${RDEPEND}
+	amd64? ( ${ASM_DEP} )
+	x86? ( ${ASM_DEP} )
+	x86-fbsd? ( ${ASM_DEP} )
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}/gpac.patch"
+}
+
+src_configure() {
+	tc-export CC
+
+	# let upstream pick the optimization level by default
+	use custom-cflags || filter-flags -O?
+
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--system-libx264 \
+		--host="${CHOST}" \
+		--disable-lsmash \
+		$(usex 10bit "--bit-depth=10" "") \
+		$(usex avs "" "--disable-avs") \
+		$(usex ffmpeg "" "--disable-lavf --disable-swscale") \
+		$(usex ffmpegsource "" "--disable-ffms") \
+		$(usex interlaced "" "--disable-interlaced") \
+		$(usex mp4 "" "--disable-gpac") \
+		$(usex threads "" "--disable-thread") || die
+
+	# this is a nasty workaround for bug #376925 for x264 that also applies
+	# here, needed because as upstream doesn't like us fiddling with their CFLAGS
+	if use custom-cflags; then
+		local cflags
+		cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
+		cflags="${cflags//$(get-flag O)/}"
+		cflags="${cflags//-O? /$(get-flag O) }"
+		cflags="${cflags//-g /}"
+		sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
+	fi
+}
diff --git a/media-video/xanim-export/Manifest b/media-video/xanim-export/Manifest
new file mode 100644
index 000000000000..c54e5621be85
--- /dev/null
+++ b/media-video/xanim-export/Manifest
@@ -0,0 +1,16 @@
+AUX 2.80.1-gentoo.patch 2814 SHA256 20e5959f0105e048746795e4857ca7bdcecb2fc2754a4fce7e4bcbd96337877d SHA512 6ccae1b9a904af30ccf7f4ff151a8085d4b81fcccea7beb54311784a2232a6923731338153290a40d4f28827fc28a0d56e1816cfeadecd0283e280d3b38866a5 WHIRLPOOL c3e9380340f44c5a8d14ac0e3cf235d099f71fb66d0ebc6917f5557ec78941fd979c85cf68506378da7cd18eb4c9749b21a155a7d415d8a72cf8e4d5e5cd09ac
+AUX 2.80.1-implicit_funcs.patch 571 SHA256 4f520f8d99150c6e8ce963aa41720f1dd3a702d5fccfa3a39f7d34155a8e0a7d SHA512 2abbc5f55deb1327d8835f97a7d94215b4667c6e874ee87510406fda0243e046c484a71ef01605ecd730e0c2c5b1a1258f17fb5c193bfacb19b8f632d44b3164 WHIRLPOOL 6cba3b0a758413b586cf7a20924fc4bb8d5cb7f3b0b7efbb8b7fd2ae5fe50e9492c01d2a8a06fcb9d7318e1323d991cd4fa526847e3a7cc596008cf815bad468
+DIST xa1.0_cyuv_linuxELFg21.o.gz 1141 SHA256 9fa40166a40a20734ba1d00990d142a3961c2416e66dac3fe0767e8304aadb1a SHA512 bc60f1a657c48a5aa2dbfd8808f76d9b904c9d745e1e5bd02d9b7a3c701378f5359b2c99e3eb48ca74708477c296b461ec78ce78f1895ca6279a3e750f6bb84f WHIRLPOOL da98f5e12ec449d95ccf6fc858d176844442613bc59d1973e88b9b4bdbe0b27ab8d69c80da60ea9db12013814b4f23391b74a8766f39291670731d8fa796df19
+DIST xa1.0_cyuv_linuxPPC.o.Z 1513 SHA256 35318deacea099d0c05be985c01672f7f306e748965d5bbc8dd454fe8a28c46e SHA512 8659bb119793291e7ce087795cddcdfc6b918e1c169132a6f1ebb1bd36270d57e0dfc84503ec61f90c461496cab688aaac1cb4dbb2a2483f846bea038305733f WHIRLPOOL 0b952b76acf9e12da988f1679f6fa1c7d002008ed4b762e54cdfbb1ae935273e85bde6b5cd338b7d2d89b77f3d01de7a7a31bc7e61396ab1af77cc92877a409a
+DIST xa1.0_cyuv_sparcELF.o.Z 1277 SHA256 f77cc763c9358e86bd5b77675cabf2150b2085d00d54eada0ec86239959a4a08 SHA512 2e7cab9942d2df510df5e3ed03a970a33276de56353ad0ee0970f42efac2fb2d4e4a92c8534eaa61eeb4f560241b405c92c77283086cf13be2bdcbb1f8423848 WHIRLPOOL f57b9de7ee40e828b193d36acb6be165e6dc0d3f164e1c2360e8109f5e611a3af66e3742a1e456f0728b6acc11412c3f5678de44cd24de12c2a8cecf30a97ba2
+DIST xa2.0_cvid_linuxELFg21.o.gz 3689 SHA256 59d7f06388f6461ce69aec7b815b5b76281bad14c7ef13f8fadaa5b848072eb5 SHA512 2375d44713af0fe5c6f3873cefd4e82ad2cdb5c3f2be936966a3d1747f73f15ad37945f2185da116f733eff7bdff989961e2cfc5d715ea9b5045d860aa32f0b4 WHIRLPOOL a115d5fd7ceac5bae8b06538cb1dc92f4e32bea0106780cf523e824b01db6e280239e6bf6def16f50acf59bb41222a640101c779da0414f2c71aa0ba2b83e080
+DIST xa2.0_cvid_linuxPPC.o.Z 5192 SHA256 aa7ea8f934780fa3ea887867811c18023cf7a9740cdfa942648f4fd7d6d996f5 SHA512 12ced02b89c2d8d8981104fe7fe93a95a2fb20607635194852e5ff6044c2def9df18ba1db8f639426fb9015f25e17d3b945170f4e1669a1281e0c8494363fe83 WHIRLPOOL 513b7b93e98f8207197476ade0282cf35cc8667c10a24f7cf73f46d39e465e869ab6563591fd3303d31553869b2a40c1ce7cf3260fb3f5023ab1918effab625e
+DIST xa2.0_cvid_sparcELF.o.Z 4730 SHA256 705511a4eb9a639b7c95a3bb7d6f4f7b1d0ce4a59db2a9cb567bfb3c4a513d02 SHA512 6d6aef8f5c4018facafbc42085b9644f2dbd37f8f0131b9e99bcb0d03157ead6d6bfe8fbc92f11cd1ab335d3771fb323081af578a40bf39c8e3ec766a2b0891a WHIRLPOOL a10ae9a90f3f4391170b4f160e90fb14e00c9e268e632e91fbb00e346192ef46fe26d0624b33b85d330440572e6852d374cc3e134c8c3c03d64789fb2b9f284a
+DIST xa2.0_iv32_linuxPPC.o.Z 56163 SHA256 d332753ffc6a47c9853a26443e562d3d5aa1cc7a8ac9fad471d3bd2ca0207d3e SHA512 73837266ff178568dd384207443b1236bad7c9867c03c8b45e3894b091780b7f4c2564a993ea4dbeeadc151dfcf87c3a5ecaa3efdc41fa2ab8461151c6aca72f WHIRLPOOL 72430e68df1e825ec48924a6d9845c282d1ded992d95f4487ec248fdd0522e27f90ab1d94077080a3f7ed53b9e1f0decc75f5a2200e732e58efd10743bb6e0b5
+DIST xa2.0_iv32_sparcELF.o.Z 48813 SHA256 86b4613490ac3cadc73524cc433deafebedacbda692ad5f88bcb7c029113ad24 SHA512 6f42e13f5adea510458b9d08cc8acc401cdebec5668bb73922ac053707d2401d503f38a33182c80748e09378464b907224ac77a166098f9dd7877e7dbe972bd1 WHIRLPOOL c87ee79394707c121396df8cea5b7f29a084cf1507033e870d1d73f389feca74906f2586906a955ffff7d4e0fa5e8aab14a772225313ee35ede6de43aedcf1e0
+DIST xa2.1_iv32_linuxELFg21.o.gz 29291 SHA256 41420dca15e5e546c455553b6434435d53de17a08a6307a79de75e753a85b3a1 SHA512 df2a9c534239061da3dab413b6e4e9c127ec4b0a3fd6a8665169bc69e3577b10b7c26c21124e083ece891ac28605ec6f4e407dc2a35ffe54f16101d8cc9be179 WHIRLPOOL ec1c0074006a0b0229b8c1fc1bd777225ea96fdc4b77272ec3b6ffe3569e31c677fa8b175b6263b42904bbb5dd1d2d5c7fcbda262333c2394c993d8a03c379b9
+DIST xanim_exporting_edition.tar.gz 985946 SHA256 8e99b7ee3842fe6e4da43dc27f8c0584a66e6ef7168d30cd37cec64560207c33 SHA512 49d1aa8853f1688097788e2082e209b769f12996dce0fc613453decf22cd48553e2a7a1b08162a49803de1213864f3b42b1d2ab46d3b7242cfb018e8a543a871 WHIRLPOOL 648c6557c35cb3ab55845e86f6abfc6953dba87f14727efc47c36734b0287f0418d265476dccb04fc626a54da635693e241fe5751d9973f49b5b1374dfe1ec49
+EBUILD xanim-export-2.80.1-r5.ebuild 2973 SHA256 01caa0e22b10cc28830081fcb7ab8bd53758fd68e558d663b260741734d9aff9 SHA512 639d111881f429939cbbcec73d03e6037bd456c89cbf536b615361f92ec0d0b0016a6405bf7c63f06d11a073fd5afdd10eb619ffe4c31e59bea2a9fbf05fced1 WHIRLPOOL d534969dfabec9b524e6a7ead10c8c85d3e797c4e4f5fbff6954e46b9efa32a9d266725d18a1a4e2e4fd4fb537a8d9d9bea20fc406dc7aa99585ec3f89e63535
+MISC ChangeLog 2549 SHA256 8a7750c127dd45fd4de4a8774efb6ad6cebc1084491d27d11683f85007e5f6b3 SHA512 bda99674bdb6a9c818d8df6427ca7d7475f3eae5bb6e0d1df0839762735c4ff24c3c7e1dda720a676ddbfca1e864adf8260f2e111d54534fc666d51bee1319f5 WHIRLPOOL 65f08ba4b90e5e6ca3b4308fc9e019e486896111441d1c2bc844a04b28215568c6cd74a446c9920ecdc7cf06ab6a0018a4a2391fb41d9c7634c11f0c65cd546f
+MISC ChangeLog-2015 3162 SHA256 3838f0d3c149a5b79ad52f3f1d848912198ee86b5fc0ec8b1369fefd81db359c SHA512 ed11af81ad8057b5a7c7a3e395554b2d842248534d4afc8685b9f76d0b79cf6af3877bc2729273869309fd5c9f2be187118db19a1c69b8460f8cec9f56dec900 WHIRLPOOL 6354345a9d09e370970826f3f4ee18c0cc0eb02c10120bc8743252024645416a818f6bab8449a087706a6595e498ed3f1f9861ce8f9a3537240a8666f15fdbb1
+MISC metadata.xml 221 SHA256 f9c43664acd23c026d227c13f3afb1a1e69d190689815295498c32604c8e0c22 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4 WHIRLPOOL 0c890eef9948116352ecd84ee44ecd07c741d7eb82b89aba4ac0d87757df3616d2170550d7b528cb9c359cf7e5cab95b494ebf92c3c1dc0ea96428603577047b
diff --git a/media-video/xanim-export/files/2.80.1-gentoo.patch b/media-video/xanim-export/files/2.80.1-gentoo.patch
new file mode 100644
index 000000000000..ffd0149a937e
--- /dev/null
+++ b/media-video/xanim-export/files/2.80.1-gentoo.patch
@@ -0,0 +1,88 @@
+Fixing as-needed issues, debundling libquicktime, respect FLAGS
+
+http://bugs.gentoo.org/show_bug.cgi?id=247919
+
+--- Makefile
++++ Makefile
+@@ -72,9 +72,6 @@
+ #         a setup problem on my SunOS machine.   Under Solaris, gcc worked
+ #         fine.
+ #
+-# CC = cc
+- CC = gcc
+-#CC = egcs
+ #
+ ######### OPTIMIZATION FLAGS
+ # -- Specifiy Any compiler Optimization flags that you wish to use. This
+@@ -116,7 +113,7 @@
+ #  to link against symbols inside xanim.
+ #
+ ### Linux
+-LD_FLAGS = -rdynamic
++LD_FLAGS = $(LDFLAGS) -rdynamic
+ ### SunOS/Solaris use:
+ # LD_FLAGS =
+ 
+@@ -133,7 +130,7 @@
+ #
+ XA_DLL_DEF = -DXA_DLL -DXA_PRINT
+ #### Use this only if the above doesn't work.
+-XA_DLL_DEF = -DXA_DLL
++#XA_DLL_DEF = -DXA_DLL
+ #
+ #### You may need this library.
+ XA_DLL_LIB = -ldl
+@@ -141,7 +138,7 @@
+ # If you'd like to change the default directory that XAnim searches while
+ # looking for dlls, then change the directory below. 
+ #
+-XA_DLL_PATH = /usr/local/xanim/mods
++XA_DLL_PATH = /usr/lib/xanim/mods-export
+ 
+ 
+ ##########################################################################
+@@ -208,9 +205,9 @@
+ # XA_CVID_DEF = -DXA_CVID
+ # XA_CYUV_DEF = -DXA_CYUV
+ #
+-#XA_IV32_LIB = mods/xa2.0_iv32_linuxELF.o
+-#XA_CVID_LIB = mods/xa2.0_cvid_linuxELF.o
+-#XA_CYUV_LIB = mods/xa1.0_cyuv_linuxELF.o
++XA_IV32_LIB = mods/xa2.1_iv32_linuxELFg21.o
++XA_CVID_LIB = mods/xa2.0_cvid_linuxELFg21.o
++XA_CYUV_LIB = mods/xa1.0_cyuv_linuxELFg21.o
+ #
+ ###########################
+ # NOTE: SGI Machines Only: 
+@@ -297,16 +294,16 @@
+ # XLIBDIR = -L/usr/openwin/lib
+ #
+ ###-- Linux using X11R6
+-INCLUDE =  -I/usr/X11R6/include -I/usr/X11R6/include/X11
+-XLIBDIR = -L/usr/X11R6/lib
++INCLUDE =  -I/usr/include -I/usr/include/X11
++XLIBDIR = -L/usr/lib
+ #
+ ###-- My SunOS machine running X11R5
+ # INCLUDE = -I/usr/X11R5/include -I/usr/X11R5/include/X11
+ # XLIBDIR = -L/usr/X11R5/lib  -lnsl
+ #
+ ###-- My SunOS machine running X11R6
+-# INCLUDE = -I/usr/X11R6/include -I/usr/X11R6/include/X11
+-# XLIBDIR = -L/usr/X11R6/lib  -lnsl
++# INCLUDE = -I/usr/include -I/usr/include/X11
++# XLIBDIR = -L/usr/lib  -lnsl
+ #
+ ###-- Win32 
+ #-- This depends on where you installed the Cygnus X11 includes and libs.
+@@ -534,8 +531,8 @@
+ #
+ 
+ XA_DEFS = $(XA_MISC_DEFS) $(XA_MOD_DEFS) $(XA_AUDIO_DEFS) -DXA_PETUNIA -DXA_KPCD -DXA_EXPORT -DXA_EXPORT_QT
+-XA_LIBS = $(XA_X11R6_LIBS) $(XA_MACH_LIBS) $(XA_MOD_LIBS) $(XA_AUDIO_LIBS) -lpthread quicktime/quicktime/libquicktime.a -ljpeg -lpng -lz
+-XA_INCS = $(INCLUDE) $(XA_VIDEO_INCS) $(XA_AUDIO_INCS) -Iquicktime/quicktime
++XA_LIBS = $(XA_X11R6_LIBS) $(XA_MACH_LIBS) $(XA_MOD_LIBS) $(XA_AUDIO_LIBS) -ljpeg -lpng $(shell pkg-config --libs libquicktime)
++XA_INCS = $(INCLUDE) $(XA_VIDEO_INCS) $(XA_AUDIO_INCS) $(shell pkg-config --cflags libquicktime)
+ CFLAGS	=  $(DEBUG) $(OPTIMIZE)
+ 
+ #####################################
diff --git a/media-video/xanim-export/files/2.80.1-implicit_funcs.patch b/media-video/xanim-export/files/2.80.1-implicit_funcs.patch
new file mode 100644
index 000000000000..f8fba207b4b2
--- /dev/null
+++ b/media-video/xanim-export/files/2.80.1-implicit_funcs.patch
@@ -0,0 +1,33 @@
+--- xa_g72x.c
++++ xa_g72x.c
+@@ -30,6 +30,7 @@
+  * Common routines for G.721 and G.723 conversions.
+  */
+ 
++#include <stdlib.h>
+ #include "xa_g72x.h"
+ 
+ static short power2[15] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80,
+--- xa_export.c
++++ xa_export.c
+@@ -7,7 +7,8 @@
+ 
+ 
+ 
+-
++#include <stdlib.h>
++#include <string.h>
+ #include <stdio.h>
+ #include <signal.h>
+ #include <jpeglib.h>
+--- xa_audio.c
++++ xa_audio.c
+@@ -227,7 +227,7 @@
+ */
+ 
+ /* TOP */
+-
++#include <sys/ioctl.h>
+ #include "xa_audio.h"
+ 
+ /* POD note:  For opening audio device non-blocking. Should probably set it
diff --git a/media-video/xanim-export/metadata.xml b/media-video/xanim-export/metadata.xml
new file mode 100644
index 000000000000..68b9a06fccf1
--- /dev/null
+++ b/media-video/xanim-export/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>media-video@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/media-video/xanim-export/xanim-export-2.80.1-r5.ebuild b/media-video/xanim-export/xanim-export-2.80.1-r5.ebuild
new file mode 100644
index 000000000000..3b7acf11a3c8
--- /dev/null
+++ b/media-video/xanim-export/xanim-export-2.80.1-r5.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit flag-o-matic eutils toolchain-funcs
+
+_XA_CYUV_sparc=xa1.0_cyuv_sparcELF.o
+_XA_CVID_sparc=xa2.0_cvid_sparcELF.o
+_XA_IV32_sparc=xa2.0_iv32_sparcELF.o
+_XA_EXT_sparc=.Z
+
+_XA_CYUV_x86=xa1.0_cyuv_linuxELFg21.o
+_XA_CVID_x86=xa2.0_cvid_linuxELFg21.o
+_XA_IV32_x86=xa2.1_iv32_linuxELFg21.o
+_XA_EXT_x86=.gz
+
+_XA_CYUV_ppc=xa1.0_cyuv_linuxPPC.o
+_XA_CVID_ppc=xa2.0_cvid_linuxPPC.o
+_XA_IV32_ppc=xa2.0_iv32_linuxPPC.o
+_XA_EXT_ppc=.Z
+
+MY_P="xanim_exporting_edition"
+
+# This might leave _XA_EXT empty and that's fine, just indicates no
+# particular support for a given arch
+eval _XA_EXT=\${_XA_EXT_${ARCH}}
+eval _XA_CVID=\${_XA_CVID_${ARCH}}
+eval _XA_CYUV=\${_XA_CYUV_${ARCH}}
+eval _XA_IV32=\${_XA_IV32_${ARCH}}
+
+# Not much we could do here, the modules are predownloaded and
+# xanim-export compiles against them
+QA_EXECSTACK_x86="usr/bin/xanim-export
+	    usr/lib/xanim/mods-export/${_XA_CVID}
+	    usr/lib/xanim/mods-export/${_XA_CYUV}
+	    usr/lib/xanim/mods-export/${_XA_IV32}
+	    usr/lib/xanim/mods-export/${_XA_CVID/g21/}
+	    usr/lib/xanim/mods-export/${_XA_CYUV/g21/}
+	    usr/lib/xanim/mods-export/xa2.0_iv32_linuxELF.o"
+
+DESCRIPTION="XAnim with Quicktime and RAW Audio export functions"
+HOMEPAGE="http://heroin.linuxave.net/toys.html"
+SRC_URI="http://heroine.linuxave.net/${MY_P}.tar.gz
+	sparc? (
+		ftp://xanim.va.pubnix.com/modules/${_XA_CYUV_sparc}${_XA_EXT_sparc}
+		ftp://xanim.va.pubnix.com/modules/${_XA_CVID_sparc}${_XA_EXT_sparc}
+		ftp://xanim.va.pubnix.com/modules/${_XA_IV32_sparc}${_XA_EXT_sparc}
+	)
+	ppc? (
+		ftp://xanim.va.pubnix.com/modules/${_XA_CYUV_ppc}${_XA_EXT_ppc}
+		ftp://xanim.va.pubnix.com/modules/${_XA_CVID_ppc}${_XA_EXT_ppc}
+		ftp://xanim.va.pubnix.com/modules/${_XA_IV32_ppc}${_XA_EXT_ppc}
+	)
+	x86? (
+		ftp://xanim.va.pubnix.com/modules/${_XA_CYUV_x86}${_XA_EXT_x86}
+		ftp://xanim.va.pubnix.com/modules/${_XA_CVID_x86}${_XA_EXT_x86}
+		ftp://xanim.va.pubnix.com/modules/${_XA_IV32_x86}${_XA_EXT_x86}
+	)"
+
+LICENSE="XAnim"
+SLOT="0"
+KEYWORDS="ppc sparc x86"
+IUSE=""
+
+RDEPEND="virtual/jpeg
+	media-libs/libpng
+	x11-libs/libXext
+	x11-libs/libXt
+	media-libs/libquicktime"
+DEPEND="${RDEPEND}
+	app-arch/ncompress
+	x11-proto/xextproto
+	x11-proto/xproto
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+
+	if [[ -n ${_XA_EXT} ]]; then
+		cd "${S}"/mods || die
+		unpack ${_XA_CVID}${_XA_EXT}
+		unpack ${_XA_CYUV}${_XA_EXT}
+		unpack ${_XA_IV32}${_XA_EXT}
+	fi
+
+	cd "${S}"
+	rm -f xanim
+	epatch "${FILESDIR}"/${PV}-gentoo.patch \
+		"${FILESDIR}"/${PV}-implicit_funcs.patch
+}
+
+src_compile() {
+	tc-export CC
+	make \
+		XA_IV32_LIB=mods/${_XA_CYUV} \
+		XA_CVID_LIB=mods/${_XA_CVID} \
+		XA_CYUV_LIB=mods/${_XA_IV32} \
+		OPTIMIZE="${CFLAGS}" \
+		|| die "main make failed"
+}
+
+src_install() {
+	newbin xanim xanim-export
+	insinto /usr/lib/xanim/mods-export
+	doins mods/*
+	dodoc README*
+	dodoc docs/README.* docs/*.readme docs/*.doc
+}
diff --git a/media-video/xine-ui/Manifest b/media-video/xine-ui/Manifest
new file mode 100644
index 000000000000..72e29ec3b41f
--- /dev/null
+++ b/media-video/xine-ui/Manifest
@@ -0,0 +1,5 @@
+DIST xine-ui-0.99.9.tar.xz 1759568 SHA256 8dd180219f546a7be0a5651370996b95b3a38ec97bf01b57d2bd1cb966e591a2 SHA512 575b20a19c5740ba0336af9dea0a1bc15d23b7471379b9d72aeb585e23f95b336368b96a28d4804726507f059dc431cc3f9adfd8b615b08c0e67b65287c2b6c7 WHIRLPOOL 7bce787c8718e057a33af2ad33efc2ab1ed4358181f2b626e871f79c396b6b900ccf3631a302463f93951199eeae19887fb2c7d4a5eddf137c85664b99424b8a
+EBUILD xine-ui-0.99.9.ebuild 1977 SHA256 6e44b623cdfad4cb8e1819515d89f85a0d31a96d516286cd14395bbe9a971216 SHA512 4d131f4a7dfd8b169ea57469d64ab1966f5b89578e87c5f14949fdcf072553afa4b6d2e08a13c1d7fd75608dbc33899a1e3e61fba58bde6f9f9b4d5647c9692a WHIRLPOOL aeef20bd8d0d7b0b29ee82f7071721ed97b381a6223ed1fdd3ae646a84f3fb6c999e3279ac1dbdcf7f17cf49dfe11286212b1a95a49cddf88108ccd1fc492e3c
+MISC ChangeLog 2584 SHA256 670d5f0ec58d345e962ecd005e3f96906acc1ceb42a0a63707de6787e15bc3eb SHA512 2f7bd77b5843e473cf7ec536c093f64ab8a0c2066ff0ca7c6347f4639722c204ebb310559c90acb881937eb7c082db734832e6c96a13c29933c81e91ec8cfa93 WHIRLPOOL 033645167ccab88356be1ff9771d427bcd86d53a628ef1e1d846a33f4ea75f93a1dc5dd15165b6e1df0e83f595d030b32c77956291c7928a8a88e0d51096a0cb
+MISC ChangeLog-2015 29294 SHA256 a3f90592d3c974d543645c49d699530d0de74cb4c8ad54ebcdfb6fede7f3bcf1 SHA512 252b2c7f9cdd0b3befa3032c714955ef0c4ff724a3ad444b91fd68c86cabb4539ed18646c0dc2784f7e6bd6d8e03596375d3cdc5161c6f95bb75d60c788d7d2a WHIRLPOOL bbcaf0cd51f0d78f71db8c5fc7abf5840a9f8d53b2c9b7d6e552a04753a3a15515aa924addc329b0517846de9a4aa4f1d073e1afb7b1b443ce848babdc811f30
+MISC metadata.xml 386 SHA256 d5013c59a7a9c4490ec9ba696525e88c67e4e246d2fd4e72fb4f292640160dd1 SHA512 ead8587493161ece36b38168e0c628a05a97d1dfc7dddec3d7a966a783621634be28bd661a6e0d65e370dd7066ef49019265967f7394aa4026b3ae97de26a820 WHIRLPOOL bbf3641b250e4df63c3b2305c18bdc0fc5d1111022021367180d08620e3a24fb45ab9089c2ccfca4bf288fff584f560b222288a5f39ce530b33c66263c97708d
diff --git a/media-video/xine-ui/metadata.xml b/media-video/xine-ui/metadata.xml
new file mode 100644
index 000000000000..d3f6c7510bab
--- /dev/null
+++ b/media-video/xine-ui/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>media-video@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="vdr">Enables Video Disk Recorder support</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">xine</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-video/xine-ui/xine-ui-0.99.9.ebuild b/media-video/xine-ui/xine-ui-0.99.9.ebuild
new file mode 100644
index 000000000000..3bed5b2be508
--- /dev/null
+++ b/media-video/xine-ui/xine-ui-0.99.9.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit fdo-mime gnome2-utils
+
+DESCRIPTION="Xine movie player"
+HOMEPAGE="http://xine.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc ppc64 x86 ~x86-fbsd"
+IUSE="aalib curl debug libcaca lirc nls readline vdr X xinerama"
+
+RDEPEND="|| ( app-arch/tar app-arch/libarchive )
+	media-libs/libpng:0=
+	>=media-libs/xine-lib-1.2:=[aalib?,libcaca?]
+	virtual/jpeg:0
+	aalib? ( media-libs/aalib:= )
+	curl? ( >=net-misc/curl-7.10.2:= )
+	libcaca? ( media-libs/libcaca:= )
+	lirc? ( app-misc/lirc:= )
+	nls? ( virtual/libintl )
+	readline? ( >=sys-libs/readline-6.2:= )
+	X? (
+		x11-libs/libICE:=
+		x11-libs/libSM:=
+		x11-libs/libX11:=
+		x11-libs/libXext:=
+		x11-libs/libXft:=
+		x11-libs/libXrender:=
+		x11-libs/libXScrnSaver:=
+		x11-libs/libXtst:=
+		x11-libs/libXv:=
+		x11-libs/libXxf86vm:=
+		xinerama? ( x11-libs/libXinerama:= )
+		)"
+DEPEND="${RDEPEND}
+	nls? ( >=sys-devel/gettext-0.18.3 )
+	X? (
+		x11-libs/libXt
+		x11-proto/inputproto
+		x11-proto/xf86vidmodeproto
+		xinerama? ( x11-proto/xineramaproto )
+		)
+	virtual/pkgconfig"
+
+src_prepare() {
+	rm -f misc/xine-bugreport
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable xinerama) \
+		$(use_enable lirc) \
+		$(use_enable vdr vdr-keys) \
+		--disable-nvtvsimple \
+		$(use_enable debug) \
+		$(use_with X x) \
+		$(use_with readline) \
+		$(use_with curl) \
+		$(use_with aalib) \
+		$(use_with libcaca caca) \
+		--without-fb
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		docdir="/usr/share/doc/${PF}" \
+		docsdir="/usr/share/doc/${PF}" \
+		install
+	dodoc AUTHORS ChangeLog NEWS README
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-video/xvattr/Manifest b/media-video/xvattr/Manifest
new file mode 100644
index 000000000000..f1d3ec7092c5
--- /dev/null
+++ b/media-video/xvattr/Manifest
@@ -0,0 +1,7 @@
+AUX xvattr-1.3-gtk.patch 1255 SHA256 a82dc71c0b5bfe18ddd6045131978d4077e9a7294fc36064795244031a52655c SHA512 a81015dfa6c556d99e27765e9d793d1ab745925be212c8a3c21503ac73a6d7bbae5642e7cae067544578e7a1388968a354b759e72edcde1ccb0fa704c929e138 WHIRLPOOL e3b77e320baa8a6f43fd7a28a625cd12b4cc48db24f3525d3181ea7fe25b586cafa13e065feef162e7b7bdb5577813d89a387920d3414596c468d4e330e7a6ab
+AUX xvattr-1.3-pod-encoding.patch 303 SHA256 a1282de99e49fed3e43a75868698b54b89bbb09ea2d800605480ab9823fd0079 SHA512 84be4a336efa6caffbacf15f2b68ddb1d6b60cc8212593662194d7a7df5891c6d5cefcb28c25412471e5e943359e6c4f076b77f9c92d1a93e084597d39697484 WHIRLPOOL db393f2a0a2d9e50c531073e12823814be92f1e7fe384015a58951c4cefbf81c39e040926b6cb30fcfde3ddbaa065ace24abeecddc7b4115a79ff20312b3149d
+DIST xvattr-1.3.tar.gz 82263 SHA256 1cedc0b4795e6f4234b1d52172f74d7163ecb8142fbb35dc86c905df5478d8fa SHA512 f7b9f9f46961458be6aebfa5c40b28ab0757220ee5a20bcc3b635eaf6912afd7ca2ee9e9d0cfa1894e8ce6c97433e23f78f307fa216d16b5628b8b37202120a0 WHIRLPOOL 91e3f0ce13d7a33bcc909862493165ce74e1b2eba7e9038046f8152166aefbf8e0a1b29883b80d85e599f242a8833317787091a391633fdec7ce9fc7cd427b6e
+EBUILD xvattr-1.3-r3.ebuild 804 SHA256 dffc8b359d44a4709a8d3c2339da3fcbf44686d9155e2ccd76955a2bb1e01048 SHA512 1e6f7388a10a4d9fe89ec892154641254daf1c0458d6a7f2df1c74488e83bb1aee957831416c739ed7094b6b1ab1e322a9d8501d32b070a44cffed3f4da13eeb WHIRLPOOL 2b0d2ee01ea9d6bce9d0d24123d2332030d0e02689381c5e0738680bd066a2735d1a085ba5b6ee21281bbc6df3e14f1c7121f0ebcf4d3acdf35acf6e5000a448
+MISC ChangeLog 2498 SHA256 254276158ff8b58cb885f4cc6875b536a0a897a585583742ec6efe9e382a36a6 SHA512 18e5948d06a6ffc48e488e19f481b7afdadbe496f8d10cb533eb944406519c8cc9b70e2f9475aebb9973bc849ac38e453b94c28ef5732025526a59f79eb34ffc WHIRLPOOL 6df3b90c4f5fe085c71ecaabcee23633ae7f6f61f792c3de7e4b191fab6ab221549b81280ea5b1145bf568077e35e1666b36d4071f39ddcf6fdfe0558273c619
+MISC ChangeLog-2015 3531 SHA256 53775a445a25d3b4c152ca7a401c7498c389dc6ee5da01644f7b59c282282a4d SHA512 3ce4855bd4cd6043010dabcfe495d1d5371d8000bebd18c35a1e7466c81f414d551fb8f9dc23f6a58259a7265bace97f69acb490e2697875867d89549d372bf6 WHIRLPOOL 6ada9770e43cc6eae69e23bd5494215e184b31a8b3dfec0e5b0a0ae701a913813e68a77d8d44d048dd3d6a2f6daef7b6722dce3491c4f9acfa204452d8d1bc53
+MISC metadata.xml 219 SHA256 4246299710294d9f4c0c15b97e8ae7925e01785b962551c6aa27174e99980bcd SHA512 24793c7fd0e2cef8fa5a0efd9bd55fed1e62ff6810199a969d4c0b869bac9b9ec79b288105b73b1b99734320bb13569a8ee00516b5452dd67d91d14dd17038e2 WHIRLPOOL e7f42aba21f5637bb8774cc17a488ecca121e56d5e855a3e956792955b8253f3049e08b2ab258728002263967db02e27914c82ecafee07a6d317bf857d13095f
diff --git a/media-video/xvattr/files/xvattr-1.3-gtk.patch b/media-video/xvattr/files/xvattr-1.3-gtk.patch
new file mode 100644
index 000000000000..579233e38c41
--- /dev/null
+++ b/media-video/xvattr/files/xvattr-1.3-gtk.patch
@@ -0,0 +1,44 @@
+diff -ur xvattr-1.3.orig/configure.in xvattr-1.3/configure.in
+--- xvattr-1.3.orig/configure.in	2002-06-13 22:40:33.000000000 +0300
++++ xvattr-1.3/configure.in	2007-09-04 14:02:56.000000000 +0300
+@@ -17,7 +17,14 @@
+ AC_PATH_XTRA
+ 
+ dnl check for gtk
+-AM_PATH_GTK
++AC_ARG_WITH(gtk,
++       [--without-gtk     Disable GTK support (default: enabled)])
++if test "x$with_gtk" != "xno"; then
++       PKG_CHECK_MODULES(GTK, gtk+-2.0)
++else
++       no_gtk="yes"
++fi
++AM_CONDITIONAL(WITH_GTK, [test "x$no_gtk" != "xyes"])
+ 
+ dnl Checks for libraries.
+ AC_ARG_WITH(xv-path,[  --with-xv-path=path    Where libXv is installed],
+diff -ur xvattr-1.3.orig/Makefile.am xvattr-1.3/Makefile.am
+--- xvattr-1.3.orig/Makefile.am	2002-06-13 22:22:00.000000000 +0300
++++ xvattr-1.3/Makefile.am	2007-09-04 13:58:14.000000000 +0300
+@@ -1,12 +1,19 @@
+ # 
+ 
+-bin_PROGRAMS = xvattr gxvattr
++if WITH_GTK
++gtk_programs = gxvattr
++endif
++
++bin_PROGRAMS = xvattr $(gtk_programs)
++
+ xvattr_SOURCES = xvattr.c
+ 
+ xvattr_LDADD = $(X_LIBS) $(X_PRE_LIBS) $(X_EXTRA_LIBS) -lX11 -lXext @LIBOBJS@
+ 
+ gxvattr_SOURCES = gxvattr.c
+-CFLAGS = @GTK_CFLAGS@
++
++gxvattr_CFLAGS = @GTK_CFLAGS@
++
+ gxvattr_LDADD = @GTK_LIBS@ $(X_LIBS) $(X_PRE_LIBS) $(X_EXTRA_LIBS) -lX11 -lXext
+ noinst_HEADERS = getopt.h
+ 
diff --git a/media-video/xvattr/files/xvattr-1.3-pod-encoding.patch b/media-video/xvattr/files/xvattr-1.3-pod-encoding.patch
new file mode 100644
index 000000000000..29343a240613
--- /dev/null
+++ b/media-video/xvattr/files/xvattr-1.3-pod-encoding.patch
@@ -0,0 +1,11 @@
+diff -ur xvattr-1.3.orig/xvattr.pod.in xvattr-1.3/xvattr.pod.in
+--- xvattr-1.3.orig/xvattr.pod.in	2014-05-18 13:22:59.321022155 +0200
++++ xvattr-1.3/xvattr.pod.in	2014-05-18 13:44:38.286711743 +0200
+@@ -1,5 +1,7 @@
+ =pod
+ 
++=encoding latin1
++
+ =head1 NAME
+ 
+ @PACKAGE@ - Query/Set X11 XVideo Setting(s)
diff --git a/media-video/xvattr/metadata.xml b/media-video/xvattr/metadata.xml
new file mode 100644
index 000000000000..0427ec20bfd4
--- /dev/null
+++ b/media-video/xvattr/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+<email>media-video@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/media-video/xvattr/xvattr-1.3-r3.ebuild b/media-video/xvattr/xvattr-1.3-r3.ebuild
new file mode 100644
index 000000000000..be3c419d34db
--- /dev/null
+++ b/media-video/xvattr/xvattr-1.3-r3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils autotools
+
+DESCRIPTION="X11 XVideo Querying/Setting Tool from Ogle project"
+HOMEPAGE="http://www.dtek.chalmers.se/groups/dvd"
+SRC_URI="http://www.dtek.chalmers.se/groups/dvd/dist/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT=0
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gtk"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXv
+	x11-libs/libXext
+	gtk? ( x11-libs/gtk+:2 )"
+DEPEND="${RDEPEND}
+	x11-libs/libXt
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gtk.patch
+	epatch "${FILESDIR}"/${P}-pod-encoding.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with gtk)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/media-video/xvid4conf/Manifest b/media-video/xvid4conf/Manifest
new file mode 100644
index 000000000000..1a63fda0f511
--- /dev/null
+++ b/media-video/xvid4conf/Manifest
@@ -0,0 +1,5 @@
+DIST xvid4conf-1.12.tar.gz 133494 SHA256 0bf08a6c0933c0e41588e2f1367f675d9be92562023d29ecf80956c03f7772b9 SHA512 277b081563b3e9ec2e3c78cf0ea7c504acf0585c0184ee359d0174be38c4c32b931360ce543193df3b323083d21a58d2ff94380647773c71eebed6928c857f57 WHIRLPOOL da1746da1af483030f2cc78660af4a8c57872bbfcb4c1b85fec5ae189007bd473563f579d7237030241ad833c4a8e6700ee9f1edcb70e70ff525ca4be6764c0b
+EBUILD xvid4conf-1.12.ebuild 524 SHA256 6e4aec8da29a1f280a6db1f52d1667437e70783c9ca046427f4e8c9b5644120e SHA512 700f93efe0abf6f645070e1a2001d4d2fdd52c4b37c56bc9a13736be95a09665614bd21221f062b77294041e5a67b1a32aa6ae74d8705e637a2146d28bbf28de WHIRLPOOL b26a6ab5f8cea06b8587f3d7072f35cdf5963ca6d4330cd56365c2f3ccad089bc84a2b70a92a05f2456d64d8d19b48675bb0173c2321f3d4349108c66a8bfa75
+MISC ChangeLog 2434 SHA256 a0a5f6c0184d87965a37c54ddae37bbdb0664c77aa111574625e75f9f619868a SHA512 922e9b436d90de8ae0dd4b75e0ec67e83a3dacf4fb5cad4f6a73abf08a8180c56b0461015937ce97b4e99bf276247e252e8c7742af1b45e0edf6a8957940ff57 WHIRLPOOL 22559bc3872c4f013033358cf14a673a6301c7f9752a48d79104098325a53becdded888de5a654444ecfcc04103b312377042ee6cf5483261319666fb117b673
+MISC ChangeLog-2015 2122 SHA256 db720fa298a3338e935e247ef2158e02899b6533105937c44db1784778a9fb6f SHA512 d2d496453754e339ce371267413f54c5cfff801c7e25c17d997d8925cf9041deabbdad2c7b4bca47f05187ffd3fa928ba167a14e0daa87a3c4df6d936e18c6b2 WHIRLPOOL 0b60f3d9cde21d11d9859147b1e6eef5e719110da6896cd788c9b77e41c263ad94e05486ba77754454052e7822dba518c13386bf37ffd4f3fe8757f29b640e7e
+MISC metadata.xml 221 SHA256 f9c43664acd23c026d227c13f3afb1a1e69d190689815295498c32604c8e0c22 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4 WHIRLPOOL 0c890eef9948116352ecd84ee44ecd07c741d7eb82b89aba4ac0d87757df3616d2170550d7b528cb9c359cf7e5cab95b494ebf92c3c1dc0ea96428603577047b
diff --git a/media-video/xvid4conf/metadata.xml b/media-video/xvid4conf/metadata.xml
new file mode 100644
index 000000000000..68b9a06fccf1
--- /dev/null
+++ b/media-video/xvid4conf/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>media-video@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/media-video/xvid4conf/xvid4conf-1.12.ebuild b/media-video/xvid4conf/xvid4conf-1.12.ebuild
new file mode 100644
index 000000000000..429e8eb26845
--- /dev/null
+++ b/media-video/xvid4conf/xvid4conf-1.12.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+DESCRIPTION="GTK2-configuration dialog for xvid4"
+HOMEPAGE="http://cvs.exit1.org/cgi-bin/viewcvs.cgi/xvid4conf/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.2.4:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_install() {
+	dodir /usr/{include,lib}
+	einstall || die
+
+	dodoc AUTHORS ChangeLog README
+}