Fix regression caused by prev. commit.

(Portage version: 2.2.0_alpha10/cvs/Linux x86_64)

3 files changed, 210 insertions, 1 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/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