gentoo resync : 23.03.2018

5 files changed, 12 insertions, 91 deletions

diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 0aa5229aa185..55aa856b9372 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,9 +1,8 @@
 AUX clementine-1.3-fix-tokenizer.patch 674 BLAKE2B 6f5b0c6bd71887cbe9ce0f85a85db134710f5aaf62c4e8105ab1b8ab0e69a0953b6177fb91dd89fcdcf5493dfc1e634f51658eea9f050689aa1e219dbd8db189 SHA512 4f520dcd4937634ebf5bb814ec64267d42473886fc5abd4924ac551bbae8ecc7643ddbacd9e2f9a5b0d8c7b0f67cf5aec420b5eb73162b248cbf6b3eafafbbd8
-AUX clementine-1.3.1_p20180314-qt-5.11.patch 1554 BLAKE2B e30ad68f0acf8f93a88204d5d03b951cafa2612ae45b9e8902a14111bc93aebd99ce0dc37072ba6ef1ab609dd858bb9da7f22cc1edbce22ba317ff786f033952 SHA512 438c4d1385929ee1d0fea9970fcf4ea6d91c6faf81add6099511e4a8e2c174fb79d65af1fea78c9b7a158f520e915ab32fa7f12474de2a7b7accd8d9b8767ffd
 AUX clementine-fts3-tokenizer.patch 1395 BLAKE2B e3dee5d7e9856c6d3d5b69ad2d4a195a7016a7dcd0f01128dc24a22c10ea5cba0cc302852272ca4d45844c0003572809fa8d8c1a2e37524d2e8c75e64d96290f SHA512 c4623333086cebb9d56d11c4deb8837fc23aaff8ddda07bcb8bb1c0df90700d6923d51324823d23b317366180660de3993053d9de0ff5103d88f59143328627a
 DIST clementine-1.3.1_p20171113.tar.gz 8467904 BLAKE2B bf1f59b987c0e4ec5c2ced00fab07c1a7e1df0eb5a46e90358b37eaaeaa916fb3e6a08ad79fc5fb791342d857783f615eb3726974dcfef9388da2793b1b7fe6a SHA512 39c459be8e4c5dd53ab9de6cdfd57f947926ccc2cd39ce2f72460bb991f7b2a28e6bc074e7bc23b0eba81c3d630e91dc2373794832c1089a9b5de7b212b94674
-DIST clementine-1.3.1_p20180314.tar.gz 8486396 BLAKE2B 978651924c50ee3669f82a51f98978869103edac3f7f7cfef372dc1f1483caa2f543d9d626a4552647acaeabb4f329a69cb5c76d8c6e9b8d605de2f86025344c SHA512 5c21540a91dae9f0db336947552548e44eec80fc9e6ebf95cbca3d2ab60cd096be963aec105f0c8d72d2628777cb6628e4a7e50f54a3edbcc22708c59f620e4a
-EBUILD clementine-1.3.1_p20171113.ebuild 4924 BLAKE2B 09cd8a038fccadaf0a023e1092e4c38047bc398f9d1239aa67a96fe216a0c8642719613da76171d6a9f30e49e916d943b207eb8436f69f1a4a6a623aec0a4706 SHA512 f12a7cad0d39622df4b1ef47f7a4844c97957ab802f25d43a489fbbd7d722d644c336436153f297f52d2d3397241d0002606b13a71cbd2dc52564e2d7164d453
-EBUILD clementine-1.3.1_p20180314.ebuild 5607 BLAKE2B 268c4804444e10563a88cfbc6a255a8bc4d6b639b906fd1e6513ade1e7f008f9dfe3bfa8e66cdea341d34bb7730078fdcea2b1c4f311f93247b5a2b998e6478d SHA512 ec5e43ffa5feaebbeeb3fd9ac40ad4e836a56b23cd1ba4aa0abf63c742776aaeedcacd4e59f16a8e5cf484bb53813b4199feb8038844df39613510c325c9aebe
-EBUILD clementine-9999.ebuild 5542 BLAKE2B d53c697df82d75b78745a7b3bf682a3e0062babe7656e8fb86c1dcd3bd1da96b5f004af5315eaeab134eb7c053a6e216621b668ec47449fb130547550ba1487e SHA512 c18099280c91ac11269535b9a5c0cc4dbee9895c4ff90687a25a217ff6b4461e587628667a1068cc68eb97139072be833510ab34f6e6910fc12b5c0eb84ca9e9
+DIST clementine-1.3.1_p20180319.tar.gz 8488685 BLAKE2B 2f4c412f9274a8957584bbc2d6482144fd6892adc629cdc0aeb750d592d8e4e62ad5b7bbb56288ecb993a9f5221b54e47e18c3f2b76c7a80670ead37ba5be3b0 SHA512 bbe288ca654ad0ed36abca288187abe452524e8fec23839973ff3f1d61ce479a979cbc45edcba10d6d15ff9baaaa23e95bb7e6d31a0090ca8e32bd547114e1ec
+EBUILD clementine-1.3.1_p20171113-r1.ebuild 4918 BLAKE2B f453ad34fca4f9cc4041183e25f6025064db2449c36a180f65ef89f0ce0582b6bbc10e5719722adb43fac934dcff1eb03680436847a3dba6344d3afb89ae6263 SHA512 ed2cd6966bb13b39cc20675f3f9eca802e3cd97bf20976c7a5d02beac294e1f47d690119238fdf47f4a99689db779eff19269f03cd4282dd4400a1fccab15c99
+EBUILD clementine-1.3.1_p20180319.ebuild 5138 BLAKE2B 10bc35b595622f69037f9b8253542d9c1d25b202c1c02ccd794e73c811325dbdf79d800ec72795b2f3ae404a4a5049fcf489bcaa441ac5c9ff40057d2176ce0f SHA512 27e179e2b49dec67a29cc81a7aa80e7bac3b9f61a30c26de5f824231dac05c8611443cd777d1e2ad8f3c047340f7e16465b7470c2962434a335da51cf6b9f060
+EBUILD clementine-9999.ebuild 5108 BLAKE2B e56991da0cbd34bd4b5b574d818445e722f7c0c1f40ae0a0c475c57304e03bf7e7252394664260ab25fc0f7318b708a079b1b373f2824e9a3317356408284c5a SHA512 4a481bd6778f517d52b953d316b7fbdfab5b8d37bdb22763369cc2419150dd6dfa211625fdfb4f89c3736463d4652137884aa4c8f70c904a9215db21b474c8d4
 MISC metadata.xml 1270 BLAKE2B 42b3ad43defebc30898db95bac41edde89d345e4776fa81f84581f8f35df8fa962024f0d08e84bfceba1080966988308434c7aac90d244ead02cc3a1fe01c58e SHA512 9d69291b66803e4dbe1ca50309891fcd9ee5ad5264bb7827a88a550367d770482744f3b5689f60a584b3fda7614cd27743085492dc72727275b470b225b96cf4
diff --git a/media-sound/clementine/clementine-1.3.1_p20171113.ebuild b/media-sound/clementine/clementine-1.3.1_p20171113-r1.ebuild
index 7210f9e8b91b..fe90073e56b5 100644
--- a/media-sound/clementine/clementine-1.3.1_p20171113.ebuild
+++ b/media-sound/clementine/clementine-1.3.1_p20171113-r1.ebuild
@@ -38,7 +38,7 @@ COMMON_DEPEND="
 	media-libs/chromaprint:=
 	media-libs/gstreamer:1.0
 	media-libs/gst-plugins-base:1.0
-	>=media-libs/libmygpo-qt-1.0.9[qt4(+)]
+	>=media-libs/libmygpo-qt-1.0.9[qt4]
 	media-libs/taglib[mp4(+)]
 	sys-libs/zlib
 	virtual/glu
@@ -47,7 +47,7 @@ COMMON_DEPEND="
 	cdda? ( dev-libs/libcdio:= )
 	dbus? ( dev-qt/qtdbus:4 )
 	ipod? ( >=media-libs/libgpod-0.8.0 )
-	lastfm? ( >=media-libs/liblastfm-1[qt4(+)] )
+	lastfm? ( >=media-libs/liblastfm-1[qt4] )
 	moodbar? ( sci-libs/fftw:3.0 )
 	mtp? ( >=media-libs/libmtp-1.0.0 )
 	projectm? (
diff --git a/media-sound/clementine/clementine-1.3.1_p20180314.ebuild b/media-sound/clementine/clementine-1.3.1_p20180319.ebuild
index 296ae7151dfe..d1601b410485 100644
--- a/media-sound/clementine/clementine-1.3.1_p20180314.ebuild
+++ b/media-sound/clementine/clementine-1.3.1_p20180319.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
 	GIT_ECLASS="git-r3"
 else
-	COMMIT=2d7894915dfc9043da9282d216775ef75041c773
+	COMMIT=804168edc74d7230a84e8937e2ea9a3b1ad2e9c2
 	SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
@@ -43,8 +43,6 @@ COMMON_DEPEND="
 	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtsql:5[sqlite]
 	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
 	media-libs/chromaprint:=
 	media-libs/gstreamer:1.0
 	media-libs/gst-plugins-base:1.0
@@ -57,7 +55,7 @@ COMMON_DEPEND="
 	cdda? ( dev-libs/libcdio:= )
 	dbus? ( dev-qt/qtdbus:5 )
 	ipod? ( >=media-libs/libgpod-0.8.0 )
-	lastfm? ( >=media-libs/liblastfm-1[qt5(+)] )
+	lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 )
 	moodbar? ( sci-libs/fftw:3.0 )
 	mtp? ( >=media-libs/libmtp-1.0.0 )
 	projectm? (
@@ -84,6 +82,8 @@ DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
 	dev-qt/linguist-tools:5
 	dev-qt/qtopengl:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
 	sys-devel/gettext
 	virtual/pkgconfig
 	box? ( dev-cpp/sparsehash )
@@ -100,10 +100,7 @@ DEPEND="${COMMON_DEPEND}
 
 DOCS=( Changelog README.md )
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-fts3-tokenizer.patch
-	"${FILESDIR}"/${P}-qt-5.11.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-fts3-tokenizer.patch )
 
 src_prepare() {
 	l10n_find_plocales_changes "src/translations" "" ".po"
@@ -118,14 +115,6 @@ src_prepare() {
 		sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die
 		cmake_comment_add_subdirectory tests
 	fi
-
-	# Fix clementine relying on downstream renaming of lastfm header dir
-	sed -i -e "/^#include/s/lastfm5/lastfm/" \
-		tests/albumcoverfetcher_test.cpp \
-		src/internet/lastfm/lastfm{settingspage.cpp,service.cpp,compat.h} \
-		src/core/song.cpp || die "Failed to sed lastfm header suffix"
-	sed -e "/^find_path.*LASTFM5/s/lastfm5/lastfm/" \
-		-i CMakeLists.txt || die "Failed to sed lastfm header suffix"
 }
 
 src_configure() {
@@ -173,10 +162,6 @@ src_test() {
 	virtx emake test
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	xdg_desktop_database_update
 	gnome2_icon_cache_update
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index 16065b58a5a9..6b168f373bff 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -55,7 +55,7 @@ COMMON_DEPEND="
 	cdda? ( dev-libs/libcdio:= )
 	dbus? ( dev-qt/qtdbus:5 )
 	ipod? ( >=media-libs/libgpod-0.8.0 )
-	lastfm? ( >=media-libs/liblastfm-1[qt5(+)] )
+	lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 )
 	moodbar? ( sci-libs/fftw:3.0 )
 	mtp? ( >=media-libs/libmtp-1.0.0 )
 	projectm? (
@@ -115,14 +115,6 @@ src_prepare() {
 		sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die
 		cmake_comment_add_subdirectory tests
 	fi
-
-	# Fix clementine relying on downstream renaming of lastfm header dir
-	sed -i -e "/^#include/s/lastfm5/lastfm/" \
-		tests/albumcoverfetcher_test.cpp \
-		src/internet/lastfm/lastfm{settingspage.cpp,service.cpp,compat.h} \
-		src/core/song.cpp || die "Failed to sed lastfm header suffix"
-	sed -e "/^find_path.*LASTFM5/s/lastfm5/lastfm/" \
-		-i CMakeLists.txt || die "Failed to sed lastfm header suffix"
 }
 
 src_configure() {
@@ -170,10 +162,6 @@ src_test() {
 	virtx emake test
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	xdg_desktop_database_update
 	gnome2_icon_cache_update
diff --git a/media-sound/clementine/files/clementine-1.3.1_p20180314-qt-5.11.patch b/media-sound/clementine/files/clementine-1.3.1_p20180314-qt-5.11.patch
deleted file mode 100644
index 8903da174984..000000000000
--- a/media-sound/clementine/files/clementine-1.3.1_p20180314-qt-5.11.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From b0b72ccfee2484ec05861879cca45d62d87055ae Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sat, 17 Mar 2018 00:29:11 +0100
-Subject: [PATCH] Fix build with Qt 5.11
-
----
- src/playlist/playlistcontainer.cpp     | 1 +
- src/ui/globalshortcutssettingspage.cpp | 1 +
- src/widgets/errordialog.cpp            | 2 ++
- 3 files changed, 4 insertions(+)
-
-diff --git a/src/playlist/playlistcontainer.cpp b/src/playlist/playlistcontainer.cpp
-index 58f1ad2d6..2ba1a3ff1 100644
---- a/src/playlist/playlistcontainer.cpp
-+++ b/src/playlist/playlistcontainer.cpp
-@@ -23,6 +23,7 @@
- #include "playlistparsers/playlistparser.h"
- #include "ui/iconloader.h"
- 
-+#include <QAction>
- #include <QFileDialog>
- #include <QInputDialog>
- #include <QKeyEvent>
-diff --git a/src/ui/globalshortcutssettingspage.cpp b/src/ui/globalshortcutssettingspage.cpp
-index ec5d29b28..c60a9561d 100644
---- a/src/ui/globalshortcutssettingspage.cpp
-+++ b/src/ui/globalshortcutssettingspage.cpp
-@@ -24,6 +24,7 @@
- #include "ui/iconloader.h"
- #include "ui/settingsdialog.h"
- 
-+#include <QAction>
- #include <QKeyEvent>
- #include <QMessageBox>
- #include <QProcess>
-diff --git a/src/widgets/errordialog.cpp b/src/widgets/errordialog.cpp
-index 1086305f3..3fd590840 100644
---- a/src/widgets/errordialog.cpp
-+++ b/src/widgets/errordialog.cpp
-@@ -18,6 +18,8 @@
- #include "errordialog.h"
- #include "ui_errordialog.h"
- 
-+#include <QStyle>
-+
- ErrorDialog::ErrorDialog(QWidget* parent)
-     : QDialog(parent), ui_(new Ui_ErrorDialog) {
-   ui_->setupUi(this);
--- 
-2.16.2
-