Drop RESTRICT=mirror from ebuilds. Put files on our mirrors. Revbump to apply latest debian patchset. Bug #334695

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 135 insertions, 7 deletions

diff --git a/media-sound/lastfmplayer/ChangeLog b/media-sound/lastfmplayer/ChangeLog
index 80e2f3098d19..77ec396bf6a1 100644
--- a/media-sound/lastfmplayer/ChangeLog
+++ b/media-sound/lastfmplayer/ChangeLog
@@ -1,6 +1,13 @@
 # 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.47 2010/07/14 23:50:51 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/ChangeLog,v 1.48 2010/08/26 21:25:24 hwoarang Exp $
+
+*lastfmplayer-1.5.4.26862-r2 (26 Aug 2010)
+
+  26 Aug 2010; Markos Chandras <hwoarang@gentoo.org>
+  lastfmplayer-1.5.4.26862-r1.ebuild, +lastfmplayer-1.5.4.26862-r2.ebuild:
+  Drop RESTRICT=mirror from ebuilds. Put files on our mirrors. Revbump to
+  apply latest debian patchset. Bug #334695
 
   14 Jul 2010; Markos Chandras <hwoarang@gentoo.org>
   -lastfmplayer-1.5.1.31879-r3.ebuild, -lastfmplayer-1.5.4.26862.ebuild:
diff --git a/media-sound/lastfmplayer/Manifest b/media-sound/lastfmplayer/Manifest
index c6987829d09e..1874c60faed8 100644
--- a/media-sound/lastfmplayer/Manifest
+++ b/media-sound/lastfmplayer/Manifest
@@ -1,7 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX fix_plugin_path.patch 540 RMD160 bcfe86a5c193824ee4605bc3989905fa2745d1f8 SHA1 768a15ed2600d0050b6577e1dec0af69663132ed SHA256 e4a44bad4bf286eb2ecbece48df873a3e8b29afcef7cc5b0c624936c1e459fab
 AUX volumeslider_h-qt45.patch 685 RMD160 4b64d3ce601d7da01c8adf705aba1a3b129798fb SHA1 e1b5a3b61dce2862f3e552ee6d273f28cbf287e2 SHA256 b1238c155d75e02907934fdbfae3f9d600399bfa2d39135b29928c2c1016a193
 DIST lastfm_1.5.4.26862+dfsg-3.debian.tar.gz 68548 RMD160 f42cd81fe286df54be8f0fbdb31969d269850bfc SHA1 8e55b12113edb3ea8e9e0ec8fe163d94e7b4d622 SHA256 80fe24fe08e560e2f69dc90b5d70a5f746d34b3c4a6f805c2c82a63c38f5195b
+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.orig.tar.gz 1478047 RMD160 ddd302f0748654d9cd3e0e70b05431e45b711908 SHA1 2d9a81b2a14f8f54ac25735a4a77dfa474d70910 SHA256 9131d08fd9c3de895670feb0c5b175a2d72d7d2bad001ea4c55cf8e0d34c700b
-EBUILD lastfmplayer-1.5.4.26862-r1.ebuild 3716 RMD160 620f3cdac741c15ec723e75b1bcfc3cd0baed8db SHA1 8b909eda9a65d83aecba6282050e56ae602102e4 SHA256 573b1ad89fc8ba245d9cd4f21880c10b35ddfda6b4c98ee89c5cfd22f2110b25
-MISC ChangeLog 9465 RMD160 917a4187c8fff51090d8f1d503ec068994943c32 SHA1 9b4f4f32f7f4cc38cff05e58614d57cbb22f9a14 SHA256 b31cc14e538f5ccfa09811ca75ae1468912da9700e7b0aa0f876633474ce107a
+EBUILD lastfmplayer-1.5.4.26862-r1.ebuild 3670 RMD160 e8ed1717a920aeda62247f3262ede0c4632594dc SHA1 12c9155cf1651d301c11ba07b11621d50e187404 SHA256 734ea744677cc291656b62da2a77d76aefec0d02a133adc4b4c18564eb0ded9d
+EBUILD lastfmplayer-1.5.4.26862-r2.ebuild 3673 RMD160 08cbbabde0ca18cf06b941e22d7628f615ff49c3 SHA1 d23b82299a6403bec90f8a8a5cb78ed44b5f6b2f SHA256 58f23f6edbbb5c35fcfa00a34326b53178a6412e11f502eec0a7362835ed5522
+MISC ChangeLog 9756 RMD160 2d5e9e2c77cc8f72f1ef8893523ed26c00cb2a62 SHA1 2e27d13f71c3441b845f8c09cdf05c7d99241f5d SHA256 ff8957a853478e325355dd4a5218afa565d326b850887857e96390db9d0862cc
 MISC metadata.xml 251 RMD160 a3b846afdec6f11b4217978cc994b85fc82088ba SHA1 3f5086c6624e6ef17caefa9fb432efaf416e27b0 SHA256 12a2bce19c4087d3496fe929a182659413c12565c7dad8a4ddad9d2e6c73d8a7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkx229UACgkQ9/cejkQaxBCImACfScv5lypNBt76nb+uKa5ghQGv
+uR0AnjZbTWCmohSG3Vf6nZwC143Z9TsX
+=CaWW
+-----END PGP SIGNATURE-----
diff --git a/media-sound/lastfmplayer/lastfmplayer-1.5.4.26862-r1.ebuild b/media-sound/lastfmplayer/lastfmplayer-1.5.4.26862-r1.ebuild
index b331db29e0bf..8ff33be4cd8b 100644
--- a/media-sound/lastfmplayer/lastfmplayer-1.5.4.26862-r1.ebuild
+++ b/media-sound/lastfmplayer/lastfmplayer-1.5.4.26862-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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-r1.ebuild,v 1.4 2010/07/14 13:28:26 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/lastfmplayer-1.5.4.26862-r1.ebuild,v 1.5 2010/08/26 21:25:24 hwoarang Exp $
 
 EAPI=2
 inherit eutils multilib toolchain-funcs qt4-r2
@@ -9,14 +9,13 @@ MY_P="${P/lastfmplayer/lastfm}+dfsg"
 
 DESCRIPTION="A player for 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-3.debian.tar.gz"
+SRC_URI="mirror://gentoo/lastfm_${PV}+dfsg.orig.tar.gz
+	mirror://gentoo/lastfm/lastfm_${PV}+dfsg-3.debian.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="ipod"
-RESTRICT="mirror"
 
 RDEPEND="x11-libs/qt-gui:4
 	x11-libs/qt-sql:4
diff --git a/media-sound/lastfmplayer/lastfmplayer-1.5.4.26862-r2.ebuild b/media-sound/lastfmplayer/lastfmplayer-1.5.4.26862-r2.ebuild
new file mode 100644
index 000000000000..623e4f44c408
--- /dev/null
+++ b/media-sound/lastfmplayer/lastfmplayer-1.5.4.26862-r2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2010 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-r2.ebuild,v 1.1 2010/08/26 21:25:24 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"
+SRC_URI="mirror://gentoo/lastfm_${PV}+dfsg.orig.tar.gz
+	mirror://gentoo/lastfm/lastfm_${PV}+dfsg-4.debian.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~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"
+	ebegin "Disabling tray-icon-size patch"
+	sed -i "/^tray-icon-size.diff/d" "${WORKDIR}"/debian/patches/series
+	eend $?
+	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-bae/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."
+}