[dev-util/kdevelop*] Reorder vars for easier merging, remove always outdated lingua list from live ebuild - it doesn't help with merging anyway)

8 files changed, 8 insertions, 17 deletions

diff --git a/dev-util/kdevelop-php-docs/Manifest b/dev-util/kdevelop-php-docs/Manifest
index 8303110365d..96546453704 100644
--- a/dev-util/kdevelop-php-docs/Manifest
+++ b/dev-util/kdevelop-php-docs/Manifest
@@ -1,2 +1,2 @@
-EBUILD kdevelop-php-docs-9999.ebuild 339 RMD160 f4b522f335c7d9541ab264f422a12be69e563780 SHA1 59e311c93766d18deb41f012497504ac99dda459 SHA256 86d145c9db99e9bb1766ba390b024348475ccd194798a8bb36c272a576abb153
+EBUILD kdevelop-php-docs-9999.ebuild 339 RMD160 44f7b529b6a7e89a45307209958266b4df836b84 SHA1 eb9b73a10692ff236cfcf582fbdb9093ff68afc5 SHA256 c7ee9ac30af075121ff480d500f889efb9b9ea3a6f41af1cd2300ef9c2dfdae1
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
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 a299b78781b..abcb5693faa 100644
--- a/dev-util/kdevelop-php-docs/kdevelop-php-docs-9999.ebuild
+++ b/dev-util/kdevelop-php-docs/kdevelop-php-docs-9999.ebuild
@@ -10,8 +10,8 @@ inherit kde4-base
 
 DESCRIPTION="PHP documentation plugin for KDevelop 4"
 
-LICENSE="GPL-2 LGPL-2"
 KEYWORDS=""
+LICENSE="GPL-2 LGPL-2"
 IUSE="debug"
 
 RDEPEND="
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index 5d832976862..e238265954d 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,2 +1,2 @@
-EBUILD kdevelop-php-9999.ebuild 421 RMD160 9ea0f5ebc0a103a03b0f7cbb7a65f88ace48a3bc SHA1 80914476beb747ee08bb3c3c9a9e73a6a40c3308 SHA256 4c62bc47dd65522e4de0168c1e29e2323d555890bc4ea7e9e6b039a4c7ee4ef2
+EBUILD kdevelop-php-9999.ebuild 386 RMD160 82212ab50167892007e1df3cdc7a2e26ec7d3bbb SHA1 a0f0cf66ce432db63f96ad2cb9fc366b86c7efc4 SHA256 56d4bd66740e2f8e56cc0788999465752ce4f031b7032475e5cac7f76236605f
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
diff --git a/dev-util/kdevelop-php/kdevelop-php-9999.ebuild b/dev-util/kdevelop-php/kdevelop-php-9999.ebuild
index 779dd228852..420846c3085 100644
--- a/dev-util/kdevelop-php/kdevelop-php-9999.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-9999.ebuild
@@ -10,14 +10,13 @@ inherit kde4-base
 
 DESCRIPTION="PHP plugin for KDevelop 4"
 
-LICENSE="GPL-2 LGPL-2"
 KEYWORDS=""
+LICENSE="GPL-2 LGPL-2"
 IUSE="debug doc"
 
 DEPEND="
 	>=dev-util/kdevelop-pg-qt-0.9.0
 "
 RDEPEND="
-	!=dev-util/kdevelop-plugins-1.0.0
 	doc? ( >=dev-util/kdevelop-php-docs-${PV}:${SLOT} )
 "
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 3c3047c554e..06bec0801d9 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,2 +1,2 @@
-EBUILD kdevelop-9999.ebuild 1460 RMD160 7043bbbd897c6346eb37517d81c69835f2f94bfb SHA1 6e68b9f7c7e3469bef9507cb82eb00cc78dc4565 SHA256 d9057a9808fc3cddb0345f3abac79932eb6679b21ab7978177f647078a53ff4c
+EBUILD kdevelop-9999.ebuild 1334 RMD160 d82903f73c5615f43b232d5da1a495067d78168f SHA1 06c6cc3ea66cbec464fd1aab96e4c1ccf0f723df SHA256 21514c09484c76feaf6fe0a8a7dd408db6b61996e33a692bc99f4089d9e1d1e1
 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 271620267ff..f8af88b0f95 100644
--- a/dev-util/kdevelop/kdevelop-9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-9999.ebuild
@@ -4,17 +4,13 @@
 
 EAPI="2"
 
-if [[ ${PV} != *9999* ]]; then
-	KDE_LINGUAS="ca ca@valencia da de en_GB es et fr gl it nds pt pt_BR sv tr uk zh_CN zh_TW"
-fi
-
 KMNAME="kdevelop"
 inherit kde4-base
 
 DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages."
 
-LICENSE="GPL-2 LGPL-2"
 KEYWORDS=""
+LICENSE="GPL-2 LGPL-2"
 IUSE="+cmake +cxx debug okteta +qmake qthelp"
 
 DEPEND="
diff --git a/dev-util/kdevplatform/Manifest b/dev-util/kdevplatform/Manifest
index f0a279d4f26..8f7fd67a4bc 100644
--- a/dev-util/kdevplatform/Manifest
+++ b/dev-util/kdevplatform/Manifest
@@ -1,2 +1,2 @@
-EBUILD kdevplatform-9999.ebuild 1555 RMD160 41197c856fb5c28711930cfb7df1eaae46ac2906 SHA1 2659b961e3245d4e92d9e94cd0ed863f5e50020a SHA256 b910697bc37da90b5b220f0b82a77539673214dfc9697eba871720566683c06c
+EBUILD kdevplatform-9999.ebuild 1429 RMD160 72c2ba9e46c8f23c1e399354ed53399a68c562c5 SHA1 8379fac23ef3b175ed9500cb6899e1384c8a195a SHA256 f0258bbd9b1a0ec1e6e8caddd3df584c6169c6667a0f0e0ab7fee925b0f81b2c
 MISC metadata.xml 289 RMD160 5df6ca559e1302043ad23456aedb09fcacd7acd7 SHA1 9f26aa927ee5c2209fcb3684bf00023c5aa4dada SHA256 88e0f5b61bd48a62ee51897ec303a9098be25268904c2d63185531ee1a412b3b
diff --git a/dev-util/kdevplatform/kdevplatform-9999.ebuild b/dev-util/kdevplatform/kdevplatform-9999.ebuild
index 54adbc9723c..249374fa0c2 100644
--- a/dev-util/kdevplatform/kdevplatform-9999.ebuild
+++ b/dev-util/kdevplatform/kdevplatform-9999.ebuild
@@ -4,19 +4,15 @@
 
 EAPI="2"
 
-if [[ ${PV} != *9999* ]]; then
-	KDE_LINGUAS="ca ca@valencia da de en_GB es et fr gl it nds pt pt_BR sv tr uk zh_CN zh_TW"
-fi
-
 KMNAME="kdevelop"
 inherit kde4-base
 
 DESCRIPTION="KDE development support libraries and apps"
 
-LICENSE="GPL-2 LGPL-2"
 KEYWORDS=""
 # Moved to playground for now
 # bazaar git kompare mercurial
+LICENSE="GPL-2 LGPL-2"
 IUSE="cvs debug git reviewboard subversion"
 
 # Moved to playground for now