old

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

5 files changed, 7 insertions, 171 deletions

diff --git a/games-strategy/widelands/ChangeLog b/games-strategy/widelands/ChangeLog
index c2442efc371e..bbf77c70741b 100644
--- a/games-strategy/widelands/ChangeLog
+++ b/games-strategy/widelands/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-strategy/widelands
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/ChangeLog,v 1.49 2012/12/27 01:41:00 jdhore Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/ChangeLog,v 1.50 2013/02/04 18:14:28 mr_bones_ Exp $
+
+  04 Feb 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/widelands-0.16-cxxflags.patch, -files/widelands-0.16-goldmine.patch,
+  -files/widelands-0.16-libpng15.patch, -widelands-0.16.ebuild:
+  old
 
   27 Dec 2012; Jeff Horelick <jdhore@gentoo.org> widelands-0.17.ebuild:
   marked x86 per bug 447166
diff --git a/games-strategy/widelands/files/widelands-0.16-cxxflags.patch b/games-strategy/widelands/files/widelands-0.16-cxxflags.patch
deleted file mode 100644
index 3dfb88fb6fd4..000000000000
--- a/games-strategy/widelands/files/widelands-0.16-cxxflags.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Wed May 16 12:30:18 UTC 2012
-
-respect CXXFLAGS
-
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -204,7 +204,7 @@
- set (CMAKE_CXX_FLAGS_DEBUG "-g -DDEBUG -DNOPARACHUTE${WL_COMPILERFLAG_OLDSTYLECAST}${WL_COMPILERFLAG_GENERICWARNINGS}${WL_COMPILERFLAG_EXTRAWARNINGS}${WL_COMPILERFLAG_STRICT}" CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
- 
- # CMAKE defines "-O3 -DNDEBUG", but we better say -O2 (see gcc manual)
--set (CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG" CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
-+set (CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG" CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
- 
- #If building with MSVC, then check for 3rdparty libs
- if (DEFINED MSVC)
diff --git a/games-strategy/widelands/files/widelands-0.16-goldmine.patch b/games-strategy/widelands/files/widelands-0.16-goldmine.patch
deleted file mode 100644
index 2a2752962e04..000000000000
--- a/games-strategy/widelands/files/widelands-0.16-goldmine.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- tribes/barbarians/deep_goldmine/conf.old	2011-07-12 17:25:38.038927012 +0200
-+++ tribes/barbarians/deep_goldmine/conf	2011-07-12 17:26:40.067926999 +0200
-@@ -1,7 +1,7 @@
- size=mine
- buildable=no
- enhanced_building=yes
--output=gold
-+output=goldstone
- enhancement=deeper_goldmine
- 
- [buildcost]
-@@ -26,11 +26,11 @@
- sleep=42000
- consume=snack
- animate=working 18000
--mine=coal 2 66 5
--produce=gold:2
-+mine=gold 2 66 5
-+produce=goldstone:2
- animate=working 18000
- mine=gold 2 66 5
--produce=gold:2
-+produce=goldstone:2
- 
- [idle]
- pics=deep_goldmine_i_??.png
diff --git a/games-strategy/widelands/files/widelands-0.16-libpng15.patch b/games-strategy/widelands/files/widelands-0.16-libpng15.patch
deleted file mode 100644
index 9f733e7b97aa..000000000000
--- a/games-strategy/widelands/files/widelands-0.16-libpng15.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- src/graphic/SDL_mng.cc
-+++ src/graphic/SDL_mng.cc
-@@ -276,7 +276,7 @@
- 	 * the normal method of doing things with libpng).  REQUIRED unless you
- 	 * set up your own error handlers in png_create_read_struct() earlier.
- 	 */
--	if (setjmp(png_ptr->jmpbuf)) {
-+	if (setjmp(png_jmpbuf(png_ptr))) {
- 		SDL_SetError("Error reading the PNG file.");
- 		goto done;
- 	}
-@@ -356,9 +356,9 @@
- 			Rmask = 0x000000FF;
- 			Gmask = 0x0000FF00;
- 			Bmask = 0x00FF0000;
--			Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0;
-+			Amask = (png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0;
- 		} else {
--			int const s = (info_ptr->channels == 4) ? 0 : 8;
-+			int const s = (png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8;
- 			Rmask = 0xFF000000 >> s;
- 			Gmask = 0x00FF0000 >> s;
- 			Bmask = 0x0000FF00 >> s;
-@@ -369,7 +369,7 @@
- 		SDL_AllocSurface
- 			(SDL_SWSURFACE,
- 			 width, height,
--			 bit_depth * info_ptr->channels,
-+			 bit_depth * png_get_channels(png_ptr, info_ptr),
- 			 Rmask, Gmask, Bmask, Amask);
- 	if (not surface) {
- 		SDL_SetError("Out of memory");
-@@ -407,6 +407,9 @@
- 	/* read rest of file, get additional chunks in info_ptr - REQUIRED */
- 	png_read_end(png_ptr, info_ptr);
- 
-+	png_colorp png_palette;
-+	int png_num_palette;
-+
- 	/* Load the palette, if any */
- 	if ((palette = surface->format->palette)) {
- 		if (color_type == PNG_COLOR_TYPE_GRAY) {
-@@ -416,12 +419,12 @@
- 				palette->colors[i].g = i;
- 				palette->colors[i].b = i;
- 			}
--		} else if (info_ptr->num_palette > 0) {
--			palette->ncolors = info_ptr->num_palette;
--			for (uint32_t i = 0; i < info_ptr->num_palette; ++i) {
--				palette->colors[i].b = info_ptr->palette[i].blue;
--				palette->colors[i].g = info_ptr->palette[i].green;
--				palette->colors[i].r = info_ptr->palette[i].red;
-+		} else if (png_num_palette > 0) {
-+			palette->ncolors = png_num_palette;
-+			for (uint32_t i = 0; i < png_num_palette; ++i) {
-+				palette->colors[i].b = png_palette[i].blue;
-+				palette->colors[i].g = png_palette[i].green;
-+				palette->colors[i].r = png_palette[i].red;
- 			}
- 		}
- 	}
diff --git a/games-strategy/widelands/widelands-0.16.ebuild b/games-strategy/widelands/widelands-0.16.ebuild
deleted file mode 100644
index 2422fce8f73f..000000000000
--- a/games-strategy/widelands/widelands-0.16.ebuild
+++ /dev/null
@@ -1,66 +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/widelands/widelands-0.16.ebuild,v 1.9 2012/05/21 19:23:02 mr_bones_ Exp $
-
-EAPI=3
-inherit eutils versionator cmake-utils games
-
-MY_PV=build$(get_version_component_range 2)
-MY_P=${PN}-${MY_PV}-src
-DESCRIPTION="A game similar to Settlers 2"
-HOMEPAGE="http://www.widelands.org/"
-SRC_URI="http://launchpad.net/widelands/${MY_PV}/${MY_PV}/+download/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="dev-games/ggz-client-libs
-	dev-lang/lua
-	media-libs/sdl-image[jpeg,png]
-	media-libs/sdl-mixer[vorbis]
-	media-libs/sdl-gfx
-	media-libs/sdl-net
-	media-libs/glew
-	media-libs/sdl-ttf"
-DEPEND="${RDEPEND}
-	dev-libs/boost"
-
-S=${WORKDIR}/${MY_P}
-
-CMAKE_BUILD_TYPE=Release
-PREFIX=${GAMES_DATADIR}/${PN}
-
-src_prepare() {
-	sed -i -e 's:__ppc__:__PPC__:' src/s2map.cc || die
-	sed -i -e '74i#define OF(x) x' src/io/filesystem/{un,}zip.h || die
-	sed -i -e '22i#define OF(x) x' src/io/filesystem/ioapi.h || die
-	epatch \
-		"${FILESDIR}"/${P}-goldmine.patch \
-		"${FILESDIR}"/${P}-libpng15.patch \
-		"${FILESDIR}"/${P}-cxxflags.patch
-}
-
-src_configure() {
-	mycmakeargs+=(
-		'-DWL_VERSION_STANDARD=true'
-		"-DWL_INSTALL_PREFIX=${GAMES_PREFIX}"
-		"-DWL_INSTALL_DATADIR=${GAMES_DATADIR}/${PN}"
-		"-DWL_INSTALL_LOCALEDIR=${GAMES_DATADIR}/${PN}/locale"
-		"-DWL_INSTALL_BINDIR=${GAMES_BINDIR}"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	newicon pics/wl-ico-128.png ${PN}.png || die
-	make_desktop_entry ${PN} Widelands
-	dodoc ChangeLog CREDITS
-	prepgamesdirs
-}