Fixing build with --as-needed wrt bug 327865. Thanks to Diego for reporting. Dropped ~x86-fbsd

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 37 insertions, 11 deletions

diff --git a/media-sound/ncmpc/ChangeLog b/media-sound/ncmpc/ChangeLog
index 3d509f0e30b8..cb49c9ea877f 100644
--- a/media-sound/ncmpc/ChangeLog
+++ b/media-sound/ncmpc/ChangeLog
@@ -1,6 +1,11 @@
 # 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.52 2010/06/03 19:09:26 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ChangeLog,v 1.53 2010/07/13 19:02:44 xarthisius Exp $
+
+  13 Jul 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  ncmpc-0.16.1-r1.ebuild, +files/ncmpc-0.16.1-asneeded.patch:
+  Fixing build with --as-needed wrt bug 327865. Thanks to Diego for
+  reporting. Dropped ~x86-fbsd as media-libs/libmpdclient is not keyworded
 
 *ncmpc-0.16.1-r1 (03 Jun 2010)
 
diff --git a/media-sound/ncmpc/Manifest b/media-sound/ncmpc/Manifest
index aa3fb9ea2a74..2747debc29d2 100644
--- a/media-sound/ncmpc/Manifest
+++ b/media-sound/ncmpc/Manifest
@@ -1,19 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
+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
 DIST ncmpc-0.13.tar.bz2 209561 RMD160 535e643d89615d4dddbd5ab56a9ef5c11bc1ceb4 SHA1 b7a16751612bcec57f134848a4630352f2fc1cfe SHA256 0aab2394039277c19447ea7f9b767e4f670a31b99d5ea3095e8b29d12b44f346
 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
 EBUILD ncmpc-0.13.ebuild 1383 RMD160 625f627a00fa2ffb8f712c1722b2815f2502e442 SHA1 de5967f0dafdbe803065de7dd9c902279d11bec8 SHA256 f270c8b15108f890f80fe7bb40a7189cd1440fbebba7f0851ae6d76993376062
 EBUILD ncmpc-0.14.ebuild 1461 RMD160 c36fc34e8a0286207f2d9a6baa066005c7ffafae SHA1 35447b9dabea06e3b26e43636faf112a4fd8c662 SHA256 e596b27b2a23cd096becbf2f369f5648ac33a86291b486713ee359265d001512
-EBUILD ncmpc-0.16.1-r1.ebuild 1575 RMD160 9ebe67719ace1128a8c192f2aa04bc3fca5fd54c SHA1 8d096efb005aebcb445ac6cc4db79f63b617d4ea SHA256 253171fc4fa9f68c191668426fededcc0d163cdbd594d0c3d2926eacd7601e6b
-MISC ChangeLog 6542 RMD160 4ed2a9ea1060f8a181ef21897cef488fa9f23470 SHA1 6d00261a7f5bc5479ff9a22a4cca83cc4fd482d3 SHA256 daa1b551a43d22bc65893113228f42bc9f11a953c48228220e7a63e9a8e1c67e
+EBUILD ncmpc-0.16.1-r1.ebuild 1663 RMD160 1a91418e92e269852d38a5f296eb75cc07fcc59a SHA1 e7d2eb485555a0840d3051f62227c9e94c88eaa8 SHA256 3d6182f21533364eaf4ddad422ff4edceeea14821eb402b0bf644cdac08e0920
+MISC ChangeLog 6805 RMD160 6bc3c4b4e74b4b2f3bf2c9a5ea8857093e408101 SHA1 42ab8a037de716b71b0a371ef8f310b15513c513 SHA256 c83f604658ee47b5a4ca071354668560a3ab4ff613fc17a86395817ce04e5966
 MISC metadata.xml 725 RMD160 40f1ac0d9737e5a38cfd9e4ea77f84327fccf244 SHA1 cc8018bf439e02a861a6fad7127a8318831087f5 SHA256 a9eca18e559d647f099cbb39f05f5c983bf8df7feb7c7f7f0c718d17c923e7f0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iF4EAREIAAYFAkwH/fkACgkQmWq1bYTyC0MLpQEApOvdTYL+k/CUyNYS4kvdhRao
-GfsVt6DdeYmo0vNBg6QBAIU18kbBAF1XZK0fabIETXSMSIiXpPDtdnP1av1urHUf
-=wVu4
+iJwEAQECAAYFAkw8uGQACgkQIiMqcbOVdxQiRgP/ZiPxmZVoOoFgxUTt1OWDv0FW
+e8zTmCc8ZG3o6lI/9ygI2YXmv05xeiFpu1hgSljDFjLFQnNdMEPaHSt5FmG8ixba
+IgCTNhNOiVWySAFnXDyXgu0UiLbQvOo4tK32NNGZXCtBwXiVq3ha8hszAZZ3SSoh
+ASelyNTMOgyir1m3Dt8=
+=6Dyu
 -----END PGP SIGNATURE-----
diff --git a/media-sound/ncmpc/files/ncmpc-0.16.1-asneeded.patch b/media-sound/ncmpc/files/ncmpc-0.16.1-asneeded.patch
new file mode 100644
index 000000000000..f472a2ec238f
--- /dev/null
+++ b/media-sound/ncmpc/files/ncmpc-0.16.1-asneeded.patch
@@ -0,0 +1,12 @@
+--- Makefile.am
++++ Makefile.am
+@@ -168,7 +168,8 @@
+ 
+ test_run_hscroll_SOURCES = test/run_hscroll.c src/hscroll.c src/charset.c
+ test_run_hscroll_CPPFLAGS = -I$(srcdir)/src $(AM_CPPFLAGS)
+-test_run_hscroll_LDFLAGS = $(GLIB_LIBS)
++test_run_hscroll_CFLAGS = $(GLIB_CFLAGS)
++test_run_hscroll_LDADD = $(GLIB_LIBS)
+ 
+ #
+ # sparse
diff --git a/media-sound/ncmpc/ncmpc-0.16.1-r1.ebuild b/media-sound/ncmpc/ncmpc-0.16.1-r1.ebuild
index df02cae38542..3c5549b2947d 100644
--- a/media-sound/ncmpc/ncmpc-0.16.1-r1.ebuild
+++ b/media-sound/ncmpc/ncmpc-0.16.1-r1.ebuild
@@ -1,9 +1,9 @@
 # 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.16.1-r1.ebuild,v 1.1 2010/06/03 19:09:26 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ncmpc-0.16.1-r1.ebuild,v 1.2 2010/07/13 19:02:44 xarthisius Exp $
 
 EAPI=2
-inherit base multilib
+inherit autotools base multilib
 
 DESCRIPTION="A ncurses client for the Music Player Daemon (MPD)"
 HOMEPAGE="http://mpd.wikia.com/wiki/Client:Ncmpc"
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.sourceforge.net/musicpd/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="artist-screen colors debug +help-screen key-screen lyrics-screen
 mouse nls search-screen song-screen"
 #lirc
@@ -23,7 +23,13 @@ RDEPEND=">=dev-libs/glib-2.12:2
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-PATCHES=( "${FILESDIR}/${P}-lyrics-backtrace.patch" )
+PATCHES=( "${FILESDIR}/${P}-lyrics-backtrace.patch"
+	"${FILESDIR}/${P}-asneeded.patch" )
+
+src_prepare() {
+	base_src_prepare
+	eautoreconf
+}
 
 src_configure() {
 	# The use_with lyrics-screen is for multilib