version bump

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

4 files changed, 186 insertions, 2 deletions

diff --git a/games-roguelike/tomenet/ChangeLog b/games-roguelike/tomenet/ChangeLog
index 677becf5a5d8..22418313347e 100644
--- a/games-roguelike/tomenet/ChangeLog
+++ b/games-roguelike/tomenet/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-roguelike/tomenet
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tomenet/ChangeLog,v 1.16 2013/07/20 04:46:55 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tomenet/ChangeLog,v 1.17 2013/09/25 20:47:46 hasufell Exp $
+
+*tomenet-4.5.4 (25 Sep 2013)
+
+  25 Sep 2013; Julian Ospald <hasufell@gentoo.org>
+  +files/tomenet-4.5.4-makefile.patch, +tomenet-4.5.4.ebuild:
+  version bump
 
   20 Jul 2013; Michael Sterrett <mr_bones_@gentoo.org>
   -files/tomenet-4.5.2-makefile.patch, -files/tomenet-4.5.3-makefile.patch,
diff --git a/games-roguelike/tomenet/Manifest b/games-roguelike/tomenet/Manifest
index ecf4a9fc773f..9a0cf763f4b2 100644
--- a/games-roguelike/tomenet/Manifest
+++ b/games-roguelike/tomenet/Manifest
@@ -1,10 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX tomenet-4.5.3a-makefile.patch 1655 SHA256 90c81421117d372d7ab57881d87d1fb6ec250eeeb292d95e41df2a55770067d2 SHA512 d949c96dcd710b9549db05ace79816bd3a516e41ce1fe2c2fa1111dfe6852a4d8743e51362ab9581d971ce01c807b85ab9b836b83f691d0b1cb05a4cbe94b63e WHIRLPOOL a3f85e1ccce1f2d9acc451bf735e0dc187226357066ebd833561623ed1e4e7c242c46469e53e379b1fb9afbe0e3a8b5945f4d5132d846e5b0f699ba3ee71bde8
 AUX tomenet-4.5.3b-makefile.patch 1655 SHA256 90c81421117d372d7ab57881d87d1fb6ec250eeeb292d95e41df2a55770067d2 SHA512 d949c96dcd710b9549db05ace79816bd3a516e41ce1fe2c2fa1111dfe6852a4d8743e51362ab9581d971ce01c807b85ab9b836b83f691d0b1cb05a4cbe94b63e WHIRLPOOL a3f85e1ccce1f2d9acc451bf735e0dc187226357066ebd833561623ed1e4e7c242c46469e53e379b1fb9afbe0e3a8b5945f4d5132d846e5b0f699ba3ee71bde8
+AUX tomenet-4.5.4-makefile.patch 1655 SHA256 90c81421117d372d7ab57881d87d1fb6ec250eeeb292d95e41df2a55770067d2 SHA512 d949c96dcd710b9549db05ace79816bd3a516e41ce1fe2c2fa1111dfe6852a4d8743e51362ab9581d971ce01c807b85ab9b836b83f691d0b1cb05a4cbe94b63e WHIRLPOOL a3f85e1ccce1f2d9acc451bf735e0dc187226357066ebd833561623ed1e4e7c242c46469e53e379b1fb9afbe0e3a8b5945f4d5132d846e5b0f699ba3ee71bde8
 AUX tomenet-server-wrapper 105 SHA256 0133c13d1276cd528d4f4686db6226faf43a964acb02eca08fbf4cc8618412f4 SHA512 9f509cdcc694fe47eed4cfdcb14f0ab3ea7006c202e7f4d8798012e62b89f34cc26834131412e18d2f0edba4237b6c66f4743ff6b780e3080a52e9da992d8cc3 WHIRLPOOL c635eeb761fd2014194b49f8eebee9581b705a06da067ab55258aba51241d923df16feaf145b3e0f28f2e0484dd92f5653f25f542d4f011ac9b5ecb71c6313f0
 AUX tomenet-wrapper 446 SHA256 c1eb467f742df807440230f82a193e6b1f283ab48bcb86b21d76b5a434babd0d SHA512 f148ad2fb52c060ada829810edc46d3aee6bd6c5229489a52b6af080b38b164c0417157bb8ec21294e16903b3e8328329fbb86645ab57a0f0a4407875844c5a2 WHIRLPOOL 773ce42ac55e1a73c57df1dcb9092a0c92c37160e78c2943389547eeea406e3051dbaa2f45e6abb69eeebe5a886f0f79ca871d0234f8b59b13b3f2f52d7e843f
 DIST tomenet-4.5.3a.tar.bz2 2691503 SHA256 932228ec512a5e96cb9a924f61dc647215094aa7b122ff46a938ae5bc7e2a5bb SHA512 5e7b0df46be2285b8f8b2418e1ae53cc433c74fef8ecd49323fe2554bc9cccc9c92bbc4c6b28f37b67e81da5ecd8e8fc9cca2c6d4e988879633cd6eff80bbdc5 WHIRLPOOL b3bd756141471502bb87a5020f5e03c6d4081d2864fda46c80c13f06fc3bec638b0a8ce3de51151de252a10d94345b89f7c62465542d5eff76404f839bb2023a
 DIST tomenet-4.5.3b.tar.bz2 2713170 SHA256 a521a70104fec13d2c2b192024e0565f2294dbb11c228b8d14763ce99a5a6f0b SHA512 a87829ea35cbda6422f81646c3f79c6f5266f031dbbd21545184f6d8b4dac4cee741be10481cdced7ba6c49606bb589d98d98d43e9c535df9eddbad81175ad50 WHIRLPOOL 0bb717b9a3d87cd90d296b14e2e639b03bf4a7e07a38f28f21b3d60143024318ade795144f708d107c45e725bd96747dd3eea44c4299dd627bdf8a1f591eb3e9
