old

Package-Manager: portage-2.2.14/cvs/Linux x86_64

4 files changed, 6 insertions, 82 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/Manifest b/games-strategy/wargus/Manifest
index bc75c74a28d2..6b5609a9e35c 100644
--- a/games-strategy/wargus/Manifest
+++ b/games-strategy/wargus/Manifest
@@ -1,8 +1,4 @@
-AUX wargus-2.2.5.5-libpng.patch 974 SHA256 b48b53ee2f18abc5e4a76f72eca6702baf39ac129765f906ce1e33985b442c15 SHA512 cc9ab831cdf03ece102d881a2ef7bd477ca209c8f5b4800963277e4519a780c7bde8c41a661be06c88bc7342eb9c39b93a3c91eea4b391dd1a10cf4f16e086e7 WHIRLPOOL de6aa722fab06b18b1cc273001317f96eb393474d00d5dc3bbe8f43ec898bce7acaad1d0ca40e3007355ddb07abb64d60dd89d0522f49bd7eea4daa85b3c17ba
-DIST wargus.png 7561 SHA256 f8190a41f5131c45c76cb6d91c97e7fcf48c4fcd26cb231802c224c7e19ac0bd SHA512 fd911dbeb9678471d08c3274030c0872a3907c32d22f31b9b4736bbc4f9ca9187fc1407717108b7dfa839eb07d3647a5a9b2c08bf6f974028a1d96aa1fecf80e WHIRLPOOL 8d0382f4b11617dbea88627ddc82d7bd5a15edd1dc1d1eb8b7bfc6098dd03158473650ebe4e966fc728eb291409f72100867dfed8f361ac41c3b1b47240c881f
-DIST wargus_2.2.5.5.orig.tar.gz 3605444 SHA256 561d0ac5e88abcd5663fca1f7793ee20739aa0d641420bf0a6b7424ebd4ab14f SHA512 5b1e6d56b2f715eecf16c16776bed699cee9739705c4bbf69883e6434d8451d05f514678505cc86898e37a56ad3864f5b23b58a0099ba53686c7471e8333d35d WHIRLPOOL 8f5005efb2d95393fba75869e8e3e8ad8ba164dffb513378612d65490fb366627c067bcda6c950aecdc56be6df029c5fb8eedf944b20d362e70f408c28e5a135
 DIST wargus_2.2.7.orig.tar.gz 3655476 SHA256 f688663458e035725f5cd18535a7a1eaecd66eaf55b032fe2ac21ed48b239908 SHA512 a419e70c53db6f3919255ef98ea717a0802e0854095b019bd9c6eef66d6602f75c1849a53ef654b5d66191a824725e3eff23f1f01767eab861e6ddfaf2414bbb WHIRLPOOL d440ac1f279912b13f37fd618f31b1bb2ac53f143789dbe56835343e9486a6ec2aeca71874c4ae2bd9c707706cdf33efbec8df8993d102b0276da0aa53e04cc3
-EBUILD wargus-2.2.5.5.ebuild 1100 SHA256 6b39eb75b688349391ec4bb7a44c29ef875f77bf8e848a74d16bbe3e15da556c SHA512 4860f44d5e9fbd1ff804987da559c07373b770d4ab94733297bc0ca2777c43d435bff39021557b81f4b464bf90fb1ecbf735e3eaa7047b1be2a7aeefb8623017 WHIRLPOOL ac0305947c0abdeb398f1aed41b209d59595e8490149195144e054100417284bd1e0d37b6d82ae698f06fd2d96a51ba2ba5fe6ff4f8e1d12a21115e24e491a05
 EBUILD wargus-2.2.7.ebuild 1327 SHA256 84dfc96c620b750b0c3ee668c1f67ba5ca8e29d14341772b2bf6dbb0bcc64a1b SHA512 36533111a4318f3b9313c92b98321b7a08129f0bf2c3b3b64fcf8dc6b6a750f24ec4e93df922d1159bac9a472aa84a4c9a48e776dec691246c014539b7a17bc9 WHIRLPOOL 65642bd4f2d8948518c748e0372afc372b947ee9ae2f8e709cb3f81b2833b008fde398e922542878a47dca0f85d2c310291eb0c45621990334ed1898ed0b909a
-MISC ChangeLog 4826 SHA256 cd7b4674e9b1920c2bee6f03583d970312ae973992352cf58a655df33434321c SHA512 29ea6fef39f8d1cd6565a3c4770e1a90f9b4bbf2a4db58cbeb8a408288804966872ace127448207f5fcac1b42ca2a62686de8931757938ad15531dc5eb12bc77 WHIRLPOOL 369b89c36ded363f538565b20ac85f0b17a31017a336a57081edfcfc19e20518ba0fc5017f44cd9140a862479c206d5601f8857e379fc2c302c193c457fc663d
+MISC ChangeLog 4950 SHA256 486c0e3e63b9f6d6490362eb424eb1db5101601fa87574ac63cea81f11083ce5 SHA512 279082f20f822617735a482b7139b0e0f947de29b960357f5d2e496e9291b65e553b842ac5fae939a8cb90d4335516e757607d5ae97cd2d62706eea5e0718af5 WHIRLPOOL 13c1a7cbf762867af46d47aeeb1cb0a2e88f8ab053e612e6a893e31ba64fa5ddc682ba106a8678686bc2e3ee0dca09008550df43232854f6372f6e80c300b646
 MISC metadata.xml 159 SHA256 a222ada7640e6dfb21d27151813829e91a72a6878d809dfddaa41581455f6b69 SHA512 6352e00c52c5aea882fb49482fa13058b44892b9f0d348747a104a92bac4317beebdab189dada073ab9c87fbd9a4d276e725884741fc86bcb6f5b1857c031974 WHIRLPOOL abfa1ff25d21dc915422368c253795602590b470ca5cf3f099bf8675e2684baccac5e3d145391adac1fc5313f2e1d54bf9d8f21704e1b99fe22dec46f3f5acf5
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
-}