bump to upstream cvs - various bugfixes and one or two new features

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

3 files changed, 163 insertions, 6 deletions

diff --git a/games-rpg/eternal-lands/ChangeLog b/games-rpg/eternal-lands/ChangeLog
index 41aa3352c56b..763b95ac7eef 100644
--- a/games-rpg/eternal-lands/ChangeLog
+++ b/games-rpg/eternal-lands/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-rpg/eternal-lands
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/ChangeLog,v 1.53 2010/04/07 17:43:49 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/ChangeLog,v 1.54 2010/07/23 22:59:45 rich0 Exp $
+
+*eternal-lands-1.9.0_p20100717 (23 Jul 2010)
+
+  23 Jul 2010; Richard Freeman <rich0@gentoo.org>
+  +eternal-lands-1.9.0_p20100717.ebuild:
+  bump to upstream cvs - various bugfixes and one or two new features
 
   07 Apr 2010; Richard Freeman <rich0@gentoo.org>
   eternal-lands-1.9.0.ebuild:
diff --git a/games-rpg/eternal-lands/Manifest b/games-rpg/eternal-lands/Manifest
index 165975329da6..6f3828a3cf92 100644
--- a/games-rpg/eternal-lands/Manifest
+++ b/games-rpg/eternal-lands/Manifest
@@ -2,15 +2,17 @@
 Hash: SHA1
 
 AUX eternal-lands-1.9.0-glext.patch 302 RMD160 81702799ee5b06ed43e6a858c48fd36ab8450a8f SHA1 4281701bf4b1c87ca54f0f0476e524335c461b9b SHA256 696da44a3c5064881f738cc08af05a9e0aa9ae80c342b1d04170459f3834f016
+DIST elc_1.9.0-20100717.tar.bz2 2107100 RMD160 d7e9c587e981dd039788ce9ab48c54005f5e2d4d SHA1 3548f6f02ffcdbade4b8b4b24928c7353a043574 SHA256 1a1181ef0c3091120600187da3d7eb23553647790ba6f8b9aca3130630539747
 DIST elc_1.9.0.tar.bz2 2103257 RMD160 2ac719cc14c301a33ce114ba5fec7cbe8424957f SHA1 c999fdd8cbacd85554ef36a264469b5eb4ffd988 SHA256 afb582046a01f95ed0f3164144caa7347065b3e99beb7c01bf06f496092edbe4
 DIST eternal-lands.png 9955 RMD160 2f9c8acd96214577cf8b8027f0d20fb1fe7574ff SHA1 34ee1c154178090f45ca171509f8ba00d26d6a21 SHA256 dd7d45cd9948fe7875ebd0bfcd1925d9b34e7606a223faf61d37a6dd2cd433fb
 EBUILD eternal-lands-1.9.0.ebuild 3969 RMD160 e1832d432a2e370503629b3c207b78fab5d8ad75 SHA1 cec8e0bbe9c962df9a292093111815b75d8493a7 SHA256 a7906a80e30e56f56f4b29595ac62a15abff7e350ca6a89c4d5ae98b2bbd7b5f
-MISC ChangeLog 9747 RMD160 f95ae0b3857f4e57c76d77fe1ea027348dd6346f SHA1 e2b2a2ba73b5d69b8a4439e5c64e5612f742566f SHA256 30922b6fd136e1a552dd34fcb324632fbf52564535cf659a59c944b1de5604f4
+EBUILD eternal-lands-1.9.0_p20100717.ebuild 3988 RMD160 ef3c64e5e393f73791facffed4af0d5d2e44b51a SHA1 1f09a17b2f94b1880274d0de08229a3e592df02d SHA256 7dc78ac38ed026ba471a8b48bbffb5543531c1c41824b8b2e2db043dff8e716d
+MISC ChangeLog 9955 RMD160 884ddf99d3c2c0d3a79de069fab5324cdfb09292 SHA1 1461c9638a28abe61ceae10981502e102824d777 SHA256 d12918e9056b8ad7a2364570b740542d44105ffb48140ca9abb2198853edc1e5
 MISC metadata.xml 366 RMD160 ccbe7a2729da6681a8dbcd3d7ea23add0ff18c65 SHA1 667cc0ff9d3cc004febdc7e34903e6d81ad2c68d SHA256 3d87566ab1a097e5e331a2238ddb230fe2e5eb2b7097744a2aa609abf0d90732
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAku8xGIACgkQG4/rWKZmVWlYVwCgy8isxRrRQ0x0Wdf46T504pm5
-/DEAoLk//UjI/7/2447yBES918UFnY9J
-=AB2h
+iEYEARECAAYFAkxKHuwACgkQG4/rWKZmVWkG5ACgjIQgshBuvNRnKUE8d8nNJPRj
+YesAoKcCUtslAy1SPpPRu3jasZGEuijG
+=mZ/t
 -----END PGP SIGNATURE-----
