version bump

Package-Manager: portage-2.1.10.3/cvs/Linux i686

4 files changed, 154 insertions, 12 deletions

diff --git a/games-simulation/searchandrescue/ChangeLog b/games-simulation/searchandrescue/ChangeLog
index dd92369d160f..32690bbf4ed8 100644
--- a/games-simulation/searchandrescue/ChangeLog
+++ b/games-simulation/searchandrescue/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-simulation/searchandrescue
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/searchandrescue/ChangeLog,v 1.32 2011/05/26 21:23:20 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/searchandrescue/ChangeLog,v 1.33 2011/08/14 22:18:55 mr_bones_ Exp $
+
+*searchandrescue-1.4.0 (14 Aug 2011)
+
+  14 Aug 2011; Michael Sterrett <mr_bones_@gentoo.org>
+  +searchandrescue-1.4.0.ebuild, +files/searchandrescue-1.4.0-build.patch:
+  version bump
 
   26 May 2011; Markus Meier <maekke@gentoo.org> searchandrescue-1.3.0.ebuild:
   x86 stable, bug #366401
diff --git a/games-simulation/searchandrescue/Manifest b/games-simulation/searchandrescue/Manifest
index d241a9e0d47d..50b5f3cba34e 100644
--- a/games-simulation/searchandrescue/Manifest
+++ b/games-simulation/searchandrescue/Manifest
@@ -1,18 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX searchandrescue-1.3.0-build.patch 2454 RMD160 317174ea233636e5b59329615b7376c2a4461bcb SHA1 667a6b5d2201f510a75cf849fecf1b830756c7a5 SHA256 dc69e0950cc122410687a24890fdbc031d6d0a1abc5fa9ecae126dc31ae01a1a
+AUX searchandrescue-1.4.0-build.patch 2454 RMD160 317174ea233636e5b59329615b7376c2a4461bcb SHA1 667a6b5d2201f510a75cf849fecf1b830756c7a5 SHA256 dc69e0950cc122410687a24890fdbc031d6d0a1abc5fa9ecae126dc31ae01a1a
 DIST SearchAndRescue-1.1.0.tar.gz 864674 RMD160 b53b51cff67f4106b1046c773b473efdc316da0d SHA1 8696533f1eb328c055a315eec2b31c56f6530361 SHA256 bd3625d920a48cb349975987be7fc79900bde25b2c75a94e300fd0f1035cb94d
 DIST SearchAndRescue-1.3.0.tar.gz 1472727 RMD160 1d6c957e2f7d644d900af7e85c851a1025b9b059 SHA1 e12edf65a2c0b966261af64c7e0c025fc77f5de7 SHA256 260a3962e0bccb2822a809707acecdfdec4061053a20ad67a33bbda60ca2e13c
+DIST SearchAndRescue-1.4.0.tar.gz 1473062 RMD160 74a4f86c0648620916e58c35abe6d693ff73d5ea SHA1 f401064a91b0f50811f1f0b75a81c123efcc4629 SHA256 30837d0c5019b646f506c284c1adc01e5334e7befc145a00e64f0e7f21642757
 DIST SearchAndRescue-data-1.0.0.tar.gz 8502581 RMD160 44600665001cdeb3dd424048bc1d8b1fd44c563d SHA1 0ca247c1331bcba86d28449e0b67bf6016797489 SHA256 8ce04aeadf95e2a5d876cc6f044b1554d4e180428c634dd4f577ed55c99d54d0
+DIST SearchAndRescue-data-1.3.0.tar.gz 52152370 RMD160 4285e9fb2e4ee6b1a9ac7725e348495cedadf675 SHA1 4beba336f39f638205805306ef024df562504ff4 SHA256 24e69e14b9d8c0683b3943d3fabe891e9b204c59dc1e8b47f4abd3db8cb29150
 EBUILD searchandrescue-1.1.0.ebuild 1946 RMD160 eb8cb30cbf0140c712ddd544d4e906e48d4cad0e SHA1 f4cff4c4009f9213723c293a05de509b5ec8dea3 SHA256 6c67d148e816ed49c99316a88fbdd0f85b44f79dac0cee5380e685d4d2215e82
 EBUILD searchandrescue-1.3.0.ebuild 1901 RMD160 ad73ff61cfe9d31e8674bd1ec78520a15ed7205c SHA1 7280ea3920391f2cf9066856c0c834ca7e7aacd0 SHA256 1223c51b2dfeb639e20f62159d98b57457dea0ee15e75a6f31523eb3897c400f
