summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2015-05-28 19:23:13 +0000
committerMichael Palimaka <kensington@gentoo.org>2015-05-28 19:23:13 +0000
commit890d2fe713843521b7dcdfeb388ebd6e64eec03e (patch)
tree14a595e3682c4b7f66dc28849194aeb9dbd79068 /dev-util
parentVersion bump, bug #549474 (diff)
downloadgentoo-2-890d2fe713843521b7dcdfeb388ebd6e64eec03e.tar.gz
gentoo-2-890d2fe713843521b7dcdfeb388ebd6e64eec03e.tar.bz2
gentoo-2-890d2fe713843521b7dcdfeb388ebd6e64eec03e.zip
Remove REQUIRED_USE to improve user experience when both qt4 and qt5 USE flags are enabled (in this case, qt5 will be preferred).
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/cmake/ChangeLog6
-rw-r--r--dev-util/cmake/cmake-3.2.2.ebuild4
2 files changed, 6 insertions, 4 deletions
diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index 3fd3a03c421e..58c198e46eb2 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-util/cmake
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.307 2015/05/28 19:08:02 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.308 2015/05/28 19:23:13 kensington Exp $
+
+ 28 May 2015; Michael Palimaka <kensington@gentoo.org> cmake-3.2.2.ebuild:
+ Remove REQUIRED_USE to improve user experience when both qt4 and qt5 USE flags
+ are enabled (in this case, qt5 will be preferred).
28 May 2015; Michael Palimaka <kensington@gentoo.org> cmake-3.2.1.ebuild,
cmake-3.2.2.ebuild, metadata.xml:
diff --git a/dev-util/cmake/cmake-3.2.2.ebuild b/dev-util/cmake/cmake-3.2.2.ebuild
index fa47be1c71a8..6313c610ef2b 100644
--- a/dev-util/cmake/cmake-3.2.2.ebuild
+++ b/dev-util/cmake/cmake-3.2.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-3.2.2.ebuild,v 1.3 2015/05/28 19:08:02 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-3.2.2.ebuild,v 1.4 2015/05/28 19:23:13 kensington Exp $
EAPI=5
@@ -16,8 +16,6 @@ SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~mips ~s390 ~sh ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc emacs system-jsoncpp ncurses qt4 qt5"
-REQUIRED_USE="?? ( qt4 qt5 )"
-
RDEPEND="
>=app-arch/libarchive-2.8.0:=
>=dev-libs/expat-2.0.1