gentoo resync : 10.01.2018

18 files changed, 575 insertions, 56 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index ea37fb5eb540..32135cbe34d8 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
index 78c48601e0aa..96263bd90dac 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/Manifest
@@ -1,5 +1,7 @@
 AUX avidemux-core-2.6.20-fix-cmake.patch 1020 BLAKE2B 775653f2d8fdf15f56025c44a3b938d6e978606eaa475e6ca67446f3c754705cb3f3f1253293dc62a8d85536e47e8371b6fb128f5fecf04b847a488899be16d4 SHA512 82f4a5c3328d593bc5b2dbabc339eb19ceb6bc295984ca1fda4efbfd0f0a3687d39d07f36cf4338230396db849012f3d8ea053404f78317712741571cf060f0e
 DIST avidemux_2.6.20.tar.gz 20172362 BLAKE2B d458749e470e60b133a177ddf97ee04a665da3f7b2c52e8cc51f907aa5b51d11338ddab9306603b615170b5cf75ec2d3444bd648756bdb724aa442abf7044553 SHA512 d01d0fc24a3004770bd3923c2debc4fa2752eb71df08cfe423746b9c44a2562ca01d82965ed2563b99572a4bed8034b79487199ce330208b51a3b7f87ccf7103
+DIST avidemux_2.7.0.tar.gz 21474504 BLAKE2B c6e55a0b5220d6d3746fa06162bf11253145fd28f2f6f744702d5e0342fba85e546a28883eb847139eadd34c94037ebc7d68f5576e7505a85288556468d14b96 SHA512 7c92213d3bd2849dbdb5a1aff2acd6da231fd76c561b756fbf4a1d5a41e9705d609d7a35b6ca6b77ceb3bf5138f861cd24ed16d8fcec4fd713f09a2ff07e9015
 EBUILD avidemux-core-2.6.20-r2.ebuild 2592 BLAKE2B e16a93a949c283c64fceb9aad8ba9e252fb7c4c0ba19e4214e709614499994dc49e2a538fad86ab3bcac25b1a1a754db264af320f2cef0577a72b40c2b026d0f SHA512 3e0c2cbb97f734a7ee9d386241bda083fe41d9f0777bad50db6f017fca121aa0cbe4e699d28a6499d7f94b0238da6fa7bc96f9f0bef359a64f000b27b562efad
-EBUILD avidemux-core-9999.ebuild 2563 BLAKE2B d0f54a429d05b82d05573c590d036ca6e4274a3f4b09c460cbd3654c065119707eea74538f38c46cbbd8343274f4977bdcd95b2767d098dd1541c83a6df3a69a SHA512 7a428f7961b8834d6fb4eba6153166d702f99307fb954e97667b0acb97ad90001bf26d747cb4e9ccdae17b24320f7bf2b6e539d62e8f044cbf29a270e5d93026
+EBUILD avidemux-core-2.7.0.ebuild 2501 BLAKE2B fc58cb54d85a4b3283fa0a7e624efee33097afe4660f155ceb9bc17eac273575c105c50439438f43480562a71b111c0c9a0a2386817cc2f44475569bc140916e SHA512 e8bc0a2df509f16cc945be16e09ace874d2fea23810eaea69788952458c7cd90b02261a6765f16d61da28057296976fa581c79c74c2bfcaf55bf4d9775fb89b6
+EBUILD avidemux-core-9999.ebuild 2501 BLAKE2B fc58cb54d85a4b3283fa0a7e624efee33097afe4660f155ceb9bc17eac273575c105c50439438f43480562a71b111c0c9a0a2386817cc2f44475569bc140916e SHA512 e8bc0a2df509f16cc945be16e09ace874d2fea23810eaea69788952458c7cd90b02261a6765f16d61da28057296976fa581c79c74c2bfcaf55bf4d9775fb89b6
 MISC metadata.xml 566 BLAKE2B 4298f411df7407c11de8f5c2cb6bc012223ae9c4e2a302823ee243309510510ad72da5b362265567ba8786476702d42c45c68077c84d9a6929f4d6cc44a29037 SHA512 031ee8ca49399bfb081d3aa2417604de938b701ba671f1de77df1c6f0abdb558d49ebf1ff9d3776f77757236ce05e981bc4a44fc2d1f164e0b499ae6b1b52b6a
diff --git a/media-libs/avidemux-core/avidemux-core-2.7.0.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.0.ebuild
new file mode 100644
index 000000000000..92f9f8ec0689
--- /dev/null
+++ b/media-libs/avidemux-core/avidemux-core-2.7.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"
+	EGIT_CHECKOUT_DIR=${WORKDIR}
+	inherit git-r3
+else
+	MY_PN="${PN/-core/}"
+	MY_P="${MY_PN}_${PV}"
+	SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+inherit cmake-utils
+
+DESCRIPTION="Core libraries for simple video cutting, filtering and encoding tasks"
+HOMEPAGE="http://fixounet.free.fr/avidemux"
+
+# Multiple licenses because of all the bundled stuff.
+LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
+SLOT="2.7"
+IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau xv"
+
+# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed?
+COMMON_DEPEND="
+	dev-db/sqlite:3
+	nvenc? ( media-video/nvidia_video_sdk )
+	sdl? ( media-libs/libsdl:0 )
+	system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] )
+	vaapi? ( x11-libs/libva:0= )
+	vdpau? ( x11-libs/libvdpau:0 )
+	xv? ( x11-libs/libXv:0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<media-video/avidemux-${PV}:${SLOT}
+	nls? ( virtual/libintl:0 )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	!system-ffmpeg? ( dev-lang/yasm[nls=] )
+"
+
+S="${WORKDIR}/${MY_P}"
+CMAKE_USE_DIR="${S}/${PN/-/_}"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if use system-ffmpeg ; then
+		# Preparations to support the system ffmpeg. Currently fails because
+		# it depends on files the system ffmpeg doesn't install.
+		local error="Failed to remove bundled ffmpeg."
+
+		rm -r cmake/admFFmpeg* cmake/ffmpeg* avidemux_core/ffmpeg_package \
+			buildCore/ffmpeg || die "${error}"
+		sed -e 's/include(admFFmpegUtil)//g' -e '/registerFFmpeg/d' \
+			-i avidemux/commonCmakeApplication.cmake || die "${error}"
+		sed -e 's/include(admFFmpegBuild)//g' \
+			-i avidemux_core/CMakeLists.txt || die "${error}"
+	fi
+}
+
+src_configure() {
+	# Add lax vector typing for PowerPC.
+	if use ppc || use ppc64 ; then
+		append-cflags -flax-vector-conversions
+	fi
+
+	# See bug 432322.
+	use x86 && replace-flags -O0 -O1
+
+	local mycmakeargs=(
+		-DAVIDEMUX_SOURCE_DIR='${S}'
+		-DGETTEXT="$(usex nls)"
+		-DNVENC="$(usex nvenc)"
+		-DSDL="$(usex sdl)"
+		-DLIBVA="$(usex vaapi)"
+		-DVDPAU="$(usex vdpau)"
+		-DXVIDEO="$(usex xv)"
+	)
+
+	if use debug ; then
+		mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile -j1
+}
+
+src_install() {
+	cmake-utils_src_install -j1
+}
diff --git a/media-libs/avidemux-core/avidemux-core-9999.ebuild b/media-libs/avidemux-core/avidemux-core-9999.ebuild
index 6d3d4eb7d5f9..92f9f8ec0689 100644
--- a/media-libs/avidemux-core/avidemux-core-9999.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-9999.ebuild
@@ -1,22 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-utils
-
-DESCRIPTION="Core libraries for a video editor designed for simple cutting, filtering and encoding tasks"
-HOMEPAGE="http://fixounet.free.fr/avidemux"
-
-# Multiple licenses because of all the bundled stuff.
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-SLOT="2.6"
-IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau xv"
-
 if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"
 	EGIT_CHECKOUT_DIR=${WORKDIR}
-
 	inherit git-r3
 else
 	MY_PN="${PN/-core/}"
@@ -24,6 +13,15 @@ else
 	SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
+inherit cmake-utils
+
+DESCRIPTION="Core libraries for simple video cutting, filtering and encoding tasks"
+HOMEPAGE="http://fixounet.free.fr/avidemux"
+
+# Multiple licenses because of all the bundled stuff.
+LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
+SLOT="2.7"
+IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau xv"
 
 # Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed?
 COMMON_DEPEND="
@@ -31,7 +29,7 @@ COMMON_DEPEND="
 	nvenc? ( media-video/nvidia_video_sdk )
 	sdl? ( media-libs/libsdl:0 )
 	system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] )
-	vaapi? ( x11-libs/libva:0 )
+	vaapi? ( x11-libs/libva:0= )
 	vdpau? ( x11-libs/libvdpau:0 )
 	xv? ( x11-libs/libXv:0 )
 "
@@ -52,13 +50,16 @@ src_prepare() {
 	cmake-utils_src_prepare
 
 	if use system-ffmpeg ; then
-		# Preparations to support the system ffmpeg. Currently fails because it depends on files the system ffmpeg doesn't install.
-		local error="Failed to remove ffmpeg."
-
-		rm -rf cmake/admFFmpeg* cmake/ffmpeg* avidemux_core/ffmpeg_package buildCore/ffmpeg || die "${error}"
-		sed -i -e 's/include(admFFmpegUtil)//g' avidemux/commonCmakeApplication.cmake || die "${error}"
-		sed -i -e '/registerFFmpeg/d' avidemux/commonCmakeApplication.cmake || die "${error}"
-		sed -i -e 's/include(admFFmpegBuild)//g' avidemux_core/CMakeLists.txt || die "${error}"
+		# Preparations to support the system ffmpeg. Currently fails because
+		# it depends on files the system ffmpeg doesn't install.
+		local error="Failed to remove bundled ffmpeg."
+
+		rm -r cmake/admFFmpeg* cmake/ffmpeg* avidemux_core/ffmpeg_package \
+			buildCore/ffmpeg || die "${error}"
+		sed -e 's/include(admFFmpegUtil)//g' -e '/registerFFmpeg/d' \
+			-i avidemux/commonCmakeApplication.cmake || die "${error}"
+		sed -e 's/include(admFFmpegBuild)//g' \
+			-i avidemux_core/CMakeLists.txt || die "${error}"
 	fi
 }
 
diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest
index 2d2886a0ac6b..d0b532dd9ae2 100644
--- a/media-libs/avidemux-plugins/Manifest
+++ b/media-libs/avidemux-plugins/Manifest
@@ -1,5 +1,7 @@
 AUX avidemux-plugins-2.6.20-optional-pulse.patch 743 BLAKE2B e60a7433e539d49d5bff7dea62bfda984866dd72b93158827ee5ed785d77174db3fbde9e67c9c3fdc8d652485d8e704c075811c65848ef48f78490c6a3061b7f SHA512 dcec29c63aa7eb828fc1aaf4b54edb76290e3c7655b00002efa8036f0572b1c0111c30e873b925bb606e8e672e177ba8d103100b1fb55dcc830b83e4a5556710
 DIST avidemux_2.6.20.tar.gz 20172362 BLAKE2B d458749e470e60b133a177ddf97ee04a665da3f7b2c52e8cc51f907aa5b51d11338ddab9306603b615170b5cf75ec2d3444bd648756bdb724aa442abf7044553 SHA512 d01d0fc24a3004770bd3923c2debc4fa2752eb71df08cfe423746b9c44a2562ca01d82965ed2563b99572a4bed8034b79487199ce330208b51a3b7f87ccf7103
+DIST avidemux_2.7.0.tar.gz 21474504 BLAKE2B c6e55a0b5220d6d3746fa06162bf11253145fd28f2f6f744702d5e0342fba85e546a28883eb847139eadd34c94037ebc7d68f5576e7505a85288556468d14b96 SHA512 7c92213d3bd2849dbdb5a1aff2acd6da231fd76c561b756fbf4a1d5a41e9705d609d7a35b6ca6b77ceb3bf5138f861cd24ed16d8fcec4fd713f09a2ff07e9015
 EBUILD avidemux-plugins-2.6.20.ebuild 4638 BLAKE2B 1ab4804335317d6c12906ec9a000a38cf1665ebcd0223b8dc563ed75f9e23f0631125c5b6521611b96a375a509ad8b54ba82095cb6f626ff122904572a95e692 SHA512 48e038364240357a6c6328b101973b94dd3cc813273ae5e36711aa4b3121b0ac322d2577a0faca8a7455ae6e2063cb4e1b0db3100564f84a77c3a44e4154ddb2
-EBUILD avidemux-plugins-9999.ebuild 4636 BLAKE2B 390405868f1f92d64f9ceda18f789a21c4e472a3d5c2da9a1cb034de78248223ddc54006ef4963e83875894b77ef28a5cf596bd320964aa30bec4e9753c73efe SHA512 8a759c8519da36a701a5bc20f1f044a671d787c0350b92b2ce1862cc5de405f5df29df63f237cb0b0e703244ee1ace1ce3a571f12c691efaa7c48adb8c9feeee
+EBUILD avidemux-plugins-2.7.0.ebuild 4846 BLAKE2B c2570de96b15f10903cd0bbffd1d91a8956b6b344a365adcaeb23ed5a398ecd248c4bfe66322fe02c9da224ab00cfdfe0c492eaf272de88f4389a958ffdc0572 SHA512 a45bc5a0ef692045cf660fa771264012ab1ed5b07720b97ffda198dcbe140aac34c6aa112c34143993c1ac5e69931ba3d5060ef4a5219355ca477b6c159582db
+EBUILD avidemux-plugins-9999.ebuild 4846 BLAKE2B c2570de96b15f10903cd0bbffd1d91a8956b6b344a365adcaeb23ed5a398ecd248c4bfe66322fe02c9da224ab00cfdfe0c492eaf272de88f4389a958ffdc0572 SHA512 a45bc5a0ef692045cf660fa771264012ab1ed5b07720b97ffda198dcbe140aac34c6aa112c34143993c1ac5e69931ba3d5060ef4a5219355ca477b6c159582db
 MISC metadata.xml 1406 BLAKE2B 11611c16434167ee45901a059c37d8802c7b605d21cee9f813982cd8e22e98aac1fa0921662178ef532ef060e7d2c61353a2e057caef3b63a9bf5df06fa6f2a6 SHA512 117225570689a4b78a36b18f5e6c50e185d2db2b10ba6d38869105fa5e718d5dc753eb151cba411df8eba48705e0eee29c2acae8c1a491cc343832d9cfa0290c
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild
new file mode 100644
index 000000000000..fb70ffe36c29
--- /dev/null
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"
+	EGIT_CHECKOUT_DIR=${WORKDIR}
+	inherit git-r3
+else
+	MY_PN="${PN/-plugins/}"
+	MY_P="${MY_PN}_${PV}"
+	SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+PYTHON_COMPAT=( python2_7 )
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="Plugins for the video editor media-video/avidemux"
+HOMEPAGE="http://fixounet.free.fr/avidemux"
+
+# Multiple licenses because of all the bundled stuff.
+LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
+SLOT="2.7"
+IUSE="a52 aac aften alsa amr dcaenc debug dts fdk fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx nvenc opengl opus oss pulseaudio qt5 truetype twolame vdpau vorbis vpx x264 x265 xv xvid"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	~media-libs/avidemux-core-${PV}:${SLOT}[vdpau?]
+	~media-video/avidemux-${PV}:${SLOT}[opengl?,qt5?]
+	>=dev-lang/spidermonkey-1.5-r2:0=
+	dev-libs/libxml2:2
+	media-libs/a52dec:0
+	media-libs/libass:0=
+	media-libs/libmad:0
+	media-libs/libmp4v2:0
+	media-libs/libpng:0=
+	virtual/libiconv:0
+	aac? (
+		>=media-libs/faac-1.29.9.2:0
+		media-libs/faad2:0
+	)
+	aften? ( media-libs/aften:0 )
+	alsa? ( >=media-libs/alsa-lib-1.0.3b-r2:0 )
+	amr? ( media-libs/opencore-amr:0 )
+	dcaenc? ( media-sound/dcaenc:0 )
+	dts? ( media-libs/libdca:0 )
+	fdk? ( media-libs/fdk-aac:0 )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	fribidi? ( dev-libs/fribidi:0 )
+	jack? (
+		media-sound/jack-audio-connection-kit:0
+		libsamplerate? ( media-libs/libsamplerate:0 )
+	)
+	lame? ( media-sound/lame:0 )
+	nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) )
+	opus? ( media-libs/opus:0 )
+	pulseaudio? ( media-sound/pulseaudio:0 )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	truetype? ( media-libs/freetype:2 )
+	twolame? ( media-sound/twolame:0 )
+	vorbis? ( media-libs/libvorbis:0 )
+	vpx? ( media-libs/libvpx:0= )
+	x264? ( media-libs/x264:0= )
+	x265? ( media-libs/x265:0= )
+	xv? (
+		x11-libs/libX11:0
+		x11-libs/libXext:0
+		x11-libs/libXv:0
+	)
+	xvid? ( media-libs/xvid:0 )
+"
+DEPEND="${COMMON_DEPEND}
+	oss? ( virtual/os-headers:0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<media-libs/avidemux-plugins-${PV}:${SLOT}
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.6.20-optional-pulse.patch )
+
+src_prepare() {
+	default
+
+	# Don't reapply PATCHES during cmake-utils_src_prepare
+	unset PATCHES
+
+	processes="buildPluginsCommon:avidemux_plugins
+		buildPluginsCLI:avidemux_plugins"
+	use qt5 && processes+=" buildPluginsQt4:avidemux_plugins"
+
+	for process in ${processes} ; do
+		CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare
+	done
+}
+
+src_configure() {
+	# Add lax vector typing for PowerPC.
+	if use ppc || use ppc64 ; then
+		append-cflags -flax-vector-conversions
+	fi
+
+	# See bug 432322.
+	use x86 && replace-flags -O0 -O1
+
+	for process in ${processes} ; do
+		local build="${WORKDIR}/${P}_build/${process%%:*}"
+
+		local mycmakeargs=(
+			-DAVIDEMUX_SOURCE_DIR='${S}'
+			-DPLUGIN_UI=$(echo ${build/buildPlugins/} | tr '[:lower:]' '[:upper:]')
+			-DFAAC="$(usex aac)"
+			-DFAAD="$(usex aac)"
+			-DALSA="$(usex alsa)"
+			-DAFTEN="$(usex aften)"
+			-DDCAENC="$(usex dcaenc)"
+			-DFDK_AAC="$(usex fdk)"
+			-DOPENCORE_AMRWB="$(usex amr)"
+			-DOPENCORE_AMRNB="$(usex amr)"
+			-DLIBDCA="$(usex dts)"
+			-DFONTCONFIG="$(usex fontconfig)"
+			-DJACK="$(usex jack)"
+			-DLAME="$(usex lame)"
+			-DNVENC="$(usex nvenc)"
+			-DOPUS="$(usex opus)"
+			-DOSS="$(usex oss)"
+			-DPULSEAUDIOSIMPLE="$(usex pulseaudio)"
+			-DQT4=OFF
+			-DFREETYPE2="$(usex truetype)"
+			-DTWOLAME="$(usex twolame)"
+			-DX264="$(usex x264)"
+			-DX265="$(usex x265)"
+			-DXVIDEO="$(usex xv)"
+			-DXVID="$(usex xvid)"
+			-DVDPAU="$(usex vdpau)"
+			-DVORBIS="$(usex vorbis)"
+			-DLIBVORBIS="$(usex vorbis)"
+			-DVPXDEC="$(usex vpx)"
+			-DUSE_EXTERNAL_LIBA52=yes
+			-DUSE_EXTERNAL_LIBASS=yes
+			-DUSE_EXTERNAL_LIBMAD=yes
+			-DUSE_EXTERNAL_LIBMP4V2=yes
+		)
+
+		if use qt5 ; then
+			mycmakeargs+=( -DENABLE_QT5=True )
+		fi
+
+		if use debug ; then
+			mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
+		fi
+
+		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake-utils_src_configure
+	done
+}
+
+src_compile() {
+	for process in ${processes} ; do
+		local build="${WORKDIR}/${P}_build/${process%%:*}"
+		BUILD_DIR="${build}" cmake-utils_src_compile
+	done
+}
+
+src_install() {
+	for process in ${processes} ; do
+		# cmake-utils_src_install doesn't respect BUILD_DIR
+		# and there sometimes is a preinstall phase present.
+		pushd "${WORKDIR}/${P}_build/${process%%:*}" > /dev/null || die
+			grep '^preinstall/fast' Makefile && emake DESTDIR="${D}" preinstall/fast
+			grep '^install/fast' Makefile && emake DESTDIR="${D}" install/fast
+		popd > /dev/null || die
+	done
+}
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild
index 02d96ecd4adb..fb70ffe36c29 100644
--- a/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild
+++ b/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild
@@ -1,25 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="Plugins for the video editor media-video/avidemux"
-HOMEPAGE="http://fixounet.free.fr/avidemux"
-
-# Multiple licenses because of all the bundled stuff.
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-SLOT="2.6"
-IUSE="aac aften a52 alsa amr dcaenc debug dts fdk fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx opengl nvenc opus oss pulseaudio qt5 vorbis truetype twolame xv xvid x264 x265 vdpau vpx"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
 if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"
 	EGIT_CHECKOUT_DIR=${WORKDIR}
-
 	inherit git-r3
 else
 	MY_PN="${PN/-plugins/}"
@@ -27,8 +13,19 @@ else
 	SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
+PYTHON_COMPAT=( python2_7 )
+inherit cmake-utils python-single-r1
 
-RDEPEND="${PYTHON_DEPS}
+DESCRIPTION="Plugins for the video editor media-video/avidemux"
+HOMEPAGE="http://fixounet.free.fr/avidemux"
+
+# Multiple licenses because of all the bundled stuff.
+LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
+SLOT="2.7"
+IUSE="a52 aac aften alsa amr dcaenc debug dts fdk fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx nvenc opengl opus oss pulseaudio qt5 truetype twolame vdpau vorbis vpx x264 x265 xv xvid"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
 	~media-libs/avidemux-core-${PV}:${SLOT}[vdpau?]
 	~media-video/avidemux-${PV}:${SLOT}[opengl?,qt5?]
 	>=dev-lang/spidermonkey-1.5-r2:0=
@@ -59,8 +56,15 @@ RDEPEND="${PYTHON_DEPS}
 	nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) )
 	opus? ( media-libs/opus:0 )
 	pulseaudio? ( media-sound/pulseaudio:0 )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
 	truetype? ( media-libs/freetype:2 )
 	twolame? ( media-sound/twolame:0 )
+	vorbis? ( media-libs/libvorbis:0 )
+	vpx? ( media-libs/libvpx:0= )
 	x264? ( media-libs/x264:0= )
 	x265? ( media-libs/x265:0= )
 	xv? (
@@ -69,11 +73,13 @@ RDEPEND="${PYTHON_DEPS}
 		x11-libs/libXv:0
 	)
 	xvid? ( media-libs/xvid:0 )
-	vorbis? ( media-libs/libvorbis:0 )
-	vpx? ( media-libs/libvpx:0= )
 "
