Version bump. Drop older.

(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)

3 files changed, 17 insertions, 72 deletions

diff --git a/dev-util/kdevplatform/ChangeLog b/dev-util/kdevplatform/ChangeLog
index f1f9634ad644..5b345107c84a 100644
--- a/dev-util/kdevplatform/ChangeLog
+++ b/dev-util/kdevplatform/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/kdevplatform
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/ChangeLog,v 1.51 2011/02/27 14:40:39 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/ChangeLog,v 1.52 2011/04/10 11:30:37 scarabeus Exp $
+
+*kdevplatform-1.2.2 (10 Apr 2011)
+
+  10 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdevplatform-1.1.2.ebuild, -kdevplatform-1.2.0.ebuild,
+  +kdevplatform-1.2.2.ebuild:
+  Version bump to latest version, drop older.
 
   27 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   kdevplatform-1.2.0.ebuild:
diff --git a/dev-util/kdevplatform/kdevplatform-1.1.2.ebuild b/dev-util/kdevplatform/kdevplatform-1.1.2.ebuild
deleted file mode 100644
index eefcea84860f..000000000000
--- a/dev-util/kdevplatform/kdevplatform-1.1.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/kdevplatform-1.1.2.ebuild,v 1.3 2011/02/23 16:03:26 tampakrap Exp $
-
-EAPI=3
-
-# Bug 276208
-RESTRICT="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"
-
-KMNAME="kdevelop"
-inherit kde4-base
-
-DESCRIPTION="KDE development support libraries and apps"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-# Moved to playground for now
-# bazaar kompare mercurial
-LICENSE="GPL-2 LGPL-2"
-IUSE="cvs debug git reviewboard subversion"
-
-# Moved to playground for now
-# bazaar? ( dev-vcs/bzr )
-# kompare? ( >=kde-base/kompare-${KDE_MINIMAL} )
-# mercurial? ( dev-vcs/mercurial )
-# block - some plugins moved to kdevplatform from kdevelop
-DEPEND="
-	dev-libs/boost
-	reviewboard? ( dev-libs/qjson )
-	subversion? ( >=dev-vcs/subversion-1.3 )
-"
-RDEPEND="${DEPEND}
-	!<dev-util/kdevelop-${KDEVELOP_VERSION}:4
-	!dev-util/kdevelop-git
-	$(add_kdebase_dep konsole)
-	cvs? ( dev-vcs/cvs )
-	git? ( dev-vcs/git )
-"
-
-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 subversion)
-		$(cmake-utils_use_with subversion SubversionLibrary)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/dev-util/kdevplatform/kdevplatform-1.2.0.ebuild b/dev-util/kdevplatform/kdevplatform-1.2.2.ebuild
index 56b5d0cd7e37..3571604c881b 100644
--- a/dev-util/kdevplatform/kdevplatform-1.2.0.ebuild
+++ b/dev-util/kdevplatform/kdevplatform-1.2.2.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/kdevplatform-1.2.0.ebuild,v 1.3 2011/02/27 14:40:39 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/kdevplatform-1.2.2.ebuild,v 1.1 2011/04/10 11:30:37 scarabeus Exp $
 
-EAPI=3
-
-# Bug 276208
-RESTRICT="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"
+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"
@@ -39,6 +38,9 @@ RDEPEND="${DEPEND}
 	git? ( dev-vcs/git )
 "
 
+# Quite few fails and upstream is aware
+RESTRICT="test"
+
 src_prepare() {
 	kde4-base_src_prepare