Version bump.

Package-Manager: portage-2.1.1_pre2-r2

5 files changed, 274 insertions, 5 deletions

diff --git a/games-rpg/eternal-lands/ChangeLog b/games-rpg/eternal-lands/ChangeLog
index f4caf41e545f..bf0f159c0077 100644
--- a/games-rpg/eternal-lands/ChangeLog
+++ b/games-rpg/eternal-lands/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-rpg/eternal-lands
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/ChangeLog,v 1.18 2006/07/03 07:02:39 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/ChangeLog,v 1.19 2006/07/04 22:50:25 uberlord Exp $
+
+*eternal-lands-1.3.0 (04 Jul 2006)
+
+  04 Jul 2006; Roy Marples <uberlord@gentoo.org>
+  +files/eternal-lands-1.3.0-update-createdir.patch,
+  +eternal-lands-1.3.0.ebuild:
+  Version bump.
 
 *eternal-lands-1.2.0_p1-r4 (03 Jul 2006)
 
diff --git a/games-rpg/eternal-lands/Manifest b/games-rpg/eternal-lands/Manifest
index 97752043bc6a..89f8972cd8b8 100644
--- a/games-rpg/eternal-lands/Manifest
+++ b/games-rpg/eternal-lands/Manifest
@@ -6,7 +6,12 @@ AUX eternal-lands-1.2.0-vertex-array.patch 9710 RMD160 93b497fd303732a8316a84f46
 MD5 abb3e62b8f7cda5c1314c7a6f6ae3477 files/eternal-lands-1.2.0-vertex-array.patch 9710
 RMD160 93b497fd303732a8316a84f46f941da731a28f06 files/eternal-lands-1.2.0-vertex-array.patch 9710
 SHA256 35ae774363b0c8888953190f5c35e06d696279712a0fa14600516cb43ee79f73 files/eternal-lands-1.2.0-vertex-array.patch 9710
+AUX eternal-lands-1.3.0-update-createdir.patch 4070 RMD160 0ec1eb58f810de1ff566420e1172f53dfb77d21c SHA1 f44c9a11149cfed8920e0a025d8f90a6cfc2dc4b SHA256 32b11244fb3a9042fdcf43db5ca29034fe01ce01622b918a80b751c8586d0413
+MD5 896c7e9dfba33c965f0e72b101813d53 files/eternal-lands-1.3.0-update-createdir.patch 4070
+RMD160 0ec1eb58f810de1ff566420e1172f53dfb77d21c files/eternal-lands-1.3.0-update-createdir.patch 4070
+SHA256 32b11244fb3a9042fdcf43db5ca29034fe01ce01622b918a80b751c8586d0413 files/eternal-lands-1.3.0-update-createdir.patch 4070
 DIST elc_120p1.tgz 731594 RMD160 a06be332015a8db57c3455f9918e3b58cfe92a41 SHA1 87b7bde975149fce7f26dc021be495ec9f9b08a9 SHA256 a610102e92e91c6c69c4ceef906ae5010280267a1b9f55ec71f172e3691f0674
+DIST elc_130.tar.bz2 849004 RMD160 e5dc66b2db5203a13707170046874392e1908a06 SHA1 ae66f6822aaa73df54dfd1838698b6897ce05f2b SHA256 ffcd5779a0516e5ec3f6c1add718653284689023a92fcb9dfa3917076d8be140
 DIST eternal-lands.png 9955 RMD160 2f9c8acd96214577cf8b8027f0d20fb1fe7574ff SHA1 34ee1c154178090f45ca171509f8ba00d26d6a21 SHA256 dd7d45cd9948fe7875ebd0bfcd1925d9b34e7606a223faf61d37a6dd2cd433fb
 EBUILD eternal-lands-1.2.0_p1-r1.ebuild 2778 RMD160 d700da345cf701213badf7fa5896d91ab1afbadd SHA1 8cb19ff0de4d73a7e5ee04025317a7c6e81fd723 SHA256 3246feddf05c07afff70125a6b4837412b3bec152112b868a3a3db956b66c609
 MD5 e98123c307e84e1e7f1bd88a6e465be1 eternal-lands-1.2.0_p1-r1.ebuild 2778
@@ -28,10 +33,14 @@ EBUILD eternal-lands-1.2.0_p1.ebuild 2598 RMD160 c72069777bc37a23731326cb9c9b731
 MD5 6c2d2bca29e47c16cdeb78ad847778a5 eternal-lands-1.2.0_p1.ebuild 2598
 RMD160 c72069777bc37a23731326cb9c9b73122ae4edb8 eternal-lands-1.2.0_p1.ebuild 2598
 SHA256 e3dea20dc5b70de5e16f0f383c744a0f03dff3d383410cac0ff6be9f641e63c4 eternal-lands-1.2.0_p1.ebuild 2598
-MISC ChangeLog 3638 RMD160 7f8e30a88e3f49eb64c0dd5cdc2ea6d20f2e1187 SHA1 23382bba4040cb81bac4fc78b041a252eef87cb6 SHA256 c9498d7a0ca0aad6fe9317c634f47b0add05b4fd280552ae7e39072104cf0356
-MD5 0d11daa2014b6adcfccd0b6f8da50b07 ChangeLog 3638
-RMD160 7f8e30a88e3f49eb64c0dd5cdc2ea6d20f2e1187 ChangeLog 3638
-SHA256 c9498d7a0ca0aad6fe9317c634f47b0add05b4fd280552ae7e39072104cf0356 ChangeLog 3638
+EBUILD eternal-lands-1.3.0.ebuild 3005 RMD160 6ddd09ecf3d81164b9f22e0fce9d01d0e9b3af41 SHA1 bcec31310937ff9e04e36aa80c3354f60229141e SHA256 09bb810385def059e8e03ca71a366084d23e041dbcb998ce3dc2dc8140b0eced
+MD5 e792748adeaccfce452927622059c9ed eternal-lands-1.3.0.ebuild 3005
+RMD160 6ddd09ecf3d81164b9f22e0fce9d01d0e9b3af41 eternal-lands-1.3.0.ebuild 3005
+SHA256 09bb810385def059e8e03ca71a366084d23e041dbcb998ce3dc2dc8140b0eced eternal-lands-1.3.0.ebuild 3005
+MISC ChangeLog 3824 RMD160 61deb2cf1c14d6932b4106543c73ed5e910d35fd SHA1 60b0e87fe9cc0442e98f116c5a7c41c506e2f8b2 SHA256 cbe3a8da3c42e4cece7f1ff097f0700d689153cbe8393c873dc8d489df40abf3
+MD5 148796ff1e15f0da3029b13308b4e60b ChangeLog 3824
+RMD160 61deb2cf1c14d6932b4106543c73ed5e910d35fd ChangeLog 3824
+SHA256 cbe3a8da3c42e4cece7f1ff097f0700d689153cbe8393c873dc8d489df40abf3 ChangeLog 3824
 MISC metadata.xml 365 RMD160 c06f3d4bff68a5e0f8ab2da3dc62c3d0cc570a20 SHA1 a123414bf441b960af386b5bc08bba88777011ae SHA256 0a477bd6a9085aca7e4538f81c3b9d7710cead2395d222f9903c898df57b3e63
 MD5 a20195e09a3313e5b377c3c4ecc29e26 metadata.xml 365
 RMD160 c06f3d4bff68a5e0f8ab2da3dc62c3d0cc570a20 metadata.xml 365
@@ -51,3 +60,6 @@ SHA256 3ab6bd6c860bbada97e4e1512e85437d05b978a961b8534b16129a9f15fe3b63 files/di
 MD5 942fb2903df55d0f4b9de1d5d9930aa5 files/digest-eternal-lands-1.2.0_p1-r4 446
 RMD160 8d98b22fce1c8c96488485778fcb0c433503c265 files/digest-eternal-lands-1.2.0_p1-r4 446
 SHA256 3ab6bd6c860bbada97e4e1512e85437d05b978a961b8534b16129a9f15fe3b63 files/digest-eternal-lands-1.2.0_p1-r4 446
