gentoo resync : 23.12.2017

5 files changed, 3 insertions, 288 deletions

diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index 63502d34ebf3..56d4268a88d2 100644
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -1,10 +1,6 @@
 AUX smplayer-14.9.0.6966-unbundle-qtsingleapplication.patch 566 BLAKE2B bc96833566d3d87d0bde532b0b6a6500671d9ec75cc0ee5f9485ea052ad030f8237d01184200f846febc07f4d7195af15d379e589de6772d58d4cfe89bff8ac3 SHA512 9c757a1eaca358c9fb712801c0a17d084ea9dd3be26dd43f9b2c83bf39d2bbe4b458ba9432aba9e76cb83b56fb698a2976951be2074acfaa787cbfbed2a54fa9
 AUX smplayer-16.4.0-zero-bidi.patch 489 BLAKE2B 50f535154f771e535c244aff2dbd27b60cdbed36f01b4c3f3bf1bd27dbaceb52d41a061aa4d15501c8ae3d0e4bb3adfc2ecd5e0eaee91aa06207738321e7a89a SHA512 acde9545bc1a0659673f6e747291c837ab36b9894bde6d03e419acf579c2f8f581127424dde786496f37308676754319c4f4402f52b620e97a63cdccd1af80d6
 AUX smplayer-17.1.0-advertisement_crap.patch 1982 BLAKE2B 22a5027e9d20dca47fed1176e13cd9f8f5c912f51352d07f8fc0dd1f0850dc241483e22524c9fab2b9e20e67d1527f391a791afa2ac96285c4a199801ab96b65 SHA512 7bc1a3e9fb916d3a7e0c4f9bba8bb2adb7a3822e34694f79501e228f700b27633cac2eba237ab4af221c50f07295ecab3093c2a7033578a3e0a91a1e6449570d
-DIST smplayer-16.11.0.tar.bz2 4254170 BLAKE2B fdae4c9183d6f2e768625096940f081123a6ab08b8c83c38b21ec33d7fb4af18715d705a116233436392c274397cd259117056779c6371b49ebbf484a2f168c7 SHA512 13776ff134c4c91747fa9432080a4ea876d5d5a134b91dde48d0f0e75c280ef6d19067906e4e850da3b1b2287214914528743495cccf7cbda310bc51682b478c
-DIST smplayer-17.11.0.tar.bz2 5033817 BLAKE2B 4cb853c2ee6596037ccb88d248d2bbf470eabebc2c2c91c03cf27752639e0550623d1e68a21f18619b58d6993f86ffe73738a84549c40f79ee136fe8e9b4aa8a SHA512 a51b49f92da21abe0a81bb07db5b5dd13d80ee86a488783acf8bacbe389dffb7dac123780d7492d2b20cdaf6727a9672d89c7d09d18674fc142ba2aa65a21754
 DIST smplayer-17.11.2.tar.bz2 5033433 BLAKE2B 0fa783172c5b3c68314d656a395db6c953de64057cdf9acc78e4bc448807bc39293ff292183fc167a122f9cf295aac786b52c0465e3d9584c506e1dd9cd73614 SHA512 e0a6e6fc29063b5f82303febdc8243c10276feb4500985e96ce418298c8f10796df44363df3136452a6cb3f8156ebdb4fba3e865a37d433f3d258db493343f81
-EBUILD smplayer-16.11.0.ebuild 3501 BLAKE2B 9722290689cf6ec87509ca343842426292587d47eb85645682531f61bad366b0026d4bccd3302b5b2dc6f0d0740662e52b9f3bec77284ae5a4cb6daae90e1d1c SHA512 0e28a728350d06be20f0be25a2a11b4a3b4aae59208bbc0c9ade099fdea35bc74ae0186a64faba4d06470ce6a6269b40c597c86f02bc903dd0f6cc113dfd2f54
-EBUILD smplayer-17.11.0.ebuild 3019 BLAKE2B 1aa48121c5e1c011a63f4a842ac257294f6b498b9c686a40851d8bbd52ecb42d366dd4196d6d69c2a80226ffa76d77aeee463995ca4d848f55607b2e6ecaafe5 SHA512 66c4b82306e08ce4795c6afad4bb412f86c3a162fa4f4be499910ea78e546fc55db2878190653c988e3a949fa8b17bb823aa4f7885dc1688aa54d16773941e51
-EBUILD smplayer-17.11.2.ebuild 3020 BLAKE2B 46919ea0eac2a4c50a48da344850ed881ae9e93720f9ca8c76d25fc911bd7afef3eda1eb6d2795124a3d5686d6f2facbd4069bc4b32a8580c8ca390e33e1cb9d SHA512 acd70c7c17ab8c1b749d9f2e51877347c59c31c6b0e7178e1586f1cce902ef4cc2749b4815576de3660317f8ed4790b56bc91edab9c3ce90bd83e04b673625ba
-MISC metadata.xml 1016 BLAKE2B 52a19c575fe59fe115fb8eba5039c66c584907292b21a6f79b9e168381f2e604cacc71fe6d2f0f5103ec1cf64549658a54892725993c1c2f4c9d575a9c1866ef SHA512 04fb5a1a6c330b847e43a6e6a635be5180e4bb353b28c551f39ca74c663874e36f697204d01fb0267775c04ec452fbb5409e7d5611b61bd7f883ee1f9c8b82fc
+EBUILD smplayer-17.11.2.ebuild 3018 BLAKE2B 7817664c0e229b77c508b7fe24775a26266a8d4e91f9d3b9daa0ef4399f45c9c66d999f5b82f09e5872f381f76dd8d3df7bf38af0c88e2650deec33f5a736678 SHA512 f91392e1a442f48103b5d35765e7821b253d16e528f53ab903ed4ac2fd7ea2c05695120bd14c8288b89ed2b396a3ce024c250ef04472617b9d87ab0ca92a209e
+MISC metadata.xml 886 BLAKE2B 93069f16c27051f346dfd71113b7998f84c09efc7b1b7ad05600f82712e1693368a99bd51e4833cb8ec5c6433ec41f002370e564a2f67aace9e65fea14ce7653 SHA512 e82489ac4436ddbecd44783d694f1056a8a40b278ef941faa236079ad4cfdf0d542cee8c73b7ae1492efe76c2cac31c6a641e2187e01a1210d4b5cd519a839f4
diff --git a/media-video/smplayer/metadata.xml b/media-video/smplayer/metadata.xml
index 9f32889eaddc..48ba551d7671 100644
--- a/media-video/smplayer/metadata.xml
+++ b/media-video/smplayer/metadata.xml
@@ -18,9 +18,6 @@
       Interfacing Specification, version 2), a DBus interface for remote
       control, which requires <pkg>dev-qt/qtdbus</pkg> as dependency.
     </flag>
