old

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

7 files changed, 18 insertions, 898 deletions

diff --git a/media-sound/clementine/ChangeLog b/media-sound/clementine/ChangeLog
index 7a2aa2463d75..bffa04036f34 100644
--- a/media-sound/clementine/ChangeLog
+++ b/media-sound/clementine/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/clementine
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/ChangeLog,v 1.72 2012/11/19 10:29:23 ssuominen Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/ChangeLog,v 1.73 2013/02/03 16:46:17 ssuominen Exp $
+
+  03 Feb 2013; Samuli Suominen <ssuominen@gentoo.org>
+  -clementine-1.0.1-r2.ebuild, -files/clementine-1.0.1-liblastfm-1.patch,
+  -clementine-1.1.0_rc1.ebuild, -clementine-1.1.0.ebuild:
+  old
 
   19 Nov 2012; Samuli Suominen <ssuominen@gentoo.org> clementine-1.1.1.ebuild:
   Pull in required virtual/glu and virtual/opengl.
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 4a217d909d43..3d38fc9e65ad 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -2,27 +2,21 @@
 Hash: SHA256
 
 AUX clementine-1.0.1-fresh-start.patch 418 SHA256 8bc9d43cb36d707d6a32c19c02f76ce93d9cd457f247ba4b2bfa5052206a3c8d SHA512 badba7977490e856ded83812905989c229bd91abdbbcbe199b4658c8764ec7377b1dea39afea461a709b6eb1ea77cb570a25a2dea71784396799b35b64c4469e WHIRLPOOL f74b5621144c8af4dbc4cf441fb2e3b52c7af889b105f4cccc09a0d5d703a2bf463a90e4effc2e0f42a806fcf7cd3bf048dde12aee8fb691b931d541ba636fa1
-AUX clementine-1.0.1-liblastfm-1.patch 15900 SHA256 f11c11d9c3918e89531897dd2ab20af2f98d354386d662b879d83ed04b11b6ab SHA512 59c763a6f3689216bab452867fd9c017635a13a274b2051e0e8fbe5c5ea014f0c432de399847ce3d277e15e9ad63e53d3c4073d57558ac4873666e2ecbee9c21 WHIRLPOOL 36ea3bdc904562fa57ae9f6d84a75825740b0a9c6afaeedc45ca95f8e20dcfc5a5a5f44d23e35ddd8c249a34eabdd9d947564f1f366dd94676769ea53c1e1a4e
 AUX clementine-1.0.1-linguas.patch 500 SHA256 e23a2b7c70816e1dcebe9e9629568255d6051674676b91e4c6509dad08ca1a0b SHA512 eaa69553b73a500214f2f20fa952aebdbc83ca7c6ec55927678f6f0ca583ce7312fb4688f9b5ce1df561751436e9fbb4688b32c86d2c62fa19f8d02682aa7946 WHIRLPOOL b020c75d31e07d0fa68a7b1104f57aa455324b7adca3504139367d90c32b4980321d31f69361889b3d096eac3e184cd60d9519a187d938d43be75642b78a3a4d
 DIST clementine-1.0.1.tar.gz 8267876 SHA256 bf28c6584e280f58e8ebf7ba33cee1f926c0b8f1857ae605164ecbb2ff096e7d SHA512 7657d8f906a349f2085a5bda410c1af093626b4839424136dcb277bb775dad1cb91dce6138035d0c9f83a8a1079a58c01a7f7fd3bd63f7e2fbd5c8bff387437c WHIRLPOOL eebeb245d12ad871b0e2fbc1b4bd33c5ce31ff03f98536bcd9197084cd7dd5c7dfce1cb9169b585a60901845351ae8626ca689d80b15fa0dddaca68e4c9f6556
-DIST clementine-1.1.0.tar.gz 8281419 SHA256 4ddfb6150874a0d14ad3e92e5fc0788c893ef2aeb6d93a5d0035a6bfc51041b3 SHA512 2d4dc56099931dd788a88e6934dfb019dd9c12646995ca6c13364ac888a336bba0afcd507362baa2c3c830825ccc26d491027618fbb0459e6cc4e2be42dff666 WHIRLPOOL 8a18a1dd2895af8a898b33780c7cbf9096750e285228b3ddd818bd42d8c609051d944246d14b9cbc9e464d8c3889113ab7ad5ba98b7b9b2a6cca6b0c42d6f97e
-DIST clementine-1.1.0rc1.tar.gz 8472774 SHA256 b2905a44258e3793674c93e6218d488d098b2a16c2da59ea6e9e6bfda59ce3cd SHA512 79bf26406de5b59d146b9d2b04b1ba27107ed371e60a55a1f2cd01c03063ff8d39c462026f6123742b5e75c6d5f599827999bfc4da882ac24df9cc5938ec8d08 WHIRLPOOL a2590c1106c2c1755bb7bdd9dccb27220939fd2cfa425979d7350701e4373db1611d3e82bc15f6d835604ff99af57519b2dcab34c2a82641d94c228c0c5dfebf
 DIST clementine-1.1.1.tar.gz 8557109 SHA256 a94dfbd4732155ff1d4f24bb792d9e4def5bf4a42dd6678638c0400217a6fda9 SHA512 61b08c97f04556b91589365d31d1056d87f2ade6df02c4c1fb10e31dcb8d3f5ec327541635776e1c20df88926f580430da6bb33b16ba737a5eb9b6d4b39bdedb WHIRLPOOL 57a778fabe58737d3a35c2bdd7fad7698e6f48a4c4e7bb834a91ac914362b583ab96dede7cb7870a112300ed8e32e7e4277e7ee6d6f5250cc32b45a84009515c
 EBUILD clementine-1.0.1-r1.ebuild 3967 SHA256 904ab39c7efefe7c19447e9d5c4b36ac2a170d6545389a0314f98d92a7502564 SHA512 d989f83ec572ef849f0fbf1282e7d969c8073dabdef2cba174d062f4d0edd26fb7d292683c1b6aea6605aa08b4685ee87b9e4dad247103f36b9d7bbf2f5bbb76 WHIRLPOOL f565910525ab1d9874c35e0f5c6f245754d39f50d37209a2b813463127537422a497c24894ad13cfed8efaa7bca90292335b0327d99de87eced34e7bdbc57aca
