public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: games-simulation/searchandrescue/
@ 2016-09-16  0:15 Austin English
  0 siblings, 0 replies; 4+ messages in thread
From: Austin English @ 2016-09-16  0:15 UTC (permalink / raw
  To: gentoo-commits

commit:     b03e1bfc8eb49d24520700ac6121b61097b0c9c1
Author:     Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 16 00:15:00 2016 +0000
Commit:     Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Fri Sep 16 00:15:09 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b03e1bfc

games-simulation/searchandrescue: remove deprecated games eclass

Also update to EAPI 6

Gentoo-Bug: https://bugs.gentoo.org/574082

Package-Manager: portage-2.3.0

 .../searchandrescue-1.5.0-r1.ebuild                | 79 ++++++++++++++++++++++
 1 file changed, 79 insertions(+)

diff --git a/games-simulation/searchandrescue/searchandrescue-1.5.0-r1.ebuild b/games-simulation/searchandrescue/searchandrescue-1.5.0-r1.ebuild
new file mode 100644
index 00000000..5967a38
--- /dev/null
+++ b/games-simulation/searchandrescue/searchandrescue-1.5.0-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~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-proto/xextproto
+	x11-proto/xf86vidmodeproto"
+
+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
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-simulation/searchandrescue/
@ 2018-06-11  1:53 Matt Turner
  0 siblings, 0 replies; 4+ messages in thread
From: Matt Turner @ 2018-06-11  1:53 UTC (permalink / raw
  To: gentoo-commits

commit:     341922190edd3a7774962729e4dca40f7cd7fc78
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 11 01:48:49 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Jun 11 01:48:49 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34192219

games-simulation/*: Update dependencies (x11-proto/* -> x11-base/xorg-proto)

 games-simulation/searchandrescue/searchandrescue-1.5.0-r1.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/games-simulation/searchandrescue/searchandrescue-1.5.0-r1.ebuild b/games-simulation/searchandrescue/searchandrescue-1.5.0-r1.ebuild
index 9c1b5118300..9213c114460 100644
--- a/games-simulation/searchandrescue/searchandrescue-1.5.0-r1.ebuild
+++ b/games-simulation/searchandrescue/searchandrescue-1.5.0-r1.ebuild
@@ -28,8 +28,7 @@ RDEPEND="
 	virtual/opengl
 	virtual/glu"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-proto/xf86vidmodeproto"
+	x11-base/xorg-proto"
 
 S=${WORKDIR}/${PN}_${PV}
 


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-simulation/searchandrescue/
@ 2019-11-11 22:47 James Le Cuirot
  0 siblings, 0 replies; 4+ messages in thread
From: James Le Cuirot @ 2019-11-11 22:47 UTC (permalink / raw
  To: gentoo-commits

commit:     456c7e22f6149b6f5664a3e6434e1c68052a0218
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 11 22:43:56 2019 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Nov 11 22:45:34 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=456c7e22

games-simulation/searchandrescue: Version bump to 1.7.0

Closes: https://bugs.gentoo.org/677670
Closes: https://bugs.gentoo.org/698716
Closes: https://github.com/gentoo/gentoo/pull/13419
Package-Manager: Portage-2.3.79, Repoman-2.3.17
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-simulation/searchandrescue/Manifest          |  3 +
 .../searchandrescue/searchandrescue-1.7.0.ebuild   | 80 ++++++++++++++++++++++
 2 files changed, 83 insertions(+)

diff --git a/games-simulation/searchandrescue/Manifest b/games-simulation/searchandrescue/Manifest
index b99ec79b403..358a5aad1bc 100644
--- a/games-simulation/searchandrescue/Manifest
+++ b/games-simulation/searchandrescue/Manifest
@@ -1,2 +1,5 @@
 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/searchandrescue-1.7.0.ebuild b/games-simulation/searchandrescue/searchandrescue-1.7.0.ebuild
new file mode 100644
index 00000000000..a6949977970
--- /dev/null
+++ b/games-simulation/searchandrescue/searchandrescue-1.7.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop flag-o-matic prefix toolchain-funcs xdg
+
+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 -> ${MY_PN}-${PV}.tar
+	mirror://sourceforge/searchandrescue/${MY_PN}-data-${PV}.tar.gz -> ${MY_PN}-data-${PV}.tar
+	mirror://sourceforge/searchandrescue/${MY_PN}-data-guadarrama-${PV}.tar.gz -> ${MY_PN}-data-guadarrama-${PV}.tar"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-libs/libsdl
+	media-libs/sdl-mixer
+	virtual/glu
+	virtual/opengl
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXxf86vm
+"
+
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+S=${WORKDIR}/${PN}_${PV}
+
+src_unpack() {
+	unpack ${MY_PN}-${PV}.tar
+	mkdir data || die
+	cd data || die
+	unpack ${MY_PN}-data-${PV}.tar
+	unpack ${MY_PN}-data-guadarrama-${PV}.tar
+	bunzip2 "${S}"/sar/man/${MY_PN}.6.bz2 || die
+}
+
+src_prepare() {
+	xdg_src_prepare
+
+	chmod +x configure || die
+	rm pconf/pconf || die
+	sed -i "/PlatformSearchPathLib/s:/lib/:/$(get_libdir)/:g" sar/platforms.ini || die
+	hprefixify sar/platforms.ini
+}
+
+src_configure() {
+	export CC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" \
+		   CPP="$(tc-getCXX) ${LDFLAGS}"
+
+	append-flags -DNEW_GRAPHICS -DHAVE_SDL_MIXER
+
+	# Needed for the configure script
+	emake -C pconf pconf CC="${CC}"
+
+	# NOTE: not an autoconf script
+	./configure Linux --prefix="${EPREFIX}/usr" || die
+	sed -i -r 's/^(\s+)@/\1/' sar/Makefile || die
+}
+
+src_compile() {
+	emake -C sar LIB_DIRS=
+}
+
+src_install() {
+	dobin sar/${MY_PN}
+	doman sar/man/${MY_PN}.6
+	dodoc AUTHORS HACKING README
+	doicon sar/icons/${MY_PN}.xpm
+	insinto /usr/share/games/${PN}
+	doins -r ../data/*
+	make_desktop_entry ${MY_PN} "Search and Rescue" ${MY_PN}
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-simulation/searchandrescue/
@ 2021-08-19  0:42 Sam James
  0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2021-08-19  0:42 UTC (permalink / raw
  To: gentoo-commits

commit:     1e9f3a4e1fdfc235dc42e4639a077bbb5595b338
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 19 00:42:16 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 19 00:42:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e9f3a4e

games-simulation/searchandrescue: add libsdl[joystick] dependency

Closes: https://bugs.gentoo.org/733522
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...handrescue-1.7.0.ebuild => searchandrescue-1.7.0-r1.ebuild} | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/games-simulation/searchandrescue/searchandrescue-1.7.0.ebuild b/games-simulation/searchandrescue/searchandrescue-1.7.0-r1.ebuild
similarity index 92%
rename from games-simulation/searchandrescue/searchandrescue-1.7.0.ebuild
rename to games-simulation/searchandrescue/searchandrescue-1.7.0-r1.ebuild
index a6949977970..0d86fc160b7 100644
--- a/games-simulation/searchandrescue/searchandrescue-1.7.0.ebuild
+++ b/games-simulation/searchandrescue/searchandrescue-1.7.0-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit desktop flag-o-matic prefix toolchain-funcs xdg
 
 MY_PN=SearchAndRescue
@@ -10,13 +11,14 @@ HOMEPAGE="http://searchandrescue.sourceforge.net/"
 SRC_URI="mirror://sourceforge/searchandrescue/${MY_PN}-${PV}.tar.gz -> ${MY_PN}-${PV}.tar
 	mirror://sourceforge/searchandrescue/${MY_PN}-data-${PV}.tar.gz -> ${MY_PN}-data-${PV}.tar
 	mirror://sourceforge/searchandrescue/${MY_PN}-data-guadarrama-${PV}.tar.gz -> ${MY_PN}-data-guadarrama-${PV}.tar"
+S="${WORKDIR}"/${PN}_${PV}
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	media-libs/libsdl
+	media-libs/libsdl[joystick]
 	media-libs/sdl-mixer
 	virtual/glu
 	virtual/opengl
@@ -31,8 +33,6 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
-S=${WORKDIR}/${PN}_${PV}
-
 src_unpack() {
 	unpack ${MY_PN}-${PV}.tar
 	mkdir data || die
@@ -52,7 +52,7 @@ src_prepare() {
 }
 
 src_configure() {
-	export CC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" \
+	export CC="$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" \
 		   CPP="$(tc-getCXX) ${LDFLAGS}"
 
 	append-flags -DNEW_GRAPHICS -DHAVE_SDL_MIXER


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-08-19  0:42 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-11 22:47 [gentoo-commits] repo/gentoo:master commit in: games-simulation/searchandrescue/ James Le Cuirot
  -- strict thread matches above, loose matches on Subject: below --
2021-08-19  0:42 Sam James
2018-06-11  1:53 Matt Turner
2016-09-16  0:15 Austin English

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox