12 files changed, 366 insertions, 6 deletions
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 74955cfdd894..6dfe463b0c8c 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -12,7 +12,7 @@ EBUILD ffmpeg-3.2.6.ebuild 15078 SHA256 8429b0673a250afb791e7ae3e48456d88bbe4201
 EBUILD ffmpeg-3.2.7.ebuild 15083 SHA256 c5b9bcbaf74024fba519764852bcd2d800fcc740b13558c555f8ca8a1c8af49c SHA512 2645eada5e381a5df2b3972dee7435f51dea461f4535796ededcc4f705979b289c48c289f3384bb58bbe1b6f64dadfda10e2c9d1674bf00d566dfe107f52a42e WHIRLPOOL 40092ab775c49ea1b902017ec0bab05a9bc898c88f49a7dd2061b86af89404f4b0bbd1b0f96e8f6cb2f73ec682f83d55e52de3d712d5a22f0bebdad928c4496a
 EBUILD ffmpeg-3.3.3.ebuild 16075 SHA256 69536764659767c709f17df58d698eec5593a74b932c273f3ffd9ae2e15a9e87 SHA512 037ba3846ccdc462945800af3438b4d852f026f0261c0264409f0e5960168457fd37c20bd9f332d2149bcf11af075b130fc7f27adb09fc6887e693fc86090204 WHIRLPOOL 1e28f1b0e98797acd5fe7123b83eb50818c1fb4eacd6b3aa953f776735819bfdd2ab9887457ea8b617b99af467c915eafc1d8acc12aa0d84bfbfcb71fcec0cfa
 EBUILD ffmpeg-3.3.4.ebuild 16107 SHA256 d7f48a8aa67297968bd97ff4e91095cd76db5559f46fbaa888fbb54f617b04a1 SHA512 ed129a8ee9f66bed5c2ab724114ed77ad345e7dec13f541ede5371ca442352b2e16666a715c30bac967210464d970bd4728c7753bd08dd542478d43da83b598b WHIRLPOOL 6509b5525e8832dbe8459db8fd48f8ab66fffc5cf9bf724c675b6bd045e9b42c10065a6d9be80b78b51671f3f04ac966b7ad0ec0b659bc39f060d42cc778179f
-EBUILD ffmpeg-3.3.5.ebuild 16111 SHA256 414951dd9db5681da58324a1f881dd0eea425f0159b449d27f56ab0f8b2f19f8 SHA512 c7f1f9f7fdc7143470c6da87d1a2bbaeda0b858aa672daf37b5b955bcd6502c52e63ad3de66f3f19569c2947ca994f038c43c39dcf401186a438fa610fc6f9ec WHIRLPOOL a2fda5a362caa5c359b5361aea9a46f5c4e837867fd2fdd176c50ed6881877ae5ba052966308f199f75d30739173cd40933a01b54837a0e45b9611b90795aec3
+EBUILD ffmpeg-3.3.5.ebuild 16110 SHA256 77f15c542700dbdb2f9be9d3f73f5569297c9de6a21a6e758b27cf0b5367d835 SHA512 323fc262dc5040d0dd5311ec466db2d919e184d07f813aad84c2fc98be7ebb32cb88add0bac61f3eccbff35783054bd9a170e94fba54dcc9f7f3ca1ed92ad68f WHIRLPOOL c78f84eaf8b69e6bc86cac3d4cdbf1b2d6792460aafd5b0bbfe8689683b4997121c2bd078eee37b6e022dffda2c9725b13ca8b1cb910f71bf0cfcfaa886a9139
 EBUILD ffmpeg-3.4.ebuild 15664 SHA256 c3e195e6126953e12170e8846e6952bfd326561a5c6ec6bc212553effd838ae3 SHA512 2060c89e73a059b6626505c1632f727536f711fb7b723633ac8b8c2a057776a2c7e7b1f98561585addadd6317f4ef506057033097d1c15c5553969e31d07008e WHIRLPOOL a5c034b4264f6076fb7e3b43d73ac0d4f8f177dfef9f5f274b65ce3f8a120f86aa7e46b5692a3be04b4b92f0b71380afe9a634e2602e9cedb4cb657d9ce8d723
 EBUILD ffmpeg-9999.ebuild 15671 SHA256 483e9cb1d91cb9f665f5bc5a2b7ba5cb82fed6223cddb4ac6a4e2006f75a7755 SHA512 31a985156399ca0ae0948fafb49168b76d8bd74c064c600c3630acc3be3ca78413952726bc80af6e919357ebfc43c8fd1a74d30d3e59da5ae5343cac99871f16 WHIRLPOOL b8ec3270ba4301bd1bd93945e6c178e33494eeb6f7ea20ba7a0b8dc086f4a8a1da871aeb749f73648cd4d16af2f66462103b280bc050269fb220f41dfbdf244a
 MISC ChangeLog 23132 SHA256 09ec61b302618a36f1aaf270cc3d8a0adfecae89915cfa1db49eba415094887f SHA512 6ec8dcf80d54a23683e72425d5989d70ee5a2f0a9cbf93a6ff3583d7af1556e9897ae9d917e216d0d2a4469ea0ea05d75389bff11c07193f9c599d59848b0468 WHIRLPOOL 7bd7dd2164286941873d7640311f3b9e501a66c4fadce9f825dcf94ff054e79e1ab1ec4922a193d12631806ceb5fed3787cf4992332586a75e4d7993a74e7a86
