Merge branch 'master' of http://git.overlays.gentoo.org/gitroot/proj/kde

13 files changed, 23 insertions, 42 deletions

diff --git a/dev-util/kdevelop-php-docs/Manifest b/dev-util/kdevelop-php-docs/Manifest
new file mode 100644
index 00000000000..ca2e77d1c54
--- /dev/null
+++ b/dev-util/kdevelop-php-docs/Manifest
@@ -0,0 +1 @@
+DIST kdevelop-php-docs-1.2.82.tar.bz2 29739 SHA256 feba2fe6fb959cbd9933bddd5a757e196e9437c87d9c8d641a6d5a9259ee99d5 SHA512 befbecf9d4ea9784d2a44c35e1512c638c46d390211edc5ec51b2f595f08ddc5a5086e0a4111f8d485d35cd67d03e80e038b3cece39014e874132050a4272a24 WHIRLPOOL ccce4f1136d1eb7a40b0647373fa52c1171a4ab94a255f1fa4f1ab220ded10b49ad2c4a1173994492b46c3cdcaf939622c86e231f8f44c3f476d7f029b789c2e
diff --git a/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.2.82.ebuild b/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.2.82.ebuild
index 6a71f168bf2..7fc0092e397 100644
--- a/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.2.82.ebuild
+++ b/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.2.82.ebuild
@@ -6,6 +6,8 @@ EAPI=4
 
 KDE_LINGUAS="ca ca@valencia da de en_GB es et fi fr gl it nb nds nl pl pt pt_BR
 ru sv uk zh_CN zh_TW"
+KMNAME="kdevelop"
+KMMODULE="php-docs"
 KDE_SCM="git"
 EGIT_REPONAME="kdev-php-docs"
 
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 6a71f168bf2..7fc0092e397 100644
--- a/dev-util/kdevelop-php-docs/kdevelop-php-docs-9999.ebuild
+++ b/dev-util/kdevelop-php-docs/kdevelop-php-docs-9999.ebuild
@@ -6,6 +6,8 @@ EAPI=4
 
 KDE_LINGUAS="ca ca@valencia da de en_GB es et fi fr gl it nb nds nl pl pt pt_BR
 ru sv uk zh_CN zh_TW"
+KMNAME="kdevelop"
+KMMODULE="php-docs"
 KDE_SCM="git"
 EGIT_REPONAME="kdev-php-docs"
 
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
new file mode 100644
index 00000000000..90ab03ba907
--- /dev/null
+++ b/dev-util/kdevelop-php/Manifest
@@ -0,0 +1 @@
+DIST kdevelop-php-1.2.82.tar.bz2 670301 SHA256 f9ee5830e2b6566806e2825ef48d562e4d0b63a805bac9c3c3c0f399abab84eb SHA512 f221b308772685fc0a5b804df5163d2dd7998a9f4b2a7814475da45f0cc5987f6151764ba8237199be0332b66dd9583dd808205af4ce85788701c2ef576a0282 WHIRLPOOL 33b6a5f8fa602bcca7da4656098785d18c7cf8056c2a97c4b3a80abdb55b5d4384753a14ff4275e3e7c55b618ac06e72fe74ab04bdb0dca81fb01b9582a17207
diff --git a/dev-util/kdevelop-php/kdevelop-php-1.2.82.ebuild b/dev-util/kdevelop-php/kdevelop-php-1.2.82.ebuild
index 07bdace20c5..67deb38ccca 100644
--- a/dev-util/kdevelop-php/kdevelop-php-1.2.82.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-1.2.82.ebuild
@@ -7,6 +7,8 @@ EAPI=4
 KDE_LINGUAS="ca ca@valencia da de en_GB es et fi fr it nb nds nl pl pt pt_BR sv
 th uk zh_CN zh_TW"
 VIRTUALX_REQUIRED=test
+KMNAME="kdevelop"
+KMMODULE="php"
 KDE_SCM="git"
 EGIT_REPONAME="kdev-php"
 
diff --git a/dev-util/kdevelop-php/kdevelop-php-9999.ebuild b/dev-util/kdevelop-php/kdevelop-php-9999.ebuild
index 07bdace20c5..67deb38ccca 100644
--- a/dev-util/kdevelop-php/kdevelop-php-9999.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-9999.ebuild
@@ -7,6 +7,8 @@ EAPI=4
 KDE_LINGUAS="ca ca@valencia da de en_GB es et fi fr it nb nds nl pl pt pt_BR sv
 th uk zh_CN zh_TW"
 VIRTUALX_REQUIRED=test
+KMNAME="kdevelop"
+KMMODULE="php"
 KDE_SCM="git"
 EGIT_REPONAME="kdev-php"
 
