From 776f4f5fac71589d29024e47946458683c5ac35e Mon Sep 17 00:00:00 2001 From: Tristan Heaven Date: Mon, 15 Jan 2007 22:36:18 +0000 Subject: Optional nls, bug #154610 (Portage version: 2.1.2) --- games-strategy/lgeneral/ChangeLog | 9 ++- .../lgeneral/files/digest-lgeneral-1.1.1-r1 | 4 ++ .../lgeneral/files/lgeneral-1.2_beta12-build.patch | 21 +++++++ .../files/lgeneral-1.2_beta12-gettext.patch | 28 ++++++++- .../lgeneral/lgeneral-1.2_beta12-r1.ebuild | 73 +++++++++++++--------- 5 files changed, 101 insertions(+), 34 deletions(-) create mode 100644 games-strategy/lgeneral/files/lgeneral-1.2_beta12-build.patch (limited to 'games-strategy/lgeneral') diff --git a/games-strategy/lgeneral/ChangeLog b/games-strategy/lgeneral/ChangeLog index e428ec83cb06..37e5005c9a14 100644 --- a/games-strategy/lgeneral/ChangeLog +++ b/games-strategy/lgeneral/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-strategy/lgeneral -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/ChangeLog,v 1.23 2006/10/20 21:01:59 tupone Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/ChangeLog,v 1.24 2007/01/15 22:36:18 nyhm Exp $ + + 15 Jan 2007; Tristan Heaven + +files/lgeneral-1.2_beta12-build.patch, + files/lgeneral-1.2_beta12-gettext.patch, lgeneral-1.2_beta12-r1.ebuild: + Optional nls, bug #154610 20 Oct 2006; +files/lgeneral-1.2_beta12-64bit.patch, -lgeneral-1.2_beta8.ebuild, -lgeneral-1.2_beta9.ebuild, diff --git a/games-strategy/lgeneral/files/digest-lgeneral-1.1.1-r1 b/games-strategy/lgeneral/files/digest-lgeneral-1.1.1-r1 index 6d5fa1852ebe..02b1068cc140 100644 --- a/games-strategy/lgeneral/files/digest-lgeneral-1.1.1-r1 +++ b/games-strategy/lgeneral/files/digest-lgeneral-1.1.1-r1 @@ -1,2 +1,6 @@ MD5 18b88069c91e7e7c75cc44a9aa90d0d9 lgeneral-1.1.1.tar.gz 588698 +RMD160 f4ca361e8b3d180e0fb7136f86cc6412a82974fb lgeneral-1.1.1.tar.gz 588698 +SHA256 182513e8662251fabbaa782c575b2d96d8d135f20892c3a58112f755c82f9a8b lgeneral-1.1.1.tar.gz 588698 MD5 786feb83f163834a22e3e85e1970145f lgeneral-data-1.1.3.tar.gz 1073781 +RMD160 d314d174fbec5200f80c88fc6642f90005c54537 lgeneral-data-1.1.3.tar.gz 1073781 +SHA256 bc4dddc25488dd863b0f4eb9d120e5017055ecbcc2cc53ba12d713681e47f10b lgeneral-data-1.1.3.tar.gz 1073781 diff --git a/games-strategy/lgeneral/files/lgeneral-1.2_beta12-build.patch b/games-strategy/lgeneral/files/lgeneral-1.2_beta12-build.patch new file mode 100644 index 000000000000..77afed05988d --- /dev/null +++ b/games-strategy/lgeneral/files/lgeneral-1.2_beta12-build.patch @@ -0,0 +1,21 @@ +--- configure.in ++++ configure.in +@@ -10,9 +10,9 @@ + dnl Checks for programs. + AC_PROG_CC + AC_PROG_RANLIB ++AM_PROG_CC_C_O + + dnl various CFLAGS +-CFLAGS="-g" + CFLAGS="$CFLAGS -Wall" + + dnl Checks for libraries. +@@ -35,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_beta12-gettext.patch b/games-strategy/lgeneral/files/lgeneral-1.2_beta12-gettext.patch index c5eebe7ce71f..9e4d27fbe8f6 100644 --- a/games-strategy/lgeneral/files/lgeneral-1.2_beta12-gettext.patch +++ b/games-strategy/lgeneral/files/lgeneral-1.2_beta12-gettext.patch @@ -1,5 +1,16 @@ ---- po/lgeneral/Makefile.in.in.old 2006-10-09 22:55:07.000000000 +0200 -+++ po/lgeneral/Makefile.in.in 2006-10-09 22:57:28.000000000 +0200 +--- po/lgeneral/Makefile.in.in ++++ po/lgeneral/Makefile.in.in +@@ -21,8 +21,8 @@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ + datadir = $(prefix)/@DATADIRNAME@ +-localedir = $(datadir)/locale +-gnulocaledir = $(prefix)/share/locale ++localedir = /usr/share/locale ++gnulocaledir = /usr/share/locale + gettextsrcdir = $(prefix)/share/gettext/po + subdir = po/lgeneral + @@ -99,11 +99,8 @@ $(XGETTEXT) $(XGETTEXTFLAGS) --default-domain=$(PACKAGE) \ --directory=$(top_srcdir) --add-comments \ @@ -14,3 +25,16 @@ $(srcdir)/cat-id-tbl.c: $(srcdir)/stamp-cat-id; @: $(srcdir)/stamp-cat-id: $(srcdir)/$(PACKAGE).pot +--- po/pg/Makefile.in.in ++++ po/pg/Makefile.in.in +@@ -23,8 +23,8 @@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ + datadir = $(prefix)/@DATADIRNAME@ +-localedir = $(datadir)/locale +-gnulocaledir = $(prefix)/share/locale ++localedir = /usr/share/locale ++gnulocaledir = /usr/share/locale + gettextsrcdir = $(prefix)/share/gettext/po + subdir = po/pg + inst_dir = @inst_dir@ diff --git a/games-strategy/lgeneral/lgeneral-1.2_beta12-r1.ebuild b/games-strategy/lgeneral/lgeneral-1.2_beta12-r1.ebuild index d175ef1fa23d..f535c5ee2bc7 100644 --- a/games-strategy/lgeneral/lgeneral-1.2_beta12-r1.ebuild +++ b/games-strategy/lgeneral/lgeneral-1.2_beta12-r1.ebuild @@ -1,74 +1,87 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 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-r1.ebuild,v 1.3 2006/10/20 21:01:59 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/lgeneral-1.2_beta12-r1.ebuild,v 1.4 2007/01/15 22:36:18 nyhm 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" +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="" +IUSE="nls" -DEPEND="media-libs/libsdl - media-libs/sdl-mixer" +RDEPEND="media-libs/libsdl + media-libs/sdl-mixer + nls? ( virtual/libintl )" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext )" -S="${WORKDIR}/${MY_P}" +S=${WORKDIR}/${MY_P} src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}/${P}"-gentoo-path.patch \ + epatch \ + "${FILESDIR}"/${P}-gentoo-path.patch \ "${FILESDIR}"/${P}-gettext.patch \ - "${FILESDIR}"/${P}-64bit.patch + "${FILESDIR}"/${P}-64bit.patch \ + "${FILESDIR}"/${P}-build.patch + + cp /usr/share/gettext/config.rpath . + rm -f missing eautoreconf - # Build a temporary lgc-pg that knows about /var/tmp/portage in work/lgc-pg: - cp -pPR "${S}" "${WORKDIR}/lgc-pg" || die "cp failed." + + # 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@::" \ - src/misc.c \ - lgc-pg/misc.c - cd "${WORKDIR}"/lgc-pg + {lgc-pg,src}/misc.c \ + || die "sed failed" + + cd "${WORKDIR}"/tmp-build sed -i \ -e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}:" \ -e "s:@D@:${D}:" \ - src/misc.c \ - lgc-pg/misc.c + {lgc-pg,src}/misc.c \ + || die "sed failed (tmp)" } src_compile() { egamesconf \ --disable-dependency-tracking \ - || die "egamesconf failed" + $(use_enable nls) \ + || die 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" + cd "${WORKDIR}"/tmp-build + egamesconf \ + --disable-dependency-tracking \ + --disable-nls \ + --datadir="${D}/${GAMES_DATADIR}" \ + || die + emake || die "emake failed (tmp)" } src_install() { - make DESTDIR=${D} install || die "make install failed." - keepdir "${GAMES_DATADIR}/${PN}/"{ai_modules,music,terrain} + emake DESTDIR="${D}" install || die "emake 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." + 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 lgeneral LGeneral + make_desktop_entry ${PN} LGeneral prepgamesdirs } -- cgit v1.2.3-65-gdbad