From 64e107b9b6058580ff0432107eb37cefb0b2a7d8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 22 Oct 2018 11:09:47 +0100 Subject: gentoo resync : 22.10.2018 --- dev-util/kdevelop-php/Manifest | 5 +- .../files/kdevelop-php-5.2.4-tests-optional.patch | 76 ++++++++++++++++++++++ dev-util/kdevelop-php/kdevelop-php-5.2.3.ebuild | 45 ------------- dev-util/kdevelop-php/kdevelop-php-5.2.4-r1.ebuild | 55 ++++++++++++++++ dev-util/kdevelop-php/kdevelop-php-5.2.4.ebuild | 40 ------------ 5 files changed, 133 insertions(+), 88 deletions(-) create mode 100644 dev-util/kdevelop-php/files/kdevelop-php-5.2.4-tests-optional.patch delete mode 100644 dev-util/kdevelop-php/kdevelop-php-5.2.3.ebuild create mode 100644 dev-util/kdevelop-php/kdevelop-php-5.2.4-r1.ebuild delete mode 100644 dev-util/kdevelop-php/kdevelop-php-5.2.4.ebuild (limited to 'dev-util/kdevelop-php') diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest index c8b46e5788c0..da1b4d710392 100644 --- a/dev-util/kdevelop-php/Manifest +++ b/dev-util/kdevelop-php/Manifest @@ -1,5 +1,4 @@ -DIST kdev-php-5.2.3.tar.xz 685364 BLAKE2B 02a00a5565bbb21a00a75231168f27a78cc3c7411430fc46e1c9b796fd378417e65369ff95fdb045a52d8c9aa1207b5b425e7c63de701d0805ee92db343e3ed4 SHA512 43ac063f38ae0f7fd222415f9327b9f738e9a450daa8a1cb6a83a1abe9c4e8adcb03628d8e62d1d93bdc85548ee36123347c39b702e7b44d4513ec54f67a5692 +AUX kdevelop-php-5.2.4-tests-optional.patch 2468 BLAKE2B f30fee2d349b2512a8fb1a02d6d1380ee5b11de43e58187438f8030faad3eaac6cf56b21ef6a7e047efb1bbca0188005092404ef0efed400ff2ad23f4752f4fe SHA512 5ef6d1b86ff63177bd28e4161e4292810aa651163581022be657786391fdfe4017e0ddd1cb94ba0be104153dded411f4b182deeda243987cf5d09f167868ada0 DIST kdev-php-5.2.4.tar.xz 685356 BLAKE2B d9c9feb1099b5d6b0d57651f2588ad51016e159bde78a7104c3f9b429e75c9ef596329173e27f5010e39388575e23b920af2b7fec72b0801c21370f235f20acf SHA512 3729cf0ea4ade85349778dd05ef9835a6993309aed05c7d7ef7d91c90ddaf09d1c5fad495753aa32f6a93b339dfbd14be9cb4b06b04a10d9d065aa8cfa1fa3cd -EBUILD kdevelop-php-5.2.3.ebuild 1062 BLAKE2B cdf8d324b3c9cdf1d8242edef0fbcc55becf96c86f5871246beaf55083e1270312535a04ec7d821d39f62205c25b0a976d0a8a1571a2e5c3b0f3ead196d3fb73 SHA512 7415d13081b485f1aba68f71ff1be86673c1c4a396c9dcbd5349707f985e54f07621cb19473f2af4c2795754fa1e843fce197623fc5593302603c9c0a94a16d3 -EBUILD kdevelop-php-5.2.4.ebuild 967 BLAKE2B 8df42002e02e3b78482b74cfd5b1061d867ae9fb85c7a7821836c752680dcd2fe8cd215d12e7bc4cf029594f1ab4dd00ff12892c00a9d34ab2ee0570f8715b49 SHA512 6312ec050c6171c420c01c49a3b3412451c0f81aa5c1d7a235212003dffe3e380d2f5630bb6ad29eee38a55929035fe6d2e7691ddbd5ca5a1f605e66d5a200c6 +EBUILD kdevelop-php-5.2.4-r1.ebuild 1247 BLAKE2B 24daa76c99e3ef06a944f837ff18ac86bd8dc41917d49a4b58681fe677ef504d099b502f14ef7b6503523bd70e3d90e704181cfc712e51bbd47633a623e50965 SHA512 a5e1f1c06b877575eb42054ad2289d19f3f9b04c08c071024500ef612d1c7fff7d924c77643c47ea9a3f0e7e073d32e6092bf3fad8b45255b28fa4063811f43a MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 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 new file mode 100644 index 000000000000..853952f11ac5 --- /dev/null +++ b/dev-util/kdevelop-php/files/kdevelop-php-5.2.4-tests-optional.patch @@ -0,0 +1,76 @@ +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.3.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.2.3.ebuild deleted file mode 100644 index f7fc8d608f48..000000000000 --- a/dev-util/kdevelop-php/kdevelop-php-5.2.3.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# 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="forceoptional" -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 karchive) - $(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] ) -" - -RESTRICT+=" test" 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 new file mode 100644 index 000000000000..ff68ee5e3fd3 --- /dev/null +++ b/dev-util/kdevelop-php/kdevelop-php-5.2.4-r1.ebuild @@ -0,0 +1,55 @@ +# 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 +} diff --git a/dev-util/kdevelop-php/kdevelop-php-5.2.4.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.2.4.ebuild deleted file mode 100644 index bdc85574736b..000000000000 --- a/dev-util/kdevelop-php/kdevelop-php-5.2.4.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# 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="forceoptional" -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" - -DEPEND=" - $(add_frameworks_dep karchive) - $(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="${DEPEND} - !dev-util/kdevelop-php-docs -" -- cgit v1.2.3