Patch from Dennis Schridde, bug #183810

Package-Manager: portage-2.1.3_rc6

5 files changed, 110 insertions, 8 deletions

diff --git a/games-strategy/warzone2100/ChangeLog b/games-strategy/warzone2100/ChangeLog
index 69250055a0b0..c32993b7329d 100644
--- a/games-strategy/warzone2100/ChangeLog
+++ b/games-strategy/warzone2100/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-strategy/warzone2100
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/warzone2100/ChangeLog,v 1.15 2007/06/24 23:12:15 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/warzone2100/ChangeLog,v 1.16 2007/07/01 18:09:17 nyhm Exp $
+
+*warzone2100-2.0.7-r1 (01 Jul 2007)
+
+  01 Jul 2007; Tristan Heaven <nyhm@gentoo.org>
+  +files/warzone2100-2.0.7-hotfix1.patch, +warzone2100-2.0.7-r1.ebuild:
+  Patch from Dennis Schridde, bug #183810
 
 *warzone2100-2.0.7 (24 Jun 2007)
 
diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest
index be63f3151e62..f22faea0f258 100644
--- a/games-strategy/warzone2100/Manifest
+++ b/games-strategy/warzone2100/Manifest
@@ -5,20 +5,28 @@ AUX warzone2100-2.0.6-buffer-overflow.patch 573 RMD160 9157300c8562d697dc91317a2
 MD5 b94afde03c79fc6eea7b309f04bf8d96 files/warzone2100-2.0.6-buffer-overflow.patch 573
 RMD160 9157300c8562d697dc91317a232465bdab7422b4 files/warzone2100-2.0.6-buffer-overflow.patch 573
 SHA256 8f9a8b3135a9b85e72d1aafb98659d013b0653efc79ec22b9f635685edf6794e files/warzone2100-2.0.6-buffer-overflow.patch 573
+AUX warzone2100-2.0.7-hotfix1.patch 1160 RMD160 1a39f276e9861d98cb6c97a62b3b963222a1d93b SHA1 274d25e3c6fdd8ed2cb3da1aeef43c9e5621a26c SHA256 b6b117882653fcbf4be9235b130647e1a1ca9c882a26bf0389963672a6190e9e
+MD5 099bda403d23560b39cf314b61da92c9 files/warzone2100-2.0.7-hotfix1.patch 1160
+RMD160 1a39f276e9861d98cb6c97a62b3b963222a1d93b files/warzone2100-2.0.7-hotfix1.patch 1160
+SHA256 b6b117882653fcbf4be9235b130647e1a1ca9c882a26bf0389963672a6190e9e files/warzone2100-2.0.7-hotfix1.patch 1160
 DIST warzone2100-2.0.6.tar.bz2 20009086 RMD160 d4822aad461c6733c8f821c125b10a8288e7021c SHA1 95d02857bafa700a3fb30ccda8d6c8d9eac35c4a SHA256 2f10634a736b7af720ad477e08ba2a36bd2b68dd79e2ba1940f4a82962102ae9
 DIST warzone2100-2.0.7.tar.bz2 19622856 RMD160 a8d483666ab6621b4b3fd8dd97fc4e95a9d9c56b SHA1 fb85be7a3016bd2c006cac645538da3a7d7025d1 SHA256 e6ae2b3584c6f189687cbfc77a34397e8210cbceab83711155c36594e9b0faca
 EBUILD warzone2100-2.0.6.ebuild 1422 RMD160 7c8b3f2fb59a50a06c22ec5c3ee7c67edd3745f9 SHA1 3181ef8780ce88425756e084fd0759d70f839873 SHA256 002728d52e54b28be80e45d560aff6ccfc96257b5ef8ebb471d39d764b2942fc
 MD5 df533b5efafae35f35e19b1c4e1395f7 warzone2100-2.0.6.ebuild 1422
 RMD160 7c8b3f2fb59a50a06c22ec5c3ee7c67edd3745f9 warzone2100-2.0.6.ebuild 1422
 SHA256 002728d52e54b28be80e45d560aff6ccfc96257b5ef8ebb471d39d764b2942fc warzone2100-2.0.6.ebuild 1422
+EBUILD warzone2100-2.0.7-r1.ebuild 1417 RMD160 4cf7e02e1d4278118175bbd9c3d11edecdcf0456 SHA1 dd1c3a350fc395d1344863d34956157f62e5e3f1 SHA256 155cd2b84c7c9464ef81c10faac9cbe65fbb2e41877d071d7a807f6c79225a9c
+MD5 d4b20b8e8ab732a6d1456f656e888d06 warzone2100-2.0.7-r1.ebuild 1417
+RMD160 4cf7e02e1d4278118175bbd9c3d11edecdcf0456 warzone2100-2.0.7-r1.ebuild 1417
+SHA256 155cd2b84c7c9464ef81c10faac9cbe65fbb2e41877d071d7a807f6c79225a9c warzone2100-2.0.7-r1.ebuild 1417
 EBUILD warzone2100-2.0.7.ebuild 1373 RMD160 5846ca0201bb4bdb90b66dde2433f1d5f28c177b SHA1 05131a29a4258eeba5a430f9d8958d149ad83d90 SHA256 974d0271404cae8853c827a3785025a3f344f075933aaaf5fb879816099c1b3e
 MD5 0ec4808491c9da256bf80e1c67a875ff warzone2100-2.0.7.ebuild 1373
 RMD160 5846ca0201bb4bdb90b66dde2433f1d5f28c177b warzone2100-2.0.7.ebuild 1373
 SHA256 974d0271404cae8853c827a3785025a3f344f075933aaaf5fb879816099c1b3e warzone2100-2.0.7.ebuild 1373
-MISC ChangeLog 2816 RMD160 caf9d0036db710bc809a29f9d1cdc9113c52dcf7 SHA1 bb8857f5966d182338394cb835705767e46942df SHA256 7067d93bc154d3af50dea649165ff5a778f0ab4e2f71178611bc09856ba29fc8
-MD5 23a512cda2c4b45609c4a8acca690125 ChangeLog 2816
-RMD160 caf9d0036db710bc809a29f9d1cdc9113c52dcf7 ChangeLog 2816
-SHA256 7067d93bc154d3af50dea649165ff5a778f0ab4e2f71178611bc09856ba29fc8 ChangeLog 2816
+MISC ChangeLog 3016 RMD160 1edd0447ea1e7324a502b8bedb491b6c03df8386 SHA1 c3fba32597de5bb3a26e401b4265b2d62f864887 SHA256 21b61651da749a4ab5ef01dd84c1d9a63b851d2bc3d10ec9847a0d83bdf16f92
+MD5 70dcddcfed706043e5334180284e75d4 ChangeLog 3016
+RMD160 1edd0447ea1e7324a502b8bedb491b6c03df8386 ChangeLog 3016
+SHA256 21b61651da749a4ab5ef01dd84c1d9a63b851d2bc3d10ec9847a0d83bdf16f92 ChangeLog 3016
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -29,10 +37,13 @@ SHA256 88214ed2dc6a9b5faf8193a9037044b0823bf5c5d0749ec103f6ebf4f9bec5f5 files/di
 MD5 0854a5abd365324d31a2ff3eed4ac719 files/digest-warzone2100-2.0.7 262
 RMD160 d52c46bfa4ba9d6f3e841d60425af0f066b07b5d files/digest-warzone2100-2.0.7 262
 SHA256 461c8246b0afc6fe1eeb969e2c65eeaa71f5d9f86915a5a535027d08ee498765 files/digest-warzone2100-2.0.7 262
