Fix regression caused by prev. commit.

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

4 files changed, 213 insertions, 2 deletions

diff --git a/media-sound/clementine/ChangeLog b/media-sound/clementine/ChangeLog
index b3d307eb6334..8c97f0aabcb7 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.25 2010/12/26 15:56:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/ChangeLog,v 1.26 2010/12/26 19:53:46 ssuominen Exp $
+
+*clementine-0.6-r2 (26 Dec 2010)
+
+  26 Dec 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +clementine-0.6-r2.ebuild, +files/clementine-0.6-fix-dbus.patch:
+  Fix regression caused by prev. commit.
 
 *clementine-0.6-r1 (26 Dec 2010)
 
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index f45912089397..734b721c63cb 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,8 +1,10 @@
 AUX clementine-0.5.1-automagic.patch 3502 RMD160 d41e9e71a94e04bb4af760d76025912dcd0dbe3a SHA1 8b67f43ebd30810ea3a50e5ae688e0031a3d1828 SHA256 599eadfb657ddfce902edad9991b79d6128a114338ffa6d197b805a5835eb235
+AUX clementine-0.6-fix-dbus.patch 2338 RMD160 7a661df804eee821846994df6f5a303080debcfb SHA1 396e928c448c8302246f5ec0d7e1fe6875d64763 SHA256 78504510fc68ecbdaf43200b0a60f1fcbd0344c3ac4d6a81937fcd93f61013fd
 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-r1.ebuild 3205 RMD160 c62438d530fefead9621bfea4e756d6603492b09 SHA1 82da7960e1ab39c545c4a2c5d0361b65f8e222c7 SHA256 b73b783d902b6c044c5a2c28c5830d7fc6a08822cf870354368e0b102a37595d
-MISC ChangeLog 3920 RMD160 4708d3a8d270c0b3ebe0ae118f676dd88b0bbf14 SHA1 d486a73918da2cb34a5a3d7ce3273c6e22c94baf SHA256 6570f9d4b21fdb4db97056dd717a0153e4291c4e97bfd6337dbe1098bb7f181a
+EBUILD clementine-0.6-r2.ebuild 3240 RMD160 3278496c53ac8f27a56bfc864550bdac85041527 SHA1 87e6bad96260a77cfb72d011a93274efc2feff9c SHA256 599a7a73c63c4df751b1ed7e2653882dd1b0855acf18483fee387a9ba934b500
+MISC ChangeLog 4117 RMD160 300924e3fd207f27cc6da5dd6780989d0ae01d62 SHA1 43bd10f6162e0f2229716a856b924a9344d009d2 SHA256 078f9bcfeb839be2ff9816829339e286e6244b585819574cd162810d9c093609
 MISC metadata.xml 796 RMD160 f8013d0be71993dc142670815b5f96565c26ac4c SHA1 51b384427e6eb9dbdacc3be406db4c9e98d1a7b8 SHA256 bd737ecf3604b5ddd66b07a90bd073c1b867a4bf349823b234f90435a068a166
