version bump; ebuild submitted by Mr. Anderson via bug #248241

Package-Manager: portage-2.1.6.13/cvs/Linux i686

7 files changed, 226 insertions, 2 deletions

diff --git a/games-strategy/lgeneral/ChangeLog b/games-strategy/lgeneral/ChangeLog
index 51c9fbe6c9ad..80f2cb81f341 100644
--- a/games-strategy/lgeneral/ChangeLog
+++ b/games-strategy/lgeneral/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for games-strategy/lgeneral
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/ChangeLog,v 1.26 2009/02/12 09:13:08 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/ChangeLog,v 1.27 2009/09/21 04:43:00 mr_bones_ Exp $
+
+*lgeneral-1.2_beta13 (21 Sep 2009)
+
+  21 Sep 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  +lgeneral-1.2_beta13.ebuild, +files/lgeneral-1.2_beta13-64bit.patch,
+  +files/lgeneral-1.2_beta13-as-needed.patch,
+  +files/lgeneral-1.2_beta13-build.patch,
+  +files/lgeneral-1.2_beta13-gentoo-path.patch:
+  version bump; ebuild submitted by Mr. Anderson via bug #248241
 
   12 Feb 2009; Alfredo Tupone <tupone@gentoo.org>
   +files/lgeneral-1.2_beta12-as-needed.patch, lgeneral-1.2_beta12-r1.ebuild:
diff --git a/games-strategy/lgeneral/Manifest b/games-strategy/lgeneral/Manifest
index 5896271df218..191581bf2080 100644
--- a/games-strategy/lgeneral/Manifest
+++ b/games-strategy/lgeneral/Manifest
@@ -4,11 +4,17 @@ AUX lgeneral-1.2_beta12-as-needed.patch 623 RMD160 af27d4d75b94958d7fd5068dd1ddc
 AUX lgeneral-1.2_beta12-build.patch 318 RMD160 05d9dc69438f42f1ac51479af15d9ec0a1eb64af SHA1 030aa4cb3215b1c3e3add11374472ddf90799789 SHA256 6d173938dfd0b013614734a4705cdcdfcab57fa831afa59a8008d371f7751ced
 AUX lgeneral-1.2_beta12-gentoo-path.patch 2393 RMD160 8bf62ea88afb1e0e480436eb298aa1f0abc3f07e SHA1 3f2b6e0463b04b9b929d196c838aa9fc4d82a84d SHA256 199427f23522583fa6a97776bb0710841f961d3528afb8cc3c610e7eed082933
 AUX lgeneral-1.2_beta12-gettext.patch 1352 RMD160 02190ad461ac5ee53b3c8eb9ec987ab6dc8a81d6 SHA1 d6a782e714b23ad8ab16a952be2cc6cf222fcf27 SHA256 4e76d9dfeba12160504cb8f034ed11d5b27e361e3eb05c1583c428b021192c1b
+AUX lgeneral-1.2_beta13-64bit.patch 339 RMD160 e68c24f17b82a16db06230323362756593414e88 SHA1 3f5ab08c14959cd149d438d4abaab39663dcad20 SHA256 541bef53004cb900e842d2eb4dc8f144e313a23d194b8b3feeb0bfdb2ebf6487
+AUX lgeneral-1.2_beta13-as-needed.patch 623 RMD160 af27d4d75b94958d7fd5068dd1ddc781227212d9 SHA1 583b46cd7600337ceaf662cfaef5b63a54007b34 SHA256 6f1ebf7fc00acc9c910d3d52616044df6612702c2e7f9f5ac9ac3c22f5d7a9d5
+AUX lgeneral-1.2_beta13-build.patch 472 RMD160 b9694335c28b81e92f7995ff73529f756342c049 SHA1 a0804f805405459d1e4922190e026163a62b1452 SHA256 96571a738c37d03f8b5c638fe857dbd136622d8e671e1972e96681b9dfaeec58
+AUX lgeneral-1.2_beta13-gentoo-path.patch 2393 RMD160 8bf62ea88afb1e0e480436eb298aa1f0abc3f07e SHA1 3f2b6e0463b04b9b929d196c838aa9fc4d82a84d SHA256 199427f23522583fa6a97776bb0710841f961d3528afb8cc3c610e7eed082933
 DIST lgeneral-1.1.1.tar.gz 588698 RMD160 f4ca361e8b3d180e0fb7136f86cc6412a82974fb SHA1 37ce2f59ec4654893fa864a7582981683e389df8 SHA256 182513e8662251fabbaa782c575b2d96d8d135f20892c3a58112f755c82f9a8b
 DIST lgeneral-1.2beta-12.tar.gz 1428381 RMD160 a7a08d50fb400389078ba7716460fce24e750b97 SHA1 ed4ea01ee36a47bb78221862978addf36de580d3 SHA256 ea737943bfc6738a3535dab16d7081f9ad1263fa8b2d747466d3f2e2cc2e3d80
