Upstream patchset to optionalize some dependencies.

Package-Manager: portage-2.2.0_alpha10/cvs/Linux x86_64

4 files changed, 28 insertions, 10 deletions

diff --git a/media-sound/clementine/ChangeLog b/media-sound/clementine/ChangeLog
index 3416c2fc5a3a..b3d307eb6334 100644
--- a/media-sound/clementine/ChangeLog
+++ b/media-sound/clementine/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/clementine
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/ChangeLog,v 1.24 2010/12/18 21:05:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/ChangeLog,v 1.25 2010/12/26 15:56:42 ssuominen Exp $
+
+*clementine-0.6-r1 (26 Dec 2010)
+
+  26 Dec 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +clementine-0.6-r1.ebuild:
+  Upstream patchset to optionalize some dependencies.
 
 *clementine-0.6 (18 Dec 2010)
 
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index ab637a23cc9f..f45912089397 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,7 +1,8 @@
 AUX clementine-0.5.1-automagic.patch 3502 RMD160 d41e9e71a94e04bb4af760d76025912dcd0dbe3a SHA1 8b67f43ebd30810ea3a50e5ae688e0031a3d1828 SHA256 599eadfb657ddfce902edad9991b79d6128a114338ffa6d197b805a5835eb235
 DIST clementine-0.5.3.tar.gz 5236224 RMD160 77765d09ea1c1639a45b0cd7bef86592642255df SHA1 20657161c1098ab430bd1451f67fb80d767656de SHA256 0704911c4a2ad38bd2154120db24e95c52bec3d456766e0f29e1f60b0a39641d
+DIST clementine-0.6-patchset-1.tar.xz 10252 RMD160 4735946c6a05701f902d7179589626d7651d00b8 SHA1 753c8b2dabb443ed45c27aee3f3789d22b66cd5e SHA256 8016b39c3cdfc7c5cbf2072bd5460afd808d630e68e6b9f65f0e31a41bc8b2ef
 DIST clementine-0.6.tar.gz 5601219 RMD160 5b7418bef5bed9a9f1837741ea31fa3304894f88 SHA1 02f2ca926aad9748e3b4f58642b1daf95dadbc16 SHA256 7a7393af462a3c0864279d8cb2fc59afeec718837e5a1d0818a16b8a20d7cd0c
 EBUILD clementine-0.5.3.ebuild 2773 RMD160 e468a710c0bcaf49020628cf8e6845289aa65cd3 SHA1 06b9e3b0db256230e7a39fb3b6f5aec8876bfbf5 SHA256 dd4dbaaaed047a8dd15e612f67bf829dd87bbdd7ec4926f21df4d3f4c3774c09
-EBUILD clementine-0.6.ebuild 2845 RMD160 eed2fd76d9178be97b9f75bdfaa4a8cdbbb2f119 SHA1 07ad947d84cbf9a3a2d62fa8cce70bfa98244ea1 SHA256 0d685ef69326043467d4e304c47d732859f32f1b35099c826156306d41f29f20
-MISC ChangeLog 3748 RMD160 5bb64a0abd6721dcb92280a3f871dbd34ff61395 SHA1 fc0c1826482a2e53741f34ec9a225db7d16cc6db SHA256 d8931145d7d07180891255d744b170dd5c688ea44e3a9a566a80c2fc5ade49ec
-MISC metadata.xml 686 RMD160 740e46168935223fd83ff9cf0ace850cab330290 SHA1 3374d9ac8b1d562b91c4f3d142320b51bdd25611 SHA256 83be604ee87640207a05c678c063d527f2ba19de1434bf52eda66c9091e1932e
+EBUILD clementine-0.6-r1.ebuild 3205 RMD160 c62438d530fefead9621bfea4e756d6603492b09 SHA1 82da7960e1ab39c545c4a2c5d0361b65f8e222c7 SHA256 b73b783d902b6c044c5a2c28c5830d7fc6a08822cf870354368e0b102a37595d
+MISC ChangeLog 3920 RMD160 4708d3a8d270c0b3ebe0ae118f676dd88b0bbf14 SHA1 d486a73918da2cb34a5a3d7ce3273c6e22c94baf SHA256 6570f9d4b21fdb4db97056dd717a0153e4291c4e97bfd6337dbe1098bb7f181a
+MISC metadata.xml 796 RMD160 f8013d0be71993dc142670815b5f96565c26ac4c SHA1 51b384427e6eb9dbdacc3be406db4c9e98d1a7b8 SHA256 bd737ecf3604b5ddd66b07a90bd073c1b867a4bf349823b234f90435a068a166
diff --git a/media-sound/clementine/clementine-0.6.ebuild b/media-sound/clementine/clementine-0.6-r1.ebuild
index 6bbaaaee857d..5a4ebe570f20 100644
--- a/media-sound/clementine/clementine-0.6.ebuild
+++ b/media-sound/clementine/clementine-0.6-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/clementine-0.6.ebuild,v 1.1 2010/12/18 21:05:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/clementine-0.6-r1.ebuild,v 1.1 2010/12/26 15:56:43 ssuominen Exp $
 
-EAPI=2
+EAPI=3
 
 LANGS=" ar be bg br ca cs cy da de el en_CA en_GB eo es et eu fi fr gl he hi hu it ja kk lt nb nl oc pl pt_BR pt ro ru sk sl sr sv tr uk zh_CN zh_TW"
 
@@ -10,21 +10,21 @@ inherit cmake-utils gnome2-utils
 
 DESCRIPTION="A modern music player and library organizer based on Amarok 1.4 and Qt4"
 HOMEPAGE="http://www.clementine-player.org/ http://code.google.com/p/clementine-player/"
-SRC_URI="http://clementine-player.googlecode.com/files/${P}.tar.gz"
+SRC_URI="http://clementine-player.googlecode.com/files/${P}.tar.gz
+	http://www.gentoo.org/~ssuominen/${P}-patchset-1.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="ayatana iphone ipod mtp projectm wiimote"
+IUSE="ayatana +dbus iphone ipod +lastfm mtp projectm +udev wiimote"
 IUSE+="${LANGS// / linguas_}"
 
 COMMON_DEPEND="
-	>=x11-libs/qt-gui-4.5:4[dbus]
+	>=x11-libs/qt-gui-4.5:4[dbus?]
 	>=x11-libs/qt-opengl-4.5:4
 	>=x11-libs/qt-sql-4.5:4[sqlite]
 	dev-db/sqlite[fts3]
 	>=media-libs/taglib-1.6
-	media-libs/liblastfm
 	>=dev-libs/glib-2.24.1-r1:2
 	dev-libs/libxml2
 	>=media-libs/gstreamer-0.10
@@ -38,6 +38,7 @@ COMMON_DEPEND="
 			app-pda/usbmuxd
 		)
 	)
+	lastfm? ( media-libs/liblastfm )
 	mtp? ( >=media-libs/libmtp-1.0.0 )
 	projectm? ( media-libs/glew )
 "
@@ -45,6 +46,7 @@ COMMON_DEPEND="
 # http://code.google.com/p/clementine-player/source/browse/#svn/trunk/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? ( udev? ( sys-fs/udisks ) )
 	mtp? ( gnome-base/gvfs )
 	projectm? ( >=media-libs/libprojectm-1.2.0 )
 	>=media-plugins/gst-plugins-meta-0.10
@@ -61,6 +63,11 @@ DOCS="Changelog TODO"
 
 MAKEOPTS="${MAKEOPTS} -j1"
 
+PATCHES=(
+	"${WORKDIR}"/${P}-optional-liblastfm.patch
+	"${WORKDIR}"/${P}-optional-dbus-devicekit.patch
+)
+
 src_configure() {
 	# linguas
 	local langs x
@@ -72,8 +79,11 @@ src_configure() {
 	mycmakeargs=(
 		-DLINGUAS="${langs}"
 		-DBUNDLE_PROJECTM_PRESETS=OFF
+		$(cmake-utils_use dbus ENABLE_DBUS)
+		$(cmake-utils_use udev ENABLE_DEVICEKIT)
 		$(cmake-utils_use ipod ENABLE_LIBGPOD)
 		$(cmake-utils_use iphone ENABLE_IMOBILEDEVICE)
+		$(cmake-utils_use lastfm ENABLE_LIBLASTFM)
 		$(cmake-utils_use mtp ENABLE_LIBMTP)
 		-DENABLE_GIO=ON
 		$(cmake-utils_use wiimote ENABLE_WIIMOTEDEV)
diff --git a/media-sound/clementine/metadata.xml b/media-sound/clementine/metadata.xml
index 35b004dfde3e..cfaca3608d2f 100644
--- a/media-sound/clementine/metadata.xml
+++ b/media-sound/clementine/metadata.xml
@@ -13,6 +13,7 @@
   <use>
     <flag name="ayatana">Build in support for Ayatana notification using the libindicate-qt plugin.</flag>
     <flag name="iphone">Enable support for iPod Touch, iPhone, iPad</flag>
+	<flag name="lastfm">Enable Last.fm streaming services support through <pkg>media-libs/liblastfm</pkg></flag>
     <flag name='projectm'>Build with ProjectM visualization</flag>
     <flag name="wiimote">Enable support for Wii remote</flag>
   </use>