old

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

3 files changed, 5 insertions, 77 deletions

diff --git a/games-strategy/wargus/ChangeLog b/games-strategy/wargus/ChangeLog
index edabea99d8d3..f8b290396daf 100644
--- a/games-strategy/wargus/ChangeLog
+++ b/games-strategy/wargus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/wargus
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/wargus/ChangeLog,v 1.29 2015/04/09 16:53:44 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wargus/ChangeLog,v 1.30 2015/04/09 16:54:51 mr_bones_ Exp $
+
+  09 Apr 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/wargus-2.2.5.5-libpng.patch, -wargus-2.2.5.5.ebuild:
+  old
 
   09 Apr 2015; Michael Sterrett <mr_bones_@gentoo.org> wargus-2.2.7.ebuild:
   mark stable
diff --git a/games-strategy/wargus/files/wargus-2.2.5.5-libpng.patch b/games-strategy/wargus/files/wargus-2.2.5.5-libpng.patch
deleted file mode 100644
index 65ebc12ce8e9..000000000000
--- a/games-strategy/wargus/files/wargus-2.2.5.5-libpng.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- wartool.orig.c
-+++ wartool.c
-@@ -61,6 +61,7 @@
- #include <unistd.h>
- #endif
- #include <ctype.h>
-+#include <zlib.h>
- #include <png.h>
- 
- #include "endian.h"
-@@ -1876,7 +1877,7 @@
- 		return 1;
- 	}
- 
--	if (setjmp(png_ptr->jmpbuf)) {
-+	if (setjmp(png_jmpbuf(png_ptr))) {
- 		// FIXME: must free buffers!!
- 		png_destroy_write_struct(&png_ptr, &info_ptr);
- 		fclose(fp);
-@@ -1888,14 +1889,8 @@
- 	png_set_compression_level(png_ptr, Z_BEST_COMPRESSION);
- 
- 	// prepare the file information
--	info_ptr->width = w;
--	info_ptr->height = h;
--	info_ptr->bit_depth = 8;
--	info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
--	info_ptr->interlace_type = 0;
--	info_ptr->valid |= PNG_INFO_PLTE;
--	info_ptr->palette = (png_colorp)pal;
--	info_ptr->num_palette = 256;
-+	png_set_IHDR(png_ptr, info_ptr, w, h, 8, PNG_COLOR_TYPE_PALETTE, 0, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
-+	png_set_PLTE(png_ptr, info_ptr, (png_colorp)pal, 256);
- 
- 	if (transparent) {
- 		unsigned char* p;
diff --git a/games-strategy/wargus/wargus-2.2.5.5.ebuild b/games-strategy/wargus/wargus-2.2.5.5.ebuild
deleted file mode 100644
index 21edfe9c2159..000000000000
--- a/games-strategy/wargus/wargus-2.2.5.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/wargus/wargus-2.2.5.5.ebuild,v 1.8 2012/06/01 20:24:32 hasufell Exp $
-
-EAPI=2
-inherit eutils cdrom games
-
-DESCRIPTION="Warcraft II for the Stratagus game engine (Needs WC2 DOS CD)"
-HOMEPAGE="http://wargus.sourceforge.net/"
-SRC_URI="http://launchpad.net/wargus/trunk/${PV}/+download/wargus_${PV}.orig.tar.gz
-	mirror://gentoo/wargus.png"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND="media-libs/libpng
-	media-video/ffmpeg2theora"
-RDEPEND="=games-engines/stratagus-${PV}*
-	!games-strategy/wargus-data"
-
-src_prepare() {
-	cdrom_get_cds data/rezdat.war
-	epatch "${FILESDIR}/${P}-libpng.patch"
-	edos2unix build.sh
-}
-
-src_install() {
-	local dir=${GAMES_DATADIR}/stratagus/${PN}
-
-	dodir "${dir}"
-	./build.sh -p "${CDROM_ROOT}" -o "${D}/${dir}" -v \
-		|| die "Failed to extract data"
-	games_make_wrapper wargus "./stratagus -d \"${dir}\"" "${GAMES_BINDIR}"
-	prepgamesdirs
-
-	doicon "${DISTDIR}"/wargus.png
-	make_desktop_entry wargus Wargus
-}