diff options
| author |   Justin Bronder <jsbronder@gentoo.org> | 2014-10-23 20:35:12 +0000 |
|---|---|---|
| committer | Justin Bronder <jsbronder@gentoo.org> | 2014-10-23 20:35:12 +0000 |
| commit | 90de9c9fe91baa173a79a4e54418579b9d97f6bc (patch) | |
| tree | 49c1038835550851b7e2a09efd02205c999888a3 /media-gfx/openmesh | |
| parent | Remove old. (diff) | |
| download | gentoo-2-90de9c9fe91baa173a79a4e54418579b9d97f6bc.tar.gz gentoo-2-90de9c9fe91baa173a79a4e54418579b9d97f6bc.tar.bz2 gentoo-2-90de9c9fe91baa173a79a4e54418579b9d97f6bc.zip | |
Prefer qt5 but force qt4 if only the qt4 USE flag is set. #523124
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4D7043C9)
Diffstat (limited to 'media-gfx/openmesh')
| -rw-r--r-- | media-gfx/openmesh/ChangeLog | 5 | ||||
| -rw-r--r-- | media-gfx/openmesh/openmesh-3.2.ebuild | 25 |
2 files changed, 23 insertions, 7 deletions
diff --git a/media-gfx/openmesh/ChangeLog b/media-gfx/openmesh/ChangeLog index 13a6caadd448..a4bd2ff0c7c0 100644 --- a/media-gfx/openmesh/ChangeLog +++ b/media-gfx/openmesh/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-gfx/openmesh # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/openmesh/ChangeLog,v 1.32 2014/08/25 23:14:55 jsbronder Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/openmesh/ChangeLog,v 1.33 2014/10/23 20:35:12 jsbronder Exp $ + + 23 Oct 2014; Justin Bronder <jsbronder@gentoo.org> openmesh-3.2.ebuild: + Prefer qt5 but force qt4 if only the qt4 USE flag is set. #523124 *openmesh-3.2 (25 Aug 2014) diff --git a/media-gfx/openmesh/openmesh-3.2.ebuild b/media-gfx/openmesh/openmesh-3.2.ebuild index 80ed0731fab2..7bc5f2ac441f 100644 --- a/media-gfx/openmesh/openmesh-3.2.ebuild +++ b/media-gfx/openmesh/openmesh-3.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/openmesh/openmesh-3.2.ebuild,v 1.1 2014/08/25 23:14:55 jsbronder Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/openmesh/openmesh-3.2.ebuild,v 1.2 2014/10/23 20:35:12 jsbronder Exp $ EAPI="5" inherit eutils cmake-utils @@ -16,11 +16,15 @@ SRC_URI="http://openmesh.org/media/Releases/${MY_PV/-RC/RC}/${MY_PN}-${MY_PV}.ta LICENSE="LGPL-3-with-linking-exception" SLOT="0" KEYWORDS="~amd64 ~ia64 ~x86" -IUSE="qt4 static-libs" +IUSE="qt4 qt5 static-libs" -RDEPEND="qt4? ( dev-qt/qtgui:4 - dev-qt/qtopengl:4 - media-libs/freeglut )" +RDEPEND=" + qt4? ( dev-qt/qtgui:4 + dev-qt/qtopengl:4 + media-libs/freeglut ) + qt5? ( dev-qt/qtgui:5 + dev-qt/qtopengl:5 + media-libs/freeglut )" DEPEND="${RDEPEND}" src_prepare() { @@ -42,7 +46,16 @@ src_prepare() { } src_configure() { - mycmakeargs="$(cmake-utils_use_build "qt4" "APPS")" + mycmakeargs="" + + if use qt4 || use qt5; then + mycmakeargs="${mycmakeargs} -DBUILD_APPS=ON" + fi + + if use qt4 && ! use qt5; then + mycmakeargs="${mycmakeargs} -DFORCE_QT4" + fi + cmake-utils_src_configure } |