36 files changed, 790 insertions, 320 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index f73342440a78..d4d224e0869a 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/codec2/Manifest b/media-libs/codec2/Manifest
index b86308edb659..8fc20ec98c8e 100644
--- a/media-libs/codec2/Manifest
+++ b/media-libs/codec2/Manifest
@@ -1,3 +1,3 @@
 DIST codec2-0.7.tar.xz 8386048 BLAKE2B 04e2ab834539d6911300d30a7de00a0c351e29c53972482765cbefefe8d9e0f10b491496690e34beacce27f68da0c85bb6ad8bb75b93ce50e44eb13f1ad8070b SHA512 bf2f40071c21096d9504aacb293e7c293e1a51d732b91d870b5b35c372684cdb187fe4aafb6c27601c75167bd3783470e054d65b4be215facf67acee8afc56af
-EBUILD codec2-0.7.ebuild 474 BLAKE2B 0abeda3f676bc5d1c84730bd3ea2526d53ee06cddc5779af37bad82b46180ac3285ac16d28b1fa3cbccd5f8a5e8fc0a40dd5a53d735e433084c8b3b9c6e7a1b8 SHA512 7ab5d8d05107148d68651a86dab1fde4a7c3d54b3b2fa52f7d606912d4fa1e621ef34c52676ea02a510d77d3949e0bfaf9a950e3d9115c33ff4949684d21cd4d
+EBUILD codec2-0.7.ebuild 480 BLAKE2B 2a9ed188558b555878a7d6047c62395da83b2cdaa792741241ce8497c579bc23fefd90d2f6cefe11263a5dc715b028f48457150e02a7e3f44e8b0cbc4f12afd7 SHA512 774899165beb2c9392b75a9c9b5b4d264bf88140a3d72eb1cde26738514b2bb1ce851be6968856ba5b3c1a189653d8ff52a609407ceb7a43ae6f5b2aedc64198
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/codec2/codec2-0.7.ebuild b/media-libs/codec2/codec2-0.7.ebuild
index 4407a9fb832a..6f88a3f0f2da 100644
--- a/media-libs/codec2/codec2-0.7.ebuild
+++ b/media-libs/codec2/codec2-0.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://freedv.com/wp-content/uploads/sites/8/2017/10/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa"
+KEYWORDS="~amd64 ~hppa ~ia64"
 IUSE=""
 
 DEPEND=""
diff --git a/media-libs/coin/Manifest b/media-libs/coin/Manifest
index 9ac81b48f345..744b2657838e 100644
--- a/media-libs/coin/Manifest
+++ b/media-libs/coin/Manifest
@@ -4,6 +4,9 @@ AUX coin-3.1.3-gcc-4.7.patch 347 BLAKE2B 4129b651164fd35e18469143c0728e67456ecdc
 AUX coin-3.1.3-gcc-7.patch 575 BLAKE2B 5bdb1d8c2b6c63cba4224506199e26bb91d47feda853903a8461929e12ef32b13395cb78926ddac86bf25ca740ab67ac66f37a085e041272a8e520916c21b8da SHA512 c4ea88ce111dd7dba1d8b1dd30cf325e91d5617540c5cbcdbe2be95e892641015071dc61830307188cfc16ecbdf58e89129b93621e0dd43ae05f7ad754df7b53
 AUX coin-3.1.3-memhandler-initialization.patch 906 BLAKE2B 421dea48d77870d324fa333bac19c6e00ad7ca576929bf029bd9b0be193462adb23cbadaf71d96fd30025db3780408a294db2d9ae3a52232798b677dd8e62c46 SHA512 f67c7179b1a023a938a55d82cfb1c18ffabc7586211e8e89a4fb4f8a4925f9c98240fffaa9c8dc46febd528e0d0b91607a417f290c0e0c06adbafb171ba1bf6b
 AUX coin-3.1.3-pkgconfig-partial.patch 431 BLAKE2B af57c0a4ec1985351db67f8f8f1d978c9ec3765e5d0d6e304e479314be3cc5cd48212094f87d8126ce84143a671fc7e000081cd0b38d149633515f121ce5f16d SHA512 6747ed14dca25017b6126ee2e542bec8cdf36cc634a8f0df059715f022a5f6c6f7126b9ea3c01e099a5564c634921fdc829c7561754df8c2dbf915659c7edb53
+AUX coin-4.0.0a-gcc-7.patch 581 BLAKE2B 2ee051f14c8c4e264cc887f51e49d817c7b08be735dcc4c3be8574fb1f4b5db2b41ad46d22c7adfd2283986a0ff87948b9f03783bb80a2b423c8040872fa9933 SHA512 6ebfca69557c867218526cbe9937a37a6a4936448353410586b24f60efbc19000003c67cb04e1b9dfa5cfe950fde3e9c9aec1762292b5c26169c963682630480
 DIST Coin-3.1.3.tar.gz 5981534 BLAKE2B 33f88149cf0bf7daeb32226e2deb29f9f36f2a29ca9fcf025f39bb50d3eb0bfc85113a1e96cf980c97d037419c3a263bcf6eccaeb2f289517304c59d4c9de919 SHA512 d6fd47ecc74e96fc4de46e3a683f038f1907b96db2bbe935fb49f2d59190bd18f3f439dc0e4cb435360e74e1d65994a32b21f670d5a76394692616625cb14394
+DIST Coin3D-coin-8d1ca1a6ea23.tar.bz2 4925310 BLAKE2B 3c9aab5e68b79db4878e5d27773537acb7d658580a8deea059565dfa78ee791cb7ee23f159e077408c3307e2647e628357daaa4f2f5a4fc4a125c8d1663ee718 SHA512 f0c4d39a89b1dc3e183c2c8cffad6be30f9d27e50b3735c1b261addc55376aceb8f81c916fbdfeb42b852071692febaf6e3839373095bcf2b7046c773fcc809c
 EBUILD coin-3.1.3-r2.ebuild 2527 BLAKE2B 45061a6697b1bc6c7b5f7a38fd1a1310c609abad681b8cbcb496ec898d049e23e7658bc39eeb5b0e1db0142d5f6c968ef036bcb010fd60306498e918a9c372d1 SHA512 6b7754a385f0107c5cf5a755734bfb0f30d00589cf26434d2b237f147fd7cb79f868bbabbf36ae85bf4e181db61aeea83dab1d3f1232f056e70da55848246f5a
-MISC metadata.xml 411 BLAKE2B d6ca31e82e4637fa533835bf2eeaf7d0b1f8943f85655df00f238c10457fc8bb08a66088a56bf1aea171e2b89d8089b850a41c12398d1d66fa86f7bbd1e032c1 SHA512 f72e31a46ab6e7416016be928e63a9c2a8f7aa6d11f7cee64021113c84345b7f8975242cba579eb8294d9890aeadb246fba21f094fb7136b02a20d251964e847
+EBUILD coin-4.0.0a_pre20180416.ebuild 1948 BLAKE2B 96330bd2e6622866130ed549269cf0de9ec89991292448a33b4996a2929ce96716d57eaca8c31a0f3e1e8a6b3d8ade514362b3e23b5c5e7811e1476acf792c61 SHA512 0edf5ef311c9113ddf61d1337baeec5d21505285b453b90551214937bca2dfad363a612d998e88692b1fb446c35c1d4383df900134ced56cd749d0755439764c
+MISC metadata.xml 483 BLAKE2B 4b4e0a4e69a83b8cfa2be1298873b2ca28cde6dbc431a967c9c37839d17647c052cf8a465894451c23a75fea7be3cadd5954e3cff69de2b3f0bd5ef333251ba2 SHA512 e4419aa5e2ed7e0637f0c971b3b6d0937d4b7e0238b567ecef8bff4c8512ad88e6e04ca3f539f09b7c1f6fe6e2727b555b291e7ed5029776a7efef078bb88a1b
diff --git a/media-libs/coin/coin-4.0.0a_pre20180416.ebuild b/media-libs/coin/coin-4.0.0a_pre20180416.ebuild
new file mode 100644
index 000000000000..da490ba09d21
--- /dev/null
+++ b/media-libs/coin/coin-4.0.0a_pre20180416.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic
+
+MY_P=Coin3D-coin-8d1ca1a6ea23
+
+DESCRIPTION="A high-level 3D graphics toolkit, fully compatible with SGI Open Inventor 2.1"
+HOMEPAGE="https://bitbucket.org/Coin3D/coin/wiki/Home"
+SRC_URI="https://dev.gentoo.org/~reavertm/${MY_P}.tar.bz2"
+
+LICENSE="|| ( GPL-2 PEL )"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="debug doc javascript openal qthelp simage test threads"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-libs/expat
+	media-libs/fontconfig
+	media-libs/freetype:2
+	sys-libs/zlib
+	virtual/opengl
+	virtual/glu
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	javascript? ( dev-lang/spidermonkey:0 )
+	openal? ( media-libs/openal )
+	simage? ( media-libs/simage )
+"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto
+	doc? (
+		app-doc/doxygen
+		qthelp? ( dev-qt/qthelp:5 )
+	)
+"
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0.0a-gcc-7.patch
+)
+
+DOCS=(
+	AUTHORS FAQ FAQ.legal NEWS README RELNOTES THANKS docs/HACKING
+)
+
+src_configure() {
+	use debug && append-cppflags -DCOIN_DEBUG=1
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DCOIN_BUILD_DOCUMENTATION=$(usex doc)
+		-DCOIN_BUILD_SHARED_LIBS=ON
+		-DCOIN_BUILD_SINGLE_LIB=ON
+		-DCOIN_BUILD_TESTS=$(usex test)
+		-DCOIN_HAVE_JAVASCRIPT=$(usex javascript)
+		-DCOIN_MULTIPLE_VERSION=OFF
+		-DCOIN_QT_HELP=$(usex doc)
+		-DCOIN_THREADSAFE=$(usex threads)
+		-DCOIN_VERBOSE=$(usex debug)
+		-DHAVE_3DS_IMPORT_CAPABILITIES=ON
+		-DHAVE_DRAGGERS=ON
+		-DHAVE_MAN=OFF
+		-DHAVE_MANIPULATORS=ON
+		-DHAVE_NODEKITS=ON
+		-DHAVE_SOUND=$(usex openal)
+		-DHAVE_VRML97=ON
+		-DSIMAGE_RUNTIME_LINKING=OFF
+		-DUSE_EXTERNAL_EXPAT=ON
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	pushd "${BUILD_DIR}/testsuite" > /dev/null || die
+	./CoinTests || die "Tests failed."
+	popd > /dev/null || die
+}
diff --git a/media-libs/coin/files/coin-4.0.0a-gcc-7.patch b/media-libs/coin/files/coin-4.0.0a-gcc-7.patch
new file mode 100644
index 000000000000..89829b59b27d
--- /dev/null
+++ b/media-libs/coin/files/coin-4.0.0a-gcc-7.patch
@@ -0,0 +1,21 @@
+diff -ruN Coin3D-coin-8d1ca1a6ea23/src/3ds/SoStream.cpp my/src/3ds/SoStream.cpp
+--- Coin3D-coin-8d1ca1a6ea23/src/3ds/SoStream.cpp	2018-04-16 23:14:36.000000000 +0200
++++ my/src/3ds/SoStream.cpp	2018-05-06 06:56:42.104728484 +0200
+@@ -185,7 +185,7 @@
+   if (!gotNum) { setBadBit(); return FALSE; } \
+  \
+   char *ce; \
+-  *s = '\0'; \
++  *s = NULL; \
+   _convertType_ tempVal = _convertFunc_(buf, &ce, 0); \
+  \
+   if (ce != s) \
+@@ -282,7 +282,7 @@
+ gotAll: \
+   \
+   char *ce; \
+-  *s = '\0'; \
++  *s = NULL; \
+   double tempVal = _convertFunc_(buf, &ce); \
+  \
+   if (ce != s) \
diff --git a/media-libs/coin/metadata.xml b/media-libs/coin/metadata.xml
index b9eaa9f26554..aa4affdefe9d 100644
--- a/media-libs/coin/metadata.xml
+++ b/media-libs/coin/metadata.xml
@@ -5,6 +5,7 @@
     <email>reavertm@gentoo.org</email>
   </maintainer>
   <use>
+    <flag name="qthelp">Build API documentation in QtHelp format</flag>
     <flag name="simage">Texture loading via <pkg>media-libs/simage</pkg> library</flag>
   </use>
   <upstream>
diff --git a/media-libs/ftgl/Manifest b/media-libs/ftgl/Manifest
index f4f508a46868..f4367ad25205 100644
--- a/media-libs/ftgl/Manifest
+++ b/media-libs/ftgl/Manifest
@@ -1,5 +1,6 @@
-AUX ftgl-2.1.3_rc5-gentoo.patch 1687 BLAKE2B 08301939a5488dbda9801ced7780dc21bc11da8632b04cce24fd86feb00a071d00a2d225794137bb272e7cb15633cb9e2715906c67347c4ad4a6810455a4172f SHA512 0e4977bf23cf92680ef3b08fff33ee857ef3e91e76a0f2251cba1c44e6597fc16f3cc4d4e90d4aee1596348ebc85c5ffb8ea7f7eb162e4f15307f40fd0b71652
-AUX ftgl-2.1.3_rc5-underlink.patch 349 BLAKE2B 7b6dcd4175a08390a85366e2d8dbe31948c571bacc9ce9fb901c32a71329c997c53f961b51fd2e67577ee49597077abf60dfd8eee8d7001b07cc8917a1747fd1 SHA512 aa7a33577a7096e68b47d6e623f99511b54d277ed334e0a2aff6e69e3d915f575e943a556aa22c5f4fe5d884eb6b4425f2b0ecb0aea95f9a36799ad65c1b7399
+AUX ftgl-2.1.3_rc5-freetype_pkgconfig.patch 263 BLAKE2B 3febbbfce31110345ade9af130a6263312f5c48deb24f08db723422cb148b0d0d4a250b461604a7cc5e32270e3dc2050a2230487d2a92674386c8f636d7c0e1f SHA512 81d7ce2043e86bd451d07f97e8686fd90527994154410eb9519d18c77b97b9311c062332fe4f6e1acbb566810d961f87626f5a56ab7843ff4e2eb3d66f3be7d4
+AUX ftgl-2.1.3_rc5-gentoo.patch 1533 BLAKE2B af20eafea69c5936d7ed101ec1de46c35ab23a12bd4b408808cd8f6b0e354509e7772a7e911f457ad5e80f3baa136eef2181650c8c04d9abdc3efbecfb67efa5 SHA512 46a7657090849635473eaae94a84c3933054cf21d220b2bd5fb366c8fe67cc1c1ee0f60fdc573d951396d9baadb6a77af553490675fd68209533b6ab7f4ba5c6
+AUX ftgl-2.1.3_rc5-underlink.patch 277 BLAKE2B 31ee2c15c3b7a908b9430a200f98d4f01aa006c0ae7cd1fb609bb5f648848eb43926f14f504f883fd840949c108125c1221efb94604810aaa51f8183d09d846b SHA512 6690fa96a81613cdc5874bf29b6bff39eae00edc2d0e3ced2d199b0cfeacfebe4f0bd312d77ce096be89e91a0f031eca800ec705575f1b6f073f7a92a4da85fe
 DIST ftgl-2.1.3-rc5.tar.bz2 707854 BLAKE2B a2d91de57edfeb34dfa0bfc68808570ba698178e656c66b2bcff9df51e7cbe725d6a85ae51ef9910d2152481206419730ab634d1c87e1a1215ddce8cb90cf83f SHA512 9841bdbe7e299dd0ae3bcbef08dc3a8787a863389bf242aa023b1c2442f3ffc8a2c6768a35d093d27e3ad7197c8228a9b15e795a36824424f05bef66b68c89a4
-EBUILD ftgl-2.1.3_rc5.ebuild 1147 BLAKE2B 1eceae95b6c723e2e6ed81f5889e91f3edb12e14bc99417f4c366e4d6dd2068ca62f1cb74516ad77d49ff7cdc67c6b41949c97003027f5e6a4475ee7a720dea1 SHA512 9d0d05385c320296ee6ef9f369da873b770cc7dce96805b9f016531b6aae62b0a39dd3f909deda3f105e3a3d9bc8da2540fb1b3952339d32626e01096e241740
+EBUILD ftgl-2.1.3_rc5.ebuild 1250 BLAKE2B 6208b2113961830c37440d0e91b2c052ad954714d53376e4c71af8606c88252c5e8423e0b332dcf0e4e8f85cc8e54f0454c0c42ad30f9b59147ea36949d5f3e5 SHA512 b56923e3d3f4b856f9f0387e1290d2c8e95d72b2b2de718430d5760b384bef3099b918de021c16d8c2ec112d25f0cd1969404b5b08d535f88f707cb9b2e7b3a4
 MISC metadata.xml 327 BLAKE2B 84a08c3564faec441b2c375d60326a01d2a60ec1a5390b1e4a8a7e317e85d7da7bc181dba11b84a5d387e32231a73ec9308466fa914d5b90cdbe12e255ba931b SHA512 d5fb9210e27a2e5687f6a223885f6f5ea023c0da51e594c12fb3b07521f3fd882bcc19829d0ccbfaebcfe7e4e15df897c70eabb2fab0d29f8f4b45dbfe710d56
diff --git a/media-libs/ftgl/files/ftgl-2.1.3_rc5-freetype_pkgconfig.patch b/media-libs/ftgl/files/ftgl-2.1.3_rc5-freetype_pkgconfig.patch
new file mode 100644
index 000000000000..89cc4c00c413
--- /dev/null
+++ b/media-libs/ftgl/files/ftgl-2.1.3_rc5-freetype_pkgconfig.patch
@@ -0,0 +1,11 @@
+--- ftgl-2.1.3~rc5/configure.ac
++++ ftgl-2.1.3~rc5/configure.ac
+@@ -41,7 +41,7 @@
+ 
+ AC_PATH_X
+ 
+-AC_CHECK_FT2([9.0.3],[],
++PKG_CHECK_MODULES(FT2, freetype2 >= 9.0.3,,
+              [AC_MSG_ERROR([FreeType2 is required to compile this library])])
+ 
+ AC_PATH_XTRA
diff --git a/media-libs/ftgl/files/ftgl-2.1.3_rc5-gentoo.patch b/media-libs/ftgl/files/ftgl-2.1.3_rc5-gentoo.patch
index 945c8742c644..885051a01d46 100644
--- a/media-libs/ftgl/files/ftgl-2.1.3_rc5-gentoo.patch
+++ b/media-libs/ftgl/files/ftgl-2.1.3_rc5-gentoo.patch
@@ -1,5 +1,5 @@
---- configure.ac.old    2008-11-21 14:41:15.000000000 +0100
-+++ configure.ac        2008-11-21 14:44:19.000000000 +0100
+--- a/configure.ac
++++ b/configure.ac
 @@ -50,8 +50,7 @@
  FTGL_CHECK_GLUT
  FTGL_CHECK_FONT
@@ -31,8 +31,8 @@
  if test "x${LATEX}" != "xno"; then
    AC_MSG_CHECKING(for a4.sty and a4wide.sty)
    if "${KPSEWHICH}" a4.sty >/dev/null 2>&1; then
---- Makefile.am.old	2008-11-24 22:35:16.000000000 +0100
-+++ Makefile.am	2008-11-24 22:36:32.000000000 +0100
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -24,16 +24,6 @@
  	m4 \
  	$(NULL)
diff --git a/media-libs/ftgl/files/ftgl-2.1.3_rc5-underlink.patch b/media-libs/ftgl/files/ftgl-2.1.3_rc5-underlink.patch
index 30bfba04c7d4..ae152ff85718 100644
--- a/media-libs/ftgl/files/ftgl-2.1.3_rc5-underlink.patch
+++ b/media-libs/ftgl/files/ftgl-2.1.3_rc5-underlink.patch
@@ -1,5 +1,5 @@
---- demo/Makefile.am.old	2011-05-20 11:13:18.822445466 +0200
-+++ demo/Makefile.am	2011-05-20 11:13:28.271042994 +0200
+--- a/demo/Makefile.am
++++ b/demo/Makefile.am
 @@ -17,7 +17,7 @@
      $(NULL)
  c_demo_CFLAGS = $(FT2_CFLAGS) $(GL_CFLAGS)
diff --git a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild b/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
index 3e89417da633..068c13cabe6e 100644
--- a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
+++ b/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils flag-o-matic autotools
+EAPI=6
+inherit autotools flag-o-matic
 
-MY_PV=${PV/_/-}
-MY_PV2=${PV/_/\~}
-MY_P=${PN}-${MY_PV}
-MY_P2=${PN}-${MY_PV2}
+MY_PV="${PV/_/-}"
+MY_PV2="${PV/_/~}"
+MY_P="${PN}-${MY_PV}"
+MY_P2="${PN}-${MY_PV2}"
 
 DESCRIPTION="library to use arbitrary fonts in OpenGL applications"
 HOMEPAGE="http://ftgl.sourceforge.net/"
@@ -22,14 +22,19 @@ DEPEND=">=media-libs/freetype-2.0.9
 	virtual/opengl
 	virtual/glu
 	media-libs/freeglut"
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}
+	virtual/pkgconfig"
 
-S=${WORKDIR}/${MY_P2}
+S="${WORKDIR}/${MY_P2}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-underlink.patch
+	"${FILESDIR}"/${P}-freetype_pkgconfig.patch
+)
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-underlink.patch
+	default
 	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
 	eautoreconf
 }
