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

["Göktürk Yüksek" <gokturk@gentoo.org>]

commit:     80e5033261032d6e950180c1081ac998894bafd7
Author:     Alexander Golubev <fatzer2 <AT> gmail <DOT> com>
AuthorDate: Thu Jun 23 01:30:37 2016 +0000
Commit:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Sun Jul  3 22:18:16 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80e50332

media-sound/clementine: a couple dependency fixes

- Fix udisks version required
- Fix boost slot

Reviewed-by: David Seifert <soap <AT> gentoo.org>

 ...ine-1.3.1.ebuild => clementine-1.2.3-r1.ebuild} | 119 +++++++++++----------
 ...ine-1.3.1.ebuild => clementine-1.3.1-r1.ebuild} |   4 +-
 media-sound/clementine/clementine-9999.ebuild      |   2 +-
 3 files changed, 63 insertions(+), 62 deletions(-)

diff --git a/media-sound/clementine/clementine-1.3.1.ebuild b/media-sound/clementine/clementine-1.2.3-r1.ebuild
similarity index 51%
copy from media-sound/clementine/clementine-1.3.1.ebuild
copy to media-sound/clementine/clementine-1.2.3-r1.ebuild
index d3af6df..5f728cb 100644
--- a/media-sound/clementine/clementine-1.3.1.ebuild
+++ b/media-sound/clementine/clementine-1.2.3-r1.ebuild
@@ -2,25 +2,25 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=6
+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 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"
+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"
 
 inherit cmake-utils flag-o-matic fdo-mime gnome2-utils virtualx
-[[ ${PV} == *9999* ]] && inherit git-r3
+[[ ${PV} == *9999* ]] && inherit git-2
 
 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="amazoncloud box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio skydrive test +udisks vkontakte wiimote"
+IUSE="ayatana box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm skydrive system-sqlite test ubuntu-one +udisks wiimote"
 IUSE+="${LANGS// / linguas_}"
 
 REQUIRED_USE="
@@ -28,72 +28,75 @@ REQUIRED_USE="
 	wiimote? ( dbus )
 "
 
+# qca dep is temporary for bug #489850
 COMMON_DEPEND="
-	dev-db/sqlite:=
+	app-crypt/qca:2[qt4(+)]
+	>=dev-qt/qtcore-4.5:4
+	>=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:3[fts3(+)] )
+	>=media-libs/taglib-1.8[mp4]
 	>=dev-libs/glib-2.24.1-r1
 	dev-libs/libxml2
 	dev-libs/protobuf:=
 	dev-libs/qjson
-	>=dev-qt/qtcore-4.5:4
-	>=dev-qt/qtgui-4.5:4
-	>=dev-qt/qtopengl-4.5:4
-	>=dev-qt/qtsql-4.5:4
+	media-libs/libechonest:=
+	>=media-libs/libmygpo-qt-1.0.7
 	>=media-libs/chromaprint-0.6
-	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]
+	media-libs/gstreamer:0.10
+	media-libs/gst-plugins-base:0.10
 	sys-libs/zlib
-	dev-libs/crypto++
 	virtual/glu
 	virtual/opengl
 	x11-libs/libX11
+	ayatana? ( dev-libs/libindicate-qt )
 	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:=
-			>=media-libs/libprojectm-1.2.0 )
+	projectm? ( media-libs/glew:= )
 "
-# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
-# Libprojectm-1.2 seams to work fine, so no reasons to use bundled version; check the clementine's patches:
+# now only presets are used, libprojectm is internal
 # https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
-# Still possibly essential but not applied yet patches are:
-# 06-fix-numeric-locale.patch
-# 08-stdlib.h-for-rand.patch
+# 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:2 ) )
-	mms? ( media-plugins/gst-plugins-libmms:1.0 )
+	dbus? ( udisks? ( sys-fs/udisks:0 ) )
+	mms? ( media-plugins/gst-plugins-libmms:0.10 )
 	mtp? ( gnome-base/gvfs )
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/gst-plugins-soup:1.0
-	media-plugins/gst-plugins-taglib:1.0
+	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
 "
 DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.39
+	>=dev-libs/boost-1.39:=
 	virtual/pkgconfig
 	sys-devel/gettext
 	dev-qt/qttest:4
 	dev-cpp/gmock
-	amazoncloud? ( dev-cpp/sparsehash )
 	box? ( dev-cpp/sparsehash )
 	dropbox? ( dev-cpp/sparsehash )
 	googledrive? ( dev-cpp/sparsehash )
-	pulseaudio? ( media-sound/pulseaudio )
 	skydrive? ( dev-cpp/sparsehash )
+	ubuntu-one? ( dev-cpp/sparsehash )
 	test? ( gnome-base/gsettings-desktop-schemas )
 "
-DOCS=( Changelog README.md )
+DOCS="Changelog"
 
-MY_P="${P/_}"
+# https://github.com/clementine-player/Clementine/issues/3935
+RESTRICT="test"
+
+# Switch to ^ when we switch to EAPI=6.
 [[ ${PV} == *9999* ]] || \
