media-sound/clementine: several cleanups and fixes

- Clean up dependencies
- Fix dependencies upon dev-libs/crypto++ (see 580134)
- Synchronise live ebuild with latest release
- Remove obsolte comments
- Reorder cmake params
- Reenable testing
- add missing USE flags:
  * added 3 missing USE flags in ebuilds of recent version: amazoncloud,
      pulseaudio and vkontakte
  * removed USE=ubuntu-one due to remove in upstream
  * slightly change description for other USEs

Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>

5 files changed, 92 insertions, 120 deletions

diff --git a/media-sound/clementine/clementine-1.3.1.ebuild b/media-sound/clementine/clementine-1.3.1.ebuild
index 2e126575406b..b348bfe63d48 100644
--- a/media-sound/clementine/clementine-1.3.1.ebuild
+++ b/media-sound/clementine/clementine-1.3.1.ebuild
@@ -9,7 +9,7 @@ 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"
 
 inherit cmake-utils flag-o-matic fdo-mime gnome2-utils virtualx
-[[ ${PV} == *9999* ]] && inherit git-2
+[[ ${PV} == *9999* ]] && inherit git-r3
 
 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"
@@ -20,7 +20,7 @@ LICENSE="GPL-3"
 SLOT="0"
 [[ ${PV} == *9999* ]] || \
 KEYWORDS="~amd64 ~x86"
-IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm skydrive test ubuntu-one +udisks wiimote"
+IUSE="amazoncloud box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio skydrive test +udisks vkontakte wiimote"
 IUSE+="${LANGS// / linguas_}"
 
 REQUIRED_USE="
@@ -28,7 +28,6 @@ REQUIRED_USE="
 	wiimote? ( dbus )
 "
 
-# qca dep is temporary for bug #489850
 COMMON_DEPEND="
 	dev-db/sqlite:=
 	>=dev-libs/glib-2.24.1-r1
@@ -38,7 +37,7 @@ COMMON_DEPEND="
 	>=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]
+	>=dev-qt/qtsql-4.5:4
 	>=media-libs/chromaprint-0.6
 	media-libs/gstreamer:1.0
 	media-libs/gst-plugins-base:1.0
@@ -46,6 +45,7 @@ COMMON_DEPEND="
 	>=media-libs/libmygpo-qt-1.0.8
 	>=media-libs/taglib-1.8[mp4]
 	sys-libs/zlib
+	dev-libs/crypto++
 	virtual/glu
 	virtual/opengl
 	x11-libs/libX11
@@ -55,16 +55,19 @@ COMMON_DEPEND="
 	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:=
+		        >=media-libs/libprojectm-1.2.0 )
 "
-# now only presets are used, libprojectm is internal
+# 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:
 # 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"
+# Still possibly essential but not applied yet patches are:
+# 06-fix-numeric-locale.patch
+# 08-stdlib.h-for-rand.patch
 RDEPEND="${COMMON_DEPEND}
 	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:1.0
 	media-plugins/gst-plugins-soup:1.0
 	media-plugins/gst-plugins-taglib:1.0
@@ -75,27 +78,21 @@ DEPEND="${COMMON_DEPEND}
 	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"
-
-# https://github.com/clementine-player/Clementine/issues/3935
-RESTRICT="test"
+DOCS=(Changelog README.md)
 
 MY_P="${P/_}"
-# Switch to ^ when we switch to EAPI=6.
 [[ ${PV} == *9999* ]] || \
-S="${WORKDIR}/C${MY_P:1}"
+S="${WORKDIR}/${MY_P^}"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3_rc1-cmake.patch"
-	"${FILESDIR}/${PN}-1.3-fix-tokenizer.patch"
-)
+PATCHES=( "${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch )
 
 src_prepare() {
 	cmake-utils_src_prepare
@@ -116,8 +113,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DBUILD_WERROR=OFF
 		-DLINGUAS="${langs}"
-		-DBUNDLE_PROJECTM_PRESETS=OFF
-		-DUSE_SYSTEM_PROJECTM=ON
+		-DENABLE_AMAZON_CLOUD_DRIVE="$(usex amazoncloud)"
 		-DENABLE_AUDIOCD="$(usex cdda)"
 		-DENABLE_DBUS="$(usex dbus)"
 		-DENABLE_DEVICEKIT="$(usex udisks)"
@@ -128,16 +124,21 @@ src_configure() {
 		-DENABLE_GIO=ON
 		-DENABLE_WIIMOTEDEV="$(usex wiimote)"
 		-DENABLE_VISUALISATIONS="$(usex projectm)"
-		$(usex projectm '-DUSE_SYSTEM_PROJECTM=ON' '')
 		-DENABLE_BOX="$(usex box)"
 		-DENABLE_DROPBOX="$(usex dropbox)"
 		-DENABLE_GOOGLE_DRIVE="$(usex googledrive)"
+		-DENABLE_LIBPULSE="$(usex pulseaudio)"
 		-DENABLE_SKYDRIVE="$(usex skydrive)"
-		-DENABLE_UBUNTU_ONE="$(usex ubuntu-one)"
+		-DENABLE_VK="$(usex vkontakte)"
 		-DENABLE_SPOTIFY_BLOB=OFF
-		-DENABLE_BREAKPAD=OFF
+		-DENABLE_BREAKPAD=OFF  #< disable crash reporting
 		-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
diff --git a/media-sound/clementine/clementine-1.3.ebuild b/media-sound/clementine/clementine-1.3.ebuild
index 2e126575406b..b348bfe63d48 100644
--- a/media-sound/clementine/clementine-1.3.ebuild
+++ b/media-sound/clementine/clementine-1.3.ebuild
@@ -9,7 +9,7 @@ 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"
 
 inherit cmake-utils flag-o-matic fdo-mime gnome2-utils virtualx
-[[ ${PV} == *9999* ]] && inherit git-2
+[[ ${PV} == *9999* ]] && inherit git-r3
 
 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"
@@ -20,7 +20,7 @@ LICENSE="GPL-3"
 SLOT="0"
 [[ ${PV} == *9999* ]] || \
 KEYWORDS="~amd64 ~x86"
-IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm skydrive test ubuntu-one +udisks wiimote"
+IUSE="amazoncloud box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio skydrive test +udisks vkontakte wiimote"
 IUSE+="${LANGS// / linguas_}"
 
 REQUIRED_USE="
@@ -28,7 +28,6 @@ REQUIRED_USE="
 	wiimote? ( dbus )
 "
 
-# qca dep is temporary for bug #489850
 COMMON_DEPEND="
 	dev-db/sqlite:=
 	>=dev-libs/glib-2.24.1-r1
@@ -38,7 +37,7 @@ COMMON_DEPEND="
 	>=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]
+	>=dev-qt/qtsql-4.5:4
 	>=media-libs/chromaprint-0.6
 	media-libs/gstreamer:1.0
 	media-libs/gst-plugins-base:1.0
@@ -46,6 +45,7 @@ COMMON_DEPEND="
 	>=media-libs/libmygpo-qt-1.0.8
 	>=media-libs/taglib-1.8[mp4]
 	sys-libs/zlib
+	dev-libs/crypto++
 	virtual/glu
 	virtual/opengl
 	x11-libs/libX11
@@ -55,16 +55,19 @@ COMMON_DEPEND="
 	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:=
+		        >=media-libs/libprojectm-1.2.0 )
 "
-# now only presets are used, libprojectm is internal
+# 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:
 # 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"
+# Still possibly essential but not applied yet patches are:
+# 06-fix-numeric-locale.patch
+# 08-stdlib.h-for-rand.patch
 RDEPEND="${COMMON_DEPEND}
 	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:1.0
 	media-plugins/gst-plugins-soup:1.0
 	media-plugins/gst-plugins-taglib:1.0
@@ -75,27 +78,21 @@ DEPEND="${COMMON_DEPEND}
 	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"
-
-# https://github.com/clementine-player/Clementine/issues/3935
-RESTRICT="test"
+DOCS=(Changelog README.md)
 
 MY_P="${P/_}"
-# Switch to ^ when we switch to EAPI=6.
 [[ ${PV} == *9999* ]] || \
-S="${WORKDIR}/C${MY_P:1}"
+S="${WORKDIR}/${MY_P^}"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3_rc1-cmake.patch"
-	"${FILESDIR}/${PN}-1.3-fix-tokenizer.patch"
-)
+PATCHES=( "${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch )
 
 src_prepare() {
 	cmake-utils_src_prepare
@@ -116,8 +113,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DBUILD_WERROR=OFF
 		-DLINGUAS="${langs}"
-		-DBUNDLE_PROJECTM_PRESETS=OFF
-		-DUSE_SYSTEM_PROJECTM=ON
+		-DENABLE_AMAZON_CLOUD_DRIVE="$(usex amazoncloud)"
 		-DENABLE_AUDIOCD="$(usex cdda)"
 		-DENABLE_DBUS="$(usex dbus)"
 		-DENABLE_DEVICEKIT="$(usex udisks)"
@@ -128,16 +124,21 @@ src_configure() {
 		-DENABLE_GIO=ON
 		-DENABLE_WIIMOTEDEV="$(usex wiimote)"
 		-DENABLE_VISUALISATIONS="$(usex projectm)"
-		$(usex projectm '-DUSE_SYSTEM_PROJECTM=ON' '')
 		-DENABLE_BOX="$(usex box)"
 		-DENABLE_DROPBOX="$(usex dropbox)"
 		-DENABLE_GOOGLE_DRIVE="$(usex googledrive)"
+		-DENABLE_LIBPULSE="$(usex pulseaudio)"
 		-DENABLE_SKYDRIVE="$(usex skydrive)"
-		-DENABLE_UBUNTU_ONE="$(usex ubuntu-one)"
+		-DENABLE_VK="$(usex vkontakte)"
 		-DENABLE_SPOTIFY_BLOB=OFF
-		-DENABLE_BREAKPAD=OFF
+		-DENABLE_BREAKPAD=OFF  #< disable crash reporting
 		-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
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index bfac234d663d..b348bfe63d48 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 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"
 
 inherit cmake-utils flag-o-matic fdo-mime gnome2-utils virtualx
-[[ ${PV} == *9999* ]] && inherit git-2
+[[ ${PV} == *9999* ]] && inherit git-r3
 
 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"
@@ -20,7 +20,7 @@ LICENSE="GPL-3"
 SLOT="0"
 [[ ${PV} == *9999* ]] || \
 KEYWORDS="~amd64 ~x86"
-IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm skydrive test ubuntu-one +udisks wiimote"
+IUSE="amazoncloud box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio skydrive test +udisks vkontakte wiimote"
 IUSE+="${LANGS// / linguas_}"
 
 REQUIRED_USE="
@@ -28,7 +28,6 @@ REQUIRED_USE="
 	wiimote? ( dbus )
 "
 
-# qca dep is temporary for bug #489850
 COMMON_DEPEND="
 	dev-db/sqlite:=
 	>=dev-libs/glib-2.24.1-r1
@@ -38,7 +37,7 @@ COMMON_DEPEND="
 	>=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]
+	>=dev-qt/qtsql-4.5:4
 	>=media-libs/chromaprint-0.6
 	media-libs/gstreamer:1.0
 	media-libs/gst-plugins-base:1.0
@@ -46,6 +45,7 @@ COMMON_DEPEND="
 	>=media-libs/libmygpo-qt-1.0.8
 	>=media-libs/taglib-1.8[mp4]
 	sys-libs/zlib
+	dev-libs/crypto++
 	virtual/glu
 	virtual/opengl
 	x11-libs/libX11
@@ -55,17 +55,19 @@ COMMON_DEPEND="
 	lastfm? ( >=media-libs/liblastfm-1[qt4(+)] )
 	mtp? ( >=media-libs/libmtp-1.0.0 )
 	moodbar? ( sci-libs/fftw:3.0 )
-	projectm? ( media-libs/glew:= )
-	>=dev-libs/crypto++-5.6.2-r4
+	projectm? ( media-libs/glew:=
+		        >=media-libs/libprojectm-1.2.0 )
 "
-# now only presets are used, libprojectm is internal
+# 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:
 # 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"
+# Still possibly essential but not applied yet patches are:
+# 06-fix-numeric-locale.patch
+# 08-stdlib.h-for-rand.patch
 RDEPEND="${COMMON_DEPEND}
 	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:1.0
 	media-plugins/gst-plugins-soup:1.0
 	media-plugins/gst-plugins-taglib:1.0
@@ -76,22 +78,19 @@ DEPEND="${COMMON_DEPEND}
 	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"
-
-# https://github.com/clementine-player/Clementine/issues/3935
-RESTRICT="test"
+DOCS=(Changelog README.md)
 
 MY_P="${P/_}"
-# Switch to ^ when we switch to EAPI=6.
 [[ ${PV} == *9999* ]] || \
-S="${WORKDIR}/C${MY_P:1}"
+S="${WORKDIR}/${MY_P^}"
 
 PATCHES=( "${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch )
 
@@ -114,31 +113,32 @@ src_configure() {
 	local mycmakeargs=(
 		-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)
-		$(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_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)"
 		-DENABLE_GIO=ON
-		$(cmake-utils_use wiimote ENABLE_WIIMOTEDEV)
-		$(cmake-utils_use projectm ENABLE_VISUALISATIONS)
-		$(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)
-		$(cmake-utils_use skydrive ENABLE_SKYDRIVE)
-		$(cmake-utils_use ubuntu-one ENABLE_UBUNTU_ONE)
+		-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)"
 		-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)
+		-DENABLE_BREAKPAD=OFF  #< disable crash reporting
 		-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
@@ -148,7 +148,7 @@ src_configure() {
 
 src_test() {
 	cd "${CMAKE_BUILD_DIR}" || die
-	Xemake test
+	virtx emake test
 }
 
 pkg_preinst() {
diff --git a/media-sound/clementine/files/clementine-1.3_rc1-cmake.patch b/media-sound/clementine/files/clementine-1.3_rc1-cmake.patch
deleted file mode 100644
index 22a922b86136..000000000000
--- a/media-sound/clementine/files/clementine-1.3_rc1-cmake.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- Clementine-1.3rc1/CMakeLists.txt
-+++ Clementine-1.3rc1/CMakeLists.txt
-@@ -60,7 +60,7 @@
- 
- pkg_check_modules(CDIO libcdio)
- pkg_check_modules(CHROMAPRINT REQUIRED libchromaprint)
--pkg_search_module(CRYPTOPP cryptopp libcrypto++)
-+#pkg_search_module(CRYPTOPP cryptopp libcrypto++)
- pkg_check_modules(GIO gio-2.0)
- pkg_check_modules(GLIB REQUIRED glib-2.0)
- pkg_check_modules(GOBJECT REQUIRED gobject-2.0)
-@@ -275,13 +275,14 @@
- 
- optional_component(VISUALISATIONS ON "Visualisations")
- 
--if(NOT HAVE_SPOTIFY_BLOB AND NOT CRYPTOPP_FOUND)
--  message(FATAL_ERROR "Either crypto++ must be available or the non-GPL Spotify "
--          "code must be compiled in")
--elseif(CRYPTOPP_FOUND)
-+#if(NOT HAVE_SPOTIFY_BLOB AND NOT CRYPTOPP_FOUND)
-+#  message(FATAL_ERROR "Either crypto++ must be available or the non-GPL Spotify "
-+#          "code must be compiled in")
-+#elseif(CRYPTOPP_FOUND)
-   set(HAVE_CRYPTOPP ON)
--  set(HAVE_SPOTIFY_DOWNLOADER ON)
--endif()
-+  set(HAVE_SPOTIFY_DOWNLOADER OFF)
-+  set(HAVE_SPOTIFY_BLOB OFF)
-+#endif()
- 
- # Find DBus if it's enabled
- if (HAVE_DBUS)
diff --git a/media-sound/clementine/metadata.xml b/media-sound/clementine/metadata.xml
index eda2d2760385..64bd4a153f6a 100644
--- a/media-sound/clementine/metadata.xml
+++ b/media-sound/clementine/metadata.xml
@@ -14,7 +14,8 @@
 		<name>Gentoo Sound project</name>
 	</maintainer>
 	<use>
-		<flag name="box">Enable Box support</flag>
+		<flag name="amazoncloud">Enable Amazon cloud drive support</flag>
+		<flag name="box">Enable filesharing via Box.com</flag>
 		<flag name="dropbox">Enable Dropbox support</flag>
 		<flag name="googledrive">Enable Google Drive support</flag>
 		<flag name="lastfm">Use liblastfm for fetching song info, scrobbling and radio streams</flag>
@@ -23,6 +24,7 @@
 		<flag name="skydrive">Enable Skydrive support</flag>
 		<flag name="system-sqlite">Use the system-wide <pkg>dev-db/sqlite</pkg> installation</flag>
 		<flag name="ubuntu-one">Enable Ubuntu One support</flag>
+		<flag name="vkontakte">Enable vk.com support</flag>
 		<flag name="wiimote">Enable support for Wii remote</flag>
 	</use>
 	<upstream>