@@ -40,8 +45,8 @@ src_configure() {
 }
 
 src_install() {
-	DOCS="AUTHORS BUGS ChangeLog NEWS README TODO docs/projects_using_ftgl.txt" \
-		default
-	rm -rf "${D}"/usr/share/doc/ftgl || die
-	prune_libtool_files
+	local DOCS=( AUTHORS BUGS ChangeLog NEWS README TODO docs/projects_using_ftgl.txt)
+	default
+	rm -r "${ED%/}"/usr/share/doc/ftgl || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index ea674c95d13b..4187dfe6c99b 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -4,6 +4,6 @@ DIST harfbuzz-1.7.5.tar.bz2 2350389 BLAKE2B 735fc36dda153e50bd83ae5e64a18d872506
 DIST harfbuzz-1.7.6.tar.bz2 2586909 BLAKE2B 0ae5902b9fe00a4f05a5dc407d698195920454efff79be10f1d85af5430d8bde7df071ba226b978c860d1dd8778a8259f330ab633a1aaa416a4451888fa9ae6a SHA512 259656574b1ec2916ada951b759a591f45c11c5c639fa29831e06320312bf951f4f5ef6306f9ffc373abf0d40dbf944db918d4c54aca3bd7eab2c3a886db7a68
 EBUILD harfbuzz-1.7.2.ebuild 3196 BLAKE2B 9e5fd81a09a5af0195bd40bfac953e3f974a7433c9dd7b7d21954ef043bf94e9aeb7d408021f3f7697eaf6a4d5bf65dd0f147a5978e6936e8d77cfa211d6b40a SHA512 52b2c7acee286bd2ad9e1e934408cc4b3d3b6f24b35e736cbe537da2ef0a41e755329ff76e2d5c9cdb9127a1a55730fcddd8fe01767240baa2d4179acf2f8495
 EBUILD harfbuzz-1.7.5.ebuild 3212 BLAKE2B f49d9fada1aaf936aeeef3448b1951243d8e6db46ccadf147f66fc20b5930c4ea1f3978c005ada123bd59777fe6c51e40269f78d49d634e3c3d512bba5a0aab9 SHA512 ef8a80e51fae481b7b1e94fcf51367a4ad844b153a6599fe629a506d56e12650a85f11c987b1f900c928571f01b3d4f155b8161f50a47a0d94ad983a764e721e
-EBUILD harfbuzz-1.7.6.ebuild 3257 BLAKE2B 8f89ac1fb5b39f4ef565ffb9a8bdcab522f3cf6ef1127315894219a7895e2d02d489ce5135a2095a19eb8f0764bab1f9a1765901c69ba4a613e78b0d62a10efd SHA512 09a96066e6b26cebea18b5ff13068a6f54b5eb0bbb9466b884a0f124783f4d59098be6e7ccb0b0e723dc92c8a6ad144a2196b6ca6870c4eee28a31706f62d2c4
+EBUILD harfbuzz-1.7.6.ebuild 3256 BLAKE2B 5d6f02d2a1f71afb3c11f3f960ff3eca47612acce6d14aa1b5fd186aa214189b1a3dfe141c0c57b417c8e94e3444e3b5c435135468a9039b0fa391a1fd2db9c9 SHA512 d15c6ee3830c7af8089ca60d406e654e6093d1ef4685ccac2f09ece2057c4d6e2ae52c2c399074882807e136a98a320a95ff7ecb8dabc37b1158d8aeea697dc1
 EBUILD harfbuzz-9999.ebuild 3212 BLAKE2B f49d9fada1aaf936aeeef3448b1951243d8e6db46ccadf147f66fc20b5930c4ea1f3978c005ada123bd59777fe6c51e40269f78d49d634e3c3d512bba5a0aab9 SHA512 ef8a80e51fae481b7b1e94fcf51367a4ad844b153a6599fe629a506d56e12650a85f11c987b1f900c928571f01b3d4f155b8161f50a47a0d94ad983a764e721e
 MISC metadata.xml 645 BLAKE2B aadcef9412392874d361b5c09e7450bf88db64fa704558553861cf16ffd1a5b5715291fefc0624e3ad0d86a537cdbd2b810fa093b289428e68a19c82049188ef SHA512 645e451768a5dba2e16d18b51ece20fa28172450bf22e29fe73ed29748f712187f997ce2f6f0a24c725f0cb10434b4a65c6de9a5fd1aa7d820e00b7dca8b8b63
diff --git a/media-libs/harfbuzz/harfbuzz-1.7.6.ebuild b/media-libs/harfbuzz/harfbuzz-1.7.6.ebuild
index 601d4943b1f2..f1ea60374084 100644
--- a/media-libs/harfbuzz/harfbuzz-1.7.6.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-1.7.6.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 145ea0711462..114d5553e48e 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,5 +1,5 @@
 DIST libgphoto2-2.5.14.tar.bz2 6992238 BLAKE2B 6173ada55f032ae2b630db5324c87ad9bebb3fda485fe9bc89a042d192a136a73596a92b1df3c762ffd7168cf91ca12f1fa2998e154152eb19cfd9b780ee2b2d SHA512 6dd75700e2b2afdf87f7eab4c62fbbe2c42f9154d644edfae25e3d5fbe5ed0894be832cc1367933fc6c113a1cc379d1956fecf108d6ee240935b9d7e2f614688
 DIST libgphoto2-2.5.16.tar.bz2 7006551 BLAKE2B 79082e691d4d9061cc35c35cabd7d0d16407764df43f8abbc7ff80f7a2b734da78a2a74a17ec2e014d9050c75235c700f3de90b61ca9fb0d68fdcc7dde64269e SHA512 7863192c2959ffc8d771eca294adc54090192e3207cf8d3a9bf143e50034c3f1248e7fe41cad75f758ab2ad09c9258d50967b921adf3223d7c74370faa110a9e
 EBUILD libgphoto2-2.5.14.ebuild 6273 BLAKE2B 50694401872006701c09767b28b49e8b8aec364ee4a7256e689fc8fbd48fa7190a5a142cddcc1ea602db407a0bf9ee3b4bf098420aeb5bddd410f8bf73d7b16a SHA512 d198382821c1c7e8a59f27de930a901991a645837d038e57d47c9037a2bede022cde0123ae3a18362a0f0c69dcd52fc0098bf0fc8025165f64bf1ba58372086e
-EBUILD libgphoto2-2.5.16.ebuild 6278 BLAKE2B 78564d53ac65bab263f037f9e16fb9971f7583ce64d5102eb33b37c787365e69f3f56ece2e6b2d688af302aa1ef110bfcd1019a13c491ee2959d1200f59b798c SHA512 b792bfd919bf5c62b8a27595d137ed5f6b42eaf47a0b7449b7fb885e2f496fa6890ab32ac68d3a050e45bc661f7fdba366b462de3d6775d2e38d7fe50e8e0e12
+EBUILD libgphoto2-2.5.16.ebuild 6277 BLAKE2B 7e07889ce011521a67f9b4f471f332bbae977730d2031baed755451069c696bd330129e656db9e833aa4e2fa3045252bf90d3479cd0018256956de0e16d5ca36 SHA512 ca6080a550faf2c242dc2b2704600ebd71a10fc7e0c2d0f2659c5f96f196cccd503ea012bd696e01dae6cceb77dcd74fbc65a4385457e74f7d93256d34f4c2ce
 MISC metadata.xml 520 BLAKE2B 113ca8821b8ba1d594d64f86facadebf238372742380ce99c6f3172712873d1ebb3d0bf32eb072d7af1771f6099f5bde84114d6e45468a0d33503fbbe393a19b SHA512 905b25e683f85a23323e1205c0492e3b955e11f9d93a9c9c360108ecdd3608fa2f9f4c2572444c0a4be0df3f5e350dd13ca4ebb5ca523c0fd70fed3f40e39ed0
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild
index 99c6997bcae3..a7933e4c4b60 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 # FIXME: should we also bump for libgphoto2_port.so soname version?
 SLOT="0/6" # libgphoto2.so soname version
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc examples exif gd jpeg nls serial"
 
 # By default, drivers for all supported cameras will be compiled.
diff --git a/media-libs/libmp3splt/Manifest b/media-libs/libmp3splt/Manifest
index 760e8f9be107..57dace467916 100644
--- a/media-libs/libmp3splt/Manifest
+++ b/media-libs/libmp3splt/Manifest
@@ -1,12 +1,8 @@
+AUX CVE-2017-15185.patch 1132 BLAKE2B ae218573443dc724c4136cd5602c14965a146479212c769929e1a60be2f2056b2703351adb8dcee92851666557db71d8303347921343d94a4db96848da827086 SHA512 5336c71917c34b84c882b2afd01d31141db816c1a6293ab1cbc87138b4d7a8288d4ebea8fc7cf882d907c0c07f5b827d9293dda082d6c8ecf3aafd002e540951
 AUX libmp3splt-0.7-libltdl.patch 672 BLAKE2B adca950fbde7d41e6c657711964b8db2ce0b607750aa1227eeb1f620c3cc47306ea1f5c064a297e563bc9ef83e99e2d5a658b6292b301ff4d3d12fb3906a7d32 SHA512 8707dcf0a23f6466c0f8d0bfcce8ecfd8840ffec09f3c7a66f039be5f707b0b561d5462ad9b170e2bca9dc4872a61114a8d515f702b9e7e79af2deddbce6385f
-DIST libmp3splt-0.7.3.tar.gz 650741 BLAKE2B 8e2486bb66549e08bb334c52a677503b6db1f5f5e8049ffc2120eb1e9f05e3e32c6e61a12a871b3f07aad03067c1bb510cedaf1c9f4cfd31ba2f644c72a26bf4 SHA512 4ad158e47ce03626bf6493575a9adff51c709d5a7827c96cc18a56303cf709e7076081d0c3d2cfc8d22173bfd40e3ea7b750ade44a155f690e2ce0d394a2ebc7
-DIST libmp3splt-0.9.0.tar.gz 686054 BLAKE2B 739723f7fd0886e7a582b59bd9bf4bf2ec286a65d5154a6d7a74ce517909e4c87287bce88d3881fb222937593feb7d9bc479b6f0a64cfa9dd19b2fcc75ee84ec SHA512 63624c9982fc2ab88e62fa29f16c5777f7689d19c3eecaceda83e7679cac9a64081e8ad2555403fe3bd0be0af2f7dedc02307254f5923b3f2856accc0f3e585a
-DIST libmp3splt-0.9.1.tar.gz 703040 BLAKE2B 7f7541a076940275fc03391fe33e601008d60b7c83c970db9893c4f4d0b4b68f170efdc7fadc41dcc64a8e3858b5668aff21abc3870a33b89b308c825b3dda93 SHA512 a95f5a5e622baca6ea87e7c8d2c2da3bda8b9c91761506392efea848e433045b8a304b774d12fef5a93c7c75d64c65b5df45a37d936bbbc91c1ddb2f8ac1d670
 DIST libmp3splt-0.9.1a.tar.gz 702948 BLAKE2B 96661e2fdc96d1ce4555bfc9b84f44bb1ecf9bd05f6b6038274a3097a657707bb6c6ef8b2b6ecf673c390f52a1885a6c91b555c1971d490df7089523d0739329 SHA512 07229c048c4f999c7c723ab2f7bb06807d264609c8c1e38f8ff40f11e54285212de71548bbd66ba3100287d563673d80a8704bd384d7ffcd2145a098faabd389
 DIST libmp3splt-0.9.2.tar.gz 707598 BLAKE2B 4e8223472a7cd05d71d7df81a88b7d545a726a45d62dc6284d694e8cf8ad9406b037e274dbe28f2cf95febc87d8ba30aa15291f58df95b83a3aa0b5d3469ffea SHA512 e5c98e8b173bc86302ccee4ca5eb0c8a8d93f225357eb7b14dea8d0700ed62ed6316506c182f6b295130f7924ff0b38e865d5e49fa9cd7882c648360d68872ed
-EBUILD libmp3splt-0.7.3.ebuild 1112 BLAKE2B 36795da97561dab79b29deb1e1cfa31c40dcc0f71746d4337a0e35772132a80c1a3a1d506fcb0c398c33199d38a380bf3922111ebe8ceeab93d4985fd5c7ce2d SHA512 284e1968313d828b029d4c931a69b9322204cdef795ee35f051a0842f030815e5e7ce91749132994cf710f9fd91cd16a5fea31b4eb689e02cc8d0edd005a71e9
-EBUILD libmp3splt-0.9.0.ebuild 1244 BLAKE2B 79ad93da476e5948a969000fdb2a8369c331bf5c137cefa5e0bebfb86001a4d336cf8b5ede133d4bbbbe9f1889b8267c0c1e51e7965e712f13224275bde0809d SHA512 b0459823431d950bef6af67d222d201f4efe435be2b6bbb43f4dfd51f8307ea9dd9ca217abf4231edd82719ebc57a12da61f311f293f31dbfcc9f2dcbb137eb9
-EBUILD libmp3splt-0.9.1.ebuild 1247 BLAKE2B 6d5d24c1a67f1cb12c82e3f29a2b43b7e2adf1aee331be92f153c08023a7b8cc45582c6d68319af3094ae83fcbfe0feae0a6fca577907da8f7034cac2dc177ad SHA512 1a4b39bfdd3c2d41ae7d908212325a7eb4e587f0189fe470134d7556a49d1b6ffc2a635cd1db656fbdaa9ce30df1c88d450c34d234ce9b2cba486d7d04d217b1
 EBUILD libmp3splt-0.9.1a.ebuild 1244 BLAKE2B 1809d4d5b3da03405fa6080259ddd79967f51ec40c9975f0a22a785f26aec47eeebd34005a592164c43f9d1798320af7813828e6a2fdd76ba02ae606abf0dfd9 SHA512 39cd447f9f20810b14b4864df837d58952ffc52d6947cb0ba672e1b4bed87da12eba7391a19cab3fcda5336b9de36d565da917a1f99f140d455a72eb3a96e285
+EBUILD libmp3splt-0.9.2-r1.ebuild 1292 BLAKE2B 6df436b2a0055f13684ad26b1b6c223fa551b7e90a62c3521e7d59c26c633226aaf5054fbd0cbd84b498a776186258754c09adf110adecba42ac8d756fdc23d6 SHA512 ef3f7a6f2ffa877d439819577f3edd84f11d0ee7cf2677a129d15eff173614d070c4ee160b5d2d74191b04716e9d4237e6f14d09794ce340ecde749d0a9f74d2
 EBUILD libmp3splt-0.9.2.ebuild 1245 BLAKE2B 23dda3aa0055c03908bc81994f2e7e819be9e79066b939d4fc23bf3f0cc55ce66b85d7bd3194a9405ea3e43c8829285f94319c149568aba6febbb6f8afe9980a SHA512 899074eb64a40a328a0ec8afa7784ae362cf13d76167d6427417f0c99a4aad3068134ce7ae866c55e6a855c83bb0507f8afd0b407b9479197f16dc47dcfe9005
 MISC metadata.xml 330 BLAKE2B f237f66bdf5752ca2864a72cd27918776b88b73d113a2aff324dbbe53956973421724b3babd3e25892d0894184bf842dbe3cb48cd3514285e500110c7d7bb1ac SHA512 46486e0840a5f4891a1d611ba22e1e540d0e16d3cf61ef362e1085d188a75b5297e6ac2abf8c3af40eeabf246c076958dc2fc8b9cce5f5bdd248b282491afc38
diff --git a/media-libs/libmp3splt/files/CVE-2017-15185.patch b/media-libs/libmp3splt/files/CVE-2017-15185.patch
new file mode 100644
index 000000000000..b31a92d0c452
--- /dev/null
+++ b/media-libs/libmp3splt/files/CVE-2017-15185.patch
@@ -0,0 +1,41 @@
+diff --git a/libmp3splt/plugins/ogg.c b/libmp3splt/plugins/ogg.c
+index 50cc495..57745f1 100644
+--- a/libmp3splt/plugins/ogg.c
++++ b/libmp3splt/plugins/ogg.c
+@@ -212,26 +212,36 @@ static splt_ogg_state *splt_ogg_v_new(int *error)
+     goto error;
+   }
+   memset(oggstate, 0, sizeof(splt_ogg_state));
++
+   if ((oggstate->sync_in = malloc(sizeof(ogg_sync_state)))==NULL)
+   {
+     goto error;
+   }
++  memset(oggstate->sync_in, 0, sizeof(ogg_sync_state));
++
+   if ((oggstate->stream_in = malloc(sizeof(ogg_stream_state)))==NULL)
+   {
+     goto error;
+   }
++  memset(oggstate->stream_in, 0, sizeof(ogg_stream_state));
++
+   if ((oggstate->vd = malloc(sizeof(vorbis_dsp_state)))==NULL)
+   {
+     goto error;
+   }
++  memset(oggstate->vd, 0, sizeof(vorbis_dsp_state));
++
+   if ((oggstate->vi = malloc(sizeof(vorbis_info)))==NULL)
+   {
+     goto error;
+   }
++  memset(oggstate->vi, 0, sizeof(vorbis_info));
++
+   if ((oggstate->vb = malloc(sizeof(vorbis_block)))==NULL)
+   {
+     goto error;
+   }
++  memset(oggstate->vb, 0, sizeof(vorbis_block));
+ 
+   if ((oggstate->headers = malloc(sizeof(splt_v_packet) * TOTAL_HEADER_PACKETS))==NULL)
+   {
diff --git a/media-libs/libmp3splt/libmp3splt-0.7.3.ebuild b/media-libs/libmp3splt/libmp3splt-0.7.3.ebuild
deleted file mode 100644
index 67392dfcdb12..000000000000
--- a/media-libs/libmp3splt/libmp3splt-0.7.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit versionator autotools eutils multilib
-
-DESCRIPTION="a library for mp3splt to split mp3 and ogg files without decoding"
-HOMEPAGE="http://mp3splt.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN:3}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
-IUSE="doc pcre"
-
-RDEPEND="media-libs/libmad
-	media-libs/libvorbis
-	media-libs/libogg
-	media-libs/libid3tag
-	pcre? ( dev-libs/libpcre )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen media-gfx/graphviz )
-	sys-apps/findutils"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.7-libltdl.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-static \
-		$(use_enable pcre) \
-		$(use_enable doc doxygen_doc) \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-cutter  # TODO package cutter <http://cutter.sourceforge.net/>
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog LIMITS NEWS README TODO || die
-	find "${D}"/usr -name '*.la' -delete
-}
diff --git a/media-libs/libmp3splt/libmp3splt-0.9.1.ebuild b/media-libs/libmp3splt/libmp3splt-0.9.1.ebuild
deleted file mode 100644
index a87df6ca43f5..000000000000
--- a/media-libs/libmp3splt/libmp3splt-0.9.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit versionator autotools eutils multilib
-
-DESCRIPTION="a library for mp3splt to split mp3 and ogg files without decoding"
-HOMEPAGE="http://mp3splt.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN:3}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
-IUSE="doc flac pcre"
-
-RDEPEND="media-libs/libmad
-	media-libs/libvorbis
-	media-libs/libogg
-	media-libs/libid3tag
-	flac? ( >=media-libs/flac-1.2.1 )
-	pcre? ( dev-libs/libpcre )"
-DEPEND="${RDEPEND}
-	doc? ( >=app-doc/doxygen-1.8.3.1 media-gfx/graphviz )
-	sys-apps/findutils"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.7-libltdl.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-static \
-		$(use_enable pcre) \
-		$(use_enable flac) \
-		$(use_enable doc doxygen_doc) \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-optimise \
-		--disable-cutter  # TODO package cutter <http://cutter.sourceforge.net/>
-}
-
-src_install() {
-	default
-	use	doc && docompress -x /usr/share/doc/${PF}/doxygen/${PN}_ico.svg
-
-	dodoc AUTHORS ChangeLog LIMITS NEWS README TODO
-
-	find "${D}"/usr -name '*.la' -delete
-}
diff --git a/media-libs/libmp3splt/libmp3splt-0.9.0.ebuild b/media-libs/libmp3splt/libmp3splt-0.9.2-r1.ebuild
index 4bcca579b4a0..0427694ed0bc 100644
--- a/media-libs/libmp3splt/libmp3splt-0.9.0.ebuild
+++ b/media-libs/libmp3splt/libmp3splt-0.9.2-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=5
+
 inherit versionator autotools eutils multilib
 
 DESCRIPTION="a library for mp3splt to split mp3 and ogg files without decoding"
@@ -10,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN:3}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc flac pcre"
 
 RDEPEND="media-libs/libmad
@@ -25,6 +26,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.7-libltdl.patch
+	epatch "${FILESDIR}"/CVE-2017-15185.patch
 	eautoreconf
 }
 
diff --git a/media-libs/lilv/Manifest b/media-libs/lilv/Manifest
index 541e129cee5d..46ed8f38ca21 100644
--- a/media-libs/lilv/Manifest
+++ b/media-libs/lilv/Manifest
@@ -4,6 +4,6 @@ DIST lilv-0.24.0.tar.bz2 244079 BLAKE2B d94b830b7439d55c2a44d9c20b1ea7938f3fe75b
 DIST lilv-0.24.2.tar.bz2 244764 BLAKE2B e049354c2ec52116bbc0c588829c8e7d6c780a8325bb050d225e4893a4ca7b3c98b8bddd01dbfa0e67616bb6baadf2483087891d4242ccd4156aa8a8749484ef SHA512 b5d04b6bb1fb4d3a9a58d93b233db502dc2ded75672766a31d252abca657cbf2d170fa590c0c56159b2bac68c7af95d8787a512e318e3a0f30855504bb034659
 EBUILD lilv-0.20.0.ebuild 1202 BLAKE2B 73f7f0d02206706482f197c4ae9e55f0b6ad6019d5f9e6926c1f66b18d308cfa324d25683b7eea179a9ef8dc6da279884b817033d1574dbe3765442e51e5cb46 SHA512 b9c60ff6903eb6cbadb2eccff179790294102eb1744cc964c985c1dcd6edb5a9eb9b1015997052d114fc6f5a84324aa4bcf43d2fb8c5fd2aec104d70240b78ab
 EBUILD lilv-0.24.0.ebuild 1213 BLAKE2B 26052c38835583e6d91e25cc1a08d90ad579d6310fa31e63dd5feb870ec2e5f0a58db9a2c68536915ad639ac75106c019fc1de484745c2fc5eb6fcb9832db517 SHA512 38d0463ed4841f97a6ec291507a84b97e698c404d985c275ddbe5bd41446d5cb76f8821b753fdead34063121a945a452b705b86262e8501735b65f7b2bcf189b
-EBUILD lilv-0.24.2-r2.ebuild 1487 BLAKE2B 42587b49f0073bd10c880150203fe5772cbacc5e3a4d29f21556620f297be4068c77cbea52e62dfcbf8eb160916904b743324732ebb4965d1f80e28ecd86c694 SHA512 760a5f58d6467ba113a16a065f7d5d1e65cfd5331475583a53d0079e0a5580edfc4559bb3f7ac1f7f1c0d772fc41a8c4e16b5af6ffe13803372216e96652344a
+EBUILD lilv-0.24.2-r2.ebuild 1493 BLAKE2B 52609e60b2e35890db989c588f0d8e574e8ea9a74b2d27dcd3bdb643ccb70b485709011c305f8c191b1daf959a88f302b0957fbc122a2a1d67f0f8eaa1226a05 SHA512 779482cfd4b4fbd53d19c4f2590908b12a0938d11757e41b876fca9a39d26971eea33d9c4f893e89198e8b1ef48f89dcca77f3e0afec08bd9d3865879ec4d3c4
 EBUILD lilv-0.24.2.ebuild 1219 BLAKE2B fc2801c4b2a283c016db5f2f9fe1e3174b7fac13f8fe7a109db2fef5a5c40a4e5bf18a9476ddd6bbac4e36a291bf49ec75ecefd1d08a2d2b4d84e33a297c8909 SHA512 fcdd8470935eccdb8c09025f33ddc94b7c16ec3369debeef51a78b654f82264fc73259aafda25f74ccebcda1b36a0d19ec65d700e83628396c658545e3eda36a
 MISC metadata.xml 626 BLAKE2B 07ffc634a72982335c60d71732dca314e28b08ed40fe892f33514f0d13ac9e141fcb6a1d0507b6f35f4d6db963865ed87acb70aa8f2c1d20ff72eb4e62006841 SHA512 e2cd8e2459104889e6cc759146f86874a78784c07b966de2f6a18302098a028e7176270565922a44a72ada23eabbf5de919271296374d9547262684611ee74ce
diff --git a/media-libs/lilv/lilv-0.24.2-r2.ebuild b/media-libs/lilv/lilv-0.24.2-r2.ebuild
index d80d24b8910a..0ab15c8f3c01 100644
--- a/media-libs/lilv/lilv-0.24.2-r2.ebuild
+++ b/media-libs/lilv/lilv-0.24.2-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ~ia64 ~ppc ~x86"
 IUSE="doc +dyn-manifest static-libs test"
 
 RDEPEND=">=media-libs/lv2-1.14.0-r1[${MULTILIB_USEDEP}]
diff --git a/media-libs/lv2/Manifest b/media-libs/lv2/Manifest
index ae7c2cfdce36..bd79268b6965 100644
--- a/media-libs/lv2/Manifest
+++ b/media-libs/lv2/Manifest
@@ -3,6 +3,6 @@ DIST lv2-1.12.0.tar.bz2 399666 BLAKE2B 6a28f9b2971c6f3077859fdcd097ebada445a607b
 DIST lv2-1.14.0.tar.bz2 386438 BLAKE2B e09e6c2b1bbf24d5896e7803b970fd8877a5b6a9ded0fcf294561c365d5f0b2e89503c0306b02dd956f7ac6ebd9df4ca0c0a17564ef3851443d81847dd41b261 SHA512 6991d848ed9f04a48ca3070efc15af83431f680aa8a8559a02b1666f7b8d43af8e089f78c3b14ad3345dac32fd1c8ad0faf3a3f56dddc07c6f0e0aeef4077498
 EBUILD lv2-1.10.0-r1.ebuild 1120 BLAKE2B 4c9532968beee4c3270d19f24db3f100c802cbe261eaf14f05993bf49938f77117ef17c3dce0b67d1db14181065d01365e7d98bb784a5b51533f5c5e211976ab SHA512 4d04d9df9efcb29f34e8520c1a867b4fa06bc9c6267d4a7cc28992715ace8479a7286d73094bd90f7a1c9935eddcfa0cbaef579366545c3927af3f56712daf3d
 EBUILD lv2-1.12.0.ebuild 1175 BLAKE2B da6c306225a16b2af78d48f573d8c171461319932e4f1c5be25eee8b0728ceaa77d728296d333c6f0e1c7394c8fce42aedf0b1e597235edb9e59bbbbb8bbc784 SHA512 cd2cb389d835e1d39aab47dcdc59aad96c4d2b8b2bc2a4bcf3c5da4c576491916297da469bac9eb6bfe09b7badb90b06be1cae5e2566d037386a9243a3da96b9
-EBUILD lv2-1.14.0-r1.ebuild 1308 BLAKE2B 06e349ccd84264e6e73a257035edcb90354b6bc680ac3aad0ecf518080348b31fc35954bb8eda0d8c09c6f949089b7a71bd54a6309b0b2df4c86818f66071768 SHA512 a664feeb92caf2174e9c4fd33524470efe458a12f2667d5aee409d27f324306cc819236538857cd68d4dac0847d92cdf0320ad41a55103da5d9d0053f8833505
+EBUILD lv2-1.14.0-r1.ebuild 1314 BLAKE2B 3d707b2ce5ad28268bb1ba5aab1dd70bba2176377a035ac7e1e784f0dd8d4c696e6befd6f77998fe60d3a5a02ebe9799b1afe12244fe60706d46350dea424357 SHA512 3671a18cfbdeadb464daf1aeb76087655cf8c8d248a260f38ef58bb28fb326b52f25854b1e6acce3c48dcec48cdf312650cfe56271a492a9c2cec96519203c31
 EBUILD lv2-1.14.0.ebuild 1179 BLAKE2B d4a01a7b3aad05b401b547096298085c0831ead8f96a60aabcf92d9b7e2493fed0cb9e5ff53a8e01ad86e4fbdbbeaf170d2a836983543c663ca706193c04f4fb SHA512 608021ed6ed19750b78b5a4c2fc5727c280dc6918254411dd6aff165c346ad11c7527c85cc2a85f4220b46457a390e59fa7d2d39a642b5dc167a8f950ac73664
 MISC metadata.xml 340 BLAKE2B e8469f758a451316b9d89c286f2d47c82b62d57ff9d43a6f2f93da8cf0abb5579fa8e568d8e6422e5d144a368310ccdec6e89ce2672f53b9db149bbf838afa68 SHA512 a31345dfd0bb1ac92461cd26ffcd20197775288be0ee4a2d660e90b8655f5288166c9613ba42ef3eef6dff6c97d268ffc85af3429eb093ffb29ad9581a5fa33d
