Added a patch to make the new counters actually work.

Package-Manager: portage-2.1.1_pre2-r2

5 files changed, 212 insertions, 5 deletions

diff --git a/games-rpg/eternal-lands/ChangeLog b/games-rpg/eternal-lands/ChangeLog
index 4397bb7e2964..cb7137865b6f 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/ChangeLog,v 1.21 2006/07/06 13:28:24 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/ChangeLog,v 1.22 2006/07/06 16:54:04 uberlord Exp $
+
+*eternal-lands-1.3.0-r1 (06 Jul 2006)
+
+  06 Jul 2006; Roy Marples <uberlord@gentoo.org>
+  +files/eternal-lands-1.3.0-counters.patch, +eternal-lands-1.3.0-r1.ebuild:
+  Added a patch to make the new counters actually work.
 
   06 Jul 2006; Roy Marples <uberlord@gentoo.org> eternal-lands-1.3.0.ebuild:
   Stop compiling with -DFONTS_FIX as it appears to be a bit wonky.
diff --git a/games-rpg/eternal-lands/Manifest b/games-rpg/eternal-lands/Manifest
index 0caf56b932d2..d076ca0282ae 100644
--- a/games-rpg/eternal-lands/Manifest
+++ b/games-rpg/eternal-lands/Manifest
@@ -6,6 +6,10 @@ 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-counters.patch 1629 RMD160 5fa4e1440705ea55009d497093f00f35192eabcf SHA1 262628ce2c723437e27969d746aa1b2abd64dde9 SHA256 30720c67c8499806f8a0ef0e02aadab1d04a5cd6759c246adab48c2b3e198b08
+MD5 8a51857b10fac0c11b93350ae4d606e5 files/eternal-lands-1.3.0-counters.patch 1629
+RMD160 5fa4e1440705ea55009d497093f00f35192eabcf files/eternal-lands-1.3.0-counters.patch 1629
+SHA256 30720c67c8499806f8a0ef0e02aadab1d04a5cd6759c246adab48c2b3e198b08 files/eternal-lands-1.3.0-counters.patch 1629
 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
@@ -33,14 +37,18 @@ 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
+EBUILD eternal-lands-1.3.0-r1.ebuild 3283 RMD160 5b6eccc41c79ded0d197dd27b359936988635273 SHA1 a57c71ada4e30ebe8a00c798d8b9783c30b2dafc SHA256 04e54124b4b72c7c6c50e8af6e25b72e8f21d2bfd60aa0467d73c2e0ee274d7f
+MD5 4391af2c903631db77fca7cbbeb0813d eternal-lands-1.3.0-r1.ebuild 3283
+RMD160 5b6eccc41c79ded0d197dd27b359936988635273 eternal-lands-1.3.0-r1.ebuild 3283
+SHA256 04e54124b4b72c7c6c50e8af6e25b72e8f21d2bfd60aa0467d73c2e0ee274d7f eternal-lands-1.3.0-r1.ebuild 3283
 EBUILD eternal-lands-1.3.0.ebuild 3256 RMD160 c5f2dcad754805bac1f5ac5e5fb0cbf55044a12e SHA1 55995292a721efe0dfd153a870fef4b0c5816ebe SHA256 bb62904abdf784d04349436f7955b84f6cda44fd088bf97425035204d98b3c74
 MD5 5e860407291a04f18353616ffbcaacf9 eternal-lands-1.3.0.ebuild 3256
 RMD160 c5f2dcad754805bac1f5ac5e5fb0cbf55044a12e eternal-lands-1.3.0.ebuild 3256
 SHA256 bb62904abdf784d04349436f7955b84f6cda44fd088bf97425035204d98b3c74 eternal-lands-1.3.0.ebuild 3256
-MISC ChangeLog 4184 RMD160 a130e178fb68641540aef6a34bb4161f7f9840f8 SHA1 f76e4a01245ff64a8917cdd138483ddde0547e76 SHA256 5ca5db3426ee4b752855bf796579483700b1c442bd2af1ec323b6b978990e0d8
-MD5 d8bf2226187b6252aeadb91cdfbcceec ChangeLog 4184
-RMD160 a130e178fb68641540aef6a34bb4161f7f9840f8 ChangeLog 4184
-SHA256 5ca5db3426ee4b752855bf796579483700b1c442bd2af1ec323b6b978990e0d8 ChangeLog 4184
+MISC ChangeLog 4406 RMD160 ca91d3fb237b98aa9d738c305459f2effdd4cb85 SHA1 ee9708dbce022c30175b180a4593fad57d58f64f SHA256 d025bf41c5867d499dc5711f17ffbade7d1008506d110f39645f22935df2ab95
+MD5 45da117daaa3f6a1f57f8e1373faaaa8 ChangeLog 4406
+RMD160 ca91d3fb237b98aa9d738c305459f2effdd4cb85 ChangeLog 4406
+SHA256 d025bf41c5867d499dc5711f17ffbade7d1008506d110f39645f22935df2ab95 ChangeLog 4406
 MISC metadata.xml 365 RMD160 c06f3d4bff68a5e0f8ab2da3dc62c3d0cc570a20 SHA1 a123414bf441b960af386b5bc08bba88777011ae SHA256 0a477bd6a9085aca7e4538f81c3b9d7710cead2395d222f9903c898df57b3e63
 MD5 a20195e09a3313e5b377c3c4ecc29e26 metadata.xml 365
 RMD160 c06f3d4bff68a5e0f8ab2da3dc62c3d0cc570a20 metadata.xml 365
