old

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

4 files changed, 7 insertions, 166 deletions

diff --git a/games-simulation/searchandrescue/ChangeLog b/games-simulation/searchandrescue/ChangeLog
index cbf760baa22a..6a63b908288c 100644
--- a/games-simulation/searchandrescue/ChangeLog
+++ b/games-simulation/searchandrescue/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-simulation/searchandrescue
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/searchandrescue/ChangeLog,v 1.40 2013/12/24 12:51:37 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/searchandrescue/ChangeLog,v 1.41 2014/02/08 16:02:11 mr_bones_ Exp $
+
+  08 Feb 2014; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/searchandrescue-1.4.0-build.patch, -searchandrescue-1.4.0.ebuild:
+  old
 
   24 Dec 2013; Agostino Sarubbo <ago@gentoo.org> searchandrescue-1.5.0.ebuild:
   Stable for x86, wrt bug #485126
diff --git a/games-simulation/searchandrescue/Manifest b/games-simulation/searchandrescue/Manifest
index 6d3a2511dd77..d3760b09b915 100644
--- a/games-simulation/searchandrescue/Manifest
+++ b/games-simulation/searchandrescue/Manifest
@@ -1,29 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX searchandrescue-1.4.0-build.patch 2110 SHA256 4c9bb535ae59dcea9d6d8973f79750a8469daab31ad3657439e17421297a77a8 SHA512 9162d53482d1a364ff8991a318aa19322399c939e657b568e8e9d621d8ab9e462db7c14c0f350e03e6f8a6d5059d11f038485a91b92869bb7800aa77640954f8 WHIRLPOOL 9b4b0e545ea723c85dfbeb574c6f33a53b9bcf03fe936e493bfd7219f7775dc14ee7ee8c887e696a831e35b53f2cce35645e6e3a845e01572685072cd66e6346
 AUX searchandrescue-1.5.0-build.patch 2110 SHA256 4c9bb535ae59dcea9d6d8973f79750a8469daab31ad3657439e17421297a77a8 SHA512 9162d53482d1a364ff8991a318aa19322399c939e657b568e8e9d621d8ab9e462db7c14c0f350e03e6f8a6d5059d11f038485a91b92869bb7800aa77640954f8 WHIRLPOOL 9b4b0e545ea723c85dfbeb574c6f33a53b9bcf03fe936e493bfd7219f7775dc14ee7ee8c887e696a831e35b53f2cce35645e6e3a845e01572685072cd66e6346
-DIST SearchAndRescue-1.4.0.tar.gz 1473062 SHA256 30837d0c5019b646f506c284c1adc01e5334e7befc145a00e64f0e7f21642757 SHA512 34289fc117fbcc3cd4351867b9f1f0949b57ca87e73c1f8245cd7087c662cdafa0162e8f0a257655576c0f922feb13b39e677d9230c28acc96f67d9b51c712bc WHIRLPOOL 5e3902e1caf3a4e68dd24fcdd35dff14733c6f2fdd2b6d9b414897a9d360f8d6ec399f85b2c4204ea41d03357dbad4a829294cf79dfeb98e049aac8074a47152
 DIST SearchAndRescue-1.5.0.tar.gz 1473765 SHA256 a49bfdcbf43e3161f82895fe30d0d14c4a61a535d40fa1b7b223144abb020b77 SHA512 72a8e5c375bb2f5d11d1346bb3c81ea4678a9c58c36f53c048e9a16d32a926ff93c3ec9756867f0869aa2a8da5fb0bfe7764f704c4e79519ee0834d225513657 WHIRLPOOL 9827f06ced0d293265e7457ae6997ae1cf09dade783b7f3ec0d010dec1edd2bcc67eb8ae9af6f94edc5b03c31d708cec84c44e34351fd9517e6b48a201d803ad
 DIST SearchAndRescue-data-1.3.0.tar.gz 52152370 SHA256 24e69e14b9d8c0683b3943d3fabe891e9b204c59dc1e8b47f4abd3db8cb29150 SHA512 5419376aeecb0f05570a8d2a0a6f830f3b22ce9d1d34a5e490485767546c6d0d1d2a2a3f37e5dfcef69e271a94a9c7dfc6b592e3c0dd62a8a6c38e4bf7d25ccd WHIRLPOOL 360ccfdc4f4222e06b344bb4660f97a13742c0fbad48bf4e1a2dff58b084ad2e485b540b3aa79d64f8a3b99bea16c517d6996a10a668f74c04193bf6abaf40dd
-EBUILD searchandrescue-1.4.0.ebuild 1903 SHA256 b25da3d35a0585b2f7fe745d6757ea48f11edf2d0354a48c1b635097c48cd386 SHA512 c4d2bd5e9410a4a09c6ae7b1c3d50ca36a3b0c744539abce679397c86f668f20dfee34f72afc1f026c4abb1c7abb1212f4b4f44542b01f1cbaccc11ac8d813e2 WHIRLPOOL 1644633ecf7d2bcbdc0cd86cb2ad847b9037b13c421e920c0df8f967412587c5124adcb4737880dc0da3747a053228e9f3da536f75b67ced6b0a37fa59dab800
 EBUILD searchandrescue-1.5.0.ebuild 1819 SHA256 c16802c0a34f11d1970ab9bb193442b729c1adfc6373125b73c0b0563adc6017 SHA512 2f46250408aa3163af988d74c9fcaa12fe39ee51778394852e649a7e9866ceb83fe74b7cd5ee5087113664fa4012cd90271688dc11feb900a0908422bc18fbb6 WHIRLPOOL c36991b675ec6b42e754d25de8cb19422bfcf237e891958dffbefd46719a04e2cf34846a77c072683d3dc2541dc4562f1edebea25a31521072d8c8138e71134e
-MISC ChangeLog 5724 SHA256 946534153bd1d260753eb9592a733eac7231d74a8c7774e35d74281ca2933072 SHA512 f10a61d49d37ba935e32fe5fab68aa8b964d0e558ddb5163aead46fc2d8dd3ec538c7cc34ff5ab101428f861eed445f574807aa4f61c3a23ca0f1d317ca2cc8a WHIRLPOOL 796b9a93e89b2b28f99e8072292448f80706e0c88ed1d14eb593e07ddad91002b531b5eb4386a386b6ef270a194b7cec9a31a14dd8e0563f3ba36e7ed4d7606a
+MISC ChangeLog 5867 SHA256 6ff0ee3f56f9d1192d1418d743bc0911a0d23b189a828e574a87b10eb7bebff1 SHA512 adab781af1c711bf388fff4647b3cde809e1cdbf16fe42fd918abc3a758802176c25753903cb03c1c38385834972f2bf623233aab4de0bcf232f0e40b7a8913f WHIRLPOOL 84ee3552347afd2c906084043d706dc0861beb9514ab80a9e69b356038fa634a7f1cfb469bc044c5659368426191d00a412b98e8dda254c16e74f1081295f438
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQIcBAEBCAAGBQJSuYNcAAoJELp701BxlEWfeE0P/3RMS2xwI6W4qwnb7OQNRzPd
-vJjE7k4UjJEKnGV+HQJRalj0l8BRTm92HZLn2BTqPDYn22iZrvqAMAmKG/G6W17W
-Bp2gc2xhI4Hr20M0hV4OryjPALnkltWeMY5sfubwROtx4oEMFOAWaJkAkoRRGsEW
-53kMvHpDu+n7WFcpiFCCTpPRByWWSnTGY+4tK4GCExN3Qnx6Eff/9BovvgXcUqjY
-sajDyTY+B4DbmrvZrcHC4Im1Pz0Udom8NyYNmGL5C9dF+2qi6Nr+7uY00+5CMNcP
-7Jd4xBtjJEHxfBy73afura1j15ggIVsXid6tAe6UQnzcNA9H8QSe410B5VgPRJx0
-znTkeogK/NAm2nHlor1xMBuaFeqYh7wqMnp4xvEjDzlEQw/N7bfZl0V5eHxbrTaQ
-Osd2L4FhphJMlStsbnco9tBY6NJAU7aoH8A7y+9Cyotn90LudgeJpE3Bzr/1x83s
-2zsr8uGFZ6MxlbKGWj4xD+NNpWQYOHVkPHobO+ccW38C+seNWVXG79LjEpBrhTJu
-x1BD3qgK1mTCnwu1kTmy2kxJgOuxs5Vr71fJkB8Ds7Skwb7hGqVUktmdK+Dy4IAk
-GrBJMgpcoFcP/TirXP94/lGr3r1aOSUHoJ+mrwbC41p3VC677X9KjpfSIUfnxyHq
-dbxS/0YoQVOpLCEU/6yt
-=Px8P
------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
deleted file mode 100644
index 40428bade2d7..000000000000
--- a/games-simulation/searchandrescue/files/searchandrescue-1.4.0-build.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- searchandrescue_1.3.0.orig/sar/makefile_append.ini
-+++ searchandrescue_1.3.0/sar/makefile_append.ini
-@@ -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."
---- searchandrescue_1.3.0.orig/sar/platforms.ini
-+++ searchandrescue_1.3.0/sar/platforms.ini
-@@ -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
deleted file mode 100644
index d5d070b4945e..000000000000
--- a/games-simulation/searchandrescue/searchandrescue-1.4.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# 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.3 2011/10/09 15:39:17 hwoarang 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
-}