-DEPEND="${RDEPEND}
-	oss? ( virtual/os-headers:0 )"
+DEPEND="${COMMON_DEPEND}
+	oss? ( virtual/os-headers:0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<media-libs/avidemux-plugins-${PV}:${SLOT}
+"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -82,11 +88,12 @@ PATCHES=( "${FILESDIR}"/${PN}-2.6.20-optional-pulse.patch )
 src_prepare() {
 	default
 
-	#Don't reapply PATCHES during cmake-utils_src_prepare
+	# Don't reapply PATCHES during cmake-utils_src_prepare
 	unset PATCHES
 
 	processes="buildPluginsCommon:avidemux_plugins
 		buildPluginsCLI:avidemux_plugins"
+	use qt5 && processes+=" buildPluginsQt4:avidemux_plugins"
 
 	for process in ${processes} ; do
 		CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index 8fb937e38a3e..257d08f0fed1 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -2,11 +2,15 @@ AUX freetype-2.4.11-sizeof-types.patch 1041 BLAKE2B dce55cf1b31d426bb5a59aee2068
 AUX freetype-2.7-enable-valid.patch 533 BLAKE2B 64449eceea9c394ee4a0e2dfb1722c95950561003d3d5ae894b4a571614d8ac6b89a895f883e90ed7d4bdbd225d26bb4a09e49e2b93c4354b8acf1358bb1b067 SHA512 bb8caa36cbd941a24347c761e0110f21aad3f783aab7507de831cdde1d2e83032cbca58ccedac94ce2f5233921a63436fc799f0dd615f21009f7f309d15c6863
 DIST freetype-2.8.1.tar.bz2 1886443 BLAKE2B d53aa77ae9cdc9ca404187e1fdc66be0a766f3f91a591bbbada0a374dd1862c4a8ebfc4be0bb0e823fb45df1e79941c1dd037734b87212a5a5fd97d9a1ca285f SHA512 ca59e47f0fceeeb9b8032be2671072604d0c79094675df24187829c05e99757d0a48a0f8062d4d688e056f783aa8f6090d732ad116562e94784fccf1339eb823
 DIST freetype-2.8.tar.bz2 1873526 BLAKE2B c2336a3774cee0334bd342f4323524063a982c8a46dc5623a420be1a0ccb76ed5adc710673ea2401b0013f80a5c22bbc07e2adb4e842a0763ee1b0afc3cedb82 SHA512 3842c34bf6100a8c9b78258146b2ff35e9bb4c993937d3ef09982c1e2552dfd15f8849ddd8a1e84edf08b5a5fb918b68cf7b1584545c5900e22a00bfa1c89ff5
+DIST freetype-2.9.tar.bz2 1915013 BLAKE2B 6474230507a0bcf9408846cf45d8e0c69314783e38ed71de6ce69031da9b418fe513056068768e4b350a93dd13dadfe8363d72b1d20d5347d5ce1d30d9d9fe08 SHA512 28465f3453baf9a187529432118389de8f1b85273c9fb787d2c8f0feee8ab64b387ddd936b4e67ec58dcf71e33884e7e25f01169b737824221ab143839a9161a
 DIST freetype-doc-2.8.1.tar.bz2 2128376 BLAKE2B b552010341c359666974c4208fe436b4414e73b59d17b2adedb9bc747ff857788bffddc98e53a5f5212ab70792211c754a5a80093bc1e6a7ae894d499a7b3da9 SHA512 386f3e2f123e60e697eb446d667bdcdf184d354a7a9a7bcc42767ea7964cd5a89e5ef42a234838c03e7ce926d3e92d763acb84983afdaf9f6977c028d55f2806
 DIST freetype-doc-2.8.tar.bz2 2127740 BLAKE2B 891b43a7a6b0eae4a0f91110367b47c1c0ebd05a2d1a309669415f98fa08736738504b243d315a100a385074888382c6767f0741dd79814f5783cd215a716ca5 SHA512 3a970a7dd6f0ba580c9f8084b271c11e6e87111ab9a5b6a3148eb1087e45ee18e998aa7e36a4311067a3b674cb784b1e827cf8c3a853e380078219be3eccce06
+DIST freetype-doc-2.9.tar.bz2 2128135 BLAKE2B a192237e9f2cd0b14cf081ba09d58d6e42793d7c8034815d9d8a11a7abf5775bc9181f960405c7f2b12c6994329f8caee3c3ae62cc8b08fbbc3fd285f76922b8 SHA512 0ffd38541f8fd0ae6efb97025bb585209580b964d632e15c66944bc2549e2b0e6c375a141df5061621e8c32eeaed017834530169addc4daa2e83399f88efde2f
 DIST ft2demos-2.8.1.tar.bz2 228934 BLAKE2B a8ff102ec9e526791a83bed42eb5fc289b96f030ebcdbe5bdb4508676d81074ff16120664adeaf95e9d04004e2aba5c86a2b3f5410133344d1ebaf5d4c33cb46 SHA512 f3a3216448df7b9bebb875a69587f31d0548f4b7e1b1bd70b0f06b3c4a43b3f5ca99ac2fcfecb32909b16b32a466fff24d1a6407e5fd6c2145fd64d2a156429a
 DIST ft2demos-2.8.tar.bz2 225274 BLAKE2B b8b02b8b03b84709b7d274d1c8dff323051051ceb3f77762f2fad51ec7a21d34cdbc35a6e828d1755b374d05801d11b0f9968361a34efbb6a6239769b8cd730a SHA512 dffdf6a493e8145c6513be34b57734a9a99c61f758a0e1ea691ef4284cee4c274ad7c3a8120a8ec425d86e33a70cd879d9db258e9c67b6a4db79c3243d4c9fb3
+DIST ft2demos-2.9.tar.bz2 230926 BLAKE2B 8c8e02101243468d52953aeeee7ad985a5aa3fabc82c19a3404ce301348fd32e5f89aa56798613658d5d29a8c3a6c7d4a70eae038ef6095005f8c10354b3f288 SHA512 3dfaf97619d585d6e4db20002c69f9c46cb8991c4faf86d9d92884a80001235ef01010148156cb4879d7869e6121fc27ef03c13288af011df26fe85c3fb7e6a1
 EBUILD freetype-2.8.1.ebuild 5398 BLAKE2B 91adb027e0b1b5903f9ad9d7b456c26df97cded09b5453a9e5f5eb8f71c8ab544424c609d6f969fea99b69019314544d0844074ae4ebcb66ab72e397419dc199 SHA512 b16b15ab519acd02fe9b462ce29987cecb0d3fca081870070c122487c8eeaacb407d13eb345f023718489a04f86c88e7b9b419e6ee2ebcf019bbf21ab77427d7
 EBUILD freetype-2.8.ebuild 5388 BLAKE2B fa9239b515b22566cc2e9f528b7d26e0bad35ae2eda09f68d8104c8f428676053585807caf630afc0e4ebae5f0e548a66967cecb98b1a486f2dfd3c8d28aab89 SHA512 0196c0c055f3a2fd70355569fe2933bbcbcdc4d14656ae5b3a13a487e8048d5ef9ab1365068b2ebc3082c7af92fb3e2f1300f934a320a4c8b03b6156917f777c
+EBUILD freetype-2.9.ebuild 5400 BLAKE2B ca537087b61cef11d2ba6b2e6d377f89029be4517ed0ef6de87e677a669400cd16560559b113f86b25f93b6c0a53c9ed258abfa2840a38a3245207a6acc2f2ac SHA512 43df5ac9eb3b13fc43052bfc7c88ad713a2cdb3fefa97e05ad2934cedcfe16d16d8e15fb8d03287949add0230649fddcf1866d06f1689e381e9abd1849c3638a
 EBUILD freetype-9999.ebuild 6525 BLAKE2B 3416510d17f7e0fb315d597e1b8dec20ada49197ebce1e924c96c5ef8e9a6c34e4b7c95ab0c8a7079a5297d0e688c080f27432518f431a2a92dea95bf05c8b8a SHA512 cd7d5c6780544a3b060eef38f93724001ac4a3aa56ceac5bacd3f2f92f8ebcf0374a33e0f3d0759b63ea061110ac2d2cbdf714f83e9f1948b2413ceb3370a238
 MISC metadata.xml 1595 BLAKE2B 3c0ee074405a5f567d22df9d68682504bf0e3479bb5165fc5b1c1f186b021315ecd3afcd619b30ed52db2766f7c1163f35dca5af1c94c3f0ccef49390fa0df92 SHA512 245c4d591054ce711d74be3d2d7390f08ccc4275a05c034350b2aef5fc8718bbe96967b67c8abe71b34d794fe9e1ceac36a0313d4b270c81ebafd4baf2c6e3d0
diff --git a/media-libs/freetype/freetype-2.9.ebuild b/media-libs/freetype/freetype-2.9.ebuild
new file mode 100644
index 000000000000..7c6cfcd26bf4
--- /dev/null
+++ b/media-libs/freetype/freetype-2.9.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic libtool multilib multilib-build multilib-minimal toolchain-funcs
+
+INFINALITY_PATCH="03-infinality-2.6.3-2016.03.26.patch"
+
+DESCRIPTION="A high-quality and portable font engine"
+HOMEPAGE="http://www.freetype.org/"
+SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
+	mirror://nongnu/freetype/${P/_/}.tar.bz2
+	utils?	( mirror://sourceforge/freetype/ft2demos-${PV}.tar.bz2
+		mirror://nongnu/freetype/ft2demos-${PV}.tar.bz2 )
+	doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2
+		mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )"
+
+LICENSE="|| ( FTL GPL-2+ )"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-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="X +adobe-cff bindist bzip2 +cleartype_hinting debug doc fontforge harfbuzz
+	infinality png static-libs utils"
+RESTRICT="!bindist? ( bindist )" # bug 541408
+
+CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,${MULTILIB_USEDEP}] )
+	png? ( >=media-libs/libpng-1.2.51:=[${MULTILIB_USEDEP}] )
+	utils? (
+		X? (
+			>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+			>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
+			>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
+		)
+	)"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	abi_x86_32? ( utils? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )"
+PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
+
+PATCHES=(
+	# This is the same as the 01 patch from infinality
+	"${FILESDIR}"/${PN}-2.7-enable-valid.patch
+
+	"${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966
+
+	# patches from upstream (can be removed with the next version bump)
+)
+
+src_prepare() {
+	enable_option() {
+		sed -i -e "/#define $1/ { s:/\* ::; s: \*/:: }" \
+			include/${PN}/config/ftoption.h \
+			|| die "unable to enable option $1"
+	}
+
+	disable_option() {
+		sed -i -e "/#define $1/ { s:^:/* :; s:$: */: }" \
+			include/${PN}/config/ftoption.h \
+			|| die "unable to disable option $1"
+	}
+
+	default
+
+	# Will be the new default for >=freetype-2.7.0
+	disable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  2"
+
+	if use infinality && use cleartype_hinting; then
+		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  ( 1 | 2 )"
+	elif use infinality; then
+		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  1"
+	elif use cleartype_hinting; then
+		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  2"
+	fi
+
+	# Can be disabled with FREETYPE_PROPERTIES="pcf:no-long-family-names=1"
+	# via environment (new since v2.8)
+	enable_option PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
+
+	if ! use bindist; then
+		# See http://freetype.org/patents.html
+		# ClearType is covered by several Microsoft patents in the US
+		enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+	fi
+
+	if ! use adobe-cff; then
+		enable_option CFF_CONFIG_OPTION_OLD_ENGINE
+	fi
+
+	if use debug; then
+		enable_option FT_DEBUG_LEVEL_TRACE
+		enable_option FT_DEBUG_MEMORY
+	fi
+
+	if use utils; then
+		cd "${WORKDIR}/ft2demos-${PV}" || die
+		# Disable tests needing X11 when USE="-X". (bug #177597)
+		if ! use X; then
+			sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die
+		fi
+		cd "${S}" || die
+	fi
+
+	# we need non-/bin/sh to run configure
+	if [[ -n ${CONFIG_SHELL} ]] ; then
+		sed -i -e "1s:^#![[:space:]]*/bin/sh:#!$CONFIG_SHELL:" \
+			"${S}"/builds/unix/configure || die
+	fi
+
+	elibtoolize --patch-only
+}
+
+multilib_src_configure() {
+	append-flags -fno-strict-aliasing
+	type -P gmake &> /dev/null && export GNUMAKE=gmake
+
+	local myeconfargs=(
+		--enable-biarch-config
+		--enable-shared
+		$(use_with bzip2)
+		$(use_with harfbuzz)
+		$(use_with png)
+		$(use_enable static-libs static)
+
+		# avoid using libpng-config
+		LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)"
+		LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)"
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use utils; then
+		einfo "Building utils"
+		# fix for Prefix, bug #339334
+		emake \
+			X11_PATH="${EPREFIX}/usr/$(get_libdir)" \
+			FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}"
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi && use utils; then
+		einfo "Installing utils"
+		rm "${WORKDIR}"/ft2demos-${PV}/bin/README || die
+		local ft2demo
+		for ft2demo in ../ft2demos-${PV}/bin/*; do
+			./libtool --mode=install $(type -P install) -m 755 "$ft2demo" \
+				"${ED%/}"/usr/bin || die
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	if use fontforge; then
+		# Probably fontforge needs less but this way makes things simplier...
+		einfo "Installing internal headers required for fontforge"
+		local header
+		find src/truetype include/freetype/internal -name '*.h' | \
+		while read header; do
+			mkdir -p "${ED%/}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
+			cp ${header} "${ED%/}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
+		done
+	fi
+
+	dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO}
+	if use doc ; then
+		docinto html
+		dodoc -r docs/*
+	fi
+
+	prune_libtool_files --all
+}
diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest
index 613dfdcd0d2c..9ebf50e83679 100644
--- a/media-libs/hamlib/Manifest
+++ b/media-libs/hamlib/Manifest
@@ -1,3 +1,3 @@
 DIST hamlib-3.1.tar.gz 2130615 BLAKE2B dbc348d5df04015e1706b6f165496f0b0d9a4f7ce5e5ba6c8589349c1c9c1119ef31e8c3d4ba14666d19f3638bf27ad9b4a566af2fd4054faafc0604b8aeafd0 SHA512 befc5c407379e30711bde2affb9c191add6dbb04a36c1309f8771170cf04156c48609a094775638036282e085de6c78d09ef8d2760d69c595471e16e985e0885
-EBUILD hamlib-3.1.ebuild 2200 BLAKE2B 01f330349f504147997a89ce6158ae075653d0403a798afb8cb733a737948b1dafd6dfdff54efb65b0a141bb91356b9262169964168461ab947c1de4b311bfb7 SHA512 8dbde97ab9f29739be53d27b979ac3dadae6e07b592b6372e63c5ee9ba252b9c0b252c599419b27662951c999444a46b511a94fa0089dd1cc7ae80ffd6ac650f
+EBUILD hamlib-3.1.ebuild 2201 BLAKE2B c32627db7df6714ad241a526c0fc18d3a3ee93d7db2a641028610926e1e45e1c27f71ac46f0030a07786b5b19932374d319c0756ae279e2310067a1bf5d4920c SHA512 3b8a200d30cb246aaefc8df5c9b200557abae9632b57e0232757679dba5f92da79e289f72902025fa799401f3b179367ba5004ba29f8118bebd57c3b01c3259e
 MISC metadata.xml 325 BLAKE2B c1966def562280393eeb5b575d4e136525dc3cf36ef4e6c00dbeff7e0069a4d10eb16706f4b4e929eda1f046d18a8e25fd0025c74695eba1f9c10d19a9f55598 SHA512 fb6d5d77da29969e9b61921ae59e5d5c71b74cebd331867a546a6b2c568650f89191a39a3a1a73c58e1244fa5d13a090b45b866c21b3a3dd71cff0a812c149e5
diff --git a/media-libs/hamlib/hamlib-3.1.ebuild b/media-libs/hamlib/hamlib-3.1.ebuild
index 0b62f3248954..5d91795318c0 100644
--- a/media-libs/hamlib/hamlib-3.1.ebuild
+++ b/media-libs/hamlib/hamlib-3.1.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=5
@@ -21,7 +21,7 @@ RESTRICT="test"
 RDEPEND="
 	=virtual/libusb-0*
 	dev-libs/libxml2
-	sys-libs/readline:0
+	sys-libs/readline:0=
 	perl? ( dev-lang/perl )
 	python? ( ${PYTHON_DEPS} )
 	tcl? ( dev-lang/tcl:0= )"
diff --git a/media-libs/libffado/Manifest b/media-libs/libffado/Manifest
index a34996685dcd..c5ae46cc0ea3 100644
--- a/media-libs/libffado/Manifest
+++ b/media-libs/libffado/Manifest
@@ -2,5 +2,5 @@ AUX libffado-2.3.0-gcc6.patch 1311 BLAKE2B 76148cf44af3130199e8709aae5f7a276a4ed
 AUX libffado-2.3.0-include-signal.patch 1246 BLAKE2B ac37bf4da0600c0ee518ace257b0de2aaad5a815e3cbedf51490c06ad90acdd893ee2fc40b4b318411c59515654db5276f40e5b0fbe877b5d2985a9e56b0c42e SHA512 c256a59a77160141e082fa6cf358ae0454779e15c01a9ceaf1df8ecd101afc74246654f9c088a67c5453434430bdd390ab2712c617737b2a93fa54edcf685177
 AUX libffado-2.3.0-modelname-strip.patch 2128 BLAKE2B 29c52d8d30136e0a040fe1801a15f4149affbb7de721f8614416a407952714426036f77c2b6451d7bf1f69adbe003258098d2dceda52a7f8d9da0604cdf78a26 SHA512 1ebbe47bdd4d15d6527c4a8c2dfa02861c8a8ce287e1cd44e80356b52007c6e55bc9f267436467f1600c0efbd261da227b947b3648c6a8efcedf8997356153ac
 DIST libffado-2.3.0.tgz 1239253 BLAKE2B cb470a590df8018975f40f56cde50468a2b51c9504b719b70ce5941406829f25452a96b8ac897aba1ed6c8d4cafa712e7872430e7bb2ebec0822f7b4720084c5 SHA512 24a8853281a17b04623e41dc590f7a9b8f4aebe4dfaece2e3b8fe28457a6ff011586e817712b4913d1fca660b701dddc70576c12d8c56470cf991eb17b4297c4
-EBUILD libffado-2.3.0.ebuild 2660 BLAKE2B 86dbf41d7dfa2364c6056b3c5fce3afda58cc7715cc4785346a52010f4c69948073e83450ac569805e12478be817949f4f2d3e03698cd7954d619e39e44a338b SHA512 392f2de5939ef4887c84dc80ec8fcf1ec992e566fc24591b6c072c8287dec89b7529b03c14201d10089aba642e8e17b5a1bfad4c17d570705e6900a5ba1a06f0
+EBUILD libffado-2.3.0.ebuild 2684 BLAKE2B 223f4ecd0acedf93aa83a1f0a47fa3f23a731313cca1ea5663b1c4fee515a594df0d04dad429e16c2240e60249b5a0aa151890e57d550462f050bd0ee0c028c6 SHA512 68469a77cf5bba5cc880c35b1d07d0bcb36f41901eebe92e8e127b4cbcd08671d393e29723743d568b5122e878b7f097e512eca6b3a05971fbd0b7b06b9617d4
 MISC metadata.xml 625 BLAKE2B ba2bee4e1ba0c8bc9e8a4bda63c8a184fa4992683ec24bec54424049fbc1b66a8332f25eb6c7841df0198a3a973408fbfe82f0ee306d49f1809d82c12ec3b0c0 SHA512 ac725c6eabcc3cd7fa5ac9f20d936e5a1c494d2a2ed6e504bf27cc750cd328600a8dbcd0adeb27d2bd760ce2b577f9860b1041a899fbfde6b67c4b6a681658eb
diff --git a/media-libs/libffado/libffado-2.3.0.ebuild b/media-libs/libffado/libffado-2.3.0.ebuild
index c5e50c2d21d5..b5d17e932632 100644
--- a/media-libs/libffado/libffado-2.3.0.ebuild
+++ b/media-libs/libffado/libffado-2.3.0.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"
@@ -13,10 +13,10 @@ HOMEPAGE="http://www.ffado.org"
 if [ "${PV}" = "9999" ]; then
 	inherit subversion
 	ESVN_REPO_URI="http://subversion.ffado.org/ffado/trunk/${PN}"
-	KEYWORDS="~arm ~arm64 ~ia64 ~ppc ~ppc64"
+	KEYWORDS="~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 else
 	SRC_URI="http://www.ffado.org/files/${P}.tgz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2 GPL-3"
diff --git a/media-libs/libpagemaker/Manifest b/media-libs/libpagemaker/Manifest
index 3f161400db00..96aed404b069 100644
--- a/media-libs/libpagemaker/Manifest
+++ b/media-libs/libpagemaker/Manifest
@@ -1,4 +1,6 @@
 DIST libpagemaker-0.0.3.tar.xz 292960 BLAKE2B df95adcbf5ff4ee312667b9b5201a53724d9d7d104bb252f5d5cae6719f490fe3541aa39875c1458ef06e8e06a1b23fd19e34e0de05e9e861b24189146c3f865 SHA512 f9a5cb8b2cdfaf550002d5d078eb79537ed29614a2433f8d41101f1e35e9536cbb324c1d96328d21e2d2e0f21ff58d807813e51f8c660b199843fc8710ae29e0
+DIST libpagemaker-0.0.4.tar.xz 306496 BLAKE2B 9928d5759c35359c4983724477e432b6876fa4d6e3039296a880661a4587de612ce93908a93d1d2dfbd033c6478748a4329a1682e327db528ddb7dc0947374ef SHA512 d9d9436622ae378da2a3c8e50a35b6133582a595c9ff0fe0e3b124fd0b83f1f12afdfc6a27d16b509ca9bab33067215d7300e505d4bf6b280be7e4bf46da6c64
 EBUILD libpagemaker-0.0.3-r1.ebuild 962 BLAKE2B b3302c91485e7581c0545620b377445e25ee36dc8ba7c7426b1adb7e42bf0479a94fb12017903cead34354cf035ee603a61a7cf01bd3b907485175a2cb9372db SHA512 a08130e82b144f3fb0568c682ccd5b79c20ed812ee3d4c1c0c5eff085f539a24ccc39bfced0ed724c5072b609e3596651e6eefcef3ad924136ada2ad8f02fcd6
-EBUILD libpagemaker-9999.ebuild 939 BLAKE2B 4d5a8670fe69729440abed34ae0a145a6def55e7e71e7c942ceb81dcf05ac0c3fdbc12db63d9d06b3a2665f6cee504ec37cef27ff86b88389b4c7cdf7b912140 SHA512 c96d847e21649d5c0181cb7504cfa0765b753249ed385ec6b5022b747b5152170200b4ea9efb15fb4ec0f5e0954165cb09846f75b0b06aa068f8620bca177a69
+EBUILD libpagemaker-0.0.4.ebuild 964 BLAKE2B 84883f3284ea13c357ac2fdd2cb825810618db084123a883b64d894e11885e41203d497bf5a8f9c798f2566c7eedf67f88c3d15167e3a25fa268bb2d179a2f1c SHA512 7c02bb4f8fe43d9a7ddcdf218e3be98a40e966b547f49751a430a8e41e0b27870e48082c56641dd20264033401795cac9e41b382879457c7344b3d7fd7294851
+EBUILD libpagemaker-9999.ebuild 964 BLAKE2B 84883f3284ea13c357ac2fdd2cb825810618db084123a883b64d894e11885e41203d497bf5a8f9c798f2566c7eedf67f88c3d15167e3a25fa268bb2d179a2f1c SHA512 7c02bb4f8fe43d9a7ddcdf218e3be98a40e966b547f49751a430a8e41e0b27870e48082c56641dd20264033401795cac9e41b382879457c7344b3d7fd7294851
 MISC metadata.xml 346 BLAKE2B 3957184c53e81e9b9727c3da9593b8c4e9c3ab4b59c03f4a6deeae528d397affac28282108c760ac4ddd0c6699b3027158ba33abb0540d12aa15c56302b3110d SHA512 2585fb6fd9ef4008842e0a5c7b1db3d86f152e2d012fdddeba02d1ca0c6e1e457f10c01c8e76b030a0316807f38f6a6853c0111790d7cb6a93437259dbdf503c
diff --git a/media-libs/libpagemaker/libpagemaker-0.0.4.ebuild b/media-libs/libpagemaker/libpagemaker-0.0.4.ebuild
new file mode 100644
index 000000000000..ce90d99852b3
--- /dev/null
+++ b/media-libs/libpagemaker/libpagemaker-0.0.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="git://gerrit.libreoffice.org/${PN}.git"
+[[ ${PV} == 9999 ]] && inherit autotools git-r3
+
+DESCRIPTION="C++ Library that parses the file format of Aldus/Adobe PageMaker documents."
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/${PN}"
+[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc tools"
+
+RDEPEND="
+	dev-libs/librevenge
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-werror \
+		$(use_with doc docs) \
+		$(use_enable tools)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libpagemaker/libpagemaker-9999.ebuild b/media-libs/libpagemaker/libpagemaker-9999.ebuild
index d14531ff67ab..ce90d99852b3 100644
--- a/media-libs/libpagemaker/libpagemaker-9999.ebuild
+++ b/media-libs/libpagemaker/libpagemaker-9999.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
@@ -14,7 +14,7 @@ LICENSE="MPL-2.0"
 SLOT="0"
 
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc tools"
 
 RDEPEND="
diff --git a/media-libs/qhull/Manifest b/media-libs/qhull/Manifest
index 540c2f060ebc..a2307bb1a39e 100644
--- a/media-libs/qhull/Manifest
+++ b/media-libs/qhull/Manifest
@@ -3,5 +3,5 @@ AUX qhull-2012.1-format-security.patch 495 BLAKE2B 2926c676e94542901ad997e782088
 DIST qhull-2012.1-src.tgz 716665 BLAKE2B b704b87ac36be3d22ab45bce1ec3bf06ed0a3786f6294e6d07af3ead6e313c947a601edccdc03c96512daaf9dead147c024d8c0963c8f3d6125c3c99b41dbfc5 SHA512 e35ea2cb73ef32b23b64a6594a8b5ea22ed8e2ea7535cfd72dca44331602368dfcb681600a0d2b090e80e67e6be7b32272244b9083d4805f2fbcf5897eb73240
 DIST qhull-2015.2.tar.gz 1010153 BLAKE2B 854d1897ad5a92b2e13f6b2304d707b21023a47d60fcc7065b487c24dad06fa016536311e224155b879ad699c046f15991a840f5f04283ffdeef8a68dfbf7c15 SHA512 a544f88b5fbabc592fdc4c5533ba58a8f856e018b85128f43d0532a1143123ceb0d5ca9ae1d27722efa5d08092c017bf7715c157d1019f447e6746f23f02dcd4
 EBUILD qhull-2012.1-r4.ebuild 1287 BLAKE2B d43d4d0f4e0ec371cba16fafa77c64e941c8ad3a57880ab1f4fe7c4233c4617de71eede17424496985c2576ff5e128ef4e318059a81bc335433f6f6a8d57624b SHA512 a15c12ce3713bf0afb205d66ce184fb33b5c6c14f9557b19b497b86619224e9079a573efc1b62dcf1ec254775262c7648c741f4cdd61235dea759b29b418a8e6
-EBUILD qhull-2015.2.ebuild 1039 BLAKE2B cfbb4d16977d25d5558497b28e357e0685b3c31d485aaf5e5465d25487745b76720a5363e31ee0510131c5c866a4d407feef57b7a78ced2717de6cfb88804bbf SHA512 9ca3f4fab86956ac16be37bc06b9a8cb0fcb65b46319bfb19cc00c13cc897047b2a8225ac7b8eb12ea1f0525602bce8ef8184900d042226fc2f0c1cc6a58cf3f
+EBUILD qhull-2015.2.ebuild 1037 BLAKE2B 9669c1f2702416717e10d37fdf6897f12c92ba89f261037251e2ea99d8ab3a95c367e1e7a7998f8381d34ddb1856ef467a1c8e70da9d640d875a7a4332607049 SHA512 2dd2adf65b5efef9227e7c5346b819a83b5d65cd84a2ba245fe4a959c2f84cf8c706dd2ff1799c7dc0f843be3924f3a33bd79c1cb795114a620c35a3912749aa
 MISC metadata.xml 977 BLAKE2B 57a86855387223c875830b8d60eb02f89f469dc4949f094255f43e0251cb537049d0a99a0eb9500c639730f6a0db518ec2b3a4ae050e3c9ea2f508cdbe790e98 SHA512 6e676d2faff561e67e077869a61747c834131ea67acb098497153c98d3bca38032ffa2ab57d6b612cfa4f1fbdb8b05b0c9a9132ab0cdeae5579bdac236b9a1f2
diff --git a/media-libs/qhull/qhull-2015.2.ebuild b/media-libs/qhull/qhull-2015.2.ebuild
index 9cc80f5c1e6b..328e14b473fa 100644
--- a/media-libs/qhull/qhull-2015.2.ebuild
+++ b/media-libs/qhull/qhull-2015.2.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
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}/download/${PN}-2015-src-7.2.0.tgz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc static-libs"
 
 DOCS=( Announce.txt File_id.diz README.txt REGISTER.txt )