From a6257f7c9dc4385f03d25852117c84f1b89cf7bc Mon Sep 17 00:00:00 2001 From: Johannes Huber Date: Fri, 23 Dec 2016 21:41:30 +0100 Subject: kde-base/kdelibs -> kde-frameworks/kdelibs --- app-accessibility/simon/simon-0.4.1.ebuild | 2 +- app-arch/p7zip/p7zip-15.09-r2.ebuild | 2 +- app-arch/p7zip/p7zip-15.09.ebuild | 4 +- app-arch/p7zip/p7zip-15.14.1.ebuild | 2 +- app-arch/p7zip/p7zip-15.14.ebuild | 2 +- app-arch/p7zip/p7zip-9.20.1-r5.ebuild | 4 +- app-arch/p7zip/p7zip-9.38.1-r2.ebuild | 4 +- app-arch/p7zip/p7zip-9.38.1-r3.ebuild | 4 +- app-cdr/k3b/k3b-2.0.3-r2.ebuild | 2 +- app-cdr/k3b/k3b-2.0.3-r3.ebuild | 2 +- app-crypt/kencfs/kencfs-1.6.2.ebuild | 2 +- app-crypt/zuluCrypt/zuluCrypt-4.7.7.ebuild | 4 +- app-i18n/kcm-fcitx/kcm-fcitx-0.4.3.ebuild | 2 +- app-i18n/kcm-fcitx/kcm-fcitx-0.4.9999.ebuild | 2 +- app-i18n/uim/uim-1.8.6-r1.ebuild | 2 +- app-i18n/uim/uim-1.8.6-r2.ebuild | 2 +- app-office/libalkimia/libalkimia-5.0.0.ebuild | 2 +- .../libreoffice-bin/libreoffice-bin-5.2.3.3.ebuild | 2 +- dev-vcs/subversion/subversion-1.8.16.ebuild | 2 +- dev-vcs/subversion/subversion-1.8.17.ebuild | 2 +- dev-vcs/subversion/subversion-1.9.4.ebuild | 2 +- dev-vcs/subversion/subversion-1.9.5.ebuild | 2 +- eclass/kde4-base.eclass | 8 +- .../ksokoban/ksokoban-0.5.0_pre20120725.ebuild | 4 +- games-puzzle/ksokoban/ksokoban-9999.ebuild | 4 +- kde-apps/akregator/akregator-4.4.2016.01.ebuild | 2 +- .../kaddressbook/kaddressbook-4.4.2016.01.ebuild | 2 +- kde-apps/kde4-l10n/kde4-l10n-16.08.3.ebuild | 2 +- kde-apps/kde4-l10n/kde4-l10n-16.12.0.ebuild | 2 +- .../kdebase-kioslaves-16.04.3-r2.ebuild | 2 +- kde-apps/kmail/kmail-4.4.2016.01.ebuild | 2 +- kde-apps/kopete/kopete-16.08.3.ebuild | 2 +- kde-apps/kopete/kopete-16.12.0.ebuild | 2 +- kde-apps/pykde4/pykde4-4.14.3-r1.ebuild | 2 +- kde-base/kdelibs/Manifest | 2 - .../dist/01_gentoo_set_xdg_menu_prefix-1.patch | 18 -- .../dist/02_gentoo_append_xdg_config_dirs-1.patch | 30 -- kde-base/kdelibs/files/kdelibs-4.10.0-udisks.patch | 51 ---- .../kdelibs/files/kdelibs-4.14.20-FindQt4.patch | 39 --- .../files/kdelibs-4.14.20-strigi-optional.patch | 24 -- .../kdelibs/files/kdelibs-4.14.22-webkit.patch | 85 ------ .../files/kdelibs-4.14.5-fatalwarnings.patch | 16 -- .../kdelibs/files/kdelibs-4.14.5-mimetypes.patch | 27 -- .../kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch | 46 ---- kde-base/kdelibs/files/kdelibs-4.4.90-xslt.patch | 12 - .../files/kdelibs-4.6.3-no_suid_kdeinit.patch | 19 -- kde-base/kdelibs/files/kdelibs-4.8.1-norpath.patch | 18 -- kde-base/kdelibs/files/kdelibs-4.9.3-werror.patch | 20 -- kde-base/kdelibs/kdelibs-4.14.24.ebuild | 301 --------------------- kde-base/kdelibs/kdelibs-4.14.27.ebuild | 300 -------------------- kde-base/kdelibs/metadata.xml | 11 - kde-frameworks/kdelibs/Manifest | 2 + .../dist/01_gentoo_set_xdg_menu_prefix-1.patch | 18 ++ .../dist/02_gentoo_append_xdg_config_dirs-1.patch | 30 ++ .../kdelibs/files/kdelibs-4.10.0-udisks.patch | 51 ++++ .../kdelibs/files/kdelibs-4.14.20-FindQt4.patch | 39 +++ .../files/kdelibs-4.14.20-strigi-optional.patch | 24 ++ .../kdelibs/files/kdelibs-4.14.22-webkit.patch | 85 ++++++ .../files/kdelibs-4.14.5-fatalwarnings.patch | 16 ++ .../kdelibs/files/kdelibs-4.14.5-mimetypes.patch | 27 ++ .../kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch | 46 ++++ .../kdelibs/files/kdelibs-4.4.90-xslt.patch | 12 + .../files/kdelibs-4.6.3-no_suid_kdeinit.patch | 19 ++ .../kdelibs/files/kdelibs-4.8.1-norpath.patch | 18 ++ .../kdelibs/files/kdelibs-4.9.3-werror.patch | 20 ++ kde-frameworks/kdelibs/kdelibs-4.14.24.ebuild | 301 +++++++++++++++++++++ kde-frameworks/kdelibs/kdelibs-4.14.27.ebuild | 300 ++++++++++++++++++++ kde-frameworks/kdelibs/metadata.xml | 11 + kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild | 4 +- kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild | 2 +- kde-misc/kfilebox/kfilebox-0.4.9.ebuild | 4 +- .../plasma-lionmail-0_p20121020.ebuild | 2 +- kde-plasma/breeze/breeze-5.8.3.ebuild | 2 +- kde-plasma/breeze/breeze-5.8.4.ebuild | 2 +- kde-plasma/kwin/kwin-4.11.22.ebuild | 2 +- kde-plasma/oxygen/oxygen-5.8.3.ebuild | 2 +- kde-plasma/oxygen/oxygen-5.8.4.ebuild | 2 +- media-gfx/wally/wally-2.4.5.ebuild | 4 +- media-sound/amarok/amarok-2.8.0-r3.ebuild | 2 +- media-sound/amarok/amarok-2.8.90-r2.ebuild | 2 +- .../kaudiocreator/kaudiocreator-1.3-r3.ebuild | 2 +- media-video/qx11grab/qx11grab-0.4.12.ebuild | 2 +- media-video/vlc/vlc-2.2.1-r1.ebuild | 2 +- media-video/vlc/vlc-2.2.4-r1.ebuild | 2 +- media-video/vlc/vlc-2.2.4.ebuild | 2 +- media-video/vlc/vlc-2.2.9999.ebuild | 2 +- media-video/vlc/vlc-9999.ebuild | 2 +- net-analyzer/nmapsi/nmapsi-0.4.1.ebuild | 2 +- net-im/qutim/qutim-0.3.2.ebuild | 2 +- net-im/qutim/qutim-0.3.3_p1.ebuild | 2 +- net-irc/quassel/quassel-0.12.4.ebuild | 2 +- net-libs/libproxy/libproxy-0.4.11-r2.ebuild | 4 +- net-misc/dhcpcd-ui/dhcpcd-ui-0.7.4.ebuild | 4 +- net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5-r1.ebuild | 2 +- net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5.ebuild | 2 +- net-misc/hotot/hotot-0.9.8.14.ebuild | 4 +- net-misc/hotot/hotot-0.9.8.14_p20130514-r1.ebuild | 2 +- net-misc/hotot/hotot-0.9.8.14_p20130514.ebuild | 4 +- net-misc/hotot/hotot-9999.ebuild | 4 +- net-p2p/ktorrent/ktorrent-4.3.1-r1.ebuild | 2 +- profiles/arch/amd64-fbsd/todo/package.use.mask | 2 +- profiles/arch/arm/package.use.mask | 2 +- profiles/arch/arm64/package.use.mask | 2 +- profiles/arch/nios2/package.use.mask | 2 +- profiles/arch/powerpc/package.use.mask | 2 +- profiles/base/package.use.force | 2 +- profiles/default/bsd/package.use.mask | 2 +- profiles/default/linux/package.use.mask | 2 +- profiles/updates/4Q-2016 | 1 + sci-visualization/gwyddion/gwyddion-2.39.ebuild | 4 +- sci-visualization/gwyddion/gwyddion-2.44.ebuild | 2 +- www-client/opera/opera-12.16_p1860-r1.ebuild | 4 +- .../adobe-flash/adobe-flash-24.0.0.186.ebuild | 2 +- x11-misc/piedock/piedock-1.6.6.ebuild | 4 +- x11-misc/qterm/qterm-0.5.12-r1.ebuild | 2 +- 115 files changed, 1121 insertions(+), 1120 deletions(-) delete mode 100644 kde-base/kdelibs/Manifest delete mode 100644 kde-base/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix-1.patch delete mode 100644 kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch delete mode 100644 kde-base/kdelibs/files/kdelibs-4.10.0-udisks.patch delete mode 100644 kde-base/kdelibs/files/kdelibs-4.14.20-FindQt4.patch delete mode 100644 kde-base/kdelibs/files/kdelibs-4.14.20-strigi-optional.patch delete mode 100644 kde-base/kdelibs/files/kdelibs-4.14.22-webkit.patch delete mode 100644 kde-base/kdelibs/files/kdelibs-4.14.5-fatalwarnings.patch delete mode 100644 kde-base/kdelibs/files/kdelibs-4.14.5-mimetypes.patch delete mode 100644 kde-base/kdelibs/files/kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch delete mode 100644 kde-base/kdelibs/files/kdelibs-4.4.90-xslt.patch delete mode 100644 kde-base/kdelibs/files/kdelibs-4.6.3-no_suid_kdeinit.patch delete mode 100644 kde-base/kdelibs/files/kdelibs-4.8.1-norpath.patch delete mode 100644 kde-base/kdelibs/files/kdelibs-4.9.3-werror.patch delete mode 100644 kde-base/kdelibs/kdelibs-4.14.24.ebuild delete mode 100644 kde-base/kdelibs/kdelibs-4.14.27.ebuild delete mode 100644 kde-base/kdelibs/metadata.xml create mode 100644 kde-frameworks/kdelibs/Manifest create mode 100644 kde-frameworks/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix-1.patch create mode 100644 kde-frameworks/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch create mode 100644 kde-frameworks/kdelibs/files/kdelibs-4.10.0-udisks.patch create mode 100644 kde-frameworks/kdelibs/files/kdelibs-4.14.20-FindQt4.patch create mode 100644 kde-frameworks/kdelibs/files/kdelibs-4.14.20-strigi-optional.patch create mode 100644 kde-frameworks/kdelibs/files/kdelibs-4.14.22-webkit.patch create mode 100644 kde-frameworks/kdelibs/files/kdelibs-4.14.5-fatalwarnings.patch create mode 100644 kde-frameworks/kdelibs/files/kdelibs-4.14.5-mimetypes.patch create mode 100644 kde-frameworks/kdelibs/files/kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch create mode 100644 kde-frameworks/kdelibs/files/kdelibs-4.4.90-xslt.patch create mode 100644 kde-frameworks/kdelibs/files/kdelibs-4.6.3-no_suid_kdeinit.patch create mode 100644 kde-frameworks/kdelibs/files/kdelibs-4.8.1-norpath.patch create mode 100644 kde-frameworks/kdelibs/files/kdelibs-4.9.3-werror.patch create mode 100644 kde-frameworks/kdelibs/kdelibs-4.14.24.ebuild create mode 100644 kde-frameworks/kdelibs/kdelibs-4.14.27.ebuild create mode 100644 kde-frameworks/kdelibs/metadata.xml diff --git a/app-accessibility/simon/simon-0.4.1.ebuild b/app-accessibility/simon/simon-0.4.1.ebuild index d4352ac1120..f0f2779d224 100644 --- a/app-accessibility/simon/simon-0.4.1.ebuild +++ b/app-accessibility/simon/simon-0.4.1.ebuild @@ -27,7 +27,7 @@ RDEPEND=" dev-qt/qtgui:4 dev-qt/qtscript:4 dev-qt/qtsql:4 - kde-base/kdelibs:4 + kde-frameworks/kdelibs:4 media-libs/alsa-lib x11-libs/libX11 x11-libs/libXtst diff --git a/app-arch/p7zip/p7zip-15.09-r2.ebuild b/app-arch/p7zip/p7zip-15.09-r2.ebuild index 8d7950b3694..3cd27bb7252 100644 --- a/app-arch/p7zip/p7zip-15.09-r2.ebuild +++ b/app-arch/p7zip/p7zip-15.09-r2.ebuild @@ -20,7 +20,7 @@ IUSE="doc kde rar +pch static wxwidgets abi_x86_x32" REQUIRED_USE="kde? ( wxwidgets )" RDEPEND=" - kde? ( x11-libs/wxGTK:${WX_GTK_VER}[X] kde-base/kdelibs ) + kde? ( x11-libs/wxGTK:${WX_GTK_VER}[X] kde-frameworks/kdelibs:4 ) wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )" DEPEND="${RDEPEND} amd64? ( dev-lang/yasm ) diff --git a/app-arch/p7zip/p7zip-15.09.ebuild b/app-arch/p7zip/p7zip-15.09.ebuild index 2b4b810a842..8ac4ad1fc5b 100644 --- a/app-arch/p7zip/p7zip-15.09.ebuild +++ b/app-arch/p7zip/p7zip-15.09.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -20,7 +20,7 @@ IUSE="doc kde rar +pch static wxwidgets abi_x86_x32" REQUIRED_USE="kde? ( wxwidgets )" RDEPEND=" - kde? ( x11-libs/wxGTK:${WX_GTK_VER}[X] kde-base/kdelibs ) + kde? ( x11-libs/wxGTK:${WX_GTK_VER}[X] kde-frameworks/kdelibs:4 ) wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )" DEPEND="${RDEPEND} amd64? ( dev-lang/yasm ) diff --git a/app-arch/p7zip/p7zip-15.14.1.ebuild b/app-arch/p7zip/p7zip-15.14.1.ebuild index 60264208745..b88e6c0c0ab 100644 --- a/app-arch/p7zip/p7zip-15.14.1.ebuild +++ b/app-arch/p7zip/p7zip-15.14.1.ebuild @@ -20,7 +20,7 @@ IUSE="doc kde rar +pch static wxwidgets abi_x86_x32" REQUIRED_USE="kde? ( wxwidgets )" RDEPEND=" - kde? ( x11-libs/wxGTK:${WX_GTK_VER}[X] kde-base/kdelibs ) + kde? ( x11-libs/wxGTK:${WX_GTK_VER}[X] kde-frameworks/kdelibs:4 ) wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )" DEPEND="${RDEPEND} amd64? ( dev-lang/yasm ) diff --git a/app-arch/p7zip/p7zip-15.14.ebuild b/app-arch/p7zip/p7zip-15.14.ebuild index a2efa2908bd..7f72d37675f 100644 --- a/app-arch/p7zip/p7zip-15.14.ebuild +++ b/app-arch/p7zip/p7zip-15.14.ebuild @@ -20,7 +20,7 @@ IUSE="doc kde rar +pch static wxwidgets abi_x86_x32" REQUIRED_USE="kde? ( wxwidgets )" RDEPEND=" - kde? ( x11-libs/wxGTK:${WX_GTK_VER}[X] kde-base/kdelibs ) + kde? ( x11-libs/wxGTK:${WX_GTK_VER}[X] kde-frameworks/kdelibs:4 ) wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )" DEPEND="${RDEPEND} amd64? ( dev-lang/yasm ) diff --git a/app-arch/p7zip/p7zip-9.20.1-r5.ebuild b/app-arch/p7zip/p7zip-9.20.1-r5.ebuild index 6b114776dd5..e30b40699fb 100644 --- a/app-arch/p7zip/p7zip-9.20.1-r5.ebuild +++ b/app-arch/p7zip/p7zip-9.20.1-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -20,7 +20,7 @@ IUSE="doc kde rar +pch static wxwidgets" REQUIRED_USE="kde? ( wxwidgets )" RDEPEND=" - kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-base/kdelibs ) + kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-frameworks/kdelibs:4 ) wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )" DEPEND="${RDEPEND} amd64? ( dev-lang/yasm ) diff --git a/app-arch/p7zip/p7zip-9.38.1-r2.ebuild b/app-arch/p7zip/p7zip-9.38.1-r2.ebuild index 7e779e8cd47..03dab4f09fb 100644 --- a/app-arch/p7zip/p7zip-9.38.1-r2.ebuild +++ b/app-arch/p7zip/p7zip-9.38.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -20,7 +20,7 @@ IUSE="doc kde rar +pch static wxwidgets abi_x86_x32" REQUIRED_USE="kde? ( wxwidgets )" RDEPEND=" - kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-base/kdelibs ) + kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-frameworks/kdelibs:4 ) wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )" DEPEND="${RDEPEND} amd64? ( dev-lang/yasm ) diff --git a/app-arch/p7zip/p7zip-9.38.1-r3.ebuild b/app-arch/p7zip/p7zip-9.38.1-r3.ebuild index 8c2486e8cd9..567aa85b39e 100644 --- a/app-arch/p7zip/p7zip-9.38.1-r3.ebuild +++ b/app-arch/p7zip/p7zip-9.38.1-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -20,7 +20,7 @@ IUSE="doc kde rar +pch static wxwidgets abi_x86_x32" REQUIRED_USE="kde? ( wxwidgets )" RDEPEND=" - kde? ( x11-libs/wxGTK:${WX_GTK_VER}[X] kde-base/kdelibs ) + kde? ( x11-libs/wxGTK:${WX_GTK_VER}[X] kde-frameworks/kdelibs:4 ) wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )" DEPEND="${RDEPEND} amd64? ( dev-lang/yasm ) diff --git a/app-cdr/k3b/k3b-2.0.3-r2.ebuild b/app-cdr/k3b/k3b-2.0.3-r2.ebuild index 0cebffd4918..544b71df368 100644 --- a/app-cdr/k3b/k3b-2.0.3-r2.ebuild +++ b/app-cdr/k3b/k3b-2.0.3-r2.ebuild @@ -48,8 +48,8 @@ DEPEND="${CDEPEND} sys-devel/gettext " RDEPEND="${CDEPEND} - $(add_kdebase_dep kdelibs 'udev,udisks(+)') app-cdr/cdrdao + kde-frameworks/kdelibs:4[udev,udisks(+)] media-sound/cdparanoia virtual/cdrtools dvd? ( diff --git a/app-cdr/k3b/k3b-2.0.3-r3.ebuild b/app-cdr/k3b/k3b-2.0.3-r3.ebuild index ecdd7ad525d..08317a6ca2f 100644 --- a/app-cdr/k3b/k3b-2.0.3-r3.ebuild +++ b/app-cdr/k3b/k3b-2.0.3-r3.ebuild @@ -47,8 +47,8 @@ DEPEND="${CDEPEND} sys-devel/gettext " RDEPEND="${CDEPEND} - $(add_kdebase_dep kdelibs 'udev,udisks(+)') app-cdr/cdrdao + kde-frameworks/kdelibs:4[udev,udisks(+)] media-sound/cdparanoia virtual/cdrtools dvd? ( diff --git a/app-crypt/kencfs/kencfs-1.6.2.ebuild b/app-crypt/kencfs/kencfs-1.6.2.ebuild index 186dc900fb1..8703167f41a 100644 --- a/app-crypt/kencfs/kencfs-1.6.2.ebuild +++ b/app-crypt/kencfs/kencfs-1.6.2.ebuild @@ -18,7 +18,7 @@ IUSE="" DEPEND=" dev-qt/qtcore:4 dev-qt/qtgui:4 - kde-base/kdelibs:4 + kde-frameworks/kdelibs:4 " RDEPEND="${DEPEND} kde-apps/kwalletd:4 diff --git a/app-crypt/zuluCrypt/zuluCrypt-4.7.7.ebuild b/app-crypt/zuluCrypt/zuluCrypt-4.7.7.ebuild index c0bf1f096d4..c8681ad8605 100644 --- a/app-crypt/zuluCrypt/zuluCrypt-4.7.7.ebuild +++ b/app-crypt/zuluCrypt/zuluCrypt-4.7.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -25,7 +25,7 @@ CDEPEND=" dev-qt/qtcore:4 dev-qt/qtgui:4 kde? ( - kde-base/kdelibs:4 + kde-frameworks/kdelibs:4 kde-apps/kwalletd:4 ) ) diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-0.4.3.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-0.4.3.ebuild index 1b9f5f8ba97..74cc0d92183 100644 --- a/app-i18n/kcm-fcitx/kcm-fcitx-0.4.3.ebuild +++ b/app-i18n/kcm-fcitx/kcm-fcitx-0.4.3.ebuild @@ -30,7 +30,7 @@ RDEPEND=">=app-i18n/fcitx-4.2.8[dbus,qt4] dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 - kde-base/kdelibs:4 + kde-frameworks/kdelibs:4 virtual/libintl x11-libs/libX11 x11-libs/libxkbfile" diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-0.4.9999.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-0.4.9999.ebuild index b4988e11ffb..3b26edf3882 100644 --- a/app-i18n/kcm-fcitx/kcm-fcitx-0.4.9999.ebuild +++ b/app-i18n/kcm-fcitx/kcm-fcitx-0.4.9999.ebuild @@ -30,7 +30,7 @@ RDEPEND=">=app-i18n/fcitx-4.2.8[dbus,qt4] dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 - kde-base/kdelibs:4 + kde-frameworks/kdelibs:4 virtual/libintl x11-libs/libX11 x11-libs/libxkbfile" diff --git a/app-i18n/uim/uim-1.8.6-r1.ebuild b/app-i18n/uim/uim-1.8.6-r1.ebuild index b25f0ce0b96..684400ca32a 100644 --- a/app-i18n/uim/uim-1.8.6-r1.ebuild +++ b/app-i18n/uim/uim-1.8.6-r1.ebuild @@ -39,7 +39,7 @@ RDEPEND="X? ( libffi? ( virtual/libffi ) gtk? ( >=x11-libs/gtk+-2.4:2 ) gtk3? ( x11-libs/gtk+:3 ) - kde? ( >=kde-base/kdelibs-4 ) + kde? ( kde-frameworks/kdelibs:4 ) libedit? ( dev-libs/libedit ) libnotify? ( >=x11-libs/libnotify-0.4 ) m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 ) diff --git a/app-i18n/uim/uim-1.8.6-r2.ebuild b/app-i18n/uim/uim-1.8.6-r2.ebuild index 5b04cfdf445..81d595ed6c9 100644 --- a/app-i18n/uim/uim-1.8.6-r2.ebuild +++ b/app-i18n/uim/uim-1.8.6-r2.ebuild @@ -39,7 +39,7 @@ RDEPEND="X? ( libffi? ( virtual/libffi ) gtk? ( >=x11-libs/gtk+-2.4:2 ) gtk3? ( x11-libs/gtk+:3 ) - kde? ( >=kde-base/kdelibs-4 ) + kde? ( kde-frameworks/kdelibs:4 ) libedit? ( dev-libs/libedit ) libnotify? ( >=x11-libs/libnotify-0.4 ) m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 ) diff --git a/app-office/libalkimia/libalkimia-5.0.0.ebuild b/app-office/libalkimia/libalkimia-5.0.0.ebuild index cca7eac9344..efc0e1d82cf 100644 --- a/app-office/libalkimia/libalkimia-5.0.0.ebuild +++ b/app-office/libalkimia/libalkimia-5.0.0.ebuild @@ -19,7 +19,7 @@ RDEPEND=" dev-libs/gmp:0=[cxx] dev-qt/qtcore:4 dev-qt/qtdbus:4 - kde-base/kdelibs:4 + kde-frameworks/kdelibs:4 " DEPEND="${RDEPEND} virtual/pkgconfig diff --git a/app-office/libreoffice-bin/libreoffice-bin-5.2.3.3.ebuild b/app-office/libreoffice-bin/libreoffice-bin-5.2.3.3.ebuild index c81ab5606d8..c30ff075b99 100644 --- a/app-office/libreoffice-bin/libreoffice-bin-5.2.3.3.ebuild +++ b/app-office/libreoffice-bin/libreoffice-bin-5.2.3.3.ebuild @@ -70,7 +70,7 @@ BIN_COMMON_DEPEND=" >=sys-devel/gcc-4.9.3 >=sys-libs/glibc-2.22 virtual/jpeg:62 - kde? ( >=kde-base/kdelibs-4.14.24:4 >=dev-qt/qtcore-4.8.6-r2:4 >=dev-qt/qtgui-4.8.6-r4:4 ) + kde? ( >=kde-frameworks/kdelibs-4.14.24:4 >=dev-qt/qtcore-4.8.6-r2:4 >=dev-qt/qtgui-4.8.6-r4:4 ) " # PLEASE place any restrictions that are specific to the binary builds diff --git a/dev-vcs/subversion/subversion-1.8.16.ebuild b/dev-vcs/subversion/subversion-1.8.16.ebuild index afae86f8820..f90474d829f 100644 --- a/dev-vcs/subversion/subversion-1.8.16.ebuild +++ b/dev-vcs/subversion/subversion-1.8.16.ebuild @@ -32,7 +32,7 @@ COMMON_DEPEND=">=dev-db/sqlite-3.7.12 berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( ${PYTHON_DEPS} ) gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/libgnome-keyring ) - kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 >=kde-base/kdelibs-4:4 ) + kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 kde-frameworks/kdelibs:4 ) perl? ( dev-lang/perl:= ) python? ( ${PYTHON_DEPS} ) ruby? ( ${RUBY_DEPS} ) diff --git a/dev-vcs/subversion/subversion-1.8.17.ebuild b/dev-vcs/subversion/subversion-1.8.17.ebuild index c5a0f02678e..45382cd3611 100644 --- a/dev-vcs/subversion/subversion-1.8.17.ebuild +++ b/dev-vcs/subversion/subversion-1.8.17.ebuild @@ -32,7 +32,7 @@ COMMON_DEPEND=">=dev-db/sqlite-3.7.12 berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( ${PYTHON_DEPS} ) gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/libgnome-keyring ) - kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 >=kde-base/kdelibs-4:4 ) + kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 kde-frameworks/kdelibs:4 ) perl? ( dev-lang/perl:= ) python? ( ${PYTHON_DEPS} ) ruby? ( ${RUBY_DEPS} ) diff --git a/dev-vcs/subversion/subversion-1.9.4.ebuild b/dev-vcs/subversion/subversion-1.9.4.ebuild index df0bcd133df..ccc98653381 100644 --- a/dev-vcs/subversion/subversion-1.9.4.ebuild +++ b/dev-vcs/subversion/subversion-1.9.4.ebuild @@ -32,7 +32,7 @@ COMMON_DEPEND=">=dev-db/sqlite-3.7.12 berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( ${PYTHON_DEPS} ) gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/libgnome-keyring ) - kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 >=kde-base/kdelibs-4:4 ) + kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 kde-frameworks/kdelibs:4 ) perl? ( dev-lang/perl:= ) python? ( ${PYTHON_DEPS} ) ruby? ( ${RUBY_DEPS} ) diff --git a/dev-vcs/subversion/subversion-1.9.5.ebuild b/dev-vcs/subversion/subversion-1.9.5.ebuild index 3c98e5d2300..4ec988b8672 100644 --- a/dev-vcs/subversion/subversion-1.9.5.ebuild +++ b/dev-vcs/subversion/subversion-1.9.5.ebuild @@ -32,7 +32,7 @@ COMMON_DEPEND=">=dev-db/sqlite-3.7.12 berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( ${PYTHON_DEPS} ) gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/libgnome-keyring ) - kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 >=kde-base/kdelibs-4:4 ) + kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 kde-frameworks/kdelibs:4 ) perl? ( dev-lang/perl:= ) python? ( ${PYTHON_DEPS} ) ruby? ( ${RUBY_DEPS} ) diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index f1e41f7b8c7..35909a0eb01 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -314,11 +314,11 @@ kdecommondepend=" if [[ ${PN} != kdelibs ]]; then local _kdelibsuse case ${WEBKIT_REQUIRED} in - always) _kdelibsuse="webkit" ;; - optional) _kdelibsuse="webkit?" ;; + always) _kdelibsuse="[webkit]" ;; + optional) _kdelibsuse="[webkit?]" ;; *) ;; esac - kdecommondepend+=" $(add_kdebase_dep kdelibs "${_kdelibsuse}" 4.14.22)" + kdecommondepend+=" >=kde-frameworks/kdelibs-4.14.22:4${_kdelibsuse}" unset _kdelibsuse if [[ ${KDEBASE} = kdevelop ]]; then if [[ ${PN} != kdevplatform ]]; then @@ -378,7 +378,7 @@ kdehandbookdepend=" app-text/docbook-xsl-stylesheets " kdehandbookrdepend=" - $(add_kdebase_dep kdelibs 'handbook') + kde-frameworks/kdelibs:4[handbook] " case ${KDE_HANDBOOK} in always) diff --git a/games-puzzle/ksokoban/ksokoban-0.5.0_pre20120725.ebuild b/games-puzzle/ksokoban/ksokoban-0.5.0_pre20120725.ebuild index 0256ede9c44..453096d906b 100644 --- a/games-puzzle/ksokoban/ksokoban-0.5.0_pre20120725.ebuild +++ b/games-puzzle/ksokoban/ksokoban-0.5.0_pre20120725.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -18,7 +18,7 @@ HOMEPAGE="https://sourceforge.net/projects/ksokoban/" LICENSE="GPL-2" SLOT="0" -DEPEND="kde-base/kdelibs:4" +DEPEND="kde-frameworks/kdelibs:4" RDEPEND="${DEPEND}" S="${WORKDIR}/${PN}" diff --git a/games-puzzle/ksokoban/ksokoban-9999.ebuild b/games-puzzle/ksokoban/ksokoban-9999.ebuild index 0256ede9c44..453096d906b 100644 --- a/games-puzzle/ksokoban/ksokoban-9999.ebuild +++ b/games-puzzle/ksokoban/ksokoban-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -18,7 +18,7 @@ HOMEPAGE="https://sourceforge.net/projects/ksokoban/" LICENSE="GPL-2" SLOT="0" -DEPEND="kde-base/kdelibs:4" +DEPEND="kde-frameworks/kdelibs:4" RDEPEND="${DEPEND}" S="${WORKDIR}/${PN}" diff --git a/kde-apps/akregator/akregator-4.4.2016.01.ebuild b/kde-apps/akregator/akregator-4.4.2016.01.ebuild index 83aedbfa9c0..889c96c42d1 100644 --- a/kde-apps/akregator/akregator-4.4.2016.01.ebuild +++ b/kde-apps/akregator/akregator-4.4.2016.01.ebuild @@ -14,9 +14,9 @@ KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="debug" DEPEND=" - $(add_kdebase_dep kdelibs '' 4.6) $(add_kdeapps_dep kdepimlibs '' 4.6) $(add_kdeapps_dep libkdepim '' 4.4.2015) + kde-frameworks/kdelibs:4 " RDEPEND="${DEPEND}" diff --git a/kde-apps/kaddressbook/kaddressbook-4.4.2016.01.ebuild b/kde-apps/kaddressbook/kaddressbook-4.4.2016.01.ebuild index a89f670c63e..5d84843fc27 100644 --- a/kde-apps/kaddressbook/kaddressbook-4.4.2016.01.ebuild +++ b/kde-apps/kaddressbook/kaddressbook-4.4.2016.01.ebuild @@ -14,10 +14,10 @@ KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="debug" DEPEND=" - $(add_kdebase_dep kdelibs '' 4.13.1) $(add_kdeapps_dep kdepimlibs '' 4.13.1) $(add_kdeapps_dep libkdepim '' 4.4.2015) $(add_kdeapps_dep libkleo '' 4.4.2015) + kde-frameworks/kdelibs:4 " RDEPEND="${DEPEND}" diff --git a/kde-apps/kde4-l10n/kde4-l10n-16.08.3.ebuild b/kde-apps/kde4-l10n/kde4-l10n-16.08.3.ebuild index 29dc41a2c46..bdb184831f0 100644 --- a/kde-apps/kde4-l10n/kde4-l10n-16.08.3.ebuild +++ b/kde-apps/kde4-l10n/kde4-l10n-16.08.3.ebuild @@ -20,7 +20,7 @@ SLOT="4" KEYWORDS="amd64 ~arm x86" DEPEND=" - kde-base/kdelibs:4 + kde-frameworks/kdelibs:4 sys-devel/gettext " RDEPEND=" diff --git a/kde-apps/kde4-l10n/kde4-l10n-16.12.0.ebuild b/kde-apps/kde4-l10n/kde4-l10n-16.12.0.ebuild index ff2859317a1..b871af01174 100644 --- a/kde-apps/kde4-l10n/kde4-l10n-16.12.0.ebuild +++ b/kde-apps/kde4-l10n/kde4-l10n-16.12.0.ebuild @@ -20,7 +20,7 @@ SLOT="4" KEYWORDS="~amd64 ~arm ~x86" DEPEND=" - kde-base/kdelibs:4 + kde-frameworks/kdelibs:4 sys-devel/gettext " RDEPEND=" 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 98325297217..9c7434c671e 100644 --- a/kde-apps/kdebase-kioslaves/kdebase-kioslaves-16.04.3-r2.ebuild +++ b/kde-apps/kdebase-kioslaves/kdebase-kioslaves-16.04.3-r2.ebuild @@ -27,8 +27,8 @@ DEPEND=" sftp? ( >=net-libs/libssh-0.4.0:=[sftp] ) " RDEPEND="${DEPEND} - $(add_kdebase_dep kdelibs 'bzip2?,lzma?') kde-apps/kdialog:* + kde-frameworks/kdelibs:4[bzip2?,lzma?] virtual/ssh !aqua? ( !kernel_SunOS? ( virtual/eject ) ) " diff --git a/kde-apps/kmail/kmail-4.4.2016.01.ebuild b/kde-apps/kmail/kmail-4.4.2016.01.ebuild index 73ce2afc8dd..1d55c69a977 100644 --- a/kde-apps/kmail/kmail-4.4.2016.01.ebuild +++ b/kde-apps/kmail/kmail-4.4.2016.01.ebuild @@ -15,11 +15,11 @@ KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="debug" DEPEND=" - $(add_kdebase_dep kdelibs '' 4.13.1) $(add_kdeapps_dep kdepimlibs '' 4.13.1) $(add_kdeapps_dep libkdepim '' 4.4.11.1-r1) $(add_kdeapps_dep libkleo '' 4.4.2015) $(add_kdeapps_dep libkpgp '' 4.4.2015) + kde-frameworks/kdelibs:4 " RDEPEND="${DEPEND} !>=kde-apps/kdepimlibs-4.14.11_pre20160211 diff --git a/kde-apps/kopete/kopete-16.08.3.ebuild b/kde-apps/kopete/kopete-16.08.3.ebuild index cfb7c97cd01..f64727037bc 100644 --- a/kde-apps/kopete/kopete-16.08.3.ebuild +++ b/kde-apps/kopete/kopete-16.08.3.ebuild @@ -64,12 +64,12 @@ testbed winpopup +xmpp yahoo zeroconf" IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}" COMMONDEPEND=" - $(add_kdebase_dep kdelibs 'zeroconf?') $(add_kdeapps_dep kdepimlibs) dev-libs/libpcre >=dev-qt/qtgui-4.4.0:4[mng] media-libs/phonon[qt4] media-libs/qimageblitz + kde-frameworks/kdelibs:4[zeroconf?] !aqua? ( x11-libs/libX11 x11-libs/libXScrnSaver diff --git a/kde-apps/kopete/kopete-16.12.0.ebuild b/kde-apps/kopete/kopete-16.12.0.ebuild index 449decdbd59..3b10bfd09b6 100644 --- a/kde-apps/kopete/kopete-16.12.0.ebuild +++ b/kde-apps/kopete/kopete-16.12.0.ebuild @@ -64,12 +64,12 @@ testbed winpopup +xmpp yahoo zeroconf" IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}" COMMONDEPEND=" - $(add_kdebase_dep kdelibs 'zeroconf?') $(add_kdeapps_dep kdepimlibs) dev-libs/libpcre >=dev-qt/qtgui-4.4.0:4[mng] media-libs/phonon[qt4] media-libs/qimageblitz + kde-frameworks/kdelibs:4[zeroconf?] !aqua? ( x11-libs/libX11 x11-libs/libXScrnSaver diff --git a/kde-apps/pykde4/pykde4-4.14.3-r1.ebuild b/kde-apps/pykde4/pykde4-4.14.3-r1.ebuild index ce382c6d434..a09a44d68e8 100644 --- a/kde-apps/pykde4/pykde4-4.14.3-r1.ebuild +++ b/kde-apps/pykde4/pykde4-4.14.3-r1.ebuild @@ -22,7 +22,7 @@ RDEPEND=" ${PYTHON_DEPS} >=dev-python/PyQt4-4.11.1[${PYTHON_USEDEP},dbus,declarative,script,sql,svg,webkit,X] >=dev-python/sip-4.16.2:=[${PYTHON_USEDEP}] - $(add_kdebase_dep kdelibs 'opengl') + kde-frameworks/kdelibs:4[opengl] akonadi? ( $(add_kdeapps_dep kdepimlibs) ) " DEPEND="${RDEPEND} diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest deleted file mode 100644 index d69eb2eb4fd..00000000000 --- a/kde-base/kdelibs/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST kdelibs-4.14.24.tar.xz 11635840 SHA256 45e663e8739f131115eda69e5af95e895cce8161228d075d74a9a8cd390346ef SHA512 187737e30d05f324977cfc14aa375b49e15c322abb2b8f482382f9e6061bf7d18b97b957a7fcc1fb9184fa68cd3e1753d9633e14f32d799e3e5a78f283ff0894 WHIRLPOOL 2a4a67f792a2d88f2a4cfd49cafe2c611e79ba974a55d6d77e9688acf89be56817adfa6489017162afc42d7c30949df277b8974a2aaf59b2357a3b279a83b0a2 -DIST kdelibs-4.14.27.tar.xz 11641732 SHA256 b79fe7f8798fe6a3aade6eced396b40b5fbb638200604056a18b377ee76ecfb2 SHA512 52a76c6e5cb8366bf353a1eee8286f4165fcdf962ac0da5545a96e066bb513a9eedbbacd7ee6981d9034e08a84f795c68d26fa2f02774938ac1a4971a8a18427 WHIRLPOOL 4cfa7a6f9c7dd74c9e90e90c9950babd1cb966655b77093fbe6fc2a7172998c720c9b9fe29ac9f22e18f1577475668fa96c9b6142051a19ca20cb57324cc0692 diff --git a/kde-base/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix-1.patch b/kde-base/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix-1.patch deleted file mode 100644 index c12c2aba9ae..00000000000 --- a/kde-base/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix-1.patch +++ /dev/null @@ -1,18 +0,0 @@ -Set XDG_MENU_PREFIX to kde-4- if not set. This fixes "empty-applications-menu" when running -KDE4 applications outside of KDE4 environment. - -Index: kded/vfolder_menu.cpp -=================================================================== ---- a/kded/vfolder_menu.cpp (revision 1014368) -+++ b/kded/vfolder_menu.cpp (working copy) -@@ -770,7 +770,9 @@ - QString result; - - QString xdgMenuPrefix = QString::fromLocal8Bit(qgetenv("XDG_MENU_PREFIX")); -- if (!xdgMenuPrefix.isEmpty()) -+ if (xdgMenuPrefix.isEmpty()) -+ xdgMenuPrefix = "kde-4-"; -+ - { - QFileInfo fileInfo(fileName); - diff --git a/kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch b/kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch deleted file mode 100644 index 074847ae995..00000000000 --- a/kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch +++ /dev/null @@ -1,30 +0,0 @@ -Set up XDG_CONFIG_DIRS lookup in order: -1. custom XDG_CONFIG_DIRS from env -2. kdeprefix xdg config dirs -3. /etc/xdg - -Index: kdecore/kernel/kstandarddirs.cpp -=================================================================== ---- a/kdecore/kernel/kstandarddirs.cpp (revision 1014759) -+++ b/kdecore/kernel/kstandarddirs.cpp (working copy) -@@ -1664,16 +1664,13 @@ - { - tokenize(xdgdirList, xdgdirs, QString(QChar(KPATH_SEPARATOR))); - } -- else -- { -- xdgdirList.clear(); -- xdgdirList.append(QString::fromLatin1("/etc/xdg")); -+ - #ifdef Q_WS_WIN -- xdgdirList.append(installPath("kdedir") + QString::fromLatin1("etc/xdg")); -+ xdgdirList.append(installPath("kdedir") + QString::fromLatin1("etc/xdg")); - #else -- xdgdirList.append(QFile::decodeName(KDESYSCONFDIR "/xdg")); -+ xdgdirList.append(QFile::decodeName(KDESYSCONFDIR "/xdg")); - #endif -- } -+ xdgdirList.append(QString::fromLatin1("/etc/xdg")); - - QString localXdgDir = readEnvPath("XDG_CONFIG_HOME"); - if (!localXdgDir.isEmpty()) diff --git a/kde-base/kdelibs/files/kdelibs-4.10.0-udisks.patch b/kde-base/kdelibs/files/kdelibs-4.10.0-udisks.patch deleted file mode 100644 index 63e9b308838..00000000000 --- a/kde-base/kdelibs/files/kdelibs-4.10.0-udisks.patch +++ /dev/null @@ -1,51 +0,0 @@ -udisks1 is deprecated and going away, so removing this clause -will permit us to build without udisks at all. - ---- a/solid/solid/CMakeLists.txt -+++ b/solid/solid/CMakeLists.txt -@@ -283,20 +283,6 @@ - backends/udisks2/udisksgenericinterface.cpp - backends/udisks2/dbus/manager.cpp - ) -- else ( WITH_SOLID_UDISKS2 ) -- message(STATUS "Building Solid UDisks backend." ) -- set(solid_LIB_SRCS ${solid_LIB_SRCS} -- backends/udisks/udisksmanager.cpp -- backends/udisks/udisksdevice.cpp -- backends/udisks/udisksblock.cpp -- backends/udisks/udisksstoragevolume.cpp -- backends/udisks/udisksdeviceinterface.cpp -- backends/udisks/udisksopticaldisc.cpp -- backends/udisks/udisksopticaldrive.cpp -- backends/udisks/udisksstoragedrive.cpp -- backends/udisks/udisksstorageaccess.cpp -- backends/udisks/udisksgenericinterface.cpp -- ) - endif ( WITH_SOLID_UDISKS2 ) - endif (CMAKE_SYSTEM_NAME MATCHES Linux) - ---- a/solid/solid/managerbase.cpp -+++ b/solid/solid/managerbase.cpp -@@ -33,8 +33,6 @@ - #include "backends/hal/halmanager.h" - #if defined (WITH_SOLID_UDISKS2) - #include "backends/udisks2/udisksmanager.h" --#else --#include "backends/udisks/udisksmanager.h" - #endif - #include "backends/upower/upowermanager.h" - -@@ -88,11 +86,9 @@ - m_backends << new Solid::Backends::UDev::UDevManager(0); - # endif - # if defined(WITH_SOLID_UDISKS2) -- m_backends << new Solid::Backends::UDisks2::Manager(0) --# else -- m_backends << new Solid::Backends::UDisks::UDisksManager(0) -+ m_backends << new Solid::Backends::UDisks2::Manager(0); - # endif -- << new Solid::Backends::UPower::UPowerManager(0) -+ m_backends << new Solid::Backends::UPower::UPowerManager(0) - << new Solid::Backends::Fstab::FstabManager(0); - } - # endif diff --git a/kde-base/kdelibs/files/kdelibs-4.14.20-FindQt4.patch b/kde-base/kdelibs/files/kdelibs-4.14.20-FindQt4.patch deleted file mode 100644 index 2325fb11c69..00000000000 --- a/kde-base/kdelibs/files/kdelibs-4.14.20-FindQt4.patch +++ /dev/null @@ -1,39 +0,0 @@ -Ensure that the correct version of Qt is always used. - -With the introduction qt-4.8.6, Qt binaries were moved from /usr/bin to -/usr/$(get_libdir)/qt4/bin, leaving behind in their place symlinks to qtchooser. - -There is no guarantee to which version of Qt these symlinks might point, so it -is necessary to find the correct version explicitly. - -Once qmake is found, it is queried for the correct location of all other items. - -Gentoo-bug: 562746 -Gentoo-bug: 583506 - ---- a/cmake/modules/FindQt4.cmake -+++ b/cmake/modules/FindQt4.cmake -@@ -446,6 +446,15 @@ GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRENT_USER\\Software\\trollte - # check for qmake - # Debian uses qmake-qt4 - # macports' Qt uses qmake-mac -+if(CMAKE_BUILD_TYPE STREQUAL Gentoo) -+ find_program(QT_QMAKE_EXECUTABLE NAMES qmake -+ PATHS -+ $ENV{EPREFIX}/usr/${CMAKE_INSTALL_LIBDIR}/qt4/bin -+ $ENV{EPREFIX}/usr/bin -+ NO_DEFAULT_PATH -+ DOC "The qmake executable for the Qt installation to use" -+ ) -+else() - FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin" - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin" -@@ -453,6 +462,7 @@ FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS - $ENV{QTDIR}/bin - DOC "The qmake executable for the Qt installation to use" - ) -+endif() - - IF (QT_QMAKE_EXECUTABLE) - diff --git a/kde-base/kdelibs/files/kdelibs-4.14.20-strigi-optional.patch b/kde-base/kdelibs/files/kdelibs-4.14.20-strigi-optional.patch deleted file mode 100644 index c9e96551cfb..00000000000 --- a/kde-base/kdelibs/files/kdelibs-4.14.20-strigi-optional.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e7b2bea..87147b5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -82,17 +82,10 @@ set_package_properties(ZLIB PROPERTIES DESCRIPTION "Support for gzip compressed - ) - - find_package(Strigi 0.6.3) --if (WIN32) -- set (STRIGI_TYPE "OPTIONAL") -- set (STRIGI_EXTRA_TEXT "") --else (WIN32) -- set (STRIGI_TYPE "REQUIRED") -- set (STRIGI_EXTRA_TEXT "Required by some critical kioslaves") --endif (WIN32) - set_package_properties(Strigi PROPERTIES DESCRIPTION "Desktop indexing and search support" - URL "http://strigi.sourceforge.net" -- TYPE ${STRIGI_TYPE} -- PURPOSE ${STRIGI_EXTRA_TEXT} -+ TYPE OPTIONAL -+ PURPOSE "Required by some kioslaves for metadata support" - ) - - find_package(LibAttica 0.4.2) diff --git a/kde-base/kdelibs/files/kdelibs-4.14.22-webkit.patch b/kde-base/kdelibs/files/kdelibs-4.14.22-webkit.patch deleted file mode 100644 index dcbb565cedc..00000000000 --- a/kde-base/kdelibs/files/kdelibs-4.14.22-webkit.patch +++ /dev/null @@ -1,85 +0,0 @@ ---- a/CMakeLists.txt 2016-07-06 12:18:35.000000000 +0200 -+++ b/CMakeLists.txt 2016-07-21 21:40:26.080328514 +0200 -@@ -45,6 +45,9 @@ - ############### Give the user the option to build the deprecated WMI solid backend instead of the new win backend ############### - option(WITH_SOLID_WMI "Enables the deprecated WMI backend on Windows") - -+############### Give the user the option to build without qtwebkit dependency ############### -+option(WITH_KDEWEBKIT "Enables the deprecated kdewebkit and kdewebkit-widgets" "ON") -+ - ############### Load the CTest options ############### - # CTestCustom.cmake has to be in the CTEST_BINARY_DIR. - # in the KDE build system, this is the same as CMAKE_BINARY_DIR. -@@ -363,7 +366,9 @@ - add_subdirectory( plasma ) - endif(NOT WINCE) - add_subdirectory( kunitconversion ) -+if(WITH_KDEWEBKIT) - add_subdirectory( kdewebkit ) -+endif(WITH_KDEWEBKIT) - add_subdirectory( includes ) - - add_subdirectory( experimental ) ---- a/kdewidgets/CMakeLists.txt 2016-07-06 12:18:35.000000000 +0200 -+++ b/kdewidgets/CMakeLists.txt 2016-07-21 21:39:54.031052674 +0200 -@@ -90,6 +90,7 @@ - - - # kdewebkit widgets -+ if(WITH_KDEWEBKIT) - include_directories( - ${CMAKE_SOURCE_DIR}/kdewebkit - ) -@@ -121,7 +122,7 @@ - endif(NOT WIN32) - - install(TARGETS kdewebkitwidgets DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer ) -- -+ endif(WITH_KDEWEBKIT) - - if (QT_QT3SUPPORT_FOUND) - ---- a/plasma/CMakeLists.txt 2016-07-22 01:26:52.992198945 +0200 -+++ b/plasma/CMakeLists.txt 2016-07-22 01:28:10.487904045 +0200 -@@ -10,6 +10,10 @@ - set(PLASMA_NO_GLOBAL_SHORTCUTS TRUE) - endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION) - -+if(NOT WITH_KDEWEBKIT) -+ set(PLASMA_NO_KDEWEBKIT TRUE) -+endif(NOT WITH_KDEWEBKIT) -+ - set(PLASMA_NO_PACKAGEKIT TRUE) - - include_directories(${CMAKE_CURRENT_SOURCE_DIR} -@@ -121,7 +125,6 @@ - framesvg.cpp - plasma.cpp - popupapplet.cpp -- private/animablegraphicswebview.cpp - private/applethandle.cpp - private/associatedapplicationmanager.cpp - private/componentinstaller.cpp -@@ -211,7 +214,6 @@ - widgets/textbrowser.cpp - widgets/treeview.cpp - widgets/textedit.cpp -- widgets/webview.cpp - - #Temporary QtJolie branch - private/qtjolie-branch/qtjolie/abstractadaptor.cpp -@@ -245,6 +247,14 @@ - ) - endif(NOT KDE_NO_DEPRECATED) - -+if(NOT PLASMA_NO_KDEWEBKIT) -+ set(plasma_LIB_SRCS -+ ${plasma_LIB_SRCS} -+ private/animablegraphicswebview.cpp -+ widgets/webview.cpp -+ ) -+endif(NOT PLASMA_NO_KDEWEBKIT) -+ - kde4_add_kcfg_files(plasma_LIB_SRCS data/kconfigxt/libplasma-theme-global.kcfgc) - - kde4_add_ui_files(plasma_LIB_SRCS diff --git a/kde-base/kdelibs/files/kdelibs-4.14.5-fatalwarnings.patch b/kde-base/kdelibs/files/kdelibs-4.14.5-fatalwarnings.patch deleted file mode 100644 index 3f571d63a03..00000000000 --- a/kde-base/kdelibs/files/kdelibs-4.14.5-fatalwarnings.patch +++ /dev/null @@ -1,16 +0,0 @@ -Avoid build failure due to harmless warnings on some platforms (eg. ARM) being -forced fatal. - ---- a/cmake/modules/FindKDE4Internal.cmake -+++ b/cmake/modules/FindKDE4Internal.cmake -@@ -1100,8 +1100,8 @@ - if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU) - if (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE) -- set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}") -- set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_MODULE_LINKER_FLAGS}") -+ set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}") -+ set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined -lc ${CMAKE_MODULE_LINKER_FLAGS}") - - set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--enable-new-dtags ${CMAKE_SHARED_LINKER_FLAGS}") - set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--enable-new-dtags ${CMAKE_MODULE_LINKER_FLAGS}") diff --git a/kde-base/kdelibs/files/kdelibs-4.14.5-mimetypes.patch b/kde-base/kdelibs/files/kdelibs-4.14.5-mimetypes.patch deleted file mode 100644 index 38cac84f620..00000000000 --- a/kde-base/kdelibs/files/kdelibs-4.14.5-mimetypes.patch +++ /dev/null @@ -1,27 +0,0 @@ -Remove fake MIME types that cause warnings. - -The offending MIME types are commented out rather than -physically removed because doing so would cause the patch -to be too large. - ---- a/mimetypes/kde.xml -+++ b/mimetypes/kde.xml -@@ -1784,7 +1784,8 @@ - - - -- -+ - - - fonts package diff --git a/kde-base/kdelibs/files/kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch b/kde-base/kdelibs/files/kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch deleted file mode 100644 index 006ca00a458..00000000000 --- a/kde-base/kdelibs/files/kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -purN kdelibs-4.3.80.orig/kdeui/util/kkeyserver_mac.cpp kdelibs-4.3.80/kdeui/util/kkeyserver_mac.cpp ---- a/kdelibs-4.3.80.orig/kdeui/util/kkeyserver_mac.cpp 2009-12-14 17:05:26.284881642 -0500 -+++ b/kdelibs-4.3.80/kdeui/util/kkeyserver_mac.cpp 2009-12-14 17:11:23.393094384 -0500 -@@ -68,7 +68,7 @@ namespace KKeyServer { - #ifdef QT_MAC_USE_COCOA - static TISInputSourceRef lastLayout = 0; - #else -- static KeyboardLayoutRef lastLayout = NULL; -+ static TISInputSourceRef lastLayout = NULL; - #endif - - void updateScancodes() { -@@ -125,16 +125,27 @@ namespace KKeyServer { - #endif - lastLayout = layout; - scancodes.clear(); -- void *kchr; -- if (KLGetKeyboardLayoutProperty(layout, kKLKCHRData, const_cast(&kchr)) != noErr) { -+ UCKeyboardLayout *uchr = (UCKeyboardLayout *)TISGetInputSourceProperty(layout, kTISPropertyUnicodeKeyLayoutData); -+ if (uchr == NULL) { - kWarning() << "Couldn't load active keyboard layout"; - } else { - for (int i = 0; i < 128; i++) { - UInt32 tmpState = 0; -- UInt32 chr = KeyTranslate(kchr, i, &tmpState); -- if (chr && chr != kFunctionKeyCharCode) { -- scancodes.insert(chr, i); -- } -+ UInt32 deadKeyState = 0; -+ UInt32 flags = 0; -+ UniCharCount maxStringLength = 255; -+ UniCharCount actualStringLength = 0; -+ UniChar unicodeString[maxStringLength]; -+ -+ UCKeyTranslate(uchr, i, kUCKeyActionDown, -+ flags, LMGetKbdType(), -+ 1, &deadKeyState, maxStringLength, &actualStringLength, unicodeString); -+ fprintf(stderr, "Got key: %s\n", unicodeString); -+ fflush(stderr); -+ //UInt32 chr = KeyTranslate(kchr, i, &tmpState); -+ //if (chr && chr != kFunctionKeyCharCode) { -+ // scancodes.insert(chr, i); -+ //} - } - } - } diff --git a/kde-base/kdelibs/files/kdelibs-4.4.90-xslt.patch b/kde-base/kdelibs/files/kdelibs-4.4.90-xslt.patch deleted file mode 100644 index 0d25ada337b..00000000000 --- a/kde-base/kdelibs/files/kdelibs-4.4.90-xslt.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -r -u kdelibs-4.4.90.orig/kdoctools/customization/htdig_index.xsl kdelibs-4.4.90/kdoctools/customization/htdig_index.xsl ---- kdelibs-4.4.90.orig/kdoctools/customization/htdig_index.xsl 2008-05-21 13:07:13.000000000 +0200 -+++ kdelibs-4.4.90/kdoctools/customization/htdig_index.xsl 2010-07-08 23:32:28.184204481 +0200 -@@ -35,7 +35,7 @@ - - - -- -+ - - - diff --git a/kde-base/kdelibs/files/kdelibs-4.6.3-no_suid_kdeinit.patch b/kde-base/kdelibs/files/kdelibs-4.6.3-no_suid_kdeinit.patch deleted file mode 100644 index 4b34f62c2be..00000000000 --- a/kde-base/kdelibs/files/kdelibs-4.6.3-no_suid_kdeinit.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -urN kdelibs-4.6.3.old/kinit/CMakeLists.txt kdelibs-4.6.3/kinit/CMakeLists.txt ---- kdelibs-4.6.3.old/kinit/CMakeLists.txt 2011-05-02 00:19:10.000000000 +0200 -+++ kdelibs-4.6.3/kinit/CMakeLists.txt 2011-05-02 00:20:32.000000000 +0200 -@@ -170,15 +170,6 @@ - install(TARGETS start_kdeinit_wrapper DESTINATION ${LIBEXEC_INSTALL_DIR}) - endif (NOT WIN32) - --if (CMAKE_SYSTEM_NAME MATCHES Linux) -- MESSAGE(STATUS "Using setuid root kdeinit wrapper in order to protect it from bad Linux OOM-killer") -- set(KDEINIT_OOM_PROTECT 1) -- install(CODE " -- set(START_KDEINIT_PATH \"\$ENV{DESTDIR}${LIBEXEC_INSTALL_DIR}/start_kdeinit\") -- EXECUTE_PROCESS(COMMAND sh -c \"chown 0 '\${START_KDEINIT_PATH}' && chmod u+s '\${START_KDEINIT_PATH}'\") -- ") --endif (CMAKE_SYSTEM_NAME MATCHES Linux) -- - ########### install files ############### - - install( FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.KLauncher.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} ) diff --git a/kde-base/kdelibs/files/kdelibs-4.8.1-norpath.patch b/kde-base/kdelibs/files/kdelibs-4.8.1-norpath.patch deleted file mode 100644 index 83d5576ac02..00000000000 --- a/kde-base/kdelibs/files/kdelibs-4.8.1-norpath.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -ruN kdelibs-4.8.1.orig/cmake/modules/FindKDE4Internal.cmake kdelibs-4.8.1/cmake/modules/FindKDE4Internal.cmake ---- kdelibs-4.8.1.orig/cmake/modules/FindKDE4Internal.cmake 2012-02-29 22:55:52.000000000 +0100 -+++ kdelibs-4.8.1/cmake/modules/FindKDE4Internal.cmake 2012-03-24 17:18:59.452942648 +0100 -@@ -1045,7 +1045,13 @@ - - set(CMAKE_SKIP_BUILD_RPATH FALSE) - set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) -- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) -+ -+ # the RPATH to be used when installing -+ SET(CMAKE_INSTALL_RPATH "") -+ -+ # don't add the automatically determined parts of the RPATH -+ # which point to directories outside the build tree to the install RPATH -+ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE) - endif (APPLE) - endif (UNIX) - diff --git a/kde-base/kdelibs/files/kdelibs-4.9.3-werror.patch b/kde-base/kdelibs/files/kdelibs-4.9.3-werror.patch deleted file mode 100644 index b094d12f722..00000000000 --- a/kde-base/kdelibs/files/kdelibs-4.9.3-werror.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/cmake/modules/FindKDE4Internal.cmake -+++ b/cmake/modules/FindKDE4Internal.cmake -@@ -1204,7 +1204,7 @@ - set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline") - set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs") - -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common") -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common") - # As of Qt 4.6.x we need to override the new exception macros if we want compile with -fno-exceptions - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-exceptions -DQT_NO_EXCEPTIONS -fno-check-new -fno-common") - -@@ -1295,7 +1295,7 @@ - endif(NOT _compile_result) - - if (GCC_IS_NEWER_THAN_4_2) -- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-type -fvisibility-inlines-hidden") -+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") - endif (GCC_IS_NEWER_THAN_4_2) - else (__KDE_HAVE_GCC_VISIBILITY AND GCC_IS_NEWER_THAN_4_1 AND NOT _GCC_COMPILED_WITH_BAD_ALLOCATOR AND NOT WIN32) - set (__KDE_HAVE_GCC_VISIBILITY 0) diff --git a/kde-base/kdelibs/kdelibs-4.14.24.ebuild b/kde-base/kdelibs/kdelibs-4.14.24.ebuild deleted file mode 100644 index 9db907a1549..00000000000 --- a/kde-base/kdelibs/kdelibs-4.14.24.ebuild +++ /dev/null @@ -1,301 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -CMAKE_MIN_VERSION="3.3.1-r1" -CPPUNIT_REQUIRED="optional" -DECLARATIVE_REQUIRED="always" -KDE_HANDBOOK="optional" -OPENGL_REQUIRED="optional" -WEBKIT_REQUIRED="optional" -inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic - -APPS_VERSION="16.08.1" # Don't forget to bump this - -DESCRIPTION="KDE libraries needed by all KDE programs" -[[ ${KDE_BUILD_TYPE} != live ]] && \ -SRC_URI="mirror://kde/stable/applications/${APPS_VERSION}/src/${P}.tar.xz" - -KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" -LICENSE="LGPL-2.1" -IUSE="cpu_flags_x86_3dnow acl altivec +bzip2 +crypt debug doc fam jpeg2k -kerberos libressl lzma cpu_flags_x86_mmx nls openexr +policykit spell -cpu_flags_x86_sse cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf" - -REQUIRED_USE=" - udisks? ( udev ) - upower? ( udev ) -" - -# needs the kate regression testsuite from svn -RESTRICT="test" - -COMMONDEPEND=" - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xsl-stylesheets - >=dev-libs/libattica-0.4.2 - dev-libs/libdbusmenu-qt[qt4] - dev-libs/libpcre[unicode] - dev-libs/libxml2 - dev-libs/libxslt - media-libs/fontconfig - media-libs/freetype:2 - media-libs/giflib:= - media-libs/libpng:0= - media-libs/phonon[qt4] - sys-libs/zlib - virtual/jpeg:0 - x11-misc/shared-mime-info - 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 ) - jpeg2k? ( media-libs/jasper:= ) - kerberos? ( virtual/krb5 ) - openexr? ( - media-libs/openexr:= - media-libs/ilmbase:= - ) - policykit? ( sys-auth/polkit-qt[qt4] ) - spell? ( app-text/enchant ) - ssl? ( - libressl? ( dev-libs/libressl:0= ) - !libressl? ( dev-libs/openssl:0= ) - ) - udev? ( virtual/udev ) - zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) -" -DEPEND="${COMMONDEPEND} - doc? ( app-doc/doxygen ) - nls? ( virtual/libintl ) -" -RDEPEND="${COMMONDEPEND} - !dev-qt/qtphonon - >=app-crypt/gnupg-2.0.11 - app-misc/ca-certificates - kde-frameworks/kdelibs-env:4 - sys-apps/dbus[X] - !aqua? ( - udisks? ( sys-fs/udisks:2 ) - x11-apps/iceauth - x11-apps/rgb - x11-misc/xdg-utils - upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) ) - ) - udev? ( app-misc/media-player-info ) -" -PDEPEND=" - $(add_kdeapps_dep katepart '' 4.14.3) - || ( - $(add_kdeapps_dep kfmclient '' 4.14.3) - x11-misc/xdg-utils - ) - handbook? ( kde-apps/khelpcenter:* ) - policykit? ( || ( - >=sys-auth/polkit-kde-agent-0.99 - kde-plasma/polkit-kde-agent - ) ) -" - -PATCHES=( - "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch" - "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch" - "${FILESDIR}/${PN}-4.14.5-fatalwarnings.patch" - "${FILESDIR}/${PN}-4.14.5-mimetypes.patch" - "${FILESDIR}/${PN}-4.4.90-xslt.patch" - "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch" - "${FILESDIR}/${PN}-4.8.1-norpath.patch" - "${FILESDIR}/${PN}-4.9.3-werror.patch" - "${FILESDIR}/${PN}-4.10.0-udisks.patch" - "${FILESDIR}/${PN}-4.14.20-FindQt4.patch" - "${FILESDIR}/${PN}-4.14.20-strigi-optional.patch" - "${FILESDIR}/${PN}-4.14.22-webkit.patch" -) - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc; then - [[ $(gcc-major-version) -lt 4 ]] || \ - ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \ - && die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)." - fi -} - -src_prepare() { - kde4-base_src_prepare - - # Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work) - sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \ - -i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed." - - 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 - epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch - fi -} - -src_configure() { - local mycmakeargs=( - -DWITH_HSPELL=OFF - -DWITH_ASPELL=OFF - -DKDE_DEFAULT_HOME=.kde4 - -DKAUTH_BACKEND=POLKITQT-1 - -DWITH_Soprano=OFF - -DWITH_SharedDesktopOntologies=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_Strigi=ON - -DBUILD_doc=$(usex handbook) - -DHAVE_X86_3DNOW=$(usex cpu_flags_x86_3dnow) - -DHAVE_PPC_ALTIVEC=$(usex altivec) - -DHAVE_X86_MMX=$(usex cpu_flags_x86_mmx) - -DHAVE_X86_SSE=$(usex cpu_flags_x86_sse) - -DHAVE_X86_SSE2=$(usex cpu_flags_x86_sse2) - -DWITH_ACL=$(usex acl) - -DWITH_BZip2=$(usex bzip2) - -DWITH_QCA2=$(usex crypt) - -DWITH_FAM=$(usex fam) - -DWITH_Jasper=$(usex jpeg2k) - -DWITH_GSSAPI=$(usex kerberos) - -DWITH_LibLZMA=$(usex lzma) - -DWITH_Libintl=$(usex nls) - -DWITH_OpenEXR=$(usex openexr) - -DWITH_OpenGL=$(usex opengl) - -DWITH_PolkitQt-1=$(usex policykit) - -DWITH_ENCHANT=$(usex spell) - -DWITH_OpenSSL=$(usex ssl) - -DWITH_UDev=$(usex udev) - -DWITH_SOLID_UDISKS2=$(usex udisks) - -DWITH_Avahi=$(usex zeroconf) - -DWITH_KDEWEBKIT=$(usex webkit) - ) - - use zeroconf || mycmakeargs+=( -DWITH_DNSSD=OFF ) - - kde4-base_src_configure -} - -src_compile() { - kde4-base_src_compile - - # The building of apidox is not managed anymore by the build system - if use doc; then - einfo "Building API documentation" - cd "${S}"/doc/api/ - ./doxygen.sh "${S}" || die "APIDOX generation failed" - fi -} - -src_install() { - kde4-base_src_install - - # use system certificates - rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die - dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt - - if use doc; then - einfo "Installing API documentation. This could take a bit of time." - cd "${S}"/doc/api/ - docinto /HTML/en/kdelibs-apidox - 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 - - einfo Installing environment file. - # Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined. - echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde" - echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde" - doenvd "${T}/77kde" -} - -pkg_postinst() { - fdo-mime_mime_database_update - - if use zeroconf; then - echo - elog "To make zeroconf support available in KDE make sure that the avahi daemon" - elog "is running." - echo - einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns" - einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf" - einfo "to include 'mdns', e.g.:" - einfo " hosts: files mdns dns" - echo - fi - - kde4-base_pkg_postinst -} - -pkg_prerm() { - # Remove ksycoca4 global database - rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4 -} - -pkg_postrm() { - fdo-mime_mime_database_update - - kde4-base_pkg_postrm -} diff --git a/kde-base/kdelibs/kdelibs-4.14.27.ebuild b/kde-base/kdelibs/kdelibs-4.14.27.ebuild deleted file mode 100644 index 4c221243ab6..00000000000 --- a/kde-base/kdelibs/kdelibs-4.14.27.ebuild +++ /dev/null @@ -1,300 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -CMAKE_MIN_VERSION="3.3.1-r1" -CPPUNIT_REQUIRED="optional" -DECLARATIVE_REQUIRED="always" -KDE_HANDBOOK="optional" -OPENGL_REQUIRED="optional" -WEBKIT_REQUIRED="optional" -inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic - -APPS_VERSION="16.12.0" # Don't forget to bump this - -DESCRIPTION="KDE libraries needed by all KDE programs" -[[ ${KDE_BUILD_TYPE} != live ]] && \ -SRC_URI="mirror://kde/stable/applications/${APPS_VERSION}/src/${P}.tar.xz" - -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" -LICENSE="LGPL-2.1" -IUSE="cpu_flags_x86_3dnow acl altivec +bzip2 +crypt debug doc fam jpeg2k -kerberos libressl lzma cpu_flags_x86_mmx nls openexr +policykit spell -cpu_flags_x86_sse cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf" - -REQUIRED_USE=" - udisks? ( udev ) - upower? ( udev ) -" - -# needs the kate regression testsuite from svn -RESTRICT="test" - -COMMONDEPEND=" - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xsl-stylesheets - >=dev-libs/libattica-0.4.2 - dev-libs/libdbusmenu-qt[qt4] - dev-libs/libpcre[unicode] - dev-libs/libxml2 - dev-libs/libxslt - media-libs/fontconfig - media-libs/freetype:2 - media-libs/giflib:= - media-libs/libpng:0= - media-libs/phonon[qt4] - sys-libs/zlib - virtual/jpeg:0 - x11-misc/shared-mime-info - 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 ) - jpeg2k? ( media-libs/jasper:= ) - kerberos? ( virtual/krb5 ) - openexr? ( - media-libs/openexr:= - media-libs/ilmbase:= - ) - policykit? ( sys-auth/polkit-qt[qt4] ) - spell? ( app-text/enchant ) - ssl? ( - libressl? ( dev-libs/libressl:0= ) - !libressl? ( dev-libs/openssl:0= ) - ) - udev? ( virtual/udev ) - zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) -" -DEPEND="${COMMONDEPEND} - doc? ( app-doc/doxygen ) - nls? ( virtual/libintl ) -" -RDEPEND="${COMMONDEPEND} - !dev-qt/qtphonon - >=app-crypt/gnupg-2.0.11 - app-misc/ca-certificates - kde-frameworks/kdelibs-env:4 - sys-apps/dbus[X] - !aqua? ( - udisks? ( sys-fs/udisks:2 ) - x11-apps/iceauth - x11-apps/rgb - x11-misc/xdg-utils - upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) ) - ) - udev? ( app-misc/media-player-info ) -" -PDEPEND=" - $(add_kdeapps_dep katepart '' 4.14.3) - || ( - $(add_kdeapps_dep kfmclient '' 4.14.3) - x11-misc/xdg-utils - ) - handbook? ( kde-apps/khelpcenter:* ) - policykit? ( || ( - >=sys-auth/polkit-kde-agent-0.99 - kde-plasma/polkit-kde-agent - ) ) -" - -PATCHES=( - "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch" - "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch" - "${FILESDIR}/${PN}-4.14.5-fatalwarnings.patch" - "${FILESDIR}/${PN}-4.14.5-mimetypes.patch" - "${FILESDIR}/${PN}-4.4.90-xslt.patch" - "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch" - "${FILESDIR}/${PN}-4.8.1-norpath.patch" - "${FILESDIR}/${PN}-4.9.3-werror.patch" - "${FILESDIR}/${PN}-4.10.0-udisks.patch" - "${FILESDIR}/${PN}-4.14.20-FindQt4.patch" - "${FILESDIR}/${PN}-4.14.22-webkit.patch" -) - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc; then - [[ $(gcc-major-version) -lt 4 ]] || \ - ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \ - && die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)." - fi -} - -src_prepare() { - kde4-base_src_prepare - - # Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work) - sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \ - -i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed." - - 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 - epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch - fi -} - -src_configure() { - local mycmakeargs=( - -DWITH_HSPELL=OFF - -DWITH_ASPELL=OFF - -DKDE_DEFAULT_HOME=.kde4 - -DKAUTH_BACKEND=POLKITQT-1 - -DWITH_Soprano=OFF - -DWITH_SharedDesktopOntologies=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_Strigi=ON - -DBUILD_doc=$(usex handbook) - -DHAVE_X86_3DNOW=$(usex cpu_flags_x86_3dnow) - -DHAVE_PPC_ALTIVEC=$(usex altivec) - -DHAVE_X86_MMX=$(usex cpu_flags_x86_mmx) - -DHAVE_X86_SSE=$(usex cpu_flags_x86_sse) - -DHAVE_X86_SSE2=$(usex cpu_flags_x86_sse2) - -DWITH_ACL=$(usex acl) - -DWITH_BZip2=$(usex bzip2) - -DWITH_QCA2=$(usex crypt) - -DWITH_FAM=$(usex fam) - -DWITH_Jasper=$(usex jpeg2k) - -DWITH_GSSAPI=$(usex kerberos) - -DWITH_LibLZMA=$(usex lzma) - -DWITH_Libintl=$(usex nls) - -DWITH_OpenEXR=$(usex openexr) - -DWITH_OpenGL=$(usex opengl) - -DWITH_PolkitQt-1=$(usex policykit) - -DWITH_ENCHANT=$(usex spell) - -DWITH_OpenSSL=$(usex ssl) - -DWITH_UDev=$(usex udev) - -DWITH_SOLID_UDISKS2=$(usex udisks) - -DWITH_Avahi=$(usex zeroconf) - -DWITH_KDEWEBKIT=$(usex webkit) - ) - - use zeroconf || mycmakeargs+=( -DWITH_DNSSD=OFF ) - - kde4-base_src_configure -} - -src_compile() { - kde4-base_src_compile - - # The building of apidox is not managed anymore by the build system - if use doc; then - einfo "Building API documentation" - cd "${S}"/doc/api/ - ./doxygen.sh "${S}" || die "APIDOX generation failed" - fi -} - -src_install() { - kde4-base_src_install - - # use system certificates - rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die - dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt - - if use doc; then - einfo "Installing API documentation. This could take a bit of time." - cd "${S}"/doc/api/ - docinto /HTML/en/kdelibs-apidox - 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 - - einfo Installing environment file. - # Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined. - echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde" - echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde" - doenvd "${T}/77kde" -} - -pkg_postinst() { - fdo-mime_mime_database_update - - if use zeroconf; then - echo - elog "To make zeroconf support available in KDE make sure that the avahi daemon" - elog "is running." - echo - einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns" - einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf" - einfo "to include 'mdns', e.g.:" - einfo " hosts: files mdns dns" - echo - fi - - kde4-base_pkg_postinst -} - -pkg_prerm() { - # Remove ksycoca4 global database - rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4 -} - -pkg_postrm() { - fdo-mime_mime_database_update - - kde4-base_pkg_postrm -} diff --git a/kde-base/kdelibs/metadata.xml b/kde-base/kdelibs/metadata.xml deleted file mode 100644 index 63ad9f4ad41..00000000000 --- a/kde-base/kdelibs/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - kde@gentoo.org - Gentoo KDE Project - - - Enable OpenGL support for Plasma (GLApplet) - - diff --git a/kde-frameworks/kdelibs/Manifest b/kde-frameworks/kdelibs/Manifest new file mode 100644 index 00000000000..d69eb2eb4fd --- /dev/null +++ b/kde-frameworks/kdelibs/Manifest @@ -0,0 +1,2 @@ +DIST kdelibs-4.14.24.tar.xz 11635840 SHA256 45e663e8739f131115eda69e5af95e895cce8161228d075d74a9a8cd390346ef SHA512 187737e30d05f324977cfc14aa375b49e15c322abb2b8f482382f9e6061bf7d18b97b957a7fcc1fb9184fa68cd3e1753d9633e14f32d799e3e5a78f283ff0894 WHIRLPOOL 2a4a67f792a2d88f2a4cfd49cafe2c611e79ba974a55d6d77e9688acf89be56817adfa6489017162afc42d7c30949df277b8974a2aaf59b2357a3b279a83b0a2 +DIST kdelibs-4.14.27.tar.xz 11641732 SHA256 b79fe7f8798fe6a3aade6eced396b40b5fbb638200604056a18b377ee76ecfb2 SHA512 52a76c6e5cb8366bf353a1eee8286f4165fcdf962ac0da5545a96e066bb513a9eedbbacd7ee6981d9034e08a84f795c68d26fa2f02774938ac1a4971a8a18427 WHIRLPOOL 4cfa7a6f9c7dd74c9e90e90c9950babd1cb966655b77093fbe6fc2a7172998c720c9b9fe29ac9f22e18f1577475668fa96c9b6142051a19ca20cb57324cc0692 diff --git a/kde-frameworks/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix-1.patch b/kde-frameworks/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix-1.patch new file mode 100644 index 00000000000..c12c2aba9ae --- /dev/null +++ b/kde-frameworks/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix-1.patch @@ -0,0 +1,18 @@ +Set XDG_MENU_PREFIX to kde-4- if not set. This fixes "empty-applications-menu" when running +KDE4 applications outside of KDE4 environment. + +Index: kded/vfolder_menu.cpp +=================================================================== +--- a/kded/vfolder_menu.cpp (revision 1014368) ++++ b/kded/vfolder_menu.cpp (working copy) +@@ -770,7 +770,9 @@ + QString result; + + QString xdgMenuPrefix = QString::fromLocal8Bit(qgetenv("XDG_MENU_PREFIX")); +- if (!xdgMenuPrefix.isEmpty()) ++ if (xdgMenuPrefix.isEmpty()) ++ xdgMenuPrefix = "kde-4-"; ++ + { + QFileInfo fileInfo(fileName); + diff --git a/kde-frameworks/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch b/kde-frameworks/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch new file mode 100644 index 00000000000..074847ae995 --- /dev/null +++ b/kde-frameworks/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch @@ -0,0 +1,30 @@ +Set up XDG_CONFIG_DIRS lookup in order: +1. custom XDG_CONFIG_DIRS from env +2. kdeprefix xdg config dirs +3. /etc/xdg + +Index: kdecore/kernel/kstandarddirs.cpp +=================================================================== +--- a/kdecore/kernel/kstandarddirs.cpp (revision 1014759) ++++ b/kdecore/kernel/kstandarddirs.cpp (working copy) +@@ -1664,16 +1664,13 @@ + { + tokenize(xdgdirList, xdgdirs, QString(QChar(KPATH_SEPARATOR))); + } +- else +- { +- xdgdirList.clear(); +- xdgdirList.append(QString::fromLatin1("/etc/xdg")); ++ + #ifdef Q_WS_WIN +- xdgdirList.append(installPath("kdedir") + QString::fromLatin1("etc/xdg")); ++ xdgdirList.append(installPath("kdedir") + QString::fromLatin1("etc/xdg")); + #else +- xdgdirList.append(QFile::decodeName(KDESYSCONFDIR "/xdg")); ++ xdgdirList.append(QFile::decodeName(KDESYSCONFDIR "/xdg")); + #endif +- } ++ xdgdirList.append(QString::fromLatin1("/etc/xdg")); + + QString localXdgDir = readEnvPath("XDG_CONFIG_HOME"); + if (!localXdgDir.isEmpty()) diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.10.0-udisks.patch b/kde-frameworks/kdelibs/files/kdelibs-4.10.0-udisks.patch new file mode 100644 index 00000000000..63e9b308838 --- /dev/null +++ b/kde-frameworks/kdelibs/files/kdelibs-4.10.0-udisks.patch @@ -0,0 +1,51 @@ +udisks1 is deprecated and going away, so removing this clause +will permit us to build without udisks at all. + +--- a/solid/solid/CMakeLists.txt ++++ b/solid/solid/CMakeLists.txt +@@ -283,20 +283,6 @@ + backends/udisks2/udisksgenericinterface.cpp + backends/udisks2/dbus/manager.cpp + ) +- else ( WITH_SOLID_UDISKS2 ) +- message(STATUS "Building Solid UDisks backend." ) +- set(solid_LIB_SRCS ${solid_LIB_SRCS} +- backends/udisks/udisksmanager.cpp +- backends/udisks/udisksdevice.cpp +- backends/udisks/udisksblock.cpp +- backends/udisks/udisksstoragevolume.cpp +- backends/udisks/udisksdeviceinterface.cpp +- backends/udisks/udisksopticaldisc.cpp +- backends/udisks/udisksopticaldrive.cpp +- backends/udisks/udisksstoragedrive.cpp +- backends/udisks/udisksstorageaccess.cpp +- backends/udisks/udisksgenericinterface.cpp +- ) + endif ( WITH_SOLID_UDISKS2 ) + endif (CMAKE_SYSTEM_NAME MATCHES Linux) + +--- a/solid/solid/managerbase.cpp ++++ b/solid/solid/managerbase.cpp +@@ -33,8 +33,6 @@ + #include "backends/hal/halmanager.h" + #if defined (WITH_SOLID_UDISKS2) + #include "backends/udisks2/udisksmanager.h" +-#else +-#include "backends/udisks/udisksmanager.h" + #endif + #include "backends/upower/upowermanager.h" + +@@ -88,11 +86,9 @@ + m_backends << new Solid::Backends::UDev::UDevManager(0); + # endif + # if defined(WITH_SOLID_UDISKS2) +- m_backends << new Solid::Backends::UDisks2::Manager(0) +-# else +- m_backends << new Solid::Backends::UDisks::UDisksManager(0) ++ m_backends << new Solid::Backends::UDisks2::Manager(0); + # endif +- << new Solid::Backends::UPower::UPowerManager(0) ++ m_backends << new Solid::Backends::UPower::UPowerManager(0) + << new Solid::Backends::Fstab::FstabManager(0); + } + # endif diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.14.20-FindQt4.patch b/kde-frameworks/kdelibs/files/kdelibs-4.14.20-FindQt4.patch new file mode 100644 index 00000000000..2325fb11c69 --- /dev/null +++ b/kde-frameworks/kdelibs/files/kdelibs-4.14.20-FindQt4.patch @@ -0,0 +1,39 @@ +Ensure that the correct version of Qt is always used. + +With the introduction qt-4.8.6, Qt binaries were moved from /usr/bin to +/usr/$(get_libdir)/qt4/bin, leaving behind in their place symlinks to qtchooser. + +There is no guarantee to which version of Qt these symlinks might point, so it +is necessary to find the correct version explicitly. + +Once qmake is found, it is queried for the correct location of all other items. + +Gentoo-bug: 562746 +Gentoo-bug: 583506 + +--- a/cmake/modules/FindQt4.cmake ++++ b/cmake/modules/FindQt4.cmake +@@ -446,6 +446,15 @@ GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRENT_USER\\Software\\trollte + # check for qmake + # Debian uses qmake-qt4 + # macports' Qt uses qmake-mac ++if(CMAKE_BUILD_TYPE STREQUAL Gentoo) ++ find_program(QT_QMAKE_EXECUTABLE NAMES qmake ++ PATHS ++ $ENV{EPREFIX}/usr/${CMAKE_INSTALL_LIBDIR}/qt4/bin ++ $ENV{EPREFIX}/usr/bin ++ NO_DEFAULT_PATH ++ DOC "The qmake executable for the Qt installation to use" ++ ) ++else() + FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin" + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin" +@@ -453,6 +462,7 @@ FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS + $ENV{QTDIR}/bin + DOC "The qmake executable for the Qt installation to use" + ) ++endif() + + IF (QT_QMAKE_EXECUTABLE) + diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.14.20-strigi-optional.patch b/kde-frameworks/kdelibs/files/kdelibs-4.14.20-strigi-optional.patch new file mode 100644 index 00000000000..c9e96551cfb --- /dev/null +++ b/kde-frameworks/kdelibs/files/kdelibs-4.14.20-strigi-optional.patch @@ -0,0 +1,24 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e7b2bea..87147b5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -82,17 +82,10 @@ set_package_properties(ZLIB PROPERTIES DESCRIPTION "Support for gzip compressed + ) + + find_package(Strigi 0.6.3) +-if (WIN32) +- set (STRIGI_TYPE "OPTIONAL") +- set (STRIGI_EXTRA_TEXT "") +-else (WIN32) +- set (STRIGI_TYPE "REQUIRED") +- set (STRIGI_EXTRA_TEXT "Required by some critical kioslaves") +-endif (WIN32) + set_package_properties(Strigi PROPERTIES DESCRIPTION "Desktop indexing and search support" + URL "http://strigi.sourceforge.net" +- TYPE ${STRIGI_TYPE} +- PURPOSE ${STRIGI_EXTRA_TEXT} ++ TYPE OPTIONAL ++ PURPOSE "Required by some kioslaves for metadata support" + ) + + find_package(LibAttica 0.4.2) diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.14.22-webkit.patch b/kde-frameworks/kdelibs/files/kdelibs-4.14.22-webkit.patch new file mode 100644 index 00000000000..dcbb565cedc --- /dev/null +++ b/kde-frameworks/kdelibs/files/kdelibs-4.14.22-webkit.patch @@ -0,0 +1,85 @@ +--- a/CMakeLists.txt 2016-07-06 12:18:35.000000000 +0200 ++++ b/CMakeLists.txt 2016-07-21 21:40:26.080328514 +0200 +@@ -45,6 +45,9 @@ + ############### Give the user the option to build the deprecated WMI solid backend instead of the new win backend ############### + option(WITH_SOLID_WMI "Enables the deprecated WMI backend on Windows") + ++############### Give the user the option to build without qtwebkit dependency ############### ++option(WITH_KDEWEBKIT "Enables the deprecated kdewebkit and kdewebkit-widgets" "ON") ++ + ############### Load the CTest options ############### + # CTestCustom.cmake has to be in the CTEST_BINARY_DIR. + # in the KDE build system, this is the same as CMAKE_BINARY_DIR. +@@ -363,7 +366,9 @@ + add_subdirectory( plasma ) + endif(NOT WINCE) + add_subdirectory( kunitconversion ) ++if(WITH_KDEWEBKIT) + add_subdirectory( kdewebkit ) ++endif(WITH_KDEWEBKIT) + add_subdirectory( includes ) + + add_subdirectory( experimental ) +--- a/kdewidgets/CMakeLists.txt 2016-07-06 12:18:35.000000000 +0200 ++++ b/kdewidgets/CMakeLists.txt 2016-07-21 21:39:54.031052674 +0200 +@@ -90,6 +90,7 @@ + + + # kdewebkit widgets ++ if(WITH_KDEWEBKIT) + include_directories( + ${CMAKE_SOURCE_DIR}/kdewebkit + ) +@@ -121,7 +122,7 @@ + endif(NOT WIN32) + + install(TARGETS kdewebkitwidgets DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer ) +- ++ endif(WITH_KDEWEBKIT) + + if (QT_QT3SUPPORT_FOUND) + +--- a/plasma/CMakeLists.txt 2016-07-22 01:26:52.992198945 +0200 ++++ b/plasma/CMakeLists.txt 2016-07-22 01:28:10.487904045 +0200 +@@ -10,6 +10,10 @@ + set(PLASMA_NO_GLOBAL_SHORTCUTS TRUE) + endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION) + ++if(NOT WITH_KDEWEBKIT) ++ set(PLASMA_NO_KDEWEBKIT TRUE) ++endif(NOT WITH_KDEWEBKIT) ++ + set(PLASMA_NO_PACKAGEKIT TRUE) + + include_directories(${CMAKE_CURRENT_SOURCE_DIR} +@@ -121,7 +125,6 @@ + framesvg.cpp + plasma.cpp + popupapplet.cpp +- private/animablegraphicswebview.cpp + private/applethandle.cpp + private/associatedapplicationmanager.cpp + private/componentinstaller.cpp +@@ -211,7 +214,6 @@ + widgets/textbrowser.cpp + widgets/treeview.cpp + widgets/textedit.cpp +- widgets/webview.cpp + + #Temporary QtJolie branch + private/qtjolie-branch/qtjolie/abstractadaptor.cpp +@@ -245,6 +247,14 @@ + ) + endif(NOT KDE_NO_DEPRECATED) + ++if(NOT PLASMA_NO_KDEWEBKIT) ++ set(plasma_LIB_SRCS ++ ${plasma_LIB_SRCS} ++ private/animablegraphicswebview.cpp ++ widgets/webview.cpp ++ ) ++endif(NOT PLASMA_NO_KDEWEBKIT) ++ + kde4_add_kcfg_files(plasma_LIB_SRCS data/kconfigxt/libplasma-theme-global.kcfgc) + + kde4_add_ui_files(plasma_LIB_SRCS diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.14.5-fatalwarnings.patch b/kde-frameworks/kdelibs/files/kdelibs-4.14.5-fatalwarnings.patch new file mode 100644 index 00000000000..3f571d63a03 --- /dev/null +++ b/kde-frameworks/kdelibs/files/kdelibs-4.14.5-fatalwarnings.patch @@ -0,0 +1,16 @@ +Avoid build failure due to harmless warnings on some platforms (eg. ARM) being +forced fatal. + +--- a/cmake/modules/FindKDE4Internal.cmake ++++ b/cmake/modules/FindKDE4Internal.cmake +@@ -1100,8 +1100,8 @@ + if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU) + if (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE) +- set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}") +- set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_MODULE_LINKER_FLAGS}") ++ set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}") ++ set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined -lc ${CMAKE_MODULE_LINKER_FLAGS}") + + set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--enable-new-dtags ${CMAKE_SHARED_LINKER_FLAGS}") + set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--enable-new-dtags ${CMAKE_MODULE_LINKER_FLAGS}") diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.14.5-mimetypes.patch b/kde-frameworks/kdelibs/files/kdelibs-4.14.5-mimetypes.patch new file mode 100644 index 00000000000..38cac84f620 --- /dev/null +++ b/kde-frameworks/kdelibs/files/kdelibs-4.14.5-mimetypes.patch @@ -0,0 +1,27 @@ +Remove fake MIME types that cause warnings. + +The offending MIME types are commented out rather than +physically removed because doing so would cause the patch +to be too large. + +--- a/mimetypes/kde.xml ++++ b/mimetypes/kde.xml +@@ -1784,7 +1784,8 @@ + + + +- ++ + + + fonts package diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch b/kde-frameworks/kdelibs/files/kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch new file mode 100644 index 00000000000..006ca00a458 --- /dev/null +++ b/kde-frameworks/kdelibs/files/kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch @@ -0,0 +1,46 @@ +diff -purN kdelibs-4.3.80.orig/kdeui/util/kkeyserver_mac.cpp kdelibs-4.3.80/kdeui/util/kkeyserver_mac.cpp +--- a/kdelibs-4.3.80.orig/kdeui/util/kkeyserver_mac.cpp 2009-12-14 17:05:26.284881642 -0500 ++++ b/kdelibs-4.3.80/kdeui/util/kkeyserver_mac.cpp 2009-12-14 17:11:23.393094384 -0500 +@@ -68,7 +68,7 @@ namespace KKeyServer { + #ifdef QT_MAC_USE_COCOA + static TISInputSourceRef lastLayout = 0; + #else +- static KeyboardLayoutRef lastLayout = NULL; ++ static TISInputSourceRef lastLayout = NULL; + #endif + + void updateScancodes() { +@@ -125,16 +125,27 @@ namespace KKeyServer { + #endif + lastLayout = layout; + scancodes.clear(); +- void *kchr; +- if (KLGetKeyboardLayoutProperty(layout, kKLKCHRData, const_cast(&kchr)) != noErr) { ++ UCKeyboardLayout *uchr = (UCKeyboardLayout *)TISGetInputSourceProperty(layout, kTISPropertyUnicodeKeyLayoutData); ++ if (uchr == NULL) { + kWarning() << "Couldn't load active keyboard layout"; + } else { + for (int i = 0; i < 128; i++) { + UInt32 tmpState = 0; +- UInt32 chr = KeyTranslate(kchr, i, &tmpState); +- if (chr && chr != kFunctionKeyCharCode) { +- scancodes.insert(chr, i); +- } ++ UInt32 deadKeyState = 0; ++ UInt32 flags = 0; ++ UniCharCount maxStringLength = 255; ++ UniCharCount actualStringLength = 0; ++ UniChar unicodeString[maxStringLength]; ++ ++ UCKeyTranslate(uchr, i, kUCKeyActionDown, ++ flags, LMGetKbdType(), ++ 1, &deadKeyState, maxStringLength, &actualStringLength, unicodeString); ++ fprintf(stderr, "Got key: %s\n", unicodeString); ++ fflush(stderr); ++ //UInt32 chr = KeyTranslate(kchr, i, &tmpState); ++ //if (chr && chr != kFunctionKeyCharCode) { ++ // scancodes.insert(chr, i); ++ //} + } + } + } diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.4.90-xslt.patch b/kde-frameworks/kdelibs/files/kdelibs-4.4.90-xslt.patch new file mode 100644 index 00000000000..0d25ada337b --- /dev/null +++ b/kde-frameworks/kdelibs/files/kdelibs-4.4.90-xslt.patch @@ -0,0 +1,12 @@ +diff -r -u kdelibs-4.4.90.orig/kdoctools/customization/htdig_index.xsl kdelibs-4.4.90/kdoctools/customization/htdig_index.xsl +--- kdelibs-4.4.90.orig/kdoctools/customization/htdig_index.xsl 2008-05-21 13:07:13.000000000 +0200 ++++ kdelibs-4.4.90/kdoctools/customization/htdig_index.xsl 2010-07-08 23:32:28.184204481 +0200 +@@ -35,7 +35,7 @@ + + + +- ++ + + + diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.6.3-no_suid_kdeinit.patch b/kde-frameworks/kdelibs/files/kdelibs-4.6.3-no_suid_kdeinit.patch new file mode 100644 index 00000000000..4b34f62c2be --- /dev/null +++ b/kde-frameworks/kdelibs/files/kdelibs-4.6.3-no_suid_kdeinit.patch @@ -0,0 +1,19 @@ +diff -urN kdelibs-4.6.3.old/kinit/CMakeLists.txt kdelibs-4.6.3/kinit/CMakeLists.txt +--- kdelibs-4.6.3.old/kinit/CMakeLists.txt 2011-05-02 00:19:10.000000000 +0200 ++++ kdelibs-4.6.3/kinit/CMakeLists.txt 2011-05-02 00:20:32.000000000 +0200 +@@ -170,15 +170,6 @@ + install(TARGETS start_kdeinit_wrapper DESTINATION ${LIBEXEC_INSTALL_DIR}) + endif (NOT WIN32) + +-if (CMAKE_SYSTEM_NAME MATCHES Linux) +- MESSAGE(STATUS "Using setuid root kdeinit wrapper in order to protect it from bad Linux OOM-killer") +- set(KDEINIT_OOM_PROTECT 1) +- install(CODE " +- set(START_KDEINIT_PATH \"\$ENV{DESTDIR}${LIBEXEC_INSTALL_DIR}/start_kdeinit\") +- EXECUTE_PROCESS(COMMAND sh -c \"chown 0 '\${START_KDEINIT_PATH}' && chmod u+s '\${START_KDEINIT_PATH}'\") +- ") +-endif (CMAKE_SYSTEM_NAME MATCHES Linux) +- + ########### install files ############### + + install( FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.KLauncher.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} ) diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.8.1-norpath.patch b/kde-frameworks/kdelibs/files/kdelibs-4.8.1-norpath.patch new file mode 100644 index 00000000000..83d5576ac02 --- /dev/null +++ b/kde-frameworks/kdelibs/files/kdelibs-4.8.1-norpath.patch @@ -0,0 +1,18 @@ +diff -ruN kdelibs-4.8.1.orig/cmake/modules/FindKDE4Internal.cmake kdelibs-4.8.1/cmake/modules/FindKDE4Internal.cmake +--- kdelibs-4.8.1.orig/cmake/modules/FindKDE4Internal.cmake 2012-02-29 22:55:52.000000000 +0100 ++++ kdelibs-4.8.1/cmake/modules/FindKDE4Internal.cmake 2012-03-24 17:18:59.452942648 +0100 +@@ -1045,7 +1045,13 @@ + + set(CMAKE_SKIP_BUILD_RPATH FALSE) + set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) +- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) ++ ++ # the RPATH to be used when installing ++ SET(CMAKE_INSTALL_RPATH "") ++ ++ # don't add the automatically determined parts of the RPATH ++ # which point to directories outside the build tree to the install RPATH ++ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE) + endif (APPLE) + endif (UNIX) + diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.9.3-werror.patch b/kde-frameworks/kdelibs/files/kdelibs-4.9.3-werror.patch new file mode 100644 index 00000000000..b094d12f722 --- /dev/null +++ b/kde-frameworks/kdelibs/files/kdelibs-4.9.3-werror.patch @@ -0,0 +1,20 @@ +--- a/cmake/modules/FindKDE4Internal.cmake ++++ b/cmake/modules/FindKDE4Internal.cmake +@@ -1204,7 +1204,7 @@ + set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline") + set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs") + +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common") + # As of Qt 4.6.x we need to override the new exception macros if we want compile with -fno-exceptions + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-exceptions -DQT_NO_EXCEPTIONS -fno-check-new -fno-common") + +@@ -1295,7 +1295,7 @@ + endif(NOT _compile_result) + + if (GCC_IS_NEWER_THAN_4_2) +- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-type -fvisibility-inlines-hidden") ++ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") + endif (GCC_IS_NEWER_THAN_4_2) + else (__KDE_HAVE_GCC_VISIBILITY AND GCC_IS_NEWER_THAN_4_1 AND NOT _GCC_COMPILED_WITH_BAD_ALLOCATOR AND NOT WIN32) + set (__KDE_HAVE_GCC_VISIBILITY 0) diff --git a/kde-frameworks/kdelibs/kdelibs-4.14.24.ebuild b/kde-frameworks/kdelibs/kdelibs-4.14.24.ebuild new file mode 100644 index 00000000000..9db907a1549 --- /dev/null +++ b/kde-frameworks/kdelibs/kdelibs-4.14.24.ebuild @@ -0,0 +1,301 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +CMAKE_MIN_VERSION="3.3.1-r1" +CPPUNIT_REQUIRED="optional" +DECLARATIVE_REQUIRED="always" +KDE_HANDBOOK="optional" +OPENGL_REQUIRED="optional" +WEBKIT_REQUIRED="optional" +inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic + +APPS_VERSION="16.08.1" # Don't forget to bump this + +DESCRIPTION="KDE libraries needed by all KDE programs" +[[ ${KDE_BUILD_TYPE} != live ]] && \ +SRC_URI="mirror://kde/stable/applications/${APPS_VERSION}/src/${P}.tar.xz" + +KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" +LICENSE="LGPL-2.1" +IUSE="cpu_flags_x86_3dnow acl altivec +bzip2 +crypt debug doc fam jpeg2k +kerberos libressl lzma cpu_flags_x86_mmx nls openexr +policykit spell +cpu_flags_x86_sse cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf" + +REQUIRED_USE=" + udisks? ( udev ) + upower? ( udev ) +" + +# needs the kate regression testsuite from svn +RESTRICT="test" + +COMMONDEPEND=" + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xsl-stylesheets + >=dev-libs/libattica-0.4.2 + dev-libs/libdbusmenu-qt[qt4] + dev-libs/libpcre[unicode] + dev-libs/libxml2 + dev-libs/libxslt + media-libs/fontconfig + media-libs/freetype:2 + media-libs/giflib:= + media-libs/libpng:0= + media-libs/phonon[qt4] + sys-libs/zlib + virtual/jpeg:0 + x11-misc/shared-mime-info + 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 ) + jpeg2k? ( media-libs/jasper:= ) + kerberos? ( virtual/krb5 ) + openexr? ( + media-libs/openexr:= + media-libs/ilmbase:= + ) + policykit? ( sys-auth/polkit-qt[qt4] ) + spell? ( app-text/enchant ) + ssl? ( + libressl? ( dev-libs/libressl:0= ) + !libressl? ( dev-libs/openssl:0= ) + ) + udev? ( virtual/udev ) + zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) +" +DEPEND="${COMMONDEPEND} + doc? ( app-doc/doxygen ) + nls? ( virtual/libintl ) +" +RDEPEND="${COMMONDEPEND} + !dev-qt/qtphonon + >=app-crypt/gnupg-2.0.11 + app-misc/ca-certificates + kde-frameworks/kdelibs-env:4 + sys-apps/dbus[X] + !aqua? ( + udisks? ( sys-fs/udisks:2 ) + x11-apps/iceauth + x11-apps/rgb + x11-misc/xdg-utils + upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) ) + ) + udev? ( app-misc/media-player-info ) +" +PDEPEND=" + $(add_kdeapps_dep katepart '' 4.14.3) + || ( + $(add_kdeapps_dep kfmclient '' 4.14.3) + x11-misc/xdg-utils + ) + handbook? ( kde-apps/khelpcenter:* ) + policykit? ( || ( + >=sys-auth/polkit-kde-agent-0.99 + kde-plasma/polkit-kde-agent + ) ) +" + +PATCHES=( + "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch" + "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch" + "${FILESDIR}/${PN}-4.14.5-fatalwarnings.patch" + "${FILESDIR}/${PN}-4.14.5-mimetypes.patch" + "${FILESDIR}/${PN}-4.4.90-xslt.patch" + "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch" + "${FILESDIR}/${PN}-4.8.1-norpath.patch" + "${FILESDIR}/${PN}-4.9.3-werror.patch" + "${FILESDIR}/${PN}-4.10.0-udisks.patch" + "${FILESDIR}/${PN}-4.14.20-FindQt4.patch" + "${FILESDIR}/${PN}-4.14.20-strigi-optional.patch" + "${FILESDIR}/${PN}-4.14.22-webkit.patch" +) + +pkg_pretend() { + if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc; then + [[ $(gcc-major-version) -lt 4 ]] || \ + ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \ + && die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)." + fi +} + +src_prepare() { + kde4-base_src_prepare + + # Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work) + sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \ + -i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed." + + 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 + epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch + fi +} + +src_configure() { + local mycmakeargs=( + -DWITH_HSPELL=OFF + -DWITH_ASPELL=OFF + -DKDE_DEFAULT_HOME=.kde4 + -DKAUTH_BACKEND=POLKITQT-1 + -DWITH_Soprano=OFF + -DWITH_SharedDesktopOntologies=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Strigi=ON + -DBUILD_doc=$(usex handbook) + -DHAVE_X86_3DNOW=$(usex cpu_flags_x86_3dnow) + -DHAVE_PPC_ALTIVEC=$(usex altivec) + -DHAVE_X86_MMX=$(usex cpu_flags_x86_mmx) + -DHAVE_X86_SSE=$(usex cpu_flags_x86_sse) + -DHAVE_X86_SSE2=$(usex cpu_flags_x86_sse2) + -DWITH_ACL=$(usex acl) + -DWITH_BZip2=$(usex bzip2) + -DWITH_QCA2=$(usex crypt) + -DWITH_FAM=$(usex fam) + -DWITH_Jasper=$(usex jpeg2k) + -DWITH_GSSAPI=$(usex kerberos) + -DWITH_LibLZMA=$(usex lzma) + -DWITH_Libintl=$(usex nls) + -DWITH_OpenEXR=$(usex openexr) + -DWITH_OpenGL=$(usex opengl) + -DWITH_PolkitQt-1=$(usex policykit) + -DWITH_ENCHANT=$(usex spell) + -DWITH_OpenSSL=$(usex ssl) + -DWITH_UDev=$(usex udev) + -DWITH_SOLID_UDISKS2=$(usex udisks) + -DWITH_Avahi=$(usex zeroconf) + -DWITH_KDEWEBKIT=$(usex webkit) + ) + + use zeroconf || mycmakeargs+=( -DWITH_DNSSD=OFF ) + + kde4-base_src_configure +} + +src_compile() { + kde4-base_src_compile + + # The building of apidox is not managed anymore by the build system + if use doc; then + einfo "Building API documentation" + cd "${S}"/doc/api/ + ./doxygen.sh "${S}" || die "APIDOX generation failed" + fi +} + +src_install() { + kde4-base_src_install + + # use system certificates + rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die + dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt + + if use doc; then + einfo "Installing API documentation. This could take a bit of time." + cd "${S}"/doc/api/ + docinto /HTML/en/kdelibs-apidox + 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 + + einfo Installing environment file. + # Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined. + echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde" + echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde" + doenvd "${T}/77kde" +} + +pkg_postinst() { + fdo-mime_mime_database_update + + if use zeroconf; then + echo + elog "To make zeroconf support available in KDE make sure that the avahi daemon" + elog "is running." + echo + einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns" + einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf" + einfo "to include 'mdns', e.g.:" + einfo " hosts: files mdns dns" + echo + fi + + kde4-base_pkg_postinst +} + +pkg_prerm() { + # Remove ksycoca4 global database + rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4 +} + +pkg_postrm() { + fdo-mime_mime_database_update + + kde4-base_pkg_postrm +} diff --git a/kde-frameworks/kdelibs/kdelibs-4.14.27.ebuild b/kde-frameworks/kdelibs/kdelibs-4.14.27.ebuild new file mode 100644 index 00000000000..4c221243ab6 --- /dev/null +++ b/kde-frameworks/kdelibs/kdelibs-4.14.27.ebuild @@ -0,0 +1,300 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +CMAKE_MIN_VERSION="3.3.1-r1" +CPPUNIT_REQUIRED="optional" +DECLARATIVE_REQUIRED="always" +KDE_HANDBOOK="optional" +OPENGL_REQUIRED="optional" +WEBKIT_REQUIRED="optional" +inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic + +APPS_VERSION="16.12.0" # Don't forget to bump this + +DESCRIPTION="KDE libraries needed by all KDE programs" +[[ ${KDE_BUILD_TYPE} != live ]] && \ +SRC_URI="mirror://kde/stable/applications/${APPS_VERSION}/src/${P}.tar.xz" + +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" +LICENSE="LGPL-2.1" +IUSE="cpu_flags_x86_3dnow acl altivec +bzip2 +crypt debug doc fam jpeg2k +kerberos libressl lzma cpu_flags_x86_mmx nls openexr +policykit spell +cpu_flags_x86_sse cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf" + +REQUIRED_USE=" + udisks? ( udev ) + upower? ( udev ) +" + +# needs the kate regression testsuite from svn +RESTRICT="test" + +COMMONDEPEND=" + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xsl-stylesheets + >=dev-libs/libattica-0.4.2 + dev-libs/libdbusmenu-qt[qt4] + dev-libs/libpcre[unicode] + dev-libs/libxml2 + dev-libs/libxslt + media-libs/fontconfig + media-libs/freetype:2 + media-libs/giflib:= + media-libs/libpng:0= + media-libs/phonon[qt4] + sys-libs/zlib + virtual/jpeg:0 + x11-misc/shared-mime-info + 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 ) + jpeg2k? ( media-libs/jasper:= ) + kerberos? ( virtual/krb5 ) + openexr? ( + media-libs/openexr:= + media-libs/ilmbase:= + ) + policykit? ( sys-auth/polkit-qt[qt4] ) + spell? ( app-text/enchant ) + ssl? ( + libressl? ( dev-libs/libressl:0= ) + !libressl? ( dev-libs/openssl:0= ) + ) + udev? ( virtual/udev ) + zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) +" +DEPEND="${COMMONDEPEND} + doc? ( app-doc/doxygen ) + nls? ( virtual/libintl ) +" +RDEPEND="${COMMONDEPEND} + !dev-qt/qtphonon + >=app-crypt/gnupg-2.0.11 + app-misc/ca-certificates + kde-frameworks/kdelibs-env:4 + sys-apps/dbus[X] + !aqua? ( + udisks? ( sys-fs/udisks:2 ) + x11-apps/iceauth + x11-apps/rgb + x11-misc/xdg-utils + upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) ) + ) + udev? ( app-misc/media-player-info ) +" +PDEPEND=" + $(add_kdeapps_dep katepart '' 4.14.3) + || ( + $(add_kdeapps_dep kfmclient '' 4.14.3) + x11-misc/xdg-utils + ) + handbook? ( kde-apps/khelpcenter:* ) + policykit? ( || ( + >=sys-auth/polkit-kde-agent-0.99 + kde-plasma/polkit-kde-agent + ) ) +" + +PATCHES=( + "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch" + "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch" + "${FILESDIR}/${PN}-4.14.5-fatalwarnings.patch" + "${FILESDIR}/${PN}-4.14.5-mimetypes.patch" + "${FILESDIR}/${PN}-4.4.90-xslt.patch" + "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch" + "${FILESDIR}/${PN}-4.8.1-norpath.patch" + "${FILESDIR}/${PN}-4.9.3-werror.patch" + "${FILESDIR}/${PN}-4.10.0-udisks.patch" + "${FILESDIR}/${PN}-4.14.20-FindQt4.patch" + "${FILESDIR}/${PN}-4.14.22-webkit.patch" +) + +pkg_pretend() { + if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc; then + [[ $(gcc-major-version) -lt 4 ]] || \ + ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \ + && die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)." + fi +} + +src_prepare() { + kde4-base_src_prepare + + # Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work) + sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \ + -i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed." + + 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 + epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch + fi +} + +src_configure() { + local mycmakeargs=( + -DWITH_HSPELL=OFF + -DWITH_ASPELL=OFF + -DKDE_DEFAULT_HOME=.kde4 + -DKAUTH_BACKEND=POLKITQT-1 + -DWITH_Soprano=OFF + -DWITH_SharedDesktopOntologies=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Strigi=ON + -DBUILD_doc=$(usex handbook) + -DHAVE_X86_3DNOW=$(usex cpu_flags_x86_3dnow) + -DHAVE_PPC_ALTIVEC=$(usex altivec) + -DHAVE_X86_MMX=$(usex cpu_flags_x86_mmx) + -DHAVE_X86_SSE=$(usex cpu_flags_x86_sse) + -DHAVE_X86_SSE2=$(usex cpu_flags_x86_sse2) + -DWITH_ACL=$(usex acl) + -DWITH_BZip2=$(usex bzip2) + -DWITH_QCA2=$(usex crypt) + -DWITH_FAM=$(usex fam) + -DWITH_Jasper=$(usex jpeg2k) + -DWITH_GSSAPI=$(usex kerberos) + -DWITH_LibLZMA=$(usex lzma) + -DWITH_Libintl=$(usex nls) + -DWITH_OpenEXR=$(usex openexr) + -DWITH_OpenGL=$(usex opengl) + -DWITH_PolkitQt-1=$(usex policykit) + -DWITH_ENCHANT=$(usex spell) + -DWITH_OpenSSL=$(usex ssl) + -DWITH_UDev=$(usex udev) + -DWITH_SOLID_UDISKS2=$(usex udisks) + -DWITH_Avahi=$(usex zeroconf) + -DWITH_KDEWEBKIT=$(usex webkit) + ) + + use zeroconf || mycmakeargs+=( -DWITH_DNSSD=OFF ) + + kde4-base_src_configure +} + +src_compile() { + kde4-base_src_compile + + # The building of apidox is not managed anymore by the build system + if use doc; then + einfo "Building API documentation" + cd "${S}"/doc/api/ + ./doxygen.sh "${S}" || die "APIDOX generation failed" + fi +} + +src_install() { + kde4-base_src_install + + # use system certificates + rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die + dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt + + if use doc; then + einfo "Installing API documentation. This could take a bit of time." + cd "${S}"/doc/api/ + docinto /HTML/en/kdelibs-apidox + 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 + + einfo Installing environment file. + # Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined. + echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde" + echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde" + doenvd "${T}/77kde" +} + +pkg_postinst() { + fdo-mime_mime_database_update + + if use zeroconf; then + echo + elog "To make zeroconf support available in KDE make sure that the avahi daemon" + elog "is running." + echo + einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns" + einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf" + einfo "to include 'mdns', e.g.:" + einfo " hosts: files mdns dns" + echo + fi + + kde4-base_pkg_postinst +} + +pkg_prerm() { + # Remove ksycoca4 global database + rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4 +} + +pkg_postrm() { + fdo-mime_mime_database_update + + kde4-base_pkg_postrm +} diff --git a/kde-frameworks/kdelibs/metadata.xml b/kde-frameworks/kdelibs/metadata.xml new file mode 100644 index 00000000000..63ad9f4ad41 --- /dev/null +++ b/kde-frameworks/kdelibs/metadata.xml @@ -0,0 +1,11 @@ + + + + + kde@gentoo.org + Gentoo KDE Project + + + Enable OpenGL support for Plasma (GLApplet) + + diff --git a/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild b/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild index 941e98f3656..fa5839f8260 100644 --- a/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild +++ b/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -29,7 +29,7 @@ IUSE="debug kde" CDEPEND=" dev-qt/qtcore:4 dev-qt/qtgui:4 - kde? ( $(add_kdebase_dep kdelibs) ) + kde? ( kde-frameworks/kdelibs:4 ) " DEPEND="${CDEPEND} sys-devel/gettext diff --git a/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild b/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild index 6881973583c..beb094accaa 100644 --- a/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild +++ b/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild @@ -36,7 +36,7 @@ CDEPEND=" dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) - kde? ( $(add_kdebase_dep kdelibs) ) + kde? ( kde-frameworks/kdelibs:4 ) " DEPEND="${CDEPEND} sys-devel/gettext diff --git a/kde-misc/kfilebox/kfilebox-0.4.9.ebuild b/kde-misc/kfilebox/kfilebox-0.4.9.ebuild index e759cee9fb5..816ed96dd4c 100644 --- a/kde-misc/kfilebox/kfilebox-0.4.9.ebuild +++ b/kde-misc/kfilebox/kfilebox-0.4.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -21,7 +21,7 @@ IUSE="" for name in ${LANGS} ; do IUSE+="linguas_$name " ; done unset name -DEPEND="kde-base/kdelibs" +DEPEND="kde-frameworks/kdelibs:4" RDEPEND="${DEPEND}" S=${WORKDIR}/${MY_P} diff --git a/kde-misc/plasma-lionmail/plasma-lionmail-0_p20121020.ebuild b/kde-misc/plasma-lionmail/plasma-lionmail-0_p20121020.ebuild index ed4fd104eed..64723321371 100644 --- a/kde-misc/plasma-lionmail/plasma-lionmail-0_p20121020.ebuild +++ b/kde-misc/plasma-lionmail/plasma-lionmail-0_p20121020.ebuild @@ -16,9 +16,9 @@ KEYWORDS="~amd64 ~x86" IUSE="debug" DEPEND=" - $(add_kdebase_dep kdelibs) $(add_kdeapps_dep kdepimlibs) kde-apps/akonadi:4 + kde-frameworks/kdelibs:4 dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtwebkit:4 diff --git a/kde-plasma/breeze/breeze-5.8.3.ebuild b/kde-plasma/breeze/breeze-5.8.3.ebuild index 50e994a6792..2f6a2f0c7da 100644 --- a/kde-plasma/breeze/breeze-5.8.3.ebuild +++ b/kde-plasma/breeze/breeze-5.8.3.ebuild @@ -28,7 +28,7 @@ COMMON_DEPEND=" $(add_qt_dep qtx11extras) x11-libs/libxcb qt4? ( - kde-base/kdelibs:4 + kde-frameworks/kdelibs:4 x11-libs/libX11 ) wayland? ( $(add_frameworks_dep kwayland) ) diff --git a/kde-plasma/breeze/breeze-5.8.4.ebuild b/kde-plasma/breeze/breeze-5.8.4.ebuild index 7a46fbc4719..6929778eb14 100644 --- a/kde-plasma/breeze/breeze-5.8.4.ebuild +++ b/kde-plasma/breeze/breeze-5.8.4.ebuild @@ -28,7 +28,7 @@ COMMON_DEPEND=" $(add_qt_dep qtx11extras) x11-libs/libxcb qt4? ( - kde-base/kdelibs:4 + kde-frameworks/kdelibs:4 x11-libs/libX11 ) wayland? ( $(add_frameworks_dep kwayland) ) diff --git a/kde-plasma/kwin/kwin-4.11.22.ebuild b/kde-plasma/kwin/kwin-4.11.22.ebuild index 5e9fc97c5a7..717579f07dd 100644 --- a/kde-plasma/kwin/kwin-4.11.22.ebuild +++ b/kde-plasma/kwin/kwin-4.11.22.ebuild @@ -21,7 +21,7 @@ IUSE="debug gles opengl wayland" COMMONDEPEND=" kde-frameworks/kactivities:4 - $(add_kdebase_dep kdelibs opengl) + kde-frameworks/kdelibs:4[opengl] kde-plasma/kephal:4 kde-plasma/libkworkspace:4 kde-plasma/liboxygenstyle:4 diff --git a/kde-plasma/oxygen/oxygen-5.8.3.ebuild b/kde-plasma/oxygen/oxygen-5.8.3.ebuild index 3798d2e7fd6..701b200fd29 100644 --- a/kde-plasma/oxygen/oxygen-5.8.3.ebuild +++ b/kde-plasma/oxygen/oxygen-5.8.3.ebuild @@ -29,7 +29,7 @@ COMMON_DEPEND=" $(add_qt_dep qtx11extras) x11-libs/libxcb qt4? ( - kde-base/kdelibs:4 + kde-frameworks/kdelibs:4 x11-libs/libX11 ) wayland? ( $(add_frameworks_dep kwayland) ) diff --git a/kde-plasma/oxygen/oxygen-5.8.4.ebuild b/kde-plasma/oxygen/oxygen-5.8.4.ebuild index 4c8fcd1b70a..7f94ea94074 100644 --- a/kde-plasma/oxygen/oxygen-5.8.4.ebuild +++ b/kde-plasma/oxygen/oxygen-5.8.4.ebuild @@ -29,7 +29,7 @@ COMMON_DEPEND=" $(add_qt_dep qtx11extras) x11-libs/libxcb qt4? ( - kde-base/kdelibs:4 + kde-frameworks/kdelibs:4 x11-libs/libX11 ) wayland? ( $(add_frameworks_dep kwayland) ) diff --git a/media-gfx/wally/wally-2.4.5.ebuild b/media-gfx/wally/wally-2.4.5.ebuild index 19b48f7bf5a..837bd698726 100644 --- a/media-gfx/wally/wally-2.4.5.ebuild +++ b/media-gfx/wally/wally-2.4.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -24,7 +24,7 @@ DEPEND=" dev-qt/qtgui:4 dev-qt/qtsql:4 dev-qt/qtsvg:4 - kde? ( $(add_kdebase_dep kdelibs) ) + kde? ( kde-frameworks/kdelibs:4 ) " RDEPEND="${DEPEND}" diff --git a/media-sound/amarok/amarok-2.8.0-r3.ebuild b/media-sound/amarok/amarok-2.8.0-r3.ebuild index a0216b82425..ca05a3056b2 100644 --- a/media-sound/amarok/amarok-2.8.0-r3.ebuild +++ b/media-sound/amarok/amarok-2.8.0-r3.ebuild @@ -39,7 +39,7 @@ fi # ipod requires gdk enabled and also gtk compiled in libgpod COMMONDEPEND=" app-crypt/qca:2[qt4(+)] - $(add_kdebase_dep kdelibs 'opengl?' 4.8.4) + kde-frameworks/kdelibs:4[opengl?] $(add_kdeapps_dep kdebase-kioslaves) >=media-libs/taglib-1.7[asf(+),mp4(+)] >=media-libs/taglib-extras-1.0.1 diff --git a/media-sound/amarok/amarok-2.8.90-r2.ebuild b/media-sound/amarok/amarok-2.8.90-r2.ebuild index a088d19f91d..40177e61530 100644 --- a/media-sound/amarok/amarok-2.8.90-r2.ebuild +++ b/media-sound/amarok/amarok-2.8.90-r2.ebuild @@ -34,7 +34,7 @@ fi # ipod requires gdk enabled and also gtk compiled in libgpod COMMONDEPEND=" app-crypt/qca:2[qt4(+)] - $(add_kdebase_dep kdelibs 'opengl?' 4.8.4) + kde-frameworks/kdelibs:4[opengl?] $(add_kdeapps_dep kdebase-kioslaves) >=media-libs/taglib-1.7[asf(+),mp4(+)] >=media-libs/taglib-extras-1.0.1 diff --git a/media-sound/kaudiocreator/kaudiocreator-1.3-r3.ebuild b/media-sound/kaudiocreator/kaudiocreator-1.3-r3.ebuild index da9b210895c..261e166d8f8 100644 --- a/media-sound/kaudiocreator/kaudiocreator-1.3-r3.ebuild +++ b/media-sound/kaudiocreator/kaudiocreator-1.3-r3.ebuild @@ -27,7 +27,7 @@ DEPEND=" " RDEPEND="${DEPEND} - $(add_kdebase_dep kdelibs 'udev,udisks(+)') + kde-frameworks/kdelibs:4[udev,udisks(+)] $(add_kdeapps_dep audiocd-kio) " diff --git a/media-video/qx11grab/qx11grab-0.4.12.ebuild b/media-video/qx11grab/qx11grab-0.4.12.ebuild index 39b2df9fd48..ffbeb0cd25a 100644 --- a/media-video/qx11grab/qx11grab-0.4.12.ebuild +++ b/media-video/qx11grab/qx11grab-0.4.12.ebuild @@ -28,7 +28,7 @@ RDEPEND=" >=x11-libs/libXrandr-1.3 libav? ( >=media-video/libav-9:0=[X,encode,truetype] ) !libav? ( >=media-video/ffmpeg-1.1:0=[X,encode,truetype] ) - kde? ( kde-base/kdelibs:4 ) + kde? ( kde-frameworks/kdelibs:4 ) opengl? ( >=dev-qt/qtopengl-4.7.4:4 ) pulseaudio? ( media-sound/pulseaudio ) " diff --git a/media-video/vlc/vlc-2.2.1-r1.ebuild b/media-video/vlc/vlc-2.2.1-r1.ebuild index 92c84d513a8..8e73802f175 100644 --- a/media-video/vlc/vlc-2.2.1-r1.ebuild +++ b/media-video/vlc/vlc-2.2.1-r1.ebuild @@ -177,7 +177,7 @@ RDEPEND="${RDEPEND} " DEPEND="${RDEPEND} - !qt5? ( kde? ( kde-base/kdelibs:4 ) ) + !qt5? ( kde? ( kde-frameworks/kdelibs:4 ) ) xcb? ( x11-proto/xproto:0 ) app-arch/xz-utils:0 x86? ( dev-lang/yasm:* ) diff --git a/media-video/vlc/vlc-2.2.4-r1.ebuild b/media-video/vlc/vlc-2.2.4-r1.ebuild index ded746abf6e..43aa8cf68ca 100644 --- a/media-video/vlc/vlc-2.2.4-r1.ebuild +++ b/media-video/vlc/vlc-2.2.4-r1.ebuild @@ -177,7 +177,7 @@ RDEPEND="${RDEPEND} " DEPEND="${RDEPEND} - !qt5? ( kde? ( kde-base/kdelibs:4 ) ) + !qt5? ( kde? ( kde-frameworks/kdelibs:4 ) ) amd64? ( dev-lang/yasm:* ) x86? ( dev-lang/yasm:* ) xcb? ( x11-proto/xproto:0 ) diff --git a/media-video/vlc/vlc-2.2.4.ebuild b/media-video/vlc/vlc-2.2.4.ebuild index 7854b231f9b..da16f6c2999 100644 --- a/media-video/vlc/vlc-2.2.4.ebuild +++ b/media-video/vlc/vlc-2.2.4.ebuild @@ -179,7 +179,7 @@ RDEPEND="${RDEPEND} " DEPEND="${RDEPEND} - !qt5? ( kde? ( kde-base/kdelibs:4 ) ) + !qt5? ( kde? ( kde-frameworks/kdelibs:4 ) ) xcb? ( x11-proto/xproto:0 ) app-arch/xz-utils:0 x86? ( dev-lang/yasm:* ) diff --git a/media-video/vlc/vlc-2.2.9999.ebuild b/media-video/vlc/vlc-2.2.9999.ebuild index 81f54364250..0e60e1c4965 100644 --- a/media-video/vlc/vlc-2.2.9999.ebuild +++ b/media-video/vlc/vlc-2.2.9999.ebuild @@ -177,7 +177,7 @@ RDEPEND="${RDEPEND} " DEPEND="${RDEPEND} - !qt5? ( kde? ( kde-base/kdelibs:4 ) ) + !qt5? ( kde? ( kde-frameworks/kdelibs:4 ) ) amd64? ( dev-lang/yasm:* ) x86? ( dev-lang/yasm:* ) xcb? ( x11-proto/xproto:0 ) diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index ebe73b8d12b..e9be021649a 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -177,7 +177,7 @@ RDEPEND="${RDEPEND} " DEPEND="${RDEPEND} - !qt5? ( kde? ( kde-base/kdelibs:4 ) ) + !qt5? ( kde? ( kde-frameworks/kdelibs:4 ) ) amd64? ( dev-lang/yasm:* ) x86? ( dev-lang/yasm:* ) xcb? ( x11-proto/xproto:0 ) diff --git a/net-analyzer/nmapsi/nmapsi-0.4.1.ebuild b/net-analyzer/nmapsi/nmapsi-0.4.1.ebuild index cdc4ac7705b..ef422088db1 100644 --- a/net-analyzer/nmapsi/nmapsi-0.4.1.ebuild +++ b/net-analyzer/nmapsi/nmapsi-0.4.1.ebuild @@ -24,7 +24,7 @@ DEPEND=" dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtwebkit:4 - kde? ( kde-base/kdelibs:4 ) + kde? ( kde-frameworks/kdelibs:4 ) " RDEPEND="${DEPEND} >=net-analyzer/nmap-6.00 diff --git a/net-im/qutim/qutim-0.3.2.ebuild b/net-im/qutim/qutim-0.3.2.ebuild index 87b71a613f2..2c13245a57a 100644 --- a/net-im/qutim/qutim-0.3.2.ebuild +++ b/net-im/qutim/qutim-0.3.2.ebuild @@ -59,7 +59,7 @@ CDEPEND=" histman? ( >=dev-qt/qtsql-${QT_PV} ) ayatana? ( >=dev-libs/libindicate-qt-0.2.2 ) hunspell? ( app-text/hunspell ) - kde? ( kde-base/kdelibs:4 ) + kde? ( kde-frameworks/kdelibs:4 ) mobility? ( dev-qt/qt-mobility[multimedia,feedback] >=dev-qt/qtbearer-${QT_PV} diff --git a/net-im/qutim/qutim-0.3.3_p1.ebuild b/net-im/qutim/qutim-0.3.3_p1.ebuild index 611370eaf8b..9d926bbae4c 100644 --- a/net-im/qutim/qutim-0.3.3_p1.ebuild +++ b/net-im/qutim/qutim-0.3.3_p1.ebuild @@ -59,7 +59,7 @@ CDEPEND=" histman? ( >=dev-qt/qtsql-${QT_PV} ) ayatana? ( >=dev-libs/libindicate-qt-0.2.2 ) hunspell? ( app-text/hunspell ) - kde? ( kde-base/kdelibs:4 ) + kde? ( kde-frameworks/kdelibs:4 ) mobility? ( dev-qt/qt-mobility[multimedia,feedback] >=dev-qt/qtbearer-${QT_PV} diff --git a/net-irc/quassel/quassel-0.12.4.ebuild b/net-irc/quassel/quassel-0.12.4.ebuild index c5434745d99..9f34a3ce991 100644 --- a/net-irc/quassel/quassel-0.12.4.ebuild +++ b/net-irc/quassel/quassel-0.12.4.ebuild @@ -64,7 +64,7 @@ GUI_RDEPEND=" >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt4(+)] dev-qt/qtdbus:4 kde? ( - kde-base/kdelibs:4 + kde-frameworks/kdelibs:4 kde-frameworks/oxygen-icons:* ayatana? ( kde-misc/plasma-widget-message-indicator ) ) diff --git a/net-libs/libproxy/libproxy-0.4.11-r2.ebuild b/net-libs/libproxy/libproxy-0.4.11-r2.ebuild index eae73af8077..1ae5fe64c49 100644 --- a/net-libs/libproxy/libproxy-0.4.11-r2.ebuild +++ b/net-libs/libproxy/libproxy-0.4.11-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -21,7 +21,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" # NOTE: mozjs/spidermonkey might still cause problems like #373397 ? # NOTE: webkit-gtk:3, not :2, needed for libjavascriptcoregtk support RDEPEND="gnome? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] ) - kde? ( >=kde-base/kdelibs-4.4.5 ) + kde? ( kde-frameworks/kdelibs:4 ) mono? ( dev-lang/mono ) networkmanager? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) perl? ( dev-lang/perl:= ) diff --git a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.4.ebuild b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.4.ebuild index d5d96a44dda..d48f3cb7758 100644 --- a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.4.ebuild +++ b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -22,7 +22,7 @@ DEPEND="${DEPEND} libnotify? ( gtk? ( x11-libs/libnotify ) gtk3? ( x11-libs/libnotify ) - qt4? ( kde-base/kdelibs ) + qt4? ( kde-frameworks/kdelibs:4 ) ) gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) diff --git a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5-r1.ebuild b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5-r1.ebuild index 78bfb2a6701..43ea008a342 100644 --- a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5-r1.ebuild +++ b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5-r1.ebuild @@ -25,7 +25,7 @@ DEPEND=" libnotify? ( gtk? ( x11-libs/libnotify ) gtk3? ( x11-libs/libnotify ) - qt4? ( kde-base/kdelibs kde-apps/knotify ) + qt4? ( kde-frameworks/kdelibs:4 kde-apps/knotify:4 ) ) gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) diff --git a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5.ebuild b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5.ebuild index 5f4c71ea697..d44d63c21e0 100644 --- a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5.ebuild +++ b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5.ebuild @@ -25,7 +25,7 @@ DEPEND="${DEPEND} libnotify? ( gtk? ( x11-libs/libnotify ) gtk3? ( x11-libs/libnotify ) - qt4? ( kde-base/kdelibs ) + qt4? ( kde-frameworks/kdelibs:4 ) ) gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) diff --git a/net-misc/hotot/hotot-0.9.8.14.ebuild b/net-misc/hotot/hotot-0.9.8.14.ebuild index a6ad8b9193f..5a893d378d5 100644 --- a/net-misc/hotot/hotot-0.9.8.14.ebuild +++ b/net-misc/hotot/hotot-0.9.8.14.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -23,7 +23,7 @@ RDEPEND="${PYTHON_DEPS} dev-python/dbus-python[${PYTHON_USEDEP}] gtk? ( dev-python/pywebkitgtk ) qt4? ( dev-qt/qtwebkit:4 - kde? ( kde-base/kdelibs ) )" + kde? ( kde-frameworks/kdelibs:4 ) )" DEPEND="${RDEPEND} sys-devel/gettext qt4? ( dev-qt/qtsql:4 )" diff --git a/net-misc/hotot/hotot-0.9.8.14_p20130514-r1.ebuild b/net-misc/hotot/hotot-0.9.8.14_p20130514-r1.ebuild index 4657908c44c..f5115f9d1ea 100644 --- a/net-misc/hotot/hotot-0.9.8.14_p20130514-r1.ebuild +++ b/net-misc/hotot/hotot-0.9.8.14_p20130514-r1.ebuild @@ -22,7 +22,7 @@ REQUIRED_USE="|| ( chrome qt4 ) ${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} dev-python/dbus-python[${PYTHON_USEDEP}] qt4? ( dev-qt/qtwebkit:4 - kde? ( kde-base/kdelibs ) ) + kde? ( kde-frameworks/kdelibs:4 ) ) " DEPEND="${RDEPEND} sys-devel/gettext diff --git a/net-misc/hotot/hotot-0.9.8.14_p20130514.ebuild b/net-misc/hotot/hotot-0.9.8.14_p20130514.ebuild index 3f85cc51625..dc692194940 100644 --- a/net-misc/hotot/hotot-0.9.8.14_p20130514.ebuild +++ b/net-misc/hotot/hotot-0.9.8.14_p20130514.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -23,7 +23,7 @@ RDEPEND="${PYTHON_DEPS} dev-python/dbus-python[${PYTHON_USEDEP}] gtk? ( dev-python/pywebkitgtk[${PYTHON_USEDEP}] ) qt4? ( dev-qt/qtwebkit:4 - kde? ( kde-base/kdelibs ) )" + kde? ( kde-frameworks/kdelibs:4 ) )" DEPEND="${RDEPEND} sys-devel/gettext qt4? ( dev-qt/qtsql:4 )" diff --git a/net-misc/hotot/hotot-9999.ebuild b/net-misc/hotot/hotot-9999.ebuild index 4bb51e0393c..652b40a5222 100644 --- a/net-misc/hotot/hotot-9999.ebuild +++ b/net-misc/hotot/hotot-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -23,7 +23,7 @@ RDEPEND="${PYTHON_DEPS} dev-python/dbus-python[${PYTHON_USEDEP}] gtk? ( dev-python/pywebkitgtk[${PYTHON_USEDEP}] ) qt4? ( dev-qt/qtwebkit:4 - kde? ( kde-base/kdelibs ) )" + kde? ( kde-frameworks/kdelibs:4 ) )" DEPEND="${RDEPEND} sys-devel/gettext qt4? ( dev-qt/qtsql:4 )" diff --git a/net-p2p/ktorrent/ktorrent-4.3.1-r1.ebuild b/net-p2p/ktorrent/ktorrent-4.3.1-r1.ebuild index cb204f6fa72..57aceac6237 100644 --- a/net-p2p/ktorrent/ktorrent-4.3.1-r1.ebuild +++ b/net-p2p/ktorrent/ktorrent-4.3.1-r1.ebuild @@ -49,8 +49,8 @@ COMMONDEPEND=" mediaplayer? ( >=media-libs/taglib-1.5 ) rss? ( $(add_kdeapps_dep kdepimlibs) ) search? ( - $(add_kdebase_dep kdelibs webkit 4.14.22) dev-qt/qtwebkit:4 + kde-frameworks/kdelibs:4[webkit] ) " DEPEND="${COMMONDEPEND} diff --git a/profiles/arch/amd64-fbsd/todo/package.use.mask b/profiles/arch/amd64-fbsd/todo/package.use.mask index fcbb4f5f35f..3255f7e7c80 100644 --- a/profiles/arch/amd64-fbsd/todo/package.use.mask +++ b/profiles/arch/amd64-fbsd/todo/package.use.mask @@ -148,7 +148,7 @@ x11-base/xorg-drivers video_cards_tdfx # >=sys-auth/polkit-qt-0.103.0 # >=kde-misc/polkit-kde-kcmodules-0.98_pre20101127 # >=sys-auth/polkit-kde-agent-0.99 -kde-base/kdelibs policykit +kde-frameworks/kdelibs policykit # <=sci-geosciences/gpsd-2.95-r1 app-misc/geoclue gps diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask index dbd247d3217..b0cfce8b2cc 100644 --- a/profiles/arch/arm/package.use.mask +++ b/profiles/arch/arm/package.use.mask @@ -510,7 +510,7 @@ sys-auth/polkit kde app-text/asciidoc test # Michael Weber (10 Feb 2011) -# kde-base/kdelibs is not stable for arm +# kde-frameworks/kdelibs is not stable for arm net-libs/libproxy kde # Justin Lecher (14 Jen 2011) diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask index f6ff3fb183e..9d1712a6764 100644 --- a/profiles/arch/arm64/package.use.mask +++ b/profiles/arch/arm64/package.use.mask @@ -249,7 +249,7 @@ sys-auth/polkit kde app-text/asciidoc test # Michael Weber (10 Feb 2011) -# kde-base/kdelibs is not stable for arm +# kde-frameworks/kdelibs is not stable for arm net-libs/libproxy kde # Justin Lecher (14 Jen 2011) diff --git a/profiles/arch/nios2/package.use.mask b/profiles/arch/nios2/package.use.mask index dc85f13d40a..fd5ea3f2db6 100644 --- a/profiles/arch/nios2/package.use.mask +++ b/profiles/arch/nios2/package.use.mask @@ -233,7 +233,7 @@ sys-auth/polkit kde app-text/asciidoc test # Michael Weber (10 Feb 2011) -# kde-base/kdelibs is not stable for arm +# kde-frameworks/kdelibs is not stable for arm net-libs/libproxy kde # Justin Lecher (14 Jen 2011) diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask index 0ef948fd73c..d76017f97ae 100644 --- a/profiles/arch/powerpc/package.use.mask +++ b/profiles/arch/powerpc/package.use.mask @@ -25,7 +25,7 @@ app-misc/hachoir-metadata kde dev-vcs/subversion kde games-arcade/jumpnbump kde kde-apps/katepart handbook -kde-base/kdelibs handbook policykit +kde-frameworks/kdelibs handbook policykit net-libs/libproxy kde net-voip/ekiga kde sys-auth/polkit kde diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force index 7ff78845eee..9e482e4b42e 100644 --- a/profiles/base/package.use.force +++ b/profiles/base/package.use.force @@ -21,7 +21,7 @@ dev-lang/python threads # Michael Palimaka (27 Jul 2016) # Reverse dependencies need to be fully investigated yet -kde-base/kdelibs webkit +kde-frameworks/kdelibs webkit # Lars Wendler (11 Sep 2015) # Package fails to build with dbus USE flag being disabled (bug #560208) diff --git a/profiles/default/bsd/package.use.mask b/profiles/default/bsd/package.use.mask index c914d8f2cd5..5e5d61b9a48 100644 --- a/profiles/default/bsd/package.use.mask +++ b/profiles/default/bsd/package.use.mask @@ -95,7 +95,7 @@ media-libs/xine-lib fusion media-libs/mesa sysfs # needs udev -kde-base/kdelibs udisks upower +kde-frameworks/kdelibs udisks upower media-libs/mesa gbm dri3 x11-base/xorg-drivers video_cards_radeonsi x11-drivers/xf86-video-ati glamor diff --git a/profiles/default/linux/package.use.mask b/profiles/default/linux/package.use.mask index abbde2680a2..5117338d5e8 100644 --- a/profiles/default/linux/package.use.mask +++ b/profiles/default/linux/package.use.mask @@ -8,7 +8,7 @@ sys-auth/consolekit -cgroups # Michael Palimaka (03 Sep 2015) # Native inotify support is preferred on linux. -kde-base/kdelibs fam +kde-frameworks/kdelibs fam kde-frameworks/kcoreaddons fam # Christian Ruppert (23 Aug 2015) diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016 index a86928bef1a..4d83e501383 100644 --- a/profiles/updates/4Q-2016 +++ b/profiles/updates/4Q-2016 @@ -57,3 +57,4 @@ move kde-base/krosspython kde-apps/kross-interpreters move kde-base/katepart kde-apps/katepart move kde-base/pykde4 kde-apps/pykde4 move kde-base/kde-env kde-frameworks/kdelibs-env +move kde-base/kdelibs kde-frameworks/kdelibs diff --git a/sci-visualization/gwyddion/gwyddion-2.39.ebuild b/sci-visualization/gwyddion/gwyddion-2.39.ebuild index 028a8e1b9c3..818e98407a7 100644 --- a/sci-visualization/gwyddion/gwyddion-2.39.ebuild +++ b/sci-visualization/gwyddion/gwyddion-2.39.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -27,7 +27,7 @@ RDEPEND=" fits? ( sci-libs/cfitsio ) fftw? ( sci-libs/fftw:3.0 ) gnome? ( gnome-base/gconf:2 ) - kde? ( kde-base/kdelibs:4 ) + kde? ( kde-frameworks/kdelibs:4 ) opengl? ( virtual/opengl x11-libs/gtkglext ) perl? ( dev-lang/perl ) python? ( diff --git a/sci-visualization/gwyddion/gwyddion-2.44.ebuild b/sci-visualization/gwyddion/gwyddion-2.44.ebuild index d1f85c22995..e1460b9e083 100644 --- a/sci-visualization/gwyddion/gwyddion-2.44.ebuild +++ b/sci-visualization/gwyddion/gwyddion-2.44.ebuild @@ -27,7 +27,7 @@ RDEPEND=" fits? ( sci-libs/cfitsio ) fftw? ( sci-libs/fftw:3.0 ) gnome? ( gnome-base/gconf:2 ) - kde? ( kde-base/kdelibs:4 ) + kde? ( kde-frameworks/kdelibs:4 ) opengl? ( virtual/opengl x11-libs/gtkglext ) perl? ( dev-lang/perl ) python? ( diff --git a/www-client/opera/opera-12.16_p1860-r1.ebuild b/www-client/opera/opera-12.16_p1860-r1.ebuild index b206145f294..3a8348581e0 100644 --- a/www-client/opera/opera-12.16_p1860-r1.ebuild +++ b/www-client/opera/opera-12.16_p1860-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -73,7 +73,7 @@ GTKRDEPEND=" x11-libs/pixman " KDERDEPEND=" - kde-base/kdelibs + kde-frameworks/kdelibs:4 dev-qt/qtcore:4 dev-qt/qtgui:4 " diff --git a/www-plugins/adobe-flash/adobe-flash-24.0.0.186.ebuild b/www-plugins/adobe-flash/adobe-flash-24.0.0.186.ebuild index b248d1f5fea..5e7bdbb1007 100644 --- a/www-plugins/adobe-flash/adobe-flash-24.0.0.186.ebuild +++ b/www-plugins/adobe-flash/adobe-flash-24.0.0.186.ebuild @@ -49,7 +49,7 @@ NPAPI_RDEPEND=" dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 - kde-base/kdelibs + kde-frameworks/kdelibs:4 x11-libs/libICE x11-libs/libSM x11-libs/libXau diff --git a/x11-misc/piedock/piedock-1.6.6.ebuild b/x11-misc/piedock/piedock-1.6.6.ebuild index 788f26d0c88..5f1a094eca9 100644 --- a/x11-misc/piedock/piedock-1.6.6.ebuild +++ b/x11-misc/piedock/piedock-1.6.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -27,7 +27,7 @@ RDEPEND=" x11-libs/gtk+:2 ) kde? ( - kde-base/kdelibs:4 + kde-frameworks/kdelibs:4 dev-qt/qtcore:4 dev-qt/qtgui:4 ) diff --git a/x11-misc/qterm/qterm-0.5.12-r1.ebuild b/x11-misc/qterm/qterm-0.5.12-r1.ebuild index 637fc00fd29..3bf0b9c5b9a 100644 --- a/x11-misc/qterm/qterm-0.5.12-r1.ebuild +++ b/x11-misc/qterm/qterm-0.5.12-r1.ebuild @@ -25,7 +25,7 @@ RDEPEND=" x11-libs/libX11 " DEPEND="${RDEPEND} - kde-base/kdelibs + kde-frameworks/kdelibs:4 dev-qt/qthelp:4 dev-qt/qtwebkit:4" -- cgit v1.2.1