version bump (bug #375227)

(Portage version: 2.1.10.3/cvs/Linux i686)

6 files changed, 190 insertions, 1 deletions

diff --git a/games-strategy/lgeneral/ChangeLog b/games-strategy/lgeneral/ChangeLog
index 1c5e427f8c2f..33bec626d91c 100644
--- a/games-strategy/lgeneral/ChangeLog
+++ b/games-strategy/lgeneral/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-strategy/lgeneral
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/ChangeLog,v 1.33 2011/01/04 22:44:31 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/ChangeLog,v 1.34 2011/07/20 16:36:57 mr_bones_ Exp $
+
+*lgeneral-1.2.1 (20 Jul 2011)
+
+  20 Jul 2011; Michael Sterrett <mr_bones_@gentoo.org> +lgeneral-1.2.1.ebuild,
+  +files/lgeneral-1.2.1-as-needed.patch, +files/lgeneral-1.2.1-build.patch,
+  +files/lgeneral-1.2.1-gentoo-path.patch,
+  +files/lgeneral-1.2.1-make-382.patch:
+  version bump (bug #375227)
 
   04 Jan 2011; Markos Chandras <hwoarang@gentoo.org> lgeneral-1.2.ebuild:
   Stable on amd64 wrt bug #350434
diff --git a/games-strategy/lgeneral/files/lgeneral-1.2.1-as-needed.patch b/games-strategy/lgeneral/files/lgeneral-1.2.1-as-needed.patch
new file mode 100644
index 000000000000..9044dc4a6fa7
--- /dev/null
+++ b/games-strategy/lgeneral/files/lgeneral-1.2.1-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 -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.1-build.patch b/games-strategy/lgeneral/files/lgeneral-1.2.1-build.patch
new file mode 100644
index 000000000000..026a1be4c4c7
--- /dev/null
+++ b/games-strategy/lgeneral/files/lgeneral-1.2.1-build.patch
@@ -0,0 +1,22 @@
+--- configure.in.old	2010-11-30 22:46:20.190215458 -0500
++++ configure.in	2010-11-30 22:47:07.138144807 -0500
+@@ -11,9 +11,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"
+ #CFLAGS="-O0 -g -Wall"
+ 
+ dnl Checks for libraries.
+@@ -36,6 +37,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.1-gentoo-path.patch b/games-strategy/lgeneral/files/lgeneral-1.2.1-gentoo-path.patch
new file mode 100644
index 000000000000..17882ddac868
--- /dev/null
+++ b/games-strategy/lgeneral/files/lgeneral-1.2.1-gentoo-path.patch
@@ -0,0 +1,26 @@
+diff -ru lgeneral-1.2.orig/configure.in lgeneral-1.2/configure.in
+--- lgeneral-1.2.orig/configure.in	2010-09-28 13:44:39.000000000 -0400
++++ lgeneral-1.2/configure.in	2010-11-30 22:37:30.245177173 -0500
+@@ -106,13 +106,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)
+@@ -150,7 +145,7 @@
+ AC_SUBST(dl_lib_flag)
+ 
+ dnl installation path
+-inst_dir=$datadir/games/lgeneral
++inst_dir=$datadir/lgeneral
+ inst_flag="-DINSTALLDIR=\\\"$inst_dir\\\""
+ 
+ dis_flag=""
diff --git a/games-strategy/lgeneral/files/lgeneral-1.2.1-make-382.patch b/games-strategy/lgeneral/files/lgeneral-1.2.1-make-382.patch
new file mode 100644
index 000000000000..f4eed33c2bdb
--- /dev/null
+++ b/games-strategy/lgeneral/files/lgeneral-1.2.1-make-382.patch
@@ -0,0 +1,23 @@
+http://bugs.gentoo.org/337610
+
+--- intl/Makefile.in
++++ intl/Makefile.in
+@@ -206,12 +206,12 @@
+ # The dependency for intlh.inst is different in gettext and all other
+ # packages.  Because we cannot you GNU make features we have to solve
+ # the problem while rewriting Makefile.in.
+-@GT_YES@intlh.inst: intlh.inst.in ../config.status
+-@GT_YES@	cd .. \
+-@GT_YES@	&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
+-@GT_YES@	  $(SHELL) ./config.status
+-@GT_NO@.PHONY: intlh.inst
+-@GT_NO@intlh.inst:
++intlh.inst: intlh.inst.in ../config.status
++	cd .. \
++	&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
++	  $(SHELL) ./config.status
++.PHONY: intlh.inst
++intlh.inst:
+ 
+ # Tell versions [3.59,3.63) of GNU make not to export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/games-strategy/lgeneral/lgeneral-1.2.1.ebuild b/games-strategy/lgeneral/lgeneral-1.2.1.ebuild
new file mode 100644
index 000000000000..d7a3bfb22aa5
--- /dev/null
+++ b/games-strategy/lgeneral/lgeneral-1.2.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/lgeneral-1.2.1.ebuild,v 1.1 2011/07/20 16:36:57 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[audio,video]
+	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}-build.patch \
+		"${FILESDIR}"/${P}-as-needed.patch \
+		"${FILESDIR}"/${P}-make-382.patch
+
+	sed -i \
+		-e '/desktop_DATA/d' \
+		-e '/icon_DATA/d' \
+		Makefile.am || die
+
+	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
+}