summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKacper Kowalik <xarthisius@gentoo.org>2010-07-13 19:02:46 +0000
committerKacper Kowalik <xarthisius@gentoo.org>2010-07-13 19:02:46 +0000
commitab34aa1d7075d410b0a68c4cd327fdcfdaf234d8 (patch)
tree50ba6ced704e76fbb29253ca90a71c08c8be02aa /media-sound/ncmpc
parentold (diff)
downloadgentoo-2-ab34aa1d7075d410b0a68c4cd327fdcfdaf234d8.tar.gz
gentoo-2-ab34aa1d7075d410b0a68c4cd327fdcfdaf234d8.tar.bz2
gentoo-2-ab34aa1d7075d410b0a68c4cd327fdcfdaf234d8.zip
Fixing build with --as-needed wrt bug 327865. Thanks to Diego for reporting. Dropped ~x86-fbsd
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'media-sound/ncmpc')
-rw-r--r--media-sound/ncmpc/ChangeLog7
-rw-r--r--media-sound/ncmpc/files/ncmpc-0.16.1-asneeded.patch12
-rw-r--r--media-sound/ncmpc/ncmpc-0.16.1-r1.ebuild14
3 files changed, 28 insertions, 5 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/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