+DIST tomenet-4.5.4.tar.bz2 2740555 SHA256 3bb8955619f3da571c7982d323cae837203dfd30eb65a508f678efae2ac40f70 SHA512 05ed8738abeb597993d6f43ff73efd98bb65413ae16b66d284b478646900afd96e36cbbfc602697c7c31fa697d546f375a477c278951560c8ff75af611342a19 WHIRLPOOL 553fdde619a39d52509cfde6a309ecd650263aaa9da42266a12af51c30561ec73e9e0969e0cff93e676b34008d399be23fa9eabac7732f854b2518d8f9a36626
 EBUILD tomenet-4.5.3a.ebuild 2223 SHA256 2e3a30b05e131841c0951511f36509b6d642b3683dc49fdeb810d10bfbcb7bed SHA512 3715adab0cbdcac29193cdda49e5d9680d84f67d5959d2f003b995d4ef5c24ee720e5975474905feb0149cf11c3c118cdb6cbfd1bed2aa6f644a1cf2ec239f21 WHIRLPOOL cc52b5bd072bd7efd58c3042d63ebc0552e2512b9835e040ccc27d289e43a9d92b643d2272fe9c7682e2fcded2a28f2136f9e410dd4e7c0d9108e2dffd7847db
 EBUILD tomenet-4.5.3b.ebuild 2223 SHA256 08fdf598abf1fb03c83f11ce4e517cb3dc4e8af9793f7ec8a9332ed6cb977f53 SHA512 e5a824754d399ed5a46c4855bb5e50d8477ed877d7d9f841c6a3fe3b37f10a0957f2ad3a7d2ecacb36d5620c57ceadcf89c52c7423d34fe3e4871c831ad8023b WHIRLPOOL 21d71028e9357ed6a65cba90995820fa5aad9ad882a3e3386d48576abc1b6933fcae50ea06fcbe7e3406b37487a154df6adc7ef14876f4b1009d51d93ca966db