diff --git a/media-video/ffmpeg/ffmpeg-3.3.5.ebuild b/media-video/ffmpeg/ffmpeg-3.3.5.ebuild
index 302f13407065..c5f89d487b69 100644
--- a/media-video/ffmpeg/ffmpeg-3.3.5.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.3.5.ebuild
@@ -54,7 +54,7 @@ LICENSE="
 	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"
+	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.
diff --git a/media-video/kamerka/Manifest b/media-video/kamerka/Manifest
index 53271205e01e..0cf3f2d6bc54 100644
--- a/media-video/kamerka/Manifest
+++ b/media-video/kamerka/Manifest
@@ -1,5 +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
+EBUILD kamerka-0.12_p20161002-r1.ebuild 1083 SHA256 f670aebe0a28f3f4f94db08d45c3708768cac1fc6ca9ac7cdbba22d6d9b8d540 SHA512 606a860f385ca8ea88fe0709bc894106b9ee601aa513b90d0d490588c286f97a68fd9b9b8bb8a3a688cefc87e0c0f4b157afc90da0efeb4c9e39141dfabfd068 WHIRLPOOL 37534161249ccbe22499f80e30cdd79b14fe9777bd131dfa9730e9c8e7c9b426e99cfd46287833e293ec6159fffb26b70f908652f657d2a852f5f3d9758c8da5
 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-r1.ebuild
index 634eb57e1a86..c31df0915797 100644
--- a/media-video/kamerka/kamerka-0.12_p20161002.ebuild
+++ b/media-video/kamerka/kamerka-0.12_p20161002-r1.ebuild
@@ -33,6 +33,6 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	media-libs/libv4l
 	media-libs/phonon[qt5(+)]
-	media-libs/qimageblitz[qt5]
+	>=media-libs/qimageblitz-0.0.6_p20131029[qt5(+)]
 "
 RDEPEND="${DEPEND}"
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index 4985996e08dd..4a8f6609169a 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -3,6 +3,7 @@ AUX mjpegtools-2.1.0-pic.patch 2282 SHA256 1b8c08c993d01838b6fe04094c00fd07220ae
 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
+EBUILD mjpegtools-2.1.0-r3.ebuild 3041 SHA256 0f30a3222d919418fe86bc58440cf7a8366fa6bb01559258b8aed57506da772a SHA512 3c74690d036e859ec43870d34cf1e4e8f30e70fe805769e018517d6b88da4b3a1307c1cb853f13775cd2f117bf2732ed6d3cc7d4990151c67cee649982821d11 WHIRLPOOL d5266e2ee6638066a4f799b62197ab2a332c69b220de2170a3fcb3868af9860305b8f55753bd058240d04e7f03e5aa286e811f76598baccdddba05477705bb33
 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/mjpegtools-2.1.0-r3.ebuild b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
