old

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

6 files changed, 16 insertions, 453 deletions

diff --git a/media-sound/clementine/ChangeLog b/media-sound/clementine/ChangeLog
index 11754b0cc0d1..39025e5ba67c 100644
--- a/media-sound/clementine/ChangeLog
+++ b/media-sound/clementine/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/clementine
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/ChangeLog,v 1.42 2011/07/06 17:59:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/ChangeLog,v 1.43 2011/11/29 16:13:08 ssuominen Exp $
+
+  29 Nov 2011; Samuli Suominen <ssuominen@gentoo.org>
+  -clementine-0.6-r2.ebuild, -files/clementine-0.6-fix-dbus.patch,
+  -clementine-0.7.ebuild, -clementine-0.7.1.ebuild:
+  old
 
 *clementine-0.7.1-r2 (06 Jul 2011)
 
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 386c0588ea4e..d3c2270f1255 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,23 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
-AUX clementine-0.6-fix-dbus.patch 2338 RMD160 7a661df804eee821846994df6f5a303080debcfb SHA1 396e928c448c8302246f5ec0d7e1fe6875d64763 SHA256 78504510fc68ecbdaf43200b0a60f1fcbd0344c3ac4d6a81937fcd93f61013fd
 AUX clementine-0.7.1-fix-devicekit.patch 698 RMD160 0e109485830bd8631f7c1498ae3270ce81f70843 SHA1 3b839f706f3c5865864c7f17c11b434ab43ae15e SHA256 3b31927a82e571d93eecbf32f9ba8cc0d23cb30c83e31077837f5f9fcd96b277
-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
 DIST clementine-0.7.1.tar.gz 5967162 RMD160 a7a7625b42d7070897124258ff979c82c236665e SHA1 8b2025b8876f9f3fe33ef5001e0621f3a5d0f142 SHA256 246e56f9283384b354bd43d5ec9937ceb93889f680f7bf45bd1ab00db36d61bc
-DIST clementine-0.7.tar.gz 5969344 RMD160 350c4c5e0ac2312c4ce4c8bae1502878b0ef8edf SHA1 496bb012e727d02320f294ebad9bf864a01b38f7 SHA256 5c9c12e5b270bcbd4116a0fdd792aff4489f980aa03c9eea12cc61c067f04b16
-EBUILD clementine-0.6-r2.ebuild 3284 RMD160 3a6e43660c37f4ff0ae8f446e53cd78c6d554f69 SHA1 125c7075b21f9746d720963abcaa46a185556e64 SHA256 387c8fcf48b435aae18d4de46b0bc3fc6bcce07da40f0d3880a7463183ab16da
 EBUILD clementine-0.7.1-r1.ebuild 3290 RMD160 f66969f94abd44891d6c773aa74ca28e3865d19b SHA1 5c52ee97a6dd6e7b684db98e82bea551cdbc15a3 SHA256 d520daf92dbcb1aa4e6161fb1c917b8b1fb08b5029c9db5978dcecf24ed54806
 EBUILD clementine-0.7.1-r2.ebuild 3415 RMD160 05065bcadd9f0142e5b9860bccc3746b47f16391 SHA1 d2ee7e3af95d2b14e063e6e233b2508e14785ea1 SHA256 ed4ba5ff79c3968086c68608a2dc3fdc928b635ad2f25467b81c6c23b50c8cec
