4 files changed, 93 insertions, 8 deletions
diff --git a/media-sound/herrie/ChangeLog b/media-sound/herrie/ChangeLog
index 96c6aeeb868d..18f39093e861 100644
--- a/media-sound/herrie/ChangeLog
+++ b/media-sound/herrie/ChangeLog
@@ -1,6 +1,15 @@
 # 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.8 2007/05/12 11:31:09 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/herrie/ChangeLog,v 1.9 2007/06/03 20:35:16 rbu Exp $
+
+*herrie-1.7 (03 Jun 2007)
+
+  03 Jun 2007; Robert Buchholz <rbu@gentoo.org> +herrie-1.7.ebuild:
+  Version bump:
+  * Removed sdl support as it was completely broken
+  * New swedish locale
+  * removed scrobbler use flag and integrated it into USE=http
+  * Jukebox mode
 
   12 May 2007; Robert Buchholz <rbu@gentoo.org> metadata.xml:
   Added to sound herd
diff --git a/media-sound/herrie/Manifest b/media-sound/herrie/Manifest
index e79078cf9840..20e1347cd784 100644
--- a/media-sound/herrie/Manifest
+++ b/media-sound/herrie/Manifest
@@ -6,14 +6,19 @@ MD5 a7a70e7955eb6853a59c19a9d08a822b files/herrie-1.5.1-chost.patch 515
 RMD160 ae8012b7fdd25dec8d33f8542894ec342969829d files/herrie-1.5.1-chost.patch 515
 SHA256 7500ebc34b46c651d8ee9f7f6376072211eb6111ccfe0a429662f28a4379d268 files/herrie-1.5.1-chost.patch 515
 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
 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
-MISC ChangeLog 1412 RMD160 76c9931f3f76c9aa6d2d764e7b65637070a2e72d SHA1 5abdb2e38c910336e20d08cf9f8a830a64dc43ca SHA256 6dbbd9e0cdfebc08f35a8d55e4516b8a8a03d618e44bac91c5074fe0ce2a6bed
-MD5 4775c192dec2a1b764ca69e67dcf9476 ChangeLog 1412
-RMD160 76c9931f3f76c9aa6d2d764e7b65637070a2e72d ChangeLog 1412
-SHA256 6dbbd9e0cdfebc08f35a8d55e4516b8a8a03d618e44bac91c5074fe0ce2a6bed ChangeLog 1412
+EBUILD herrie-1.7.ebuild 1996 RMD160 d756dd7f4b3e64f647954f4c1ddfe020cf854b14 SHA1 567742b60ef4406fe82e35f5d4a421abe411bbe3 SHA256 6604e06f540960563678969f5229c8b9f05a3d22a4a73d5e4e5dd4a19a6fbb49
+MD5 274909d56083fe0e7fdfb05784b5dc78 herrie-1.7.ebuild 1996
+RMD160 d756dd7f4b3e64f647954f4c1ddfe020cf854b14 herrie-1.7.ebuild 1996
+SHA256 6604e06f540960563678969f5229c8b9f05a3d22a4a73d5e4e5dd4a19a6fbb49 herrie-1.7.ebuild 1996
+MISC ChangeLog 1679 RMD160 d7359c22d402e6646cdf3459e9bc49e9141a9349 SHA1 bb6316668191fa515e14e6432d941d176a025e19 SHA256 fbdc2f3dfa699c936a06053ff4d6077d79b966731eb44ccf388caf09eb0af275
+MD5 e5c8d24db3e1486ab1fc314e0cf3aa4f ChangeLog 1679
+RMD160 d7359c22d402e6646cdf3459e9bc49e9141a9349 ChangeLog 1679
+SHA256 fbdc2f3dfa699c936a06053ff4d6077d79b966731eb44ccf388caf09eb0af275 ChangeLog 1679
 MISC metadata.xml 909 RMD160 d20b55320e3a1f6381bf43b218136c928dc98009 SHA1 6320f83cd0797f7c163a3ad4e05983c880450e91 SHA256 262bc38bcefd756f4a7a8da1c6b3c07df251e79af150d264e485ec16a22302df
 MD5 e34bcf20b895b255ca4063578c940c59 metadata.xml 909
 RMD160 d20b55320e3a1f6381bf43b218136c928dc98009 metadata.xml 909
@@ -21,10 +26,13 @@ SHA256 262bc38bcefd756f4a7a8da1c6b3c07df251e79af150d264e485ec16a22302df metadata
 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 232
+RMD160 27736edbe412a50ddb6e62c9089ffa6fbce58412 files/digest-herrie-1.7 232
+SHA256 46c74956705c8d2cc88cbe2298696c4f57a300d390de9851565bab24304b61ca files/digest-herrie-1.7 232
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFGRaWCyZx3L/ph1soRAsvSAJkBQnVTMgxv/swCscX5DmCJ+rJQ1gCgyJQu
-QozHLMWHd+knV9io5Phhl8M=
-=2IBx
+iD8DBQFGYyYMyZx3L/ph1soRAqZMAKDlQsr6RBki7QGwpjo2LDtCd/YMzACg2+ey
+0mfF6h0LN0+1XCEZVRD8XVU=
+=sFFM
 -----END PGP SIGNATURE-----
diff --git a/media-sound/herrie/files/digest-herrie-1.7 b/media-sound/herrie/files/digest-herrie-1.7
new file mode 100644
index 000000000000..636a0cc45ce8
--- /dev/null
+++ b/media-sound/herrie/files/digest-herrie-1.7
@@ -0,0 +1,3 @@
+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/herrie-1.7.ebuild b/media-sound/herrie/herrie-1.7.ebuild
new file mode 100644
index 000000000000..ba12c00f6a5e
--- /dev/null
+++ b/media-sound/herrie/herrie-1.7.ebuild
@@ -0,0 +1,65 @@
+# 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.ebuild,v 1.1 2007/06/03 20:35:16 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 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"
+
+	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
+}