commit: bf89015dc69df3f1a9e3392a9ab8231c27a7a1ce
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 1 22:32:56 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 3 16:00:36 2017 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=bf89015d
kde-plasma/oxygen: DEPEND on >=Qt-4.8.7, warn on <GCC-5
Gentoo-bug: 619006
Package-Manager: Portage-2.3.5, Repoman-2.3.1
kde-plasma/oxygen/oxygen-5.10.0.ebuild | 7 +++++++
kde-plasma/oxygen/oxygen-5.10.49.9999.ebuild | 7 +++++++
kde-plasma/oxygen/oxygen-5.8.49.9999.ebuild | 7 +++++++
kde-plasma/oxygen/oxygen-9999.ebuild | 7 +++++++
4 files changed, 28 insertions(+)
diff --git a/kde-plasma/oxygen/oxygen-5.10.0.ebuild
b/kde-plasma/oxygen/oxygen-5.10.0.ebuild
index 9278b31d04..322e8762a9 100644
--- a/kde-plasma/oxygen/oxygen-5.10.0.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.10.0.ebuild
@@ -29,6 +29,9 @@ COMMON_DEPEND="
$(add_qt_dep qtx11extras)
x11-libs/libxcb
qt4? (
+ >=dev-qt/qtcore-4.8.7-r2:4
+ >=dev-qt/qtdbus-4.8.7:4
+ >=dev-qt/qtgui-4.8.7:4
kde-frameworks/kdelibs:4
x11-libs/libX11
)
@@ -51,6 +54,10 @@ RDEPEND="${COMMON_DEPEND}
"
pkg_setup() {
+ if use qt4 && [[ $(gcc-major-version) -lt 5 ]] ; then
+ ewarn "A GCC version older than 5 was detected. There may be
trouble. See also Gentoo bug #595618"
+ fi
+
kde5_pkg_setup
MULTIBUILD_VARIANTS=( kf5 $(usev qt4) )
}
diff --git a/kde-plasma/oxygen/oxygen-5.10.49.9999.ebuild
b/kde-plasma/oxygen/oxygen-5.10.49.9999.ebuild
index 7ad84e860f..6b352f6d3d 100644
--- a/kde-plasma/oxygen/oxygen-5.10.49.9999.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.10.49.9999.ebuild
@@ -29,6 +29,9 @@ COMMON_DEPEND="
$(add_qt_dep qtx11extras)
x11-libs/libxcb
qt4? (
+ >=dev-qt/qtcore-4.8.7-r2:4
+ >=dev-qt/qtdbus-4.8.7:4
+ >=dev-qt/qtgui-4.8.7:4
kde-frameworks/kdelibs:4
x11-libs/libX11
)
@@ -51,6 +54,10 @@ RDEPEND="${COMMON_DEPEND}
"
pkg_setup() {
+ if use qt4 && [[ $(gcc-major-version) -lt 5 ]] ; then
+ ewarn "A GCC version older than 5 was detected. There may be
trouble. See also Gentoo bug #595618"
+ fi
+
kde5_pkg_setup
MULTIBUILD_VARIANTS=( kf5 $(usev qt4) )
}
diff --git a/kde-plasma/oxygen/oxygen-5.8.49.9999.ebuild
b/kde-plasma/oxygen/oxygen-5.8.49.9999.ebuild
index 17a976198f..8520f389bf 100644
--- a/kde-plasma/oxygen/oxygen-5.8.49.9999.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.8.49.9999.ebuild
@@ -28,6 +28,9 @@ COMMON_DEPEND="
$(add_qt_dep qtx11extras)
x11-libs/libxcb
qt4? (
+ >=dev-qt/qtcore-4.8.7-r2:4
+ >=dev-qt/qtdbus-4.8.7:4
+ >=dev-qt/qtgui-4.8.7:4
kde-frameworks/kdelibs:4
x11-libs/libX11
)
@@ -50,6 +53,10 @@ RDEPEND="${COMMON_DEPEND}
"
pkg_setup() {
+ if use qt4 && [[ $(gcc-major-version) -lt 5 ]] ; then
+ ewarn "A GCC version older than 5 was detected. There may be
trouble. See also Gentoo bug #595618"
+ fi
+
kde5_pkg_setup
MULTIBUILD_VARIANTS=( kf5 $(usev qt4) )
}
diff --git a/kde-plasma/oxygen/oxygen-9999.ebuild
b/kde-plasma/oxygen/oxygen-9999.ebuild
index 7ad84e860f..6b352f6d3d 100644
--- a/kde-plasma/oxygen/oxygen-9999.ebuild
+++ b/kde-plasma/oxygen/oxygen-9999.ebuild
@@ -29,6 +29,9 @@ COMMON_DEPEND="
$(add_qt_dep qtx11extras)
x11-libs/libxcb
qt4? (
+ >=dev-qt/qtcore-4.8.7-r2:4
+ >=dev-qt/qtdbus-4.8.7:4
+ >=dev-qt/qtgui-4.8.7:4
kde-frameworks/kdelibs:4
x11-libs/libX11
)
@@ -51,6 +54,10 @@ RDEPEND="${COMMON_DEPEND}
"
pkg_setup() {
+ if use qt4 && [[ $(gcc-major-version) -lt 5 ]] ; then
+ ewarn "A GCC version older than 5 was detected. There may be
trouble. See also Gentoo bug #595618"
+ fi
+
kde5_pkg_setup
MULTIBUILD_VARIANTS=( kf5 $(usev qt4) )
}