kde4*.eclass: Drop USE=aqua

diff --git a/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild b/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild
index d37a099bf4a6c410b7b4042d1d8063046154f190..a49456b792d0f066def314c63593561bb7fd8ef0 100644 (file)
--- a/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild
+++ b/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild
@@ -28,7 +28,7 @@ DEPEND="
        declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,webkit?,${MULTILIB_USEDEP}] )
        multimedia? ( ~dev-qt/qtmultimedia-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
        opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-       phonon? ( media-libs/phonon[aqua=,qt4] )
+       phonon? ( media-libs/phonon[qt4] )
        webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
        xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
 "

diff --git a/dev-qt/qtdemo/qtdemo-4.8.7.ebuild b/dev-qt/qtdemo/qtdemo-4.8.7.ebuild
index 58b778819e4ce86dc48d215f5343eceb9aac7a4d..e8c4d393d6e138e95e8a618db32f60cb11011886 100644 (file)
--- a/dev-qt/qtdemo/qtdemo-4.8.7.ebuild
+++ b/dev-qt/qtdemo/qtdemo-4.8.7.ebuild
@@ -25,7 +25,7 @@ DEPEND="
        declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,webkit?,${MULTILIB_USEDEP}] )
        multimedia? ( ~dev-qt/qtmultimedia-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
        opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-       phonon? ( >=media-libs/phonon-4.8.3-r1[aqua=,qt4,${MULTILIB_USEDEP}] )
+       phonon? ( >=media-libs/phonon-4.8.3-r1[qt4,${MULTILIB_USEDEP}] )
        webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
        xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
 "

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index a7a2301317c22647b265c2d2d5cbeb3506bf00bf..07b188d044f07476e69e2957e7d3341826b138c2 100644 (file)
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -384,10 +384,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=""
@@ -440,12 +438,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 fc37db293c07132e1bf5c742749adf266b9ea77b..4fdd299948d26464a1cc262bdf25011b8caae552 100644 (file)
--- 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/kdebase-kioslaves/kdebase-kioslaves-16.04.3-r2.ebuild b/kde-apps/kdebase-kioslaves/kdebase-kioslaves-16.04.3-r2.ebuild
index 77ce31dd66b1510a02c49c1941d375f8f7a6dee1..88a155725b6bc7071a0a8b2595f91a17b436f029 100644 (file)
--- a/kde-apps/kdebase-kioslaves/kdebase-kioslaves-16.04.3-r2.ebuild
+++ b/kde-apps/kdebase-kioslaves/kdebase-kioslaves-16.04.3-r2.ebuild
@@ -18,7 +18,7 @@ RESTRICT="test"
 
 DEPEND="
        virtual/jpeg:0
-       !aqua? ( x11-libs/libXcursor )
+       x11-libs/libXcursor
        bzip2? ( app-arch/bzip2 )
        exif? ( media-gfx/exiv2:= )
        openexr? ( media-libs/openexr:= )
@@ -29,7 +29,7 @@ RDEPEND="${DEPEND}
        kde-apps/kdialog:*
        kde-frameworks/kdelibs:4[bzip2?,lzma?]
        virtual/ssh
-       !aqua? ( !kernel_SunOS? ( virtual/eject ) )
+       !kernel_SunOS? ( virtual/eject )
 "
 
 KMEXTRA="

diff --git a/kde-apps/konsolepart/konsolepart-4.14.3.ebuild b/kde-apps/konsolepart/konsolepart-4.14.3.ebuild
index b44fb70b00b50600125bbcd715e66a3880f63880..5e62afdfe679236ec78b21ea53029e4d1786fb14 100644 (file)
--- a/kde-apps/konsolepart/konsolepart-4.14.3.ebuild
+++ b/kde-apps/konsolepart/konsolepart-4.14.3.ebuild
@@ -15,20 +15,16 @@ KEYWORDS="amd64 x86"
 IUSE="debug"
 
 COMMONDEPEND="
-       !aqua? (
-               x11-libs/libX11
-               x11-libs/libXext
-               >=x11-libs/libxklavier-3.2
-               x11-libs/libXrender
-               x11-libs/libXtst
-       )
+       x11-libs/libX11
+       x11-libs/libXext
+       >=x11-libs/libxklavier-3.2
+       x11-libs/libXrender
+       x11-libs/libXtst
 "
 DEPEND="${COMMONDEPEND}
-       !aqua? (
-               x11-apps/bdftopcf
-               x11-proto/kbproto
-               x11-proto/renderproto
-       )
+       x11-apps/bdftopcf
+       x11-proto/kbproto
+       x11-proto/renderproto
 "
 RDEPEND="${COMMONDEPEND}
        !<kde-apps/konsole-4.14.3-r2

diff --git a/kde-apps/kopete/kopete-17.04.3.ebuild b/kde-apps/kopete/kopete-17.04.3.ebuild
index f81bf0cdcf2fae62a75e492240eb5fb101a6c04f..0638ae9eed21c757e147caa6d53b15c94032a4b1 100644 (file)
--- a/kde-apps/kopete/kopete-17.04.3.ebuild
+++ b/kde-apps/kopete/kopete-17.04.3.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" )

diff --git a/kde-apps/kopete/kopete-17.08.0.ebuild b/kde-apps/kopete/kopete-17.08.0.ebuild
index 7b7ed8c5dce4706d3b40fe544d71b3947f510ae1..bcc421a01cba723337f4c526a1e2c71b4b1e2d7b 100644 (file)
--- a/kde-apps/kopete/kopete-17.08.0.ebuild
+++ b/kde-apps/kopete/kopete-17.08.0.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" )

diff --git a/kde-frameworks/kdelibs/kdelibs-4.14.34.ebuild b/kde-frameworks/kdelibs/kdelibs-4.14.34.ebuild
index ae2a79fe668876cb24ac809a434e28fba2ff8ec9..cf9f89776e1d39c92e4ba99cffe1fd4f62739023 100644 (file)
--- a/kde-frameworks/kdelibs/kdelibs-4.14.34.ebuild
+++ b/kde-frameworks/kdelibs/kdelibs-4.14.34.ebuild
@@ -47,29 +47,25 @@ COMMONDEPEND="
        media-libs/phonon[qt4]
        sys-libs/zlib
        virtual/jpeg:0
+       x11-libs/libICE
+       x11-libs/libSM
+       x11-libs/libX11
+       x11-libs/libXau
+       x11-libs/libXcursor
+       x11-libs/libXdmcp
+       x11-libs/libXext
+       x11-libs/libXfixes
+       x11-libs/libXft
+       x11-libs/libXpm
+       x11-libs/libXrender
+       x11-libs/libXScrnSaver
+       x11-libs/libXtst
        x11-misc/shared-mime-info
+       !kernel_SunOS? ( || (
+               sys-libs/libutempter
+               >=sys-freebsd/freebsd-lib-9.0
+       ) )
        acl? ( virtual/acl )
-       !aqua? (
-               x11-libs/libICE
-               x11-libs/libSM
-               x11-libs/libX11
-               x11-libs/libXau
-               x11-libs/libXcursor
-               x11-libs/libXdmcp
-               x11-libs/libXext
-               x11-libs/libXfixes
-               x11-libs/libXft
-               x11-libs/libXpm
-               x11-libs/libXrender
-               x11-libs/libXScrnSaver
-               x11-libs/libXtst
-               !kernel_SunOS? (
-                       || (
-                               sys-libs/libutempter
-                               >=sys-freebsd/freebsd-lib-9.0
-                       )
-               )
-       )
        bzip2? ( app-arch/bzip2 )
        crypt? ( app-crypt/qca:2[qt4] )
        fam? ( virtual/fam )
@@ -98,14 +94,12 @@ RDEPEND="${COMMONDEPEND}
        app-misc/ca-certificates
        kde-frameworks/kdelibs-env:4
        sys-apps/dbus[X]
-       !aqua? (
-               x11-apps/iceauth
-               x11-apps/rgb
-               x11-misc/xdg-utils
-               udisks? ( sys-fs/udisks:2 )
-               upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
-       )
+       x11-apps/iceauth
+       x11-apps/rgb
+       x11-misc/xdg-utils
        udev? ( app-misc/media-player-info )
+       udisks? ( sys-fs/udisks:2 )
+       upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
 "
 PDEPEND="
        x11-misc/xdg-utils
@@ -141,36 +135,6 @@ src_prepare() {
                        plasma/CMakeLists.txt plasma/tests/CMakeLists.txt includes/CMakeLists.txt \
                        || die "failed to sed out QT_QTOPENGL_FOUND"
        fi
-
-       if use aqua; then
-               sed -i -e \
-                       "s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \
-                       cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake"
-
-               #if [[ ${CHOST} == *-darwin8 ]]; then
-               sed -i -e \
-                       "s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \
-                       cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake"
-               #fi
-
-               # solid/solid/backends/iokit doesn't properly link, so disable it.
-               sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \
-                       || die "disabling solid/solid/backends/iokit failed"
-               sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \
-                       || die "disabling solid/solid/backends/iokit failed"
-
-               # There's no fdatasync on OSX and the check fails to detect that.
-               sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \
-                       || die "disabling fdatasync failed"
-
-               # Fix nameser include to nameser8_compat
-               sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \
-                       || die "fixing nameser include failed"
-               append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1
-
-               # Try to fix kkeyserver_mac
-               eapply "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch
-       fi
 }
 
 src_configure() {
@@ -236,25 +200,6 @@ src_install() {
                dohtml -r ${P}-apidocs/*
        fi
 
-       if use aqua; then
-               einfo "fixing ${PN} plugins"
-
-               local _PV=${PV:0:3}.0
-               local _dir=${EPREFIX}/usr/$(get_libdir)/kde4/plugins/script
-
-               install_name_tool -id \
-                       "${_dir}/libkrossqtsplugin.${_PV}.dylib" \
-                       "${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \
-                       || die "failed fixing libkrossqtsplugin.${_PV}.dylib"
-
-               einfo "fixing ${PN} cmake detection files"
-               #sed -i -e \
-               #       "s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \
-               echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \
-                       "${ED}"/usr/share/apps/cmake/modules/FindXKB.cmake \
-                       || die "failed fixing FindXKB.cmake"
-       fi
-
        # We don't package it, so don't install headers
        rm -r "${ED}"/usr/include/KDE/Nepomuk || die
 

diff --git a/kde-frameworks/kdelibs/kdelibs-4.14.35.ebuild b/kde-frameworks/kdelibs/kdelibs-4.14.35.ebuild
index e6a574ab21261d4399417ce2321d04afae47438f..f7eb7c73bd1dcc30341b16be90ea63885a244c70 100644 (file)
--- a/kde-frameworks/kdelibs/kdelibs-4.14.35.ebuild
+++ b/kde-frameworks/kdelibs/kdelibs-4.14.35.ebuild
@@ -47,29 +47,25 @@ COMMONDEPEND="
        media-libs/phonon[qt4]
        sys-libs/zlib
        virtual/jpeg:0
+       x11-libs/libICE
+       x11-libs/libSM
+       x11-libs/libX11
+       x11-libs/libXau
+       x11-libs/libXcursor
+       x11-libs/libXdmcp
+       x11-libs/libXext
+       x11-libs/libXfixes
+       x11-libs/libXft
+       x11-libs/libXpm
+       x11-libs/libXrender
+       x11-libs/libXScrnSaver
+       x11-libs/libXtst
        x11-misc/shared-mime-info
+       !kernel_SunOS? ( || (
+               sys-libs/libutempter
+               >=sys-freebsd/freebsd-lib-9.0
+       ) )
        acl? ( virtual/acl )
-       !aqua? (
-               x11-libs/libICE
-               x11-libs/libSM
-               x11-libs/libX11
-               x11-libs/libXau
-               x11-libs/libXcursor
-               x11-libs/libXdmcp
-               x11-libs/libXext
-               x11-libs/libXfixes
-               x11-libs/libXft
-               x11-libs/libXpm
-               x11-libs/libXrender
-               x11-libs/libXScrnSaver
-               x11-libs/libXtst
-               !kernel_SunOS? (
-                       || (
-                               sys-libs/libutempter
-                               >=sys-freebsd/freebsd-lib-9.0
-                       )
-               )
-       )
        bzip2? ( app-arch/bzip2 )
        fam? ( virtual/fam )
        jpeg2k? ( media-libs/jasper:= )
@@ -101,15 +97,13 @@ RDEPEND="${COMMONDEPEND}
        app-misc/ca-certificates
        kde-frameworks/kdelibs-env:4
        sys-apps/dbus[X]
-       !aqua? (
-               x11-apps/iceauth
-               x11-apps/rgb
-               x11-misc/xdg-utils
-               udisks? ( sys-fs/udisks:2 )
-               upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
-       )
+       x11-apps/iceauth
+       x11-apps/rgb
+       x11-misc/xdg-utils
        plasma? ( !sci-libs/plasma )
        udev? ( app-misc/media-player-info )
+       udisks? ( sys-fs/udisks:2 )
+       upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
 "
 PDEPEND="
        x11-misc/xdg-utils
@@ -146,36 +140,6 @@ src_prepare() {
                        plasma/CMakeLists.txt plasma/tests/CMakeLists.txt includes/CMakeLists.txt \
                        || die "failed to sed out QT_QTOPENGL_FOUND"
        fi
-
-       if use aqua; then
-               sed -i -e \
-                       "s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \
-                       cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake"
-
-               #if [[ ${CHOST} == *-darwin8 ]]; then
-               sed -i -e \
-                       "s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \
-                       cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake"
-               #fi
-
-               # solid/solid/backends/iokit doesn't properly link, so disable it.
-               sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \
-                       || die "disabling solid/solid/backends/iokit failed"
-               sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \
-                       || die "disabling solid/solid/backends/iokit failed"
-
-               # There's no fdatasync on OSX and the check fails to detect that.
-               sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \
-                       || die "disabling fdatasync failed"
-
-               # Fix nameser include to nameser8_compat
-               sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \
-                       || die "fixing nameser include failed"
-               append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1
-
-               # Try to fix kkeyserver_mac
-               eapply "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch
-       fi
 }
 
 src_configure() {
@@ -243,25 +207,6 @@ src_install() {
                dohtml -r ${P}-apidocs/*
        fi
 
-       if use aqua; then
-               einfo "fixing ${PN} plugins"
-
-               local _PV=${PV:0:3}.0
-               local _dir=${EPREFIX}/usr/$(get_libdir)/kde4/plugins/script
-
-               install_name_tool -id \
-                       "${_dir}/libkrossqtsplugin.${_PV}.dylib" \
-                       "${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \
-                       || die "failed fixing libkrossqtsplugin.${_PV}.dylib"
-
-               einfo "fixing ${PN} cmake detection files"
-               #sed -i -e \
-               #       "s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \
-               echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \
-                       "${ED}"/usr/share/apps/cmake/modules/FindXKB.cmake \
-                       || die "failed fixing FindXKB.cmake"
-       fi
-
        # We don't package it, so don't install headers
        rm -r "${ED}"/usr/include/KDE/Nepomuk || die
 

diff --git a/media-libs/phonon/phonon-4.9.1-r1.ebuild b/media-libs/phonon/phonon-4.9.1-r1.ebuild
index 38d15b51591016759e4a73d69487afaa3b62a888..2474f3bab8dbb172af14a7c6aa0c3709af8cfd5a 100644 (file)
--- a/media-libs/phonon/phonon-4.9.1-r1.ebuild
+++ b/media-libs/phonon/phonon-4.9.1-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://phonon.kde.org/"
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="0"
-IUSE="aqua debug designer gstreamer pulseaudio qt4 +qt5 +vlc"
+IUSE="debug designer gstreamer pulseaudio qt4 +qt5 +vlc"
 
 REQUIRED_USE="|| ( qt4 qt5 )"
 
@@ -47,7 +47,6 @@ DEPEND="${RDEPEND}
        qt5? ( kde-frameworks/extra-cmake-modules:5 )
 "
 PDEPEND="
-       aqua? ( media-libs/phonon-qt7 )
        gstreamer? ( >=media-libs/phonon-gstreamer-4.9.0[qt4?,qt5?] )
        vlc? ( >=media-libs/phonon-vlc-0.9.0[qt4?,qt5?] )
 "

diff --git a/media-libs/phonon/phonon-9999.ebuild b/media-libs/phonon/phonon-9999.ebuild
index 33202cf975a2d7811abb1396403c07e01a8d2288..e39cec4c2f6707045ba3057bdb65352ea34c9eaf 100644 (file)
--- a/media-libs/phonon/phonon-9999.ebuild
+++ b/media-libs/phonon/phonon-9999.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://phonon.kde.org/"
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="0"
-IUSE="aqua debug designer gstreamer pulseaudio qt4 +vlc"
+IUSE="debug designer gstreamer pulseaudio qt4 +vlc"
 
 RDEPEND="
        !!dev-qt/qtphonon:4
@@ -43,7 +43,6 @@ DEPEND="${RDEPEND}
        kde-frameworks/extra-cmake-modules:5
 "
 PDEPEND="
-       aqua? ( media-libs/phonon-qt7 )
        gstreamer? ( >=media-libs/phonon-gstreamer-4.9.0[qt4?,qt5(+)] )
        vlc? ( >=media-libs/phonon-vlc-0.9.0[qt4?,qt5(+)] )
 "

diff --git a/profiles/prefix/darwin/package.use.mask b/profiles/prefix/darwin/package.use.mask
index 690a8d0e985a8530500cda54e9f54283cf120af7..d83ac53d383f39b6d9390e9427e5667985978301 100644 (file)
--- a/profiles/prefix/darwin/package.use.mask
+++ b/profiles/prefix/darwin/package.use.mask
@@ -2,6 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
+# Andreas Sturmlechner <asturm@gentoo.org> (03 Sep 2017)
+# Required media-libs/phonon no longer provides USE=aqua
+dev-qt/qtdemo phonon
+
 # Fabian Groffen <grobian@gentoo.org> (06 Apr 2016)
 # dev-libs/re2 needs love, bug #563932
 app-misc/sphinx re2