Version bump to 1.2-beta12, bug #115761

(Portage version: 2.1-r2)

7 files changed, 160 insertions, 2 deletions

diff --git a/games-strategy/lgeneral/ChangeLog b/games-strategy/lgeneral/ChangeLog
index bf9316db3c52..d2132b56176c 100644
--- a/games-strategy/lgeneral/ChangeLog
+++ b/games-strategy/lgeneral/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-strategy/lgeneral
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/ChangeLog,v 1.19 2005/11/07 07:48:21 mr_bones_ Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/ChangeLog,v 1.20 2006/08/26 01:51:59 tupone Exp $
+
+*lgeneral-1.2_beta12 (26 Aug 2006)
+
+  26 Aug 2006; <tupone@gentoo.org>
+  +files/lgeneral-1.2_beta12-gentoo-path.patch, +lgeneral-1.2_beta12.ebuild:
+  Version bump to 1.2-beta12, bug #115761, reported by gunix@comhem.se
 
 *lgeneral-1.2_beta9 (07 Nov 2005)
 
diff --git a/games-strategy/lgeneral/files/digest-lgeneral-1.2_beta12 b/games-strategy/lgeneral/files/digest-lgeneral-1.2_beta12
new file mode 100644
index 000000000000..4b35c6650a2f
--- /dev/null
+++ b/games-strategy/lgeneral/files/digest-lgeneral-1.2_beta12
@@ -0,0 +1,6 @@
+MD5 8b03cde09e9efc5074d027ae6773f385 lgeneral-1.2beta-12.tar.gz 1428381
+RMD160 a7a08d50fb400389078ba7716460fce24e750b97 lgeneral-1.2beta-12.tar.gz 1428381
+SHA256 ea737943bfc6738a3535dab16d7081f9ad1263fa8b2d747466d3f2e2cc2e3d80 lgeneral-1.2beta-12.tar.gz 1428381
+MD5 17b15c7cdd31547d061522d1e35da6e9 pg-data.tar.gz 410454
+RMD160 0f05a0a521639cdf04c8fe6ac8950d5794ccdb0a pg-data.tar.gz 410454
+SHA256 f2f74022cf8c279451911dda0a57cffab26ebf11429d61a6596310340ed23f76 pg-data.tar.gz 410454
diff --git a/games-strategy/lgeneral/files/digest-lgeneral-1.2_beta2 b/games-strategy/lgeneral/files/digest-lgeneral-1.2_beta2
index ba55a08fbe47..74d1e6edfb5e 100644
--- a/games-strategy/lgeneral/files/digest-lgeneral-1.2_beta2
+++ b/games-strategy/lgeneral/files/digest-lgeneral-1.2_beta2
@@ -1,2 +1,6 @@
 MD5 093964e5918e530bed4e404b8e53dea0 lgeneral-1.2beta-2.tar.gz 878853
+RMD160 fde81c42bc3370bc22ef577c56fb78c9b7b64092 lgeneral-1.2beta-2.tar.gz 878853
+SHA256 e816752800a94ae5dbb5f1f44458ffd58105e1cdaaa57c5e9e0727c6106a0c9e lgeneral-1.2beta-2.tar.gz 878853
 MD5 17b15c7cdd31547d061522d1e35da6e9 pg-data.tar.gz 410454
+RMD160 0f05a0a521639cdf04c8fe6ac8950d5794ccdb0a pg-data.tar.gz 410454
+SHA256 f2f74022cf8c279451911dda0a57cffab26ebf11429d61a6596310340ed23f76 pg-data.tar.gz 410454
diff --git a/games-strategy/lgeneral/files/digest-lgeneral-1.2_beta8 b/games-strategy/lgeneral/files/digest-lgeneral-1.2_beta8
index 35528ef417db..3b4d6c1d1d7f 100644
--- a/games-strategy/lgeneral/files/digest-lgeneral-1.2_beta8
+++ b/games-strategy/lgeneral/files/digest-lgeneral-1.2_beta8
@@ -1,2 +1,4 @@
 MD5 60dd2044c21ea15916a2c77a2bdf40cd lgeneral-1.2beta-8.tar.gz 1304148
 MD5 17b15c7cdd31547d061522d1e35da6e9 pg-data.tar.gz 410454
+RMD160 0f05a0a521639cdf04c8fe6ac8950d5794ccdb0a pg-data.tar.gz 410454
+SHA256 f2f74022cf8c279451911dda0a57cffab26ebf11429d61a6596310340ed23f76 pg-data.tar.gz 410454
diff --git a/games-strategy/lgeneral/files/digest-lgeneral-1.2_beta9 b/games-strategy/lgeneral/files/digest-lgeneral-1.2_beta9
index 72b7c3df1396..d45a0aedbfe7 100644
--- a/games-strategy/lgeneral/files/digest-lgeneral-1.2_beta9
+++ b/games-strategy/lgeneral/files/digest-lgeneral-1.2_beta9
@@ -1,2 +1,4 @@
 MD5 787579c254e543e04948afb5363d9ec2 lgeneral-1.2beta-9.tar.gz 1310609
 MD5 17b15c7cdd31547d061522d1e35da6e9 pg-data.tar.gz 410454