new file mode 100644
index 000000000000..5817ec12981b
--- /dev/null
+++ b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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
+	default
+
+	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
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+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/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 6450854e0d59..146323d6aea4 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,10 +1,12 @@
 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-17.0.0.tar.xz 4606064 SHA256 9faf7996b84eb68c2b1738ec27217d24480731b24d31c81fbef19daa5844992e SHA512 9d092949a78bcf063483219245b610c73b73dd6c3bb740e4c30016c49dd35612629679df10265235ad1e7f77422afa913ae9473765611b049eef6d8f2f174fe5 WHIRLPOOL 8339b68f449f3275a49c5276def399f4b2156cf890f6cc77c88f501ae3c127d4f12b57c623b9818cad0ab5985d701bad1927c32c7f0a55e8012b209631d00421
+DIST mkvtoolnix-18.0.0.tar.xz 4613492 SHA256 b8282d6d279caa86038721d2a49471d1dd25a465ee1a779ee9c2a99bc8ff972f SHA512 3094bc4859a29bc35a9051989a327a50bcfc2a033386f9ece0dba23a5221037ae6aa318345ecae024ef7884fc3622b56bf3cbafbee9e2b116b74bb28c5d779f9 WHIRLPOOL 14575fb52f3dac71ebadf85029d8c264420bc2fc33aefe512ad2b5dccba11a8f2a01efc0ea3a263f5ca37b8b97f6b0de5c876354e45e8c55a2ab5813eb99f430
 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-17.0.0.ebuild 2552 SHA256 495214f6a7c3863894b255f3c1639d2eeaf01f25bc0b6cbd6e3b9c4613067c8a SHA512 2f326f9d3300ddbe52aef7d0fceb0b393a335eb0cd8d716ba5627cde93db95d246821d959d2bff16c30cbd1aa936742c137f190b6021e2a3f78bc35679170ca2 WHIRLPOOL 2b3cb0257128cef0331fd086f84f94d863fbe699b0bac8b53587a54598015fd951de9c6071f6dcd31077c3473cf76bace86373c4088b13f74f2735d44c79264a
+EBUILD mkvtoolnix-18.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 495214f6a7c3863894b255f3c1639d2eeaf01f25bc0b6cbd6e3b9c4613067c8a SHA512 2f326f9d3300ddbe52aef7d0fceb0b393a335eb0cd8d716ba5627cde93db95d246821d959d2bff16c30cbd1aa936742c137f190b6021e2a3f78bc35679170ca2 WHIRLPOOL 2b3cb0257128cef0331fd086f84f94d863fbe699b0bac8b53587a54598015fd951de9c6071f6dcd31077c3473cf76bace86373c4088b13f74f2735d44c79264a
 MISC ChangeLog 8086 SHA256 8903d17d86b9d83c6ed274b54fea99093105d638f8ede9a7e83fcf3c70887cb9 SHA512 4b2e0e3c75c32d6cbd98b4e088c34c46927bf72ee5485dfa0643cf440033002b4868ce0e974085cc464b42b11eaa197a095e3b4265f74a48ba87ab61d5e338d8 WHIRLPOOL 3fc8cde847811db2929a0ce11930575a8e381036d6ce094a6b910f0b9faf27f6db22f9f9c9fd12bd446fa53af6871279aeb88727788a68e6f9aa403d2880f942
