Add a patch to create the directories required for files being auto-updated

  if they do not exist.
Package-Manager: portage-2.1.1_pre1-r5

5 files changed, 239 insertions, 13 deletions

diff --git a/games-rpg/eternal-lands/ChangeLog b/games-rpg/eternal-lands/ChangeLog
index 7cf684fc6b0c..f4caf41e545f 100644
--- a/games-rpg/eternal-lands/ChangeLog
+++ b/games-rpg/eternal-lands/ChangeLog
@@ -1,6 +1,14 @@
 # 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.17 2006/05/21 11:34:06 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/ChangeLog,v 1.18 2006/07/03 07:02:39 uberlord Exp $
+
+*eternal-lands-1.2.0_p1-r4 (03 Jul 2006)
+
+  03 Jul 2006; Roy Marples <uberlord@gentoo.org>
+  +files/eternal-lands-1.2.0-update-createdir.patch,
+  +eternal-lands-1.2.0_p1-r4.ebuild:
+  Add a patch to create the directories required for files being auto-updated
+  if they do not exist.
 
 *eternal-lands-1.2.0_p1-r3 (21 May 2006)
 
diff --git a/games-rpg/eternal-lands/Manifest b/games-rpg/eternal-lands/Manifest
index 51998f72e15a..97752043bc6a 100644
--- a/games-rpg/eternal-lands/Manifest
+++ b/games-rpg/eternal-lands/Manifest
@@ -1,30 +1,38 @@
-AUX eternal-lands-1.2.0-vertex-array.patch 9710 RMD160 93b497fd303732a8316a84f46f941da731a28f06 SHA1 43fbb052c7f692694add155254d00d03634e70e8 SHA256 35ae774363b0c8888953190f5c35e06d696279712a0fa14600516cb43ee79f73 size 9710
+AUX eternal-lands-1.2.0-update-createdir.patch 2424 RMD160 db5cfb6190bc7fea261cec70eed4c94654f5c726 SHA1 fdea53284e0b543e6ac840c071066773ff9f91ef SHA256 957a20a68d953035605df5ee28b080952ed5bf5ac30807686a791f44ea2b05db
+MD5 8aaa1ce43587ca22d63389095901ebdc files/eternal-lands-1.2.0-update-createdir.patch 2424
+RMD160 db5cfb6190bc7fea261cec70eed4c94654f5c726 files/eternal-lands-1.2.0-update-createdir.patch 2424
+SHA256 957a20a68d953035605df5ee28b080952ed5bf5ac30807686a791f44ea2b05db files/eternal-lands-1.2.0-update-createdir.patch 2424
+AUX eternal-lands-1.2.0-vertex-array.patch 9710 RMD160 93b497fd303732a8316a84f46f941da731a28f06 SHA1 43fbb052c7f692694add155254d00d03634e70e8 SHA256 35ae774363b0c8888953190f5c35e06d696279712a0fa14600516cb43ee79f73
 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
-DIST elc_120p1.tgz 731594 RMD160 a06be332015a8db57c3455f9918e3b58cfe92a41 SHA256 a610102e92e91c6c69c4ceef906ae5010280267a1b9f55ec71f172e3691f0674 size 731594
-DIST eternal-lands.png 9955 RMD160 2f9c8acd96214577cf8b8027f0d20fb1fe7574ff SHA256 dd7d45cd9948fe7875ebd0bfcd1925d9b34e7606a223faf61d37a6dd2cd433fb size 9955
-EBUILD eternal-lands-1.2.0_p1-r1.ebuild 2778 RMD160 d700da345cf701213badf7fa5896d91ab1afbadd SHA1 8cb19ff0de4d73a7e5ee04025317a7c6e81fd723 SHA256 3246feddf05c07afff70125a6b4837412b3bec152112b868a3a3db956b66c609 size 2778
+DIST elc_120p1.tgz 731594 RMD160 a06be332015a8db57c3455f9918e3b58cfe92a41 SHA1 87b7bde975149fce7f26dc021be495ec9f9b08a9 SHA256 a610102e92e91c6c69c4ceef906ae5010280267a1b9f55ec71f172e3691f0674
+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
 RMD160 d700da345cf701213badf7fa5896d91ab1afbadd eternal-lands-1.2.0_p1-r1.ebuild 2778
 SHA256 3246feddf05c07afff70125a6b4837412b3bec152112b868a3a3db956b66c609 eternal-lands-1.2.0_p1-r1.ebuild 2778
