gentoo resync : 18.11.2018

4 files changed, 53 insertions, 9 deletions

diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 23cbe04e99fa..360d13cf6994 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,7 +1,8 @@
+AUX clementine-1.3.1_p20181112-no-dbus.patch 1356 BLAKE2B eda2e90798f5028cc5406df9b5ba5b2be01c16d6644d6f2a2416af46e8e8dbadf6a7fd7b5b6e6d32393589ef9d3e2b73ee5a37290f8265fbb7f3e03405825224 SHA512 a001f42b6c4352a0d01eea769959383b4674a1988ae07d6754bd85546b8343f793f8ab86a865c86a6bb7ce2a4c8f99f921e7e1cc61b624bdae4f5bf36865d6b2
 AUX clementine-fts3-tokenizer.patch 1395 BLAKE2B e3dee5d7e9856c6d3d5b69ad2d4a195a7016a7dcd0f01128dc24a22c10ea5cba0cc302852272ca4d45844c0003572809fa8d8c1a2e37524d2e8c75e64d96290f SHA512 c4623333086cebb9d56d11c4deb8837fc23aaff8ddda07bcb8bb1c0df90700d6923d51324823d23b317366180660de3993053d9de0ff5103d88f59143328627a
 DIST clementine-1.3.1_p20180416.tar.gz 8489387 BLAKE2B 37412428cf030a71f0011ba68a7ce71a3bbdc59402dc6d6349cca8ee44b208052cee9add1597a9577e5a6ed4bb2ebf16c4e1f79612d12be265f637caffd02a76 SHA512 8f38554571c637d9f79df43679ac2a76383f7a9b4ee8e921a16175889180e72afadc352dd40d73a671aa8ae9b01f6a251ae7b94b010043f8bcb8d8f42dcfff62
-DIST clementine-1.3.1_p20180523.tar.gz 8490122 BLAKE2B 783cd420c8e3cd7423ecb6caa3466efd2c09e9033c2a198f52dc113603233f1bf3e3dc5208491338c0fdc9ab26e5b661e7fced0dd835b4c19a867fa3cacc9ccd SHA512 a47de226108240313fef2ce965726b3afea988030adffe38fdabf5d0dc46b2eda42cfebc32d77e939eb6dd687a99556c9bd8848c6a5e78c434950d00a8833200
+DIST clementine-1.3.1_p20181112.tar.gz 8526632 BLAKE2B da3f155006ef5e94233104011aadad41e974ec339827b91bd3c5c0c2420b23199be852a9d0cb7c9b0112ba2d43ff3e3e87388db92679f8e64da5c3fa3e578c1d SHA512 eed16cec7323b142e4602a4bd81d7363e9cf4fc203c3b8b341aadbe883fdbd571dff0792260eec8af2f91e79fe905c3510d1e7ce1b06e9d4698016820cc771fa
 EBUILD clementine-1.3.1_p20180416.ebuild 5175 BLAKE2B b66494abab89a91ed12929a31c5253ab9c2190f3a95f5443a15ec8244a51704cafa734d754dc6928393addccfbfe1f081c9ecfe217a83e15e808a79207878e8e SHA512 302a93dc77c533bc65c10de9f82d1ed5da2f42c40c83392b4b1a32da3fd4e25f530e07edcf704780a93abce026ddc41c4b3054ea94964f4a1cc79658eb5e5ad7
-EBUILD clementine-1.3.1_p20180523.ebuild 5177 BLAKE2B 0bce51b4bcdba84963d6872017d5c944d9092eb0732d5c4bf99f581814e652c9aeda7f3429961de0b75fe1869a3cbc7897a8895eddb39e7b3ee7d73778c52888 SHA512 078cc9a488ac8e47aa29e2d53c4f56f39fea5e73699f9a23ecbfa4555cbcc50572cdbf7c9f7f022481be07da984777c5876119c221470e1734868df01b9130f0
-EBUILD clementine-9999.ebuild 5056 BLAKE2B 46397ac46af25668683a505acd33478a36e32832edd8a89fcad664906b10404825c2bb4454b6cb9d99b4aad935aaba9a51c9ca23a1a5df14b0e70128ca968bd1 SHA512 f18af7523ab3143578ea99db58ac6d926a4e6f7c567dec5b7fcc40a961549e21af51a8110ee07a419f31e1a59d76d855b90a38b188f9d8f208fbf512563c16cd
+EBUILD clementine-1.3.1_p20181112.ebuild 5219 BLAKE2B acda6fd2baaaa86a1366bbc8f3be825fffd0238e70a14529b991aae4637a63a6770726eeb7ec357cabc08e9d38bbc9d28231fee57351f31032ed826bf27fb1ce SHA512 083866c2400177d690263387dbe6384a33b24fda7822bc6f687b5214511ec4ac74cdd88aca6faa0c77af2dc5a0e603736a6d33fa7b9c00b9493179289cfb5f8a
+EBUILD clementine-9999.ebuild 5106 BLAKE2B 173f32354a9891b77909bee7e617b39b6b90005d7dc40a1da8e271dbc7aeb28421e7b9aeaaf1e075de0be9801df98a8233e89e4b669efb2891854ec3b5fae55b SHA512 6b2a173785f473e5290f673a42d55092bf1e184eff3eed0fabef238758395f7a21d9a090cd29efb36e3db3fd2b52dc55d53a271edf1c8d7038ff5a516cefe39a
 MISC metadata.xml 1052 BLAKE2B 670e37f375845acd8dcbc27339690ab21eeab2328ea04bc089a84ef2f608a04594ab35fc3bab6fc989a535f28321b4bef150374e27f8930326c35e0edcaa7f52 SHA512 cefd5c85937f11065d37c5287cd34a3977eaa4c223089bd9297786701845201d03af6596ac3d88e773baf291e07efe1137ceb29357ec2b0520f37e51a8de301b
