| 1 |
commit: 01a2bac11f11a4991307fe195323fb0f266e093f |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Sep 8 17:52:12 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Sep 8 17:55:50 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=01a2bac1 |
| 7 |
|
| 8 |
kde-apps/mailcommon: Add subslot operator on qtwidgets |
| 9 |
|
| 10 |
Upstream commit e93fe44f8e2e571fc1f7579d8e4335ec44c027b9 |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.75, Repoman-2.3.17 |
| 13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 14 |
|
| 15 |
kde-apps/mailcommon/mailcommon-19.08.49.9999.ebuild | 3 ++- |
| 16 |
kde-apps/mailcommon/mailcommon-9999.ebuild | 5 +++-- |
| 17 |
2 files changed, 5 insertions(+), 3 deletions(-) |
| 18 |
|
| 19 |
diff --git a/kde-apps/mailcommon/mailcommon-19.08.49.9999.ebuild b/kde-apps/mailcommon/mailcommon-19.08.49.9999.ebuild |
| 20 |
index 97003cfdf9..a5f7e73072 100644 |
| 21 |
--- a/kde-apps/mailcommon/mailcommon-19.08.49.9999.ebuild |
| 22 |
+++ b/kde-apps/mailcommon/mailcommon-19.08.49.9999.ebuild |
| 23 |
@@ -13,6 +13,7 @@ LICENSE="GPL-2+ LGPL-2.1+" |
| 24 |
KEYWORDS="" |
| 25 |
IUSE="" |
| 26 |
|
| 27 |
+# drop qtwidgets subslot operator when QT_MINIMAL >= 5.14.0 |
| 28 |
BDEPEND=" |
| 29 |
dev-libs/libxslt |
| 30 |
" |
| 31 |
@@ -47,7 +48,7 @@ DEPEND=" |
| 32 |
$(add_qt_dep qtdbus) |
| 33 |
$(add_qt_dep qtgui) |
| 34 |
$(add_qt_dep qtmultimedia) |
| 35 |
- $(add_qt_dep qtwidgets) |
| 36 |
+ $(add_qt_dep qtwidgets '' '' '5=') |
| 37 |
$(add_qt_dep qtxml) |
| 38 |
media-libs/phonon[qt5(+)] |
| 39 |
" |
| 40 |
|
| 41 |
diff --git a/kde-apps/mailcommon/mailcommon-9999.ebuild b/kde-apps/mailcommon/mailcommon-9999.ebuild |
| 42 |
index 0b40814b55..27891f3004 100644 |
| 43 |
--- a/kde-apps/mailcommon/mailcommon-9999.ebuild |
| 44 |
+++ b/kde-apps/mailcommon/mailcommon-9999.ebuild |
| 45 |
@@ -13,6 +13,7 @@ LICENSE="GPL-2+ LGPL-2.1+" |
| 46 |
KEYWORDS="" |
| 47 |
IUSE="" |
| 48 |
|
| 49 |
+# drop qtwidgets subslot operator when QT_MINIMAL >= 5.14.0 |
| 50 |
BDEPEND=" |
| 51 |
dev-libs/libxslt |
| 52 |
" |
| 53 |
@@ -47,9 +48,9 @@ DEPEND=" |
| 54 |
$(add_qt_dep qtdbus) |
| 55 |
$(add_qt_dep qtgui) |
| 56 |
$(add_qt_dep qtmultimedia) |
| 57 |
- $(add_qt_dep qtwidgets) |
| 58 |
+ $(add_qt_dep qtwidgets '' '' '5=') |
| 59 |
$(add_qt_dep qtxml) |
| 60 |
- >=media-libs/phonon-4.10.90[qt5(+)] |
| 61 |
+ >=media-libs/phonon-4.10.90 |
| 62 |
" |
| 63 |
RDEPEND="${DEPEND} |
| 64 |
!kde-apps/kdepim-l10n |
Archives