Version bump wrt #328519 by Ihar Hrachyshka. Restore USE="lirc" wrt #250015 by Michał Górny.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 80 insertions, 1 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/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
+}