Stable for HPPA (bug #341019).

(Portage version: 2.2_rc97/cvs/Linux i686)

3 files changed, 7 insertions, 73 deletions

diff --git a/media-sound/ncmpcpp/ChangeLog b/media-sound/ncmpcpp/ChangeLog
index e27d940ca702..7ad0614b1096 100644
--- a/media-sound/ncmpcpp/ChangeLog
+++ b/media-sound/ncmpcpp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/ncmpcpp
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpcpp/ChangeLog,v 1.41 2010/10/15 21:36:34 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpcpp/ChangeLog,v 1.42 2010/10/18 02:06:22 jer Exp $
+
+  18 Oct 2010; Jeroen Roovers <jer@gentoo.org> -ncmpcpp-0.5.4.ebuild,
+  ncmpcpp-0.5.5.ebuild:
+  Stable for HPPA (bug #341019).
 
   15 Oct 2010; Brent Baude <ranger@gentoo.org> ncmpcpp-0.5.5.ebuild:
   stable ppc, bug 341019
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.5.4.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.5.4.ebuild
deleted file mode 100644
index b1f5b83a1aa7..000000000000
--- a/media-sound/ncmpcpp/ncmpcpp-0.5.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpcpp/ncmpcpp-0.5.4.ebuild,v 1.6 2010/10/14 18:13:41 jer Exp $
-
-EAPI="2"
-inherit bash-completion eutils
-
-DESCRIPTION="An ncurses mpd client, ncmpc clone with some new features, written in C++"
-HOMEPAGE="http://unkart.ovh.org/ncmpcpp"
-SRC_URI="http://unkart.ovh.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-IUSE="bash-completion clock curl fftw iconv outputs taglib +threads unicode visualizer"
-SLOT="0"
-KEYWORDS="amd64 hppa ~ppc x86"
-
-DEPEND="sys-libs/ncurses[unicode?]
-	>=media-libs/libmpdclient-2.1
-	curl? ( net-misc/curl )
-	visualizer? ( fftw? ( sci-libs/fftw:3.0 ) )
-	iconv? ( virtual/libiconv )
-	taglib? ( media-libs/taglib )"
-RDEPEND="$DEPEND"
-
-src_configure() {
-	local myconf=""
-	if use fftw; then
-		myconf="$(use_with visualizer fftw)"
-		if ! use visualizer; then
-			ewarn "For the fftw USE flag to have any effect, you must also"
-			ewarn "enable the visualizer USE flag."
-		fi
-	else
-		myconf="--without-fftw"
-	fi
-	econf \
-		${myconf} \
-		$(use_enable clock) \
-		$(use_enable outputs) \
-		$(use_enable unicode) \
-		$(use_enable visualizer) \
-		$(use_with curl) \
-		$(use_with iconv) \
-		$(use_with threads) \
-		$(use_with taglib)
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "install failed"
-
-	# use dodoc instead of upstream's doc install which does not compress
-	rm -rf "${D}"/usr/share/doc/${PN}
-	dodoc AUTHORS NEWS doc/config doc/keys || die "dodoc failed"
-
-	dobashcompletion doc/${PN}-completion.bash ${PN}
-}
-
-pkg_postinst() {
-	echo
-	elog "Example configuration files have been installed at"
-	elog "${ROOT}usr/share/doc/${PF}"
-	elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/keys"
-	elog "as user configuration files."
-	echo
-	if use visualizer; then
-	elog "If you want to use the visualizer, you need mpd with fifo enabled."
-	echo
-	fi
-	bash-completion_pkg_postinst
-}
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.5.5.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.5.5.ebuild
index fcf23c191a99..da141b4a5d52 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.5.5.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.5.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpcpp/ncmpcpp-0.5.5.ebuild,v 1.5 2010/10/15 21:36:34 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpcpp/ncmpcpp-0.5.5.ebuild,v 1.6 2010/10/18 02:06:22 jer Exp $
 
 EAPI="2"
 inherit bash-completion eutils
@@ -12,7 +12,7 @@ SRC_URI="http://unkart.ovh.org/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 IUSE="bash-completion clock curl fftw iconv outputs taglib unicode visualizer"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc x86"
+KEYWORDS="amd64 hppa ppc x86"
 
 DEPEND="sys-libs/ncurses[unicode?]
 	>=media-libs/libmpdclient-2.1