Version bump. Bug #410845 by slepnoga and Matthias P. Braendli.

Package-Manager: portage-2.2.0_alpha101_p6/cvs/Linux x86_64

5 files changed, 119 insertions, 11 deletions

diff --git a/games-strategy/scorched3d/ChangeLog b/games-strategy/scorched3d/ChangeLog
index 2a1dacaff746..da93b7e1ac14 100644
--- a/games-strategy/scorched3d/ChangeLog
+++ b/games-strategy/scorched3d/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-strategy/scorched3d
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.82 2011/09/12 12:44:05 tupone Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.83 2012/05/12 14:41:22 slyfox Exp $
+
+*scorched3d-43.3d (12 May 2012)
+
+  12 May 2012; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/scorched3d-43.3d-fixups.patch, +scorched3d-43.3d.ebuild,
+  scorched3d-43.2a.ebuild:
+  Version bump. Bug #410845 by slepnoga and Matthias P. Braendli.
 
   12 Sep 2011; Tupone Alfredo <tupone@gentoo.org>
   +files/scorched3d-43.2a-png15.patch:
diff --git a/games-strategy/scorched3d/Manifest b/games-strategy/scorched3d/Manifest
index f9511c903f0e..4d1c867f2e87 100644
--- a/games-strategy/scorched3d/Manifest
+++ b/games-strategy/scorched3d/Manifest
@@ -6,14 +6,17 @@ AUX scorched3d-43.2a-gcc43.patch 875 RMD160 b52c37c3210c5ea0629f5f00283a4a63fa5c
 AUX scorched3d-43.2a-odbc.patch 665 RMD160 00d9966808a9b61a45223cce0ba50116774f243e SHA1 71b0f9308e743dd1630977467c12b3caf89bb446 SHA256 27e8af602e38579f87b83bc67afc7c3fde012e058f73dab7b5e63f22752bb1be
 AUX scorched3d-43.2a-png15.patch 2582 RMD160 7e93324f980fc7fa89021d6852c1073bdde465d4 SHA1 bdf57394119d81d7a84e14f9435de3c0cc482578 SHA256 654d3f1d55f514c7249215b6974c0d70777c9dbd7de6ef7ccbffd98cefcfa853
 AUX scorched3d-43.2a-win32.patch 625 RMD160 6170762627bb1094479eece1e07591e6e9703abf SHA1 9622d3d756999780da4385bd48a2cd12290d7aab SHA256 50c8cadae0476071f580983f8287e95ac15c45e865e4837b567493a97fcd4c5f
+AUX scorched3d-43.3d-fixups.patch 828 RMD160 341a6d2995d4b3e88f7b0a79e4c038b699335917 SHA1 642cc5fb6597cf08d50fe02dbff6f76bf0627e56 SHA256 1096fa8a3acae7eaef2598d00972af136e01f057c8e30e7b6d29a9fe028706a6
 DIST Scorched3D-43.2a-src.tar.gz 66822169 RMD160 f1d91afdb80220b85b82ecb87988033629c3d697 SHA1 d72e928512d4cc1c525161abd061318425a1ae40 SHA256 b13fa8b6862271efde2fb1f7d6c470ce180940cf8896f42a86a1f8b39cad61c3
