New version.

  This is just the elc client now - the artwork and music have been split off
  into eternal-lands-data.
(Portage version: 2.1_pre4-r1)

6 files changed, 118 insertions, 150 deletions

diff --git a/games-rpg/eternal-lands/ChangeLog b/games-rpg/eternal-lands/ChangeLog
index 53a041f28a13..084a468183d7 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/ChangeLog,v 1.7 2005/10/28 14:34:38 wolf31o2 Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/ChangeLog,v 1.8 2006/02/13 21:32:03 uberlord Exp $
+
+  13 Feb 2006; Roy Marples <uberlord@gentoo.org>
+  -eternal-lands-1.1.2.ebuild, +eternal-lands-1.2.0_p1.ebuild:
+  New version.
+  This is just the elc client now - the artwork and music have been split off
+  into eternal-lands-data.
 
   28 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   eternal-lands-1.0.1.ebuild, eternal-lands-1.1.2.ebuild:
diff --git a/games-rpg/eternal-lands/Manifest b/games-rpg/eternal-lands/Manifest
index c115b9828920..4276b09be051 100644
--- a/games-rpg/eternal-lands/Manifest
+++ b/games-rpg/eternal-lands/Manifest
@@ -1,4 +1,12 @@
-MD5 99735af03908e8a0ce11b2f97acaf730 ChangeLog 1360
-MD5 5c06e9a09ae290ab9488b4b873183687 eternal-lands-1.1.2.ebuild 4059
-MD5 e6486bdc48faa0017a36591fb674f105 files/digest-eternal-lands-1.1.2 242
+MD5 989f205e50df6200a07222aad5c7ab1e ChangeLog 1593
+RMD160 976f47a84ba1985ebe63ce6710b3da40cfadc4ff ChangeLog 1593
+SHA256 3139bfdc10fcd2342503cdadd6ae97705de53a286d81879337eb9bbca518fcde ChangeLog 1593
+MD5 ca5c5d65ff9cac239f4a555c57934d25 eternal-lands-1.2.0_p1.ebuild 2378
+RMD160 0021e29b801e60975a4fee22221300543565bc74 eternal-lands-1.2.0_p1.ebuild 2378
+SHA256 7f856f77894b2c01185a8b6167adb01a545936d73d5186c605418eb65d0744a7 eternal-lands-1.2.0_p1.ebuild 2378
+MD5 942fb2903df55d0f4b9de1d5d9930aa5 files/digest-eternal-lands-1.2.0_p1 446
+RMD160 8d98b22fce1c8c96488485778fcb0c433503c265 files/digest-eternal-lands-1.2.0_p1 446
+SHA256 3ab6bd6c860bbada97e4e1512e85437d05b978a961b8534b16129a9f15fe3b63 files/digest-eternal-lands-1.2.0_p1 446
 MD5 f14047c98a46008d55322cc6df542db0 metadata.xml 218
