[patch] Diff against 1.0.1

eternal-lands-1.1.0-r1.diff (text/plain), 4.55 KB, created by Bjørn Mogensen on 2005-09-16 15:52:38 UTC

--- eternal-lands-1.0.1.ebuild	2005-09-13 22:44:38.000000000 +0200
+++ eternal-lands-1.1.0-r1.ebuild	2005-09-17 01:00:51.000000000 +0200
@@ -1,16 +1,16 @@
 # 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.0.1.ebuild,v 1.2 2005/06/09 01:08:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/eternal-lands-1.1.0-r1.ebuild,v 1.2 2005/06/09 01:08:50 mr_bones_ Exp $
 
 inherit games
 
 TMP_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_${TMP_PV//.}.zip
-	ftp://ftp.berlios.de/pub/elc/elc_${PV//.}.tgz
-	mapeditor? ( ftp://ftp.berlios.de/pub/elc/mapedit_${PV//.}.tgz )
-	!nomusic? ( http://el.tfm.ro/el_music_${PV//.}.zip )"
+SRC_URI="http://el.tfm.ro/el_${TMP_PV//.}-t1.zip
+	ftp://ftp.berlios.de/pub/elc/elc_${TMP_PV//.}.tgz
+	mapeditor? ( ftp://ftp.berlios.de/pub/elc/mapedit_${TMP_PV//.}.tgz )
+	!nomusic? ( http://el.tfm.ro/el_music_101.zip )"
 
 LICENSE="eternal_lands"
 SLOT="0"
@@ -24,7 +24,9 @@
 	>media-libs/openal-20020127
 	media-libs/libvorbis
 	>=dev-libs/libxml2-2.6.7
-	mapeditor? ( <x11-libs/gtk+-1.3 )"
+	=media-libs/cal3d-0.10.0
+	>=media-libs/libpng-1.2.8
+	mapeditor? (>=x11-libs/gtk+-2.4)"
 
 DEPEND="${RDEPEND}
 	app-arch/unzip
@@ -32,22 +34,24 @@
 		>=media-gfx/graphviz-1.10 )"
 
 src_unpack() {
-	OPTIONS="OPTIONS=-DDATA_DIR="\\\\\"${GAMES_DATADIR}/${PN}/\\\\\"" "
+	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"
 	use netthread && OPTIONS="${OPTIONS} -DNETWORK_THREAD"
 	cd "${S_CLIENT}"
 	sed \
-		-e "s@CFLAGS=\$(PLATFORM) -Wall -O -Werror -ggdb -pipe @CFLAGS=${CFLAGS} @g" \
+		-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 = mozilla/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"
@@ -66,7 +70,7 @@
 	fi
 	cd ${WORKDIR}
 	cp license.txt EULA || die "cp failed"
-	cp changes.txt ChangeLog || die "cp failed"
+	cp -r ${S_CLIENT}/languages .
 }
 
 src_compile() {
@@ -74,7 +78,7 @@
 	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=-docs"
+		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
@@ -86,26 +90,33 @@
 
 src_install () {
 	cd "${WORKDIR}"
+	
 	newgamesbin el.x86.linux.bin el || die "newgamesbin failed"
 	if use mapeditor; then
 		newgamesbin mapedit.x86.linux.bin el-mapedit \
 			|| die "newgamesbin failed"
 	fi
 
-	dodoc ChangeLog EULA
+	dodoc EULA
 	insinto "${GAMES_DATADIR}/${PN}"
-	doins *.ini entrable.lst harvestable.lst el_icon.png icon.bmp \
-		global_filters.txt local_ignores.txt e3dlist.txt \
+	
+	doins *.ini entrable.lst harvestable.lst \
+		global_filters.txt e3dlist.txt \
 		|| die "doins failed"
 
+	doicon el_icon.png || die "doicon failed"
+
 	if use mapeditor; then
+		doicon mapeditor.bmp || die "doicon failed"
+		cp -r mapeditor ${D}/${GAMES_DATADIR}/${PN} || die "copy failed"
 		doins browser.lst || die "doins failed"
 	fi
 
-	cp -R 2dobjects 3dobjects languages maps md2 particles sound textures tiles \
+	cp -R 2dobjects 3dobjects languages maps particles sound textures tiles\
+	meshes animations actor_defs books skeletons\
 		"${D}/${GAMES_DATADIR}/${PN}" \
 		|| die "copy failed"
-
+	
 	if ! use nomusic; then
 		cp -R music "${D}/${GAMES_DATADIR}/${PN}" || die "cp failed"
 	fi
@@ -117,6 +128,11 @@
 		dohtml "${WORKDIR}/mapeditor.html"
 		dohtml -r "${WORKDIR}/mapeditor"
 	fi
+	
+	make_desktop_entry el "Eternal Lands" el_icon.png Game
+	use mapeditor && \
+		make_desktop_entry el-mapedit "Map editor" mapeditor.bmp Game
+	
 	prepgamesdirs
 }
 
@@ -124,8 +140,6 @@
 	games_pkg_postinst
 	echo
 	einfo "To run the game: el"
-	einfo "Copy ${GAMES_DATADIR}/${PN}/el.ini to ~/.elc/"
-	einfo "to make per-user changes."
 	echo
 	if use mapeditor; then
 		einfo "To use the map editor: el-mapedit"