jsbronder 14/10/24 15:14:07 Modified: ChangeLog openmesh-3.2.ebuild Log: Proper qt4 and app handling, #523124. Thanks to Alpha Bravo (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4D7043C9)
Revision Changes Path 1.34 media-gfx/openmesh/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/openmesh/ChangeLog?rev=1.34&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/openmesh/ChangeLog?rev=1.34&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/openmesh/ChangeLog?r1=1.33&r2=1.34 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-gfx/openmesh/ChangeLog,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- ChangeLog 23 Oct 2014 20:35:12 -0000 1.33 +++ ChangeLog 24 Oct 2014 15:14:07 -0000 1.34 @@ -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.33 2014/10/23 20:35:12 jsbronder Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/openmesh/ChangeLog,v 1.34 2014/10/24 15:14:07 jsbronder Exp $ + + 24 Oct 2014; Justin Bronder <jsbron...@gentoo.org> openmesh-3.2.ebuild: + Proper qt4 and app handling, #523124. Thanks to Alpha Bravo 23 Oct 2014; Justin Bronder <jsbron...@gentoo.org> openmesh-3.2.ebuild: Prefer qt5 but force qt4 if only the qt4 USE flag is set. #523124 1.3 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.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/openmesh/openmesh-3.2.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/openmesh/openmesh-3.2.ebuild?r1=1.2&r2=1.3 Index: openmesh-3.2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-gfx/openmesh/openmesh-3.2.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- openmesh-3.2.ebuild 23 Oct 2014 20:35:12 -0000 1.2 +++ openmesh-3.2.ebuild 24 Oct 2014 15:14:07 -0000 1.3 @@ -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.2 2014/10/23 20:35:12 jsbronder Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/openmesh/openmesh-3.2.ebuild,v 1.3 2014/10/24 15:14:07 jsbronder Exp $ EAPI="5" inherit eutils cmake-utils @@ -48,12 +48,12 @@ src_configure() { mycmakeargs="" - if use qt4 || use qt5; then - mycmakeargs="${mycmakeargs} -DBUILD_APPS=ON" + if ! use qt4 && ! use qt5; then + mycmakeargs="${mycmakeargs} -DBUILD_APPS=OFF" fi if use qt4 && ! use qt5; then - mycmakeargs="${mycmakeargs} -DFORCE_QT4" + mycmakeargs="${mycmakeargs} -DFORCE_QT4=ON" fi cmake-utils_src_configure
