version bump

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

4 files changed, 179 insertions, 9 deletions

diff --git a/games-roguelike/tomenet/ChangeLog b/games-roguelike/tomenet/ChangeLog
index 89a882061f06..e96a99b66f99 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.11 2013/01/17 16:42:47 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tomenet/ChangeLog,v 1.12 2013/01/31 22:47:17 hasufell Exp $
+
+*tomenet-4.5.3 (31 Jan 2013)
+
+  31 Jan 2013; Julian Ospald <hasufell@gentoo.org> +tomenet-4.5.3.ebuild,
+  +files/tomenet-4.5.3-makefile.patch:
+  version bump
 
   17 Jan 2013; Julian Ospald <hasufell@gentoo.org> -tomenet-4.5.0.ebuild,
   -files/tomenet-4.5.0-makefile.patch:
diff --git a/games-roguelike/tomenet/Manifest b/games-roguelike/tomenet/Manifest
index d4a934fecb1e..42d191e90d05 100644
--- a/games-roguelike/tomenet/Manifest
+++ b/games-roguelike/tomenet/Manifest
@@ -2,22 +2,25 @@
 Hash: SHA256
 
 AUX tomenet-4.5.2-makefile.patch 1655 SHA256 90c81421117d372d7ab57881d87d1fb6ec250eeeb292d95e41df2a55770067d2 SHA512 d949c96dcd710b9549db05ace79816bd3a516e41ce1fe2c2fa1111dfe6852a4d8743e51362ab9581d971ce01c807b85ab9b836b83f691d0b1cb05a4cbe94b63e WHIRLPOOL a3f85e1ccce1f2d9acc451bf735e0dc187226357066ebd833561623ed1e4e7c242c46469e53e379b1fb9afbe0e3a8b5945f4d5132d846e5b0f699ba3ee71bde8
+AUX tomenet-4.5.3-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.2.tar.bz2 2647359 SHA256 29f09d36137e788e7a4df3872f2aee9f476cc714dcdb74c2e57899567869a798 SHA512 44fea45df8984bce7636dca2ea4bfa31d7771643720fc5b242b52c4a461aedd812936c0f888be81cc763b25c3f4d1840b755a70e8fe959110cb4512003bb72b9 WHIRLPOOL ebfcc43a0abcbd297e16d1e8a624015b0c22d785f8469023a1042f69f4efee4cf76c8f56a59e26d1db56df61aec04611913a58d5b68df6e22e6bd5b628091cd4
+DIST tomenet-4.5.3.tar.bz2 2649818 SHA256 74f8c098d8617bc8c7bc634205373e1286efd9febfd6fceb6a3c870ae7e7482e SHA512 a628ff788d2adf785b7c51ee2a264881dd363a1281cddc778adc89cd4aeef9596ecab7f9e484acb51367134fde2aa7a3449c998d72c627266f134abe7e5317e1 WHIRLPOOL 37114bb2973bd4400860c8c71814b95c7d5ab9c2ef54aba6ada2a0f5ca47233c9eebf48271a365bd459f79aa1cb4b7a101b38fa6f38fa66a93037883eddc5bcc
 DIST tomenet-cvs-snapshot-100310.tar.bz2 2253747 SHA256 f76872a4f36d5b509d1b4e9c4449610b7f5f1897928541b8fe5d96f81095d658
 EBUILD tomenet-100310.ebuild 1389 SHA256 df9a2fcd1167fc930546c8d17835ef792f83b0013d60897dc2bd813a1f7b70d0 SHA512 d49d251709595b678caeb209e335fe2cab1c2836b6723a267b79bbb0008453b89c548d636f0727b0174afc8e0a41e7e4ca948c1af2fb8ac8a2678a612e02adf0 WHIRLPOOL f73131b8b78444d55e86af66699ed86d85221ef9388f488f1b4ce1af6abfdc1428ff680188d87a9cac865bb7f74f12ba55b1f358e569bcbe7aaadb889915051d
 EBUILD tomenet-4.5.2.ebuild 2222 SHA256 4e5ea09cb1d36bd49f225db1759c6f852c56b2086f7d0c99f468573d6c124db5 SHA512 d1bc31a50d1b8ed69408ee2a4c09f5f9508fd9af55209dce7da9780636b152708e60a67f49d6f771d2f4e51d38d9b79f938b5f52680a986749342ce152c426de WHIRLPOOL 0339919205fea2431d2ef5f6aed5c5014b27f6bc7cc8d9a0422abd98ab2c9b8b0d0e4e99c279d6b546ce599b132614faf2804fa3a3d9af618acaff69a4c0f960
