version bump wrt #447844 based on work from Paweł Jastrzębski

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

6 files changed, 214 insertions, 15 deletions

diff --git a/games-roguelike/tomenet/ChangeLog b/games-roguelike/tomenet/ChangeLog
index 0baa523daa5f..7dec606fbf41 100644
--- a/games-roguelike/tomenet/ChangeLog
+++ b/games-roguelike/tomenet/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-roguelike/tomenet
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tomenet/ChangeLog,v 1.7 2010/04/26 14:52:24 phajdan.jr Exp $
+# 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 $
+
+*tomenet-4.5.0 (20 Dec 2012)
+
+  20 Dec 2012; Julian Ospald <hasufell@gentoo.org> +tomenet-4.5.0.ebuild,
+  +files/tomenet-4.5.0-makefile.patch, +files/tomenet-wrapper, metadata.xml:
+  version bump wrt #447844 based on work from Paweł Jastrzębski
 
   26 Apr 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   tomenet-100310.ebuild:
diff --git a/games-roguelike/tomenet/Manifest b/games-roguelike/tomenet/Manifest
index 3a531c534975..fb0e840d085c 100644
--- a/games-roguelike/tomenet/Manifest
+++ b/games-roguelike/tomenet/Manifest
@@ -1,4 +1,23 @@
-DIST tomenet-cvs-snapshot-100310.tar.bz2 2253747 RMD160 717ddd11db89026af02fe5ceec21204c115a7608 SHA1 2db24b33b6539162dc1cce544dd47885dc837e9d SHA256 f76872a4f36d5b509d1b4e9c4449610b7f5f1897928541b8fe5d96f81095d658
-EBUILD tomenet-100310.ebuild 1389 RMD160 d58d44643ce99d2de8c50646da959300b39bf8c5 SHA1 4ea42eb1b159eceffec08d041e9a434664ad2399 SHA256 df9a2fcd1167fc930546c8d17835ef792f83b0013d60897dc2bd813a1f7b70d0
-MISC ChangeLog 1019 RMD160 b35f5a1e88767d6208e38c2f8c29d212cb0e9c42 SHA1 eb8665aa962b3f4ccccfa3f7d08fb630693d84fa SHA256 fccfa2a4ca96bbb5910afc9ecacb5ed524b7b03c69ccdd0fbf8aa0b8440d5032
-MISC metadata.xml 615 RMD160 6e41fbf20f8d17d62bce377302b80b46a17de1b5 SHA1 1a7aa3899f4851c5eec4129df8d444f4b3bcb881 SHA256 541b50b3c0f2924cd150c5560fe1c6a9fd17f8feddce78b36c3c506456eb2fd3
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX tomenet-4.5.0-makefile.patch 1499 SHA256 328b0d02987940b85a19834f242ac2026d783792843b7d0be8f2455d9af3ddc5 SHA512 5512462c3f28237f7b0b773bb7f806096c31c81ab404a3e4d69c5b7a3852b42f3383f42eb685d62c86be72fddb2d28a86f280eecb817b05e957509ad2bd581c3 WHIRLPOOL 5cb902059189773ff2cde6daf33fb67dd8d21eed330c50c9a52557562c1fcaac980fab446081a05d93291db636f56f762f8776ae2ad28cce59ff4008f10fc7fa
+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-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
+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
+-----END PGP SIGNATURE-----
diff --git a/games-roguelike/tomenet/files/tomenet-4.5.0-makefile.patch b/games-roguelike/tomenet/files/tomenet-4.5.0-makefile.patch
new file mode 100644
index 000000000000..8c78b42fd531
--- /dev/null
+++ b/games-roguelike/tomenet/files/tomenet-4.5.0-makefile.patch
@@ -0,0 +1,55 @@
+--- makefile
++++ makefile
+@@ -185,7 +185,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
+@@ -197,11 +197,11 @@
+ # 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
+ 
+ 
+ #
+@@ -225,6 +225,15 @@
+ #CFLAGS = -Wall -g -pipe -DUSE_X11 -DUSE_GCU
+ #LIBS = -L/usr/X11R6/lib -lX11 -lcurses
+ 
++# defines
++ifdef USE_SDL
++CFLAGS += -DSOUND_SDL
++SDL_LIBS = $(shell sdl-config --libs) -lSDL_mixer
++endif
++
++ifdef DEFAULT_PATH
++CFLAGS += -DDEFAULT_PATH=\"$(DEFAULT_PATH)\"
++endif
+ 
+ X11BASE = /usr/X11R6
+ 
+@@ -241,8 +250,9 @@
+ #LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lncurses -lcrypt -lm
+ ##
+ ## With SDL
+-CFLAGS = -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -O2 -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 += -I${X11BASE}/include -DUSE_GCU -DUSE_X11 -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 $(shell sdl-config --cflags)
++LIBS += -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lncurses -lcrypt -lm ${SDL_LIBS}
+ #-lXtst (for numlock - obsolete)
+ 
+ ## Uncomment this if you want to bundle libraries with the client
diff --git a/games-roguelike/tomenet/files/tomenet-wrapper b/games-roguelike/tomenet/files/tomenet-wrapper
new file mode 100644
index 000000000000..2ca29b862176
--- /dev/null
+++ b/games-roguelike/tomenet/files/tomenet-wrapper
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+if [ ! -e ~/.tomenet/.gentoo ]; then
+	LIBDIR="@LIBDIR@"
+	[ -e ~/.tomenet ] || mkdir ~/.tomenet
+
+	ln -s "${LIBDIR}"/game ~/.tomenet/game
+	ln -s "${LIBDIR}"/text ~/.tomenet/text
+	cp -R "${LIBDIR}"/user "${LIBDIR}"/scpt "${LIBDIR}"/xtra ~/.tomenet/
+	[ -e ~/.tomenetrc ] || cp "${LIBDIR}"/.tomenetrc ~/.tomenetrc
+
+	touch ~/.tomenet/.gentoo
+fi
+
+TOMENET_PATH="${HOME}/.tomenet"
+export TOMENET_PATH
+cd "${TOMENET_PATH}"
+exec tomenet.bin "$@"
diff --git a/games-roguelike/tomenet/metadata.xml b/games-roguelike/tomenet/metadata.xml
index f885b53ff31a..1712bc53befb 100644
--- a/games-roguelike/tomenet/metadata.xml
+++ b/games-roguelike/tomenet/metadata.xml
@@ -1,14 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
-<longdescription lang="en">
-TomeNET is a multiplayer fantasy dungeon exploration game based on the works of
-J.R.R. Tolkien. It is a game that emphasizes intricate, challenging, and varied
-gameplay over graphics. Hundreds of different monsters in randomly-generated,
-unpredictable dungeons will strive to slay you by various means, and you counter
-- if you survive - by developing the skills of your choice and wielding mighty
-artifacts.
-</longdescription>
+	<herd>games</herd>
+	<use>
+		<flag name='server'>Compile server support</flag>
+	</use>
+	<longdescription lang="en">
+		TomeNET is a multiplayer fantasy dungeon exploration game based on
+		the	works of J.R.R. Tolkien. It is a game that emphasizes intricate,
+		challenging, and varied gameplay over graphics. Hundreds of
+		different monsters in randomly-generated,
+		unpredictable dungeons will strive to slay you by various means,
+		and you counter - if you survive - by developing the skills of your
+		choice and wielding mighty 
+		artifacts.
+	</longdescription>
 </pkgmetadata>
 