-MISC ChangeLog 2584 SHA256 b215dee530f20be4e420ede8f1d5acfe9fc6d57684af12f768f50405595b1081 SHA512 3942aa00c39d91c965de392aed8fad23bef7deae5d4e219371dd559e830ac63e932ba719d6e85f5bd034d5cdbbc34415905a24c10081c6a1d950f6dfafa121f3 WHIRLPOOL b082bd09a2449c9078cf22be5c3a7c7f5aacdd58cfd756ff2034ddf214617840f46ecc1fbe8bec50c6f5ccbeb6010991dd163c927b834aa94c4f950448775fbd
+EBUILD tomenet-4.5.4.ebuild 2222 SHA256 269d0f65236a4fef4eb962b6d21c3ad08004908ebc95484d11bb46f49e23968b SHA512 fc302a0f01fb234ef2e702eee46aa5663a339b307cc430c0ccd9ba6c0764d196a4afef3a44405617b6538634cd68be9fd572542ad3d7c197557aa36007c1074c WHIRLPOOL d81ad9cab19bf85af4f81fcb7cfad73291ba0c01087494cccb4d05dbfec6436d5e32ee4ffecb9933e4a63b11cccf5b969fe200dbe850164e3c8b3fac7a8d7e13
+MISC ChangeLog 2742 SHA256 74bd0f227c811316e1adf4d11c170f3471656c3a19fe9aa0b4a96f4292c11f92 SHA512 6dc4d6a1c70ed9def142cb22c44316b00abfcd03ce53031a736e00a9c4b5959acb411db972a23efd6068c4b33e3c370147ee373d7b034d99d2e3f3edd1855f6c WHIRLPOOL 4f0433e52578cec10368bf18f52d61d1214ee9a32f291df4e36845ae574e1e187e6721d21a57016e641c41cee00af1030f3170c9c71fe6081bfc4f952556237d
 MISC metadata.xml 702 SHA256 87ae42911bd86b56de7c0bc51d6ef64c71bcfee305540e923bc98454a43c4485 SHA512 b9878d09060df615054d8a2a351b7f90d2ae385bc1740d640569c97b3f6961136f5f6df2f2485dbe84e9f5ca311e9eb4816d11ab04a348aac9b05b0fe537d107 WHIRLPOOL b56e0cd138185a7b2e7dc8f92b9d1de088bdcf2bb8197bb88a95498d895f5a2b7aaa2421e77702b720735d7016bc94edb29a92f17842f6bc091a86fb1b641b24
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iQEcBAEBCAAGBQJSQ0v2AAoJEFpvPKfnPDWz5dgIAKnIP2TUd838uXBPnn21AC4R
+IXltaAX9OmZTgV9SRAdTmovUm/nQcPP5POFr5oNA31pc9KISUcKqtGv4Ek3CDk1R
+LHKQzITtL+jByDlKN/A28tZ4r8T1j1UixCB19r7+gH4vWFiE7hGK1q4am1xYRLEW
+z0mvIuPBkUD/YXwMzUlqbkmgKq7sb/PHsd/o9ny6h7Tk3gsHr62FtUDoYq0s+epo
+8uRK85vtEfMUVi71MK1nYpnwiaLkTlotF+4SppEZmnvxlHdChCxrqn0hSdMbHJWp
+xiu6DB1D3PzZXpNlmLaluX3c/ukNm+Lm74GXL2ZCYlZTDxafgrjqu6Rygcr+Bnw=
+=6QAN
+-----END PGP SIGNATURE-----
diff --git a/games-roguelike/tomenet/files/tomenet-4.5.4-makefile.patch b/games-roguelike/tomenet/files/tomenet-4.5.4-makefile.patch
new file mode 100644
index 000000000000..318fc6997b87
--- /dev/null
+++ b/games-roguelike/tomenet/files/tomenet-4.5.4-makefile.patch
@@ -0,0 +1,64 @@
+--- src/makefile
++++ 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)
+@@ -256,8 +266,9 @@
+ # 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 -DSOUND_SDL `sdl-config --cflags`
+-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}
+ ##
+ ## Without SDL
+ #CFLAGS = -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937
+@@ -357,9 +368,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.5.4.ebuild b/games-roguelike/tomenet/tomenet-4.5.4.ebuild
new file mode 100644
index 000000000000..4db34ac4b18b
--- /dev/null
+++ b/games-roguelike/tomenet/tomenet-4.5.4.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tomenet/tomenet-4.5.4.ebuild,v 1.1 2013/09/25 20:47:46 hasufell Exp $
+
+EAPI=5
+inherit eutils gnome2-utils games
+
+DESCRIPTION="A MMORPG based on the works of J.R.R. Tolkien"
+HOMEPAGE="http://www.tomenet.net/"
+SRC_URI="http://www.tomenet.net/downloads/${P}.tar.bz2"
+
+LICENSE="Moria"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dedicated server +sound X"
+
+DEPEND="sys-libs/ncurses
+	!dedicated? (
+		X? (
+			x11-libs/libX11
+		)
+		sound? (
+			media-libs/libsdl[audio]
+			media-libs/sdl-mixer[vorbis,smpeg,mp3]
+		)
+	)"
+RDEPEND="${DEPEND}
+	!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
+}
+
+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
+}