old

(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)

3 files changed, 5 insertions, 129 deletions

diff --git a/games-strategy/lgeneral/ChangeLog b/games-strategy/lgeneral/ChangeLog
index 2e42a383d8d6..ec85ecec2b94 100644
--- a/games-strategy/lgeneral/ChangeLog
+++ b/games-strategy/lgeneral/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/lgeneral
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/ChangeLog,v 1.48 2015/02/10 10:09:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/ChangeLog,v 1.49 2015/02/19 01:30:48 mr_bones_ Exp $
+
+  19 Feb 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/lgeneral-1.2.3-format.patch, -lgeneral-1.2.3.ebuild:
+  old
 
   10 Feb 2015; Agostino Sarubbo <ago@gentoo.org> lgeneral-1.2.4.ebuild:
   Stable for x86, wrt bug #539066
diff --git a/games-strategy/lgeneral/files/lgeneral-1.2.3-format.patch b/games-strategy/lgeneral/files/lgeneral-1.2.3-format.patch
deleted file mode 100644
index 364b65a7ee3c..000000000000
--- a/games-strategy/lgeneral/files/lgeneral-1.2.3-format.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- lgc-pg/units.c.old	2014-10-20 08:42:12.389153753 +0200
-+++ lgc-pg/units.c	2014-10-20 08:42:41.412883009 +0200
-@@ -552,7 +552,7 @@
-             }
-         }
-         /* get flags */
--        sprintf( flags, unit_classes[entry.class * 3 + 2] );
-+        sprintf( flags, "%s", unit_classes[entry.class * 3 + 2] );
-         if ( apply_unit_mods ) {
-             i = 0;
-             while ( add_flags[i*2][0] != 'X' ) {
---- src/engine.c.old	2014-10-20 08:44:21.867947804 +0200
-+++ src/engine.c	2014-10-20 08:45:19.299413602 +0200
-@@ -2311,7 +2311,7 @@
-                 if ( gui->module_dlg->subdir[0] != 0 )
-                     sprintf( path, "%s/%s", gui->module_dlg->subdir, (char*)gui->module_dlg->lbox->cur_item );
-                 else
--                    sprintf( path, (char*)gui->module_dlg->lbox->cur_item );
-+                    sprintf( path, "%s", (char*)gui->module_dlg->lbox->cur_item );
-                 free( setup.modules[gui->setup->sel_id] );
-                 setup.modules[gui->setup->sel_id] = strdup( path );
-                 gui_handle_player_select( gui->setup->list->cur_item );
-@@ -2756,7 +2756,7 @@
-                      result = gui_get_message_pane_selection(camp_pane);
-                      if (result && strcmp(result, "nextscen") == 0) {
-                          /* start scenario */
--                         sprintf( setup.fname, camp_cur_scen->scen );
-+                         sprintf( setup.fname, "%s", camp_cur_scen->scen );
-                          setup.type = SETUP_DEFAULT_SCEN;
-                          end_scen = 1;
-                          *reinit = 1;
-@@ -4243,7 +4243,7 @@
-                 }
-                 else {
-                     /* next scenario */
--                    sprintf( setup.fname, camp_cur_scen->scen );
-+                    sprintf( setup.fname, "%s", camp_cur_scen->scen );
-                     setup.type = SETUP_CAMP_BRIEFING;
-                     reinit = 1;
-                 }
diff --git a/games-strategy/lgeneral/lgeneral-1.2.3.ebuild b/games-strategy/lgeneral/lgeneral-1.2.3.ebuild
deleted file mode 100644
index 00bfc1c366b3..000000000000
--- a/games-strategy/lgeneral/lgeneral-1.2.3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# 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.6 2014/10/20 07:00:23 tupone Exp $
-
-EAPI=5
-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[sound,video]
-	media-libs/sdl-mixer
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-format.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 \
-		$(use_enable nls)
-
-	# Build the temporary lgc-pg:
-	cd "${WORKDIR}"/tmp-build
-	egamesconf \
-		--disable-nls \
-		--datadir="${D}/${GAMES_DATADIR}"
-}
-
-src_compile() {
-	emake
-
-	# Build the temporary lgc-pg:
-	cd "${WORKDIR}"/tmp-build
-	emake
-}
-
-src_install() {
-	default
-	keepdir "${GAMES_DATADIR}"/${PN}/{ai_modules,music,terrain}
-
-	# Generate scenario data:
-	dodir "${GAMES_DATADIR}"/${PN}/gfx/{flags,units,terrain} #413901
-	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"
-
-	newicon lgeneral48.png ${PN}.png
-	make_desktop_entry ${PN} LGeneral
-	prepgamesdirs
-}