gentoo resync : 03.11.2018

12 files changed, 221 insertions, 43 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 4c0f632be159..804d5aecf082 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index a9a34d467bfd..10e6292297c1 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -8,6 +8,6 @@ AUX gpac-freetype.patch 622 BLAKE2B b27d2ae313ca95cd46280b56d42b631854995d5e2832
 DIST gpac-0.6.1.tar.gz 9113143 BLAKE2B 943c09de168f7e0ce5836d5d75e670fbd651d062cf5511728867079485fcda26d984485c04cb73404d419185cd595bba18a7dae6b2f574298ebc59425b1ba62a SHA512 b1409a8ebcda08c3af504d7de591528ef84f5c3d8d506dd490502e16493de11c2435ea3f5957f39100a2ce040d5e431c86a5a203f806fcc865ae4b08f6cf5595
 DIST gpac-0.7.1.tar.gz 10654838 BLAKE2B 795fd11d6bf02bb0d27d97f2c98017e9875aae26ea7d99c5587c7ec5ccc8273283fbce6444389ff4371a34d0e7d03102982ff8a8ec014c7f0c2ddd36c684cba9 SHA512 0377d9471db9e5ccf75f85dfd0c9f4e37a211108b5e128a5411ac015bd9c906257320d517717f0fa03d434e1fce24bd8a9c3a73200fac5c21b80895b716ab403
 EBUILD gpac-0.6.1-r2.ebuild 3211 BLAKE2B abcf08b642fec5182c653b186fc61a16b0f8be87bcad28cd7494c3a871cc9717c3d8e9cef51616a7a9b99ed61d9e12644f284ecf95d3fb9fb0f8462faa6667eb SHA512 2bfa94a7e2ccfb8953a505047bcbf2843218530d79b66a839dc2ee9c6d324914d37f673563a0bc71eca4fdd18ee720acdc30fe58d24efb8b347df6030afb75a5
-EBUILD gpac-0.7.1.ebuild 3499 BLAKE2B 30ef351d63cc2e35d1380fcd973accdec5dbf2fd0e486e44fd7693e6ee889f13dd4e7d0166a4f947f61943b0bb1935247b1d2113f15e8174d69c1de4a49530ae SHA512 3db6c70aee8146a3db6a862d0919dbb96a58fc9077f9b6b4d8a23ab077ae2c209fddf392c1a1e5961af952ff35efe0299f85f052f88cf852c8113755f19df368
-EBUILD gpac-9999.ebuild 3095 BLAKE2B 5a1223e8f93f7b0ac751e1a8f46c305b60d578bb8235d23c9bb9f9619db405ee35607714df635d003a0e742b425265114f3e4b2dca527b2601691ee93ce90ba5 SHA512 f5d8046010c916cdca9ae2698e5d08fe29fb2637a869799c021968aad872094d1e2ca68db77cf36c62b154bd5b5e31ff392b01cb522e701c04565304eb185a06
+EBUILD gpac-0.7.1.ebuild 3480 BLAKE2B 6e1e83a6bdeb6827cf6927c59d15ef299158e8f24b649c75d53601222d12567e224b64fb68678fb72df9ecf3002ccaaeabe1e63760908937fcb82954038279c8 SHA512 991f1af2143baf56748012d48ef6d9132ba4d03e9e6347d41be0e2dd81742310bc24e5b9a76b0be526efc6a9d6e5bb09f135cd69b03ca377990913457588aaa2
+EBUILD gpac-9999.ebuild 3243 BLAKE2B b9ac1b87c46486616ce0212037494ea238d42939f8b6ce88b943840414f0d7ab409d51969d8c30b1b60bb2c559e742ca388b83290ebbf18776d7ee24024a0fb5 SHA512 9f3ff849d76e8747cd913d2a28ac9768678918b5dfb73c98fa50360eac97d636920cd31e330fd1413da41e900ef6080132f876835cad8ad26ecf0ba2fe252f6a
 MISC metadata.xml 356 BLAKE2B 02d021261f873991949e9d24bdd1f2791a93e033c6a350bd014bdc9d2fa32f733547d8f7b78733f010d95420e07d4d1c0dd63ac367757dcc505a4eb0801921bb SHA512 651073c0156c19eda006ee7622db5a127f1e2f747ed7e0cb141be1abca2084a1427ea82a888b335a68b056980b68a693f852b44d96bfe47f28cc985bf72dfac4
diff --git a/media-video/gpac/gpac-0.7.1.ebuild b/media-video/gpac/gpac-0.7.1.ebuild
index fea54fdfefe0..73698dcdb6b6 100644
--- a/media-video/gpac/gpac-0.7.1.ebuild
+++ b/media-video/gpac/gpac-0.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 fi
 
-inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
+inherit flag-o-matic toolchain-funcs ${SCM}
 
 DESCRIPTION="Implementation of the MPEG-4 Systems standard developed from scratch in ANSI C"
 HOMEPAGE="https://gpac.wp.imt.fr/"
diff --git a/media-video/gpac/gpac-9999.ebuild b/media-video/gpac/gpac-9999.ebuild
index 1853504344e3..0beb2918a9d4 100644
--- a/media-video/gpac/gpac-9999.ebuild
+++ b/media-video/gpac/gpac-9999.ebuild
@@ -1,25 +1,25 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
 if [[ ${PV} == *9999 ]] ; then
 	SCM="git-r3"
 	EGIT_REPO_URI="https://github.com/gpac/gpac"
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 fi
 
-inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
+inherit flag-o-matic toolchain-funcs ${SCM}
 
-DESCRIPTION="GPAC is an implementation of the MPEG-4 Systems standard developed from scratch in ANSI C"
-HOMEPAGE="http://gpac.wp.mines-telecom.fr/"
+DESCRIPTION="Implementation of the MPEG-4 Systems standard developed from scratch in ANSI C"
+HOMEPAGE="https://gpac.wp.imt.fr/"
 
 LICENSE="GPL-2"
-SLOT="0"
-IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k mad opengl oss png
+# subslot == libgpac major
+SLOT="0/7"
+IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libav libressl mad opengl oss png
 	pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
 
 RDEPEND="
@@ -27,32 +27,53 @@ RDEPEND="
 	aac? ( >=media-libs/faad2-2.0 )
 	alsa? ( media-libs/alsa-lib )
 	dvb? ( media-tv/linuxtv-dvb-apps )
-	ffmpeg? ( virtual/ffmpeg )
+	ffmpeg? (
+		!libav? ( media-video/ffmpeg:0= )
+		libav? ( media-video/libav:0= ) )
 	jack? ( media-sound/jack-audio-connection-kit )
-	jpeg? ( virtual/jpeg )
+	jpeg? ( virtual/jpeg:0 )
 	mad? ( >=media-libs/libmad-0.15.1b )
 	opengl? ( virtual/opengl media-libs/freeglut virtual/glu )
 	>=media-libs/libogg-1.1
-	png? ( >=media-libs/libpng-1.4 )
+	png? ( >=media-libs/libpng-1.4:0= )
 	vorbis? ( >=media-libs/libvorbis-1.1 )
 	theora? ( media-libs/libtheora )
-	truetype? ( >=media-libs/freetype-2.1.4 )
-	xml? ( >=dev-libs/libxml2-2.6.0 )
+	truetype? ( >=media-libs/freetype-2.1.4:2 )
+	xml? ( >=dev-libs/libxml2-2.6.0:2 )
 	xvid? ( >=media-libs/xvid-1.0.1 )
 	sdl? ( media-libs/libsdl )
 	jpeg2k? ( media-libs/openjpeg:0 )