diff --git a/media-sound/clementine/clementine-1.3.1_p20180523.ebuild b/media-sound/clementine/clementine-1.3.1_p20181112.ebuild
index 1af1af58a542..0840a685935d 100644
--- a/media-sound/clementine/clementine-1.3.1_p20180523.ebuild
+++ b/media-sound/clementine/clementine-1.3.1_p20181112.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=4619a4c1ab3b17b13d4b2327ad477912917eaf36
+	COMMIT=b8eea8ccc116388b67e4b042a5b81e87bf7a24e5
 	SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
@@ -47,7 +47,7 @@ COMMON_DEPEND="
 	media-libs/gstreamer:1.0
 	media-libs/gst-plugins-base:1.0
 	>=media-libs/libmygpo-qt-1.0.9[qt5(+)]
-	media-libs/taglib
+	>=media-libs/taglib-1.11.1_p20181028
 	sys-libs/zlib
 	virtual/glu
 	virtual/opengl
@@ -104,7 +104,7 @@ S="${WORKDIR}/${PN^}-${COMMIT}"
 
 DOCS=( Changelog README.md )
 
-PATCHES=( "${FILESDIR}"/${PN}-fts3-tokenizer.patch )
+PATCHES=( "${FILESDIR}"/${P}-no-dbus.patch )
 
 src_prepare() {
 	l10n_find_plocales_changes "src/translations" "" ".po"
@@ -119,6 +119,8 @@ src_prepare() {
 		sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die
 		cmake_comment_add_subdirectory tests
 	fi
+
+	rm -r 3rdparty/{libmygpo-qt,libmygpo-qt5,taglib} || die
 }
 
 src_configure() {
@@ -134,7 +136,6 @@ src_configure() {
 		-DENABLE_DEVICEKIT=OFF
 		-DENABLE_GIO=ON
 		-DENABLE_SPOTIFY_BLOB=OFF
-		-DUSE_BUILTIN_TAGLIB=OFF
 		-DUSE_SYSTEM_GMOCK=ON
 		-DUSE_SYSTEM_PROJECTM=ON
 		-DBUNDLE_PROJECTM_PRESETS=OFF
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index cfb50fb9b37b..78421f8b1167 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -47,7 +47,7 @@ COMMON_DEPEND="
 	media-libs/gstreamer:1.0
 	media-libs/gst-plugins-base:1.0
 	>=media-libs/libmygpo-qt-1.0.9[qt5(+)]
-	media-libs/taglib
+	>=media-libs/taglib-1.11.1_p20181028
 	sys-libs/zlib
 	virtual/glu
 	virtual/opengl
@@ -113,6 +113,8 @@ src_prepare() {
 		sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die
 		cmake_comment_add_subdirectory tests
 	fi
+
+	rm -r 3rdparty/{libmygpo-qt,libmygpo-qt5,taglib} || die
 }
 
 src_configure() {
@@ -128,7 +130,6 @@ src_configure() {
 		-DENABLE_DEVICEKIT=OFF
 		-DENABLE_GIO=ON
 		-DENABLE_SPOTIFY_BLOB=OFF
-		-DUSE_BUILTIN_TAGLIB=OFF
 		-DUSE_SYSTEM_GMOCK=ON
 		-DUSE_SYSTEM_PROJECTM=ON
 		-DBUNDLE_PROJECTM_PRESETS=OFF
diff --git a/media-sound/clementine/files/clementine-1.3.1_p20181112-no-dbus.patch b/media-sound/clementine/files/clementine-1.3.1_p20181112-no-dbus.patch
new file mode 100644
index 000000000000..d03db2451ad3
--- /dev/null
+++ b/media-sound/clementine/files/clementine-1.3.1_p20181112-no-dbus.patch
@@ -0,0 +1,41 @@
+From d940136d0ae2a98ea72d842df0099bebcd361426 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Fri, 2 Nov 2018 12:58:08 +0100
+Subject: [PATCH] Fix build without Qt5DBus
+
+---
+ CMakeLists.txt     | 2 +-
+ src/CMakeLists.txt | 4 ++++
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c1de26e3e..eaf794c27 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -304,7 +304,7 @@ endif ()
+ if(WIN32)
+   set(QT_LIBRARIES Qt5::Core Qt5::OpenGL Qt5::Sql Qt5::Network Qt5::Xml Qt5::Widgets Qt5::Concurrent)
+ else(WIN32)
+-  set(QT_LIBRARIES Qt5::Core Qt5::OpenGL Qt5::Sql Qt5::Network Qt5::Xml Qt5::Widgets Qt5::Concurrent Qt5::X11Extras Qt5::DBus)
++  set(QT_LIBRARIES Qt5::Core Qt5::OpenGL Qt5::Sql Qt5::Network Qt5::Xml Qt5::Widgets Qt5::Concurrent Qt5::X11Extras)
+ endif(WIN32)
+ 
+ # Remove GLU and GL from the link line - they're not really required
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 120f09949..88f1ac6c3 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -1249,6 +1249,10 @@ target_link_libraries(clementine_lib
+   Qocoa
+ )
+ 
++if (HAVE_DBUS)
++  target_link_libraries(clementine_lib Qt5::DBus)
++endif ()
++
+ if(ENABLE_VISUALISATIONS)
+   target_link_libraries(clementine_lib ${LIBPROJECTM_LIBRARIES})
+ endif(ENABLE_VISUALISATIONS)
+-- 
+2.19.1
+