commit: c2640d0553194000a512303ca69fbbc2ee46e5a8 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Mon Nov 11 22:46:33 2019 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Mon Nov 11 22:46:33 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2640d05
games-simulation/searchandrescue: Drop old 1.5.0 Package-Manager: Portage-2.3.79, Repoman-2.3.17 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> games-simulation/searchandrescue/Manifest | 2 - .../files/searchandrescue-1.5.0-build.patch | 66 ------------------- .../searchandrescue-1.5.0-r1.ebuild | 77 ---------------------- 3 files changed, 145 deletions(-) diff --git a/games-simulation/searchandrescue/Manifest b/games-simulation/searchandrescue/Manifest index 358a5aad1bc..6c98a8edfca 100644 --- a/games-simulation/searchandrescue/Manifest +++ b/games-simulation/searchandrescue/Manifest @@ -1,5 +1,3 @@ -DIST SearchAndRescue-1.5.0.tar.gz 1473765 BLAKE2B cf7dcbb4d250a124a5450115e4fa6f016e83ba16a5ba12cbc53a3c3725643f0a0d306853a3239471ae87d4fc5bef16f2fe903601daf24e2c7a8e3dc71b1a1c2f SHA512 72a8e5c375bb2f5d11d1346bb3c81ea4678a9c58c36f53c048e9a16d32a926ff93c3ec9756867f0869aa2a8da5fb0bfe7764f704c4e79519ee0834d225513657 DIST SearchAndRescue-1.7.0.tar 6256640 BLAKE2B 9ccf63408499bd5f44a1eb6d24656ca5403eb732bd166ccd263d5fdd6f29e5168a563cda4e59eff74d39fa832876f0f04451042baf99d332d748828d0f03b7de SHA512 36295e7c20e685068ba6448b5f579eb53fedba663f76ac1d0db1da1765fbbfe6c1c4728e8a90680250ebbb3f4ad181fbe5bdd2f0fc703c774ec27dc829feacc9 -DIST SearchAndRescue-data-1.3.0.tar.gz 52152370 BLAKE2B e6f19b03f45d971c43cfeb72e3202fbf99c1e3d276acc8e133e6c345b08f19cfdc1ae997fdb3d90e173fe5a6bd46685ac3903b1e1da3eda7fa105fc8d9547c7f SHA512 5419376aeecb0f05570a8d2a0a6f830f3b22ce9d1d34a5e490485767546c6d0d1d2a2a3f37e5dfcef69e271a94a9c7dfc6b592e3c0dd62a8a6c38e4bf7d25ccd DIST SearchAndRescue-data-1.7.0.tar 52141474 BLAKE2B 2f43e1349d27c11e441d01d7421d9e5b9145d99c6685ddfb1e2a713269123f9cfc2c655359fa65fa09844dcbf3958bc9d4b2c51c4f9c03e401e2bc40f8953f40 SHA512 a323c50a2c64705ebd43c27e836f088094085bc4f5d219a9b0341cc3b16aafe96e364eb36162a7acb6a59aefe6304767f497e2d7bb0dc29d881f51e6535a6295 DIST SearchAndRescue-data-guadarrama-1.7.0.tar 41738769 BLAKE2B 8c0d02ca8bce7d70eb1016d4676eb35da5c20d1e2c5e65602d8d7414e2ee8bec9bf13399dd3576a3379b62ebc3d7fd7ba85ea33cc1ff2c179278a59bf623daf3 SHA512 1c9615858fc778832566991ee4802c0929c81a9b0b720e5db90b4bb0baff718fa0ba589fe33444ee7eb040622081d60c10036af2b199bf2bd0a7f5f45ba71c72 diff --git a/games-simulation/searchandrescue/files/searchandrescue-1.5.0-build.patch b/games-simulation/searchandrescue/files/searchandrescue-1.5.0-build.patch deleted file mode 100644 index 40428bade2d..00000000000 --- a/games-simulation/searchandrescue/files/searchandrescue-1.5.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.5.0-r1.ebuild b/games-simulation/searchandrescue/searchandrescue-1.5.0-r1.ebuild deleted file mode 100644 index 9213c114460..00000000000 --- a/games-simulation/searchandrescue/searchandrescue-1.5.0-r1.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils flag-o-matic toolchain-funcs - -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 ~x86" -IUSE="" - -RDEPEND=" - media-libs/libsdl - media-libs/sdl-mixer - x11-libs/libICE - x11-libs/libSM - x11-libs/libXi - x11-libs/libXmu - x11-libs/libXpm - x11-libs/libXxf86vm - virtual/opengl - virtual/glu" -DEPEND="${RDEPEND} - x11-base/xorg-proto" - -S=${WORKDIR}/${PN}_${PV} - -PATCHES=( - "${FILESDIR}"/${P}-build.patch -) - -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() { - default - - rm pconf/pconf || die - sed -i -e '/Wall/s/$/ $(CFLAGS)/' pconf/Makefile || die -} - -src_configure() { - emake CC=$(tc-getCC) -C pconf pconf # Needed for the configure script - - append-cppflags -DNEW_GRAPHICS -DHAVE_SDL_MIXER - export CPP="$(tc-getCXX)" - export CPPFLAGS="${CXXFLAGS}" - # NOTE: not an autoconf script - ./configure Linux --prefix="/usr" || die - sed -i -e 's/@\$/$/' sar/Makefile || die -} - -src_compile() { - emake -C sar -} - -src_install() { - dobin sar/${MY_PN} - doman sar/man/${MY_PN}.6 - dodoc AUTHORS HACKING README - doicon sar/icons/SearchAndRescue.xpm - newicon sar/icons/SearchAndRescue.xpm ${PN}.xpm - dodir /usr/share/games/${PN} - cp -r "${WORKDIR}"/data/* "${D}/usr/share/games/${PN}/" || die - make_desktop_entry SearchAndRescue "SearchAndRescue" /usr/share/pixmaps/${PN}.xpm -}
