[kdevelop/kdevplatform] sync with main tree.

4 files changed, 14 insertions, 29 deletions

diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index fa8b336c9e5..c590c813347 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,2 +1,2 @@
-EBUILD kdevelop-9999.ebuild 1328 RMD160 c5374e2b332138e8aa7eab8e38f2cea8639bea56 SHA1 35e6429826803b5005ea4187fe02d269f68ffa7f SHA256 d0d0dbf8e5f8bb106de70029932a9fe27fedf9c49bc464d00c7e8186d246ac06
+EBUILD kdevelop-9999.ebuild 1635 RMD160 a902dbd2273a32d9588968d58456d9308f0dbd6d SHA1 ec69051909108b393306020d6532602bda6ca513 SHA256 00e7917f2cd69d22288646bb9f2a3efa4fc42fe2c4d046845994ffbeb52b0f45
 MISC metadata.xml 429 RMD160 19300c79fd5f01e46ccdb57c48e9092f84a99df4 SHA1 c0fa5ba9271542c990a65094391985285fdc17af SHA256 57c402369aa48da3ae4102f7d649da1e3c0bc1ddb38672ae51759cd8490b29f5
diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild b/dev-util/kdevelop/kdevelop-9999.ebuild
index f10390e90e8..bd05d08efb2 100644
--- a/dev-util/kdevelop/kdevelop-9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-9999.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-4.2.0.ebuild,v 1.2 2011/03/26 00:43:27 dilfridge Exp $
 
-EAPI=3
+EAPI=4
 
-KDE_SCM="git"
+KDE_LINGUAS="ca ca@valencia da de en_GB es et fi gl it nds nl pt pt_BR sl sv th uk zh_CN zh_TW"
+VIRTUALX_REQUIRED=test
 inherit kde4-base
 
 DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages."
@@ -14,6 +15,7 @@ LICENSE="GPL-2 LGPL-2"
 IUSE="+cmake +cxx debug okteta +qmake qthelp"
 
 DEPEND="
+	dev-util/kdevplatform[subversion]
 	$(add_kdebase_dep ksysguard)
 	$(add_kdebase_dep libkworkspace)
 	okteta? ( $(add_kdebase_dep okteta) )
@@ -23,6 +25,7 @@ RDEPEND="${DEPEND}
 	$(add_kdebase_dep kapptemplate)
 	cxx? ( >=sys-devel/gdb-7.0[python] )
 "
