From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/
Date: Mon, 16 May 2022 08:12:35 +0000 (UTC) [thread overview]
Message-ID: <1652688729.217931310b7294ef26594cd205ccd98a7d22ddbf.soap@gentoo> (raw)
commit: 217931310b7294ef26594cd205ccd98a7d22ddbf
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon May 16 08:12:09 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon May 16 08:12:09 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21793131
games-simulation/flightgear: [QA] use tc-check-openmp correctly
Signed-off-by: David Seifert <soap <AT> gentoo.org>
games-simulation/flightgear/flightgear-2020.3.12.ebuild | 12 ++++++++----
games-simulation/flightgear/flightgear-2020.3.13.ebuild | 10 +++++++---
games-simulation/flightgear/flightgear-9999.ebuild | 12 ++++++++----
3 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/games-simulation/flightgear/flightgear-2020.3.12.ebuild b/games-simulation/flightgear/flightgear-2020.3.12.ebuild
index baafbbda8846..749751eb1080 100644
--- a/games-simulation/flightgear/flightgear-2020.3.12.ebuild
+++ b/games-simulation/flightgear/flightgear-2020.3.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -52,8 +52,7 @@ COMMON_DEPEND="
"
# libXi and libXmu are build-only-deps according to FindGLUT.cmake
DEPEND="${COMMON_DEPEND}
- >=dev-libs/boost-1.44
- qt5? ( >=dev-qt/linguist-tools-5.7.1:5 )
+ dev-libs/boost
utils? (
x11-libs/libXi
x11-libs/libXmu
@@ -62,6 +61,7 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
~games-simulation/${PN}-data-${PV}
"
+BDEPEND="qt5? ( >=dev-qt/linguist-tools-5.7.1:5 )"
PATCHES=(
"${FILESDIR}/${PN}-2020.3.8-cmake.patch"
@@ -70,7 +70,11 @@ PATCHES=(
DOCS=(AUTHORS ChangeLog NEWS README Thanks)
pkg_pretend() {
- use openmp && tc-check-openmp
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
src_configure() {
diff --git a/games-simulation/flightgear/flightgear-2020.3.13.ebuild b/games-simulation/flightgear/flightgear-2020.3.13.ebuild
index a71789169d16..49a222d30548 100644
--- a/games-simulation/flightgear/flightgear-2020.3.13.ebuild
+++ b/games-simulation/flightgear/flightgear-2020.3.13.ebuild
@@ -52,8 +52,7 @@ COMMON_DEPEND="
"
# libXi and libXmu are build-only-deps according to FindGLUT.cmake
DEPEND="${COMMON_DEPEND}
- >=dev-libs/boost-1.44
- qt5? ( >=dev-qt/linguist-tools-5.7.1:5 )
+ dev-libs/boost
utils? (
x11-libs/libXi
x11-libs/libXmu
@@ -62,6 +61,7 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
~games-simulation/${PN}-data-${PV}
"
+BDEPEND="qt5? ( >=dev-qt/linguist-tools-5.7.1:5 )"
PATCHES=(
"${FILESDIR}/${PN}-2020.3.8-cmake.patch"
@@ -70,7 +70,11 @@ PATCHES=(
DOCS=(AUTHORS ChangeLog NEWS README Thanks)
pkg_pretend() {
- use openmp && tc-check-openmp
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
src_configure() {
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild
index f48409f1c9d4..19115fd74b49 100644
--- a/games-simulation/flightgear/flightgear-9999.ebuild
+++ b/games-simulation/flightgear/flightgear-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -54,8 +54,7 @@ COMMON_DEPEND="
"
# libXi and libXmu are build-only-deps according to FindGLUT.cmake
DEPEND="${COMMON_DEPEND}
- >=dev-libs/boost-1.44
- qt5? ( >=dev-qt/linguist-tools-5.7.1:5 )
+ dev-libs/boost
utils? (
x11-libs/libXi
x11-libs/libXmu
@@ -64,6 +63,7 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
~games-simulation/${PN}-data-${PV}
"
+BDEPEND="qt5? ( >=dev-qt/linguist-tools-5.7.1:5 )"
PATCHES=(
"${FILESDIR}/${PN}-2020.3.5-cmake.patch"
@@ -72,7 +72,11 @@ PATCHES=(
DOCS=(AUTHORS ChangeLog NEWS README Thanks)
pkg_pretend() {
- use openmp && tc-check-openmp
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
src_configure() {
next reply other threads:[~2022-05-16 8:12 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-16 8:12 David Seifert [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-08-12 1:16 [gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/ Eli Schwartz
2024-08-12 1:16 Eli Schwartz
2024-06-04 1:50 Maciej Mrozowski
2023-07-27 19:42 Andreas Sturmlechner
2023-04-26 4:10 Sam James
2023-04-26 4:03 Sam James
2022-12-16 1:57 Sam James
2022-08-11 7:37 Ionen Wolkens
2022-05-13 19:49 Sam James
2021-04-24 22:03 David Seifert
2020-10-31 11:11 David Seifert
2020-10-06 19:33 Maciej Mrozowski
2020-08-04 20:09 Maciej Mrozowski
2020-02-06 1:13 Maciej Mrozowski
2020-02-01 1:02 Maciej Mrozowski
2020-01-24 18:52 David Seifert
2018-12-24 22:15 Lars Wendler
2018-05-22 23:54 Maciej Mrozowski
2017-03-04 17:09 Lars Wendler
2017-03-04 10:50 Lars Wendler
2017-03-04 10:50 Lars Wendler
2017-01-11 17:46 Lars Wendler
2017-01-11 16:17 Agostino Sarubbo
2016-12-29 18:07 Lars Wendler
2016-12-25 14:22 Lars Wendler
2016-12-20 19:16 Tobias Klausmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1652688729.217931310b7294ef26594cd205ccd98a7d22ddbf.soap@gentoo \
--to=soap@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox