commit: d4f6c986c9e495330017eff12b6d62988369386a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 30 18:08:52 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 5 13:36:47 2017 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=d4f6c986
kde4*.eclass: Drop USE=aqua
eclass/kde4-base.eclass | 12 ++----------
eclass/kde4-functions.eclass | 14 ++++++++++----
kde-apps/kopete/kopete-17.08.49.9999.ebuild | 8 +++-----
3 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 1a5a4e0c79..ec1082c835 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -392,10 +392,8 @@ unset kdelibsuse
kdedepend="
dev-util/automoc
virtual/pkgconfig
- !aqua? (
- >=x11-libs/libXtst-1.1.0
- x11-proto/xf86vidmodeproto
- )
+ >=x11-libs/libXtst-1.1.0
+ x11-proto/xf86vidmodeproto
"
kderdepend=""
@@ -448,12 +446,6 @@ case ${KDE_SELINUX_MODULE} in
;;
esac
-# We always need the aqua useflag because otherwise we cannot = refer to it
inside
-# add_kdebase_dep. This was always kind of a bug, but came to light with EAPI=5
-# (where referring to a use flag not in IUSE masks the ebuild).
-# The only alternative would be to prohibit using add_kdebase_dep if
KDE_REQUIRED=never
-IUSE+=" aqua"
-
case ${KDE_REQUIRED} in
always)
[[ -n ${kdecommondepend} ]] && COMMONDEPEND+="
${kdecommondepend}"
diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index 7f3230d4d2..558191db5e 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -296,6 +296,10 @@ add_kdeapps_dep() {
local ver
+ if [[ -n ${2} ]] ; then
+ local use="[${2}]"
+ fi
+
if [[ -n ${3} ]]; then
ver=${3}
elif [[ -n ${KDE_OVERRIDE_MINIMAL} ]]; then
@@ -313,9 +317,7 @@ add_kdeapps_dep() {
[[ -z ${1} ]] && die "Missing parameter"
- #FIXME
- # Drop aqua= from kf5 packages
- echo " >=kde-apps/${1}-${ver}:4[aqua=${2:+,${2}}]"
+ echo " >=kde-apps/${1}-${ver}:4${use}"
}
# @FUNCTION: add_kdebase_dep
@@ -332,6 +334,10 @@ add_kdebase_dep() {
local ver
+ if [[ -n ${2} ]] ; then
+ local use="[${2}]"
+ fi
+
if [[ -n ${3} ]]; then
ver=${3}
elif [[ -n ${KDE_OVERRIDE_MINIMAL} ]]; then
@@ -351,7 +357,7 @@ add_kdebase_dep() {
[[ -z ${1} ]] && die "Missing parameter"
- echo " >=kde-base/${1}-${ver}:4[aqua=${2:+,${2}}]"
+ echo " >=kde-base/${1}-${ver}:4${use}"
}
# local function to enable specified translations for specified directory
diff --git a/kde-apps/kopete/kopete-17.08.49.9999.ebuild
b/kde-apps/kopete/kopete-17.08.49.9999.ebuild
index df6a667b47..1251a9c1c4 100644
--- a/kde-apps/kopete/kopete-17.08.49.9999.ebuild
+++ b/kde-apps/kopete/kopete-17.08.49.9999.ebuild
@@ -71,10 +71,8 @@ COMMONDEPEND="
kde-frameworks/kdelibs:4[zeroconf?]
media-libs/phonon[qt4]
media-libs/qimageblitz[-qt5(-)]
- !aqua? (
- x11-libs/libX11
- x11-libs/libXScrnSaver
- )
+ x11-libs/libX11
+ x11-libs/libXScrnSaver
cryptography? (
|| (
$(add_kdeapps_dep kdepim-common-libs)
@@ -117,8 +115,8 @@ RDEPEND="${COMMONDEPEND}
winpopup? ( net-fs/samba )
"
DEPEND="${COMMONDEPEND}
+ x11-proto/scrnsaverproto
jingle? ( dev-libs/jsoncpp )
- !aqua? ( x11-proto/scrnsaverproto )
"
PATCHES=( "${FILESDIR}/${PN}-17.04.0-kde4qgpgme.patch" )
