diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2017-08-30 20:08:52 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2017-09-05 15:36:47 +0200 |
| commit | d4f6c986c9e495330017eff12b6d62988369386a (patch) | |
| tree | 4893c5063937afb5c32716e5638fdd4f9920c0ca /eclass | |
| parent | kde-frameworks/extra-cmake-modules: Tarball respun (diff) | |
| download | kde-d4f6c986c9e495330017eff12b6d62988369386a.tar.gz kde-d4f6c986c9e495330017eff12b6d62988369386a.tar.bz2 kde-d4f6c986c9e495330017eff12b6d62988369386a.zip | |
kde4*.eclass: Drop USE=aqua
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde4-base.eclass | 12 | ||||
| -rw-r--r-- | eclass/kde4-functions.eclass | 14 |
2 files changed, 12 insertions, 14 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 |