4 files changed, 23 insertions, 151 deletions
diff --git a/media-sound/lastfmplayer/ChangeLog b/media-sound/lastfmplayer/ChangeLog
index 7f7afbf28748..f78c904ea40e 100644
--- a/media-sound/lastfmplayer/ChangeLog
+++ b/media-sound/lastfmplayer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/lastfmplayer
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/ChangeLog,v 1.70 2012/08/01 13:40:01 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/ChangeLog,v 1.71 2012/08/26 00:36:09 hwoarang Exp $
+
+  26 Aug 2012; Markos Chandras <hwoarang@gentoo.org>
+  -lastfmplayer-1.5.4.27091-r1.ebuild, lastfmplayer-1.5.4.27091-r3.ebuild:
+  Stabilize everywhere to promote the desktop file fix to the stable tree.
+  Remove old
 
   01 Aug 2012; Markos Chandras <hwoarang@gentoo.org>
   -files/fix_plugin_path.patch:
diff --git a/media-sound/lastfmplayer/Manifest b/media-sound/lastfmplayer/Manifest
index a706e7743128..a0a954b33eab 100644
--- a/media-sound/lastfmplayer/Manifest
+++ b/media-sound/lastfmplayer/Manifest
@@ -7,24 +7,23 @@ AUX lastfmplayer-extensions-path.patch 1507 SHA256 4ec6beecbe5de40937b148ac72bc7
 DIST dbusextension-2.0.tar.bz2 11101 SHA256 db9f5040b593886a36ec409bb1e5b96f2225132207c841cc0b3c15c6242741d2 SHA512 f277a8e4452f2d80b93111ef956f54999881d44df6beaf4294a8dc9468c5f6c2660bbd34f7d363c0541e2f46078fd6ab311b6d30547f5369fe84be1045f849f8 WHIRLPOOL e2c8aef7e8112fb3959f653a53861da5ba77f57c33ea4cafe157f8e060e98362acd8220602bc2ffae7c9437526df902fd10c5c5b5f4175bcbc9c2b1bddc988e5
 DIST lastfm-1.5.4.27091+dfsg.tar.gz 1480448 SHA256 b26596f35e71c9f5b20505486cb73f34404bbef01949c166929f566a5d9d6505 SHA512 72506c942217973fc170c2f37bf3a91fbd6378e626d891913aefa6bf7fcfa96751e2fb7c048405d7f1aad18bc9121bf066afb78b1a2498172af59d03fd80493b WHIRLPOOL 8da1761606cc50a0b17f77694b1ab8ab8c26d55eb8dd8abcc10c23afd3256f802c935d499db48614379f45f72ef754e0d00b65ca59091e58a84ff355b40e8c8a
 DIST lastfm_1.5.4.27091+dfsg-2.debian.tar.gz 69004 SHA256 e5953574db35c098b0d82537d69c0e15369bd3d3a84920a7ae42948ce9d42db7 SHA512 ef4f9995681f77ff8751d1d4d28bb68f5640b54f9646c79fafc53b3d20ba155b60baca29047ebe01f01919c89d2bfb1aeee573aa2946ac382c6de984eb81f923 WHIRLPOOL 2df70e0112bec474f010785b36ce6a0575d07aaa9c38dcd27cefcabce2394fbecb8406b0674469805c9509620ddb64cb1623c602e26cd5521ead23951d2c4978
-EBUILD lastfmplayer-1.5.4.27091-r1.ebuild 4340 SHA256 7c20ba3f085c96102a58c16dfcba18afa0f1a163049587b8b248f8dd8120c0c7 SHA512 256db8c703ee8c6f417a8a5a0ffe8965136d23fc4c78da171e58cce246d377560c7501ea0a7110992d1f79a829b2c87e814037efe385e21dc25f7e1552e414f3 WHIRLPOOL 5fcb5beaac9150e1855459ed7b8659104bfe0a4b317ee005f9d7937ff5853a1958c6f66aa9433039d4ac0877241a07c01cb51d3d784657d661058b5a88fc2ede
-EBUILD lastfmplayer-1.5.4.27091-r3.ebuild 4667 SHA256 e7bd9538ece2dfc689b3d07c6e2b685c79460409e1c9ff09896f7441b7864edb SHA512 ee2ec44f65755b5ef10fbd274af9bd56c71eb139d80edcb628e6b38b165f4b011987bb7a249ee92c37036834e75dcf4cde5f01cad3d306c0d78fcaf0910932ae WHIRLPOOL 37fdc80c4970c982baf1187a4ff2641c10b6c7acb73562483e32d884308a1623bbbe96c5026902f909ae2019a60f047b41dd91246782cb0f5d1a25b15cb9da69
-MISC ChangeLog 13385 SHA256 b7c7081d25c77977fc67f6d98092858758bc89b50437ce674efa614f043dd2eb SHA512 b05bcca88da3a0131827f66baf3c0bb91fb75ddf21604cdba30c211d5538552c6e454b5f023705e55fb33c1143d8d45209f5e5c73bcf3819ee71582624a10d1c WHIRLPOOL 57750067be857d2205e8396ba45a96976d4a5dff5eeb0571022fa9b261d318ffac802267650953eafd170a98c8d3380752e565b730eaea75aa4efd530a14859a
+EBUILD lastfmplayer-1.5.4.27091-r3.ebuild 4664 SHA256 7212cfcb7ea2b0aecdfd36e5dd8fc52fcfcb1fe20fa11789e8766fb652d26e66 SHA512 29524470a18cbc70d6b00a913503a8f40794ede04970c89736497c7145d454b9e09b01179c4ee8e7b94b15f0489e8215ef0d7fa6c1351aef63afe2cbcfaee357 WHIRLPOOL 2d5a6fa196345b53c408b7c23042ef2880ba0520f2aaa31c3d8ba7d2d21ce3687c153dca631099e40478632824e4e298a074c14f33897bb36a855fc1ca2d2296
+MISC ChangeLog 13602 SHA256 e4a417093a15c4b36f5cff97f7e431e6085b1a42f0acc501bf3e5840b129b184 SHA512 e1754dbd5f8eaf9e1b3b6943fdbf955063a50afcabf56af1799ee3f0e1dcd2a0a657f14479d92f4f9860432e6fe9b2f839455372df494ea418466d5278b06815 WHIRLPOOL 725316744d94adf620c60fbd0758556a4a93ff5d15a88ac54262e19682864734111a614a3d4d0573b3d9e59a789dbef3528277de42167fc30b7bd9286502a58b
 MISC metadata.xml 251 SHA256 12a2bce19c4087d3496fe929a182659413c12565c7dad8a4ddad9d2e6c73d8a7 SHA512 95b129d3aadb4aa9c206f00123fb0a5b2da85737094fd703dca472786e4def0e503c6dae2376d704fc971baff3a3037cfe615932dc992d4fdada8eb93c0ee09f WHIRLPOOL 120f551446436a80a990a46ecfda7f4aaef9ff759f0736887bcb0d8623f7a0820420e68f3a0bc83f37f9516d6bddb6f0725cc4c7e7f1085135ef1a625823ba9c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQGTG2AAoJEPqDWhW0r/LCfKQQAIcODTy8n9omvuv5cu69iT6K
-V3jmSHSiDhpMQTP2gEQ4wxg+6Fuyd/e4JqVzgV2Kxa/gZI475Y2HCQPNIdFmQbG9
-j2x6IPZ177tzZ5Uork/V2ac+S7+9Ni+gBSwiJuNLoIapC9LG8OQpnfUI+TwboEBH
-BCgUnr6R2IYtHYVFlVRnd9tAfQRQPK8Hzk097FLka2J/8UoSUbRtowRCCQy+1Jqs
-+vOT52vFjdE6TKZpKZc6RGqA9Xi081dtoG448N/6hqJmiNvrl0tIdZ378qDUl/Qp
-DTFIzW4VkkvLV7mPzQqxAXT4vLesDLH0p/RJ+zRKvvev9X0InLb5qEmHzeTVVXp1
-9bKQs96pvWASAtO3zxKpquhmb6yhsILUmu9PqFY6nffv57go9QTPq87lvKwIiwZl
-ZHAa3GqavriQH7wKHd2JNY5yXsMPJze9M3D7NDxm6T4Rf/VajYFdsVelCqbS3eOo
-KvkGUNRRBoaDdruHQKQaifu38UKUIDNjk+bjIdyHhG1mPDCfznEwcfn1LO0ZoYCO
-8S4Dkz7zim0K01PulZBg8HJq6IARQIoG3Ro9cMpRcgfj2RLUvKpC/HGAnTlIWyuX
-BlHXnDwH+W1QZfP//Wkiy5/EK1KtVk0jfP8PzAwGp83KTbznR4X1g+UbUX9eF7gs
-Vc+yhXA5LEXbjVzgmIfN
-=TksH
+iQIcBAEBCAAGBQJQOW9/AAoJEPqDWhW0r/LC4nsP/1steymzicj3WrlHVbmN7itm
+FfG3WOcTS/zj7sNyfuCSIjX2ISLO2BmkyHMfEvIeejJ73g0jzfwyQGfaA/tXYH4b
+iJ2CHyB0ztKttxn6fuNQO07Ccj7jSbJxPniKH4Lf882niUIXmETIJuUdcd+Fj9kS
+zJbXoPZxGBWbPgC/Gf1G984SZWOHo0N8b9DRVp20PvCgcLYvFFDZxV8BpIBhh/mp
+AkBBAVDUI++olfXFt5aVOdzc/ivf7dfNsJ7xmcObcCQqjfr4u+usPeHzxzM6SEnS
+j8Jr5Bgccf0vAWLi6ohnBxz5FOpAfKNcE5IOm7R59vRTxR02UcCysVK1Sw3pfHQv
+P/FfeuOXpbF++PKpKXwaFCL2rfSf+00tSQKLQjK0WKAZxY66/9Z/Vw+4ojmYbKh3
+d9Eeh6M4QakxMxF6hndG0PFcXhKj2pdGmdGiQR4hVyAdMSRy2OVkmqDUJU+cqSup
+Fvgl9U8oMIpJYN3VULyj4sI4ItqsX5Pvz59d144QcPDMqWaAdI6rqhcsVNj+HWo5
+enUslObjeTrKn0FCp8TKj13/PEchscCb09RDxmpKAmW70xtfW17e06HlkDgnPpFI
+vxmt2qiY567T2Jsd/7qUK47NyqoeJYe+lbSS0w8DnvQQNMFMbyLulTQcRNT9ZjJn
+XxNN+oyEJffXVNhnw6Cn
+=5EhO
 -----END PGP SIGNATURE-----