diff --git a/dev-util/kdevelop/kdevelop-4.2.82.ebuild b/dev-util/kdevelop/kdevelop-4.2.82.ebuild
index 6729d6efb7a..5e2c856f8a3 100644
--- a/dev-util/kdevelop/kdevelop-4.2.82.ebuild
+++ b/dev-util/kdevelop/kdevelop-4.2.82.ebuild
@@ -13,7 +13,7 @@ inherit kde4-base
 
 DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages."
 LICENSE="GPL-2 LGPL-2"
-IUSE="+cmake +cxx debug okteta +qmake qthelp"
+IUSE="+cmake +cxx debug okteta qthelp"
 
 if [[ $PV == *9999* ]]; then
 	KEYWORDS=""
@@ -21,9 +21,7 @@ else
 	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 fi
 
-# Remove ksysguard dep after libprocessui moved into kdelibs
 DEPEND="
-	dev-util/kdevplatform[subversion]
 	$(add_kdebase_dep ksysguard)
 	$(add_kdebase_dep libkworkspace)
 	okteta? ( $(add_kdebase_dep okteta) )
@@ -33,8 +31,6 @@ RDEPEND="${DEPEND}
 	$(add_kdebase_dep kapptemplate)
 	cxx? ( >=sys-devel/gdb-7.0[python] )
 "
-# see bug 347547 about the kdevplatform[subversion] dependency
-
 RESTRICT="test"
 # see bug 366471
 
@@ -46,16 +42,8 @@ src_configure() {
 		$(cmake-utils_use_with okteta LibKasten)
 		$(cmake-utils_use_with okteta LibOkteta)
 		$(cmake-utils_use_with okteta LibOktetaKasten)
-		$(cmake-utils_use_build qmake)
-		$(cmake-utils_use_build qmake qmakebuilder)
-		$(cmake-utils_use_build qmake qmake_parser)
 		$(cmake-utils_use_build qthelp)
 	)
 
 	kde4-base_src_configure
 }
-
-src_install() {
-	kde4-base_src_install
-}
-
diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild b/dev-util/kdevelop/kdevelop-9999.ebuild
index 6729d6efb7a..5e2c856f8a3 100644
--- a/dev-util/kdevelop/kdevelop-9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-9999.ebuild
@@ -13,7 +13,7 @@ inherit kde4-base
 
 DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages."
 LICENSE="GPL-2 LGPL-2"
-IUSE="+cmake +cxx debug okteta +qmake qthelp"
+IUSE="+cmake +cxx debug okteta qthelp"
 
 if [[ $PV == *9999* ]]; then
 	KEYWORDS=""
@@ -21,9 +21,7 @@ else
 	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 fi
 
-# Remove ksysguard dep after libprocessui moved into kdelibs
 DEPEND="
-	dev-util/kdevplatform[subversion]
 	$(add_kdebase_dep ksysguard)
 	$(add_kdebase_dep libkworkspace)
 	okteta? ( $(add_kdebase_dep okteta) )
@@ -33,8 +31,6 @@ RDEPEND="${DEPEND}
 	$(add_kdebase_dep kapptemplate)
 	cxx? ( >=sys-devel/gdb-7.0[python] )
 "
-# see bug 347547 about the kdevplatform[subversion] dependency
-
 RESTRICT="test"
 # see bug 366471
 
@@ -46,16 +42,8 @@ src_configure() {
 		$(cmake-utils_use_with okteta LibKasten)
 		$(cmake-utils_use_with okteta LibOkteta)
 		$(cmake-utils_use_with okteta LibOktetaKasten)
-		$(cmake-utils_use_build qmake)
-		$(cmake-utils_use_build qmake qmakebuilder)
-		$(cmake-utils_use_build qmake qmake_parser)
 		$(cmake-utils_use_build qthelp)
 	)
 
 	kde4-base_src_configure
 }
-
-src_install() {
-	kde4-base_src_install
-}
-
diff --git a/dev-util/kdevelop/metadata.xml b/dev-util/kdevelop/metadata.xml
index 3745b9d29b2..d2b28f67cc0 100644
--- a/dev-util/kdevelop/metadata.xml
+++ b/dev-util/kdevelop/metadata.xml
@@ -4,7 +4,6 @@
 <herd>kde</herd>
 <use>
 	<flag name="cmake">Enable support for CMake build system</flag>
-	<flag name="qmake">Enable support for QMake build system</flag>
 	<flag name="okteta">Enable hex editor plugin</flag>
 	<flag name="qthelp">Enable support for QtHelp documentation browsing</flag>
 </use>
diff --git a/dev-util/kdevplatform/kdevplatform-1.2.82.ebuild b/dev-util/kdevplatform/kdevplatform-1.2.82.ebuild
index 0fc4ec72c05..ba33e89fe88 100644
--- a/dev-util/kdevplatform/kdevplatform-1.2.82.ebuild
+++ b/dev-util/kdevplatform/kdevplatform-1.2.82.ebuild
@@ -8,13 +8,13 @@ KMNAME="kdevelop"
 KDE_SCM="git"
 KDE_MINIMAL="4.7"
 VIRTUALX_REQUIRED=test
-KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr it nb nds nl pl pt 
+KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr it nb nds nl pl pt
 pt_BR ru sl sv th uk zh_CN zh_TW"
+EGIT_REPONAME="${PN}"
 
 inherit kde4-base
 
 DESCRIPTION="KDE development support libraries and apps"
-
 LICENSE="GPL-2 LGPL-2"
 IUSE="cvs debug git reviewboard subversion"
 
@@ -28,19 +28,17 @@ fi
 # bazaar? ( dev-vcs/bzr )
 # kompare? ( $(add_kdebase_dep kompare) )
 # mercurial? ( dev-vcs/mercurial )
-# block - some plugins moved to kdevplatform from kdevelop
 DEPEND="
 	dev-libs/boost
-	reviewboard? ( dev-libs/qjson )
-	subversion? ( dev-vcs/subversion )
 "
 RDEPEND="${DEPEND}
 	!<dev-util/kdevelop-${KDEVELOP_VERSION}:4
 	$(add_kdebase_dep konsole)
 	cvs? ( dev-vcs/cvs )
 	git? ( dev-vcs/git )
+	reviewboard? ( dev-libs/qjson )
+	subversion? ( dev-vcs/subversion )
 "
-#!dev-util/kdevelop-git
 # Quite few fails and upstream is aware
 RESTRICT="test"
 
diff --git a/dev-util/kdevplatform/kdevplatform-9999.ebuild b/dev-util/kdevplatform/kdevplatform-9999.ebuild
index 0fc4ec72c05..ba33e89fe88 100644
--- a/dev-util/kdevplatform/kdevplatform-9999.ebuild
+++ b/dev-util/kdevplatform/kdevplatform-9999.ebuild
@@ -8,13 +8,13 @@ KMNAME="kdevelop"
 KDE_SCM="git"
 KDE_MINIMAL="4.7"
 VIRTUALX_REQUIRED=test
-KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr it nb nds nl pl pt 
+KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr it nb nds nl pl pt
 pt_BR ru sl sv th uk zh_CN zh_TW"
+EGIT_REPONAME="${PN}"
 
 inherit kde4-base
 
 DESCRIPTION="KDE development support libraries and apps"
-
 LICENSE="GPL-2 LGPL-2"
 IUSE="cvs debug git reviewboard subversion"
 
@@ -28,19 +28,17 @@ fi
 # bazaar? ( dev-vcs/bzr )
 # kompare? ( $(add_kdebase_dep kompare) )
 # mercurial? ( dev-vcs/mercurial )
-# block - some plugins moved to kdevplatform from kdevelop
 DEPEND="
 	dev-libs/boost
-	reviewboard? ( dev-libs/qjson )
-	subversion? ( dev-vcs/subversion )
 "
 RDEPEND="${DEPEND}
 	!<dev-util/kdevelop-${KDEVELOP_VERSION}:4
 	$(add_kdebase_dep konsole)
 	cvs? ( dev-vcs/cvs )
 	git? ( dev-vcs/git )
+	reviewboard? ( dev-libs/qjson )
+	subversion? ( dev-vcs/subversion )
 "
-#!dev-util/kdevelop-git
 # Quite few fails and upstream is aware
 RESTRICT="test"
 
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 3fcf6fbac5d..575cb7e6185 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -83,7 +83,7 @@ case ${KDEBASE} in
 					KDEVELOP_VERSION=${PV}
 					KDEVPLATFORM_VERSION="$(($(get_major_version)-3)).$(get_after_major_version)"
 					;;
-				kdevplatform)
+				kdevplatform|kdevelop-php*)
 					KDEVELOP_VERSION="$(($(get_major_version)+3)).$(get_after_major_version)"
 					KDEVPLATFORM_VERSION=${PV}
 					;;
@@ -479,7 +479,7 @@ _calculate_src_uri() {
 				*) SRC_URI="mirror://kde/stable/${_kmname_pv}/${_kmname_pv}.tar.bz2" ;;
 			esac
 			;;
-		kdevelop|kdevplatform)
+		kdevelop|kdevelop-php*|kdevplatform)
 			case ${KDEVELOP_VERSION} in
 				4.[12].[6-8]*) SRC_URI="mirror://kde/unstable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.bz2" ;;
 				*) SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.bz2" ;;
diff --git a/metadata/layout.conf b/metadata/layout.conf
index bbeea52140f..f1a0bec867c 100644
--- a/metadata/layout.conf
+++ b/metadata/layout.conf
@@ -5,7 +5,7 @@ manifest-hashes = SHA256 SHA512 WHIRLPOOL
 update-changelog = false
 # Use thin manifests
 thin-manifests = true
-# Dont sign thinn manifests. There is no current policy for git commit signing
+# Dont sign thin manifests. There is no current policy for git commit signing
 sign-manifests = false
 # sign commits using git mechanisms
 sign-commits = true