-EBUILD clementine-0.7.1.ebuild 3236 RMD160 f5df595fc7696f38bf336b4acc77bbcb764a5c52 SHA1 caa96b89fc0d3cd7e9735677170405dc537b6d24 SHA256 5f8e0d7092ff2b234d78fcd56fc95a2e482aae847c00390386583dea78f645d3
-EBUILD clementine-0.7.ebuild 3315 RMD160 384a93e03f0a32509918ef8626067787e1f05664 SHA1 5fee631622c24de75b3aebe5703a13938adbb359 SHA256 ca7d5c8115da39746a395de9cfe0c8db0a041547ebf4df693570f5e04ca87735
-MISC ChangeLog 6592 RMD160 10c0d357116a2f0f64d1a23985d5b8f6014a31b7 SHA1 cc5f7daef1cabd3f3d6e45bb51eb979ee4bd6948 SHA256 357ee1f7780390e83cc6a0c9a0b28df57a3324d4b74f0ac69dfe2a05379a213b
+MISC ChangeLog 6772 RMD160 d5b4908494a30262430ffbadbc2b00ab78ee6434 SHA1 9fd4c82e87d6ca7ee71ce01f17ccd71cab7738d2 SHA256 f6c32ad9baa66626412ca32214f3ed3cbae23cd775e6df17f7eec79cfc3e66a9
 MISC metadata.xml 721 RMD160 430f7276f1c8f098c80c41038edeb5846877797e SHA1 ba4e1e1f7ca17a1992acff7c1e7cb32714097a71 SHA256 dc41ef2c4267b011a08f93fe460e112c6eed67868c74745a822271d7800e5e30
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk4UolQACgkQXkR9YqOcLPGJJAD/R+/cqe2kjiFr/rdrey+XqP9I
-G3P6SX5uUxHFM1dfGT0BAJvAjX6fRz4QXQOFuvaaEGEyYfYtZhLRvRYxsi9zydLT
-=Dctc
+iQEcBAEBAgAGBQJO1QP/AAoJEEdUh39IaPFNfc0H/jinlQpOM7ZqxbT8Dy9uV+sY
+eQMjptmq2vj1ltZMovjSGd6gZ7pyQbLD/9fP/VLOPEj0NIIPxtsEWt6hea69bKz3
+7t7HbBMVtJXb6gPOJoBKQgTNk1KQ+/AogqEYtYxmqgAGLZK98rObEPHmVoPFQuQR
+Ca7nPBDMDl9EFb8Ieaa9FxPtaGBm4zatryWiR76kfJC/p/gK4OMT3d1FthgWL/DA
+IY0y1j86I1OKX4eZmF3wD8r+vi0UHGHKIBtua0608XGa4VMa4szzQ/GcH3sr2GwW
+OkOoQIwWrTgLjWFFZJ4npf5/erNkRmloitZOf4iPW+zWyRxuqt7ARb5sHeYhI94=
+=zu+j
 -----END PGP SIGNATURE-----
