version bump

(Portage version: 2.0.51.22-r3)

5 files changed, 95 insertions, 1 deletions

diff --git a/games-strategy/lgeneral/ChangeLog b/games-strategy/lgeneral/ChangeLog
index a5066298116c..46aadd9e41e5 100644
--- a/games-strategy/lgeneral/ChangeLog
+++ b/games-strategy/lgeneral/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-strategy/lgeneral
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/ChangeLog,v 1.14 2005/10/11 06:55:47 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/ChangeLog,v 1.15 2005/10/15 04:04:19 mr_bones_ Exp $
+
+*lgeneral-1.2_beta6 (15 Oct 2005)
+
+  15 Oct 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/1.2_beta6-gcc4.patch, +lgeneral-1.2_beta6.ebuild:
+  version bump
 
   11 Oct 2005; Michael Sterrett <mr_bones_@gentoo.org>
   +files/1.2_beta5-gcc4.patch, lgeneral-1.2_beta5.ebuild:
diff --git a/games-strategy/lgeneral/Manifest b/games-strategy/lgeneral/Manifest
index 1b81c6d2e855..b914e0970633 100644
--- a/games-strategy/lgeneral/Manifest
+++ b/games-strategy/lgeneral/Manifest
@@ -1,3 +1,4 @@
+MD5 55332d6f35da9d70285b06eab8ef512d lgeneral-1.2_beta6.ebuild 1651
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 MD5 cca6898907a4441d1f2c7e1a76b6b585 lgeneral-1.2_beta2.ebuild 1481
 MD5 55332d6f35da9d70285b06eab8ef512d lgeneral-1.2_beta5.ebuild 1651
@@ -6,5 +7,6 @@ MD5 3c00b7bf7d280e0857bd222b0c06bad3 ChangeLog 3076
 MD5 2ed49392adca7517991f0115bf18bc5f files/1.2_beta5-gcc4.patch 841
 MD5 77fda12a372abfd55040151b84dd2d7b files/1.1.1-netbsd-audio.patch 813
 MD5 75e452fcd09e7f2a437b74ab63f8b175 files/digest-lgeneral-1.2_beta5 130
+MD5 80df20a9e5cbef4c8d3d6cf6b5adc9a8 files/digest-lgeneral-1.2_beta6 130
 MD5 a439ff98a9b35e8e232647449c5de2a0 files/digest-lgeneral-1.2_beta2 129
 MD5 9bd18133cff27a13ac0c62fe2ebeba33 files/digest-lgeneral-1.1.1-r1 138
diff --git a/games-strategy/lgeneral/files/1.2_beta6-gcc4.patch b/games-strategy/lgeneral/files/1.2_beta6-gcc4.patch
new file mode 100644
index 000000000000..226cfa34d8de
--- /dev/null
+++ b/games-strategy/lgeneral/files/1.2_beta6-gcc4.patch
@@ -0,0 +1,24 @@
+diff -ur lgeneral-orig/src/ai.c lgeneral-1.2beta-5/src/ai.c
+--- lgeneral-orig/src/ai.c	2005-10-07 16:58:21.000000000 +0200
++++ lgeneral-1.2beta-5/src/ai.c	2005-10-07 16:58:48.000000000 +0200
+@@ -508,7 +508,7 @@
+ */
+ void ai_finalize( void )
+ {
+-printf(__FUNCTION__ "\n");
++printf("%s\n", __FUNCTION__);
+     if ( finalized )
+         return;
+ printf("Really finalized\n");
+diff -ur lgeneral-orig/src/ai_group.c lgeneral-1.2beta-5/src/ai_group.c
+--- lgeneral-orig/src/ai_group.c	2005-10-07 16:58:21.000000000 +0200
++++ lgeneral-1.2beta-5/src/ai_group.c	2005-10-07 16:59:18.000000000 +0200
+@@ -560,7 +560,7 @@
+         }
+     }
+     if ( unit == 0 ) {
+-        printf("ERROR: " __FUNCTION__ ": null unit detected\n");
++        printf("ERROR: %s: null unit detected\n", __FUNCTION__);
+ 	return 0;
+     }
+     if ( group->state == GS_ART_FIRE )
diff --git a/games-strategy/lgeneral/files/digest-lgeneral-1.2_beta6 b/games-strategy/lgeneral/files/digest-lgeneral-1.2_beta6
new file mode 100644
index 000000000000..88e8f5a9fc64
--- /dev/null
+++ b/games-strategy/lgeneral/files/digest-lgeneral-1.2_beta6
@@ -0,0 +1,2 @@
+MD5 ad55b9168b52b843e2f8015cc5945793 lgeneral-1.2beta-6.tar.gz 1291444
+MD5 17b15c7cdd31547d061522d1e35da6e9 pg-data.tar.gz 410454
diff --git a/games-strategy/lgeneral/lgeneral-1.2_beta6.ebuild b/games-strategy/lgeneral/lgeneral-1.2_beta6.ebuild
new file mode 100644
index 000000000000..6aac19fc1095
--- /dev/null
+++ b/games-strategy/lgeneral/lgeneral-1.2_beta6.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/lgeneral-1.2_beta6.ebuild,v 1.1 2005/10/15 04:04:19 mr_bones_ Exp $
+
+inherit eutils games
+
+DATA=pg-data
+MY_P="${P/_/}"
+MY_P="${MY_P/beta/beta-}"
+DESCRIPTION="A Panzer General clone written in SDL"
+HOMEPAGE="http://lgames.sourceforge.net/index.php?project=LGeneral"
+SRC_URI="mirror://sourceforge/lgeneral/${MY_P}.tar.gz
+	mirror://sourceforge/lgeneral/${DATA}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=media-libs/libsdl-1.2.4
+	>=media-libs/sdl-mixer-1.2.3"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	#epatch "${FILESDIR}"/${PV}-gcc4.patch
+	# Build a temporary lgc-pg that knows about /var/tmp/portage in work/lgc-pg:
+	cp -pPR "${S}" "${WORKDIR}/lgc-pg" || die "cp failed."
+}
+
+src_compile() {
+	egamesconf \
+		--disable-dependency-tracking \
+		--datadir="${GAMES_DATADIR}/../" || die
+	emake || die "emake failed"
+
+	# Build the temporary lgc-pg:
+	cd "${WORKDIR}/lgc-pg"
+	egamesconf --datadir="${D}/${GAMES_DATADIR_BASE}" || die
+	cd lgc-pg
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed."
+	keepdir "${GAMES_DATADIR}/${PN}/"{ai_modules,music,terrain}
+
+	# Generate scenario data:
+	"${WORKDIR}/lgc-pg/lgc-pg/lgc-pg" \
+		-s "${WORKDIR}/${DATA}" \
+		-d "${D}/${GAMES_DATADIR}/lgeneral" \
+		|| die "Failed to generate scenario data."
+
+	dodoc AUTHORS ChangeLog README.lgeneral README.lgc-pg TODO
+	newicon lgeneral48.png ${PN}.png
+	make_desktop_entry lgeneral LGeneral
+	prepgamesdirs
+}