+DIST lgeneral-1.2beta-13.tar.gz 1601598 RMD160 8a00ef60ca77af5d7895823a8a2e7585a07df792 SHA1 381389be3c35e1c4474e48f10557fa8f7a7bc1f6 SHA256 a30ddc8a16e75c6454b5f0aa5ff02837cae8d9194d7673e35650ddfeb84f781e
 DIST lgeneral-data-1.1.3.tar.gz 1073781 RMD160 d314d174fbec5200f80c88fc6642f90005c54537 SHA1 e0e2afd114e178206d99c1d572525b9814ea60db SHA256 bc4dddc25488dd863b0f4eb9d120e5017055ecbcc2cc53ba12d713681e47f10b
 DIST pg-data.tar.gz 410454 RMD160 0f05a0a521639cdf04c8fe6ac8950d5794ccdb0a SHA1 d78db7705e55751332fd1163311311ec36fff3ea SHA256 f2f74022cf8c279451911dda0a57cffab26ebf11429d61a6596310340ed23f76
 EBUILD lgeneral-1.1.1-r1.ebuild 1132 RMD160 c67f31c44ffb97cea7168a3aba83db6e51c09f2b SHA1 381457da249178045d57dc6a31240320dd64298e SHA256 895f35da4a51fe572de3e3880135a30d266b5b1291a51797a1cbaddc345fe169
 EBUILD lgeneral-1.2_beta12-r1.ebuild 2298 RMD160 09df136c038a64e34be767f25fbd672b8eebb842 SHA1 79ad68ff32a65bb6424ba0f07525d0e90a15a961 SHA256 8a5994da7532ed8e409f85be1be0aa8638a5d7deed156e2e3a90297fa8a11f6d
