jsbronder 14/10/23 20:35:12 Modified: openmesh-3.2.ebuild ChangeLog Log: 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)
Revision Changes Path 1.2 media-gfx/openmesh/openmesh-3.2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/openmesh/openmesh-3.2.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/openmesh/openmesh-3.2.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/openmesh/openmesh-3.2.ebuild?r1=1.1&r2=1.2 Index: openmesh-3.2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-gfx/openmesh/openmesh-3.2.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openmesh-3.2.ebuild 25 Aug 2014 23:14:55 -0000 1.1 +++ openmesh-3.2.ebuild 23 Oct 2014 20:35:12 -0000 1.2 @@ -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 @@ 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_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 } 1.33 media-gfx/openmesh/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/openmesh/ChangeLog?rev=1.33&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/openmesh/ChangeLog?rev=1.33&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/openmesh/ChangeLog?r1=1.32&r2=1.33 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-gfx/openmesh/ChangeLog,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- ChangeLog 25 Aug 2014 23:14:55 -0000 1.32 +++ ChangeLog 23 Oct 2014 20:35:12 -0000 1.33 @@ -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 <[email protected]> openmesh-3.2.ebuild: + Prefer qt5 but force qt4 if only the qt4 USE flag is set. #523124 *openmesh-3.2 (25 Aug 2014)