-    <flag name="streaming">Support for streaming video sites through
-      <pkg>net-misc/youtube-dl</pkg> (MPV only).
-    </flag>
   </use>
   <upstream>
     <remote-id type="sourceforge">smplayer</remote-id>
diff --git a/media-video/smplayer/smplayer-16.11.0.ebuild b/media-video/smplayer/smplayer-16.11.0.ebuild
deleted file mode 100644
index 62806f4d7de7..000000000000
--- a/media-video/smplayer/smplayer-16.11.0.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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 l10n qmake-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 qt5 streaming"
-
-COMMON_DEPEND="
-	sys-libs/zlib
-	!qt5? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		dev-qt/qtsingleapplication[X,qt4]
-		autoshutdown? ( dev-qt/qtdbus:4 )
-		mpris? ( dev-qt/qtdbus:4 )
-		streaming? (
-			dev-qt/qtcore:4[ssl]
-			dev-qt/qtscript:4
-		)
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtsingleapplication[X,qt5]
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-		autoshutdown? ( dev-qt/qtdbus:5 )
-		mpris? ( dev-qt/qtdbus:5 )
-		streaming? (
-			dev-qt/qtnetwork:5[ssl]
-			dev-qt/qtscript:5
-		)
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	qt5? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	|| (
-		media-video/mplayer[bidi?,libass,png,X]
-		(
-			>=media-video/mpv-0.10.0[libass,X]
-			streaming? ( >=net-misc/youtube-dl-2014.11.26 )
-		)
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-14.9.0.6966-unbundle-qtsingleapplication.patch" # bug 487544
-)
-
-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
-
-	# Turn off youtube support (which pulls in extra dependencies) if unwanted
-	if ! use streaming ; then
-		sed -e 's:DEFINES += YOUTUBE_SUPPORT:#&:' \
-			-i src/smplayer.pro || die
-		sed -e 's:^#define PLAYLIST_DOWNLOAD://&:' \
-			-i src/playlist.h || die
-	fi
-
-	# Commented out because it gives false positives
-	#l10n_find_plocales_changes "${S}"/src/translations ${PN}_ .ts
-}
-
-src_configure() {
-	cd src || die
-	use qt5 && eqmake5 || eqmake4
-}
-
-gen_translation() {
-	local mydir="$(qt4_get_bindir)"
-	if use qt5; then
-		mydir="$(qt5_get_bindir)"
-	fi
-
-	ebegin "Generating $1 translation"
-	"${mydir}"/lrelease ${PN}_${1}.ts
-	eend $? || die "failed to generate $1 translation"
-}
-
-src_compile() {
-	default
-
-	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
-}
diff --git a/media-video/smplayer/smplayer-17.11.0.ebuild b/media-video/smplayer/smplayer-17.11.0.ebuild
deleted file mode 100644
index 2611d969dfa9..000000000000
--- a/media-video/smplayer/smplayer-17.11.0.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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 l10n qmake-utils 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"
-)
-
-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() {
-	default
-
-	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() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-video/smplayer/smplayer-17.11.2.ebuild b/media-video/smplayer/smplayer-17.11.2.ebuild
index 3a43e40959a4..583903b5976e 100644
--- a/media-video/smplayer/smplayer-17.11.2.ebuild
+++ b/media-video/smplayer/smplayer-17.11.2.ebuild
@@ -16,7 +16,7 @@ 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"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux"
 IUSE="autoshutdown bidi debug mpris"
 
 COMMON_DEPEND="