old

(Portage version: 2.1.6.13/cvs/Linux x86_64)

4 files changed, 4 insertions, 91 deletions

diff --git a/media-sound/herrie/ChangeLog b/media-sound/herrie/ChangeLog
index 0af47a555d07..db242eb93ff8 100644
--- a/media-sound/herrie/ChangeLog
+++ b/media-sound/herrie/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for media-sound/herrie
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/herrie/ChangeLog,v 1.35 2009/06/01 15:50:47 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/herrie/ChangeLog,v 1.36 2009/06/01 16:13:50 ssuominen Exp $
 
   01 Jun 2009; Ferris McCormick <fmccor@gentoo.org> herrie-2.2.ebuild:
   Sparc stable, required for Bug #271815.
@@ -72,8 +72,7 @@
 *herrie-1.9.2 (20 Jan 2008)
 
   20 Jan 2008; Robert Buchholz <rbu@gentoo.org>
-  -files/herrie-1.5.1-chost.patch, -herrie-1.7-r1.ebuild,
-  -herrie-1.8.1.ebuild, +herrie-1.9.2.ebuild:
+  -herrie-1.7-r1.ebuild, -herrie-1.8.1.ebuild, +herrie-1.9.2.ebuild:
   Version bump, introducing directory search, new translations, and bug fixes.
   Clean up old versions.
 
diff --git a/media-sound/herrie/files/herrie-1.8-chost.patch b/media-sound/herrie/files/herrie-chost_issue.patch
index 1949972baa6a..1949972baa6a 100644
--- a/media-sound/herrie/files/herrie-1.8-chost.patch
+++ b/media-sound/herrie/files/herrie-chost_issue.patch
diff --git a/media-sound/herrie/herrie-2.0.2.ebuild b/media-sound/herrie/herrie-2.0.2.ebuild
deleted file mode 100644
index 3d5640d8526e..000000000000
--- a/media-sound/herrie/herrie-2.0.2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/herrie/herrie-2.0.2.ebuild,v 1.5 2008/06/19 11:50:12 opfer 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 ppc sparc x86"
-IUSE="ao alsa pulseaudio oss http modplug mp3 sndfile vorbis xspf unicode nls"
-
-# Supported languages
-APP_LINGUAS="ca da de es fi ga nl pl pt_BR ru sv tr vi zh_CN"
-for X in ${APP_LINGUAS}; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-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
-}
diff --git a/media-sound/herrie/herrie-2.2.ebuild b/media-sound/herrie/herrie-2.2.ebuild
index f43967c4db6f..58cd2875418a 100644
--- a/media-sound/herrie/herrie-2.2.ebuild
+++ b/media-sound/herrie/herrie-2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/herrie/herrie-2.2.ebuild,v 1.5 2009/06/01 15:50:47 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/herrie/herrie-2.2.ebuild,v 1.6 2009/06/01 16:13:50 ssuominen Exp $
 
 EAPI=2
 inherit eutils toolchain-funcs
@@ -14,7 +14,6 @@ SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
 IUSE="ao alsa pulseaudio oss http modplug mp3 sndfile vorbis xspf unicode nls"
 
-# Supported languages
 APP_LINGUAS="ca da de es fi ga nl pl pt_BR ru sv tr vi zh_CN"
 for X in ${APP_LINGUAS}; do
 	IUSE="${IUSE} linguas_${X}"
@@ -38,7 +37,7 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.8-chost.patch \
+	epatch "${FILESDIR}"/${PN}-chost_issue.patch \
 		"${FILESDIR}"/${P}-libxspf.patch
 }
 
@@ -47,7 +46,6 @@ src_configure() {
 		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"