[gentoo-commits] proj/gamerlay:master commit in: games-engines/stratagus/, games-strategy/wargus/, games-strategy/wargus/files/

["Michał Górny" <mgorny@gentoo.org>]

commit:     707b53ecef8c8cef38fa920e0f3d707679004cef
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun May 27 20:32:02 2012 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun May 27 20:32:02 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=707b53ec

games-engines/stratagus, games-strategy/wargus: Now in gx86.

---
 games-engines/stratagus/metadata.xml               |    5 --
 games-engines/stratagus/stratagus-2.2.6.ebuild     |   74 --------------------
 .../wargus/files/wargus-2.2.5.5-libpng.patch       |   36 ----------
 games-strategy/wargus/metadata.xml                 |    5 --
 games-strategy/wargus/wargus-2.2.6.ebuild          |   56 ---------------
 5 files changed, 0 insertions(+), 176 deletions(-)

diff --git a/games-engines/stratagus/metadata.xml b/games-engines/stratagus/metadata.xml
deleted file mode 100644
index d3c2cc9..0000000
--- a/games-engines/stratagus/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>games</herd>
-</pkgmetadata>

diff --git a/games-engines/stratagus/stratagus-2.2.6.ebuild b/games-engines/stratagus/stratagus-2.2.6.ebuild
deleted file mode 100644
index 05991bb..0000000
--- a/games-engines/stratagus/stratagus-2.2.6.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-inherit cmake-utils eutils games
-
-DESCRIPTION="A realtime strategy game engine"
-HOMEPAGE="http://stratagus.sourceforge.net/"
-SRC_URI="http://launchpad.net/stratagus/trunk/${PV}/+download/stratagus_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bzip2 debug doc mikmod mng theora vorbis"
-
-RDEPEND="x11-libs/libX11
-	virtual/opengl
-	dev-db/sqlite:3
-	>=dev-lang/lua-5
-	dev-lua/toluapp
-	media-libs/libpng
-	media-libs/libsdl[audio,opengl,video]
-	bzip2? ( app-arch/bzip2 )
-	mikmod? ( media-libs/libmikmod )
-	mng? ( media-libs/libmng )
-	theora? ( media-libs/libtheora media-libs/libvorbis )
-	vorbis? ( media-libs/libvorbis )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}/${PN}_${PV}.orig"
-
-src_prepare() {
-	sed -i \
-		-e '/DESTINATION/s:games\|s\?bin:games/bin:' \
-		-e '/DESTINATION/s:share/doc/stratagus:/tmp/doc:' \
-		CMakeLists.txt || die 'fixing install paths failed'
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with bzip2)
-		$(cmake-utils_use_with debug)
-		$(cmake-utils_use_enable doc)
-		$(cmake-utils_use_with mikmod)
-		$(cmake-utils_use_with mng)
-		$(cmake-utils_use_with theora)
-		$(cmake-utils_use_with vorbis oggvorbis)
-
-		# install header files
-		-DENABLE_DEV=ON
-
-		# XXX: make sqlite (metaserver) optional
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use doc; then
-		# thanks to games.eclass we're stuck with EAPI 2
-		dodoc "${D}"/tmp/doc/*.txt || die
-		rm -f "${D}"/tmp/doc/*.txt || die
-		dohtml -r "${D}"/tmp/doc/* || die
-		rm -rf "${D}"/tmp || die
-	fi
-}

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 65ebc12..0000000
--- 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/metadata.xml b/games-strategy/wargus/metadata.xml
deleted file mode 100644
index f72870c..0000000
--- a/games-strategy/wargus/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>games</herd>
-</pkgmetadata>

diff --git a/games-strategy/wargus/wargus-2.2.6.ebuild b/games-strategy/wargus/wargus-2.2.6.ebuild
deleted file mode 100644
index 18840bb..0000000
--- a/games-strategy/wargus/wargus-2.2.6.ebuild
+++ /dev/null
@@ -1,56 +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.7 2012/05/17 18:06:23 mr_bones_ Exp $
-
-EAPI=2
-inherit eutils cdrom cmake-utils 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="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libpng
-	media-sound/timidity++
-	media-video/ffmpeg2theora"
-RDEPEND="=games-engines/stratagus-${PV}*"
-
-S="${WORKDIR}/${PN}_${PV}.orig"
-
-src_prepare() {
-	cdrom_get_cds data/rezdat.war
-	epatch "${FILESDIR}/${PN}-2.2.5.5-libpng.patch"
-
-	sed -i \
-		-e '/TARGETS.*DESTINATION/s:games\|s\?bin:games/bin:' \
-		CMakeLists.txt || die 'fixing install paths failed'
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSTRATAGUS=/usr/games/bin/stratagus
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# XXX: -r to rip CD tracks? not sure if it is good idea to pass it
-	# by default
-
-	local dir=${GAMES_DATADIR}/stratagus/${PN}
-
-	"${D}"/usr/games/bin/wartool -m -v "${CDROM_ROOT}"/data "${D}/${dir}" \
-		|| die "Failed to extract data"
-}