Version bump

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

6 files changed, 55 insertions, 76 deletions

diff --git a/media-sound/shell-fm/ChangeLog b/media-sound/shell-fm/ChangeLog
index 51ebdcf705f6..9f6238a2efd1 100644
--- a/media-sound/shell-fm/ChangeLog
+++ b/media-sound/shell-fm/ChangeLog
@@ -1,20 +1,23 @@
 # ChangeLog for media-sound/shell-fm
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/shell-fm/ChangeLog,v 1.8 2008/05/12 15:26:34 drac Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/shell-fm/ChangeLog,v 1.9 2009/05/09 11:38:51 ssuominen Exp $
+
+*shell-fm-0.6 (09 May 2009)
+
+  09 May 2009; Samuli Suominen <ssuominen@gentoo.org>
+  -shell-fm-0.2_p191.ebuild, -shell-fm-0.4.ebuild, +shell-fm-0.6.ebuild:
+  Version bump wrt #264009, thanks to Daniel Pielmeier.
 
 *shell-fm-0.5 (12 May 2008)
 
-  12 May 2008; Samuli Suominen <drac@gentoo.org> +shell-fm-0.5.ebuild:
+  12 May 2008; Samuli Suominen <ssuominen@gentoo.org> +shell-fm-0.5.ebuild:
   Version bump.
 
 *shell-fm-0.4 (19 Nov 2007)
 
-  19 Nov 2007; Samuli Suominen <drac@gentoo.org> +shell-fm-0.4.ebuild:
+  19 Nov 2007; Samuli Suominen <ssuominen@gentoo.org> +shell-fm-0.4.ebuild:
   Version bump for bug 199658, thanks to Thomas M. for reporting.
 
-  17 Sep 2007; Samuli Suominen <drac@gentoo.org> metadata.xml:
-  Add sound as herd.
-
   01 Sep 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing pioto from metadata due to his retirement (see #145404 for reference).
 
diff --git a/media-sound/shell-fm/Manifest b/media-sound/shell-fm/Manifest
index 13d0fdca4677..1c5791567a3d 100644
--- a/media-sound/shell-fm/Manifest
+++ b/media-sound/shell-fm/Manifest
@@ -1,8 +1,6 @@
-DIST shell-fm-0.2_p191.tar.bz2 96480 RMD160 87bcc906d977806a5fe567e4fd6b18cf5d7f6d7a SHA1 4d9c2416f0e16a1ef9bfb865cfc6ab5ec4f46c02 SHA256 94593585ce0d95f9c82db5bfe119e5bfbe31aca58b7b48cf1581bb3f89c37da0
-DIST shell-fm-0.4.tar.bz2 63665 RMD160 59943b8db2c7dc13340b1bfd0a3060e6da99e3da SHA1 208354f6ac81fb4051fd15c843ad3b7603107ec4 SHA256 f74a0b8b855b80c7e21bbee15ea1c6b81fc1a96bffa23dff160ec0dcadcee736
+DIST jkramer-shell-fm-7a4ba409f8776903d6dc54acd12ccd0d242592f8.tar.gz 41976 RMD160 9424969928d92c812c355668e912a9f6a6fcf719 SHA1 a6a1c9106f725be00c8542360fb4d8876ae62a47 SHA256 c9ab536a0d7ff27e7a609836cb3591e63423dfc08108931a5d9263a993a9a63e
 DIST shell-fm-0.5.tar.bz2 32966 RMD160 1a1ea8d487fa1ef78e277d3cad74c18a324aa3b1 SHA1 5ca7b9ef2203ac4fb33eea9365222ab1902a2975 SHA256 7505899c88aefa52f0ff57f97506ae761e5712546179a6deef08e17339c37fdf
-EBUILD shell-fm-0.2_p191.ebuild 683 RMD160 dad9960c3a5cbff522f8471e6dfffc836ba181a8 SHA1 b631d8ddd0f9d57704e188cc159de06dfc609704 SHA256 18fd5c3737343b8e209d58953688959766e018b1759666fa3363757bbb6ede1a
-EBUILD shell-fm-0.4.ebuild 910 RMD160 97d9028d62c59482a4c4b45c21b6e10e5cca6cb1 SHA1 65cbad3fb791a054fcc8d4c1a098034add5457fc SHA256 6b74de23ce6dcf4ab26272c209dd9cc7675eac0e208365b59d0b444fd9cbeedc
 EBUILD shell-fm-0.5.ebuild 970 RMD160 592a9e1f6112dbe3d5f4655c42d087d830a937ab SHA1 3025c1e53943788e5a82741a5bc2427e268e8347 SHA256 ad08dbada8d8e7375933c4b5809ad56b826dc89533a9bc9f8e13f1fb3101b003
-MISC ChangeLog 1094 RMD160 876852ad2266b8b795b16b415d5b31e964f0b103 SHA1 84b2c2b608bcc10ed9a96cbdc97ee305e7cad4b9 SHA256 e234e6551b9706683d72ee3580243260a851a5ec2896448a30ca88904c408233
-MISC metadata.xml 473 RMD160 ebce23b2b22db06c1b5e40a5864e72f57088d6bb SHA1 ec731961e22f425fe9be7b906cf13e645eae59ed SHA256 e62232f699071233075d7d62fd9338a544d213f78749534a2ee81633c5f242ca
+EBUILD shell-fm-0.6.ebuild 1092 RMD160 e16d39cdaefa1854bd300db7696a2d415a06d817 SHA1 1f9af8c99631d8e066709135386c5a5ae3594e3b SHA256 96bc95a71622fd9cce8ce823487f8173a59fb95132883a1325257e976a210118
+MISC ChangeLog 1237 RMD160 8ae6ead612bf55697bd2631b83763693fadd6d59 SHA1 96a84fd38e567f7a90722c3ace0abcd92b7fe0d4 SHA256 64ab434ac26bd99ca3c19258e4976715e59a7b653b4a8073b28882fa2763a93f
+MISC metadata.xml 410 RMD160 95c58ff33fd363206cf30d77766d4ccf4aa2da2a SHA1 769e852f09ecef095830cb19c6ade3ebb10565c1 SHA256 bc07ea5330fddfac0e4ca0799221b99efaa0eaddca09edc5dfdf7f672cb933e3
diff --git a/media-sound/shell-fm/metadata.xml b/media-sound/shell-fm/metadata.xml
index ea38039a6820..75fba769b2db 100644
--- a/media-sound/shell-fm/metadata.xml
+++ b/media-sound/shell-fm/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>sound</herd>
-	<maintainer>
-		<email>sound@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		Shell.FM is a lightweight console based player for Last.FM radio
 		streams. It's written mainly for Linux, but should be able to run on any
diff --git a/media-sound/shell-fm/shell-fm-0.2_p191.ebuild b/media-sound/shell-fm/shell-fm-0.2_p191.ebuild
deleted file mode 100644
index ec355e6d4cbb..000000000000
--- a/media-sound/shell-fm/shell-fm-0.2_p191.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/shell-fm/shell-fm-0.2_p191.ebuild,v 1.4 2007/06/16 14:30:25 dertobi123 Exp $
-
-DESCRIPTION="A lightweight console based player for Last.FM radio streams."
-HOMEPAGE="http://nex.scrapping.cc/shell-fm/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="ao"
-
-DEPEND="media-libs/libmad
-	ao? ( media-libs/libao )"
-
-src_compile() {
-	econf $(use_enable ao) || die 'econf failed'
-	emake || die 'emake failed'
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die 'emake install failed'
-}
diff --git a/media-sound/shell-fm/shell-fm-0.4.ebuild b/media-sound/shell-fm/shell-fm-0.4.ebuild
deleted file mode 100644
index fb066f33f0f9..000000000000
--- a/media-sound/shell-fm/shell-fm-0.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/shell-fm/shell-fm-0.4.ebuild,v 1.2 2007/11/19 22:25:40 drac Exp $
-
-inherit autotools
-
-DESCRIPTION="A lightweight console based player for Last.FM radio streams."
-HOMEPAGE="http://nex.scrapping.cc/shell-fm"
-SRC_URI="http://nex.scrapping.cc/${PN}/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="ao"
-
-RDEPEND="media-libs/libmad
-	ao? ( media-libs/libao )"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_compile() {
-	econf $(use_enable ao)
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS NEWS TODO shell-fm.rc-example doc/*.txt
-	insinto /usr/share/doc/${PF}/scripts
-	doins scripts/{shell*,zcontrol}
-}
diff --git a/media-sound/shell-fm/shell-fm-0.6.ebuild b/media-sound/shell-fm/shell-fm-0.6.ebuild
new file mode 100644
index 000000000000..39fba3c97db6
--- /dev/null
+++ b/media-sound/shell-fm/shell-fm-0.6.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/shell-fm/shell-fm-0.6.ebuild,v 1.1 2009/05/09 11:38:51 ssuominen Exp $
+
+EAPI=2
+inherit toolchain-funcs
+
+MY_P=jkramer-${PN}-7a4ba409f8776903d6dc54acd12ccd0d242592f8
+
+DESCRIPTION="A lightweight console based player for Last.FM radio streams"
+HOMEPAGE="http://nex.scrapping.cc/shell-fm/"
+SRC_URI="http://github.com/jkramer/shell-fm/tarball/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="ao"
+
+RDEPEND="media-libs/libmad
+	ao? ( media-libs/libao )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	sed -i -e "s:-Os:${CFLAGS}:g" source/Makefile || die "sed failed"
+	use ao || sed -i -e "s:\$(LIBAO)::g" source/Makefile || die "sed failed"
+}
+
+src_compile() {
+	tc-export CC
+	emake || die "emake failed"
+}
+
+src_install() {
+	dobin source/${PN} || die "dobin failed"
+	doman manual/${PN}.1
+	exeinto /usr/share/${PN}/scripts
+	doexe scripts/{*.sh,*.pl,zcontrol} || die "doexe failed"
+}