[gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/

[Jason Donenfeld]

commit:     798265666093d42ba44871fbb932594cebd321d1
Author:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 30 16:57:00 2016 +0000
Commit:     Jason Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Wed Mar 30 17:06:47 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79826566

media-sound/clementine: update the 9999 to be the same as latest rc

Package-Manager: portage-2.2.28

 media-sound/clementine/clementine-9999.ebuild | 67 ++++++++++++++-------------
 1 file changed, 35 insertions(+), 32 deletions(-)

diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index b31df97..debdf11 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,7 +6,7 @@ EAPI=5
 
 EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
 
-LANGS=" af ar be bg bn br bs ca cs cy da de el en_CA en_GB eo es es_AR et eu fa fi fr ga gl he hi hr hu hy ia id is it ja ka kk ko lt lv mr ms nb nl oc pa pl pt pt_BR ro ru sk sl sr sr@latin sv te tr uk uz vi zh_CN zh_TW"
+LANGS=" af ar be bg bn br bs ca cs cy da de el en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW"
 
 inherit cmake-utils flag-o-matic fdo-mime gnome2-utils virtualx
 [[ ${PV} == *9999* ]] && inherit git-2
@@ -14,13 +14,13 @@ inherit cmake-utils flag-o-matic fdo-mime gnome2-utils virtualx
 DESCRIPTION="A modern music player and library organizer based on Amarok 1.4 and Qt4"
 HOMEPAGE="http://www.clementine-player.org https://github.com/clementine-player/Clementine"
 [[ ${PV} == *9999* ]] || \
-SRC_URI="https://github.com/clementine-player/Clementine/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/clementine-player/Clementine/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
 [[ ${PV} == *9999* ]] || \
 KEYWORDS="~amd64 ~x86"
-IUSE="ayatana box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm skydrive system-sqlite test ubuntu-one +udisks wiimote"
+IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm skydrive test ubuntu-one +udisks wiimote"
 IUSE+="${LANGS// / linguas_}"
 
 REQUIRED_USE="
@@ -30,45 +30,44 @@ REQUIRED_USE="
 
 # qca dep is temporary for bug #489850
 COMMON_DEPEND="
-	app-crypt/qca:2[qt4(+)]
-	>=dev-qt/qtgui-4.5:4
-	dbus? ( >=dev-qt/qtdbus-4.5:4 )
-	>=dev-qt/qtopengl-4.5:4
-	>=dev-qt/qtsql-4.5:4[sqlite]
-	system-sqlite? ( dev-db/sqlite[fts3(+)] )
-	>=media-libs/taglib-1.8[mp4]
+	dev-db/sqlite:=
 	>=dev-libs/glib-2.24.1-r1
 	dev-libs/libxml2
 	dev-libs/protobuf:=
 	dev-libs/qjson
-	media-libs/libechonest:=
-	>=media-libs/libmygpo-qt-1.0.7
+	>=dev-qt/qtcore-4.5:4
+	>=dev-qt/qtgui-4.5:4
+	>=dev-qt/qtopengl-4.5:4
+	>=dev-qt/qtsql-4.5:4[sqlite]
 	>=media-libs/chromaprint-0.6
-	media-libs/gstreamer:0.10
-	media-libs/gst-plugins-base:0.10
-	dev-libs/crypto++
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	media-libs/libechonest:=[qt4]
+	>=media-libs/libmygpo-qt-1.0.8
+	>=media-libs/taglib-1.8[mp4]
+	sys-libs/zlib
 	virtual/glu
 	virtual/opengl
-	ayatana? ( dev-libs/libindicate-qt )
+	x11-libs/libX11
 	cdda? ( dev-libs/libcdio )
+	dbus? ( >=dev-qt/qtdbus-4.5:4 )
 	ipod? ( >=media-libs/libgpod-0.8.0 )
 	lastfm? ( >=media-libs/liblastfm-1[qt4(+)] )
 	mtp? ( >=media-libs/libmtp-1.0.0 )
 	moodbar? ( sci-libs/fftw:3.0 )
-	projectm? ( media-libs/glew )
+	projectm? ( media-libs/glew:= )
 "
 # now only presets are used, libprojectm is internal
 # https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
 # r1966 "Compile with a static sqlite by default, since Qt 4.7 doesn't seem to expose the symbols we need to use FTS"
 RDEPEND="${COMMON_DEPEND}
-	dbus? ( udisks? ( sys-fs/udisks:0 ) )
-	mms? ( media-plugins/gst-plugins-libmms:0.10 )
+	dbus? ( udisks? ( sys-fs/udisks:2 ) )
+	mms? ( media-plugins/gst-plugins-libmms:1.0 )
 	mtp? ( gnome-base/gvfs )
 	projectm? ( >=media-libs/libprojectm-1.2.0 )
-	media-plugins/gst-plugins-meta:0.10
-	media-plugins/gst-plugins-gio:0.10
-	media-plugins/gst-plugins-soup:0.10
-	media-plugins/gst-plugins-taglib:0.10
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/gst-plugins-soup:1.0
+	media-plugins/gst-plugins-taglib:1.0
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/boost-1.39
@@ -88,9 +87,15 @@ DOCS="Changelog"
 # https://github.com/clementine-player/Clementine/issues/3935
 RESTRICT="test"
 
+MY_P="${P/_}"
 # Switch to ^ when we switch to EAPI=6.
 [[ ${PV} == *9999* ]] || \
-S="${WORKDIR}/C${P:1}"
+S="${WORKDIR}/C${MY_P:1}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3_rc1-cmake.patch
+	"${FILESDIR}"/${PN}-1.3_rc1-fix-tokenizer.patch
+)
 
 src_prepare() {
 	cmake-utils_src_prepare
@@ -112,6 +117,7 @@ src_configure() {
 		-DBUILD_WERROR=OFF
 		-DLINGUAS="${langs}"
 		-DBUNDLE_PROJECTM_PRESETS=OFF
+		-DUSE_SYSTEM_PROJECTM=ON
 		$(cmake-utils_use cdda ENABLE_AUDIOCD)
 		$(cmake-utils_use dbus ENABLE_DBUS)
 		$(cmake-utils_use udisks ENABLE_DEVICEKIT)
@@ -122,7 +128,7 @@ src_configure() {
 		-DENABLE_GIO=ON
 		$(cmake-utils_use wiimote ENABLE_WIIMOTEDEV)
 		$(cmake-utils_use projectm ENABLE_VISUALISATIONS)
-		$(cmake-utils_use ayatana ENABLE_SOUNDMENU)
+		$(usex projectm '-DUSE_SYSTEM_PROJECTM=ON' '')
 		$(cmake-utils_use box ENABLE_BOX)
 		$(cmake-utils_use dropbox ENABLE_DROPBOX)
 		$(cmake-utils_use googledrive ENABLE_GOOGLE_DRIVE)
@@ -130,14 +136,11 @@ src_configure() {
 		$(cmake-utils_use ubuntu-one ENABLE_UBUNTU_ONE)
 		-DENABLE_SPOTIFY_BLOB=OFF
 		-DENABLE_BREAKPAD=OFF
-		$(cmake-utils_use !system-sqlite STATIC_SQLITE)
-		$(cmake-utils_use system-sqlite I_HATE_MY_USERS)
-		$(cmake-utils_use system-sqlite MY_USERS_WILL_SUFFER_BECAUSE_OF_ME)
+		#$(cmake-utils_use !system-sqlite STATIC_SQLITE)
+		#$(cmake-utils_use system-sqlite I_HATE_MY_USERS)
+		#$(cmake-utils_use system-sqlite MY_USERS_WILL_SUFFER_BECAUSE_OF_ME)
 		-DUSE_BUILTIN_TAGLIB=OFF
 		-DUSE_SYSTEM_GMOCK=ON
-		# force to find crypto++ see bug #548544
-		-DCRYPTOPP_LIBRARIES="crypto++"
-		-DCRYPTOPP_FOUND=ON
 		)
 
 	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT