fix for 302198

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

4 files changed, 171 insertions, 13 deletions

diff --git a/games-rpg/eternal-lands/ChangeLog b/games-rpg/eternal-lands/ChangeLog
index 76ba67b9adae..d3c3ced307cb 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/ChangeLog,v 1.50 2009/10/17 13:37:14 rich0 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/ChangeLog,v 1.51 2010/02/04 22:39:01 rich0 Exp $
+
+*eternal-lands-1.8.0-r2 (03 Feb 2010)
+
+  03 Feb 2010; Richard Freeman <rich0@gentoo.org>
+  +eternal-lands-1.8.0-r2.ebuild, +files/eternal-lands-1.8.0-glext.patch:
+  fix for 302198
 
 *eternal-lands-1.8.0-r1 (17 Oct 2009)
 
diff --git a/games-rpg/eternal-lands/Manifest b/games-rpg/eternal-lands/Manifest
index 9fbb3578ff0f..1b0a4fea864f 100644
--- a/games-rpg/eternal-lands/Manifest
+++ b/games-rpg/eternal-lands/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX eternal-lands-1.8.0-glext.patch 302 RMD160 81702799ee5b06ed43e6a858c48fd36ab8450a8f SHA1 4281701bf4b1c87ca54f0f0476e524335c461b9b SHA256 696da44a3c5064881f738cc08af05a9e0aa9ae80c342b1d04170459f3834f016
 DIST elc_1.8.0.tar.bz2 1902747 RMD160 2fac7db6d8abde11d1dd3fd749eeb5a1cee40850 SHA1 28f38e05f534d892303d5877eccaefab1222fe4c SHA256 804c6b97886756fad8897b114ebf90fe30ec2adb2b849b91f7ec28d6d5b296d5
 DIST eternal-lands.png 9955 RMD160 2f9c8acd96214577cf8b8027f0d20fb1fe7574ff SHA1 34ee1c154178090f45ca171509f8ba00d26d6a21 SHA256 dd7d45cd9948fe7875ebd0bfcd1925d9b34e7606a223faf61d37a6dd2cd433fb
 EBUILD eternal-lands-1.8.0-r1.ebuild 3921 RMD160 ed619cd7596f2e525cc25a379271a5fe3ebab8c9 SHA1 a9bc82fbb5ecd0be3d4de284d9635cdc40dfe22a SHA256 ee58d6c7015a6f823d770e69838a9cb88b7543cf95f34832d41256ac60d8acbd
+EBUILD eternal-lands-1.8.0-r2.ebuild 3968 RMD160 94fc5e14b4edd2a1d54d2cd6bd7e4827f773d8cd SHA1 51d68ad24a0651db352afaf811cf6b612598c231 SHA256 66f1192358ed2c3148368e9a196dafbcf6589b5737496b9147198596399ee14c
 EBUILD eternal-lands-1.8.0.ebuild 3747 RMD160 f6b82f5310eeb45e4e7bf07e16f79ba4e236671b SHA1 80ec651078ebf4f8154970e4354f0d5fb3283427 SHA256 3ba5134b1db876040200220fe3f25283b3539c32c6ebb835976b8e4fe8095eaf
-MISC ChangeLog 9027 RMD160 bad941d01a1b09f6c9f1732bbb2c4a9542b3e339 SHA1 4998805083d89995af25bdfc03be64fca181d946 SHA256 c22cdd8b9b7043be6f52fc49fa7a7adc39fb1f7ddf3a36a5185fecf51d046eb5
+MISC ChangeLog 9208 RMD160 a27214c4ec2d27a2c18653324d36562b0013fafc SHA1 b887a8ce03b39d8f0f49296c9ba3f888d4d6de8a SHA256 f3aa76c976f29a5d978be2bacc8f8054f452dbb3b43dfe1d2259556341e53cf5
 MISC metadata.xml 366 RMD160 ccbe7a2729da6681a8dbcd3d7ea23add0ff18c65 SHA1 667cc0ff9d3cc004febdc7e34903e6d81ad2c68d SHA256 3d87566ab1a097e5e331a2238ddb230fe2e5eb2b7097744a2aa609abf0d90732
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrZyJUACgkQG4/rWKZmVWnuiACfSCky5fx2Mnjq9ZSk31kK+c/D
-xOMAoMEM4lD2vWOkveVAxqCTj6LlrQDE
-=UseF
------END PGP SIGNATURE-----
diff --git a/games-rpg/eternal-lands/eternal-lands-1.8.0-r2.ebuild b/games-rpg/eternal-lands/eternal-lands-1.8.0-r2.ebuild
new file mode 100644
index 000000000000..cb8bf4b0c96b
--- /dev/null
+++ b/games-rpg/eternal-lands/eternal-lands-1.8.0-r2.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.8.0-r2.ebuild,v 1.1 2010/02/04 22:39:01 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.8.0.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
+	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.8.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.8.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 {} \;
+
+}
diff --git a/games-rpg/eternal-lands/files/eternal-lands-1.8.0-glext.patch b/games-rpg/eternal-lands/files/eternal-lands-1.8.0-glext.patch
new file mode 100644
index 000000000000..a41db54c0f37
--- /dev/null
+++ b/games-rpg/eternal-lands/files/eternal-lands-1.8.0-glext.patch
@@ -0,0 +1,11 @@
+--- platform.h.orig	2010-02-03 13:21:41.300205559 -0500
++++ platform.h	2010-02-03 13:22:25.704049074 -0500
+@@ -79,7 +79,7 @@
+  #define GL_GLEXT_LEGACY
+  #include <GL/gl.h>
+  #include <GL/glu.h>
+- #include "glext.h"
++ #include <GL/glext.h>
+ #endif
+ 
+ // Inlucde the plaform specific location sound libs