diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2014-10-25 13:06:42 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2014-10-25 13:06:42 +0000 |
| commit | 5582f60be72a751b6a0f1439861b1770fbd252c6 (patch) | |
| tree | bf37d5cbc045515633ae341caa476016c203a77f /games-roguelike | |
| parent | Initial import of the YubiKey NEO Manager. (diff) | |
| download | gentoo-2-5582f60be72a751b6a0f1439861b1770fbd252c6.tar.gz gentoo-2-5582f60be72a751b6a0f1439861b1770fbd252c6.tar.bz2 gentoo-2-5582f60be72a751b6a0f1439861b1770fbd252c6.zip | |
Fix building against sys-libs/ncurses[tinfo] (bug #526714).
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'games-roguelike')
| -rw-r--r-- | games-roguelike/tomenet/ChangeLog | 6 | ||||
| -rw-r--r-- | games-roguelike/tomenet/files/tomenet-4.5.5-makefile.patch | 2 | ||||
| -rw-r--r-- | games-roguelike/tomenet/tomenet-4.5.5.ebuild | 11 |
3 files changed, 13 insertions, 6 deletions
diff --git a/games-roguelike/tomenet/ChangeLog b/games-roguelike/tomenet/ChangeLog index 5f81875e36cd..3f95cd345a57 100644 --- a/games-roguelike/tomenet/ChangeLog +++ b/games-roguelike/tomenet/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-roguelike/tomenet # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tomenet/ChangeLog,v 1.20 2014/08/13 17:48:38 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tomenet/ChangeLog,v 1.21 2014/10/25 13:06:42 jer Exp $ + + 25 Oct 2014; Jeroen Roovers <jer@gentoo.org> tomenet-4.5.5.ebuild, + files/tomenet-4.5.5-makefile.patch: + Fix building against sys-libs/ncurses[tinfo] (bug #526714). 13 Aug 2014; Michael Sterrett <mr_bones_@gentoo.org> -files/tomenet-4.5.3a-makefile.patch, -files/tomenet-4.5.3b-makefile.patch, diff --git a/games-roguelike/tomenet/files/tomenet-4.5.5-makefile.patch b/games-roguelike/tomenet/files/tomenet-4.5.5-makefile.patch index 318fc6997b87..d42c608e7b2e 100644 --- a/games-roguelike/tomenet/files/tomenet-4.5.5-makefile.patch +++ b/games-roguelike/tomenet/files/tomenet-4.5.5-makefile.patch @@ -48,7 +48,7 @@ -LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lncurses -lcrypt -lm `sdl-config --libs` -lSDL_mixer +CFLAGS += -Wall +CFLAGS += -DUSE_GCU -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -+LIBS += -L/usr/pkg/lib -lncurses -lcrypt -lm ${SDL_LIBS} ++LIBS += -L/usr/pkg/lib $(shell ${PKG_CONFIG} --libs ncurses) -lcrypt -lm ${SDL_LIBS} ## ## Without SDL #CFLAGS = -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 diff --git a/games-roguelike/tomenet/tomenet-4.5.5.ebuild b/games-roguelike/tomenet/tomenet-4.5.5.ebuild index ceb9ebfbabb9..1a070b44c034 100644 --- a/games-roguelike/tomenet/tomenet-4.5.5.ebuild +++ b/games-roguelike/tomenet/tomenet-4.5.5.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tomenet/tomenet-4.5.5.ebuild,v 1.2 2014/05/15 16:56:38 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tomenet/tomenet-4.5.5.ebuild,v 1.3 2014/10/25 13:06:42 jer Exp $ EAPI=5 -inherit eutils gnome2-utils games +inherit eutils games gnome2-utils toolchain-funcs DESCRIPTION="A MMORPG based on the works of J.R.R. Tolkien" HOMEPAGE="http://www.tomenet.net/" @@ -14,7 +14,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="dedicated server +sound X" -DEPEND="sys-libs/ncurses +RDEPEND="sys-libs/ncurses !dedicated? ( X? ( x11-libs/libX11 @@ -24,7 +24,8 @@ DEPEND="sys-libs/ncurses media-libs/sdl-mixer[vorbis,smpeg,mp3] ) )" -RDEPEND="${DEPEND} +DEPEND="${RDEPEND} + virtual/pkgconfig !dedicated? ( sound? ( app-arch/p7zip[wxwidgets] ) )" S=${WORKDIR}/${P}/src @@ -42,6 +43,8 @@ src_prepare() { -e "s#@LIBDIR@#${GAMES_DATADIR}/${PN}#" \ "${FILESDIR}"/${PN}-server-wrapper > "${T}"/${PN}.server || die fi + + tc-export PKG_CONFIG } src_compile() { |