[gentoo-commits] proj/kde:master commit in: dev-util/kdevplatform/

[Michael Palimaka]

commit:     0e9a95a04b32b1b1bef6c6741631736e03e441e8
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 30 15:18:00 2012 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Oct 30 15:18:00 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0e9a95a0

[dev-util/kdevplatform] Clean up dependencies and configuration. Enable tests.

Package-Manager: portage-2.1.11.31

---
 dev-util/kdevplatform/kdevplatform-9999.ebuild |   39 ++++++-----------------
 1 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/dev-util/kdevplatform/kdevplatform-9999.ebuild b/dev-util/kdevplatform/kdevplatform-9999.ebuild
index 1da1aae..f19509b 100644
--- a/dev-util/kdevplatform/kdevplatform-9999.ebuild
+++ b/dev-util/kdevplatform/kdevplatform-9999.ebuild
@@ -6,16 +6,17 @@ EAPI=4
 
 KMNAME="kdevelop"
 KDE_MINIMAL="4.7"
-VIRTUALX_REQUIRED=test
 KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl it nb nds nl pl pt
 pt_BR sl sv th uk zh_CN zh_TW"
+VIRTUALDBUS_TEST="true"
+VIRTUALX_REQUIRED="test"
 EGIT_REPONAME="${PN}"
 
 inherit kde4-base
 
 DESCRIPTION="KDE development support libraries and apps"
 LICENSE="GPL-2 LGPL-2"
-IUSE="cvs debug git reviewboard subversion"
+IUSE="cvs debug reviewboard subversion"
 
 if [[ $PV == *9999 ]]; then
 	KEYWORDS=""
@@ -23,46 +24,26 @@ else
 	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 fi
 
-# Moved to playground for now
-# bazaar? ( dev-vcs/bzr )
-# kompare? ( $(add_kdebase_dep kompare) )
-# mercurial? ( dev-vcs/mercurial )
 DEPEND="
 	dev-libs/boost
+	reviewboard? ( dev-libs/qjson )
+	subversion? (
+		dev-libs/apr
+		dev-libs/apr-util
+		dev-vcs/subversion
+	)
 "
 RDEPEND="${DEPEND}
 	!<dev-util/kdevelop-${KDEVELOP_VERSION}:4
-	dev-libs/apr
-	dev-libs/apr-util
 	$(add_kdebase_dep konsole)
 	cvs? ( dev-vcs/cvs )
-	git? ( dev-vcs/git )
-	reviewboard? ( dev-libs/qjson )
-	subversion? ( dev-vcs/subversion )
 "
-# Quite few fails and upstream is aware
-RESTRICT="test"
-
-src_prepare() {
-	kde4-base_src_prepare
-
-	# FindKDevPlatform.cmake is installed by kdelibs
-	sed -i \
-		-e '/cmakeFiles/s/^/#DONOTINSTALL/' \
-		cmake/modules/CMakeLists.txt || die
-}
 
-# Moved to playground for now
-# $(cmake-utils_use_build bazaar)
-# $(cmake-utils_use_with kompare)
-# $(cmake-utils_use_build mercurial)
 src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_build cvs)
-		$(cmake-utils_use_build git)
-		$(cmake-utils_use_with reviewboard QJSON)
+		$(cmake-utils_use_build reviewboard)
 		$(cmake-utils_use_build subversion)
-		$(cmake-utils_use_with subversion SubversionLibrary)
 	)
 
 	kde4-base_src_configure