-EBUILD clementine-1.0.1-r2.ebuild 4080 SHA256 afeb22c50e5adf3cbf8add9ada73c74c834695c998d6a130c41ec686b013e80c SHA512 25f360ff8b0935ba6b0d9bc5db085f7ecce2098b50cd09133a7b4f36cc18b1b175d8d8c02220c8b7845f27cc4ddedd15c6f02f68b0f7888dbfc3d35e94b6cc69 WHIRLPOOL a40cf67ba29f54f8f0193d488ebe896dd0c1c6253a38bd5113888bb79567ac3386df6c4c7e4d0347143e418c656712880f1f4672ec42883372d87e6a6929790d
-EBUILD clementine-1.1.0.ebuild 3929 SHA256 44382dd2304f458f3ac5272b1aba1482c76aa823507c965932683d6eb5c90f7f SHA512 2c3942b3f6dfc639324028007a507fe2f2324d1d4bb660abb9a2768a2ef9219be8e11dbfe8a397ed2158e6eeabd1d02903d1631499c02c07973ebbeb53deb0d5 WHIRLPOOL f95f94592f1cbe14f995847f6cd9a1315c2816339744845574337cc89eda4a54859feb4277de56f758324e30dcb79c8fb92f3f077787700ea531ca92369983c4
-EBUILD clementine-1.1.0_rc1.ebuild 3959 SHA256 b3c8a9381d46699a8868b560f6e8566104d067492780caf5a0bc0c83e7ab17c0 SHA512 8be90083e001c88c7e9e6faded416d80d4d778a91adba8944c533c608fb88054327dc677d6a1cf2f0de054c0f62d502030544f3adc2063d5ca4360a6490da2eb WHIRLPOOL 611999a74f36bfdc11c4615c0c9ae11b56c22a910419b0dcb65bfa209c723032a00328f5ed99893154ea823fe0662cba268f1355a373e737a9d736ef9e42a84d
-EBUILD clementine-1.1.1.ebuild 3958 SHA256 2cb04f980c170744901a136191cd4b876e5b0f6d34ce5073a644e7651c2c4e80 SHA512 ead01f97a200a75fc85a3d5331bcc10212c2dc3a95008cc899b152846ef93874176483504a1b50be32b42db5b6d223cbcdc7983f8e769a54f0ceca0f6f8e752f WHIRLPOOL 8393ccf5f79e4282672587d7ddf55675fc73d5fcfebefc83176b34905482ffa64f8d8d0e5308a696b9083573d880cb125258760b888d1691f7197d0581493ec3
-MISC ChangeLog 11314 SHA256 782578bcfd5b4d56ea2552d6b1ae6d128abe5b28809baad7e55f600c3972873d SHA512 d32eb97c082f47ac7e7e03afbc92a17320ed5d48c4d08d0147591dfd8a635aba4c5be2687437150f196f012cfe6a3a21e856736b480b2478bf3a7e2c761d6b87 WHIRLPOOL bb9b5e02c1d4a4fc0fe323d12d8d619e525a2000067c3a41cdaa8cdf2ba6e3d74ffc5fc8feb86423f2448913757951745a4bd3596663547bdb3b5f846a84be9a
+EBUILD clementine-1.1.1.ebuild 3958 SHA256 074cc8f9c3845f86d96287e377f39cfef97c522c413e4c7e706ee373665355f5 SHA512 b23bd81fe34a083bb26edb96f6413744d1a046df55d18a8f221fc54a5eedeb52fe0272c97ec18249414704d284da5ed826a0489af1e90b73976a51e71e3aaf11 WHIRLPOOL 212e699f7d5257f403511c1fee6f5d2bebf89fe2fa061c82a07c8865fe1e2a93253b3074ebf0924f213e0fc25b72078c66e250ec9e0e81c066e8a83601fe1b76
+MISC ChangeLog 11507 SHA256 7b258fadd0b60b07933a7fd7e15011c514ac6c1ff714774f1dcc023aeb597beb SHA512 ca8ebc188c0b3f45b38c506b05634c9905240f25f7cbe27cfdff5d2d1ee02ce71a45756fd3e49c7b8526422b752710d27e4d415e54cb5524a41cf6f3d09919d3 WHIRLPOOL 14fdcc22128fad903aac6fc58c3fd6c39739512a01439d62f0f5c25c91274193d9730b38a90ad12ebb2ec6a232f3d1024173d388c44cb644af3c6c5146911667
 MISC metadata.xml 916 SHA256 78f24c6f0d70a4542c61d70d81453125ab7d27ef5b910cf708c447e773b7a93f SHA512 f2b6ebbf79852b5d115cea302163f987f262aeef606f2c6ef45f385fc49173451d130f7ef0dbaf1f84a3d7ac2ffbfc939234d01a0a6539962b8bfb9ebc35203c WHIRLPOOL 3c56538fa923f79644cb7d138c287b3251ffee6ac1d6d209171b70e2beac8fbdc7a77f62fb78452220bac737c49589ba565aa672484ff80421e2cb9f5ce50008
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQqgn7AAoJEEdUh39IaPFNWkkIAJTAH9IMfz2y1+OB4959yEPk
-FHPXNwPp8i7i7TFRUTFf4G398ylf8iQZIRQGhj2SXUfwfQSqDYgF2zJZpmjM5hpW
-bhz8VmUeXaeRxGPsUQn3fMIK1WaCSDFET9frdN363ySKutDs2oS7U/FJIX3LaiYc
-jsPPHOuYQXs+j4wWHvRekYwft5vf/gwNngRQ2Whg0wmpTxzVrZIaRy3/YH1S1cSo
-lNyypFbQSkDUM5+LNch0tKU2jQiyVwjVy8RRY6WMaUqM7uqIr87uywyvvDbP+5hf
-P8yQAe+Vgm+Q4gH8l+L1KkTqbbMHBxXd7cyrFEp4OSKi3XDku1Qg36oimj30oSc=
-=h+xp
+iQEcBAEBCAAGBQJRDpQ/AAoJEEdUh39IaPFNCWAH/0SIG+THHtNq0uX6wacxT+46
+ELUq2Zob9TbAAnozO/me7J3JvV3qrJBvLZ8cG9+9Bj4wd3367P66SB3Jf7jkGmRb
+02NWM4R410vNKaZlolQC/Kz24OGDtF857bz+25vixidtqdtMx2rnz/3atiSknhG4
+qerDVTyo1jQKrEbYKOFezWQHr9whjq7vNC7eYUEcOQhMSF2QmMomp1CL79dtfQAQ
+AWU6JU7OCSxDVV8dRn/w2sVisUnY1ZwvxbRYvmh1NXkVU7tugZ+lLUu/28H8/Iek
+XxGoDXykSf7sHW8DNEKybNMPk7SEMLdUC81sSNmMkOm6HgyLR/sanIei7iGL80g=
+=BCBU
 -----END PGP SIGNATURE-----
diff --git a/media-sound/clementine/clementine-1.0.1-r2.ebuild b/media-sound/clementine/clementine-1.0.1-r2.ebuild
deleted file mode 100644
index ea9c511b0efc..000000000000
--- a/media-sound/clementine/clementine-1.0.1-r2.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/clementine-1.0.1-r2.ebuild,v 1.3 2012/10/08 10:00:17 pinkbyte Exp $
-
-EAPI=4
-
-LANGS=" ar be bg bn br bs ca cs cy da de el en_CA en_GB eo es et eu fa fi fr gl he hi hr hu hy ia id is it ja ka kk ko lt lv mr ms nb nl oc pa pl pt_BR pt ro ru sk sl sr@latin sr sv tr uk vi zh_CN zh_TW"
-
-inherit cmake-utils eutils flag-o-matic 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 cdda +dbus debug ios ipod kde lastfm mms mtp projectm test +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.7[mp4]
-	>=dev-libs/glib-2.24.1-r1
-	dev-libs/libxml2
-	dev-libs/qjson
-	media-libs/libechonest
-	>=media-libs/chromaprint-0.6
-	media-libs/gstreamer:0.10
-	media-libs/gst-plugins-base:0.10
-	ayatana? ( dev-libs/libindicate-qt )
-	cdda? ( dev-libs/libcdio )
-	ipod? (
-		>=media-libs/libgpod-0.8.0[ios?]
-		ios? (
-			app-pda/libplist
-			>=app-pda/libimobiledevice-1.0
-			app-pda/usbmuxd
-		)
-	)
-	kde? ( >=kde-base/kdelibs-4.4 )
-	lastfm? ( >=media-libs/liblastfm-1 )
-	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:0 ) )
-	mms? ( media-plugins/gst-plugins-libmms:0.10 )
-	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
-	media-plugins/gst-plugins-taglib:0.10
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.39
-	virtual/pkgconfig
-	sys-devel/gettext
-	x11-libs/qt-test:4
-	kde? ( dev-util/automoc )
-	dev-cpp/gmock
-	test? ( gnome-base/gsettings-desktop-schemas )
-"
-DOCS="Changelog"
-
-src_prepare() {
-	# some tests fail or hang
-	sed -i \
-		-e '/add_test_file(translations_test.cpp/d' \
-		tests/CMakeLists.txt || die
-
-	# API changed, see http://bugs.gentoo.org/410933
-	has_version '>=app-pda/libimobiledevice-1.1.2' && \
-		sed -i -e 's:event->uuid:event->udid:' src/devices/ilister.cpp
-
-	epatch "${FILESDIR}"/${P}-fresh-start.patch \
-		"${FILESDIR}"/${P}-linguas.patch \
-		"${FILESDIR}"/${P}-liblastfm-1.patch
-}
-
-src_configure() {
-	local langs x
-	for x in ${LANGS}; do
-		use linguas_${x} && langs+=" ${x}"
-	done
-
-	# spotify is not in portage
-	# REMOTE is unstable
-	local mycmakeargs=(
-		-DBUILD_WERROR=OFF
-		-DLINGUAS="${langs}"
-		-DBUNDLE_PROJECTM_PRESETS=OFF
-		$(cmake-utils_use cdda ENABLE_AUDIOCD)
-		$(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 kde ENABLE_PLASMARUNNER)
-		$(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)
-		-DENABLE_SPOTIFY=OFF
-		-DENABLE_SPOTIFY_BLOB=OFF
-		-DENABLE_REMOTE=OFF
-		-DENABLE_BREAKPAD=OFF
-		-DSTATIC_SQLITE=OFF
-		-DUSE_SYSTEM_GMOCK=ON
-		)
-
-	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
-
-	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-1.1.0.ebuild b/media-sound/clementine/clementine-1.1.0.ebuild
deleted file mode 100644
index f7b5d2c8053a..000000000000
--- a/media-sound/clementine/clementine-1.1.0.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/clementine-1.1.0.ebuild,v 1.2 2012/10/27 16:14:13 maksbotan Exp $
-
-EAPI=4
-
-LANGS=" af ar be bg bn br bs ca cs cy da de el en_CA en_GB eo es es_AR et eu fa fi fr ga gl he hi hr hu hy ia id is it ja ka kk ko lt lv mr ms nb nl oc pa pl pt pt_BR ro ru sk sl sr sr@latin sv te tr uk uz vi zh_CN zh_TW"
-
-inherit cmake-utils flag-o-matic 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 cdda +dbus debug googledrive ios ipod lastfm mms moodbar mtp projectm test +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.7[mp4]
-	>=dev-libs/glib-2.24.1-r1
-	dev-libs/libxml2
-	dev-libs/protobuf
-	dev-libs/qjson
-	media-libs/libechonest
-	>=media-libs/chromaprint-0.6
-	media-libs/gstreamer:0.10
-	media-libs/gst-plugins-base:0.10
-	ayatana? ( dev-libs/libindicate-qt )
-	cdda? ( dev-libs/libcdio )
-	googledrive? ( >=media-libs/taglib-1.8[mp4] )
-	ipod? (
-		>=media-libs/libgpod-0.8.0[ios?]
-		ios? (
-			app-pda/libplist
-			>=app-pda/libimobiledevice-1.0
-			app-pda/usbmuxd
-		)
-	)
-	lastfm? ( >=media-libs/liblastfm-1 )
-	mtp? ( >=media-libs/libmtp-1.0.0 )
-	moodbar? ( sci-libs/fftw:3.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:0 ) )
-	mms? ( media-plugins/gst-plugins-libmms:0.10 )
-	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
-	media-plugins/gst-plugins-taglib:0.10
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.39
-	virtual/pkgconfig
-	sys-devel/gettext
-	x11-libs/qt-test:4
-	dev-cpp/gmock
-	googledrive? ( dev-cpp/sparsehash )
-	test? ( gnome-base/gsettings-desktop-schemas )
-"
-DOCS="Changelog"
-
-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
-
-	# spotify is not in portage
-	local mycmakeargs=(
-		-DBUILD_WERROR=OFF
-		-DLINGUAS="${langs}"
-		-DBUNDLE_PROJECTM_PRESETS=OFF
-		$(cmake-utils_use cdda ENABLE_AUDIOCD)
-		$(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)
-		$(cmake-utils_use moodbar ENABLE_MOODBAR)
-		-DENABLE_GIO=ON
-		$(cmake-utils_use wiimote ENABLE_WIIMOTEDEV)
-		$(cmake-utils_use projectm ENABLE_VISUALISATIONS)
-		$(cmake-utils_use ayatana ENABLE_SOUNDMENU)
-		$(cmake-utils_use googledrive ENABLE_GOOGLE_DRIVE)
-		-DENABLE_SPOTIFY=OFF
-		-DENABLE_SPOTIFY_BLOB=OFF
-		-DENABLE_SPOTIFY_DOWNLOADER=OFF
-		-DENABLE_BREAKPAD=OFF
-		-DSTATIC_SQLITE=OFF
-		-DUSE_SYSTEM_GMOCK=ON
-		)
-
-	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
-
-	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-1.1.0_rc1.ebuild b/media-sound/clementine/clementine-1.1.0_rc1.ebuild
deleted file mode 100644
index 14faa470023e..000000000000
--- a/media-sound/clementine/clementine-1.1.0_rc1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/clementine-1.1.0_rc1.ebuild,v 1.1 2012/10/08 17:13:03 pinkbyte Exp $
-
-EAPI=4
-
-LANGS=" af ar be bg bn br bs ca cs cy da de el en_CA en_GB eo es es_AR et eu fa fi fr ga gl he hi hr hu hy ia id is it ja ka kk ko lt lv mr ms nb nl oc pa pl pt pt_BR ro ru sk sl sr sr@latin sv te tr uk uz vi zh_CN zh_TW"
-
-inherit cmake-utils flag-o-matic 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 cdda +dbus debug googledrive ios ipod lastfm mms moodbar mtp projectm test +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.7[mp4]
-	>=dev-libs/glib-2.24.1-r1
-	dev-libs/libxml2
-	dev-libs/protobuf
-	dev-libs/qjson
-	media-libs/libechonest
-	>=media-libs/chromaprint-0.6
-	media-libs/gstreamer:0.10
-	media-libs/gst-plugins-base:0.10
-	ayatana? ( dev-libs/libindicate-qt )
-	cdda? ( dev-libs/libcdio )
-	googledrive? ( >=media-libs/taglib-1.8[mp4] )
-	ipod? (
-		>=media-libs/libgpod-0.8.0[ios?]
-		ios? (
-			app-pda/libplist
-			>=app-pda/libimobiledevice-1.0
-			app-pda/usbmuxd
-		)
-	)
-	lastfm? ( >=media-libs/liblastfm-1 )
-	mtp? ( >=media-libs/libmtp-1.0.0 )
-	moodbar? ( sci-libs/fftw:3.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:0 ) )
-	mms? ( media-plugins/gst-plugins-libmms:0.10 )
-	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
-	media-plugins/gst-plugins-taglib:0.10
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.39
-	virtual/pkgconfig
-	sys-devel/gettext
-	x11-libs/qt-test:4
-	dev-cpp/gmock
-	googledrive? ( dev-cpp/sparsehash )
-	test? ( gnome-base/gsettings-desktop-schemas )
-"
-DOCS="Changelog"
-
-S="${WORKDIR}/${P/_/}"
-
-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
-
-	# spotify is not in portage
-	local mycmakeargs=(
-		-DBUILD_WERROR=OFF
-		-DLINGUAS="${langs}"
-		-DBUNDLE_PROJECTM_PRESETS=OFF
-		$(cmake-utils_use cdda ENABLE_AUDIOCD)
-		$(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)
-		$(cmake-utils_use moodbar ENABLE_MOODBAR)
-		-DENABLE_GIO=ON
-		$(cmake-utils_use wiimote ENABLE_WIIMOTEDEV)
-		$(cmake-utils_use projectm ENABLE_VISUALISATIONS)
-		$(cmake-utils_use ayatana ENABLE_SOUNDMENU)
-		$(cmake-utils_use googledrive ENABLE_GOOGLE_DRIVE)
-		-DENABLE_SPOTIFY=OFF
-		-DENABLE_SPOTIFY_BLOB=OFF
-		-DENABLE_SPOTIFY_DOWNLOADER=OFF
-		-DENABLE_BREAKPAD=OFF
-		-DSTATIC_SQLITE=OFF
-		-DUSE_SYSTEM_GMOCK=ON
-		)
-
-	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
-
-	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-1.1.1.ebuild b/media-sound/clementine/clementine-1.1.1.ebuild
index 68afbf9314de..c7af5d8340cb 100644
--- a/media-sound/clementine/clementine-1.1.1.ebuild
+++ b/media-sound/clementine/clementine-1.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/clementine-1.1.1.ebuild,v 1.2 2012/11/19 10:29:23 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/clementine-1.1.1.ebuild,v 1.3 2013/02/03 16:46:17 ssuominen Exp $
 
 EAPI=4
 