-MISC ChangeLog 5214 RMD160 11d0104a3be4b90b1cbe37b7bdf6fbeb3c1baa81 SHA1 bd00ef1a2f1c510ba5b8a7a3a747cadd03228518 SHA256 d76d0516f473e812c17d7cefa23bb83053403234ebe51a1d2f9c8852f4d23358
+EBUILD lgeneral-1.2_beta13.ebuild 2263 RMD160 e443e7af9f14ffa351572996bf18394c1e7226af SHA1 c87dbf6d46ff8827ce67335823a5e40882f1f4f7 SHA256 4629ff828fd855c48e3988cf4ce5c62df3963eb02c2f8786d0fa248078d8df19
+MISC ChangeLog 5581 RMD160 6a616af2ffef6bbb94d90af61bc19a5ff0f5e892 SHA1 2d499e61963c18930d09a161a987c4c67420be2d SHA256 4fc60fe5ad34d843865261a29fa512ab8fbdde3924442457a81af0b07d00d538
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-strategy/lgeneral/files/lgeneral-1.2_beta13-64bit.patch b/games-strategy/lgeneral/files/lgeneral-1.2_beta13-64bit.patch
new file mode 100644
index 000000000000..d152657f3aca
--- /dev/null
+++ b/games-strategy/lgeneral/files/lgeneral-1.2_beta13-64bit.patch
@@ -0,0 +1,11 @@
+--- src/unit_lib.h.old	2006-10-20 22:11:43.000000000 +0200
++++ src/unit_lib.h	2006-10-20 22:11:58.000000000 +0200
+@@ -145,7 +145,7 @@
+ #endif
+     int eval_score; /* between 0 - 1000 indicating the worth of the unit relative the
+                        best one */
+-} Unit_Lib_Entry;
++} __attribute__((__packed__)) Unit_Lib_Entry;
+ 
+ 
+ /*
diff --git a/games-strategy/lgeneral/files/lgeneral-1.2_beta13-as-needed.patch b/games-strategy/lgeneral/files/lgeneral-1.2_beta13-as-needed.patch
new file mode 100644
index 000000000000..2361aa54d569
--- /dev/null
+++ b/games-strategy/lgeneral/files/lgeneral-1.2_beta13-as-needed.patch
@@ -0,0 +1,13 @@
+--- tools/ltrextract/Makefile.am.old    2009-02-12 09:48:37.000000000 +0100
++++ tools/ltrextract/Makefile.am        2009-02-12 09:50:36.000000000 +0100
+@@ -3,9 +3,8 @@
+ 
+ bin_PROGRAMS = ltrextract
+ 
+-LIBS = $(top_builddir)/util/libutil.a $(INTLLIBS)
+ AM_CFLAGS = -DLTREXTRACT @dis_flag@ -I$(LGENERAL_PATH) -I$(top_srcdir) -I$(top_srcdir)/util $(INTLINCLUDES)
+-ltrextract_LDFLAGS = -lm
++ltrextract_LDADD = $(top_builddir)/util/libutil.a $(INTLLIBS)
+ ltrextract_SOURCES = ltrextract.c util.c util.h \
+ 	terrain.c terrain.h map.c map.h nation.c nation.h \
+ 	unit_lib.c unit_lib.h scenario.c scenario.h campaign.c campaign.h \
diff --git a/games-strategy/lgeneral/files/lgeneral-1.2_beta13-build.patch b/games-strategy/lgeneral/files/lgeneral-1.2_beta13-build.patch
new file mode 100644
index 000000000000..1bbea1e06c56
--- /dev/null
+++ b/games-strategy/lgeneral/files/lgeneral-1.2_beta13-build.patch
@@ -0,0 +1,22 @@
+--- configure.in.old	2007-09-27 22:22:52.000000000 +0200
++++ configure.in	2009-02-02 07:01:03.000000000 +0100
+@@ -10,9 +10,10 @@
+ dnl Checks for programs.
+ AC_PROG_CC
+ AC_PROG_RANLIB
++AM_PROG_CC_C_O
+ 
+ dnl various CFLAGS
+-CFLAGS="$CFLAGS -g -Wall"
++CFLAGS="$CFLAGS -Wall"
+ 
+ dnl Checks for libraries.
+ AC_CHECK_LIB(m, main,, AC_MSG_ERROR(maths library is needed))
+@@ -34,6 +35,7 @@
+ dnl L10n support
+ ALL_LINGUAS="en de"
+ 
++AC_GNU_SOURCE
+ AM_GNU_GETTEXT
+ 
+ XGETTEXTFLAGS=
diff --git a/games-strategy/lgeneral/files/lgeneral-1.2_beta13-gentoo-path.patch b/games-strategy/lgeneral/files/lgeneral-1.2_beta13-gentoo-path.patch
new file mode 100644
index 000000000000..c921a857a982
--- /dev/null
+++ b/games-strategy/lgeneral/files/lgeneral-1.2_beta13-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_beta13.ebuild b/games-strategy/lgeneral/lgeneral-1.2_beta13.ebuild
new file mode 100644
index 000000000000..eb91f4d4e5a2
--- /dev/null
+++ b/games-strategy/lgeneral/lgeneral-1.2_beta13.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/lgeneral-1.2_beta13.ebuild,v 1.1 2009/09/21 04:43:00 mr_bones_ Exp $
+
+EAPI=2
+inherit eutils autotools games
+
+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/${PN}/${MY_P}.tar.gz
+	mirror://sourceforge/${PN}/pg-data.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="media-libs/libsdl
+	media-libs/sdl-mixer
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gentoo-path.patch \
+		"${FILESDIR}"/${P}-64bit.patch \
+		"${FILESDIR}"/${P}-build.patch \
+		"${FILESDIR}"/${P}-as-needed.patch
+
+	cp /usr/share/gettext/config.rpath .
+	rm -f missing
+	eautoreconf
+
+	# Build a temporary lgc-pg that knows about ${WORKDIR}:
+	cp -pPR "${S}" "${WORKDIR}"/tmp-build || die "cp failed"
+	sed -i \
+		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}:" \
+		-e "s:@D@::" \
+		{lgc-pg,src}/misc.c \
+		|| die "sed failed"
+
+	cd "${WORKDIR}"/tmp-build
+	sed -i \
+		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}:" \
+		-e "s:@D@:${D}:" \
+		{lgc-pg,src}/misc.c \
+		|| die "sed failed (tmp)"
+}
+
+src_configure() {
+	egamesconf \
+		--disable-dependency-tracking \
+		$(use_enable nls) \
+		|| die
+
+	# Build the temporary lgc-pg:
+	cd "${WORKDIR}"/tmp-build
+	egamesconf \
+		--disable-dependency-tracking \
+		--disable-nls \
+		--datadir="${D}/${GAMES_DATADIR}" \
+		|| die
+}
+
+src_compile() {
+	emake || die "emake failed"
+
+	# Build the temporary lgc-pg:
+	cd "${WORKDIR}"/tmp-build
+	emake || die "emake failed (tmp)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	keepdir "${GAMES_DATADIR}"/${PN}/{ai_modules,music,terrain}
+
+	# Generate scenario data:
+	SDL_VIDEODRIVER=dummy "${WORKDIR}"/tmp-build/lgc-pg/lgc-pg \
+		-s "${WORKDIR}"/pg-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 ${PN} LGeneral
+	prepgamesdirs
+}