| 1 |
commit: 3949a11a140267c011df4b05edf35d44780823ea |
| 2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 30 17:57:26 2016 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 30 17:57:26 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3949a11a |
| 7 |
|
| 8 |
dev-util/cmake: Drop qt4 |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.2 |
| 11 |
|
| 12 |
dev-util/cmake/cmake-2.8.12.2-r1.ebuild | 12 +++--------- |
| 13 |
dev-util/cmake/cmake-3.2.2.ebuild | 10 +++------- |
| 14 |
dev-util/cmake/cmake-3.3.1-r1.ebuild | 10 +++------- |
| 15 |
dev-util/cmake/cmake-3.5.2-r1.ebuild | 8 ++------ |
| 16 |
dev-util/cmake/cmake-3.6.2.ebuild | 8 ++------ |
| 17 |
dev-util/cmake/cmake-3.7.0_rc2.ebuild | 8 ++------ |
| 18 |
6 files changed, 15 insertions(+), 41 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-util/cmake/cmake-2.8.12.2-r1.ebuild b/dev-util/cmake/cmake-2.8.12.2-r1.ebuild |
| 21 |
index af20ec7..24d7780 100644 |
| 22 |
--- a/dev-util/cmake/cmake-2.8.12.2-r1.ebuild |
| 23 |
+++ b/dev-util/cmake/cmake-2.8.12.2-r1.ebuild |
| 24 |
@@ -1,4 +1,4 @@ |
| 25 |
-# Copyright 1999-2015 Gentoo Foundation |
| 26 |
+# Copyright 1999-2016 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
# $Id$ |
| 29 |
|
| 30 |
@@ -17,9 +17,7 @@ SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}. |
| 31 |
LICENSE="CMake" |
| 32 |
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~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" |
| 33 |
SLOT="0" |
| 34 |
-IUSE="emacs ncurses qt4 qt5" |
| 35 |
- |
| 36 |
-REQUIRED_USE="?? ( qt4 qt5 )" |
| 37 |
+IUSE="emacs ncurses qt5" |
| 38 |
|
| 39 |
DEPEND=" |
| 40 |
>=app-arch/libarchive-2.8.0:= |
| 41 |
@@ -28,10 +26,6 @@ DEPEND=" |
| 42 |
sys-libs/zlib |
| 43 |
virtual/pkgconfig |
| 44 |
ncurses? ( sys-libs/ncurses:0= ) |
| 45 |
- qt4? ( |
| 46 |
- dev-qt/qtcore:4 |
| 47 |
- dev-qt/qtgui:4 |
| 48 |
- ) |
| 49 |
qt5? ( |
| 50 |
dev-qt/qtcore:5 |
| 51 |
dev-qt/qtgui:5 |
| 52 |
@@ -154,7 +148,7 @@ src_configure() { |
| 53 |
$(cmake-utils_use_build ncurses CursesDialog) |
| 54 |
) |
| 55 |
|
| 56 |
- if use qt4 || use qt5 ; then |
| 57 |
+ if use qt5 ; then |
| 58 |
mycmakeargs+=( |
| 59 |
-DBUILD_QtDialog=ON |
| 60 |
$(cmake-utils_use_find_package qt5 Qt5Widgets) |
| 61 |
|
| 62 |
diff --git a/dev-util/cmake/cmake-3.2.2.ebuild b/dev-util/cmake/cmake-3.2.2.ebuild |
| 63 |
index 51c7679..33916d4 100644 |
| 64 |
--- a/dev-util/cmake/cmake-3.2.2.ebuild |
| 65 |
+++ b/dev-util/cmake/cmake-3.2.2.ebuild |
| 66 |
@@ -1,4 +1,4 @@ |
| 67 |
-# Copyright 1999-2015 Gentoo Foundation |
| 68 |
+# Copyright 1999-2016 Gentoo Foundation |
| 69 |
# Distributed under the terms of the GNU General Public License v2 |
| 70 |
# $Id$ |
| 71 |
|
| 72 |
@@ -14,7 +14,7 @@ SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar |
| 73 |
LICENSE="CMake" |
| 74 |
SLOT="0" |
| 75 |
KEYWORDS="alpha amd64 arm ~arm64 hppa ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc 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" |
| 76 |
-IUSE="doc emacs system-jsoncpp ncurses qt4 qt5" |
| 77 |
+IUSE="doc emacs system-jsoncpp ncurses qt5" |
| 78 |
|
| 79 |
RDEPEND=" |
| 80 |
>=app-arch/libarchive-3.0.0:= |
| 81 |
@@ -24,10 +24,6 @@ RDEPEND=" |
| 82 |
virtual/pkgconfig |
| 83 |
emacs? ( virtual/emacs ) |
| 84 |
ncurses? ( sys-libs/ncurses:0= ) |
| 85 |
- qt4? ( |
| 86 |
- dev-qt/qtcore:4 |
| 87 |
- dev-qt/qtgui:4 |
| 88 |
- ) |
| 89 |
qt5? ( |
| 90 |
dev-qt/qtcore:5 |
| 91 |
dev-qt/qtgui:5 |
| 92 |
@@ -141,7 +137,7 @@ src_configure() { |
| 93 |
$(cmake-utils_use_build ncurses CursesDialog) |
| 94 |
) |
| 95 |
|
| 96 |
- if use qt4 || use qt5 ; then |
| 97 |
+ if use qt5 ; then |
| 98 |
mycmakeargs+=( |
| 99 |
-DBUILD_QtDialog=ON |
| 100 |
$(cmake-utils_use_find_package qt5 Qt5Widgets) |
| 101 |
|
| 102 |
diff --git a/dev-util/cmake/cmake-3.3.1-r1.ebuild b/dev-util/cmake/cmake-3.3.1-r1.ebuild |
| 103 |
index 0f3a6c5..e3aeb00 100644 |
| 104 |
--- a/dev-util/cmake/cmake-3.3.1-r1.ebuild |
| 105 |
+++ b/dev-util/cmake/cmake-3.3.1-r1.ebuild |
| 106 |
@@ -1,4 +1,4 @@ |
| 107 |
-# Copyright 1999-2015 Gentoo Foundation |
| 108 |
+# Copyright 1999-2016 Gentoo Foundation |
| 109 |
# Distributed under the terms of the GNU General Public License v2 |
| 110 |
# $Id$ |
| 111 |
|
| 112 |
@@ -17,7 +17,7 @@ SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}. |
| 113 |
LICENSE="CMake" |
| 114 |
SLOT="0" |
| 115 |
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc 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" |
| 116 |
-IUSE="doc emacs system-jsoncpp ncurses qt4 qt5" |
| 117 |
+IUSE="doc emacs system-jsoncpp ncurses qt5" |
| 118 |
|
| 119 |
RDEPEND=" |
| 120 |
>=app-arch/libarchive-3.0.0:= |
| 121 |
@@ -27,10 +27,6 @@ RDEPEND=" |
| 122 |
virtual/pkgconfig |
| 123 |
emacs? ( virtual/emacs ) |
| 124 |
ncurses? ( sys-libs/ncurses:0= ) |
| 125 |
- qt4? ( |
| 126 |
- dev-qt/qtcore:4 |
| 127 |
- dev-qt/qtgui:4 |
| 128 |
- ) |
| 129 |
qt5? ( |
| 130 |
dev-qt/qtcore:5 |
| 131 |
dev-qt/qtgui:5 |
| 132 |
@@ -149,7 +145,7 @@ src_configure() { |
| 133 |
$(cmake-utils_use_build ncurses CursesDialog) |
| 134 |
) |
| 135 |
|
| 136 |
- if use qt4 || use qt5 ; then |
| 137 |
+ if use qt5 ; then |
| 138 |
mycmakeargs+=( |
| 139 |
-DBUILD_QtDialog=ON |
| 140 |
$(cmake-utils_use_find_package qt5 Qt5Widgets) |
| 141 |
|
| 142 |
diff --git a/dev-util/cmake/cmake-3.5.2-r1.ebuild b/dev-util/cmake/cmake-3.5.2-r1.ebuild |
| 143 |
index 5162c05..3974d8e 100644 |
| 144 |
--- a/dev-util/cmake/cmake-3.5.2-r1.ebuild |
| 145 |
+++ b/dev-util/cmake/cmake-3.5.2-r1.ebuild |
| 146 |
@@ -16,7 +16,7 @@ SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}. |
| 147 |
LICENSE="CMake" |
| 148 |
SLOT="0" |
| 149 |
KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc 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" |
| 150 |
-IUSE="doc emacs system-jsoncpp ncurses qt4 qt5" |
| 151 |
+IUSE="doc emacs system-jsoncpp ncurses qt5" |
| 152 |
|
| 153 |
RDEPEND=" |
| 154 |
>=app-arch/libarchive-3.0.0:= |
| 155 |
@@ -26,10 +26,6 @@ RDEPEND=" |
| 156 |
virtual/pkgconfig |
| 157 |
emacs? ( virtual/emacs ) |
| 158 |
ncurses? ( sys-libs/ncurses:0= ) |
| 159 |
- qt4? ( |
| 160 |
- dev-qt/qtcore:4 |
| 161 |
- dev-qt/qtgui:4 |
| 162 |
- ) |
| 163 |
qt5? ( |
| 164 |
dev-qt/qtcore:5 |
| 165 |
dev-qt/qtgui:5 |
| 166 |
@@ -148,7 +144,7 @@ src_configure() { |
| 167 |
-DBUILD_CursesDialog="$(usex ncurses)" |
| 168 |
) |
| 169 |
|
| 170 |
- if use qt4 || use qt5 ; then |
| 171 |
+ if use qt5 ; then |
| 172 |
mycmakeargs+=( |
| 173 |
-DBUILD_QtDialog=ON |
| 174 |
$(cmake-utils_use_find_package qt5 Qt5Widgets) |
| 175 |
|
| 176 |
diff --git a/dev-util/cmake/cmake-3.6.2.ebuild b/dev-util/cmake/cmake-3.6.2.ebuild |
| 177 |
index 2e5926c..1e94166 100644 |
| 178 |
--- a/dev-util/cmake/cmake-3.6.2.ebuild |
| 179 |
+++ b/dev-util/cmake/cmake-3.6.2.ebuild |
| 180 |
@@ -16,7 +16,7 @@ SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}. |
| 181 |
LICENSE="CMake" |
| 182 |
SLOT="0" |
| 183 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~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" |
| 184 |
-IUSE="doc emacs system-jsoncpp ncurses qt4 qt5" |
| 185 |
+IUSE="doc emacs system-jsoncpp ncurses qt5" |
| 186 |
|
| 187 |
RDEPEND=" |
| 188 |
>=app-arch/libarchive-3.0.0:= |
| 189 |
@@ -26,10 +26,6 @@ RDEPEND=" |
| 190 |
virtual/pkgconfig |
| 191 |
emacs? ( virtual/emacs ) |
| 192 |
ncurses? ( sys-libs/ncurses:0= ) |
| 193 |
- qt4? ( |
| 194 |
- dev-qt/qtcore:4 |
| 195 |
- dev-qt/qtgui:4 |
| 196 |
- ) |
| 197 |
qt5? ( |
| 198 |
dev-qt/qtcore:5 |
| 199 |
dev-qt/qtgui:5 |
| 200 |
@@ -149,7 +145,7 @@ src_configure() { |
| 201 |
-DBUILD_CursesDialog="$(usex ncurses)" |
| 202 |
) |
| 203 |
|
| 204 |
- if use qt4 || use qt5 ; then |
| 205 |
+ if use qt5 ; then |
| 206 |
mycmakeargs+=( |
| 207 |
-DBUILD_QtDialog=ON |
| 208 |
$(cmake-utils_use_find_package qt5 Qt5Widgets) |
| 209 |
|
| 210 |
diff --git a/dev-util/cmake/cmake-3.7.0_rc2.ebuild b/dev-util/cmake/cmake-3.7.0_rc2.ebuild |
| 211 |
index 1d69907..faf3193 100644 |
| 212 |
--- a/dev-util/cmake/cmake-3.7.0_rc2.ebuild |
| 213 |
+++ b/dev-util/cmake/cmake-3.7.0_rc2.ebuild |
| 214 |
@@ -17,7 +17,7 @@ LICENSE="CMake" |
| 215 |
SLOT="0" |
| 216 |
[[ "${PV}" = *_rc* ]] || \ |
| 217 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~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" |
| 218 |
-IUSE="doc emacs system-jsoncpp ncurses qt4 qt5" |
| 219 |
+IUSE="doc emacs system-jsoncpp ncurses qt5" |
| 220 |
|
| 221 |
RDEPEND=" |
| 222 |
>=app-arch/libarchive-3.0.0:= |
| 223 |
@@ -27,10 +27,6 @@ RDEPEND=" |
| 224 |
virtual/pkgconfig |
| 225 |
emacs? ( virtual/emacs ) |
| 226 |
ncurses? ( sys-libs/ncurses:0= ) |
| 227 |
- qt4? ( |
| 228 |
- dev-qt/qtcore:4 |
| 229 |
- dev-qt/qtgui:4 |
| 230 |
- ) |
| 231 |
qt5? ( |
| 232 |
dev-qt/qtcore:5 |
| 233 |
dev-qt/qtgui:5 |
| 234 |
@@ -150,7 +146,7 @@ src_configure() { |
| 235 |
-DBUILD_CursesDialog="$(usex ncurses)" |
| 236 |
) |
| 237 |
|
| 238 |
- if use qt4 || use qt5 ; then |
| 239 |
+ if use qt5 ; then |
| 240 |
mycmakeargs+=( |
| 241 |
-DBUILD_QtDialog=ON |
| 242 |
$(cmake-utils_use_find_package qt5 Qt5Widgets) |
Archives