-MISC ChangeLog 1814 SHA256 0770ff06a0c82acf53ff35c7824dea668ce32d225dab5aa4e42f94e3c268b724 SHA512 5a12d5bbec564c482ec56c311b9f815e40f08af9c00c9f5e60289f73ec3a526bd85fbf253d523dc38eeb0274c23587ab8896a4a4a24afa8296b71ec77a18f5e1 WHIRLPOOL 71eb10038069ed03952aa0d197b9fd1b6f27c28284a59da78cd678b0c3fd4e38c27b6fbf567e8f8a0ea8f1fdb51b2e74df5f5fb49f1bf7dfd5583c677920d87d
+EBUILD tomenet-4.5.3.ebuild 2222 SHA256 dc55d3e448a4594226101aaafb2199a6fc65e37b7644c07ea5f089c8148404ac SHA512 698646716ef57d6d4c9943536dd68dc6b4fa517def3bc3e291478a092bc00dc217ec3190704f009f57eb1abd1240c359885fc3deec99f2b5f64297a45636f5c9 WHIRLPOOL 8d67b2bda8f65e531f2fec950f23334471712a1eab1dd91164378b93d8e5c29bf5fa524317f8085c9c48c97836b91d05d129656a6dc340e44f6f46e318a91209
+MISC ChangeLog 1973 SHA256 6ca38d95457d254f6b8bf0bc1014eed0fb0cbc168285000e49d73805a8604da3 SHA512 b9e07ff3d918c4cb69aeb160c8834c789f42a7bdd4348c3ee8917156c807a780613724ebd2df513de1e12629825a20f4d9aca2e498d677360e9f13161dcf36e1 WHIRLPOOL 222a85a4c19a91103ad9ebfa1ff72f0b277b82fc88bab23c03b43361a7f441f9b614a6051852e5ed4ca55ed99e104e1891081b3366eca09155981e501c775075
 MISC metadata.xml 702 SHA256 87ae42911bd86b56de7c0bc51d6ef64c71bcfee305540e923bc98454a43c4485 SHA512 b9878d09060df615054d8a2a351b7f90d2ae385bc1740d640569c97b3f6961136f5f6df2f2485dbe84e9f5ca311e9eb4816d11ab04a348aac9b05b0fe537d107 WHIRLPOOL b56e0cd138185a7b2e7dc8f92b9d1de088bdcf2bb8197bb88a95498d895f5a2b7aaa2421e77702b720735d7016bc94edb29a92f17842f6bc091a86fb1b641b24
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ+CoGAAoJEFpvPKfnPDWz4WkH/3XRNNebyvjBQq3Iw6WjMNox
-/k2/mSaA9ZCDqS2LVeJsncVmnWoYHA5gYA2Q15H6tzq04LXzYaur+K2vVBlM8Soa
-A0hUN6zTRKn2ji2bVLfvr3w8OXRZXdzT24aJhbnRmPPpS82YjgPbyejtXt2XZKPt
-N0qJH6LldmkQbkf5Bw3Q+k6PHZoSUs1vp+JxHt4/BUblD70qkZwflizN7puk9nVD
-iWulWujKlpkUSZN6Dc8t3YHfoj9fC2Drk8oG93q5MGueKodSApIbkSFaesKFvAhk
-dYWvoYUtYRj0WCdrCWF/wsCW2oMVeIqALSaKrSmQqGhIrndTbtYMuRLpaSawGKU=
-=rgHG
+iQEcBAEBCAAGBQJRCvR4AAoJEFpvPKfnPDWzy+0H/3O1xw93w4GFhkDnSoFyeQv+
+OFPhCVlqDmlbEiesFlvPV+tPmSnvPd5tVNvUerWRmiqbAiHZBkgebAr75E5jUD+n
+hhqP9T0EyDgujF7YDrOFeKC5CjhrG0hgImXxxdqYoSguNQgjyehzsSl5UNadA7xH
+m+JUxzIO4xsy0C6KAI9HgQnhMxgfwE0dce2Nnh8inDs7yefvB7L2raF/gVqGsv59
+Ab4LXRbiPbeTKg4SKh1CrXPkNZXvHsoKNRTjhdeHJqTGlESayh5L8HtHid31KKUv
+WNdrOUTDFNm0NTtolRXh7CSMtyslGHyvvakjH0tCayB2j2RvugVaSYU+DQWh8ZI=
+=Hxww
 -----END PGP SIGNATURE-----
diff --git a/games-roguelike/tomenet/files/tomenet-4.5.3-makefile.patch b/games-roguelike/tomenet/files/tomenet-4.5.3-makefile.patch
new file mode 100644
index 000000000000..318fc6997b87
--- /dev/null
+++ b/games-roguelike/tomenet/files/tomenet-4.5.3-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.3.ebuild b/games-roguelike/tomenet/tomenet-4.5.3.ebuild
new file mode 100644
index 000000000000..d9f618a0428f
--- /dev/null
+++ b/games-roguelike/tomenet/tomenet-4.5.3.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.3.ebuild,v 1.1 2013/01/31 22:47:17 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
+}