[kdevelop] Bit reorder deps and use proper blockers to avoid all those collisions.

6 files changed, 45 insertions, 32 deletions

diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 784b6c4c5d2..ca278969c9a 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,4 +1,4 @@
 DIST kdevelop-3.9.97.tar.bz2 2415397 RMD160 88c1d655fb3e54235dfa3a3d9de8f53183cd1913 SHA1 79141abbc2fd98e5bb23c5262cff16321ba72b3e SHA256 9d53ab9656ffa2cdb8388424cc02143b0bfb8e68a9cea00335a658d41de95be4
-EBUILD kdevelop-3.9.97.ebuild 1842 RMD160 b5397c184ae73d8338399fc3d817ae46f3899b86 SHA1 14d1c67584a8650b7a2e322968507d373c121893 SHA256 34c11863e91ff285e5374921aee22874d0c1a506294bba297634d21b56182f37
-EBUILD kdevelop-9999.ebuild 1688 RMD160 cd23e67540a36c1d98cf86cf559548ce37fd88ca SHA1 14d78f75a34f17dc68c63b50043a35f7b67a1dd1 SHA256 452649aa12546bade4810234e89ba82c42a8010a45501e996cc79fd3c0a720a3
+EBUILD kdevelop-3.9.97.ebuild 1963 RMD160 de5a68fa6e56839024fa2b447668a796fab13886 SHA1 23efaff3671432568d2358cbb842bfc0ffacead8 SHA256 29a14a48698b5fa091a20b4655c46ca0b0199be35f4eb0ef8029227ddf3f563e
+EBUILD kdevelop-9999.ebuild 1946 RMD160 2bdb1e620666ef463dcdb3a6ae4268cad2c21097 SHA1 98ca48963aa66eedde09d1a590ccfd68029371b6 SHA256 55dca284169988265219c6b7f028219b4f269216dc2dd84ad134147d35f289b3
 MISC metadata.xml 376 RMD160 93e6c292048eaf4c9a6510b167b6565f7a6ded38 SHA1 fc7c31107627f479cfedf13d0b89514e36840549 SHA256 6a5c6a78d5091e2045348ccb90057b68d3b6a25a17972779c4df81264650a602
diff --git a/dev-util/kdevelop/kdevelop-3.9.97.ebuild b/dev-util/kdevelop/kdevelop-3.9.97.ebuild
index bf50d9e2cfe..8e8e98b2dd6 100644
--- a/dev-util/kdevelop/kdevelop-3.9.97.ebuild
+++ b/dev-util/kdevelop/kdevelop-3.9.97.ebuild
@@ -4,12 +4,18 @@
 
 EAPI="2"
 
-inherit kde4-base versionator
+KMNAME="extragear/sdk"
+inherit kde4-base
 
-KDEVPLATFORM_PV="$(($(get_major_version)-3)).$(get_after_major_version)"
+if [[ ${PV} == *9999* ]]; then
+	KDEVPLATFORM_PV="9999"
+else
+	inherit versionator
+	KDEVPLATFORM_PV="$(($(get_major_version)-3)).$(get_after_major_version)"
+fi
 DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages."
 HOMEPAGE="http://www.kdevelop.org/"
-SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
+[[ ${PV} != *9999* ]] && SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 KEYWORDS="~amd64 ~hppa ~x86"
diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild b/dev-util/kdevelop/kdevelop-9999.ebuild
index 0edb6d730c3..d01348e010b 100644
--- a/dev-util/kdevelop/kdevelop-9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-9999.ebuild
@@ -7,8 +7,15 @@ EAPI="2"
 KMNAME="extragear/sdk"
 inherit kde4-base
 
+if [[ ${PV} == *9999* ]]; then
+	KDEVPLATFORM_PV="9999"
+else
+	inherit versionator
+	KDEVPLATFORM_PV="$(($(get_major_version)-3)).$(get_after_major_version)"
+fi
 DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages."
 HOMEPAGE="http://www.kdevelop.org/"
+[[ ${PV} != *9999* ]] && SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 KEYWORDS=""
@@ -16,7 +23,7 @@ SLOT="4"
 IUSE="+cmake +cxx debug +qmake qthelp"
 
 DEPEND="
-	>=dev-util/kdevplatform-9999
+	>=dev-util/kdevplatform-${KDEVPLATFORM_PV}
 	>=kde-base/ksysguard-${KDE_MINIMAL}
 	>=kde-base/libkworkspace-${KDE_MINIMAL}
 	qthelp? ( >=x11-libs/qt-assistant-4.4:4 )
diff --git a/dev-util/kdevplatform/Manifest b/dev-util/kdevplatform/Manifest
index bb7aa20f6ca..ab67a8cf950 100644
--- a/dev-util/kdevplatform/Manifest
+++ b/dev-util/kdevplatform/Manifest
@@ -1,4 +1,4 @@
 DIST kdevplatform-0.9.97.tar.bz2 1008807 RMD160 033ff8cb652dba64c61d5317cfb2f28e132ef038 SHA1 93819d3b0201e2648035b5e137aaaf40ef65b8fe SHA256 c378900c6d96014fd48e4939883f2e2c4a29b8fadc5ea22bdf64216720d36401
-EBUILD kdevplatform-0.9.97.ebuild 1284 RMD160 628df4a616e00cb8e876b9d1fb6e791cd4df691d SHA1 8d8841f58bdafafd0b22abc8019659b766aaf267 SHA256 847ffb6119c0d1d8f0fb542281c28e095e91c500fd8ada59614b61b059de4a1f
-EBUILD kdevplatform-9999.ebuild 1235 RMD160 fc8d44973afde63fe62896ccae17af3a734f8154 SHA1 7f3e59d9da307620424e56ba937e72b3836954e0 SHA256 21c7c29c543d72acbb0f2b6c978dfe932c6c26defbb7c5b08bd94c3a8661d73c
+EBUILD kdevplatform-0.9.97.ebuild 1295 RMD160 3d2b326668a8d67c8ae652ee00db2465af1b5383 SHA1 fedb87bd00de3fdc3f314106838062359832770b SHA256 a39b33e5d800fc1f2ceab96c0eff15ae94d8a7dfa37ff6d08b52f676b02e5757
+EBUILD kdevplatform-9999.ebuild 1357 RMD160 a6c08de5dbe73f302742d47ded1bac2d7fe0f3b8 SHA1 537b27096ef252bc68d606d3d9c27d6788f6dde2 SHA256 c433212acc25ce37ae102797b2a27d225cdde8275862e12b4ace98422cea12f0
 MISC metadata.xml 370 RMD160 415ffb51f442c372efbdcaee940254bccdef300a SHA1 f84d23dd0f900dcabab74a17f77d464fcbc5ca3f SHA256 32ee98d53944f32615ec51900aa79939effb944e30bd353560d0dcd61d09cd67
diff --git a/dev-util/kdevplatform/kdevplatform-0.9.97.ebuild b/dev-util/kdevplatform/kdevplatform-0.9.97.ebuild
index b2c5c493598..f48a33f310d 100644
--- a/dev-util/kdevplatform/kdevplatform-0.9.97.ebuild
+++ b/dev-util/kdevplatform/kdevplatform-0.9.97.ebuild
@@ -4,12 +4,17 @@
 
 EAPI="2"
 
-inherit kde4-base versionator
-
-KDEVELOP_PV="$(($(get_major_version)+3)).$(get_after_major_version)"
+KMNAME="extragear/sdk"
+inherit kde4-base
+
+if [[ ${PV} == *9999* ]]; then
+	KDEVELOP_PV="9999"
+else
+	KDEVELOP_PV="$(($(get_major_version)+3)).$(get_after_major_version)"
+fi
 DESCRIPTION="KDE development support libraries and apps"
 HOMEPAGE="http://www.kdevelop.org/"
-SRC_URI="mirror://kde/unstable/kdevelop/${KDEVELOP_PV}/src/${P}.tar.bz2"
+[[ ${PV} != *9999* ]] && SRC_URI="mirror://kde/unstable/kdevelop/${KDEVELOP_PV}/src/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
@@ -19,7 +24,7 @@ SLOT="4"
 IUSE="cvs debug mercurial subversion"
 
 DEPEND="
-	>=dev-libs/boost-1.35.0
+	dev-libs/boost
 	subversion? ( >=dev-util/subversion-1.3 )
 "
 # Moved to playground for now
@@ -27,6 +32,7 @@ DEPEND="
 # git? ( dev-util/git )
 # block - some plugins moved to kdevplatform from kdevelop
 RDEPEND="${DEPEND}
+	!<dev-util/kdevelop-${KDEVELOP_PV}
 	cvs? ( dev-util/cvs )
 	mercurial? ( dev-util/mercurial )
 "
@@ -44,9 +50,3 @@ src_configure() {
 
 	kde4-base_src_configure
 }
-
-src_install() {
-	kde4-base_src_install
-
-	rm "${D}/${PREFIX}"/share/apps/cmake/modules/FindKDevPlatform.cmake
-}
diff --git a/dev-util/kdevplatform/kdevplatform-9999.ebuild b/dev-util/kdevplatform/kdevplatform-9999.ebuild
index 97e422fa4ab..59d7c6aa61e 100644
--- a/dev-util/kdevplatform/kdevplatform-9999.ebuild
+++ b/dev-util/kdevplatform/kdevplatform-9999.ebuild
@@ -7,8 +7,14 @@ EAPI="2"
 KMNAME="extragear/sdk"
 inherit kde4-base
 
+if [[ ${PV} == *9999* ]]; then
+	KDEVELOP_PV="9999"
+else
+	KDEVELOP_PV="$(($(get_major_version)+3)).$(get_after_major_version)"
+fi
 DESCRIPTION="KDE development support libraries and apps"
 HOMEPAGE="http://www.kdevelop.org/"
+[[ ${PV} != *9999* ]] && SRC_URI="mirror://kde/unstable/kdevelop/${KDEVELOP_PV}/src/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 KEYWORDS=""
@@ -17,19 +23,19 @@ SLOT="4"
 # bazaar git
 IUSE="cvs debug kompare mercurial subversion"
 
-DEPEND="
-	>=dev-libs/boost-1.35.0
-	kompare? ( >=kde-base/kompare-4.3.1 )
-	subversion? ( >=dev-util/subversion-1.3 )
-"
 # Moved to playground for now
 # bazaar? ( dev-util/bzr )
 # git? ( dev-util/git )
 # block - some plugins moved to kdevplatform from kdevelop
-RDEPEND="${DEPEND}
-	!<dev-util/kdevelop-3.9.96:4
+RDEPEND="
+	!<dev-util/kdevelop-${KDEVELOP_PV}
 	cvs? ( dev-util/cvs )
+	kompare? ( >=kde-base/kompare-${KDE_MINIMAL} )
 	mercurial? ( dev-util/mercurial )
+	subversion? ( >=dev-util/subversion-1.3 )
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
 "
 
 # Moved to playground for now
@@ -46,9 +52,3 @@ src_configure() {
 
 	kde4-base_src_configure
 }
-
-src_install() {
-	kde4-base_src_install
-
-	rm "${D}/${PREFIX}"/share/apps/cmake/modules/FindKDevPlatform.cmake
-}