diff --git a/media-sound/clementine/files/clementine-1.0.1-liblastfm-1.patch b/media-sound/clementine/files/clementine-1.0.1-liblastfm-1.patch
deleted file mode 100644
index 7ab1c29e73e8..000000000000
--- a/media-sound/clementine/files/clementine-1.0.1-liblastfm-1.patch
+++ /dev/null
@@ -1,475 +0,0 @@
---- src/core/song.cpp
-+++ src/core/song.cpp
-@@ -49,7 +49,7 @@
- 
- #ifdef HAVE_LIBLASTFM
-   #include "internet/fixlastfm.h"
--  #include <lastfm/Track>
-+  #include <lastfm/Track.h>
- #endif
- 
- #include <QFile>
---- src/covers/lastfmcoverprovider.cpp
-+++ src/covers/lastfmcoverprovider.cpp
-@@ -19,8 +19,8 @@
- #include "coverprovider.h"
- #include "lastfmcoverprovider.h"
- 
--#include <lastfm/Artist>
--#include <lastfm/XmlQuery>
-+#include <lastfm/Artist.h>
-+#include <lastfm/XmlQuery.h>
- #include <lastfm/ws.h>
- 
- #include <QNetworkReply>
-@@ -52,14 +52,8 @@ void LastFmCoverProvider::QueryFinished(
- 
-   CoverSearchResults results;
- 
--  try {
--    lastfm::XmlQuery query(lastfm::ws::parse(reply));
--#ifdef Q_OS_WIN32
--    if (lastfm::ws::last_parse_error != lastfm::ws::NoError) {
--      throw std::runtime_error("");
--    }
--#endif
--
-+  lastfm::XmlQuery query;
-+  if (query.parse(reply->readAll())) {
-     // parse the list of search results
-     QList<lastfm::XmlQuery> elements = query["results"]["albummatches"].children("album");
- 
-@@ -69,7 +63,7 @@ void LastFmCoverProvider::QueryFinished(
-       result.image_url = element["image size=extralarge"].text();
-       results << result;
-     }
--  } catch(std::runtime_error&) {
-+  } else {
-     // Drop through and emit an empty list of results.
-   }
- 
---- src/internet/lastfmservice.cpp
-+++ src/internet/lastfmservice.cpp
-@@ -33,20 +33,18 @@
- 
- #include <boost/scoped_ptr.hpp>
- 
--#include <lastfm/Audioscrobbler>
-+#include <lastfm/Audioscrobbler.h>
- #include <lastfm/misc.h>
--#include <lastfm/RadioStation>
--#include <lastfm/Scrobble>
--#include <lastfm/ScrobbleCache>
--#include <lastfm/ScrobblePoint>
-+#include <lastfm/RadioStation.h>
-+#include <lastfm/ScrobbleCache.h>
-+#include <lastfm/ScrobblePoint.h>
- #include <lastfm/ws.h>
--#include <lastfm/XmlQuery>
-+#include <lastfm/XmlQuery.h>
- 
- #include <QMenu>
- #include <QSettings>
- 
- using boost::scoped_ptr;
--using lastfm::Scrobble;
- using lastfm::XmlQuery;
- 
- uint qHash(const lastfm::Track& track) {
-@@ -300,13 +298,8 @@ void LastFMService::AuthenticateReplyFin
-   reply->deleteLater();
- 
-   // Parse the reply
--  try {
--    lastfm::XmlQuery const lfm = lastfm::ws::parse(reply);
--#ifdef Q_OS_WIN32
--    if (lastfm::ws::last_parse_error != lastfm::ws::NoError)
--      throw std::runtime_error("");
--#endif
--
-+  lastfm::XmlQuery lfm;
-+  if (lfm.parse(reply->readAll())) {
-     lastfm::ws::Username = lfm["session"]["name"].text();
-     lastfm::ws::SessionKey = lfm["session"]["key"].text();
-     QString subscribed = lfm["session"]["subscriber"].text();
-@@ -318,8 +311,8 @@ void LastFMService::AuthenticateReplyFin
-     settings.setValue("Username", lastfm::ws::Username);
-     settings.setValue("Session", lastfm::ws::SessionKey);
-     settings.setValue("Subscriber", is_subscriber);
--  } catch (std::runtime_error& e) {
--    qLog(Error) << e.what();
-+  } else {
-+    qLog(Error) << lfm.parseError().message();
-     emit AuthenticationComplete(false);
-     return;
-   }
-@@ -347,13 +340,8 @@ void LastFMService::UpdateSubscriberStat
- 
-   bool is_subscriber = false;
- 
--  try {
--    const lastfm::XmlQuery lfm = lastfm::ws::parse(reply);
--#ifdef Q_OS_WIN32
--    if (lastfm::ws::last_parse_error != lastfm::ws::NoError)
--      throw std::runtime_error("");
--#endif
--
-+  lastfm::XmlQuery lfm;
-+  if (lfm.parse(reply->readAll())) {
-     connection_problems_ = false;
-     QString subscriber = lfm["user"]["subscriber"].text();
-     is_subscriber = (subscriber.toInt() == 1);
-@@ -362,11 +350,9 @@ void LastFMService::UpdateSubscriberStat
-     settings.beginGroup(kSettingsGroup);
-     settings.setValue("Subscriber", is_subscriber);
-     qLog(Info) << lastfm::ws::Username << "Subscriber status:" << is_subscriber;
--  } catch (lastfm::ws::ParseError e) {
--    qLog(Error) << "Last.fm parse error: " << e.enumValue();
--    connection_problems_ = e.enumValue() == lastfm::ws::MalformedResponse;
--  } catch (std::runtime_error& e) {
--    qLog(Error) << e.what();
-+  } else {
-+    qLog(Error) << "Last.fm parse error: " << lfm.parseError().message();
-+    connection_problems_ = lfm.parseError().enumValue() == lastfm::ws::MalformedResponse;
-   }
- 
-   emit UpdatedSubscriberStatus(is_subscriber);
-@@ -469,7 +455,8 @@ bool LastFMService::InitScrobbler() {
-     scrobbler_ = new lastfm::Audioscrobbler(kAudioscrobblerClientId);
- 
-   //reemit the signal since the sender is private
--  connect(scrobbler_, SIGNAL(status(int)), SIGNAL(ScrobblerStatus(int)));
-+  connect(scrobbler_, SIGNAL(scrobblesSubmitted(QList<lastfm::Track>)), SIGNAL(ScrobbleSubmitted()));
-+  connect(scrobbler_, SIGNAL(nowPlayingError(int,QString)), SIGNAL(ScrobbleError(int)));
-   return true;
- }
- 
-@@ -497,7 +484,7 @@ void LastFMService::NowPlaying(const Son
-   if (!last_track_.isNull() &&
-       last_track_.source() == lastfm::Track::NonPersonalisedBroadcast) {
-     const int duration_secs = last_track_.timestamp().secsTo(QDateTime::currentDateTime());
--    if (duration_secs >= ScrobblePoint::kScrobbleMinLength) {
-+    if (duration_secs >= lastfm::ScrobblePoint::scrobbleTimeMin()) {
-       lastfm::MutableTrack mtrack(last_track_);
-       mtrack.setDuration(duration_secs);
- 
-@@ -514,14 +501,16 @@ void LastFMService::NowPlaying(const Son
-   already_scrobbled_ = false;
-   last_track_ = mtrack;
- 
--  //check immediately if the song is valid
--  Scrobble::Invalidity invalidity;
--
--  if (!lastfm::Scrobble(last_track_).isValid( &invalidity )) {
--    //for now just notify this, we can also see the cause
--    emit ScrobblerStatus(-1);
--    return;
--  }
-+// TODO: validity was removed from liblastfm1 but might reappear, it should have
-+// no impact as we get a different error when actually trying to scrobble.
-+//   //check immediately if the song is valid
-+//   Scrobble::Invalidity invalidity;
-+//
-+//   if (!lastfm::Scrobble(last_track_).isValid( &invalidity )) {
-+//     //for now just notify this, we can also see the cause
-+//     emit ScrobbleError(-1);
-+//     return;
-+//   }
- 
-   scrobbler_->nowPlaying(mtrack);
- }
-@@ -530,12 +519,12 @@ void LastFMService::Scrobble() {
-   if (!InitScrobbler())
-     return;
- 
--  ScrobbleCache cache(lastfm::ws::Username);
-+  lastfm::ScrobbleCache cache(lastfm::ws::Username);
-   qLog(Debug) << "There are" << cache.tracks().count() << "tracks in the last.fm cache.";
-   scrobbler_->cache(last_track_);
- 
-   // Let's mark a track as cached, useful when the connection is down
--  emit ScrobblerStatus(30);
-+  emit ScrobbleError(30);
-   scrobbler_->submit();
- 
-   already_scrobbled_ = true;
-@@ -640,7 +629,7 @@ void LastFMService::RefreshFriends(bool
-     return;
-   }
- 
--  lastfm::AuthenticatedUser user;
-+  lastfm::User user;
-   QNetworkReply* reply = user.getFriends();
-   connect(reply, SIGNAL(finished()), SLOT(RefreshFriendsFinished()));
- }
-@@ -649,7 +638,7 @@ void LastFMService::RefreshNeighbours()
-   if (!neighbours_list_ || !IsAuthenticated())
-     return;
- 
--  lastfm::AuthenticatedUser user;
-+  lastfm::User user;
-   QNetworkReply* reply = user.getNeighbours();
-   connect(reply, SIGNAL(finished()), SLOT(RefreshNeighboursFinished()));
- }
-@@ -661,14 +650,11 @@ void LastFMService::RefreshFriendsFinish
- 
-   QList<lastfm::User> friends;
- 
--  try {
--    friends = lastfm::User::list(reply);
--#ifdef Q_OS_WIN32
--    if (lastfm::ws::last_parse_error != lastfm::ws::NoError)
--      throw std::runtime_error("");
--#endif
--  } catch (std::runtime_error& e) {
--    qLog(Error) << e.what();
-+  lastfm::XmlQuery lfm;
-+  if (lfm.parse(reply->readAll())) {
-+    friends = lastfm::UserList(lfm).users();
-+  } else {
-+    qLog(Error) << lfm.parseError().message();
-     return;
-   }
- 
-@@ -708,14 +694,11 @@ void LastFMService::RefreshNeighboursFin
- 
-   QList<lastfm::User> neighbours;
- 
--  try {
--    neighbours = lastfm::User::list(reply);
--#ifdef Q_OS_WIN32
--    if (lastfm::ws::last_parse_error != lastfm::ws::NoError)
--      throw std::runtime_error("");
--#endif
--  } catch (std::runtime_error& e) {
--    qLog(Error) << e.what();
-+  lastfm::XmlQuery lfm;
-+  if (lfm.parse(reply->readAll())) {
-+    neighbours = lastfm::UserList(lfm).users();
-+  } else {
-+    qLog(Error) << lfm.parseError().message();
-     return;
-   }
- 
-@@ -869,13 +852,8 @@ void LastFMService::FetchMoreTracksFinis
-   model()->task_manager()->SetTaskFinished(tune_task_id_);
-   tune_task_id_ = 0;
- 
--  try {
--    const XmlQuery& query = lastfm::ws::parse(reply);
--#ifdef Q_OS_WIN32
--    if (lastfm::ws::last_parse_error != lastfm::ws::NoError)
--      throw std::runtime_error("");
--#endif
--
-+  XmlQuery query;
-+  if (query.parse(reply->readAll())) {
-     const XmlQuery& playlist = query["playlist"];
-     foreach (const XmlQuery& q, playlist["trackList"].children("track")) {
-       lastfm::MutableTrack t;
-@@ -890,17 +868,9 @@ void LastFMService::FetchMoreTracksFinis
-       art_urls_[t] = q["image"].text();
-       playlist_ << t;
-     }
--  } catch (std::runtime_error& e) {
--    // For some reason a catch block that takes a lastfm::ws::ParseError&
--    // doesn't get called, even when a lastfm::ws::ParseError is thrown...
--    // Hacks like this remind me of Java...
--    if (QString(typeid(e).name()).contains("ParseError")) {
--      // dynamic_cast throws a std::bad_cast ... *boggle*
-+  } else {
-       emit StreamError(tr("Couldn't load the last.fm radio station")
--                       .arg(e.what()));
--    } else {
--      emit StreamError(tr("An unknown last.fm error occurred: %1").arg(e.what()));
--    }
-+                       .arg(query.parseError().message()));
-     return;
-   }
- 
-@@ -913,7 +883,7 @@ void LastFMService::Tune(const QUrl& url
- 
-   last_url_ = url;
-   initial_tune_ = true;
--  const lastfm::RadioStation station(FixupUrl(url));
-+  const lastfm::RadioStation station(FixupUrl(url).toString());
- 
-   playlist_.clear();
- 
---- src/internet/lastfmservice.h
-+++ src/internet/lastfmservice.h
-@@ -27,7 +27,8 @@ class Track;
- uint qHash(const lastfm::Track& track);
- 
- #include "fixlastfm.h"
--#include <lastfm/Track>
-+#include <lastfm/Audioscrobbler.h>
-+#include <lastfm/Track.h>
- #include <lastfm/ws.h>
- 
- #include "internetmodel.h"
-@@ -132,7 +133,8 @@ class LastFMService : public InternetSer
-   void ScrobblingEnabledChanged(bool value);
-   void ButtonVisibilityChanged(bool value);
-   void ScrobbleButtonVisibilityChanged(bool value);
--  void ScrobblerStatus(int value);
-+  void ScrobbleSubmitted();
-+  void ScrobbleError(int value);
-   void UpdatedSubscriberStatus(bool is_subscriber);
-   void ScrobbledRadioStream();
- 
---- src/songinfo/lastfmtrackinfoprovider.cpp
-+++ src/songinfo/lastfmtrackinfoprovider.cpp
-@@ -22,7 +22,7 @@
- #include "ui/iconloader.h"
- 
- #include <lastfm/ws.h>
--#include <lastfm/XmlQuery>
-+#include <lastfm/XmlQuery.h>
- 
- void LastfmTrackInfoProvider::FetchInfo(int id, const Song& metadata) {
-   QMap<QString, QString> params;
-@@ -50,18 +50,12 @@ void LastfmTrackInfoProvider::RequestFin
-     return;
-   }
- 
--  try {
--    lastfm::XmlQuery query = lastfm::ws::parse(reply);
--#ifdef Q_OS_WIN32
--    if (lastfm::ws::last_parse_error != lastfm::ws::NoError)
--      throw std::runtime_error("");
--#endif
--
-+  lastfm::XmlQuery query;
-+  if (query.parse(reply->readAll())) {
-     GetPlayCounts(id, query);
-     GetWiki(id, query);
-     GetTags(id, query);
- 
--  } catch (std::runtime_error&) {
-   }
-   emit Finished(id);
- }
---- src/suggesters/lastfmsuggester.cpp
-+++ src/suggesters/lastfmsuggester.cpp
-@@ -1,6 +1,6 @@
- #include "lastfmsuggester.h"
- 
--#include <lastfm/XmlQuery>
-+#include <lastfm/XmlQuery.h>
- 
- #include "core/logging.h"
- #include "core/timeconstants.h"
-@@ -39,13 +39,8 @@ void LastFMSuggester::RequestFinished()
-   int id = it.value();
-   replies_.erase(it);
- 
--  try {
--    lastfm::XmlQuery const lfm = lastfm::ws::parse(reply);
--#ifdef Q_OS_WIN32
--    if (lastfm::ws::last_parse_error != lastfm::ws::NoError)
--      throw std::runtime_error("");
--#endif
--
-+  lastfm::XmlQuery lfm;
-+  if (lfm.parse(reply->readAll())) {
-     const QList<XmlQuery> tracks = lfm["similartracks"].children("track");
-     SongList songs;
-     foreach (const XmlQuery& q, tracks) {
-@@ -59,8 +54,8 @@ void LastFMSuggester::RequestFinished()
-     }
-     qLog(Debug) << songs.length() << "suggested songs from Last.fm";
-     emit SuggestSongsFinished(id, songs);
--  } catch (std::runtime_error& e) {
--    qLog(Error) << e.what();
-+  } else {
-+    qLog(Error) << lfm.parseError().message();
-     emit SuggestSongsFinished(id, SongList());
-   }
- }
---- src/ui/mainwindow.cpp
-+++ src/ui/mainwindow.cpp
-@@ -700,7 +700,8 @@ MainWindow::MainWindow(
-   connect(player_->playlists()->sequence(), SIGNAL(ShuffleModeChanged(PlaylistSequence::ShuffleMode)), osd_, SLOT(ShuffleModeChanged(PlaylistSequence::ShuffleMode)));
- 
- #ifdef HAVE_LIBLASTFM
--  connect(InternetModel::Service<LastFMService>(), SIGNAL(ScrobblerStatus(int)), SLOT(ScrobblerStatus(int)));
-+  connect(InternetModel::Service<LastFMService>(), SIGNAL(ScrobbleSubmitted()), SLOT(ScrobbleSubmitted()));
-+  connect(InternetModel::Service<LastFMService>(), SIGNAL(ScrobbleError(int)), SLOT(ScrobbleError(int)));
- 
-   LastFMButtonVisibilityChanged(internet_model_->InternetModel::Service<LastFMService>()->AreButtonsVisible());
-   ScrobbleButtonVisibilityChanged(internet_model_->InternetModel::Service<LastFMService>()->IsScrobbleButtonVisible());
-@@ -2201,30 +2202,26 @@ void MainWindow::SetToggleScrobblingIcon
- }
- 
- #ifdef HAVE_LIBLASTFM
--void MainWindow::ScrobblerStatus(int value) {
-+void MainWindow::ScrobbleSubmitted() {
-   const LastFMService* lastfm_service = InternetModel::Service<LastFMService>();
-   const bool last_fm_enabled = ui_->action_toggle_scrobbling->isVisible() &&
-                                lastfm_service->IsScrobblingEnabled() &&
-                                lastfm_service->IsAuthenticated();
- 
-+  playlists_->active()->set_lastfm_status(Playlist::LastFM_Scrobbled);
-+  // update the button icon
-+  if (last_fm_enabled)
-+    ui_->action_toggle_scrobbling->setIcon(QIcon(":/last.fm/as.png"));                                                                                                                                     
-+}                                                                                                                                                                                                          
-+
-+void MainWindow::ScrobbleError(int value) {
-+
-   switch (value) {
-     case -1:
-       // custom error value got from initial validity check
-       playlists_->active()->set_lastfm_status(Playlist::LastFM_Invalid);
-       break;
- 
--    case 2:
--    case 3:
--      // we should get 3 for a correct scrobbling, but I just get 2 for
--      // mysterious reasons
--      // seems to scrobble fine though, so for now we accept it as correct
--      playlists_->active()->set_lastfm_status(Playlist::LastFM_Scrobbled);
--
--      // update the button icon
--      if (last_fm_enabled)
--        ui_->action_toggle_scrobbling->setIcon(QIcon(":/last.fm/as.png"));
--      break;
--
-     case 30:
-       // Hack: when offline, liblastfm doesn't inform us, so set the status
-       // as queued; in this way we won't try to scrobble again, it will be done automatically
---- src/ui/mainwindow.h
-+++ src/ui/mainwindow.h
-@@ -224,7 +224,8 @@ class MainWindow : public QMainWindow, p
- 
-   void ShowCoverManager();
- #ifdef HAVE_LIBLASTFM
--  void ScrobblerStatus(int value);
-+  void ScrobbleSubmitted();
-+  void ScrobbleError(int value);
- #endif
-   void ShowAboutDialog();
-   void ShowTranscodeDialog();
---- tests/mpris1_test.cpp
-+++ tests/mpris1_test.cpp
-@@ -22,7 +22,7 @@
- #include "playlist/playlistsequence.h"
- #ifdef HAVE_LIBLASTFM
- #include "internet/fixlastfm.h"
--#include <lastfm/Track>
-+#include <lastfm/Track.h>
- #endif
- 
- #include "gmock/gmock.h"
---- tests/song_test.cpp
-+++ tests/song_test.cpp
-@@ -20,7 +20,7 @@
- #include "core/song.h"
- #ifdef HAVE_LIBLASTFM
- #include "internet/fixlastfm.h"
--#include <lastfm/Track>
-+#include <lastfm/Track.h>
- #endif
- 
- #include "gmock/gmock.h"