| 1 |
jer 14/03/21 05:11:09 |
| 2 |
|
| 3 |
Modified: nethack-3.4.3-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix building against sys-libs/ncurses[tinfo]. Respect LDFLAGS. |
| 6 |
|
| 7 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A792A613) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.28 games-roguelike/nethack/nethack-3.4.3-r1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-roguelike/nethack/nethack-3.4.3-r1.ebuild?rev=1.28&view=markup |
| 13 |
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 |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-roguelike/nethack/nethack-3.4.3-r1.ebuild?r1=1.27&r2=1.28 |
| 15 |
|
| 16 |
Index: nethack-3.4.3-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/games-roguelike/nethack/nethack-3.4.3-r1.ebuild,v |
| 19 |
retrieving revision 1.27 |
| 20 |
retrieving revision 1.28 |
| 21 |
diff -u -r1.27 -r1.28 |
| 22 |
--- nethack-3.4.3-r1.ebuild 2 Mar 2010 21:10:39 -0000 1.27 |
| 23 |
+++ nethack-3.4.3-r1.ebuild 21 Mar 2014 05:11:09 -0000 1.28 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
-# Copyright 1999-2010 Gentoo Foundation |
| 26 |
+# Copyright 1999-2014 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $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 $ |
| 29 |
+# $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 $ |
| 30 |
|
| 31 |
EAPI=2 |
| 32 |
inherit eutils toolchain-funcs flag-o-matic games |
| 33 |
@@ -22,6 +22,7 @@ |
| 34 |
x11-libs/libXt |
| 35 |
)" |
| 36 |
DEPEND="${RDEPEND} |
| 37 |
+ virtual/pkgconfig |
| 38 |
X? ( |
| 39 |
x11-proto/xproto |
| 40 |
x11-apps/bdftopcf |
| 41 |
@@ -65,13 +66,20 @@ |
| 42 |
|| die "sed Makefile failed" |
| 43 |
fi |
| 44 |
|
| 45 |
+ # sys-libs/ncurses[tinfo] |
| 46 |
+ sed -i \ |
| 47 |
+ -e '/^WINTTYLIB/s| = .*| = '"$( |
| 48 |
+ $(tc-getPKG_CONFIG) --libs ncurses |
| 49 |
+ )"'|g' \ |
| 50 |
+ src/Makefile || die |
| 51 |
+ |
| 52 |
if use X ; then |
| 53 |
epatch "${FILESDIR}/${PV}-X-support.patch" |
| 54 |
fi |
| 55 |
} |
| 56 |
|
| 57 |
src_compile() { |
| 58 |
- local lflags="-L/usr/X11R6/lib" |
| 59 |
+ local lflags="${LDFLAGS}" |
| 60 |
|
| 61 |
cd "${S}"/src |
| 62 |
append-flags -I../include |
| 63 |
@@ -88,7 +96,11 @@ |
| 64 |
LFLAGS="${lflags}" \ |
| 65 |
|| die "main build failed" |
| 66 |
cd "${S}"/util |
| 67 |
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" recover || die "util build failed" |
| 68 |
+ emake \ |
| 69 |
+ CC="$(tc-getCC)" \ |
| 70 |
+ CFLAGS="${CFLAGS}" \ |
| 71 |
+ LFLAGS="${lflags}" \ |
| 72 |
+ recover || die "util build failed" |
| 73 |
} |
| 74 |
|
| 75 |
src_install() { |
| 76 |
|
| 77 |
|
| 78 |
|
| 79 |
1.35 games-roguelike/nethack/ChangeLog |
| 80 |
|
| 81 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-roguelike/nethack/ChangeLog?rev=1.35&view=markup |
| 82 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-roguelike/nethack/ChangeLog?rev=1.35&content-type=text/plain |
| 83 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-roguelike/nethack/ChangeLog?r1=1.34&r2=1.35 |
| 84 |
|
| 85 |
Index: ChangeLog |
| 86 |
=================================================================== |
| 87 |
RCS file: /var/cvsroot/gentoo-x86/games-roguelike/nethack/ChangeLog,v |
| 88 |
retrieving revision 1.34 |
| 89 |
retrieving revision 1.35 |
| 90 |
diff -u -r1.34 -r1.35 |
| 91 |
--- ChangeLog 2 Mar 2010 21:10:39 -0000 1.34 |
| 92 |
+++ ChangeLog 21 Mar 2014 05:11:09 -0000 1.35 |
| 93 |
@@ -1,6 +1,9 @@ |
| 94 |
# ChangeLog for games-roguelike/nethack |
| 95 |
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 96 |
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/ChangeLog,v 1.34 2010/03/02 21:10:39 mr_bones_ Exp $ |
| 97 |
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 98 |
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/ChangeLog,v 1.35 2014/03/21 05:11:09 jer Exp $ |
| 99 |
+ |
| 100 |
+ 21 Mar 2014; Jeroen Roovers <jer@g.o> nethack-3.4.3-r1.ebuild: |
| 101 |
+ Fix building against sys-libs/ncurses[tinfo]. Respect LDFLAGS. |
| 102 |
|
| 103 |
02 Mar 2010; Michael Sterrett <mr_bones_@g.o> |
| 104 |
-files/3.4.3-QT-support.patch, nethack-3.4.3-r1.ebuild, |
Archives