commit: 5b07ce44694000acc828dc03eda53e284b2fc7ac Author: Stefan Strogin <stefan.strogin <AT> gmail <DOT> com> AuthorDate: Thu Jan 17 19:37:22 2019 +0000 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> CommitDate: Sun Feb 10 03:18:21 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b07ce44
games-roguelike/tomenet: version bump to 4.7.2 Closes: https://bugs.gentoo.org/674536 Package-Manager: Portage-2.3.56, Repoman-2.3.12 Signed-off-by: Stefan Strogin <stefan.strogin <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/10856 Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> games-roguelike/tomenet/Manifest | 1 + .../tomenet/files/tomenet-4.7.2-makefile.patch | 65 ++++++++++++++ games-roguelike/tomenet/tomenet-4.7.2.ebuild | 99 ++++++++++++++++++++++ 3 files changed, 165 insertions(+) diff --git a/games-roguelike/tomenet/Manifest b/games-roguelike/tomenet/Manifest index e83e3a90b42..cb2a3a96713 100644 --- a/games-roguelike/tomenet/Manifest +++ b/games-roguelike/tomenet/Manifest @@ -1 +1,2 @@ DIST tomenet-4.6.1a.tar.bz2 2990275 BLAKE2B 40d855e4f9e908a8802bba8fd95fcb8c69df026bdc9b891e14a79691e80f7caab48e7826066a761101d932116542d42240457d85998278f8a928dd64ed1ac522 SHA512 eb89cd2276a18947d55efcc745e0b0abc0d9ae8a8d922a4726632657f32657e762bd0530d721afcf9d4ab3eeed2da6e43a3822d1d8c2c3b630fdb4cde924ac9f +DIST tomenet-4.7.2.tar.bz2 3253873 BLAKE2B 4cba4827a64588c850691ae3b5c7ad0097a322ab1baca42492cbe42bc1e76615fb0084b7b8608e20adf303bded42a9cb80c4d09d0a29f1f68699ffa8e04240bb SHA512 284aa71374b726fd86bfa6b0d820301ec7e5004ddb140a1567c54c883c138cabd2ac55085c222aa057b234dc822f717489128b857ed527fff7d702092bdb51d5 diff --git a/games-roguelike/tomenet/files/tomenet-4.7.2-makefile.patch b/games-roguelike/tomenet/files/tomenet-4.7.2-makefile.patch new file mode 100644 index 00000000000..474ebd370c2 --- /dev/null +++ b/games-roguelike/tomenet/files/tomenet-4.7.2-makefile.patch @@ -0,0 +1,65 @@ +diff --git a/src/makefile b/src/makefile +index ee56a33..7f3c81f 100644 +--- a/src/makefile ++++ b/src/makefile +@@ -203,7 +203,7 @@ CLI_LUAOBJS = \ + # + # 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 @@ CC = gcc + # 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) +@@ -236,6 +246,11 @@ X11BASE = /usr/X11R6 + ## With SDL + #CFLAGS = -O2 -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 = -O2 -g -pipe -Wall -DUSE_X11 -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99 +@@ -259,7 +274,7 @@ X11BASE = /usr/X11R6 + #CFLAGS = -O2 -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 -fPIC + CFLAGS = -O2 -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 -fPIC -Wno-format-truncation + #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 -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 + ACCEDIT_LIBS = -lcurses -lcrypt + ## + ## Without SDL diff --git a/games-roguelike/tomenet/tomenet-4.7.2.ebuild b/games-roguelike/tomenet/tomenet-4.7.2.ebuild new file mode 100644 index 00000000000..c51b641ecf4 --- /dev/null +++ b/games-roguelike/tomenet/tomenet-4.7.2.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +inherit eutils gnome2-utils toolchain-funcs games + +DESCRIPTION="A MMORPG based on the works of J.R.R. Tolkien" +HOMEPAGE="https://www.tomenet.eu"; +SRC_URI="https://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 +}