+MD5 a36070419026fbb1b7f19de61752a438 files/digest-eternal-lands-1.3.0 452
+RMD160 71b1e63275f7db40b156a470b1aa39de6a76671f files/digest-eternal-lands-1.3.0 452
+SHA256 53503f94d087461511bfffd09ac0ff5bea124b1e70e587c28636e5b0da658b0a files/digest-eternal-lands-1.3.0 452
diff --git a/games-rpg/eternal-lands/eternal-lands-1.3.0.ebuild b/games-rpg/eternal-lands/eternal-lands-1.3.0.ebuild
new file mode 100644
index 000000000000..b9c73c5902c5
--- /dev/null
+++ b/games-rpg/eternal-lands/eternal-lands-1.3.0.ebuild
@@ -0,0 +1,110 @@
+# 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.3.0.ebuild,v 1.1 2006/07/04 22:50:25 uberlord Exp $
+
+inherit eutils 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"
+IUSE="doc"
+
+RDEPEND="
+	|| ( (
+		x11-libs/libX11
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-libs/libXext )
+		virtual/x11 )
+	virtual/opengl
+	>=media-libs/libsdl-1.2.5
+	>=media-libs/sdl-net-1.2.5
+	~media-libs/openal-0.0.8
+	media-libs/freealut
+	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
+
+	# Allow compiled vertex arrays to be togglable as they don't seem to work
+	# with xorg drivers on IGP style cards.
+	epatch "${FILESDIR}/${PN}-${PV}-update-createdir.patch"
+
+	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/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"
+}
+
+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"
+
+	insopts -m 0660
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins *.ini *.txt commands.lst || die "doins failed"
+
+	if use doc ; then
+		dohtml -r client/*
+	fi
+
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	# Ensure that the files are writable by the game group for auto
+	# updating.
+	chmod -R g+rw "${ROOT}/${GAMES_DATADIR}/${MY_PN}"
+
+	# Make sure new files stay in games group
+	find "${ROOT}/${GAMES_DATADIR}/${MY_PN}" -type d -exec chmod g+sx {} \;
+}
diff --git a/games-rpg/eternal-lands/files/digest-eternal-lands-1.3.0 b/games-rpg/eternal-lands/files/digest-eternal-lands-1.3.0
new file mode 100644
index 000000000000..2be8e9ed82f7
--- /dev/null
+++ b/games-rpg/eternal-lands/files/digest-eternal-lands-1.3.0
@@ -0,0 +1,6 @@
+MD5 f83902ed603926a9611ace5914a3fdc0 elc_130.tar.bz2 849004
+RMD160 e5dc66b2db5203a13707170046874392e1908a06 elc_130.tar.bz2 849004
+SHA256 ffcd5779a0516e5ec3f6c1add718653284689023a92fcb9dfa3917076d8be140 elc_130.tar.bz2 849004
+MD5 059df8128b11b19a76b54e9907072f00 eternal-lands.png 9955
+RMD160 2f9c8acd96214577cf8b8027f0d20fb1fe7574ff eternal-lands.png 9955
+SHA256 dd7d45cd9948fe7875ebd0bfcd1925d9b34e7606a223faf61d37a6dd2cd433fb eternal-lands.png 9955
diff --git a/games-rpg/eternal-lands/files/eternal-lands-1.3.0-update-createdir.patch b/games-rpg/eternal-lands/files/eternal-lands-1.3.0-update-createdir.patch
new file mode 100644
index 000000000000..56217d7016c1
--- /dev/null
+++ b/games-rpg/eternal-lands/files/eternal-lands-1.3.0-update-createdir.patch
@@ -0,0 +1,134 @@
+--- elc/update.c	2006-07-04 20:03:48.000000000 +0100
++++ elc/update.c	2006-07-04 23:34:01.000000000 +0100
+@@ -17,6 +17,18 @@
+ #include	<sys/stat.h>
+ #endif	//WINDOWS
+ 
++#ifndef S_ISDIR
++#define S_ISDIR(x) ((x) & S_IFMT) == S_IFDIR)
++#endif // S_ISDIR
++
++#ifdef WINDOWS
++#define CHMOD(file) 0
++#define MKDIR(file) mkdir(file)
++#else
++#define CHMOD(file) chmod(file, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP)
++#define MKDIR(file) (mkdir(file, S_IRWXU | S_IRWXG) || chmod(file, S_IRWXU | S_IRWXG | S_ISGID))
++#endif //WINDOWS
++
+ int update_attempt_count;   // count how many update attempts have been tried (hopefully diff servers)
+ int temp_counter;           // collision prevention during downloads just incase more then one ever starts
+ int update_busy;            // state & lockout control to prevent two updates running at the saem rime
+@@ -165,18 +177,15 @@
+ 			strcpy(update_server, update_servers[0]);
+ 		}
+ 		// failsafe, try to make sure the directory is there
+-		if(mkdir_res < 0){
+-#ifdef  WINDOWS
+-			mkdir_res= mkdir("./tmp");
+-#else   //WINDOWS
+-			mkdir_res= mkdir("./tmp", 0777);
+-#endif  //WINDOWS
+-		}
++		if(mkdir_res < 0)
++			mkdir_res= MKDIR("./tmp");
+ 		sprintf(filename, "./tmp/temp000.dat");
+ 		++temp_counter;
+ 		fp= my_fopen(filename, "wb+");
+ 		if(fp){
++			CHMOD(filename);
+ 			sprintf(filename, "http://%s/updates%d%d%d/files.lst", update_server, VER_MAJOR, VER_MINOR, VER_RELEASE);
++	
+ 			http_threaded_get_file(update_server, filename, fp, NULL, EVENT_UPDATES_DOWNLOADED);
+ 		}
+ 		// and keep running until we get a response
+@@ -288,6 +297,7 @@
+ 			buffer[sizeof(buffer)-1]= '\0';
+ 			fp= my_fopen(download_temp_file, "wb+");
+ 			if(fp){
++				CHMOD(download_temp_file);
+ 				// build the prope URL to download
+ 				download_cur_file= download_queue[--download_queue_size];
+ 				download_cur_md5= download_MD5s[download_queue_size];
+@@ -305,8 +315,6 @@
+ // finish up on one file that just downloaded
+ void    handle_file_download(struct http_get_struct *get)
+ {
+-	int sts;
+-
+ 	if(!get){   // huh? what are you doing?
+ 		return;
+ 	}
+@@ -317,26 +325,51 @@
+ 		// the download was successful
+ 		// replace the current file
+ 		// TODO: check for remove/rename errors
+-		remove(download_cur_file);
+-		sts= rename(download_temp_file, download_cur_file);
+ 
+-		// check for errors
+-		if(!sts){
+-			// TODO: make the restart more intelligent
+-			if(allow_restart){
+-				restart_required++;
+-			}
+-		} else {
++ 		// First, check directory exists
++ 		char *dir = (char *) malloc (strlen (download_cur_file) + 1);
++ 		char *slash;
++ 		struct stat stats;
++ 
++ 		strcpy (dir, download_cur_file);
++ 		slash = dir;
++ 
++ 		// Skip over leading slashes.
++ 		while (*slash == '/')
++ 			slash++;
++ 
++		while (1){
++			slash = strchr (slash, '/');
++			if (slash == NULL)
++				break;
++
++			*slash = '\0';
++ 			if (! (stat (dir, &stats) == 0 && S_ISDIR (stats.st_mode) ) )
++				if (MKDIR(dir)!= 0) {
++ 					log_error("cannot create directory %s", dir);
++ 					break;
++ 				}
++ 			*slash++ = '/';
++ 
++ 			// Avoid unnecessary calls to mkdir when given
++ 			// file names containing multiple adjacent slashes.
++ 			while (*slash == '/')
++ 				slash++;
++ 		}
++ 
++  		remove(download_cur_file);
++ 		if (rename(download_temp_file, download_cur_file)){
++ 			remove(download_temp_file);
+ 			log_error("Unable to finish processing of %d (%d)", download_cur_file, errno);
+ 			// the final renamed failed, no restart permitted
+ 			allow_restart= 0;
+ 			restart_required= 0;
++		} else {
++			if(allow_restart)
++				restart_required++;
+ 		}
+-	} else {
+-		// and make sure we can't restart since we had a total failure
+-		allow_restart= 0;
+-		restart_required= 0;
+ 	}
++
+ 	// release the filename
+ 	free(download_cur_file);
+ 	free(download_cur_md5);
+@@ -358,6 +391,7 @@
+ 		sprintf(download_temp_file, "./tmp/temp%03d.dat", ++temp_counter);
+ 		fp= my_fopen(download_temp_file, "wb+");
+ 		if(fp){
++			CHMOD(download_temp_file);
+ 			// build the prope URL to download
+ 			download_cur_file= download_queue[--download_queue_size];
+ 			download_cur_md5= download_MD5s[download_queue_size];