diff --git a/media-sound/lastfmplayer/lastfmplayer-1.5.4.27091-r1.ebuild b/media-sound/lastfmplayer/lastfmplayer-1.5.4.27091-r1.ebuild
deleted file mode 100644
index bc6631efd903..000000000000
--- a/media-sound/lastfmplayer/lastfmplayer-1.5.4.27091-r1.ebuild
+++ /dev/null
@@ -1,132 +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/lastfmplayer/lastfmplayer-1.5.4.27091-r1.ebuild,v 1.4 2011/08/07 12:36:36 xarthisius Exp $
-
-EAPI=2
-inherit eutils multilib toolchain-funcs qt4-r2
-
-MY_P="${P/lastfmplayer/lastfm}+dfsg"
-
-DESCRIPTION="A player for last.fm radio streams"
-HOMEPAGE="http://www.last.fm/help/player
-	http://www.mehercule.net/staticpages/index.php/lastfm"
-SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/lastfm-${PV}+dfsg.tar.gz
-	http://dev.gentoo.org/~hwoarang/distfiles/lastfm_${PV}+dfsg-2.debian.tar.gz
-	dbus? ( http://glue.umd.edu/~rossatok/dbusextension-2.0.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
-IUSE="dbus ipod"
-
-RDEPEND="x11-libs/qt-gui:4
-	x11-libs/qt-sql:4
-	media-libs/libsamplerate
-	sci-libs/fftw
-	media-libs/libmad
-	ipod? ( >=media-libs/libgpod-0.5.2 )
-	media-libs/alsa-lib"
-DEPEND="${RDEPEND}
-	app-arch/sharutils"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	qt4-r2_src_prepare
-	# Use a different extensions path
-	epatch "${FILESDIR}"/${PN}-extensions-path.patch
-	einfo "Applying Debian patchset"
-	sed -i "/^tray-icon-size.diff/d" "${WORKDIR}"/debian/patches/series
-	cd "${S}"
-	for i in $( < "${WORKDIR}"/debian/patches/series); do
-		epatch "${WORKDIR}"/debian/patches/$i
-	done
-	if ! use ipod ; then
-		sed -i '/src\/mediadevices\/ipod/d' LastFM.pro || die "sed failed"
-	fi
-	#fix plugin search path for multilib support
-	sed -i -e "s:/usr/lib/:/usr/$(get_libdir)/:g" \
-		"${S}"/src/libMoose/MooseCommon.cpp
-	if use dbus; then
-		mv "${WORKDIR}"/dbus "${S}"/src/dbus
-		sed -i -e "/include/s:../definitions.pro.in:definitions.pro.in:" \
-			-e "/TARGET/s:dbusextension:LastFmDbusExtension:" \
-			"${S}"/src/dbus/dbusextension.pro
-	fi
-}
-
-src_configure() {
-	if use dbus; then
-		pushd "${S}"/src/dbus
-		eqmake4 dbusextension.pro
-		popd >> /dev/null
-	fi
-	qt4-r2_src_configure
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die "emake failed"
-	if use dbus; then
-		einfo "Building DBUS plugin"
-		emake -C "${S}"/src/dbus || die "failed to build dbus extension"
-	fi
-	cd i18n; lrelease *.ts
-}
-
-src_install() {
-	cd "${WORKDIR}"
-	# Docs
-	dodoc "${S}"/ChangeLog.txt "${S}"/README debian/README.source \
-		|| die "dodoc failed"
-	doman debian/lastfm.1 || die "doman failed"
-
-	# Copied from debian/rules
-	insinto /usr/share
-	doins -r debian/package-files/share/icons || die "failed to install icons"
-	insinto /usr/share/lastfm/icons
-	doins "${S}"/bin/data/icons/*.png \
-		|| die "failed to install application icons"
-	insinto /usr/share/lastfm
-	doins "${S}"/bin/data/*.png || die "failed to install icons"
-	dodir /usr/$(get_libdir)/lastfm_services/
-	insinto /usr/$(get_libdir)/lastfm_services/
-	insopts -m0755
-	doins -r "${S}"/bin/lastfm_services/*.so || die "failed to install plugins"
-	if use dbus; then
-		insinto /usr/$(get_libdir)/lastfm_services/extensions/
-		insopts -m0755
-		doins "${S}"/bin/lastfm_services/extensions/*.so || die
-	fi
-	insinto /usr/$(get_libdir)
-	insopts -m0755
-	doins "${S}"/bin/libLastFmTools.so.1* || die "failed to install library"
-	doins "${S}"/bin/libMoose.so.1* || die "failed to install library"
-	#fix symlinks
-	cd "${D}"/usr/$(get_libdir)/
-	ln -sfn libLastFmTools.so.1.0.0 libLastFmTools.so.1
-	ln -sfn libLastFmTools.so.1.0.0 libLastFmTools.so.1.0
-	ln -sfn libMoose.so.1.0.0 libMoose.so.1
-	ln -sfn libMoose.so.1.0.0 libMoose.so.1.0
-	cd "${WORKDIR}"
-	newbin "${S}"/bin/last.fm lastfm || die "newbin failed"
-	insinto /usr/share/lastfm/i18n
-	doins "${S}"/i18n/*.qm || die "failed to install translations"
-	fperms 755 /usr/bin/lastfm
-	rm -f "${D}"/usr/share/lastfm/icons/{*profile24,systray_mac}.png
-	# create desktop entry
-	doicon "${WORKDIR}"/debian/package-files/share/icons/hicolor/48x48/apps/lastfm.png
-	make_desktop_entry lastfm "Last.fm Player" lastfm
-}
-
-pkg_postinst() {
-	elog "To use the Last.fm player with a mozilla based browser:"
-	elog " 1. Install gnome-base/gconf"
-	elog " 2. gconftool-2 -t string -s \
-/desktop/gnome/url-handlers/lastfm/command \"/usr/bin/lastfm %s\""
-	elog " 3. gconftool-2 -s \
-/desktop/gnome/url-handlers/lastfm/needs_terminal false -t bool"
-	elog " 4. gconftool-2 -t bool -s \
-/desktop/gnome/url-handlers/lastfm/enabled true"
-	elog
-	elog "If you experience awkward fonts or widgets, try running qtconfig."
-}
diff --git a/media-sound/lastfmplayer/lastfmplayer-1.5.4.27091-r3.ebuild b/media-sound/lastfmplayer/lastfmplayer-1.5.4.27091-r3.ebuild
index 0092d61cc35a..db82ad6e5688 100644
--- a/media-sound/lastfmplayer/lastfmplayer-1.5.4.27091-r3.ebuild
+++ b/media-sound/lastfmplayer/lastfmplayer-1.5.4.27091-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/lastfmplayer-1.5.4.27091-r3.ebuild,v 1.1 2012/07/14 17:10:48 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/lastfmplayer-1.5.4.27091-r3.ebuild,v 1.2 2012/08/26 00:36:09 hwoarang Exp $
 
 EAPI=2
 inherit eutils multilib toolchain-funcs qt4-r2
@@ -16,7 +16,7 @@ SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/lastfm-${PV}+dfsg.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ppc x86"
 IUSE="dbus ipod"
 
 RDEPEND="x11-libs/qt-gui:4