summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dev-util/kdevelop-mercurial/kdevelop-mercurial-9999.ebuild5
-rw-r--r--dev-util/kdevelop-pg-qt/kdevelop-pg-qt-9999.ebuild2
-rw-r--r--dev-util/kdevelop-php-docs/kdevelop-php-docs-9999.ebuild2
-rw-r--r--dev-util/kdevelop-php/files/kdevelop-php-1.2.0-dbustests.patch123
-rw-r--r--dev-util/kdevelop-php/kdevelop-php-1.5.0.ebuild11
-rw-r--r--dev-util/kdevelop-php/kdevelop-php-9999.ebuild15
-rw-r--r--dev-util/kdevelop/kdevelop-4.5.0.ebuild2
-rw-r--r--dev-util/kdevelop/kdevelop-9999.ebuild2
8 files changed, 21 insertions, 141 deletions
diff --git a/dev-util/kdevelop-mercurial/kdevelop-mercurial-9999.ebuild b/dev-util/kdevelop-mercurial/kdevelop-mercurial-9999.ebuild
index bc4736c661c..65c9be6a818 100644
--- a/dev-util/kdevelop-mercurial/kdevelop-mercurial-9999.ebuild
+++ b/dev-util/kdevelop-mercurial/kdevelop-mercurial-9999.ebuild
@@ -2,9 +2,10 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
-KMNAME="kdevelop"
+KDEBASE="kdevelop"
+KMNAME="kdev-mercurial"
KDEVPLATFORM_VERSION="1.0.2"
inherit kde4-base
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-9999.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-9999.ebuild
index 2bfc8cfb926..e242f3cfb85 100644
--- a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-9999.ebuild
+++ b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
inherit kde4-base
diff --git a/dev-util/kdevelop-php-docs/kdevelop-php-docs-9999.ebuild b/dev-util/kdevelop-php-docs/kdevelop-php-docs-9999.ebuild
index 7e8973acdb0..218a1003031 100644
--- a/dev-util/kdevelop-php-docs/kdevelop-php-docs-9999.ebuild
+++ b/dev-util/kdevelop-php-docs/kdevelop-php-docs-9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
KDE_LINGUAS="ca ca@valencia da de en_GB es et fi fr gl hu it nb nds nl pl pt
pt_BR ru sk sv uk zh_CN zh_TW"
diff --git a/dev-util/kdevelop-php/files/kdevelop-php-1.2.0-dbustests.patch b/dev-util/kdevelop-php/files/kdevelop-php-1.2.0-dbustests.patch
deleted file mode 100644
index 49402f46365..00000000000
--- a/dev-util/kdevelop-php/files/kdevelop-php-1.2.0-dbustests.patch
+++ /dev/null
@@ -1,123 +0,0 @@
---- kdevelop-php-9999/completion/tests/CMakeLists.txt
-+++ kdevelop-php-9999/completion/tests/CMakeLists.txt
-@@ -8,16 +8,8 @@
-
- set(completiontest_SRCS test_completion.cpp
- ../../duchain/tests/duchaintestbase.cpp)
--kde4_add_unit_test(completiontest ${completiontest_SRCS})
--target_link_libraries(completiontest
-- kdev4phpcompletion
-- kdev4phpduchain
-- kdev4phpparser
-- ${QT_QTTEST_LIBRARY}
-- ${KDEVPLATFORM_TESTS_LIBRARIES}
-- ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
--)
- # hack to make ../../duchain/tests/duchaintestbase.h use the correct EXPORT tags when compiling with MinGW
-+
- if (MINGW)
- set_property(TARGET completiontest APPEND_STRING PROPERTY COMPILE_FLAGS " -DMAKE_KDEV4PHPDUCHAIN_LIB")
- endif (MINGW)
-@@ -25,15 +17,7 @@
-
- set(completionbench_SRCS bench_completion.cpp
- ../../duchain/tests/duchaintestbase.cpp)
--kde4_add_unit_test(completionbenchmark ${completionbench_SRCS})
--target_link_libraries(completionbenchmark
-- kdev4phpcompletion
-- kdev4phpduchain
-- kdev4phpparser
-- ${QT_QTTEST_LIBRARY}
-- ${KDEVPLATFORM_TESTS_LIBRARIES}
-- ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
--)
-+
- # hack to make ../../duchain/tests/duchaintestbase.h use the correct EXPORT tags when compiling with MinGW
- if (MINGW)
- set_property(TARGET completionbenchmark APPEND_STRING PROPERTY COMPILE_FLAGS " -DMAKE_KDEV4PHPDUCHAIN_LIB")
-
---- kdevelop-php-9999/duchain/tests/CMakeLists.txt
-+++ kdevelop-php-9999-patched/duchain/tests/CMakeLists.txt
-@@ -9,14 +9,7 @@
- set(duchain_SRCS
- duchain.cpp
- duchaintestbase.cpp)
--kde4_add_unit_test(duchain ${duchain_SRCS})
--target_link_libraries(duchain
-- kdev4phpduchain
-- kdev4phpparser
-- ${QT_QTTEST_LIBRARY}
-- ${KDEVPLATFORM_TESTS_LIBRARIES}
-- ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
--)
-+
- # hack to make ../duchaintestbase.h use the correct EXPORT tags when compiling with MinGW
- if (MINGW)
- set_property(TARGET duchain APPEND_STRING PROPERTY COMPILE_FLAGS " -DMAKE_KDEV4PHPDUCHAIN_LIB")
-@@ -26,14 +19,7 @@
- set(expressionparser_SRCS
- expressionparser.cpp
- duchaintestbase.cpp)
--kde4_add_unit_test(expressionparser ${expressionparser_SRCS})
--target_link_libraries(expressionparser
-- kdev4phpduchain
-- kdev4phpparser
-- ${QT_QTTEST_LIBRARY}
-- ${KDEVPLATFORM_TESTS_LIBRARIES}
-- ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
--)
-+
- # hack to make ../duchaintestbase.h use the correct EXPORT tags when compiling with MinGW
- if (MINGW)
- set_property(TARGET expressionparser APPEND_STRING PROPERTY COMPILE_FLAGS " -DMAKE_KDEV4PHPDUCHAIN_LIB")
-@@ -43,15 +29,7 @@
- set(uses_SRCS
- uses.cpp
- duchaintestbase.cpp)
--kde4_add_unit_test(uses ${uses_SRCS})
--target_link_libraries(uses
-- kdev4phpduchain
-- kdev4phpparser
-- ${QT_QTTEST_LIBRARY}
-- ${KDEVPLATFORM_INTERFACES_LIBRARIES}
-- ${KDEVPLATFORM_TESTS_LIBRARIES}
-- ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
--)
-+
- # hack to make ../duchaintestbase.h use the correct EXPORT tags when compiling with MinGW
- if (MINGW)
- set_property(TARGET uses APPEND_STRING PROPERTY COMPILE_FLAGS " -DMAKE_KDEV4PHPDUCHAIN_LIB")
-@@ -62,15 +40,7 @@
- benchmarks.cpp
- duchaintestbase.cpp
- )
--kde4_add_unit_test(benchmarks ${benchmarks_SRCS})
--target_link_libraries(benchmarks
-- kdev4phpduchain
-- kdev4phpparser
-- ${QT_QTTEST_LIBRARY}
-- ${KDEVPLATFORM_INTERFACES_LIBRARIES}
-- ${KDEVPLATFORM_TESTS_LIBRARIES}
-- ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
--)
-+
- # hack to make ../duchaintestbase.h use the correct EXPORT tags when compiling with MinGW
- if (MINGW)
- set_property(TARGET benchmarks APPEND_STRING PROPERTY COMPILE_FLAGS " -DMAKE_KDEV4PHPDUCHAIN_LIB")
-@@ -81,15 +51,7 @@
- duchain_multiplefiles.cpp
- duchaintestbase.cpp
- )
--kde4_add_unit_test(duchain_multiplefiles ${duchain_multiplefiles_SRCS})
--target_link_libraries(duchain_multiplefiles
-- kdev4phpduchain
-- kdev4phpparser
-- ${QT_QTTEST_LIBRARY}
-- ${KDEVPLATFORM_INTERFACES_LIBRARIES}
-- ${KDEVPLATFORM_TESTS_LIBRARIES}
-- ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
--)
-+
- # hack to make ../duchaintestbase.h use the correct EXPORT tags when compiling with MinGW
- if (MINGW)
- set_property(TARGET duchain_multiplefiles APPEND_STRING PROPERTY COMPILE_FLAGS " -DMAKE_KDEV4PHPDUCHAIN_LIB")
diff --git a/dev-util/kdevelop-php/kdevelop-php-1.5.0.ebuild b/dev-util/kdevelop-php/kdevelop-php-1.5.0.ebuild
index 8d712b7fb59..1205c06dc11 100644
--- a/dev-util/kdevelop-php/kdevelop-php-1.5.0.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-1.5.0.ebuild
@@ -7,8 +7,9 @@ EAPI=5
KDE_LINGUAS="ca ca@valencia da de el en_GB es et fi fr gl it nb nds nl pl pt
pt_BR sv th uk zh_CN zh_TW"
VIRTUALX_REQUIRED=test
-KMNAME="kdevelop"
-EGIT_REPONAME="kdev-php"
+KDEBASE="kdevelop"
+KMNAME="kdev-php"
+EGIT_REPONAME="${KMNAME}"
inherit kde4-base
@@ -16,10 +17,10 @@ DESCRIPTION="PHP plugin for KDevelop 4"
LICENSE="GPL-2 LGPL-2"
IUSE="debug doc"
-if [[ $PV == *9999* ]]; then
- KEYWORDS=""
-else
+if [[ $PV != *9999* ]]; then
KEYWORDS="~amd64 ~x86"
+else
+ KEYWORDS=""
fi
DEPEND="
diff --git a/dev-util/kdevelop-php/kdevelop-php-9999.ebuild b/dev-util/kdevelop-php/kdevelop-php-9999.ebuild
index dc76439cc73..1205c06dc11 100644
--- a/dev-util/kdevelop-php/kdevelop-php-9999.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-9999.ebuild
@@ -2,13 +2,14 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
KDE_LINGUAS="ca ca@valencia da de el en_GB es et fi fr gl it nb nds nl pl pt
pt_BR sv th uk zh_CN zh_TW"
VIRTUALX_REQUIRED=test
-KMNAME="kdevelop"
-EGIT_REPONAME="kdev-php"
+KDEBASE="kdevelop"
+KMNAME="kdev-php"
+EGIT_REPONAME="${KMNAME}"
inherit kde4-base
@@ -16,10 +17,10 @@ DESCRIPTION="PHP plugin for KDevelop 4"
LICENSE="GPL-2 LGPL-2"
IUSE="debug doc"
-if [[ $PV == *9999* ]]; then
- KEYWORDS=""
-else
+if [[ $PV != *9999* ]]; then
KEYWORDS="~amd64 ~x86"
+else
+ KEYWORDS=""
fi
DEPEND="
@@ -29,4 +30,4 @@ RDEPEND="
dev-util/kdevelop
doc? ( >=dev-util/kdevelop-php-docs-${PV}:${SLOT} )
"
-PATCHES=( "${FILESDIR}/${PN}"-1.2.0-{dbustests,parmake}.patch )
+PATCHES=( "${FILESDIR}/${PN}"-1.2.0-parmake.patch )
diff --git a/dev-util/kdevelop/kdevelop-4.5.0.ebuild b/dev-util/kdevelop/kdevelop-4.5.0.ebuild
index 32ce0e76fda..eb7cb2a0330 100644
--- a/dev-util/kdevelop/kdevelop-4.5.0.ebuild
+++ b/dev-util/kdevelop/kdevelop-4.5.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl it nb nds nl pl pt
pt_BR ru sl sv th uk zh_CN zh_TW"
diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild b/dev-util/kdevelop/kdevelop-9999.ebuild
index 32ce0e76fda..eb7cb2a0330 100644
--- a/dev-util/kdevelop/kdevelop-9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl it nb nds nl pl pt
pt_BR ru sl sv th uk zh_CN zh_TW"
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-08 20:33:08 +0000