From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id F09031381F3 for ; Thu, 15 Nov 2012 15:00:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 532BC21C036; Thu, 15 Nov 2012 15:00:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B2B3121C036 for ; Thu, 15 Nov 2012 15:00:27 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DC29A33DC2A for ; Thu, 15 Nov 2012 15:00:25 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 43DC5E5436 for ; Thu, 15 Nov 2012 15:00:06 +0000 (UTC) From: "Christian Schmitt" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Christian Schmitt" Message-ID: <1352991552.bfe4afccf372c3a1fe8cfef73c85bd75aa059e53.christian@gentoo> Subject: [gentoo-commits] proj/gamerlay:master commit in: games-simulation/flightgear/ X-VCS-Repository: proj/gamerlay X-VCS-Files: games-simulation/flightgear/flightgear-9999.ebuild games-simulation/flightgear/metadata.xml X-VCS-Directories: games-simulation/flightgear/ X-VCS-Committer: christian X-VCS-Committer-Name: Christian Schmitt X-VCS-Revision: bfe4afccf372c3a1fe8cfef73c85bd75aa059e53 X-VCS-Branch: master Date: Thu, 15 Nov 2012 15:00:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: dac9da59-5818-42df-b0b9-f3d6fe0d2768 X-Archives-Hash: 3b422139f63a6746336c39c7c2114caf commit: bfe4afccf372c3a1fe8cfef73c85bd75aa059e53 Author: Christian Schmitt ilovelinux de> AuthorDate: Thu Nov 15 13:13:33 2012 +0000 Commit: Christian Schmitt ilovelinux de> CommitDate: Thu Nov 15 14:59:12 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=bfe4afcc [games-simulation/flightgear] Sync with portage. Enable fgpanel --- games-simulation/flightgear/flightgear-9999.ebuild | 39 ++++++++++---------- games-simulation/flightgear/metadata.xml | 4 +- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild index 1f04cca..eaaef4c 100644 --- a/games-simulation/flightgear/flightgear-9999.ebuild +++ b/games-simulation/flightgear/flightgear-9999.ebuild @@ -17,7 +17,7 @@ EGIT_REPO_URI="git://gitorious.org/fg/flightgear.git LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="debug +jsbsim larcsim +subversion test uiuc +yasim" +IUSE="debug fgpanel +jsbsim oldfdm +subversion test +yasim" COMMON_DEPEND=" dev-db/sqlite:3 @@ -32,6 +32,10 @@ DEPEND="${COMMON_DEPEND} >=dev-libs/boost-1.37 media-libs/openal >=media-libs/plib-1.8.5 + fgpanel? ( + media-libs/freeglut + media-libs/libpng + ) subversion? ( dev-libs/apr dev-vcs/subversion @@ -43,24 +47,21 @@ RDEPEND="${COMMON_DEPEND}" DOCS=(AUTHORS ChangeLog NEWS README Thanks) src_configure() { - if use uiuc || use larcsim; then - mycmakeargs=(-DENABLE_LARCSIM=ON -DENABLE_UIUC_MODEL=ON) - else - mycmakeargs=(-DENABLE_LARCSIM=OFF -DENABLE_UIUC_MODEL=OFF) - fi - - mycmakeargs+=( - -DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX} - -DFG_DATA_DIR="${GAMES_DATADIR}"/${PN}-live - -DENABLE_FGADMIN=OFF - -DENABLE_RTI=OFF - -DSIMGEAR_SHARED=ON - -DSYSTEM_SQLITE=ON - -DWITH_FGPANEL=OFF - $(cmake-utils_use_enable jsbsim) - $(cmake-utils_use_enable subversion LIBSVN) - $(cmake-utils_use_enable test TESTS) - $(cmake-utils_use_enable yasim) + local mycmakeargs=( + -DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX} + -DFG_DATA_DIR="${GAMES_DATADIR}"/${PN}-live + -DENABLE_FGADMIN=OFF + -DENABLE_PROFILE=OFF + -DENABLE_RTI=OFF + -DSIMGEAR_SHARED=ON + -DSYSTEM_SQLITE=ON + $(cmake-utils_use_with fgpanel) + $(cmake-utils_use_enable jsbsim) + $(cmake-utils_use_enable oldfdm LARCSIM) + $(cmake-utils_use_enable oldfdm UIUC_MODEL) + $(cmake-utils_use_enable subversion LIBSVN) + $(cmake-utils_use_enable test TESTS) + $(cmake-utils_use_enable yasim) ) cmake-utils_src_configure diff --git a/games-simulation/flightgear/metadata.xml b/games-simulation/flightgear/metadata.xml index bd524f5..05de519 100644 --- a/games-simulation/flightgear/metadata.xml +++ b/games-simulation/flightgear/metadata.xml @@ -3,10 +3,10 @@ games + Enable the standalone panel utility Enable the JSBSim flight dynamics model - Enable the LaRCsim flight dynamics model + Enable the UIUC/LaRCsim flight dynamics model Enable Flightgear's Terrasync to link against libsvn - Enable the UIUC flight dynamics model Enable the YASim flight dynamics model