+MD5 0854a5abd365324d31a2ff3eed4ac719 files/digest-warzone2100-2.0.7-r1 262
+RMD160 d52c46bfa4ba9d6f3e841d60425af0f066b07b5d files/digest-warzone2100-2.0.7-r1 262
+SHA256 461c8246b0afc6fe1eeb969e2c65eeaa71f5d9f86915a5a535027d08ee498765 files/digest-warzone2100-2.0.7-r1 262
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGfvpYdz7hIScOURERArkfAJ9GyhyATCNSYAWnKjbCtRexQBrB2gCgzpc2
-jDTrNfEF+lGNA08QQF/x4v4=
-=wEdZ
+iD8DBQFGh+3Udz7hIScOURERAkoxAJ9bky9IjrEBpg6qeZhL8qOM8BUc8ACg5OGY
+eCU8Ks6y7nTkX8goWQ11F5w=
+=TW/T
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/warzone2100/files/digest-warzone2100-2.0.7-r1 b/games-strategy/warzone2100/files/digest-warzone2100-2.0.7-r1
new file mode 100644
index 000000000000..56c2425ba503
--- /dev/null
+++ b/games-strategy/warzone2100/files/digest-warzone2100-2.0.7-r1
@@ -0,0 +1,3 @@
+MD5 983ccc67cfd5df3185c6836c62ea722f warzone2100-2.0.7.tar.bz2 19622856
+RMD160 a8d483666ab6621b4b3fd8dd97fc4e95a9d9c56b warzone2100-2.0.7.tar.bz2 19622856
+SHA256 e6ae2b3584c6f189687cbfc77a34397e8210cbceab83711155c36594e9b0faca warzone2100-2.0.7.tar.bz2 19622856
diff --git a/games-strategy/warzone2100/files/warzone2100-2.0.7-hotfix1.patch b/games-strategy/warzone2100/files/warzone2100-2.0.7-hotfix1.patch
new file mode 100644
index 000000000000..a5e8057b0bc7
--- /dev/null
+++ b/games-strategy/warzone2100/files/warzone2100-2.0.7-hotfix1.patch
@@ -0,0 +1,24 @@
+Index: data/wrf/cam2/cam2change.wrf
+===================================================================
+--- data/wrf/cam2/cam2change.wrf	(revision 1629)
++++ data/wrf/cam2/cam2change.wrf	(revision 1630)
+@@ -9,7 +9,6 @@
+ directory	"texpages"
+ file 		TEXPAGE		"page-6-features-urban area.png"
+ file		TEXPAGE		"page-8-player buildings-bases urban.png"
+-file		TEXPAGE		"page-9-player-soft buildings-bases-urban.png"	//need altering to urban**DONE**
+ file		TEXPAGE		"page-9-player-hard buildings-bases-urban.png"
+ file		TEXPAGE 	"page-7-barbarians-urban.png"
+ file 		HWTERTILES	"tertilesc2hw.png"
+Index: data/wrf/cam3/cam3change.wrf
+===================================================================
+--- data/wrf/cam3/cam3change.wrf	(revision 1629)
++++ data/wrf/cam3/cam3change.wrf	(revision 1630)
+@@ -10,7 +10,6 @@
+ file 		TEXPAGE		"page-6-features-rockies.png"
+ file		TEXPAGE		"page-7-barbarians-kevlar.png"
+ file		TEXPAGE		"page-8-player buildings-bases-rockies.png"
+-file		TEXPAGE		"page-9-player-soft buildings-bases-rockies.png"	//needs changing**DONE**
+ file		TEXPAGE		"page-9-player-hard buildings-bases-rockies.png"
+ file 		HWTERTILES	"tertilesc3hw.png"
+ 
diff --git a/games-strategy/warzone2100/warzone2100-2.0.7-r1.ebuild b/games-strategy/warzone2100/warzone2100-2.0.7-r1.ebuild
new file mode 100644
index 000000000000..c12084857abb
--- /dev/null
+++ b/games-strategy/warzone2100/warzone2100-2.0.7-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/warzone2100/warzone2100-2.0.7-r1.ebuild,v 1.1 2007/07/01 18:09:17 nyhm Exp $
+
+inherit eutils versionator games
+
+MY_PV=$(get_version_component_range -2)
+DESCRIPTION="3D real-time strategy game"
+HOMEPAGE="http://wz2100.net/"
+SRC_URI="http://download.gna.org/warzone/releases/${MY_PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+# upstream requested debug support
+IUSE="debug mp3"
+
+RDEPEND="dev-games/physfs
+	media-libs/jpeg
+	media-libs/libogg
+	media-libs/libpng
+	media-libs/libsdl
+	media-libs/libvorbis
+	>=media-libs/openal-0.0.8-r1
+	media-libs/sdl-net
+	virtual/glu
+	virtual/opengl
+	mp3? ( media-libs/libmad )"
+DEPEND="${RDEPEND}
+	app-arch/zip"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i '/^dist_doc_DATA/s:COPYING.*$:TODO:' Makefile.in || die "sed failed"
+	epatch "${FILESDIR}"/${P}-hotfix1.patch
+}
+
+src_compile() {
+	egamesconf \
+		--disable-dependency-tracking \
+		--docdir=/usr/share/doc/${PF} \
+		--with-icondir=/usr/share/pixmaps \
+		--with-applicationdir=/usr/share/applications \
+		--with-ogg=/usr \
+		--with-vorbis=/usr \
+		--enable-ogg \
+		$(use_enable mp3) \
+		$(use_enable debug) \
+		|| die
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	prepalldocs
+	prepgamesdirs
+}