Fix building against sys-libs/ncurses[tinfo] (bug #551864).

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 119 insertions, 5 deletions

diff --git a/media-sound/ncmpc/ChangeLog b/media-sound/ncmpc/ChangeLog
index 785cf03843d1..3602d4113496 100644
--- a/media-sound/ncmpc/ChangeLog
+++ b/media-sound/ncmpc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/ncmpc
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ChangeLog,v 1.87 2015/06/12 05:08:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ChangeLog,v 1.88 2015/06/13 06:23:39 jer Exp $
+
+*ncmpc-0.24-r1 (13 Jun 2015)
+
+  13 Jun 2015; Jeroen Roovers <jer@gentoo.org> +ncmpc-0.24-r1.ebuild,
+  +files/ncmpc-0.24-tinfo.patch:
+  Fix building against sys-libs/ncurses[tinfo] (bug #551864).
 
   12 Jun 2015; Jeroen Roovers <jer@gentoo.org> ncmpc-0.24.ebuild:
   Stable for HPPA PPC64 (bug #535502).
diff --git a/media-sound/ncmpc/Manifest b/media-sound/ncmpc/Manifest
index 29b9e643c85d..2078be66f9ed 100644
--- a/media-sound/ncmpc/Manifest
+++ b/media-sound/ncmpc/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX ncmpc-0.24-tinfo.patch 1235 SHA256 f62272ef096a3e32a198d90f11d19ed700a943182b0b05ed6e402b57e8ace9af SHA512 679d70bd3dce9f6e8b02dfa72bd7b55748b9d260bb34df37806e8a40c5032ee583503094ec11e3863126f55f198e15114675acefe22d0ea11a343ba9c9c81daf WHIRLPOOL 1dbc9297d50e95e1d770bb7706862d484e7c34cc451d9a86e37ee13c529347092c1d5005d505623f0b8b7f39252c5005c1d340d23f99c93024bbbbbb1a0a3c10
 DIST ncmpc-0.20.tar.bz2 356991 SHA256 f19b15be4cb94f402bc488463e8159958d1a395b2fea97c02522b848061348e2 SHA512 4072f11d6956313cd63ef22eddedc6eb1919900038af1acf4b9483ac8515d5e112be5180b2a265ca08f2f9c1705d4e2e39282a4bfb543e4015ea923498fe1063 WHIRLPOOL 47f061ea32a91a3493842b51281c8fea1f9c344818bdd86e795e1c242048c0bc37906fca77218857f63980497b316e860a7ad27af0835d7c8a8388e2ef19383a
 DIST ncmpc-0.21.tar.bz2 337229 SHA256 648e846e305c867cb937dcb467393c2f5a30bf460bdf77b63de7af69fba1fd07 SHA512 e6ae3d741e239f48b833b15bd9805fd7bb1d491eb5154a37da2363b9d57ac87fb4744e12bd9bdcd5d3e011190afb8980c20d044a2eaf54e082fc202a192b0ecf WHIRLPOOL 748c3a61eb9bd3817aab42988df484b2862c77673dbdb0fadba7006dc195138085ec48d81284771eeedc98c1362cffe7592ce845528f4d72487c4a142d407bdf
 DIST ncmpc-0.24.tar.xz 298012 SHA256 0e6f76b2b11449cfa479d2830ac681f4e3bff54a95a9134b069dd5a173b4c3e9 SHA512 852bedec9d1e0f13748d00ded8a57b7824a3907fa4aef441cd016c13b3a4229e630957ee965d9f5cf7c1a0c47bfa3bb040058d32c6fcf6b4474acc57f834d929 WHIRLPOOL 56aca88f833e06793113c283272ccfb1170f8cd2c094218863d91a5735a2028ebc9c3e870b416e6a260242b61714fedc3eee2f1e6d4f696e0cfd2402bdb4ab68
 EBUILD ncmpc-0.20.ebuild 1577 SHA256 2d6c6acf086de7287f3edecbc400f5ab128132983171c4f1f47c28f4867c33c0 SHA512 2fea37841ec439869891b3e21622d9dfe4649884edc90a086931a1e46ad5c5f4629958062f7967cccbcee45dc1035a08a4f9fc31325a07ddc1208d273947fdb9 WHIRLPOOL 0edfa1fb9cf08762173046eb5978d47c0f5441c5374026b4be3b0b3c23c58d437df9cc590655928c4f12b3cd4570c847614980c50ede266d4a80acc1672b84d0
 EBUILD ncmpc-0.21.ebuild 1621 SHA256 63809793c2908f564a5c746dc48f79c23b4421488d35d1d783a3fcb8244d5e0e SHA512 19560c3adf7868c65e53ae49a66b18c2a97ba1e372b0d18daa13feb988533546b514416a92ef54298b3ca24febbdd06ea2694e73d21ba0307a20c9560bf47008 WHIRLPOOL f28ab4b26d600554ee622fd3696da819e082c8e2a2f096c1b85c7a76558c8a6478bc16ab5decc6f02febdd8a48cd4e38c34a958238ecedf2988cd857d4ccfdc4
+EBUILD ncmpc-0.24-r1.ebuild 1741 SHA256 86d7723bc8e6e3d6618fcb5d0a96d3caaf59c95a916018b39cd102b894ef73e9 SHA512 3dd83c513032c6acdbe95d290a50861a12af114d6d3e7160268fd6632ab4ec6eddc7b8a645840f468d0ebadcc974a73d51928d2cc405e012798ca530e63c31b6 WHIRLPOOL 8a0d72a333ff508653a2f18ea01947f81805ce73fcf3316d29fd4100d61f69db9e788f9439ff32f036f5fc10af0ace54382887df5a2e546b7cc4371371dc37e4
 EBUILD ncmpc-0.24.ebuild 1641 SHA256 080c6109287fb920b2a0357fe7352d3067737fd7688efa0da88270330b5c4f86 SHA512 5bb5f1cf49543c986fb1ea3f461206c96e416d75fc9e9d17f5ed0571f22ae394fb048cd3dc36bfb35bbd4226a848deab8f3c4c9ed389b05cd4166e3ca3194d79 WHIRLPOOL c35e0b717214e6fc47dc697e7673c1e18759b7c176577086b649a502f3b849c07cfb2d63d7759df9a2db0cea95d502dc5fdd891a65174fb9fe9e4516c7821af5
-MISC ChangeLog 10837 SHA256 497da80b91e4979bf8c3aa8e13b11433222b4a648f593cc56669b384becdb1b3 SHA512 35e7a1b231c3d6f13a5276cebd0b97780a56cbe7f3e89195f93c7d3b2a54e909b393b331b92eb733f4ae2b8fc32a0ade9c517c45ac6f2ee6c1c4074b1848ef72 WHIRLPOOL b14d4c3b7a19c48b300765a80425f7d982b55ab76bbc88e35e1d15c14016b43aab022ae596c7d4863154d9169c085e322306b3657979fe4e7618394837ecd128
+MISC ChangeLog 11033 SHA256 e547c7707e7d56b3f54da2e12d6bf1ac0423a82632868b613122e8af04385bed SHA512 2a6977baee5c5e8dcf2ed8874fd6439a8a1707f73afd5d371d9fca8357ff2f02b3c1f59b13305d2b405be09f15ff823cc6e8bfe3ceac2dfc9c6ae44561613fc8 WHIRLPOOL 144b0b5704360a05147138d13a444ad864bc036d6198865529edb758b4a87ddf51bc0e9446ebe9369f24840a6e96a3a792a2f6d57d924bed4c70377f15b67c3b
 MISC metadata.xml 782 SHA256 da4eb2c23202dfd4a5bfae9acec4166360007d2830e6aa229bcc53ac23ce5da4 SHA512 9171d706cdad2c4f6e10070b737c9578f67791f0d0d4ec0522eff581d1c4d140f9678836bfe29225bb25f07c747e18d152df1caf4f4f6159f267e1fbd9805a8d WHIRLPOOL 5e0cca3fcfaafc8827a76a5cf70b1e192224bce235973fbc6faa3c1cd4d5b06f8aaac25c58b9e1864b1304d2994dad9b9bfdfee2675f196606f0e3f52bc7c4b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlV6aWEACgkQVWmRsqeSphM0/gCggVGr8EMjsDseKAFyr3Y932+T
-u7gAnRDdKbVjfsFvsKb54fsJPG5c4qSR
-=NXk0
+iEYEAREIAAYFAlV7zGwACgkQVWmRsqeSphM3tACbBQArdpUKmO7+T8M/eSqZJ5SP
+f78An1w35FXx30nYoLXr/tKXp2vMP21J
+=VrXR
 -----END PGP SIGNATURE-----
diff --git a/media-sound/ncmpc/files/ncmpc-0.24-tinfo.patch b/media-sound/ncmpc/files/ncmpc-0.24-tinfo.patch
new file mode 100644
index 000000000000..40ee0066e3d3
--- /dev/null
+++ b/media-sound/ncmpc/files/ncmpc-0.24-tinfo.patch
@@ -0,0 +1,48 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -17,11 +17,8 @@
+ dnl Check for programs
+ AC_PROG_CC_C99
+ AC_PROG_INSTALL
+-AX_WITH_CURSES
++PKG_PROG_PKG_CONFIG
+ 
+-AS_IF([ test "x$ax_cv_curses" = xno ],
+-	[AC_MSG_ERROR([No curses support detected.])
+-	])
+ 
+ dnl =======================================================
+ dnl initialize variables
+@@ -83,6 +80,19 @@
+ esac
+ AM_CONDITIONAL([HAVE_WINDOWS], [test $HAVE_WINDOWS -eq 1])
+ 
++dnl ncurses
++
++PKG_CHECK_MODULES([ncurses], [ncurses],[
++	LIBS="$LIBS $ncurses_LIBS"
++	ax_cv_curses_color=yes
++	ax_cv_curses_mouse=yes
++	ax_cv_curses_enhanced=yes
++	AC_DEFINE([HAVE_NCURSES_H], [1], [Define to 1 if the Ncurses library is present])
++	AC_SUBST([CURSES_LIB],[$ncurses_LIBS])
++	],
++	[AC_MSG_ERROR([No curses support detected.])])
++
++
+ dnl multi-byte character support
+ 
+ AC_ARG_ENABLE([multibyte],
+@@ -207,12 +217,6 @@
+ 
+ dnl Optional - curses getmouse support
+ 
+-dnl AC_CHECK_LIB depends on being able to prepend a '-l', remove the '-l' from CURSES_LIB first
+-AC_CHECK_LIB([$(expr substr $CURSES_LIB 3 99)],
+-		[getmouse],
+-		[ax_cv_curses_mouse=yes],
+-		[ax_cv_curses_mouse=no])
+-
+ AC_ARG_ENABLE([mouse], 
+ 	AS_HELP_STRING([--enable-mouse],
+ 		[Enable curses getmouse support @<:@default=yes@:>@]),
diff --git a/media-sound/ncmpc/ncmpc-0.24-r1.ebuild b/media-sound/ncmpc/ncmpc-0.24-r1.ebuild
new file mode 100644
index 000000000000..2fd65da57da2
--- /dev/null
+++ b/media-sound/ncmpc/ncmpc-0.24-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ncmpc-0.24-r1.ebuild,v 1.1 2015/06/13 06:23:39 jer Exp $
+
+EAPI=5
+inherit autotools eutils multilib
+
+DESCRIPTION="A ncurses client for the Music Player Daemon (MPD)"
+HOMEPAGE="http://www.musicpd.org/clients/ncmpc/"
+SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="artist-screen chat-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.3
+	sys-libs/ncurses
+	lirc? ( app-misc/lirc )
+	nls? ( sys-libs/ncurses[unicode] )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README doc/config.sample doc/keys.sample )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.24-tinfo.patch
+	eautoreconf
+}
+
+src_configure() {
+	# upstream lirc doesn't have pkg-config file wrt #250015
+	if use lirc; then
+		export LIBLIRCCLIENT_CFLAGS="-I/usr/include/lirc"
+		export LIBLIRCCLIENT_LIBS="-llirc_client"
+	fi
+
+	# use_with lyrics-screen is for multilib
+	econf \
+		--docdir=/usr/share/doc/${PF} \
+		$(use_enable artist-screen) \
+		$(use_enable chat-screen) \
+		$(use_enable colors) \
+		$(use_enable debug) \
+		$(use_enable help-screen) \
+		$(use_enable key-screen) \
+		$(use_enable lirc) \
+		$(use_enable lyrics-screen) \
+		$(use_enable mouse) \
+		$(use_enable nls locale) \
+		$(use_enable nls multibyte) \
+		$(use_enable nls) \
+		$(use_enable search-screen) \
+		$(use_enable song-screen) \
+		$(use_with lyrics-screen lyrics-plugin-dir /usr/$(get_libdir)/ncmpc/lyrics)
+}