Version bump. Drop older.

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

3 files changed, 10 insertions, 66 deletions

diff --git a/dev-util/kdevelop/ChangeLog b/dev-util/kdevelop/ChangeLog
index 5cbe4c14218f..87d6d70464a8 100644
--- a/dev-util/kdevelop/ChangeLog
+++ b/dev-util/kdevelop/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/kdevelop
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.215 2011/03/26 00:43:27 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.216 2011/04/10 11:31:01 scarabeus Exp $
+
+*kdevelop-4.2.2 (10 Apr 2011)
+
+  10 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> -kdevelop-4.1.2.ebuild,
+  -kdevelop-4.2.0.ebuild, +kdevelop-4.2.2.ebuild:
+  Version bump. Drop older.
 
   26 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   kdevelop-4.1.2.ebuild, kdevelop-4.2.0.ebuild:
diff --git a/dev-util/kdevelop/kdevelop-4.2.0.ebuild b/dev-util/kdevelop/kdevelop-4.2.0.ebuild
deleted file mode 100644
index 84b72850f163..000000000000
--- a/dev-util/kdevelop/kdevelop-4.2.0.ebuild
+++ /dev/null
@@ -1,58 +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/kdevelop/kdevelop-4.2.0.ebuild,v 1.2 2011/03/26 00:43:27 dilfridge Exp $
-
-EAPI=3
-
-# Bug 328269
-# 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="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages."
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-LICENSE="GPL-2 LGPL-2"
-IUSE="+cmake +cxx debug okteta +qmake qthelp"
-
-DEPEND="
-	dev-util/kdevplatform[subversion]
-	$(add_kdebase_dep ksysguard)
-	$(add_kdebase_dep libkworkspace)
-	okteta? ( $(add_kdebase_dep okteta) )
-	qthelp? ( >=x11-libs/qt-assistant-4.4:4 )
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kapptemplate)
-	cxx? ( >=sys-devel/gdb-7.0[python] )
-"
-# see bug 347547 about the kdevplatform[subversion] dependency
-
-src_prepare() {
-	kde4-base_src_prepare
-
-	# Remove this and the ksysguard dep after libprocessui moved into kdelibs
-	sed -i -e 's/${KDE4WORKSPACE_PROCESSUI_LIBS}/processui/g' \
-		debuggers/gdb/CMakeLists.txt \
-		|| die "Failed to patch CMake files"
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_build cmake)
-		$(cmake-utils_use_build cmake cmakebuilder)
-		$(cmake-utils_use_build cxx cpp)
-		$(cmake-utils_use_with okteta LibKasten)
-		$(cmake-utils_use_with okteta LibOkteta)
-		$(cmake-utils_use_with okteta LibOktetaKasten)
-		$(cmake-utils_use_build qmake)
-		$(cmake-utils_use_build qmake qmakebuilder)
-		$(cmake-utils_use_build qmake qmake_parser)
-		$(cmake-utils_use_build qthelp)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/dev-util/kdevelop/kdevelop-4.1.2.ebuild b/dev-util/kdevelop/kdevelop-4.2.2.ebuild
index 841da8b0f439..c641dc6a08e3 100644
--- a/dev-util/kdevelop/kdevelop-4.1.2.ebuild
+++ b/dev-util/kdevelop/kdevelop-4.2.2.ebuild
@@ -1,15 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-4.1.2.ebuild,v 1.3 2011/03/26 00:43:27 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-4.2.2.ebuild,v 1.1 2011/04/10 11:31:01 scarabeus Exp $
 
-EAPI=3
-
-# Bug 328269
-RESTRICT="test"
+EAPI=4
 
 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"
+VIRTUALX_REQUIRED=test
 inherit kde4-base
 
 DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages."