Version Bump - 254364

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.27-gentoo-r7-rf82 x86_64

5 files changed, 34 insertions, 36 deletions

diff --git a/games-rpg/eternal-lands-data/ChangeLog b/games-rpg/eternal-lands-data/ChangeLog
index f60c56ef0f0a..2a47b0566338 100644
--- a/games-rpg/eternal-lands-data/ChangeLog
+++ b/games-rpg/eternal-lands-data/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-rpg/eternal-lands-data
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands-data/ChangeLog,v 1.18 2008/07/18 16:51:41 rich0 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands-data/ChangeLog,v 1.19 2009/01/11 02:37:35 rich0 Exp $
+
+*eternal-lands-data-1.8.0 (11 Jan 2009)
+
+  11 Jan 2009; Richard Freeman <rich0@gentoo.org>
+  -eternal-lands-data-1.7.0-r1.ebuild, +eternal-lands-data-1.8.0.ebuild:
+  Version Bump - 254364
 
 *eternal-lands-data-1.7.0-r1 (18 Jul 2008)
 
diff --git a/games-rpg/eternal-lands-data/eternal-lands-data-1.7.0-r1.ebuild b/games-rpg/eternal-lands-data/eternal-lands-data-1.8.0.ebuild
index 3419eb827de4..b2adfa1840c9 100644
--- a/games-rpg/eternal-lands-data/eternal-lands-data-1.7.0-r1.ebuild
+++ b/games-rpg/eternal-lands-data/eternal-lands-data-1.8.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands-data/eternal-lands-data-1.7.0-r1.ebuild,v 1.1 2008/07/18 16:51:41 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands-data/eternal-lands-data-1.8.0.ebuild,v 1.1 2009/01/11 02:37:35 rich0 Exp $
 
 inherit games
 
@@ -11,7 +11,7 @@ MY_PV="${MY_PV//./}"
 MY_PN="${PN%*-data}"
 DESCRIPTION="An online MMORPG written in C and SDL"
 HOMEPAGE="http://www.eternal-lands.com"
-SRC_URI="http://www.eternal-lands.com/el_linux_170_install.zip
+SRC_URI="http://www.eternal-lands.com/el_linux_180_install.zip
 		music? ( mirror://gentoo/el_music_full-${MUSIC_DATE}.zip )
 		sound? ( mirror://gentoo/el_sound_150.zip )"
 # WARNING: The music file is held at
@@ -28,7 +28,7 @@ IUSE="music sound"
 DEPEND="app-arch/unzip"
 
 # Maybe one day upstream will do things in a consistent way.
-S="${WORKDIR}/el_install"
+S="${WORKDIR}/el_linux"
 
 src_unpack() {
 	unpack ${A}
diff --git a/games-rpg/eternal-lands/ChangeLog b/games-rpg/eternal-lands/ChangeLog
index 50cfcee5610d..c3438544e034 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/ChangeLog,v 1.46 2008/07/18 16:49:16 rich0 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/ChangeLog,v 1.47 2009/01/11 02:38:10 rich0 Exp $
+
+*eternal-lands-1.8.0 (11 Jan 2009)
+
+  11 Jan 2009; Richard Freeman <rich0@gentoo.org>
+  -files/eternal-lands-1.7.0-errors.patch, -eternal-lands-1.7.0-r1.ebuild,
+  +eternal-lands-1.8.0.ebuild:
+  Version Bump - 254364
 
   18 Jul 2008; Richard Freeman <rich0@gentoo.org>
   -eternal-lands-1.6.0.ebuild, -eternal-lands-1.7.0.ebuild,
diff --git a/games-rpg/eternal-lands/eternal-lands-1.7.0-r1.ebuild b/games-rpg/eternal-lands/eternal-lands-1.8.0.ebuild
index 1d9ab53a4f89..a98257d5ef6e 100644
--- a/games-rpg/eternal-lands/eternal-lands-1.7.0-r1.ebuild
+++ b/games-rpg/eternal-lands/eternal-lands-1.8.0.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.7.0-r1.ebuild,v 1.3 2008/07/19 00:53:20 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/eternal-lands-1.8.0.ebuild,v 1.1 2009/01/11 02:38:11 rich0 Exp $
 
+EAPI="2"
 inherit cvs eutils flag-o-matic games
 
 DESCRIPTION="An online MMORPG written in C and SDL"
@@ -26,10 +27,9 @@ RDEPEND="x11-libs/libX11
 	media-libs/freealut
 	media-libs/libvorbis
 	dev-libs/libxml2
-	media-libs/cal3d
-	!=media-libs/cal3d-0.11.0_pre20050823
+	media-libs/cal3d[-16bit-indices]
 	media-libs/libpng
-	>=games-rpg/eternal-lands-data-1.7.0"
+	>=games-rpg/eternal-lands-data-1.8.0"
 
 DEPEND="${RDEPEND}
 	>=app-admin/eselect-opengl-1.0.6-r1
@@ -43,16 +43,16 @@ ECVS_USER="anonymous"
 #ECVS_LOCALNAME="elc"
 ECVS_PASS=""
 ECVS_CVS_OPTIONS="-dP -z3"
-ECVS_BRANCH="elc_1_7_0"
+ECVS_BRANCH="elc_1_8_0"
 
 S="${WORKDIR}/${ECVS_MODULE}"
 
 pkg_setup() {
 	games_pkg_setup
-	if built_with_use media-libs/cal3d 16bit-indices ; then
-		eerror "${PN} won't work if media-libs/cal3d has been built with 16bit-indices"
-		die "re-emerge  media-libs/cal3d without the 16bit-indices USE flag"
-	fi
+#	if built_with_use media-libs/cal3d 16bit-indices ; then
+#		eerror "${PN} won't work if media-libs/cal3d has been built with 16bit-indices"
+#		die "re-emerge  media-libs/cal3d without the 16bit-indices USE flag"
+#	fi
 }
 
 src_unpack() {
@@ -61,9 +61,11 @@ src_unpack() {
 	S_CLIENT="${WORKDIR}/elc"
 	BROWSER="firefox"
 
+
 	cd "${S}"
 
-	epatch "${FILESDIR}/eternal-lands-1.7.0-errors.patch"
+#	epatch "${FILESDIR}/eternal-lands-1.7.0-errors.patch"
+
 
 	# Add debugging options
 	if use debug ; then
diff --git a/games-rpg/eternal-lands/files/eternal-lands-1.7.0-errors.patch b/games-rpg/eternal-lands/files/eternal-lands-1.7.0-errors.patch
deleted file mode 100644
index 7af126db0b9a..000000000000
--- a/games-rpg/eternal-lands/files/eternal-lands-1.7.0-errors.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- errors.c.orig	2008-07-17 22:43:28.791326638 -0400
-+++ errors.c	2008-07-17 22:44:37.258432153 -0400
-@@ -68,12 +68,12 @@
- 	time(&c_time);
- 	l_time = localtime(&c_time);
- 	strftime(logmsg, sizeof(logmsg), "[%H:%M:%S] ", l_time);
--	strcat(logmsg, errmsg);
-+	strncat(logmsg, errmsg, sizeof(logmsg)-strlen(logmsg)-2);
- 
- 	if(message[strlen(message)-1] != '\n') {
- 		strcat(logmsg, "\n");
- 	}
--	fprintf(err_file, logmsg);
-+	fputs(logmsg, err_file);
-   	fflush (err_file);
- }
-