version bump

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

5 files changed, 179 insertions, 10 deletions

diff --git a/games-roguelike/tomenet/ChangeLog b/games-roguelike/tomenet/ChangeLog
index 7dec606fbf41..fac234083933 100644
--- a/games-roguelike/tomenet/ChangeLog
+++ b/games-roguelike/tomenet/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-roguelike/tomenet
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tomenet/ChangeLog,v 1.8 2012/12/20 17:34:58 hasufell Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tomenet/ChangeLog,v 1.9 2013/01/16 22:28:57 hasufell Exp $
+
+*tomenet-4.5.2 (16 Jan 2013)
+
+  16 Jan 2013; Julian Ospald <hasufell@gentoo.org> +tomenet-4.5.2.ebuild,
+  +files/tomenet-4.5.2-makefile.patch, +files/tomenet-server-wrapper:
+  version bump
 
 *tomenet-4.5.0 (20 Dec 2012)
 
diff --git a/games-roguelike/tomenet/Manifest b/games-roguelike/tomenet/Manifest
index fb0e840d085c..d744139130e5 100644
--- a/games-roguelike/tomenet/Manifest
+++ b/games-roguelike/tomenet/Manifest
@@ -2,22 +2,26 @@
 Hash: SHA256
 
 AUX tomenet-4.5.0-makefile.patch 1499 SHA256 328b0d02987940b85a19834f242ac2026d783792843b7d0be8f2455d9af3ddc5 SHA512 5512462c3f28237f7b0b773bb7f806096c31c81ab404a3e4d69c5b7a3852b42f3383f42eb685d62c86be72fddb2d28a86f280eecb817b05e957509ad2bd581c3 WHIRLPOOL 5cb902059189773ff2cde6daf33fb67dd8d21eed330c50c9a52557562c1fcaac980fab446081a05d93291db636f56f762f8776ae2ad28cce59ff4008f10fc7fa
+AUX tomenet-4.5.2-makefile.patch 1452 SHA256 924f891dd9eed74eb22fb0356031cbdc03882f84bfd1fd72ef1e71d88aae7e60 SHA512 514d2664a6a340db19f4b53899799ee0747124c785fdb42a7747a20b3f842cbba477733e20ffdf90b9caa3b4422c1268c8dd039599998581e5059a61577ffadf WHIRLPOOL d9d6790a8b4eef892046920e314cfd2ea297d7eccb765e0312cfd76d38e1af505943cbd031c89d951bdcb6647a420c77102db2c887cce4e974f917ee41ae966c
+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.0.tar.bz2 2628908 SHA256 e74bdcdea6c05eff8247e23f59baa773c53472196b415e79cd4d37f4937e6f56 SHA512 e85c6f1c51e4317f9806070894440e2a9472fe6147d7611d29dcd84e69329c58b4cb2d6ff2b7c5fa59161c9a6fe4a9d607050db8c9a3a0e6d71e7404df8e0c47 WHIRLPOOL 154babe0385c29c43689bc6490c89c5f018e73ddcdcbc6eff03f91ee343c0d255d6130d748b51362d5c7509bc7e537be4ddd371ac3c20af3d387551757dccff7
+DIST tomenet-4.5.2.tar.bz2 2647359 SHA256 29f09d36137e788e7a4df3872f2aee9f476cc714dcdb74c2e57899567869a798 SHA512 44fea45df8984bce7636dca2ea4bfa31d7771643720fc5b242b52c4a461aedd812936c0f888be81cc763b25c3f4d1840b755a70e8fe959110cb4512003bb72b9 WHIRLPOOL ebfcc43a0abcbd297e16d1e8a624015b0c22d785f8469023a1042f69f4efee4cf76c8f56a59e26d1db56df61aec04611913a58d5b68df6e22e6bd5b628091cd4
 DIST tomenet-cvs-snapshot-100310.tar.bz2 2253747 SHA256 f76872a4f36d5b509d1b4e9c4449610b7f5f1897928541b8fe5d96f81095d658
 DIST tomenet4.png 1641 SHA256 4b6a56defee04d9144d4d80b672e048a5d612e65660d93f7441f4f3f8b40d9b7 SHA512 6ece9a1a5831920a069282b6764b8023b6cee679dba659a61cfdd0ee9e7919ad48de8ab8de9224be405f16594f16e7471c7306b58713f1e4f2491365ecb2b531 WHIRLPOOL 5f734674c780da90dcd9b850344a39b4e6263450489af47c7d65ac11e36238a13490e405355389a5118d7a55ab3989117c24984980587f888d67281017b31a20
 EBUILD tomenet-100310.ebuild 1389 SHA256 df9a2fcd1167fc930546c8d17835ef792f83b0013d60897dc2bd813a1f7b70d0 SHA512 d49d251709595b678caeb209e335fe2cab1c2836b6723a267b79bbb0008453b89c548d636f0727b0174afc8e0a41e7e4ca948c1af2fb8ac8a2678a612e02adf0 WHIRLPOOL f73131b8b78444d55e86af66699ed86d85221ef9388f488f1b4ce1af6abfdc1428ff680188d87a9cac865bb7f74f12ba55b1f358e569bcbe7aaadb889915051d
 EBUILD tomenet-4.5.0.ebuild 2247 SHA256 885df499636e6a77c82b22c9f8f3ef2fc811ee215e3767b33aa0737a3330fdd8 SHA512 aeb5429a9e673cf71fdaa94c30d59d57a9cd8ade33b9f1659b71592f97be28574ba8248f987d2eb876872bc0869113256a6c349f9c5f22007e045bd5df0a5a71 WHIRLPOOL e09364b4a09974393b7a7129bd1227e73cfceeb1505b29e2f0a00fe0d83c5390d65f986739b0e0b264788016de75263402df7e1360ec057f33071c66c6ad9a12
