version bump

Package-Manager: portage-2.2.14/cvs/Linux x86_64

5 files changed, 182 insertions, 6 deletions

diff --git a/games-roguelike/tomenet/ChangeLog b/games-roguelike/tomenet/ChangeLog
index 744df7f435c4..50a8ae567a88 100644
--- a/games-roguelike/tomenet/ChangeLog
+++ b/games-roguelike/tomenet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-roguelike/tomenet
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tomenet/ChangeLog,v 1.22 2014/10/27 16:19:22 mr_bones_ Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tomenet/ChangeLog,v 1.23 2015/02/18 09:13:13 mr_bones_ Exp $
+
+*tomenet-4.5.9 (18 Feb 2015)
+
+  18 Feb 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/tomenet-4.5.9-makefile.patch, +tomenet-4.5.9.ebuild,
+  tomenet-4.5.5.ebuild:
+  version bump
 
   27 Oct 2014; Michael Sterrett <mr_bones_@gentoo.org> tomenet-4.5.5.ebuild:
   tidy
diff --git a/games-roguelike/tomenet/Manifest b/games-roguelike/tomenet/Manifest
index c3c1fc7a2f98..e58f5894b090 100644
--- a/games-roguelike/tomenet/Manifest
+++ b/games-roguelike/tomenet/Manifest
@@ -1,7 +1,10 @@
 AUX tomenet-4.5.5-makefile.patch 1683 SHA256 de7ce1a835032d194e0217226fa28b9aa23ac7ae58d17c2653a9d324f2051bb1 SHA512 80033a6ac81b15bfbee955856ba478cf6ab8fdc1303b3f7871f7274671989699dfe84792b773e6436b47efc7ec063037407cc1904625953f773b239baa23e3a4 WHIRLPOOL 641a84a78169a70232e9361f05c1365a12917331f7161d0ea31b46b510210a266c227b7723d44a1e96f03e23d40709bb2e099f7086887a09d7ea74acb9b4ec29
+AUX tomenet-4.5.9-makefile.patch 1689 SHA256 ab3f011222e4d44a5db0fcbfac40ee23abd1229a7b613ee93d03508e4e340759 SHA512 906566746c7ddacce2ff4bd2d70050801080b665b874d7ce250f5e514a5395716ced6958a521e04ede9cd804a2b5d2c594281a3c3d72178e0541f09b097c9dad WHIRLPOOL 52586ca78d03107f38f1930144effde54ee8613209295fc99a0ecd762a44191a683856fe058050152403b9208e426d4cd8b0288a4c33355516c3e032979901d6
 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.5.tar.bz2 2787559 SHA256 788a3dbbcb24ad747763a1ff4e80d859d521ac29df3da1d33842e5c39ecbd197 SHA512 2908783062058dfc8c6a29e8a13c658f9222e95b01add3749cfe3cd9edc8ed3478c273bf0963668e8a5b53a6119aa2979a5eb0d50dd386c0b87436ab7be57536 WHIRLPOOL 75d731785deaf31e52986e35faeccc5b4486641b441ad37c367986a800dacd69286104dd22c8fc7ff389f8807826e6cd290b6831d27df7482c23efca1ee83881
-EBUILD tomenet-4.5.5.ebuild 2282 SHA256 eacbf64e14de917cf0bd42af86ec3c7849f8cba554a9ef19d6bfae0facdf5b76 SHA512 77d0a70117024e1bf998efbf6fae052e4f0eb857af58715ebde85c6dce750e002ab128acf742aceff44550a633727e2618ada7c710c786ccbbfb62be3e4297b5 WHIRLPOOL cde6b14d99edaace549cc2260a919fa5eef96a59e84182a7906cbd77295dd8d73a86181158d4a122accfa8aa7d9db8db643cd0ba1a5db9f57edecc89502f91e4
-MISC ChangeLog 3647 SHA256 3e558097ee600263b285df796fd49981cf72766888492c5397db0c175dab33e7 SHA512 a8a92cdc4d5cf71e8a4f07a5fe2770e3a5e637c687a2abf7c59798e9546e3ac94ee50703b5ddc6c9121e7caf524ea8e9c941c17689cff93fb585a4e64c2bcd9b WHIRLPOOL b974eec7c15103ae5a8d00edce4e8f64ab42781771cbd311ffd42b509ee5b5aac7b4ec08bf2ae25a3c7b303598b3794d2a754e67af279b87c9705ed236c1a62f
+DIST tomenet-4.5.9.tar.bz2 3012187 SHA256 40ce5068e2ee10ad051241d5c44423bb74a9ef4054260ee692adeccc9b46d4c7 SHA512 1e13e37b209ab274fb6aeafeb270cff0590ffa352b91b61970194e968826bed3fd365c210238a48b067d0882bac737c70250d8846acc816e3c3ac0b3b843ee1d WHIRLPOOL c9106d27be0e9f173eae24d12f79b75818b1dd23d2c1c93dd4a1a707de6ddaf7538de0dce73216d4a32a290245cd4c09dd26bbc3b54e811484a3a44bb2945fa6
+EBUILD tomenet-4.5.5.ebuild 2282 SHA256 28757154f3e66f8dfd7c7b54c4724d75c26c6537ec0173e4869e71c04dabdc06 SHA512 c65be1f80a27b6302d7c9974170be1648a6642e78c4dbdbfc5efff75f1ae6667543b86780e0480dfa777fc04cbda8ee7342b75d8ace4992486d58ba95b92c029 WHIRLPOOL 90a529c230d96b5d5135634d45e9562d45df75860eb160b46e04cfa71c1792f35f03b4dcf235ccb61a493570c1dd63e4b90cd15ecfbe81cc0d8555744744f8fe
+EBUILD tomenet-4.5.9.ebuild 2280 SHA256 4cbff5f9e2eccc7594f5cc8401ba1e68e89a2a4396b76854f1fc9cab016e80f4 SHA512 30e6d21445834df963cf45119095f2f47698f0f66e4516af0211fa5587333ee2ada9d6d506e4b42ffc3d2c60979aa8b717dc5edbc0679d47caaa96b8305e1f5c WHIRLPOOL a5596bf1006e8e3473ed6a7b0bef166e68ba02a0a1705a9975ce54ebb03bf9b8ee81c3d4897656e7783affe328de3ce35940ed42da82a6f22d26ee260b4d26b9
+MISC ChangeLog 3834 SHA256 d1931296d7c928a0954512c2a0d9b05b55c2965a4b531766215f08833f6ac52b SHA512 381aa805705f70a0eb309ebd3535a4b2c00a43ad72f94b75e549609abf3c5a6b46288b42fa2155c4e9fac792428ee836c48dafbe3132eb682499bf4ce1cf9cef WHIRLPOOL da7fc2f897c80f565e98d50628af5559e4b97dd97777f9d4b4bb6acce9cee5aa56c9cd548c5971d787b332d532afaabd47a3c436add0924ac0d84c7432f055d5
 MISC metadata.xml 702 SHA256 87ae42911bd86b56de7c0bc51d6ef64c71bcfee305540e923bc98454a43c4485 SHA512 b9878d09060df615054d8a2a351b7f90d2ae385bc1740d640569c97b3f6961136f5f6df2f2485dbe84e9f5ca311e9eb4816d11ab04a348aac9b05b0fe537d107 WHIRLPOOL b56e0cd138185a7b2e7dc8f92b9d1de088bdcf2bb8197bb88a95498d895f5a2b7aaa2421e77702b720735d7016bc94edb29a92f17842f6bc091a86fb1b641b24
diff --git a/games-roguelike/tomenet/files/tomenet-4.5.9-makefile.patch b/games-roguelike/tomenet/files/tomenet-4.5.9-makefile.patch
new file mode 100644
index 000000000000..4f0a3a0f0790
--- /dev/null
+++ b/games-roguelike/tomenet/files/tomenet-4.5.9-makefile.patch
@@ -0,0 +1,66 @@
+--- 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
+@@ -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.5.5.ebuild b/games-roguelike/tomenet/tomenet-4.5.5.ebuild
index f2065487f6f2..7304c1a4868e 100644
--- a/games-roguelike/tomenet/tomenet-4.5.5.ebuild
+++ b/games-roguelike/tomenet/tomenet-4.5.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tomenet/tomenet-4.5.5.ebuild,v 1.4 2014/10/27 16:19:22 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tomenet/tomenet-4.5.5.ebuild,v 1.5 2015/02/18 09:13:13 mr_bones_ Exp $
 
 EAPI=5
 inherit eutils gnome2-utils toolchain-funcs games
diff --git a/games-roguelike/tomenet/tomenet-4.5.9.ebuild b/games-roguelike/tomenet/tomenet-4.5.9.ebuild
new file mode 100644
index 000000000000..4996c42e7b85
--- /dev/null
+++ b/games-roguelike/tomenet/tomenet-4.5.9.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tomenet/tomenet-4.5.9.ebuild,v 1.1 2015/02/18 09:13:13 mr_bones_ Exp $
+
+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
+	!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
+}