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

1 files changed, 13 insertions, 13 deletions

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
-}