fixed conflict with FEATURES variable - thanks to Jetchko Jekov for spotting it

Package-Manager: portage-2.1.3.19

4 files changed, 170 insertions, 6 deletions

diff --git a/games-rpg/eternal-lands/ChangeLog b/games-rpg/eternal-lands/ChangeLog
index 7bda1b33ab39..b4cc161813ee 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/ChangeLog,v 1.37 2007/12/29 03:52:47 rich0 Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/ChangeLog,v 1.38 2008/01/15 19:34:47 rich0 Exp $
+
+*eternal-lands-1.5.0-r1 (15 Jan 2008)
+
+  15 Jan 2008; Richard Freeman <rich0@gentoo.org>
+  +eternal-lands-1.5.0-r1.ebuild:
+  fixed conflict with FEATURES variable - thanks to Jetchko Jekov for spotting it
 
   29 Dec 2007; Richard Freeman <rich0@gentoo.org>
   eternal-lands-1.5.0.ebuild:
diff --git a/games-rpg/eternal-lands/Manifest b/games-rpg/eternal-lands/Manifest
index 8f83b5fd1d44..404912b620da 100644
--- a/games-rpg/eternal-lands/Manifest
+++ b/games-rpg/eternal-lands/Manifest
@@ -1,13 +1,17 @@
 DIST elc_150.tar.bz2 1718210 RMD160 d651456e18662cb635c31270f1430fb64f731f17 SHA1 90a72fb165356c6d9b83670c1759394c8adb091a SHA256 880ee5397b74e9dc4e2ed1f0a004b189b90607da4e7a349660079f2a99851f8a
 DIST eternal-lands.png 9955 RMD160 2f9c8acd96214577cf8b8027f0d20fb1fe7574ff SHA1 34ee1c154178090f45ca171509f8ba00d26d6a21 SHA256 dd7d45cd9948fe7875ebd0bfcd1925d9b34e7606a223faf61d37a6dd2cd433fb
+EBUILD eternal-lands-1.5.0-r1.ebuild 4217 RMD160 b8f00077439e614cee0d3530991ecfdf58b86735 SHA1 ce69d0dc00d4ec1c289b28e43c33dac99f7c75b1 SHA256 d183e54659c32baab22794bd1c515893d7eaa05fcffed4baea3b3e8784d1a631
+MD5 77b681dc74860524c296b55122cc7c0d eternal-lands-1.5.0-r1.ebuild 4217
+RMD160 b8f00077439e614cee0d3530991ecfdf58b86735 eternal-lands-1.5.0-r1.ebuild 4217
+SHA256 d183e54659c32baab22794bd1c515893d7eaa05fcffed4baea3b3e8784d1a631 eternal-lands-1.5.0-r1.ebuild 4217
 EBUILD eternal-lands-1.5.0.ebuild 4017 RMD160 f3f0c0e178769acafe5a4c3e1a98585fadda38d1 SHA1 043d951951dbafa15f190d43abbaa4ef31b50ab1 SHA256 eb2d39db88eac58d43a7eacecf87e21315a2ee3299adae6025144649a1b3e5af
 MD5 6c942e40db15072a7bded484fd01ab66 eternal-lands-1.5.0.ebuild 4017
 RMD160 f3f0c0e178769acafe5a4c3e1a98585fadda38d1 eternal-lands-1.5.0.ebuild 4017
 SHA256 eb2d39db88eac58d43a7eacecf87e21315a2ee3299adae6025144649a1b3e5af eternal-lands-1.5.0.ebuild 4017
-MISC ChangeLog 6996 RMD160 1fe0a2dfee180ed888f71d1c017853033ef319d7 SHA1 2831e18b61fde4fe5b11106c7b0a2269d11857a0 SHA256 d833a611672978f0bbb4993099f9842678aa9849b89da16049258541e3397a94
-MD5 334f0ec03dac8bf5c30839b48815d044 ChangeLog 6996
-RMD160 1fe0a2dfee180ed888f71d1c017853033ef319d7 ChangeLog 6996
-SHA256 d833a611672978f0bbb4993099f9842678aa9849b89da16049258541e3397a94 ChangeLog 6996
+MISC ChangeLog 7202 RMD160 07edfe0847a0d8e4a3b0e3523731f06c3bf96ea1 SHA1 7874ce9a1ff5b0eca833ee2ab542a5dee18fc834 SHA256 2f2f31768873ad059b1527d1e842affb80341790edf2fa4a40f199a7a3072fa6
+MD5 e692a0494ec8cd480f0a39d1c4c1c547 ChangeLog 7202
+RMD160 07edfe0847a0d8e4a3b0e3523731f06c3bf96ea1 ChangeLog 7202
+SHA256 2f2f31768873ad059b1527d1e842affb80341790edf2fa4a40f199a7a3072fa6 ChangeLog 7202
 MISC metadata.xml 366 RMD160 ccbe7a2729da6681a8dbcd3d7ea23add0ff18c65 SHA1 667cc0ff9d3cc004febdc7e34903e6d81ad2c68d SHA256 3d87566ab1a097e5e331a2238ddb230fe2e5eb2b7097744a2aa609abf0d90732
 MD5 67aa2fde42a58edc954b67ab7ee5902a metadata.xml 366
 RMD160 ccbe7a2729da6681a8dbcd3d7ea23add0ff18c65 metadata.xml 366
@@ -15,3 +19,6 @@ SHA256 3d87566ab1a097e5e331a2238ddb230fe2e5eb2b7097744a2aa609abf0d90732 metadata
 MD5 279a654b9c54dee2ffb3d8863bc7eecc files/digest-eternal-lands-1.5.0 455
 RMD160 195fdce2d2f5aa4cde00f6b6d3647c2ad66ca6ca files/digest-eternal-lands-1.5.0 455
 SHA256 b7b53ee22c88a99042985442333a81132b7d68840da0dc79cb017f242befcb8b files/digest-eternal-lands-1.5.0 455
