Version bump. Add new dependency on libmpdclient. Force USE=visualizer on

  for USE=fftw. Use dodoc to install documentation. Fixes bug 299283.
  Remove obsolete versions.
Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

5 files changed, 78 insertions, 101 deletions

diff --git a/media-sound/ncmpcpp/ChangeLog b/media-sound/ncmpcpp/ChangeLog
index d54b27237db8..0483331b09b3 100644
--- a/media-sound/ncmpcpp/ChangeLog
+++ b/media-sound/ncmpcpp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/ncmpcpp
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpcpp/ChangeLog,v 1.22 2009/10/21 12:21:07 maekke Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpcpp/ChangeLog,v 1.23 2010/01/02 14:38:55 yngwin Exp $
+
+*ncmpcpp-0.5 (02 Jan 2010)
+
+  02 Jan 2010; Ben de Groot <yngwin@gentoo.org> -ncmpcpp-0.3.2.ebuild,
+  -ncmpcpp-0.3.4.ebuild, +ncmpcpp-0.5.ebuild:
+  Version bump. Add new dependency on libmpdclient. Force USE=visualizer on
+  for USE=fftw. Use dodoc to install documentation. Fixes bug 299283.
+  Remove obsolete versions.
 
   21 Oct 2009; Markus Meier <maekke@gentoo.org> ncmpcpp-0.3.5.ebuild:
   x86 stable, bug #285872
diff --git a/media-sound/ncmpcpp/Manifest b/media-sound/ncmpcpp/Manifest
index 297dcf4fd9bd..5b8c1630e247 100644
--- a/media-sound/ncmpcpp/Manifest
+++ b/media-sound/ncmpcpp/Manifest
@@ -1,20 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST ncmpcpp-0.3.2.tar.bz2 323371 RMD160 7321be3f0f9cd2274ff4130d0774685ea866f160 SHA1 f5e2f7379533aed722eb9d4c976e41b754aaa108 SHA256 332a44835c399cca09254e1dd2fbd5342733a7b92d56379506d039fbbc4b40ae
-DIST ncmpcpp-0.3.4.tar.bz2 328423 RMD160 93ac13965bba1a7b20d60f6ca314f67eec76dba9 SHA1 055041dac5dd3f1bd1771892827c545ed6020768 SHA256 1c15f36871e506bf821f7a0eb0b85b2fe59e19fb23ec68cf1b98919baa055df0
 DIST ncmpcpp-0.3.5.tar.bz2 333424 RMD160 d07bca2f52c5c38619662a836840eab5924e74f8 SHA1 7c483e66ffa24826b8b6c081e1155286b5e4b421 SHA256 874b146c53d35f0584fb0a923f1aa99d0f0c87b6771df96a0600ca1c690edf79
 DIST ncmpcpp-0.4.1.tar.bz2 349814 RMD160 4126d242f40a33520562516e4391b83682d384cf SHA1 496c683147f103f90daf7e6590a0c5e2e2bfb21e SHA256 51f023521edaa7c4fa719a6d1f0d2f44e71e983b361152f20d01a422babc65a3
-EBUILD ncmpcpp-0.3.2.ebuild 1195 RMD160 f135b46cb1a515b1134fe047d086f769821051d7 SHA1 26c7e413db60c13880ad7e67d142545379402f68 SHA256 acd13d34203b183c88ac0b3f0d268f7ad8cb6c3f541a6c3c743518d2851c37ac
-EBUILD ncmpcpp-0.3.4.ebuild 1216 RMD160 de139d20971b81292bd48ebdf30e346d0bf48da5 SHA1 a9d7726b40f98043c204cd5f6b59e3ff1431377b SHA256 5ba0f47a3aced4061e1a295bcc26508db15199278a2b6e12bfb0cb06ef59a1e4
+DIST ncmpcpp-0.5.tar.bz2 340041 RMD160 b4f1f22f78a39a77c325cb9f7f46fb5d5b9e7bf0 SHA1 89020ec50921ab22b7ee10e4e4320a5fd87b0a35 SHA256 4271cd477cc26038a3f6526a97bcf8b6a8785d08a2828a3ec2a18e1e4f197cae
 EBUILD ncmpcpp-0.3.5.ebuild 1191 RMD160 c3a6ce33d91fe552e4ab6b9e8892ddf1aeda45ef SHA1 9a8206ba606b42a88d5b47d09a6198eb333aa663 SHA256 b3bb786c78cd01979e39cd8e24fbdf49a0066b2bb65dab2e1a19099a0b94b104
 EBUILD ncmpcpp-0.4.1.ebuild 1395 RMD160 e6337fdfad4cdddffef173523a9479a7126712ae SHA1 72e17493b24f9238cb561cd267fa98fb3b51a7a5 SHA256 78fb692709fd0b5d7a737e92e22b402485eeda6d43ce47f7e2b30c2e381beca5
-MISC ChangeLog 2937 RMD160 112f2466ed0cb7a79ccf307b7e422e2896d1fec4 SHA1 2412b1f32f5d53c21c31e420753ff9b77e3f3ad4 SHA256 6bba0970b7741cc646e6011d11b7036dea517614015584835dec7b4fb8517a18
+EBUILD ncmpcpp-0.5.ebuild 1806 RMD160 97d0f2dc4acf9d88d90a3aa9eb89707ca9f28a71 SHA1 57ca317417c2c4ed978e6e37bc39278c75ae255f SHA256 0397b6b176cc178957d9f7d20d649b65d40ab11658a851a48444db28d23e7600
+MISC ChangeLog 3257 RMD160 e53e1e879c730cb1245486e8b8896bdac773da16 SHA1 46405d6ed37bd526ff1de32d1ba5ea183e71e1c2 SHA256 02dca4dd3f901964755c79d2882188762c93281d446698301335e71da5f8b402
 MISC metadata.xml 588 RMD160 c8bc1b30a5d705d28e8d04f31067c10992b7556b SHA1 6f91b99608781ba3a81a52a39a3d6eaaf59c8f1d SHA256 a456e66abd2393ef90f9806e37cb03991bef1c8ba1edf8c2ef5a3b7f12271597
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkre/MwACgkQkKaRLQcq0GIfFQCfVQjravd37ps1mB2AA4gAIZYb
-GAQAoIY4tqG6mICO1QDgyoRNzhhXQ/V1
-=QBk7
------END PGP SIGNATURE-----
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.3.2.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.3.2.ebuild
deleted file mode 100644
index de603a6bc247..000000000000
--- a/media-sound/ncmpcpp/ncmpcpp-0.3.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpcpp/ncmpcpp-0.3.2.ebuild,v 1.2 2009/05/03 15:04:59 maekke Exp $
-
-EAPI="2"
-inherit 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="clock curl taglib unicode"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="sys-libs/ncurses[unicode?]
-	curl? ( net-misc/curl )
-	taglib? ( media-libs/taglib )"
-RDEPEND="$DEPEND"
-
-src_configure() {
-	econf $(use_enable unicode) $(use_enable clock) \
-		$(use_with curl) $(use_with taglib)
-}
-
-src_install() {
-	emake install DESTDIR="${D}" docdir="/usr/share/doc/${PF}" \
-		|| die "install failed"
-	prepalldocs
-}
-
-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
-	elog "This version of ncmpcpp uses features from mpd-0.14, so"
-	elog "we recommend you use this with >=mpd-0.14_alpha1."
-	echo
-}
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.3.4.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.3.4.ebuild
deleted file mode 100644
index e96db06e031f..000000000000
--- a/media-sound/ncmpcpp/ncmpcpp-0.3.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpcpp/ncmpcpp-0.3.4.ebuild,v 1.1 2009/05/19 22:07:06 yngwin Exp $
-
-EAPI="2"
-inherit 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="clock curl taglib unicode"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="sys-libs/ncurses[unicode?]
-	curl? ( net-misc/curl )
-	taglib? ( media-libs/taglib )"
-RDEPEND="$DEPEND"
-
-src_configure() {
-	econf $(use_enable unicode) $(use_enable clock) \
-		$(use_with curl) $(use_with taglib)
-}
-
-src_install() {
-	emake install DESTDIR="${D}" docdir="/usr/share/doc/${PF}" \
-		|| die "install failed"
-	prepalldocs
-}
-
-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
-	elog "This version of ncmpcpp uses features from mpd-0.14, and optionally"
-	elog "from 0.15, so we recommend you use this with >=mpd-0.14."
-	echo
-}
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.5.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.5.ebuild
new file mode 100644
index 000000000000..5a8a68dccdde
--- /dev/null
+++ b/media-sound/ncmpcpp/ncmpcpp-0.5.ebuild
@@ -0,0 +1,65 @@
+# 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.ebuild,v 1.1 2010/01/02 14:38:55 yngwin 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 ~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"
+
+pkg_setup() {
+	if ( use fftw && ! use visualizer ); then
+		die "USE=fftw requires USE=visualizer enabled"
+	fi
+}
+
+src_configure() {
+	econf $(use_enable clock) \
+		$(use_enable outputs) \
+		$(use_enable unicode) \
+		$(use_enable visualizer) \
+		$(use_with curl) \
+		$(use_with fftw) \
+		$(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
+}