Version bump, introducing directory search, new translations, and bug fixes.

(Portage version: 2.1.4_rc10)

7 files changed, 24 insertions, 108 deletions

diff --git a/media-sound/herrie/ChangeLog b/media-sound/herrie/ChangeLog
index 931c7a7914e8..94d1a53168d1 100644
--- a/media-sound/herrie/ChangeLog
+++ b/media-sound/herrie/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/herrie
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/herrie/ChangeLog,v 1.18 2007/10/27 17:28:54 nixnut Exp $
+# 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 $
+
+*herrie-1.9.2 (20 Jan 2008)
+
+  20 Jan 2008; Robert Buchholz <rbu@gentoo.org>
+  -files/herrie-1.5.1-chost.patch, -herrie-1.7-r1.ebuild,
+  -herrie-1.8.1.ebuild, +herrie-1.9.2.ebuild:
+  Version bump, introducing directory search, new translations, and bug fixes.
+  Clean up old versions.
 
   27 Oct 2007; nixnut <nixnut@gentoo.org> herrie-1.8.3.ebuild:
   Stable on ppc wrt bug 196074
diff --git a/media-sound/herrie/files/digest-herrie-1.7-r1 b/media-sound/herrie/files/digest-herrie-1.7-r1
deleted file mode 100644
index 636a0cc45ce8..000000000000
--- a/media-sound/herrie/files/digest-herrie-1.7-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cbde0e97dd514ef8434865cd448b8805 herrie-1.7.tar.bz2 56836
-RMD160 60a433cf94699cb1af04bbbc8c27de6a498bc954 herrie-1.7.tar.bz2 56836
-SHA256 fc89d1cf3b899e16333fe1c4dbf2313b3492ba938bd0947446974a0c7889d3c3 herrie-1.7.tar.bz2 56836
diff --git a/media-sound/herrie/files/digest-herrie-1.8.1 b/media-sound/herrie/files/digest-herrie-1.8.1
deleted file mode 100644
index 2d45445817c7..000000000000
--- a/media-sound/herrie/files/digest-herrie-1.8.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2cd7717ce38d2c667ce345cd54fb13bb herrie-1.8.1.tar.bz2 61640
-RMD160 785b2b7d8e1aff08efe1dd1d3918cdc3dc8a3899 herrie-1.8.1.tar.bz2 61640
-SHA256 5f97f7d227caa66ecda308be9236c31867c51f6a3165c776504ef0607a3ca6be herrie-1.8.1.tar.bz2 61640
diff --git a/media-sound/herrie/files/digest-herrie-1.9.2 b/media-sound/herrie/files/digest-herrie-1.9.2
new file mode 100644
index 000000000000..8a61e1d4737f
--- /dev/null
+++ b/media-sound/herrie/files/digest-herrie-1.9.2
@@ -0,0 +1,3 @@
+MD5 aef6c624abf78f05f2291d1ad1645962 herrie-1.9.2.tar.bz2 67331
+RMD160 8911454b28bab60e12caefec3c4b3983e738326f herrie-1.9.2.tar.bz2 67331
+SHA256 e54e0505abb7cad66198ad70fc14b645ca1dcfc216f3c9f7ff06ba264ee80e17 herrie-1.9.2.tar.bz2 67331
diff --git a/media-sound/herrie/files/herrie-1.5.1-chost.patch b/media-sound/herrie/files/herrie-1.5.1-chost.patch
deleted file mode 100644
index be4cd778b13c..000000000000
--- a/media-sound/herrie/files/herrie-1.5.1-chost.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-This patch sets the OS variable according to the CHOST given by the environment,
-thus enabling cross-compilation.
-
---- configure.orig	2007-04-12 23:51:53.000000000 +0200
-+++ configure	2007-04-13 00:03:10.000000000 +0200
-@@ -45,6 +45,21 @@
- CFG_CURSES_HEADER=ncurses
- CFG_CURSES_LIB=ncurses
- 
-+case "$CHOST" in
-+  *-darwin*)
-+	OS=Darwin
-+	;;
-+  *-linux*)
-+	OS=Linux
-+	;;
-+  *-freebsd*)
-+	OS=FreeBSD
-+	;;
-+  *-solaris*)
-+	OS=SunOS
-+	;;
-+esac
-+
- # Operating system defaults
- [ "$OS" != "" ] || OS=`uname`
- case $OS in
diff --git a/media-sound/herrie/herrie-1.7-r1.ebuild b/media-sound/herrie/herrie-1.7-r1.ebuild
deleted file mode 100644
index 59fabbdbfe0a..000000000000
--- a/media-sound/herrie/herrie-1.7-r1.ebuild
+++ /dev/null
@@ -1,68 +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/herrie/herrie-1.7-r1.ebuild,v 1.1 2007/06/05 19:26:40 rbu Exp $
-
-inherit eutils toolchain-funcs flag-o-matic
-
-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 ~x86"
-IUSE="ao http modplug mp3 sndfile vorbis xspf unicode
-	linguas_de linguas_nl linguas_pl linguas_tr linguas_sv"
-
-DEPEND="sys-libs/ncurses
-	>=dev-libs/glib-2.0
-	ao? ( media-libs/libao )
-	http? ( net-misc/curl )
-	modplug? ( media-libs/libmodplug )
-	mp3? ( media-libs/libmad
-		media-libs/libid3tag )
-	sndfile? ( media-libs/libsndfile )
-	vorbis? ( media-libs/libvorbis )
-	xspf? ( >=media-libs/libspiff-0.6.5 )"
-RDEPEND="${DEPEND}"
-DEPEND="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.5.1-chost.patch"
-}
-
-src_compile() {
-	local EXTRA_CONF="verbose no_strip"
-	use ao && EXTRA_CONF="${EXTRA_CONF} ao"
-	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 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"
-
-	append-flags "-DCLOSE_STDERR"
-
-	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
-}
diff --git a/media-sound/herrie/herrie-1.8.1.ebuild b/media-sound/herrie/herrie-1.9.2.ebuild
index 2353aea43a23..539217e95e9b 100644
--- a/media-sound/herrie/herrie-1.8.1.ebuild
+++ b/media-sound/herrie/herrie-1.9.2.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.1.ebuild,v 1.1 2007/07/11 19:39:51 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/herrie/herrie-1.9.2.ebuild,v 1.1 2008/01/20 23:58:47 rbu Exp $
 
 inherit eutils toolchain-funcs
 
@@ -10,9 +10,15 @@ SRC_URI="http://herrie.info/distfiles/${P}.tar.bz2"
 
 LICENSE="BSD-2 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86 ~ppc"
-IUSE="ao alsa pulseaudio oss http modplug mp3 sndfile vorbis xspf unicode nls
-	linguas_de linguas_nl linguas_pl linguas_tr linguas_sv linguas_ga linguas_ru"
+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 ru sv tr vi"
+for X in ${APP_LINGUAS}; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
 
 DEPEND="sys-libs/ncurses
 	>=dev-libs/glib-2.0