gentoo resync : 15.02.2018

33 files changed, 716 insertions, 40 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index c6509129b5fa..f2165363386a 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/blib/Manifest b/media-libs/blib/Manifest
index 1bcf29c3a05d..a823a49eb204 100644
--- a/media-libs/blib/Manifest
+++ b/media-libs/blib/Manifest
@@ -1,3 +1,4 @@
 DIST blib-1.1.7.tar.gz 570809 BLAKE2B 4b6c6738dd67a81b09ff0a280d3522d8cd41046b6eebe0ff4d6bf78df49fa3aa20382e0b02b3ee17c8c536fe34445a85a80433a39a87c2f0f650612fcd37914a SHA512 060fe2ff453c1dd073ff6105217618157da54416243b0f086a4f1324028b2fc222f6f732de1914d0e2e82df3565801b68d1ff49df4e6b89cd409bad73eb01ad6
 EBUILD blib-1.1.7-r1.ebuild 1063 BLAKE2B 00050dcd2186d9334be96ba994216d99de33c2d36f5ac9170d0ba4e11d3ef12a3d6813ee8c4773a1d09a727e86ed6fc445856238b1b13c05ada3507805efdf39 SHA512 99fd0781550e7629cffc0ef85b23612885f35fead40aa224cbb4c9e3f5b0eaed2a4a38ef6d5458446d21a6a94d40ef1de10fa8ab4ee06923eb8ef5a6460bb420
+EBUILD blib-1.1.7-r2.ebuild 996 BLAKE2B e95d0ad85bf327008ea1e17599bf8db05a77f6d9d6b3887ae15d92d4298b1b227f5f945aca1571732119cca6629a46c1855e8bbff34a8e1b14c4a20ef4299945 SHA512 dde64551463ee3be8993080f4737cd4d4f402b7336a7c16ffdd49953ef917af4efeea1925e495766099c21c0a33bedb01147271b1b6bf596bd84acd7b141b556
 MISC metadata.xml 219 BLAKE2B bca5749b6f2d3541ba2d2635b59056f9ecdc46553991dec3ee5a7bc9f26393bdae62755418850d3cbda0eeb65b7f72029ddf09d4f088b21c84d407d0e6eaa098 SHA512 24793c7fd0e2cef8fa5a0efd9bd55fed1e62ff6810199a969d4c0b869bac9b9ec79b288105b73b1b99734320bb13569a8ee00516b5452dd67d91d14dd17038e2
