Version bump featuring polish LINGUAS and unicode support, drop old

Package-Manager: portage-2.1.2.2

8 files changed, 37 insertions, 137 deletions

diff --git a/media-sound/herrie/ChangeLog b/media-sound/herrie/ChangeLog
index b8660ad51ecf..5a6f6d04a8bd 100644
--- a/media-sound/herrie/ChangeLog
+++ b/media-sound/herrie/ChangeLog
@@ -1,6 +1,13 @@
 # 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.5 2007/04/17 21:21:02 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/herrie/ChangeLog,v 1.6 2007/04/21 17:17:18 rbu Exp $
+
+*herrie-1.6.1 (21 Apr 2007)
+
+  21 Apr 2007; Robert Buchholz <rbu@gentoo.org>
+  -files/herrie-1.5.1-gnu-source-define.patch, -herrie-1.5.1.ebuild,
+  -herrie-1.6.ebuild, +herrie-1.6.1.ebuild:
+  Version bump featuring polish LINGUAS and unicode support, drop old
 
   17 Apr 2007; Robert Buchholz <rbu@gentoo.org> herrie-1.6.ebuild:
   ao and sdl at the same time doesn't work. Added a clarification
diff --git a/media-sound/herrie/Manifest b/media-sound/herrie/Manifest
index 47ffb58589b3..df7b3e9d99c2 100644
--- a/media-sound/herrie/Manifest
+++ b/media-sound/herrie/Manifest
@@ -5,38 +5,26 @@ AUX herrie-1.5.1-chost.patch 515 RMD160 ae8012b7fdd25dec8d33f8542894ec342969829d
 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
-AUX herrie-1.5.1-gnu-source-define.patch 610 RMD160 b30d84b6186c58515f31d355fbaf6555341edc15 SHA1 c343e04977f1ac2a3a4edd20a458b0a44959b838 SHA256 490b8b0ce1c38e723d0b486d5498933170c8f335369103554e47401722059993
-MD5 f03263043f896993859702b8509bacd5 files/herrie-1.5.1-gnu-source-define.patch 610
-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
-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 2169 RMD160 be321d796fdb04acbe82061df887017dac11aeb0 SHA1 26ce5bcb7a00f15e8c2581f8f54c078104175548 SHA256 3df637dbed7eedc5ca4ecec8294ab1b7200a21cdbfc90ca0841433cf5cb18dad
-MD5 93ea94a9271039f2a2c04a40d7f1d5ae herrie-1.6.ebuild 2169
-RMD160 be321d796fdb04acbe82061df887017dac11aeb0 herrie-1.6.ebuild 2169
-SHA256 3df637dbed7eedc5ca4ecec8294ab1b7200a21cdbfc90ca0841433cf5cb18dad herrie-1.6.ebuild 2169
-MISC ChangeLog 867 RMD160 56b20b29d7ce4a45a3069585f7594c19c895242f SHA1 64543a8932648fc66bc7d73ac1c0ee80082bffbc SHA256 ba7191a3537fe56a4f3d44830a2b270a18e4c01dbf4e168cf0a20c3a4dc6d8fa
-MD5 e11933a07fa7e5aa5ddf4925d2e2c9bb ChangeLog 867
-RMD160 56b20b29d7ce4a45a3069585f7594c19c895242f ChangeLog 867
-SHA256 ba7191a3537fe56a4f3d44830a2b270a18e4c01dbf4e168cf0a20c3a4dc6d8fa ChangeLog 867
+DIST herrie-1.6.1.tar.bz2 51267 RMD160 ddb881849e6d6c9f97e4fd98ad8176c48d49f0cf SHA1 09207c276e14a5a5961b7ca372bd866d16d76f1c SHA256 71d7e4cedda21fab6971c1223bd4af5cb6faaee0f9baef19095ec9697403b709
+EBUILD herrie-1.6.1.ebuild 2457 RMD160 4683c8d5a15482fed2cb3eb43b83917f8e9ae0af SHA1 359702a7c9703d562179687d9a4acbabdd8c4554 SHA256 f72e23f3baaac80f272211cd205f3260c709a283cfe50908c3775c6228dd6cc8
+MD5 1701f4945e8bdf5db665664d4af029ce herrie-1.6.1.ebuild 2457
+RMD160 4683c8d5a15482fed2cb3eb43b83917f8e9ae0af herrie-1.6.1.ebuild 2457
+SHA256 f72e23f3baaac80f272211cd205f3260c709a283cfe50908c3775c6228dd6cc8 herrie-1.6.1.ebuild 2457
+MISC ChangeLog 1128 RMD160 c2c38f2679e5b70868c6357006e63144504a6c98 SHA1 1e6f7efeeaa554782e16642bc902d0e035b9735d SHA256 3d95e0d74cada1c87a2f559987c53afbe50195ff178ecffb8a77972baabc5037
+MD5 5c5942df43fce344fb20f558c52ad685 ChangeLog 1128
+RMD160 c2c38f2679e5b70868c6357006e63144504a6c98 ChangeLog 1128
+SHA256 3d95e0d74cada1c87a2f559987c53afbe50195ff178ecffb8a77972baabc5037 ChangeLog 1128
 MISC metadata.xml 911 RMD160 e9b4f716a180fda312cd194192439d16bbaa435c SHA1 99af99f3f799499ebdb9e479ac771d1c0ad05bf7 SHA256 8ab5a1e832275427a7e49bf3d44dec79f07bfcc927854aaad327c7a9c0bec61b
 MD5 f1f8e0f1c7376cdf1a3d2abe80966d80 metadata.xml 911
 RMD160 e9b4f716a180fda312cd194192439d16bbaa435c metadata.xml 911
 SHA256 8ab5a1e832275427a7e49bf3d44dec79f07bfcc927854aaad327c7a9c0bec61b metadata.xml 911
-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
+MD5 2f5d92d9e94a2021c28b150ec43bf5b3 files/digest-herrie-1.6.1 238
+RMD160 a97ab524edf4305ecc02dbd99d882d969c9d8137 files/digest-herrie-1.6.1 238
+SHA256 3ff5d5ae23b8e4a470c5d06ff57c8ff561dc3650c25fda2f9ec84f6d2f3a090a files/digest-herrie-1.6.1 238
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFGJTpEyZx3L/ph1soRAtMuAJ9vb2mnTrdSamvepM4nhoUw3FkK8wCgsF2g
-+2WsxMQtiVmBmoALodVBbIg=
-=hNFy
+iD8DBQFGKkclyZx3L/ph1soRAlB3AKC7rAi2r/Y3UgrTdsefQ1NF4Zg+vgCfdPcX
+8L1fZfd1p7FVzJemI3Kyy+0=
+=vFu9
 -----END PGP SIGNATURE-----
diff --git a/media-sound/herrie/files/digest-herrie-1.5.1 b/media-sound/herrie/files/digest-herrie-1.5.1
deleted file mode 100644
index c58a3b59b8a7..000000000000
--- a/media-sound/herrie/files/digest-herrie-1.5.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a4b208a6486d175787cff36b886fc06e herrie-1.5.1.tar.gz 53842
-RMD160 02315c6c8bf1626a5abff0d511b26e2901a05184 herrie-1.5.1.tar.gz 53842
-SHA256 cf12a622541ab3954ef08dbad097a4c20eb38c99ecba200f332a2ae8eca80800 herrie-1.5.1.tar.gz 53842
diff --git a/media-sound/herrie/files/digest-herrie-1.6 b/media-sound/herrie/files/digest-herrie-1.6
deleted file mode 100644
index 6f78b572b409..000000000000
--- a/media-sound/herrie/files/digest-herrie-1.6
+++ /dev/null
@@ -1,3 +0,0 @@
-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/files/digest-herrie-1.6.1 b/media-sound/herrie/files/digest-herrie-1.6.1
new file mode 100644
index 000000000000..0b433d2cd81c
--- /dev/null
+++ b/media-sound/herrie/files/digest-herrie-1.6.1
@@ -0,0 +1,3 @@
+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/herrie-1.5.1-gnu-source-define.patch b/media-sound/herrie/files/herrie-1.5.1-gnu-source-define.patch
deleted file mode 100644
index f405259639da..000000000000
--- a/media-sound/herrie/files/herrie-1.5.1-gnu-source-define.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Ed Schouten <ed@flippo.fxq.nl>
-Date: Wed, 21 Mar 2007 17:52:11 +0000 (+0100)
-Subject: Make sure we don't define _GNU_SOURCE twice.
-X-Git-Url: http://g-rave.nl/gitweb?p=herrie;a=commitdiff_plain;h=a8033171d7e0abc9afe5d6cf7504716192a9fcc1
-
-Make sure we don't define _GNU_SOURCE twice.
----
-
-diff --git a/herrie/src/stdinc.h b/herrie/src/stdinc.h
-index 6b5998d..c079e44 100644
---- a/herrie/src/stdinc.h
-+++ b/herrie/src/stdinc.h
-@@ -25,7 +25,9 @@
-  */
- 
- /* Teach glibc a little lesson */
-+#ifndef _GNU_SOURCE
- #define _GNU_SOURCE
-+#endif /* !_GNU_SOURCE */
- #undef _FORTIFY_SOURCE
- 
- #include <sys/param.h>
diff --git a/media-sound/herrie/herrie-1.5.1.ebuild b/media-sound/herrie/herrie-1.5.1.ebuild
deleted file mode 100644
index c62b2c1879f9..000000000000
--- a/media-sound/herrie/herrie-1.5.1.ebuild
+++ /dev/null
@@ -1,69 +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.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://www.il.fontys.nl/~ed/projects/herrie/distfiles/${P}.tar.gz"
-
-LICENSE="BSD-2 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ao http modplug mp3 scrobbler sdl sndfile vorbis linguas_nl 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 )"
-RDEPEND="${DEPEND}"
-DEPEND="sys-devel/gettext"
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-chost.patch"
-	epatch "${FILESDIR}/${P}-gnu-source-define.patch"
-}
-
-src_compile() {
-	if ! use vorbis && ! use mp3 && ! use modplug && ! use sndfile ; then
-		die "You need to enable at least one audio output (USE must contain any of modplug, mp3, sndfile, vorbis)."
-	fi
-
-	local EXTRA_CONF=""
-	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"
-
-	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
-}
diff --git a/media-sound/herrie/herrie-1.6.ebuild b/media-sound/herrie/herrie-1.6.1.ebuild
index 9827ac860bf3..e94dfb218a87 100644
--- a/media-sound/herrie/herrie-1.6.ebuild
+++ b/media-sound/herrie/herrie-1.6.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.6.ebuild,v 1.2 2007/04/17 21:21:02 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/herrie/herrie-1.6.1.ebuild,v 1.1 2007/04/21 17:17:18 rbu Exp $
 
 inherit eutils toolchain-funcs
 
@@ -11,7 +11,7 @@ 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"
+IUSE="ao http modplug mp3 scrobbler sdl sndfile vorbis xspf unicode linguas_nl linguas_tr linguas_de linguas_pl"
 
 DEPEND="sys-libs/ncurses
 	>=dev-libs/glib-2.0
@@ -37,6 +37,11 @@ pkg_setup() {
 	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() {
@@ -44,6 +49,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}/${PN}-1.5.1-chost.patch"
+	sed -i "47s:CFG_STRIP=-s:unset CFG_STRIP:" configure
 }
 
 src_compile() {
@@ -55,6 +61,7 @@ src_compile() {
 	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"
 
@@ -63,15 +70,7 @@ src_compile() {
 }
 
 src_install() {
-	dobin herrie
-	doman herrie.1
-
+	emake DESTDIR="${D}" install || die "make install failed"
 	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
+	mv  ${D}/etc/herrie.conf{.sample,}
 }