diff options
| -rw-r--r-- | games-strategy/lgeneral/ChangeLog | 9 | ||||
| -rw-r--r-- | games-strategy/lgeneral/Manifest | 46 | ||||
| -rw-r--r-- | games-strategy/lgeneral/files/digest-lgeneral-1.1.1-r1 | 4 | ||||
| -rw-r--r-- | games-strategy/lgeneral/files/lgeneral-1.2_beta12-build.patch | 21 | ||||
| -rw-r--r-- | games-strategy/lgeneral/files/lgeneral-1.2_beta12-gettext.patch | 28 | ||||
| -rw-r--r-- | games-strategy/lgeneral/lgeneral-1.2_beta12-r1.ebuild | 73 |
6 files changed, 126 insertions, 55 deletions
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 <nyhm@gentoo.org> + +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; <tupone@gentoo.org> +files/lgeneral-1.2_beta12-64bit.patch, -lgeneral-1.2_beta8.ebuild, -lgeneral-1.2_beta9.ebuild, diff --git a/games-strategy/lgeneral/Manifest b/games-strategy/lgeneral/Manifest index 4e86d50d49bc..f6723d0ec361 100644 --- a/games-strategy/lgeneral/Manifest +++ b/games-strategy/lgeneral/Manifest @@ -9,42 +9,46 @@ AUX lgeneral-1.2_beta12-64bit.patch 339 RMD160 e68c24f17b82a16db0623032336275659 MD5 a60f15e44bb8185e6a3f3b5245ad040a files/lgeneral-1.2_beta12-64bit.patch 339 RMD160 e68c24f17b82a16db06230323362756593414e88 files/lgeneral-1.2_beta12-64bit.patch 339 SHA256 541bef53004cb900e842d2eb4dc8f144e313a23d194b8b3feeb0bfdb2ebf6487 files/lgeneral-1.2_beta12-64bit.patch 339 +AUX lgeneral-1.2_beta12-build.patch 318 RMD160 05d9dc69438f42f1ac51479af15d9ec0a1eb64af SHA1 030aa4cb3215b1c3e3add11374472ddf90799789 SHA256 6d173938dfd0b013614734a4705cdcdfcab57fa831afa59a8008d371f7751ced +MD5 7aca2c8186e11cd8454b39daa67e5a3f files/lgeneral-1.2_beta12-build.patch 318 +RMD160 05d9dc69438f42f1ac51479af15d9ec0a1eb64af files/lgeneral-1.2_beta12-build.patch 318 +SHA256 6d173938dfd0b013614734a4705cdcdfcab57fa831afa59a8008d371f7751ced files/lgeneral-1.2_beta12-build.patch 318 AUX lgeneral-1.2_beta12-gentoo-path.patch 2393 RMD160 8bf62ea88afb1e0e480436eb298aa1f0abc3f07e SHA1 3f2b6e0463b04b9b929d196c838aa9fc4d82a84d SHA256 199427f23522583fa6a97776bb0710841f961d3528afb8cc3c610e7eed082933 MD5 9b7e601212e846db45e03c487205f0c4 files/lgeneral-1.2_beta12-gentoo-path.patch 2393 RMD160 8bf62ea88afb1e0e480436eb298aa1f0abc3f07e files/lgeneral-1.2_beta12-gentoo-path.patch 2393 SHA256 199427f23522583fa6a97776bb0710841f961d3528afb8cc3c610e7eed082933 files/lgeneral-1.2_beta12-gentoo-path.patch 2393 -AUX lgeneral-1.2_beta12-gettext.patch 755 RMD160 9103c135e84058c68a70bc2813a4dad6bb62794f SHA1 4ffa9488e0e8c734984a9092422fa834d3cab366 SHA256 f224293c35f694e0c19c7ecd37298b7edd04cf681f3bf6150645db18c8812441 -MD5 2057faa05ce9d4b4efa85ff0aab3d6ca files/lgeneral-1.2_beta12-gettext.patch 755 -RMD160 9103c135e84058c68a70bc2813a4dad6bb62794f files/lgeneral-1.2_beta12-gettext.patch 755 -SHA256 f224293c35f694e0c19c7ecd37298b7edd04cf681f3bf6150645db18c8812441 files/lgeneral-1.2_beta12-gettext.patch 755 -DIST lgeneral-1.1.1.tar.gz 588698 +AUX lgeneral-1.2_beta12-gettext.patch 1352 RMD160 02190ad461ac5ee53b3c8eb9ec987ab6dc8a81d6 SHA1 d6a782e714b23ad8ab16a952be2cc6cf222fcf27 SHA256 4e76d9dfeba12160504cb8f034ed11d5b27e361e3eb05c1583c428b021192c1b +MD5 306c5be270276094fa94964472be5cd5 files/lgeneral-1.2_beta12-gettext.patch 1352 +RMD160 02190ad461ac5ee53b3c8eb9ec987ab6dc8a81d6 files/lgeneral-1.2_beta12-gettext.patch 1352 +SHA256 4e76d9dfeba12160504cb8f034ed11d5b27e361e3eb05c1583c428b021192c1b files/lgeneral-1.2_beta12-gettext.patch 1352 +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-2.tar.gz 878853 RMD160 fde81c42bc3370bc22ef577c56fb78c9b7b64092 SHA1 fb208bfca3e463c7b30ede2ec20b8baa10729c36 SHA256 e816752800a94ae5dbb5f1f44458ffd58105e1cdaaa57c5e9e0727c6106a0c9e -DIST lgeneral-data-1.1.3.tar.gz 1073781 +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 1113 RMD160 fa9072a0e18021d179659a830298034d311696ed SHA1 cb50614216ff45a6eeebfdcee41b2575e2e720ce SHA256 9c48b6f1099eb7b91f72921f31a6f0c22b9d509aea6db19c57a0a10bf47a60b7 MD5 128afa83e71a3141c957a56313b92000 lgeneral-1.1.1-r1.ebuild 1113 RMD160 fa9072a0e18021d179659a830298034d311696ed lgeneral-1.1.1-r1.ebuild 1113 SHA256 9c48b6f1099eb7b91f72921f31a6f0c22b9d509aea6db19c57a0a10bf47a60b7 lgeneral-1.1.1-r1.ebuild 1113 -EBUILD lgeneral-1.2_beta12-r1.ebuild 1998 RMD160 1f8831501e2dabce326bb4b803394b80494d73d9 SHA1 a0325b62929befa5318e72b59d547f6cf8e7b776 SHA256 52d200f40c3631b00e1987dfc97fb34191ecd0584a9576e0bd3319d2fce0eebc -MD5 76338a1f17ab56171994a307bdbf7c56 lgeneral-1.2_beta12-r1.ebuild 1998 -RMD160 1f8831501e2dabce326bb4b803394b80494d73d9 lgeneral-1.2_beta12-r1.ebuild 1998 -SHA256 52d200f40c3631b00e1987dfc97fb34191ecd0584a9576e0bd3319d2fce0eebc lgeneral-1.2_beta12-r1.ebuild 1998 +EBUILD lgeneral-1.2_beta12-r1.ebuild 2204 RMD160 bbacebd7cd51933e716e5afcee0edf489d5dd37d SHA1 692891c36e53f766992d6a56e4d8784c1b0ce5fd SHA256 8c1cafa04f17430223e1b5eedfe301952715740458efe9770845a1e97ca7ca77 +MD5 63d78b74ce1fbc0bad43a62cc0e4bc79 lgeneral-1.2_beta12-r1.ebuild 2204 +RMD160 bbacebd7cd51933e716e5afcee0edf489d5dd37d lgeneral-1.2_beta12-r1.ebuild 2204 +SHA256 8c1cafa04f17430223e1b5eedfe301952715740458efe9770845a1e97ca7ca77 lgeneral-1.2_beta12-r1.ebuild 2204 EBUILD lgeneral-1.2_beta2.ebuild 1481 RMD160 bcdc7fb57f619db9eab7f9eb2df50b5ee0dd6c3a SHA1 7fc4964bc271095f1853e45854b5133f1b70caf2 SHA256 eb2f0c178f72ac9d14259066b689dafd1ab134c040c8aae5cd8a5ca6000eb698 MD5 cca6898907a4441d1f2c7e1a76b6b585 lgeneral-1.2_beta2.ebuild 1481 RMD160 bcdc7fb57f619db9eab7f9eb2df50b5ee0dd6c3a lgeneral-1.2_beta2.ebuild 1481 SHA256 eb2f0c178f72ac9d14259066b689dafd1ab134c040c8aae5cd8a5ca6000eb698 lgeneral-1.2_beta2.ebuild 1481 -MISC ChangeLog 4719 RMD160 4e4d0d4413c7cad258457b3bb85c1e3736cf1111 SHA1 c38f32f9831b7506cbe55bf06cb45152add82db0 SHA256 4831824af3c617fff65027d934b840bf998c66d5cf8972785e2c2d1a2ce95d26 -MD5 c934c69d6665c01be65b9b005541a3c1 ChangeLog 4719 -RMD160 4e4d0d4413c7cad258457b3bb85c1e3736cf1111 ChangeLog 4719 -SHA256 4831824af3c617fff65027d934b840bf998c66d5cf8972785e2c2d1a2ce95d26 ChangeLog 4719 +MISC ChangeLog 4910 RMD160 1fcb6ca3e6e0e80b457989ec13d04304090a76ad SHA1 21da3666fb6fb66a439ceb3197b3a5a1ef6a3613 SHA256 211baf52bc0a63fc57667893094be4482951f65c35b6734ff377113a2a967db0 +MD5 4afd1b437df12544d50dcbdf488174d2 ChangeLog 4910 +RMD160 1fcb6ca3e6e0e80b457989ec13d04304090a76ad ChangeLog 4910 +SHA256 211baf52bc0a63fc57667893094be4482951f65c35b6734ff377113a2a967db0 ChangeLog 4910 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158 -MD5 9bd18133cff27a13ac0c62fe2ebeba33 files/digest-lgeneral-1.1.1-r1 138 -RMD160 49c076d64fdc70bf6761bf278a4a216fb86a2846 files/digest-lgeneral-1.1.1-r1 138 -SHA256 c820f4cea2008320449181b7da6a1b9fc531d93ea43235d6563d02ea6de1f562 files/digest-lgeneral-1.1.1-r1 138 +MD5 f76dd9b754cfc0a1dd0f829d20854e41 files/digest-lgeneral-1.1.1-r1 506 +RMD160 bc831c2d733f58f1630e4bfd906b1cebe470d736 files/digest-lgeneral-1.1.1-r1 506 +SHA256 58209f0b5c9433f59683212ebd07f67cfdac67ead074c65c2611d6486d08c2b5 files/digest-lgeneral-1.1.1-r1 506 MD5 4a69ee31a100bcaefc5658cffac1a0a7 files/digest-lgeneral-1.2_beta12-r1 485 RMD160 c2ba879600fc8e0beaa8cf34412c36f316d79f67 files/digest-lgeneral-1.2_beta12-r1 485 SHA256 8bc0b78e07c69a26a2446bcbafe2a7ef30b6ce19bd3526f1ea543e7655690f45 files/digest-lgeneral-1.2_beta12-r1 485 @@ -52,9 +56,9 @@ MD5 2b3f8675d24c8c3e239b10fc379e573e files/digest-lgeneral-1.2_beta2 479 RMD160 88ba2eda907087985254f9bc7e5346e1c629637c files/digest-lgeneral-1.2_beta2 479 SHA256 c5523ae5ffd430b3bc3fdeed6301d6ba560b83121e7870387a11076b7ee6f1af files/digest-lgeneral-1.2_beta2 479 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) +Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFOTlSbfN2jvlVAhwRAj8cAJ9Tq+LX987ZrNDd3MnyEZRSEQ54UACfeizm -tAKDVafPzDFgI0Lw+o3XHSU= -=J7fz +iD8DBQFFrAHodz7hIScOURERApytAJ9YazZYaKbBdhVUB1d7wHHEaoe/BgCaAnaH +Lgv2XW6xXaG5HB1w2v96PRs= +=Bw+B -----END PGP SIGNATURE----- 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 } |