diff --git a/media-libs/lv2/lv2-1.14.0-r1.ebuild b/media-libs/lv2/lv2-1.14.0-r1.ebuild
index 617f2a434fa4..f0ff612f42a2 100644
--- a/media-libs/lv2/lv2-1.14.0-r1.ebuild
+++ b/media-libs/lv2/lv2-1.14.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://lv2plug.in/spec/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~mips ppc ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ~ia64 ~mips ppc ppc64 ~x86"
 IUSE="doc plugins"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/media-libs/mediastreamer/Manifest b/media-libs/mediastreamer/Manifest
index 84ea52a09a5a..f7db14382fa2 100644
--- a/media-libs/mediastreamer/Manifest
+++ b/media-libs/mediastreamer/Manifest
@@ -11,6 +11,5 @@ AUX mediastreamer-2.9.0-xxd.patch 642 BLAKE2B eba083c86b405da0aa7a96b192e70e87a4
 DIST mediastreamer-2.8.2.tar.gz 882966 BLAKE2B f025bbfdf8e5940fd7e185df687f4d53c4416afea0e0c237ed63bd289cea0a34643945f625881d90564f025e311ecae317114e44ffe81484ecbb2edc653cf8f4 SHA512 2041d9fbba0f831aea6bdd3259b21742a37cfdbdf473b0bc4f20bd730371395ddf2866804ae496e9864adf5fcd0d24e03193d5d8feadd54e6ff0b3adda01ff60
 DIST mediastreamer-2.9.0.tar.gz 3578877 BLAKE2B 14db241196f5d98cd7fc06ebe9e59317d47248a6c0ba103c4382ad5a2e48ebf87293f344320215380a0b9ddf76c7d4986db2c27cf114734d883505424c21a6a7 SHA512 8c31ab07c659dce84c410dfb5814b6cdf3defcd4055814922f58e2886bfeecfd5bab294c408858a29e72fcf53f35a1f7748113e1f2863baa329daedae07ef2f0
 EBUILD mediastreamer-2.8.2.ebuild 3824 BLAKE2B ad844e6ca0b7d3c7432fd8a6110487c84b5d67d15c387953deb35cfcc9123320281e04f9f337a0a62602635beff62aeb28b593dab8a10a96538d3e53ae6b6ee1 SHA512 9336b58a8b0ef34d58ee9f3d37cb40911e25a5c1979bbf9507370f3d9018de5c13833d8cfbaeb3482810bf1c9d366a0541ea576c345af5837fc4e4ca9d0579c1
-EBUILD mediastreamer-2.9.0-r1.ebuild 4584 BLAKE2B 0e76a1c5b90f4e4991073eed84ae37e2b50510ed156e705c773622225286b7f600d7c60df795dcce57e533f0574c05756fd18df9cb20b7854cc2feae2253507a SHA512 2b05c989175bb8fccf7d5bccce914ddfeec8c5ef28e76d34bbcdf811aa19b0343ead4b41fbcd5aa3fd0aa8cba9921d7d1ecabf253842108b45b01c69b162ade9
 EBUILD mediastreamer-2.9.0-r2.ebuild 4632 BLAKE2B a3e4859766821fe9936ad23368ec9ab1250fc0db207a358d2b5eb2357894a2e05e9f9bb2152ed1fd45933a7cc2e5ae70438faa14ceac28022008c4642c14588e SHA512 6c57cdb71150764b6106777414c0319d2735536010dacec88800331dbbc14c0359e4fc015967c05bad35cf1a05bcc9954cc588726bcb4336768d6ae73be76821
 MISC metadata.xml 934 BLAKE2B 2e1402da227d8892f2a2e739510ab4b81e2588bb057479976ddfe917a08d4248a3d7c4c286b4a5367b703557b799df57049a42baa46bd6c5fe1058a9466941fe SHA512 8cf01a51dd7bafcbd4ca39c49deacd38104d9640ed26ceab65e3f96ebb9e9be6caed8e8e0a3813946365fd6400141fac0481e3d29d59cef1625f132a81b2eddd
diff --git a/media-libs/mediastreamer/mediastreamer-2.9.0-r1.ebuild b/media-libs/mediastreamer/mediastreamer-2.9.0-r1.ebuild
deleted file mode 100644
index bf240cf613cc..000000000000
--- a/media-libs/mediastreamer/mediastreamer-2.9.0-r1.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="Mediastreaming library for telephony application"
-HOMEPAGE="http://www.linphone.org/"
-SRC_URI="mirror://nongnu/linphone/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/3"
-KEYWORDS="amd64 ppc ppc64 x86"
-# Many cameras will not work or will crash an application if mediastreamer2 is
-# not built with v4l2 support (taken from configure.ac)
-# TODO: run-time test for ipv6: does it really need ortp[ipv6] ?
-IUSE="+alsa amr bindist coreaudio debug doc examples +filters g726 g729 gsm ilbc
-	ipv6 libav ntp-timestamp opengl opus +ortp oss pcap portaudio pulseaudio sdl
-	silk +speex static-libs test theora upnp v4l video x264 X"
-
-REQUIRED_USE="|| ( oss alsa portaudio coreaudio pulseaudio )
-	video? ( || ( opengl sdl X ) )
-	theora? ( video )
-	X? ( video )
-	v4l? ( video )
-	opengl? ( video )"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	g726? ( >=media-libs/spandsp-0.0.6_pre1 )
-	gsm? ( media-sound/gsm )
-	opus? ( media-libs/opus )
-	ortp? ( >=net-libs/ortp-0.21.0[ipv6?] )
-	pcap? ( sys-libs/libcap )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.21 )
-	speex? ( >=media-libs/speex-1.2_beta3 )
-	upnp? ( net-libs/libupnp )
-	video? (
-		libav? ( >=media-video/libav-9.12:0= )
-		!libav? ( >=media-video/ffmpeg-1.2.6-r1:0= )
-
-		opengl? ( media-libs/glew
-			virtual/opengl
-			x11-libs/libX11 )
-		v4l? ( media-libs/libv4l
-			sys-kernel/linux-headers )
-		theora? ( media-libs/libtheora )
-		sdl? ( media-libs/libsdl[video,X] )
-		X? ( x11-libs/libX11
-			x11-libs/libXv ) )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	opengl? ( dev-util/xxdi )
-	test? ( >=dev-util/cunit-2.1_p2[ncurses] )
-	X? ( x11-proto/videoproto )"
-
-PDEPEND="amr? ( !bindist? ( media-plugins/mediastreamer-amr ) )
-	g729? ( !bindist? ( media-plugins/mediastreamer-bcg729 ) )
-	ilbc? ( media-plugins/mediastreamer-ilbc )
-	video? ( x264? ( media-plugins/mediastreamer-x264 ) )
-	silk? ( !bindist? ( media-plugins/mediastreamer-silk ) )"
-
-src_prepare() {
-	# variable causes "command not found" warning and is not
-	# needed anyway
-	sed -i \
-		-e 's/$(ACLOCAL_MACOS_FLAGS)//' \
-		Makefile.am || die
-
-	# respect user's CFLAGS
-	sed -i \
-		-e "s:-O2::;s: -g::" \
-		configure.ac || die "patching configure.ac failed"
-
-	# change default paths
-	sed -i \
-		-e "s:\(prefix/share\):\1/${PN}:" \
-		configure.ac || die "patching configure.ac failed"
-
-	# fix doc installation dir
-	sed -i \
-		-e "s:\$(pkgdocdir):\$(docdir):" \
-		help/Makefile.am || die "patching help/Makefile.am failed"
-
-	# fix html installation dir
-	sed -i \
-		-e "s:\(doc_htmldir=\).*:\1\$(htmldir):" \
-		help/Makefile.am || die "patching help/Makefile.am failed"
-
-	# linux/videodev.h dropped in 2.6.38
-	sed -i \
-		-e 's:linux/videodev.h ::' \
-		configure.ac || die
-
-	epatch "${FILESDIR}/${P}-v4l-automagic.patch" \
-		"${FILESDIR}/${P}-libav9.patch" \
-		"${FILESDIR}/${P}-underlinking.patch" \
-		"${FILESDIR}/${P}-tests.patch" \
-		"${FILESDIR}/${P}-xxd.patch" \
-		"${FILESDIR}/${P}-ffmpeg3.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
-		--datadir="${EPREFIX}"/usr/share/${PN}
-		# arts is deprecated
-		--disable-artsc
-		# don't want -Werror
-		--disable-strict
-		--disable-libv4l1
-		# don't use bundled libs
-		--enable-external-ortp
-		$(use_enable alsa)
-		$(use_enable pulseaudio)
-		$(use_enable coreaudio macsnd)
-		$(use_enable debug)
-		$(use_enable filters)
-		$(use_enable g726 spandsp)
-		$(use_enable gsm)
-		$(use_enable ipv6)
-		$(use_enable ntp-timestamp)
-		$(use_enable opengl glx)
-		$(use_enable opus)
-		$(use_enable ortp)
-		$(use_enable oss)
-		$(use_enable pcap)
-		$(use_enable portaudio)
-		$(use_enable speex)
-		$(use_enable static-libs static)
-		$(use_enable theora)
-		$(use_enable upnp)
-		$(use_enable video)
-		$(use_enable v4l)
-		$(use_enable v4l libv4l2)
-		$(use_enable sdl)
-		$(use_enable X x11)
-		$(use_enable X xv)
-
-		$(use doc || echo ac_cv_path_DOXYGEN=false)
-	)
-
-	# Mac OS X Audio Queue is an audio recording facility, available on
-	# 10.5 (Leopard, Darwin9) and onward
-	if use coreaudio && [[ ${CHOST} == *-darwin* && ${CHOST##*-darwin} -ge 9 ]]
-	then
-		myeconfargs+=( --enable-macaqsnd )
-	else
-		myeconfargs+=( --disable-macaqsnd )
-	fi
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	default
-	cd tester || die
-	./mediastreamer2_tester || die
-}
-
-src_install() {
-	default
-	prune_libtool_files
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins tester/*.c
-	fi
-}
diff --git a/media-libs/sdl-ttf/Manifest b/media-libs/sdl-ttf/Manifest
index 3346352cd627..2983aa78bfb6 100644
--- a/media-libs/sdl-ttf/Manifest
+++ b/media-libs/sdl-ttf/Manifest
@@ -1,5 +1,5 @@
 AUX sdl-ttf-2.0.11-freetype_pkgconfig.patch 1229 BLAKE2B 79ee75681d33ba925a29066b818cd32409c1eff159cd827606c6ea893a739eb698586d8cc292b1d3c21b3963112a26f5685aba532b47d1e83bc21fcce6995253 SHA512 abb3fd400c5d44789b891bad53124ca135ea3125affb95621623ab22fc43f5fbfeb79c63a97648936faf4698180837f76ca57143ee401610106d08741610e937
 AUX sdl-ttf-2.0.11-underlink.patch 244 BLAKE2B 2eb1782f89a72c94a1d90e4560895aafc9beda72a1537d41186de0e2816b6d37486b1211ac274d72c1b369f82d2b977c173443145a4a49b9592379e667881d32 SHA512 22495819ad0972183d850496acdcae1358bd37d25191e62c293f8d5fc50c617507631a202d46bd1ec380c70d89c61d050763919d48912b9a527908e8ad1ef1ac
 DIST SDL_ttf-2.0.11.tar.gz 4053686 BLAKE2B 3a78eeec91d7f6983b851cdd52925890c168cdf85dd34c7722183cc5a8848dab530c0c2d76493e0a380aa7e4f81967eeefd7cb34dc74faafc40497ffcb0e577b SHA512 64e04d1cd77e525e0f2413ad928841e5d3d09d551c030fc577b50777116580e430cb272b2aeb6191dfcc464669cf2f7a5a50d10e7c75637a3b1e8c8fca7fc78b
-EBUILD sdl-ttf-2.0.11-r1.ebuild 1256 BLAKE2B 70921da3d9c1ad8d25ec3984d68b08770c6d0e7687c7c617a197382c77d97c447eb801396702b2cb10299188dce4a599c9310757fbcd505335c2955848a5d17d SHA512 0a8097f81f62b6c83fd39f0d4b73b51384fcc391a4d2704157ea018201018bfa17b432d663c48b7987f9a9d879fa6753cc7c6f4fa6b7e0e42f2178b1ee3087d5
+EBUILD sdl-ttf-2.0.11-r1.ebuild 1275 BLAKE2B 0b1ed90933ef406f9cc7dd5cf38c11deac3c3eac1752c5fe058868a1f0b0c86db8647619f04524f95537a690cf6e24343193dc5f9bb5574faa5f8e2bb89fbee8 SHA512 917936e002759a4f1a9f129d222508e13a9ec0cc4937e143f71f3eddd33c60216a301b6cc1ea8f9fd4c37651315c72b8bce7f17f764c0ffdef9708a4ebea5a45
 MISC metadata.xml 487 BLAKE2B 95ce74adcba0d3325dbcbf132d27ec7e09a56bb5043d44ced349f0a8318f7a7ba6a3f77cf164292af4f789c4c058b6825a733338245d9434f689ce3c84060565 SHA512 8da59a1be8aa7ca22c2f8b14e4c4fd288a9bc4b508157bb38b0cbb8f1f5f7dce3904861e419b8a6b40a0b895e8866c53b677c1467c0531b9615d70806bdee360
diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
index e72a1d47b822..61ff98347e5a 100644
--- a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
+++ b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
@@ -18,7 +18,8 @@ RDEPEND="
 	X? ( >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )
 	>=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
 	>=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/media-libs/sdl2-ttf/Manifest b/media-libs/sdl2-ttf/Manifest
index 2e359b7380ad..37131b3ce87e 100644
--- a/media-libs/sdl2-ttf/Manifest
+++ b/media-libs/sdl2-ttf/Manifest
@@ -1,4 +1,4 @@
 AUX sdl-ttf-2.0.11-freetype_pkgconfig.patch 1229 BLAKE2B 79ee75681d33ba925a29066b818cd32409c1eff159cd827606c6ea893a739eb698586d8cc292b1d3c21b3963112a26f5685aba532b47d1e83bc21fcce6995253 SHA512 abb3fd400c5d44789b891bad53124ca135ea3125affb95621623ab22fc43f5fbfeb79c63a97648936faf4698180837f76ca57143ee401610106d08741610e937
 DIST SDL2_ttf-2.0.14.tar.gz 4147462 BLAKE2B c676c8880d26ee61900f82c418474d0eee9844842eb006f44c80f0cc3384dd2a3f0a1da0dc8a7e50f78caa6420cc494a4a4be1ef7a294310084d5a91b8ec3c44 SHA512 4db817573fd216e26180f4c401cc869ce407589a461032fd7167dc612d35e038cca1ab67be7909b6b49c741581a68125ab46362ad8e3c0a2cdd39624ad847099
-EBUILD sdl2-ttf-2.0.14.ebuild 1080 BLAKE2B 47f9c2df080d3a805de029a87f92979dfd78b5d4f848a5f19ac18831e3dfd057d8df7d50160fee026a268efd350295256a501031797a7d56216bd673c6f005e6 SHA512 5e4079f1d806bb67e971e2a715dbd6217cdc42877d3bf7cbf2aa56d8dcf28d8aae243d7df90a94c3a4f6f226d952c3e3d121788188bc33bcc2221e4e10d9ebd8
+EBUILD sdl2-ttf-2.0.14.ebuild 1099 BLAKE2B 0295afa0a1c642fe8bbab2e71d52e53b5c00a812cd42be08b5f950f7dd61cab1ec196a39e600be3a275ac3c03f2f1557278b42c1fd1af64463d7c8d12d8c67ab SHA512 3c7099971f3c7e1980bfb6765f38dc2ec8fe9abf28cd5028517dfdb7d38ce5c86545ac9aee0fa5ac6ec0f62f677e2bd54c920e61ef4da363c3e366368c4f98a0
 MISC metadata.xml 501 BLAKE2B bf59cfab67a21e983789c97ca2b7c457ff228546a9b9a0649c84751d8dad50b79d3bd1c00317e1710e93cbaca727cbec5e648546556e724c12745462e746e709 SHA512 90a6e2793665a3e29fa719b5dad023be6ebf2a5aa4c0ea1f33f99210829b33602fefc8b4722ae0df05085e7190f828bb49aa53c9ff004c91e0f6c9f2338a09b7
diff --git a/media-libs/sdl2-ttf/sdl2-ttf-2.0.14.ebuild b/media-libs/sdl2-ttf/sdl2-ttf-2.0.14.ebuild
index 2e741425b72d..9bb754c90b17 100644
--- a/media-libs/sdl2-ttf/sdl2-ttf-2.0.14.ebuild
+++ b/media-libs/sdl2-ttf/sdl2-ttf-2.0.14.ebuild
@@ -18,7 +18,8 @@ RDEPEND="X? ( >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )
 	>=media-libs/libsdl2-2.0.1-r1[${MULTILIB_USEDEP}]
 	>=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}]
 	virtual/opengl[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/media-libs/simage/Manifest b/media-libs/simage/Manifest
index 03cc352d5efc..b1b37bb3f19c 100644
--- a/media-libs/simage/Manifest
+++ b/media-libs/simage/Manifest
@@ -1,5 +1,8 @@
 AUX simage-1.7.0-libpng15.patch 572 BLAKE2B 7f4eacdd5aac3e6634fd26824d0dfb7ec779fcf6be86e642f2870c62b1f0bd86b1ef767e19034e05fd62cba9904ef45e13a85be7657e00133febb67b0469c337 SHA512 0a867187b0dbc644182784e56dfd26b51f48c9355b01228fe3386fab05cee084e0066d4b18eb3f63110a25c0d2abf8f8b214d9b94e2e7dc7438e90308653e4e8
 AUX simage-1.7.0-pkgconfig-partial.patch 467 BLAKE2B a2957c1d5fc6939df7ecb1bb15743253294142a87f98d4043368f189dc4f5ee302de16e84572a69e3ea5755124326fb075b2e45d3574a1759c899d9e96eaf828 SHA512 791db9c02fc0dc7526ed43b340ab6f92baea91a5bf9005099f6adf1550a7ab73ef36790d2e761f0b50b88098e9124f3035ff21149cca00d819c2262d8e180618
+AUX simage-1.7.1-cmake-automagic-deps.patch 14873 BLAKE2B a65d862adea4d9f8064b0fccec538047820a134155489cb790d0eae095d7a078f4e4593bf56e532dc3ac03bfff7f0a20a2c81658adddde36faa24cb8fec6df94 SHA512 d80f999d57eddd6eea7b92bb421c2b9bf0f577cdffd0574afbfd2b9c1d25a9dea555d64587be8c96fea203486740ce563b35eaf35da16b6abb4f4b0707cc0916
+DIST Coin3D-simage-3bd369da8f08.tar.bz2 630229 BLAKE2B 6231dde891c07d8a4a37eebd5f89d9e445c048bf48d1718a5f1e2b12f488ad6c806edd04fd4eb30b5e041f978fbb65ea0b1d3b1263d7006bbda4568f4bef87c6 SHA512 61793a728c66dc4f427b1f853e0dcf38a71dced68814c8438e6653a4a1486d8066ce50a7c088d476cf796b4872c724687b3ca9d51ec0ed74f54d5d7e47c89b34
 DIST simage-1.7.0.tar.gz 752602 BLAKE2B feca31f8d41ae67271e43c9c664243d872985068ffc8496d43c9b59a47ae5c3067956acced3ff9abbdc5a360aec662e3972a93d8523a704a72ac9d12dd4cfaa0 SHA512 944ec009dd7041692073ddd9795fdd633fe3bc9101f1c1234e8be3746487a9431aecf52abde01563e719153fbe1ca7d29f9b64042e4a64ea08d6cb14666dd89f
 EBUILD simage-1.7.0-r1.ebuild 1817 BLAKE2B 9b8f4a0165ca55031aade77d5f5a395e54e2ec2245cd62c1585c6d7304e4780ded2c300db60eb4b0d263fd3e4beed01ab89d9ffbe94a719a544926407cb056b1 SHA512 f9384dafd6afa304582b146f45fd4051938ca774042576c505aea66faa024f4dd8a1ed7d4915fe81aa3eae732c1a0733d704468f965e8ce17caf4f63efd83832
+EBUILD simage-1.7.1a_beta_pre20180312.ebuild 1758 BLAKE2B 6235580fb576b72f1497843d266cff696d589abbe1e48f72a63a4ad2d5ef587289c3bb34aedbb1a8bd02621b5ecb838f429a75eb1d178fc3703a0e4007112219 SHA512 b90b684e4ecef03f88be837d004e0503fef28a2bac26981affc791da52f2a416a77df5d626a42646978104c4ee436e10ffd82056d2be3a7a693c68d82b76f5ad
 MISC metadata.xml 298 BLAKE2B 312f7a48552438ce1231a58486f19aca02bbb281b72733645ffad42a3f82df778145bfc66a61c1216e47bd68e54668725fe08274482be7fb3997c99bf3089fdc SHA512 b72572413e5e40d55658049b4624de687dd1011553fc384deb0c837830b6f82d060b6356ad25e803f27d3be697b07a8c3fbc45932d20d89e4d9918ed6fecd84a
diff --git a/media-libs/simage/files/simage-1.7.1-cmake-automagic-deps.patch b/media-libs/simage/files/simage-1.7.1-cmake-automagic-deps.patch
new file mode 100644
index 000000000000..c119c938eeb5
--- /dev/null
+++ b/media-libs/simage/files/simage-1.7.1-cmake-automagic-deps.patch
@@ -0,0 +1,497 @@
+diff -ruN Coin3D-simage-3bd369da8f08/CMakeLists.txt my/CMakeLists.txt
+--- Coin3D-simage-3bd369da8f08/CMakeLists.txt	2018-03-12 19:57:28.000000000 +0100
++++ my/CMakeLists.txt	2018-05-06 08:53:45.202467390 +0200
+@@ -74,6 +74,36 @@
+ 	set(SIMAGE_GDIPLUS_SUPPORT OFF)
+ endif()
+ 
++if(GIF_FOUND)
++	option(SIMAGE_GIF_SUPPORT "Enable support for GIF images" ON)
++else()
++	set(SIMAGE_GIF_SUPPORT OFF)
++endif()
++
++if(JASPER_FOUND)
++	option(SIMAGE_JASPER_SUPPORT "Enable support for JPEG2K images" ON)
++else()
++	set(SIMAGE_JASPER_SUPPORT OFF)
++endif()
++
++if(JPEG_FOUND)
++	option(SIMAGE_JPEG_SUPPORT "Enable support for JPEG images" ON)
++else()
++	set(SIMAGE_JPEG_SUPPORT OFF)
++endif()
++
++if(PNG_FOUND)
++	option(SIMAGE_PNG_SUPPORT "Enable support for PNG images" ON)
++else()
++	set(SIMAGE_PNG_SUPPORT OFF)
++endif()
++
++if(TIFF_FOUND)
++	option(SIMAGE_TIFF_SUPPORT "Enable support for TIFF images" ON)
++else()
++	set(SIMAGE_TIFF_SUPPORT OFF)
++endif()
++
+ if(SNDFILE_FOUND)
+ 	option(SIMAGE_LIBSNDFILE_SUPPORT "" ON)
+ else()
+@@ -141,23 +171,23 @@
+ 		return 0;
+ 	}
+ " HAVE_GDIPLUS_LOCKBITS_RECTARG_POINTER)
+-set(HAVE_GIFLIB ${GIF_FOUND})
++set(HAVE_GIFLIB ${SIMAGE_GIF_SUPPORT})
+ check_include_files(guile/gh.h HAVE_GUILE_GH_H)
+ check_include_files(inttypes.h HAVE_INTTYPES_H)
+-set(HAVE_JASPER ${JASPER_FOUND})
+-set(HAVE_JPEGLIB ${JPG_FOUND})
++set(HAVE_JASPER ${SIMAGE_JASPER_SUPPORT})
++set(HAVE_JPEGLIB ${SIMAGE_JPEG_SUPPORT})
+ check_include_files(libguile.h HAVE_LIBGUILE_H)
+ check_include_files(memory.h HAVE_MEMORY_H)
+-set(HAVE_PNGLIB ${PNG_FOUND})
++set(HAVE_PNGLIB ${SIMAGE_PNG_SUPPORT})
+ check_include_files(stdint.h HAVE_STDINT_H)
+ check_include_files(stdlib.h HAVE_STDLIB_H)
+ check_include_files(strings.h HAVE_STRINGS_H)
+ check_include_files(string.h HAVE_STRING_H)
+ check_include_files(sys/stat.h HAVE_SYS_STAT_H)
+ check_include_files(sys/types.h HAVE_SYS_TYPES_H)
+-set(HAVE_TIFFLIB ${TIFF_FOUND})
++set(HAVE_TIFFLIB ${SIMAGE_TIFF_SUPPORT})
+ check_include_files(unistd.h HAVE_UNISTD_H)
+-set(HAVE_VFW ${VFW_FOUND})
++set(HAVE_VFW ${SIMAGE_AVIENC_SUPPORT})
+ check_include_files(windows.h HAVE_WINDOWS_H)
+ set(PACKAGE "simage")
+ set(PACKAGE_BUGREPORT "coin-support@coin3d.org")
+@@ -321,27 +351,27 @@
+ 	target_link_libraries(simage ${GDIPLUS_LIBRARIES})
+ endif()
+ 
+-if(GIF_FOUND)
++if(SIMAGE_GIF_SUPPORT)
+ 	target_include_directories(simage PUBLIC ${GIF_INCLUDE_DIR})
+ 	target_link_libraries(simage ${GIF_LIBRARIES})
+ endif()
+ 
+-if(JASPER_FOUND)
++if(SIMAGE_JASPER_SUPPORT)
+ 	target_include_directories(simage PUBLIC ${JASPER_INCLUDE_DIR})
+ 	target_link_libraries(simage ${JASPER_LIBRARIES})
+ endif()
+ 
+-if(JPEG_FOUND)
++if(SIMAGE_JPEG_SUPPORT)
+ 	target_include_directories(simage PUBLIC ${JPEG_INCLUDE_DIR})
+ 	target_link_libraries(simage ${JPEG_LIBRARIES})
+ endif()
+ 
+-if(OGGVORBIS_FOUND)
++if(SIMAGE_OGGVORBIS_SUPPORT)
+ 	target_include_directories(simage PUBLIC ${OGGVORBIS_INCLUDE_DIRS})
+ 	target_link_libraries(simage ${OGGVORBIS_LIBRARIES})
+ endif()
+ 
+-if(PNG_FOUND)
++if(SIMAGE_PNG_SUPPORT)
+ 	target_include_directories(simage PUBLIC ${PNG_INCLUDE_DIR})
+ 	target_link_libraries(simage ${PNG_LIBRARIES})
+ endif()
+@@ -350,22 +380,22 @@
+ 	target_link_libraries(simage ${QT_LIBRARIES})
+ endif()
+ 
+-if(QUICKTIME_FOUND)
++if(SIMAGE_QUICKTIME_SUPPORT)
+ 	target_include_directories(simage PUBLIC ${QUICKTIME_INCLUDE_DIR})
+ 	target_link_libraries(simage ${QUICKTIME_LIBRARIES})
+ endif()
+ 
+-if(SNDFILE_FOUND)
++if(SIMAGE_LIBSNDFILE_SUPPORT)
+ 	target_include_directories(simage PUBLIC ${SNDFILE_INCLUDE_DIRS})
+ 	target_link_libraries(simage ${SNDFILE_LIBRARIES})
+ endif()
+ 
+-if(TIFF_FOUND)
++if(SIMAGE_TIFF_SUPPORT)
+ 	target_include_directories(simage PUBLIC ${TIFF_INCLUDE_DIR})
+ 	target_link_libraries(simage ${TIFF_LIBRARY})
+ endif()
+ 
+-if(VFW_FOUND)
++if(SIMAGE_AVIENC_SUPPORT)
+ 	target_link_libraries(simage ${VFW_LIBRARIES})
+ endif()
+ 
+diff -ruN Coin3D-simage-3bd369da8f08/config.h.cmake.in my/config.h.cmake.in
+--- Coin3D-simage-3bd369da8f08/config.h.cmake.in	2018-03-12 19:57:28.000000000 +0100
++++ my/config.h.cmake.in	2018-05-06 09:29:09.795849171 +0200
+@@ -9,30 +9,18 @@
+ /* Define if first argument of Gdiplus::Bitmap::LockBits() is a pointer */
+ #cmakedefine HAVE_GDIPLUS_LOCKBITS_RECTARG_POINTER 1
+ 
+-/* define to support the giflib library */
+-#cmakedefine HAVE_GIFLIB 1
+-
+ /* Define to 1 if you have the <guile/gh.h> header file. */
+ #cmakedefine HAVE_GUILE_GH_H 1
+ 
+ /* Define to 1 if you have the <inttypes.h> header file. */
+ #cmakedefine HAVE_INTTYPES_H 1
+ 
+-/* define to support the jasper library */
+-#cmakedefine HAVE_JASPER 1
+-
+-/* define to support the jpeg library */
+-#cmakedefine HAVE_JPEGLIB 1
+-
+ /* Define to 1 if you have the <libguile.h> header file. */
+ #cmakedefine HAVE_LIBGUILE_H 1
+ 
+ /* Define to 1 if you have the <memory.h> header file. */
+ #cmakedefine HAVE_MEMORY_H 1
+ 
+-/* define for libpng support */
+-#cmakedefine HAVE_PNGLIB 1
+-
+ /* Define to 1 if you have the <stdint.h> header file. */
+ #cmakedefine HAVE_STDINT_H 1
+ 
+@@ -51,15 +39,9 @@
+ /* Define to 1 if you have the <sys/types.h> header file. */
+ #cmakedefine HAVE_SYS_TYPES_H 1
+ 
+-/* define to support the tiff library */
+-#cmakedefine HAVE_TIFFLIB 1
+-
+ /* Define to 1 if you have the <unistd.h> header file. */
+ #cmakedefine HAVE_UNISTD_H 1
+ 
+-/* Define to use the Video for Windows library */
+-#cmakedefine HAVE_VFW 1
+-
+ /* Define to 1 if you have the <windows.h> header file. */
+ #cmakedefine HAVE_WINDOWS_H 1
+ 
+@@ -108,6 +90,21 @@
+ /* define this to the simage minor version number */
+ #define SIMAGE_MINOR_VERSION @SIMAGE_MINOR_VERSION@
+ 
++/* define to support the giflib library */
++#cmakedefine SIMAGE_GIF_SUPPORT 1
++
++/* define to support the jasper library */
++#cmakedefine SIMAGE_JASPER_SUPPORT 1
++
++/* define to support the jpeg library */
++#cmakedefine SIMAGE_JPEG_SUPPORT 1
++
++/* define for libpng support */
++#cmakedefine SIMAGE_PNG_SUPPORT 1
++
++/* define to support the tiff library */
++#cmakedefine SIMAGE_TIFF_SUPPORT 1
++
+ /* define to enable mpeg2enc support */
+ #cmakedefine SIMAGE_MPEG2ENC_SUPPORT 1
+ 
+diff -ruN Coin3D-simage-3bd369da8f08/include/simage_gif.h my/include/simage_gif.h
+--- Coin3D-simage-3bd369da8f08/include/simage_gif.h	2018-03-12 19:57:28.000000000 +0100
++++ my/include/simage_gif.h	2018-05-06 09:42:19.739539807 +0200
+@@ -21,9 +21,9 @@
+ #include <config.h>
+ #endif /* HAVE_CONFIG_H */
+ 
+-#ifndef HAVE_GIFLIB
++#ifndef SIMAGE_GIF_SUPPORT
+ #error "This file should not be used under the current configuration!"
+-#endif /* !HAVE_GIFLIB */
++#endif /* !SIMAGE_GIF_SUPPORT */
+ 
+ #ifdef __cplusplus
+ extern "C" {
+diff -ruN Coin3D-simage-3bd369da8f08/include/simage_jasper.h my/include/simage_jasper.h
+--- Coin3D-simage-3bd369da8f08/include/simage_jasper.h	2018-03-12 19:57:28.000000000 +0100
++++ my/include/simage_jasper.h	2018-05-06 09:42:31.084498335 +0200
+@@ -21,9 +21,9 @@
+ #include <config.h>
+ #endif /* HAVE_CONFIG_H */
+ 
+-#ifndef HAVE_JASPER
++#ifndef SIMAGE_JASPER_SUPPORT
+ #error "This file should not be used under the current configuration!"
+-#endif /* !HAVE_JASPERLIB */
++#endif /* !SIMAGE_JASPER_SUPPORT */
+ 
+ #ifdef __cplusplus
+ extern "C" {
+diff -ruN Coin3D-simage-3bd369da8f08/include/simage_jpeg.h my/include/simage_jpeg.h
+--- Coin3D-simage-3bd369da8f08/include/simage_jpeg.h	2018-03-12 19:57:28.000000000 +0100
++++ my/include/simage_jpeg.h	2018-05-06 09:42:50.762422085 +0200
+@@ -21,9 +21,9 @@
+ #include <config.h>
+ #endif /* HAVE_CONFIG_H */
+ 
+-#ifndef HAVE_JPEGLIB
++#ifndef SIMAGE_JPEG_SUPPORT
+ #error "This file should not be used under the current configuration!"
+-#endif /* !HAVE_JPEGLIB */
++#endif /* !SIMAGE_JPEG_SUPPORT */
+ 
+ #ifdef __cplusplus
+ extern "C" {
+diff -ruN Coin3D-simage-3bd369da8f08/include/simage_png.h my/include/simage_png.h
+--- Coin3D-simage-3bd369da8f08/include/simage_png.h	2018-03-12 19:57:28.000000000 +0100
++++ my/include/simage_png.h	2018-05-06 09:43:08.250349842 +0200
+@@ -21,9 +21,9 @@
+ #include <config.h>
+ #endif /* HAVE_CONFIG_H */
+ 
+-#ifndef HAVE_PNGLIB
++#ifndef SIMAGE_PNG_SUPPORT
+ #error "This file should not be used under the current configuration!"
+-#endif /* !HAVE_PNGLIB */
++#endif /* !SIMAGE_PNG_SUPPORT */
+ 
+ #ifdef __cplusplus
+ extern "C" {
+diff -ruN Coin3D-simage-3bd369da8f08/include/simage_tiff.h my/include/simage_tiff.h
+--- Coin3D-simage-3bd369da8f08/include/simage_tiff.h	2018-03-12 19:57:28.000000000 +0100
++++ my/include/simage_tiff.h	2018-05-06 09:43:32.091244844 +0200
+@@ -21,9 +21,9 @@
+ #include <config.h>
+ #endif /* HAVE_CONFIG_H */
+ 
+-#ifndef HAVE_TIFFLIB
++#ifndef SIMAGE_TIFF_SUPPORT
+ #error "This file should not be used under the current configuration!"
+-#endif /* !HAVE_TIFFLIB */
++#endif /* !SIMAGE_TIFF_SUPPORT */
+ 
+ #ifdef __cplusplus
+ extern "C" {
+diff -ruN Coin3D-simage-3bd369da8f08/src/simage_gif.c my/src/simage_gif.c
+--- Coin3D-simage-3bd369da8f08/src/simage_gif.c	2018-03-12 19:57:28.000000000 +0100
++++ my/src/simage_gif.c	2018-05-06 09:40:56.444783960 +0200
+@@ -23,7 +23,7 @@
+ #include <config.h>
+ #endif /* HAVE_CONFIG_H */
+ 
+-#ifdef HAVE_GIFLIB
++#ifdef SIMAGE_GIF_SUPPORT
+ 
+ #include <simage_gif.h>
+ #include <stdlib.h>
+@@ -409,4 +409,4 @@
+   return 1;
+ }
+ 
+-#endif /* HAVE_GIFLIB */
++#endif /* SIMAGE_GIF_SUPPORT */
+diff -ruN Coin3D-simage-3bd369da8f08/src/simage_jasper.c my/src/simage_jasper.c
+--- Coin3D-simage-3bd369da8f08/src/simage_jasper.c	2018-03-12 19:57:28.000000000 +0100
++++ my/src/simage_jasper.c	2018-05-06 09:30:40.082652034 +0200
+@@ -23,7 +23,7 @@
+ #include <config.h>
+ #endif /* HAVE_CONFIG_H */
+ 
+-#ifdef HAVE_JASPER
++#ifdef SIMAGE_JASPER_SUPPORT
+ 
+ #include <simage_jasper.h>
+ 
+@@ -331,4 +331,4 @@
+   return 0;
+ }
+ 
+-#endif /* HAVE_JASPER */
++#endif /* SIMAGE_JASPER_SUPPORT */
+diff -ruN Coin3D-simage-3bd369da8f08/src/simage_jpeg.c my/src/simage_jpeg.c
+--- Coin3D-simage-3bd369da8f08/src/simage_jpeg.c	2018-03-12 19:57:28.000000000 +0100
++++ my/src/simage_jpeg.c	2018-05-06 09:31:06.325304369 +0200
+@@ -23,7 +23,7 @@
+ #include <config.h>
+ #endif /* HAVE_CONFIG_H */
+ 
+-#ifdef HAVE_JPEGLIB
++#ifdef SIMAGE_JPEG_SUPPORT
+ 
+ #include <stdio.h>
+ #include <setjmp.h>
+@@ -74,7 +74,7 @@
+       strncpy(buffer, "JPEG saver: Error opening file", buflen);
+       break;
+     case ERR_JPEGLIB_WRITE:
+-      strncpy(buffer, "JPEG saver: Internal libjpeg error", buflen);    
++      strncpy(buffer, "JPEG saver: Internal libjpeg error", buflen);
+       break;
+   }
+   return jpegerror;
+@@ -89,7 +89,7 @@
+ 
+ typedef struct my_error_mgr * my_error_ptr;
+ 
+-static void 
++static void
+ my_error_exit (j_common_ptr cinfo)
+ {
+   /* cinfo->err really points to a my_error_mgr struct, so coerce pointer */
+@@ -105,7 +105,7 @@
+   longjmp(myerr->setjmp_buffer, 1);
+ }
+ 
+-int 
++int
+ simage_jpeg_identify(const char * ptr,
+                      const unsigned char *header,
+                      int headerlen)
+@@ -113,9 +113,9 @@
+   static unsigned char jpgcmp[] = {'J', 'F', 'I', 'F' };
+   static unsigned char jpgcmp2[] = {'E', 'x', 'i', 'f' };
+   if (headerlen < 10) return 0;
+-  if (memcmp((const void*)&header[6], 
++  if (memcmp((const void*)&header[6],
+              (const void*)jpgcmp, 4) == 0) return 1;
+-  if (memcmp((const void*)&header[6], 
++  if (memcmp((const void*)&header[6],
+              (const void*)jpgcmp2, 4) == 0) return 1;
+   return 0;
+ }
+@@ -215,7 +215,7 @@
+     format = 3;
+     cinfo.out_color_space = JCS_RGB;
+   }
+-  
++
+   (void) jpeg_start_decompress(&cinfo);
+   /* We can ignore the return value since suspension is not possible
+    * with the stdio data source.
+@@ -234,20 +234,20 @@
+     ((j_common_ptr) &cinfo, JPOOL_IMAGE, row_stride, 1);
+   width = cinfo.output_width;
+   height = cinfo.output_height;
+-  buffer = currPtr = (unsigned char*) 
++  buffer = currPtr = (unsigned char*)
+     malloc(width*height*cinfo.output_components);
+-  
++
+   /* Step 6: while (scan lines remain to be read) */
+   /*           jpeg_read_scanlines(...); */
+ 
+   /* Here we use the library's state variable cinfo.output_scanline as the
+    * loop counter, so that we don't have to keep track ourselves.
+    */
+-  
++
+   /* flip image upside down */
+   if (buffer) {
+-    currPtr = buffer + row_stride * (cinfo.output_height-1);  
+-    
++    currPtr = buffer + row_stride * (cinfo.output_height-1);
++
+     while (cinfo.output_scanline < cinfo.output_height) {
+       /* jpeg_read_scanlines expects an array of pointers to scanlines.
+        * Here the array is only one element long, but you could ask for
+@@ -293,7 +293,7 @@
+   return buffer;
+ }
+ 
+-int 
++int
+ simage_jpeg_save(const char * filename,
+                  const unsigned char * bytes,
+                  int width,
+@@ -321,7 +321,7 @@
+   int quality;
+   unsigned char * tmpbytes;
+   int bytesperrow;
+-  
++
+   quality = 90;
+   tmpbytes = NULL;
+ 
+@@ -375,7 +375,7 @@
+   /*
+    * alpha channel is not supported for jpeg. strip it.
+    */
+-  
++
+   if (numcomponents == 4) {
+     unsigned char * dst;
+     const unsigned char * src;
+@@ -383,8 +383,8 @@
+     dst = tmpbytes = (unsigned char *) malloc(n*3);
+     src = bytes;
+     for (i = 0; i < n; i++) {
+-      *dst++ = *src++; 
+-      *dst++ = *src++; 
++      *dst++ = *src++;
++      *dst++ = *src++;
+       *dst++ = *src++;
+       src++;
+     }
+@@ -397,7 +397,7 @@
+     dst = tmpbytes = (unsigned char *) malloc(n*3);
+     src = bytes;
+     for (i = 0; i < n; i++) {
+-      *dst++ = *src++; 
++      *dst++ = *src++;
+       src++;
+     }
+     numcomponents = 1;
+@@ -408,7 +408,7 @@
+   /* First we supply a description of the input image.
+    * Four fields of the cinfo struct must be filled in:
+    */
+-   
++
+   cinfo.image_width = width;         /* image width and height, in pixels */
+   cinfo.image_height = height;
+   cinfo.input_components = numcomponents;  /* # of color components per pixel */
+@@ -468,4 +468,4 @@
+   return 1;
+ }
+ 
+-#endif /* HAVE_JPEGLIB */
++#endif /* SIMAGE_JPEG_SUPPORT */
+diff -ruN Coin3D-simage-3bd369da8f08/src/simage_png.c my/src/simage_png.c
+--- Coin3D-simage-3bd369da8f08/src/simage_png.c	2018-03-12 19:57:28.000000000 +0100
++++ my/src/simage_png.c	2018-05-06 09:32:01.648571705 +0200
+@@ -22,7 +22,7 @@
+ #include <config.h>
+ #endif /* HAVE_CONFIG_H */
+ 
+-#ifdef HAVE_PNGLIB
++#ifdef SIMAGE_PNG_SUPPORT
+ 
+ #include <simage_png.h>
+ #include <stdio.h>
+@@ -479,4 +479,4 @@
+   return 1;
+ }
+ 
+-#endif /* HAVE_PNGLIB */
++#endif /* SIMAGE_PNG_SUPPORT */
+diff -ruN Coin3D-simage-3bd369da8f08/src/simage_tiff.c my/src/simage_tiff.c
+--- Coin3D-simage-3bd369da8f08/src/simage_tiff.c	2018-03-12 19:57:28.000000000 +0100
++++ my/src/simage_tiff.c	2018-05-06 09:32:43.539017111 +0200
+@@ -23,7 +23,7 @@
+ #include <config.h>
+ #endif /* HAVE_CONFIG_H */
+ 
+-#ifdef HAVE_TIFFLIB
++#ifdef SIMAGE_TIFF_SUPPORT
+ 
+ #include <simage_tiff.h>
+ #include <stdio.h>
+@@ -683,4 +683,4 @@
+ #undef CVT
+ #undef pack
+ 
+-#endif /* HAVE_TIFFLIB */
++#endif /* SIMAGE_TIFF_SUPPORT */
diff --git a/media-libs/simage/simage-1.7.1a_beta_pre20180312.ebuild b/media-libs/simage/simage-1.7.1a_beta_pre20180312.ebuild
new file mode 100644
index 000000000000..01635618aef0
--- /dev/null
+++ b/media-libs/simage/simage-1.7.1a_beta_pre20180312.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic
+
+MY_P=Coin3D-simage-3bd369da8f08
+
+DESCRIPTION="Image and video texturing library"
+HOMEPAGE="https://bitbucket.org/Coin3D/simage"
+SRC_URI="https://dev.gentoo.org/~reavertm/${MY_P}.tar.bz2"
+
+LICENSE="public-domain mpeg2enc"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+SLOT="0"
+IUSE="debug gif jpeg jpeg2k png qt5 sndfile tiff vorbis"
+
+RDEPEND="
+	gif? ( media-libs/giflib )
+	jpeg? ( virtual/jpeg:0= )
+	jpeg2k? ( media-libs/jasper )
+	png? ( media-libs/libpng:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+	)
+	sndfile? ( media-libs/libsndfile )
+	tiff? ( media-libs/tiff:0= )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.7.1-cmake-automagic-deps.patch"
+)
+
+DOCS=(AUTHORS ChangeLog NEWS README)
+
+src_configure() {
+	use debug && append-cppflags -DSIMAGE_DEBUG=1
+
+	local mycmakeargs=(
+		-DSIMAGE_AVIENC_SUPPORT=OFF # Windows only
+		-DSIMAGE_BUILD_SHARED_LIBS=ON
+		-DSIMAGE_CGIMAGE_SUPPORT=OFF # OS X only
+		-DSIMAGE_EPS_SUPPORT=ON
+		-DSIMAGE_GDIPLUS_SUPPORT=OFF # Windows only
+		-DSIMAGE_GIF_SUPPORT=$(usex gif)
+		-DSIMAGE_JASPER_SUPPORT=$(usex jpeg2k)
+		-DSIMAGE_JPEG_SUPPORT=$(usex jpeg)
+		-DSIMAGE_LIBSNDFILE_SUPPORT=$(usex sndfile)
+		-DSIMAGE_MPEG2ENC_SUPPORT=ON
+		-DSIMAGE_OGGVORBIS_SUPPORT=$(usex vorbis)
+		-DSIMAGE_PIC_SUPPORT=ON
+		-DSIMAGE_PNG_SUPPORT=$(usex png)
+		-DSIMAGE_QIMAGE_SUPPORT=$(usex qt5)
+		-DSIMAGE_QUICKTIME_SUPPORT=OFF # OS X only
+		-DSIMAGE_TIFF_SUPPORT=$(usex tiff)
+		-DUSE_QT5=ON
+		-DSIMAGE_RGB_SUPPORT=ON
+		-DSIMAGE_TGA_SUPPORT=ON
+		-DSIMAGE_XWD_SUPPORT=ON
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/media-libs/sratom/Manifest b/media-libs/sratom/Manifest
index b5611afcf61d..fb9b8779ab36 100644
--- a/media-libs/sratom/Manifest
+++ b/media-libs/sratom/Manifest
@@ -3,6 +3,6 @@ DIST sratom-0.4.6.tar.bz2 138165 BLAKE2B 2745b36055acbe601ef2ca4720749d84c3a72dc
 DIST sratom-0.6.0.tar.bz2 149340 BLAKE2B c661e0c4fba0cdf6cfb8a7dba90ff92135422557a0721bc394c7500853aeb9370554df8a02b7faea2fa222b96db36b20b265cc1fa50e6e06655946dbe992f815 SHA512 899bb01896e2b65b69482041c7e06edc9e45e9a3466392c82a58f16dfc71462a6c3e3e16a5aa50a6347c8366ea72898468910a59a084762f75eb8c7031ceacf8
 EBUILD sratom-0.4.4.ebuild 864 BLAKE2B 6527a78c86313675815593cb09ede0deb282ebe08e21f8202d3251bc33ad1581f7639c3eb81498e0eea4e89d71687c51f6630f0df1a08d7953c270a492b95107 SHA512 fa894633fee36d536f431b0ed51464359834e5856cdfe643cdb95bcba450ed981b58938d97194578310f8b0f0161937d33e2cdfc6c0b6f77ea34d6405b308733
 EBUILD sratom-0.4.6.ebuild 962 BLAKE2B 694f3a86c1d400aeb9bd90cb35dc98a61daf9cae6357850e381599dfcbd3967c2ad3cbfe743726d18c8922d11f51fd39ac0b220a2a703946ff0944bb2d605dda SHA512 dbfcf918113e45edc9b6a70bb7eb7b14ec0750f5923f77b98c570de908b435b70dbb871d9247b243d4aa5d0137212698fdfad8b07fd2248583c503728bfee68e
-EBUILD sratom-0.6.0-r1.ebuild 1187 BLAKE2B 31daef63e5533ada2bf898cb4fd42c4b7579a2ee456d91e5d866bcd45717c77477f150ea2fb7eba154c1b9506803b11e520ecef70296e3f685064ae98b64701d SHA512 fa7558ad73a9c93aeedcb9ac7b7d2084bce5d2f8ce29320a25b5b5e941c82caad820e2294611625ec4e872384532c58f7e11af76d5a7cb35486a1029f5febee9
+EBUILD sratom-0.6.0-r1.ebuild 1193 BLAKE2B ccf80210916428bb2eb4f6353b2dfaf50568642eac98b5be9c9896cd6a81424d83e2d8cf1e29370401e9294f750ce7d0f057b95503d084cebdc360022657dd10 SHA512 201a442c58ee2bde5cd18206737854c6f332287ed0cc63322a5585b1a17ec453395be749aafd0c95b6106f1426ed8642cdf54509aae4ad2597e6c3d79bf298b3
 EBUILD sratom-0.6.0.ebuild 970 BLAKE2B dba12d32ada45ae37f80595b988185a2d929f0d471953751cf0e93916b53cafd450298b650a2385baaa7934aee3119bfef89bef78504b3383808a44a7d61f2d2 SHA512 ec297eaa7c64c35a4b4051193cfe96fc68121d025afcf850ad28d1c4f5abb37e14079b3602118acaf18e48152caca197dc3dedccda3a0a0989ce8c271ac296cc
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/sratom/sratom-0.6.0-r1.ebuild b/media-libs/sratom/sratom-0.6.0-r1.ebuild
index 43e14dc09b7a..7ff6f9b6b5d3 100644
--- a/media-libs/sratom/sratom-0.6.0-r1.ebuild
+++ b/media-libs/sratom/sratom-0.6.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ~ia64 ~ppc ~x86"
 IUSE="doc static-libs test"
 
 RDEPEND=">=media-libs/lv2-1.14.0-r1