version bump - ebuild and patches submitted by TGL via bug #119425

(Portage version: 2.1_pre7-r4)

7 files changed, 192 insertions, 11 deletions

diff --git a/games-strategy/wormux/ChangeLog b/games-strategy/wormux/ChangeLog
index b323b4d244a0..467ceed0501b 100644
--- a/games-strategy/wormux/ChangeLog
+++ b/games-strategy/wormux/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-strategy/wormux
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/wormux/ChangeLog,v 1.6 2006/02/26 06:17:59 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wormux/ChangeLog,v 1.7 2006/04/05 19:37:17 mr_bones_ Exp $
+
+*wormux-0.7 (05 Apr 2006)
+
+  05 Apr 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/wormux-0.7-fix-gettext-Makefile.patch,
+  +files/wormux-0.7-gcc41.patch, +files/wormux-0.7-user-CFLAGS.patch,
+  +wormux-0.7.ebuild:
+  version bump - ebuild and patches submitted by TGL via bug #119425
 
   26 Feb 2006; Mark Loeser <halcy0n@gentoo.org>
   +files/wormux-0.5.1-gcc41.patch, wormux-0.5.1.ebuild:
diff --git a/games-strategy/wormux/Manifest b/games-strategy/wormux/Manifest
index 7de2a21ce4c6..4377f749b0e8 100644
--- a/games-strategy/wormux/Manifest
+++ b/games-strategy/wormux/Manifest
@@ -1,25 +1,30 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 250574c8ec04affcb16e28d3279b0102 ChangeLog 1046
 RMD160 cb93d37892f2457778e2dc46476a188fd86bb5c7 ChangeLog 1046
 SHA256 bee860772e5f0b64be33294e3f34a4cd8f8775a6c7c417c4db0abfb222f84dc0 ChangeLog 1046
 MD5 e485e3a4a60562c01b0420109aca1592 files/digest-wormux-0.5.1 259
 RMD160 a15f603c1a788a61074c9814e21705d294e29cbf files/digest-wormux-0.5.1 259
 SHA256 c1f683e2171dedd14084dce474ba272b21f2689703b5da32478408fbacc4232b files/digest-wormux-0.5.1 259
+MD5 c822602746ebd8866706026aa950af4a files/digest-wormux-0.7 238
+RMD160 e8548636ea7607df66d3a3e01ffee4646d4bbca9 files/digest-wormux-0.7 238
+SHA256 5d2437ca5cb712c1cf33247f75b4f11aab37903579591b4d5c1c87838133108d files/digest-wormux-0.7 238
 MD5 47b6e6e5200a6d52cabd26804d587558 files/wormux-0.5.1-gcc41.patch 557
 RMD160 ca6a40fb5449569ffd748bdb2383a689d7e40aa2 files/wormux-0.5.1-gcc41.patch 557
 SHA256 d2be5422a4f30ed7f10376e4ad7f711229db0e9c29b816584d6a6a35a832099e files/wormux-0.5.1-gcc41.patch 557
+MD5 b6f6a9557673e7b0957b4cbbe8bc6fd5 files/wormux-0.7-fix-gettext-Makefile.patch 436
+RMD160 92138b8a3a511518e93025b757292fde524603da files/wormux-0.7-fix-gettext-Makefile.patch 436
+SHA256 e3c7208bc087e791d486c57c99371a2097aeff9d3e86c4c0cb6d01606a20de75 files/wormux-0.7-fix-gettext-Makefile.patch 436
+MD5 fd320f36c84e8c6995947013155c9a62 files/wormux-0.7-gcc41.patch 2755
+RMD160 76e0698191761c93824e0209db73e9a51a83f864 files/wormux-0.7-gcc41.patch 2755
+SHA256 5c3ecd62755256e06454a15dae37733567e5263d8f8e9a8fa61056bcf7952a48 files/wormux-0.7-gcc41.patch 2755
+MD5 c7d6e6dfbe156830af5acc8f00894c5f files/wormux-0.7-user-CFLAGS.patch 419
+RMD160 5243a77aa9f933e5468e1e91794a81e69fe3e8de files/wormux-0.7-user-CFLAGS.patch 419
+SHA256 a9f6a722ff6244c67371d098fddcff94fa7b549816cc4cdc4a642b511063ab29 files/wormux-0.7-user-CFLAGS.patch 419
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
 MD5 e830dbd00b3dd8143e6ee23bcd411511 wormux-0.5.1.ebuild 1029
 RMD160 3c12f03a650e78da7c2e9f9b7cdc2b168fbb9291 wormux-0.5.1.ebuild 1029
 SHA256 5482546869e46e3e63ab3b344a37cd67de8884ada0ca2add9d01f8673b306181 wormux-0.5.1.ebuild 1029
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFEAUhSCRZPokWLroQRAoMSAJkBKxwXopza8M6kYMObMiOkj87LcwCdFvmI
-4n1y4QxW4Y1GG+StBIhjwdg=
-=YIq8
------END PGP SIGNATURE-----
+MD5 c2d31b61b1d16b630908d5fcebc0b7b2 wormux-0.7.ebuild 1136
+RMD160 708886e25a7d4ce21178a79bdfa6d819df4251d6 wormux-0.7.ebuild 1136
+SHA256 da0088835b4dc1f41c81dd99c1c19669f0c60e6bd79417cfbe3315c826f6a5d3 wormux-0.7.ebuild 1136
diff --git a/games-strategy/wormux/files/digest-wormux-0.7 b/games-strategy/wormux/files/digest-wormux-0.7
new file mode 100644
index 000000000000..dab2d87e6f18
--- /dev/null
+++ b/games-strategy/wormux/files/digest-wormux-0.7
@@ -0,0 +1,3 @@
+MD5 4e7178aa8765424577ec185ee841665f wormux-0.7.tar.gz 18737873
+RMD160 3c2669d00ad8a0902f313e42adeb5ee1507b7bc4 wormux-0.7.tar.gz 18737873
+SHA256 874605b6261a26ab695dab0410d4e523fefb86c9631f910dbc019d89a99d88e8 wormux-0.7.tar.gz 18737873
diff --git a/games-strategy/wormux/files/wormux-0.7-fix-gettext-Makefile.patch b/games-strategy/wormux/files/wormux-0.7-fix-gettext-Makefile.patch
new file mode 100644
index 000000000000..9d28d6005b08
--- /dev/null
+++ b/games-strategy/wormux/files/wormux-0.7-fix-gettext-Makefile.patch
@@ -0,0 +1,14 @@
+--- wormux-0.7beta3/po/Makefile.in.orig	2006-01-24 16:07:54.000000000 +0100
++++ wormux-0.7beta3/po/Makefile.in	2006-01-24 16:08:09.000000000 +0100
+@@ -443,9 +443,9 @@
+ 	@sed -e '/^#/d' $< > t-$@
+ 	@mv t-$@ $@
+ 
+-all-local: all-local-@USE_NLS@ $(GMOFILES)
++all-local: all-local-@USE_NLS@
+ 
+-all-local-yes: stamp-po
++all-local-yes: $(GMOFILES)
+ all-local-no:
+ 
+ # stamp-po is a timestamp denoting the last time at which the CATALOGS have
diff --git a/games-strategy/wormux/files/wormux-0.7-gcc41.patch b/games-strategy/wormux/files/wormux-0.7-gcc41.patch
new file mode 100644
index 000000000000..c04e67ca0b2d
--- /dev/null
+++ b/games-strategy/wormux/files/wormux-0.7-gcc41.patch
@@ -0,0 +1,88 @@
+--- wormux-0.7.orig/src/graphic/color.h	2006-04-04 23:20:52.000000000 +0200
++++ wormux-0.7/src/graphic/color.h	2006-04-04 23:21:35.000000000 +0200
+@@ -37,7 +37,7 @@
+ 		Color();
+ 		Color(Uint8 r, Uint8 g, Uint8 b, Uint8 a);
+ 
+-		bool Color::operator==(const Color &color) const;
++		bool operator==(const Color &color) const;
+ 
+ 		void SetColor(Uint8 r, Uint8 g, Uint8 b, Uint8 a);
+ 
+--- wormux-0.7.orig/src/graphic/surface.h	2006-04-04 23:20:52.000000000 +0200
++++ wormux-0.7/src/graphic/surface.h	2006-04-04 23:23:06.000000000 +0200
+@@ -52,7 +52,7 @@
+ 			void SetAutoFree(bool newAutoFree);
+ 
+ 			void SetSurface(SDL_Surface *newSurface, bool freePrevious = true);
+-			void Surface::NewSurface(const Point2i &size, Uint32 flags, bool useAlpha = true);
++			void NewSurface(const Point2i &size, Uint32 flags, bool useAlpha = true);
+ 
+ 			SDL_Surface *GetSurface();
+ 
+--- wormux-0.7.orig/src/game/game_loop.h	2006-04-04 23:20:52.000000000 +0200
++++ wormux-0.7/src/game/game_loop.h	2006-04-04 23:24:28.000000000 +0200
+@@ -72,10 +72,10 @@
+ private:
+   GameLoop();
+ 
+-  void GameLoop::InitGameData_NetServer();
+-  void GameLoop::InitGameData_NetClient();
+-  void GameLoop::InitData_Local();
+-  void GameLoop::InitData();
++  void InitGameData_NetServer();
++  void InitGameData_NetClient();
++  void InitData_Local();
++  void InitData();
+     
+   void RefreshClock();
+   void CallDraw();
+--- wormux-0.7.orig/src/weapon/air_attack.h	2006-04-04 23:25:53.000000000 +0200
++++ wormux-0.7/src/weapon/air_attack.h	2006-04-04 23:26:45.000000000 +0200
+@@ -69,7 +69,7 @@
+   bool PeutLacherObus() const;
+   int LitCibleX() const;
+   int GetDirection() const;
+-  void Avion::SignalGhostState (bool was_dead);
++  void SignalGhostState (bool was_dead);
+ };
+ 
+ class AirAttack : public Weapon
+--- wormux-0.7.orig/src/weapon/cluster_bomb.h	2006-04-04 23:25:53.000000000 +0200
++++ wormux-0.7/src/weapon/cluster_bomb.h	2006-04-04 23:28:04.000000000 +0200
+@@ -72,7 +72,7 @@
+   ClusterLauncher();
+ 
+  private:
+-  ClusterBombConfig& ClusterLauncher::cfg() ;
++  ClusterBombConfig& cfg() ;
+ };
+ 
+ #endif
+--- wormux-0.7.orig/src/gui/box.cpp	2006-04-05 00:39:01.000000000 +0200
++++ wormux-0.7/src/gui/box.cpp	2006-04-05 00:40:03.000000000 +0200
+@@ -56,7 +56,6 @@
+   for (it = widgets.begin(); 
+        it != widgets.end(); 
+        ++it){
+-    assert(it != NULL);
+     if( (*it)->Clic(mousePosition, button) )
+       return true;
+   }
+@@ -106,8 +105,6 @@
+        it != widgets.end(); 
+        ++it ){
+ 
+-    assert(it != NULL);
+-
+     if( it == widgets.begin() )
+       _y += border.y - margin;
+ 
+@@ -154,7 +151,6 @@
+   for( it = widgets.begin(); 
+        it != widgets.end(); 
+        ++it ){
+-    assert(it != NULL);   
+ 
+     if( it == widgets.begin() )
+       _x += border.x - margin;
diff --git a/games-strategy/wormux/files/wormux-0.7-user-CFLAGS.patch b/games-strategy/wormux/files/wormux-0.7-user-CFLAGS.patch
new file mode 100644
index 000000000000..0f6c0973fdc5
--- /dev/null
+++ b/games-strategy/wormux/files/wormux-0.7-user-CFLAGS.patch
@@ -0,0 +1,13 @@
+--- wormux-0.7/configure.orig	2006-04-04 23:41:28.000000000 +0200
++++ wormux-0.7/configure	2006-04-04 23:43:34.000000000 +0200
+@@ -6752,9 +6752,7 @@
+         GCC_FLAGS="$GCC_FLAGS -Wno-unused-parameter"
+ 
+     if test "${debug}" = "yes"; then
+-        GCC_FLAGS="$GCC_FLAGS -O0 -g -DDEBUG"
+-    else
+-        GCC_FLAGS="$GCC_FLAGS -O2"
++        GCC_FLAGS="$GCC_FLAGS -DDEBUG"
+     fi
+ 
+     CFLAGS="$CFLAGS $GCC_FLAGS"
diff --git a/games-strategy/wormux/wormux-0.7.ebuild b/games-strategy/wormux/wormux-0.7.ebuild
new file mode 100644
index 000000000000..01ff67a27933
--- /dev/null
+++ b/games-strategy/wormux/wormux-0.7.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wormux/wormux-0.7.ebuild,v 1.1 2006/04/05 19:37:17 mr_bones_ Exp $
+
+inherit eutils games
+
+DESCRIPTION="A free Worms clone"
+HOMEPAGE="http://www.wormux.org/"
+SRC_URI="http://download.gna.org/wormux/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="debug nls"
+
+RDEPEND=">=media-libs/libsdl-1.2.6
+	>=media-libs/sdl-image-1.2
+	>=media-libs/sdl-mixer-1.2
+	>=media-libs/sdl-ttf-2.0
+	>=media-libs/sdl-gfx-2.0.13
+	>=dev-cpp/libxmlpp-2.6"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch \
+		"${FILESDIR}/${P}-fix-gettext-Makefile.patch" \
+		"${FILESDIR}/${P}-user-CFLAGS.patch" \
+		"${FILESDIR}/${P}-gcc41.patch"
+}
+
+src_compile() {
+	egamesconf \
+		--with-datadir-name="${GAMES_DATADIR}/${PN}" \
+		$(use_enable debug) \
+		$(use_enable nls) \
+		|| die
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS README
+	newicon data/wormux-32.xpm wormux.xpm
+	make_desktop_entry wormux Wormux wormux.xpm
+	prepgamesdirs
+}