-	ssl? ( dev-libs/openssl )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= ) )
 	pulseaudio? ( media-sound/pulseaudio )
 	X? (
 		x11-libs/libXt
 		x11-libs/libX11
 		x11-libs/libXv
 		x11-libs/libXext
-	)"
+	)
+"
 # disabled upstream, see applications/Makefile
 # wxwidgets? ( =x11-libs/wxGTK-2.8* )
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
-DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/${PN}-0.7.1-configure.patch" )
+
+DOCS=(
+	doc/CODING_STYLE
+	doc/GPAC\ UPnP.doc
+	doc/ISO\ 639-2\ codes.txt
+	doc/SceneGenerators
+	doc/ipmpx_syntax.bt
+	Changelog
+	AUTHORS
+	BUGS
+	README.md
+	TODO
+)
+HTML_DOCS="doc/*.html"
 
 my_use() {
 	local flag="$1" pflag="${2:-$1}"
@@ -64,9 +85,7 @@ my_use() {
 }
 
 src_prepare() {
-	epatch	"${FILESDIR}"/110_all_implicitdecls.patch \
-			"${FILESDIR}"/${PN}-0.5.3-static-libs.patch \
-			"${FILESDIR}"/${PN}-0.5.2-gf_isom_set_pixel_aspect_ratio.patch
+	default
 	sed -i -e "s:\(--disable-.*\)=\*):\1):" configure || die
 }
 
@@ -83,7 +102,7 @@ src_configure() {
 		$(use_enable debug) \
 		$(use_enable ipv6) \
 		$(use_enable jack jack yes) \
-		$(use_enable opengl) \
+		$(use_enable opengl 3d) \
 		$(use_enable oss oss-audio) \
 		$(use_enable pulseaudio pulseaudio yes) \
 		$(use_enable sdl) \
@@ -110,9 +129,7 @@ src_configure() {
 }
 
 src_install() {
+	einstalldocs
 	emake STRIP="true" DESTDIR="${D}" install
 	emake STRIP="true" DESTDIR="${D}" install-lib
-	dodoc AUTHORS BUGS Changelog README.md TODO
-	dodoc doc/*.txt
-	dohtml doc/*.html
 }
diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index 51bf174806d6..22838f99d885 100644
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -3,8 +3,10 @@ AUX smplayer-16.4.0-zero-bidi.patch 489 BLAKE2B 50f535154f771e535c244aff2dbd27b6
 AUX smplayer-17.1.0-advertisement_crap.patch 1982 BLAKE2B 22a5027e9d20dca47fed1176e13cd9f8f5c912f51352d07f8fc0dd1f0850dc241483e22524c9fab2b9e20e67d1527f391a791afa2ac96285c4a199801ab96b65 SHA512 7bc1a3e9fb916d3a7e0c4f9bba8bb2adb7a3822e34694f79501e228f700b27633cac2eba237ab4af221c50f07295ecab3093c2a7033578a3e0a91a1e6449570d
 AUX smplayer-18.2.0-jobserver.patch 423 BLAKE2B 04452fa5992dd2cef5be64dc9a9c78ca775336174dbef69e6054361173886be26d941cabfe2c5b486a05f2b3bee7029b439652d4dfb10e5651a7db68db8b70af SHA512 6bdb6d57be84c1d020c6f2e2f547eda9a0118bfcd0e4d2cdbb940501a0853ec388f359e04a52b8ff9c6c6b38d60f3837ed2c2e127a4df5bf79751486d9ed9ed6
 AUX smplayer-18.3.0-disable-werror.patch 367 BLAKE2B 68b0f5b9cb34afb3843de4dd366a0a2e77eea881277d7b8a7928e851d2456f8fe5220ee50ae77296b622187758b7f6f3a4c298c0400becfee0d2fa074e7706e3 SHA512 b330aee54397a3fce5cda3a1244918351831ffe37cc7d45bcfa93384952bdce3166875afd5cd4bae9f1d6e83281b6b6bfc3ad777317a0b2c6c5dcc5593ddcb54
+DIST smplayer-18.10.0.tar.bz2 5167524 BLAKE2B e6c1993057f9249cb0677643816744c3a7e44bdd70865b21bc5d69d6f087c03be53fa01057ac75c42d74a00a6d5b5f6e8be4e6955ffe022196c45bba218becc2 SHA512 7726294c16761900b384db42155a26891f9becae38ef39b35dd9c6a62c2050b5720a8b641a893b33c7bc08a5c98e12a4651196a67311444d6cbed2dbd5895f5c
 DIST smplayer-18.6.0.tar.bz2 5111791 BLAKE2B db19932703d93cba7f3f54989988d88af7ed033a61388f89263f613ce743cfd1ff649dad9db2b43193a459110267ee176eae9640f814e77545cfe6b5fb53abe2 SHA512 8383c8c3d4a171adc189d6bc4c11c0b7a8ea78bf8ff8518589647dfd846b314cf3290a1d607c617e7e971ee29c6966666bf9d306d1b1c1bb4824f42efd97c7a8
 DIST smplayer-18.9.0.tar.bz2 5163115 BLAKE2B 84fa716fbe01dc3719ca74e0419229c70e0955ccbc482471e24dfa22e8ce4c03edbd99bc8aa92cad2ec2fc2060feaf2cab13850fab05fc6f3e34bba63861e22a SHA512 ee2e68877ad9fb45923e46512953326b6703e830964c3d123aee6a4ca96990fae03a3b568b313aae76548dea08d671f86ef55b3023bc46eb3aa73b1ff96c135d
+EBUILD smplayer-18.10.0.ebuild 3209 BLAKE2B f768219c133221d3b32f199cbc599d1a4c125922b018c36d2ee68429c17d6d935654d59d56d63761e2177028bb4d66e784d9b1bdbda0c8723f855f8c3c7d2f9e SHA512 4892bc88f019f797062ee98375e80dcbe909408cf41d175e4d8a87d1f7c8ddb74878a4102c7d9ecf851fefa5f96bccd0eeb8e7acc818eb779d5900ca72a66dac
 EBUILD smplayer-18.6.0.ebuild 3210 BLAKE2B ba9f7d3676975005609ad952cc02f3b859b016dc7442cd07117bbae390a6f820dfafce3177fff8802ee673d1b5ab68ae1bbb0ca26325526ce793ca0f2ce38cc1 SHA512 0f9a893db8bfc70f2bcad5ff6c6a394d9af54ff81793d475cd5a9ebe6aebcb1402083cbc18e68227f9a99389c6c16ebd2ed5e81a2e7a936739038703a3ae7ef4
 EBUILD smplayer-18.9.0.ebuild 3212 BLAKE2B c33eac8e4b85c11234107d4f316c999dcd04085e180bfbe1703a72adf804c11f7b2ad685e656d12ded2ca09be6efe07c8e636842d1c6eb31c76d081d4491c531 SHA512 e56132a6953a0f5fd980adc562a63edfa11d4e2eb73d41442fa9b52ad4b028e73e70623435aad7ab347d2286e438274e54e67a1911fa2eb68c3381ea562c184e
 MISC metadata.xml 886 BLAKE2B 93069f16c27051f346dfd71113b7998f84c09efc7b1b7ad05600f82712e1693368a99bd51e4833cb8ec5c6433ec41f002370e564a2f67aace9e65fea14ce7653 SHA512 e82489ac4436ddbecd44783d694f1056a8a40b278ef941faa236079ad4cfdf0d542cee8c73b7ae1492efe76c2cac31c6a641e2187e01a1210d4b5cd519a839f4
diff --git a/media-video/smplayer/smplayer-18.10.0.ebuild b/media-video/smplayer/smplayer-18.10.0.ebuild
new file mode 100644
index 000000000000..87ba114738e4
--- /dev/null
+++ b/media-video/smplayer/smplayer-18.10.0.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="am ar_SY ar bg ca cs da de el en_GB en en_US es et eu fa fi fr gl
+he_IL hr hu id it ja ka ko ku lt mk ms_MY nl nn_NO pl pt_BR pt ro_RO ru_RU
+sk sl_SI sq_AL sr sv th tr uk_UA uz vi_VN zh_CN zh_TW"
+PLOCALE_BACKUP="en_US"
+
+inherit gnome2-utils l10n qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="Great Qt GUI front-end for mplayer/mpv"
+HOMEPAGE="http://www.smplayer.eu/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux"
+IUSE="autoshutdown bidi debug mpris"
+
+COMMON_DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5=
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtscript:5
+	dev-qt/qtsingleapplication[X,qt5(+)]
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-libs/zlib
+	autoshutdown? ( dev-qt/qtdbus:5 )
+	mpris? ( dev-qt/qtdbus:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+"
+RDEPEND="${COMMON_DEPEND}
+	|| (
+		media-video/mplayer[bidi?,libass,png,X]
+		(
+			>=media-video/mpv-0.15.0[libass,X]
+			>=net-misc/youtube-dl-2014.11.26
+		)
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-14.9.0.6966-unbundle-qtsingleapplication.patch" # bug 487544
+	"${FILESDIR}/${PN}-17.1.0-advertisement_crap.patch"
+	"${FILESDIR}/${PN}-18.2.0-jobserver.patch"
+	"${FILESDIR}/${PN}-18.3.0-disable-werror.patch"
+)
+
+src_prepare() {
+	use bidi || PATCHES+=( "${FILESDIR}"/${PN}-16.4.0-zero-bidi.patch )
+
+	default
+
+	# Upstream Makefile sucks
+	sed -i -e "/^PREFIX=/ s:/usr/local:${EPREFIX}/usr:" \
+		-e "/^DOC_PATH=/ s:packages/smplayer:${PF}:" \
+		-e '/\.\/get_svn_revision\.sh/,+2c\
+	cd src && $(DEFS) $(MAKE)' \
+		Makefile || die
+
+	# Turn off online update checker, bug #479902
+	sed -e 's:DEFINES += UPDATE_CHECKER:#&:' \
+		-e 's:DEFINES += CHECK_UPGRADED:#&:' \
+		-i src/smplayer.pro || die
+
+	# Turn off intrusive share widget
+	sed -e 's:DEFINES += SHARE_WIDGET:#&:' \
+		-i src/smplayer.pro || die
+
+	# Toggle autoshutdown option which pulls in dbus, bug #524392
+	if ! use autoshutdown ; then
+		sed -e 's:DEFINES += AUTO_SHUTDOWN_PC:#&:' \
+			-i src/smplayer.pro || die
+	fi
+
+	# Turn debug message flooding off
+	if ! use debug ; then
+		sed -e 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' \
+			-i src/smplayer.pro || die
+	fi
+
+	# MPRIS2 pulls in dbus, bug #553710
+	if ! use mpris ; then
+		sed -e 's:DEFINES += MPRIS2:#&:' \
+			-i src/smplayer.pro || die
+	fi
+
+	# Commented out because it gives false positives
+	#l10n_find_plocales_changes "${S}"/src/translations ${PN}_ .ts
+}
+
+src_configure() {
+	cd src || die
+	eqmake5
+}
+
+gen_translation() {
+	local mydir="$(qt5_get_bindir)"
+
+	ebegin "Generating $1 translation"
+	"${mydir}"/lrelease ${PN}_${1}.ts
+	eend $? || die "failed to generate $1 translation"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+
+	cd src/translations || die
+	l10n_for_each_locale_do gen_translation
+}
+
+src_install() {
+	# remove unneeded copies of the GPL
+	rm -f Copying* docs/*/gpl.html || die
+	# don't install empty dirs
+	rmdir --ignore-fail-on-non-empty docs/* || die
+
+	default
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-video/subtitlecomposer/Manifest b/media-video/subtitlecomposer/Manifest
index 8245e434af4f..4afa658fa77d 100644
--- a/media-video/subtitlecomposer/Manifest
+++ b/media-video/subtitlecomposer/Manifest
@@ -1,5 +1,6 @@
+AUX subtitlecomposer-0.6.6-cmake.patch 454 BLAKE2B 61bce9ca11c64c243aefdee08994d18e0e11a9dc4f985198ab83131b328da20cfe4d92a439395cda3a4d0b3eae6fc9f05531adf41a2955bdf124fc160421c653 SHA512 cbcfba8c34430640eb6351012e1d0358041b5dbd7b1565ab170b5937d51300c85be4331c52181e1176d60a97a0d995685b71559ead096a188fa3879c487fa9df
 DIST subtitlecomposer-0.6.4.tar.gz 1638176 BLAKE2B b71de34df7f9e98d94a541d029bf5a06aafd6c67ded1b87647c176f0579b3f6e6fe79c797e9f438d850f9aad93cc461704ea43590b31ed855673249f6227f4d0 SHA512 585471b7fbcbe21da31fc5f67b7803bac5820ba1dd13135ab17d86121b105926712fd2c726541153e0223ca9a72a717f80229f3a32f526319357ae0ef47af18e
 DIST subtitlecomposer-0.6.6.tar.gz 1637272 BLAKE2B 0a3a7cc7f0301b5ea8cb7affd4600349c8b65bf8a856480e706a3549d8deb7ddc687faad11258d7753e6484783b50fff99ddbd1fc9f68a35fbd0b4346a7a2748 SHA512 0f1513d3ff0abcbd0979b370e1ec4cd0b92f7e65adef8c922ddbf37e2dbc73fb4cd821356df6dc1ba3d8832ab8cba25573f68297f4f6be05b5c4d824a663872a
 EBUILD subtitlecomposer-0.6.4.ebuild 1637 BLAKE2B 81ccde2b2548926de9af7c5b037a004450ec489496a22d4dbbc76c34ac93da04a857047a10b0d3e31b26a1cddc7dc7b601084b5b4a1eac056b4c9754609f9dbe SHA512 e85d6ee1a174bb5156349091358affc4690002c6da7e7b89a1db707ed3317ec786af9999a927d29451684eb705e04c9997299dbaef07f2ec41ec4a76634703e4
-EBUILD subtitlecomposer-0.6.6.ebuild 1839 BLAKE2B 699491b8b9883f2dbce6b26c697df671fcd8501e007f1150da504119446f277b8b6b2a60cbdab0de430fe0a700787b4a354969e0627f0af90f2bf9f228d7a99e SHA512 01571831ae2448ad7570c52948e8a0e8b3eaf61d8f2ef9f8d397ef026a3d077ee40c4448d62f66f55aba08102f780c946f658a6e6e5c98a5887739372e8ab0cb
+EBUILD subtitlecomposer-0.6.6.ebuild 1881 BLAKE2B 3f67acfa1643230609445c92ef8ec18f2eaba65f0fdd7b20c9b066b2d153c55dcb755fd5f3c6c48f1ca3942266d7da2ab97d5773e6f9d0b4030ed64e4c43f979 SHA512 5d3d1bab8ae075ad9b00d3e876ec4c4b1426ddbbbce1227a4eb7f1c8a63104adae1a20dcfd9f9c10ff77922cd9a0a34e9cc3a6aac7370a5ed89af590a354288a
 MISC metadata.xml 524 BLAKE2B 662474bada941eadcab48ae4432e72af4f786ff61d2bc1db20115e2f70ca4953e01c38fd550cce72908fe5c36077d9e1b240f53e24142c7556802f3a7783d1bd SHA512 c2ef5d88d2b12534ba76ba4949c4ceee405f88b546f3b749704d8f7529d1b19b3ce8b20b18b496203259dcbde74ba7bf948ae9e4fa4601984554f8f0664a6efe
diff --git a/media-video/subtitlecomposer/files/subtitlecomposer-0.6.6-cmake.patch b/media-video/subtitlecomposer/files/subtitlecomposer-0.6.6-cmake.patch
new file mode 100644
index 000000000000..4c97e15a9e13
--- /dev/null
+++ b/media-video/subtitlecomposer/files/subtitlecomposer-0.6.6-cmake.patch
@@ -0,0 +1,12 @@
+diff -ruN subtitlecomposer-0.6.6/CMakeLists.txt subtitlecomposer-my/CMakeLists.txt
+--- subtitlecomposer-0.6.6/CMakeLists.txt	2018-02-11 03:08:46.000000000 +0100
++++ subtitlecomposer-my/CMakeLists.txt	2018-10-13 07:19:22.163074971 +0200
+@@ -12,7 +12,7 @@
+ 
+ cmake_policy(SET CMP0043 NEW)
+ cmake_policy(SET CMP0063 NEW)
+-cmake_policy(SET CMP0071 NEW)
++#cmake_policy(SET CMP0071 NEW) # since cmake-3.10
+ 
+ include(KDEInstallDirs)
+ include(KDECMakeSettings)
diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.6.6.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.6.6.ebuild
index 57cb8983dbf1..55b113a40f88 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.6.6.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.6.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -54,6 +54,10 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-cmake.patch"
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_PocketSphinx=ON # bug 616706
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 7de1b5a084c5..1cad64a8cf7c 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -10,6 +10,6 @@ DIST vlc-3.0.3.tar.xz 24941592 BLAKE2B dd6e27b10064ecae1c6f64459d2ed172d09f8dc14
 DIST vlc-3.0.4.tar.xz 24934112 BLAKE2B b8e680e178f5d34b187d5ee613a75e247b9ef500b18843a6c987479d1afc2e723111a7d3f2ac2ec8c2f34cbd36e2e7a9c0e0add6e594418fc429ec8878f0b1b0 SHA512 55c5a45a1573d559f8d62272dc446bebfb328bd48f938e634693a45032e1a3095148e634de5bc53a3a3c0e4858f7df3ed7e5dc91f3f5447e47d0ab5775171271
 EBUILD vlc-3.0.3-r1.ebuild 13450 BLAKE2B 90c0942f1018dc8bae1bc15c4417bb7555aede9e6ec7d3a87ddd048af03d816855cc3f96e1042a2f6c0d2949ca76dd8b9d80b240509413af3bb61e212ffd11ad SHA512 072af5095c8fda41fe7c29d4254a4147687b64a8593b117d37466dc8012d1c64bb7291ecf6a5ef0f806f6de0522dd90eb796568f73201cd1a327d85efd3f7218
 EBUILD vlc-3.0.4.ebuild 13221 BLAKE2B 65f35cbb37b2da5bf91ceea246a32f70980c96eae0a30dd816dd43c26eba4326682b8a8a5b52b351eb666b6c107352498f1918f59b47edb34d0c13054f7af95f SHA512 3698903d40c16dee702bfedd47888b465d11a5a7d93442ceb758a92d8c14c93710a349a4e83943e39cdf9c8aa5fcd6e879dd1bca9fb71b06faf5a93cebc5266e
-EBUILD vlc-3.0.9999.ebuild 13226 BLAKE2B 612c0e25b550e63fe14d871d95737b7d7f7388feb22db02685419a7ff86effc30e6a8591b267650154a3807b33a4a347a09510b778303324b7199ebb5d41c96d SHA512 5a619b52dc28b8aab14519c274483e44d1b71d2f26d8740fd4e757b7759899ec2ec123f0811ca6a353a4d1009c91f0f7403097806475f041cfed8752c4d2f4f2
-EBUILD vlc-9999.ebuild 13209 BLAKE2B 47add64565abb5e7f4fc44729f67de84d6bfe7bc025819d3f986d9497207bdb12c4a27462d917ae18197fe31899a252eed8aaf3efd80a0350e7c2c32d21e7706 SHA512 86bfd49188514a5ccd813590f8ec8eff9bd55d751b8c2f6057d250031bbcbe3dade0a18a55bfaba07ea7b11f42208d431fe04dc7c79a500679268a9cdf4fc49b
+EBUILD vlc-3.0.9999.ebuild 13335 BLAKE2B 6fae468451c37a769c158af2bb1a63a6f20d4a09f0abd4a8f8591e328dc3b3fb757634e1ce157b8c7ef8e33ce326f55a6128569a1f778a6b4eeae4191def98a2 SHA512 da6f54017dfe0bd81632898a45141f837ca18e09e67765726a36f814b2f675bd3e9a1ff295bd318a37d1a98d059576da58f2df9700467abe2fe64d2a9dbf4207
+EBUILD vlc-9999.ebuild 13318 BLAKE2B a04c1806ced8930329d08146b407ed5ee7fae86727e2a77fd472296358eb9295a06b6f4e95a9f5c0f567b134e2339adbabfe0a978d13dccf726dd0adf71b8062 SHA512 0a431903eef79e28c7349f6a2737c5e82359258758641125ae30f60cedadeb1cb3e18143241fdb730a96b7776552241c0e95915351d48ef5110cda3ee46cc8bb
 MISC metadata.xml 5126 BLAKE2B 107f372c830ec4bdb8ee0ca64dedb7259b08c5ee0832e9a371bf62f0a2908a76fda48cb0738e3c406090824a0c4840784004878c4364307ad76dc997e5425517 SHA512 39e2ddb1ff53603585b54410d04c783077f681b93be2f00ad91b418f029a6fb432671efb5ae3eede535d4c7b45bf43d7e5ce5cb8649064401e11eef6b025cd7a
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index b2e1f771823a..c06e6f61f05c 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,7 +33,7 @@ IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromeca
 	dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth
 	fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass
 	libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua
-	macosx-notifications macosx-qtkit matroska modplug mp3 mpeg mtp musepack ncurses
+	macosx-notifications macosx-qtkit mad matroska modplug mp3 mpeg mtp musepack ncurses
 	neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5
 	rdp run-as-root samba schroedinger sdl-image sftp shout sid skins soxr speex srt ssl
 	svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx
@@ -130,13 +130,14 @@ RDEPEND="
 	lirc? ( app-misc/lirc:0 )
 	live? ( media-plugins/live:0 )
 	lua? ( >=dev-lang/lua-5.1:0 )
+	mad? ( media-libs/libmad )
 	matroska? (
 		dev-libs/libebml:0=
 		media-libs/libmatroska:0=
 	)
-	modplug? ( media-libs/libmodplug:0 )
-	mp3? ( media-libs/libmad:0 )
-	mpeg? ( media-libs/libmpeg2:0 )
+	modplug? ( media-libs/libmodplug )
+	mp3? ( media-sound/mpg123 )
+	mpeg? ( media-libs/libmpeg2 )
 	mtp? ( media-libs/libmtp:0= )
 	musepack? ( media-sound/musepack-tools:0 )
 	ncurses? ( sys-libs/ncurses:0=[unicode] )
@@ -272,6 +273,7 @@ src_configure() {
 		--disable-aa
 		--disable-dependency-tracking
 		--disable-optimizations
+		--disable-rpath
 		--disable-update-check
 		--enable-fast-install
 		--enable-screen
@@ -333,9 +335,10 @@ src_configure() {
 		$(use_enable lua)
 		$(use_enable macosx-notifications osx-notifications)
 		$(use_enable macosx-qtkit)
+		$(use_enable mad)
 		$(use_enable matroska)
 		$(use_enable modplug mod)
-		$(use_enable mp3 mad)
+		$(use_enable mp3 mpg123)
 		$(use_enable mpeg libmpeg2)
 		$(use_enable mtp)
 		$(use_enable musepack mpc)
@@ -390,6 +393,7 @@ src_configure() {
 		$(use_enable zeroconf avahi)
 		$(use_enable zvbi)
 		$(use_enable !zvbi telx)
+		--with-kde-solid=/usr/share/solid/actions
 		--disable-asdcp
 		--disable-coverage
 		--disable-cprof
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index bc8a5669d833..f38f3b52ffb8 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,7 +33,7 @@ IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromeca
 	dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth
 	fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate kms libass
 	libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua
-	macosx-notifications macosx-qtkit matroska modplug mp3 mpeg mtp musepack ncurses
+	macosx-notifications macosx-qtkit mad matroska modplug mp3 mpeg mtp musepack ncurses
 	neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5
 	rdp run-as-root samba schroedinger sdl-image sftp shout sid skins soxr speex srt ssl
 	svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx
@@ -131,13 +131,14 @@ RDEPEND="
 	lirc? ( app-misc/lirc:0 )
 	live? ( media-plugins/live:0 )
 	lua? ( >=dev-lang/lua-5.1:0 )
+	mad? ( media-libs/libmad )
 	matroska? (
 		dev-libs/libebml:0=
 		media-libs/libmatroska:0=
 	)
-	modplug? ( media-libs/libmodplug:0 )
-	mp3? ( media-libs/libmad:0 )
-	mpeg? ( media-libs/libmpeg2:0 )
+	modplug? ( media-libs/libmodplug )
+	mp3? ( media-sound/mpg123 )
+	mpeg? ( media-libs/libmpeg2 )
 	mtp? ( media-libs/libmtp:0= )
 	musepack? ( media-sound/musepack-tools:0 )
 	ncurses? ( sys-libs/ncurses:0=[unicode] )
@@ -274,6 +275,7 @@ src_configure() {
 	local myeconfargs=(
 		--disable-dependency-tracking
 		--disable-optimizations
+		--disable-rpath
 		--disable-update-check
 		--enable-fast-install
 		--enable-screen
@@ -336,9 +338,10 @@ src_configure() {
 		$(use_enable lua)
 		$(use_enable macosx-notifications osx-notifications)
 		$(use_enable macosx-qtkit)
+		$(use_enable mad)
 		$(use_enable matroska)
 		$(use_enable modplug mod)
-		$(use_enable mp3 mad)
+		$(use_enable mp3 mpg123)
 		$(use_enable mpeg libmpeg2)
 		$(use_enable mtp)
 		$(use_enable musepack mpc)
@@ -391,6 +394,7 @@ src_configure() {
 		$(use_enable zeroconf avahi)
 		$(use_enable zvbi)
 		$(use_enable !zvbi telx)
+		--with-kde-solid=/usr/share/solid/actions
 		--disable-asdcp
 		--disable-coverage
 		--disable-cprof