commit:     7d016a13a8ab445701f9fe2fd6a739cf79dcd761
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 10 23:47:40 2016 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Thu Feb 11 03:12:35 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d016a13

games-roguelike/tomenet: version bump

Package-Manager: portage-2.2.26

 games-roguelike/tomenet/Manifest                   |   1 +
 .../tomenet/files/tomenet-4.6.1a-makefile.patch    |  77 ++++++++++++++++
 games-roguelike/tomenet/tomenet-4.6.1a.ebuild      | 100 +++++++++++++++++++++
 3 files changed, 178 insertions(+)

diff --git a/games-roguelike/tomenet/Manifest b/games-roguelike/tomenet/Manifest
index 48de226..e03833d 100644
--- a/games-roguelike/tomenet/Manifest
+++ b/games-roguelike/tomenet/Manifest
@@ -1 +1,2 @@
 DIST tomenet-4.6.0.tar.bz2 3039894 SHA256 
bd1cbf05fe8cb4c8af5e658ede622cf12b54aae42c640af12677e4067902673f SHA512 
73dd682158b09ede8b78ca604891eebe6534ca3e8979187ac8b938deb3b37e5fde3424122fac6fce392e0e38cc70e40ae6bb07ce7e7192a8cd43d7d8057ab9b3
 WHIRLPOOL 
8f03ed1b1bc962403d8ff7611857ce40daa5436fa540da96aa142bdf70d6c4dd134238b582e7c6be2e52b63ce1c92f33bef1d21799d1ff4f29684256404831f6
+DIST tomenet-4.6.1a.tar.bz2 2990275 SHA256 
0e27c0332f1a1e58e51c4d254dd14707e21608e32c5acf2be28a5baaa65065ab SHA512 
eb89cd2276a18947d55efcc745e0b0abc0d9ae8a8d922a4726632657f32657e762bd0530d721afcf9d4ab3eeed2da6e43a3822d1d8c2c3b630fdb4cde924ac9f
 WHIRLPOOL 
eb5ecbea231bf756c71b983b4a7fc082e7d63061d8f215731b7065eeef57e912dfbb1b217d3d031c6db11f8882c4d4c10c8d821c8ccd873f0e9e41f9148f2d30

diff --git a/games-roguelike/tomenet/files/tomenet-4.6.1a-makefile.patch 
b/games-roguelike/tomenet/files/tomenet-4.6.1a-makefile.patch
new file mode 100644
index 0000000..c78a55c
--- /dev/null
+++ b/games-roguelike/tomenet/files/tomenet-4.6.1a-makefile.patch
@@ -0,0 +1,77 @@
+diff -ru tomenet-4.6.1a.orig/src/makefile tomenet-4.6.1a/src/makefile
+--- tomenet-4.6.1a.orig/src/makefile   2015-12-31 07:05:21.000000000 -0500
++++ tomenet-4.6.1a/src/makefile        2016-02-10 01:42:12.958344532 -0500
+@@ -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)
+@@ -237,6 +247,11 @@
+ #CFLAGS = -g -pipe -Wall -DUSE_X11 -I${X11BASE}/include -D_XOPEN_SOURCE 
-D_BSD_SOURCE -DMEXP=19937 -std=c99 -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 -std=c99
++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 -std=c99
+ #LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lcrypt -lm
+@@ -256,8 +271,8 @@
+ # attempt to "guess" at many of these flags based on your system.
+ #
+ ## With SDL
+-CFLAGS = -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include 
-D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99 -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
++#CFLAGS = -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include 
-D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99 -DSOUND_SDL `sdl-config 
--cflags` -D_DEFAULT_SOURCE -DACC32
++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 -std=c99
+@@ -357,10 +372,6 @@
+ # Compile a client with 'test client' version/tag
+ tomenet.test: CFLAGS += -DTEST_CLIENT -O0
+ 
+-# Normal release build
+-tomenet: CFLAGS += -O2
+-
+-
+ # Lua
+ SRCS += $(LUASRCS)
+ SRCS += $(CLI_LUASRCS)

diff --git a/games-roguelike/tomenet/tomenet-4.6.1a.ebuild 
b/games-roguelike/tomenet/tomenet-4.6.1a.ebuild
new file mode 100644
index 0000000..e9e1dd3
--- /dev/null
+++ b/games-roguelike/tomenet/tomenet-4.6.1a.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2016 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" "$(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
+       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
+}

Reply via email to