commit: 3949a11a140267c011df4b05edf35d44780823ea Author: Johannes Huber <johu <AT> gentoo <DOT> org> AuthorDate: Sun Oct 30 17:57:26 2016 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Sun Oct 30 17:57:26 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3949a11a
dev-util/cmake: Drop qt4 Package-Manager: portage-2.3.2 dev-util/cmake/cmake-2.8.12.2-r1.ebuild | 12 +++--------- dev-util/cmake/cmake-3.2.2.ebuild | 10 +++------- dev-util/cmake/cmake-3.3.1-r1.ebuild | 10 +++------- dev-util/cmake/cmake-3.5.2-r1.ebuild | 8 ++------ dev-util/cmake/cmake-3.6.2.ebuild | 8 ++------ dev-util/cmake/cmake-3.7.0_rc2.ebuild | 8 ++------ 6 files changed, 15 insertions(+), 41 deletions(-) diff --git a/dev-util/cmake/cmake-2.8.12.2-r1.ebuild b/dev-util/cmake/cmake-2.8.12.2-r1.ebuild index af20ec7..24d7780 100644 --- a/dev-util/cmake/cmake-2.8.12.2-r1.ebuild +++ b/dev-util/cmake/cmake-2.8.12.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -17,9 +17,7 @@ SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}. LICENSE="CMake" 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" SLOT="0" -IUSE="emacs ncurses qt4 qt5" - -REQUIRED_USE="?? ( qt4 qt5 )" +IUSE="emacs ncurses qt5" DEPEND=" >=app-arch/libarchive-2.8.0:= @@ -28,10 +26,6 @@ DEPEND=" sys-libs/zlib virtual/pkgconfig ncurses? ( sys-libs/ncurses:0= ) - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 @@ -154,7 +148,7 @@ src_configure() { $(cmake-utils_use_build ncurses CursesDialog) ) - if use qt4 || use qt5 ; then + if use qt5 ; then mycmakeargs+=( -DBUILD_QtDialog=ON $(cmake-utils_use_find_package qt5 Qt5Widgets) diff --git a/dev-util/cmake/cmake-3.2.2.ebuild b/dev-util/cmake/cmake-3.2.2.ebuild index 51c7679..33916d4 100644 --- a/dev-util/cmake/cmake-3.2.2.ebuild +++ b/dev-util/cmake/cmake-3.2.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -14,7 +14,7 @@ SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar LICENSE="CMake" SLOT="0" 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" -IUSE="doc emacs system-jsoncpp ncurses qt4 qt5" +IUSE="doc emacs system-jsoncpp ncurses qt5" RDEPEND=" >=app-arch/libarchive-3.0.0:= @@ -24,10 +24,6 @@ RDEPEND=" virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 @@ -141,7 +137,7 @@ src_configure() { $(cmake-utils_use_build ncurses CursesDialog) ) - if use qt4 || use qt5 ; then + if use qt5 ; then mycmakeargs+=( -DBUILD_QtDialog=ON $(cmake-utils_use_find_package qt5 Qt5Widgets) diff --git a/dev-util/cmake/cmake-3.3.1-r1.ebuild b/dev-util/cmake/cmake-3.3.1-r1.ebuild index 0f3a6c5..e3aeb00 100644 --- a/dev-util/cmake/cmake-3.3.1-r1.ebuild +++ b/dev-util/cmake/cmake-3.3.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -17,7 +17,7 @@ SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}. LICENSE="CMake" SLOT="0" 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" -IUSE="doc emacs system-jsoncpp ncurses qt4 qt5" +IUSE="doc emacs system-jsoncpp ncurses qt5" RDEPEND=" >=app-arch/libarchive-3.0.0:= @@ -27,10 +27,6 @@ RDEPEND=" virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 @@ -149,7 +145,7 @@ src_configure() { $(cmake-utils_use_build ncurses CursesDialog) ) - if use qt4 || use qt5 ; then + if use qt5 ; then mycmakeargs+=( -DBUILD_QtDialog=ON $(cmake-utils_use_find_package qt5 Qt5Widgets) diff --git a/dev-util/cmake/cmake-3.5.2-r1.ebuild b/dev-util/cmake/cmake-3.5.2-r1.ebuild index 5162c05..3974d8e 100644 --- a/dev-util/cmake/cmake-3.5.2-r1.ebuild +++ b/dev-util/cmake/cmake-3.5.2-r1.ebuild @@ -16,7 +16,7 @@ SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}. LICENSE="CMake" SLOT="0" 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" -IUSE="doc emacs system-jsoncpp ncurses qt4 qt5" +IUSE="doc emacs system-jsoncpp ncurses qt5" RDEPEND=" >=app-arch/libarchive-3.0.0:= @@ -26,10 +26,6 @@ RDEPEND=" virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 @@ -148,7 +144,7 @@ src_configure() { -DBUILD_CursesDialog="$(usex ncurses)" ) - if use qt4 || use qt5 ; then + if use qt5 ; then mycmakeargs+=( -DBUILD_QtDialog=ON $(cmake-utils_use_find_package qt5 Qt5Widgets) diff --git a/dev-util/cmake/cmake-3.6.2.ebuild b/dev-util/cmake/cmake-3.6.2.ebuild index 2e5926c..1e94166 100644 --- a/dev-util/cmake/cmake-3.6.2.ebuild +++ b/dev-util/cmake/cmake-3.6.2.ebuild @@ -16,7 +16,7 @@ SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}. LICENSE="CMake" SLOT="0" 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" -IUSE="doc emacs system-jsoncpp ncurses qt4 qt5" +IUSE="doc emacs system-jsoncpp ncurses qt5" RDEPEND=" >=app-arch/libarchive-3.0.0:= @@ -26,10 +26,6 @@ RDEPEND=" virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 @@ -149,7 +145,7 @@ src_configure() { -DBUILD_CursesDialog="$(usex ncurses)" ) - if use qt4 || use qt5 ; then + if use qt5 ; then mycmakeargs+=( -DBUILD_QtDialog=ON $(cmake-utils_use_find_package qt5 Qt5Widgets) diff --git a/dev-util/cmake/cmake-3.7.0_rc2.ebuild b/dev-util/cmake/cmake-3.7.0_rc2.ebuild index 1d69907..faf3193 100644 --- a/dev-util/cmake/cmake-3.7.0_rc2.ebuild +++ b/dev-util/cmake/cmake-3.7.0_rc2.ebuild @@ -17,7 +17,7 @@ LICENSE="CMake" SLOT="0" [[ "${PV}" = *_rc* ]] || \ 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" -IUSE="doc emacs system-jsoncpp ncurses qt4 qt5" +IUSE="doc emacs system-jsoncpp ncurses qt5" RDEPEND=" >=app-arch/libarchive-3.0.0:= @@ -27,10 +27,6 @@ RDEPEND=" virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 @@ -150,7 +146,7 @@ src_configure() { -DBUILD_CursesDialog="$(usex ncurses)" ) - if use qt4 || use qt5 ; then + if use qt5 ; then mycmakeargs+=( -DBUILD_QtDialog=ON $(cmake-utils_use_find_package qt5 Qt5Widgets)
