From e534fe40e953496a42efa84d0f7829f2a08b81b0 Mon Sep 17 00:00:00 2001 From: Michael Sterrett Date: Wed, 2 Dec 2015 01:26:47 -0500 Subject: version bump Package-Manager: portage-2.2.20.1 --- games-roguelike/tomenet/Manifest | 1 + .../tomenet/files/tomenet-4.6.0-makefile.patch | 75 ++++++++++++++++ games-roguelike/tomenet/tomenet-4.6.0.ebuild | 100 +++++++++++++++++++++ 3 files changed, 176 insertions(+) create mode 100644 games-roguelike/tomenet/files/tomenet-4.6.0-makefile.patch create mode 100644 games-roguelike/tomenet/tomenet-4.6.0.ebuild (limited to 'games-roguelike/tomenet') diff --git a/games-roguelike/tomenet/Manifest b/games-roguelike/tomenet/Manifest index 85752091a12a..11ce73580a9e 100644 --- a/games-roguelike/tomenet/Manifest +++ b/games-roguelike/tomenet/Manifest @@ -1 +1,2 @@ DIST tomenet-4.5.9.tar.bz2 3012187 SHA256 40ce5068e2ee10ad051241d5c44423bb74a9ef4054260ee692adeccc9b46d4c7 SHA512 1e13e37b209ab274fb6aeafeb270cff0590ffa352b91b61970194e968826bed3fd365c210238a48b067d0882bac737c70250d8846acc816e3c3ac0b3b843ee1d WHIRLPOOL c9106d27be0e9f173eae24d12f79b75818b1dd23d2c1c93dd4a1a707de6ddaf7538de0dce73216d4a32a290245cd4c09dd26bbc3b54e811484a3a44bb2945fa6 +DIST tomenet-4.6.0.tar.bz2 3039894 SHA256 bd1cbf05fe8cb4c8af5e658ede622cf12b54aae42c640af12677e4067902673f SHA512 73dd682158b09ede8b78ca604891eebe6534ca3e8979187ac8b938deb3b37e5fde3424122fac6fce392e0e38cc70e40ae6bb07ce7e7192a8cd43d7d8057ab9b3 WHIRLPOOL 8f03ed1b1bc962403d8ff7611857ce40daa5436fa540da96aa142bdf70d6c4dd134238b582e7c6be2e52b63ce1c92f33bef1d21799d1ff4f29684256404831f6 diff --git a/games-roguelike/tomenet/files/tomenet-4.6.0-makefile.patch b/games-roguelike/tomenet/files/tomenet-4.6.0-makefile.patch new file mode 100644 index 000000000000..0dc9fb8171c3 --- /dev/null +++ b/games-roguelike/tomenet/files/tomenet-4.6.0-makefile.patch @@ -0,0 +1,75 @@ +--- tomenet-4.5.9.orig/src/makefile ++++ tomenet-4.5.9/src/makefile +@@ -203,7 +203,7 @@ + # + # This is my compiler of choice, it seems to work most everywhere + # +-CC = gcc ++CC ?= gcc + + # For allowing #if..#else..#endif constructs in LUA files - C. Blue + # Note: The flags must contain +@@ -215,16 +215,26 @@ + # need to use the gcc invocation below instead. + # + # cpp variant: +-CPP = cpp +-CPPFLAGS = -C -P ++#CPP = cpp ++#CPPFLAGS = -C -P + # gcc variant: +-#CPP = gcc +-#CPPFLAGS = -x c -E -Wp,-C,-P ++CPP ?= gcc ++CPPFLAGS = -x c -E -Wp,-C,-P + + + # For variations with X11 + X11BASE = /usr/X11R6 + ++# defines ++ifdef USE_SDL ++CFLAGS += -DSOUND_SDL $(shell sdl-config --cflags) ++SDL_LIBS = $(shell sdl-config --libs) -lSDL_mixer ++endif ++ ++ifdef USE_X ++CFLAGS += -I${X11BASE}/include -DUSE_X11 ++LIBS += -L${X11BASE}/lib -lX11 ++endif + + ## + ## Standard version -- supports X11 (main-x11.c) +@@ -234,8 +244,11 @@ + # "CFLAGS", if your machine places files in a weird location. + # + ## With SDL +-#CFLAGS = -g -pipe -Wall -DUSE_X11 -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -DSOUND_SDL `sdl-config --cflags` +-#LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -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 $(shell ${PKG_CONFIG} --libs ncurses) -lcrypt -lm ${SDL_LIBS} ++ + ## + ## Without SDL + #CFLAGS = -g -pipe -Wall -DUSE_X11 -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 +@@ -257,7 +270,7 @@ + # + ## With SDL + CFLAGS = -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -DSOUND_SDL `sdl-config --cflags` -D_DEFAULT_SOURCE -DACC32 +-LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lncurses -lcrypt -lm `sdl-config --libs` -lSDL_mixer ++LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 $(shell ${PKG_CONFIG} --libs ncurses) -lcrypt -lm $(shell sdl-config --libs) -lSDL_mixer + ## + ## Without SDL + #CFLAGS = -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 +@@ -357,9 +370,6 @@ + # Compile a client with 'test client' version/tag + tomenet.test: CFLAGS += -DTEST_CLIENT -O0 + +-# Normal release build +-tomenet: CFLAGS += -O2 +- + + # Lua + SRCS += $(LUASRCS) diff --git a/games-roguelike/tomenet/tomenet-4.6.0.ebuild b/games-roguelike/tomenet/tomenet-4.6.0.ebuild new file mode 100644 index 000000000000..79d9b8a2dc03 --- /dev/null +++ b/games-roguelike/tomenet/tomenet-4.6.0.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils gnome2-utils toolchain-funcs games + +DESCRIPTION="A MMORPG based on the works of J.R.R. Tolkien" +HOMEPAGE="http://www.tomenet.eu/" +SRC_URI="http://www.tomenet.eu/downloads/${P}.tar.bz2" + +LICENSE="Moria" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="dedicated server +sound X" + +RDEPEND="sys-libs/ncurses:0 + !dedicated? ( + X? ( + x11-libs/libX11 + ) + sound? ( + media-libs/libsdl[sound] + media-libs/sdl-mixer[vorbis,smpeg,mp3] + ) + )" +DEPEND="${RDEPEND} + virtual/pkgconfig + !dedicated? ( sound? ( app-arch/p7zip[wxwidgets] ) )" + +S=${WORKDIR}/${P}/src + +src_prepare() { + epatch "${FILESDIR}"/${P}-makefile.patch + use server || use dedicated || { rm -r ../lib/{config,data,save} || die ;} + + sed \ + -e "s#@LIBDIR@#${GAMES_DATADIR}/${PN}#" \ + "${FILESDIR}"/${PN}-wrapper > "${T}"/${PN} || die + + if use server || use dedicated ; then + sed \ + -e "s#@LIBDIR@#${GAMES_DATADIR}/${PN}#" \ + "${FILESDIR}"/${PN}-server-wrapper > "${T}"/${PN}.server || die + fi + + tc-export PKG_CONFIG +} + +src_compile() { + local mytargets="$(usex dedicated "accedit tomenet.server evilmeta" "$(usex server "all" "tomenet")")" + emake \ + $(usex dedicated "" "$(usex X "USE_X=1" "")") \ + $(usex dedicated "" "$(usex sound "USE_SDL=1" "")") \ + -f makefile \ + ${mytargets[@]} +} + +src_install() { + dodoc ../TomeNET-Guide.txt + + if ! use dedicated ; then + newgamesbin ${PN} ${PN}.bin + dogamesbin "${T}"/${PN} + + doicon -s 48 client/tomenet4.png + make_desktop_entry ${PN} ${PN} ${PN}4 + fi + + if use server || use dedicated ; then + newgamesbin tomenet.server tomenet.server.bin + dogamesbin "${T}"/${PN}.server accedit evilmeta + fi + + insinto "${GAMES_DATADIR}/${PN}" + doins -r ../lib/* + doins ../.tomenetrc + + prepgamesdirs +} + +pkg_preinst() { + games_pkg_preinst + gnome2_icon_savelist +} + +pkg_postinst() { + games_pkg_postinst + gnome2_icon_cache_update + + if use sound; then + elog "You can get soundpacks from here:" + elog ' http://tomenet.net/downloads.php' + elog "They must be placed inside ~/.tomenet directory." + fi +} + +pkg_postrm() { + gnome2_icon_cache_update +} -- cgit v1.2.3-18-g5258