Version bump introducing russian translation and ebuild cleanup

Package-Manager: portage-2.1.2.9

7 files changed, 40 insertions, 114 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/Manifest b/media-sound/herrie/Manifest
index 387df82da09a..7dc956bd0997 100644
--- a/media-sound/herrie/Manifest
+++ b/media-sound/herrie/Manifest
@@ -9,42 +9,34 @@ AUX herrie-1.8-chost.patch 547 RMD160 77f7506ee0b3f4eceeeb3b43a020086fba6739ac S
 MD5 4644c0851213a67e1e96bf8ad9adabf4 files/herrie-1.8-chost.patch 547
 RMD160 77f7506ee0b3f4eceeeb3b43a020086fba6739ac files/herrie-1.8-chost.patch 547
 SHA256 07371e7b5feff1f2b9a1cce1875be9def54c478084f2635a30bdcc8e6333f2f2 files/herrie-1.8-chost.patch 547
-DIST herrie-1.6.1.tar.bz2 51267 RMD160 ddb881849e6d6c9f97e4fd98ad8176c48d49f0cf SHA1 09207c276e14a5a5961b7ca372bd866d16d76f1c SHA256 71d7e4cedda21fab6971c1223bd4af5cb6faaee0f9baef19095ec9697403b709
 DIST herrie-1.7.tar.bz2 56836 RMD160 60a433cf94699cb1af04bbbc8c27de6a498bc954 SHA1 f1c334a9132eb7509a02fac4db5d054ed89fdb3f SHA256 fc89d1cf3b899e16333fe1c4dbf2313b3492ba938bd0947446974a0c7889d3c3
-DIST herrie-1.8.tar.bz2 60521 RMD160 0e943316ff001f07670366297d245641d3777c9a SHA1 28b58d616dcd5d183fcdd2995d08848479aa1c9d SHA256 99b2f32f9503871fd2247966b95b3192e75705f5134b22dc6680432ead57fbd8
-EBUILD herrie-1.6.1-r1.ebuild 2425 RMD160 5ed8b53980482bacfc2360dddeee2201aceccee2 SHA1 09146782c51b0273272a5e63980b8e83818fe771 SHA256 6413b2cbfd1203204e5e45c39bbe7b62842bcbb9d05ef2abeebd515283d4a176
-MD5 f7c9c0534df1d2d4ddcb9cf6dc887ce8 herrie-1.6.1-r1.ebuild 2425
-RMD160 5ed8b53980482bacfc2360dddeee2201aceccee2 herrie-1.6.1-r1.ebuild 2425
-SHA256 6413b2cbfd1203204e5e45c39bbe7b62842bcbb9d05ef2abeebd515283d4a176 herrie-1.6.1-r1.ebuild 2425
+DIST herrie-1.8.1.tar.bz2 61640 RMD160 785b2b7d8e1aff08efe1dd1d3918cdc3dc8a3899 SHA1 a3e0a3003b1654c590711e5982875126835bec32 SHA256 5f97f7d227caa66ecda308be9236c31867c51f6a3165c776504ef0607a3ca6be
 EBUILD herrie-1.7-r1.ebuild 2048 RMD160 eb7c6cbbb15e4652be9edf5d511f12c983c1ed12 SHA1 ebc075cf289ee00821f90d91f54bbf6868379db1 SHA256 3cfe2db895998c7e1ed4bfaca59512eea0502e77607ad2229f2344564dd28e5b
 MD5 2942664dc9d8186cd5fd1b8f21705e7e herrie-1.7-r1.ebuild 2048
 RMD160 eb7c6cbbb15e4652be9edf5d511f12c983c1ed12 herrie-1.7-r1.ebuild 2048
 SHA256 3cfe2db895998c7e1ed4bfaca59512eea0502e77607ad2229f2344564dd28e5b herrie-1.7-r1.ebuild 2048