@@ -63,3 +71,6 @@ SHA256 3ab6bd6c860bbada97e4e1512e85437d05b978a961b8534b16129a9f15fe3b63 files/di
 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
+MD5 a36070419026fbb1b7f19de61752a438 files/digest-eternal-lands-1.3.0-r1 452
+RMD160 71b1e63275f7db40b156a470b1aa39de6a76671f files/digest-eternal-lands-1.3.0-r1 452
+SHA256 53503f94d087461511bfffd09ac0ff5bea124b1e70e587c28636e5b0da658b0a files/digest-eternal-lands-1.3.0-r1 452
diff --git a/games-rpg/eternal-lands/eternal-lands-1.3.0-r1.ebuild b/games-rpg/eternal-lands/eternal-lands-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..40f6bb21c1ba
--- /dev/null
+++ b/games-rpg/eternal-lands/eternal-lands-1.3.0-r1.ebuild
@@ -0,0 +1,118 @@
+# 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-r1.ebuild,v 1.1 2006/07/06 16:54:04 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
+
+	# Create updated files with correct perms and allow dir creation
+	epatch "${FILESDIR}/${PN}-1.3.0-update-createdir.patch"
+
+	# Get counters working
+	epatch "${FILESDIR}/${PN}-1.3.0-counters.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/' \
+		-e 's/-DFONTS_FIX//' \
+		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() {
+	einfo "Auto Update is now enabled in Eternal Lands"
+	ewarn "If an update occurs then the client will suddenly exit"
+	einfo "Updates only happen when the game first loads"
+	einfo "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}/${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-r1 b/games-rpg/eternal-lands/files/digest-eternal-lands-1.3.0-r1
new file mode 100644
index 000000000000..2be8e9ed82f7
--- /dev/null
+++ b/games-rpg/eternal-lands/files/digest-eternal-lands-1.3.0-r1
@@ -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-counters.patch b/games-rpg/eternal-lands/files/eternal-lands-1.3.0-counters.patch
new file mode 100644
index 000000000000..243cfb658cff
--- /dev/null
+++ b/games-rpg/eternal-lands/files/eternal-lands-1.3.0-counters.patch
@@ -0,0 +1,66 @@
+--- elc.orig/counters.c	2006-07-04 20:03:48.000000000 +0100
++++ elc/counters.c	2006-07-06 14:46:40.000000000 +0100
+@@ -121,54 +121,6 @@
+ 	return my_fopen(filename, mode);
+ }
+ 
+-/*******************************************************************************
+- * XXX: Delete this function.
+- ******************************************************************************/
+-void import_old_counters()
+-{
+-	char filename[256], username[16];
+-	int i, j;
+-	Uint8 io_name_len;
+-	Uint8 io_is_player;
+-	Uint32 io_n_total;
+-	char io_name[32];
+-	FILE *f;
+-	
+-	strncpy(username, username_str, sizeof(username));
+-	for (i = 0; username[i]; i++) {
+-		username[i] = tolower(username[i]);
+-	}
+-	
+-#ifndef WINDOWS
+-	snprintf(filename, sizeof(filename), "%s/kills_%s.dat", configdir, username);
+-#else
+-	snprintf(filename, sizeof(filename), "kills_%s.dat", username);
+-#endif
+-
+-	if (!(f = my_fopen(filename, "rb"))) {
+-		return;
+-	}
+-
+-	i = KILLS - 1;
+-
+-	while (fread(&io_name_len, sizeof(io_name_len), 1, f) > 0) {
+-		fread(io_name, io_name_len, 1, f);
+-		io_name[io_name_len] = '\0';
+-
+-		fread(&io_is_player, sizeof(io_is_player), 1, f);
+-		fread(&io_n_total, sizeof(io_n_total), 1, f);
+-
+-		j = entries[i]++;
+-		counters[i] = realloc(counters[i], entries[i] * sizeof(struct Counter));
+-		counters[i][j].name = strdup(io_name);
+-		counters[i][j].n_session = 0;
+-		counters[i][j].n_total = io_n_total;
+-		counters[i][j].extra = io_is_player;
+-	}
+-
+-	fclose(f);
+-}
+-
+ void load_counters()
+ {
+ 	FILE *f;
+@@ -198,7 +150,7 @@
+ 	}
+ 	
+ 	if (!(f = open_counters_file("rb"))) {
+-		import_old_counters();
++		counters_initialized = 1;
+ 		return;
+ 	}
+