diff options
| author |   Justin Bronder <jsbronder@gentoo.org> | 2014-10-24 15:14:07 +0000 |
|---|---|---|
| committer | Justin Bronder <jsbronder@gentoo.org> | 2014-10-24 15:14:07 +0000 |
| commit | 6ecd2c1eb66bc84804b0376beedacf2db16bcf6b (patch) | |
| tree | 57403b1c5c56a44eab06ff91c9af39748c0f3e1e /media-gfx | |
| parent | Version bump. Update bashrc example to fix bug #517782. (diff) | |
| download | gentoo-2-6ecd2c1eb66bc84804b0376beedacf2db16bcf6b.tar.gz gentoo-2-6ecd2c1eb66bc84804b0376beedacf2db16bcf6b.tar.bz2 gentoo-2-6ecd2c1eb66bc84804b0376beedacf2db16bcf6b.zip | |
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)
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/openmesh/ChangeLog | 5 | ||||
| -rw-r--r-- | media-gfx/openmesh/openmesh-3.2.ebuild | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/media-gfx/openmesh/ChangeLog b/media-gfx/openmesh/ChangeLog index a4bd2ff0c7c0..105f4f2abbe3 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.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 <jsbronder@gentoo.org> openmesh-3.2.ebuild: + Proper qt4 and app handling, #523124. Thanks to Alpha Bravo 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 diff --git a/media-gfx/openmesh/openmesh-3.2.ebuild b/media-gfx/openmesh/openmesh-3.2.ebuild index 7bc5f2ac441f..f674daf8a256 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.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_prepare() { 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 |