Only apply patch to use libncursesw for wide chars if ncurses has been built with unicode support. Bug #155177, suggested by Mathias Gumz <akira at fluxbox.org>.

Package-Manager: portage-2.1.2.3

5 files changed, 34 insertions, 27 deletions

diff --git a/media-sound/ncmpc/ChangeLog b/media-sound/ncmpc/ChangeLog
index 893ad1fc33e2..3f3c1e227fc3 100644
--- a/media-sound/ncmpc/ChangeLog
+++ b/media-sound/ncmpc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/ncmpc
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ChangeLog,v 1.23 2007/03/28 21:51:34 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ChangeLog,v 1.24 2007/04/04 07:45:49 ticho Exp $
+
+  04 Apr 2007; Andrej Kacian <ticho@gentoo.org> ncmpc-0.11.1-r2.ebuild:
+  Only apply patch to use libncursesw for wide chars if ncurses has been built
+  with unicode support. Bug #155177, suggested by Mathias Gumz <akira at
+  fluxbox.org>.
 
 *ncmpc-0.11.1-r2 (28 Mar 2007)
 
diff --git a/media-sound/ncmpc/Manifest b/media-sound/ncmpc/Manifest
index 54eb0607a105..77ea53b84f7c 100644
--- a/media-sound/ncmpc/Manifest
+++ b/media-sound/ncmpc/Manifest
@@ -7,26 +7,26 @@ RMD160 60a94e9a011f826377ffa059fc91db1d27621688 files/0.11.1-widechars.patch 662
 SHA256 a8653a43e374954001321341e077663c78f9677bda40f8e1d10b7077c75ed830 files/0.11.1-widechars.patch 6626
 DIST ncmpc-0.11.0.tar.gz 242626 RMD160 4329e5cab6081df5c5179217f456182f6425d356 SHA1 5adab98537fdcd88a2296b4ef738614be81d0e83 SHA256 6a45305578e6db3013c269bc079adbbefe9eedd1a617060cdc640d1741b4e4ef
 DIST ncmpc-0.11.1.tar.gz 273489 RMD160 a47e2850f165306e95c0966ac9e862e75cf876f7 SHA1 f1998f1d245386eb103ae12c50cf1bf0f5985ed7 SHA256 aa0a6162e8543e01304f7dc2f6b227babebda9f2430664e6deae0277444cb817
-EBUILD ncmpc-0.11.0.ebuild 666 RMD160 55a5d608d9d16fbf2c709d0a20f07d493ecc407d SHA1 a49357e545fdc6d979a00d5d58a669501eb69e28 SHA256 6bcebc614eeddf7aa68577faffb896f9e2ec7b6fcf1d1b7d201d042e7dae1d82
-MD5 b9b8c3cf7a56d387251214e233596aa6 ncmpc-0.11.0.ebuild 666
-RMD160 55a5d608d9d16fbf2c709d0a20f07d493ecc407d ncmpc-0.11.0.ebuild 666
-SHA256 6bcebc614eeddf7aa68577faffb896f9e2ec7b6fcf1d1b7d201d042e7dae1d82 ncmpc-0.11.0.ebuild 666
+EBUILD ncmpc-0.11.0.ebuild 666 RMD160 05a220a5bc3979112ddc4c4a0bf06f57f998443d SHA1 d11097454fda6c0d87f7dd4cecacfbef3a0e4fec SHA256 c2dacf424cbdb07a8bbaea06ea61e9cdf492ecd2ab898dea0993985dd7f7d195
+MD5 75eadd3269b0350b9d304bd00537a5f2 ncmpc-0.11.0.ebuild 666
+RMD160 05a220a5bc3979112ddc4c4a0bf06f57f998443d ncmpc-0.11.0.ebuild 666
+SHA256 c2dacf424cbdb07a8bbaea06ea61e9cdf492ecd2ab898dea0993985dd7f7d195 ncmpc-0.11.0.ebuild 666
 EBUILD ncmpc-0.11.1-r1.ebuild 1150 RMD160 46b3f08cc6fff8d0856e7b898404247458571b2d SHA1 62b71e67de38b92f5e593b31e02364cea2f4b8e0 SHA256 6bd92f6f70d29ca38a5507bef303e2e088a393710223a87bba2437027204e7b6
 MD5 2274260baa2ceae8d1f6cd4e2a22959c ncmpc-0.11.1-r1.ebuild 1150
 RMD160 46b3f08cc6fff8d0856e7b898404247458571b2d ncmpc-0.11.1-r1.ebuild 1150
 SHA256 6bd92f6f70d29ca38a5507bef303e2e088a393710223a87bba2437027204e7b6 ncmpc-0.11.1-r1.ebuild 1150
-EBUILD ncmpc-0.11.1-r2.ebuild 1279 RMD160 0ff375598e01d6c597de7daf56a10e1610f72421 SHA1 3d42d6efb7c8989797ba61a18aeccb0fc54e2c09 SHA256 440f47d3b7c1d2a2edb2da7efea778cd2fbbd6aefca7b11d8826415fb13c99c0
-MD5 ddfc2593fdde03dcbc789f59a43d0608 ncmpc-0.11.1-r2.ebuild 1279
-RMD160 0ff375598e01d6c597de7daf56a10e1610f72421 ncmpc-0.11.1-r2.ebuild 1279
-SHA256 440f47d3b7c1d2a2edb2da7efea778cd2fbbd6aefca7b11d8826415fb13c99c0 ncmpc-0.11.1-r2.ebuild 1279
-EBUILD ncmpc-0.11.1.ebuild 720 RMD160 7376561033978b690b18b584bb2ab86415e75c13 SHA1 af642d2f7c813fadb18516b296c390f622d72185 SHA256 d38c88a440270107a8a1f3703d29543c60de61b9a2891db02f4bd113ce224c56
-MD5 1963e47df79320fefec44c4c67b20f2b ncmpc-0.11.1.ebuild 720
-RMD160 7376561033978b690b18b584bb2ab86415e75c13 ncmpc-0.11.1.ebuild 720
-SHA256 d38c88a440270107a8a1f3703d29543c60de61b9a2891db02f4bd113ce224c56 ncmpc-0.11.1.ebuild 720
-MISC ChangeLog 2980 RMD160 05d2ae4fc9f98a3cd3446ae395c88c1642312faf SHA1 924d26c281d6ebb671078f73118437c2ee8e1563 SHA256 f154f227f67fd6e56f22ab7a6675e3e6913a95a456fe5614d0739373b609a551
-MD5 3a28f27bcaf8a969860bfee3b7c90f7e ChangeLog 2980
-RMD160 05d2ae4fc9f98a3cd3446ae395c88c1642312faf ChangeLog 2980
-SHA256 f154f227f67fd6e56f22ab7a6675e3e6913a95a456fe5614d0739373b609a551 ChangeLog 2980
+EBUILD ncmpc-0.11.1-r2.ebuild 1336 RMD160 9059f9e863f51ce71014fa9f68bb45a5a6940c2a SHA1 6577efa7542545ab2fee3383611a24832b37ea0a SHA256 303252d9b02007e4b27c0ea9b7b0863251d1bd517a72157ead6799c659131eaa
+MD5 83aa79519922cf20393f40b8a9222f75 ncmpc-0.11.1-r2.ebuild 1336
+RMD160 9059f9e863f51ce71014fa9f68bb45a5a6940c2a ncmpc-0.11.1-r2.ebuild 1336
+SHA256 303252d9b02007e4b27c0ea9b7b0863251d1bd517a72157ead6799c659131eaa ncmpc-0.11.1-r2.ebuild 1336
+EBUILD ncmpc-0.11.1.ebuild 720 RMD160 5602ed526b69bf77bc0ce33c542a7ba396d060d9 SHA1 eb0ec73363b4f6ad1c86639aa5df54fbc9ff617b SHA256 8f926224bbad5f91f65fcd44710ffa84d8dd957d03760309ab8fa32e2ba6ca9d
+MD5 da6e74ba57aa7729b6fcea86c3e08569 ncmpc-0.11.1.ebuild 720
+RMD160 5602ed526b69bf77bc0ce33c542a7ba396d060d9 ncmpc-0.11.1.ebuild 720
+SHA256 8f926224bbad5f91f65fcd44710ffa84d8dd957d03760309ab8fa32e2ba6ca9d ncmpc-0.11.1.ebuild 720
+MISC ChangeLog 3221 RMD160 3b8a21cc02517f1bad321e9ae006293c8f5ff6b6 SHA1 5d1479b95b5046ef8a5b7044b1fad3dee3cc12fb SHA256 8c79ce11aeb500f60652c424328badb3bf9f34269a9402254184997f49d9beda
+MD5 7ae84adea0159501de20764bcd254ebf ChangeLog 3221
+RMD160 3b8a21cc02517f1bad321e9ae006293c8f5ff6b6 ChangeLog 3221
+SHA256 8c79ce11aeb500f60652c424328badb3bf9f34269a9402254184997f49d9beda ChangeLog 3221
 MISC metadata.xml 246 RMD160 071447743a333f649becb31b0dc1099e3b9899d8 SHA1 6fa188edafe93d99fded82b0a2473284febf05d2 SHA256 1f0eb72a1ad524a8416cd9925d0ea348dc142b3e02fe2b5acefba3a7866f714c
 MD5 3a05fb17d7dc8a018b36f13aea905095 metadata.xml 246
 RMD160 071447743a333f649becb31b0dc1099e3b9899d8 metadata.xml 246
