Add upstream patch for bug 299463

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 123 insertions, 2 deletions

diff --git a/media-sound/ncmpcpp/ChangeLog b/media-sound/ncmpcpp/ChangeLog
index 0483331b09b3..ddd953712e06 100644
--- a/media-sound/ncmpcpp/ChangeLog
+++ b/media-sound/ncmpcpp/ChangeLog
@@ -1,6 +1,12 @@
 # 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.23 2010/01/02 14:38:55 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpcpp/ChangeLog,v 1.24 2010/01/05 02:50:48 yngwin Exp $
+
+*ncmpcpp-0.5-r1 (05 Jan 2010)
+
+  05 Jan 2010; Ben de Groot <yngwin@gentoo.org> +ncmpcpp-0.5-r1.ebuild,
+  +files/ncmpcpp-0.5-fix-toggle-command.patch:
+  Add upstream patch for bug 299463
 
 *ncmpcpp-0.5 (02 Jan 2010)
 
diff --git a/media-sound/ncmpcpp/Manifest b/media-sound/ncmpcpp/Manifest
index 5b8c1630e247..151e74cf70d2 100644
--- a/media-sound/ncmpcpp/Manifest
+++ b/media-sound/ncmpcpp/Manifest
@@ -1,8 +1,10 @@
+AUX ncmpcpp-0.5-fix-toggle-command.patch 1060 RMD160 9ae436627744a169e72b8861b72a27b3ca3b686b SHA1 83887c78eed5fcada7f817d87bc8209019530273 SHA256 ca5a17f2ae0c41c6be65d62542863d2c4f4ef1e1c4fd163ea84cef041fd7bb82
 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
 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
+EBUILD ncmpcpp-0.5-r1.ebuild 1913 RMD160 49ed319f350dc9a94e530ced72018ef2f83f776c SHA1 6257ccc152cb9052f5a80b573fbb5e4cd88d461d SHA256 2daf4b52ad36b8bea99a9df2a800be7d7f87489b822f2d0e50a9ae622036ab8e
 EBUILD ncmpcpp-0.5.ebuild 1806 RMD160 97d0f2dc4acf9d88d90a3aa9eb89707ca9f28a71 SHA1 57ca317417c2c4ed978e6e37bc39278c75ae255f SHA256 0397b6b176cc178957d9f7d20d649b65d40ab11658a851a48444db28d23e7600
-MISC ChangeLog 3257 RMD160 e53e1e879c730cb1245486e8b8896bdac773da16 SHA1 46405d6ed37bd526ff1de32d1ba5ea183e71e1c2 SHA256 02dca4dd3f901964755c79d2882188762c93281d446698301335e71da5f8b402
+MISC ChangeLog 3444 RMD160 d49b881990160e06449f81205f3f9386f1f694b7 SHA1 f3ec2830c9248cecd7bbcb17ae9a14a5e462db88 SHA256 4bf3b6688edbcf9126899fdc837c99a66dd13ff41bcf04e580794399ae96bf99
 MISC metadata.xml 588 RMD160 c8bc1b30a5d705d28e8d04f31067c10992b7556b SHA1 6f91b99608781ba3a81a52a39a3d6eaaf59c8f1d SHA256 a456e66abd2393ef90f9806e37cb03991bef1c8ba1edf8c2ef5a3b7f12271597
diff --git a/media-sound/ncmpcpp/files/ncmpcpp-0.5-fix-toggle-command.patch b/media-sound/ncmpcpp/files/ncmpcpp-0.5-fix-toggle-command.patch
new file mode 100644
index 000000000000..e614b8161fd0
--- /dev/null
+++ b/media-sound/ncmpcpp/files/ncmpcpp-0.5-fix-toggle-command.patch
@@ -0,0 +1,43 @@
+From 895c9177d538f6e84669c4172c94370d48a03736 Mon Sep 17 00:00:00 2001
+From: Andrzej Rybczak <electricityispower@gmail.com>
+Date: Sun, 3 Jan 2010 16:21:56 +0100
+Subject: [PATCH] fix toggle command
+
+---
+ src/helpers.cpp |    6 ++++++
+ src/mpdpp.cpp   |    2 +-
+ 2 files changed, 7 insertions(+), 1 deletions(-)
+
+diff --git a/src/helpers.cpp b/src/helpers.cpp
+index c1479ef..48c76a0 100644
+--- a/src/helpers.cpp
++++ b/src/helpers.cpp
+@@ -176,6 +176,12 @@ void ParseArgv(int argc, char **argv)
+ 		}
+ 		else if (!strcmp(argv[i], "toggle"))
+ 		{
++			Mpd.UpdateStatus();
++			if (!Mpd.GetErrorMessage().empty())
++			{
++				std::cout << "Error: " << Mpd.GetErrorMessage() << std::endl;
++				exit(1);
++			}
+ 			Mpd.Toggle();
+ 			quit = 1;
+ 		}
+diff --git a/src/mpdpp.cpp b/src/mpdpp.cpp
+index daa062e..2e0ede2 100644
+--- a/src/mpdpp.cpp
++++ b/src/mpdpp.cpp
+@@ -424,7 +424,7 @@ void Connection::Toggle()
+ 		if (isPlaying())
+ 			mpd_send_toggle_pause(itsConnection);
+ 		else
+-			mpd_send_toggle_pause(itsConnection);
++			mpd_send_play(itsConnection);
+ 	}
+ }
+ 
+-- 
+1.6.6
+
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.5-r1.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.5-r1.ebuild
new file mode 100644
index 000000000000..d90b0bdde9b7
--- /dev/null
+++ b/media-sound/ncmpcpp/ncmpcpp-0.5-r1.ebuild
@@ -0,0 +1,70 @@
+# 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-r1.ebuild,v 1.1 2010/01/05 02:50:48 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_prepare() {
+	# upstream patch for bug 299463
+	epatch "${FILESDIR}"/${P}-fix-toggle-command.patch
+}
+
+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
+}