Version bump

(Portage version: 2.1.6.13/cvs/Linux x86_64)

5 files changed, 51 insertions, 70 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/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"
+}