-EBUILD eternal-lands-1.2.0_p1-r2.ebuild 2779 RMD160 bf9854a918ef83b325357a6714082ee54016d893 SHA1 6198f6057dabce4cb25cc4b2c62e8c932e21a9fd SHA256 dd12e4c6f11e7a71d332e03c807484bfbc3c6c7af4412458cffaaa46fecaca56 size 2779
+EBUILD eternal-lands-1.2.0_p1-r2.ebuild 2779 RMD160 bf9854a918ef83b325357a6714082ee54016d893 SHA1 6198f6057dabce4cb25cc4b2c62e8c932e21a9fd SHA256 dd12e4c6f11e7a71d332e03c807484bfbc3c6c7af4412458cffaaa46fecaca56
 MD5 c22a280a1c276e10b42270f0edf22253 eternal-lands-1.2.0_p1-r2.ebuild 2779
 RMD160 bf9854a918ef83b325357a6714082ee54016d893 eternal-lands-1.2.0_p1-r2.ebuild 2779
 SHA256 dd12e4c6f11e7a71d332e03c807484bfbc3c6c7af4412458cffaaa46fecaca56 eternal-lands-1.2.0_p1-r2.ebuild 2779
-EBUILD eternal-lands-1.2.0_p1-r3.ebuild 2817 RMD160 8b2c3a44655e7c3628fc4edbbd22cb98f233b106 SHA1 96b75bb051d63eea1ea59c1ac84487f9e235004b SHA256 d0eb8994db1cfabae2f130f0f9716c61909b8eca1b5ca5c8e7dbcd0049fb3f29 size 2817
+EBUILD eternal-lands-1.2.0_p1-r3.ebuild 2817 RMD160 8b2c3a44655e7c3628fc4edbbd22cb98f233b106 SHA1 96b75bb051d63eea1ea59c1ac84487f9e235004b SHA256 d0eb8994db1cfabae2f130f0f9716c61909b8eca1b5ca5c8e7dbcd0049fb3f29
 MD5 0f3a1ba4713faca87c0aaccafffd641a eternal-lands-1.2.0_p1-r3.ebuild 2817
 RMD160 8b2c3a44655e7c3628fc4edbbd22cb98f233b106 eternal-lands-1.2.0_p1-r3.ebuild 2817
 SHA256 d0eb8994db1cfabae2f130f0f9716c61909b8eca1b5ca5c8e7dbcd0049fb3f29 eternal-lands-1.2.0_p1-r3.ebuild 2817
-EBUILD eternal-lands-1.2.0_p1.ebuild 2598 RMD160 c72069777bc37a23731326cb9c9b73122ae4edb8 SHA1 0aca764dcec5a55dbdb58b2e8a4cf227c3d44534 SHA256 e3dea20dc5b70de5e16f0f383c744a0f03dff3d383410cac0ff6be9f641e63c4 size 2598
+EBUILD eternal-lands-1.2.0_p1-r4.ebuild 3129 RMD160 115beca1ab010fd135fcae433d7c135ceb899277 SHA1 1e4917d66c67b44a034134db4a442f216e01df20 SHA256 babee5798ae7d6a7d88f4b1c726030f94758d7c6f9e9f02e78f2515eb632e6d8
+MD5 ead6c053ffa7df4613522980a410f76a eternal-lands-1.2.0_p1-r4.ebuild 3129
+RMD160 115beca1ab010fd135fcae433d7c135ceb899277 eternal-lands-1.2.0_p1-r4.ebuild 3129
+SHA256 babee5798ae7d6a7d88f4b1c726030f94758d7c6f9e9f02e78f2515eb632e6d8 eternal-lands-1.2.0_p1-r4.ebuild 3129
+EBUILD eternal-lands-1.2.0_p1.ebuild 2598 RMD160 c72069777bc37a23731326cb9c9b73122ae4edb8 SHA1 0aca764dcec5a55dbdb58b2e8a4cf227c3d44534 SHA256 e3dea20dc5b70de5e16f0f383c744a0f03dff3d383410cac0ff6be9f641e63c4
 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 3354 RMD160 625105ca59357d035f80dfb312c4c07d0ed4c600 SHA1 45bbeac19c34a99180743595188c60eb1212cc65 SHA256 979108220c036ad1a83e6d0413f70911329f2753db9ad9f4611e607d5c8ed7b3 size 3354
-MD5 e0710d23066057b3035d7a985a6e3ff5 ChangeLog 3354
-RMD160 625105ca59357d035f80dfb312c4c07d0ed4c600 ChangeLog 3354
-SHA256 979108220c036ad1a83e6d0413f70911329f2753db9ad9f4611e607d5c8ed7b3 ChangeLog 3354
-MISC metadata.xml 365 RMD160 c06f3d4bff68a5e0f8ab2da3dc62c3d0cc570a20 SHA1 a123414bf441b960af386b5bc08bba88777011ae SHA256 0a477bd6a9085aca7e4538f81c3b9d7710cead2395d222f9903c898df57b3e63 size 365
+MISC ChangeLog 3638 RMD160 7f8e30a88e3f49eb64c0dd5cdc2ea6d20f2e1187 SHA1 23382bba4040cb81bac4fc78b041a252eef87cb6 SHA256 c9498d7a0ca0aad6fe9317c634f47b0add05b4fd280552ae7e39072104cf0356
+MD5 0d11daa2014b6adcfccd0b6f8da50b07 ChangeLog 3638
+RMD160 7f8e30a88e3f49eb64c0dd5cdc2ea6d20f2e1187 ChangeLog 3638
+SHA256 c9498d7a0ca0aad6fe9317c634f47b0add05b4fd280552ae7e39072104cf0356 ChangeLog 3638
+MISC metadata.xml 365 RMD160 c06f3d4bff68a5e0f8ab2da3dc62c3d0cc570a20 SHA1 a123414bf441b960af386b5bc08bba88777011ae SHA256 0a477bd6a9085aca7e4538f81c3b9d7710cead2395d222f9903c898df57b3e63
 MD5 a20195e09a3313e5b377c3c4ecc29e26 metadata.xml 365
 RMD160 c06f3d4bff68a5e0f8ab2da3dc62c3d0cc570a20 metadata.xml 365
 SHA256 0a477bd6a9085aca7e4538f81c3b9d7710cead2395d222f9903c898df57b3e63 metadata.xml 365
@@ -40,3 +48,6 @@ SHA256 3ab6bd6c860bbada97e4e1512e85437d05b978a961b8534b16129a9f15fe3b63 files/di
 MD5 942fb2903df55d0f4b9de1d5d9930aa5 files/digest-eternal-lands-1.2.0_p1-r3 446
 RMD160 8d98b22fce1c8c96488485778fcb0c433503c265 files/digest-eternal-lands-1.2.0_p1-r3 446
 SHA256 3ab6bd6c860bbada97e4e1512e85437d05b978a961b8534b16129a9f15fe3b63 files/digest-eternal-lands-1.2.0_p1-r3 446