-EBUILD scorched3d-43.2a.ebuild 1538 RMD160 27dfc52fd574993167d365c664c1d78ee172161c SHA1 15f2d769ba5fd5a449b153f1e3387f8153f2b641 SHA256 b17133cd6a44a5d0a0de9ad6923431d1ebc10da5983205e2ba3c53496049cab9
-MISC ChangeLog 12803 RMD160 9559108747332446aec04a88bcd423dd9d130811 SHA1 53062e4ee3774786d372da669172ea7a394f3bf3 SHA256 ea67f011c8938d3695064ea8315a4ccee69a381cf94e06ac08ffdd44b07872e9
+DIST Scorched3D-43.3d-src.tar.gz 93245939 RMD160 f09442b73e80e3bcd0e462527b6530ffdec6473f SHA1 a47e5095b779290f5798ad2e6eb158f930af1230 SHA256 a5e7bdc3810517ab142cfcb43951ca55d03c81252d00bc323f0f204deb62ef1c
+EBUILD scorched3d-43.2a.ebuild 1554 RMD160 6d635f4b6ac7c58441f3d66b48c223b0761c1fc8 SHA1 f07d1822f5a211f717f0f23376d6f038d60d8abf SHA256 59a13e7e9400de681b9b087b80d38892e80494a823d43d3d1fa71c55450f06ea
+EBUILD scorched3d-43.3d.ebuild 1746 RMD160 7b3ff907fc2c83b664801c99de90bb3f93e23580 SHA1 34914d37cfe78aaa4136d368573d60756dce9fdc SHA256 91817b072e5915512716bed1891070fa0e5767f4e6fb6a03c62400c3e843336c
+MISC ChangeLog 13050 RMD160 6f1ad673a754b92d9b2c3ab1d263c1d7296d1dc9 SHA1 7ee3ca20eb45a7c47c4b557267637bb70c67313d SHA256 5fc4e51c1c45b27e730f03c1cc35bf52e218110fc2549e4fa99ae5b0dc25dca2
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk5t/kIACgkQIY77eQFFFC2faQCcCEkEdUS+4VwzrH4ZiGYOVzT4
-d/4AoM+e+T8HtP3lDWuCLHn6mb9f3hmx
-=NPRg
+iEYEARECAAYFAk+ud8wACgkQcaHudmEf86rOigCfXPakeVkypMBFCqht6zSYxinS
+brgAn1J30QhSz+VhW/pkSWObH37vZhDm
+=DsRI
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/scorched3d/files/scorched3d-43.3d-fixups.patch b/games-strategy/scorched3d/files/scorched3d-43.3d-fixups.patch
new file mode 100644
index 000000000000..c054829546e6
--- /dev/null
+++ b/games-strategy/scorched3d/files/scorched3d-43.3d-fixups.patch
@@ -0,0 +1,26 @@
+diff -ru scorched.orig/configure.ac scorched/configure.ac
+--- scorched.orig/configure.ac	2008-03-03 16:17:18.000000000 -0500
++++ scorched/configure.ac	2009-02-15 20:40:30.000000000 -0500
+@@ -13,22 +13,6 @@
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
+ 
+-LDFLAGS="-L/usr/X11R6/lib -L/usr/X11R6"
+-CPPFLAGS="-I/usr/X11R6/include -I/usr/X11R6"
+-
+-if test `uname` == Darwin; then
+-LDFLAGS="$LDFLAGS -lmx"
+-CPPFLAGS="$CPPFLAGS -DFFTW_USE_DOUBLE -D__DARWIN__ -D__MACOSX__"
+-else
+-LDFLAGS="$LDFLAGS -L/usr/local/lib"
+-CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+-fi
+-
+-AC_CHECK_LIB(fridge, beer, echo "Hmm?!",[
+-	echo "Warning: No beer found in fridge!";
+-	echo "We highly suggest that you rectify this situation immediately."
+-])
+-
+ AC_ARG_ENABLE(serveronly, 
+ 	[  --enable-serveronly Enable server only compilation],
+ 		    , enable_serveronly=no,
diff --git a/games-strategy/scorched3d/scorched3d-43.2a.ebuild b/games-strategy/scorched3d/scorched3d-43.2a.ebuild
index e091ca540856..4c45dc40d9d8 100644
--- a/games-strategy/scorched3d/scorched3d-43.2a.ebuild
+++ b/games-strategy/scorched3d/scorched3d-43.2a.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-43.2a.ebuild,v 1.6 2011/03/25 12:18:07 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-43.2a.ebuild,v 1.7 2012/05/12 14:41:22 slyfox Exp $
 
 EAPI=2
 WX_GTK_VER=2.8
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="dedicated mysql"
 
-DEPEND="media-libs/libsdl[video]
+RDEPEND="media-libs/libsdl[video]
 	media-libs/sdl-net
 	media-libs/libpng
 	virtual/jpeg:0
@@ -33,6 +33,8 @@ DEPEND="media-libs/libsdl[video]
 	)
 	mysql? ( virtual/mysql )"
 
+DEPEND="$RDEPEND"
+
 S=${WORKDIR}/scorched
 
 src_prepare() {
diff --git a/games-strategy/scorched3d/scorched3d-43.3d.ebuild b/games-strategy/scorched3d/scorched3d-43.3d.ebuild
new file mode 100644
index 000000000000..c24f2d8fdc65
--- /dev/null
+++ b/games-strategy/scorched3d/scorched3d-43.3d.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-43.3d.ebuild,v 1.1 2012/05/12 14:41:22 slyfox Exp $
+
+EAPI=2
+WX_GTK_VER=2.8
+inherit autotools eutils wxwidgets games
+
+DESCRIPTION="Multi-player tank battle in 3D (OpenGL)"
+HOMEPAGE="http://www.scorched3d.co.uk/"
+SRC_URI="mirror://sourceforge/${PN}/Scorched3D-${PV}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="dedicated mysql"
+
+RDEPEND="media-libs/libsdl[video]
+	media-libs/sdl-net
+	media-libs/libpng
+	virtual/jpeg:0
+	dev-libs/expat
+	!dedicated? (
+		virtual/opengl
+		virtual/glu
+		media-libs/libogg
+		media-libs/libvorbis
+		media-libs/openal
+		media-libs/freealut
+		x11-libs/wxGTK:2.8[X]
+		media-libs/freetype:2
+		sci-libs/fftw:3.0
+	)
+	mysql? ( virtual/mysql )"
+
+DEPEND="$RDEPEND"
+
+S=${WORKDIR}/scorched
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fixups.patch
+	epatch "${FILESDIR}"/${PN}-43.2a-gcc43.patch
+	epatch "${FILESDIR}"/${PN}-43.2a-odbc.patch
+	epatch "${FILESDIR}"/${PN}-43.2a-png15.patch
+	epatch "${FILESDIR}"/${PN}-43.2a-win32.patch
+	eautoreconf
+}
+
+src_configure() {
+	egamesconf \
+		--disable-dependency-tracking \
+		--with-fftw=/usr \
+		--with-ogg=/usr \
+		--with-vorbis=/usr \
+		--datadir="${GAMES_DATADIR}/${PN}" \
+		--with-docdir="/usr/share/doc/${PF}" \
+		--with-wx-config="${WX_CONFIG}" \
+		--without-pgsql \
+		$(use_with mysql) \
+		$(use_enable dedicated serveronly)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	if ! use dedicated ; then
+		newicon data/images/tank-old.bmp ${PN}.bmp || die
+		make_desktop_entry ${PN} "Scorched 3D" /usr/share/pixmaps/${PN}.bmp
+	fi
+	prepgamesdirs
+}