diff --git a/games-rpg/eternal-lands/eternal-lands-1.9.0_p20100717.ebuild b/games-rpg/eternal-lands/eternal-lands-1.9.0_p20100717.ebuild
new file mode 100644
index 000000000000..6721ff9d83dd
--- /dev/null
+++ b/games-rpg/eternal-lands/eternal-lands-1.9.0_p20100717.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/eternal-lands-1.9.0_p20100717.ebuild,v 1.1 2010/07/23 22:59:45 rich0 Exp $
+
+EAPI=2
+inherit eutils flag-o-matic games
+
+DESCRIPTION="An online MMORPG written in C and SDL"
+HOMEPAGE="http://www.eternal-lands.com"
+SRC_URI="mirror://gentoo/elc_1.9.0-20100717.tar.bz2
+	mirror://gentoo/eternal-lands.png"
+
+LICENSE="eternal_lands"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="debug doc kernel_linux"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	virtual/opengl
+	virtual/glu
+	media-libs/libsdl[X]
+	media-libs/sdl-net
+	media-libs/sdl-image
+	media-libs/openal
+	media-libs/freealut
+	media-libs/libvorbis
+	dev-libs/libxml2
+	media-libs/cal3d[-16bit-indices]
+	media-libs/libpng
+	>=games-rpg/eternal-lands-data-1.9.0"
+
+DEPEND="${RDEPEND}
+	>=app-admin/eselect-opengl-1.0.6-r1
+	app-arch/unzip
+	doc? ( app-doc/doxygen
+		media-gfx/graphviz )"
+
+#ECVS_SERVER="cvs.elc.berlios.de:/cvsroot/elc"
+#ECVS_MODULE="elc"
+#ECVS_USER="anonymous"
+#ECVS_LOCALNAME="elc"
+#ECVS_PASS=""
+#ECVS_CVS_OPTIONS="-dP -z3"
+#ECVS_BRANCH="elc_1_8_0"
+
+#S="${WORKDIR}/${ECVS_MODULE}"
+S="${WORKDIR}/elc"
+
+src_unpack() {
+#	cvs_src_unpack
+	OPTIONS="-DDATA_DIR="\\\\\"${GAMES_DATADIR}/${PN}/\\\\\"""
+	S_CLIENT="${WORKDIR}/elc"
+	BROWSER="firefox"
+	unpack ${A}
+	cd "${S}"
+}
+
+src_prepare() {
+	# Add debugging options
+	if use debug ; then
+		OPTIONS="${OPTIONS} -DMEMORY_DEBUG"
+		append-flags -ggdb
+	fi
+
+	# Clean compile flags (make Gentoo friendly)
+	sed -i \
+		-e "s@CFLAGS=\$(PLATFORM) \$(CWARN) -O0 -ggdb -pipe@CFLAGS = ${CFLAGS} ${OPTIONS} @g" \
+		-e "s@CXXFLAGS=\$(PLATFORM) \$(CXXWARN) -O0 -ggdb -pipe@CXXFLAGS = ${CXXFLAGS} ${OPTIONS} @g" \
+		-e 's/lopenal/lopenal -l alut/' \
+		Makefile.linux || die "sed failed"
+
+	sed -i \
+		-e 's/#browser/browser/g' \
+		-e "s/browser = mozilla/#browser = ${BROWSER}/g" \
+		-e "s@#data_dir = /usr/local/games/el/@#data_dir = ${GAMES_DATADIR}/${PN}/@g" \
+		el.ini || die "sed failed"
+
+	# Support BSD in the Linux makefile - it's easier
+	use kernel_linux || sed -i \
+		-e 's/^CFLAGS=.*/& -DBSD/' \
+		Makefile.linux || die "sed failed"
+
+	# Clean up library flag order for --as-needed
+#	sed -i -e 's/@$(LINK) $(CFLAGS) $(LDFLAGS) -o $(EXE) $(OBJS)/@$(LINK) $(CFLAGS) -o $(EXE) $(OBJS) $(LDFLAGS)/' Makefile.linux
+
+	# Finally, update the server
+	sed -i -e '/#server_address =/ s/.*/#server_address = game.eternal-lands.com/' \
+		el.ini || die "sed failed"
+
+	sed -i -e 's:FEATURES:EL_FEATURES:' make.defaults
+	sed -i -e 's:FEATURES:EL_FEATURES:' Makefile.linux
+
+	if use debug; then
+		sed -i -e 's/#\(EL_FEATURES += MEMORY_DEBUG\)/\1/' make.defaults
+		sed -i -e 's/#\(EL_FEATURES += MEMORY_DEBUG\)/\1/' Makefile.linux
+	fi
+
+	cp Makefile.linux Makefile
+
+	epatch "${FILESDIR}/${PN}-1.9.0-glext.patch"
+}
+
+src_compile() {
+	emake || die "make failed"
+
+	if use doc; then
+		emake docs || die "Failed to create documentation, try with USE=-doc"
+		mv ./docs/html/ ../client || die "Failed to move documentation directory"
+	fi
+}
+
+src_install() {
+	doicon "${DISTDIR}/eternal-lands.png" ${PN}.png
+
+	newgamesbin el.x86.linux.bin el \
+		|| die "newgamesbin failed"
+	make_desktop_entry el "Eternal Lands" \
+		|| die "make_desktop_entry failed"
+	insopts -m 0660
+	insinto "${GAMES_DATADIR}/${PN}"
+
+	doins -r *.ini *.txt commands.lst \
+		|| die "doins failed"
+
+	if use doc ; then
+		dohtml -r client/*
+	fi
+
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	elog "Auto Update is now enabled in Eternal Lands"
+	elog "If an update occurs then the client will suddenly exit"
+	elog "Updates only happen when the game first loads"
+	elog "Please don't report this behaviour as a bug"
+
+	# Ensure that the files are writable by the game group for auto
+	# updating.
+	chmod -R g+rw "${ROOT}/${GAMES_DATADIR}/${PN}"
+
+	# Make sure new files stay in games group
+	find "${ROOT}/${GAMES_DATADIR}/${PN}" -type d -exec chmod g+sx {} \;
+
+}