version bump

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

4 files changed, 180 insertions, 10 deletions

diff --git a/games-roguelike/tomenet/ChangeLog b/games-roguelike/tomenet/ChangeLog
index 97fa7f4cd9ce..2e32ece05802 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.14 2013/05/07 23:04:08 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tomenet/ChangeLog,v 1.15 2013/07/16 11:24:22 hasufell Exp $
+
+*tomenet-4.5.3b (16 Jul 2013)
+
+  16 Jul 2013; Julian Ospald <hasufell@gentoo.org> +tomenet-4.5.3b.ebuild,
+  +files/tomenet-4.5.3b-makefile.patch:
+  version bump
 
 *tomenet-4.5.3a (07 May 2013)
 
diff --git a/games-roguelike/tomenet/Manifest b/games-roguelike/tomenet/Manifest
index 4b66696cad08..0e52c50154ae 100644
--- a/games-roguelike/tomenet/Manifest
+++ b/games-roguelike/tomenet/Manifest
@@ -4,24 +4,27 @@ 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-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-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-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
 EBUILD tomenet-4.5.2.ebuild 2222 SHA256 4e5ea09cb1d36bd49f225db1759c6f852c56b2086f7d0c99f468573d6c124db5 SHA512 d1bc31a50d1b8ed69408ee2a4c09f5f9508fd9af55209dce7da9780636b152708e60a67f49d6f771d2f4e51d38d9b79f938b5f52680a986749342ce152c426de WHIRLPOOL 0339919205fea2431d2ef5f6aed5c5014b27f6bc7cc8d9a0422abd98ab2c9b8b0d0e4e99c279d6b546ce599b132614faf2804fa3a3d9af618acaff69a4c0f960
 EBUILD tomenet-4.5.3.ebuild 2222 SHA256 dc55d3e448a4594226101aaafb2199a6fc65e37b7644c07ea5f089c8148404ac SHA512 698646716ef57d6d4c9943536dd68dc6b4fa517def3bc3e291478a092bc00dc217ec3190704f009f57eb1abd1240c359885fc3deec99f2b5f64297a45636f5c9 WHIRLPOOL 8d67b2bda8f65e531f2fec950f23334471712a1eab1dd91164378b93d8e5c29bf5fa524317f8085c9c48c97836b91d05d129656a6dc340e44f6f46e318a91209
 EBUILD tomenet-4.5.3a.ebuild 2223 SHA256 2e3a30b05e131841c0951511f36509b6d642b3683dc49fdeb810d10bfbcb7bed SHA512 3715adab0cbdcac29193cdda49e5d9680d84f67d5959d2f003b995d4ef5c24ee720e5975474905feb0149cf11c3c118cdb6cbfd1bed2aa6f644a1cf2ec239f21 WHIRLPOOL cc52b5bd072bd7efd58c3042d63ebc0552e2512b9835e040ccc27d289e43a9d92b643d2272fe9c7682e2fcded2a28f2136f9e410dd4e7c0d9108e2dffd7847db
-MISC ChangeLog 2236 SHA256 7b0267a91d7abb7c1e1a56432085bdd69b0e3c5bb50b1db56bbde33fb6a9b1f2 SHA512 60f028f2604cdad04297d6fc04a39ea7c697a4c0842ce5e07fdb0bf6f321564655f3f0f58df1a9f183a6e7022998bfa8bdde600dc6cff0da69048ea636e9f84b WHIRLPOOL 7e374bc0cdb8379e6c31fdb5c977db4135db0f5cb54e2c09195a891e36b594580ee90f52c2cb338bcde2110f36d35ad040e32e51b48df4c5b60bc39840ee79ca
+EBUILD tomenet-4.5.3b.ebuild 2223 SHA256 08fdf598abf1fb03c83f11ce4e517cb3dc4e8af9793f7ec8a9332ed6cb977f53 SHA512 e5a824754d399ed5a46c4855bb5e50d8477ed877d7d9f841c6a3fe3b37f10a0957f2ad3a7d2ecacb36d5620c57ceadcf89c52c7423d34fe3e4871c831ad8023b WHIRLPOOL 21d71028e9357ed6a65cba90995820fa5aad9ad882a3e3386d48576abc1b6933fcae50ea06fcbe7e3406b37487a154df6adc7ef14876f4b1009d51d93ca966db
+MISC ChangeLog 2398 SHA256 6f5be4d0edf38b12b6175d0bc3a25c246976e441b2c75f570be458f4f3772236 SHA512 f237b6c4a72706a91bee7c887ac5d6818cc2e1bc6eac7bc1aecaf503f07af8b65eec23f0ffd2277034d5bb82997303c65592f036668bcba73ef913d2afc1cea3 WHIRLPOOL 98024bddf7f449eb6f8ea5662b43cf17949cd747f613c640f060195fe9ed2b0f9ee0b031037cd08936103b40e1f7339d17b06074acbd06b5bcd1bfd7fb2b8357
 MISC metadata.xml 702 SHA256 87ae42911bd86b56de7c0bc51d6ef64c71bcfee305540e923bc98454a43c4485 SHA512 b9878d09060df615054d8a2a351b7f90d2ae385bc1740d640569c97b3f6961136f5f6df2f2485dbe84e9f5ca311e9eb4816d11ab04a348aac9b05b0fe537d107 WHIRLPOOL b56e0cd138185a7b2e7dc8f92b9d1de088bdcf2bb8197bb88a95498d895f5a2b7aaa2421e77702b720735d7016bc94edb29a92f17842f6bc091a86fb1b641b24
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRiYhsAAoJEFpvPKfnPDWz/eUH/3uxQ0PbSGTWdPIN8k3Lv5D1
-4tF9x6Cuc4KQMVEKi6KyyX2/5qjD6Atw1JI+RicJdTXMqvL/HVl7CYq+Xdr5+wEN
-ALzCi2SrshdAg/DqvDv6S8Kf/AsX9l4izoEmEOKL9FcqEarJ4OUY2ptXT6qfgC3M
-8ehBcHgafmi0OlCtA7J38V/rwQed7JFKPy8P6rni7/1W7e+5qCn1SI8I5A2XPF+S
-ovlwS5tML8bama+/3widq1dHmTGDq6qJ+eDcBnBjYHjvdYHd7SPU5xv6BMRNNT7B
-3Mvkl+m7Ad08A4HGO2vHTkKq7/I/+jopm3bdQc80vXi7Ax9JAxd5J7ec5TmweFI=
-=GI/N
+iQEcBAEBCAAGBQJR5S1oAAoJEFpvPKfnPDWzLRYIAJNW0vaacPI6E1SyOCHUV48S
+eYSVpEDuxchqkv0kGcqIg8q0m9xMs9zZVMtkHp40GRkcRf5rS84ggHaBnnFIUrw9
+EaaMUgFymStzYBFNGU0RYcY7VgxkpJo3IBqnEOdgv/b/diwWOpmhBXf/e3PGrPGw
+M9BpvhRx6O15nmVkzKKbge1sUAKC2ln9FrrNT4Y69APcjM7OFG8IWNhT+ymYIEuB
+RbmQ7TEPy5NJ82n+S0T4Kt8Il0j1k89bPmjd0u9rnnshKcLdR2lyVkTMZwN5xUDh
+KdzeUQonmQgMw2TbiSilgws0c2mIKUefxdhhxp/ByBhmbsCYdTQ9YguuabyW8qY=
+=Zipj
 -----END PGP SIGNATURE-----
diff --git a/games-roguelike/tomenet/files/tomenet-4.5.3b-makefile.patch b/games-roguelike/tomenet/files/tomenet-4.5.3b-makefile.patch
new file mode 100644
index 000000000000..318fc6997b87
--- /dev/null
+++ b/games-roguelike/tomenet/files/tomenet-4.5.3b-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.3b.ebuild b/games-roguelike/tomenet/tomenet-4.5.3b.ebuild
new file mode 100644
index 000000000000..130e184cbc64
--- /dev/null
+++ b/games-roguelike/tomenet/tomenet-4.5.3b.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.3b.ebuild,v 1.1 2013/07/16 11:24:22 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
+}