+RMD160 0f05a0a521639cdf04c8fe6ac8950d5794ccdb0a pg-data.tar.gz 410454
+SHA256 f2f74022cf8c279451911dda0a57cffab26ebf11429d61a6596310340ed23f76 pg-data.tar.gz 410454
diff --git a/games-strategy/lgeneral/files/lgeneral-1.2_beta12-gentoo-path.patch b/games-strategy/lgeneral/files/lgeneral-1.2_beta12-gentoo-path.patch
new file mode 100644
index 000000000000..c921a857a982
--- /dev/null
+++ b/games-strategy/lgeneral/files/lgeneral-1.2_beta12-gentoo-path.patch
@@ -0,0 +1,71 @@
+--- configure.in.old	2006-08-25 23:23:54.000000000 +0200
++++ configure.in	2006-08-25 23:24:04.000000000 +0200
+@@ -146,7 +146,7 @@
+ AC_SUBST(dl_lib_flag)
+ 
+ dnl installation path
+-inst_dir=$datadir/games/lgeneral
++inst_dir=$datadir/lgeneral
+ 
+ dis_flag=""
+ AC_ARG_ENABLE( install,
+--- configure.in.old	2006-08-25 23:48:27.000000000 +0200
++++ configure.in	2006-08-25 23:49:09.000000000 +0200
+@@ -105,13 +105,8 @@
+ 
+ dnl find out whether we can determine the path of the running executable
+ ac_paths_determ=generic
+-AC_MSG_CHECKING(if executable's path can be determined at runtime)
+-readlink /proc/$$/exe >/dev/null 2>&1 && ac_paths_determ=linux
+-ac_can_determ_paths=yes
+-if test x$ac_paths_determ = xgeneric ; then
+   ac_can_determ_paths=no
+   AC_DEFINE_UNQUOTED(PATHS_GENERIC, 1, [Defined if detecting executable's path name is not supported at runtime.])
+-fi
+ AC_MSG_RESULT($ac_can_determ_paths)
+ AC_MSG_RESULT(executable's path determination strategy... $ac_paths_determ)
+ AM_CONDITIONAL(compile_paths_linux, test x$ac_paths_determ = xlinux)
+--- src/misc.c.old	2006-08-25 23:58:11.000000000 +0200
++++ src/misc.c	2006-08-26 00:01:35.000000000 +0200
+@@ -418,16 +418,11 @@
+ #ifdef DISABLE_INSTALL
+     return ".";
+ #else
+-    const char *prefix;
+     static char *gamedir;
+-    static const char suffix[] = "/share/games/lgeneral";
++    static const char suffix[] = "@GENTOO_DATADIR@/lgeneral";
+-    unsigned len;
+     if (gamedir) return gamedir;
+-    prefix = paths_prefix();
+-    len = strlen(prefix);
+-    gamedir = malloc(len + sizeof suffix);
++    gamedir = malloc(sizeof suffix);
+-    strcpy(gamedir, prefix);
+-    strcpy(gamedir + len, suffix);
++    strcpy(gamedir, suffix);
+     return gamedir;
+ #endif
+ }
+--- lgc-pg/misc.c.old	2006-08-26 01:53:53.000000000 +0200
++++ lgc-pg/misc.c	2006-08-26 01:55:10.000000000 +0200
+@@ -420,16 +420,11 @@
+ #ifdef DISABLE_INSTALL
+     return ".";
+ #else
+-    const char *prefix;
+     static char *gamedir;
+-    static const char suffix[] = "/share/games/lgeneral";
+-    unsigned len;
++    static const char suffix[] = "@D@@GENTOO_DATADIR@/lgeneral";
+     if (gamedir) return gamedir;
+-    prefix = paths_prefix();
+-    len = strlen(prefix);
+-    gamedir = malloc(len + sizeof suffix);
+-    strcpy(gamedir, prefix);
+-    strcpy(gamedir + len, suffix);
++    gamedir = malloc(sizeof suffix);
++    strcpy(gamedir, suffix);
+     return gamedir;
+ #endif
+ }
diff --git a/games-strategy/lgeneral/lgeneral-1.2_beta12.ebuild b/games-strategy/lgeneral/lgeneral-1.2_beta12.ebuild
new file mode 100644
index 000000000000..d97e3eb85c1b
--- /dev/null
+++ b/games-strategy/lgeneral/lgeneral-1.2_beta12.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/lgeneral-1.2_beta12.ebuild,v 1.1 2006/08/26 01:51:59 tupone Exp $
+
+inherit eutils autotools 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="~x86"
+IUSE=""
+
+DEPEND="media-libs/libsdl
+	media-libs/sdl-mixer"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}"-gentoo-path.patch
+	eautoreconf
+	sed -i \
+		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}:" \
+		-e "s:@D@:${D}:" \
+		src/misc.c \
+		lgc-pg/misc.c
+	touch po/lgeneral/lgeneral.pot
+	# 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 \
+		|| die "egamesconf failed"
+	emake || die "emake failed"
+
+	# Build the temporary lgc-pg:
+	cd "${WORKDIR}/lgc-pg"
+	egamesconf --datadir="${D}/${GAMES_DATADIR}" \
+		|| die "lgc-gc egamesconf failed"
+	emake || die "lgc-gc emake failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed."
+	keepdir "${GAMES_DATADIR}/${PN}/"{ai_modules,music,terrain}
+
+	# Generate scenario data:
+	SDL_VIDEODRIVER=dummy "${WORKDIR}"/lgc-pg/lgc-pg/lgc-pg \
+		-s "${WORKDIR}/${DATA}" \
+		-d ${D}"${GAMES_DATADIR}/${PN}" \
+		|| 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
+}