From: Andreas Sturmlechner Date: Mon, 1 Apr 2019 20:33:19 +0000 (+0200) Subject: dev-util/kdevelop-php: Drop 5.2.4-r1 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=de4190feda960c6a4c49a72ee2a787aa75f17edd;p=gentoo.git dev-util/kdevelop-php: Drop 5.2.4-r1 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner --- diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest index 7f7618f614d4..d87e2026b8a2 100644 --- a/dev-util/kdevelop-php/Manifest +++ b/dev-util/kdevelop-php/Manifest @@ -1,2 +1 @@ -DIST kdev-php-5.2.4.tar.xz 685356 BLAKE2B d9c9feb1099b5d6b0d57651f2588ad51016e159bde78a7104c3f9b429e75c9ef596329173e27f5010e39388575e23b920af2b7fec72b0801c21370f235f20acf SHA512 3729cf0ea4ade85349778dd05ef9835a6993309aed05c7d7ef7d91c90ddaf09d1c5fad495753aa32f6a93b339dfbd14be9cb4b06b04a10d9d065aa8cfa1fa3cd DIST kdev-php-5.3.2.tar.xz 1008036 BLAKE2B 33940afeeb7b8594f0dbf56e444ba05f9665c7e4c9bc1d55c9d6a5b85bd2e03a04db1b8f27d968d627e26cfa573a3da519bb1d0eb592dc784296c9db7ea1fad8 SHA512 d8649bca173eccc1aa6568715e5976beb762ad7a377adbdab8f55aad76176ca5c8d16477ec70fa231b5699105d2a827c2ffda1c4835419c670c561b4444605b4 diff --git a/dev-util/kdevelop-php/files/kdevelop-php-5.2.4-tests-optional.patch b/dev-util/kdevelop-php/files/kdevelop-php-5.2.4-tests-optional.patch deleted file mode 100644 index 853952f11ac5..000000000000 --- a/dev-util/kdevelop-php/files/kdevelop-php-5.2.4-tests-optional.patch +++ /dev/null @@ -1,76 +0,0 @@ -From eb3a484c072f7cc5a319d919d54e6d843cd8c79f Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sun, 7 Oct 2018 12:05:45 +0200 -Subject: [PATCH 1/2] Make Qt5Test optional - -Test Plan: Builds fine w/o Qt5Test present. - -Subscribers: kdevelop-devel - -Tags: #kdevelop - -Differential Revision: https://phabricator.kde.org/D16012 ---- - CMakeLists.txt | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c09ca29..c1e25d6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -21,7 +21,10 @@ include(GenerateExportHeader) - include(FeatureSummary) - - set(QT_MIN_VERSION "5.5.0") --find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core Widgets Test) -+find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core Widgets) -+if(BUILD_TESTING) -+ find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED) -+endif() - set(KF5_DEP_VERSION "5.15.0") - find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS Archive ThreadWeaver TextEditor I18n ItemModels KCMUtils) - find_package(KDevPlatform ${KDEVPLATFORM_VERSION} REQUIRED) --- -2.19.1 - - -From 600c167d742da9f22f6d72f6b5d8c3919de2580b Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Wed, 10 Oct 2018 01:35:19 +0200 -Subject: [PATCH 2/2] Drop unused KF5Archive - ---- - CMakeLists.txt | 2 +- - completion/tests/CMakeLists.txt | 4 ---- - 2 files changed, 1 insertion(+), 5 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c1e25d6..5f1070a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -26,7 +26,7 @@ if(BUILD_TESTING) - find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED) - endif() - set(KF5_DEP_VERSION "5.15.0") --find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS Archive ThreadWeaver TextEditor I18n ItemModels KCMUtils) -+find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS ThreadWeaver TextEditor I18n ItemModels KCMUtils) - find_package(KDevPlatform ${KDEVPLATFORM_VERSION} REQUIRED) - find_package(KDevelop-PG-Qt REQUIRED) - -diff --git a/completion/tests/CMakeLists.txt b/completion/tests/CMakeLists.txt -index dbe37c1..214cc05 100644 ---- a/completion/tests/CMakeLists.txt -+++ b/completion/tests/CMakeLists.txt -@@ -23,9 +23,5 @@ ecm_add_test( - Qt5::Test - KDev::Tests - KDev::Language -- -- # TODO: KF5: KDevice is forcing us to have this dependency. I'm sure -- # we can work-around it :) -- KF5::Archive - ) - --- -2.19.1 - diff --git a/dev-util/kdevelop-php/kdevelop-php-5.2.4-r1.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.2.4-r1.ebuild deleted file mode 100644 index ff68ee5e3fd3..000000000000 --- a/dev-util/kdevelop-php/kdevelop-php-5.2.4-r1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -EGIT_BRANCH="5.2" -KDEBASE="kdevelop" -KDE_DOC_DIR="docs" -KDE_HANDBOOK="forceoptional" -KDE_TEST="true" -KMNAME="kdev-php" -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="PHP plugin for KDevelop" -LICENSE="GPL-2 LGPL-2" -IUSE="" -[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="amd64 x86" - -COMMON_DEPEND=" - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kio) - $(add_frameworks_dep kitemmodels) - $(add_frameworks_dep ktexteditor) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep threadweaver) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - dev-util/kdevelop-pg-qt:5 - dev-util/kdevelop:5 -" -RDEPEND="${COMMON_DEPEND} - !dev-util/kdevelop-php-docs -" -DEPEND="${COMMON_DEPEND} - test? ( dev-util/kdevelop:5[test] ) -" - -PATCHES=( "${FILESDIR}/${P}-tests-optional.patch" ) - -# remaining tests fail for some, bug 668530 -RESTRICT+=" test" - -src_test() { - # tests hang, bug 667922 - local myctestargs=( - -E "(completionbenchmark|duchain_multiplefiles)" - ) - kde5_src_test -}