-MISC ChangeLog 1265 SHA256 f0d687d373674132c16fbaa849a7b611d0be5b21a0d0a9d9a0a6d73b948a4c75 SHA512 e0a5405d299307053eb483c37ee34218e6922d04f286345ff9b76bc55c304af685141175175c58db9323d92a63b85c033a5e56b51aeaeaefc082edcf003e3e3f WHIRLPOOL aeedcf8235428a72725100f4d09011587098cdab4e95a9bf9c9d9539799f23d627014ac6a0c30239ae94042315a310128c37170802e7d3d2e3605eae1c8c5cef
+EBUILD tomenet-4.5.2.ebuild 2237 SHA256 4203f25e25cfe97eb1107e3e03673a82d1999743b6d0ff976fc0e9bbf7cc4769 SHA512 d5079555b19827adc519d6923fd3be9970497f741bcc41fc9b9f96e66f93556865af9b0e0cbb1058d015df481392e370cf7b533b284a96918fecdf30bf2b105d WHIRLPOOL 78352d14d6c0948ebfa67b7104defb69fb1ef4b2bc801d6ea58f2974750c553bbb02223fb9c3e6decfa23917aa744a9233c83d01c9cd121a6258dedcf7028ac0
+MISC ChangeLog 1455 SHA256 a12bfb73dc017b4a92f928d9093ab7f147db9c1f75784852dfbb36f367a27443 SHA512 f97ef86f6dd1fb689f70173c96d0a7e54147ca7c7c5dda263aa554ad136667ccdeee86e924dbf8fe74aae2b6cf376d89b05f072381bc648f6b75795319551e25 WHIRLPOOL 78a1b49a95961d96d836f3dcab7b1eb74d44e43a16ea33f8c415feb381b520dd5b7a05c1d67803e902bf711fc1572264fa0c6221f4c319d6fe84c251ef9a0975
 MISC metadata.xml 702 SHA256 87ae42911bd86b56de7c0bc51d6ef64c71bcfee305540e923bc98454a43c4485 SHA512 b9878d09060df615054d8a2a351b7f90d2ae385bc1740d640569c97b3f6961136f5f6df2f2485dbe84e9f5ca311e9eb4816d11ab04a348aac9b05b0fe537d107 WHIRLPOOL b56e0cd138185a7b2e7dc8f92b9d1de088bdcf2bb8197bb88a95498d895f5a2b7aaa2421e77702b720735d7016bc94edb29a92f17842f6bc091a86fb1b641b24
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ00xEAAoJEFpvPKfnPDWzZzIH/3KbbFGvKyIVmMzeSEjPeUBC
-8swpbwyMzikYm4z5A9YCHtuMVXW6CQHKb3P1actvs3DSkAcp/uo2rOsfkCDixXOr
-PvCBF7FMLz2hCkSlIA1NLXQKVcfk6tFVjhfMYsepRhHyHaRWCqP2eNyZJejze+G8
-rf+cwbJUiJc66S4+UYdcA89U8lQ2D8VrJlVqBvJMI0gvxNiUBqRR4Ju/YOrdyc6s
-4qUz6TGSvMx5Jq/+J25tg2Vckh8DfXT2VINwJO/1WnPBEm6fNtoPSo4/ttcNDG/n
-JPj6eVTZPG56dhFn6lRHKZIeAReSu1KOj/MGnoc0hzUtG6HlMBOojM3F+v4RDgM=
-=xuxJ
+iQEcBAEBCAAGBQJQ9ymtAAoJEFpvPKfnPDWzUmYIAKHyxv810vU6P73pNgM6GW/m
+sMiqGrgvhHhuZYm2+WPU6yTIyXt2PkvYOASZpkrXXp1OrWMEI6jecyICVKd0Vtcl
+IvxzM9mlIfm211mDBEuhjNmwHOfQcxDsnBk5kjU1RuRY23+6zfdITDOwf9xh/BJe
+OuJy68RUGpnejEthz/2YomCPJSa1464ugsa4MlWeyVtowR1g96UuR49zUr7gpzwb
+/U9pU+qE+ll8gY2KX4ulXO53R7zcouafGmPYPT+5O0Aaxl4lLzHjnDeHggeSfSrT
+aBSeFwqQWrhPVioij/mN7uGDPQ76T6edX3Akmkivq1feB7TQJv0kkAwF4qaQ5iA=
+=nzfo
 -----END PGP SIGNATURE-----
diff --git a/games-roguelike/tomenet/files/tomenet-4.5.2-makefile.patch b/games-roguelike/tomenet/files/tomenet-4.5.2-makefile.patch
new file mode 100644
index 000000000000..7e408ef9f34e
--- /dev/null
+++ b/games-roguelike/tomenet/files/tomenet-4.5.2-makefile.patch
@@ -0,0 +1,54 @@
+--- makefile
++++ 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
diff --git a/games-roguelike/tomenet/files/tomenet-server-wrapper b/games-roguelike/tomenet/files/tomenet-server-wrapper
new file mode 100644
index 000000000000..831fbfb76ed8
--- /dev/null
+++ b/games-roguelike/tomenet/files/tomenet-server-wrapper
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+TOMENET_PATH="@LIBDIR@"
+export TOMENET_PATH
+cd "${TOMENET_PATH}"
+exec tomenet.server.bin "$@"
diff --git a/games-roguelike/tomenet/tomenet-4.5.2.ebuild b/games-roguelike/tomenet/tomenet-4.5.2.ebuild
new file mode 100644
index 000000000000..9a776dc8a214
--- /dev/null
+++ b/games-roguelike/tomenet/tomenet-4.5.2.ebuild
@@ -0,0 +1,99 @@
+# 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.2.ebuild,v 1.1 2013/01/16 22:28:57 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
+	rm -r ../lib/{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 ../{ChangeLog,TomeNET-Guide.txt,changes.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
+		docinto server
+		dodoc runserv
+	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 soundepacks from here:"
+		elog '  http://tomenet.net/downloads.php'
+		elog "They must be placed inside ~/.tomenet directory."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}