| 1 |
commit: f9919f0af99e9ececcea0e95391eb90cc36adb68 |
| 2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 20 02:04:59 2015 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 20 02:04:59 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=f9919f0a |
| 7 |
|
| 8 |
qt5-build.eclass: drop subslot from 5.5.x |
| 9 |
|
| 10 |
eclass/qt5-build.eclass | 12 ++++++++---- |
| 11 |
1 file changed, 8 insertions(+), 4 deletions(-) |
| 12 |
|
| 13 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
| 14 |
index 63c6617..0778918 100644 |
| 15 |
--- a/eclass/qt5-build.eclass |
| 16 |
+++ b/eclass/qt5-build.eclass |
| 17 |
@@ -23,12 +23,16 @@ inherit eutils flag-o-matic toolchain-funcs versionator virtualx |
| 18 |
HOMEPAGE="https://www.qt.io/" |
| 19 |
LICENSE="|| ( LGPL-2.1 LGPL-3 ) FDL-1.3" |
| 20 |
|
| 21 |
-# IMPORTANT: add a subslot dependency to your package only if you are sure |
| 22 |
-# that it uses some private Qt APIs (most likely it does not) |
| 23 |
-SLOT=5/$(get_version_component_range 1-2) |
| 24 |
- |
| 25 |
QT5_MINOR_VERSION=$(get_version_component_range 2) |
| 26 |
|
| 27 |
+if [[ ${QT5_MINOR_VERSION} -ge 6 ]]; then |
| 28 |
+ # IMPORTANT: add a subslot dependency to your package only if you are sure |
| 29 |
+ # that it uses some private Qt APIs (most likely it does not) |
| 30 |
+ SLOT=5/$(get_version_component_range 1-2) |
| 31 |
+else |
| 32 |
+ SLOT=5 |
| 33 |
+fi |
| 34 |
+ |
| 35 |
# @ECLASS-VARIABLE: QT5_MODULE |
| 36 |
# @DESCRIPTION: |
| 37 |
# The upstream name of the module this package belongs to. Used for |
Archives