tupone 14/10/20 07:00:23 Modified: ChangeLog lgeneral-1.2.3.ebuild Log: Fix compile with format-security. Bug #520568 (Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 0145142D)
Revision Changes Path 1.45 games-strategy/lgeneral/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/lgeneral/ChangeLog?rev=1.45&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/lgeneral/ChangeLog?rev=1.45&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/lgeneral/ChangeLog?r1=1.44&r2=1.45 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/ChangeLog,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- ChangeLog 15 May 2014 17:05:05 -0000 1.44 +++ ChangeLog 20 Oct 2014 07:00:23 -0000 1.45 @@ -1,6 +1,10 @@ # ChangeLog for games-strategy/lgeneral # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/ChangeLog,v 1.44 2014/05/15 17:05:05 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/ChangeLog,v 1.45 2014/10/20 07:00:23 tupone Exp $ + + 20 Oct 2014; Alfredo Tupone <tup...@gentoo.org> lgeneral-1.2.3.ebuild, + +files/lgeneral-1.2.3-format.patch: + Fix compile with format-security. Bug #520568 by Agostino Sarubbo 15 May 2014; Ulrich Müller <u...@gentoo.org> lgeneral-1.2.3.ebuild: Fix USE dependency on media-libs/libsdl, "audio" USE flag was renamed to 1.6 games-strategy/lgeneral/lgeneral-1.2.3.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/lgeneral/lgeneral-1.2.3.ebuild?rev=1.6&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/lgeneral/lgeneral-1.2.3.ebuild?rev=1.6&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/lgeneral/lgeneral-1.2.3.ebuild?r1=1.5&r2=1.6 Index: lgeneral-1.2.3.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/lgeneral-1.2.3.ebuild,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- lgeneral-1.2.3.ebuild 15 May 2014 17:05:05 -0000 1.5 +++ lgeneral-1.2.3.ebuild 20 Oct 2014 07:00:23 -0000 1.6 @@ -1,8 +1,8 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/lgeneral-1.2.3.ebuild,v 1.5 2014/05/15 17:05:05 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/lgeneral-1.2.3.ebuild,v 1.6 2014/10/20 07:00:23 tupone Exp $ -EAPI=2 +EAPI=5 inherit eutils autotools games MY_P="${P/_/}" @@ -26,6 +26,7 @@ S=${WORKDIR}/${MY_P} src_prepare() { + epatch "${FILESDIR}"/${P}-format.patch sed -i \ -e '/desktop_DATA/d' \ -e '/icon_DATA/d' \ @@ -53,29 +54,25 @@ src_configure() { egamesconf \ - --disable-dependency-tracking \ - $(use_enable nls) \ - || die + $(use_enable nls) # Build the temporary lgc-pg: cd "${WORKDIR}"/tmp-build egamesconf \ - --disable-dependency-tracking \ --disable-nls \ - --datadir="${D}/${GAMES_DATADIR}" \ - || die + --datadir="${D}/${GAMES_DATADIR}" } src_compile() { - emake || die "emake failed" + emake # Build the temporary lgc-pg: cd "${WORKDIR}"/tmp-build - emake || die "emake failed (tmp)" + emake } src_install() { - emake DESTDIR="${D}" install || die "emake install failed" + default keepdir "${GAMES_DATADIR}"/${PN}/{ai_modules,music,terrain} # Generate scenario data: @@ -85,7 +82,6 @@ -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