diff --git a/media-sound/clementine/clementine-0.6-r2.ebuild b/media-sound/clementine/clementine-0.6-r2.ebuild
new file mode 100644
index 000000000000..22e479c137c6
--- /dev/null
+++ b/media-sound/clementine/clementine-0.6-r2.ebuild
@@ -0,0 +1,113 @@
+# 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-r2.ebuild,v 1.1 2010/12/26 19:53:47 ssuominen Exp $
+
+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"
+
+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
+	http://www.gentoo.org/~ssuominen/${P}-patchset-1.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+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-opengl-4.5:4
+	>=x11-libs/qt-sql-4.5:4[sqlite]
+	dev-db/sqlite[fts3]
+	>=media-libs/taglib-1.6
+	>=dev-libs/glib-2.24.1-r1:2
+	dev-libs/libxml2
+	>=media-libs/gstreamer-0.10
+	>=media-libs/gst-plugins-base-0.10
+	ayatana? ( dev-libs/libindicate-qt )
+	ipod? (
+		>=media-libs/libgpod-0.7.92
+		iphone? (
+			app-pda/libplist
+			>=app-pda/libimobiledevice-1.0
+			app-pda/usbmuxd
+		)
+	)
+	lastfm? ( media-libs/liblastfm )
+	mtp? ( >=media-libs/libmtp-1.0.0 )
+	projectm? ( media-libs/glew )
+"
+# now only presets are used, libprojectm is internal
+# 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
+	>=media-plugins/gst-plugins-gio-0.10
+	>=media-plugins/gst-plugins-soup-0.10
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.39
+	dev-util/pkgconfig
+	sys-devel/gettext
+	x11-libs/qt-test:4
+"
+DOCS="Changelog TODO"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+PATCHES=(
+	"${WORKDIR}"/${P}-optional-liblastfm.patch
+	"${WORKDIR}"/${P}-optional-dbus-devicekit.patch
+	"${FILESDIR}"/${P}-fix-dbus.patch
+)
+
+src_configure() {
+	# linguas
+	local langs x
+	for x in ${LANGS}; do
+		use linguas_${x} && langs+=" ${x}"
+	done
+
+	# Upstream supports only gstreamer engine, other engines are unstable and lacking features.
+	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)
+		$(cmake-utils_use projectm ENABLE_VISUALISATIONS)
+		$(cmake-utils_use ayatana ENABLE_SOUNDMENU)
+		-DSTATIC_SQLITE=OFF
+		-DENGINE_GSTREAMER_ENABLED=ON
+		-DENGINE_QT_PHONON_ENABLED=OFF
+		-DENGINE_LIBVLC_ENABLED=OFF
+		-DENGINE_LIBXINE_ENABLED=OFF
+		)
+
+	cmake-utils_src_configure
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/clementine/files/clementine-0.6-fix-dbus.patch b/media-sound/clementine/files/clementine-0.6-fix-dbus.patch
new file mode 100644
index 000000000000..a15ce24e5f67
--- /dev/null
+++ b/media-sound/clementine/files/clementine-0.6-fix-dbus.patch
@@ -0,0 +1,90 @@
+From 49e45d2ae6d8fb91d2f3ee49780995807e853fec Mon Sep 17 00:00:00 2001
+From: David Sansome <me@davidsansome.com>
+Date: Sun, 26 Dec 2010 17:24:44 +0000
+Subject: Fix dbus
+
+git-svn-id: http://clementine-player.googlecode.com/svn/trunk@2501 94c5599e-fc6c-11de-b061-8119ef04aefe
+---
+diff --git a/src/config.h.in b/src/config.h.in
+index 0068378..2baa3ae 100644
+--- a/src/config.h.in
++++ b/src/config.h.in
+@@ -35,13 +35,12 @@
+ #cmakedefine HAVE_SPARKLE
+ #cmakedefine HAVE_STATIC_SQLITE
+ 
+-#cmakedefine HAVE_LIBGPOD
++#cmakedefine HAVE_DBUS
+ #cmakedefine HAVE_GIO
+ #cmakedefine HAVE_IMOBILEDEVICE
+-#cmakedefine HAVE_LIBMTP
+-
++#cmakedefine HAVE_LIBGPOD
+ #cmakedefine HAVE_LIBINDICATE
+-
+ #cmakedefine HAVE_LIBLASTFM
++#cmakedefine HAVE_LIBMTP
+ 
+ #endif // CONFIG_H_IN
+diff --git a/src/core/player.h b/src/core/player.h
+index 66dfdcb..18a1bfc 100644
+--- a/src/core/player.h
++++ b/src/core/player.h
+@@ -23,6 +23,7 @@
+ 
+ #include <boost/scoped_ptr.hpp>
+ 
++#include "config.h"
+ #include "core/albumcoverloader.h"
+ #include "core/song.h"
+ #include "engines/engine_fwd.h"
+diff --git a/src/ui/screensaver.cpp b/src/ui/screensaver.cpp
+index b548ce1..58aeaa7 100644
+--- a/src/ui/screensaver.cpp
++++ b/src/ui/screensaver.cpp
+@@ -15,6 +15,7 @@
+    along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
++#include "config.h"
+ #include "screensaver.h"
+ 
+ #include <QtGlobal>
+diff --git a/src/widgets/osd.cpp b/src/widgets/osd.cpp
+index f38379f..df97a22 100644
+--- a/src/widgets/osd.cpp
++++ b/src/widgets/osd.cpp
+@@ -15,6 +15,7 @@
+    along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
++#include "config.h"
+ #include "osd.h"
+ #include "osdpretty.h"
+ #include "ui/systemtrayicon.h"
+diff --git a/src/widgets/osd.h b/src/widgets/osd.h
+index e899c63..ced0cf7 100644
+--- a/src/widgets/osd.h
++++ b/src/widgets/osd.h
+@@ -22,6 +22,7 @@
+ #include <QImage>
+ #include <QObject>
+ 
++#include "config.h"
+ #include "engines/engine_fwd.h"
+ #include "core/albumcoverloader.h"
+ #include "core/backgroundthread.h"
+diff --git a/src/widgets/osd_x11.cpp b/src/widgets/osd_x11.cpp
+index 6ea482b..59abc93 100644
+--- a/src/widgets/osd_x11.cpp
++++ b/src/widgets/osd_x11.cpp
+@@ -15,6 +15,7 @@
+    along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
++#include "config.h"
+ #include "osd.h"
+ 
+ #include <QtDebug>
+--
+cgit v0.8.3.4