+RMD160 71896cb18bffd2608ef27608ce1134e324cde86e metadata.xml 218
+SHA256 ecd37445d56028db2db4ce40945f1a02a8b49e1a28fe2f19c15074a731b33d3b metadata.xml 218
diff --git a/games-rpg/eternal-lands/eternal-lands-1.1.2.ebuild b/games-rpg/eternal-lands/eternal-lands-1.1.2.ebuild
deleted file mode 100644
index c1f69ec0c095..000000000000
--- a/games-rpg/eternal-lands/eternal-lands-1.1.2.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2005 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.1.2.ebuild,v 1.4 2005/12/22 15:30:49 mr_bones_ Exp $
-
-inherit games
-
-MY_PV=${PV%_p*}
-DESCRIPTION="An online MMORPG written in C and SDL"
-HOMEPAGE="http://www.eternal-lands.com"
-SRC_URI="http://el.tfm.ro/el_${MY_PV//./}_linux.zip
-	ftp://ftp.berlios.de/pub/elc/elc_${MY_PV//./}.tgz
-	mapeditor? ( ftp://ftp.berlios.de/pub/elc/mapedit_${MY_PV//./}.tgz )
-	!nomusic? ( http://el.tfm.ro/el_music_101.zip )"
-
-LICENSE="eternal_lands"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc mapeditor nomusic"
-
-RDEPEND="virtual/x11
-	virtual/opengl
-	>=media-libs/libsdl-1.2.5
-	>=media-libs/sdl-net-1.2.5
-	<media-libs/openal-20051024
-	!>=media-libs/openal-20051024
-	!media-libs/alut
-	media-libs/libvorbis
-	>=dev-libs/libxml2-2.6.7
-	=media-libs/cal3d-0.10.0
-	>=media-libs/libpng-1.2.8
-	mapeditor? ( >=x11-libs/gtk+-2.4 )"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	doc? ( >=app-doc/doxygen-1.3.8
-		>=media-gfx/graphviz-1.10 )"
-
-src_unpack() {
-	OPTIONS="OPTIONS=-DDATA_DIR="\\\\\"${GAMES_DATADIR}/${PN}/\\\\\"""
-	S_CLIENT="${WORKDIR}/elc"
-	S_MAPEDITOR="${WORKDIR}/map_editor"
-	BROWSER="mozilla"
-
-	unpack ${A}
-	use amd64 && OPTIONS="${OPTIONS} -DX86_64"
-	cd "${S_CLIENT}"
-	sed \
-		-e "s@CFLAGS=\$(PLATFORM) \$(CWARN) -O -ggdb -pipe@CFLAGS=${CFLAGS} @g"\
-		-e "s@CXXFLAGS=\$(PLATFORM) \$(CXXWARN) -O -ggdb -pipe@CXXFLAGS=${CXXFLAGS} @g"\
-		-e "s@OPTIONS=@${OPTIONS} @g" \
-		Makefile.linux > Makefile \
-		|| die "sed failed"
-	sed \
-		-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 > ../el.ini \
-		|| die "sed failed"
-	if use mapeditor; then
-		cd "${S_MAPEDITOR}"
-		sed \
-			-e "s@CFLAGS=@CFLAGS=${CFLAGS} @g" \
-			-e "s@OPTIONS=@${OPTIONS} @g" \
-			Makefile.linux > Makefile \
-			|| die "sed failed"
-		sed \
-			-e "s@#data_dir = /usr/local/games/el/@#data_dir = ${GAMES_DATADIR}/${PN}/@g" \
-			mapedit.ini > ../mapedit.ini \
-			|| die "sed failed"
-		mv browser.lst ../browser.lst
-	fi
-	cd "${WORKDIR}"
-	cp license.txt EULA || die "cp failed"
-	cp -r "${S_CLIENT}"/languages .
-}
-
-src_compile() {
-	cd "${S_CLIENT}"
-	emake || die "emake failed"
-	cp el.x86.linux.bin ../el.x86.linux.bin || die "cp 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
-	if use mapeditor; then
-		cd "${S_MAPEDITOR}"
-		emake || die "emake failed"
-		cp mapedit.x86.linux.bin ../mapedit.x86.linux.bin || die "cp failed"
-	fi
-}
-
-src_install() {
-	cd "${WORKDIR}"
-
-	newgamesbin el.x86.linux.bin el || die "newgamesbin failed"
-	newicon el_icon.png ${PN}.png || die "newicon failed"
-	make_desktop_entry el "Eternal Lands"
-	dodoc EULA
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r 2dobjects 3dobjects languages maps particles sound textures tiles \
-		meshes animations actor_defs books skeletons \
-		*.ini entrable.lst harvestable.lst \
-		global_filters.txt e3dlist.txt \
-		|| die "doins failed"
-
-	if use mapeditor; then
-		newgamesbin mapedit.x86.linux.bin el-mapedit || die "newgamesbin failed"
-		doins -r browser.lst mapeditor || die "doins failed"
-		dohtml -r "${WORKDIR}/mapeditor" || die
-		make_desktop_entry el-mapedit "Map editor"
-	fi
-	if ! use nomusic ; then
-		doins -r music/ || die "doins failed"
-	fi
-
-	if use doc ; then
-		dohtml -r "${WORKDIR}/client/"*
-	fi
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	echo
-	einfo "To run the game: el"
-	echo
-	if use mapeditor; then
-		einfo "To use the map editor: el-mapedit"
-		einfo "Copy ${GAMES_DATADIR}/${PN}/mapedit.ini to ~/.elc/"
-		einfo "to make per-user changes."
-		echo
-		einfo "To read an introduction to the map editor, read"
-		einfo "/usr/share/doc/${PF}/html/mapeditor.html"
-		echo
-	fi
-	if use doc; then
-		einfo "The documentation for the client source can be found"
-		einfo "in /usr/share/doc/${PF}/html/index.html"
-		echo
-	fi
-}
diff --git a/games-rpg/eternal-lands/eternal-lands-1.2.0_p1.ebuild b/games-rpg/eternal-lands/eternal-lands-1.2.0_p1.ebuild
new file mode 100644
index 000000000000..fa3987257ede
--- /dev/null
+++ b/games-rpg/eternal-lands/eternal-lands-1.2.0_p1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2006 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.2.0_p1.ebuild,v 1.1 2006/02/13 21:32:03 uberlord Exp $
+
+inherit 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="ftp://ftp.berlios.de/pub/elc/elc/elc_${MY_PV}.tgz
+	mirror://gentoo/eternal-lands.png"
+
+LICENSE="eternal_lands"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+	|| ( (
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libX11 )
+		virtual/x11 )
+	virtual/opengl
+	>=media-libs/libsdl-1.2.5
+	>=media-libs/sdl-net-1.2.5
+	<media-libs/openal-20051024
+	!>=media-libs/openal-20051024
+	!media-libs/alut
+	media-libs/libvorbis
+	>=dev-libs/libxml2-2.6.7
+	=media-libs/cal3d-0.10.0
+	>=media-libs/libpng-1.2.8
+	=games-rpg/${PN}-data-${PV}"
+
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	sys-apps/findutils
+	doc? ( >=app-doc/doxygen-1.3.8
+		>=media-gfx/graphviz-1.10 )"
+
+src_unpack() {
+	OPTIONS="OPTIONS=-DDATA_DIR="\\\\\"${GAMES_DATADIR}/${PN}/\\\\\"""
+	S_CLIENT="${WORKDIR}/elc"
+	BROWSER="konqueror"
+
+	unpack ${A}
+	cd "${S}"
+
+	# Remove CVS entries
+	find . -type d -name CVS -exec rm -rf {} \; 2>/dev/null
+
+	use amd64 && OPTIONS="${OPTIONS} -DX86_64"
+	sed \
+		-e "s@CFLAGS=\$(PLATFORM) \$(CWARN) -O -ggdb -pipe@CFLAGS=${CFLAGS} @g"\
+		-e "s@CXXFLAGS=\$(PLATFORM) \$(CXXWARN) -O -ggdb -pipe@CXXFLAGS=${CXXFLAGS} @g"\
+		-e "s@OPTIONS=@${OPTIONS} @g" \
+		-e 's/ -DAUTO_UPDATE//' \
+		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"
+}
+
+src_compile() {
+	emake || die "emake 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"
+
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins -r *.ini *.txt *.lst \
+		actor_defs books languages \
+		|| die "doins failed"
+
+	if use doc ; then
+		dohtml -r client/*
+	fi
+
+	prepgamesdirs
+}
diff --git a/games-rpg/eternal-lands/files/digest-eternal-lands-1.1.2 b/games-rpg/eternal-lands/files/digest-eternal-lands-1.1.2
deleted file mode 100644
index ebb5cd5533cd..000000000000
--- a/games-rpg/eternal-lands/files/digest-eternal-lands-1.1.2
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 3591dd7dfd4f7a2f35d77f2cd0044610 el_112_linux.zip 28691858
-MD5 a4be2dd8a7ff378e0836ce4d26cedfd0 elc_112.tgz 596932
-MD5 1f87d42843d4deb824d588f7fe3f7432 mapedit_112.tgz 123705
-MD5 16fe9ca8c9f4e3757571bfeeff8e260b el_music_101.zip 27141551
diff --git a/games-rpg/eternal-lands/files/digest-eternal-lands-1.2.0_p1 b/games-rpg/eternal-lands/files/digest-eternal-lands-1.2.0_p1
new file mode 100644
index 000000000000..ec8e42ae0a6d
--- /dev/null
+++ b/games-rpg/eternal-lands/files/digest-eternal-lands-1.2.0_p1
@@ -0,0 +1,6 @@
+MD5 15492252c997253a90e6eec4f9edfeae elc_120p1.tgz 731594
+RMD160 a06be332015a8db57c3455f9918e3b58cfe92a41 elc_120p1.tgz 731594
+SHA256 a610102e92e91c6c69c4ceef906ae5010280267a1b9f55ec71f172e3691f0674 elc_120p1.tgz 731594
+MD5 059df8128b11b19a76b54e9907072f00 eternal-lands.png 9955
+RMD160 2f9c8acd96214577cf8b8027f0d20fb1fe7574ff eternal-lands.png 9955
+SHA256 dd7d45cd9948fe7875ebd0bfcd1925d9b34e7606a223faf61d37a6dd2cd433fb eternal-lands.png 9955