@@ -46,7 +46,7 @@ SHA256 d282248fc4afcef832c0efbfbb69f723eef48c3abb7081802ad20f7473771bf9 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGCuNsQlM6RnzZP+IRAp0NAKCLwDZ3zStCd84+VAKR3Re2jGpO6gCfSNTt
-sIeFlV5Wm4GN48Gb4GqleLU=
-=BSnr
+iD8DBQFGE1e0QlM6RnzZP+IRAj6DAKClk0vqw0T+D6JcZvXy4CQbj+G0lACgmIsj
+YNA8WV71uADgykCglqBmyCo=
+=w3re
 -----END PGP SIGNATURE-----
diff --git a/media-sound/ncmpc/ncmpc-0.11.0.ebuild b/media-sound/ncmpc/ncmpc-0.11.0.ebuild
index c8648a8df126..caf6459a3118 100644
--- a/media-sound/ncmpc/ncmpc-0.11.0.ebuild
+++ b/media-sound/ncmpc/ncmpc-0.11.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ncmpc-0.11.0.ebuild,v 1.7 2006/10/29 22:49:09 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ncmpc-0.11.0.ebuild,v 1.8 2007/04/04 07:45:49 ticho Exp $
 
 IUSE=""
 
diff --git a/media-sound/ncmpc/ncmpc-0.11.1-r2.ebuild b/media-sound/ncmpc/ncmpc-0.11.1-r2.ebuild
index ef2df3b711ba..cf9b29a81fff 100644
--- a/media-sound/ncmpc/ncmpc-0.11.1-r2.ebuild
+++ b/media-sound/ncmpc/ncmpc-0.11.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ncmpc-0.11.1-r2.ebuild,v 1.1 2007/03/28 21:51:34 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ncmpc-0.11.1-r2.ebuild,v 1.2 2007/04/04 07:45:49 ticho Exp $
 
 inherit eutils autotools
 
@@ -26,8 +26,10 @@ pkg_setup() {
 src_unpack() {
 	unpack "${A}"
 	cd "${S}"
-	epatch "${FILESDIR}"/${PV}-widechars.patch
-	eautoreconf
+	if built_with_use sys-libs/ncurses unicode ; then
+		epatch "${FILESDIR}"/${PV}-widechars.patch
+		eautoreconf
+	fi
 }
 
 src_compile() {
diff --git a/media-sound/ncmpc/ncmpc-0.11.1.ebuild b/media-sound/ncmpc/ncmpc-0.11.1.ebuild
index 5e9751eb1d1b..dd1dbbf87dbb 100644
--- a/media-sound/ncmpc/ncmpc-0.11.1.ebuild
+++ b/media-sound/ncmpc/ncmpc-0.11.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ncmpc-0.11.1.ebuild,v 1.7 2006/10/29 22:49:09 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ncmpc-0.11.1.ebuild,v 1.8 2007/04/04 07:45:49 ticho Exp $
 
 IUSE=""