Version bump, unquote $A, thanks repoman.

(Portage version: 2.1.4.4)

4 files changed, 97 insertions, 6 deletions

diff --git a/media-sound/herrie/ChangeLog b/media-sound/herrie/ChangeLog
index 94d1a53168d1..83f3ca1f209e 100644
--- a/media-sound/herrie/ChangeLog
+++ b/media-sound/herrie/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/herrie
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/herrie/ChangeLog,v 1.19 2008/01/20 23:58:47 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/herrie/ChangeLog,v 1.20 2008/03/16 17:01:07 rbu Exp $
+
+*herrie-2.0 (16 Mar 2008)
+
+  16 Mar 2008; Robert Buchholz <rbu@gentoo.org> herrie-1.8.3.ebuild,
+  herrie-1.9.2.ebuild, +herrie-2.0.ebuild:
+  Version bump, adding Chinese and Portuguese translation and bugfixes.
+  Unquote $A, thanks repoman.
 
 *herrie-1.9.2 (20 Jan 2008)
 
diff --git a/media-sound/herrie/herrie-1.8.3.ebuild b/media-sound/herrie/herrie-1.8.3.ebuild
index ee7d76fdddec..ba4679fc7f24 100644
--- a/media-sound/herrie/herrie-1.8.3.ebuild
+++ b/media-sound/herrie/herrie-1.8.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/herrie/herrie-1.8.3.ebuild,v 1.4 2007/10/27 17:28:54 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/herrie/herrie-1.8.3.ebuild,v 1.5 2008/03/16 17:01:07 rbu Exp $
 
 inherit eutils toolchain-funcs
 
@@ -41,7 +41,7 @@ pkg_setup() {
 }
 
 src_unpack() {
-	unpack "${A}"
+	unpack ${A}
 	cd "${S}"
 
 	epatch "${FILESDIR}/${PN}-1.8-chost.patch"
diff --git a/media-sound/herrie/herrie-1.9.2.ebuild b/media-sound/herrie/herrie-1.9.2.ebuild
index c86662331d60..710d635369b5 100644
--- a/media-sound/herrie/herrie-1.9.2.ebuild
+++ b/media-sound/herrie/herrie-1.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/herrie/herrie-1.9.2.ebuild,v 1.2 2008/01/21 03:24:30 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/herrie/herrie-1.9.2.ebuild,v 1.3 2008/03/16 17:01:07 rbu Exp $
 
 inherit eutils toolchain-funcs
 
@@ -46,7 +46,7 @@ pkg_setup() {
 }
 
 src_unpack() {
-	unpack "${A}"
+	unpack ${A}
 	cd "${S}"
 
 	epatch "${FILESDIR}/${PN}-1.8-chost.patch"
diff --git a/media-sound/herrie/herrie-2.0.ebuild b/media-sound/herrie/herrie-2.0.ebuild
new file mode 100644
index 000000000000..3195ac9304aa
--- /dev/null
+++ b/media-sound/herrie/herrie-2.0.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/herrie/herrie-2.0.ebuild,v 1.1 2008/03/16 17:01:07 rbu Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Herrie is a command line music player."
+HOMEPAGE="http://herrie.info/"
+SRC_URI="http://herrie.info/distfiles/${P}.tar.bz2"
+
+LICENSE="BSD-2 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="ao alsa pulseaudio oss http modplug mp3 sndfile vorbis xspf unicode nls"
+
+# Supported languages
+APP_LINGUAS="ca da de es fi ga nl pl pt_BR ru sv tr vi zh_CN"
+for X in ${APP_LINGUAS}; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+DEPEND="sys-libs/ncurses
+	>=dev-libs/glib-2.0
+	ao? ( media-libs/libao )
+	alsa? ( media-libs/alsa-lib )
+	http? ( net-misc/curl )
+	modplug? ( media-libs/libmodplug )
+	mp3? ( media-libs/libmad
+		media-libs/libid3tag )
+	pulseaudio? ( media-sound/pulseaudio )
+	sndfile? ( media-libs/libsndfile )
+	vorbis? ( media-libs/libvorbis )
+	xspf? ( >=media-libs/libspiff-0.6.5 )
+	!ao? ( !alsa? ( !pulseaudio? ( !oss? ( media-libs/alsa-lib ) ) ) )
+	"
+RDEPEND="${DEPEND}"
+DEPEND="nls? ( sys-devel/gettext )
+	dev-util/pkgconfig"
+
+pkg_setup() {
+	if use unicode && ! built_with_use sys-libs/ncurses unicode; then
+		echo
+		eerror "Rebuild sys-libs/ncurses with USE=unicode if you need unicode in herrie."
+		die "Rebuild sys-libs/ncurses with USE=unicode if you need unicode in herrie."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-1.8-chost.patch"
+}
+
+src_compile() {
+	if ! use ao && ! use alsa && ! use pulseaudio && ! use oss ; then
+		ewarn "No audio output selected (ao, alsa, pulseaudio, oss), defaulting to alsa."
+	fi
+
+	# We could add coreaudio here if on osx
+	local EXTRA_CONF="verbose no_strip"
+	use ao && EXTRA_CONF="${EXTRA_CONF} ao"
+	use alsa && EXTRA_CONF="${EXTRA_CONF} alsa"
+	use http || EXTRA_CONF="${EXTRA_CONF} no_http no_scrobbler"
+	use mp3 || EXTRA_CONF="${EXTRA_CONF} no_mp3"
+	use modplug || EXTRA_CONF="${EXTRA_CONF} no_modplug"
+	use nls || EXTRA_CONF="${EXTRA_CONF} no_nls"
+	use oss && EXTRA_CONF="${EXTRA_CONF} oss"
+	use pulseaudio && EXTRA_CONF="${EXTRA_CONF} pulse"
+	use sndfile || EXTRA_CONF="${EXTRA_CONF} no_sndfile"
+	use unicode || EXTRA_CONF="${EXTRA_CONF} ncurses"
+	use vorbis || EXTRA_CONF="${EXTRA_CONF} no_vorbis"
+	use xspf || EXTRA_CONF="${EXTRA_CONF} no_xspf"
+
+	einfo "./configure ${EXTRA_CONF}"
+	CC="$(tc-getCC)" PREFIX=/usr MANDIR=/usr/share/man \
+		./configure ${EXTRA_CONF} || die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc README ChangeLog
+}