From 255f77726d0e162c72aec3ac1718c8bd25d56a42 Mon Sep 17 00:00:00 2001 From: Tristan Heaven Date: Fri, 12 Jan 2007 23:57:50 +0000 Subject: [PATCH] Allow sdl to be used instead of glut Package-Manager: portage-2.1.2_rc4-r8 --- games-simulation/flightgear/ChangeLog | 7 +++- games-simulation/flightgear/Manifest | 24 +++++------ .../flightgear/flightgear-0.9.10.ebuild | 40 +++++++------------ 3 files changed, 32 insertions(+), 39 deletions(-) diff --git a/games-simulation/flightgear/ChangeLog b/games-simulation/flightgear/ChangeLog index abfd66f24a7f..d8d32193199c 100644 --- a/games-simulation/flightgear/ChangeLog +++ b/games-simulation/flightgear/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for games-simulation/flightgear -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/ChangeLog,v 1.25 2006/10/17 18:06:42 wolf31o2 Exp $ +# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/ChangeLog,v 1.26 2007/01/12 23:57:50 nyhm Exp $ + + 12 Jan 2007; Tristan Heaven flightgear-0.9.10.ebuild: + Allow sdl to be used instead of glut 17 Oct 2006; Chris Gianelloni -flightgear-0.9.4.ebuild, -flightgear-0.9.5.ebuild, diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest index 2cfe912eaa53..8dc6838fa3de 100644 --- a/games-simulation/flightgear/Manifest +++ b/games-simulation/flightgear/Manifest @@ -9,18 +9,18 @@ DIST FlightGear-0.9.10.tar.gz 2072135 RMD160 ebf268c350912b03f215088e108a29d0128 DIST FlightGear-0.9.9.tar.gz 1771791 RMD160 ccf95c96531c9a2ed3eae0ccd90816c0a1f72737 SHA1 230b73263e598eef48b11f0defa28452d7e45ca4 SHA256 46597145e087d116e479bf9048c06a0c84107ebda62420d783104831e4775c6a DIST fgfs-base-0.9.10.tar.bz2 146866758 RMD160 33fd5fe53d5b8091ec85526f3047b89bb43f8621 SHA1 4fc61a0791613e95f23c733cf32f7ac107478dfc SHA256 7770a7bd9f2bfa6475e414f4a83438c6e1e29abf12bd1b30045e3cc1732698eb DIST fgfs-base-0.9.9.tar.bz2 85943212 RMD160 607f901c19251596705f61a7110431cf5c8d6193 SHA1 cf61183c174afc5fc1936c1c9880a11f1784c329 SHA256 5524223a0b7ef51c3cd565b441c5e858bb8f902f077c5512d44787a6e04fe5ad -EBUILD flightgear-0.9.10.ebuild 1160 RMD160 ed4514b248e0163cf8a86c34203ce17f7dc77967 SHA1 43cbad28dcebcffe33f3eb5674e7ea872911489b SHA256 02aaa6d9dbdb2542cfba2241ea3f071397d93b4af7200b56a63cf42b495452f9 -MD5 bd34eaf69d6418542a9d7d3f89d88602 flightgear-0.9.10.ebuild 1160 -RMD160 ed4514b248e0163cf8a86c34203ce17f7dc77967 flightgear-0.9.10.ebuild 1160 -SHA256 02aaa6d9dbdb2542cfba2241ea3f071397d93b4af7200b56a63cf42b495452f9 flightgear-0.9.10.ebuild 1160 +EBUILD flightgear-0.9.10.ebuild 1036 RMD160 c84e9d811e19b9108a3e5712676e27e0de19ec2c SHA1 5e93a62675626381205cab319be93fbda2784a4a SHA256 afe75327ab7f8612fd4bc52413b05f92986bf86a302d07238b3bbc4cc1a094d2 +MD5 85e621700f03f90cd9d130bc570da180 flightgear-0.9.10.ebuild 1036 +RMD160 c84e9d811e19b9108a3e5712676e27e0de19ec2c flightgear-0.9.10.ebuild 1036 +SHA256 afe75327ab7f8612fd4bc52413b05f92986bf86a302d07238b3bbc4cc1a094d2 flightgear-0.9.10.ebuild 1036 EBUILD flightgear-0.9.9.ebuild 1204 RMD160 cae518579257fdfd3f0d1fc37b79767719794ce2 SHA1 110e199fd651ed2440d2ec1d1eb77aad3d7d5fd3 SHA256 436325fdba6f668cb67fb31576b246b426add6df31bc7a393180accde3c1dc82 MD5 9a1153e3d65ed8bb5c3d15c3c4926876 flightgear-0.9.9.ebuild 1204 RMD160 cae518579257fdfd3f0d1fc37b79767719794ce2 flightgear-0.9.9.ebuild 1204 SHA256 436325fdba6f668cb67fb31576b246b426add6df31bc7a393180accde3c1dc82 flightgear-0.9.9.ebuild 1204 -MISC ChangeLog 5358 RMD160 ef7413a003d7ff19ce42fd595550ad27a633848f SHA1 030597a03ba4d83869ffffdaa36e0fa331540209 SHA256 063edd78d8af395e44c00c0e8aab768d9d1abd4ffabc5a659da87eea659997c2 -MD5 793fad9a3a118b4626d8a007ecbc60ee ChangeLog 5358 -RMD160 ef7413a003d7ff19ce42fd595550ad27a633848f ChangeLog 5358 -SHA256 063edd78d8af395e44c00c0e8aab768d9d1abd4ffabc5a659da87eea659997c2 ChangeLog 5358 +MISC ChangeLog 5468 RMD160 0a0f359733d2c57bb0078ca021639c0d8eff5225 SHA1 ff7f19fa19b86c1d9af07744ac3a4dce99058729 SHA256 d56df47faf5aebb9433898351f70d96ce71d905aa284fbb9a1a7d173c2787cf6 +MD5 eeb5e4a987a1c46dfaf5d4c34b75ff82 ChangeLog 5468 +RMD160 0a0f359733d2c57bb0078ca021639c0d8eff5225 ChangeLog 5468 +SHA256 d56df47faf5aebb9433898351f70d96ce71d905aa284fbb9a1a7d173c2787cf6 ChangeLog 5468 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158 @@ -32,9 +32,9 @@ MD5 61c2b34c6164a561ef7cadd2c497f20a files/digest-flightgear-0.9.9 509 RMD160 20f948d2e182b2ff4b34cf26e7160af2fd996a98 files/digest-flightgear-0.9.9 509 SHA256 a9bd6e050708e80baa6a2d4323b1ca843c3a15be812248c85f023660b1d59faa files/digest-flightgear-0.9.9 509 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) +Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFNRvJkT4lNIS36YERAt9FAKCjWcPEHr6dnno7++EgxOGlzONlOQCfetYL -nZILpKReW6bKDdxeAIylPb0= -=ciRE +iD8DBQFFqCCDdz7hIScOURERAhPEAKDPY3QROOqfrAp8SNjGBOtptKK96wCdEhqD +qAoOjzEL+10ZUgXjdvN/Ixg= +=iLkg -----END PGP SIGNATURE----- diff --git a/games-simulation/flightgear/flightgear-0.9.10.ebuild b/games-simulation/flightgear/flightgear-0.9.10.ebuild index 678b0946f5ee..6f82ab9a0fbb 100644 --- a/games-simulation/flightgear/flightgear-0.9.10.ebuild +++ b/games-simulation/flightgear/flightgear-0.9.10.ebuild @@ -1,12 +1,11 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/flightgear-0.9.10.ebuild,v 1.2 2006/10/17 18:06:42 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/flightgear-0.9.10.ebuild,v 1.3 2007/01/12 23:57:50 nyhm Exp $ -inherit flag-o-matic games +inherit games MY_PN=FlightGear MY_P=${MY_PN}-${PV} -S="${WORKDIR}/${MY_P}" DESCRIPTION="Open Source Flight Simulator" HOMEPAGE="http://www.flightgear.org/" SRC_URI="mirror://flightgear/Source/${MY_P}.tar.gz @@ -15,37 +14,28 @@ SRC_URI="mirror://flightgear/Source/${MY_P}.tar.gz LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~sparc ~x86" -IUSE="" +IUSE="sdl" -RDEPEND="virtual/glut +DEPEND="virtual/glut ~dev-games/simgear-0.3.10 >=media-libs/plib-1.8.4 - media-libs/freealut" -DEPEND="${RDEPEND}" + media-libs/freealut + sdl? ( media-libs/libsdl )" -src_unpack() { - unpack ${A} - cd ${S} - mv ../data ./data -} +S=${WORKDIR}/${MY_P} src_compile() { - use hppa && replace-flags -march=2.0 -march=1.0 egamesconf \ - --with-multiplayer \ - --with-network-olk \ - --with-threads \ - --with-x || die + --disable-dependency-tracking \ + $(use_enable sdl) \ + || die emake -j1 || die "emake failed" } src_install() { - egamesinstall || die - - dodir "${GAMES_DATADIR}/${MY_PN}" - cp -pPR data/* "${D}/${GAMES_DATADIR}/${MY_PN}" || die "cp failed" - - dodoc README* ChangeLog AUTHORS NEWS Thanks - + emake DESTDIR="${D}" install || die "emake install failed" + insinto "${GAMES_DATADIR}"/${MY_PN} + doins -r ../data/* || die "doins failed" + dodoc AUTHORS ChangeLog NEWS README Thanks prepgamesdirs } -- 2.26.2