Version bump introducing russian translation and ebuild cleanup

(Portage version: 2.1.2.9)

6 files changed, 25 insertions, 91 deletions

diff --git a/media-sound/herrie/ChangeLog b/media-sound/herrie/ChangeLog
index 5d82e1cc921d..d39c2ab22203 100644
--- a/media-sound/herrie/ChangeLog
+++ b/media-sound/herrie/ChangeLog
@@ -1,6 +1,12 @@
 # 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.13 2007/07/07 20:13:23 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/herrie/ChangeLog,v 1.14 2007/07/11 19:39:51 rbu Exp $
+
+*herrie-1.8.1 (11 Jul 2007)
+
+  11 Jul 2007; Robert Buchholz <rbu@gentoo.org> -herrie-1.6.1-r1.ebuild,
+  -herrie-1.8.ebuild, +herrie-1.8.1.ebuild:
+  Version bump introducing russian translation and ebuild cleanup
 
   07 Jul 2007; Robert Buchholz <rbu@gentoo.org> herrie-1.8.ebuild:
   Added ~ppc
diff --git a/media-sound/herrie/files/digest-herrie-1.6.1-r1 b/media-sound/herrie/files/digest-herrie-1.6.1-r1
deleted file mode 100644
index 0b433d2cd81c..000000000000
--- a/media-sound/herrie/files/digest-herrie-1.6.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 eb921bf87856d7b2cf86da2d303e85bf herrie-1.6.1.tar.bz2 51267
-RMD160 ddb881849e6d6c9f97e4fd98ad8176c48d49f0cf herrie-1.6.1.tar.bz2 51267
-SHA256 71d7e4cedda21fab6971c1223bd4af5cb6faaee0f9baef19095ec9697403b709 herrie-1.6.1.tar.bz2 51267
diff --git a/media-sound/herrie/files/digest-herrie-1.8 b/media-sound/herrie/files/digest-herrie-1.8
deleted file mode 100644
index 09ba3c4a16d6..000000000000
--- a/media-sound/herrie/files/digest-herrie-1.8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 99a9c9944108d011ef092bb87dea8c33 herrie-1.8.tar.bz2 60521
-RMD160 0e943316ff001f07670366297d245641d3777c9a herrie-1.8.tar.bz2 60521
-SHA256 99b2f32f9503871fd2247966b95b3192e75705f5134b22dc6680432ead57fbd8 herrie-1.8.tar.bz2 60521
diff --git a/media-sound/herrie/files/digest-herrie-1.8.1 b/media-sound/herrie/files/digest-herrie-1.8.1
new file mode 100644
index 000000000000..2d45445817c7
--- /dev/null
+++ b/media-sound/herrie/files/digest-herrie-1.8.1
@@ -0,0 +1,3 @@
+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/herrie-1.6.1-r1.ebuild b/media-sound/herrie/herrie-1.6.1-r1.ebuild
deleted file mode 100644
index a8e1306a15b2..000000000000
--- a/media-sound/herrie/herrie-1.6.1-r1.ebuild
+++ /dev/null
@@ -1,76 +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.6.1-r1.ebuild,v 1.1 2007/04/30 17:57:41 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 ~x86"
-IUSE="ao http modplug mp3 scrobbler sdl sndfile vorbis xspf unicode
-	linguas_de linguas_nl linguas_pl linguas_tr"
-
-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 )
-	scrobbler? ( net-misc/curl
-		dev-libs/openssl )
-	sdl? ( media-libs/libsdl )
-	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 sdl && ! use ao ; then
-		ewarn "Please be aware that SDL support in Herrie is highly experimental. Use it at your own risk."
-	fi
-	if use sdl && use ao ; then
-		ewarn "You cannot use SDL and ao at the same time, using ao."
-	fi
-	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"
-	sed -i "47s:CFG_STRIP=-s:unset CFG_STRIP:" configure
-}
-
-src_compile() {
-	local EXTRA_CONF="verbose"
-	use ao && EXTRA_CONF="${EXTRA_CONF} ao"
-	use http || EXTRA_CONF="${EXTRA_CONF} no_http"
-	use mp3 || EXTRA_CONF="${EXTRA_CONF} no_mp3"
-	use modplug || EXTRA_CONF="${EXTRA_CONF} no_modplug"
-	use scrobbler || EXTRA_CONF="${EXTRA_CONF} no_scrobbler"
-	use sdl && ! use ao && EXTRA_CONF="${EXTRA_CONF} sdl"
-	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"
-
-	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.ebuild b/media-sound/herrie/herrie-1.8.1.ebuild
index fc71b980b3f2..2353aea43a23 100644
--- a/media-sound/herrie/herrie-1.8.ebuild
+++ b/media-sound/herrie/herrie-1.8.1.ebuild
@@ -1,6 +1,6 @@
 # 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.8.ebuild,v 1.3 2007/07/07 20:13:23 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/herrie/herrie-1.8.1.ebuild,v 1.1 2007/07/11 19:39:51 rbu Exp $
 
 inherit eutils toolchain-funcs
 
@@ -11,13 +11,13 @@ SRC_URI="http://herrie.info/distfiles/${P}.tar.bz2"
 LICENSE="BSD-2 GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~sparc ~x86 ~ppc"
-IUSE="ao http modplug mp3 sndfile vorbis xspf unicode nls pulseaudio oss
-	linguas_de linguas_nl linguas_pl linguas_tr linguas_sv linguas_ga"
+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"
 
 DEPEND="sys-libs/ncurses
 	>=dev-libs/glib-2.0
-	media-libs/alsa-lib
 	ao? ( media-libs/libao )
+	alsa? ( media-libs/alsa-lib )
 	http? ( net-misc/curl )
 	modplug? ( media-libs/libmodplug )
 	mp3? ( media-libs/libmad
@@ -25,9 +25,11 @@ DEPEND="sys-libs/ncurses
 	pulseaudio? ( media-sound/pulseaudio )
 	sndfile? ( media-libs/libsndfile )
 	vorbis? ( media-libs/libvorbis )
-	xspf? ( >=media-libs/libspiff-0.6.5 )"
+	xspf? ( >=media-libs/libspiff-0.6.5 )
+	!ao? ( !alsa? ( !pulseaudio? ( !oss? ( media-libs/alsa-lib ) ) ) )
+	"
 RDEPEND="${DEPEND}"
-DEPEND="sys-devel/gettext
+DEPEND="nls? ( sys-devel/gettext )
 	dev-util/pkgconfig"
 
 pkg_setup() {
@@ -42,13 +44,18 @@ src_unpack() {
 	unpack "${A}"
 	cd "${S}"
 
-	epatch "${FILESDIR}/${P}-chost.patch"
+	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 alsa"
+	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"