-MISC ChangeLog 4563 RMD160 639cd74d63b207102d5ce07a39f3678fbed4788e SHA1 a33ab2b75ba02708bfdecc9ba9dc98c11ce16723 SHA256 c95b4baf7a09825fa8ce70a22677912d6bcc5f9ddcaf383bea0fc95858837bb3
+EBUILD searchandrescue-1.4.0.ebuild 1906 RMD160 befcfddb2d2238f7fb5ce343aaee7534871a32a9 SHA1 97f1a3278eb62157e15230a82c87bfee6b3ef026 SHA256 706a2ae7dc2bf68a66dbb5a4579b72630a5d68a07afd490779ca92b89ef8b856
+MISC ChangeLog 4750 RMD160 94949bf1b5c42ad7433cd267b5bb380325eaf5a7 SHA1 2216578729d97ddec32bb9568c21debc53247e3d SHA256 e3ddb8c29c5366085e641af9016ef75bfdcd0463de150641d84ce1320a2e98e4
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk3exNIACgkQkKaRLQcq0GKsGQCeLTy8JbE6//Hq/90gcABxnbTl
-FEwAn14m38H4VvK/30Z03ZEFyN12YrVa
-=trMf
------END PGP SIGNATURE-----
diff --git a/games-simulation/searchandrescue/files/searchandrescue-1.4.0-build.patch b/games-simulation/searchandrescue/files/searchandrescue-1.4.0-build.patch
new file mode 100644
index 000000000000..fe7236fbced0
--- /dev/null
+++ b/games-simulation/searchandrescue/files/searchandrescue-1.4.0-build.patch
@@ -0,0 +1,68 @@
+diff -ru searchandrescue_1.3.0.orig/sar/makefile_append.ini searchandrescue_1.3.0/sar/makefile_append.ini
+--- searchandrescue_1.3.0.orig/sar/makefile_append.ini	2004-08-05 18:34:15.000000000 -0400
++++ searchandrescue_1.3.0/sar/makefile_append.ini	2011-04-06 18:12:26.599574441 -0400
+@@ -3,7 +3,7 @@
+ 
+ 
+ # C++ flags:
+-CPPFLAGS = -D__cplusplus -Dc_plusplus
++CPPFLAGS += -D__cplusplus -Dc_plusplus
+ 
+ 
+ # Source files list:
+@@ -16,14 +16,12 @@
+ OBJ_CPP = $(SRC_CPP:.cpp=.o)
+ .c.o:
+ 	@echo "Compiling module $*.o"
+-	@$(CC) -c $*.c $(INC_DIRS) $(CFLAGS)
++	$(CC) -c $*.c $(INC_DIRS) $(CFLAGS)
+ .cpp.o:
+ 	@echo "Compiling module $*.o"
+-	@$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS)
++	$(CPP) -c $*.cpp $(INC_DIRS) $(CPPFLAGS)
+ 
+ # Programs
+-LS      = ls
+-LSFLAGS = -s -h -c --color=auto
+ RM      = rm
+ RMFLAGS = -f
+ 
+@@ -32,9 +30,8 @@
+ 
+ modules: $(OBJ_C) $(OBJ_CPP)
+ 	@echo -n "Linking modules..."
+-	@$(CPP) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIBS) $(LIB_DIRS)
++	$(CPP) $(OBJ_C) $(OBJ_CPP) $(LDFLAGS) -o $(BIN) $(LIBS) $(LIB_DIRS)
+ 	@echo -n "   "
+-	@-$(LS) $(LSFLAGS) $(BIN)
+ 
+ prebuild:
+ 	@echo "Building program \"$(BIN)\"..."
+@@ -54,5 +51,5 @@
+ clean:
+ 	@echo "Cleaning program \"$(BIN)\"..."
+ 	@echo "Deleting all intermediate files..."
+-	@$(RM) $(RMFLAGS) a.out core *.o $(BIN)
++	$(RM) $(RMFLAGS) a.out core *.o $(BIN)
+ 	@echo "Clean done."
+diff -ru searchandrescue_1.3.0.orig/sar/platforms.ini searchandrescue_1.3.0/sar/platforms.ini
+--- searchandrescue_1.3.0.orig/sar/platforms.ini	2011-03-08 19:29:52.000000000 -0500
++++ searchandrescue_1.3.0/sar/platforms.ini	2011-04-06 18:12:11.277632730 -0400
+@@ -102,7 +102,7 @@
+                 FeatureDepend = xf86vidmode-lib
+                         DependType = Library
+                         MustExist = Yes
+-                        DependPath = libXxf86vm.a
++                        DependPath = libXxf86vm.so
+                         DependGrepString = XF86VidModeQueryExtension
+                 FeatureDepend = xf86vidmode-devel
+                         DependType = Header
+@@ -223,7 +223,7 @@
+                 FeatureDepend = xf86vidmode-lib
+                         DependType = Library
+                         MustExist = Yes
+-                        DependPath = libXxf86vm.a
++                        DependPath = libXxf86vm.so
+                         DependGrepString = XF86VidModeQueryExtension
+                 FeatureDepend = xf86vidmode-devel
+                         DependType = Header
diff --git a/games-simulation/searchandrescue/searchandrescue-1.4.0.ebuild b/games-simulation/searchandrescue/searchandrescue-1.4.0.ebuild
new file mode 100644
index 000000000000..fd56793517a3
--- /dev/null
+++ b/games-simulation/searchandrescue/searchandrescue-1.4.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/searchandrescue/searchandrescue-1.4.0.ebuild,v 1.1 2011/08/14 22:18:55 mr_bones_ Exp $
+
+EAPI=2
+inherit eutils flag-o-matic toolchain-funcs games
+
+MY_DATA_PV=1.3.0
+MY_PN=SearchAndRescue
+DESCRIPTION="Helicopter based air rescue flight simulator"
+HOMEPAGE="http://searchandrescue.sourceforge.net/"
+SRC_URI="mirror://sourceforge/searchandrescue/${MY_PN}-${PV}.tar.gz
+	mirror://sourceforge/searchandrescue/${MY_PN}-data-${MY_DATA_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXxf86vm
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libXmu
+	x11-libs/libXi
+	x11-libs/libXpm
+	virtual/opengl
+	virtual/glu
+	media-libs/libsdl
+	media-libs/sdl-mixer"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto
+	x11-proto/xf86vidmodeproto"
+
+S=${WORKDIR}/${PN}_${PV}
+
+src_unpack() {
+	unpack ${MY_PN}-${PV}.tar.gz
+	mkdir data && cd data && \
+		unpack ${MY_PN}-data-${MY_DATA_PV}.tar.gz
+	bunzip2 "${S}"/sar/man/${MY_PN}.6.bz2 || die
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
+}
+
+src_configure() {
+	append-flags -DNEW_GRAPHICS -DHAVE_SDL_MIXER
+	export CPP="$(tc-getCXX)"
+	export CPPFLAGS="${CXXFLAGS}"
+	# NOTE: not an autoconf script
+	./configure Linux \
+		--prefix="${GAMES_PREFIX}" \
+		--disable=Y2 \
+		|| die
+	sed -i -e 's/@\$/$/' sar/Makefile || die
+}
+
+src_compile() {
+	emake -C sar || die
+}
+src_install() {
+	dogamesbin sar/${MY_PN} || die "dogamesbin failed"
+	doman sar/man/${MY_PN}.6
+	dodoc AUTHORS HACKING README
+	doicon sar/icons/SearchAndRescue.xpm
+	newicon sar/icons/SearchAndRescue.xpm ${PN}.xpm
+	cd "${WORKDIR}/data"
+	dodir "${GAMES_DATADIR}/${PN}"
+	cp -r * "${D}/${GAMES_DATADIR}/${PN}/" || die "cp failed"
+	make_desktop_entry SearchAndRescue "SearchAndRescue" \
+		/usr/share/pixmaps/${PN}.xpm
+	prepgamesdirs
+}