old

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

6 files changed, 8 insertions, 191 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/Manifest b/games-strategy/widelands/Manifest
index 49bd53a96233..ab0137f9f52a 100644
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -1,25 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-AUX widelands-0.16-cxxflags.patch 728 SHA256 933ca96d6d7ee19a23d2cc64bea2a1817c61a18916485c3a9bbfb28778091222 SHA512 da7d185482320217a828f08c2fad5cf4632ded5c3be44664ed996ffa7fc34e070f817b3fae67e7d5d24d77915cb7bff6790c05737d47b36e02312fe03561dd5a WHIRLPOOL 0ba7f989c425e2ca4eba96710afb7087f82caf4aefdcf495304105bdc9adc27669a1991c7264a6e8b3e31f45cafce2070a579360ac644cc3a6f8b6851198950b
-AUX widelands-0.16-goldmine.patch 558 SHA256 e49bb7f6e31a36c3b6bffe374122161c113a65a945087ffaa979988fda7b6ade SHA512 d9c830a05676bf4a98cc9c08aabff794046783a31ceca6dbef07c41224eb37e8dd67c02c236c3a9890769a05a7e46904ace5af8029da5d70b5b3c1f8c1762cf6 WHIRLPOOL 3c505e70099ad96487bdb224b10dde9d63b30fa12a00b304fd9417601cfe09418174cbbaf9b92b37290acaa5b537c6ecd4c18fa7e2ce8af6c1c8bf67a360665b
-AUX widelands-0.16-libpng15.patch 2064 SHA256 1b696a840d4beef6740531c1cafc227798c513b4c8dd7d3a61d3ce6b256e02ff SHA512 2cfd7da09ede6e0bbe395505472d60946922b7b1740795c00674d7df37a9db6ce6b1cfa7b6777123f524042e812b2f425e52d95e022507261ce4f574de1d294f WHIRLPOOL ca65e2f4e498d9b0a149b3156469a1810421dacc9086c2eea761b055ccfe11357e73f2232e3226b43c0a2c450515af0be9dd6054c10029b4bb5320bfb26da1bf
 AUX widelands-0.17-cxxflags.patch 1733 SHA256 1ce15258755faf1f348601dd0431b1657a73af348bc5f3ca1a9b22d83d6ad150 SHA512 952dc2fd7bfbd6e0108ea6155d153ca6b4d83f9c8ad9124ac134da502851fbd991fe9e75af7af8bb72eb5938537c4a62389de0b54d16e8bab0ff057b4897d5bc WHIRLPOOL 2ce299c7f40ad2238f7704cc2dbb5a65916da696648641d8f29943901d38b99f90f02b6652651fb7bcba75729f1f6ad7ca64dc55c56fce6d5cb51a4b5d072a89
 AUX widelands-0.17-gcc47.patch 247 SHA256 54359ddc7e3a6c86339e6bcc5f8fadad0a472156dabc27b2e4289cf1cd920e29 SHA512 2ce2728ee6f3e7e066443e6891a95a74b430ac1aaf2386d52dd54dd8217afdadbe747cea1daef1f6a57543f98f8e2eb9451a9b81e22a82f6964750fd60020139 WHIRLPOOL cb7eba1815785f76b3b5ccfc763ab6342eb764eb50a14a4914c740b80b0ebb7be25ee851b09732031c79848b653ae1cb3409a812c7163a7dad1ee09546339040
-DIST widelands-build16-src.tar.bz2 137808494 SHA256 d8db3c15c30314cb220c6d79d93d3d31e7bce2722c93d2c385d643c3c669625d
 DIST widelands-build17-src.tar.bz2 175547379 SHA256 be48b3b8f342a537b39a3aec2f7702250a6a47e427188ba3bece67d7d90f3cc5 SHA512 ace4127ba00bbe788cb266d2c508b2d9b0651c99f65f08a3c7d680f8998e64e26252f7095c1b62d94012b99ef1a6dc2f8be08d17f2e8f1ab864abc650c658f2d WHIRLPOOL 35454b86d467058017ac71da8fae23b3556fe8e6ced5cf94fbd07ff21b2b38eca444be6168224d3023cd1af81867a3e6e45dd1773ef54675769ec51403b24cfa
-EBUILD widelands-0.16.ebuild 1700 SHA256 755054489022cd3ae72b891ef940aed9915d00bfb5e93bc0c4de07fc4edf10a2 SHA512 52e0b1778254e6626144f15d35d48d4e6911e5498dbb431e48603f6f7e6aa7feb0dc96985191488008febc135de89bfa52eb121b11b2501bb89eb62aec3ad931 WHIRLPOOL 869fd68350c9f263d3354318b25e1b8523fae98ca35eba6fa9dadedad208da2ed8ab651a1ab0b4d37cffbaefb0e59c6819c3ea895cde717c3fa4fd94c0ac5d00
 EBUILD widelands-0.17.ebuild 2287 SHA256 c227899b54b6ec1a1ddd6845c71783d4afa950f313fda402dcb7ba4aeb11039e SHA512 9c387e105c3221590fd93dab6819272f851e894f6489eedd92a1455d712ecb61079b0456b8896c5c508c5fcefbfd82d3d8afd07e38210f0288141e1d86f492a8 WHIRLPOOL afba611d74c80e33f7ab8500a23d31bb5a6fdd2895dbe68709dbcd88e1b7c2c9c95a090dcd27651368073b4ba83bda465bb5d30203518657e85550cf0cc7bc2d
-MISC ChangeLog 7987 SHA256 1e244c33ac7ca8a286661bb79c6e63cd4fc014dea6e42e9487e8f94b6bd5b819 SHA512 3e7b6b3ebcc379049bc198a78497f04e3d50ec2cecb5484af826c2aa2583a1b5bbf93f398b33823072a2e74f1e24c22a4fbbf23ccffec8b4903596689707f1b6 WHIRLPOOL 0ad3d98b5d79c31f119fc3d4c7ba2a5041e9f6ff16862a1af4ac38ab61e155db7012ca2b043429ed500f00547790d7d80da9f5b50e7706478f0bc4c485df617b
+MISC ChangeLog 8194 SHA256 a66ca4a17485227f4d58521c849ba357ab17927f6b3557b71d4596258c233b91 SHA512 c85c9f20cd7736ce996ba4b25b695438526c1312e8a709457ed2be11107c817e220458e12e6b1471e0352067a475f8e8e080f0fbe2eb8c9ef092d598a64023c8 WHIRLPOOL 77377e60248442496a1b5a3e71a2b5a4bc005e51d1402fa87f32b385ed04465d955521ce0358db35368205a751154a11deba7ed4287b096fcf81b430b8841120
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCgAGBQJQ26ctAAoJEPUd7O0j6ekAzBYH/Ao/IjCU9bnvB0Rt0CBsx9fx
-eTxQP3ZvnC6x5U2We6kMnqO8/rsYuiIneAlo4TUlx/ewSZgd5PGFMK+DNw0m+x+q
-t/Sf+vL0trkqRs0KCUk3b9LQjrAXZjEsKxcPyC7j0dgSgJa566aXFYjK+htX94qW
-AjBFK7H97UklxW8Y50buNOBP5lQhb1GDA7qhfnOaX+eynDsy3TfCgpFHCvaDDOVV
-Zcp8XJikBdKoZEs09RUJHOjVZl/HnhxGnXLqsDpTdwi8bV9oei7s84WpHanBp9as
-zJ6dblFwryDKKaEswyuLYGcfa/WSPYmegpKAx0YimGNKYaSSpL20u/SZF30sZHM=
-=lqMS
------END PGP SIGNATURE-----
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
-}