update to allow revisions to eternal-lands-data, clean out non-working versions

(Portage version: 2.1.4.4)

4 files changed, 8 insertions, 313 deletions

diff --git a/games-rpg/eternal-lands/ChangeLog b/games-rpg/eternal-lands/ChangeLog
index 97e3af93ec8e..50cfcee5610d 100644
--- a/games-rpg/eternal-lands/ChangeLog
+++ b/games-rpg/eternal-lands/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-rpg/eternal-lands
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/ChangeLog,v 1.45 2008/07/18 02:54:11 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/ChangeLog,v 1.46 2008/07/18 16:49:16 rich0 Exp $
+
+  18 Jul 2008; Richard Freeman <rich0@gentoo.org>
+  -eternal-lands-1.6.0.ebuild, -eternal-lands-1.7.0.ebuild,
+  eternal-lands-1.7.0-r1.ebuild:
+  update to allow revisions to eternal-lands-data, clean out non-working versions
 
 *eternal-lands-1.7.0-r1 (18 Jul 2008)
 
diff --git a/games-rpg/eternal-lands/eternal-lands-1.6.0.ebuild b/games-rpg/eternal-lands/eternal-lands-1.6.0.ebuild
deleted file mode 100644
index ba1a800765ad..000000000000
--- a/games-rpg/eternal-lands/eternal-lands-1.6.0.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# 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.6.0.ebuild,v 1.3 2008/05/14 03:23:22 nyhm Exp $
-
-inherit cvs eutils flag-o-matic games
-
-DESCRIPTION="An online MMORPG written in C and SDL"
-HOMEPAGE="http://www.eternal-lands.com"
-SRC_URI="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
-	!=media-libs/cal3d-0.11.0_pre20050823
-	media-libs/libpng
-	=games-rpg/eternal-lands-data-1.6.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_6_0"
-
-S="${WORKDIR}/${ECVS_MODULE}"
-
-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() {
-	cvs_src_unpack
-	OPTIONS="-DDATA_DIR="\\\\\"${GAMES_DATADIR}/${PN}/\\\\\"""
-	S_CLIENT="${WORKDIR}/elc"
-	BROWSER="firefox"
-
-	cd "${S}"
-
-	# 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"
-
-	# Gah (anybody know why this is here?)
-#	sed -i \
-#		-e 's/CXX=g++/CXX=gcc/' \
-#		Makefile.linux || die "sed failed"
-
-	# 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
-}
-
-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/eternal-lands-1.7.0-r1.ebuild b/games-rpg/eternal-lands/eternal-lands-1.7.0-r1.ebuild
index 69e02853c444..0e2477063325 100644
--- a/games-rpg/eternal-lands/eternal-lands-1.7.0-r1.ebuild
+++ b/games-rpg/eternal-lands/eternal-lands-1.7.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.7.0-r1.ebuild,v 1.1 2008/07/18 02:54:11 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/eternal-lands-1.7.0-r1.ebuild,v 1.2 2008/07/18 16:49:16 rich0 Exp $
 
 inherit cvs eutils flag-o-matic games
 
@@ -29,7 +29,7 @@ RDEPEND="x11-libs/libX11
 	media-libs/cal3d
 	!=media-libs/cal3d-0.11.0_pre20050823
 	media-libs/libpng
-	=games-rpg/eternal-lands-data-1.7.0"
+	>=games-rpg/eternal-lands-data-1.7.0"
 
 DEPEND="${RDEPEND}
 	>=app-admin/eselect-opengl-1.0.6-r1
diff --git a/games-rpg/eternal-lands/eternal-lands-1.7.0.ebuild b/games-rpg/eternal-lands/eternal-lands-1.7.0.ebuild
deleted file mode 100644
index b39350fddc5c..000000000000
--- a/games-rpg/eternal-lands/eternal-lands-1.7.0.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# 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.7.0.ebuild,v 1.2 2008/07/17 23:03:57 mr_bones_ Exp $
-
-inherit cvs eutils flag-o-matic games
-
-DESCRIPTION="An online MMORPG written in C and SDL"
-HOMEPAGE="http://www.eternal-lands.com"
-SRC_URI="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
-	!=media-libs/cal3d-0.11.0_pre20050823
-	media-libs/libpng
-	=games-rpg/eternal-lands-data-1.7.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_7_0"
-
-S="${WORKDIR}/${ECVS_MODULE}"
-
-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() {
-	cvs_src_unpack
-	OPTIONS="-DDATA_DIR="\\\\\"${GAMES_DATADIR}/${PN}/\\\\\"""
-	S_CLIENT="${WORKDIR}/elc"
-	BROWSER="firefox"
-
-	cd "${S}"
-
-	# 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"
-
-	# Gah (anybody know why this is here?)
-#	sed -i \
-#		-e 's/CXX=g++/CXX=gcc/' \
-#		Makefile.linux || die "sed failed"
-
-	# 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
-}
-
-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"
-	elog
-	elog "Note that a segfault is generated by the error reporting code"
-	elog "in v1.7.0.  This is an upstream issue but if you run into this"
-	elog "feel free to comment in bug 232119.  It should be resolved soon."
-
-	# 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 {} \;
-
-}