From 908478e5adca224c04b62ce4986361c2b016402a Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sat, 23 Jun 2018 10:35:41 +0200 Subject: profiles: Remove last-rited kde-frameworks/kdelibs +deps Closes: https://bugs.gentoo.org/629018 --- dev-libs/libattica/Manifest | 1 - dev-libs/libattica/libattica-0.4.2.ebuild | 47 ---- dev-libs/libattica/metadata.xml | 8 - .../kdelibs-env/kdelibs-env-4.14.3.ebuild | 33 --- kde-frameworks/kdelibs-env/metadata.xml | 8 - kde-frameworks/kdelibs/Manifest | 1 - .../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 --- .../kdelibs/files/kdelibs-4.14.22-webkit.patch | 85 ------- .../kdelibs/files/kdelibs-4.14.35-3dnow.patch | 19 -- .../files/kdelibs-4.14.35-kde3support.patch | 90 ------- .../kdelibs/files/kdelibs-4.14.35-plasma4.patch | 54 ---- .../files/kdelibs-4.14.5-fatalwarnings.patch | 16 -- .../kdelibs/files/kdelibs-4.14.5-mimetypes.patch | 27 -- .../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.37.ebuild | 283 --------------------- kde-frameworks/kdelibs/metadata.xml | 11 - kde-plasma/qguiplatformplugin_kde/Manifest | 1 - .../qguiplatformplugin_kde-4.11.22-cmake.patch | 17 -- kde-plasma/qguiplatformplugin_kde/metadata.xml | 8 - .../qguiplatformplugin_kde-4.11.22.ebuild | 31 --- profiles/package.mask | 7 - 27 files changed, 954 deletions(-) delete mode 100644 dev-libs/libattica/Manifest delete mode 100644 dev-libs/libattica/libattica-0.4.2.ebuild delete mode 100644 dev-libs/libattica/metadata.xml delete mode 100644 kde-frameworks/kdelibs-env/kdelibs-env-4.14.3.ebuild delete mode 100644 kde-frameworks/kdelibs-env/metadata.xml delete mode 100644 kde-frameworks/kdelibs/Manifest delete mode 100644 kde-frameworks/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix-1.patch delete mode 100644 kde-frameworks/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch delete mode 100644 kde-frameworks/kdelibs/files/kdelibs-4.10.0-udisks.patch delete mode 100644 kde-frameworks/kdelibs/files/kdelibs-4.14.20-FindQt4.patch delete mode 100644 kde-frameworks/kdelibs/files/kdelibs-4.14.22-webkit.patch delete mode 100644 kde-frameworks/kdelibs/files/kdelibs-4.14.35-3dnow.patch delete mode 100644 kde-frameworks/kdelibs/files/kdelibs-4.14.35-kde3support.patch delete mode 100644 kde-frameworks/kdelibs/files/kdelibs-4.14.35-plasma4.patch delete mode 100644 kde-frameworks/kdelibs/files/kdelibs-4.14.5-fatalwarnings.patch delete mode 100644 kde-frameworks/kdelibs/files/kdelibs-4.14.5-mimetypes.patch delete mode 100644 kde-frameworks/kdelibs/files/kdelibs-4.4.90-xslt.patch delete mode 100644 kde-frameworks/kdelibs/files/kdelibs-4.6.3-no_suid_kdeinit.patch delete mode 100644 kde-frameworks/kdelibs/files/kdelibs-4.8.1-norpath.patch delete mode 100644 kde-frameworks/kdelibs/files/kdelibs-4.9.3-werror.patch delete mode 100644 kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild delete mode 100644 kde-frameworks/kdelibs/metadata.xml delete mode 100644 kde-plasma/qguiplatformplugin_kde/Manifest delete mode 100644 kde-plasma/qguiplatformplugin_kde/files/qguiplatformplugin_kde-4.11.22-cmake.patch delete mode 100644 kde-plasma/qguiplatformplugin_kde/metadata.xml delete mode 100644 kde-plasma/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.22.ebuild diff --git a/dev-libs/libattica/Manifest b/dev-libs/libattica/Manifest deleted file mode 100644 index 036ca798d2dd..000000000000 --- a/dev-libs/libattica/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST attica-0.4.2.tar.bz2 57093 BLAKE2B 3bed190846d8d2f15c9b3f650ee6f224787e18287eec4ab746c92d6ececb08bfd732183450d6ba6ca628d48bedb7b1c3d6fc579dfe61b29bbd317943f36b019a SHA512 cef5d5c4bf01ed45ed8b59db354a4ac7949de435a45e4f753c847cadc15855e25997dedf1ff20c7bc4a2724d2cdba15139c54f0682df7d8cc8750de5be6f716e diff --git a/dev-libs/libattica/libattica-0.4.2.ebuild b/dev-libs/libattica/libattica-0.4.2.ebuild deleted file mode 100644 index 71dc23670246..000000000000 --- a/dev-libs/libattica/libattica-0.4.2.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -MY_P="${P#lib}" -MY_PN="${PN#lib}" - -if [[ $PV = *9999* ]]; then - EGIT_REPO_URI="git://anongit.kde.org/attica" - KEYWORDS="" - scm_eclass=git-2 -else - SRC_URI="mirror://kde/stable/${MY_PN}/${MY_P}.tar.bz2" - KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" -fi - -inherit cmake-utils ${scm_eclass} - -DESCRIPTION="A library providing access to Open Collaboration Services" -HOMEPAGE="https://www.kde.org/" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -IUSE="debug test" - -RDEPEND=" - dev-qt/qtcore:4 -" -DEPEND="${RDEPEND} - test? ( - dev-qt/qtgui:4 - dev-qt/qttest:4 - ) -" - -DOCS=( AUTHORS ChangeLog README ) - -S=${WORKDIR}/${MY_P} - -src_configure() { - local mycmakeargs=( - -DQT4_BUILD=true - $(cmake-utils_use test ATTICA_ENABLE_TESTS) - ) - cmake-utils_src_configure -} diff --git a/dev-libs/libattica/metadata.xml b/dev-libs/libattica/metadata.xml deleted file mode 100644 index 0cf59224b009..000000000000 --- a/dev-libs/libattica/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - kde@gentoo.org - Gentoo KDE Project - - diff --git a/kde-frameworks/kdelibs-env/kdelibs-env-4.14.3.ebuild b/kde-frameworks/kdelibs-env/kdelibs-env-4.14.3.ebuild deleted file mode 100644 index a6ebe5e9b499..000000000000 --- a/kde-frameworks/kdelibs-env/kdelibs-env-4.14.3.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Environment setting required for all KDELibs4 apps to run" -HOMEPAGE="https://www.kde.org/" -SRC_URI="" - -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" -LICENSE="GPL-2" -SLOT="4/4.14" -IUSE="" - -S="${WORKDIR}" - -src_install() { - # number goes down with version - newenvd - 43kdepaths < - - - - kde@gentoo.org - Gentoo KDE Project - - diff --git a/kde-frameworks/kdelibs/Manifest b/kde-frameworks/kdelibs/Manifest deleted file mode 100644 index 4b017adeaa17..000000000000 --- a/kde-frameworks/kdelibs/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST kdelibs-4.14.37.tar.xz 11642272 BLAKE2B 6d4384b9de08c557ba2a9af856825985bc26e71ab6deb515f13ad023a5c6f74d820666f13a6b719d51aff6fa03243f8606c3bbf568d279532ab7eb79c6cd5b2f SHA512 b25a845b7c1edae0c66b0a0881801dd3c57febc4cb57186ddddfd32c3253e492b7ff866fb38a10e4fb489233ecee71e80f3a1806f293a29607ea5f68d60ab6e1 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 deleted file mode 100644 index c12c2aba9aeb..000000000000 --- a/kde-frameworks/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-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 deleted file mode 100644 index 074847ae9953..000000000000 --- a/kde-frameworks/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-frameworks/kdelibs/files/kdelibs-4.10.0-udisks.patch b/kde-frameworks/kdelibs/files/kdelibs-4.10.0-udisks.patch deleted file mode 100644 index 63e9b308838b..000000000000 --- a/kde-frameworks/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-frameworks/kdelibs/files/kdelibs-4.14.20-FindQt4.patch b/kde-frameworks/kdelibs/files/kdelibs-4.14.20-FindQt4.patch deleted file mode 100644 index 2325fb11c693..000000000000 --- a/kde-frameworks/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-frameworks/kdelibs/files/kdelibs-4.14.22-webkit.patch b/kde-frameworks/kdelibs/files/kdelibs-4.14.22-webkit.patch deleted file mode 100644 index dcbb565cedc6..000000000000 --- a/kde-frameworks/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-frameworks/kdelibs/files/kdelibs-4.14.35-3dnow.patch b/kde-frameworks/kdelibs/files/kdelibs-4.14.35-3dnow.patch deleted file mode 100644 index 41a7aa874162..000000000000 --- a/kde-frameworks/kdelibs/files/kdelibs-4.14.35-3dnow.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit f96d12c9dbc59be09a7f8e29ced43f681e6f3dce -Author: Andreas Sturmlechner -Date: Sun Jul 23 01:18:26 2017 +0200 - - Add missing HAVE_X86_3DNOW cmakedefine - -diff --git a/solid/solid/config-processor.h.cmake b/solid/solid/config-processor.h.cmake -index f7c3d2b4bc..51ac8e18f5 100644 ---- a/solid/solid/config-processor.h.cmake -+++ b/solid/solid/config-processor.h.cmake -@@ -10,5 +10,7 @@ - #cmakedefine HAVE_X86_SSE2 - - /* Defined to 1 if the assembler supports AltiVec instructions. */ --#cmakedefine HAVE_PPC_ALTIVEC -+#cmakedefine HAVE_PPC_ALTIVEC - -+/* Defined to 1 if the assembler supports 3DNOW instructions. */ -+#cmakedefine HAVE_X86_3DNOW diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.14.35-kde3support.patch b/kde-frameworks/kdelibs/files/kdelibs-4.14.35-kde3support.patch deleted file mode 100644 index 956b01c80d29..000000000000 --- a/kde-frameworks/kdelibs/files/kdelibs-4.14.35-kde3support.patch +++ /dev/null @@ -1,90 +0,0 @@ -commit 8c1dbc358be1f66ba6cf2bcd574aa3739affec57 -Author: Andreas Sturmlechner -Date: Thu Feb 16 19:41:52 2017 +0100 - - Make kde3support and Qt3Support optional (default on) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 463919b669..d7caade3cf 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -48,6 +48,9 @@ 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") - -+############### Give the user the option to build without qt3support dependency ############### -+option(WITH_KDE3SUPPORT "Enables the deprecated kde3support" "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. -@@ -324,9 +327,9 @@ endif(NOT WINCE) - add_subdirectory( kio ) - add_subdirectory( solid ) - add_subdirectory( kded ) --if (QT_QT3SUPPORT_FOUND) -+if (WITH_KDE3SUPPORT AND QT_QT3SUPPORT_FOUND) - add_subdirectory( kde3support ) --endif (QT_QT3SUPPORT_FOUND) -+endif (WITH_KDE3SUPPORT AND QT_QT3SUPPORT_FOUND) - add_subdirectory( kfile ) - add_subdirectory( kconf_update ) - if(NOT WINCE) -diff --git a/includes/CMakeLists.txt b/includes/CMakeLists.txt -index cdf014320e..a303647c76 100644 ---- a/includes/CMakeLists.txt -+++ b/includes/CMakeLists.txt -@@ -1,4 +1,4 @@ --if (QT_QT3SUPPORT_FOUND) -+if (WITH_KDE3SUPPORT AND QT_QT3SUPPORT_FOUND) - install( FILES - K3BookmarkDrag - K3ButtonBox -@@ -50,7 +50,7 @@ install( FILES - K3NamedCommand - K3RFCDate - DESTINATION ${INCLUDE_INSTALL_DIR}/KDE COMPONENT Devel) --endif (QT_QT3SUPPORT_FOUND) -+endif (WITH_KDE3SUPPORT AND QT_QT3SUPPORT_FOUND) - - install( FILES - KACL -@@ -515,14 +515,14 @@ DESTINATION ${INCLUDE_INSTALL_DIR}/KDE COMPONENT Devel) - endif(NOT KDE_NO_DEPRECATED) - - if (UNIX) -- if (QT_QT3SUPPORT_FOUND) -+ if (WITH_KDE3SUPPORT AND QT_QT3SUPPORT_FOUND) - install( FILES - K3ProcIO - K3Process - K3ProcessController - K3ShellProcess - DESTINATION ${INCLUDE_INSTALL_DIR}/KDE COMPONENT Devel) -- endif (QT_QT3SUPPORT_FOUND) -+ endif (WITH_KDE3SUPPORT AND QT_QT3SUPPORT_FOUND) - - install( FILES - KDEsuClient -diff --git a/kdewidgets/CMakeLists.txt b/kdewidgets/CMakeLists.txt -index ecb6b69a5e..62db88b7c4 100644 ---- a/kdewidgets/CMakeLists.txt -+++ b/kdewidgets/CMakeLists.txt -@@ -124,7 +124,7 @@ if(QT_QTDESIGNER_FOUND) - install(TARGETS kdewebkitwidgets DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer ) - endif(WITH_KDEWEBKIT) - -- if (QT_QT3SUPPORT_FOUND) -+ if (WITH_KDE3SUPPORT AND QT_QT3SUPPORT_FOUND) - - include_directories( - ${CMAKE_SOURCE_DIR}/kde3support -@@ -158,7 +158,7 @@ if(QT_QTDESIGNER_FOUND) - endif(NOT WIN32) - - install(TARGETS kde3supportwidgets DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer ) -- endif (QT_QT3SUPPORT_FOUND) -+ endif (WITH_KDE3SUPPORT AND QT_QT3SUPPORT_FOUND) - endif (QT_QTDESIGNER_FOUND) - - ########### install files ############### diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.14.35-plasma4.patch b/kde-frameworks/kdelibs/files/kdelibs-4.14.35-plasma4.patch deleted file mode 100644 index 977c1a5e5df8..000000000000 --- a/kde-frameworks/kdelibs/files/kdelibs-4.14.35-plasma4.patch +++ /dev/null @@ -1,54 +0,0 @@ -commit 8a9ec27390a9df359343d1d3537b52e16f680c25 -Author: Andreas Sturmlechner -Date: Sun Jul 23 01:02:08 2017 +0200 - - Make Plasma-4 support optional (default on) - - This adds a new option WITH_PLASMA4SUPPORT. - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d7caade3cf..8e7759ef0d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -51,6 +51,9 @@ option(WITH_KDEWEBKIT "Enables the deprecated kdewebkit and kdewebkit-widgets" " - ############### Give the user the option to build without qt3support dependency ############### - option(WITH_KDE3SUPPORT "Enables the deprecated kde3support" "ON") - -+############### Give the user the option to build without Plasma-4 support ############### -+option(WITH_PLASMA4SUPPORT "Enables the deprecated Plasma-4 Workspace support" "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. -@@ -358,9 +361,9 @@ endif(NOT WINCE) - add_subdirectory( dnssd ) - add_subdirectory( kross ) - add_subdirectory( security ) --if(NOT WINCE) -+if(NOT WINCE AND WITH_PLASMA4SUPPORT) - add_subdirectory( plasma ) --endif(NOT WINCE) -+endif(NOT WINCE AND WITH_PLASMA4SUPPORT) - add_subdirectory( kunitconversion ) - if(WITH_KDEWEBKIT) - add_subdirectory( kdewebkit ) -diff --git a/includes/CMakeLists.txt b/includes/CMakeLists.txt -index cdf014320e..44f3fdd6e2 100644 ---- a/includes/CMakeLists.txt -+++ b/includes/CMakeLists.txt -@@ -1051,6 +1051,7 @@ install(FILES - DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Nepomuk/Vocabulary COMPONENT Devel) - - -+if(WITH_PLASMA4SUPPORT) - install(FILES - Plasma/AbstractDialogManager - Plasma/AbstractRunner -@@ -1145,6 +1146,7 @@ install( FILES - Plasma/AnimationDriver - DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Plasma COMPONENT Devel) - endif(NOT KDE_NO_DEPRECATED) -+endif(WITH_PLASMA4SUPPORT) - - - install(FILES diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.14.5-fatalwarnings.patch b/kde-frameworks/kdelibs/files/kdelibs-4.14.5-fatalwarnings.patch deleted file mode 100644 index 3f571d63a03d..000000000000 --- a/kde-frameworks/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-frameworks/kdelibs/files/kdelibs-4.14.5-mimetypes.patch b/kde-frameworks/kdelibs/files/kdelibs-4.14.5-mimetypes.patch deleted file mode 100644 index 38cac84f6201..000000000000 --- a/kde-frameworks/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-frameworks/kdelibs/files/kdelibs-4.4.90-xslt.patch b/kde-frameworks/kdelibs/files/kdelibs-4.4.90-xslt.patch deleted file mode 100644 index 0d25ada337b0..000000000000 --- a/kde-frameworks/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-frameworks/kdelibs/files/kdelibs-4.6.3-no_suid_kdeinit.patch b/kde-frameworks/kdelibs/files/kdelibs-4.6.3-no_suid_kdeinit.patch deleted file mode 100644 index 4b34f62c2be4..000000000000 --- a/kde-frameworks/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-frameworks/kdelibs/files/kdelibs-4.8.1-norpath.patch b/kde-frameworks/kdelibs/files/kdelibs-4.8.1-norpath.patch deleted file mode 100644 index 83d5576ac023..000000000000 --- a/kde-frameworks/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-frameworks/kdelibs/files/kdelibs-4.9.3-werror.patch b/kde-frameworks/kdelibs/files/kdelibs-4.9.3-werror.patch deleted file mode 100644 index b094d12f7227..000000000000 --- a/kde-frameworks/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-frameworks/kdelibs/kdelibs-4.14.37.ebuild b/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild deleted file mode 100644 index ce48c2e3f5c4..000000000000 --- a/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild +++ /dev/null @@ -1,283 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -QT_MINIMAL="4.8.7" -inherit cmake-utils toolchain-funcs flag-o-matic gnome2-utils toolchain-funcs xdg-utils - -DESCRIPTION="Libraries needed for programs by KDE" -HOMEPAGE="https://www.kde.org/" -SRC_URI="mirror://kde/stable/applications/17.08.2/src/${P}.tar.xz" - -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" -LICENSE="LGPL-2.1" -SLOT="4/4.14" -IUSE="cpu_flags_x86_3dnow acl altivec +bzip2 debug doc fam +handbook jpeg2k kerberos -libressl lzma cpu_flags_x86_mmx nls openexr plasma +policykit qt3support -spell test 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-lang/perl - >=dev-libs/libattica-0.4.2 - dev-libs/libdbusmenu-qt[qt4] - dev-libs/libpcre[unicode] - dev-libs/libxml2 - dev-libs/libxslt - >=dev-qt/designer-${QT_MINIMAL}:4 - >=dev-qt/qtcore-${QT_MINIMAL}:4[qt3support?,ssl] - >=dev-qt/qtdbus-${QT_MINIMAL}:4 - >=dev-qt/qtdeclarative-${QT_MINIMAL}:4 - >=dev-qt/qtgui-${QT_MINIMAL}:4[accessibility,dbus(+)] - >=dev-qt/qtscript-${QT_MINIMAL}:4 - >=dev-qt/qtsvg-${QT_MINIMAL}:4 - 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-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXcursor - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXft - x11-libs/libXpm - x11-libs/libXrender - x11-libs/libXScrnSaver - x11-libs/libXtst - x11-misc/shared-mime-info - !kernel_SunOS? ( || ( - sys-libs/libutempter - >=sys-freebsd/freebsd-lib-9.0 - ) ) - acl? ( virtual/acl ) - bzip2? ( app-arch/bzip2 ) - fam? ( virtual/fam ) - jpeg2k? ( media-libs/jasper:= ) - kerberos? ( virtual/krb5 ) - openexr? ( - media-libs/openexr:= - media-libs/ilmbase:= - ) - plasma? ( - app-crypt/qca:2[qt4] - >=dev-qt/qtsql-${QT_MINIMAL}:4[qt3support?] - ) - 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} - >=dev-qt/qttest-${QT_MINIMAL}:4 - doc? ( app-doc/doxygen ) - nls? ( virtual/libintl ) - test? ( dev-util/cppunit ) -" -RDEPEND="${COMMONDEPEND} - !dev-qt/qtphonon - >=app-crypt/gnupg-2.0.11 - app-misc/ca-certificates - kde-frameworks/kdelibs-env:4 - kde-frameworks/oxygen-icons - sys-apps/dbus[X] - x11-apps/iceauth - x11-apps/rgb - x11-misc/xdg-utils - plasma? ( !sci-libs/plasma ) - udev? ( app-misc/media-player-info ) - udisks? ( sys-fs/udisks:2 ) - upower? ( >=sys-power/upower-0.9.23 ) -" -PDEPEND=" - dev-util/automoc - virtual/pkgconfig - x11-base/xorg-proto - >=x11-libs/libXtst-1.1.0 - x11-misc/xdg-utils - handbook? ( kde-apps/khelpcenter:* ) - policykit? ( kde-plasma/polkit-kde-agent ) -" - -DOCS=( AUTHORS README{,-WIN32.TXT} TODO ) - -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" - "${FILESDIR}/${PN}-4.14.35-3dnow.patch" - "${FILESDIR}/${PN}-4.14.35-kde3support.patch" - "${FILESDIR}/${PN}-4.14.35-plasma4.patch" -) - -src_prepare() { - cmake-utils_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." - - sed -i -e "/if/ s/QT_QTOPENGL_FOUND/FALSE/" \ - plasma/CMakeLists.txt plasma/tests/CMakeLists.txt includes/CMakeLists.txt \ - || die "failed to sed out QT_QTOPENGL_FOUND" -} - -src_configure() { - local mycmakeargs=( - -DWITH_HSPELL=OFF - -DWITH_ASPELL=OFF - -DKDE_DEFAULT_HOME=.kde4 - -DKDE_DISTRIBUTION_TEXT=Gentoo - -DKDE4_BUILD_TESTS=OFF - -DKAUTH_BACKEND=POLKITQT-1 - -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc - -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_FAM=$(usex fam) - -DWITH_Jasper=$(usex jpeg2k) - -DWITH_GSSAPI=$(usex kerberos) - -DWITH_LibLZMA=$(usex lzma) - -DWITH_Libintl=$(usex nls) - -DWITH_OpenEXR=$(usex openexr) - -DWITH_PLASMA4SUPPORT=$(usex plasma) - -DWITH_QCA2=$(usex plasma) - -DWITH_PolkitQt-1=$(usex policykit) - -DWITH_KDE3SUPPORT=$(usex qt3support) - -DWITH_ENCHANT=$(usex spell) - -DWITH_OpenSSL=$(usex ssl) - -DWITH_UDev=$(usex udev) - -DWITH_SOLID_UDISKS2=$(usex udisks) - -DWITH_KDEWEBKIT=OFF - -DWITH_Avahi=$(usex zeroconf) - ) - - use zeroconf || mycmakeargs+=( -DWITH_DNSSD=OFF ) - - if use debug; then - # Set "real" debug mode - CMAKE_KDE_BUILD_TYPE="Debugfull" - else - # Handle common release builds - append-cppflags -DQT_NO_DEBUG - fi - - tc-is-cross-compiler || cmakeargs+=( -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" ) - #qmake -query QT_INSTALL_LIBS unavailable when cross-compiling - tc-is-cross-compiler && cmakeargs+=( -DQT_LIBRARY_DIR="${ROOT}"/usr/$(get_libdir)/qt4 ) - #kde-config -path data unavailable when cross-compiling - tc-is-cross-compiler && cmakeargs+=( -DKDE4_DATA_DIR="${ROOT}"/usr/share/apps/ ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_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() { - for doc in "${S}"/*/{AUTHORS,ChangeLog*,README*,TODO}; do - [[ -f ${doc} && -s ${doc} ]] && newdoc "${doc}" "$(basename $(dirname ${doc})).$(basename ${doc})" - done - - cmake-utils_src_install - - # We don't want /usr/share/doc/HTML to be compressed, - # because then khelpcenter can't find the docs - [[ -d ${ED}/usr/share/doc/HTML ]] && - docompress -x /usr/share/doc/HTML - - # 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 - dodoc -r ${P}-apidocs/* - fi - - # We don't package it, so don't install headers - rm -r "${ED}"/usr/include/KDE/Nepomuk || die - - 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_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - - if use zeroconf; then - elog - elog "To make zeroconf support available in applications make sure that the avahi daemon" - elog "is running." - elog - elog "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns" - elog "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf" - elog "to include 'mdns', e.g.:" - elog " hosts: files mdns dns" - elog - fi -} - -pkg_prerm() { - # Remove ksycoca4 global database - rm -f "${EROOT%/}"/usr/share/kde4/services/ksycoca4 || die -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_database_update -} diff --git a/kde-frameworks/kdelibs/metadata.xml b/kde-frameworks/kdelibs/metadata.xml deleted file mode 100644 index ed16b85b6d74..000000000000 --- a/kde-frameworks/kdelibs/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - kde@gentoo.org - Gentoo KDE Project - - - Enable kde3support/qt3support for very old applications - - diff --git a/kde-plasma/qguiplatformplugin_kde/Manifest b/kde-plasma/qguiplatformplugin_kde/Manifest deleted file mode 100644 index 747700987229..000000000000 --- a/kde-plasma/qguiplatformplugin_kde/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST kde-workspace-4.11.22.tar.xz 13553668 BLAKE2B 119f48758bd4d7eb32ebe5dd031de9afe31382f7c001edadf985486a860caa3adb4f170aaf763a9bbba10af21622a31740db12bedaa9caf201e0f00ae1bdff12 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 diff --git a/kde-plasma/qguiplatformplugin_kde/files/qguiplatformplugin_kde-4.11.22-cmake.patch b/kde-plasma/qguiplatformplugin_kde/files/qguiplatformplugin_kde-4.11.22-cmake.patch deleted file mode 100644 index defd44f26514..000000000000 --- a/kde-plasma/qguiplatformplugin_kde/files/qguiplatformplugin_kde-4.11.22-cmake.patch +++ /dev/null @@ -1,17 +0,0 @@ -Standalone build of the plugin. - ---- a/CMakeLists.txt 2018-01-04 21:38:30.921464554 +0100 -+++ b/CMakeLists.txt 2018-01-04 21:38:30.890464324 +0100 -@@ -1,5 +1,12 @@ -+cmake_minimum_required(VERSION 2.8.6 FATAL_ERROR) -+ - project(qguiplatformplugin_kde) - -+find_package(KDE4 4.9.4 REQUIRED) -+include(KDE4Defaults) -+add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) -+include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES}) -+ - set(kde_SOURCES qguiplatformplugin_kde.cpp) - qt4_generate_moc(qguiplatformplugin_kde.cpp ${CMAKE_CURRENT_BINARY_DIR}/qguiplatformplugin_kde.moc) - diff --git a/kde-plasma/qguiplatformplugin_kde/metadata.xml b/kde-plasma/qguiplatformplugin_kde/metadata.xml deleted file mode 100644 index 2fdbf33d963d..000000000000 --- a/kde-plasma/qguiplatformplugin_kde/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - kde@gentoo.org - Gentoo KDE Project - - diff --git a/kde-plasma/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.22.ebuild b/kde-plasma/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.22.ebuild deleted file mode 100644 index 718a88956c5e..000000000000 --- a/kde-plasma/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.22.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils flag-o-matic - -DESCRIPTION="Helps integration of pure Qt4 applications with KDE Plasma" -HOMEPAGE="https://www.kde.org/" -SRC_URI="mirror://kde/Attic/applications/15.08.0/src/kde-workspace-${PV}.tar.xz" - -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux" -LICENSE="GPL-2" -SLOT="4/4.11" -IUSE="debug" - -RDEPEND=" - dev-qt/qtcore:4 - dev-qt/qtgui:4 - kde-frameworks/kdelibs:4 -" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/kde-workspace-${PV}/qguiplatformplugin_kde" - -PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) - -src_configure() { - use debug || append-cppflags -DQT_NO_DEBUG - cmake-utils_src_configure -} diff --git a/profiles/package.mask b/profiles/package.mask index 31012dd6167b..aadad308f01a 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -352,13 +352,6 @@ app-i18n/ibus-tutcode # x11-drivers/nvidia-drivers. Work in progress. media-libs/libglvnd -# Andreas Sturmlechner (24 May 2018) -# Depends on dead Qt4. Masked for removal in 30 days. Bug #629018 -dev-libs/libattica -kde-frameworks/kdelibs -kde-frameworks/kdelibs-env -kde-plasma/qguiplatformplugin_kde - # Andreas Sturmlechner (18 May 2018) # Breaking consumers by internal header cleanup and removal of deprecated # qt5_use_modules from Qt5CoreMacros.cmake. File bugs with fixes upstream -- cgit v1.2.3-65-gdbad