Revision bump using new Debian patchset

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

3 files changed, 137 insertions, 8 deletions

diff --git a/media-sound/lastfmplayer/ChangeLog b/media-sound/lastfmplayer/ChangeLog
index 66aee699f9ad..bb9bf820aa16 100644
--- a/media-sound/lastfmplayer/ChangeLog
+++ b/media-sound/lastfmplayer/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/lastfmplayer
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/ChangeLog,v 1.55 2010/10/26 20:55:12 hwoarang Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/ChangeLog,v 1.56 2011/01/23 18:05:16 hwoarang Exp $
+
+*lastfmplayer-1.5.4.26862-r3 (23 Jan 2011)
+
+  23 Jan 2011; Markos Chandras <hwoarang@gentoo.org>
+  +lastfmplayer-1.5.4.26862-r3.ebuild:
+  Revision bump using new Debian patchset
+  Changelog: http://packages.debian.org/changelogs/pool/main/l/lastfm/current/changelog
+  Security Fix: http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-3362
 
   26 Oct 2010; Markos Chandras <hwoarang@gentoo.org>
   -lastfmplayer-1.5.4.26862-r1.ebuild:
diff --git a/media-sound/lastfmplayer/Manifest b/media-sound/lastfmplayer/Manifest
index 8c6c2e62139c..88c621a1ad40 100644
--- a/media-sound/lastfmplayer/Manifest
+++ b/media-sound/lastfmplayer/Manifest
@@ -1,16 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX fix_plugin_path.patch 540 RMD160 bcfe86a5c193824ee4605bc3989905fa2745d1f8 SHA1 768a15ed2600d0050b6577e1dec0af69663132ed SHA256 e4a44bad4bf286eb2ecbece48df873a3e8b29afcef7cc5b0c624936c1e459fab
 DIST lastfm_1.5.4.26862+dfsg-4.debian.tar.gz 67416 RMD160 31d85e3f2d5319e2c8726f9f06e6de14fb4bfcff SHA1 822119a9cb058c6b5af545b51647a7530639b390 SHA256 2cbe532ca81085cc538bd547408a6d14e5e54b6885d397df70f6d2184d40fafb
+DIST lastfm_1.5.4.26862+dfsg-6.debian.tar.gz 67186 RMD160 4d58347ca904cdaaf7e7ebeec3e81eda9393e578 SHA1 43a7799595f27463d3906c4afceada3c585d7f9a SHA256 a3c555918a0b1e867ab1b11300e82741a61217eba918e1548b8dd07c4b811a18
 DIST lastfm_1.5.4.26862+dfsg.orig.tar.gz 1478047 RMD160 ddd302f0748654d9cd3e0e70b05431e45b711908 SHA1 2d9a81b2a14f8f54ac25735a4a77dfa474d70910 SHA256 9131d08fd9c3de895670feb0c5b175a2d72d7d2bad001ea4c55cf8e0d34c700b
 EBUILD lastfmplayer-1.5.4.26862-r2.ebuild 3674 RMD160 fe15700aa713922618a81d9c7eb473af66e4a176 SHA1 12441260d61d8a7f029b0cfe863775511c420795 SHA256 5508c35316191a188f1e8c7a69c1b76950de0e63c32c1b4bc16377a490ff0811
-MISC ChangeLog 10678 RMD160 632f78fe23f508b04c82eb2439f293aa78aa9c0d SHA1 81464b6d9ca25ed284170cee7fd2b22d3341fc0c SHA256 2962697d133350fdefdfadac99b131d6651c3c7392eb5fd9222619527a7d7bdc
+EBUILD lastfmplayer-1.5.4.26862-r3.ebuild 3729 RMD160 717a14c5b49cce9ecaed8906ac9d648b0ad4b79c SHA1 5a4daea28f5a842768dfdb37037f299ae17f7847 SHA256 2920f7a50a0a9ec788c3cc475dbafe7e302eaef35af7bdedf50e86d4af3c7d6b
+MISC ChangeLog 11021 RMD160 21484de699b7fb3337b141365fcfdd172ab693eb SHA1 a73fb8f1c7f039565bf371717d9802a1af78dee9 SHA256 2cd9d5cb782e2c9b7d297cba1877c59452ac70f4b65bb5f32908e3d14bf1f58b
 MISC metadata.xml 251 RMD160 a3b846afdec6f11b4217978cc994b85fc82088ba SHA1 3f5086c6624e6ef17caefa9fb432efaf416e27b0 SHA256 12a2bce19c4087d3496fe929a182659413c12565c7dad8a4ddad9d2e6c73d8a7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkzHQCAACgkQ9/cejkQaxBAI8ACfUbGq6qzb1IKp8lzoba5C/Tom
