gentoo resync : 21.09.2018

3 files changed, 2 insertions, 138 deletions

diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index 45d9817b9e06..51bf174806d6 100644
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -3,10 +3,8 @@ 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.3.0.tar.bz2 5037751 BLAKE2B 74f8b2183dc5cbae212f68ac1c07c3ad28a40ee2119cb1716b4c8d893545ab9139df943b2445103cbb776a8f97a8ac1af0730c9fbacb1e1ad178c411e29ac82b SHA512 cb0ff19c240bf8d92b12b096c9bf627b8365b690a0f9af126f6cda5436e4ed42510a511617fee6edee4cf1fbc79fb04bf05377585bbf93755b784d0471d2d6d4
-DIST smplayer-18.5.0.tar.bz2 5040367 BLAKE2B 18b1db622f11cb8c9a5f088071fae8b3d7deb43ff05b8d84c96a9e9717c03fd5e29fbec0f101ca2088c627838501bc83f5746b1290ad6110b5c35255c1293bd0 SHA512 0e5dfa0d4ef435156d93d3231deff9cea695adac1e6364db8af7f6c0bd6918062de8cd5fcacd8057d181644d2ad7b9dfd2c8241402e479ad6bf3c4db970bb1ba
 DIST smplayer-18.6.0.tar.bz2 5111791 BLAKE2B db19932703d93cba7f3f54989988d88af7ed033a61388f89263f613ce743cfd1ff649dad9db2b43193a459110267ee176eae9640f814e77545cfe6b5fb53abe2 SHA512 8383c8c3d4a171adc189d6bc4c11c0b7a8ea78bf8ff8518589647dfd846b314cf3290a1d607c617e7e971ee29c6966666bf9d306d1b1c1bb4824f42efd97c7a8
-EBUILD smplayer-18.3.0.ebuild 3210 BLAKE2B ba9f7d3676975005609ad952cc02f3b859b016dc7442cd07117bbae390a6f820dfafce3177fff8802ee673d1b5ab68ae1bbb0ca26325526ce793ca0f2ce38cc1 SHA512 0f9a893db8bfc70f2bcad5ff6c6a394d9af54ff81793d475cd5a9ebe6aebcb1402083cbc18e68227f9a99389c6c16ebd2ed5e81a2e7a936739038703a3ae7ef4
-EBUILD smplayer-18.5.0.ebuild 3212 BLAKE2B c33eac8e4b85c11234107d4f316c999dcd04085e180bfbe1703a72adf804c11f7b2ad685e656d12ded2ca09be6efe07c8e636842d1c6eb31c76d081d4491c531 SHA512 e56132a6953a0f5fd980adc562a63edfa11d4e2eb73d41442fa9b52ad4b028e73e70623435aad7ab347d2286e438274e54e67a1911fa2eb68c3381ea562c184e
+DIST smplayer-18.9.0.tar.bz2 5163115 BLAKE2B 84fa716fbe01dc3719ca74e0419229c70e0955ccbc482471e24dfa22e8ce4c03edbd99bc8aa92cad2ec2fc2060feaf2cab13850fab05fc6f3e34bba63861e22a SHA512 ee2e68877ad9fb45923e46512953326b6703e830964c3d123aee6a4ca96990fae03a3b568b313aae76548dea08d671f86ef55b3023bc46eb3aa73b1ff96c135d
 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.3.0.ebuild b/media-video/smplayer/smplayer-18.3.0.ebuild
deleted file mode 100644
index 711f309f6bec..000000000000
--- a/media-video/smplayer/smplayer-18.3.0.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2018 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 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/smplayer/smplayer-18.5.0.ebuild b/media-video/smplayer/smplayer-18.9.0.ebuild
index 8b62e36f20f2..8b62e36f20f2 100644
--- a/media-video/smplayer/smplayer-18.5.0.ebuild
+++ b/media-video/smplayer/smplayer-18.9.0.ebuild