Version bump fixing the ALSA code (bug #188285)

Package-Manager: portage-2.1.3.9

4 files changed, 103 insertions, 8 deletions

diff --git a/media-sound/herrie/ChangeLog b/media-sound/herrie/ChangeLog
index d39c2ab22203..a971318a1951 100644
--- a/media-sound/herrie/ChangeLog
+++ b/media-sound/herrie/ChangeLog
@@ -1,6 +1,11 @@
 # 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.14 2007/07/11 19:39:51 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/herrie/ChangeLog,v 1.15 2007/09/17 22:27:45 rbu Exp $
+
+*herrie-1.8.3 (17 Sep 2007)
+
+  03 Sep 2007; Robert Buchholz <rbu@gentoo.org> +herrie-1.8.3.ebuild:
+  Version bump fixing the ALSA code (bug #188285)
 
 *herrie-1.8.1 (11 Jul 2007)
 
diff --git a/media-sound/herrie/Manifest b/media-sound/herrie/Manifest
index 7dc956bd0997..909f71a2223a 100644
--- a/media-sound/herrie/Manifest
+++ b/media-sound/herrie/Manifest
@@ -11,6 +11,7 @@ RMD160 77f7506ee0b3f4eceeeb3b43a020086fba6739ac files/herrie-1.8-chost.patch 547
 SHA256 07371e7b5feff1f2b9a1cce1875be9def54c478084f2635a30bdcc8e6333f2f2 files/herrie-1.8-chost.patch 547
 DIST herrie-1.7.tar.bz2 56836 RMD160 60a433cf94699cb1af04bbbc8c27de6a498bc954 SHA1 f1c334a9132eb7509a02fac4db5d054ed89fdb3f SHA256 fc89d1cf3b899e16333fe1c4dbf2313b3492ba938bd0947446974a0c7889d3c3
 DIST herrie-1.8.1.tar.bz2 61640 RMD160 785b2b7d8e1aff08efe1dd1d3918cdc3dc8a3899 SHA1 a3e0a3003b1654c590711e5982875126835bec32 SHA256 5f97f7d227caa66ecda308be9236c31867c51f6a3165c776504ef0607a3ca6be
+DIST herrie-1.8.3.tar.bz2 62786 RMD160 68ae1977988d4912e549a6519c3b28f79b8f08ea SHA1 580e7154e2670402f18f1d4502e9460a3c5dfeba SHA256 d4746b136b59b31715461d436292da3bbd6b3a8c814f6fa897e4c229aaa465f8
 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
@@ -19,10 +20,14 @@ EBUILD herrie-1.8.1.ebuild 2591 RMD160 fe520f004c92ed9adfcaad45d78153d3fb01a056
 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
+EBUILD herrie-1.8.3.ebuild 2591 RMD160 12f4b049fed99b6bd25d2990ce2b07344b24e754 SHA1 8eb1ff92112a16088e2e5b8762220ae1ef2e5092 SHA256 a150349a9151d80b37c27040862eea1e7073a7d7db5763fd3f1247c0a390f2bf
+MD5 63c3f7cf99864fb86eafa71ea1de1c90 herrie-1.8.3.ebuild 2591
+RMD160 12f4b049fed99b6bd25d2990ce2b07344b24e754 herrie-1.8.3.ebuild 2591
+SHA256 a150349a9151d80b37c27040862eea1e7073a7d7db5763fd3f1247c0a390f2bf herrie-1.8.3.ebuild 2591
+MISC ChangeLog 2633 RMD160 e1baedfd279b6bb15310e55eb366778a201cd2c6 SHA1 87e0cd7f3debc66daf7baeea72bd3931ae8f74ec SHA256 97f46de1f254a0147c6fb87a4f8af36178ec436e85c785f10f3f8c933afd4db1
+MD5 10e3761a2e9736617a8e1d5e10d403ba ChangeLog 2633
+RMD160 e1baedfd279b6bb15310e55eb366778a201cd2c6 ChangeLog 2633
+SHA256 97f46de1f254a0147c6fb87a4f8af36178ec436e85c785f10f3f8c933afd4db1 ChangeLog 2633
 MISC metadata.xml 909 RMD160 d20b55320e3a1f6381bf43b218136c928dc98009 SHA1 6320f83cd0797f7c163a3ad4e05983c880450e91 SHA256 262bc38bcefd756f4a7a8da1c6b3c07df251e79af150d264e485ec16a22302df
 MD5 e34bcf20b895b255ca4063578c940c59 metadata.xml 909
 RMD160 d20b55320e3a1f6381bf43b218136c928dc98009 metadata.xml 909
@@ -33,10 +38,13 @@ SHA256 46c74956705c8d2cc88cbe2298696c4f57a300d390de9851565bab24304b61ca files/di
 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
+MD5 762d72bd6600ee11f6501989e29f9611 files/digest-herrie-1.8.3 238
+RMD160 349401a88bd279b11324eb6a63bbb65907c2fb74 files/digest-herrie-1.8.3 238
+SHA256 17993bb90dcf9e7f0ca89454801d88833986b87d7b4d00de7625f3ed14285680 files/digest-herrie-1.8.3 238
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGlTIKyZx3L/ph1soRApTPAJ9aIhKAgqYp6z3eb7E9kPRtR0YUMACdEkvO
-C1GatgN0+859+MVtDS7dlSI=
-=M2Oz
+iD8DBQFG7v9pyZx3L/ph1soRAjm4AJ0TbfYctKZGNGlITHAC+E/t4ROVXwCg3gPn
+jHHkcqyCRtRjDm6uymbn53s=
+=Z2GJ
 -----END PGP SIGNATURE-----
diff --git a/media-sound/herrie/files/digest-herrie-1.8.3 b/media-sound/herrie/files/digest-herrie-1.8.3
new file mode 100644
index 000000000000..074d158c376e
--- /dev/null
+++ b/media-sound/herrie/files/digest-herrie-1.8.3
@@ -0,0 +1,3 @@
+MD5 a76baacdb82d4e5fc246c3f5da90e2af herrie-1.8.3.tar.bz2 62786
+RMD160 68ae1977988d4912e549a6519c3b28f79b8f08ea herrie-1.8.3.tar.bz2 62786
+SHA256 d4746b136b59b31715461d436292da3bbd6b3a8c814f6fa897e4c229aaa465f8 herrie-1.8.3.tar.bz2 62786
diff --git a/media-sound/herrie/herrie-1.8.3.ebuild b/media-sound/herrie/herrie-1.8.3.ebuild
new file mode 100644
index 000000000000..e2e6a2973db8
--- /dev/null
+++ b/media-sound/herrie/herrie-1.8.3.ebuild
@@ -0,0 +1,79 @@
+# 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.3.ebuild,v 1.1 2007/09/17 22:27:45 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 ~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"
+
+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
+}