-9e8AmwX+Y4ErOp9Nh89YEgEqcc0ytA/k
-=oH+p
+iQIcBAEBCgAGBQJNPG3MAAoJEPqDWhW0r/LCC5wP/2yQRV4BXBpP0QKJJ5/+yX1a
+2xZqPOMBr+H9uXngTJ/icFwLJhK7A2gc+Z9fU8w7rm1/RdI0SFHemw+MM4CFGyXV
+cXGmH49DgimH7kKiFTBc/C75ciI7T4Log2HOH3G9ZKhFl6Ay5jBumv712TeD3Uvo
+X3bruyDzRTwOxuDQBUWtqiHjaZM7PVoVXCq3DKNyj4XRROfAnrKuX4ZY8Z4RoyUJ
+LB0odyvpLA4AhXi5TNfhrSaL48zfv7RHrZRqD7XKRgNBLYn7X6i4J52kW2sVpdkW
+3S3td2nrBnE/sB1EU49VMBOtiEgvvAfTj4R5WWobNsYEc4Hex9w3rrHSEfRAF5bp
+zx9AkXUm5FMsgjoZJBUIYeFzNb5jJxbCWj2wZ+iiwQ5Jgpeg+Fi+g/HQatB8O0fl
+B+1Qhml9XwH2a8UGdwOeXQrMv9gSBra6Qg7DVOPNSEy2SuJwldo7LGbhzhI5/hW+
+YMrukCq+jEksDpwtUWPU8mMPGd2buRe/93qV7PWvcJORxKqWhSmBDkvGMN0Clx7b
+EONXQ9ZKujhRMfoOc1y9PyzMm7xbLyUSwmpquEoDaxHgzGmEQc0uaf0KkLDNelDo
+BPT0MXkyk0erum1bqoNReo9WFf7AVdJ8OPJVCirLXn01QfTr3NM2IB04c2itKvG1
+4lv1jAHdw+kmBvaoMHAy
+=ZOFq
 -----END PGP SIGNATURE-----
diff --git a/media-sound/lastfmplayer/lastfmplayer-1.5.4.26862-r3.ebuild b/media-sound/lastfmplayer/lastfmplayer-1.5.4.26862-r3.ebuild
new file mode 100644
index 000000000000..06f97086cf78
--- /dev/null
+++ b/media-sound/lastfmplayer/lastfmplayer-1.5.4.26862-r3.ebuild
@@ -0,0 +1,109 @@
+# 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.26862-r3.ebuild,v 1.1 2011/01/23 18:05:16 hwoarang 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.orig.tar.gz
+	http://dev.gentoo.org/~hwoarang/distfiles/lastfm_${PV}+dfsg-6.debian.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="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
+	epatch "${FILESDIR}"/fix_plugin_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
+	#don't install plugins into generic location
+	sed -i "s:\$\$BIN_DIR/services:\$\$BIN_DIR/lastfm_services:" \
+		"${S}"/definitions.pro.inc
+	#fix plugin search path
+	sed -i "s:/usr/lib/services:/usr/$(get_libdir)/lastfm_services:" \
+		"${S}"/src/libMoose/MooseCommon.cpp
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die "emake failed"
+	cd i18n; lrelease *.ts
+}
+
+src_install() {
+	cd "${WORKDIR}"
+	# Docs
+	dodoc "${S}"/ChangeLog "${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"
+	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."
+}