Version bump featuring polish LINGUAS and unicode support, drop old

(Portage version: 2.1.2.2)

7 files changed, 22 insertions, 110 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/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,}
 }