+# see bug 347547 about the kdevplatform[subversion] dependency
 
 src_prepare() {
 	kde4-base_src_prepare
diff --git a/dev-util/kdevplatform/Manifest b/dev-util/kdevplatform/Manifest
index 9afb0769f86..da0d13b9822 100644
--- a/dev-util/kdevplatform/Manifest
+++ b/dev-util/kdevplatform/Manifest
@@ -1,25 +1,2 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX kdevplatform-1.2.0-gcc46.patch 1153 RMD160 ce92414c4e0472d0789e339c81afb746463efe8d SHA1 d9407d2f3dccfbeeb3578086cce03c986503216b SHA256 f290ed010b5991683f9a8670dc727e0d7888f3a3164b11616f0319880a537c4d
-DIST kdevplatform-1.2.0.tar.bz2 1743728 RMD160 372302f6d52cc829f0bbb52f218d1b3db82cbe05 SHA1 7f0f8c35435f55238483b74bea013a9454e3c7ae SHA256 f673f0e62593f69f74e4fcf4c666472b3e197d210f5315621520b4f73ae2e421
-EBUILD kdevplatform-1.2.0.ebuild 1722 RMD160 92ce820c1b4129228d5238e42ccd6d9b6942678a SHA1 879b5b82ff4f890259cee0c371a2f83509f98faf SHA256 ed9ed958ec0eb1eca93a05d83a45b5e68e3e94c80f6d2c2804664da1821f9ec9
-EBUILD kdevplatform-9999.ebuild 1456 RMD160 442e46636fe2a9197016da6f478ba49c953a3419 SHA1 0531a4f15ce9b6db40e02d2a26a006ce3fa3762f SHA256 bd4416917a9b24f2c11bd0af3d2ed82a9b13443b72e8afd9f72234b78a5566c9
+EBUILD kdevplatform-9999.ebuild 1632 RMD160 a8cececc75adeded1094b10df8a9e11d4d976624 SHA1 f7189592657e8088a4dc76b5c2b436b89b34c1a8 SHA256 eb5d1fddfb045adc361bdbd6e2586250a7b41de8cd1f850248f1cba690be9a32
 MISC metadata.xml 289 RMD160 5df6ca559e1302043ad23456aedb09fcacd7acd7 SHA1 9f26aa927ee5c2209fcb3684bf00023c5aa4dada SHA256 88e0f5b61bd48a62ee51897ec303a9098be25268904c2d63185531ee1a412b3b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCAAGBQJNmg4YAAoJELHSF2kinlg45sUQAKyQ6uPeg8O2qOnrV0R9JSXh
-nEs3KSEQIRQrmqaBZfg4nSwiaQ3r2GNupDeKz/YX8H07LdqCizFCLn+i8ddU9lnl
-WjqNFSd1KqRD72uc14GqNto+hYouOWVMuM3Xxb6axxfwobnT0z2yNPqc6g40nrse
-cdmIyA+ki7z7FBWELDrCjuAQMXkXY1uRKPhohx+9v3gQD4Xz6ek7fiOEULUiK7W+
-dQYX9hhMTNWDIKvHA90+UIOBohpQR/44iaVfIgp0bT3nDslEnqFQYdbR2kjITvzy
-70BYOQ/Dv8gXmw1HgtIRdQpc2rK9in0me4F7dtubRip36RrnpVhChHlz+P9OLW5v
-UfAL+rr1LoxI81DdxvQ/7SSLbkFFnPYLCUOe8BhusOESiyauy6/WSY85sKIc58oY
-pURO9hQakBw2+gySzAW7uL3qk1BFFSX4FKGaiNqMjj9ms1IE8zJRUZeGgtlhsxIW
-iP+6vmmdA/l2Br3BYfLmxueDli0YQH1jUWWbGxMCXpW9y650XtKzit5+PiXjVGR0
-vOi5k81qwLZiioVZL7xiwEAvoRV7ECvqgfjD39AnAuY0/Jf/h4iexf3uXocP2y8Q
-+y8xPV/wJIeEjpu55WsLc97QpBPaOIuHlFZVU0wvD9heZ07pArSm7xPll7Mc8h/x
-t0mHfdjsu77VoP/5QAJU
-=MGmj
------END PGP SIGNATURE-----
diff --git a/dev-util/kdevplatform/kdevplatform-9999.ebuild b/dev-util/kdevplatform/kdevplatform-9999.ebuild
index 08417538b15..55bdfcf6c7a 100644
--- a/dev-util/kdevplatform/kdevplatform-9999.ebuild
+++ b/dev-util/kdevplatform/kdevplatform-9999.ebuild
@@ -2,12 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KMNAME="kdevelop"
 KDE_SCM="git"
 EGIT_REPONAME="${PN}"
 KDE_MINIMAL="4.6"
+VIRTUALX_REQUIRED=test
+KDE_LINGUAS="ca ca@valencia da de en_GB es et fi gl it nds nl pt pt_BR sl sv th uk zh_CN zh_TW"
 inherit kde4-base
 
 DESCRIPTION="KDE development support libraries and apps"
@@ -36,6 +38,9 @@ RDEPEND="${DEPEND}
 	git? ( dev-vcs/git )
 "
 
+# Quite few fails and upstream is aware
+RESTRICT="test"
+
 src_prepare() {
 	kde4-base_src_prepare