diff --git a/media-libs/blib/blib-1.1.7-r2.ebuild b/media-libs/blib/blib-1.1.7-r2.ebuild
new file mode 100644
index 000000000000..43c49ee5e869
--- /dev/null
+++ b/media-libs/blib/blib-1.1.7-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="blib is a library full of useful things to hack the Blinkenlights"
+HOMEPAGE="http://www.blinkenlights.de"
+SRC_URI="http://www.blinkenlights.de/dist/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aalib gtk"
+
+RDEPEND="
+	>=dev-libs/glib-2:2
+	aalib? ( >=media-libs/aalib-1.4_rc4-r2 )
+	gtk? ( >=x11-libs/gtk+-2.4.4:2 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	# Drop DEPRECATED flags, bug #391105
+	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
+		blib/Makefile.am blib/Makefile.in \
+		gfx/Makefile.am gfx/Makefile.in \
+		modules/Makefile.am modules/Makefile.in \
+		test/modules/Makefile.am test/modules/Makefile.in || die
+}
+
+src_configure() {
+	econf \
+		--disable-directfb \
+		--disable-static \
+		$(use_enable aalib) \
+		$(use_enable gtk gtk2)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/fontconfig-infinality/Manifest b/media-libs/fontconfig-infinality/Manifest
index 48a592f7e65f..0856af8540f1 100644
--- a/media-libs/fontconfig-infinality/Manifest
+++ b/media-libs/fontconfig-infinality/Manifest
@@ -3,6 +3,6 @@ DIST fontconfig-infinality-20120619.tar.xz 18956 BLAKE2B ca1f698ccade1ed7744864d
 DIST fontconfig-infinality-20130404.tar.xz 23344 BLAKE2B 8531a8cab3ab37c7d8c23c992ad9ecb3473e92918569c1f77b0345be61d9f0bec968447bdd63898ca6197f210a5c79117433a1aa9e7eb4ff4f7b479a4817476a SHA512 742206795523509a7d195f194394ef3f67a9022b46f194ea369f7388c0c59842d29573fd2719f616dcc2378a4b527b93cdd3cf787b7a1728c875c7e1aa5a5417
 DIST fontconfig-nyx-1.tar.xz 1344 BLAKE2B 5ac550757c1ba96a6fc8830bc64c09da60e06fd9dadd4bb4f11354c9b2335df89e0a003ecc20a87e865934ea413b9267cd367294c2cf66442121aeee70732253 SHA512 d4959b0e81f9dc3529f5ee043dd5e0c45dc66848f4685daa1ef02aa8a40ed8e229f1da3f20a1ff9e315b15daddf9fb37c6ec1396eb9965fdbe3faf22c1cc70c8
 DIST fontconfig-nyx-2.tar.xz 1376 BLAKE2B 35853d469bc1e38d7ccbc0346e26e8c1d885db86d4b81f7c341b64a2914fc0b8fdc5f7e449800e8b305163e7dca1bc60f7ed912674f5a4acd2e6e79cdb0c939b SHA512 7863c41f67b02a37d9d3b438bcd1d6ece2bf42310ea61090f4d6384e22893a4ffbb2f7bc349511f40ba4570784f14e5656506de6b7e60f6da9c9eaba252beb1d
-EBUILD fontconfig-infinality-20120619.ebuild 1379 BLAKE2B 9d607444b25dc1394114400f952b397fb3cba6640fb0f7336bc6020b3a639c13c49779b639bcf6fb867b55ec75080c2a4423b7e3e834bb92c8fc8ddfe7efeb12 SHA512 e198ac3caf4d4a3adec3dd8fdebf543c0e8f0996fce67b6abedfafc536a0f56b64df929f292ecd32f7148ed883cc73d01332b19d314157205202969d7433d963
-EBUILD fontconfig-infinality-20130404.ebuild 1562 BLAKE2B 6337c3ec9de186ce97ac11752e1d3b031337dbdb4c1d9168a6c0c22bf9921bd87a8b10aec6f491b07d19deef9615035b44ba41df56d2f617d4ea7226c2f7d102 SHA512 d8354496a71b54d45575d243caa2d89df8cbe8a9c17f2fd3a5ef9a75e40650bcfb2afd9d1843eaa2aeffc441f92b8d7c27ed8eed45394dcd6bd29393b79102f7
+EBUILD fontconfig-infinality-20120619.ebuild 1338 BLAKE2B 5553ce251432f9f7a851adfd51a9e63b7f58a167690e2e05c25fb1312d1e0516d945e2b753feb37f79dc34b5e2c7c492b8481b26306c89f1c0a19cf14434356f SHA512 9900161d45f910fddf1bd82a8792034d4f53132c86cf47fdc41a420a3eaf47c22d1dc6c696f4ee24a998404640604cd6bad250136af65a0be67aea3ba8ff39d0
+EBUILD fontconfig-infinality-20130404.ebuild 1521 BLAKE2B 80bf72042abb01fc978088e5e5886c99492e754eaff564f3f1f8ffecd0458d896d2258f1bca57e6fbe1a404c25cf6a98024a6bb5cc2d0a2e2780a75c84a86d27 SHA512 e03dbb7e4b594470d087eed27b8927fc07b0da74ae99f61268c332e6b2e7a8f8518b3ad97614890a04751aedc90eac9471fca8ed5afddae9a3a5320f29a6cce4
 MISC metadata.xml 326 BLAKE2B dd093b07465ecce80ed78966217960f47725a0737737af4a5c0d140b542e51f6f9705b49f46000ef5d28f1c9f602ff20e0dc71072874203580558ad0863049f2 SHA512 272fe9c2e8befa218cd456c34c82e11ad47149da9735b3d7c5a9073f4993d04127f8b23224a910c40d339da6745ec504724b29438fda5f019915cdd6e3d1fada
diff --git a/media-libs/fontconfig-infinality/fontconfig-infinality-20120619.ebuild b/media-libs/fontconfig-infinality/fontconfig-infinality-20120619.ebuild
index fdfb057b80bd..abd7c399e578 100644
--- a/media-libs/fontconfig-infinality/fontconfig-infinality-20120619.ebuild
+++ b/media-libs/fontconfig-infinality/fontconfig-infinality-20120619.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
 
-DESCRIPTION="Configuration to be used in conjunction with the freetype-infinality subpixel hinting"
+DESCRIPTION="Configuration for freetype-infinality subpixel hinting"
 HOMEPAGE="http://www.infinality.net/blog/infinality-freetype-patches/"
-SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz
-	nyx? ( https://dev.gentoo.org/~yngwin/distfiles/fontconfig-nyx-1.tar.xz )"
+SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.tar.xz
+	nyx? ( https://dev.gentoo.org/~jstein/dist/fontconfig-nyx-1.tar.xz )"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/media-libs/fontconfig-infinality/fontconfig-infinality-20130404.ebuild b/media-libs/fontconfig-infinality/fontconfig-infinality-20130404.ebuild
index 6c58f2588df3..044748c76069 100644
--- a/media-libs/fontconfig-infinality/fontconfig-infinality-20130404.ebuild
+++ b/media-libs/fontconfig-infinality/fontconfig-infinality-20130404.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit readme.gentoo
 
-DESCRIPTION="Configuration to be used in conjunction with the freetype-infinality subpixel hinting"
+DESCRIPTION="Configuration for freetype-infinality subpixel hinting"
 HOMEPAGE="http://www.infinality.net/blog/infinality-freetype-patches/"
-SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz
-	nyx? ( https://dev.gentoo.org/~yngwin/distfiles/fontconfig-nyx-2.tar.xz )"
+SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.tar.xz
+	nyx? ( https://dev.gentoo.org/~jstein/dist/fontconfig-nyx-2.tar.xz )"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index e972e9826d8a..a8b6e059c546 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -6,9 +6,9 @@ AUX fontconfig-2.7.1-latin-reorder.patch 1701 BLAKE2B 9ac50adca6b257ebd12848ac09
 DIST fontconfig-2.11.1.tar.bz2 1516095 BLAKE2B 4f78c606d198c4d721dd7fe61181f4433a562fee7f69372e64b661e4aac7750928bc158691fdbaf5ae932bda373d007f95a6d0089cda2eb50f15f599c4eb9d6f SHA512 acf4e6293e0e5521e4b8f29f4b48860ecd1d39744d0eab21c7332e56bfc3ccc63548e459243c5e425b8e5ef265f2cf065eece02460725e794041219d41188149
 DIST fontconfig-2.12.4.tar.bz2 1613580 BLAKE2B 9d6b0d5d7bc61cd3dbab2ad769df3aa33c1b38d6c55e02e18aee875a1bef4162a5bba0b9bf8f09c0f94d63c64c3f6bf6f3c5d993f210f74076f861c696f5262c SHA512 f336e9220afe738e0bf7186d87a5eb09842342ad99ca2102c69820a1f0b232e15c61ef72ae3f5d56503f5be32557d09180a80e05690e85b4eb13ed88f5cece81
 DIST fontconfig-2.12.6.tar.bz2 1624683 BLAKE2B 48432f3d3cc90240ec19dffb6714e7f780eb6b401693b40e2efa2bb593bc89c42b03c99fce8f2ceb7c108da254dc248d91a790849d22feaa50a725338b80fd1f SHA512 2a1d3e62cae2bfcae2e67e9cb75ab6534a35bda4215f1ad4b8bf757e77e7d9d609c016562f5288fd10046a0e94655a807f6dd044d7868ed81a146c4275c4dd06
-DIST fontconfig-2.12.91.tar.bz2 1678752 BLAKE2B bb34ec8559a372696e72629aaac517c24ee5a9503ba6f8c20fdda22f5e2eac49b94323c18e6d90cbcba72fd00b0ad8a88c12c9954b55c90f78e7888129773abc SHA512 755a288e798c6c93acde8307905bef63fcc0cf85d69855334042897e1c26ed089626b1e42d2cfe3de657c623b19dec469b483a75d64502954cc8641290f23301
+DIST fontconfig-2.12.92.tar.bz2 1691287 BLAKE2B fea26d468e89d27b186763b175f9e3eb5674ca4771ec5462dfe280214bcde863bb032610a9f943f4afc0139f5042324ae220596698a25e6825cc7f0e1500be02 SHA512 4925cde8c988f25f40786b32937df68a9152a9a1e5645d3894aa5b9d70cffb7fd1a7b3e1480d716b93618ad7414bac752be6a77c71f1065dcee57368064030ab
 EBUILD fontconfig-2.11.1-r2.ebuild 4770 BLAKE2B f1cc240f9fd3631a484c33cc078c505d4b4af5e8c60baa63b9bb1112bf355e82774372ee26e85b13863c043d64e583d1c26af75fd0948f24b9f8eb6fb88a79ef SHA512 597cbd513b3407a49c40bca4ab879777f761d1ac3bf3091efdf504ce854dfc672d1721e16acc9bf8fce557ffe7f911105ae1dedcbf2ab082848b331e60ccef81
 EBUILD fontconfig-2.12.4.ebuild 4930 BLAKE2B 40ea1f8710e43736d7da02b1a30df092818cc5ac8d513ec2f09958d0ed6cad7a1446b143279779643229e473b1fadc206387820c8b31755974b5f1d76594ed95 SHA512 46110903d927e176a8346527503431ca66b4a1b08aa3a441e0621ea9c7eec5429b21191c18156c8782013cc0e8dfe7a0ba55acd1d6c9dd92ddee23fe3562d11d
-EBUILD fontconfig-2.12.6.ebuild 5008 BLAKE2B 681b60673d02536732261e444b8f00b8178f43a6408dc2990644152b2d3d9971f2d7cca9c88ce7b5fe1aa356cca6c1f47b6a2425af0668aba1d0bdfbda0b3c08 SHA512 2aef38239990fa98e967696681f68fed5644ff3acb43d14810ee61505907de091491ea53a7b311ca2c28452eac60a1227b3196f15d0d58aa14c86b618980ee1b
-EBUILD fontconfig-2.12.91.ebuild 5009 BLAKE2B 316c388b65625ae9be41c8a79f48dfcd94cfeabf3fa962edd5aa2ed32d3e9489fc420b2dfdb17b061b64536a90651b6698e23957758a31d55ff82e01315f4682 SHA512 c2b552485c90827698bc12a2b32fff0703262d65360e8cabee78dce071b6fca9cbdf8360d2814ceee760d0195fa0ba252442dd7176f8856cd5e77bc0adb274f9
+EBUILD fontconfig-2.12.6.ebuild 5007 BLAKE2B 39a5c9e988609ce183ce3e51b57fa5e6481a9e41e120ec8cc24bf731b927322c6d7e5882f294351106ed0c91a5e0618bef34a5ee106ac6cac15ee8ca228441e3 SHA512 20eb9465e4dc39af53a53ddb2fee02746a8466b2705258b54161d426d1f473d86d68a9de97c2fccd96ba31c3bb3593b92b4627f40b3aee118e509e35c8e85121
+EBUILD fontconfig-2.12.92.ebuild 5073 BLAKE2B f2826657bf7ba5a8319c34bce4c05f85575c41bad341b2b8725ecfaf51b30929e159ea83fd3aff68a1f501a0a9aae4b870a8b07a60d12b8df2f1fd10c2857a0a SHA512 5481e6a6acbdb1a1a50354a2fa34b6f01acc93a6a2ffcc344f94548fe48246c82411a13455fc3f7ba389d1d9f6b5cc1e6f94e7a38ef240a8d4948f29f8c3d1ff
 MISC metadata.xml 729 BLAKE2B 3af0a9c7963c02bf886eb9d7522c2f1776b9b241afc05ae8e71f93ed08bfc937061f5ee9402232f317a207db84e4ee0ad0f9b7c8ba4b72b8600ab30c90822197 SHA512 997967959d02a36cf5187ab42649e7fb581331141fb92aa0aeee622a996959553824424837c56ea0a3abd44cc0abc40cca04abe819c0a4261944072f681260bb
diff --git a/media-libs/fontconfig/fontconfig-2.12.6.ebuild b/media-libs/fontconfig/fontconfig-2.12.6.ebuild
index 65dbef6a92cd..646c4e88f958 100644
--- a/media-libs/fontconfig/fontconfig-2.12.6.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.12.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://fontconfig.org/release/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc static-libs"
 
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
diff --git a/media-libs/fontconfig/fontconfig-2.12.91.ebuild b/media-libs/fontconfig/fontconfig-2.12.92.ebuild
index 59f25375fa73..c305817adbd0 100644
--- a/media-libs/fontconfig/fontconfig-2.12.91.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.12.92.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools multilib-minimal readme.gentoo-r1
+inherit autotools multilib-minimal readme.gentoo-r1 versionator
 
 DESCRIPTION="A library for configuring and customizing font access"
 HOMEPAGE="http://fontconfig.org/"
@@ -11,7 +11,8 @@ SRC_URI="http://fontconfig.org/release/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="1.0"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+[[ "$(get_version_component_range 3)" -ge 90 ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc static-libs"
 
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest
index a6715bc13d30..044553d8a58d 100644
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@@ -4,8 +4,9 @@ DIST gexiv2-0.10.3.tar.xz 244816 BLAKE2B 79177a679c0d10c90a266c023930e27318f2e78
 DIST gexiv2-0.10.5.tar.xz 591752 BLAKE2B 2fe5beaec7a6c2c9c55e8669c1cd8077cb5636f9b188b1ae64212582a23b514ece68108dbd3d4369417af6901579a28b69beb1a44013b51a3517f7fcf4f3e409 SHA512 350e9db388d0aa1c106f3e5bf8862206977d650be0223229c61c6a3ee20642890fbfd7681a215b9c85c10d0787a00a25bc05a639e19a5f39be27cb6d1bb0fc06
 DIST gexiv2-0.10.6.tar.xz 629872 BLAKE2B 9a0f0b98eb1f19d4642cd0fb692b8ec539d3aa98f5c47f04317466877c404955d86c7fb4b2399fee30191555340fbc7701e19132d707f57d123cb16771507570 SHA512 4b15b33af9266a69babd902d379edefe7afd3d2eef11aa3c144f9ddf9c645b697bae16b8d89f50e9b3da884f1ba32f505e118c5fef5204f5630e3a9c6fee7fca
 DIST gexiv2-0.10.8.tar.xz 634696 BLAKE2B 182cda3bac5b3211e5ef8267628a86cc496c0242f25c5cd94ed9eab81c7460022373f3bb794c976fd0b9a10e49f9ca7109521ac6f99bbe7a4e0306a31db899da SHA512 4c25cf6884495151947a70e62a096f3279223673bece4d4ff02720b2820aaad9e80c8715e02bf46c3f5598f582fdf07b4b3ddabd017d53001245e3381a4cc286
+EBUILD gexiv2-0.10.3-r1.ebuild 1302 BLAKE2B 43e272b98068e32d329e71766eadde4dd3b3ae9da04fbc4ac6a06d5fdffa4a0daca322f898e80a52209c4510a6657eb07d6a2fded3b8d52f54ce6896f7c3b199 SHA512 0d1c228ed35c68803b4c6b93f263b00667e6affe60b1e1066290f4a095de558e8c88e049f1f7450feac5f6e6810c233367f4a88ed96b35ac5a8812d7f0b3df25
 EBUILD gexiv2-0.10.3.ebuild 1263 BLAKE2B 499afbb8cb30cf2f3a6b536fe378c24bacec6e073e4c66005d8432f845c964a8460bd204ae386c2596da04be2973b8529032c42f288e7194c5d088992beb0dac SHA512 8e482c48e8d590633c518b4bfc50b1d38a6996e5f58af84bb60fe1d72d3dd94ac1fc1b1bf06b2dd508088ade154f903350fd38a3b9460f9c26fcd2616504ab9f
 EBUILD gexiv2-0.10.5-r1.ebuild 1388 BLAKE2B f45b369b735e07a3561856d4fbaa86fec086a02dd24841ed5d4d81a081a5ad4663eac1f2c9ed916b0cf387d3c546c991ae6ba90dc001b67c7a29f07786530130 SHA512 7e8c345bbbab1698c845c2c3f30ec66235cb0b80f32b6841ca186c68f50b8ddaef848bec6c75075b649731063e4315ee726edfe589e118cf930b7dba01a4a451
-EBUILD gexiv2-0.10.6.ebuild 1287 BLAKE2B 105b3830f92130d6a0f80de4d851722578540a2a4203eeaa7ee630d2d84ee9bdf69a08e5aac58571a4f02f0a7141f336d1765b1d63fd07cb33b32e67be8fbbff SHA512 e63a5e7c7928913f8ee1ad51c2a48133fedb6d78e784c02ad21135f657fed85135e290a09a28955e89fc4ed7bba19d54f97e7ec0be84d03661a14b7923c306dd
-EBUILD gexiv2-0.10.8.ebuild 1402 BLAKE2B 9bd3d8681eb074f05890202ec3a29f6e29c7ce8ef93faa075062afff72f893fac913c55af3020bdca8ec00ce77275d23711ecd20baa7d1ec92ffccdb2fa49441 SHA512 f3679506189cf3bb8eab1561212a0ad34a6f4ae77b564cc7e93c3b38dea9ba630bb87dd1fe8b51a51cff4768e4dc17fe1c594b220cc3010e4df7beb28e60b4e9
+EBUILD gexiv2-0.10.6.ebuild 1326 BLAKE2B 2a08ca7e489a0b8751a253c9e53ad2379b5d1d989afbdb450e2e0413c9e4bb609e24acbe9e6d83924e3894e8ac15793f39cdf0bf0fc9e632e58f2fb56ff67e5a SHA512 ee6ff6a1d9162d0c8e5001770b8f22c5b53699b49fb78628e92f0463d1fa441d35b87d6476094ff2f3670b1e797986573219e16ea9c538d859980b2987069afe
+EBUILD gexiv2-0.10.8.ebuild 1512 BLAKE2B 726883a9f1882136c6bf1a476c0ed79959746b142d5b2cf45cfae43305e6b1f2465377a76c933fe2294f84279446f01c3d25018a2a869bcbbfb9552193b62999 SHA512 ce0021f2cc5ac31969d8089af4c5eebb63651fdf48d994a5072ae35000050e6f01791b082713de4044245cc445ce17a035e1da9a6568a8805be32605be312e2b
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-libs/gexiv2/gexiv2-0.10.3-r1.ebuild b/media-libs/gexiv2/gexiv2-0.10.3-r1.ebuild
new file mode 100644
index 000000000000..fc6047cfb1f1
--- /dev/null
+++ b/media-libs/gexiv2/gexiv2-0.10.3-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit eutils multilib python-r1 toolchain-funcs versionator xdg-utils
+
+MY_PV=$(get_version_component_range 1-2)
+
+DESCRIPTION="GObject-based wrapper around the Exiv2 library"
+HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2"
+SRC_URI="mirror://gnome/sources/${PN}/${MY_PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
+IUSE="introspection python static-libs"
+
+REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.26.1:2
+	>=media-gfx/exiv2-0.21:0=
+	introspection? ( dev-libs/gobject-introspection:= )"
+DEPEND="${RDEPEND}
+	dev-libs/gobject-introspection-common
+	virtual/pkgconfig"
+
+src_prepare() {
+	xdg_environment_reset
+	tc-export CXX
+	epatch "${FILESDIR}/${P}-exiv-0.26.patch"
+}
+
+src_configure() {
+	econf \
+		$(use_enable introspection) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIB="$(get_libdir)" install
+	dodoc AUTHORS NEWS README THANKS
+
+	if use python ; then
+		python_moduleinto gi/overrides/
+		python_foreach_impl python_domodule GExiv2.py
+	fi
+
+	use static-libs || prune_libtool_files --modules
+}
diff --git a/media-libs/gexiv2/gexiv2-0.10.6.ebuild b/media-libs/gexiv2/gexiv2-0.10.6.ebuild
index 73d79469fb5b..4adf9967d4d8 100644
--- a/media-libs/gexiv2/gexiv2-0.10.6.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.10.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,6 +28,7 @@ RDEPEND="${PYTHON_DEPS}
 	>=media-gfx/exiv2-0.21:0=
 	introspection? ( dev-libs/gobject-introspection:= )"
 DEPEND="${RDEPEND}
+	dev-libs/gobject-introspection-common
 	virtual/pkgconfig"
 
 src_prepare() {
diff --git a/media-libs/gexiv2/gexiv2-0.10.8.ebuild b/media-libs/gexiv2/gexiv2-0.10.8.ebuild
index 1ace566e3332..268944a20166 100644
--- a/media-libs/gexiv2/gexiv2-0.10.8.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.10.8.ebuild
@@ -15,12 +15,12 @@ SRC_URI="mirror://gnome/sources/${PN}/${MY_PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="introspection python static-libs test vala"
 
 REQUIRED_USE="
 	python? ( introspection ${PYTHON_REQUIRED_USE} )
-	test? ( python )
+	test? ( python introspection )
 	vala? ( introspection )
 "
 
@@ -31,6 +31,11 @@ RDEPEND="${PYTHON_DEPS}
 	vala? ( $(vala_depend) )
 "
 DEPEND="${RDEPEND}
+	test? (
+		dev-python/pygobject
+		media-gfx/exiv2[xmp]
+	)
+	dev-libs/gobject-introspection-common
 	virtual/pkgconfig"
 
 src_prepare() {
diff --git a/media-libs/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest
index 45bd9c38d67d..a491f2a39651 100644
--- a/media-libs/gst-plugins-bad/Manifest
+++ b/media-libs/gst-plugins-bad/Manifest
@@ -2,6 +2,8 @@ AUX gst-plugins-bad-0.10.23-CVE-2015-0797.patch 1044 BLAKE2B fe60f1069711c17e8e1
 DIST gst-plugins-bad-0.10.23-h264-patches.tar.xz 5284 BLAKE2B 90ad2a742de6d6b3efedb1a2fc16a9f24cf0566fd455a27f113afa0fc2ceff5f2517a31e8db8ed6ed8b4c92595b333a29dbb451077975f3d726808976f4a8671 SHA512 528ed30edb544dd970047fd4b0f05bf75f9f49f07a8118f805430c56c3ec75643013799491aeba70c62cb0343cd3e72758bf5c167d00e90a6a3f13857e4860e1
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 BLAKE2B 86ed955fb5c73f2145b8f8ed2daaeffd9975362e81c3ca911be00d18f6b6d975381651071eb54514ef94a931f1fc89e673dc8c1d68e10de132bbe51accb6d165 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4dd8815627b0e716fe9be5d005ddd609c92a08619214a6b15059e7f537dadbc36c34d4c6ebfde1284c6a6029d2edf89bf9fa2 SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661
+DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 EBUILD gst-plugins-bad-0.10.23-r4.ebuild 1565 BLAKE2B 8907f6548ae1d077342bf0f35280c9cd59c492bd8a2e23e9c176c1682e32cab561835123af61fc40067f55c43574e401aa16e418ede39a56786744f741f203f7 SHA512 6c68c102487868c23bc177aa65a9a734f7e2cd89bcca5af827d98dcfb61d26a84b09a07d4ec6d7397a17ffa57ab33fdbfc5fc290bb9eb397209150da86ebb492
 EBUILD gst-plugins-bad-1.12.3.ebuild 2812 BLAKE2B f6ea1539d722daf9296ea0c1ce99653f709e36297e0c04ccb1ae45705ae3ee11325036e892aeffedba002632f2379f0c7486cfc92b67fae76b69036ed58b1ac4 SHA512 27e72cde6700f40d738abe14e709072326ca2af3e556b65acd09604b472168f7e705808c8756edc8d14a1992c8091a6065c2500cec6aa9cbbdda137a229a0bc4
+EBUILD gst-plugins-bad-1.12.4.ebuild 2820 BLAKE2B aee1cc3a7300311f8b38b871a008da579e09a191314c5b67b8fb2f693b55b741c8ca1553a02db87f41146e2968c933d6eebcf8b974814e4c626feb1fa28ee432 SHA512 9bac5af30497f909d88de86c48eb60e1dbec0bc1941e1c2a347a2ae164c725d418c4530ef9b1815e863969a08a9eca57555b3b2c81859d00389ca35ce5ef088d
 MISC metadata.xml 439 BLAKE2B 5a4a36ccf4bd485eaf1fa66650eec8fa592d4c5bbf9fa478f1645e1b39649b7115694bf55dee7aeb4a5c53b2ba3c4614591cdf4e7d745938397c304108e0aa7c SHA512 9bd27a1a513fc2d697f7d0f2ceb7fa0701c446fe21b597256afd4c2c1f44145e875323ed1ef6202bf7b85472ab4aab43a4b6db5795bb1d28ff53a2a7e484055e
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.12.4.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.12.4.ebuild
new file mode 100644
index 000000000000..8475f11a84de
--- /dev/null
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.12.4.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE="gst-plugins-bad"
+
+inherit eutils flag-o-matic gstreamer virtualx
+
+DESCRIPTION="Less plugins for GStreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="LGPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+
+IUSE="X bzip2 +egl gles2 gtk +introspection +opengl +orc vcd vnc wayland"
+REQUIRED_USE="
+	gles2? ( !opengl )
+	opengl? ( X )
+	wayland? ( egl )
+	egl? ( || ( opengl gles2 ) )
+"
+
+# X11 is automagic for now, upstream #709530
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
+	gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
+	opengl? (
+		>=media-libs/mesa-9.1.6[${MULTILIB_USEDEP}]
+		virtual/glu[${MULTILIB_USEDEP}] )
+	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.4.0[${MULTILIB_USEDEP}]
+		>=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.4
+	)
+
+	gtk? ( >=x11-libs/gtk+-3.15:3[X?,wayland?,${MULTILIB_USEDEP}] )
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	addpredict /dev # Prevent sandbox violations bug #570624
+}
+
+multilib_src_configure() {
+	local myconf=()
+	if use opengl || use gles2 ; then
+		# Actually enable the gl element, not just libs
+		myconf+=( --enable-gl )
+	fi
+
+	# Always enable gsettings (no extra dependency)
+	# and shm (need a switch for winnt ?)
+	gstreamer_multilib_src_configure \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable bzip2 bz2) \
+		$(use_enable egl) \
+		$(use_enable gles2) \
+		$(use_enable gtk gtk3) \
+		$(use_enable opengl) \
+		$(use_enable opengl glx) \
+		$(use_enable orc) \
+		$(use_enable vcd) \
+		$(use_enable vnc librfb) \
+		$(use_enable wayland) \
+		$(use_enable X x11) \
+		--disable-examples \
+		--disable-debug \
+		--disable-cocoa \
+		--without-player-tests \
+		--disable-wgl \
+		--enable-shm \
+		${myconf[$@]}
+		# not ported
+		# --enable-gsettings
+
+	if multilib_is_native_abi; then
+		local x
+		for x in libs plugins; do
+			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
+		done
+	fi
+}
+
+multilib_src_test() {
+	unset DISPLAY
+	# Tests are slower than upstream expects
+	virtx emake check CK_DEFAULT_TIMEOUT=300
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
+	einstalldocs
+	prune_libtool_files --modules
+}
diff --git a/media-libs/gst-rtsp-server/Manifest b/media-libs/gst-rtsp-server/Manifest
index 94ead838434f..f8f07de24ff2 100644
--- a/media-libs/gst-rtsp-server/Manifest
+++ b/media-libs/gst-rtsp-server/Manifest
@@ -1,5 +1,7 @@
 DIST gst-rtsp-0.10.8.tar.bz2 567670 BLAKE2B 10c01001a53daa039b1c48917fcd31ac0f6437d365bac2aa6b70d0b43cb94df89ab1d2a55b8fc89f5e04efffca142f99fe0f96a1c2708acc9a062f4f3a01cd8d SHA512 c5020cffa9334b7d9c6b9dbe6f32bd4580eeee1c67689269d232e954ef9d96d8b988e3fb19da89701eae26419df0bf6de5796f7780cfbedda4c07154b1c1ebd7
 DIST gst-rtsp-server-1.12.3.tar.xz 631392 BLAKE2B 97d401cf79dd99e0b8869c454b9f4de8d9c87b2ab2382e627f60759f69b1b25a8b071ed5a7a53bd5641482390e8dfc691512bf367efce57d3fa9223e7af1cb4e SHA512 cab130bf57692852827864ac9156bdf76dbcf0691f6ce6fe04a7176123b2e3ff4637edbffb3c5b14ec1db6d5c2c4f3460ed54a5ccae98aee9547af45d0bc82a7
+DIST gst-rtsp-server-1.12.4.tar.xz 632488 BLAKE2B 86c9734128a34f3c3bb983133475ab0fd43a2ac79a76dcb1470a97165feca4a6b9b0c9dbf9177fe47a263eb2a192e57992eb767ffc938f7b0a026a252181dd2d SHA512 295c27803b22ba58fcbc2e2509246d64bb6bc038d8ad8b9fe5b82c75346cccff49c61157fb05e9557e45bcf791cc7b7720aea6dd2e23e9922a345da426f291f1
 EBUILD gst-rtsp-server-0.10.8-r1.ebuild 2664 BLAKE2B 1bfce81aa8708ae23b01096abd90c08e92c58a55c1126d0df3dbd9c50a78e09915c599ac7a32f3fcbe6ab3793521e3b74a6ec20add132fd7640d157a2267e900 SHA512 2c521e305cc9d6d759011fc85e51d9ea861d378aff73683b40a43af995481829d3c3e2d19fe2caf066b1f1d9e852b0f992b6f9289ef34b4b050ad22f33b5e464
 EBUILD gst-rtsp-server-1.12.3.ebuild 1965 BLAKE2B 23bf4e165f9ac43d23e6b899a1a3cdcc4c5af43550591f2a2db05b38f016a32658e15e53cf6bddbc6171552b2fe684cf85d119f10980c3d75f407d121f980b45 SHA512 edafc2800223827f6463ba67434ed751c053a2e8a0b83e7f53c837973399eeff216f4a067e987099c6a10e19e6673dee7776e058d648b14b44aaa55d54663aa6
+EBUILD gst-rtsp-server-1.12.4.ebuild 1967 BLAKE2B a1af7b6617bdf0182f02d6575d6aa1f53a29e9defa26a34dc33344c97a25aee5359688c7a48238fa147519af0fde37c0c521bbca7f485a7171f16edf391cdc44 SHA512 b0780eea12375d224bb20a39696d38ba6c69b6e78a1ace5e8e5286a97db66f35b414bdbd4dccf4f11610b320f92c7b14ba3443b3e9eaad07f1a5fd0744d37e9c
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-libs/gst-rtsp-server/gst-rtsp-server-1.12.4.ebuild b/media-libs/gst-rtsp-server/gst-rtsp-server-1.12.4.ebuild
new file mode 100644
index 000000000000..80836e844b80
--- /dev/null
+++ b/media-libs/gst-rtsp-server/gst-rtsp-server-1.12.4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils gstreamer
+
+DESCRIPTION="A GStreamer based RTSP server"
+HOMEPAGE="https://people.freedesktop.org/~wtay/"
+
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples +introspection static-libs test"
+
+# FIXME: check should depend on USE=test but check is losy
+# configure says good and bad are required by macros forces them to be optional
+# they are only used in unittests anyway.
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${PV}:${SLOT}[introspection?,${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[introspection?,${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/check-0.9.2
+	>=dev-util/gtk-doc-am-1.12
+	test? (
+		>=media-libs/gst-plugins-bad-${PV}:${SLOT}[introspection?,${MULTILIB_USEDEP}]
+		>=media-libs/gst-plugins-good-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	)
+"
+
+# Due to gstreamer src_configure
+QA_CONFIGURE_OPTIONS="--enable-nls"
+
+multilib_src_configure() {
+	# debug: only adds -g to CFLAGS
+	# docbook: nothing behind that switch
+	# libcgroup is automagic and only used in examples
+	gstreamer_multilib_src_configure \
+		--disable-examples \
+		--disable-docbook \
+		--disable-gtk-doc \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable static-libs static) \
+		$(use_enable test tests) \
+		LIBCGROUP_LIBS= \
+		LIBCGROUP_FLAGS=
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi ; then
+		ln -s "${S}"/docs/libs/${d}/html docs/libs/${d}/html || die
+	fi
+}
+
+multilib_src_install() {
+	emake install DESTDIR="${D}"
+	# Handle broken upstream modifications to defaults of gtk-doc
+	emake install -C docs/libs DESTDIR="${D}"
+	prune_libtool_files
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples
+		doins "${S}"/examples/*.c
+	fi
+}
diff --git a/media-libs/gstreamer-editing-services/Manifest b/media-libs/gstreamer-editing-services/Manifest
index 2b1ae6ebe28e..6b9a4867bcdc 100644
--- a/media-libs/gstreamer-editing-services/Manifest
+++ b/media-libs/gstreamer-editing-services/Manifest
@@ -1,3 +1,5 @@
 DIST gstreamer-editing-services-1.12.3.tar.xz 1061796 BLAKE2B 250983e470a607f5734a1dde799223521f3918f2c985ddc9995f4a9720e7ce7147a60f9d90b71be65f06f3caf7fe0428d90a7f9395f31930f06fc18b9710ce36 SHA512 18f2ae1e04e5848221f45728b5d4002549aeaaeaa39af58410666fbc6ab01971900fabaa92cc3d17f910c4d4d5dc691689aeb7930164a24a6b9c49709e7fb669
+DIST gstreamer-editing-services-1.12.4.tar.xz 1062972 BLAKE2B e2f401e419e793a37b3deac71696326f6d2c7491d7a138c40de8af46f2bd5ba415b56b9656a9d225d9704e3339b15aee3e587299441c2b75633a7792a954d4b3 SHA512 b845fc897384aaf691a9dcbf26e6ba682c9eca161e0ad227f47fb0865527d05254fd7b08d082e824a026bfe6909efe8069e3205e209a2e6dfce07f5a7d18dfdf
 EBUILD gstreamer-editing-services-1.12.3.ebuild 1585 BLAKE2B 3839f34cab169b1097a8b55dfaca313ee7d32899d65997e02c8f98c6d50718b22259f566cd65039f7b5ad5ede8cbe609f4ae2949ffebcc2152772add714e9e7a SHA512 21c64e866ae08c7a6e3e462202b1c8f6f15036a6e730c88dcf0e3c798fcbaa20b0f5b1475667815c29a86d4371adc7cd1fbb46ccbb1e919eabc3c8b89c58da2c
+EBUILD gstreamer-editing-services-1.12.4.ebuild 1587 BLAKE2B 00212c2e67caaf023042e899a825ff791cf79125bdf70272b2c3f1b023dbf4c17b13a74f40f2d011fc3d66f6ffdce3855456b4443a49cf463d7f204c40576cf0 SHA512 72f2a72a67c3728210dce4963315906a697209991b31bd2d33e12890868cde6daefb9844380d579ab45e9720def816ef92ced385ddc42f6034db78b5dea21365
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.12.4.ebuild b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.12.4.ebuild
new file mode 100644
index 000000000000..7d6f89bec6ff
--- /dev/null
+++ b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.12.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit bash-completion-r1 gnome2 python-r1
+
+DESCRIPTION="SDK for making video editors and more"
+HOMEPAGE="http://wiki.pitivi.org/wiki/GES"
+SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="1.0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="+introspection"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/glib-2.40.0:2
+	dev-libs/libxml2:2
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=media-libs/gstreamer-${PV}:1.0[introspection?]
+	>=media-libs/gst-plugins-base-${PV}:1.0[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	media-libs/gnonlin:1.0
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1.3
+	virtual/pkgconfig
+"
+# XXX: tests do pass but need g-e-s to be installed due to missing
+# AM_TEST_ENVIRONMENT setup.
+RESTRICT="test"
+
+src_configure() {
+	# gtk is only used for examples
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		--disable-examples \
+		--without-gtk \
+		--with-bash-completion-dir="$(get_bashcompdir)" \
+		--with-package-name="GStreamer editing services ebuild for Gentoo" \
+		--with-package-origin="https://packages.gentoo.org/package/media-libs/gstreamer-editing-services"
+}
+
+src_compile() {
+	# Prevent sandbox violations, bug #538888
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	addpredict /dev
+	gnome2_src_compile
+}
diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index 4fdeda916754..cf725ada7f74 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -1,6 +1,9 @@
 AUX baseline_reg.patch 847 BLAKE2B d45b93ba00abffca157438b6140e329de2cafe95be97fafcfc60272fa821fb847984838179cff186babf8931f79decdccb1bfa0a724abc6de675b1551ff0684e SHA512 a35f518aaf384ed35130cbd509e2ae16efc1878a3528d174156105af6d6259a094d205c47084f068b1f42e07ab87e750d6b82113376e00e041e81fedf90dd541
+AUX gnuplot-png.patch 1093 BLAKE2B 0f09fb0575c4b35d22b33c0a669e1c5c61bd07e698a44c2b295da37413fb3ae4fc0ac952208b2cee5b20ac374c1f96554c18e7b61b46811b574a2f1ed009f744 SHA512 128602fee63a9ca4b99200dd4c1e3b183f0f1fe6d2109975fc2de0f41476a3ea39c443e6191099a4972d32b7725c08a2e9dbb1bbc1715d73238d85f491c8bf69
 DIST leptonica-1.74.1.tar.gz 11707064 BLAKE2B 8ffc9c2c0f9ffb83a5ab91ed27a17b3fd53ea550719f302ac0447f1768746ed7b14b324a2486061200984905f33df78da82cb2c19173b17fe8a66eeef51a84b1 SHA512 c6f08458d288997283aa56258932a79f4ecef10bf3fb95c91749b8b6fbe2a1573774371d969a43c2b73eb6fd67c1d6a3d07db465c29e5055bd42fc0ac22a5b47
 DIST leptonica-1.74.4.tar.gz 12349877 BLAKE2B 5c4a71c1c4f44b617f16b1b1029455badee268dc1ac459f1c7ffe6af5b8dbe702bdbaa6e5564af6e41d0881c59e1aa43dc40d5164f618f13ca2a563b2aa3bd0e SHA512 e74732c10218430463ca01f15e19d329dceb938e315586ed100c634c4d50809824f1d9bf7eeaf91654caf42ed78a5ae5de7c08e7a1d8884c580c536121627891
+DIST leptonica-1.75.2.tar.gz 12377982 BLAKE2B d2d52a5237f23a812ccd1439a13f579e5a21db51d5f9a00ba6d7d108bf9ab084aa4a032a6fe092e8f302628357a4e947064647b34496aa7c5b02c89f78497c4d SHA512 b5107673d1b94b936105cf9795e349c89bd58b80f5947f8e041867b052580215f4fb5bc728cd893c11082efdde11158562a1c93ad53387b6ffb33e7b9e089efb
 EBUILD leptonica-1.74.1.ebuild 1668 BLAKE2B d90ab773cef1d51ca2bbe38c13ebe0c412ee15dd265b38f3fa3ed2b57e18d12766928445b1ce9fb714965908b36513be995c8a97fca74a2e2879bcfd19be899b SHA512 4b114487e1b52877be9d4d85aa06b0340231565f4696682144d20b12403b78f086d7067ac0d1c388951c3ed99b8a5541764892391da8c9b0dc2c3dc256964815
 EBUILD leptonica-1.74.4.ebuild 1715 BLAKE2B a37760d4318cb5579447ef37f76391e7c3cb29bcac946b27421cc2ac67d287b496e231efeea5311fd5abe79981d7f4029acc949e0589412c365154c43ea5c2c2 SHA512 0beb0bdc9dd6736d2092b4cbd2cf00cd8454778ec9042d338f2abcc2b8a58fc9e721483e689eb34dede11144c3c7f3aed234ab3480210b946575208ff20f4784
+EBUILD leptonica-1.75.2.ebuild 1955 BLAKE2B 7dc81a47fc99dfc89fa388ed44a032659193969d3dcf4251130a0f23e39e9fd3f3afb20428142bfbc5289fde9a70b690ba21afa6842f745eadf4e115f1788ae6 SHA512 cf52396e2f12d8baa8e8642e8530cd2e2d84f4233ee24260cb12472fcb055c1854298224d061a178c2932ced0f45e669e54e0825fd10ac5d8bd232020c456d14
 MISC metadata.xml 584 BLAKE2B 577358c352b0d57e1c73e93ec313eb799a577af32893be3d77b2f68769493e5db075af57a2951541036f0a43b19933e9580fcc147d259462e78fb850bbf90a55 SHA512 be7f1725bd6c5807b12b4ef4f1d602e80e79637262c442d98f828fe8f1615092bdf603b56d72203c23bc32c847a7a35fbf7c331787c1afd86b3cbe051d5bf55b
diff --git a/media-libs/leptonica/files/gnuplot-png.patch b/media-libs/leptonica/files/gnuplot-png.patch
new file mode 100644
index 000000000000..4e87fca73b3c
--- /dev/null
+++ b/media-libs/leptonica/files/gnuplot-png.patch
@@ -0,0 +1,29 @@
+From 1b3c9b64ee204b3f9371cea624c959b3177c9c1d Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@aura-online.co.uk>
+Date: Tue, 13 Feb 2018 14:37:32 +0000
+Subject: [PATCH] Skip gnuplot tests if it is missing PNG support
+
+---
+ prog/reg_wrapper.sh | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/prog/reg_wrapper.sh b/prog/reg_wrapper.sh
+index bc60c82..4afdc08 100755
+--- a/prog/reg_wrapper.sh
++++ b/prog/reg_wrapper.sh
+@@ -32,7 +32,11 @@ TEST_NAME="${TEST_NAME%_reg*}"
+ 
+ case "${TEST_NAME}" in
+     baseline|boxa1|colormask|colorspace|dna|enhance|extrema|fpix1|italic|kernel|nearline|projection|rankbin|rankhisto|wordboxes)
+-        which gnuplot > /dev/null || which wgnuplot > /dev/null || exec ${@%${TEST}} /bin/sh -c "exit 77" ;;
++        GNUPLOT=$(type -P gnuplot wgnuplot)
++
++        if [ -z "${GNUPLOT}" ] || ! "${GNUPLOT}" -e "set terminal png" 2>/dev/null ; then
++            exec ${@%${TEST}} /bin/sh -c "exit 77"
++        fi
+ esac
+ 
+ exec ${@%${TEST}} /bin/sh -c "cd \"${srcdir}\" && \"${PWD}/\"${TEST} generate && \"${PWD}/\"${TEST} compare"
+-- 
+2.16.1
+
diff --git a/media-libs/leptonica/leptonica-1.75.2.ebuild b/media-libs/leptonica/leptonica-1.75.2.ebuild
new file mode 100644
index 000000000000..d72072546d55
--- /dev/null
+++ b/media-libs/leptonica/leptonica-1.75.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib-minimal
+
+DESCRIPTION="C library for image processing and analysis"
+HOMEPAGE="http://www.leptonica.org/"
+SRC_URI="https://github.com/DanBloomberg/${PN}/releases/download/${PV}/${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
+IUSE="gif jpeg jpeg2k png static-libs test tiff utils webp zlib"
+
+# N.B. Tests need some features enabled:
+REQUIRED_USE="test? ( jpeg png tiff zlib )"
+
+RDEPEND="gif? ( >=media-libs/giflib-5.1.3:=[${MULTILIB_USEDEP}] )
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}]
+		   sys-libs/zlib:=[${MULTILIB_USEDEP}] )
+	tiff? ( media-libs/tiff:0=[${MULTILIB_USEDEP}] )
+	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+	test? ( media-libs/tiff:0[zlib] )"
+
+PATCHES=( "${FILESDIR}"/gnuplot-png.patch )
+ECONF_SOURCE="${S}"
+DOCS=( README version-notes )
+
+src_prepare() {
+	default
+
+	# unhtmlize docs
+	local X
+	for X in ${DOCS[@]}; do
+		awk '/<\/pre>/{s--} {if (s) print $0} /<pre>/{s++}' \
+			"${X}.html" > "${X}" || die 'awk failed'
+		rm -f -- "${X}.html"
+	done
+}
+
+multilib_src_configure() {
+	econf \
+		--enable-shared \
+		$(use_with gif giflib) \
+		$(use_with jpeg) \
+		$(use_with jpeg2k libopenjpeg) \
+		$(use_with png libpng) \
+		$(use_with tiff libtiff) \
+		$(use_with webp libwebp) \
+		$(use_with zlib) \
+		$(use_enable static-libs static) \
+		$(multilib_native_use_enable utils programs)
+}
+
+multilib_src_test() {
+	default
+
+	# ${TMPDIR} is not respected. It used to be but it lead to issues
+	# and there have been long debates with upstream about it. :(
+	rm -rf /tmp/lept/ || die
+}
+
+src_install() {
+	multilib-minimal_src_install
+	prune_libtool_files
+}
diff --git a/media-libs/libebur128/Manifest b/media-libs/libebur128/Manifest
index a67cdf9b41ae..b056acceaff3 100644
--- a/media-libs/libebur128/Manifest
+++ b/media-libs/libebur128/Manifest
@@ -14,5 +14,5 @@ EBUILD libebur128-1.0.3.ebuild 1159 BLAKE2B a284d1752c4c0d780c24d8c4ef6a291f824c
 EBUILD libebur128-1.1.0.ebuild 1069 BLAKE2B 44f6662374f5799fe69bc3a301b78b78f30eb02746e08395a5a4f755a1cb460989120981824a3eb9a582488a88d972604648b7a0f8767262951c588a9a8dc491 SHA512 897b218e80356300bcf6494816db7dc487591a21ca35764b34ee7237377b4f9c37b4e3c2eef522ac4469061fc2429db07a016e30ca498b3ffe92763ee85cf5d0
 EBUILD libebur128-1.2.0-r1.ebuild 953 BLAKE2B b25cb6ba208c8db3e762982e16b661e1d4ed82299065be01a59a82dfc1d149b64275290ee630b4cac80ff46173511f3c9cacea8d3f0c1cc8a92d602e16bb6d40 SHA512 a7b1ae3173dd6ce3ced5f947750b4fe223f4d468746f77df471a20753439534269ec3b8b6fc9288cffb80f60d15e84debe165a9a3f8fb7d631d3ce4e7e73889b
 EBUILD libebur128-1.2.2.ebuild 1042 BLAKE2B 134d30fcf7c5df32823c76d719fd0ee6ed74529c87461fc662110c705ddbb572132d0757ca5b5db8a9e5cbb0cadbff0230213212e1a41a50fb0b12bc4c1266d7 SHA512 306c3e3fc377c252b347a9acc2a3376bc1e7ad152272863dba45b508fb32a1dcb9faf9cbbe3e482cfd174ed4e71cf990499d8b277321d53287be9bdbb74c4d57
-EBUILD libebur128-1.2.3.ebuild 967 BLAKE2B 750a7b1895b30d4de47821d9dc4a7245293df55c3a78cb03397b2843a7e76dd91db85dd2953c16be811c78347a9cf78840da23c29c4a05556bd400ce61db7f87 SHA512 fb2f4f70264a495e17d8808d062750ab6f0bd5287a6be69aa1e7afa00eb20c47124430f214ce7eab863b3fdcf46f8f32931f6f76e51a840b2ce15821b37d9682
+EBUILD libebur128-1.2.3.ebuild 965 BLAKE2B cf2045646b33cb02412db82096346b63f266f2b47ec43a712055a9086181c4c9262d02be1b14434222b6aad03d50b6d1607c96f87ebc958f2005ecfa8607dd49 SHA512 717bd127e7813297823d1ae48ae1a63a2f3c7eb33f576ca9256bbf81a1d9ac27f23ba42273e7cf6807ddff238019242e592e7a1eee871036ec97e972bd44b476
 MISC metadata.xml 752 BLAKE2B fd4288cd3e104741b109ce1bfaa4562ec9258940a3b43d58d6a6427a6ded2a762c56907012811e2fd9de363ba87f3978aed62c0b1c9c79e1f9eac4134d1c6552 SHA512 d0117447e87d367f45438b1b2ebd3f238b8ddf97491d8d742bb0f6609e6da4cb155249f86f95a330545c89b6433badd93ff2d26b55a3417990d63612e26b6218
diff --git a/media-libs/libebur128/libebur128-1.2.3.ebuild b/media-libs/libebur128/libebur128-1.2.3.ebuild
index 77ae54e811ee..70f56a616b9f 100644
--- a/media-libs/libebur128/libebur128-1.2.3.ebuild
+++ b/media-libs/libebur128/libebur128-1.2.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/jiixyj/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 x86"
 IUSE="static-libs test"
 
 DEPEND="test? ( app-arch/unzip
diff --git a/media-libs/libopenraw/Manifest b/media-libs/libopenraw/Manifest
index 68a5c2871ec8..9098f3cbbab3 100644
--- a/media-libs/libopenraw/Manifest
+++ b/media-libs/libopenraw/Manifest
@@ -7,5 +7,5 @@ DIST libopenraw-0.1.2.tar.bz2 563981 BLAKE2B 60332274c72602e5b3eea3e41dfee8c6230
 EBUILD libopenraw-0.0.9.ebuild 1169 BLAKE2B 6548945f67fed5f9ed96341a1e6f37af9d3e61655a95f23dbe5fdc68fa35c92e913e2e5cb51c744e1ca8dccc7efed3e7cd7776f65e58056349f67fa8854fc755 SHA512 8ed478f8438c0d278b40aaed32831e0b70a591ff426d48fd82015838f1a3cb1bea5cc153d85c36d81d3605069e11812487821a9afb084c36b3f3c41235adc03d
 EBUILD libopenraw-0.1.0.ebuild 1221 BLAKE2B fcdbbbff7ac8fef777a9366ff255f36296fbcd86d2750d581bec1b5fddf3af0da45628591b6afc849d09893f774b69e4ddd1d415f898ea196ff66abb6732584b SHA512 a2b73e4e3d407bd4e06e8e077027109ad395e9720dc8b8f49e957b68cde7139a274fda5e98be5a5ecfdef19f5f569b3412a443e64363053cada2c22799d1e986
 EBUILD libopenraw-0.1.1.ebuild 1113 BLAKE2B f307eb191171c2dc977c7f87c57396470d4b6951406fb9cbb3c244395503865e67f74e1d577491878732de43a4e8789cb6b436da07b104ef0c5a7d528abbee61 SHA512 92c0ea3a04232eba0f796bc94ffb2f76d47a26b0f18f0571bd85625c0dc8a64078cb203d20fb8116258bfd9e16dc6349f5c31737453ec23ad888e6168a006af6
-EBUILD libopenraw-0.1.2.ebuild 1112 BLAKE2B 529912efa1a990147cf2b8756375a51cc962852342f50f34e9243562f17de88c479dc674a8f09141e7624534647fb08cf88de71c1dc4ef87e4815554f79f3a0f SHA512 c72b8e3823781b0dc818da24181570d2bc71efdd29e0e9040abd726ea806f02d1e058364599e5fc0129b0627b2732e6f7e3bec906c47a7b6ea6e9927eb2f07de
+EBUILD libopenraw-0.1.2.ebuild 1110 BLAKE2B a60bfde4ea5a33767622601b3b0f93b43b7631a4f455d587314739ed3fdc6fe63560bc9a8c532ecc3d972cfe29c8e483e0ff77cb8dfb82cc87700d4554052255 SHA512 7c6e40ebb83265b7bc1d6726683c484a2ca4ecf5c023de57acd5ff54cedb7a4ad55a0092eafaf5a09fd8a7d47182f6321b49c36b482a97393ed503195e89b8db
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/media-libs/libopenraw/libopenraw-0.1.2.ebuild b/media-libs/libopenraw/libopenraw-0.1.2.ebuild
index 9d86a2868956..557087a3a2cc 100644
--- a/media-libs/libopenraw/libopenraw-0.1.2.ebuild
+++ b/media-libs/libopenraw/libopenraw-0.1.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://${PN}.freedesktop.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0/7"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="gtk static-libs test"
 
 RDEPEND="
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 44d40886aa70..ca79c028e818 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -8,5 +8,5 @@ AUX mlt-6.4.1-qtopengl-2.patch 2573 BLAKE2B 3a313c170a079b8c036a75773b2e9f8b047b
 DIST mlt-6.4.1.tar.gz 1344030 BLAKE2B 835561eac31a44d292c5915567338eb43110b3474778327af282403b43e3e89eaec407e5920f81a774c03968b4c08a496b0ef6c3e6d0970c17353613e7f4d051 SHA512 b082274e2184a0496f496517ddbcae33bab44cd1f50c1708942b7a24e5861ba97cae9fa21ec41ea21d662cbf56e2e2e66caa707a100077ef6e13aa7140f7a9fb
 EBUILD mlt-6.4.1-r2.ebuild 5611 BLAKE2B afd7fbeea301840cda11ac7c8855c15f94fe22d8701fe35efe520ec9efae68e6e9342d8c23bf754a48ab150b5f97ed8187480aef4b3334c63c382a38b065246c SHA512 dc24d3812d5452b056ee7e7192f22712177aec8cdf5470e76314a7335f7a8ba849f5dd629b9d6f5c9f873a4b03181cb00914398406106b1aec682b8e8f0bed20
 EBUILD mlt-6.4.1-r4.ebuild 5814 BLAKE2B ba612ea2de197a01ce80ff6a6a618995e44a0abfab61d552a4f06915df3adff9a1d8b00b49cf9480acd39b0550305c18a897355cdb37b8488c36a12645a72aad SHA512 a9dad9ccaf640182da4f94bcdc5f9ce1a7a8cb0462a98b1a01dcaf8781c50b734ba74d0c4f597f6c41b2d1fe2de29f3ad0e73def1562768d30fc2f16fb880064
-EBUILD mlt-6.4.1-r6.ebuild 5687 BLAKE2B 00fdbefaa9c1c8f2609b1ad6d72d5d43f446cf5c3353bb0a03bfe4d8a727eccb7139f8b289be338ec847ec8cc3d0fac49a26fcbc5aeb7feee54fb9bbce27db0b SHA512 4a7046100abe253d3afd9ad5943a3a32f0d417d68197889e326ad56ac42d28b32a484a41e42fa32ae4857c4f3cf74cf211c382611c5387a9b17b15e69d9f6979
+EBUILD mlt-6.4.1-r6.ebuild 5686 BLAKE2B 08fa51de7e7f2f026d47b8d82e519e180a4e40ecb808ffead7d6e15a5ba781f8d9b70de777e66f16582de38c4cea1846dcb8460108d607e77b0e22c4d2b882cf SHA512 aaac36678fd887ac956be2429e2ab674d607990e2be7e3bb88ab606101562309d2711f0d97ccef81dd67b719781041afb0738f79729f85b1584836d836b33a1c
 MISC metadata.xml 1501 BLAKE2B 88eb294bb8844bef1c8d6397649ce3d99edf5691e4f048061b9faee4776043233327b4094e8a06998ac648207836965523036a5e5f3e8a937c50dcfce2051330 SHA512 e3afcec0da4ce1e08e77b0c1a43a7dfb082282da02ab3aa694035bd0c229640b7094ceca0cac0834d33e3b49bc22e924fad0e5d167ea961934f03703eb39cca4
diff --git a/media-libs/mlt/mlt-6.4.1-r6.ebuild b/media-libs/mlt/mlt-6.4.1-r6.ebuild
index 1d9f408817c2..b19c9bea7a94 100644
--- a/media-libs/mlt/mlt-6.4.1-r6.ebuild
+++ b/media-libs/mlt/mlt-6.4.1-r6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/mltframework/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg fftw frei0r
 gtk jack kdenlive libav libsamplerate lua melt opencv opengl python qt5 rtaudio ruby sdl vdpau xine xml"
 # java perl php tcl vidstab
diff --git a/media-libs/phat/Manifest b/media-libs/phat/Manifest
index 63d640819265..4f8e0ff8b540 100644
--- a/media-libs/phat/Manifest
+++ b/media-libs/phat/Manifest
@@ -1,5 +1,5 @@
 AUX phat-0.4.1-underlinking.patch 859 BLAKE2B cd3f794f3dec133d493d295f3986f22bc4ca4c3af8393e5d405e18bd2a2cc22692fa6891bc9c59e9aab55135ba72539407d078815b5eef8765d8c0a2765af4eb SHA512 814cf8d980d61e4729db095c2b440a5811dff626f28963d24fa6e37316fc13716da2d63861f796ba2b8e4d5c2141be2bd919f01d5d6fb4cb4cd445ace9f5d0a6
 DIST phat-0.4.1.tar.gz 550910 BLAKE2B ab95b5ed5c0d9d37ff9e12b733368b3b1c3ad90fecec07ca4ae2a803094b2c1b2b743986e9983a95a5be30b8fe3a0e2080e201e6ce6d9567bc02f1c303031332 SHA512 c2d25d4cf2f291a447229ab3c1c779e5a8872d8b0c88a759b7dee437b8ad355eea6211b7d257af96cd3e719098a0da3cff7ffc916281af29bf55eb9c077ff333
-EBUILD phat-0.4.1-r1.ebuild 759 BLAKE2B 4da6ee3b279d2a20b8b33604cac986764ec5777f7a3fa2f2ed531bb1d38d8beb1fb163ee24c97275fc664b4082e709dc901dca2c726a01f6e1b268dc5f27a4b4 SHA512 888aefe9e7803c0474e4250f854bcf66aa7890c4ea88a6f9ceaa33a377ebf16469eebbc04bc1741c06d8d6ba2b07f2d3e47f4e06d4bde1118c2a44a6480abfce
+EBUILD phat-0.4.1-r1.ebuild 758 BLAKE2B 3ce17f008758e93fe76e7856d42bb1c5c1ed711540f78cc8e328e1b10af5e35c1512c6fe89dcd65033d4d81fcea2fd2d766c9907a7a308e5b8c286141944cb90 SHA512 935255f9f66b2c82844f6fc0391d2f7f4f1a8b72543672383eb827ca53ffcc929d86156625a2a65fb924f8ef4cdbc66290f3313baecec958d8ccdb604fff9bb9
 EBUILD phat-0.4.1.ebuild 757 BLAKE2B 0de898f65a1be98c0a1d11d94290e2cbc3e0e3908047928ed8ee2ca05f986556aaa042e1c05e9c35bb93cb0a0692e61891bb6d051daf92a237b07bad6733099c SHA512 fdbfc61ee8fc81680eb9e813ed8a0651b9ea65ccf9173379d671cc1cfa0ceaba8c17b405f5ed2d0f38a08a99ee37f38235b82374e1dabf351d4a68ce4599633e
 MISC metadata.xml 335 BLAKE2B 1660913c7b57ba6458607889251f8459e48444ccf4c62786ab8525e12df434fd684c57663326a7bf028ba398582087777e981afecd54d104b765a990a8eb2f0d SHA512 699f64a5b2b97448646e5fb9562e653dd2996eb419bbedde43c2ba9fdb17a60c6b8b57883a18752a0838d06ca054f724a243dd10d3ea35f8da8db8774f01a587
diff --git a/media-libs/phat/phat-0.4.1-r1.ebuild b/media-libs/phat/phat-0.4.1-r1.ebuild
index 5c9cb0ec0574..c12ef911dd53 100644
--- a/media-libs/phat/phat-0.4.1-r1.ebuild
+++ b/media-libs/phat/phat-0.4.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/phat.berlios/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 IUSE="debug"
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 5fe06a384ec8..f88b0354f3dd 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -7,6 +7,7 @@ DIST xine-lib-1.2.8.tar.xz 5151580 BLAKE2B e0b62aa74545aa40737673e8fb4b6f493f65c
 DIST xine-lib-1.2.9.tar.xz 5180452 BLAKE2B 43d977d31bf2fcabd896c806e56d5cd12cf579951a4e0df5451df7323fb43cff2770fb2bf1b65b9041e761ec9e9e68d55f761e18522c787aa643f71bb73bd0b7 SHA512 bc672b32d6d72e6fa5641319e0bd15d721ea4b65e6d025e3cdbf6ba3655a7b2c714809d919a53fca8a908a7ce37541a341c13dd8a336799c2e942d5f86b84d3c
 EBUILD xine-lib-1.2.6-r2.ebuild 5726 BLAKE2B 47bc92135d960c6d94970e86c3e02b7e325feb5aa2ba73cf62c43d4a15b0b87c3fec03978f5345c043b12482383668e7b86c968298fb87d51ea8e31da8fe35b2 SHA512 5b92b1712da307acd84b3e0afa091cbb395e169d434b640cb3b44e4b02fae0d7c48e8296511124679e1e478a948b8a261933b27f8ce64d4f669bdc3ed445bd79
 EBUILD xine-lib-1.2.8.ebuild 5696 BLAKE2B 7560e459258e066d5df9bd939e559845e22f86a63213bababdd6f98febbd26c616c1659ac06dc79bcad3e10d670b539ec735170d257ffa96c57c6123d3164be2 SHA512 4e84e6312fb3df90291680cd338ef336dae7a7835c282c16fd792b33b4112782c8ea77dbca2f72ca42ee9aaa2f4f0940e50184d4e77be2b3e4ff5f33fe58df45
+EBUILD xine-lib-1.2.9-r1.ebuild 5501 BLAKE2B dcbff06850812fe03ceb4ca4eabc8e05821ae671d1e53e06418d531fbf46a8c8c5f5a4f8170a047409c86da3d063112aac64c107459645e35452c2c07bbf81cb SHA512 03c902b800fe65a2e0abdade525dfbe110a662499f38a97d8a4aa32b0e9a91ffb349da51334d8e6aa2f0fb3bf196efe5fde294cfab603e77ed6609df88a505da
 EBUILD xine-lib-1.2.9.ebuild 5565 BLAKE2B 6e5ca0d27be4dae22f23dbc822e849c2b24696ebfbc2dd788b1391470cea49c9ad5ee5ebc44b2c76c55c94e256e80cf1c95d8d91d630a933eb1b4ddee2bfbf05 SHA512 7cd31a34ec4cb49b0faf0c56a3b6e672b5d602f50a3d732ddcab8934808531599f49bce3ef599bb72fef30b2b4a7de735f43b53f996d3671590aafe1fffd4763
-EBUILD xine-lib-1.2.9999.ebuild 5449 BLAKE2B 03d41975b7a68c73c3331f5be5086042f514a55f28eb16b62117afdab1657909281af440b4ff9a87e950ef6cd7e0f9b9e0bc8b7e29acc0b1a3e44cf37e69cd15 SHA512 7996e99e79a9bd761ce4fe8e0694ab53e8f9c3ea394953489ee0f64906b374a6883d8487e9b0f3229e2f3e1dfd9c6a6663b574ae64475b75023e84c3e4fd993c
+EBUILD xine-lib-1.2.9999.ebuild 5385 BLAKE2B 5be07886ffa9a495a74ecb5c8ba77ac1fb833260a22b17423651ad84ab560111cf9959e67b4e8e5a349e8724cbc51de9bea444e62ac1303b6eced26eee742bbf SHA512 312298cf43fe939a7cdfa489677445dcd04b8be19c94d8ac35132f82c450ca679c3b4a3369ea32937a15c68f21d6de4e38f858b5fd015308fd4c3feed3a708c2
 MISC metadata.xml 2668 BLAKE2B 64956b27b10284478ae15509a1aa4a1408104c1e98263ac7e1ea376cbb8e596f532e049f4b3381c51f86d4cd4187784be6ad481177ffc62aef0964c90094d6b1 SHA512 17263da5cdc28752dc9344b9806665d236d8a5d3ccad7b19209912a3510b17c9d6587fd1aa847e509a3c4accd53cc96c7d1fc476f6adf9aa63c90b7eed45183b
diff --git a/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild b/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild
new file mode 100644
index 000000000000..1b7e31b6ffc2
--- /dev/null
+++ b/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic libtool multilib
+
+if [[ ${PV} == *9999* ]]; then
+	EHG_REPO_URI="http://hg.debian.org/hg/xine-lib/xine-lib-1.2"
+	inherit autotools mercurial
+	unset NLS_IUSE
+	NLS_DEPEND="sys-devel/gettext"
+	NLS_RDEPEND="virtual/libintl"
+else
+	KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+	SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
+	NLS_IUSE="nls"
+	NLS_DEPEND="nls? ( sys-devel/gettext )"
+	NLS_RDEPEND="nls? ( virtual/libintl )"
+fi
+
+DESCRIPTION="Core libraries for Xine movie player"
+HOMEPAGE="http://xine.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="1"
+IUSE="a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac fusionsound gtk imagemagick ipv6 jack jpeg libav libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X +xcb xinerama +xv xvmc ${NLS_IUSE}"
+
+RDEPEND="${NLS_RDEPEND}
+	dev-libs/libxdg-basedir
+	media-libs/libdvdnav
+	sys-libs/zlib
+	virtual/libiconv
+	a52? ( media-libs/a52dec )
+	aac? ( media-libs/faad2 )
+	aalib? ( media-libs/aalib )
+	alsa? ( media-libs/alsa-lib )
+	bluray? ( >=media-libs/libbluray-0.2.1:= )
+	css? ( >=media-libs/libdvdcss-1.2.10 )
+	dts? ( media-libs/libdca )
+	dxr3? ( media-libs/libfame )
+	flac? ( media-libs/flac )
+	fusionsound? ( >=dev-libs/DirectFB-1.7.1[fusionsound] )
+	gtk? ( x11-libs/gdk-pixbuf:2 )
+	imagemagick? ( virtual/imagemagick-tools )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
+	jpeg? ( virtual/jpeg:0 )
+	!libav? ( media-video/ffmpeg:0= )
+	libav? (
+		media-libs/libpostproc:0=
+		media-video/libav:0=
+		)
+	libcaca? ( media-libs/libcaca )
+	mad? ( media-libs/libmad )
+	mng? ( media-libs/libmng )
+	modplug? ( >=media-libs/libmodplug-0.8.8.1 )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+		)
+	pulseaudio? ( media-sound/pulseaudio )
+	samba? ( net-fs/samba )
+	sdl? ( media-libs/libsdl )
+	speex? (
+		media-libs/libogg
+		media-libs/speex
+		)
+	theora? (
+		media-libs/libogg
+		media-libs/libtheora
+		)
+	truetype? (
+		media-libs/fontconfig
+		media-libs/freetype:2
+		)
+	v4l? ( media-libs/libv4l )
+	vaapi? ( x11-libs/libva:0=[X,opengl] )
+	vcd? (
+		>=media-video/vcdimager-0.7.23
+		dev-libs/libcdio:0=[-minimal]
+		)
+	vdpau? ( x11-libs/libvdpau )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+		)
+	vpx? ( media-libs/libvpx:0= )
+	wavpack? ( media-sound/wavpack )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		)
+	xcb? ( x11-libs/libxcb )
+	xinerama? ( x11-libs/libXinerama )
+	xv? ( x11-libs/libXv )
+	xvmc? ( x11-libs/libXvMC )"
+DEPEND="${RDEPEND}
+	${NLS_DEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	>=sys-devel/libtool-2.2.6b
+	oss? ( virtual/os-headers )
+	v4l? ( virtual/os-headers )
+	X? (
+		x11-libs/libXt
+		x11-proto/xf86vidmodeproto
+		x11-proto/xproto
+		)
+	xv? ( x11-proto/videoproto )
+	xvmc? ( x11-proto/videoproto )
+	xinerama? ( x11-proto/xineramaproto )"
+REQUIRED_USE="vidix? ( || ( X fbcon ) )
+	xv? ( X )
+	xinerama? ( X )"
+
+src_prepare() {
+	default
+
+	if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
+		eapply "${FILESDIR}/${PN}-1.2.6-imagemagick7.patch"
+	fi
+
+	sed -i -e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|' src/vdr/input_vdr.c || die
+
+	if [[ "${PV}" = *9999* ]] ; then
+		eautoreconf
+	else
+		elibtoolize
+	fi
+
+	local x
+	for x in 0 1 2 3; do
+		sed -i -e "/^O${x}_CFLAGS=\"-O${x}\"/d" configure || die
+	done
+}
+
+src_configure() {
+	[[ ${CHOST} == i?86-* ]] && append-flags -fomit-frame-pointer #422519
+
+	local win32dir #197236
+	if has_multilib_profile; then
+		win32dir=/usr/$(ABI="x86" get_libdir)/win32
+	else
+		win32dir=/usr/$(get_libdir)/win32
+	fi
+
+	local myconf=(
+		--disable-directfb
+		--disable-gnomevfs
+		--disable-optimizations
+		--disable-real-codecs
+		--disable-v4l
+		--disable-w32dll
+		--with-external-dvdnav
+		--with-real-codecs-path=/usr/$(get_libdir)/codecs
+		--with-w32-path=${win32dir}
+		--with-xv-path=/usr/$(get_libdir)
+		--without-esound
+		$(use_enable a52 a52dec)
+		$(use_enable aac faad)
+		$(use_enable aalib)
+		$(use_enable altivec)
+		$(use_enable bluray)
+		$(use_enable dts)
+		$(use_enable dvb)
+		$(use_enable dxr3)
+		$(use_enable fbcon fb)
+		$(use_enable gtk gdkpixbuf)
+		$(use_enable ipv6)
+		$(use_enable jpeg libjpeg)
+		$(use_enable mad)
+		$(use_enable mmap)
+		$(use_enable mng)
+		$(use_enable modplug)
+		$(use_enable musepack)
+		$(use_enable opengl)
+		$(use_enable opengl glu)
+		$(use_enable oss)
+		$(use_enable samba)
+		$(use_enable v4l libv4l)
+		$(use_enable v4l v4l2)
+		$(use_enable vaapi)
+		$(use_enable vdpau)
+		$(use_enable vis)
+		$(use_enable vidix)
+		$(use_enable xinerama)
+		$(use_enable xvmc)
+		$(use_enable vcd)
+		$(use_enable vdr)
+		$(use_enable vpx)
+		$(use_with alsa)
+		$(use_with flac libflac)
+		$(use_with fusionsound)
+		$(use_with imagemagick)
+		$(use_with jack)
+		$(use_with libcaca caca)
+		$(use_with pulseaudio)
+		$(use_with sdl)
+		$(use_with speex)
+		$(use_with theora)
+		$(use_with truetype fontconfig)
+		$(use_with truetype freetype)
+		$(use_with vorbis)
+		$(use_with wavpack)
+		$(use_with X x)
+		$(use_with xcb)
+	)
+	[[ ${PV} == *9999* ]] || myconf+=( $(use_enable nls) )
+
+	if ! use libav && has_version '>=media-video/ffmpeg-2.2:0'; then
+		myconf+=( --enable-avformat ) #507474
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	# enable verbose building, bug #448140
+	emake V=1
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+	rm -f "${ED}"usr/share/doc/${PF}/COPYING
+}
diff --git a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
index 8e2f4aec7966..7938ae7f0b18 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://xine.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="1"
-IUSE="a52 aac aalib +alsa altivec bluray +css directfb dts dvb dxr3 fbcon flac fusionsound gtk imagemagick ipv6 jack jpeg libav libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X +xcb xinerama +xv xvmc ${NLS_IUSE}"
+IUSE="a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac fusionsound gtk imagemagick ipv6 jack jpeg libav libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X +xcb xinerama +xv xvmc ${NLS_IUSE}"
 
 RDEPEND="${NLS_RDEPEND}
 	dev-libs/libxdg-basedir
@@ -37,7 +37,6 @@ RDEPEND="${NLS_RDEPEND}
 	alsa? ( media-libs/alsa-lib )
 	bluray? ( >=media-libs/libbluray-0.2.1:= )
 	css? ( >=media-libs/libdvdcss-1.2.10 )
-	directfb? ( dev-libs/DirectFB )
 	dts? ( media-libs/libdca )
 	dxr3? ( media-libs/libfame )
 	flac? ( media-libs/flac )
@@ -76,7 +75,7 @@ RDEPEND="${NLS_RDEPEND}
 		media-libs/freetype:2
 		)
 	v4l? ( media-libs/libv4l )
-	vaapi? ( x11-libs/libva[X,opengl] )
+	vaapi? ( x11-libs/libva:0=[X,opengl] )
 	vcd? (
 		>=media-video/vcdimager-0.7.23
 		dev-libs/libcdio:0=[-minimal]
@@ -143,6 +142,7 @@ src_configure() {
 	fi
 
 	local myconf=(
+		--disable-directfb
 		--disable-gnomevfs
 		--disable-optimizations
 		--disable-real-codecs
@@ -158,7 +158,6 @@ src_configure() {
 		$(use_enable aalib)
 		$(use_enable altivec)
 		$(use_enable bluray)
-		$(use_enable directfb)
 		$(use_enable dts)
 		$(use_enable dvb)
 		$(use_enable dxr3)
@@ -218,9 +217,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-
-	rm -f \
-		"${ED%/}"usr/lib*/libxine*.la \
-		"${ED%/}"usr/share/doc/${PF}/COPYING
+	default
+	find "${D}" -name '*.la' -delete || die
+	rm -f "${ED}"usr/share/doc/${PF}/COPYING
 }