diff --git a/media-sound/clementine/clementine-0.6-r2.ebuild b/media-sound/clementine/clementine-0.6-r2.ebuild
deleted file mode 100644
index eb930d3bdc1e..000000000000
--- a/media-sound/clementine/clementine-0.6-r2.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2011 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.6 2011/04/27 20:27:08 angelos 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 ios 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.8.0[ios?]
-		ios? (
-			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 ios ENABLE_IMOBILEDEVICE)
-		$(cmake-utils_use lastfm ENABLE_LIBLASTFM)
-		$(cmake-utils_use mtp ENABLE_LIBMTP)
-		-DENABLE_GIO=ON
-		$(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
-		)
-
-	# bug #355259
-	if use dbus; then
-		mycmakeargs+=(
-			$(cmake-utils_use wiimote ENABLE_WIIMOTEDEV)
-			)
-	fi
-
-	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/clementine-0.7.1.ebuild b/media-sound/clementine/clementine-0.7.1.ebuild
deleted file mode 100644
index 1858e4bd2a9f..000000000000
--- a/media-sound/clementine/clementine-0.7.1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/clementine-0.7.1.ebuild,v 1.3 2011/04/27 20:27:08 angelos Exp $
-
-EAPI=4
-
-LANGS=" ar be bg br ca cs cy da de el en_CA en_GB eo es et eu fi fr gl he hi hr hu is it ja kk lt lv nb nl oc pa pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_TW"
-
-inherit cmake-utils gnome2-utils virtualx
-
-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"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ayatana +dbus ios ipod +lastfm mtp projectm +udev wiimote"
-IUSE+="${LANGS// / linguas_}"
-
-REQUIRED_USE="
-	ios? ( ipod )
-	udev? ( dbus )
-	wiimote? ( dbus )
-"
-
-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/libechonest
-	media-libs/gstreamer:0.10
-	media-libs/gst-plugins-base:0.10
-	ayatana? ( dev-libs/libindicate-qt )
-	ipod? (
-		>=media-libs/libgpod-0.8.0[ios?]
-		ios? (
-			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"
-
-src_prepare() {
-	# some tests fail or hang
-	sed -i \
-		-e '/add_test_file(translations_test.cpp/d' \
-		tests/CMakeLists.txt || die
-}
-
-src_configure() {
-	local langs x
-	for x in ${LANGS}; do
-		use linguas_${x} && langs+=" ${x}"
-	done
-
-	# REMOTE and SCRIPTING unstable or unusable
-	local mycmakeargs=(
-		-DBUILD_WERROR=OFF
-		-DLINGUAS="${langs}"
-		-DBUNDLE_PROJECTM_PRESETS=OFF
-		$(cmake-utils_use dbus ENABLE_DBUS)
-		$(cmake-utils_use udev ENABLE_DEVICEKIT)
-		-DENABLE_GIO=ON
-		$(cmake-utils_use ios ENABLE_IMOBILEDEVICE)
-		$(cmake-utils_use ipod ENABLE_LIBGPOD)
-		$(cmake-utils_use lastfm ENABLE_LIBLASTFM)
-		$(cmake-utils_use mtp ENABLE_LIBMTP)
-		-DENABLE_REMOTE=OFF
-		-DENABLE_SCRIPTING_ARCHIVES=OFF
-		-DENABLE_SCRIPTING_PYTHON=OFF
-		$(cmake-utils_use ayatana ENABLE_SOUNDMENU)
-		$(cmake-utils_use projectm ENABLE_VISUALISATIONS)
-		$(cmake-utils_use wiimote ENABLE_WIIMOTEDEV)
-		-DSTATIC_SQLITE=OFF
-		)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cd "${CMAKE_BUILD_DIR}" || die
-	Xemake test
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/media-sound/clementine/clementine-0.7.ebuild b/media-sound/clementine/clementine-0.7.ebuild
deleted file mode 100644
index 84d939b4c23c..000000000000
--- a/media-sound/clementine/clementine-0.7.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/clementine-0.7.ebuild,v 1.4 2011/04/27 20:27:08 angelos Exp $
-
-EAPI=4
-
-LANGS=" ar be bg br ca cs cy da de el en_CA en_GB eo es et eu fi fr gl he hi hr hu is it ja kk lt lv nb nl oc pa pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_TW"
-
-inherit cmake-utils gnome2-utils virtualx
-
-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"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ayatana +dbus ios ipod +lastfm mtp projectm +udev wiimote"
-IUSE+="${LANGS// / linguas_}"
-
-REQUIRED_USE="
-	ios? ( ipod )
-	udev? ( dbus )
-	wiimote? ( dbus )
-"
-
-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/libechonest
-	media-libs/gstreamer:0.10
-	media-libs/gst-plugins-base:0.10
-	ayatana? ( dev-libs/libindicate-qt )
-	ipod? (
-		>=media-libs/libgpod-0.8.0[ios?]
-		ios? (
-			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"
-
-src_prepare() {
-	sed -i -e 's:-Werror::' src/CMakeLists.txt || die #360703
-
-	# some tests fail or hang
-	sed -i \
-		-e '/add_test_file(mpris1_test.cpp/d' \
-		-e '/add_test_file(translations_test.cpp/d' \
-		tests/CMakeLists.txt || die
-}
-
-src_configure() {
-	local langs x
-	for x in ${LANGS}; do
-		use linguas_${x} && langs+=" ${x}"
-	done
-
-	# REMOTE and SCRIPTING unstable or unusable
-	local mycmakeargs=(
-		-DLINGUAS="${langs}"
-		-DBUNDLE_PROJECTM_PRESETS=OFF
-		$(cmake-utils_use dbus ENABLE_DBUS)
-		$(cmake-utils_use udev ENABLE_DEVICEKIT)
-		-DENABLE_GIO=ON
-		$(cmake-utils_use ios ENABLE_IMOBILEDEVICE)
-		$(cmake-utils_use ipod ENABLE_LIBGPOD)
-		$(cmake-utils_use lastfm ENABLE_LIBLASTFM)
-		$(cmake-utils_use mtp ENABLE_LIBMTP)
-		-DENABLE_REMOTE=OFF
-		-DENABLE_SCRIPTING_ARCHIVES=OFF
-		-DENABLE_SCRIPTING_PYTHON=OFF
-		$(cmake-utils_use ayatana ENABLE_SOUNDMENU)
-		$(cmake-utils_use projectm ENABLE_VISUALISATIONS)
-		$(cmake-utils_use wiimote ENABLE_WIIMOTEDEV)
-		-DSTATIC_SQLITE=OFF
-		)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cd "${CMAKE_BUILD_DIR}" || die
-	Xemake test
-}
-
-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
deleted file mode 100644
index a15ce24e5f67..000000000000
--- a/media-sound/clementine/files/clementine-0.6-fix-dbus.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-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