-S="${WORKDIR}/${MY_P^}"
+S="${WORKDIR}/C${P:1}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch
+	"${FILESDIR}/${PN}-1.2.3-namespaces.patch"
+	"${FILESDIR}/${P}-hide_boost_includes_from_q_moc.patch"
 )
 
 src_prepare() {
@@ -115,32 +118,30 @@ src_configure() {
 	local mycmakeargs=(
 		-DBUILD_WERROR=OFF
 		-DLINGUAS="${langs}"
-		-DENABLE_AMAZON_CLOUD_DRIVE="$(usex amazoncloud)"
-		-DENABLE_AUDIOCD="$(usex cdda)"
-		-DENABLE_DBUS="$(usex dbus)"
-		-DENABLE_DEVICEKIT="$(usex udisks)"
-		-DENABLE_LIBGPOD="$(usex ipod)"
-		-DENABLE_LIBLASTFM="$(usex lastfm)"
-		-DENABLE_LIBMTP="$(usex mtp)"
-		-DENABLE_MOODBAR="$(usex moodbar)"
+		-DBUNDLE_PROJECTM_PRESETS=OFF
+		$(cmake-utils_use cdda ENABLE_AUDIOCD)
+		$(cmake-utils_use dbus ENABLE_DBUS)
+		$(cmake-utils_use udisks ENABLE_DEVICEKIT)
+		$(cmake-utils_use ipod ENABLE_LIBGPOD)
+		$(cmake-utils_use lastfm ENABLE_LIBLASTFM)
+		$(cmake-utils_use mtp ENABLE_LIBMTP)
+		$(cmake-utils_use moodbar ENABLE_MOODBAR)
 		-DENABLE_GIO=ON
-		-DENABLE_WIIMOTEDEV="$(usex wiimote)"
-		-DENABLE_VISUALISATIONS="$(usex projectm)"
-		-DENABLE_BOX="$(usex box)"
-		-DENABLE_DROPBOX="$(usex dropbox)"
-		-DENABLE_GOOGLE_DRIVE="$(usex googledrive)"
-		-DENABLE_LIBPULSE="$(usex pulseaudio)"
-		-DENABLE_SKYDRIVE="$(usex skydrive)"
-		-DENABLE_VK="$(usex vkontakte)"
+		$(cmake-utils_use wiimote ENABLE_WIIMOTEDEV)
+		$(cmake-utils_use projectm ENABLE_VISUALISATIONS)
+		$(cmake-utils_use ayatana ENABLE_SOUNDMENU)
+		$(cmake-utils_use box ENABLE_BOX)
+		$(cmake-utils_use dropbox ENABLE_DROPBOX)
+		$(cmake-utils_use googledrive ENABLE_GOOGLE_DRIVE)
+		$(cmake-utils_use skydrive ENABLE_SKYDRIVE)
+		$(cmake-utils_use ubuntu-one ENABLE_UBUNTU_ONE)
 		-DENABLE_SPOTIFY_BLOB=OFF
-		-DENABLE_BREAKPAD=OFF  #< disable crash reporting
+		-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)
 		-DUSE_BUILTIN_TAGLIB=OFF
 		-DUSE_SYSTEM_GMOCK=ON
-		-DUSE_SYSTEM_PROJECTM=ON
-		-DBUNDLE_PROJECTM_PRESETS=OFF
-		# force to find crypto++ see bug #548544
-		-DCRYPTOPP_LIBRARIES="crypto++"
-		-DCRYPTOPP_FOUND=ON
 		)
 
 	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
@@ -150,7 +151,7 @@ src_configure() {
 
 src_test() {
 	cd "${CMAKE_BUILD_DIR}" || die
-	virtx emake test
+	Xemake test
 }
 
 pkg_preinst() {

diff --git a/media-sound/clementine/clementine-1.3.1.ebuild b/media-sound/clementine/clementine-1.3.1-r1.ebuild
similarity index 98%
rename from media-sound/clementine/clementine-1.3.1.ebuild
rename to media-sound/clementine/clementine-1.3.1-r1.ebuild
index d3af6df..4c1168c 100644
--- a/media-sound/clementine/clementine-1.3.1.ebuild
+++ b/media-sound/clementine/clementine-1.3.1-r1.ebuild
@@ -65,7 +65,7 @@ COMMON_DEPEND="
 # 06-fix-numeric-locale.patch
 # 08-stdlib.h-for-rand.patch
 RDEPEND="${COMMON_DEPEND}
-	dbus? ( udisks? ( sys-fs/udisks:2 ) )
+	dbus? ( udisks? ( sys-fs/udisks:0 ) )
 	mms? ( media-plugins/gst-plugins-libmms:1.0 )
 	mtp? ( gnome-base/gvfs )
 	media-plugins/gst-plugins-meta:1.0
@@ -73,7 +73,7 @@ RDEPEND="${COMMON_DEPEND}
 	media-plugins/gst-plugins-taglib:1.0
 "
 DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.39
+	>=dev-libs/boost-1.39:=
 	virtual/pkgconfig
 	sys-devel/gettext
 	dev-qt/qttest:4

diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index d3af6df..4edecab 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -73,7 +73,7 @@ RDEPEND="${COMMON_DEPEND}
 	media-plugins/gst-plugins-taglib:1.0
 "
 DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.39
+	>=dev-libs/boost-1.39:=
 	virtual/pkgconfig
 	sys-devel/gettext
 	dev-qt/qttest:4