lastfmplayer version bump (#224167) and split Qt4 deps (#222705).

(Portage version: 2.2_rc1/cvs/Linux 2.6.25-hh7 i686)

4 files changed, 100 insertions, 5 deletions

diff --git a/media-sound/lastfmplayer/ChangeLog b/media-sound/lastfmplayer/ChangeLog
index 2860c07c51cd..be86474de781 100644
--- a/media-sound/lastfmplayer/ChangeLog
+++ b/media-sound/lastfmplayer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/lastfmplayer
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/ChangeLog,v 1.32 2008/06/27 12:32:17 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/ChangeLog,v 1.33 2008/07/16 19:26:40 yngwin Exp $
+
+*lastfmplayer-1.5.1.31879 (16 Jul 2008)
+
+  16 Jul 2008; Ben de Groot <yngwin@gentoo.org>
+  lastfmplayer-1.4.2.58240.ebuild, lastfmplayer-1.4.2.58240-r1.ebuild,
+  +lastfmplayer-1.5.1.31879.ebuild:
+  Version bump (#224167) and split Qt4 deps (#222705).
 
   27 Jun 2008; Steve Dibb <beandog@gentoo.org>
   lastfmplayer-1.4.2.58240-r1.ebuild:
diff --git a/media-sound/lastfmplayer/lastfmplayer-1.4.2.58240-r1.ebuild b/media-sound/lastfmplayer/lastfmplayer-1.4.2.58240-r1.ebuild
index 009a8738daec..81e49d94e731 100644
--- a/media-sound/lastfmplayer/lastfmplayer-1.4.2.58240-r1.ebuild
+++ b/media-sound/lastfmplayer/lastfmplayer-1.4.2.58240-r1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/lastfmplayer-1.4.2.58240-r1.ebuild,v 1.3 2008/06/27 05:40:44 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/lastfmplayer-1.4.2.58240-r1.ebuild,v 1.4 2008/07/16 19:26:40 yngwin Exp $
 
+EAPI=1
 inherit eutils multilib qt4
 
 MY_P="${P/lastfmplayer/lastfm}.dfsg"
@@ -18,7 +19,8 @@ KEYWORDS="~x86 ~ppc ~amd64"
 IUSE=""
 RESTRICT="mirror"
 
-RDEPEND="$(qt4_min_version 4.2)
+RDEPEND="|| ( ( x11-libs/qt-gui:4 x11-libs/qt-sql:4 )
+			=x11-libs/qt-4.3* )
 	media-libs/libsamplerate
 	sci-libs/fftw
 	media-libs/libmad
diff --git a/media-sound/lastfmplayer/lastfmplayer-1.4.2.58240.ebuild b/media-sound/lastfmplayer/lastfmplayer-1.4.2.58240.ebuild
index 7d38d27bdb00..6410d8cc0955 100644
--- a/media-sound/lastfmplayer/lastfmplayer-1.4.2.58240.ebuild
+++ b/media-sound/lastfmplayer/lastfmplayer-1.4.2.58240.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/lastfmplayer-1.4.2.58240.ebuild,v 1.3 2008/03/11 20:05:55 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/lastfmplayer-1.4.2.58240.ebuild,v 1.4 2008/07/16 19:26:40 yngwin Exp $
 
+EAPI=1
 inherit eutils qt4
 
 MY_P="${P/lastfmplayer/last.fm}"
@@ -16,7 +17,8 @@ KEYWORDS="~x86 ~ppc ~amd64"
 IUSE=""
 RESTRICT="mirror"
 
-DEPEND="$(qt4_min_version 4.2)
+DEPEND="|| ( ( x11-libs/qt-gui:4 x11-libs/qt-sql:4 )
+			=x11-libs/qt-4.3* )
 	media-libs/libsamplerate
 	sci-libs/fftw
 	media-libs/libmad
diff --git a/media-sound/lastfmplayer/lastfmplayer-1.5.1.31879.ebuild b/media-sound/lastfmplayer/lastfmplayer-1.5.1.31879.ebuild
new file mode 100644
index 000000000000..ab20788c373a
--- /dev/null
+++ b/media-sound/lastfmplayer/lastfmplayer-1.5.1.31879.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/lastfmplayer-1.5.1.31879.ebuild,v 1.1 2008/07/16 19:26:40 yngwin Exp $
+
+EAPI=1
+inherit eutils multilib qt4
+
+MY_P="${P/lastfmplayer/lastfm}.dfsg"
+
+DESCRIPTION="The player allows you to listen to last.fm radio streams"
+HOMEPAGE="http://www.last.fm/help/player"
+SRC_URI="mirror://debian/pool/main/l/lastfm/lastfm_${PV}.dfsg.orig.tar.gz
+	mirror://debian/pool/main/l/lastfm/lastfm_${PV}.dfsg-1.diff.gz"
+#http://cdn.last.fm/client/src/${MY_P}.src.tar.bz2
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+RESTRICT="mirror"
+
+RDEPEND="|| ( ( x11-libs/qt-gui:4 x11-libs/qt-sql:4 )
+			=x11-libs/qt-4.3* )
+	media-libs/libsamplerate
+	sci-libs/fftw
+	media-libs/libmad
+	>=media-libs/libgpod-0.5.2
+	media-libs/alsa-lib"
+DEPEND="${RDEPEND}
+	app-arch/sharutils"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	epatch lastfm_${PV}.dfsg-1.diff
+	cd "${S}"
+	for i in $(< debian/patches/series); do
+		epatch debian/patches/$i
+	done
+}
+
+src_compile() {
+	./configure
+	emake || die "emake failed"
+	cd i18n; lrelease *.ts
+}
+
+src_install() {
+	# Docs
+	dodoc ChangeLog README debian/README.Debian-source
+	doman debian/lastfm.1
+
+	# Copied from debian/rules
+	uudecode -o - debian/icons.tar.gz.uu | tar -xzf -
+	uudecode -o - debian/trayicons22.tar.gz.uu | tar -xzf -
+	insinto /usr/share
+	doins -r icons
+	insinto /usr/share/lastfm/icons
+	doins user_*.png
+
+	sed -i -e "s,/usr/lib,/usr/$(get_libdir),g" debian/lastfm.install
+	# make directories
+	for i in $(<debian/lastfm.install); do [ ${i:0:1} == / ] && dodir $i; done
+	# debian installation
+	sed -i -e "s:^:mv :" -e 's: /:${D}/:' debian/lastfm.install
+	bash debian/lastfm.install
+
+	# copied..
+	mv "${D}"/usr/bin/lastfm.sh "${D}"/usr/bin/lastfm
+	fperms 755 /usr/bin/lastfm
+	rm -f "${D}"/usr/share/lastfm/icons/{*profile24,systray_mac}.png
+}
+
+pkg_postinst() {
+	elog "To use the Last.fm player with a mozilla based browser:"
+	elog " 1. Go to about:config in the browser"
+	elog " 2. Right-click on the page"
+	elog " 3. Select New and then String"
+	elog " 4. For the name: network.protocol-handler.app.lastfm"
+	elog " 5. For the value: /usr/bin/lastfm"
+	elog
+	elog "If you experience awkward fonts or widgets, try running qtconfig."
+}