From 246d01fbe67d4342ccfda51f3aed6d4816b24db2 Mon Sep 17 00:00:00 2001
From: Christoph Mende <mende.christoph@gmail.com>
Date: Thu, 19 Jul 2012 16:03:46 +0200
Subject: [PATCH] ncmpc: Sync with gentoo

(Portage version: 2.2.0_alpha120/git/Linux x86_64, signed Manifest commit with key 84F20B43)
---
 media-sound/ncmpc/Manifest          | 14 ++++++++++--
 media-sound/ncmpc/metadata.xml      |  2 --
 media-sound/ncmpc/ncmpc-9999.ebuild | 45 +++++++++++++++++--------------------
 3 files changed, 32 insertions(+), 29 deletions(-)
 rewrite media-sound/ncmpc/Manifest (100%)

diff --git a/media-sound/ncmpc/Manifest b/media-sound/ncmpc/Manifest
dissimilarity index 100%
index 54f4d61..778ecab 100644
--- a/media-sound/ncmpc/Manifest
+++ b/media-sound/ncmpc/Manifest
@@ -1,2 +1,12 @@
-EBUILD ncmpc-9999.ebuild 1456 RMD160 33056e3bc537ee9ffd1fa616ee73e9eccb91a3f4 SHA1 1467af3469fdab6a8ce19446e2c0c5d457695cf8 SHA256 c8f3d02167acce831a1d713901a601075d356716f00a1f6e702ec293036a860c
-MISC metadata.xml 841 RMD160 2427230854f9022223df3b8029f69256d3355214 SHA1 549e587d1eb5a69562e3d0501fd4c3eedecf70ff SHA256 8ae9ec284b12c65ab91fc55984bf416e0f2fc4f8ca50e508de92cca57cbde656
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+EBUILD ncmpc-9999.ebuild 1485 SHA256 45bcc31dd29a09d82be3491f342dd96f318a9cfe0df96d8ce99b9b4007038b94 SHA512 349c5c625702c4b531084cf248389a8b0d5ac168657f8a3dbe98bdce458d267583ebc336ee46093d6bc34e6e324728d5a2704d212fa71c8f17b814606094ace4 WHIRLPOOL 2836438f686238670b318f426d44dba0fca46ae455622ce5e4c9cfed717b97f6657979406bb263ba1a0abe01d3f41bad52ff5493152771e431edacfb59116157
+MISC metadata.xml 722 SHA256 f7db67224439f7afa042d042f2930c820cab441a30a7f5367c2dd5727f69df8e SHA512 a15a7aeeb0cc041b15048e8690cffb5d784e68294bec5fbcea644b88a7a0b6190899c112bb17ce7fb92503d3b7423214090f9df49e52afb61c67267067a10ea0 WHIRLPOOL 815db470063eddfd1d047be53d17f6ddd687b026570a4bb85a9a591c5560a20716d2e4cd979d8d3d76f1c49ffc345879926d17132dbd0b7d87e3172e397a63a6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlAIE8IACgkQmWq1bYTyC0MiLgEAjQE8UGv5sifh5mSsBEuqSxs+
+TfnzxHWmEzFfqK8kb30BALDN8PHa+I0+wsiehXknmXGpuUB+fM/YYa3LGbimDGA8
+=ofVE
+-----END PGP SIGNATURE-----
diff --git a/media-sound/ncmpc/metadata.xml b/media-sound/ncmpc/metadata.xml
index 413b80d..1071db3 100644
--- a/media-sound/ncmpc/metadata.xml
+++ b/media-sound/ncmpc/metadata.xml
@@ -13,9 +13,7 @@
 		<flag name="key-screen">Enable key editor screen</flag>
 		<flag name="lyrics-screen">Enable lyrics screen</flag>
 		<flag name="mouse">Enable curses getmouse support</flag>
-		<flag name="outputs-screen">Enable output screen</flag>
 		<flag name="search-screen">Enable search screen</flag>
 		<flag name="song-screen">Enable song viewer screen</flag>
-		<flag name="wcwidth">Enable wide char width support</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-sound/ncmpc/ncmpc-9999.ebuild b/media-sound/ncmpc/ncmpc-9999.ebuild
index a529219..13e2f9e 100644
--- a/media-sound/ncmpc/ncmpc-9999.ebuild
+++ b/media-sound/ncmpc/ncmpc-9999.ebuild
@@ -1,37 +1,40 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=4
-
-inherit git-2 autotools
+inherit autotools multilib git-2
 
 DESCRIPTION="A ncurses client for the Music Player Daemon (MPD)"
 HOMEPAGE="http://mpd.wikia.com/wiki/Client:Ncmpc"
-LICENSE="GPL-2"
 EGIT_REPO_URI="git://git.musicpd.org/cirrus/ncmpc.git"
+EGIT_BOOTSTRAP="eautoreconf"
 
-KEYWORDS=""
+LICENSE="GPL-2"
 SLOT="0"
-IUSE="artist-screen +colors debug +help-screen key-screen lirc lyrics-screen mouse nls minimal outputs-screen search-screen song-screen +wcwidth"
+KEYWORDS=""
+IUSE="artist-screen colors debug +help-screen key-screen lirc lyrics-screen mouse nls search-screen song-screen"
 
-RDEPEND=">=dev-libs/glib-2.4
-	dev-libs/popt
-	=media-libs/libmpdclient-9999
+RDEPEND=">=dev-libs/glib-2.12:2
+	~media-libs/libmpdclient-9999
 	sys-libs/ncurses
-	lirc? ( app-misc/lirc )"
+	lirc? ( app-misc/lirc )
+	nls? ( sys-libs/ncurses[unicode] )"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+	virtual/pkgconfig"
 
-src_prepare() {
-	eautoreconf
-	glib-gettextize --force --copy
-}
+DOCS=( AUTHORS NEWS README doc/config.sample doc/keys.sample )
 
 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} \
-		--disable-dependency-tracking \
 		$(use_enable nls multibyte) \
 		$(use_enable nls locale) \
 		$(use_enable nls) \
@@ -41,17 +44,9 @@ src_configure() {
 		$(use_enable mouse) \
 		$(use_enable artist-screen) \
 		$(use_enable search-screen) \
-		$(use_enable sond-screen) \
+		$(use_enable song-screen) \
 		$(use_enable key-screen) \
 		$(use_enable lyrics-screen) \
-		$(use_enable outputs-screen) \
-		$(use_enable minimal mini) \
 		$(use_enable debug) \
-		$(use_enable wcwidth wide) \
 		$(use_with lyrics-screen lyrics-plugin-dir /usr/$(get_libdir)/ncmpc/lyrics)
 }
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS NEWS README doc/*.sample
-}
-- 
2.11.4.GIT