13 files changed, 22 insertions, 348 deletions
diff --git a/dev-util/kdevelop-php-docs/ChangeLog b/dev-util/kdevelop-php-docs/ChangeLog
index de4d28c36046..df0ef221fcef 100644
--- a/dev-util/kdevelop-php-docs/ChangeLog
+++ b/dev-util/kdevelop-php-docs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/kdevelop-php-docs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-php-docs/ChangeLog,v 1.10 2010/10/12 06:30:05 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-php-docs/ChangeLog,v 1.11 2010/10/18 19:24:13 reavertm Exp $
+
+  18 Oct 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  -kdevelop-php-docs-1.0.0.ebuild, -kdevelop-php-docs-1.0.1.ebuild:
+  Remove old
 
   12 Oct 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   kdevelop-php-docs-1.0.2.ebuild:
diff --git a/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.0.0.ebuild b/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.0.0.ebuild
deleted file mode 100644
index 2e4c11596a34..000000000000
--- a/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.0.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.0.0.ebuild,v 1.3 2010/07/15 10:46:21 hwoarang Exp $
-
-EAPI="2"
-
-KMNAME="kdevelop"
-KMMODULE="php-docs"
-inherit kde4-base
-
-DESCRIPTION="PHP documentation plugin for KDevelop 4"
-
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="amd64 x86"
-IUSE="debug"
diff --git a/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.0.1.ebuild b/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.0.1.ebuild
deleted file mode 100644
index 7c344541b05f..000000000000
--- a/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.0.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.0.1.ebuild,v 1.4 2010/09/14 17:17:18 fauli Exp $
-
-EAPI="2"
-
-if [[ ${PV} != *9999* ]]; then
-	KDE_LINGUAS="ca ca@valencia da en_GB es et fr gl it nds nl pt pt_BR sv uk zh_TW"
-fi
-
-KMNAME="kdevelop"
-KMMODULE="php-docs"
-KDEVELOP_VERSION="4.0.1"
-inherit kde4-base
-
-DESCRIPTION="PHP documentation plugin for KDevelop 4"
-
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="amd64 x86"
-IUSE="debug"
diff --git a/dev-util/kdevelop-php/ChangeLog b/dev-util/kdevelop-php/ChangeLog
index bc706d878697..705685b38fe7 100644
--- a/dev-util/kdevelop-php/ChangeLog
+++ b/dev-util/kdevelop-php/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/kdevelop-php
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-php/ChangeLog,v 1.11 2010/10/12 06:30:26 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-php/ChangeLog,v 1.12 2010/10/18 19:22:42 reavertm Exp $
+
+  18 Oct 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  -kdevelop-php-1.0.0.ebuild, -kdevelop-php-1.0.1.ebuild:
+  Remove old
 
   12 Oct 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   kdevelop-php-1.0.2.ebuild:
diff --git a/dev-util/kdevelop-php/kdevelop-php-1.0.0.ebuild b/dev-util/kdevelop-php/kdevelop-php-1.0.0.ebuild
deleted file mode 100644
index 1e9e75dc6336..000000000000
--- a/dev-util/kdevelop-php/kdevelop-php-1.0.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-php/kdevelop-php-1.0.0.ebuild,v 1.3 2010/07/15 10:45:54 hwoarang Exp $
-
-EAPI="2"
-
-KMNAME="kdevelop"
-KMMODULE="php"
-inherit kde4-base
-
-DESCRIPTION="PHP plugin for KDevelop 4"
-
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="amd64 x86"
-IUSE="debug doc"
-
-RDEPEND="
-	doc? ( >=dev-util/kdevelop-php-docs-${PV}:${SLOT} )
-"
diff --git a/dev-util/kdevelop-php/kdevelop-php-1.0.1.ebuild b/dev-util/kdevelop-php/kdevelop-php-1.0.1.ebuild
deleted file mode 100644
index c03ed034cc08..000000000000
--- a/dev-util/kdevelop-php/kdevelop-php-1.0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-php/kdevelop-php-1.0.1.ebuild,v 1.5 2010/09/14 17:14:47 fauli Exp $
-
-EAPI="2"
-
-# Bug 330051
-RESTRICT="test"
-
-if [[ ${PV} != *9999* ]]; then
-	KDE_LINGUAS="ca ca@valencia da en_GB es et fr gl it nds nl pt pt_BR sv th uk zh_CN zh_TW"
-fi
-
-KMNAME="kdevelop"
-KMMODULE="php"
-KDEVELOP_VERSION="4.0.1"
-inherit kde4-base
-
-DESCRIPTION="PHP plugin for KDevelop 4"
-
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="amd64 x86"
-IUSE="debug doc"
-
-RDEPEND="
-	doc? ( >=dev-util/kdevelop-php-docs-${PV}:${SLOT} )
-"
diff --git a/dev-util/kdevelop/ChangeLog b/dev-util/kdevelop/ChangeLog
index 4c7346a8c4d4..c49409a33b18 100644
--- a/dev-util/kdevelop/ChangeLog
+++ b/dev-util/kdevelop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/kdevelop
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.207 2010/10/12 06:24:27 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.208 2010/10/18 19:20:32 reavertm Exp $
+
+  18 Oct 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  -kdevelop-4.0.0.ebuild, -kdevelop-4.0.1.ebuild:
+  Remove old
 
   12 Oct 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   kdevelop-4.0.2.ebuild:
diff --git a/dev-util/kdevelop/kdevelop-4.0.0.ebuild b/dev-util/kdevelop/kdevelop-4.0.0.ebuild
deleted file mode 100644
index a0e06195a2ef..000000000000
--- a/dev-util/kdevelop/kdevelop-4.0.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-4.0.0.ebuild,v 1.6 2010/07/15 10:45:26 hwoarang Exp $
-
-EAPI="2"
-
-# Bug 328269
-RESTRICT="test"
-
-if [[ ${PV} != *9999* ]]; then
-	KDE_LINGUAS="ca ca@valencia da de en_GB es et fr gl it nds pt pt_BR sv tr uk zh_CN zh_TW"
-fi
-
-KMNAME="kdevelop"
-inherit kde4-base
-
-DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages."
-
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="amd64 x86"
-IUSE="+cmake +cxx debug +qmake qthelp"
-
-DEPEND="
-	>=kde-base/ksysguard-${KDE_MINIMAL}
-	>=kde-base/libkworkspace-${KDE_MINIMAL}
-	qthelp? ( >=x11-libs/qt-assistant-4.4:4 )
-"
-RDEPEND="${DEPEND}
-	>=kde-base/kapptemplate-${KDE_MINIMAL}
-	cxx? ( >=sys-devel/gdb-7.0[python] )
-"
-
-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 qmake)
-		$(cmake-utils_use_build qmake qmakebuilder)
-		$(cmake-utils_use_build qmake qmake_parser)
-		$(cmake-utils_use_build cxx cpp)
-		$(cmake-utils_use_build qthelp)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/dev-util/kdevelop/kdevelop-4.0.1.ebuild b/dev-util/kdevelop/kdevelop-4.0.1.ebuild
deleted file mode 100644
index 113d6cce13de..000000000000
--- a/dev-util/kdevelop/kdevelop-4.0.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-4.0.1.ebuild,v 1.3 2010/09/14 17:12:37 fauli Exp $
-
-EAPI="2"
-
-# Bug 328269
-RESTRICT="test"
-
-if [[ ${PV} != *9999* ]]; then
-	KDE_LINGUAS="ca ca@valencia da de en_GB es et fi fr gl it nds nl pt pt_BR sl sv tr uk zh_CN zh_TW"
-fi
-
-KMNAME="kdevelop"
-inherit kde4-base
-
-DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages."
-
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="amd64 x86"
-IUSE="+cmake +cxx debug +qmake qthelp"
-
-DEPEND="
-	>=kde-base/ksysguard-${KDE_MINIMAL}
-	>=kde-base/libkworkspace-${KDE_MINIMAL}
-	qthelp? ( >=x11-libs/qt-assistant-4.4:4 )
-"
-RDEPEND="${DEPEND}
-	>=kde-base/kapptemplate-${KDE_MINIMAL}
-	cxx? ( >=sys-devel/gdb-7.0[python] )
-"
-
-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 qmake)
-		$(cmake-utils_use_build qmake qmakebuilder)
-		$(cmake-utils_use_build qmake qmake_parser)
-		$(cmake-utils_use_build cxx cpp)
-		$(cmake-utils_use_build qthelp)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/dev-util/kdevplatform/ChangeLog b/dev-util/kdevplatform/ChangeLog
index 6fe622c78bf0..a002579280f0 100644
--- a/dev-util/kdevplatform/ChangeLog
+++ b/dev-util/kdevplatform/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/kdevplatform
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/ChangeLog,v 1.43 2010/10/12 06:21:23 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/ChangeLog,v 1.44 2010/10/18 19:27:40 reavertm Exp $
+
+  18 Oct 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  -kdevplatform-1.0.0-r1.ebuild,
+  -files/kdevplatform-1.0.0-preserve-remote-URI.patch,
+  -kdevplatform-1.0.1.ebuild:
+  Remove old
 
   12 Oct 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   kdevplatform-1.0.2.ebuild:
diff --git a/dev-util/kdevplatform/files/kdevplatform-1.0.0-preserve-remote-URI.patch b/dev-util/kdevplatform/files/kdevplatform-1.0.0-preserve-remote-URI.patch
deleted file mode 100644
index 3edbc176761b..000000000000
--- a/dev-util/kdevplatform/files/kdevplatform-1.0.0-preserve-remote-URI.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-commit 2dcbfa0c9de95499902a2313d70ec4422b020770
-Author: Andreas Pakulat <apaku@gmx.de>
-Date:   Wed May 19 09:36:47 2010 +0200
-
-    Use the complete url of the active document.
-    
-    Don't just use the directory, use the complete url of the active
-    document and go up one step. This fixes the default-dir when working
-    with remote url.
-    
-    BUG:238094
-
-diff --git a/shell/documentcontroller.cpp b/shell/documentcontroller.cpp
-index 2288972..6d9344f 100644
---- a/shell/documentcontroller.cpp
-+++ b/shell/documentcontroller.cpp
-@@ -176,7 +176,7 @@ struct DocumentControllerPrivate {
-             KUrl dir;
-             if( controller->activeDocument() )
-             {
--                dir = KUrl( controller->activeDocument()->url().directory() );
-+                dir = controller->activeDocument()->url().upUrl();
-             }else
-             {
-                 dir = KGlobal::config()->group("Open File").readEntry( "Last Open File Directory", Core::self()->projectController()->projectsBaseDirectory() );
diff --git a/dev-util/kdevplatform/kdevplatform-1.0.0-r1.ebuild b/dev-util/kdevplatform/kdevplatform-1.0.0-r1.ebuild
deleted file mode 100644
index 45aaaeb756a3..000000000000
--- a/dev-util/kdevplatform/kdevplatform-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/kdevplatform-1.0.0-r1.ebuild,v 1.8 2010/09/02 15:40:34 reavertm Exp $
-
-EAPI="2"
-
-# Bug 276208
-RESTRICT="test"
-
-if [[ ${PV} != *9999* ]]; then
-	KDE_LINGUAS="ca ca@valencia da de en_GB es et fr gl it nds pt pt_BR sv tr uk zh_CN zh_TW"
-fi
-
-KMNAME="kdevelop"
-inherit kde4-base
-
-DESCRIPTION="KDE development support libraries and apps"
-
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-# Moved to playground for now
-# bazaar git kompare mercurial
-IUSE="cvs debug subversion"
-
-# Moved to playground for now
-# bazaar? ( dev-vcs/bzr )
-# kompare? ( >=kde-base/kompare-${KDE_MINIMAL} )
-# mercurial? ( dev-vcs/mercurial )
-# git? ( dev-vcs/git )
-# block - some plugins moved to kdevplatform from kdevelop
-DEPEND="
-	dev-libs/boost
-	subversion? ( >=dev-vcs/subversion-1.3 )
-"
-RDEPEND="${DEPEND}
-	!<dev-util/kdevelop-${KDEVELOP_VERSION}
-	>=kde-base/konsole-${KDE_MINIMAL}
-	cvs? ( dev-vcs/cvs )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-preserve-remote-URI.patch" # bug 319625
-)
-
-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_build git)
-# $(cmake-utils_use_with kompare)
-# $(cmake-utils_use_build mercurial)
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_build cvs)
-		$(cmake-utils_use_build subversion)
-		$(cmake-utils_use_with subversion SubversionLibrary)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/dev-util/kdevplatform/kdevplatform-1.0.1.ebuild b/dev-util/kdevplatform/kdevplatform-1.0.1.ebuild
deleted file mode 100644
index 1bb13003bf81..000000000000
--- a/dev-util/kdevplatform/kdevplatform-1.0.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/kdevplatform-1.0.1.ebuild,v 1.4 2010/09/14 17:10:07 fauli Exp $
-
-EAPI="2"
-
-# Bug 276208
-RESTRICT="test"
-
-if [[ ${PV} != *9999* ]]; then
-	KDE_LINGUAS="ca ca@valencia da de en_GB es et fi fr gl it nds nl pt pt_BR sl sv tr uk zh_CN zh_TW"
-fi
-
-KMNAME="kdevelop"
-inherit kde4-base
-
-DESCRIPTION="KDE development support libraries and apps"
-
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-# Moved to playground for now
-# bazaar git kompare mercurial
-IUSE="cvs debug subversion"
-
-# Moved to playground for now
-# bazaar? ( dev-vcs/bzr )
-# kompare? ( >=kde-base/kompare-${KDE_MINIMAL} )
-# mercurial? ( dev-vcs/mercurial )
-# git? ( dev-vcs/git )
-# block - some plugins moved to kdevplatform from kdevelop
-DEPEND="
-	dev-libs/boost
-	subversion? ( >=dev-vcs/subversion-1.3 )
-"
-RDEPEND="${DEPEND}
-	!<dev-util/kdevelop-${KDEVELOP_VERSION}
-	>=kde-base/konsole-${KDE_MINIMAL}
-	cvs? ( dev-vcs/cvs )
-"
-
-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_build git)
-# $(cmake-utils_use_with kompare)
-# $(cmake-utils_use_build mercurial)
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_build cvs)
-		$(cmake-utils_use_build subversion)
-		$(cmake-utils_use_with subversion SubversionLibrary)
-	)
-
-	kde4-base_src_configure
-}