Version bump, URI fix for 0.5.1

Package-Manager: portage-2.1.2.2

5 files changed, 105 insertions, 14 deletions

diff --git a/media-sound/herrie/ChangeLog b/media-sound/herrie/ChangeLog
index 39f1a1a83239..396a04f36a0a 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.2 2007/04/13 09:18:45 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/herrie/ChangeLog,v 1.3 2007/04/17 20:18:43 rbu Exp $
+
+*herrie-1.6 (17 Apr 2007)
+
+  17 Apr 2007; Robert Buchholz <rbu@gentoo.org> herrie-1.5.1.ebuild,
+  +herrie-1.6.ebuild:
+  Version bump, URI fix for 0.5.1
 
   13 Apr 2007; Robert Buchholz <rbu@gentoo.org> herrie-1.5.1.ebuild:
   LICENSE corrected to BSD-2
diff --git a/media-sound/herrie/Manifest b/media-sound/herrie/Manifest
index f611f4401a9d..5ccdf28ab533 100644
--- a/media-sound/herrie/Manifest
+++ b/media-sound/herrie/Manifest
@@ -10,14 +10,19 @@ MD5 f03263043f896993859702b8509bacd5 files/herrie-1.5.1-gnu-source-define.patch
 RMD160 b30d84b6186c58515f31d355fbaf6555341edc15 files/herrie-1.5.1-gnu-source-define.patch 610
 SHA256 490b8b0ce1c38e723d0b486d5498933170c8f335369103554e47401722059993 files/herrie-1.5.1-gnu-source-define.patch 610
 DIST herrie-1.5.1.tar.gz 53842 RMD160 02315c6c8bf1626a5abff0d511b26e2901a05184 SHA1 5e7fb0dc263e882dfa440f48a43abc4b802a7155 SHA256 cf12a622541ab3954ef08dbad097a4c20eb38c99ecba200f332a2ae8eca80800
-EBUILD herrie-1.5.1.ebuild 1991 RMD160 567bd4c0462466c382b63812a51cc68e7cf0f1c6 SHA1 c57482f7b03cd4b58eaff1e2806b4f82c8367e38 SHA256 650966c64cdabee87f592d927002079ce99b43b27ed6ea5da1bd98a615c04b92
-MD5 f57a82c5d9e2ca8177ab14d543d5e9d7 herrie-1.5.1.ebuild 1991
-RMD160 567bd4c0462466c382b63812a51cc68e7cf0f1c6 herrie-1.5.1.ebuild 1991
-SHA256 650966c64cdabee87f592d927002079ce99b43b27ed6ea5da1bd98a615c04b92 herrie-1.5.1.ebuild 1991
-MISC ChangeLog 580 RMD160 7af4b68c0491209fefd8f2bfb69aca8f001ec85b SHA1 06a4881401b5500ae057ba18b72618f26af13e91 SHA256 4f485c32c7089bbd2fb2329b5d2170942e04076832fed0d791b9701e8bca8098
-MD5 e5e32d3a44f7ca943a360e3bd9b083c9 ChangeLog 580
-RMD160 7af4b68c0491209fefd8f2bfb69aca8f001ec85b ChangeLog 580
-SHA256 4f485c32c7089bbd2fb2329b5d2170942e04076832fed0d791b9701e8bca8098 ChangeLog 580
+DIST herrie-1.6.tar.bz2 49747 RMD160 0f84baa8e35ed06c8e5744076f84a9800554b5c6 SHA1 7e49d091f049e2c118e4a0080b73dc303b4d4ac6 SHA256 17a92c4b5dfe5c2ff2ae7897cbce963258dc44b7b4c6bd288f273a56b7d9d2ae
+EBUILD herrie-1.5.1.ebuild 2002 RMD160 20e0b61870c471d9ff2d79ee25dc98ef960113e8 SHA1 11586327785a9e3c92dcc807b3820f388f53d40b SHA256 e6f46826221d331a2db4f00cc176b54dffc36b2a1d36f4b619fcc42e14537fdd
+MD5 075f651eb20c6209ee2b711da8e965f3 herrie-1.5.1.ebuild 2002
+RMD160 20e0b61870c471d9ff2d79ee25dc98ef960113e8 herrie-1.5.1.ebuild 2002
+SHA256 e6f46826221d331a2db4f00cc176b54dffc36b2a1d36f4b619fcc42e14537fdd herrie-1.5.1.ebuild 2002
+EBUILD herrie-1.6.ebuild 2048 RMD160 3cede1f8cfe34f58935caee78fec63ddf193f999 SHA1 489fe7f5fab44004dff494bdabf30f4371d8987e SHA256 f2691f083b4af49966ec0a9830a74e9dd3595668ea17d6ead0703b0cd923725b
+MD5 43f36cc055bc8d78477d98046e0f2f53 herrie-1.6.ebuild 2048
+RMD160 3cede1f8cfe34f58935caee78fec63ddf193f999 herrie-1.6.ebuild 2048
+SHA256 f2691f083b4af49966ec0a9830a74e9dd3595668ea17d6ead0703b0cd923725b herrie-1.6.ebuild 2048
+MISC ChangeLog 733 RMD160 a83398c2b41a42e8c7c1c7894382008a5e621e93 SHA1 c2eadd942f7574ffd6fa9873c4ef455c98f27639 SHA256 a139b53e10b71b0d54ef6b4c77374a82fcaddc5dd57d27bf91adca7948e2cda0
+MD5 ca845fe3842013d17986d7f84db07e71 ChangeLog 733
+RMD160 a83398c2b41a42e8c7c1c7894382008a5e621e93 ChangeLog 733
+SHA256 a139b53e10b71b0d54ef6b4c77374a82fcaddc5dd57d27bf91adca7948e2cda0 ChangeLog 733
 MISC metadata.xml 911 RMD160 e9b4f716a180fda312cd194192439d16bbaa435c SHA1 99af99f3f799499ebdb9e479ac771d1c0ad05bf7 SHA256 8ab5a1e832275427a7e49bf3d44dec79f07bfcc927854aaad327c7a9c0bec61b
 MD5 f1f8e0f1c7376cdf1a3d2abe80966d80 metadata.xml 911
 RMD160 e9b4f716a180fda312cd194192439d16bbaa435c metadata.xml 911
@@ -25,10 +30,13 @@ SHA256 8ab5a1e832275427a7e49bf3d44dec79f07bfcc927854aaad327c7a9c0bec61b metadata
 MD5 04b109c5d327b250e3f6337c3722faa0 files/digest-herrie-1.5.1 235
 RMD160 8b901a6134da39dc81eb50dd4f8b1600e3a977ba files/digest-herrie-1.5.1 235
 SHA256 0e5c8a2c33fd0937a78df6eb151dc0511db19c01b550da2aa91729a5bf186335 files/digest-herrie-1.5.1 235
+MD5 ddf13f968d27e42ff69125d3946d4818 files/digest-herrie-1.6 232
+RMD160 90250be78bb6d9fadd07eea4adf88f306c0ca959 files/digest-herrie-1.6 232
+SHA256 baabdfe4a60374124f8cef1980b49f022eb704828503742c98d2aa87e0b1bcdf files/digest-herrie-1.6 232
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFGH0r7yZx3L/ph1soRAu2lAJ9QateLL8sgPxO1Z1imCz4aoWzABQCfXMxs
-McTjU0JAm1yPiRpqeTJSazc=
-=BR5z
+iD8DBQFGJSuqyZx3L/ph1soRAqbuAKDtTu8dqSgq2Xchijtp7HCZPRiRJACgozJn
+aC5xHnm841cOXAEyjkhy+sM=
+=M8+I
 -----END PGP SIGNATURE-----
diff --git a/media-sound/herrie/files/digest-herrie-1.6 b/media-sound/herrie/files/digest-herrie-1.6
new file mode 100644
index 000000000000..6f78b572b409
--- /dev/null
+++ b/media-sound/herrie/files/digest-herrie-1.6
@@ -0,0 +1,3 @@
+MD5 4ce7ebeb10d21ec52cd7b1ca3158bbbb herrie-1.6.tar.bz2 49747
+RMD160 0f84baa8e35ed06c8e5744076f84a9800554b5c6 herrie-1.6.tar.bz2 49747
+SHA256 17a92c4b5dfe5c2ff2ae7897cbce963258dc44b7b4c6bd288f273a56b7d9d2ae herrie-1.6.tar.bz2 49747
diff --git a/media-sound/herrie/herrie-1.5.1.ebuild b/media-sound/herrie/herrie-1.5.1.ebuild
index 36b37c6310ca..c62b2c1879f9 100644
--- a/media-sound/herrie/herrie-1.5.1.ebuild
+++ b/media-sound/herrie/herrie-1.5.1.ebuild
@@ -1,12 +1,12 @@
 # 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.5.1.ebuild,v 1.2 2007/04/13 09:18:45 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/herrie/herrie-1.5.1.ebuild,v 1.3 2007/04/17 20:18:43 rbu Exp $
 
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Herrie is a command line music player."
 HOMEPAGE="http://herrie.info/"
-SRC_URI="http://g-rave.nl/projects/herrie/distfiles/${P}.tar.gz"
+SRC_URI="http://www.il.fontys.nl/~ed/projects/herrie/distfiles/${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-2"
 SLOT="0"
diff --git a/media-sound/herrie/herrie-1.6.ebuild b/media-sound/herrie/herrie-1.6.ebuild
new file mode 100644
index 000000000000..b0383adb9341
--- /dev/null
+++ b/media-sound/herrie/herrie-1.6.ebuild
@@ -0,0 +1,74 @@
+# 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.ebuild,v 1.1 2007/04/17 20:18:43 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 linguas_nl linguas_tr linguas_de"
+
+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 ; then
+		ewarn "Please be aware that SDL support in Herrie is highly experimental. Use it at your own risk."
+	fi
+}
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-1.5.1-chost.patch"
+}
+
+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 && EXTRA_CONF="${EXTRA_CONF} sdl"
+	use sndfile || EXTRA_CONF="${EXTRA_CONF} no_sndfile"
+	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() {
+	dobin herrie
+	doman herrie.1
+
+	dodoc README ChangeLog
+
+	insinto /etc
+	newins herrie.conf.sample herrie.conf
+
+	use linguas_nl && domo nl.mo
+	use linguas_tr && domo tr.mo
+	use linguas_de && domo de.mo
+}