4 files changed, 84 insertions, 2 deletions
diff --git a/media-sound/ncmpc/ChangeLog b/media-sound/ncmpc/ChangeLog
index cb49c9ea877f..ef8535ede669 100644
--- a/media-sound/ncmpc/ChangeLog
+++ b/media-sound/ncmpc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/ncmpc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ChangeLog,v 1.53 2010/07/13 19:02:44 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ChangeLog,v 1.54 2010/08/06 12:15:16 ssuominen Exp $
+
+*ncmpc-0.17 (06 Aug 2010)
+
+  06 Aug 2010; Samuli Suominen <ssuominen@gentoo.org> +ncmpc-0.17.ebuild,
+  +files/ncmpc-0.17-fix-segfault-on-help-screen.patch:
+  Version bump wrt #328519 by Ihar Hrachyshka. Restore USE="lirc" wrt
+  #250015 by Michał Górny.
 
   13 Jul 2010; Kacper Kowalik <xarthisius@gentoo.org>
   ncmpc-0.16.1-r1.ebuild, +files/ncmpc-0.16.1-asneeded.patch:
diff --git a/media-sound/ncmpc/Manifest b/media-sound/ncmpc/Manifest
index e371d3b480eb..5b5b4bd284d3 100644
--- a/media-sound/ncmpc/Manifest
+++ b/media-sound/ncmpc/Manifest
@@ -1,8 +1,11 @@
 AUX ncmpc-0.16.1-asneeded.patch 326 RMD160 87d8015a1e1e8929ec9334485f5ee16c222e3779 SHA1 a64509fd134ff87fe4b2834337765acf19eadf38 SHA256 4cbf856bdc07d0dc2acd21427fc4979d855fc6e226ea789454d27df6d58c682c
 AUX ncmpc-0.16.1-lyrics-backtrace.patch 633 RMD160 18c2062f1ccd82755505c635dc87d0b813167378 SHA1 442f9e2e0955836d212d9d810197c7a786f61ab7 SHA256 8895bd42ba0a4a06eaf4702470497a71127e42b89ce5b7018da36e6224ec5504
+AUX ncmpc-0.17-fix-segfault-on-help-screen.patch 308 RMD160 2e2bf47983298840cb8c8f5a6e9922e86ccce4b2 SHA1 d7bfc1c0ea572e28c8cd95c3929ffa6ff9599be9 SHA256 adf445002a512b5ccdde0725dc2c00d130937be195d8e54a873a45b6730461ca
 DIST ncmpc-0.14.tar.bz2 247783 RMD160 cf687b30bfe8c36c597289c359a8b0ce14923575 SHA1 0a2ea890129cf9cc2929ab93554d4892f7f19e7f SHA256 d04d4798df1c857e9cdbefe146f8827995bf7fe4357fd8cf0421299f7a0cdc87
 DIST ncmpc-0.16.1.tar.bz2 248796 RMD160 288f41723240aa27081cc9af599b609462cd2c02 SHA1 1728d4a3a880d08c356354d2ebaf2a18fdc56016 SHA256 936481e146f90a248c092ad82f166b40af82db6eec56537a64abac75d75ef922
+DIST ncmpc-0.17.tar.bz2 254701 RMD160 370148a52475ac58343886640522b45e1c104336 SHA1 aa5cd5aa71a259db3899bc064b1d848f0b8d14a7 SHA256 f978ccb260c33c7fd42383a93a0f8fc8b42a27d1f2a43a3526753688add30472
 EBUILD ncmpc-0.14.ebuild 1461 RMD160 c36fc34e8a0286207f2d9a6baa066005c7ffafae SHA1 35447b9dabea06e3b26e43636faf112a4fd8c662 SHA256 e596b27b2a23cd096becbf2f369f5648ac33a86291b486713ee359265d001512
 EBUILD ncmpc-0.16.1-r1.ebuild 1663 RMD160 1a91418e92e269852d38a5f296eb75cc07fcc59a SHA1 e7d2eb485555a0840d3051f62227c9e94c88eaa8 SHA256 3d6182f21533364eaf4ddad422ff4edceeea14821eb402b0bf644cdac08e0920
-MISC ChangeLog 6805 RMD160 6bc3c4b4e74b4b2f3bf2c9a5ea8857093e408101 SHA1 42ab8a037de716b71b0a371ef8f310b15513c513 SHA256 c83f604658ee47b5a4ca071354668560a3ab4ff613fc17a86395817ce04e5966
+EBUILD ncmpc-0.17.ebuild 1721 RMD160 8ccafad6f91db43f0cef39e275cc42e6bff50fdf SHA1 c8c357557b9900f5d4bb241bb288d6a0fb4174cb SHA256 7b339d427b3c2a1123f22335846174a228411cad72192a1c8b8b7fd9b2b0a66e
+MISC ChangeLog 7060 RMD160 001dc684f0ef66e3b79d9ef7f274ca341eb81e3a SHA1 78a7784a2c992afb50817409c388f012c2182dc2 SHA256 ebb1499db4173b8a594f8f54583003ac5b1c8acce8e5ade958907f426d8c40e4
 MISC metadata.xml 725 RMD160 40f1ac0d9737e5a38cfd9e4ea77f84327fccf244 SHA1 cc8018bf439e02a861a6fad7127a8318831087f5 SHA256 a9eca18e559d647f099cbb39f05f5c983bf8df7feb7c7f7f0c718d17c923e7f0
diff --git a/media-sound/ncmpc/files/ncmpc-0.17-fix-segfault-on-help-screen.patch b/media-sound/ncmpc/files/ncmpc-0.17-fix-segfault-on-help-screen.patch
new file mode 100644
index 000000000000..0cdf767b1400
--- /dev/null
+++ b/media-sound/ncmpc/files/ncmpc-0.17-fix-segfault-on-help-screen.patch
@@ -0,0 +1,14 @@
+http://bugs.gentoo.org/328519
+
+--- src/screen_help.c
++++ src/screen_help.c
+@@ -105,7 +105,9 @@
+ 	{ 0, CMD_LIST_JUMP, NULL },
+ 	{ 0, CMD_TOGGLE_FIND_WRAP, NULL },
+ 	{ 0, CMD_LOCATE, NULL },
++#ifdef ENABLE_SONG_SCREEN
+ 	{ 0, CMD_SCREEN_SONG, NULL },
++#endif
+ 	{ 0, CMD_NONE, NULL },
+ 	{ 0, CMD_QUIT, NULL },
+ 
diff --git a/media-sound/ncmpc/ncmpc-0.17.ebuild b/media-sound/ncmpc/ncmpc-0.17.ebuild
new file mode 100644
index 000000000000..781586d0816a
--- /dev/null
+++ b/media-sound/ncmpc/ncmpc-0.17.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ncmpc-0.17.ebuild,v 1.1 2010/08/06 12:15:16 ssuominen Exp $
+
+EAPI=3
+inherit eutils multilib
+
+DESCRIPTION="A ncurses client for the Music Player Daemon (MPD)"
+HOMEPAGE="http://mpd.wikia.com/wiki/Client:Ncmpc"
+SRC_URI="http://downloads.sourceforge.net/musicpd/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="artist-screen colors debug +help-screen key-screen lirc lyrics-screen mouse nls search-screen song-screen"
+
+RDEPEND=">=dev-libs/glib-2.12:2
+	>=media-libs/libmpdclient-2
+	sys-libs/ncurses
+	lirc? ( app-misc/lirc )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fix-segfault-on-help-screen.patch
+}
+
+src_configure() {
+	# upstream lirc doesn't have pkg-config file wrt #250015
+	if use lirc; then
+		export LIBLIRCCLIENT_CFLAGS="-I${EPREFIX}/usr/include/lirc"
+		export LIBLIRCCLIENT_LIBS="-llirc_client"
+	fi
+
+	# use_with lyrics-screen is for multilib
+	econf \
+		--docdir=${EPREFIX}/usr/share/doc/${PF} \
+		--disable-dependency-tracking \
+		$(use_enable nls multibyte) \
+		$(use_enable nls locale) \
+		$(use_enable nls) \
+		$(use_enable colors) \
+		$(use_enable lirc) \
+		$(use_enable help-screen) \
+		$(use_enable mouse) \
+		$(use_enable artist-screen) \
+		$(use_enable search-screen) \
+		$(use_enable song-screen) \
+		$(use_enable key-screen) \
+		$(use_enable lyrics-screen) \
+		$(use_enable debug) \
+		$(use_with lyrics-screen lyrics-plugin-dir /usr/$(get_libdir)/ncmpc/lyrics)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS NEWS README doc/*.sample
+}