diff --git a/media-video/mkvtoolnix/mkvtoolnix-18.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-18.0.0.ebuild
new file mode 100644
index 000000000000..93682af702f5
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-18.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/projectx/Manifest b/media-video/projectx/Manifest
index 660bcf26a6de..3e58c15853ef 100644
--- a/media-video/projectx/Manifest
+++ b/media-video/projectx/Manifest
@@ -7,6 +7,7 @@ DIST projectx-0.91.0.10.tar.xz 830104 SHA256 7650e4992773c53ea2fb552ee030da8cee6
 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-r1.ebuild 3251 SHA256 97fa48472c0fecd4b4782b624f22321bec8359ade7bb81f7be50a3a3f4f65ad1 SHA512 fba239114105423fa1a9910121d1231d3e9c20f97d57f6a5ef356ebffdb92c3575768007a7030b75b648c861d8fe61c53cfde8d782a89d63fdfc8a2796fbe2f4 WHIRLPOOL e366d1834b48d49ada1f0f5ce617602b8ad4d29f7dcaa6255cabd23077a1f4427e43a9d820dcaa49402b09ba4644cc95c01afdde2cf9a9f0c6f950acf680ff7f
 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
diff --git a/media-video/projectx/projectx-0.91.0.10-r1.ebuild b/media-video/projectx/projectx-0.91.0.10-r1.ebuild
new file mode 100644
index 000000000000..930ed27128ca
--- /dev/null
+++ b/media-video/projectx/projectx-0.91.0.10-r1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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
+	https://dev.gentoo.org/~billie/distfiles/${PN}-idctfast.tar.xz
+	https://dev.gentoo.org/~billie/distfiles/${XDG_P}.java.xz
+	https://dev.gentoo.org/~billie/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:0
+	X? ( dev-java/browserlauncher2:1.0 )"
+
+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
+}
+
+src_prepare() {
+	default
+
+	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/syncplay/Manifest b/media-video/syncplay/Manifest
index 948c62e9138f..2fe1916b2566 100644
--- a/media-video/syncplay/Manifest
+++ b/media-video/syncplay/Manifest
@@ -1,5 +1,5 @@
 DIST syncplay-1.4.0.tar.gz 539743 SHA256 37fc2b3d1d6d49e2289dcdeffcf24ebdafbc24398411cff4666e09d49405759d SHA512 2266ffafe3b15730a43e3ddd8aa24e99c65ce5a4e95d05bcac745262d310cb846c84c6e5bb061ebb96e89faa0f10e22aacee286db6cbe53cd5f521cb2e5eee1a WHIRLPOOL 68ea8b437c379e2a049efbb9a4258c9d85bdb2d26841ed1100ee7a0083b4e66687bf21826daffd12102acb236b9bede9037f63ead0eba67dbbc5142db309d183
-EBUILD syncplay-1.4.0.ebuild 1357 SHA256 4a6e8fd0ebdff5bb33518c98f22599f12f90a31b870db2cdac70a3e998c6a488 SHA512 decf80d28781f046bb5a12493d7dce2c9dbc2a8822446810302b38f3793aeaefc11a029e5cc70c0d17337b6598ba586eb4db97b28acb653c1c8a9349f0371c38 WHIRLPOOL 6e64f1e7a42f5cfdfcad95d93cca7dfd9fbd61f8b4b1b7af32d80d7b45d8319c45487522e645d842a2048accc42d070543d4d6344224598148c1aef83992f16a
+EBUILD syncplay-1.4.0.ebuild 1356 SHA256 8ff11a7e0b97ddfb5a4add99a0cdd2131adb4ab402afc26d9246384aad331db8 SHA512 41d3dd93f6caf0af2babbb1e3e83765fe2c0639972b7bad07dac234d5bb9afeb8f3f2efa61fe020be4cbb16da10ad3bdf443a60fac2cc19055e1ad3b6880fd37 WHIRLPOOL 99d8c0ff8b66b7d09b359b534938c12cadb6ad1713f3c8488c430dfd383f3afa7fdc69a365a5502d94d01e6dbc07d4dcd4685bf799f89a9e409a9f7e42b21c2e
 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/syncplay-1.4.0.ebuild b/media-video/syncplay/syncplay-1.4.0.ebuild
index ae5ec4785364..f1762037dbc0 100644
--- a/media-video/syncplay/syncplay-1.4.0.ebuild
+++ b/media-video/syncplay/syncplay-1.4.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/Syncplay/syncplay/archive/v${MY_PV}.tar.gz -> ${P}.t
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="+client +server gui vlc"
 REQUIRED_USE="vlc? ( client )
 	gui? ( client )