diff --git a/games-roguelike/tomenet/tomenet-4.5.0.ebuild b/games-roguelike/tomenet/tomenet-4.5.0.ebuild
new file mode 100644
index 000000000000..af05a4d2e66d
--- /dev/null
+++ b/games-roguelike/tomenet/tomenet-4.5.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tomenet/tomenet-4.5.0.ebuild,v 1.1 2012/12/20 17:34:58 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
+	http://dev.gentoo.org/~hasufell/distfiles/${PN}4.png"
+
+LICENSE="Moria"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dedicated server +sound"
+
+# VERSION BUMP REMINDER:
+# libX11 might be optional at next release
+# via -DUSE_X11
+DEPEND="sys-libs/ncurses
+	x11-libs/libX11
+	sound? (
+		media-libs/libsdl[audio]
+		media-libs/sdl-mixer[vorbis,smpeg,mp3]
+	)"
+RDEPEND="${DEPEND}
+	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
+}
+
+src_compile() {
+	local mytargets="$(usex dedicated "accedit tomenet.server evilmeta" "$(usex server "all" "tomenet")")"
+	emake \
+		$(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 "${DISTDIR}"/${PN}4.png
+		make_desktop_entry ${PN} ${PN} ${PN}4
+	fi
+
+	if use server || use dedicated ; then
+		dogamesbin accedit tomenet.server evilmeta
+		docinto server
+		dodoc runonce runserv runserv3
+	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 server || use dedicated ; then
+		elog "Server scripts in /usr/share/doc/${PF}/server will need adjustment."
+		elog "\"lib\" dir is in ${GAMES_DATADIR}/${PN}"
+	fi
+
+	if use sound; then
+		elog "You can get soundepacks from here:"
+		elog '  http://www.tomenet.net/phpBB3/viewtopic.php?f=4&t=120'
+		elog "They must be placed inside ~/.tomenet directory."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}