-EBUILD herrie-1.8.ebuild 2283 RMD160 69f03fc5772cdbdac36ee054e5f39c1fde41ade8 SHA1 14a65da33e24df05056f8b92a524c6a1aa1e500f SHA256 a7bc4a357df865d236c946a37f3bd45cc15c9229d1b818bc69b9a7e3917a8ddd
-MD5 bb37471fb551b56acb1a84cffe1f248a herrie-1.8.ebuild 2283
-RMD160 69f03fc5772cdbdac36ee054e5f39c1fde41ade8 herrie-1.8.ebuild 2283
-SHA256 a7bc4a357df865d236c946a37f3bd45cc15c9229d1b818bc69b9a7e3917a8ddd herrie-1.8.ebuild 2283
-MISC ChangeLog 2270 RMD160 a54396c378b7b2898f85f2bf2a180bc6e8532247 SHA1 1e711ff12463a46ee4dc11e2113941c0e9476a26 SHA256 3dc9b4aa0f515f69a848c11f6d5e2186c9ad1e90d7e8ec222d8ab90d477f458b
-MD5 f4174a6f7e116e9ef45be62fa51f0e1f ChangeLog 2270
-RMD160 a54396c378b7b2898f85f2bf2a180bc6e8532247 ChangeLog 2270
-SHA256 3dc9b4aa0f515f69a848c11f6d5e2186c9ad1e90d7e8ec222d8ab90d477f458b ChangeLog 2270
+EBUILD herrie-1.8.1.ebuild 2591 RMD160 fe520f004c92ed9adfcaad45d78153d3fb01a056 SHA1 1771ae571b35f39ed91d48ecd0ff173d827f4895 SHA256 eba7c54ed2bfeb05db483a0687d92477c714b9ade5c36f84ef2fc5c16d8e8d97
+MD5 e4d8a68184060034175e0eeda7a143af herrie-1.8.1.ebuild 2591
+RMD160 fe520f004c92ed9adfcaad45d78153d3fb01a056 herrie-1.8.1.ebuild 2591
+SHA256 eba7c54ed2bfeb05db483a0687d92477c714b9ade5c36f84ef2fc5c16d8e8d97 herrie-1.8.1.ebuild 2591
+MISC ChangeLog 2483 RMD160 dc3bfb7fac5c507329f20c8229d6f1b2f103ec15 SHA1 a35681dad7c4eb96e8d8339c694ad550fc558dd0 SHA256 8e38e56d02aeb49105992d7f3f22c2adb8ce3c609b3806e22a45bcc1d90d4a0a
+MD5 6784eec5d2b69c52985840a9b7f426e7 ChangeLog 2483
+RMD160 dc3bfb7fac5c507329f20c8229d6f1b2f103ec15 ChangeLog 2483
+SHA256 8e38e56d02aeb49105992d7f3f22c2adb8ce3c609b3806e22a45bcc1d90d4a0a ChangeLog 2483
 MISC metadata.xml 909 RMD160 d20b55320e3a1f6381bf43b218136c928dc98009 SHA1 6320f83cd0797f7c163a3ad4e05983c880450e91 SHA256 262bc38bcefd756f4a7a8da1c6b3c07df251e79af150d264e485ec16a22302df
 MD5 e34bcf20b895b255ca4063578c940c59 metadata.xml 909
 RMD160 d20b55320e3a1f6381bf43b218136c928dc98009 metadata.xml 909
 SHA256 262bc38bcefd756f4a7a8da1c6b3c07df251e79af150d264e485ec16a22302df metadata.xml 909
-MD5 2f5d92d9e94a2021c28b150ec43bf5b3 files/digest-herrie-1.6.1-r1 238
-RMD160 a97ab524edf4305ecc02dbd99d882d969c9d8137 files/digest-herrie-1.6.1-r1 238
-SHA256 3ff5d5ae23b8e4a470c5d06ff57c8ff561dc3650c25fda2f9ec84f6d2f3a090a files/digest-herrie-1.6.1-r1 238
 MD5 9f41d2ae2e477529c8fad937d0e668f5 files/digest-herrie-1.7-r1 232
 RMD160 27736edbe412a50ddb6e62c9089ffa6fbce58412 files/digest-herrie-1.7-r1 232
 SHA256 46c74956705c8d2cc88cbe2298696c4f57a300d390de9851565bab24304b61ca files/digest-herrie-1.7-r1 232
-MD5 9353fab9dce5659a272f488ccd690b7b files/digest-herrie-1.8 232
-RMD160 d7d3728858db33741df1da034b018a24e5ccfbbb files/digest-herrie-1.8 232
-SHA256 3bcb74a677af4f290ac526180da5f8e7a8cc2f4ea8ac15c168ce45f884cacf37 files/digest-herrie-1.8 232
+MD5 05e775b73975c3807e5debd8e84f3381 files/digest-herrie-1.8.1 238
+RMD160 8eb7242ed852c004adcbaa34347cb4828e332f9f files/digest-herrie-1.8.1 238
+SHA256 79efc373030508f3568d25d633f508ce7a153548fccdb71aecf1c3b24b388f28 files/digest-herrie-1.8.1 238
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGj/PpyZx3L/ph1soRAp2cAKCOykuMzM8jczfXwn4Ly0jsvGadwACgqZXP
-3jN6ympFAIeld/MJfo8yGWo=
-=EXgD
+iD8DBQFGlTIKyZx3L/ph1soRApTPAJ9aIhKAgqYp6z3eb7E9kPRtR0YUMACdEkvO
+C1GatgN0+859+MVtDS7dlSI=
+=M2Oz
 -----END PGP SIGNATURE-----
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"