+MD5 279a654b9c54dee2ffb3d8863bc7eecc files/digest-eternal-lands-1.5.0-r1 455
+RMD160 195fdce2d2f5aa4cde00f6b6d3647c2ad66ca6ca files/digest-eternal-lands-1.5.0-r1 455
+SHA256 b7b53ee22c88a99042985442333a81132b7d68840da0dc79cb017f242befcb8b files/digest-eternal-lands-1.5.0-r1 455
diff --git a/games-rpg/eternal-lands/eternal-lands-1.5.0-r1.ebuild b/games-rpg/eternal-lands/eternal-lands-1.5.0-r1.ebuild
new file mode 100644
index 000000000000..490a39269d06
--- /dev/null
+++ b/games-rpg/eternal-lands/eternal-lands-1.5.0-r1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2008 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.5.0-r1.ebuild,v 1.1 2008/01/15 19:34:47 rich0 Exp $
+
+inherit eutils flag-o-matic games
+
+MY_PV="${PV//_/}"
+MY_PV="${MY_PV//./}"
+S="${WORKDIR}/elc"
+DESCRIPTION="An online MMORPG written in C and SDL"
+HOMEPAGE="http://www.eternal-lands.com"
+SRC_URI="mirror://gentoo/elc_${MY_PV}.tar.bz2
+	mirror://gentoo/eternal-lands.png"
+
+# NOTE: Sometimes you'll have to roll your own elc tarball from their CVS
+# tree as they don't always release one.
+# If they do then use this in SRC_URI instead
+# ftp://ftp.berlios.de/pub/elc/elc_${MY_PV}.tgz
+
+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
+	>=media-libs/libsdl-1.2.5
+	>=media-libs/sdl-net-1.2.5
+	media-libs/openal
+	media-libs/freealut
+	media-libs/libvorbis
+	>=dev-libs/libxml2-2.6.7
+	media-libs/cal3d
+	!=media-libs/cal3d-0.11.0_pre20050823
+	>=media-libs/libpng-1.2.8
+	media-libs/sdl-image
+	media-libs/mesa
+	~games-rpg/${PN}-data-${PV}"
+
+DEPEND="${RDEPEND}
+	>=app-admin/eselect-opengl-1.0.6-r1
+	app-arch/unzip
+	doc? ( >=app-doc/doxygen-1.3.8
+		>=media-gfx/graphviz-1.10 )"
+
+pkg_setup() {
+	games_pkg_setup
+	if built_with_use media-libs/cal3d 16bit-indices ; then
+		eerror "${PN} won't work if media-libs/cal3d has been built with 16bit-indices"
+		die "re-emerge  media-libs/cal3d without the 16bit-indices USE flag"
+	fi
+}
+
+src_unpack() {
+	OPTIONS="-DDATA_DIR="\\\\\"${GAMES_DATADIR}/${PN}/\\\\\"""
+	S_CLIENT="${WORKDIR}/elc"
+	BROWSER="firefox"
+
+	unpack ${A}
+	cd "${S}"
+
+	# Create updated files with correct perms and allow dir creation
+	#epatch "${FILESDIR}/${PN}-1.3.0-update-createdir.patch"
+
+	# Build for amd64
+	use amd64 && OPTIONS="${OPTIONS} -DX86_64"
+
+	# This should be default in the next version
+	OPTIONS="${OPTIONS} -DUSE_ACTOR_DEFAULTS -DGL_EXTENSION_CHECK"
+
+	# Add debugging options
+	if use debug ; then
+		OPTIONS="${OPTIONS} -DMEMORY_DEBUG"
+		append-flags -ggdb
+	fi
+
+	sed \
+		-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 > Makefile \
+		|| 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 || die "sed failed"
+
+	# Gah
+	sed -i -e 's/CXX=g++/CXX=gcc/' Makefile || die "sed failed"
+
+	# Update the server
+	sed -i -e '/#server_address =/ s/.*/#server_address = game.eternal-lands.com/' \
+		el.ini || die "sed failed"
+
+	# EL uses its own FEATURES environment var - rename it
+	sed -i -e 's:FEATURES:EL_FEATURES:' make.defaults
+	sed -i -e 's:FEATURES:EL_FEATURES:' Makefile.linux
+	sed -i -e 's:FEATURES:EL_FEATURES:' Makefile
+}
+
+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() {
+	newgamesbin el.x86.linux.bin el || die "newgamesbin failed"
+	doicon "${DISTDIR}/eternal-lands.png"
+	make_desktop_entry el "Eternal Lands"
+
+	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/digest-eternal-lands-1.5.0-r1 b/games-rpg/eternal-lands/files/digest-eternal-lands-1.5.0-r1
new file mode 100644
index 000000000000..c23464263959
--- /dev/null
+++ b/games-rpg/eternal-lands/files/digest-eternal-lands-1.5.0-r1
@@ -0,0 +1,6 @@
+MD5 8109d42317f3d50f198b8649b339e169 elc_150.tar.bz2 1718210
+RMD160 d651456e18662cb635c31270f1430fb64f731f17 elc_150.tar.bz2 1718210
+SHA256 880ee5397b74e9dc4e2ed1f0a004b189b90607da4e7a349660079f2a99851f8a elc_150.tar.bz2 1718210
+MD5 059df8128b11b19a76b54e9907072f00 eternal-lands.png 9955
+RMD160 2f9c8acd96214577cf8b8027f0d20fb1fe7574ff eternal-lands.png 9955
+SHA256 dd7d45cd9948fe7875ebd0bfcd1925d9b34e7606a223faf61d37a6dd2cd433fb eternal-lands.png 9955