+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
diff --git a/games-rpg/eternal-lands/eternal-lands-1.2.0_p1-r4.ebuild b/games-rpg/eternal-lands/eternal-lands-1.2.0_p1-r4.ebuild
new file mode 100644
index 000000000000..02511a001adc
--- /dev/null
+++ b/games-rpg/eternal-lands/eternal-lands-1.2.0_p1-r4.ebuild
@@ -0,0 +1,115 @@
+# 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-r4.ebuild,v 1.1 2006/07/03 07:02:39 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}.tgz
+	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}"
+
+	# Allow compiled vertex arrays to be togglable as they don't seem to work
+	# with xorg drivers on IGP style cards.
+	epatch "${FILESDIR}/${PN}-1.2.0-vertex-array.patch"
+	epatch "${FILESDIR}/${PN}-1.2.0-update-createdir.patch"
+
+	# 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/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"
+
+	rm -f books/*.c books/*.o books/*.h
+
+	insopts -m 0660
+	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
+}
+
+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.2.0_p1-r4 b/games-rpg/eternal-lands/files/digest-eternal-lands-1.2.0_p1-r4
new file mode 100644
index 000000000000..ec8e42ae0a6d
--- /dev/null
+++ b/games-rpg/eternal-lands/files/digest-eternal-lands-1.2.0_p1-r4
@@ -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
diff --git a/games-rpg/eternal-lands/files/eternal-lands-1.2.0-update-createdir.patch b/games-rpg/eternal-lands/files/eternal-lands-1.2.0-update-createdir.patch
new file mode 100644
index 000000000000..5d8fc689f7c2
--- /dev/null
+++ b/games-rpg/eternal-lands/files/eternal-lands-1.2.0-update-createdir.patch
@@ -0,0 +1,86 @@
+--- update.c	2006-07-03 07:30:09.154559449 +0100
++++ update.c	2006-07-03 07:57:31.000000000 +0100
+@@ -7,6 +7,7 @@
+ #include    "asc.h"
+ #include    <stdio.h>
+ #include    <ctype.h>
++#include    <sys/stat.h>
+ #ifdef	WINDOWS
+ #define	strdup	_strdup
+ #endif	//WINDOWS
+@@ -153,6 +154,8 @@
+ 		++temp_counter;
+ 		fp= my_fopen(filename, "wb+");
+ 		if(fp){
++			chmod (filename,
++				S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
+ 			sprintf(filename, "http://%s/updates/files.lst", update_server);
+ 			http_threaded_get_file(update_server, filename, fp, NULL, EVENT_UPDATES_DOWNLOADED);
+ 		}
+@@ -265,6 +268,7 @@
+ 			buffer[sizeof(buffer)-1]= '\0';
+ 			fp= my_fopen(download_temp_file, "wb+");
+ 			if(fp){
++	
+ 				// build the prope URL to download
+ 				download_cur_file= download_queue[--download_queue_size];
+ 				download_cur_md5= download_MD5s[download_queue_size];
+@@ -291,9 +295,47 @@
+ 	if(get->status == 0){
+ 		// the download was successful
+ 		// replace the current file
+-		// TODO: check for remove/rename errors
++		// 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, 0770) != 0)
++				{
++					log_error("cannot create directory %s", dir);
++					break;
++				}
++				else
++					chmod (dir, S_IRWXU | S_IRWXG | S_ISGID);
++			}
++
++			*slash++ = '/';
++
++			// Avoid unnecessary calls to mkdir when given
++			// file names containing multiple adjacent slashes.
++			while (*slash == '/')
++				slash++;
++		}
++
+ 		remove(download_cur_file);
+-		rename(download_temp_file, download_cur_file);
++		if ( ! rename(download_temp_file, download_cur_file) )
++			remove(download_temp_file);
+ 
+ 		// TODO: make the restart more intelligent
+ 		if(allow_restart){
+@@ -325,6 +367,8 @@
+ 		sprintf(download_temp_file, "temp%03d.dat", ++temp_counter);
+ 		fp= my_fopen(download_temp_file, "wb+");
+ 		if(fp){
++			chmod (download_temp_file,
++				S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
+ 			// build the prope URL to download
+ 			download_cur_file= download_queue[--download_queue_size];
+ 			download_cur_md5= download_MD5s[download_queue_size];