jer 14/03/21 05:11:09 Modified: nethack-3.4.3-r1.ebuild ChangeLog Log: Fix building against sys-libs/ncurses[tinfo]. Respect LDFLAGS. (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path 1.28 games-roguelike/nethack/nethack-3.4.3-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-roguelike/nethack/nethack-3.4.3-r1.ebuild?rev=1.28&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-roguelike/nethack/nethack-3.4.3-r1.ebuild?rev=1.28&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-roguelike/nethack/nethack-3.4.3-r1.ebuild?r1=1.27&r2=1.28 Index: nethack-3.4.3-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/games-roguelike/nethack/nethack-3.4.3-r1.ebuild,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- nethack-3.4.3-r1.ebuild 2 Mar 2010 21:10:39 -0000 1.27 +++ nethack-3.4.3-r1.ebuild 21 Mar 2014 05:11:09 -0000 1.28 @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/nethack-3.4.3-r1.ebuild,v 1.27 2010/03/02 21:10:39 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/nethack-3.4.3-r1.ebuild,v 1.28 2014/03/21 05:11:09 jer Exp $ EAPI=2 inherit eutils toolchain-funcs flag-o-matic games @@ -22,6 +22,7 @@ x11-libs/libXt )" DEPEND="${RDEPEND} + virtual/pkgconfig X? ( x11-proto/xproto x11-apps/bdftopcf @@ -65,13 +66,20 @@ || die "sed Makefile failed" fi + # sys-libs/ncurses[tinfo] + sed -i \ + -e '/^WINTTYLIB/s| = .*| = '"$( + $(tc-getPKG_CONFIG) --libs ncurses + )"'|g' \ + src/Makefile || die + if use X ; then epatch "${FILESDIR}/${PV}-X-support.patch" fi } src_compile() { - local lflags="-L/usr/X11R6/lib" + local lflags="${LDFLAGS}" cd "${S}"/src append-flags -I../include @@ -88,7 +96,11 @@ LFLAGS="${lflags}" \ || die "main build failed" cd "${S}"/util - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" recover || die "util build failed" + emake \ + CC="$(tc-getCC)" \ + CFLAGS="${CFLAGS}" \ + LFLAGS="${lflags}" \ + recover || die "util build failed" } src_install() { 1.35 games-roguelike/nethack/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-roguelike/nethack/ChangeLog?rev=1.35&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-roguelike/nethack/ChangeLog?rev=1.35&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-roguelike/nethack/ChangeLog?r1=1.34&r2=1.35 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/games-roguelike/nethack/ChangeLog,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- ChangeLog 2 Mar 2010 21:10:39 -0000 1.34 +++ ChangeLog 21 Mar 2014 05:11:09 -0000 1.35 @@ -1,6 +1,9 @@ # ChangeLog for games-roguelike/nethack -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/ChangeLog,v 1.34 2010/03/02 21:10:39 mr_bones_ Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/ChangeLog,v 1.35 2014/03/21 05:11:09 jer Exp $ + + 21 Mar 2014; Jeroen Roovers <j...@gentoo.org> nethack-3.4.3-r1.ebuild: + Fix building against sys-libs/ncurses[tinfo]. Respect LDFLAGS. 02 Mar 2010; Michael Sterrett <mr_bon...@gentoo.org> -files/3.4.3-QT-support.patch, nethack-3.4.3-r1.ebuild,
