| 1 |
commit: 3c8208a14eadfce2aa0495ca48339d1e4bb8f64e |
| 2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 27 01:28:10 2017 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 27 01:28:10 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=3c8208a1 |
| 7 |
|
| 8 |
qt5-build.eclass: drop 5.6 support |
| 9 |
|
| 10 |
eclass/qt5-build.eclass | 35 +++++++---------------------------- |
| 11 |
1 file changed, 7 insertions(+), 28 deletions(-) |
| 12 |
|
| 13 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
| 14 |
index 11847bcf..f5ef89cc 100644 |
| 15 |
--- a/eclass/qt5-build.eclass |
| 16 |
+++ b/eclass/qt5-build.eclass |
| 17 |
@@ -50,19 +50,13 @@ esac |
| 18 |
inherit estack flag-o-matic ltprune toolchain-funcs versionator virtualx |
| 19 |
|
| 20 |
HOMEPAGE="https://www.qt.io/" |
| 21 |
+LICENSE="|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3" |
| 22 |
+SLOT=5/$(get_version_component_range 1-2) |
| 23 |
|
| 24 |
QT5_MINOR_VERSION=$(get_version_component_range 2) |
| 25 |
QT5_PATCH_VERSION=$(get_version_component_range 3) |
| 26 |
readonly QT5_MINOR_VERSION QT5_PATCH_VERSION |
| 27 |
|
| 28 |
-if [[ ${QT5_MINOR_VERSION} -ge 7 ]]; then |
| 29 |
- LICENSE="|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3" |
| 30 |
-else |
| 31 |
- LICENSE="|| ( LGPL-2.1 LGPL-3 ) FDL-1.3" |
| 32 |
-fi |
| 33 |
- |
| 34 |
-SLOT=5/$(get_version_component_range 1-2) |
| 35 |
- |
| 36 |
case ${PV} in |
| 37 |
5.9999) |
| 38 |
# git dev branch |
| 39 |
@@ -131,10 +125,7 @@ EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install sr |
| 40 |
# Unpacks the sources. |
| 41 |
qt5-build_src_unpack() { |
| 42 |
if tc-is-gcc; then |
| 43 |
- local min_gcc4_minor_version=5 |
| 44 |
- if [[ ${QT5_MINOR_VERSION} -ge 7 || ${PN} == qtwebengine ]]; then |
| 45 |
- min_gcc4_minor_version=7 |
| 46 |
- fi |
| 47 |
+ local min_gcc4_minor_version=7 |
| 48 |
if [[ $(gcc-major-version) -lt 4 ]] || \ |
| 49 |
[[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt ${min_gcc4_minor_version} ]]; then |
| 50 |
eerror "GCC version 4.${min_gcc4_minor_version} or later is required to build this package" |
| 51 |
@@ -268,21 +259,9 @@ qt5-build_src_install() { |
| 52 |
if [[ ${PN} == qtcore ]]; then |
| 53 |
pushd "${QT5_BUILD_DIR}" >/dev/null || die |
| 54 |
|
| 55 |
- local qmake_install_target=install_qmake |
| 56 |
- if [[ ${QT5_MINOR_VERSION} -ge 7 ]]; then |
| 57 |
- # qmake/qmake-aux.pro |
| 58 |
- qmake_install_target=sub-qmake-qmake-aux-pro-install_subtargets |
| 59 |
- fi |
| 60 |
- |
| 61 |
- local global_docs_install_target= |
| 62 |
- if [[ ${QT5_MINOR_VERSION} -le 6 && ${QT5_PATCH_VERSION} -le 2 ]]; then |
| 63 |
- global_docs_install_target=install_global_docs |
| 64 |
- fi |
| 65 |
- |
| 66 |
set -- emake INSTALL_ROOT="${D}" \ |
| 67 |
- ${qmake_install_target} \ |
| 68 |
- install_{syncqt,mkspecs} \ |
| 69 |
- ${global_docs_install_target} |
| 70 |
+ sub-qmake-qmake-aux-pro-install_subtargets \ |
| 71 |
+ install_{syncqt,mkspecs} |
| 72 |
|
| 73 |
einfo "Running $*" |
| 74 |
"$@" |
| 75 |
@@ -585,7 +564,7 @@ qt5_base_configure() { |
| 76 |
# prefer system libraries (only common hard deps here) |
| 77 |
-system-zlib |
| 78 |
-system-pcre |
| 79 |
- $([[ ${QT5_MINOR_VERSION} -ge 7 ]] && echo -system-doubleconversion) |
| 80 |
+ -system-doubleconversion |
| 81 |
|
| 82 |
# disable everything to prevent automagic deps (part 1) |
| 83 |
-no-mtdev |
| 84 |
@@ -603,7 +582,7 @@ qt5_base_configure() { |
| 85 |
-glib |
| 86 |
|
| 87 |
# disable everything to prevent automagic deps (part 2) |
| 88 |
- $([[ ${QT5_MINOR_VERSION} -ge 7 ]] && echo -no-gtk || echo -no-gtkstyle) |
| 89 |
+ -no-gtk |
| 90 |
$([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -no-pulseaudio -no-alsa) |
| 91 |
|
| 92 |
# exclude examples and tests from default build |
Archives