* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/tomenet/files/, games-roguelike/tomenet/
@ 2015-12-02 6:47 Michael Sterrett
0 siblings, 0 replies; 4+ messages in thread
From: Michael Sterrett @ 2015-12-02 6:47 UTC (permalink / raw
To: gentoo-commits
commit: e534fe40e953496a42efa84d0f7829f2a08b81b0
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 2 06:26:47 2015 +0000
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Wed Dec 2 06:27:07 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e534fe40
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(+)
diff --git a/games-roguelike/tomenet/Manifest b/games-roguelike/tomenet/Manifest
index 8575209..11ce735 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 0000000..0dc9fb8
--- /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 0000000..79d9b8a
--- /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
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/tomenet/files/, games-roguelike/tomenet/
@ 2019-02-10 3:18 Aaron Bauman
0 siblings, 0 replies; 4+ messages in thread
From: Aaron Bauman @ 2019-02-10 3:18 UTC (permalink / raw
To: gentoo-commits
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
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/tomenet/files/, games-roguelike/tomenet/
@ 2019-02-10 3:18 Aaron Bauman
0 siblings, 0 replies; 4+ messages in thread
From: Aaron Bauman @ 2019-02-10 3:18 UTC (permalink / raw
To: gentoo-commits
commit: 26d81c98d89ae5875cba71a8b8bccee40f879f16
Author: Stefan Strogin <stefan.strogin <AT> gmail <DOT> com>
AuthorDate: Thu Jan 17 22:17:28 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=26d81c98
games-roguelike/tomenet: drop games eclass, EAPI=6
Let tomenet-wrapper check symlinks in ~/.tomenet/. Recreate them if they
target to nowhere (e.g. /usr/share/games/tomenet/...).
Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Stefan Strogin <stefan.strogin <AT> gmail.com>
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
.../tomenet/files/tomenet-4.7.2-makefile.patch | 6 ++---
games-roguelike/tomenet/files/tomenet-wrapper | 6 ++---
games-roguelike/tomenet/tomenet-4.7.2.ebuild | 30 +++++++++++-----------
3 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/games-roguelike/tomenet/files/tomenet-4.7.2-makefile.patch b/games-roguelike/tomenet/files/tomenet-4.7.2-makefile.patch
index 474ebd370c2..1b89c2bc987 100644
--- a/games-roguelike/tomenet/files/tomenet-4.7.2-makefile.patch
+++ b/games-roguelike/tomenet/files/tomenet-4.7.2-makefile.patch
@@ -1,7 +1,7 @@
-diff --git a/src/makefile b/src/makefile
+diff --git a/makefile b/makefile
index ee56a33..7f3c81f 100644
---- a/src/makefile
-+++ b/src/makefile
+--- a/makefile
++++ b/makefile
@@ -203,7 +203,7 @@ CLI_LUAOBJS = \
#
# This is my compiler of choice, it seems to work most everywhere
diff --git a/games-roguelike/tomenet/files/tomenet-wrapper b/games-roguelike/tomenet/files/tomenet-wrapper
index 2ca29b86217..71abcb79cf2 100644
--- a/games-roguelike/tomenet/files/tomenet-wrapper
+++ b/games-roguelike/tomenet/files/tomenet-wrapper
@@ -1,11 +1,11 @@
#!/bin/sh
-if [ ! -e ~/.tomenet/.gentoo ]; then
+if [ ! -e ~/.tomenet/.gentoo ] || [ ! -e ~/.tomenet/game ] || [ ! -e ~/.tomenet/text ] ; then
LIBDIR="@LIBDIR@"
[ -e ~/.tomenet ] || mkdir ~/.tomenet
- ln -s "${LIBDIR}"/game ~/.tomenet/game
- ln -s "${LIBDIR}"/text ~/.tomenet/text
+ [ -e ~/.tomenet/game ] || ln -sf "${LIBDIR}"/game ~/.tomenet/game
+ [ -e ~/.tomenet/text ] || ln -sf "${LIBDIR}"/text ~/.tomenet/text
cp -R "${LIBDIR}"/user "${LIBDIR}"/scpt "${LIBDIR}"/xtra ~/.tomenet/
[ -e ~/.tomenetrc ] || cp "${LIBDIR}"/.tomenetrc ~/.tomenetrc
diff --git a/games-roguelike/tomenet/tomenet-4.7.2.ebuild b/games-roguelike/tomenet/tomenet-4.7.2.ebuild
index c51b641ecf4..5da772d9c22 100644
--- a/games-roguelike/tomenet/tomenet-4.7.2.ebuild
+++ b/games-roguelike/tomenet/tomenet-4.7.2.ebuild
@@ -1,8 +1,8 @@
# 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
+EAPI=6
+inherit eutils gnome2-utils toolchain-funcs
DESCRIPTION="A MMORPG based on the works of J.R.R. Tolkien"
HOMEPAGE="https://www.tomenet.eu"
@@ -29,17 +29,21 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/${P}/src
+PATCHES=(
+ "${FILESDIR}"/${P}-makefile.patch
+)
+
src_prepare() {
- epatch "${FILESDIR}"/${P}-makefile.patch
+ default
use server || use dedicated || { rm -r ../lib/{config,data,save} || die ;}
sed \
- -e "s#@LIBDIR@#${GAMES_DATADIR}/${PN}#" \
+ -e "s#@LIBDIR@#/usr/share/${PN}#" \
"${FILESDIR}"/${PN}-wrapper > "${T}"/${PN} || die
if use server || use dedicated ; then
sed \
- -e "s#@LIBDIR@#${GAMES_DATADIR}/${PN}#" \
+ -e "s#@LIBDIR@#/usr/share/${PN}#" \
"${FILESDIR}"/${PN}-server-wrapper > "${T}"/${PN}.server || die
fi
@@ -59,37 +63,33 @@ src_install() {
dodoc ../TomeNET-Guide.txt
if ! use dedicated ; then
- newgamesbin ${PN} ${PN}.bin
- dogamesbin "${T}"/${PN}
+ newbin ${PN} ${PN}.bin
+ dobin "${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
+ newbin tomenet.server tomenet.server.bin
+ dobin "${T}"/${PN}.server accedit
fi
- insinto "${GAMES_DATADIR}/${PN}"
+ insinto "/usr/share/${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 ' https://tomenet.net/downloads.php'
elog "They must be placed inside ~/.tomenet directory."
fi
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/tomenet/files/, games-roguelike/tomenet/
@ 2020-12-15 15:38 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2020-12-15 15:38 UTC (permalink / raw
To: gentoo-commits
commit: d1a1094a20def82b39fe3378415bbb707418c741
Author: Alexey Sokolov <sokolov <AT> google <DOT> com>
AuthorDate: Tue Dec 15 15:38:25 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Dec 15 15:38:25 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1a1094a
games-roguelike/tomenet: drop old
Closes: https://bugs.gentoo.org/669928
Closes: https://github.com/gentoo/gentoo/pull/18522
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
games-roguelike/tomenet/Manifest | 2 -
.../tomenet/files/tomenet-4.6.1a-makefile.patch | 77 -----------------
.../tomenet/files/tomenet-4.7.2-makefile.patch | 65 --------------
games-roguelike/tomenet/tomenet-4.6.1a.ebuild | 99 ----------------------
games-roguelike/tomenet/tomenet-4.7.2.ebuild | 99 ----------------------
5 files changed, 342 deletions(-)
diff --git a/games-roguelike/tomenet/Manifest b/games-roguelike/tomenet/Manifest
index 28db3470d88..04197fd30cc 100644
--- a/games-roguelike/tomenet/Manifest
+++ b/games-roguelike/tomenet/Manifest
@@ -1,3 +1 @@
-DIST tomenet-4.6.1a.tar.bz2 2990275 BLAKE2B 40d855e4f9e908a8802bba8fd95fcb8c69df026bdc9b891e14a79691e80f7caab48e7826066a761101d932116542d42240457d85998278f8a928dd64ed1ac522 SHA512 eb89cd2276a18947d55efcc745e0b0abc0d9ae8a8d922a4726632657f32657e762bd0530d721afcf9d4ab3eeed2da6e43a3822d1d8c2c3b630fdb4cde924ac9f
-DIST tomenet-4.7.2.tar.bz2 3253873 BLAKE2B 4cba4827a64588c850691ae3b5c7ad0097a322ab1baca42492cbe42bc1e76615fb0084b7b8608e20adf303bded42a9cb80c4d09d0a29f1f68699ffa8e04240bb SHA512 284aa71374b726fd86bfa6b0d820301ec7e5004ddb140a1567c54c883c138cabd2ac55085c222aa057b234dc822f717489128b857ed527fff7d702092bdb51d5
DIST tomenet-4.7.3.tar.bz2 3355774 BLAKE2B e574434d283525793ad7b7e2c23103692c540be8727a90623b9fd52aba47d245be99cb39846046f4ba78795e168c8ef9342ff9ee16417dce3698036cbd6c50eb SHA512 25c7dedcd63306ada738078c412a45483ee6ac4c6fe116624a409cb4c9795270942cac2428c1ecafac45bbc9e3044890e308f8bd1bb1344dd156a610948addcd
diff --git a/games-roguelike/tomenet/files/tomenet-4.6.1a-makefile.patch b/games-roguelike/tomenet/files/tomenet-4.6.1a-makefile.patch
deleted file mode 100644
index c78a55cebd9..00000000000
--- a/games-roguelike/tomenet/files/tomenet-4.6.1a-makefile.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-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/files/tomenet-4.7.2-makefile.patch b/games-roguelike/tomenet/files/tomenet-4.7.2-makefile.patch
deleted file mode 100644
index 1b89c2bc987..00000000000
--- a/games-roguelike/tomenet/files/tomenet-4.7.2-makefile.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/makefile b/makefile
-index ee56a33..7f3c81f 100644
---- a/makefile
-+++ b/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.6.1a.ebuild b/games-roguelike/tomenet/tomenet-4.6.1a.ebuild
deleted file mode 100644
index ec80992655c..00000000000
--- a/games-roguelike/tomenet/tomenet-4.6.1a.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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
-}
diff --git a/games-roguelike/tomenet/tomenet-4.7.2.ebuild b/games-roguelike/tomenet/tomenet-4.7.2.ebuild
deleted file mode 100644
index 5da772d9c22..00000000000
--- a/games-roguelike/tomenet/tomenet-4.7.2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils gnome2-utils toolchain-funcs
-
-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
-
-PATCHES=(
- "${FILESDIR}"/${P}-makefile.patch
-)
-
-src_prepare() {
- default
- use server || use dedicated || { rm -r ../lib/{config,data,save} || die ;}
-
- sed \
- -e "s#@LIBDIR@#/usr/share/${PN}#" \
- "${FILESDIR}"/${PN}-wrapper > "${T}"/${PN} || die
-
- if use server || use dedicated ; then
- sed \
- -e "s#@LIBDIR@#/usr/share/${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
- newbin ${PN} ${PN}.bin
- dobin "${T}"/${PN}
-
- doicon -s 48 client/tomenet4.png
- make_desktop_entry ${PN} ${PN} ${PN}4
- fi
-
- if use server || use dedicated ; then
- newbin tomenet.server tomenet.server.bin
- dobin "${T}"/${PN}.server accedit
- fi
-
- insinto "/usr/share/${PN}"
- doins -r ../lib/*
- doins ../.tomenetrc
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-
- if use sound; then
- elog "You can get soundpacks from here:"
- elog ' https://tomenet.net/downloads.php'
- elog "They must be placed inside ~/.tomenet directory."
- fi
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-12-15 15:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-02-10 3:18 [gentoo-commits] repo/gentoo:master commit in: games-roguelike/tomenet/files/, games-roguelike/tomenet/ Aaron Bauman
-- strict thread matches above, loose matches on Subject: below --
2020-12-15 15:38 David Seifert
2019-02-10 3:18 Aaron Bauman
2015-12-02 6:47 Michael Sterrett
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox