Drop KDEpim 4.6.1 and KDE 4.7.1

(Portage version: 2.1.10.31/cvs/Linux x86_64)
author: Andreas K. Hüttel <dilfridge@gentoo.org> 2011-10-28 19:03:48 +0000
committer: Andreas K. Hüttel <dilfridge@gentoo.org> 2011-10-28 19:03:48 +0000
commit: 77b20615bb930cef6da50398d4bc456f89272bf8 (patch)
tree: 2e9b2c7048cfe75f38525f73bf365449c94c6ad8 /kde-base
parent: Drop KDEpim 4.6.1 and KDE 4.7.1 (diff)
download: gentoo-2-77b20615bb930cef6da50398d4bc456f89272bf8.tar.gz
gentoo-2-77b20615bb930cef6da50398d4bc456f89272bf8.tar.bz2
gentoo-2-77b20615bb930cef6da50398d4bc456f89272bf8.zip
603 files changed, 1457 insertions, 10029 deletions
diff --git a/kde-base/activitymanager/ChangeLog b/kde-base/activitymanager/ChangeLog
index 6e85a6a20d0d..3db1f3e1bf09 100644
--- a/kde-base/activitymanager/ChangeLog
+++ b/kde-base/activitymanager/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/activitymanager
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/activitymanager/ChangeLog,v 1.33 2011/10/15 17:26:07 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/activitymanager/ChangeLog,v 1.34 2011/10/28 19:03:19 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -activitymanager-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -activitymanager-4.7.0.ebuild:
diff --git a/kde-base/activitymanager/activitymanager-4.7.1.ebuild b/kde-base/activitymanager/activitymanager-4.7.1.ebuild
deleted file mode 100644
index eca3a75f42a0..000000000000
--- a/kde-base/activitymanager/activitymanager-4.7.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/activitymanager/activitymanager-4.7.1.ebuild,v 1.1 2011/09/07 20:13:50 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="Activity manager"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug semantic-desktop"
-
-DEPEND="$(add_kdebase_dep kdelibs 'semantic-desktop=')"
-RDEPEND=${DEPEND}
-
-KMEXTRACTONLY="
-	nepomuk/
-"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		# $(cmake-utils_use_with zeitgeist QtZeitgeist)
-		-DWITH_QtZeitgeist=NO
-	)
-	kde4-meta_src_configure
-}
diff --git a/kde-base/akonadiconsole/ChangeLog b/kde-base/akonadiconsole/ChangeLog
index 4ac32266d6ac..288b75846ff1 100644
--- a/kde-base/akonadiconsole/ChangeLog
+++ b/kde-base/akonadiconsole/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/akonadiconsole
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadiconsole/ChangeLog,v 1.9 2011/10/15 17:26:10 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadiconsole/ChangeLog,v 1.10 2011/10/28 19:03:41 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -akonadiconsole-4.6.1.ebuild, -akonadiconsole-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -akonadiconsole-4.6.1.ebuild, -akonadiconsole-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -akonadiconsole-4.7.0.ebuild:
diff --git a/kde-base/akonadiconsole/akonadiconsole-4.6.1.ebuild b/kde-base/akonadiconsole/akonadiconsole-4.6.1.ebuild
deleted file mode 100644
index 05bd75987f52..000000000000
--- a/kde-base/akonadiconsole/akonadiconsole-4.6.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadiconsole/akonadiconsole-4.6.1.ebuild,v 1.1 2011/07/11 14:01:18 tampakrap Exp $
-
-EAPI=4
-
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="Akonadi developer console"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	akonadi_next/
-	calendarsupport/
-	messageviewer/
-"
diff --git a/kde-base/akonadiconsole/akonadiconsole-4.7.1.ebuild b/kde-base/akonadiconsole/akonadiconsole-4.7.1.ebuild
deleted file mode 100644
index 6008177fef43..000000000000
--- a/kde-base/akonadiconsole/akonadiconsole-4.7.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadiconsole/akonadiconsole-4.7.1.ebuild,v 1.1 2011/09/07 20:14:01 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="Akonadi developer console"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	akonadi_next/
-	calendarsupport/
-	messageviewer/
-"
diff --git a/kde-base/akregator/ChangeLog b/kde-base/akregator/ChangeLog
index 9d9b167b69a4..f90cc98331ae 100644
--- a/kde-base/akregator/ChangeLog
+++ b/kde-base/akregator/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/akregator
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/ChangeLog,v 1.198 2011/10/15 17:26:04 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/ChangeLog,v 1.199 2011/10/28 19:03:22 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -akregator-4.6.1.ebuild, -akregator-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -akregator-4.6.1.ebuild, -akregator-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -akregator-4.7.0.ebuild:
diff --git a/kde-base/akregator/akregator-4.6.1.ebuild b/kde-base/akregator/akregator-4.6.1.ebuild
deleted file mode 100644
index 28d056b8f1c9..000000000000
--- a/kde-base/akregator/akregator-4.6.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/akregator-4.6.1.ebuild,v 1.1 2011/07/11 14:01:18 tampakrap Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="KDE news feed aggregator."
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMLOADLIBS="kdepim-common-libs"
diff --git a/kde-base/akregator/akregator-4.7.1.ebuild b/kde-base/akregator/akregator-4.7.1.ebuild
deleted file mode 100644
index 2aae486065a8..000000000000
--- a/kde-base/akregator/akregator-4.7.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/akregator-4.7.1.ebuild,v 1.1 2011/09/07 20:14:03 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="KDE news feed aggregator."
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMLOADLIBS="kdepim-common-libs"
diff --git a/kde-base/amor/ChangeLog b/kde-base/amor/ChangeLog
index a63b39184ffd..020d4f7e62f7 100644
--- a/kde-base/amor/ChangeLog
+++ b/kde-base/amor/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/amor
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/amor/ChangeLog,v 1.189 2011/10/15 17:25:57 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/amor/ChangeLog,v 1.190 2011/10/28 19:03:26 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -amor-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -amor-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/amor/amor-4.7.1.ebuild b/kde-base/amor/amor-4.7.1.ebuild
deleted file mode 100644
index 5c5bc92ee8e0..000000000000
--- a/kde-base/amor/amor-4.7.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/amor/amor-4.7.1.ebuild,v 1.1 2011/09/07 20:13:50 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdetoys"
-inherit kde4-meta
-
-DESCRIPTION="KDE: Amusing Misuse Of Resources - desktop-dwelling creature"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/ark/ChangeLog b/kde-base/ark/ChangeLog
index 7796f1fb347c..aae71dfb58da 100644
--- a/kde-base/ark/ChangeLog
+++ b/kde-base/ark/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/ark
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ark/ChangeLog,v 1.203 2011/10/28 18:28:10 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ark/ChangeLog,v 1.204 2011/10/28 19:03:45 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -ark-4.7.1.ebuild,
+  -ark-4.7.1-r1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -ark-4.7.1.ebuild,
+  -ark-4.7.1-r1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -ark-4.7.2.ebuild:
   Remove old
diff --git a/kde-base/ark/ark-4.7.1-r1.ebuild b/kde-base/ark/ark-4.7.1-r1.ebuild
deleted file mode 100644
index 4c0b256ac4e1..000000000000
--- a/kde-base/ark/ark-4.7.1-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ark/ark-4.7.1-r1.ebuild,v 1.1 2011/10/20 00:14:06 reavertm Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeutils"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
-
-DESCRIPTION="KDE Archiving tool"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+archive +bzip2 debug lzma"
-
-DEPEND="
-	$(add_kdebase_dep libkonq)
-	sys-libs/zlib
-	archive? ( >=app-arch/libarchive-2.6.1[bzip2?,lzma?,zlib] )
-	lzma? ( app-arch/xz-utils )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.6.5-CVE-2011-2725.patch"
-)
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with archive LibArchive)
-		$(cmake-utils_use_with bzip2 BZip2)
-		$(cmake-utils_use_with lzma LibLZMA)
-	)
-	${kde_eclass}_src_configure
-}
-
-pkg_postinst() {
-	${kde_eclass}_pkg_postinst
-	elog "For creating rar archives, install app-arch/rar"
-}
diff --git a/kde-base/ark/ark-4.7.1.ebuild b/kde-base/ark/ark-4.7.1.ebuild
deleted file mode 100644
index dbff26ff926e..000000000000
--- a/kde-base/ark/ark-4.7.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ark/ark-4.7.1.ebuild,v 1.1 2011/09/07 20:13:49 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeutils"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
-
-DESCRIPTION="KDE Archiving tool"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+archive +bzip2 debug lzma"
-
-DEPEND="
-	$(add_kdebase_dep libkonq)
-	sys-libs/zlib
-	archive? ( >=app-arch/libarchive-2.6.1[bzip2?,lzma?,zlib] )
-	lzma? ( app-arch/xz-utils )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with archive LibArchive)
-		$(cmake-utils_use_with bzip2 BZip2)
-		$(cmake-utils_use_with lzma LibLZMA)
-	)
-	${kde_eclass}_src_configure
-}
-
-pkg_postinst() {
-	${kde_eclass}_pkg_postinst
-	elog "For creating rar archives, install app-arch/rar"
-}
diff --git a/kde-base/attica/ChangeLog b/kde-base/attica/ChangeLog
index 0d9fa63f9606..53f26206de08 100644
--- a/kde-base/attica/ChangeLog
+++ b/kde-base/attica/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/attica
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/attica/ChangeLog,v 1.49 2011/10/15 17:25:50 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/attica/ChangeLog,v 1.50 2011/10/28 19:03:45 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -attica-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -attica-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/attica/attica-4.7.1.ebuild b/kde-base/attica/attica-4.7.1.ebuild
deleted file mode 100644
index bb143f18648b..000000000000
--- a/kde-base/attica/attica-4.7.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/attica/attica-4.7.1.ebuild,v 1.1 2011/09/07 20:13:55 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="Open Collaboration Services provider management"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	>=dev-libs/libattica-0.1.4
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/blinken/ChangeLog b/kde-base/blinken/ChangeLog
index 9be2b1c28059..49f337375a62 100644
--- a/kde-base/blinken/ChangeLog
+++ b/kde-base/blinken/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/blinken
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/blinken/ChangeLog,v 1.163 2011/10/15 17:25:51 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/blinken/ChangeLog,v 1.164 2011/10/28 19:03:21 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -blinken-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -blinken-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/blinken/blinken-4.7.1.ebuild b/kde-base/blinken/blinken-4.7.1.ebuild
deleted file mode 100644
index 7a32ec8fab84..000000000000
--- a/kde-base/blinken/blinken-4.7.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/blinken/blinken-4.7.1.ebuild,v 1.1 2011/09/07 20:13:42 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE version of the Simon Says game."
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep libkdeedu)
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep knotify)
-"
diff --git a/kde-base/blogilo/ChangeLog b/kde-base/blogilo/ChangeLog
index 8a28b98a1fb2..35694cc66e04 100644
--- a/kde-base/blogilo/ChangeLog
+++ b/kde-base/blogilo/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/blogilo
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/blogilo/ChangeLog,v 1.46 2011/10/15 17:26:08 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/blogilo/ChangeLog,v 1.47 2011/10/28 19:03:37 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -blogilo-4.6.1.ebuild,
+  -blogilo-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -blogilo-4.6.1.ebuild,
+  -blogilo-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -blogilo-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/blogilo/blogilo-4.6.1.ebuild b/kde-base/blogilo/blogilo-4.6.1.ebuild
deleted file mode 100644
index edc0496fde52..000000000000
--- a/kde-base/blogilo/blogilo-4.6.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/blogilo/blogilo-4.6.1.ebuild,v 1.1 2011/07/11 14:01:18 tampakrap Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="KDE Blogging Client"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-"
-RDEPEND="${DEPEND}
-	!kde-misc/bilbo
-	!kde-misc/blogilo
-"
diff --git a/kde-base/blogilo/blogilo-4.7.1.ebuild b/kde-base/blogilo/blogilo-4.7.1.ebuild
deleted file mode 100644
index 25febc4a19b3..000000000000
--- a/kde-base/blogilo/blogilo-4.7.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/blogilo/blogilo-4.7.1.ebuild,v 1.1 2011/09/07 20:14:07 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="KDE Blogging Client"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-"
-RDEPEND="${DEPEND}
-	!kde-misc/bilbo
-	!kde-misc/blogilo
-"
diff --git a/kde-base/bomber/ChangeLog b/kde-base/bomber/ChangeLog
index dc466f401a5e..e8d61d113fe3 100644
--- a/kde-base/bomber/ChangeLog
+++ b/kde-base/bomber/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/bomber
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/bomber/ChangeLog,v 1.78 2011/10/15 17:25:59 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/bomber/ChangeLog,v 1.79 2011/10/28 19:03:28 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -bomber-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -bomber-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/bomber/bomber-4.7.1.ebuild b/kde-base/bomber/bomber-4.7.1.ebuild
deleted file mode 100644
index 85c9e00e653f..000000000000
--- a/kde-base/bomber/bomber-4.7.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/bomber/bomber-4.7.1.ebuild,v 1.1 2011/09/07 20:13:47 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE arcade bombing game"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/bovo/ChangeLog b/kde-base/bovo/ChangeLog
index 7f740b135198..b8ee0b8ede5d 100644
--- a/kde-base/bovo/ChangeLog
+++ b/kde-base/bovo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/bovo
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/bovo/ChangeLog,v 1.93 2011/10/15 17:26:06 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/bovo/ChangeLog,v 1.94 2011/10/28 19:03:35 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -bovo-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -bovo-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/bovo/bovo-4.7.1.ebuild b/kde-base/bovo/bovo-4.7.1.ebuild
deleted file mode 100644
index c0afe7c41655..000000000000
--- a/kde-base/bovo/bovo-4.7.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/bovo/bovo-4.7.1.ebuild,v 1.1 2011/09/07 20:13:46 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="Five-in-a-row Board Game"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/cantor/ChangeLog b/kde-base/cantor/ChangeLog
index 7d18256f9f74..adddb42ca9be 100644
--- a/kde-base/cantor/ChangeLog
+++ b/kde-base/cantor/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/cantor
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/cantor/ChangeLog,v 1.45 2011/10/25 20:13:38 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/cantor/ChangeLog,v 1.46 2011/10/28 19:03:23 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -cantor-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   25 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> cantor-4.7.2.ebuild:
   Restrict tests, bug 386491
diff --git a/kde-base/cantor/cantor-4.7.1.ebuild b/kde-base/cantor/cantor-4.7.1.ebuild
deleted file mode 100644
index 665abec6c1dd..000000000000
--- a/kde-base/cantor/cantor-4.7.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/cantor/cantor-4.7.1.ebuild,v 1.1 2011/09/07 20:13:42 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE4 interface for doing mathematics and scientific computing"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug ps +R"
-
-# TODO Add Sage Mathematics Software backend (http://www.sagemath.org)
-RDEPEND="
-	ps? ( app-text/libspectre )
-	R? ( dev-lang/R )
-"
-DEPEND="${RDEPEND}
-	>=dev-cpp/eigen-2.0.3:2
-"
-
-src_configure() {
-	mycmakeargs+="
-		$(cmake-utils_use_with ps LibSpectre)
-		$(cmake-utils_use_with R)
-	"
-	kde4-base_src_configure
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	if ! use R; then
-		echo
-		ewarn "You have decided to build ${PN} with no backend."
-		ewarn "To have this application functional, please do one of below:"
-		ewarn "    # emerge -va1 '='${CATEGORY}/${P} with 'R' USE flag enabled"
-		ewarn "    # emerge -vaDu sci-mathematics/maxima"
-		echo
-	fi
-}
diff --git a/kde-base/cervisia/ChangeLog b/kde-base/cervisia/ChangeLog
index 6b32cc19efd3..e682ef747039 100644
--- a/kde-base/cervisia/ChangeLog
+++ b/kde-base/cervisia/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/cervisia
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/cervisia/ChangeLog,v 1.183 2011/10/15 17:25:55 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/cervisia/ChangeLog,v 1.184 2011/10/28 19:03:24 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -cervisia-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -cervisia-4.7.0.ebuild:
diff --git a/kde-base/cervisia/cervisia-4.7.1.ebuild b/kde-base/cervisia/cervisia-4.7.1.ebuild
deleted file mode 100644
index 95423645d831..000000000000
--- a/kde-base/cervisia/cervisia-4.7.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/cervisia/cervisia-4.7.1.ebuild,v 1.1 2011/09/07 20:13:54 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdesdk"
-inherit kde4-meta
-
-DESCRIPTION="Cervisia - A KDE CVS frontend"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	dev-vcs/cvs
-"
diff --git a/kde-base/dolphin-plugins/ChangeLog b/kde-base/dolphin-plugins/ChangeLog
index cf3733fe9495..f9236253129e 100644
--- a/kde-base/dolphin-plugins/ChangeLog
+++ b/kde-base/dolphin-plugins/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/dolphin-plugins
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin-plugins/ChangeLog,v 1.29 2011/10/15 17:25:54 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin-plugins/ChangeLog,v 1.30 2011/10/28 19:03:24 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -dolphin-plugins-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -dolphin-plugins-4.7.0.ebuild:
diff --git a/kde-base/dolphin-plugins/dolphin-plugins-4.7.1.ebuild b/kde-base/dolphin-plugins/dolphin-plugins-4.7.1.ebuild
deleted file mode 100644
index 9235e0ef26d4..000000000000
--- a/kde-base/dolphin-plugins/dolphin-plugins-4.7.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin-plugins/dolphin-plugins-4.7.1.ebuild,v 1.1 2011/09/07 20:13:53 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kdesdk"
-inherit kde4-meta
-
-DESCRIPTION="Extra Dolphin plugins"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +git +subversion"
-
-DEPEND="
-	$(add_kdebase_dep libkonq)
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kompare)
-	git? ( dev-vcs/git )
-	subversion? ( dev-vcs/subversion )
-"
-
-# SCM plugins moved from dolphin somewhere before 4.4.75
-add_blocker dolphin '<4.4.75'
-
-KMLOADLIBS="libkonq"
-
-#
-# See bug 351147 for why this is necessary
-#
-src_prepare() {
-	echo 'macro_optional_add_subdirectory ( dolphin-plugins )' >> CMakeLists.txt || die
-	echo > dolphin-plugins/CMakeLists.txt || die
-	use git && echo 'add_subdirectory ( git )' >> dolphin-plugins/CMakeLists.txt
-	use subversion && echo 'add_subdirectory ( svn )' >> dolphin-plugins/CMakeLists.txt
-
-	kde4-meta_src_prepare
-}
-
-src_install() {
-	{ use git || use subversion; } && kde4-meta_src_install
-}
diff --git a/kde-base/dolphin/ChangeLog b/kde-base/dolphin/ChangeLog
index 3057b339b0da..dee14975e0fa 100644
--- a/kde-base/dolphin/ChangeLog
+++ b/kde-base/dolphin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/dolphin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/ChangeLog,v 1.110 2011/10/15 17:25:59 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/ChangeLog,v 1.111 2011/10/28 19:03:29 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -dolphin-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -dolphin-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/dolphin/dolphin-4.7.1.ebuild b/kde-base/dolphin/dolphin-4.7.1.ebuild
deleted file mode 100644
index 005ee85b679a..000000000000
--- a/kde-base/dolphin/dolphin-4.7.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/dolphin-4.7.1.ebuild,v 1.1 2011/09/07 20:13:38 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-baseapps"
-inherit kde4-meta
-
-DESCRIPTION="A KDE filemanager focusing on usability"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug semantic-desktop thumbnail"
-
-DEPEND="
-	$(add_kdebase_dep kdelibs 'semantic-desktop=')
-	$(add_kdebase_dep libkonq)
-	semantic-desktop? ( >=dev-libs/shared-desktop-ontologies-0.2 )
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kfind)
-"
-PDEPEND="
-	thumbnail? (
-		$(add_kdebase_dep thumbnailers)
-		|| (
-			$(add_kdebase_dep ffmpegthumbs)
-			$(add_kdebase_dep mplayerthumbs)
-		)
-	)
-"
-
-KMLOADLIBS="libkonq"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/dragonplayer/ChangeLog b/kde-base/dragonplayer/ChangeLog
index 7e76dd28207e..03df13262175 100644
--- a/kde-base/dragonplayer/ChangeLog
+++ b/kde-base/dragonplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/dragonplayer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dragonplayer/ChangeLog,v 1.92 2011/10/15 17:26:06 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dragonplayer/ChangeLog,v 1.93 2011/10/28 19:03:35 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -dragonplayer-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -dragonplayer-4.7.0.ebuild:
diff --git a/kde-base/dragonplayer/dragonplayer-4.7.1.ebuild b/kde-base/dragonplayer/dragonplayer-4.7.1.ebuild
deleted file mode 100644
index 71dd2fb401d3..000000000000
--- a/kde-base/dragonplayer/dragonplayer-4.7.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dragonplayer/dragonplayer-4.7.1.ebuild,v 1.1 2011/09/07 20:13:50 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdemultimedia"
-inherit kde4-meta
-
-DESCRIPTION="Dragon Player is a simple video player for KDE 4"
-HOMEPAGE="http://www.dragonplayer.net/"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-2"
-IUSE="debug xine"
-
-RDEPEND="
-	>=media-libs/phonon-4.4.3
-	xine? ( media-libs/xine-lib[xcb] )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with xine)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/drkonqi/ChangeLog b/kde-base/drkonqi/ChangeLog
index dc42fa292045..9f6712dcf8b8 100644
--- a/kde-base/drkonqi/ChangeLog
+++ b/kde-base/drkonqi/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/drkonqi
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/drkonqi/ChangeLog,v 1.200 2011/10/15 17:25:50 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/drkonqi/ChangeLog,v 1.201 2011/10/28 19:03:20 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -drkonqi-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -drkonqi-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/drkonqi/drkonqi-4.7.1.ebuild b/kde-base/drkonqi/drkonqi-4.7.1.ebuild
deleted file mode 100644
index 0c1a86a50ea1..000000000000
--- a/kde-base/drkonqi/drkonqi-4.7.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/drkonqi/drkonqi-4.7.1.ebuild,v 1.1 2011/09/07 20:14:02 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KDE crash handler, gives the user feedback if a program crashed"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-	if ! has_version "sys-devel/gdb"; then
-		elog "For more usability consider installing following packages:"
-		elog "    sys-devel/gdb - Easier debugging support"
-	fi
-}
diff --git a/kde-base/ffmpegthumbs/ChangeLog b/kde-base/ffmpegthumbs/ChangeLog
index a65c66d6696e..c6770ae54a44 100644
--- a/kde-base/ffmpegthumbs/ChangeLog
+++ b/kde-base/ffmpegthumbs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/ffmpegthumbs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ffmpegthumbs/ChangeLog,v 1.30 2011/10/15 17:26:02 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ffmpegthumbs/ChangeLog,v 1.31 2011/10/28 19:03:31 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -ffmpegthumbs-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -ffmpegthumbs-4.7.0.ebuild:
diff --git a/kde-base/ffmpegthumbs/ffmpegthumbs-4.7.1.ebuild b/kde-base/ffmpegthumbs/ffmpegthumbs-4.7.1.ebuild
deleted file mode 100644
index 7dcfbde73301..000000000000
--- a/kde-base/ffmpegthumbs/ffmpegthumbs-4.7.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ffmpegthumbs/ffmpegthumbs-4.7.1.ebuild,v 1.1 2011/09/07 20:13:40 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kdemultimedia"
-inherit kde4-meta
-
-DESCRIPTION="A FFmpeg based thumbnail Generator for Video Files."
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	virtual/ffmpeg
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/filelight/ChangeLog b/kde-base/filelight/ChangeLog
index ee98016f4cc9..21c4ab498789 100644
--- a/kde-base/filelight/ChangeLog
+++ b/kde-base/filelight/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/filelight
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/filelight/ChangeLog,v 1.25 2011/10/15 17:26:00 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/filelight/ChangeLog,v 1.26 2011/10/28 19:03:29 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -filelight-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -filelight-4.7.0.ebuild:
diff --git a/kde-base/filelight/filelight-4.7.1.ebuild b/kde-base/filelight/filelight-4.7.1.ebuild
deleted file mode 100644
index 49afb49fbc41..000000000000
--- a/kde-base/filelight/filelight-4.7.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/filelight/filelight-4.7.1.ebuild,v 1.1 2011/09/07 20:13:44 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeutils"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
-
-DESCRIPTION="Filelight creates an interactive map of concentric, segmented rings that help visualise disk usage."
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	!kde-misc/filelight
-	x11-apps/xdpyinfo
-"
diff --git a/kde-base/freespacenotifier/ChangeLog b/kde-base/freespacenotifier/ChangeLog
index e8c69e4e429e..4629b08be3cb 100644
--- a/kde-base/freespacenotifier/ChangeLog
+++ b/kde-base/freespacenotifier/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/freespacenotifier
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/freespacenotifier/ChangeLog,v 1.32 2011/10/15 17:25:49 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/freespacenotifier/ChangeLog,v 1.33 2011/10/28 19:03:36 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -freespacenotifier-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -freespacenotifier-4.7.0.ebuild:
diff --git a/kde-base/freespacenotifier/freespacenotifier-4.7.1.ebuild b/kde-base/freespacenotifier/freespacenotifier-4.7.1.ebuild
deleted file mode 100644
index 12332596c0b3..000000000000
--- a/kde-base/freespacenotifier/freespacenotifier-4.7.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/freespacenotifier/freespacenotifier-4.7.1.ebuild,v 1.1 2011/09/07 20:13:47 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="A module that monitors free disk space on the home dir"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/granatier/ChangeLog b/kde-base/granatier/ChangeLog
index 1340c503d5c7..9c9cd8977191 100644
--- a/kde-base/granatier/ChangeLog
+++ b/kde-base/granatier/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/granatier
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/granatier/ChangeLog,v 1.43 2011/10/15 17:25:58 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/granatier/ChangeLog,v 1.44 2011/10/28 19:03:28 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -granatier-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -granatier-4.7.0.ebuild:
diff --git a/kde-base/granatier/granatier-4.7.1.ebuild b/kde-base/granatier/granatier-4.7.1.ebuild
deleted file mode 100644
index 84e76737a83c..000000000000
--- a/kde-base/granatier/granatier-4.7.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/granatier/granatier-4.7.1.ebuild,v 1.1 2011/09/07 20:13:59 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE Bomberman game"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	media-libs/libsndfile
-	media-libs/openal
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/gwenview/ChangeLog b/kde-base/gwenview/ChangeLog
index 1b6c414a73db..87b0d02690d0 100644
--- a/kde-base/gwenview/ChangeLog
+++ b/kde-base/gwenview/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/gwenview
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/gwenview/ChangeLog,v 1.106 2011/10/15 17:26:15 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/gwenview/ChangeLog,v 1.107 2011/10/28 19:03:47 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -gwenview-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -gwenview-4.7.0.ebuild:
diff --git a/kde-base/gwenview/gwenview-4.7.1.ebuild b/kde-base/gwenview/gwenview-4.7.1.ebuild
deleted file mode 100644
index aabbcffa5b3e..000000000000
--- a/kde-base/gwenview/gwenview-4.7.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/gwenview/gwenview-4.7.1.ebuild,v 1.1 2011/09/07 20:13:50 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE image viewer"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug kipi semantic-desktop"
-
-# tests hang, last checked for 4.2.96
-RESTRICT="test"
-
-DEPEND="
-	$(add_kdebase_dep kdelibs 'semantic-desktop=')
-	$(add_kdebase_dep libkonq)
-	>=media-gfx/exiv2-0.19
-	virtual/jpeg
-	kipi? ( $(add_kdebase_dep libkipi) )
-"
-RDEPEND="${DEPEND}"
-
-KMLOADLIBS="libkonq"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with kipi)
-	)
-
-	if use semantic-desktop; then
-		mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=Nepomuk)
-	else
-		mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=None)
-	fi
-
-	kde4-base_src_configure
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	echo
-	elog "For SVG support, emerge -va kde-base/svgpart"
-	echo
-	use kipi && elog "The plugins for the KIPI inteface can be found in media-plugins/kipi-plugins"
-	use kipi && echo
-}
diff --git a/kde-base/jovie/ChangeLog b/kde-base/jovie/ChangeLog
index 2e854fecc5ae..e5e24e2f6eac 100644
--- a/kde-base/jovie/ChangeLog
+++ b/kde-base/jovie/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/jovie
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/jovie/ChangeLog,v 1.28 2011/10/15 17:26:08 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/jovie/ChangeLog,v 1.29 2011/10/28 19:03:28 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -jovie-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -jovie-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/jovie/jovie-4.7.1.ebuild b/kde-base/jovie/jovie-4.7.1.ebuild
deleted file mode 100644
index 5895f084e1de..000000000000
--- a/kde-base/jovie/jovie-4.7.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/jovie/jovie-4.7.1.ebuild,v 1.1 2011/09/07 20:13:46 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeaccessibility"
-	kde_eclass="kde4-meta"
-fi
-
-inherit ${kde_eclass}
-
-DESCRIPTION="Jovie is a text to speech application"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	app-accessibility/speech-dispatcher
-"
-RDEPEND="${DEPEND}"
-
-# Renamed from kttsd just after 4.4.80
-add_blocker kttsd
diff --git a/kde-base/juk/ChangeLog b/kde-base/juk/ChangeLog
index 5b7ae97c50a2..e325d85bf2bb 100644
--- a/kde-base/juk/ChangeLog
+++ b/kde-base/juk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/juk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/ChangeLog,v 1.201 2011/10/15 17:26:13 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/ChangeLog,v 1.202 2011/10/28 19:03:45 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -juk-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -juk-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/juk/juk-4.7.1.ebuild b/kde-base/juk/juk-4.7.1.ebuild
deleted file mode 100644
index 82dff0333c10..000000000000
--- a/kde-base/juk/juk-4.7.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/juk-4.7.1.ebuild,v 1.1 2011/09/07 20:13:49 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdemultimedia"
-inherit kde4-meta
-
-DESCRIPTION="Jukebox and music manager for KDE."
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug musicbrainz"
-
-DEPEND="
-	>=media-libs/taglib-1.6
-	musicbrainz? ( media-libs/tunepimp )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with musicbrainz TunePimp)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kabcclient/ChangeLog b/kde-base/kabcclient/ChangeLog
index 6099a3e540a9..4cbc00e4d32d 100644
--- a/kde-base/kabcclient/ChangeLog
+++ b/kde-base/kabcclient/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kabcclient
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kabcclient/ChangeLog,v 1.72 2011/10/15 17:25:59 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kabcclient/ChangeLog,v 1.73 2011/10/28 19:03:29 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kabcclient-4.6.1.ebuild, -kabcclient-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kabcclient-4.6.1.ebuild, -kabcclient-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kabcclient-4.7.0.ebuild:
diff --git a/kde-base/kabcclient/kabcclient-4.6.1.ebuild b/kde-base/kabcclient/kabcclient-4.6.1.ebuild
deleted file mode 100644
index 148d363c5c69..000000000000
--- a/kde-base/kabcclient/kabcclient-4.6.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kabcclient/kabcclient-4.6.1.ebuild,v 1.1 2011/07/11 14:01:18 tampakrap Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KMMODULE="console/${PN}"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="A command line client for accessing the KDE addressbook"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	kde4-meta_src_install
-
-	# work around NULL DT_RPATH in kabc2mutt
-	dosym kabcclient ${PREFIX}/bin/kabc2mutt
-}
diff --git a/kde-base/kabcclient/kabcclient-4.7.1.ebuild b/kde-base/kabcclient/kabcclient-4.7.1.ebuild
deleted file mode 100644
index 704dbd845362..000000000000
--- a/kde-base/kabcclient/kabcclient-4.7.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kabcclient/kabcclient-4.7.1.ebuild,v 1.1 2011/09/07 20:13:42 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KMMODULE="console/${PN}"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="A command line client for accessing the KDE addressbook"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	kde4-meta_src_install
-
-	# work around NULL DT_RPATH in kabc2mutt
-	dosym kabcclient ${PREFIX}/bin/kabc2mutt
-}
diff --git a/kde-base/kaccessible/ChangeLog b/kde-base/kaccessible/ChangeLog
index f5351fc95e08..dc655406f99c 100644
--- a/kde-base/kaccessible/ChangeLog
+++ b/kde-base/kaccessible/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kaccessible
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaccessible/ChangeLog,v 1.24 2011/10/15 17:26:08 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaccessible/ChangeLog,v 1.25 2011/10/28 19:03:42 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kaccessible-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kaccessible-4.7.0.ebuild:
diff --git a/kde-base/kaccessible/kaccessible-4.7.1.ebuild b/kde-base/kaccessible/kaccessible-4.7.1.ebuild
deleted file mode 100644
index 712103e2352b..000000000000
--- a/kde-base/kaccessible/kaccessible-4.7.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaccessible/kaccessible-4.7.1.ebuild,v 1.1 2011/09/07 20:13:45 alexxy Exp $
-
-EAPI=4
-
-KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeaccessibility"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
-
-DESCRIPTION="Provides accessibility services like focus tracking"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +speechd"
-
-DEPEND="app-accessibility/speech-dispatcher"
-RDEPEND=${DEPEND}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with speechd Speechd)
-	)
-	${kde_eclass}_src_configure
-}
diff --git a/kde-base/kactivities/ChangeLog b/kde-base/kactivities/ChangeLog
index 1c09832999c1..8d203792e425 100644
--- a/kde-base/kactivities/ChangeLog
+++ b/kde-base/kactivities/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kactivities
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kactivities/ChangeLog,v 1.2 2011/10/06 18:11:07 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kactivities/ChangeLog,v 1.3 2011/10/28 19:03:21 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kactivities-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
 *kactivities-4.7.2 (06 Oct 2011)
 
diff --git a/kde-base/kactivities/kactivities-4.7.1.ebuild b/kde-base/kactivities/kactivities-4.7.1.ebuild
deleted file mode 100644
index 17a13400fa86..000000000000
--- a/kde-base/kactivities/kactivities-4.7.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kactivities/kactivities-4.7.1.ebuild,v 1.1 2011/09/27 21:44:29 abcd Exp $
-
-EAPI=4
-
-KDE_SCM="git"
-KMNAME="kdelibs"
-
-inherit kde4-base
-
-DESCRIPTION="KDE Activity Manager"
-
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT="test"
-
-# Split out from kdelibs in 4.7.1-r2
-add_blocker kdelibs 4.7.1-r1
-
-src_unpack() {
-	kde4-base_src_unpack
-	# Move the unpacked sources to where they are expected to be
-	[[ $(echo *-${PV}) != ${P} ]] && { mv *-${PV} ${P} || die; }
-}
-
-src_prepare() {
-	kde4-base_src_prepare
-
-	sed -i -e '/libkdeclarative/s:^:#DONOTWANT:' experimental/CMakeLists.txt || die
-}
-
-src_configure() {
-	local S="${WORKDIR}/${P}/experimental"
-
-	kde4-base_src_configure
-}
-
-src_compile() {
-	local S="${WORKDIR}/${P}/experimental"
-
-	kde4-base_src_compile
-}
-
-src_install() {
-	local S="${WORKDIR}/${P}/experimental"
-
-	kde4-base_src_install
-}
diff --git a/kde-base/kaddressbook/ChangeLog b/kde-base/kaddressbook/ChangeLog
index 58cdeb289bc4..fe6ea951cf8e 100644
--- a/kde-base/kaddressbook/ChangeLog
+++ b/kde-base/kaddressbook/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kaddressbook
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/ChangeLog,v 1.195 2011/10/15 17:25:49 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/ChangeLog,v 1.196 2011/10/28 19:03:19 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kaddressbook-4.6.1.ebuild, -kaddressbook-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kaddressbook-4.6.1.ebuild, -kaddressbook-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kaddressbook-4.7.0.ebuild:
diff --git a/kde-base/kaddressbook/kaddressbook-4.6.1.ebuild b/kde-base/kaddressbook/kaddressbook-4.6.1.ebuild
deleted file mode 100644
index 4a1918daf3dd..000000000000
--- a/kde-base/kaddressbook/kaddressbook-4.6.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-4.6.1.ebuild,v 1.1 2011/07/11 14:01:19 tampakrap Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="The KDE Address Book"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	>=dev-libs/grantlee-0.1.4
-	$(add_kdebase_dep kdelibs 'semantic-desktop')
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRA="
-	plugins/kaddressbook/
-	plugins/ktexteditor/
-"
-KMEXTRACTONLY="
-	akonadi_next/
-	calendarsupport/
-	libkleo/
-"
-
-KMLOADLIBS="kdepim-common-libs"
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-
-	if ! has_version kde-base/kdepim-kresources:${SLOT}; then
-		echo
-		elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
-		echo
-	fi
-}
diff --git a/kde-base/kaddressbook/kaddressbook-4.7.1.ebuild b/kde-base/kaddressbook/kaddressbook-4.7.1.ebuild
deleted file mode 100644
index 27eff01a9bd0..000000000000
--- a/kde-base/kaddressbook/kaddressbook-4.7.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-4.7.1.ebuild,v 1.1 2011/09/07 20:13:39 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="The KDE Address Book"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	>=dev-libs/grantlee-0.1.4
-	$(add_kdebase_dep kdelibs 'semantic-desktop')
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRA="
-	plugins/kaddressbook/
-	plugins/ktexteditor/
-"
-KMEXTRACTONLY="
-	akonadi_next/
-	calendarsupport/
-	libkleo/
-"
-
-KMLOADLIBS="kdepim-common-libs"
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-
-	if ! has_version kde-base/kdepim-kresources:${SLOT}; then
-		echo
-		elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
-		echo
-	fi
-}
diff --git a/kde-base/kajongg/ChangeLog b/kde-base/kajongg/ChangeLog
index 6b801d9177c9..3aa31a1c8848 100644
--- a/kde-base/kajongg/ChangeLog
+++ b/kde-base/kajongg/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kajongg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kajongg/ChangeLog,v 1.29 2011/10/15 17:26:15 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kajongg/ChangeLog,v 1.30 2011/10/28 19:03:21 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kajongg-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kajongg-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kajongg/kajongg-4.7.1.ebuild b/kde-base/kajongg/kajongg-4.7.1.ebuild
deleted file mode 100644
index 4badc783d775..000000000000
--- a/kde-base/kajongg/kajongg-4.7.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kajongg/kajongg-4.7.1.ebuild,v 1.1 2011/09/07 20:14:07 alexxy Exp $
-
-EAPI=3
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta python
-
-DESCRIPTION="The classical Mah Jongg for four players"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	dev-db/sqlite:3
-	$(add_kdebase_dep libkdegames)
-	$(add_kdebase_dep pykde4)
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep libkmahjongg)
-	>=dev-python/twisted-8.2.0
-"
diff --git a/kde-base/kalarm/ChangeLog b/kde-base/kalarm/ChangeLog
index 285ab83d342b..a2a40aa854ff 100644
--- a/kde-base/kalarm/ChangeLog
+++ b/kde-base/kalarm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kalarm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/ChangeLog,v 1.188 2011/10/15 17:26:12 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/ChangeLog,v 1.189 2011/10/28 19:03:44 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kalarm-4.6.1.ebuild,
+  -kalarm-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kalarm-4.6.1.ebuild,
+  -kalarm-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kalarm-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kalarm/kalarm-4.6.1.ebuild b/kde-base/kalarm/kalarm-4.6.1.ebuild
deleted file mode 100644
index df1bfbcff0ee..000000000000
--- a/kde-base/kalarm/kalarm-4.6.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/kalarm-4.6.1.ebuild,v 1.1 2011/07/11 14:01:19 tampakrap Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="Personal alarm message, command and email scheduler for KDE"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
-	$(add_kdebase_dep kdepim-common-libs)
-	media-libs/phonon
-"
-DEPEND="${RDEPEND}"
-
-KMEXTRACTONLY="
-	kmail/
-"
diff --git a/kde-base/kalarm/kalarm-4.7.1.ebuild b/kde-base/kalarm/kalarm-4.7.1.ebuild
deleted file mode 100644
index 4cac4c5269f1..000000000000
--- a/kde-base/kalarm/kalarm-4.7.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/kalarm-4.7.1.ebuild,v 1.1 2011/09/07 20:14:06 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="Personal alarm message, command and email scheduler for KDE"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
-	$(add_kdebase_dep kdepim-common-libs)
-	media-libs/phonon
-"
-DEPEND="${RDEPEND}"
-
-KMEXTRACTONLY="
-	kmail/
-"
diff --git a/kde-base/kalgebra/ChangeLog b/kde-base/kalgebra/ChangeLog
index ca1308533515..5be54fb6fe97 100644
--- a/kde-base/kalgebra/ChangeLog
+++ b/kde-base/kalgebra/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kalgebra
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalgebra/ChangeLog,v 1.101 2011/10/15 17:26:07 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalgebra/ChangeLog,v 1.102 2011/10/28 19:03:48 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kalgebra-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kalgebra-4.7.0.ebuild:
diff --git a/kde-base/kalgebra/kalgebra-4.7.1.ebuild b/kde-base/kalgebra/kalgebra-4.7.1.ebuild
deleted file mode 100644
index ea9a3f96c5d7..000000000000
--- a/kde-base/kalgebra/kalgebra-4.7.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalgebra/kalgebra-4.7.1.ebuild,v 1.1 2011/09/07 20:14:08 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-OPENGL_REQUIRED="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="MathML-based graph calculator for KDE."
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +plasma readline"
-
-DEPEND="
-	$(add_kdebase_dep libkdeedu)
-	readline? ( sys-libs/readline )
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	libkdeedu/kdeeduui/
-"
-KMEXTRA="
-	libkdeedu/qtmmlwidget/
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.5.73-solaris-graph2d.patch
-)
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with readline)
-		$(cmake-utils_use_with plasma)
-		$(cmake-utils_use_with opengl OpenGL)
-	)
-
-	kde4-base_src_configure
-}
-
-src_test() {
-	# disable broken test
-	sed -i -e '/mathmlpresentationtest/ s/^/#DO_NOT_RUN_TEST /' \
-		"${S}"/analitza/tests/CMakeLists.txt || \
-		die "sed to disable mathmlpresentationtest failed."
-
-	kde4-base_src_test
-}
diff --git a/kde-base/kalzium/ChangeLog b/kde-base/kalzium/ChangeLog
index 127f1846e42d..9154f1585cc5 100644
--- a/kde-base/kalzium/ChangeLog
+++ b/kde-base/kalzium/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kalzium
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/ChangeLog,v 1.202 2011/10/15 17:26:10 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/ChangeLog,v 1.203 2011/10/28 19:03:41 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kalzium-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kalzium-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kalzium/kalzium-4.7.1.ebuild b/kde-base/kalzium/kalzium-4.7.1.ebuild
deleted file mode 100644
index 79f057abaa4e..000000000000
--- a/kde-base/kalzium/kalzium-4.7.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/kalzium-4.7.1.ebuild,v 1.1 2011/09/07 20:13:44 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-CPPUNIT_REQUIRED="optional"
-OPENGL_REQUIRED="always"
-inherit kde4-base flag-o-matic
-
-DESCRIPTION="KDE: periodic table of the elements."
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="editor debug +plasma solver"
-
-RDEPEND="
-	$(add_kdebase_dep libkdeedu)
-	editor? ( >=sci-chemistry/openbabel-2.2 )
-"
-DEPEND="${RDEPEND}
-	editor? ( >=dev-cpp/eigen-2.0.3:2 )
-	solver? ( dev-ml/facile[ocamlopt] )
-"
-
-KMEXTRACTONLY="
-	libkdeedu/kdeeduui/
-	libkdeedu/libscience/
-"
-
-src_configure(){
-	# Fix missing finite()
-	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H
-
-	mycmakeargs=(
-		$(cmake-utils_use_with editor Eigen2)
-		$(cmake-utils_use_with editor OpenBabel2)
-		$(cmake-utils_use_with editor OpenGL)
-		$(cmake-utils_use_with solver OCaml)
-		$(cmake-utils_use_with solver Libfacile)
-	)
-
-	kde4-base_src_configure
-}
-
-src_test(){ :; } #see bug 376911
diff --git a/kde-base/kamera/ChangeLog b/kde-base/kamera/ChangeLog
index 763db3b13219..8f75095d706c 100644
--- a/kde-base/kamera/ChangeLog
+++ b/kde-base/kamera/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kamera
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kamera/ChangeLog,v 1.182 2011/10/15 17:25:52 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kamera/ChangeLog,v 1.183 2011/10/28 19:03:22 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kamera-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kamera-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kamera/kamera-4.7.1.ebuild b/kde-base/kamera/kamera-4.7.1.ebuild
deleted file mode 100644
index cf226c1a5b91..000000000000
--- a/kde-base/kamera/kamera-4.7.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kamera/kamera-4.7.1.ebuild,v 1.1 2011/09/07 20:14:04 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE digital camera manager"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	media-libs/libgphoto2
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/kanagram/ChangeLog b/kde-base/kanagram/ChangeLog
index ad1e687d8c69..46b4e3a29827 100644
--- a/kde-base/kanagram/ChangeLog
+++ b/kde-base/kanagram/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kanagram
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kanagram/ChangeLog,v 1.162 2011/10/15 17:25:53 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kanagram/ChangeLog,v 1.163 2011/10/28 19:03:23 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kanagram-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kanagram-4.7.0.ebuild:
diff --git a/kde-base/kanagram/kanagram-4.7.1.ebuild b/kde-base/kanagram/kanagram-4.7.1.ebuild
deleted file mode 100644
index acba35cee7d7..000000000000
--- a/kde-base/kanagram/kanagram-4.7.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kanagram/kanagram-4.7.1.ebuild,v 1.1 2011/09/07 20:13:42 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE: letter order game."
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep libkdeedu)
-"
diff --git a/kde-base/kapman/ChangeLog b/kde-base/kapman/ChangeLog
index 5e9e04436a5e..45169d153d63 100644
--- a/kde-base/kapman/ChangeLog
+++ b/kde-base/kapman/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kapman
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kapman/ChangeLog,v 1.76 2011/10/15 17:25:53 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kapman/ChangeLog,v 1.77 2011/10/28 19:03:25 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kapman-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kapman-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kapman/kapman-4.7.1.ebuild b/kde-base/kapman/kapman-4.7.1.ebuild
deleted file mode 100644
index 4b4454973628..000000000000
--- a/kde-base/kapman/kapman-4.7.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kapman/kapman-4.7.1.ebuild,v 1.1 2011/09/07 20:13:52 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="Pac-Man clone for KDE"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kapptemplate/ChangeLog b/kde-base/kapptemplate/ChangeLog
index 100de7f3f6ff..ba095100e3ce 100644
--- a/kde-base/kapptemplate/ChangeLog
+++ b/kde-base/kapptemplate/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kapptemplate
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kapptemplate/ChangeLog,v 1.161 2011/10/15 17:25:59 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kapptemplate/ChangeLog,v 1.162 2011/10/28 19:03:28 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kapptemplate-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kapptemplate-4.7.0.ebuild:
diff --git a/kde-base/kapptemplate/kapptemplate-4.7.1.ebuild b/kde-base/kapptemplate/kapptemplate-4.7.1.ebuild
deleted file mode 100644
index 1723e7913a20..000000000000
--- a/kde-base/kapptemplate/kapptemplate-4.7.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kapptemplate/kapptemplate-4.7.1.ebuild,v 1.1 2011/09/07 20:13:51 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdesdk"
-inherit kde4-meta
-
-DESCRIPTION="KAppTemplate - A shell script to create the necessary framework to develop KDE applications."
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kate/ChangeLog b/kde-base/kate/ChangeLog
index 39feca886b3a..fc65e8cda193 100644
--- a/kde-base/kate/ChangeLog
+++ b/kde-base/kate/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kate
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kate/ChangeLog,v 1.209 2011/10/15 17:26:03 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kate/ChangeLog,v 1.210 2011/10/28 19:03:33 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kate-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kate-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kate/kate-4.7.1.ebuild b/kde-base/kate/kate-4.7.1.ebuild
deleted file mode 100644
index ffdd12802fa6..000000000000
--- a/kde-base/kate/kate-4.7.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kate/kate-4.7.1.ebuild,v 1.1 2011/09/07 20:13:47 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kate"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="Kate is an MDI texteditor."
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +plasma"
-
-DEPEND="
-	dev-libs/libxml2
-	dev-libs/libxslt
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep katepart)
-"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with plasma)
-	)
-
-	kde4-meta_src_configure
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-
-	if ! has_version kde-base/kaddressbook:${SLOT}; then
-		echo
-		elog "File templates plugin requires kde-base/kaddressbook:${SLOT}."
-		elog "Please install it if you plan to use this plugin."
-		echo
-	fi
-}
diff --git a/kde-base/katepart/ChangeLog b/kde-base/katepart/ChangeLog
index e4c782964b04..47d961e21ec7 100644
--- a/kde-base/katepart/ChangeLog
+++ b/kde-base/katepart/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/katepart
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/katepart/ChangeLog,v 1.5 2011/10/15 17:26:16 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/katepart/ChangeLog,v 1.6 2011/10/28 19:03:47 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -katepart-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -katepart-4.7.0.ebuild:
diff --git a/kde-base/katepart/katepart-4.7.1.ebuild b/kde-base/katepart/katepart-4.7.1.ebuild
deleted file mode 100644
index 07c3adbe040b..000000000000
--- a/kde-base/katepart/katepart-4.7.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/katepart/katepart-4.7.1.ebuild,v 1.1 2011/09/07 20:13:50 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kate"
-KMMODULE="part"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="KDE Editor KPart"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug"
-
-add_blocker kdelibs 4.6.50
-
-src_configure() {
-	local mycmakeargs=(
-		"-DKDE4_BUILD_TESTS=OFF"
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/katomic/ChangeLog b/kde-base/katomic/ChangeLog
index e4380943b88c..48287673cb94 100644
--- a/kde-base/katomic/ChangeLog
+++ b/kde-base/katomic/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/katomic
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/katomic/ChangeLog,v 1.184 2011/10/15 17:25:51 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/katomic/ChangeLog,v 1.185 2011/10/28 19:03:22 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -katomic-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -katomic-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/katomic/katomic-4.7.1.ebuild b/kde-base/katomic/katomic-4.7.1.ebuild
deleted file mode 100644
index c2f04ac31fac..000000000000
--- a/kde-base/katomic/katomic-4.7.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/katomic/katomic-4.7.1.ebuild,v 1.1 2011/09/07 20:13:52 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE Atomic Entertainment Game"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kbattleship/ChangeLog b/kde-base/kbattleship/ChangeLog
index d5bcf5e4514c..0e429ee6be24 100644
--- a/kde-base/kbattleship/ChangeLog
+++ b/kde-base/kbattleship/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kbattleship
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbattleship/ChangeLog,v 1.188 2011/10/15 17:26:09 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbattleship/ChangeLog,v 1.189 2011/10/28 19:03:39 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kbattleship-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kbattleship-4.7.0.ebuild:
diff --git a/kde-base/kbattleship/kbattleship-4.7.1.ebuild b/kde-base/kbattleship/kbattleship-4.7.1.ebuild
deleted file mode 100644
index e3018ffe9e1f..000000000000
--- a/kde-base/kbattleship/kbattleship-4.7.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbattleship/kbattleship-4.7.1.ebuild,v 1.1 2011/09/07 20:13:59 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit games-ggz kde4-meta
-
-DESCRIPTION="The KDE Battleship clone"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-src_prepare() {
-	# cmake is doing this really weird
-	sed -i \
-		-e "s:register_ggz_module:#register_ggz_module:g" \
-		"${PN}"/src/CMakeLists.txt || die "ggz removal failed"
-
-	kde4-meta_src_prepare
-}
-
-src_install() {
-	kde4-meta_src_install
-	# and also we have to prepare the ggz dir
-	insinto "${GGZ_MODDIR}"
-	newins ${PN}/src/module.dsc ${P}.dsc
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-	games-ggz_pkg_postinst
-}
-
-pkg_postrm() {
-	kde4-meta_pkg_postrm
-	games-ggz_pkg_postrm
-}
diff --git a/kde-base/kblackbox/ChangeLog b/kde-base/kblackbox/ChangeLog
index 25e4f5861cd4..7fdaa959d192 100644
--- a/kde-base/kblackbox/ChangeLog
+++ b/kde-base/kblackbox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kblackbox
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kblackbox/ChangeLog,v 1.183 2011/10/15 17:26:17 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kblackbox/ChangeLog,v 1.184 2011/10/28 19:03:48 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kblackbox-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kblackbox-4.7.0.ebuild:
diff --git a/kde-base/kblackbox/kblackbox-4.7.1.ebuild b/kde-base/kblackbox/kblackbox-4.7.1.ebuild
deleted file mode 100644
index 8edc5db6dbe3..000000000000
--- a/kde-base/kblackbox/kblackbox-4.7.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kblackbox/kblackbox-4.7.1.ebuild,v 1.1 2011/09/07 20:13:49 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE Blackbox Game"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kblocks/ChangeLog b/kde-base/kblocks/ChangeLog
index ea88ed405085..9ca817ddb0fb 100644
--- a/kde-base/kblocks/ChangeLog
+++ b/kde-base/kblocks/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kblocks
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kblocks/ChangeLog,v 1.81 2011/10/15 17:26:13 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kblocks/ChangeLog,v 1.82 2011/10/28 19:03:45 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kblocks-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kblocks-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kblocks/kblocks-4.7.1.ebuild b/kde-base/kblocks/kblocks-4.7.1.ebuild
deleted file mode 100644
index 3fcc67ae1c53..000000000000
--- a/kde-base/kblocks/kblocks-4.7.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kblocks/kblocks-4.7.1.ebuild,v 1.1 2011/09/07 20:13:49 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE: Kblocks is a single-player Tetris-like game."
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kbounce/ChangeLog b/kde-base/kbounce/ChangeLog
index 2e4afd8a785e..0e2dc5a15ae6 100644
--- a/kde-base/kbounce/ChangeLog
+++ b/kde-base/kbounce/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kbounce
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbounce/ChangeLog,v 1.183 2011/10/15 17:26:15 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbounce/ChangeLog,v 1.184 2011/10/28 19:03:46 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kbounce-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kbounce-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kbounce/kbounce-4.7.1.ebuild b/kde-base/kbounce/kbounce-4.7.1.ebuild
deleted file mode 100644
index 28f2a2b1c013..000000000000
--- a/kde-base/kbounce/kbounce-4.7.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbounce/kbounce-4.7.1.ebuild,v 1.1 2011/09/07 20:13:50 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE Bounce Ball Game"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kbreakout/ChangeLog b/kde-base/kbreakout/ChangeLog
index f5eb52328e0b..dce2e8ad81d1 100644
--- a/kde-base/kbreakout/ChangeLog
+++ b/kde-base/kbreakout/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kbreakout
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbreakout/ChangeLog,v 1.81 2011/10/15 17:26:16 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbreakout/ChangeLog,v 1.82 2011/10/28 19:03:47 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kbreakout-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kbreakout-4.7.0.ebuild:
diff --git a/kde-base/kbreakout/kbreakout-4.7.1.ebuild b/kde-base/kbreakout/kbreakout-4.7.1.ebuild
deleted file mode 100644
index f1565801f457..000000000000
--- a/kde-base/kbreakout/kbreakout-4.7.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbreakout/kbreakout-4.7.1.ebuild,v 1.1 2011/09/07 20:14:03 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE: A Breakout-like game for KDE."
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kbruch/ChangeLog b/kde-base/kbruch/ChangeLog
index 3bdcb7d83dfe..0ec6376d7a0f 100644
--- a/kde-base/kbruch/ChangeLog
+++ b/kde-base/kbruch/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kbruch
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbruch/ChangeLog,v 1.180 2011/10/15 17:25:58 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbruch/ChangeLog,v 1.181 2011/10/28 19:03:31 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kbruch-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kbruch-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kbruch/kbruch-4.7.1.ebuild b/kde-base/kbruch/kbruch-4.7.1.ebuild
deleted file mode 100644
index ba70d0fa36d6..000000000000
--- a/kde-base/kbruch/kbruch-4.7.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbruch/kbruch-4.7.1.ebuild,v 1.1 2011/09/07 20:13:49 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE Educational: Learn calculating with fractions"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kcachegrind/ChangeLog b/kde-base/kcachegrind/ChangeLog
index 9518d404fa6c..794af6f2fe18 100644
--- a/kde-base/kcachegrind/ChangeLog
+++ b/kde-base/kcachegrind/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kcachegrind
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcachegrind/ChangeLog,v 1.178 2011/10/15 17:25:55 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcachegrind/ChangeLog,v 1.179 2011/10/28 19:03:25 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kcachegrind-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kcachegrind-4.7.0.ebuild:
diff --git a/kde-base/kcachegrind/kcachegrind-4.7.1.ebuild b/kde-base/kcachegrind/kcachegrind-4.7.1.ebuild
deleted file mode 100644
index 4c407f2173bd..000000000000
--- a/kde-base/kcachegrind/kcachegrind-4.7.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcachegrind/kcachegrind-4.7.1.ebuild,v 1.1 2011/09/07 20:13:49 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdesdk"
-inherit kde4-meta
-
-DESCRIPTION="KDE Frontend for Cachegrind"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	media-gfx/graphviz
-"
diff --git a/kde-base/kcalc/ChangeLog b/kde-base/kcalc/ChangeLog
index 1c0287490680..48a5b0151a29 100644
--- a/kde-base/kcalc/ChangeLog
+++ b/kde-base/kcalc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kcalc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/ChangeLog,v 1.189 2011/10/15 17:26:06 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/ChangeLog,v 1.190 2011/10/28 19:03:39 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kcalc-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kcalc-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kcalc/kcalc-4.7.1.ebuild b/kde-base/kcalc/kcalc-4.7.1.ebuild
deleted file mode 100644
index a7f07c7b06f3..000000000000
--- a/kde-base/kcalc/kcalc-4.7.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/kcalc-4.7.1.ebuild,v 1.1 2011/09/07 20:13:46 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-CPPUNIT_REQUIRED="optional"
-KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeutils"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
-
-DESCRIPTION="KDE calculator"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	dev-libs/gmp
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3.2-solaris-knumber_priv.patch
-)
-
-src_test() {
-	LANG=C ${kde_eclass}_src_test
-}
diff --git a/kde-base/kcharselect/ChangeLog b/kde-base/kcharselect/ChangeLog
index 7fc7097a86be..5c7dc29ff202 100644
--- a/kde-base/kcharselect/ChangeLog
+++ b/kde-base/kcharselect/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kcharselect
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcharselect/ChangeLog,v 1.172 2011/10/15 17:25:58 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcharselect/ChangeLog,v 1.173 2011/10/28 19:03:27 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kcharselect-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kcharselect-4.7.0.ebuild:
diff --git a/kde-base/kcharselect/kcharselect-4.7.1.ebuild b/kde-base/kcharselect/kcharselect-4.7.1.ebuild
deleted file mode 100644
index c614ad500695..000000000000
--- a/kde-base/kcharselect/kcharselect-4.7.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcharselect/kcharselect-4.7.1.ebuild,v 1.1 2011/09/07 20:14:07 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeutils"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
-
-DESCRIPTION="KDE character selection utility"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kcheckpass/ChangeLog b/kde-base/kcheckpass/ChangeLog
index 59d9fae813ba..6da40fe8cdb8 100644
--- a/kde-base/kcheckpass/ChangeLog
+++ b/kde-base/kcheckpass/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kcheckpass
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/ChangeLog,v 1.198 2011/10/15 17:26:17 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/ChangeLog,v 1.199 2011/10/28 19:03:48 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kcheckpass-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kcheckpass-4.7.0.ebuild:
diff --git a/kde-base/kcheckpass/kcheckpass-4.7.1.ebuild b/kde-base/kcheckpass/kcheckpass-4.7.1.ebuild
deleted file mode 100644
index 2a35fe4b0943..000000000000
--- a/kde-base/kcheckpass/kcheckpass-4.7.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/kcheckpass-4.7.1.ebuild,v 1.1 2011/09/07 20:13:48 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="A simple password checker, used by any software in need of user authentication."
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug pam"
-
-RDEPEND="
-	pam? (
-		>=kde-base/kdebase-pam-7
-		virtual/pam
-	)
-"
-DEPEND="${RDEPEND}
-	x11-libs/libxkbfile
-"
-
-PATCHES=(
-	"${FILESDIR}/kdebase-4.0.2-pam-optional.patch"
-)
-
-src_prepare() {
-	kde4-meta_src_prepare
-
-	use pam && epatch "${FILESDIR}/${PN}-4.4.2-no-SUID-no-GUID.patch"
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with pam)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kcminit/ChangeLog b/kde-base/kcminit/ChangeLog
index 86e54dc500ce..fecf0bbe09b9 100644
--- a/kde-base/kcminit/ChangeLog
+++ b/kde-base/kcminit/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kcminit
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcminit/ChangeLog,v 1.177 2011/10/15 17:26:10 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcminit/ChangeLog,v 1.178 2011/10/28 19:03:35 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kcminit-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kcminit-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kcminit/kcminit-4.7.1.ebuild b/kde-base/kcminit/kcminit-4.7.1.ebuild
deleted file mode 100644
index e332451b935c..000000000000
--- a/kde-base/kcminit/kcminit-4.7.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcminit/kcminit-4.7.1.ebuild,v 1.1 2011/09/07 20:14:05 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="KCMInit - runs startups initialization for Control Modules."
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep ksplash)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/kcmshell/ChangeLog b/kde-base/kcmshell/ChangeLog
index 96cd3339ea02..7562daefaec7 100644
--- a/kde-base/kcmshell/ChangeLog
+++ b/kde-base/kcmshell/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kcmshell
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcmshell/ChangeLog,v 1.97 2011/10/15 17:25:58 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcmshell/ChangeLog,v 1.98 2011/10/28 19:03:27 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kcmshell-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kcmshell-4.7.0.ebuild:
diff --git a/kde-base/kcmshell/kcmshell-4.7.1.ebuild b/kde-base/kcmshell/kcmshell-4.7.1.ebuild
deleted file mode 100644
index 47e3b1a578f9..000000000000
--- a/kde-base/kcmshell/kcmshell-4.7.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcmshell/kcmshell-4.7.1.ebuild,v 1.1 2011/09/07 20:13:53 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KCMShell is a utility to host KDE control modules independently of SystemSettings."
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kcolorchooser/ChangeLog b/kde-base/kcolorchooser/ChangeLog
index 52bdad46f6a5..fa2a8f4bb36a 100644
--- a/kde-base/kcolorchooser/ChangeLog
+++ b/kde-base/kcolorchooser/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kcolorchooser
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcolorchooser/ChangeLog,v 1.92 2011/10/15 17:25:48 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcolorchooser/ChangeLog,v 1.93 2011/10/28 19:03:18 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kcolorchooser-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kcolorchooser-4.7.0.ebuild:
diff --git a/kde-base/kcolorchooser/kcolorchooser-4.7.1.ebuild b/kde-base/kcolorchooser/kcolorchooser-4.7.1.ebuild
deleted file mode 100644
index dc9ece7f9203..000000000000
--- a/kde-base/kcolorchooser/kcolorchooser-4.7.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcolorchooser/kcolorchooser-4.7.1.ebuild,v 1.1 2011/09/07 20:13:45 alexxy Exp $
-
-EAPI=4
-
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE color selector/editor"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kcontrol/ChangeLog b/kde-base/kcontrol/ChangeLog
index 6038701baeb2..5f23a6f193cb 100644
--- a/kde-base/kcontrol/ChangeLog
+++ b/kde-base/kcontrol/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kcontrol
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/ChangeLog,v 1.225 2011/10/15 17:26:05 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/ChangeLog,v 1.226 2011/10/28 19:03:34 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kcontrol-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kcontrol-4.7.0.ebuild:
diff --git a/kde-base/kcontrol/kcontrol-4.7.1.ebuild b/kde-base/kcontrol/kcontrol-4.7.1.ebuild
deleted file mode 100644
index 4923ea2e13ac..000000000000
--- a/kde-base/kcontrol/kcontrol-4.7.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/kcontrol-4.7.1.ebuild,v 1.1 2011/09/07 20:14:07 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="The KDE Control Center"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	$(add_kdebase_dep kdnssd)
-	$(add_kdebase_dep khotkeys)
-"
-
-add_blocker systemsettings '<4.2.91'
diff --git a/kde-base/kcron/ChangeLog b/kde-base/kcron/ChangeLog
index 0ca76108a5b9..b0917ff0fd01 100644
--- a/kde-base/kcron/ChangeLog
+++ b/kde-base/kcron/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kcron
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcron/ChangeLog,v 1.181 2011/10/15 17:25:47 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcron/ChangeLog,v 1.182 2011/10/28 19:03:17 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kcron-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kcron-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kcron/kcron-4.7.1.ebuild b/kde-base/kcron/kcron-4.7.1.ebuild
deleted file mode 100644
index 4763f77712d9..000000000000
--- a/kde-base/kcron/kcron-4.7.1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcron/kcron-4.7.1.ebuild,v 1.1 2011/09/07 20:14:01 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdeadmin"
-inherit kde4-meta
-
-DESCRIPTION="KDE Task Scheduler"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="!prefix? ( virtual/cron )"
diff --git a/kde-base/kde-env/ChangeLog b/kde-base/kde-env/ChangeLog
index 570a7e9b4457..b51eda9a1871 100644
--- a/kde-base/kde-env/ChangeLog
+++ b/kde-base/kde-env/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kde-env
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/ChangeLog,v 1.119 2011/10/15 17:25:50 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/ChangeLog,v 1.120 2011/10/28 19:03:20 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kde-env-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kde-env-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kde-env/kde-env-4.7.1.ebuild b/kde-base/kde-env/kde-env-4.7.1.ebuild
deleted file mode 100644
index fbe2a8a60f8e..000000000000
--- a/kde-base/kde-env/kde-env-4.7.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/kde-env-4.7.1.ebuild,v 1.1 2011/09/07 20:14:05 alexxy Exp $
-
-EAPI=4
-
-CMAKE_REQUIRED="never"
-KDE_REQUIRED="never"
-inherit kde4-base
-
-DESCRIPTION="Environment setting required for all KDE4 apps to run."
-SRC_URI=""
-ESVN_REPO_URI=""
-
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-LICENSE="as-is"
-IUSE="aqua"
-
-add_blocker kdelibs 4.6.80 '<3.5.10-r3:3.5'
-
-S=${WORKDIR}
-
-src_unpack() {
-	:
-}
-
-src_prepare() {
-	:
-}
-
-src_install() {
-	# number goes down with version
-	cat <<-EOF > 43kdepaths
-CONFIG_PROTECT="/usr/share/config"
-#KDE_IS_PRELINKED=1
-EOF
-	doenvd 43kdepaths
-
-	# Properly place xinitrc.d file that exports XDG_MENU_PREFIX to env
-	cat <<EOF > 11-xdg-menu-kde-4
-#!/bin/sh
-
-if [ -z \${XDG_MENU_PREFIX} ] && [ "\${DESKTOP_SESSION}" = "KDE-4" ]; then
-	export XDG_MENU_PREFIX="kde-4-"
-fi
-EOF
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe 11-xdg-menu-kde-4 || die "doexe failed"
-}
-
-pkg_preinst() {
-	:
-}
-
-src_test() {
-	:
-}
diff --git a/kde-base/kde-l10n/ChangeLog b/kde-base/kde-l10n/ChangeLog
index 92133159e624..900343651ab7 100644
--- a/kde-base/kde-l10n/ChangeLog
+++ b/kde-base/kde-l10n/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kde-l10n
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-l10n/ChangeLog,v 1.109 2011/10/15 17:25:49 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-l10n/ChangeLog,v 1.110 2011/10/28 19:03:19 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kde-l10n-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kde-l10n-4.7.0-r2.ebuild:
diff --git a/kde-base/kde-l10n/kde-l10n-4.7.1.ebuild b/kde-base/kde-l10n/kde-l10n-4.7.1.ebuild
deleted file mode 100644
index 0839dfecfbf3..000000000000
--- a/kde-base/kde-l10n/kde-l10n-4.7.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-l10n/kde-l10n-4.7.1.ebuild,v 1.2 2011/10/02 19:32:28 reavertm Exp $
-
-EAPI="3"
-
-KDE_HANDBOOK="optional"
-inherit kde4-base
-
-DESCRIPTION="KDE internationalization package"
-HOMEPAGE="http://www.kde.org/"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND="
-	sys-devel/gettext
-"
-RDEPEND="!<kde-misc/konq-plugins-4.6"
-
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-# /usr/portage/distfiles $ ls -1 kde-l10n-*-${PV}.* |sed -e 's:-${PV}.tar.bz2::' -e 's:kde-l10n-::' |tr '\n' ' '
-MY_LANGS="ar bg bs ca ca@valencia cs da de el en_GB es et eu fi fr ga gl he hr
-hu ia id is it ja kk km kn ko lt lv nb nds nl nn pa pl pt pt_BR ro ru sk sl sr
-sv th tr ug uk wa zh_CN zh_TW"
-
-URI_BASE="${SRC_URI/-${PV}.tar.bz2/}"
-SRC_URI=""
-
-for MY_LANG in ${MY_LANGS} ; do
-	IUSE="${IUSE} linguas_${MY_LANG}"
-	SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${URI_BASE}/${PN}-${MY_LANG}-${PV}.tar.bz2 )"
-done
-
-S="${WORKDIR}"
-
-src_unpack() {
-	local LNG DIR
-	if [[ -z ${A} ]]; then
-		elog
-		elog "You either have the LINGUAS variable unset, or it only"
-		elog "contains languages not supported by ${P}."
-		elog "You won't have any additional language support."
-		elog
-		elog "${P} supports these language codes:"
-		elog "${MY_LANGS}"
-		elog
-	fi
-
-	# For EAPI >= 3, or if not using .tar.xz archives:
-	[[ -n ${A} ]] && unpack ${A}
-	cd "${S}"
-
-	# add all linguas to cmake
-	if [[ -n ${A} ]]; then
-		for LNG in ${LINGUAS}; do
-			DIR="${PN}-${LNG}-${PV}"
-			if [[ -d "${DIR}" ]] ; then
-				echo "add_subdirectory( ${DIR} )" >> "${S}"/CMakeLists.txt
-			fi
-		done
-	fi
-}
-
-src_prepare() {
-	find "${S}" -name CMakeLists.txt -type f \
-		-exec sed -i -e 's:^ *add_subdirectory( *kdepim-runtime *):# no kdepim-runtime:g' {} +
-	find "${S}" -name CMakeLists.txt -type f \
-		-exec sed -i -e 's:^ *add_subdirectory( *kdepim *):# no kdepim:g' {} +
-
-	kde4-base_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_build handbook docs)
-	)
-	[[ -n ${A} ]] && kde4-base_src_configure
-}
-
-src_compile() {
-	[[ -n ${A} ]] && kde4-base_src_compile
-}
-
-src_test() {
-	[[ -n ${A} ]] && kde4-base_src_test
-}
-
-src_install() {
-	[[ -n ${A} ]] && kde4-base_src_install
-}
diff --git a/kde-base/kde-meta/ChangeLog b/kde-base/kde-meta/ChangeLog
index 07e5eb98aa80..74b0dbd73284 100644
--- a/kde-base/kde-meta/ChangeLog
+++ b/kde-base/kde-meta/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kde-meta
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/ChangeLog,v 1.200 2011/10/15 17:25:47 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/ChangeLog,v 1.201 2011/10/28 19:03:17 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kde-meta-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kde-meta-4.7.0.ebuild:
diff --git a/kde-base/kde-meta/kde-meta-4.7.1.ebuild b/kde-base/kde-meta/kde-meta-4.7.1.ebuild
deleted file mode 100644
index 26ce3f63f10a..000000000000
--- a/kde-base/kde-meta/kde-meta-4.7.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/kde-meta-4.7.1.ebuild,v 1.1 2011/09/07 20:14:02 alexxy Exp $
-
-EAPI=4
-inherit kde4-meta-pkg
-
-DESCRIPTION="KDE - merge this to pull in all split kde-base/* packages"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="accessibility nls oldpim sdk semantic-desktop"
-
-RDEPEND="
-	$(add_kdebase_dep kate)
-	$(add_kdebase_dep kdeadmin-meta)
-	$(add_kdebase_dep kdeartwork-meta)
-	$(add_kdebase_dep kdebase-meta)
-	$(add_kdebase_dep kdeedu-meta)
-	$(add_kdebase_dep kdegames-meta)
-	$(add_kdebase_dep kdegraphics-meta)
-	$(add_kdebase_dep kdemultimedia-meta)
-	$(add_kdebase_dep kdenetwork-meta)
-	$(add_kdebase_dep kdeplasma-addons)
-	$(add_kdebase_dep kdetoys-meta)
-	$(add_kdebase_dep kdeutils-meta)
-	accessibility? ( $(add_kdebase_dep kdeaccessibility-meta) )
-	nls? ( $(add_kdebase_dep kde-l10n) )
-	sdk? (
-		$(add_kdebase_dep kdebindings-meta)
-		$(add_kdebase_dep kdesdk-meta)
-		$(add_kdebase_dep kdewebdev-meta)
-	)
-	semantic-desktop? (
-		!oldpim? ( $(add_kdebase_dep kdepim-meta) )
-		oldpim? ( $(add_kdebase_dep kdepim-meta "" 4.4.11.1) )
-	)
-"
diff --git a/kde-base/kde-wallpapers/ChangeLog b/kde-base/kde-wallpapers/ChangeLog
index 0b0400d332de..e99276a0afd9 100644
--- a/kde-base/kde-wallpapers/ChangeLog
+++ b/kde-base/kde-wallpapers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kde-wallpapers
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-wallpapers/ChangeLog,v 1.38 2011/10/15 17:26:16 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-wallpapers/ChangeLog,v 1.39 2011/10/28 19:03:48 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kde-wallpapers-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kde-wallpapers-4.7.0.ebuild:
diff --git a/kde-base/kde-wallpapers/kde-wallpapers-4.7.1.ebuild b/kde-base/kde-wallpapers/kde-wallpapers-4.7.1.ebuild
deleted file mode 100644
index 08e6a10429d6..000000000000
--- a/kde-base/kde-wallpapers/kde-wallpapers-4.7.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-wallpapers/kde-wallpapers-4.7.1.ebuild,v 1.1 2011/09/07 20:13:46 alexxy Exp $
-
-EAPI=3
-
-KMNAME="kde-wallpapers"
-KDE_SCM="svn"
-inherit kde4-base
-
-DESCRIPTION="KDE wallpapers"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-add_blocker kdebase-wallpapers
-
-src_configure() {
-	mycmakeargs=( -DWALLPAPER_INSTALL_DIR="${EPREFIX}/usr/share/wallpapers" )
-
-	kde4-base_src_configure
-}
diff --git a/kde-base/kdeaccessibility-meta/ChangeLog b/kde-base/kdeaccessibility-meta/ChangeLog
index 6e134062208b..b9acc1bd0984 100644
--- a/kde-base/kdeaccessibility-meta/ChangeLog
+++ b/kde-base/kdeaccessibility-meta/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdeaccessibility-meta
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-meta/ChangeLog,v 1.185 2011/10/15 17:26:09 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-meta/ChangeLog,v 1.186 2011/10/28 19:03:39 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdeaccessibility-meta-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdeaccessibility-meta-4.7.0.ebuild:
diff --git a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.7.1.ebuild b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.7.1.ebuild
deleted file mode 100644
index a9c8eab5e987..000000000000
--- a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.7.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.7.1.ebuild,v 1.1 2011/09/07 20:13:41 alexxy Exp $
-
-EAPI=4
-inherit kde4-meta-pkg
-
-DESCRIPTION="kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	$(add_kdebase_dep jovie)
-	$(add_kdebase_dep kaccessible)
-	$(add_kdebase_dep kmag)
-	$(add_kdebase_dep kmousetool)
-	$(add_kdebase_dep kmouth)
-"
diff --git a/kde-base/kdeaccounts-plugin/ChangeLog b/kde-base/kdeaccounts-plugin/ChangeLog
index 7dd78d4a7ea4..c6ffdd2c43f8 100644
--- a/kde-base/kdeaccounts-plugin/ChangeLog
+++ b/kde-base/kdeaccounts-plugin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdeaccounts-plugin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccounts-plugin/ChangeLog,v 1.89 2011/10/15 17:25:51 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccounts-plugin/ChangeLog,v 1.90 2011/10/28 19:03:34 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdeaccounts-plugin-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdeaccounts-plugin-4.7.0.ebuild:
diff --git a/kde-base/kdeaccounts-plugin/kdeaccounts-plugin-4.7.1.ebuild b/kde-base/kdeaccounts-plugin/kdeaccounts-plugin-4.7.1.ebuild
deleted file mode 100644
index 66d06dbaf14c..000000000000
--- a/kde-base/kdeaccounts-plugin/kdeaccounts-plugin-4.7.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccounts-plugin/kdeaccounts-plugin-4.7.1.ebuild,v 1.1 2011/09/07 20:13:57 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kdesdk"
-inherit kde4-meta
-
-DESCRIPTION="Addressbook Plugin that puts names/email addresses of all KDE SVN accounts into an addressbook"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/kdeadmin-meta/ChangeLog b/kde-base/kdeadmin-meta/ChangeLog
index 1dd443d0ebae..63a14c70ee77 100644
--- a/kde-base/kdeadmin-meta/ChangeLog
+++ b/kde-base/kdeadmin-meta/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdeadmin-meta
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin-meta/ChangeLog,v 1.193 2011/10/15 17:25:51 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin-meta/ChangeLog,v 1.194 2011/10/28 19:03:22 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdeadmin-meta-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdeadmin-meta-4.7.0.ebuild:
diff --git a/kde-base/kdeadmin-meta/kdeadmin-meta-4.7.1.ebuild b/kde-base/kdeadmin-meta/kdeadmin-meta-4.7.1.ebuild
deleted file mode 100644
index 2b8ac372f5cf..000000000000
--- a/kde-base/kdeadmin-meta/kdeadmin-meta-4.7.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin-meta/kdeadmin-meta-4.7.1.ebuild,v 1.1 2011/09/07 20:13:41 alexxy Exp $
-
-EAPI=4
-inherit kde4-meta-pkg
-
-DESCRIPTION="KDE administration tools - merge this to pull in all kdeadmin-derived packages"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cups"
-
-RDEPEND="
-	$(add_kdebase_dep kcron)
-	$(add_kdebase_dep ksystemlog)
-	$(add_kdebase_dep kuser)
-	cups? ( $(add_kdebase_dep system-config-printer-kde) )
-"
diff --git a/kde-base/kdeartwork-colorschemes/ChangeLog b/kde-base/kdeartwork-colorschemes/ChangeLog
index 0e0ff07e455e..c0ac10575c7f 100644
--- a/kde-base/kdeartwork-colorschemes/ChangeLog
+++ b/kde-base/kdeartwork-colorschemes/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdeartwork-colorschemes
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-colorschemes/ChangeLog,v 1.91 2011/10/15 17:25:56 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-colorschemes/ChangeLog,v 1.92 2011/10/28 19:03:25 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdeartwork-colorschemes-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdeartwork-colorschemes-4.7.0.ebuild:
diff --git a/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-4.7.1.ebuild b/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-4.7.1.ebuild
deleted file mode 100644
index d51acc118b60..000000000000
--- a/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-4.7.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-4.7.1.ebuild,v 1.1 2011/09/07 20:13:59 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kdeartwork"
-KMMODULE="ColorSchemes"
-inherit kde4-meta
-
-DESCRIPTION="KDE extra colorschemes"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-# Moved here in 4.7
-add_blocker kdeaccessibility-colorschemes
diff --git a/kde-base/kdeartwork-desktopthemes/ChangeLog b/kde-base/kdeartwork-desktopthemes/ChangeLog
index 947fcab2ebb2..a3fd4996212b 100644
--- a/kde-base/kdeartwork-desktopthemes/ChangeLog
+++ b/kde-base/kdeartwork-desktopthemes/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdeartwork-desktopthemes
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-desktopthemes/ChangeLog,v 1.77 2011/10/15 17:26:00 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-desktopthemes/ChangeLog,v 1.78 2011/10/28 19:03:29 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdeartwork-desktopthemes-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdeartwork-desktopthemes-4.7.0.ebuild:
diff --git a/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-4.7.1.ebuild b/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-4.7.1.ebuild
deleted file mode 100644
index 493c8030ce82..000000000000
--- a/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-4.7.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-4.7.1.ebuild,v 1.1 2011/09/07 20:13:44 alexxy Exp $
-
-EAPI=4
-
-KMMODULE="desktopthemes"
-KMNAME="kdeartwork"
-inherit kde4-meta
-
-DESCRIPTION="Additional KDE4 Plasma themes"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/kde-base/kdeartwork-emoticons/ChangeLog b/kde-base/kdeartwork-emoticons/ChangeLog
index cdce20ae9f4a..43a90a1c645b 100644
--- a/kde-base/kdeartwork-emoticons/ChangeLog
+++ b/kde-base/kdeartwork-emoticons/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdeartwork-emoticons
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-emoticons/ChangeLog,v 1.163 2011/10/15 17:26:12 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-emoticons/ChangeLog,v 1.164 2011/10/28 19:03:44 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdeartwork-emoticons-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdeartwork-emoticons-4.7.0.ebuild:
diff --git a/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-4.7.1.ebuild b/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-4.7.1.ebuild
deleted file mode 100644
index 30cd80a6459c..000000000000
--- a/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-4.7.1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-4.7.1.ebuild,v 1.1 2011/09/07 20:13:50 alexxy Exp $
-
-EAPI=4
-
-RESTRICT="binchecks strip"
-
-KMMODULE="emoticons"
-KMNAME="kdeartwork"
-inherit kde4-meta
-
-DESCRIPTION="EmotIcons (icons for things like smilies :-) for kde"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/kde-base/kdeartwork-iconthemes/ChangeLog b/kde-base/kdeartwork-iconthemes/ChangeLog
index e0e1246faf4f..c6056ba03666 100644
--- a/kde-base/kdeartwork-iconthemes/ChangeLog
+++ b/kde-base/kdeartwork-iconthemes/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdeartwork-iconthemes
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-iconthemes/ChangeLog,v 1.183 2011/10/15 17:25:49 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-iconthemes/ChangeLog,v 1.184 2011/10/28 19:03:19 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdeartwork-iconthemes-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdeartwork-iconthemes-4.7.0.ebuild:
diff --git a/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.7.1.ebuild b/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.7.1.ebuild
deleted file mode 100644
index 416b3cfc9fec..000000000000
--- a/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.7.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.7.1.ebuild,v 1.1 2011/09/07 20:13:51 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kdeartwork"
-KMMODULE="IconThemes"
-inherit kde4-meta
-
-DESCRIPTION="Icon themes for kde"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-# Provides nuvola icon theme
-RDEPEND="
-	!x11-themes/nuvola
-"
-
-# Moved here in 4.7
-add_blocker kdeaccessibility-iconthemes
diff --git a/kde-base/kdeartwork-kscreensaver/ChangeLog b/kde-base/kdeartwork-kscreensaver/ChangeLog
index 77dfb9dd845c..cf2498830da0 100644
--- a/kde-base/kdeartwork-kscreensaver/ChangeLog
+++ b/kde-base/kdeartwork-kscreensaver/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdeartwork-kscreensaver
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/ChangeLog,v 1.199 2011/10/15 17:26:10 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/ChangeLog,v 1.200 2011/10/28 19:03:41 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdeartwork-kscreensaver-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdeartwork-kscreensaver-4.7.0.ebuild:
diff --git a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.7.1.ebuild b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.7.1.ebuild
deleted file mode 100644
index 695e34aafd45..000000000000
--- a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.7.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.7.1.ebuild,v 1.1 2011/09/07 20:14:06 alexxy Exp $
-
-EAPI=4
-
-KMMODULE="kscreensaver"
-KMNAME="kdeartwork"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="Extra screensavers for kde"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +eigen +kexiv2 opengl xscreensaver"
-
-# libkworkspace - only as a stub to provide KDE4Workspace config
-RDEPEND="
-	$(add_kdebase_dep kscreensaver 'opengl?')
-	$(add_kdebase_dep libkworkspace)
-	media-libs/libart_lgpl
-	opengl? ( virtual/opengl )
-	xscreensaver? ( x11-misc/xscreensaver )
-"
-DEPEND="${RDEPEND}
-	eigen? ( dev-cpp/eigen:2 )
-	kexiv2? ( $(add_kdebase_dep libkexiv2) )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-xscreensaver.patch"
-	"${FILESDIR}/${PN}-4.5.95-webcollage.patch" )
-
-src_configure() {
-	mycmakeargs=(
-		-DKSCREENSAVER_SOUND_SUPPORT=ON
-		$(cmake-utils_use_with eigen Eigen2)
-		$(cmake-utils_use_with kexiv2 Kexiv2)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with xscreensaver)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kdeartwork-meta/ChangeLog b/kde-base/kdeartwork-meta/ChangeLog
index 3ba9251f006f..b7cafe701176 100644
--- a/kde-base/kdeartwork-meta/ChangeLog
+++ b/kde-base/kdeartwork-meta/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdeartwork-meta
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-meta/ChangeLog,v 1.189 2011/10/15 17:26:09 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-meta/ChangeLog,v 1.190 2011/10/28 19:03:40 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdeartwork-meta-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdeartwork-meta-4.7.0.ebuild:
diff --git a/kde-base/kdeartwork-meta/kdeartwork-meta-4.7.1.ebuild b/kde-base/kdeartwork-meta/kdeartwork-meta-4.7.1.ebuild
deleted file mode 100644
index 348143906891..000000000000
--- a/kde-base/kdeartwork-meta/kdeartwork-meta-4.7.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-meta/kdeartwork-meta-4.7.1.ebuild,v 1.1 2011/09/07 20:14:06 alexxy Exp $
-
-EAPI=4
-inherit kde4-meta-pkg
-
-DESCRIPTION="kdeartwork - merge this to pull in all kdeartwork-derived packages"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	$(add_kdebase_dep kdeartwork-colorschemes)
-	$(add_kdebase_dep kdeartwork-desktopthemes)
-	$(add_kdebase_dep kdeartwork-emoticons)
-	$(add_kdebase_dep kdeartwork-iconthemes)
-	$(add_kdebase_dep kdeartwork-kscreensaver)
-	$(add_kdebase_dep kdeartwork-sounds)
-	$(add_kdebase_dep kdeartwork-styles)
-	$(add_kdebase_dep kdeartwork-wallpapers)
-	$(add_kdebase_dep kdeartwork-weatherwallpapers)
-"
diff --git a/kde-base/kdeartwork-sounds/ChangeLog b/kde-base/kdeartwork-sounds/ChangeLog
index c3dd22e5096c..c43fd6f3c0de 100644
--- a/kde-base/kdeartwork-sounds/ChangeLog
+++ b/kde-base/kdeartwork-sounds/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdeartwork-sounds
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-sounds/ChangeLog,v 1.163 2011/10/15 17:26:01 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-sounds/ChangeLog,v 1.164 2011/10/28 19:03:30 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdeartwork-sounds-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdeartwork-sounds-4.7.0.ebuild:
diff --git a/kde-base/kdeartwork-sounds/kdeartwork-sounds-4.7.1.ebuild b/kde-base/kdeartwork-sounds/kdeartwork-sounds-4.7.1.ebuild
deleted file mode 100644
index c7380fe8caea..000000000000
--- a/kde-base/kdeartwork-sounds/kdeartwork-sounds-4.7.1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-sounds/kdeartwork-sounds-4.7.1.ebuild,v 1.1 2011/09/07 20:14:02 alexxy Exp $
-
-EAPI=4
-
-RESTRICT="binchecks strip"
-
-KMMODULE="sounds"
-KMNAME="kdeartwork"
-inherit kde4-meta
-
-DESCRIPTION="Extra sound themes for kde"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/kde-base/kdeartwork-styles/ChangeLog b/kde-base/kdeartwork-styles/ChangeLog
index 72208eb9a8aa..ac67eda3e2ce 100644
--- a/kde-base/kdeartwork-styles/ChangeLog
+++ b/kde-base/kdeartwork-styles/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdeartwork-styles
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-styles/ChangeLog,v 1.183 2011/10/15 17:26:04 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-styles/ChangeLog,v 1.184 2011/10/28 19:03:25 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdeartwork-styles-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdeartwork-styles-4.7.0.ebuild:
diff --git a/kde-base/kdeartwork-styles/kdeartwork-styles-4.7.1.ebuild b/kde-base/kdeartwork-styles/kdeartwork-styles-4.7.1.ebuild
deleted file mode 100644
index d16e5440141f..000000000000
--- a/kde-base/kdeartwork-styles/kdeartwork-styles-4.7.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-styles/kdeartwork-styles-4.7.1.ebuild,v 1.1 2011/09/07 20:13:43 alexxy Exp $
-
-EAPI=4
-
-KMMODULE="styles"
-KMNAME="kdeartwork"
-inherit kde4-meta
-
-DESCRIPTION="Extra KWin styles and window decorations"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-add_blocker kwin '<4.5.67'
-
-DEPEND="
-		$(add_kdebase_dep kwin)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRA="
-	aurorae/
-	kwin-styles/
-"
diff --git a/kde-base/kdeartwork-wallpapers/ChangeLog b/kde-base/kdeartwork-wallpapers/ChangeLog
index a61db4fe93ab..02ca41924368 100644
--- a/kde-base/kdeartwork-wallpapers/ChangeLog
+++ b/kde-base/kdeartwork-wallpapers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdeartwork-wallpapers
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-wallpapers/ChangeLog,v 1.181 2011/10/15 17:25:50 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-wallpapers/ChangeLog,v 1.182 2011/10/28 19:03:20 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdeartwork-wallpapers-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdeartwork-wallpapers-4.7.0.ebuild:
diff --git a/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.7.1.ebuild b/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.7.1.ebuild
deleted file mode 100644
index eae01e350a48..000000000000
--- a/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.7.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.7.1.ebuild,v 1.1 2011/09/07 20:13:40 alexxy Exp $
-
-EAPI=4
-
-RESTRICT="binchecks strip"
-
-KMMODULE="wallpapers"
-KMNAME="kdeartwork"
-inherit kde4-meta
-
-DESCRIPTION="Wallpapers from kde"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-# Please bump this as needed (probably at least for every minor version)
-add_blocker kdebase-wallpapers '<4.6.0'
-add_blocker kdeartwork-weatherwallpapers '<4.6.0'
-
-KMEXTRA="
-	HighResolutionWallpapers/
-"
diff --git a/kde-base/kdeartwork-weatherwallpapers/ChangeLog b/kde-base/kdeartwork-weatherwallpapers/ChangeLog
index 53ee5af0cb68..fab46ec80346 100644
--- a/kde-base/kdeartwork-weatherwallpapers/ChangeLog
+++ b/kde-base/kdeartwork-weatherwallpapers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdeartwork-weatherwallpapers
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-weatherwallpapers/ChangeLog,v 1.67 2011/10/15 17:26:02 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-weatherwallpapers/ChangeLog,v 1.68 2011/10/28 19:03:32 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdeartwork-weatherwallpapers-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdeartwork-weatherwallpapers-4.7.0.ebuild:
diff --git a/kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-4.7.1.ebuild b/kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-4.7.1.ebuild
deleted file mode 100644
index 9a828ae28111..000000000000
--- a/kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-4.7.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-4.7.1.ebuild,v 1.1 2011/09/07 20:13:46 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kdeartwork"
-KMMODULE="WeatherWallpapers"
-inherit kde4-meta
-
-DESCRIPTION="Weather aware wallpapers. Changes with weather outside."
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	$(add_kdebase_dep kdeartwork-wallpapers)
-"
diff --git a/kde-base/kdebase-cursors/ChangeLog b/kde-base/kdebase-cursors/ChangeLog
index 852af2d7ef97..1a623d4fb0ed 100644
--- a/kde-base/kdebase-cursors/ChangeLog
+++ b/kde-base/kdebase-cursors/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase-cursors
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-cursors/ChangeLog,v 1.85 2011/10/15 17:26:06 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-cursors/ChangeLog,v 1.86 2011/10/28 19:03:35 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdebase-cursors-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdebase-cursors-4.7.0.ebuild:
diff --git a/kde-base/kdebase-cursors/kdebase-cursors-4.7.1.ebuild b/kde-base/kdebase-cursors/kdebase-cursors-4.7.1.ebuild
deleted file mode 100644
index 75b9e114bec3..000000000000
--- a/kde-base/kdebase-cursors/kdebase-cursors-4.7.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-cursors/kdebase-cursors-4.7.1.ebuild,v 1.1 2011/09/07 20:13:47 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-KMMODULE="cursors"
-inherit kde4-meta
-
-DESCRIPTION="oxygen cursors from kdebase"
-IUSE=""
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
diff --git a/kde-base/kdebase-data/ChangeLog b/kde-base/kdebase-data/ChangeLog
index d8997d18e115..e51b5815b2ab 100644
--- a/kde-base/kdebase-data/ChangeLog
+++ b/kde-base/kdebase-data/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase-data
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/ChangeLog,v 1.199 2011/10/15 17:25:55 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/ChangeLog,v 1.200 2011/10/28 19:03:33 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdebase-data-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdebase-data-4.7.0.ebuild:
diff --git a/kde-base/kdebase-data/kdebase-data-4.7.1.ebuild b/kde-base/kdebase-data/kdebase-data-4.7.1.ebuild
deleted file mode 100644
index b311fe2ea482..000000000000
--- a/kde-base/kdebase-data/kdebase-data-4.7.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/kdebase-data-4.7.1.ebuild,v 1.1 2011/09/07 20:13:45 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-KMNOMODULE="true"
-inherit kde4-meta
-
-DESCRIPTION="Icons, localization data and various .desktop files from kdebase."
-IUSE="+wallpapers"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	wallpapers? ( $(add_kdebase_dep kde-wallpapers) )
-	$(add_kdebase_dep oxygen-icons)
-	x11-themes/hicolor-icon-theme
-"
-
-KMEXTRA="
-	l10n/
-	localization/
-	pics/
-"
-# Note that the eclass doesn't do this for us, because of KMNOMODULE="true".
-KMEXTRACTONLY="
-	config-runtime.h.cmake
-	kde4
-"
-
-src_configure() {
-	# Remove remnants of hicolor-icon-theme
-	sed -e "s:add_subdirectory[[:space:]]*([[:space:]]*hicolor[[:space:]]*):#donotwant:g" \
-		-i pics/CMakeLists.txt \
-		|| die "failed to remove remnants of hicolor-icon-theme"
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kdebase-desktoptheme/ChangeLog b/kde-base/kdebase-desktoptheme/ChangeLog
index c43439b60dfe..89ffdab21517 100644
--- a/kde-base/kdebase-desktoptheme/ChangeLog
+++ b/kde-base/kdebase-desktoptheme/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase-desktoptheme
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-desktoptheme/ChangeLog,v 1.87 2011/10/15 17:25:59 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-desktoptheme/ChangeLog,v 1.88 2011/10/28 19:03:40 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdebase-desktoptheme-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdebase-desktoptheme-4.7.0.ebuild:
diff --git a/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.7.1.ebuild b/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.7.1.ebuild
deleted file mode 100644
index cd85a282f416..000000000000
--- a/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.7.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.7.1.ebuild,v 1.2 2011/10/15 13:17:33 dilfridge Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-KMMODULE="desktoptheme"
-inherit kde4-meta
-
-DESCRIPTION="Oxygen KDE4 desktop theme."
-IUSE=""
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
diff --git a/kde-base/kdebase-kioslaves/ChangeLog b/kde-base/kdebase-kioslaves/ChangeLog
index 567a99c7a948..6b748571fa6b 100644
--- a/kde-base/kdebase-kioslaves/ChangeLog
+++ b/kde-base/kdebase-kioslaves/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase-kioslaves
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.235 2011/10/15 17:25:51 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.236 2011/10/28 19:03:22 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdebase-kioslaves-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdebase-kioslaves-4.7.0.ebuild, -kdebase-kioslaves-4.7.0-r1.ebuild:
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.7.1.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.7.1.ebuild
deleted file mode 100644
index c8fdf43e5d73..000000000000
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.7.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.7.1.ebuild,v 1.1 2011/09/07 20:13:41 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-runtime"
-KMMODULE="kioslave"
-inherit kde4-meta
-
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-DESCRIPTION="kioslave: the kde VFS framework - kioslave plugins present a filesystem-like view of arbitrary data"
-IUSE="+bzip2 exif debug lzma openexr samba +sftp"
-
-# tests hang, last checked for 4.2.96
-RESTRICT="test"
-
-DEPEND="
-	!aqua? ( x11-libs/libXcursor )
-	bzip2? ( app-arch/bzip2 )
-	exif? ( media-gfx/exiv2 )
-	lzma? ( app-arch/xz-utils )
-	openexr? ( media-libs/openexr )
-	samba? ( net-fs/samba[smbclient] )
-	sftp? ( >=net-libs/libssh-0.4.0[sftp] )
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdelibs 'bzip2?,lzma?')
-	$(add_kdebase_dep kdialog)
-	virtual/ssh
-	!aqua? ( !kernel_SunOS? ( virtual/eject ) )
-"
-
-KMEXTRA="
-	kioexec
-	kdeeject
-"
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_SLP=OFF
-		$(cmake-utils_use_with bzip2 BZip2)
-		$(cmake-utils_use_with exif Exiv2)
-		$(cmake-utils_use_with lzma LibLZMA)
-		$(cmake-utils_use_with openexr OpenEXR)
-		$(cmake-utils_use_with samba)
-		$(cmake-utils_use_with sftp LibSSH)
-	)
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kdebase-menu-icons/ChangeLog b/kde-base/kdebase-menu-icons/ChangeLog
index bed0e9b82adb..170e342b9178 100644
--- a/kde-base/kdebase-menu-icons/ChangeLog
+++ b/kde-base/kdebase-menu-icons/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase-menu-icons
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-menu-icons/ChangeLog,v 1.72 2011/10/15 17:25:58 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-menu-icons/ChangeLog,v 1.73 2011/10/28 19:03:27 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdebase-menu-icons-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdebase-menu-icons-4.7.0.ebuild:
diff --git a/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.7.1.ebuild b/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.7.1.ebuild
deleted file mode 100644
index 353b007eb426..000000000000
--- a/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.7.1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.7.1.ebuild,v 1.1 2011/09/07 20:13:57 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-KMMODULE="menu"
-inherit kde4-meta
-
-DESCRIPTION="KDE menu icons"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-add_blocker kde-menu-icons
diff --git a/kde-base/kdebase-menu/ChangeLog b/kde-base/kdebase-menu/ChangeLog
index 1910452b601c..a6d26b8cc44c 100644
--- a/kde-base/kdebase-menu/ChangeLog
+++ b/kde-base/kdebase-menu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase-menu
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-menu/ChangeLog,v 1.72 2011/10/15 17:26:14 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-menu/ChangeLog,v 1.73 2011/10/28 19:03:46 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdebase-menu-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdebase-menu-4.7.0.ebuild:
diff --git a/kde-base/kdebase-menu/kdebase-menu-4.7.1.ebuild b/kde-base/kdebase-menu/kdebase-menu-4.7.1.ebuild
deleted file mode 100644
index cf018d4c7b56..000000000000
--- a/kde-base/kdebase-menu/kdebase-menu-4.7.1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-menu/kdebase-menu-4.7.1.ebuild,v 1.1 2011/09/07 20:13:53 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-KMMODULE="kde-menu"
-inherit kde4-meta
-
-DESCRIPTION="KDE Menu query tool."
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-add_blocker kde-menu
diff --git a/kde-base/kdebase-meta/ChangeLog b/kde-base/kdebase-meta/ChangeLog
index 3e8471efeed5..470590741b4e 100644
--- a/kde-base/kdebase-meta/ChangeLog
+++ b/kde-base/kdebase-meta/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase-meta
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-meta/ChangeLog,v 1.203 2011/10/15 17:26:15 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-meta/ChangeLog,v 1.204 2011/10/28 19:03:46 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdebase-meta-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdebase-meta-4.7.0.ebuild:
diff --git a/kde-base/kdebase-meta/kdebase-meta-4.7.1.ebuild b/kde-base/kdebase-meta/kdebase-meta-4.7.1.ebuild
deleted file mode 100644
index 93e95a86c29b..000000000000
--- a/kde-base/kdebase-meta/kdebase-meta-4.7.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-meta/kdebase-meta-4.7.1.ebuild,v 1.1 2011/09/07 20:13:48 alexxy Exp $
-
-EAPI=4
-inherit kde4-meta-pkg
-
-DESCRIPTION="Merge this to pull in all kdebase-derived packages"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+wallpapers"
-
-RDEPEND="
-	$(add_kdebase_dep dolphin)
-	$(add_kdebase_dep freespacenotifier)
-	$(add_kdebase_dep kcheckpass)
-	$(add_kdebase_dep kcminit)
-	wallpapers? ( $(add_kdebase_dep kde-wallpapers) )
-	$(add_kdebase_dep kdebase-cursors)
-	$(add_kdebase_dep kdebase-runtime-meta)
-	$(add_kdebase_dep kdebase-startkde)
-	$(add_kdebase_dep kdepasswd)
-	$(add_kdebase_dep kdialog)
-	$(add_kdebase_dep keditbookmarks)
-	$(add_kdebase_dep kephal)
-	$(add_kdebase_dep kfind)
-	$(add_kdebase_dep kfmclient)
-	$(add_kdebase_dep khotkeys)
-	$(add_kdebase_dep kinfocenter)
-	$(add_kdebase_dep klipper)
-	$(add_kdebase_dep kmenuedit)
-	$(add_kdebase_dep konq-plugins)
-	$(add_kdebase_dep konqueror)
-	$(add_kdebase_dep konsole)
-	$(add_kdebase_dep kscreensaver)
-	$(add_kdebase_dep ksmserver)
-	$(add_kdebase_dep ksplash)
-	$(add_kdebase_dep kstartupconfig)
-	$(add_kdebase_dep kstyles)
-	$(add_kdebase_dep ksysguard)
-	$(add_kdebase_dep ksystraycmd)
-	$(add_kdebase_dep kwin)
-	$(add_kdebase_dep kwrite)
-	$(add_kdebase_dep kwrited)
-	$(add_kdebase_dep libkonq)
-	$(add_kdebase_dep libkworkspace)
-	$(add_kdebase_dep liboxygenstyle)
-	$(add_kdebase_dep libplasmaclock)
-	$(add_kdebase_dep libplasmagenericshell)
-	$(add_kdebase_dep libtaskmanager)
-	$(add_kdebase_dep nsplugins)
-	$(add_kdebase_dep phonon-kde)
-	$(add_kdebase_dep plasma-apps)
-	$(add_kdebase_dep plasma-workspace)
-	$(add_kdebase_dep powerdevil)
-	$(add_kdebase_dep qguiplatformplugin_kde)
-	$(add_kdebase_dep solid)
-	$(add_kdebase_dep systemsettings)
-	!prefix? ( $(add_kdebase_dep kdm) )
-"
diff --git a/kde-base/kdebase-runtime-meta/ChangeLog b/kde-base/kdebase-runtime-meta/ChangeLog
index ba0f9c32ee17..5a9c2996eb28 100644
--- a/kde-base/kdebase-runtime-meta/ChangeLog
+++ b/kde-base/kdebase-runtime-meta/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase-runtime-meta
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-runtime-meta/ChangeLog,v 1.52 2011/10/15 17:26:01 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-runtime-meta/ChangeLog,v 1.53 2011/10/28 19:03:30 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdebase-runtime-meta-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdebase-runtime-meta-4.7.0.ebuild:
diff --git a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.7.1.ebuild b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.7.1.ebuild
deleted file mode 100644
index 22597532e74d..000000000000
--- a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.7.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.7.1.ebuild,v 1.1 2011/09/07 20:13:59 alexxy Exp $
-
-EAPI=4
-inherit kde4-meta-pkg
-
-DESCRIPTION="Merge this to pull in all kdebase-runtime-derived packages"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+handbook semantic-desktop"
-
-RDEPEND="
-	$(add_kdebase_dep activitymanager)
-	$(add_kdebase_dep attica)
-	$(add_kdebase_dep drkonqi)
-	$(add_kdebase_dep kcmshell)
-	$(add_kdebase_dep kcontrol)
-	$(add_kdebase_dep kdebase-data)
-	$(add_kdebase_dep kdebase-desktoptheme)
-	$(add_kdebase_dep kdebase-kioslaves)
-	$(add_kdebase_dep kdebase-menu)
-	$(add_kdebase_dep kdebase-menu-icons)
-	$(add_kdebase_dep kdebugdialog)
-	$(add_kdebase_dep kdesu)
-	$(add_kdebase_dep kdontchangethehostname)
-	$(add_kdebase_dep keditfiletype)
-	$(add_kdebase_dep kfile)
-	$(add_kdebase_dep kglobalaccel)
-	$(add_kdebase_dep kiconfinder)
-	$(add_kdebase_dep kioclient)
-	$(add_kdebase_dep kmimetypefinder)
-	$(add_kdebase_dep knetattach)
-	$(add_kdebase_dep knewstuff)
-	$(add_kdebase_dep kpasswdserver)
-	$(add_kdebase_dep kquitapp)
-	$(add_kdebase_dep kstart)
-	$(add_kdebase_dep ktimezoned)
-	$(add_kdebase_dep ktraderclient)
-	$(add_kdebase_dep kuiserver)
-	$(add_kdebase_dep kurifilter-plugins)
-	$(add_kdebase_dep kwallet)
-	$(add_kdebase_dep kwalletd)
-	$(add_kdebase_dep plasma-runtime)
-	$(add_kdebase_dep renamedlg-plugins)
-	$(add_kdebase_dep solid-runtime)
-	handbook? ( $(add_kdebase_dep khelpcenter) )
-	semantic-desktop? ( $(add_kdebase_dep nepomuk) )
-"
diff --git a/kde-base/kdebase-startkde/ChangeLog b/kde-base/kdebase-startkde/ChangeLog
index ef3536e1f9c7..85a9f94a2b6e 100644
--- a/kde-base/kdebase-startkde/ChangeLog
+++ b/kde-base/kdebase-startkde/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase-startkde
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.249 2011/10/15 17:26:05 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.250 2011/10/28 19:03:34 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdebase-startkde-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdebase-startkde-4.7.0.ebuild:
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.7.1.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.7.1.ebuild
deleted file mode 100644
index cc02eaf69a8a..000000000000
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.7.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-4.7.1.ebuild,v 1.1 2011/09/07 20:14:01 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-KMNOMODULE="true"
-inherit kde4-meta multilib prefix
-
-DESCRIPTION="Startkde script, which starts a complete KDE session, and associated scripts"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+wallpapers"
-
-# The KDE apps called from the startkde script.
-# These provide the most minimal KDE desktop.
-RDEPEND="
-	$(add_kdebase_dep kcminit)
-	$(add_kdebase_dep kdebase-runtime-meta)
-	wallpapers? ( $(add_kdebase_dep kde-wallpapers) )
-	$(add_kdebase_dep kfmclient)
-	$(add_kdebase_dep knotify)
-	$(add_kdebase_dep kreadconfig)
-	$(add_kdebase_dep krunner)
-	$(add_kdebase_dep ksmserver)
-	$(add_kdebase_dep ksplash)
-	$(add_kdebase_dep kstartupconfig)
-	$(add_kdebase_dep kwin)
-	$(add_kdebase_dep phonon-kde)
-	$(add_kdebase_dep plasma-apps)
-	$(add_kdebase_dep plasma-workspace)
-	$(add_kdebase_dep systemsettings)
-	x11-apps/mkfontdir
-	x11-apps/xmessage
-	x11-apps/xprop
-	x11-apps/xrandr
-	x11-apps/xrdb
-	x11-apps/xsetroot
-	x11-apps/xset
-"
-
-KMEXTRACTONLY="
-	ConfigureChecks.cmake
-	kdm/
-	startkde.cmake
-"
-
-PATCHES=("${FILESDIR}/gentoo-startkde4-4.patch")
-
-src_prepare() {
-	kde4-meta_src_prepare
-
-	cp "${FILESDIR}/KDE-4" "${T}"
-
-	# fix ${EPREFIX}
-	eprefixify startkde.cmake "${T}/KDE-4"
-}
-
-src_install() {
-	kde4-meta_src_install
-
-	# startup and shutdown scripts
-	insinto /etc/kde/startup
-	doins "${FILESDIR}/agent-startup.sh"
-
-	insinto /etc/kde/shutdown
-	doins "${FILESDIR}/agent-shutdown.sh"
-
-	# x11 session script
-	exeinto /etc/X11/Sessions
-	doexe "${T}/KDE-4"
-
-	# freedesktop compliant session script
-	sed -e "s:\${KDE4_BIN_INSTALL_DIR}:${EPREFIX}/usr/bin:g" \
-		"${S}/kdm/kfrontend/sessions/kde-plasma.desktop.cmake" > "${T}/KDE-4.desktop"
-	insinto /usr/share/xsessions
-	doins "${T}/KDE-4.desktop"
-}
-
-pkg_postinst () {
-	kde4-meta_pkg_postinst
-
-	echo
-	elog "To enable gpg-agent and/or ssh-agent in KDE sessions,"
-	elog "edit ${EPREFIX}/etc/kde/startup/agent-startup.sh and"
-	elog "${EPREFIX}/etc/kde/shutdown/agent-shutdown.sh"
-	echo
-	elog "The name of the session script has changed."
-	elog "If you currently have XSESSION=\"kde-$(get_kde_version)\" in your"
-	elog "configuration files, you will need to change it to"
-	elog "XSESSION=\"KDE-4\""
-}
diff --git a/kde-base/kdebindings-meta/ChangeLog b/kde-base/kdebindings-meta/ChangeLog
index 9dc6d5ad3950..09e29e7617ba 100644
--- a/kde-base/kdebindings-meta/ChangeLog
+++ b/kde-base/kdebindings-meta/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebindings-meta
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-meta/ChangeLog,v 1.109 2011/10/15 17:25:51 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-meta/ChangeLog,v 1.110 2011/10/28 19:03:47 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdebindings-meta-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdebindings-meta-4.7.0.ebuild:
diff --git a/kde-base/kdebindings-meta/kdebindings-meta-4.7.1.ebuild b/kde-base/kdebindings-meta/kdebindings-meta-4.7.1.ebuild
deleted file mode 100644
index 909674241401..000000000000
--- a/kde-base/kdebindings-meta/kdebindings-meta-4.7.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-meta/kdebindings-meta-4.7.1.ebuild,v 1.1 2011/09/07 20:13:40 alexxy Exp $
-
-EAPI=4
-inherit kde4-meta-pkg
-
-DESCRIPTION="KDE bindings - merge this to pull in all kdebindings-derived packages"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="csharp java perl python ruby"
-
-RDEPEND="
-	$(add_kdebase_dep smokegen)
-	$(add_kdebase_dep smokekde)
-	$(add_kdebase_dep smokeqt)
-	csharp? (
-		$(add_kdebase_dep kimono)
-		$(add_kdebase_dep qyoto)
-	)
-	java? ( $(add_kdebase_dep krossjava) )
-	perl? (
-		$(add_kdebase_dep perlkde)
-		$(add_kdebase_dep perlqt)
-	)
-	python? (
-		$(add_kdebase_dep krosspython)
-		$(add_kdebase_dep pykde4)
-	)
-	ruby? (
-		$(add_kdebase_dep korundum)
-		$(add_kdebase_dep krossruby)
-		$(add_kdebase_dep qtruby)
-	)
-"
diff --git a/kde-base/kdebugdialog/ChangeLog b/kde-base/kdebugdialog/ChangeLog
index facde3984a01..680dbe97f539 100644
--- a/kde-base/kdebugdialog/ChangeLog
+++ b/kde-base/kdebugdialog/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebugdialog
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebugdialog/ChangeLog,v 1.170 2011/10/15 17:25:49 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebugdialog/ChangeLog,v 1.171 2011/10/28 19:03:18 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdebugdialog-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdebugdialog-4.7.0.ebuild:
diff --git a/kde-base/kdebugdialog/kdebugdialog-4.7.1.ebuild b/kde-base/kdebugdialog/kdebugdialog-4.7.1.ebuild
deleted file mode 100644
index 13ff072d4488..000000000000
--- a/kde-base/kdebugdialog/kdebugdialog-4.7.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebugdialog/kdebugdialog-4.7.1.ebuild,v 1.1 2011/09/07 20:14:04 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KDE: A dialog box for setting preferences for debug output"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kdeedu-meta/ChangeLog b/kde-base/kdeedu-meta/ChangeLog
index 7123c6514629..2f52bf148349 100644
--- a/kde-base/kdeedu-meta/ChangeLog
+++ b/kde-base/kdeedu-meta/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdeedu-meta
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu-meta/ChangeLog,v 1.190 2011/10/15 17:26:04 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu-meta/ChangeLog,v 1.191 2011/10/28 19:03:34 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdeedu-meta-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdeedu-meta-4.7.0.ebuild:
diff --git a/kde-base/kdeedu-meta/kdeedu-meta-4.7.1.ebuild b/kde-base/kdeedu-meta/kdeedu-meta-4.7.1.ebuild
deleted file mode 100644
index 0e19d0fea4f2..000000000000
--- a/kde-base/kdeedu-meta/kdeedu-meta-4.7.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu-meta/kdeedu-meta-4.7.1.ebuild,v 1.1 2011/09/07 20:13:55 alexxy Exp $
-
-EAPI=4
-inherit kde4-meta-pkg
-
-DESCRIPTION="KDE educational apps - merge this to pull in all kdeedu-derived packages"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	$(add_kdebase_dep blinken)
-	$(add_kdebase_dep cantor)
-	$(add_kdebase_dep kalgebra)
-	$(add_kdebase_dep kalzium)
-	$(add_kdebase_dep kanagram)
-	$(add_kdebase_dep kbruch)
-	$(add_kdebase_dep kgeography)
-	$(add_kdebase_dep khangman)
-	$(add_kdebase_dep kig)
-	$(add_kdebase_dep kiten)
-	$(add_kdebase_dep klettres)
-	$(add_kdebase_dep kmplot)
-	$(add_kdebase_dep kstars)
-	$(add_kdebase_dep ktouch)
-	$(add_kdebase_dep kturtle)
-	$(add_kdebase_dep kwordquiz)
-	$(add_kdebase_dep libkdeedu)
-	$(add_kdebase_dep marble)
-	$(add_kdebase_dep parley)
-	$(add_kdebase_dep rocs)
-	$(add_kdebase_dep step)
-"
diff --git a/kde-base/kdegames-meta/ChangeLog b/kde-base/kdegames-meta/ChangeLog
index c4a9d57091aa..c4512c61d411 100644
--- a/kde-base/kdegames-meta/ChangeLog
+++ b/kde-base/kdegames-meta/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdegames-meta
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames-meta/ChangeLog,v 1.192 2011/10/15 17:25:57 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames-meta/ChangeLog,v 1.193 2011/10/28 19:03:26 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdegames-meta-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdegames-meta-4.7.0.ebuild:
diff --git a/kde-base/kdegames-meta/kdegames-meta-4.7.1.ebuild b/kde-base/kdegames-meta/kdegames-meta-4.7.1.ebuild
deleted file mode 100644
index de23e8657041..000000000000
--- a/kde-base/kdegames-meta/kdegames-meta-4.7.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames-meta/kdegames-meta-4.7.1.ebuild,v 1.1 2011/09/07 20:13:58 alexxy Exp $
-
-EAPI=4
-inherit kde4-meta-pkg
-
-DESCRIPTION="kdegames - merge this to pull in all kdegames-derived packages"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="opengl python"
-
-RDEPEND="
-	$(add_kdebase_dep bomber)
-	$(add_kdebase_dep bovo)
-	$(add_kdebase_dep granatier)
-	$(add_kdebase_dep kapman)
-	$(add_kdebase_dep katomic)
-	$(add_kdebase_dep kbattleship)
-	$(add_kdebase_dep kblackbox)
-	$(add_kdebase_dep kblocks)
-	$(add_kdebase_dep kbounce)
-	$(add_kdebase_dep kbreakout)
-	$(add_kdebase_dep kdiamond)
-	$(add_kdebase_dep kfourinline)
-	$(add_kdebase_dep kgoldrunner)
-	$(add_kdebase_dep killbots)
-	$(add_kdebase_dep kigo)
-	$(add_kdebase_dep kiriki)
-	$(add_kdebase_dep kjumpingcube)
-	$(add_kdebase_dep klickety)
-	$(add_kdebase_dep klines)
-	$(add_kdebase_dep kmahjongg)
-	$(add_kdebase_dep kmines)
-	$(add_kdebase_dep knetwalk)
-	$(add_kdebase_dep kolf)
-	$(add_kdebase_dep kollision)
-	$(add_kdebase_dep konquest)
-	$(add_kdebase_dep kpat)
-	$(add_kdebase_dep kreversi)
-	$(add_kdebase_dep kshisen)
-	$(add_kdebase_dep ksirk)
-	$(add_kdebase_dep kspaceduel)
-	$(add_kdebase_dep ksquares)
-	$(add_kdebase_dep ktron)
-	$(add_kdebase_dep ktuberling)
-	$(add_kdebase_dep kubrick)
-	$(add_kdebase_dep libkdegames)
-	$(add_kdebase_dep libkmahjongg)
-	$(add_kdebase_dep lskat)
-	$(add_kdebase_dep palapeli)
-	opengl? ( $(add_kdebase_dep ksudoku) )
-	python? ( $(add_kdebase_dep kajongg) )
-"
diff --git a/kde-base/kdegraphics-meta/ChangeLog b/kde-base/kdegraphics-meta/ChangeLog
index 0c4789c16824..fe807864f2fe 100644
--- a/kde-base/kdegraphics-meta/ChangeLog
+++ b/kde-base/kdegraphics-meta/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdegraphics-meta
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-meta/ChangeLog,v 1.194 2011/10/15 17:25:52 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-meta/ChangeLog,v 1.195 2011/10/28 19:03:22 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdegraphics-meta-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdegraphics-meta-4.7.0.ebuild:
diff --git a/kde-base/kdegraphics-meta/kdegraphics-meta-4.7.1.ebuild b/kde-base/kdegraphics-meta/kdegraphics-meta-4.7.1.ebuild
deleted file mode 100644
index f2dbb0581f4a..000000000000
--- a/kde-base/kdegraphics-meta/kdegraphics-meta-4.7.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-meta/kdegraphics-meta-4.7.1.ebuild,v 1.1 2011/09/07 20:13:41 alexxy Exp $
-
-EAPI=4
-inherit kde4-meta-pkg
-
-DESCRIPTION="kdegraphics - merge this to pull in all kdegraphics-derived packages"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="scanner"
-
-RDEPEND="
-	$(add_kdebase_dep gwenview)
-	$(add_kdebase_dep kamera)
-	$(add_kdebase_dep kcolorchooser)
-	$(add_kdebase_dep kdegraphics-strigi-analyzer)
-	$(add_kdebase_dep kgamma)
-	$(add_kdebase_dep kolourpaint)
-	$(add_kdebase_dep kruler)
-	$(add_kdebase_dep ksnapshot)
-	$(add_kdebase_dep libkdcraw)
-	$(add_kdebase_dep libkexiv2)
-	$(add_kdebase_dep libkipi)
-	$(add_kdebase_dep okular)
-	$(add_kdebase_dep svgpart)
-	$(add_kdebase_dep thumbnailers)
-	scanner? (
-		$(add_kdebase_dep ksaneplugin)
-		$(add_kdebase_dep libksane)
-	)
-"
diff --git a/kde-base/kdegraphics-strigi-analyzer/ChangeLog b/kde-base/kdegraphics-strigi-analyzer/ChangeLog
index 283c6031b58f..ff6d410233de 100644
--- a/kde-base/kdegraphics-strigi-analyzer/ChangeLog
+++ b/kde-base/kdegraphics-strigi-analyzer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdegraphics-strigi-analyzer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-strigi-analyzer/ChangeLog,v 1.83 2011/10/15 17:25:57 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-strigi-analyzer/ChangeLog,v 1.84 2011/10/28 19:03:26 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdegraphics-strigi-analyzer-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdegraphics-strigi-analyzer-4.7.0.ebuild:
diff --git a/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-4.7.1.ebuild b/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-4.7.1.ebuild
deleted file mode 100644
index 4ac26e43de0b..000000000000
--- a/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-4.7.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-4.7.1.ebuild,v 1.1 2011/09/07 20:13:43 alexxy Exp $
-
-EAPI=4
-
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="kdegraphics: strigi plugins"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	app-misc/strigi
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index e2dcf2d4aff2..551005f38611 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.799 2011/10/19 21:43:32 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.800 2011/10/28 19:03:25 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdelibs-4.7.1-r3.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   19 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   kdelibs-4.7.1-r3.ebuild, kdelibs-4.7.2.ebuild:
diff --git a/kde-base/kdelibs/kdelibs-4.7.1-r3.ebuild b/kde-base/kdelibs/kdelibs-4.7.1-r3.ebuild
deleted file mode 100644
index 3ecaf9ff9e9a..000000000000
--- a/kde-base/kdelibs/kdelibs-4.7.1-r3.ebuild
+++ /dev/null
@@ -1,330 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.7.1-r3.ebuild,v 1.3 2011/10/19 21:43:32 dilfridge Exp $
-
-EAPI=4
-
-CPPUNIT_REQUIRED="optional"
-DECLARATIVE_REQUIRED="always"
-OPENGL_REQUIRED="optional"
-KDE_SCM="git"
-inherit kde4-base fdo-mime toolchain-funcs
-
-DESCRIPTION="KDE libraries needed by all KDE programs."
-HOMEPAGE="http://www.kde.org/"
-
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-LICENSE="LGPL-2.1"
-IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam +handbook jpeg2k kerberos
-lzma mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev
-+udisks +upower upnp zeroconf"
-
-REQUIRED_USE="
-	udisks? ( udev )
-	upower? ( udev )
-"
-
-# needs the kate regression testsuite from svn
-RESTRICT="test"
-
-COMMONDEPEND="
-	app-crypt/qca:2
-	>=app-misc/strigi-0.7.6
-	>=dev-libs/libattica-0.1.90
-	>=dev-libs/libdbusmenu-qt-0.3.2
-	dev-libs/libpcre[unicode]
-	dev-libs/libxml2
-	dev-libs/libxslt
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/giflib
-	>=media-libs/libpng-1.4
-	>=media-libs/phonon-4.4.3
-	sys-libs/zlib
-	virtual/jpeg
-	>=x11-misc/shared-mime-info-0.60
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	!aqua? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libXcursor
-		x11-libs/libXdmcp
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXft
-		x11-libs/libXpm
-		x11-libs/libXrender
-		x11-libs/libXScrnSaver
-		x11-libs/libXtst
-		!kernel_SunOS? ( sys-libs/libutempter )
-	)
-	bzip2? ( app-arch/bzip2 )
-	fam? ( virtual/fam )
-	jpeg2k? ( media-libs/jasper )
-	kerberos? ( virtual/krb5 )
-	lzma? ( app-arch/xz-utils )
-	openexr? (
-		media-libs/openexr
-		media-libs/ilmbase
-	)
-	policykit? ( >=sys-auth/polkit-qt-0.99 )
-	semantic-desktop? (
-		>=dev-libs/shared-desktop-ontologies-0.6.50
-		>=dev-libs/soprano-2.6.51[dbus,raptor,redland]
-	)
-	spell? ( app-text/enchant )
-	ssl? ( dev-libs/openssl )
-	udev? ( sys-fs/udev )
-	upnp? ( media-libs/herqq )
-	zeroconf? (
-		|| (
-			net-dns/avahi[mdnsresponder-compat]
-			!bindist? ( net-misc/mDNSResponder )
-		)
-	)
-"
-DEPEND="${COMMONDEPEND}
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xsl-stylesheets
-	doc? ( app-doc/doxygen )
-	nls? ( virtual/libintl )
-"
-RDEPEND="${COMMONDEPEND}
-	!dev-libs/conversion
-	!dev-libs/kunitconversion
-	!x11-libs/qt-phonon
-	!<=kde-misc/kdnssd-avahi-0.1.2:0
-	>=app-crypt/gnupg-2.0.11
-	app-misc/ca-certificates
-	$(add_kdebase_dep kde-env)
-	!aqua? (
-		x11-apps/iceauth
-		x11-apps/rgb
-		>=x11-misc/xdg-utils-1.0.2-r3
-		udisks? ( sys-fs/udisks )
-		upower? ( sys-power/upower )
-	)
-"
-PDEPEND="
-	$(add_kdebase_dep katepart)
-	|| ( ( $(add_kdebase_dep kfmclient) ) x11-misc/xdg-utils )
-	handbook? ( $(add_kdebase_dep khelpcenter) )
-	policykit? (
-		>=kde-misc/polkit-kde-kcmodules-0.98_pre20101127
-		>=sys-auth/polkit-kde-agent-0.99
-	)
-	semantic-desktop? ( $(add_kdebase_dep nepomuk) )
-"
-
-# Blockers added due to packages from old versions, removed in the meanwhile
-# as well as for file collisions
-add_blocker libknotificationitem
-add_blocker libkworkspace '<4.3.66'
-add_blocker kcontrol '<4.5.80'
-# @since 4.4 - kpilot is gone (blocker added to help upgrades)
-add_blocker kpilot
-# Block some old versions of KDE-3.5 packages that don't work well with KDE-4
-add_blocker kdebase 0 3.5.9-r4:3.5
-add_blocker kdebase-startkde 0 3.5.10:3.5
-add_blocker kdelibs 0 '<3.5.10:3.5'
-# Force the upgrade of plasma-workspace to a version that explicitly depends on kactivities
-add_blocker plasma-workspace 4.7.1
-
-PATCHES=(
-	"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch"
-	"${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"
-	"${FILESDIR}/${PN}-4.5.90-mimetypes.patch"
-	"${FILESDIR}/${PN}-4.4.90-xslt.patch"
-	"${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch"
-	"${FILESDIR}/${PN}-4.6.3-bytecode.patch"
-	"${FILESDIR}/${PN}-4.7.1-clearbutton.patch"
-	"${FILESDIR}/${PN}-4.7.1-libpng15.patch"
-	"${FILESDIR}/${PN}-4.7.1-qlabel-1.patch"
-	"${FILESDIR}/${PN}-4.7.1-qlabel-2.patch"
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		[[ $(gcc-major-version) -lt 4 ]] || \
-				( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
-			&& die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
-	fi
-}
-
-src_prepare() {
-	kde4-base_src_prepare
-	use arm && epatch "${FILESDIR}/${PN}-4.6.2-armlinking.patch"
-
-	# Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work)
-	sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \
-		-i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed."
-
-	if use aqua; then
-		sed -i -e \
-			"s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \
-			cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake"
-
-		#if [[ ${CHOST} == *-darwin8 ]]; then
-		sed -i -e \
-			"s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \
-			cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake"
-		#fi
-
-		# solid/solid/backends/iokit doesn't properly link, so disable it.
-		sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \
-			|| die "disabling solid/solid/backends/iokit failed"
-		sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \
-			|| die "disabling solid/solid/backends/iokit failed"
-
-		# There's no fdatasync on OSX and the check fails to detect that.
-		sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \
-			|| die "disabling fdatasync failed"
-
-		# Fix nameser include to nameser8_compat
-		sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \
-			|| die "fixing nameser include failed"
-		append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1
-
-		# Try to fix kkeyserver_mac
-		epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		epatch "${FILESDIR}/kdelibs-4.3.2-solaris-ksyscoca.patch"
-		# getgrouplist not in solaris libc
-		epatch "${FILESDIR}/kdelibs-4.3.2-solaris-getgrouplist.patch"
-		# solaris has no d_type element in dir_ent
-		epatch "${FILESDIR}/kdelibs-4.3.2-solaris-fileunix.patch"
-	fi
-}
-
-src_configure() {
-	if use zeroconf; then
-		if has_version net-dns/avahi; then
-			mycmakeargs=(-DWITH_Avahi=ON -DWITH_DNSSD=OFF)
-		elif has_version net-misc/mDNSResponder; then
-			mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=ON)
-		else
-			die "USE=\"zeroconf\" enabled but neither net-dns/avahi nor net-misc/mDNSResponder were found."
-		fi
-	else
-		mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=OFF)
-	fi
-	mycmakeargs+=(
-		-DWITH_HSPELL=OFF
-		-DWITH_ASPELL=OFF
-		-DKDE_DEFAULT_HOME=.kde4
-		-DKAUTH_BACKEND=POLKITQT-1
-		-DBUILD_libkactivities=OFF
-		$(cmake-utils_use_build handbook doc)
-		$(cmake-utils_use_has 3dnow X86_3DNOW)
-		$(cmake-utils_use_has altivec PPC_ALTIVEC)
-		$(cmake-utils_use_has mmx X86_MMX)
-		$(cmake-utils_use_has sse X86_SSE)
-		$(cmake-utils_use_has sse2 X86_SSE2)
-		$(cmake-utils_use_with acl)
-		$(cmake-utils_use_with alsa)
-		$(cmake-utils_use_with bzip2 BZip2)
-		$(cmake-utils_use_with fam)
-		$(cmake-utils_use_with jpeg2k Jasper)
-		$(cmake-utils_use_with kerberos GSSAPI)
-		$(cmake-utils_use_with lzma LibLZMA)
-		$(cmake-utils_use_with nls Libintl)
-		$(cmake-utils_use_with openexr OpenEXR)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with policykit PolkitQt-1)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with semantic-desktop SharedDesktopOntologies)
-		$(cmake-utils_use_with spell ENCHANT)
-		$(cmake-utils_use_with ssl OpenSSL)
-		$(cmake-utils_use_with udev UDev)
-		$(cmake-utils_use_with upnp HUpnp)
-	)
-	kde4-base_src_configure
-}
-
-src_compile() {
-	kde4-base_src_compile
-
-	# The building of apidox is not managed anymore by the build system
-	if use doc; then
-		einfo "Building API documentation"
-		cd "${S}"/doc/api/
-		./doxygen.sh "${S}" || die "APIDOX generation failed"
-	fi
-}
-
-src_install() {
-	kde4-base_src_install
-
-	# use system certificates
-	rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die
-	dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt
-
-	if use doc; then
-		einfo "Installing API documentation. This could take a bit of time."
-		cd "${S}"/doc/api/
-		docinto /HTML/en/kdelibs-apidox
-		dohtml -r ${P}-apidocs/*
-	fi
-
-	if use aqua; then
-		einfo "fixing ${PN} plugins"
-
-		local _PV=${PV:0:3}.0
-		local _dir=${EPREFIX}/usr/$(get_libdir)/kde4/plugins/script
-
-		install_name_tool -id \
-			"${_dir}/libkrossqtsplugin.${_PV}.dylib" \
-			"${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \
-			|| die "failed fixing libkrossqtsplugin.${_PV}.dylib"
-
-		einfo "fixing ${PN} cmake detection files"
-		#sed -i -e \
-		#	"s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \
-		echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \
-			"${ED}"/usr/share/apps/cmake/modules/FindXKB.cmake \
-			|| die "failed fixing FindXKB.cmake"
-	fi
-
-	einfo Installing environment file.
-	# Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined.
-	echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde"
-	echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde"
-	doenvd "${T}/77kde"
-}
-
-pkg_postinst() {
-	fdo-mime_mime_database_update
-
-	if use zeroconf; then
-		echo
-		elog "To make zeroconf support available in KDE make sure that the 'mdnsd' daemon"
-		elog "is running."
-		echo
-		einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns"
-		einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf"
-		einfo "to include 'mdns', e.g.:"
-		einfo "	hosts: files mdns dns"
-		echo
-	fi
-
-	elog "Your homedir is set to \${HOME}/.kde4"
-	echo
-
-	kde4-base_pkg_postinst
-}
-
-pkg_prerm() {
-	# Remove ksycoca4 global database
-	rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4
-}
-
-pkg_postrm() {
-	fdo-mime_mime_database_update
-
-	kde4-base_pkg_postrm
-}
diff --git a/kde-base/kdemultimedia-kioslaves/ChangeLog b/kde-base/kdemultimedia-kioslaves/ChangeLog
index e1508942264e..17887e05995d 100644
--- a/kde-base/kdemultimedia-kioslaves/ChangeLog
+++ b/kde-base/kdemultimedia-kioslaves/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdemultimedia-kioslaves
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/ChangeLog,v 1.195 2011/10/15 17:26:12 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/ChangeLog,v 1.196 2011/10/28 19:03:34 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdemultimedia-kioslaves-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdemultimedia-kioslaves-4.7.0.ebuild:
diff --git a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.7.1.ebuild b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.7.1.ebuild
deleted file mode 100644
index a3e6542f34af..000000000000
--- a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.7.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.7.1.ebuild,v 1.1 2011/09/07 20:14:00 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdemultimedia"
-KMMODULE="kioslave"
-inherit kde4-meta
-
-DESCRIPTION="KDE kioslaves from the kdemultimedia package"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug encode flac vorbis"
-
-# 4 of 9 tests fail. Last checked for 4.2.88
-RESTRICT=test
-
-DEPEND="
-	$(add_kdebase_dep libkcddb)
-	$(add_kdebase_dep libkcompactdisc)
-	media-sound/cdparanoia
-	encode? (
-		flac? ( >=media-libs/flac-1.1.2 )
-		vorbis? ( media-libs/libvorbis )
-	)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	libkcompactdisc/
-"
-KMCOMPILEONLY="
-	libkcddb/
-"
-
-KMLOADLIBS="libkcddb"
-
-src_configure() {
-	if use encode; then
-		mycmakeargs=(
-			$(cmake-utils_use_with flac)
-			$(cmake-utils_use_with vorbis OggVorbis)
-		)
-	else
-		mycmakeargs=(-DWITH_OggVorbis=OFF -DWITH_Flac=OFF)
-	fi
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kdemultimedia-meta/ChangeLog b/kde-base/kdemultimedia-meta/ChangeLog
index 91784b553cba..1d07c6102077 100644
--- a/kde-base/kdemultimedia-meta/ChangeLog
+++ b/kde-base/kdemultimedia-meta/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdemultimedia-meta
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-meta/ChangeLog,v 1.191 2011/10/15 17:26:12 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-meta/ChangeLog,v 1.192 2011/10/28 19:03:43 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdemultimedia-meta-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdemultimedia-meta-4.7.0.ebuild:
diff --git a/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.7.1.ebuild b/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.7.1.ebuild
deleted file mode 100644
index ffa82e164ade..000000000000
--- a/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.7.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.7.1.ebuild,v 1.1 2011/09/07 20:13:42 alexxy Exp $
-
-EAPI=4
-inherit kde4-meta-pkg
-
-DESCRIPTION="kdemultimedia - merge this to pull in all kdemultimedia-derived packages"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="ffmpeg +mplayer"
-
-RDEPEND="
-	$(add_kdebase_dep dragonplayer)
-	$(add_kdebase_dep juk)
-	$(add_kdebase_dep kdemultimedia-kioslaves)
-	$(add_kdebase_dep kmix)
-	$(add_kdebase_dep kscd)
-	$(add_kdebase_dep libkcddb)
-	$(add_kdebase_dep libkcompactdisc)
-	mplayer? ( $(add_kdebase_dep mplayerthumbs) )
-	ffmpeg? ( $(add_kdebase_dep ffmpegthumbs) )
-"
diff --git a/kde-base/kdenetwork-filesharing/ChangeLog b/kde-base/kdenetwork-filesharing/ChangeLog
index 0fcf9752b6d7..defee97db5db 100644
--- a/kde-base/kdenetwork-filesharing/ChangeLog
+++ b/kde-base/kdenetwork-filesharing/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdenetwork-filesharing
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-filesharing/ChangeLog,v 1.182 2011/10/15 17:26:13 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-filesharing/ChangeLog,v 1.183 2011/10/28 19:03:45 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdenetwork-filesharing-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdenetwork-filesharing-4.7.0.ebuild:
diff --git a/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.7.1.ebuild b/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.7.1.ebuild
deleted file mode 100644
index b6c3e54c6ccf..000000000000
--- a/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.7.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.7.1.ebuild,v 1.1 2011/09/07 20:13:49 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kdenetwork"
-KMMODULE="filesharing"
-inherit kde4-meta
-
-DESCRIPTION="kcontrol filesharing config module for NFS, SMB etc"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kdenetwork-meta/ChangeLog b/kde-base/kdenetwork-meta/ChangeLog
index d94d8b15d964..4564d9cc8112 100644
--- a/kde-base/kdenetwork-meta/ChangeLog
+++ b/kde-base/kdenetwork-meta/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdenetwork-meta
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-meta/ChangeLog,v 1.193 2011/10/15 17:25:49 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-meta/ChangeLog,v 1.194 2011/10/28 19:03:19 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdenetwork-meta-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdenetwork-meta-4.7.0.ebuild:
diff --git a/kde-base/kdenetwork-meta/kdenetwork-meta-4.7.1.ebuild b/kde-base/kdenetwork-meta/kdenetwork-meta-4.7.1.ebuild
deleted file mode 100644
index 83b1a8f0edff..000000000000
--- a/kde-base/kdenetwork-meta/kdenetwork-meta-4.7.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-meta/kdenetwork-meta-4.7.1.ebuild,v 1.1 2011/09/07 20:13:40 alexxy Exp $
-
-EAPI=4
-inherit kde4-meta-pkg
-
-DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived packages"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="ppp"
-
-RDEPEND="
-	$(add_kdebase_dep kdenetwork-filesharing)
-	$(add_kdebase_dep kdnssd)
-	$(add_kdebase_dep kget)
-	$(add_kdebase_dep kopete)
-	$(add_kdebase_dep krdc)
-	$(add_kdebase_dep krfb)
-	ppp? ( $(add_kdebase_dep kppp) )
-"
diff --git a/kde-base/kdepasswd/ChangeLog b/kde-base/kdepasswd/ChangeLog
index e9d65adf3719..4748dcaf722e 100644
--- a/kde-base/kdepasswd/ChangeLog
+++ b/kde-base/kdepasswd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdepasswd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepasswd/ChangeLog,v 1.197 2011/10/15 17:26:08 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepasswd/ChangeLog,v 1.198 2011/10/28 19:03:38 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdepasswd-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdepasswd-4.7.0.ebuild:
diff --git a/kde-base/kdepasswd/kdepasswd-4.7.1.ebuild b/kde-base/kdepasswd/kdepasswd-4.7.1.ebuild
deleted file mode 100644
index f041ef32c7ea..000000000000
--- a/kde-base/kdepasswd/kdepasswd-4.7.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepasswd/kdepasswd-4.7.1.ebuild,v 1.1 2011/09/07 20:13:42 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-baseapps"
-inherit kde4-meta
-
-DESCRIPTION="KDE GUI for passwd"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep libkonq)
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdesu)
-"
-
-KMLOADLIBS="libkonq"
diff --git a/kde-base/kdepim-common-libs/ChangeLog b/kde-base/kdepim-common-libs/ChangeLog
index 731c74d600b2..cc852c4c5b52 100644
--- a/kde-base/kdepim-common-libs/ChangeLog
+++ b/kde-base/kdepim-common-libs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdepim-common-libs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-common-libs/ChangeLog,v 1.9 2011/10/15 17:26:10 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-common-libs/ChangeLog,v 1.10 2011/10/28 19:03:40 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdepim-common-libs-4.6.1.ebuild, -kdepim-common-libs-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdepim-common-libs-4.6.1.ebuild, -kdepim-common-libs-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdepim-common-libs-4.7.0.ebuild:
diff --git a/kde-base/kdepim-common-libs/kdepim-common-libs-4.6.1.ebuild b/kde-base/kdepim-common-libs/kdepim-common-libs-4.6.1.ebuild
deleted file mode 100644
index ee381a101a5f..000000000000
--- a/kde-base/kdepim-common-libs/kdepim-common-libs-4.6.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-common-libs/kdepim-common-libs-4.6.1.ebuild,v 1.1 2011/07/11 14:01:18 tampakrap Exp $
-
-EAPI=4
-
-KMNAME="kdepim"
-KMNOMODULE="true"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="Common libraries for KDE PIM apps"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	app-crypt/gpgme
-	>=app-office/akonadi-server-1.3.60
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
-"
-RDEPEND="${DEPEND}
-	app-crypt/gnupg
-	$(add_kdebase_dep kdepim-runtime)
-"
-
-# @Since >4.4.76 merged here
-add_blocker akonadi
-add_blocker libkdepim
-add_blocker libkleo
-add_blocker libkpgp
-add_blocker messagecomposer
-add_blocker messagecore
-add_blocker messagelist
-add_blocker messageviewer
-add_blocker templateparser
-add_blocker kaddressbook '<4.4.90'
-add_blocker kmail '<4.4.80'
-add_blocker korganizer '<4.5.67'
-
-KMEXTRA="
-	akonadi_next/
-	calendarsupport/
-	calendarviews/
-	incidenceeditor-ng/
-	libkdepim/
-	libkdepimdbusinterfaces/
-	libkleo/
-	libkpgp/
-	kdgantt2/
-	messagecomposer/
-	messagecore/
-	messagelist/
-	messageviewer/
-	nepomuk_email_feeder/
-	ontologies/
-	templateparser/
-"
-
-KMEXTRACTONLY="
-	kleopatra/
-	kmail/
-	knode/org.kde.knode.xml
-	korganizer/korgac/org.kde.korganizer.KOrgac.xml
-	korganizer/org.kde.korganizer.Korganizer.xml
-"
-
-KMSAVELIBS="true"
diff --git a/kde-base/kdepim-common-libs/kdepim-common-libs-4.7.1.ebuild b/kde-base/kdepim-common-libs/kdepim-common-libs-4.7.1.ebuild
deleted file mode 100644
index 9efa8a137aac..000000000000
--- a/kde-base/kdepim-common-libs/kdepim-common-libs-4.7.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-common-libs/kdepim-common-libs-4.7.1.ebuild,v 1.1 2011/09/07 20:14:00 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kdepim"
-KMNOMODULE="true"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="Common libraries for KDE PIM apps"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	app-crypt/gpgme
-	>=app-office/akonadi-server-1.3.60
-	>=dev-libs/shared-desktop-ontologies-0.6.50
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
-"
-RDEPEND="${DEPEND}
-	app-crypt/gnupg
-	$(add_kdebase_dep kdepim-runtime)
-"
-
-# @Since >4.4.76 merged here
-add_blocker akonadi
-add_blocker libkdepim
-add_blocker libkleo
-add_blocker libkpgp
-add_blocker messagecomposer
-add_blocker messagecore
-add_blocker messagelist
-add_blocker messageviewer
-add_blocker templateparser
-add_blocker kaddressbook '<4.4.90'
-add_blocker kmail '<4.4.80'
-add_blocker korganizer '<4.5.67'
-
-KMEXTRA="
-	akonadi_next/
-	calendarsupport/
-	calendarviews/
-	incidenceeditor-ng/
-	libkdepim/
-	libkdepimdbusinterfaces/
-	libkleo/
-	libkpgp/
-	kdgantt2/
-	messagecomposer/
-	messagecore/
-	messagelist/
-	messageviewer/
-	nepomuk_email_feeder/
-	ontologies/
-	templateparser/
-"
-
-KMEXTRACTONLY="
-	kleopatra/
-	kmail/
-	knode/org.kde.knode.xml
-	korganizer/korgac/org.kde.korganizer.KOrgac.xml
-	korganizer/org.kde.korganizer.Korganizer.xml
-"
-
-KMSAVELIBS="true"
diff --git a/kde-base/kdepim-icons/ChangeLog b/kde-base/kdepim-icons/ChangeLog
index 33ed40c06f75..781f98eb77b3 100644
--- a/kde-base/kdepim-icons/ChangeLog
+++ b/kde-base/kdepim-icons/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdepim-icons
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-icons/ChangeLog,v 1.86 2011/10/15 17:25:49 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-icons/ChangeLog,v 1.87 2011/10/28 19:03:19 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdepim-icons-4.6.1.ebuild, -kdepim-icons-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdepim-icons-4.6.1.ebuild, -kdepim-icons-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdepim-icons-4.7.0.ebuild:
diff --git a/kde-base/kdepim-icons/kdepim-icons-4.6.1.ebuild b/kde-base/kdepim-icons/kdepim-icons-4.6.1.ebuild
deleted file mode 100644
index 1d7b2cd7df30..000000000000
--- a/kde-base/kdepim-icons/kdepim-icons-4.6.1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-icons/kdepim-icons-4.6.1.ebuild,v 1.1 2011/07/11 14:01:19 tampakrap Exp $
-
-EAPI=4
-
-KMNAME="kdepim"
-KMMODULE="icons"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="KDE PIM icons"
-IUSE=""
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
diff --git a/kde-base/kdepim-icons/kdepim-icons-4.7.1.ebuild b/kde-base/kdepim-icons/kdepim-icons-4.7.1.ebuild
deleted file mode 100644
index 4fc196c2f980..000000000000
--- a/kde-base/kdepim-icons/kdepim-icons-4.7.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-icons/kdepim-icons-4.7.1.ebuild,v 1.1 2011/09/07 20:13:40 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kdepim"
-KMMODULE="icons"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="KDE PIM icons"
-IUSE=""
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="$(add_kdebase_dep kdepimlibs)"
-RDEPEND=""
diff --git a/kde-base/kdepim-kresources/ChangeLog b/kde-base/kdepim-kresources/ChangeLog
index ee7e62904781..1f75a5026909 100644
--- a/kde-base/kdepim-kresources/ChangeLog
+++ b/kde-base/kdepim-kresources/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdepim-kresources
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kresources/ChangeLog,v 1.196 2011/10/15 17:25:52 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kresources/ChangeLog,v 1.197 2011/10/28 19:03:22 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdepim-kresources-4.6.1.ebuild, -kdepim-kresources-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdepim-kresources-4.6.1.ebuild, -kdepim-kresources-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdepim-kresources-4.7.0.ebuild:
diff --git a/kde-base/kdepim-kresources/kdepim-kresources-4.6.1.ebuild b/kde-base/kdepim-kresources/kdepim-kresources-4.6.1.ebuild
deleted file mode 100644
index 965842e6f5fd..000000000000
--- a/kde-base/kdepim-kresources/kdepim-kresources-4.6.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kresources/kdepim-kresources-4.6.1.ebuild,v 1.1 2011/07/11 14:01:18 tampakrap Exp $
-
-EAPI=4
-
-KMNAME="kdepim"
-KMMODULE="kresources"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="KDE PIM groupware plugin collection"
-IUSE="debug"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	kmail/
-	knotes/
-	korganizer/version.h
-"
-
-KMLOADLIBS="kdepim-common-libs"
-
-src_install() {
-	kde4-meta_src_install
-
-	# Install headers needed by kdepim-wizards, egroupware and slox stuff gone
-	insinto "${PREFIX}"/include/${PN}
-	doins "${CMAKE_BUILD_DIR}"/${KMMODULE}/groupwise/*.h
-}
diff --git a/kde-base/kdepim-kresources/kdepim-kresources-4.7.1.ebuild b/kde-base/kdepim-kresources/kdepim-kresources-4.7.1.ebuild
deleted file mode 100644
index 6204af642fe2..000000000000
--- a/kde-base/kdepim-kresources/kdepim-kresources-4.7.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kresources/kdepim-kresources-4.7.1.ebuild,v 1.1 2011/09/07 20:13:41 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kdepim"
-KMMODULE="kresources"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="KDE PIM groupware plugin collection"
-IUSE="debug"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	kmail/
-	knotes/
-	korganizer/version.h
-"
-
-KMLOADLIBS="kdepim-common-libs"
-
-src_install() {
-	kde4-meta_src_install
-
-	# Install headers needed by kdepim-wizards, egroupware and slox stuff gone
-	insinto "${PREFIX}"/include/${PN}
-	doins "${CMAKE_BUILD_DIR}"/${KMMODULE}/groupwise/*.h
-}
diff --git a/kde-base/kdepim-l10n/ChangeLog b/kde-base/kdepim-l10n/ChangeLog
index c50c83910ff4..753057629dcb 100644
--- a/kde-base/kdepim-l10n/ChangeLog
+++ b/kde-base/kdepim-l10n/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdepim-l10n
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-l10n/ChangeLog,v 1.15 2011/10/18 22:50:14 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-l10n/ChangeLog,v 1.16 2011/10/28 19:03:24 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdepim-l10n-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
 *kdepim-l10n-4.7.2 (18 Oct 2011)
 *kdepim-l10n-4.7.1 (18 Oct 2011)
diff --git a/kde-base/kdepim-l10n/kdepim-l10n-4.7.1.ebuild b/kde-base/kdepim-l10n/kdepim-l10n-4.7.1.ebuild
deleted file mode 100644
index fb50e41911fb..000000000000
--- a/kde-base/kdepim-l10n/kdepim-l10n-4.7.1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-l10n/kdepim-l10n-4.7.1.ebuild,v 1.1 2011/10/18 22:50:14 dilfridge Exp $
-
-EAPI=4
-
-inherit kde4-base
-
-DESCRIPTION="KDE PIM internationalization package"
-HOMEPAGE="http://www.kde.org/"
-LICENSE="GPL-2"
-
-DEPEND="
-	sys-devel/gettext
-"
-RDEPEND=""
-
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+handbook"
-
-MY_LANGS="ar bg bs ca ca@valencia cs da de el en_GB es et eu fi fr ga gl he hr
-hu ia id is it ja kk km kn ko lt lv nb nds nl nn pa pl pt pt_BR ro ru sk sl sr
-sv th tr ug uk wa zh_CN zh_TW"
-
-URI_BASE="${SRC_URI/-${PV}.tar.bz2/}"
-SRC_URI=""
-
-for MY_LANG in ${MY_LANGS} ; do
-	IUSE="${IUSE} linguas_${MY_LANG}"
-	SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${URI_BASE}/kde-l10n-${MY_LANG}-${PV}.tar.bz2 )"
-done
-
-S="${WORKDIR}"
-
-src_unpack() {
-	local LNG DIR
-	if [[ -z ${A} ]]; then
-		elog
-		elog "You either have the LINGUAS variable unset, or it only"
-		elog "contains languages not supported by ${P}."
-		elog "You won't have any additional language support."
-		elog
-		elog "${P} supports these language codes:"
-		elog "${MY_LANGS}"
-		elog
-	fi
-
-	# For EAPI >= 3, or if not using .tar.xz archives:
-	[[ -n ${A} ]] && unpack ${A}
-	cd "${S}"
-
-	# add all linguas to cmake
-	if [[ -n ${A} ]]; then
-		for LNG in ${LINGUAS}; do
-			DIR="kde-l10n-${LNG}-${PV}"
-			if [[ -d "${DIR}" ]] ; then
-				echo "add_subdirectory( ${DIR} )" >> "${S}"/CMakeLists.txt
-			fi
-
-			# remove everything except kdepim
-			for SUBDIR in data docs messages scripts ; do
-				if [[ -d "${S}/${DIR}/${SUBDIR}" ]] ; then
-					einfo "   ${SUBDIR} subdirectory"
-					echo > "${S}/${DIR}/${SUBDIR}/CMakeLists.txt"
-					[[ -d "${S}/${DIR}/${SUBDIR}/kdepim" ]] && ( echo "add_subdirectory(kdepim)" >> "${S}/${DIR}/${SUBDIR}/CMakeLists.txt" )
-				fi
-			done
-
-			# in some cases we may have sub-lingua subdirs, e.g. sr :(
-			for XSUBDIR in "${S}/${DIR}/${LNG}"@* ; do
-				XLNG=$(echo ${XSUBDIR}|sed -e 's:^.*/::')
-				if [[ -d "${XSUBDIR}" ]] ; then
-					einfo "   ${XLNG} variant"
-					# remove everything except kdepim
-					for SUBDIR in data docs messages scripts ; do
-						if [[ -d "${XSUBDIR}/${SUBDIR}" ]] ; then
-							einfo "      ${SUBDIR} subdirectory"
-							echo > "${XSUBDIR}/${SUBDIR}/CMakeLists.txt"
-							[[ -d "${XSUBDIR}/${SUBDIR}/kdepim" ]] && ( echo "add_subdirectory(kdepim)" >> "${XSUBDIR}/${SUBDIR}/CMakeLists.txt" )
-						fi
-					done
-				fi
-			done
-		done
-	fi
-}
-
-src_prepare() {
-	[[ -n ${A} ]] && kde4-base_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_build handbook docs)
-	)
-	[[ -n ${A} ]] && kde4-base_src_configure
-}
-
-src_compile() {
-	[[ -n ${A} ]] && kde4-base_src_compile
-}
-
-src_test() {
-	[[ -n ${A} ]] && kde4-base_src_test
-}
-
-src_install() {
-	[[ -n ${A} ]] && kde4-base_src_install
-}
diff --git a/kde-base/kdepim-meta/ChangeLog b/kde-base/kdepim-meta/ChangeLog
index e9f68d2e8bb5..d623930a9274 100644
--- a/kde-base/kdepim-meta/ChangeLog
+++ b/kde-base/kdepim-meta/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdepim-meta
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/ChangeLog,v 1.194 2011/10/15 17:26:12 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/ChangeLog,v 1.195 2011/10/28 19:03:43 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdepim-meta-4.6.1.ebuild, -kdepim-meta-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdepim-meta-4.6.1.ebuild, -kdepim-meta-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdepim-meta-4.7.0-r1.ebuild:
diff --git a/kde-base/kdepim-meta/kdepim-meta-4.6.1.ebuild b/kde-base/kdepim-meta/kdepim-meta-4.6.1.ebuild
deleted file mode 100644
index f54a2630ad45..000000000000
--- a/kde-base/kdepim-meta/kdepim-meta-4.6.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/kdepim-meta-4.6.1.ebuild,v 1.1 2011/07/11 14:01:20 tampakrap Exp $
-
-EAPI=4
-inherit kde4-meta-pkg
-
-DESCRIPTION="kdepim - merge this to pull in all kdepim-derived packages"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	$(add_kdebase_dep akonadiconsole)
-	$(add_kdebase_dep akregator)
-	$(add_kdebase_dep blogilo)
-	$(add_kdebase_dep kabcclient)
-	$(add_kdebase_dep kaddressbook)
-	$(add_kdebase_dep kalarm)
-	$(add_kdebase_dep kdepim-icons)
-	$(add_kdebase_dep kdepim-kresources)
-	$(add_kdebase_dep kdepim-runtime)
-	$(add_kdebase_dep kdepim-strigi-analyzer)
-	$(add_kdebase_dep kdepim-wizards)
-	$(add_kdebase_dep kjots)
-	$(add_kdebase_dep kleopatra)
-	$(add_kdebase_dep kmail)
-	$(add_kdebase_dep knode)
-	$(add_kdebase_dep knotes)
-	$(add_kdebase_dep konsolekalendar)
-	$(add_kdebase_dep kontact)
-	$(add_kdebase_dep korganizer)
-	$(add_kdebase_dep ktimetracker)
-"
diff --git a/kde-base/kdepim-meta/kdepim-meta-4.7.1.ebuild b/kde-base/kdepim-meta/kdepim-meta-4.7.1.ebuild
deleted file mode 100644
index 7d51a62d7bb8..000000000000
--- a/kde-base/kdepim-meta/kdepim-meta-4.7.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/kdepim-meta-4.7.1.ebuild,v 1.1 2011/09/07 20:13:46 alexxy Exp $
-
-EAPI=4
-inherit kde4-meta-pkg
-
-DESCRIPTION="kdepim - merge this to pull in all kdepim-derived packages"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	$(add_kdebase_dep akonadiconsole)
-	$(add_kdebase_dep akregator)
-	$(add_kdebase_dep blogilo)
-	$(add_kdebase_dep kabcclient)
-	$(add_kdebase_dep kaddressbook)
-	$(add_kdebase_dep kalarm)
-	$(add_kdebase_dep kdepim-icons)
-	$(add_kdebase_dep kdepim-kresources)
-	$(add_kdebase_dep kdepim-runtime)
-	$(add_kdebase_dep kdepim-strigi-analyzer)
-	$(add_kdebase_dep kdepim-wizards)
-	$(add_kdebase_dep kjots)
-	$(add_kdebase_dep kleopatra)
-	$(add_kdebase_dep kmail)
-	$(add_kdebase_dep knode)
-	$(add_kdebase_dep knotes)
-	$(add_kdebase_dep konsolekalendar)
-	$(add_kdebase_dep kontact)
-	$(add_kdebase_dep korganizer)
-	$(add_kdebase_dep ktimetracker)
-"
diff --git a/kde-base/kdepim-runtime/ChangeLog b/kde-base/kdepim-runtime/ChangeLog
index 4e9fa502deef..a064c7ac4477 100644
--- a/kde-base/kdepim-runtime/ChangeLog
+++ b/kde-base/kdepim-runtime/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for kde-base/kdepim-runtime
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.52 2011/10/28 18:34:55 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.53 2011/10/28 19:03:20 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdepim-runtime-4.6.1.ebuild, -kdepim-runtime-4.7.1.ebuild,
+  -kdepim-runtime-4.7.1-r1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdepim-runtime-4.6.1.ebuild, -kdepim-runtime-4.7.1.ebuild,
+  -kdepim-runtime-4.7.1-r1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdepim-runtime-4.6.1.ebuild, -kdepim-runtime-4.7.1.ebuild,
+  -kdepim-runtime-4.7.1-r1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdepim-runtime-4.7.2.ebuild:
diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.6.1.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.6.1.ebuild
deleted file mode 100644
index fee855d564f3..000000000000
--- a/kde-base/kdepim-runtime/kdepim-runtime-4.6.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.6.1.ebuild,v 1.1 2011/07/11 14:01:19 tampakrap Exp $
-
-EAPI=4
-
-KDE_LINGUAS="ar be ca ca@valencia cs da de el en_GB eo es et fi fr ga gl hr hu
-ia it ja kk km ko lt lv mai nb nds nl nn pa pl pt pt_BR ro ru se sk sl sv th
-tr uk zh_CN zh_TW"
-KMNAME="kdepim-runtime"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE PIM runtime plugin collection"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RESTRICT="test"
-# Would need test programs _testrunner and akonaditest from kdepimlibs, see bug 313233
-
-DEPEND="
-	app-misc/strigi
-	>=app-office/akonadi-server-1.3.60
-	dev-libs/boost
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
-	x11-misc/shared-mime-info
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdepim-icons)
-"
-
-add_blocker kdemaildir '<4.3.0'
-add_blocker akonadi '<4.3.90'
diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.7.1-r1.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.7.1-r1.ebuild
deleted file mode 100644
index d5a8607eac69..000000000000
--- a/kde-base/kdepim-runtime/kdepim-runtime-4.7.1-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.7.1-r1.ebuild,v 1.1 2011/09/27 23:35:50 dilfridge Exp $
-
-EAPI=4
-
-KMNAME="kdepim-runtime"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE PIM runtime plugin collection"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RESTRICT="test"
-# Would need test programs _testrunner and akonaditest from kdepimlibs, see bug 313233
-
-DEPEND="
-	app-misc/strigi
-	>=app-office/akonadi-server-1.3.60
-	dev-libs/boost
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=dev-libs/shared-desktop-ontologies-0.6.51
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
-	x11-misc/shared-mime-info
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdepim-icons)
-"
-
-add_blocker kdemaildir '<4.3.0'
-add_blocker akonadi '<4.3.90'
-
-PATCHES=( "${FILESDIR}/${P}-emptyids.patch" )
diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.7.1.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.7.1.ebuild
deleted file mode 100644
index 0bcc287d4c6a..000000000000
--- a/kde-base/kdepim-runtime/kdepim-runtime-4.7.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.7.1.ebuild,v 1.1 2011/09/07 20:13:45 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kdepim-runtime"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE PIM runtime plugin collection"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RESTRICT="test"
-# Would need test programs _testrunner and akonaditest from kdepimlibs, see bug 313233
-
-DEPEND="
-	app-misc/strigi
-	>=app-office/akonadi-server-1.3.60
-	dev-libs/boost
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=dev-libs/shared-desktop-ontologies-0.6.51
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
-	x11-misc/shared-mime-info
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdepim-icons)
-"
-
-add_blocker kdemaildir '<4.3.0'
-add_blocker akonadi '<4.3.90'
diff --git a/kde-base/kdepim-strigi-analyzer/ChangeLog b/kde-base/kdepim-strigi-analyzer/ChangeLog
index 149b63de7e09..d1d71715f105 100644
--- a/kde-base/kdepim-strigi-analyzer/ChangeLog
+++ b/kde-base/kdepim-strigi-analyzer/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdepim-strigi-analyzer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-strigi-analyzer/ChangeLog,v 1.83 2011/10/15 17:25:48 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-strigi-analyzer/ChangeLog,v 1.84 2011/10/28 19:03:18 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdepim-strigi-analyzer-4.6.1.ebuild, -kdepim-strigi-analyzer-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdepim-strigi-analyzer-4.6.1.ebuild, -kdepim-strigi-analyzer-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdepim-strigi-analyzer-4.7.0.ebuild:
diff --git a/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-4.6.1.ebuild b/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-4.6.1.ebuild
deleted file mode 100644
index 50bca0c4aa10..000000000000
--- a/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-4.6.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-4.6.1.ebuild,v 1.1 2011/07/11 14:01:19 tampakrap Exp $
-
-EAPI=4
-
-KMNAME="kdepim"
-KMMODULE="strigi-analyzer"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="kdepim: strigi plugins"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	app-misc/strigi
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	libkleo/
-	libkpgp/
-	messageviewer/
-"
diff --git a/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-4.7.1.ebuild b/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-4.7.1.ebuild
deleted file mode 100644
index a5da0bb6cb6d..000000000000
--- a/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-4.7.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-4.7.1.ebuild,v 1.1 2011/09/07 20:14:06 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kdepim"
-KMMODULE="strigi-analyzer"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="kdepim: strigi plugins"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	app-misc/strigi
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	libkleo/
-	libkpgp/
-	messageviewer/
-"
diff --git a/kde-base/kdepim-wizards/ChangeLog b/kde-base/kdepim-wizards/ChangeLog
index 11148940507f..23d5911d0cf0 100644
--- a/kde-base/kdepim-wizards/ChangeLog
+++ b/kde-base/kdepim-wizards/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdepim-wizards
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-wizards/ChangeLog,v 1.182 2011/10/15 17:25:53 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-wizards/ChangeLog,v 1.183 2011/10/28 19:03:33 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdepim-wizards-4.6.1.ebuild, -kdepim-wizards-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdepim-wizards-4.6.1.ebuild, -kdepim-wizards-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdepim-wizards-4.7.0.ebuild:
diff --git a/kde-base/kdepim-wizards/kdepim-wizards-4.6.1.ebuild b/kde-base/kdepim-wizards/kdepim-wizards-4.6.1.ebuild
deleted file mode 100644
index 256f7d58b771..000000000000
--- a/kde-base/kdepim-wizards/kdepim-wizards-4.6.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-wizards/kdepim-wizards-4.6.1.ebuild,v 1.1 2011/07/11 14:01:20 tampakrap Exp $
-
-EAPI=4
-
-KMNAME="kdepim"
-KMMODULE="wizards"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="KDE PIM wizards"
-IUSE="debug"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep kdepim-kresources)
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	kmail/
-	knotes/
-	kresources/groupwise/
-"
-
-src_prepare() {
-	ln -s "${EPREFIX}"/usr/include/kdepim-kresources/{kabc_groupwiseprefs,kcal_groupwiseprefsbase}.h \
-		kresources/groupwise/ \
-		|| die "Failed to link extra_headers."
-
-	kde4-meta_src_prepare
-}
diff --git a/kde-base/kdepim-wizards/kdepim-wizards-4.7.1.ebuild b/kde-base/kdepim-wizards/kdepim-wizards-4.7.1.ebuild
deleted file mode 100644
index 0bde4c5aab2d..000000000000
--- a/kde-base/kdepim-wizards/kdepim-wizards-4.7.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-wizards/kdepim-wizards-4.7.1.ebuild,v 1.1 2011/09/07 20:13:48 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kdepim"
-KMMODULE="wizards"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="KDE PIM wizards"
-IUSE="debug"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep kdepim-kresources)
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	kmail/
-	knotes/
-	kresources/groupwise/
-"
-
-src_prepare() {
-	ln -s "${EPREFIX}"/usr/include/kdepim-kresources/{kabc_groupwiseprefs,kcal_groupwiseprefsbase}.h \
-		kresources/groupwise/ \
-		|| die "Failed to link extra_headers."
-
-	kde4-meta_src_prepare
-}
diff --git a/kde-base/kdepimlibs/ChangeLog b/kde-base/kdepimlibs/ChangeLog
index 0eebd454f67e..51face98bae1 100644
--- a/kde-base/kdepimlibs/ChangeLog
+++ b/kde-base/kdepimlibs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdepimlibs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/ChangeLog,v 1.113 2011/10/15 17:26:09 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/ChangeLog,v 1.114 2011/10/28 19:03:40 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdepimlibs-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdepimlibs-4.7.0.ebuild:
diff --git a/kde-base/kdepimlibs/kdepimlibs-4.7.1.ebuild b/kde-base/kdepimlibs/kdepimlibs-4.7.1.ebuild
deleted file mode 100644
index 33c4ff0e985c..000000000000
--- a/kde-base/kdepimlibs/kdepimlibs-4.7.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/kdepimlibs-4.7.1.ebuild,v 1.1 2011/09/07 20:13:48 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-CPPUNIT_REQUIRED="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="Common library for KDE PIM apps."
-HOMEPAGE="http://www.kde.org/"
-
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-LICENSE="LGPL-2.1"
-IUSE="debug ldap semantic-desktop"
-
-# some akonadi tests timeout, that probaly needs more work as its ~700 tests
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=app-crypt/gpgme-1.1.6
-	dev-libs/libgpg-error
-	>=dev-libs/libical-0.43
-	dev-libs/cyrus-sasl
-	$(add_kdebase_dep kdelibs 'semantic-desktop=')
-	semantic-desktop? (
-		>=app-office/akonadi-server-1.5.80
-		media-libs/phonon
-		x11-misc/shared-mime-info
-	)
-	ldap? ( net-nds/openldap )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.35.0-r5
-"
-RDEPEND="${COMMON_DEPEND}"
-
-# libakonadi-kcal moved here from akonadi in 4.3.86
-add_blocker akonadi '<4.3.86'
-# @since 4.3 - libkholidays is in kdepimlibs now
-add_blocker libkholidays
-# @since 4.4 - kontactinterfaces is in kdepimlibs now
-add_blocker kontactinterfaces
-
-src_prepare() {
-	kde4-base_src_prepare
-
-	# Disable hardcoded checks
-	sed -r -e '/find_package\((Akonadi|SharedDesktopOntologies|Soprano|Nepomuk)/{/macro_optional_/!s/find/macro_optional_&/}' \
-		-e '/macro_log_feature\((Akonadi|SHAREDDESKTOPONTOLOGIES|Soprano|Nepomuk)_FOUND/s/ TRUE / FALSE /' \
-		-e '/add_subdirectory\((akonadi|mailtransport)/{/macro_optional_/!s/add/macro_optional_&/}' \
-		-i CMakeLists.txt || die
-	if ! use semantic-desktop; then
-		sed -e '/include(SopranoAddOntology)/s/^/#DISABLED /' \
-			-i CMakeLists.txt || die
-		# More reliable than -DBUILD_akonadi=OFF
-		rm -r akonadi mailtransport || die
-	fi
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_build handbook doc)
-		$(cmake-utils_use_with ldap)
-		$(cmake-utils_use_with semantic-desktop Akonadi)
-		$(cmake-utils_use_with semantic-desktop SharedDesktopOntologies)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		# $(cmake-utils_use_with prison)
-		-DWITH_Prison=NO
-	)
-
-	kde4-base_src_configure
-}
diff --git a/kde-base/kdeplasma-addons/ChangeLog b/kde-base/kdeplasma-addons/ChangeLog
index 1d9431ebc23e..6d680cdbf382 100644
--- a/kde-base/kdeplasma-addons/ChangeLog
+++ b/kde-base/kdeplasma-addons/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdeplasma-addons
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.105 2011/10/15 17:26:01 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.106 2011/10/28 19:03:31 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdeplasma-addons-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdeplasma-addons-4.7.0.ebuild, -kdeplasma-addons-4.7.0-r1.ebuild:
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.1.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.1.ebuild
deleted file mode 100644
index 11ff1db68267..000000000000
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.1.ebuild,v 1.1 2011/09/07 20:14:07 alexxy Exp $
-
-EAPI=4
-
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="Extra Plasma applets and engines."
-HOMEPAGE="http://www.kde.org/"
-LICENSE="GPL-2 LGPL-2"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="attica debug desktopglobe exif qalculate qwt scim semantic-desktop"
-
-# krunner is only needed to generate dbus interface for lancelot
-COMMON_DEPEND="
-	app-crypt/qca:2
-	app-crypt/qca-ossl:2
-	$(add_kdebase_dep kdelibs 'semantic-desktop=')
-	$(add_kdebase_dep krunner)
-	$(add_kdebase_dep plasma-workspace 'semantic-desktop=')
-	x11-misc/shared-mime-info
-	attica? ( dev-libs/libattica )
-	desktopglobe? ( $(add_kdebase_dep marble) )
-	exif? ( $(add_kdebase_dep libkexiv2) )
-	qalculate? ( sci-libs/libqalculate )
-	qwt? ( x11-libs/qwt:5 )
-	scim? ( app-i18n/scim )
-	semantic-desktop? (
-		$(add_kdebase_dep kdepimlibs 'semantic-desktop')
-		$(add_kdebase_dep plasma-workspace 'rss')
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/eigen:2
-"
-# kde-misc/plasmaboard: moved here in 4.3.65
-# kde-misc/qalculate-applet: since 4.4.0
-RDEPEND="${COMMON_DEPEND}
-	!kde-misc/plasmaboard
-	!kde-misc/qalculate-applet
-"
-
-# kdebase-data: some svg icons moved from data directly here.
-add_blocker kdebase-data '<4.2.88'
-
-src_prepare() {
-	use semantic-desktop || epatch "${FILESDIR}/${PN}-4.6.2-optional-akonadi.patch"
-	kde4-base_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DDBUS_INTERFACES_INSTALL_DIR="${EPREFIX}/usr/share/dbus-1/interfaces/"
-		$(cmake-utils_use_with attica LibAttica)
-		$(cmake-utils_use_with desktopglobe Marble)
-		$(cmake-utils_use_with exif Kexiv2)
-		$(cmake-utils_use_with qalculate)
-		$(cmake-utils_use_with qwt)
-		$(cmake-utils_use_with semantic-desktop KdepimLibs)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with scim)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/kde-base/kdesdk-kioslaves/ChangeLog b/kde-base/kdesdk-kioslaves/ChangeLog
index eba9c3604c88..084c6f3bb810 100644
--- a/kde-base/kdesdk-kioslaves/ChangeLog
+++ b/kde-base/kdesdk-kioslaves/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdesdk-kioslaves
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/ChangeLog,v 1.184 2011/10/15 17:26:01 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/ChangeLog,v 1.185 2011/10/28 19:03:31 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdesdk-kioslaves-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdesdk-kioslaves-4.7.0.ebuild:
diff --git a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.7.1.ebuild b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.7.1.ebuild
deleted file mode 100644
index 5aca60bbcb92..000000000000
--- a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.7.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.7.1.ebuild,v 1.1 2011/09/07 20:13:56 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kdesdk"
-KMMODULE="kioslave"
-inherit kde4-meta
-
-DESCRIPTION="kioslaves from kdesdk package"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug subversion"
-
-DEPEND="
-	subversion? (
-		dev-libs/apr
-		dev-vcs/subversion
-	)
-"
-RDEPEND="${DEPEND}
-	subversion? ( !>=dev-vcs/kdesvn-1.5.2:4 )
-"
-
-src_configure() {
-	mycmakeargs=(
-		-DAPRCONFIG_EXECUTABLE="${EPREFIX}"/usr/bin/apr-1-config
-		$(cmake-utils_use_with subversion SVN)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kdesdk-meta/ChangeLog b/kde-base/kdesdk-meta/ChangeLog
index 506a3cd8bc0a..69718dba0bb7 100644
--- a/kde-base/kdesdk-meta/ChangeLog
+++ b/kde-base/kdesdk-meta/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdesdk-meta
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-meta/ChangeLog,v 1.178 2011/10/15 17:26:02 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-meta/ChangeLog,v 1.179 2011/10/28 19:03:18 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdesdk-meta-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdesdk-meta-4.7.0.ebuild:
diff --git a/kde-base/kdesdk-meta/kdesdk-meta-4.7.1.ebuild b/kde-base/kdesdk-meta/kdesdk-meta-4.7.1.ebuild
deleted file mode 100644
index 12c23785b29f..000000000000
--- a/kde-base/kdesdk-meta/kdesdk-meta-4.7.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-meta/kdesdk-meta-4.7.1.ebuild,v 1.1 2011/09/07 20:13:39 alexxy Exp $
-
-EAPI=4
-inherit kde4-meta-pkg
-
-DESCRIPTION="KDE SDK - merge this to pull in all kdesdk-derived packages"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cvs"
-
-RDEPEND="
-	cvs? ( $(add_kdebase_dep cervisia) )
-	$(add_kdebase_dep dolphin-plugins)
-	$(add_kdebase_dep kapptemplate)
-	$(add_kdebase_dep kate)
-	$(add_kdebase_dep kcachegrind)
-	$(add_kdebase_dep kdeaccounts-plugin)
-	$(add_kdebase_dep kdesdk-kioslaves)
-	$(add_kdebase_dep kdesdk-misc)
-	$(add_kdebase_dep kdesdk-scripts)
-	$(add_kdebase_dep kdesdk-strigi-analyzer)
-	$(add_kdebase_dep kompare)
-	$(add_kdebase_dep kstartperf)
-	$(add_kdebase_dep kuiviewer)
-	$(add_kdebase_dep lokalize)
-	$(add_kdebase_dep okteta)
-	$(add_kdebase_dep umbrello)
-"
diff --git a/kde-base/kdesdk-misc/ChangeLog b/kde-base/kdesdk-misc/ChangeLog
index 03606b353be2..5ae476c18ec6 100644
--- a/kde-base/kdesdk-misc/ChangeLog
+++ b/kde-base/kdesdk-misc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdesdk-misc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-misc/ChangeLog,v 1.163 2011/10/15 17:26:00 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-misc/ChangeLog,v 1.164 2011/10/28 19:03:29 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdesdk-misc-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdesdk-misc-4.7.0.ebuild:
diff --git a/kde-base/kdesdk-misc/kdesdk-misc-4.7.1.ebuild b/kde-base/kdesdk-misc/kdesdk-misc-4.7.1.ebuild
deleted file mode 100644
index 9958f2a08c4c..000000000000
--- a/kde-base/kdesdk-misc/kdesdk-misc-4.7.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-misc/kdesdk-misc-4.7.1.ebuild,v 1.1 2011/09/07 20:14:04 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kdesdk"
-KMNOMODULE="true"
-inherit kde4-meta
-
-DESCRIPTION="KDE miscellaneous SDK tools"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug extras"
-
-DEPEND="
-	extras? ( >=dev-java/antlr-2.7.7:0[cxx,script] )
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRA="
-	doc/kmtrace/
-	doc/poxml/
-	kmtrace/
-	kpartloader/
-	kprofilemethod/
-	kspy/
-	kunittest/
-	poxml/
-	scheck/
-"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with extras Antlr2)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kdesdk-scripts/ChangeLog b/kde-base/kdesdk-scripts/ChangeLog
index eeb7e2a898ea..bf71e9d3d875 100644
--- a/kde-base/kdesdk-scripts/ChangeLog
+++ b/kde-base/kdesdk-scripts/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdesdk-scripts
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-scripts/ChangeLog,v 1.171 2011/10/15 17:26:00 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-scripts/ChangeLog,v 1.172 2011/10/28 19:03:29 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdesdk-scripts-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdesdk-scripts-4.7.0.ebuild:
diff --git a/kde-base/kdesdk-scripts/kdesdk-scripts-4.7.1.ebuild b/kde-base/kdesdk-scripts/kdesdk-scripts-4.7.1.ebuild
deleted file mode 100644
index d7a8c01cc862..000000000000
--- a/kde-base/kdesdk-scripts/kdesdk-scripts-4.7.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-scripts/kdesdk-scripts-4.7.1.ebuild,v 1.1 2011/09/07 20:13:39 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdesdk"
-KMMODULE="scripts"
-inherit kde4-meta
-
-DESCRIPTION="KDE SDK Scripts"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	app-arch/advancecomp
-	media-gfx/optipng
-"
-
-src_prepare() {
-	# bug 275069
-	sed -ie 's:colorsvn::' scripts/CMakeLists.txt || die
-
-	kde4-meta_src_prepare
-}
diff --git a/kde-base/kdesdk-strigi-analyzer/ChangeLog b/kde-base/kdesdk-strigi-analyzer/ChangeLog
index c23fc5ea24e3..7ed316ecf634 100644
--- a/kde-base/kdesdk-strigi-analyzer/ChangeLog
+++ b/kde-base/kdesdk-strigi-analyzer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdesdk-strigi-analyzer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-strigi-analyzer/ChangeLog,v 1.80 2011/10/15 17:25:51 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-strigi-analyzer/ChangeLog,v 1.81 2011/10/28 19:03:20 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdesdk-strigi-analyzer-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdesdk-strigi-analyzer-4.7.0.ebuild:
diff --git a/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.7.1.ebuild b/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.7.1.ebuild
deleted file mode 100644
index 39e67e01948b..000000000000
--- a/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.7.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.7.1.ebuild,v 1.1 2011/09/07 20:13:52 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kdesdk"
-KMMODULE="strigi-analyzer"
-inherit kde4-meta
-
-DESCRIPTION="kdesdk: strigi plugins"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	app-misc/strigi
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/kdesu/ChangeLog b/kde-base/kdesu/ChangeLog
index a7bb6acc2dd9..12c21c1d2708 100644
--- a/kde-base/kdesu/ChangeLog
+++ b/kde-base/kdesu/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kdesu
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesu/ChangeLog,v 1.191 2011/10/15 17:26:04 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesu/ChangeLog,v 1.192 2011/10/28 19:03:33 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kdesu-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kdesu-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kdesu/kdesu-4.7.1.ebuild b/kde-base/kdesu/kdesu-4.7.1.ebuild
deleted file mode 100644
index a849bca8fa47..000000000000
--- a/kde-base/kdesu/kdesu-4.7.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesu/kdesu-4.7.1.ebuild,v 1.1 2011/09/07 20:13:51 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-# FIXME: Is default command ( su/sudo ) still configurable,
-# if not, USE-flag ?
-DESCRIPTION="KDE: gui for su(1)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-src_configure() {
-	# Upstream moved kdesu to libexec first, then decided to move it back
-	# to /${PREFIX}/bin/ , so I'm doing that now already.
-	sed -e '/kdesu_executable/s:LIBEXEC_INSTALL_DIR:BIN_INSTALL_DIR:' \
-		-i "${S}"/kdesu/kdesu/CMakeLists.txt || \
-		die "Moving kdesu from libexec to bin failed."
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kdetoys-meta/ChangeLog b/kde-base/kdetoys-meta/ChangeLog
index 43c9f64b9199..f381bf896170 100644
--- a/kde-base/kdetoys-meta/ChangeLog
+++ b/kde-base/kdetoys-meta/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdetoys-meta
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys-meta/ChangeLog,v 1.187 2011/10/15 17:25:58 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys-meta/ChangeLog,v 1.188 2011/10/28 19:03:27 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdetoys-meta-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdetoys-meta-4.7.0.ebuild:
diff --git a/kde-base/kdetoys-meta/kdetoys-meta-4.7.1.ebuild b/kde-base/kdetoys-meta/kdetoys-meta-4.7.1.ebuild
deleted file mode 100644
index 48a98c2e6c66..000000000000
--- a/kde-base/kdetoys-meta/kdetoys-meta-4.7.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys-meta/kdetoys-meta-4.7.1.ebuild,v 1.1 2011/09/07 20:13:46 alexxy Exp $
-
-EAPI=4
-inherit kde4-meta-pkg
-
-DESCRIPTION="KDE toys - merge this to pull in all kdetoys-derived packages"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	$(add_kdebase_dep amor)
-	$(add_kdebase_dep kteatime)
-	$(add_kdebase_dep ktux)
-"
diff --git a/kde-base/kdeutils-meta/ChangeLog b/kde-base/kdeutils-meta/ChangeLog
index af350a2d6e7f..08ae9cead22c 100644
--- a/kde-base/kdeutils-meta/ChangeLog
+++ b/kde-base/kdeutils-meta/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdeutils-meta
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils-meta/ChangeLog,v 1.189 2011/10/15 17:26:02 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils-meta/ChangeLog,v 1.190 2011/10/28 19:03:33 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdeutils-meta-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdeutils-meta-4.7.0.ebuild:
diff --git a/kde-base/kdeutils-meta/kdeutils-meta-4.7.1.ebuild b/kde-base/kdeutils-meta/kdeutils-meta-4.7.1.ebuild
deleted file mode 100644
index 5914ca2a00c3..000000000000
--- a/kde-base/kdeutils-meta/kdeutils-meta-4.7.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils-meta/kdeutils-meta-4.7.1.ebuild,v 1.1 2011/09/07 20:13:42 alexxy Exp $
-
-EAPI=4
-inherit kde4-meta-pkg
-
-DESCRIPTION="kdeutils - merge this to pull in all kdeutils-derived packages"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cups floppy"
-
-RDEPEND="
-	$(add_kdebase_dep ark)
-	$(add_kdebase_dep filelight)
-	$(add_kdebase_dep kcalc)
-	$(add_kdebase_dep kcharselect)
-	$(add_kdebase_dep kdf)
-	$(add_kdebase_dep kgpg)
-	$(add_kdebase_dep kremotecontrol)
-	$(add_kdebase_dep ktimer)
-	$(add_kdebase_dep kwallet)
-	$(add_kdebase_dep superkaramba)
-	$(add_kdebase_dep sweeper)
-	cups? ( $(add_kdebase_dep printer-applet) )
-	floppy? ( $(add_kdebase_dep kfloppy) )
-"
diff --git a/kde-base/kdewebdev-meta/ChangeLog b/kde-base/kdewebdev-meta/ChangeLog
index d877e135d20a..29d189a790af 100644
--- a/kde-base/kdewebdev-meta/ChangeLog
+++ b/kde-base/kdewebdev-meta/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdewebdev-meta
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev-meta/ChangeLog,v 1.172 2011/10/15 17:26:15 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev-meta/ChangeLog,v 1.173 2011/10/28 19:03:33 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdewebdev-meta-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdewebdev-meta-4.7.0.ebuild:
diff --git a/kde-base/kdewebdev-meta/kdewebdev-meta-4.7.1.ebuild b/kde-base/kdewebdev-meta/kdewebdev-meta-4.7.1.ebuild
deleted file mode 100644
index 2f88742b3e0e..000000000000
--- a/kde-base/kdewebdev-meta/kdewebdev-meta-4.7.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev-meta/kdewebdev-meta-4.7.1.ebuild,v 1.1 2011/09/07 20:13:57 alexxy Exp $
-
-EAPI=4
-inherit kde4-meta-pkg
-
-DESCRIPTION="KDE WebDev - merge this to pull in all kdewebdev-derived packages"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	$(add_kdebase_dep kfilereplace)
-	$(add_kdebase_dep kimagemapeditor)
-	$(add_kdebase_dep klinkstatus)
-	$(add_kdebase_dep kommander)
-"
diff --git a/kde-base/kdf/ChangeLog b/kde-base/kdf/ChangeLog
index 2d47a4f9b3c0..633f237e9058 100644
--- a/kde-base/kdf/ChangeLog
+++ b/kde-base/kdf/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kdf
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdf/ChangeLog,v 1.181 2011/10/15 17:25:59 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdf/ChangeLog,v 1.182 2011/10/28 19:03:28 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kdf-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kdf-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kdf/kdf-4.7.1.ebuild b/kde-base/kdf/kdf-4.7.1.ebuild
deleted file mode 100644
index 33bbf052d63e..000000000000
--- a/kde-base/kdf/kdf-4.7.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdf/kdf-4.7.1.ebuild,v 1.1 2011/09/07 20:13:55 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeutils"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
-
-DESCRIPTION="KDE free disk space utility"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-src_unpack() {
-	${kde_eclass}_src_unpack
-}
diff --git a/kde-base/kdialog/ChangeLog b/kde-base/kdialog/ChangeLog
index 2cd9b4ca1756..328bf39a3f1f 100644
--- a/kde-base/kdialog/ChangeLog
+++ b/kde-base/kdialog/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kdialog
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdialog/ChangeLog,v 1.183 2011/10/15 17:26:04 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdialog/ChangeLog,v 1.184 2011/10/28 19:03:33 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kdialog-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kdialog-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kdialog/kdialog-4.7.1.ebuild b/kde-base/kdialog/kdialog-4.7.1.ebuild
deleted file mode 100644
index cacc6d8ea992..000000000000
--- a/kde-base/kdialog/kdialog-4.7.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdialog/kdialog-4.7.1.ebuild,v 1.1 2011/09/07 20:13:50 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-baseapps"
-inherit kde4-meta
-
-DESCRIPTION="KDialog can be used to show nice dialog boxes from shell scripts"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kdiamond/ChangeLog b/kde-base/kdiamond/ChangeLog
index 0d92e4abb5b8..46bc2d6010af 100644
--- a/kde-base/kdiamond/ChangeLog
+++ b/kde-base/kdiamond/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdiamond
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdiamond/ChangeLog,v 1.81 2011/10/15 17:26:06 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdiamond/ChangeLog,v 1.82 2011/10/28 19:03:35 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdiamond-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdiamond-4.7.0.ebuild:
diff --git a/kde-base/kdiamond/kdiamond-4.7.1.ebuild b/kde-base/kdiamond/kdiamond-4.7.1.ebuild
deleted file mode 100644
index eb83bb69c0c3..000000000000
--- a/kde-base/kdiamond/kdiamond-4.7.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdiamond/kdiamond-4.7.1.ebuild,v 1.1 2011/09/07 20:14:00 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE: KDiamond is a three-in-a-row game."
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog
index 04b34280895a..2809ecf2f820 100644
--- a/kde-base/kdm/ChangeLog
+++ b/kde-base/kdm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kdm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.265 2011/10/28 18:30:18 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.266 2011/10/28 19:03:41 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kdm-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kdm-4.7.2.ebuild:
   Remove old
diff --git a/kde-base/kdm/kdm-4.7.1.ebuild b/kde-base/kdm/kdm-4.7.1.ebuild
deleted file mode 100644
index 2a96bb8838bb..000000000000
--- a/kde-base/kdm/kdm-4.7.1.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.7.1.ebuild,v 1.1 2011/09/07 20:14:01 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-workspace"
-inherit kde4-meta flag-o-matic
-
-DESCRIPTION="KDE login manager, similar to xdm and gdm"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="+consolekit debug kerberos pam"
-
-DEPEND="
-	$(add_kdebase_dep libkworkspace)
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libXtst
-	consolekit? (
-		>=sys-apps/dbus-1.0.2
-		sys-auth/consolekit
-	)
-	kerberos? ( virtual/krb5 )
-	pam? (
-		$(add_kdebase_dep kcheckpass)
-		virtual/pam
-	)
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdepasswd)
-	>=x11-apps/xinit-1.0.5-r2
-	x11-apps/xmessage
-"
-
-add_blocker systemsettings '<4.5.80'
-
-KMEXTRA="
-	libs/kdm/
-"
-
-PATCHES=(
-	"${FILESDIR}/kdebase-4.0.2-pam-optional.patch"
-	"${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch"
-)
-
-pkg_setup() {
-	kde4-meta_pkg_setup
-
-	# Create kdm:kdm user
-	KDM_HOME=/var/lib/kdm
-	enewgroup kdm
-	enewuser kdm -1 -1 "${KDM_HOME}" kdm
-}
-
-src_configure() {
-	# genkdmconf breaks with -O3
-	# last checked in 4.2.95
-	replace-flags -O3 -O2
-
-	mycmakeargs=(
-		$(cmake-utils_use kerberos KDE4_KRB5AUTH)
-		$(cmake-utils_use_with pam)
-		$(cmake-utils_use_with consolekit CkConnector)
-	)
-
-	kde4-meta_src_configure
-}
-
-src_install() {
-	export GENKDMCONF_FLAGS="--no-old --no-backup"
-
-	kde4-meta_src_install
-
-	# Customize the kdmrc configuration:
-	# - SessionDirs set to /usr/share/xsessions
-	# - increase server timeout to 30s
-	# - TerminateServer=true to workaround X server regen bug, bug 278473
-	# - DataDir set to /var/lib/kdm
-	# - FaceDir set to /var/lib/kdm/faces
-	sed -e "s|^.*SessionsDirs=.*$|#&\nSessionsDirs=${EPREFIX}/usr/share/apps/kdm/sessions,${EPREFIX}/usr/share/xsessions|" \
-		-e "/#ServerTimeout=/s/^.*$/ServerTimeout=30/" \
-		-e "/#TerminateServer=/s/^.*$/TerminateServer=true/" \
-		-e "s|^.*DataDir=.*$|#&\nDataDir=${EPREFIX}${KDM_HOME}|" \
-		-e "s|^.*FaceDir=.*$|#&\nFaceDir=${EPREFIX}${KDM_HOME}/faces|" \
-		-i "${ED}"/usr/share/config/kdm/kdmrc \
-		|| die "Failed to set ServerTimeout and SessionsDirs correctly in kdmrc."
-
-	# Don't install empty dir
-	rmdir "${ED}"/usr/share/config/kdm/sessions
-
-	# Set up permissions to kdm work directory
-	keepdir "${KDM_HOME}"
-	fowners root:kdm "${KDM_HOME}"
-	fperms 1770 "${KDM_HOME}"
-
-	# install logrotate file
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/kdm-logrotate kdm
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-
-	local file src dest dir old_dirs=(
-		/var/lib/kdm-live
-		/var/lib/kdm-4.6
-		/var/lib/kdm-4.5
-		/var/lib/kdm-4.4
-		/usr/share/apps/kdm
-		/usr/kde/4.4/share/apps/kdm
-		/usr/kde/4.3/share/apps/kdm
-		/usr/kde/4.2/share/apps/kdm
-	)
-
-	mkdir -p "${EROOT}${KDM_HOME}/faces"
-	# Set the default kdm face icon if it's not already set by the system admin
-	# because this is user-overrideable in that way, it's not in src_install
-	for file in faces/.default.face.icon:default1.png faces/root.face.icon:root1.png kdmsts: ; do
-		src=${file#*:}
-		dest=${file%:*}
-		if [[ ! -e ${EROOT}${KDM_HOME}/$dest ]]; then
-			for dir in "${old_dirs[@]}"; do
-				if [[ -e ${EROOT}${dir}/${dest} ]]; then
-					cp "${EROOT}${dir}/${dest}" "${EROOT}${KDM_HOME}/${dest}"
-					break 2
-				fi
-			done
-			if [[ -n ${src} ]]; then
-				cp "${EROOT}/usr/share/apps/kdm/pics/users/${src}" \
-					"${EROOT}${KDM_HOME}/${dest}"
-			fi
-		fi
-	done
-	for dir in "${old_dirs[@]}"; do
-		if [[ ${dir} != /usr/* && -d ${EROOT}${dir} ]]; then
-			echo
-			elog "The directory ${EROOT%/}${dir} still exists from an older installation of KDE."
-			elog "You may wish to copy relevant settings into ${EROOT%/}${KDM_HOME}."
-			echo
-			elog "After doing so, you may delete the directory."
-			echo
-		fi
-	done
-
-	# Make sure permissions are correct -- old installations may have
-	# gotten this wrong
-	use prefix || chown root:kdm "${EROOT}${KDM_HOME}"
-	chmod 1770 "${EROOT}${KDM_HOME}"
-
-	if use consolekit; then
-		echo
-		elog "You have compiled 'kdm' with consolekit support. If you want to use kdm,"
-		elog "make sure consolekit daemon is running and started at login time"
-		elog
-		elog "rc-update add consolekit default && /etc/init.d/consolekit start"
-		echo
-	fi
-}
diff --git a/kde-base/kdnssd/ChangeLog b/kde-base/kdnssd/ChangeLog
index 8f84ec6839a8..8e6774871a54 100644
--- a/kde-base/kdnssd/ChangeLog
+++ b/kde-base/kdnssd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kdnssd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdnssd/ChangeLog,v 1.194 2011/10/15 17:25:55 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdnssd/ChangeLog,v 1.195 2011/10/28 19:03:24 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kdnssd-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kdnssd-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kdnssd/kdnssd-4.7.1.ebuild b/kde-base/kdnssd/kdnssd-4.7.1.ebuild
deleted file mode 100644
index 2d6722c31d96..000000000000
--- a/kde-base/kdnssd/kdnssd-4.7.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdnssd/kdnssd-4.7.1.ebuild,v 1.1 2011/09/07 20:13:48 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kdenetwork"
-inherit kde4-meta
-
-DESCRIPTION="A DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug zeroconf"
-
-DEPEND="
-	zeroconf? ( $(add_kdebase_dep kdelibs zeroconf) )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	mycmakeargs=(-DWITH_Xmms=OFF -DWITH_DNSSD=ON)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kdontchangethehostname/ChangeLog b/kde-base/kdontchangethehostname/ChangeLog
index 9356f2f7a392..e015714ec72d 100644
--- a/kde-base/kdontchangethehostname/ChangeLog
+++ b/kde-base/kdontchangethehostname/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdontchangethehostname
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdontchangethehostname/ChangeLog,v 1.31 2011/10/15 17:26:12 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdontchangethehostname/ChangeLog,v 1.32 2011/10/28 19:03:36 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdontchangethehostname-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdontchangethehostname-4.7.0.ebuild:
diff --git a/kde-base/kdontchangethehostname/kdontchangethehostname-4.7.1.ebuild b/kde-base/kdontchangethehostname/kdontchangethehostname-4.7.1.ebuild
deleted file mode 100644
index a4c7335e9dec..000000000000
--- a/kde-base/kdontchangethehostname/kdontchangethehostname-4.7.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdontchangethehostname/kdontchangethehostname-4.7.1.ebuild,v 1.1 2011/09/07 20:14:08 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="Tool to inform KDE about a change in hostname"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	x11-apps/xauth
-"
-
-# moved from kdelibs
-add_blocker kdelibs 4.4.68
diff --git a/kde-base/keditbookmarks/ChangeLog b/kde-base/keditbookmarks/ChangeLog
index c07785bbab84..1542b22858af 100644
--- a/kde-base/keditbookmarks/ChangeLog
+++ b/kde-base/keditbookmarks/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/keditbookmarks
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/keditbookmarks/ChangeLog,v 1.96 2011/10/15 17:25:59 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/keditbookmarks/ChangeLog,v 1.97 2011/10/28 19:03:29 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -keditbookmarks-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -keditbookmarks-4.7.0.ebuild:
diff --git a/kde-base/keditbookmarks/keditbookmarks-4.7.1.ebuild b/kde-base/keditbookmarks/keditbookmarks-4.7.1.ebuild
deleted file mode 100644
index a92f7d86934d..000000000000
--- a/kde-base/keditbookmarks/keditbookmarks-4.7.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/keditbookmarks/keditbookmarks-4.7.1.ebuild,v 1.1 2011/09/07 20:13:55 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-baseapps"
-inherit kde4-meta
-
-DESCRIPTION="KDE's bookmarks editor"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep libkonq)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	lib/konq/
-"
diff --git a/kde-base/keditfiletype/ChangeLog b/kde-base/keditfiletype/ChangeLog
index 819f6c74a361..3607a546fde9 100644
--- a/kde-base/keditfiletype/ChangeLog
+++ b/kde-base/keditfiletype/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/keditfiletype
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/keditfiletype/ChangeLog,v 1.71 2011/10/15 17:25:48 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/keditfiletype/ChangeLog,v 1.72 2011/10/28 19:03:18 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -keditfiletype-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -keditfiletype-4.7.0.ebuild:
diff --git a/kde-base/keditfiletype/keditfiletype-4.7.1.ebuild b/kde-base/keditfiletype/keditfiletype-4.7.1.ebuild
deleted file mode 100644
index b8c21f045510..000000000000
--- a/kde-base/keditfiletype/keditfiletype-4.7.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/keditfiletype/keditfiletype-4.7.1.ebuild,v 1.1 2011/09/07 20:13:38 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KDE mime/file type assocciation editor"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-# test fails, last checked for 4.2.89
-RESTRICT=test
-
-# @Since 4.2.68 - split from konqueror
-add_blocker konqueror 4.2.67
diff --git a/kde-base/kephal/ChangeLog b/kde-base/kephal/ChangeLog
index 150cdb4331dd..c062d00b60a2 100644
--- a/kde-base/kephal/ChangeLog
+++ b/kde-base/kephal/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kephal
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kephal/ChangeLog,v 1.82 2011/10/15 17:25:57 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kephal/ChangeLog,v 1.83 2011/10/28 19:03:47 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kephal-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kephal-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kephal/kephal-4.7.1.ebuild b/kde-base/kephal/kephal-4.7.1.ebuild
deleted file mode 100644
index 70b8631d8109..000000000000
--- a/kde-base/kephal/kephal-4.7.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kephal/kephal-4.7.1.ebuild,v 1.1 2011/09/07 20:14:04 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-KMMODULE="libs/kephal"
-inherit kde4-meta
-
-DESCRIPTION="Allows handling of multihead systems via the XRandR extension"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	x11-libs/libxkbfile
-	x11-libs/libXrandr
-"
-DEPEND="${RDEPEND}
-	x11-proto/randrproto
-"
diff --git a/kde-base/kfile/ChangeLog b/kde-base/kfile/ChangeLog
index d17eca2c2860..331795675312 100644
--- a/kde-base/kfile/ChangeLog
+++ b/kde-base/kfile/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kfile
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfile/ChangeLog,v 1.97 2011/10/15 17:25:48 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfile/ChangeLog,v 1.98 2011/10/28 19:03:18 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kfile-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kfile-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kfile/kfile-4.7.1.ebuild b/kde-base/kfile/kfile-4.7.1.ebuild
deleted file mode 100644
index e9b9b567f03a..000000000000
--- a/kde-base/kfile/kfile-4.7.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfile/kfile-4.7.1.ebuild,v 1.1 2011/09/07 20:13:51 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="A commandline frontend to KFileMetaInfo"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kfilereplace/ChangeLog b/kde-base/kfilereplace/ChangeLog
index c15654dde233..2d722daacf12 100644
--- a/kde-base/kfilereplace/ChangeLog
+++ b/kde-base/kfilereplace/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kfilereplace
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfilereplace/ChangeLog,v 1.180 2011/10/15 17:26:02 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfilereplace/ChangeLog,v 1.181 2011/10/28 19:03:31 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kfilereplace-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kfilereplace-4.7.0.ebuild:
diff --git a/kde-base/kfilereplace/kfilereplace-4.7.1.ebuild b/kde-base/kfilereplace/kfilereplace-4.7.1.ebuild
deleted file mode 100644
index 2ee5489bd3f6..000000000000
--- a/kde-base/kfilereplace/kfilereplace-4.7.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfilereplace/kfilereplace-4.7.1.ebuild,v 1.1 2011/09/07 20:13:56 alexxy Exp $
-
-EAPI=4
-KDE_HANDBOOK="optional"
-KMNAME="kdewebdev"
-inherit kde4-meta
-
-DESCRIPTION="KDE web development - powerful search and replace in multiple files"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kfind/ChangeLog b/kde-base/kfind/ChangeLog
index 100b779bc5aa..c5a8819c53b4 100644
--- a/kde-base/kfind/ChangeLog
+++ b/kde-base/kfind/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kfind
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfind/ChangeLog,v 1.194 2011/10/15 17:26:13 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfind/ChangeLog,v 1.195 2011/10/28 19:03:44 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kfind-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kfind-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kfind/kfind-4.7.1.ebuild b/kde-base/kfind/kfind-4.7.1.ebuild
deleted file mode 100644
index f7a282ec35c8..000000000000
--- a/kde-base/kfind/kfind-4.7.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfind/kfind-4.7.1.ebuild,v 1.1 2011/09/07 20:13:39 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-baseapps"
-inherit kde4-meta
-
-DESCRIPTION="KDE file finder utility"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep libkonq)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/kfloppy/ChangeLog b/kde-base/kfloppy/ChangeLog
index 5052764e888f..f05fb7005ab9 100644
--- a/kde-base/kfloppy/ChangeLog
+++ b/kde-base/kfloppy/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kfloppy
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfloppy/ChangeLog,v 1.175 2011/10/15 17:26:05 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfloppy/ChangeLog,v 1.176 2011/10/28 19:03:34 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kfloppy-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kfloppy-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kfloppy/kfloppy-4.7.1.ebuild b/kde-base/kfloppy/kfloppy-4.7.1.ebuild
deleted file mode 100644
index 449d04731761..000000000000
--- a/kde-base/kfloppy/kfloppy-4.7.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfloppy/kfloppy-4.7.1.ebuild,v 1.1 2011/09/07 20:14:08 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeutils"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
-
-DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kfmclient/ChangeLog b/kde-base/kfmclient/ChangeLog
index fe32909e2f82..013c05feb1f8 100644
--- a/kde-base/kfmclient/ChangeLog
+++ b/kde-base/kfmclient/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kfmclient
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfmclient/ChangeLog,v 1.67 2011/10/15 17:25:47 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfmclient/ChangeLog,v 1.68 2011/10/28 19:03:17 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kfmclient-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kfmclient-4.7.0.ebuild:
diff --git a/kde-base/kfmclient/kfmclient-4.7.1.ebuild b/kde-base/kfmclient/kfmclient-4.7.1.ebuild
deleted file mode 100644
index 4b960de9b098..000000000000
--- a/kde-base/kfmclient/kfmclient-4.7.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfmclient/kfmclient-4.7.1.ebuild,v 1.1 2011/09/07 20:14:02 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-baseapps"
-KMMODULE="konqueror/client"
-inherit kde4-meta
-
-DESCRIPTION="KDE tool for opening URLs from the command line"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-# Moved from kde-base/konqueror in 4.3.65-r1
-add_blocker konqueror 4.3.65
-
-KMEXTRACTONLY="
-	konqueror/kfmclient.desktop
-	konqueror/kfmclient_dir.desktop
-	konqueror/kfmclient_html.desktop
-	konqueror/kfmclient_war.desktop
-	konqueror/src/org.kde.Konqueror.Main.xml
-	konqueror/src/org.kde.Konqueror.MainWindow.xml
-"
-
-src_prepare() {
-	kde4-meta_src_prepare
-
-	# Do not install non-kfmclient *.desktop files
-	sed -e "/konqbrowser\.desktop/d" \
-		-e "/konqueror\.desktop/s/^/#DONOTWANT/" \
-		-e "/install(FILES profile/s/^/#DONOTWANT/" \
-		-i konqueror/CMakeLists.txt \
-		|| die "Failed to omit .desktop files"
-}
diff --git a/kde-base/kfourinline/ChangeLog b/kde-base/kfourinline/ChangeLog
index 7d0bdcfed3c1..82bf085a48b6 100644
--- a/kde-base/kfourinline/ChangeLog
+++ b/kde-base/kfourinline/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kfourinline
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfourinline/ChangeLog,v 1.92 2011/10/15 17:25:49 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfourinline/ChangeLog,v 1.93 2011/10/28 19:03:45 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kfourinline-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kfourinline-4.7.0.ebuild:
diff --git a/kde-base/kfourinline/kfourinline-4.7.1.ebuild b/kde-base/kfourinline/kfourinline-4.7.1.ebuild
deleted file mode 100644
index 7445adb15b68..000000000000
--- a/kde-base/kfourinline/kfourinline-4.7.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfourinline/kfourinline-4.7.1.ebuild,v 1.1 2011/09/07 20:13:40 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE four-in-a-row game."
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kgamma/ChangeLog b/kde-base/kgamma/ChangeLog
index 8b9cb901b4fc..07de53235873 100644
--- a/kde-base/kgamma/ChangeLog
+++ b/kde-base/kgamma/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kgamma
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgamma/ChangeLog,v 1.186 2011/10/15 17:25:50 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgamma/ChangeLog,v 1.187 2011/10/28 19:03:20 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kgamma-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kgamma-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kgamma/kgamma-4.7.1.ebuild b/kde-base/kgamma/kgamma-4.7.1.ebuild
deleted file mode 100644
index 3f4f9784e4f2..000000000000
--- a/kde-base/kgamma/kgamma-4.7.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgamma/kgamma-4.7.1.ebuild,v 1.1 2011/09/07 20:14:03 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-
-inherit kde4-base
-
-DESCRIPTION="KDE screen gamma values kcontrol module"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	x11-libs/libXxf86vm
-"
-DEPEND="${RDEPEND}
-	x11-proto/xf86vidmodeproto
-"
diff --git a/kde-base/kgeography/ChangeLog b/kde-base/kgeography/ChangeLog
index d12ec4db4401..ef1f1566f3a7 100644
--- a/kde-base/kgeography/ChangeLog
+++ b/kde-base/kgeography/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kgeography
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgeography/ChangeLog,v 1.157 2011/10/15 17:26:15 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgeography/ChangeLog,v 1.158 2011/10/28 19:03:47 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kgeography-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kgeography-4.7.0.ebuild:
diff --git a/kde-base/kgeography/kgeography-4.7.1.ebuild b/kde-base/kgeography/kgeography-4.7.1.ebuild
deleted file mode 100644
index 389198428770..000000000000
--- a/kde-base/kgeography/kgeography-4.7.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgeography/kgeography-4.7.1.ebuild,v 1.1 2011/09/07 20:13:58 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE: a geography learning tool"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kget/ChangeLog b/kde-base/kget/ChangeLog
index 4477f3f19233..e5f6667119f8 100644
--- a/kde-base/kget/ChangeLog
+++ b/kde-base/kget/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kget
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/ChangeLog,v 1.204 2011/10/15 17:25:58 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/ChangeLog,v 1.205 2011/10/28 19:03:28 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kget-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kget-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kget/kget-4.7.1.ebuild b/kde-base/kget/kget-4.7.1.ebuild
deleted file mode 100644
index 7920f8b8c385..000000000000
--- a/kde-base/kget/kget-4.7.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/kget-4.7.1.ebuild,v 1.1 2011/09/07 20:13:55 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdenetwork"
-inherit kde4-meta
-
-DESCRIPTION="An advanced download manager for KDE"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug bittorrent mms semantic-desktop sqlite webkit"
-
-RDEPEND="
-	app-crypt/qca:2
-	$(add_kdebase_dep kdelibs 'semantic-desktop=')
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep libkonq)
-	$(add_kdebase_dep libkworkspace)
-	$(add_kdebase_dep solid)
-	bittorrent? ( >=net-libs/libktorrent-1.0.3 )
-	mms? ( media-libs/libmms )
-	sqlite? ( dev-db/sqlite:3 )
-	webkit? ( >=kde-misc/kwebkitpart-0.9.6 )
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with bittorrent KTorrent)
-		$(cmake-utils_use_with mms LibMms)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with sqlite)
-		$(cmake-utils_use_with webkit KWebKitPart)
-	)
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kglobalaccel/ChangeLog b/kde-base/kglobalaccel/ChangeLog
index 68c84c17d809..1d79fcd42a46 100644
--- a/kde-base/kglobalaccel/ChangeLog
+++ b/kde-base/kglobalaccel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kglobalaccel
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kglobalaccel/ChangeLog,v 1.72 2011/10/15 17:26:07 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kglobalaccel/ChangeLog,v 1.73 2011/10/28 19:03:36 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kglobalaccel-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kglobalaccel-4.7.0.ebuild:
diff --git a/kde-base/kglobalaccel/kglobalaccel-4.7.1.ebuild b/kde-base/kglobalaccel/kglobalaccel-4.7.1.ebuild
deleted file mode 100644
index 5834f9ceb5f1..000000000000
--- a/kde-base/kglobalaccel/kglobalaccel-4.7.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kglobalaccel/kglobalaccel-4.7.1.ebuild,v 1.1 2011/09/07 20:13:57 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KDE's Global Shortcut Daemon"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-# Module renamed upstream
-add_blocker kdedglobalaccel
-
-src_configure() {
-	mycmakeargs=(
-		-DKDEBASE_KGLOBALACCEL_REMOVE_OBSOLETE_KDED_DESKTOP_FILE=NOTFOUND
-		-DKDEBASE_KGLOBALACCEL_REMOVE_OBSOLETE_KDED_PLUGIN=NOTFOUND
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kgoldrunner/ChangeLog b/kde-base/kgoldrunner/ChangeLog
index f338436c30f8..b0a0e8950cee 100644
--- a/kde-base/kgoldrunner/ChangeLog
+++ b/kde-base/kgoldrunner/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kgoldrunner
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgoldrunner/ChangeLog,v 1.184 2011/10/15 17:26:01 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgoldrunner/ChangeLog,v 1.185 2011/10/28 19:03:30 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kgoldrunner-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kgoldrunner-4.7.0.ebuild:
diff --git a/kde-base/kgoldrunner/kgoldrunner-4.7.1.ebuild b/kde-base/kgoldrunner/kgoldrunner-4.7.1.ebuild
deleted file mode 100644
index 51462d04915d..000000000000
--- a/kde-base/kgoldrunner/kgoldrunner-4.7.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgoldrunner/kgoldrunner-4.7.1.ebuild,v 1.1 2011/09/07 20:13:52 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE: KGoldrunner is a game of action and puzzle solving"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	media-libs/libsndfile
-	media-libs/openal
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/kgpg/ChangeLog b/kde-base/kgpg/ChangeLog
index 8f15b79d53d2..e4e6c075d45c 100644
--- a/kde-base/kgpg/ChangeLog
+++ b/kde-base/kgpg/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kgpg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgpg/ChangeLog,v 1.192 2011/10/15 17:26:15 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgpg/ChangeLog,v 1.193 2011/10/28 19:03:46 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kgpg-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kgpg-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kgpg/kgpg-4.7.1.ebuild b/kde-base/kgpg/kgpg-4.7.1.ebuild
deleted file mode 100644
index 985763728eda..000000000000
--- a/kde-base/kgpg/kgpg-4.7.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgpg/kgpg-4.7.1.ebuild,v 1.1 2011/09/07 20:13:50 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeutils"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
-
-DESCRIPTION="KDE gpg keyring manager"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-"
-RDEPEND="${DEPEND}
-	app-crypt/gnupg
-"
-
-pkg_postinst() {
-	${kde_eclass}_pkg_postinst
-
-	if ! has_version app-crypt/dirmngr ; then
-		elog "For improved key search functionality, install app-crypt/dirmngr."
-	fi
-}
diff --git a/kde-base/khangman/ChangeLog b/kde-base/khangman/ChangeLog
index 966f519b866c..ebf02ad45763 100644
--- a/kde-base/khangman/ChangeLog
+++ b/kde-base/khangman/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/khangman
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/khangman/ChangeLog,v 1.189 2011/10/15 17:26:07 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khangman/ChangeLog,v 1.190 2011/10/28 19:03:16 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -khangman-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -khangman-4.7.0.ebuild:
diff --git a/kde-base/khangman/khangman-4.7.1.ebuild b/kde-base/khangman/khangman-4.7.1.ebuild
deleted file mode 100644
index bfdb2de7a73e..000000000000
--- a/kde-base/khangman/khangman-4.7.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/khangman/khangman-4.7.1.ebuild,v 1.1 2011/09/07 20:13:40 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="Classical hangman game for KDE"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep libkdeedu)
-"
diff --git a/kde-base/khelpcenter/ChangeLog b/kde-base/khelpcenter/ChangeLog
index 69ae027d2068..4c2b208aef9c 100644
--- a/kde-base/khelpcenter/ChangeLog
+++ b/kde-base/khelpcenter/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/khelpcenter
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/khelpcenter/ChangeLog,v 1.199 2011/10/15 17:25:52 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khelpcenter/ChangeLog,v 1.200 2011/10/28 19:03:22 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -khelpcenter-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -khelpcenter-4.7.0.ebuild:
diff --git a/kde-base/khelpcenter/khelpcenter-4.7.1.ebuild b/kde-base/khelpcenter/khelpcenter-4.7.1.ebuild
deleted file mode 100644
index e58ca9bee0f0..000000000000
--- a/kde-base/khelpcenter/khelpcenter-4.7.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/khelpcenter/khelpcenter-4.7.1.ebuild,v 1.1 2011/09/07 20:13:41 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="always"
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="The KDE Help Center"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	$(add_kdebase_dep kdesu)
-	>=www-misc/htdig-3.2.0_beta6-r1
-"
-
-KMEXTRA="
-	doc/documentationnotfound/
-	doc/glossary/
-	doc/onlinehelp/
-"
diff --git a/kde-base/khotkeys/ChangeLog b/kde-base/khotkeys/ChangeLog
index c4ed37268781..d3a19d4d35bc 100644
--- a/kde-base/khotkeys/ChangeLog
+++ b/kde-base/khotkeys/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/khotkeys
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/khotkeys/ChangeLog,v 1.195 2011/10/15 17:26:14 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khotkeys/ChangeLog,v 1.196 2011/10/28 19:03:46 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -khotkeys-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -khotkeys-4.7.0.ebuild:
diff --git a/kde-base/khotkeys/khotkeys-4.7.1.ebuild b/kde-base/khotkeys/khotkeys-4.7.1.ebuild
deleted file mode 100644
index a09b90773938..000000000000
--- a/kde-base/khotkeys/khotkeys-4.7.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/khotkeys/khotkeys-4.7.1.ebuild,v 1.1 2011/09/07 20:14:01 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="KDE: hotkey daemon"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep libkworkspace)
-	x11-libs/libXtst
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	libs/kworkspace/
-"
diff --git a/kde-base/kiconfinder/ChangeLog b/kde-base/kiconfinder/ChangeLog
index 352322dcf92b..6713b80dc6df 100644
--- a/kde-base/kiconfinder/ChangeLog
+++ b/kde-base/kiconfinder/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kiconfinder
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kiconfinder/ChangeLog,v 1.87 2011/10/15 17:25:50 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kiconfinder/ChangeLog,v 1.88 2011/10/28 19:03:19 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kiconfinder-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kiconfinder-4.7.0.ebuild:
diff --git a/kde-base/kiconfinder/kiconfinder-4.7.1.ebuild b/kde-base/kiconfinder/kiconfinder-4.7.1.ebuild
deleted file mode 100644
index ab73848e9545..000000000000
--- a/kde-base/kiconfinder/kiconfinder-4.7.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kiconfinder/kiconfinder-4.7.1.ebuild,v 1.1 2011/09/07 20:13:39 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="Finds an icon based on its name"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kig/ChangeLog b/kde-base/kig/ChangeLog
index b77ac2ae8576..4927a892e16f 100644
--- a/kde-base/kig/ChangeLog
+++ b/kde-base/kig/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kig
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/ChangeLog,v 1.193 2011/10/15 17:26:14 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/ChangeLog,v 1.194 2011/10/28 19:03:45 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kig-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kig-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kig/kig-4.7.1.ebuild b/kde-base/kig/kig-4.7.1.ebuild
deleted file mode 100644
index db6ec319b09f..000000000000
--- a/kde-base/kig/kig-4.7.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/kig-4.7.1.ebuild,v 1.1 2011/09/07 20:13:49 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE Interactive Geometry tool"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug kig-scripting"
-
-DEPEND="
-	kig-scripting? ( >=dev-libs/boost-1.32 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with kig-scripting BoostPython)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/kde-base/kigo/ChangeLog b/kde-base/kigo/ChangeLog
index df620dba2da1..9ff2ea000da2 100644
--- a/kde-base/kigo/ChangeLog
+++ b/kde-base/kigo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kigo
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kigo/ChangeLog,v 1.45 2011/10/15 17:25:50 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kigo/ChangeLog,v 1.46 2011/10/28 19:03:19 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kigo-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kigo-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kigo/kigo-4.7.1.ebuild b/kde-base/kigo/kigo-4.7.1.ebuild
deleted file mode 100644
index ed2a75943070..000000000000
--- a/kde-base/kigo/kigo-4.7.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kigo/kigo-4.7.1.ebuild,v 1.1 2011/09/07 20:13:54 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit games-ggz kde4-meta
-
-DESCRIPTION="KDE Go game"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	games-board/gnugo
-"
-
-src_install() {
-	kde4-meta_src_install
-	# and also we have to prepare the ggz dir
-	insinto "${GGZ_MODDIR}"
-	newins ${PN}/src/module.dsc ${P}.dsc
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-	games-ggz_pkg_postinst
-}
-
-pkg_postrm() {
-	kde4-meta_pkg_postrm
-	games-ggz_pkg_postrm
-}
diff --git a/kde-base/killbots/ChangeLog b/kde-base/killbots/ChangeLog
index 09fa38cbc423..031ffe5f33a5 100644
--- a/kde-base/killbots/ChangeLog
+++ b/kde-base/killbots/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/killbots
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/killbots/ChangeLog,v 1.79 2011/10/15 17:25:55 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/killbots/ChangeLog,v 1.80 2011/10/28 19:03:25 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -killbots-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -killbots-4.7.0.ebuild:
diff --git a/kde-base/killbots/killbots-4.7.1.ebuild b/kde-base/killbots/killbots-4.7.1.ebuild
deleted file mode 100644
index 1d6ad821c113..000000000000
--- a/kde-base/killbots/killbots-4.7.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/killbots/killbots-4.7.1.ebuild,v 1.1 2011/09/07 20:13:54 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="Kill the bots or they kill you!"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-# Tests hang, last checked in 4.3.3
-RESTRICT="test"
diff --git a/kde-base/kimagemapeditor/ChangeLog b/kde-base/kimagemapeditor/ChangeLog
index 6a6931d822e3..d9ce9e2f1d72 100644
--- a/kde-base/kimagemapeditor/ChangeLog
+++ b/kde-base/kimagemapeditor/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kimagemapeditor
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kimagemapeditor/ChangeLog,v 1.177 2011/10/15 17:26:14 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kimagemapeditor/ChangeLog,v 1.178 2011/10/28 19:03:45 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kimagemapeditor-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kimagemapeditor-4.7.0.ebuild:
diff --git a/kde-base/kimagemapeditor/kimagemapeditor-4.7.1.ebuild b/kde-base/kimagemapeditor/kimagemapeditor-4.7.1.ebuild
deleted file mode 100644
index 3b174789c278..000000000000
--- a/kde-base/kimagemapeditor/kimagemapeditor-4.7.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kimagemapeditor/kimagemapeditor-4.7.1.ebuild,v 1.1 2011/09/07 20:13:55 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdewebdev"
-inherit kde4-meta
-
-DESCRIPTION="KDE web development - image map editor"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kimono/ChangeLog b/kde-base/kimono/ChangeLog
index 4c25c001106b..70a13d8c0b6f 100644
--- a/kde-base/kimono/ChangeLog
+++ b/kde-base/kimono/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kimono
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kimono/ChangeLog,v 1.5 2011/10/15 17:26:03 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kimono/ChangeLog,v 1.6 2011/10/28 19:03:32 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kimono-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kimono-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kimono/kimono-4.7.1.ebuild b/kde-base/kimono/kimono-4.7.1.ebuild
deleted file mode 100644
index 728e937d5add..000000000000
--- a/kde-base/kimono/kimono-4.7.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kimono/kimono-4.7.1.ebuild,v 1.1 2011/09/07 20:13:45 alexxy Exp $
-
-EAPI=4
-
-KDE_SCM="git"
-inherit kde4-base mono
-
-DESCRIPTION="C# bindings for KDE"
-KEYWORDS="~amd64 ~x86"
-IUSE="akonadi debug plasma semantic-desktop"
-
-DEPEND="
-	dev-lang/mono
-	$(add_kdebase_dep qyoto 'webkit')
-	$(add_kdebase_dep smokeqt)
-	$(add_kdebase_dep smokekde 'akonadi?,semantic-desktop=')
-	plasma? ( $(add_kdebase_dep smokeqt 'webkit') )
-	semantic-desktop? ( >=dev-libs/soprano-2.6.51[clucene] )
-"
-RDEPEND="${DEPEND}"
-
-# Split from kdebindings-csharp in 4.7
-add_blocker kdebindings-csharp
-
-src_prepare() {
-	kde4-base_src_prepare
-
-	sed -i "/add_subdirectory( examples )/ s:^:#:" plasma/CMakeLists.txt
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with akonadi)
-		$(cmake-utils_use_with akonadi KdepimLibs)
-		$(cmake-utils_use_disable plasma)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-	)
-	kde4-base_src_configure
-}
diff --git a/kde-base/kinfocenter/ChangeLog b/kde-base/kinfocenter/ChangeLog
index 21e454623b4b..a29d957b1999 100644
--- a/kde-base/kinfocenter/ChangeLog
+++ b/kde-base/kinfocenter/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kinfocenter
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kinfocenter/ChangeLog,v 1.95 2011/10/15 17:25:55 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kinfocenter/ChangeLog,v 1.96 2011/10/28 19:03:25 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kinfocenter-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kinfocenter-4.7.0.ebuild:
diff --git a/kde-base/kinfocenter/kinfocenter-4.7.1.ebuild b/kde-base/kinfocenter/kinfocenter-4.7.1.ebuild
deleted file mode 100644
index 6193245dfd0f..000000000000
--- a/kde-base/kinfocenter/kinfocenter-4.7.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kinfocenter/kinfocenter-4.7.1.ebuild,v 1.1 2011/09/07 20:13:43 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-workspace"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="The KDE Info Center"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug ieee1394"
-
-DEPEND="
-	$(add_kdebase_dep solid)
-	sys-apps/pciutils
-	ieee1394? ( sys-libs/libraw1394 )
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-"
-RDEPEND="${DEPEND}
-	sys-apps/usbutils
-"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with ieee1394 RAW1394)
-		$(cmake-utils_use_with opengl OpenGL)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kioclient/ChangeLog b/kde-base/kioclient/ChangeLog
index 0dfcd7a70fbd..c51107247a5e 100644
--- a/kde-base/kioclient/ChangeLog
+++ b/kde-base/kioclient/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kioclient
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kioclient/ChangeLog,v 1.97 2011/10/15 17:25:57 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kioclient/ChangeLog,v 1.98 2011/10/28 19:03:26 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kioclient-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kioclient-4.7.0.ebuild:
diff --git a/kde-base/kioclient/kioclient-4.7.1.ebuild b/kde-base/kioclient/kioclient-4.7.1.ebuild
deleted file mode 100644
index 1580135abfce..000000000000
--- a/kde-base/kioclient/kioclient-4.7.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kioclient/kioclient-4.7.1.ebuild,v 1.1 2011/09/07 20:14:04 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="Command-line tool for network-transparent operations"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kiriki/ChangeLog b/kde-base/kiriki/ChangeLog
index b1bfbe4754ef..61501ede8e12 100644
--- a/kde-base/kiriki/ChangeLog
+++ b/kde-base/kiriki/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kiriki
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kiriki/ChangeLog,v 1.91 2011/10/15 17:26:00 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kiriki/ChangeLog,v 1.92 2011/10/28 19:03:46 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kiriki-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kiriki-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kiriki/kiriki-4.7.1.ebuild b/kde-base/kiriki/kiriki-4.7.1.ebuild
deleted file mode 100644
index 7789b0a73756..000000000000
--- a/kde-base/kiriki/kiriki-4.7.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kiriki/kiriki-4.7.1.ebuild,v 1.1 2011/09/07 20:14:05 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="Kiriki - a gtali clone for KDE4"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kiten/ChangeLog b/kde-base/kiten/ChangeLog
index 14a2a652b4ee..a2ce5476893b 100644
--- a/kde-base/kiten/ChangeLog
+++ b/kde-base/kiten/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kiten
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kiten/ChangeLog,v 1.184 2011/10/15 17:26:05 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kiten/ChangeLog,v 1.185 2011/10/28 19:03:35 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kiten-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kiten-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kiten/kiten-4.7.1.ebuild b/kde-base/kiten/kiten-4.7.1.ebuild
deleted file mode 100644
index 59529632bfc5..000000000000
--- a/kde-base/kiten/kiten-4.7.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kiten/kiten-4.7.1.ebuild,v 1.1 2011/09/07 20:13:46 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE Japanese dictionary and reference"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kjots/ChangeLog b/kde-base/kjots/ChangeLog
index 11317c5f7d49..9184569d88f1 100644
--- a/kde-base/kjots/ChangeLog
+++ b/kde-base/kjots/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kjots
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kjots/ChangeLog,v 1.184 2011/10/15 17:25:48 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kjots/ChangeLog,v 1.185 2011/10/28 19:03:17 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kjots-4.6.1.ebuild,
+  -kjots-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kjots-4.6.1.ebuild,
+  -kjots-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kjots-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kjots/kjots-4.6.1.ebuild b/kde-base/kjots/kjots-4.6.1.ebuild
deleted file mode 100644
index 6223709c8f3f..000000000000
--- a/kde-base/kjots/kjots-4.6.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kjots/kjots-4.6.1.ebuild,v 1.1 2011/07/11 14:01:18 tampakrap Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="KDE note taking utility"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	>=dev-libs/grantlee-0.1
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	akonadi_next/
-"
diff --git a/kde-base/kjots/kjots-4.7.1.ebuild b/kde-base/kjots/kjots-4.7.1.ebuild
deleted file mode 100644
index f0a3235e78b8..000000000000
--- a/kde-base/kjots/kjots-4.7.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kjots/kjots-4.7.1.ebuild,v 1.1 2011/09/07 20:14:06 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="KDE note taking utility"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	>=dev-libs/grantlee-0.1
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	akonadi_next/
-"
diff --git a/kde-base/kjumpingcube/ChangeLog b/kde-base/kjumpingcube/ChangeLog
index 86ef4df16853..6b66d4781d68 100644
--- a/kde-base/kjumpingcube/ChangeLog
+++ b/kde-base/kjumpingcube/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kjumpingcube
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kjumpingcube/ChangeLog,v 1.184 2011/10/15 17:25:59 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kjumpingcube/ChangeLog,v 1.185 2011/10/28 19:03:28 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kjumpingcube-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kjumpingcube-4.7.0.ebuild:
diff --git a/kde-base/kjumpingcube/kjumpingcube-4.7.1.ebuild b/kde-base/kjumpingcube/kjumpingcube-4.7.1.ebuild
deleted file mode 100644
index 6107ae04871c..000000000000
--- a/kde-base/kjumpingcube/kjumpingcube-4.7.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kjumpingcube/kjumpingcube-4.7.1.ebuild,v 1.1 2011/09/07 20:13:43 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE: Tactical one or two player game"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kleopatra/ChangeLog b/kde-base/kleopatra/ChangeLog
index a3cde3a2fee1..c142c6f6de53 100644
--- a/kde-base/kleopatra/ChangeLog
+++ b/kde-base/kleopatra/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kleopatra
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kleopatra/ChangeLog,v 1.89 2011/10/15 17:25:57 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kleopatra/ChangeLog,v 1.90 2011/10/28 19:03:27 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kleopatra-4.6.1.ebuild, -kleopatra-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kleopatra-4.6.1.ebuild, -kleopatra-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kleopatra-4.7.0.ebuild:
diff --git a/kde-base/kleopatra/kleopatra-4.6.1.ebuild b/kde-base/kleopatra/kleopatra-4.6.1.ebuild
deleted file mode 100644
index 289a033cffe7..000000000000
--- a/kde-base/kleopatra/kleopatra-4.6.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kleopatra/kleopatra-4.6.1.ebuild,v 1.1 2011/07/11 14:01:19 tampakrap Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="Kleopatra - KDE X.509 key manager"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	app-crypt/gpgme
-	dev-libs/boost
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}
-	app-crypt/gnupg
-"
-
-KMEXTRACTONLY="
-	libkleo/
-"
-
-src_unpack() {
-	if use handbook; then
-		KMEXTRA="
-			doc/kwatchgnupg
-		"
-	fi
-
-	kde4-meta_src_unpack
-}
diff --git a/kde-base/kleopatra/kleopatra-4.7.1.ebuild b/kde-base/kleopatra/kleopatra-4.7.1.ebuild
deleted file mode 100644
index 60ff2e2f87ca..000000000000
--- a/kde-base/kleopatra/kleopatra-4.7.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kleopatra/kleopatra-4.7.1.ebuild,v 1.1 2011/09/07 20:14:01 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="Kleopatra - KDE X.509 key manager"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	app-crypt/gpgme
-	dev-libs/boost
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}
-	app-crypt/gnupg
-"
-
-KMEXTRACTONLY="
-	libkleo/
-"
-
-src_unpack() {
-	if use handbook; then
-		KMEXTRA="
-			doc/kwatchgnupg
-		"
-	fi
-
-	kde4-meta_src_unpack
-}
diff --git a/kde-base/klettres/ChangeLog b/kde-base/klettres/ChangeLog
index a3d8ff60824a..3051d239dd29 100644
--- a/kde-base/klettres/ChangeLog
+++ b/kde-base/klettres/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/klettres
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klettres/ChangeLog,v 1.187 2011/10/15 17:25:58 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klettres/ChangeLog,v 1.188 2011/10/28 19:03:25 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -klettres-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -klettres-4.7.0.ebuild:
diff --git a/kde-base/klettres/klettres-4.7.1.ebuild b/kde-base/klettres/klettres-4.7.1.ebuild
deleted file mode 100644
index 7e8779f98628..000000000000
--- a/kde-base/klettres/klettres-4.7.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klettres/klettres-4.7.1.ebuild,v 1.1 2011/09/07 20:13:49 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE: KLettres helps a very young child or an adult learning "
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	$(add_kdebase_dep knotify)
-"
diff --git a/kde-base/klickety/ChangeLog b/kde-base/klickety/ChangeLog
index 6fd74241e05d..a04a0d7a53f7 100644
--- a/kde-base/klickety/ChangeLog
+++ b/kde-base/klickety/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/klickety
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klickety/ChangeLog,v 1.120 2011/10/15 17:25:51 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klickety/ChangeLog,v 1.121 2011/10/28 19:03:21 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -klickety-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -klickety-4.7.0.ebuild:
diff --git a/kde-base/klickety/klickety-4.7.1.ebuild b/kde-base/klickety/klickety-4.7.1.ebuild
deleted file mode 100644
index a8f9a1c10200..000000000000
--- a/kde-base/klickety/klickety-4.7.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klickety/klickety-4.7.1.ebuild,v 1.1 2011/09/07 20:13:45 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="A KDE game almost the same as ksame, but a bit different."
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-# Replaced ksame around 4.5.74
-add_blocker ksame
diff --git a/kde-base/klines/ChangeLog b/kde-base/klines/ChangeLog
index 3a1dc8edf3cb..ec1f6778f92f 100644
--- a/kde-base/klines/ChangeLog
+++ b/kde-base/klines/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/klines
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klines/ChangeLog,v 1.184 2011/10/15 17:26:02 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klines/ChangeLog,v 1.185 2011/10/28 19:03:32 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -klines-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -klines-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/klines/klines-4.7.1.ebuild b/kde-base/klines/klines-4.7.1.ebuild
deleted file mode 100644
index 7886dd76e699..000000000000
--- a/kde-base/klines/klines-4.7.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klines/klines-4.7.1.ebuild,v 1.1 2011/09/07 20:13:52 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE: Kolor Lines - a little game about balls and how to get rid of them"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/klinkstatus/ChangeLog b/kde-base/klinkstatus/ChangeLog
index 1128713451cf..ff43f18f7d6f 100644
--- a/kde-base/klinkstatus/ChangeLog
+++ b/kde-base/klinkstatus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/klinkstatus
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klinkstatus/ChangeLog,v 1.185 2011/10/15 17:25:51 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klinkstatus/ChangeLog,v 1.186 2011/10/28 19:03:21 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -klinkstatus-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -klinkstatus-4.7.0.ebuild:
diff --git a/kde-base/klinkstatus/klinkstatus-4.7.1.ebuild b/kde-base/klinkstatus/klinkstatus-4.7.1.ebuild
deleted file mode 100644
index 57d8ecd02dcf..000000000000
--- a/kde-base/klinkstatus/klinkstatus-4.7.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klinkstatus/klinkstatus-4.7.1.ebuild,v 1.1 2011/09/07 20:13:58 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdewebdev"
-inherit kde4-meta
-
-DESCRIPTION="KDE web development - link validity checker"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug tidy"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
-	tidy? ( app-text/htmltidy )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_KdepimLibs=ON
-		$(cmake-utils_use_with tidy LibTidy)
-	)
-
-	kde4-meta_src_configure
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-
-	echo
-	elog "To use scripting in ${PN}, install dev-lang/ruby."
-	echo
-}
diff --git a/kde-base/klipper/ChangeLog b/kde-base/klipper/ChangeLog
index 6e0a035dc94a..3dd4307542b0 100644
--- a/kde-base/klipper/ChangeLog
+++ b/kde-base/klipper/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/klipper
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klipper/ChangeLog,v 1.192 2011/10/15 17:25:55 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klipper/ChangeLog,v 1.193 2011/10/28 19:03:24 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -klipper-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -klipper-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/klipper/klipper-4.7.1.ebuild b/kde-base/klipper/klipper-4.7.1.ebuild
deleted file mode 100644
index 58a744fa921c..000000000000
--- a/kde-base/klipper/klipper-4.7.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klipper/klipper-4.7.1.ebuild,v 1.1 2011/09/07 20:14:03 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="Applet for KDE and X clipboard management"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep libkworkspace)
-	$(add_kdebase_dep libtaskmanager)
-	!aqua? ( x11-libs/libXfixes )
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/kmag/ChangeLog b/kde-base/kmag/ChangeLog
index 894dae8bba3d..bfda3c60509d 100644
--- a/kde-base/kmag/ChangeLog
+++ b/kde-base/kmag/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kmag
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmag/ChangeLog,v 1.180 2011/10/15 17:26:07 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmag/ChangeLog,v 1.181 2011/10/28 19:03:36 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kmag-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kmag-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kmag/kmag-4.7.1.ebuild b/kde-base/kmag/kmag-4.7.1.ebuild
deleted file mode 100644
index 05d4703817a0..000000000000
--- a/kde-base/kmag/kmag-4.7.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmag/kmag-4.7.1.ebuild,v 1.1 2011/09/07 20:13:58 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeaccessibility"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
-
-DESCRIPTION="KDE screen magnifier"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	$(add_kdebase_dep kaccessible)
-"
diff --git a/kde-base/kmahjongg/ChangeLog b/kde-base/kmahjongg/ChangeLog
index c99badbdc3cb..2e51afd85f5b 100644
--- a/kde-base/kmahjongg/ChangeLog
+++ b/kde-base/kmahjongg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kmahjongg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmahjongg/ChangeLog,v 1.185 2011/10/15 17:26:09 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmahjongg/ChangeLog,v 1.186 2011/10/28 19:03:27 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kmahjongg-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kmahjongg-4.7.0.ebuild:
diff --git a/kde-base/kmahjongg/kmahjongg-4.7.1.ebuild b/kde-base/kmahjongg/kmahjongg-4.7.1.ebuild
deleted file mode 100644
index 22679bf37a16..000000000000
--- a/kde-base/kmahjongg/kmahjongg-4.7.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmahjongg/kmahjongg-4.7.1.ebuild,v 1.1 2011/09/07 20:13:40 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="Mahjongg for KDE"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep libkmahjongg)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	libkdegames/
-	libkmahjongg/
-"
diff --git a/kde-base/kmail/ChangeLog b/kde-base/kmail/ChangeLog
index 723d460aa2d5..449857ee8ee7 100644
--- a/kde-base/kmail/ChangeLog
+++ b/kde-base/kmail/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kmail
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.259 2011/10/15 17:26:17 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.260 2011/10/28 19:03:34 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kmail-4.6.1.ebuild,
+  -kmail-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kmail-4.6.1.ebuild,
+  -kmail-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kmail-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kmail/kmail-4.6.1.ebuild b/kde-base/kmail/kmail-4.6.1.ebuild
deleted file mode 100644
index 35b2156feeab..000000000000
--- a/kde-base/kmail/kmail-4.6.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.6.1.ebuild,v 1.1 2011/07/11 14:01:20 tampakrap Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-VIRTUALX_REQUIRED=test
-inherit kde4-meta
-
-DESCRIPTION="KMail is the email component of Kontact, the integrated personal information manager of KDE."
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
-	$(add_kdebase_dep korganizer)
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-add_blocker kmailcvt
-add_blocker libksieve
-add_blocker mimelib
-
-KMEXTRACTONLY="
-	akonadi_next/
-	calendarsupport/
-	korganizer/
-	kresources/
-	libkleo/
-	libkpgp/
-	libkdepimdbusinterfaces/
-	kdgantt2/
-"
-KMCOMPILEONLY="
-	messagecomposer/
-	messagecore/
-	messagelist/
-	messageviewer/
-	templateparser/
-	incidenceeditor-ng/
-	calendarsupport/
-"
-KMEXTRA="
-	kmailcvt/
-	ksendemail/
-	libksieve/
-	mailcommon/
-	ontologies/
-	plugins/messageviewer/
-"
-
-KMLOADLIBS="kdepim-common-libs"
-
-src_configure() {
-	# Bug 308903
-	use ppc64 && append-flags -mminimal-toc
-
-	kde4-meta_src_configure
-}
-
-src_compile() {
-	kde4-meta_src_compile kmail_xml
-	kde4-meta_src_compile
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-
-	if ! has_version kde-base/kdepim-kresources:${SLOT}; then
-		echo
-		elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
-		echo
-	fi
-	if ! has_version kde-base/kleopatra:${SLOT}; then
-		echo
-		elog "For certificate management and the gnupg log viewer, please install kde-base/kleopatra:${SLOT}"
-		echo
-	fi
-}
diff --git a/kde-base/kmail/kmail-4.7.1.ebuild b/kde-base/kmail/kmail-4.7.1.ebuild
deleted file mode 100644
index 3fed919d052b..000000000000
--- a/kde-base/kmail/kmail-4.7.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.7.1.ebuild,v 1.1 2011/09/07 20:14:05 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-VIRTUALX_REQUIRED=test
-inherit kde4-meta
-
-DESCRIPTION="KMail is the email component of Kontact, the integrated personal information manager of KDE."
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
-	$(add_kdebase_dep korganizer)
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-add_blocker kmailcvt
-add_blocker libksieve
-add_blocker mimelib
-
-KMEXTRACTONLY="
-	akonadi_next/
-	calendarsupport/
-	korganizer/
-	kresources/
-	libkleo/
-	libkpgp/
-	libkdepimdbusinterfaces/
-	kdgantt2/
-"
-KMCOMPILEONLY="
-	messagecomposer/
-	messagecore/
-	messagelist/
-	messageviewer/
-	templateparser/
-	incidenceeditor-ng/
-	calendarsupport/
-"
-KMEXTRA="
-	kmailcvt/
-	ksendemail/
-	libksieve/
-	mailcommon/
-	ontologies/
-	plugins/messageviewer/
-"
-
-KMLOADLIBS="kdepim-common-libs"
-
-src_configure() {
-	# Bug 308903
-	use ppc64 && append-flags -mminimal-toc
-
-	kde4-meta_src_configure
-}
-
-src_compile() {
-	kde4-meta_src_compile kmail_xml
-	kde4-meta_src_compile
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-
-	if ! has_version kde-base/kdepim-kresources:${SLOT}; then
-		echo
-		elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
-		echo
-	fi
-	if ! has_version kde-base/kleopatra:${SLOT}; then
-		echo
-		elog "For certificate management and the gnupg log viewer, please install kde-base/kleopatra:${SLOT}"
-		echo
-	fi
-}
diff --git a/kde-base/kmenuedit/ChangeLog b/kde-base/kmenuedit/ChangeLog
index 54bcd2499fef..d7cab3becce3 100644
--- a/kde-base/kmenuedit/ChangeLog
+++ b/kde-base/kmenuedit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kmenuedit
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmenuedit/ChangeLog,v 1.186 2011/10/15 17:26:08 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmenuedit/ChangeLog,v 1.187 2011/10/28 19:03:38 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kmenuedit-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kmenuedit-4.7.0.ebuild:
diff --git a/kde-base/kmenuedit/kmenuedit-4.7.1.ebuild b/kde-base/kmenuedit/kmenuedit-4.7.1.ebuild
deleted file mode 100644
index 832010690722..000000000000
--- a/kde-base/kmenuedit/kmenuedit-4.7.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmenuedit/kmenuedit-4.7.1.ebuild,v 1.1 2011/09/07 20:13:43 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="KDE menu editor"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	$(add_kdebase_dep khotkeys)
-"
-DEPEND=${RDEPEND}
-
-KMEXTRACTONLY="
-	libs/kworkspace/
-"
-
-src_configure() {
-	sed -i -e \
-		"s:\${CMAKE_CURRENT_BINARY_DIR}/../khotkeys/app/org.kde.khotkeys.xml:${EPREFIX}/usr/share/dbus-1/interfaces/org.kde.khotkeys.xml:g" \
-		kmenuedit/CMakeLists.txt \
-		|| die "sed failed"
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kmimetypefinder/ChangeLog b/kde-base/kmimetypefinder/ChangeLog
index 7b32c96a2159..9cd1b231e5ba 100644
--- a/kde-base/kmimetypefinder/ChangeLog
+++ b/kde-base/kmimetypefinder/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kmimetypefinder
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmimetypefinder/ChangeLog,v 1.97 2011/10/15 17:25:50 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmimetypefinder/ChangeLog,v 1.98 2011/10/28 19:03:20 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kmimetypefinder-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kmimetypefinder-4.7.0.ebuild:
diff --git a/kde-base/kmimetypefinder/kmimetypefinder-4.7.1.ebuild b/kde-base/kmimetypefinder/kmimetypefinder-4.7.1.ebuild
deleted file mode 100644
index 30ef37cb1bef..000000000000
--- a/kde-base/kmimetypefinder/kmimetypefinder-4.7.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmimetypefinder/kmimetypefinder-4.7.1.ebuild,v 1.1 2011/09/07 20:13:51 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KDE application to report the mimetype for a given file"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kmines/ChangeLog b/kde-base/kmines/ChangeLog
index 57bdf97ec381..c0019fcdca74 100644
--- a/kde-base/kmines/ChangeLog
+++ b/kde-base/kmines/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kmines
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmines/ChangeLog,v 1.184 2011/10/15 17:26:04 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmines/ChangeLog,v 1.185 2011/10/28 19:03:33 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kmines-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kmines-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kmines/kmines-4.7.1.ebuild b/kde-base/kmines/kmines-4.7.1.ebuild
deleted file mode 100644
index cea944c765dd..000000000000
--- a/kde-base/kmines/kmines-4.7.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmines/kmines-4.7.1.ebuild,v 1.1 2011/09/07 20:13:48 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KMines is a classic mine sweeper game"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kmix/ChangeLog b/kde-base/kmix/ChangeLog
index 6df174db3470..f01818d1c9ab 100644
--- a/kde-base/kmix/ChangeLog
+++ b/kde-base/kmix/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kmix
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/ChangeLog,v 1.192 2011/10/15 17:25:53 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/ChangeLog,v 1.193 2011/10/28 19:03:23 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kmix-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kmix-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kmix/kmix-4.7.1.ebuild b/kde-base/kmix/kmix-4.7.1.ebuild
deleted file mode 100644
index 9789bf01cca2..000000000000
--- a/kde-base/kmix/kmix-4.7.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/kmix-4.7.1.ebuild,v 1.1 2011/09/07 20:13:39 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdemultimedia"
-inherit kde4-meta
-
-DESCRIPTION="KDE mixer gui"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="alsa debug pulseaudio"
-
-DEPEND="
-	alsa? ( >=media-libs/alsa-lib-1.0.14a )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.12 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with pulseaudio PulseAudio)
-		$(cmake-utils_use_with alsa)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kmousetool/ChangeLog b/kde-base/kmousetool/ChangeLog
index 3e43bb7eb006..b8e99eb76787 100644
--- a/kde-base/kmousetool/ChangeLog
+++ b/kde-base/kmousetool/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kmousetool
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmousetool/ChangeLog,v 1.182 2011/10/15 17:25:56 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmousetool/ChangeLog,v 1.183 2011/10/28 19:03:26 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kmousetool-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kmousetool-4.7.0.ebuild:
diff --git a/kde-base/kmousetool/kmousetool-4.7.1.ebuild b/kde-base/kmousetool/kmousetool-4.7.1.ebuild
deleted file mode 100644
index 936a497c9a48..000000000000
--- a/kde-base/kmousetool/kmousetool-4.7.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmousetool/kmousetool-4.7.1.ebuild,v 1.1 2011/09/07 20:14:01 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeaccessibility"
-	kde_eclass="kde4-meta"
-fi
-
-inherit ${kde_eclass}
-
-DESCRIPTION="KDE program that clicks the mouse for you."
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	$(add_kdebase_dep knotify)
-"
diff --git a/kde-base/kmouth/ChangeLog b/kde-base/kmouth/ChangeLog
index c33595c3ef0c..f9224028af45 100644
--- a/kde-base/kmouth/ChangeLog
+++ b/kde-base/kmouth/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kmouth
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmouth/ChangeLog,v 1.181 2011/10/15 17:26:16 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmouth/ChangeLog,v 1.182 2011/10/28 19:03:47 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kmouth-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kmouth-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kmouth/kmouth-4.7.1.ebuild b/kde-base/kmouth/kmouth-4.7.1.ebuild
deleted file mode 100644
index 41d18a38bb22..000000000000
--- a/kde-base/kmouth/kmouth-4.7.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmouth/kmouth-4.7.1.ebuild,v 1.1 2011/09/07 20:14:05 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeaccessibility"
-	kde_eclass="kde4-meta"
-fi
-
-inherit ${kde_eclass}
-
-DESCRIPTION="KDE application that reads what you type out loud. Doesn't include a speech synthesizer."
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kmplot/ChangeLog b/kde-base/kmplot/ChangeLog
index d5e92948d495..8af9ad9de7ce 100644
--- a/kde-base/kmplot/ChangeLog
+++ b/kde-base/kmplot/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kmplot
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmplot/ChangeLog,v 1.187 2011/10/15 17:26:02 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmplot/ChangeLog,v 1.188 2011/10/28 19:03:32 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kmplot-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kmplot-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kmplot/kmplot-4.7.1.ebuild b/kde-base/kmplot/kmplot-4.7.1.ebuild
deleted file mode 100644
index 18186ccaca8e..000000000000
--- a/kde-base/kmplot/kmplot-4.7.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmplot/kmplot-4.7.1.ebuild,v 1.1 2011/09/07 20:13:56 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="Mathematical function plotter for KDE"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	$(add_kdebase_dep knotify)
-"
diff --git a/kde-base/knetattach/ChangeLog b/kde-base/knetattach/ChangeLog
index 363cb6ccab73..5e9012e5e826 100644
--- a/kde-base/knetattach/ChangeLog
+++ b/kde-base/knetattach/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/knetattach
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knetattach/ChangeLog,v 1.190 2011/10/15 17:26:01 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knetattach/ChangeLog,v 1.191 2011/10/28 19:03:30 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -knetattach-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -knetattach-4.7.0.ebuild:
diff --git a/kde-base/knetattach/knetattach-4.7.1.ebuild b/kde-base/knetattach/knetattach-4.7.1.ebuild
deleted file mode 100644
index de02e303de58..000000000000
--- a/kde-base/knetattach/knetattach-4.7.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knetattach/knetattach-4.7.1.ebuild,v 1.1 2011/09/07 20:13:44 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KDE network wizard"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/knetwalk/ChangeLog b/kde-base/knetwalk/ChangeLog
index a6f6800f03bb..8e2a250870c0 100644
--- a/kde-base/knetwalk/ChangeLog
+++ b/kde-base/knetwalk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/knetwalk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knetwalk/ChangeLog,v 1.114 2011/10/15 17:25:59 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knetwalk/ChangeLog,v 1.115 2011/10/28 19:03:29 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -knetwalk-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -knetwalk-4.7.0.ebuild:
diff --git a/kde-base/knetwalk/knetwalk-4.7.1.ebuild b/kde-base/knetwalk/knetwalk-4.7.1.ebuild
deleted file mode 100644
index ee2b1405d08d..000000000000
--- a/kde-base/knetwalk/knetwalk-4.7.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knetwalk/knetwalk-4.7.1.ebuild,v 1.1 2011/09/07 20:13:44 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE: Knetwalk is the kde version of the popular NetWalk game for system administrators"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/knewstuff/ChangeLog b/kde-base/knewstuff/ChangeLog
index c49a8c27e614..6e846cdf72e1 100644
--- a/kde-base/knewstuff/ChangeLog
+++ b/kde-base/knewstuff/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/knewstuff
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knewstuff/ChangeLog,v 1.96 2011/10/15 17:26:09 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knewstuff/ChangeLog,v 1.97 2011/10/28 19:03:39 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -knewstuff-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -knewstuff-4.7.0.ebuild:
diff --git a/kde-base/knewstuff/knewstuff-4.7.1.ebuild b/kde-base/knewstuff/knewstuff-4.7.1.ebuild
deleted file mode 100644
index a69091e2ebc4..000000000000
--- a/kde-base/knewstuff/knewstuff-4.7.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knewstuff/knewstuff-4.7.1.ebuild,v 1.1 2011/09/07 20:13:52 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KDE4 software to download and upload 'new stuff'"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/knode/ChangeLog b/kde-base/knode/ChangeLog
index b82f9ffaa17b..8b16f7b4f3b5 100644
--- a/kde-base/knode/ChangeLog
+++ b/kde-base/knode/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/knode
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/ChangeLog,v 1.188 2011/10/15 17:25:49 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/ChangeLog,v 1.189 2011/10/28 19:03:18 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -knode-4.6.1.ebuild,
+  -knode-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -knode-4.6.1.ebuild,
+  -knode-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -knode-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/knode/knode-4.6.1.ebuild b/kde-base/knode/knode-4.6.1.ebuild
deleted file mode 100644
index 9bf4ed2e6d65..000000000000
--- a/kde-base/knode/knode-4.6.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/knode-4.6.1.ebuild,v 1.1 2011/07/11 14:01:19 tampakrap Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="A newsreader for KDE"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-# test fails, last checked for 4.2.96
-RESTRICT=test
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	libkleo/
-	libkpgp/
-	messagecomposer/
-	messageviewer/
-"
-
-KMLOADLIBS="kdepim-common-libs"
-
-src_unpack() {
-	if use handbook; then
-		KMEXTRA="
-			doc/kioslave/news
-		"
-	fi
-
-	kde4-meta_src_unpack
-}
diff --git a/kde-base/knode/knode-4.7.1.ebuild b/kde-base/knode/knode-4.7.1.ebuild
deleted file mode 100644
index 0713adcb0422..000000000000
--- a/kde-base/knode/knode-4.7.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/knode-4.7.1.ebuild,v 1.1 2011/09/07 20:13:58 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="A newsreader for KDE"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-# test fails, last checked for 4.2.96
-RESTRICT=test
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	libkleo/
-	libkpgp/
-	messagecomposer/
-	messageviewer/
-"
-
-KMLOADLIBS="kdepim-common-libs"
-
-src_unpack() {
-	if use handbook; then
-		KMEXTRA="
-			doc/kioslave/news
-		"
-	fi
-
-	kde4-meta_src_unpack
-}
diff --git a/kde-base/knotes/ChangeLog b/kde-base/knotes/ChangeLog
index b86388ae5408..37cd4ffd0614 100644
--- a/kde-base/knotes/ChangeLog
+++ b/kde-base/knotes/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/knotes
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knotes/ChangeLog,v 1.181 2011/10/15 17:26:14 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knotes/ChangeLog,v 1.182 2011/10/28 19:03:45 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -knotes-4.6.1.ebuild,
+  -knotes-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -knotes-4.6.1.ebuild,
+  -knotes-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -knotes-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/knotes/knotes-4.6.1.ebuild b/kde-base/knotes/knotes-4.6.1.ebuild
deleted file mode 100644
index 9938f8baa42f..000000000000
--- a/kde-base/knotes/knotes-4.6.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knotes/knotes-4.6.1.ebuild,v 1.1 2011/07/11 14:01:20 tampakrap Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="KDE Notes application"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMLOADLIBS="kdepim-common-libs"
diff --git a/kde-base/knotes/knotes-4.7.1.ebuild b/kde-base/knotes/knotes-4.7.1.ebuild
deleted file mode 100644
index 3592f550844c..000000000000
--- a/kde-base/knotes/knotes-4.7.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knotes/knotes-4.7.1.ebuild,v 1.1 2011/09/07 20:14:06 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="KDE Notes application"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMLOADLIBS="kdepim-common-libs"
diff --git a/kde-base/knotify/ChangeLog b/kde-base/knotify/ChangeLog
index a5100768b331..e37769865c3a 100644
--- a/kde-base/knotify/ChangeLog
+++ b/kde-base/knotify/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/knotify
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knotify/ChangeLog,v 1.99 2011/10/15 17:25:56 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knotify/ChangeLog,v 1.100 2011/10/28 19:03:36 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -knotify-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -knotify-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/knotify/knotify-4.7.1.ebuild b/kde-base/knotify/knotify-4.7.1.ebuild
deleted file mode 100644
index ec7c9786319f..000000000000
--- a/kde-base/knotify/knotify-4.7.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knotify/knotify-4.7.1.ebuild,v 1.1 2011/09/07 20:14:07 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="The KDE notification daemon."
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kolf/ChangeLog b/kde-base/kolf/ChangeLog
index 7d3ca511da5f..406051e95347 100644
--- a/kde-base/kolf/ChangeLog
+++ b/kde-base/kolf/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kolf
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kolf/ChangeLog,v 1.184 2011/10/15 17:26:14 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kolf/ChangeLog,v 1.185 2011/10/28 19:03:16 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kolf-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kolf-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kolf/kolf-4.7.1.ebuild b/kde-base/kolf/kolf-4.7.1.ebuild
deleted file mode 100644
index d6b0eaa9f926..000000000000
--- a/kde-base/kolf/kolf-4.7.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kolf/kolf-4.7.1.ebuild,v 1.1 2011/09/07 20:13:49 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE Minigolf Game"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kollision/ChangeLog b/kde-base/kollision/ChangeLog
index 2ffb19d0ba60..00721a938f18 100644
--- a/kde-base/kollision/ChangeLog
+++ b/kde-base/kollision/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kollision
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kollision/ChangeLog,v 1.80 2011/10/15 17:26:11 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kollision/ChangeLog,v 1.81 2011/10/28 19:03:43 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kollision-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kollision-4.7.0.ebuild:
diff --git a/kde-base/kollision/kollision-4.7.1.ebuild b/kde-base/kollision/kollision-4.7.1.ebuild
deleted file mode 100644
index 4425f6f2f5e2..000000000000
--- a/kde-base/kollision/kollision-4.7.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kollision/kollision-4.7.1.ebuild,v 1.1 2011/09/07 20:14:00 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE: A simple ball dodging game"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kolourpaint/ChangeLog b/kde-base/kolourpaint/ChangeLog
index 453638472b16..61c060bdf6be 100644
--- a/kde-base/kolourpaint/ChangeLog
+++ b/kde-base/kolourpaint/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kolourpaint
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kolourpaint/ChangeLog,v 1.188 2011/10/16 10:06:53 mschiff Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kolourpaint/ChangeLog,v 1.189 2011/10/28 19:03:27 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kolourpaint-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   16 Oct 2011; Marc Schiffbauer <mschiff@gentoo.org> kolourpaint-4.7.2.ebuild:
   Added scanner USE flag. Thanks to Diogo Pereira. Fixes bug #386591
diff --git a/kde-base/kolourpaint/kolourpaint-4.7.1.ebuild b/kde-base/kolourpaint/kolourpaint-4.7.1.ebuild
deleted file mode 100644
index 1ed221cb9725..000000000000
--- a/kde-base/kolourpaint/kolourpaint-4.7.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kolourpaint/kolourpaint-4.7.1.ebuild,v 1.1 2011/09/07 20:14:06 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="Paint Program for KDE"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-LICENSE="BSD LGPL-2"
-IUSE="debug"
-
-DEPEND="media-libs/qimageblitz"
-RDEPEND=${DEPEND}
diff --git a/kde-base/kommander/ChangeLog b/kde-base/kommander/ChangeLog
index 82c197b6e168..841585ec6eb0 100644
--- a/kde-base/kommander/ChangeLog
+++ b/kde-base/kommander/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kommander
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kommander/ChangeLog,v 1.182 2011/10/15 17:25:48 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kommander/ChangeLog,v 1.183 2011/10/28 19:03:17 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kommander-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kommander-4.7.0.ebuild:
diff --git a/kde-base/kommander/kommander-4.7.1.ebuild b/kde-base/kommander/kommander-4.7.1.ebuild
deleted file mode 100644
index d50eb2e9c155..000000000000
--- a/kde-base/kommander/kommander-4.7.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kommander/kommander-4.7.1.ebuild,v 1.1 2011/09/07 20:13:47 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdewebdev"
-inherit kde4-meta
-
-DESCRIPTION="KDE dialog system for scripting"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kompare/ChangeLog b/kde-base/kompare/ChangeLog
index a85c9371498c..a918092dbcd1 100644
--- a/kde-base/kompare/ChangeLog
+++ b/kde-base/kompare/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kompare
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kompare/ChangeLog,v 1.180 2011/10/15 17:26:05 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kompare/ChangeLog,v 1.181 2011/10/28 19:03:38 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kompare-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kompare-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kompare/kompare-4.7.1.ebuild b/kde-base/kompare/kompare-4.7.1.ebuild
deleted file mode 100644
index f814af46b53d..000000000000
--- a/kde-base/kompare/kompare-4.7.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kompare/kompare-4.7.1.ebuild,v 1.1 2011/09/07 20:13:57 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdesdk"
-inherit kde4-meta
-
-DESCRIPTION="Kompare is a program to view the differences between files."
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/konq-plugins/ChangeLog b/kde-base/konq-plugins/ChangeLog
index 63c345d87ae8..30e69496ef55 100644
--- a/kde-base/konq-plugins/ChangeLog
+++ b/kde-base/konq-plugins/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/konq-plugins
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konq-plugins/ChangeLog,v 1.121 2011/10/15 17:26:08 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konq-plugins/ChangeLog,v 1.122 2011/10/28 19:03:37 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -konq-plugins-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -konq-plugins-4.7.0.ebuild:
diff --git a/kde-base/konq-plugins/konq-plugins-4.7.1.ebuild b/kde-base/konq-plugins/konq-plugins-4.7.1.ebuild
deleted file mode 100644
index fa69d0dae35b..000000000000
--- a/kde-base/konq-plugins/konq-plugins-4.7.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konq-plugins/konq-plugins-4.7.1.ebuild,v 1.2 2011/09/11 20:42:32 dilfridge Exp $
-
-EAPI=4
-
-KMNAME="kde-baseapps"
-inherit kde4-meta
-
-DESCRIPTION="Various plugins for konqueror"
-HOMEPAGE="http://kde.org/"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug tidy"
-
-DEPEND="
-	$(add_kdebase_dep libkonq)
-	tidy? ( app-text/htmltidy )
-"
-RDEPEND="${DEPEND}
-	!kde-misc/konq-plugins
-	$(add_kdebase_dep kcmshell)
-	$(add_kdebase_dep konqueror)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DKdeWebKit=OFF
-		-DWebKitPart=OFF
-		$(cmake-utils_use_with tidy LibTidy)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/konqueror/ChangeLog b/kde-base/konqueror/ChangeLog
index c43d2a9e15a2..9454d7e69f1e 100644
--- a/kde-base/konqueror/ChangeLog
+++ b/kde-base/konqueror/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/konqueror
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/ChangeLog,v 1.218 2011/10/15 17:25:56 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/ChangeLog,v 1.219 2011/10/28 19:03:26 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -konqueror-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -konqueror-4.7.0.ebuild:
diff --git a/kde-base/konqueror/konqueror-4.7.1.ebuild b/kde-base/konqueror/konqueror-4.7.1.ebuild
deleted file mode 100644
index a4a030a069e5..000000000000
--- a/kde-base/konqueror/konqueror-4.7.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/konqueror-4.7.1.ebuild,v 1.1 2011/09/07 20:13:43 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-baseapps"
-inherit flag-o-matic kde4-meta
-
-DESCRIPTION="KDE: Web browser, file manager, ..."
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+bookmarks debug svg"
-# 4 of 4 tests fail. Last checked for 4.0.3
-RESTRICT="test"
-
-DEPEND="
-	$(add_kdebase_dep libkonq)
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kfind)
-	$(add_kdebase_dep kfmclient)
-	bookmarks? ( $(add_kdebase_dep keditbookmarks) )
-	svg? ( $(add_kdebase_dep svgpart) )
-"
-
-KMEXTRACTONLY="
-	konqueror/client/
-	lib/konq/
-"
-
-src_prepare() {
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
-
-	kde4-meta_src_prepare
-
-	# Do not install *.desktop files for kfmclient
-	sed -e "/kfmclient\.desktop/d" -i konqueror/CMakeLists.txt \
-		|| die "Failed to omit .desktop files"
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-
-	echo
-	elog "If you want to use konqueror as a filemanager, install the dolphin kpart:"
-	elog "emerge -1 kde-base/dolphin:${SLOT}"
-	elog
-	elog "To use Java on webpages: emerge jre"
-	echo
-}
diff --git a/kde-base/konquest/ChangeLog b/kde-base/konquest/ChangeLog
index f083ec77d251..35b5c8a35fce 100644
--- a/kde-base/konquest/ChangeLog
+++ b/kde-base/konquest/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/konquest
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konquest/ChangeLog,v 1.184 2011/10/15 17:26:12 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konquest/ChangeLog,v 1.185 2011/10/28 19:03:43 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -konquest-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -konquest-4.7.0.ebuild:
diff --git a/kde-base/konquest/konquest-4.7.1.ebuild b/kde-base/konquest/konquest-4.7.1.ebuild
deleted file mode 100644
index 73b5db206cfb..000000000000
--- a/kde-base/konquest/konquest-4.7.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konquest/konquest-4.7.1.ebuild,v 1.1 2011/09/07 20:13:39 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="Galactic Strategy KDE Game"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/konsole/ChangeLog b/kde-base/konsole/ChangeLog
index ef1c36a12d59..a4c67c9e60af 100644
--- a/kde-base/konsole/ChangeLog
+++ b/kde-base/konsole/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/konsole
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/ChangeLog,v 1.206 2011/10/15 17:25:57 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/ChangeLog,v 1.207 2011/10/28 19:03:27 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -konsole-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -konsole-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/konsole/konsole-4.7.1.ebuild b/kde-base/konsole/konsole-4.7.1.ebuild
deleted file mode 100644
index aa1db4008425..000000000000
--- a/kde-base/konsole/konsole-4.7.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/konsole-4.7.1.ebuild,v 1.1 2011/09/07 20:14:05 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-
-KDE_DOC_DIRS="doc/manual"
-
-inherit kde4-base
-
-DESCRIPTION="X terminal for use with KDE"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-COMMONDEPEND="
-	!aqua? (
-		x11-libs/libX11
-		x11-libs/libXext
-		>=x11-libs/libxklavier-3.2
-		x11-libs/libXrender
-		x11-libs/libXtst
-	)
-"
-DEPEND="${COMMONDEPEND}
-	!aqua? (
-		x11-apps/bdftopcf
-		x11-proto/kbproto
-		x11-proto/renderproto
-	)
-"
-RDEPEND="${COMMONDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.6.4-imagesize.patch"
-	"${FILESDIR}/${PN}-4.7.0-tests.patch"
-)
diff --git a/kde-base/konsolekalendar/ChangeLog b/kde-base/konsolekalendar/ChangeLog
index af7e914ccbad..398582b7ca16 100644
--- a/kde-base/konsolekalendar/ChangeLog
+++ b/kde-base/konsolekalendar/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/konsolekalendar
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konsolekalendar/ChangeLog,v 1.170 2011/10/15 17:26:11 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsolekalendar/ChangeLog,v 1.171 2011/10/28 19:03:43 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -konsolekalendar-4.6.1.ebuild, -konsolekalendar-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -konsolekalendar-4.6.1.ebuild, -konsolekalendar-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -konsolekalendar-4.7.0.ebuild:
diff --git a/kde-base/konsolekalendar/konsolekalendar-4.6.1.ebuild b/kde-base/konsolekalendar/konsolekalendar-4.6.1.ebuild
deleted file mode 100644
index a08d8e7a8e44..000000000000
--- a/kde-base/konsolekalendar/konsolekalendar-4.6.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konsolekalendar/konsolekalendar-4.6.1.ebuild,v 1.1 2011/07/11 14:01:19 tampakrap Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KMMODULE="console/${PN}"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="A command line interface to KDE calendars"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMLOADLIBS="kdepim-common-libs"
diff --git a/kde-base/konsolekalendar/konsolekalendar-4.7.1.ebuild b/kde-base/konsolekalendar/konsolekalendar-4.7.1.ebuild
deleted file mode 100644
index 4b6daf3f7acb..000000000000
--- a/kde-base/konsolekalendar/konsolekalendar-4.7.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konsolekalendar/konsolekalendar-4.7.1.ebuild,v 1.1 2011/09/07 20:14:00 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KMMODULE="console/${PN}"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="A command line interface to KDE calendars"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMLOADLIBS="kdepim-common-libs"
diff --git a/kde-base/kontact/ChangeLog b/kde-base/kontact/ChangeLog
index 8212cf125dfe..d9a1dbe36ff3 100644
--- a/kde-base/kontact/ChangeLog
+++ b/kde-base/kontact/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kontact
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/ChangeLog,v 1.193 2011/10/15 17:26:02 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/ChangeLog,v 1.194 2011/10/28 19:03:48 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kontact-4.6.1.ebuild,
+  -kontact-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kontact-4.6.1.ebuild,
+  -kontact-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kontact-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kontact/kontact-4.6.1.ebuild b/kde-base/kontact/kontact-4.6.1.ebuild
deleted file mode 100644
index c6421880f535..000000000000
--- a/kde-base/kontact/kontact-4.6.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/kontact-4.6.1.ebuild,v 1.1 2011/07/11 14:01:20 tampakrap Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="KDE personal information manager"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMLOADLIBS="kdepim-common-libs"
-KMSAVELIBS="true"
-
-# We remove plugins that are related to external kdepim programs. This way
-# kontact doesn't have to depend on all programs it has plugins for.
-# kcontactmanager gone from kdesvn
-#
-KMEXTRACTONLY="
-	kontact/plugins/akregator/
-	kontact/plugins/kaddressbook/
-	kontact/plugins/kjots/
-	kontact/plugins/kmail/
-	kontact/plugins/knode/
-	kontact/plugins/knotes/
-	kontact/plugins/korganizer/
-	kontact/plugins/ktimetracker/
-	kontact/plugins/planner/
-	kontact/plugins/specialdates/
-	libkdepimdbusinterfaces/
-"
-
-src_unpack() {
-	if use handbook; then
-		KMEXTRA+="
-			doc/kontact-admin/
-		"
-	fi
-
-	kde4-meta_src_unpack
-}
diff --git a/kde-base/kontact/kontact-4.7.1.ebuild b/kde-base/kontact/kontact-4.7.1.ebuild
deleted file mode 100644
index 1541b2389154..000000000000
--- a/kde-base/kontact/kontact-4.7.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/kontact-4.7.1.ebuild,v 1.1 2011/09/07 20:13:50 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="KDE personal information manager"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMLOADLIBS="kdepim-common-libs"
-KMSAVELIBS="true"
-
-# We remove plugins that are related to external kdepim programs. This way
-# kontact doesn't have to depend on all programs it has plugins for.
-# kcontactmanager gone from kdesvn
-#
-KMEXTRACTONLY="
-	kontact/plugins/akregator/
-	kontact/plugins/kaddressbook/
-	kontact/plugins/kjots/
-	kontact/plugins/kmail/
-	kontact/plugins/knode/
-	kontact/plugins/knotes/
-	kontact/plugins/korganizer/
-	kontact/plugins/ktimetracker/
-	kontact/plugins/planner/
-	kontact/plugins/specialdates/
-	libkdepimdbusinterfaces/
-"
-
-src_unpack() {
-	if use handbook; then
-		KMEXTRA+="
-			doc/kontact-admin/
-		"
-	fi
-
-	kde4-meta_src_unpack
-}
diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index 29a6d62ef70c..203c6c3e88f0 100644
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kopete
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.294 2011/10/15 17:26:08 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.295 2011/10/28 19:03:28 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kopete-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kopete-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kopete/kopete-4.7.1.ebuild b/kde-base/kopete/kopete-4.7.1.ebuild
deleted file mode 100644
index e561eab2f2d5..000000000000
--- a/kde-base/kopete/kopete-4.7.1.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.7.1.ebuild,v 1.1 2011/09/07 20:14:05 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdenetwork"
-inherit kde4-meta
-
-DESCRIPTION="KDE multi-protocol IM client"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug ssl v4l2"
-
-# tests hang, last checked for 4.2.96
-RESTRICT=test
-
-# Available plugins
-#
-#	addbookmarks: NO DEPS
-#	alias: NO DEPS (disabled upstream)
-#	autoreplace: NO DEPS
-#	contactnotes: NO DEPS
-#	highlight: NO DEPS
-#	history: NO DEPS
-#	latex: virtual/latex as RDEPEND
-#	nowlistening: NO DEPS
-#	otr: libotr
-#	pipes: NO DEPS
-#	privacy: NO DEPS
-#	statistics: dev-db/sqlite:3
-#	texteffect: NO DEPS
-#	translator: NO DEPS
-#	urlpicpreview: NO DEPS
-#	webpresence: libxml2 libxslt
-# NOTE: By default we enable all plugins that don't have any dependencies
-PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight +history latex
-+nowlistening otr +pipes +privacy +statistics +texteffect +translator
-+urlpicpreview webpresence"
-
-# Available protocols
-#
-#	gadu: net-libs/libgadu @since 4.3
-#	groupwise: app-crypt/qca:2
-#	irc: NO DEPS, probably will fail so inform user about it
-#	xmpp: net-dns/libidn app-crypt/qca:2 ENABLED BY DEFAULT NETWORK
-#	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
-#	meanwhile: net-libs/meanwhile
-#	msn: libmsn == this is wlm plugin, we disable msn one
-#	oscar: NO DEPS
-#	qq: NO DEPS
-#   telepathy: net-libs/decibel
-#   testbed: NO DEPS
-#	winpopup: NO DEPS (we're adding samba as RDEPEND so it works)
-#	yahoo: media-libs/jasper
-#	zeroconf (bonjour): NO DEPS
-PROTOCOLS="gadu groupwise jingle meanwhile msn oscar qq skype
-sms testbed winpopup +xmpp yahoo zeroconf"
-
-# disabled protocols
-#   telepathy: net-libs/decibel
-#   irc: NO DEPS
-
-IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
-
-COMMONDEPEND="
-	dev-libs/libpcre
-	$(add_kdebase_dep kdepimlibs)
-	media-libs/qimageblitz
-	>=x11-libs/qt-gui-4.4.0:4[mng]
-	!aqua? ( x11-libs/libXScrnSaver )
-	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
-	groupwise? ( app-crypt/qca:2 )
-	jingle? (
-		>=media-libs/mediastreamer-2.3.0
-		media-libs/speex
-		net-libs/ortp
-	)
-	meanwhile? ( net-libs/meanwhile )
-	msn? ( >=net-libs/libmsn-4.1 )
-	otr? ( >=net-libs/libotr-3.2.0 )
-	statistics? ( dev-db/sqlite:3 )
-	v4l2? ( media-libs/libv4l )
-	webpresence? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-	)
-	xmpp? (
-		app-crypt/qca:2
-		net-dns/libidn
-	)
-	yahoo? ( media-libs/jasper )
-"
-RDEPEND="${COMMONDEPEND}
-	latex? (
-		|| (
-			media-gfx/imagemagick
-			media-gfx/graphicsmagick[imagemagick]
-		)
-		virtual/latex-base
-	)
-	sms? ( app-mobilephone/smssend )
-	ssl? ( app-crypt/qca-ossl )
-	winpopup? ( net-fs/samba )
-"
-#	telepathy? ( net-libs/decibel )"
-DEPEND="${COMMONDEPEND}
-	!aqua? ( x11-proto/scrnsaverproto )
-"
-
-src_prepare() {
-	sed -e "s:lib/mozilla:$(get_libdir)/mozilla:" \
-		-i kopete/protocols/skype/skypebuttons/CMakeLists.txt || die "sed failed"
-
-	kde4-meta_src_prepare
-}
-
-src_configure() {
-	local x x2
-	# Handle common stuff
-	mycmakeargs=(
-		$(cmake-utils_use_with jingle GOOGLETALK)
-		$(cmake-utils_use_with jingle LiboRTP)
-		$(cmake-utils_use_with jingle Mediastreamer)
-		$(cmake-utils_use_with jingle Speex)
-		$(cmake-utils_use_disable v4l2 VIDEOSUPPORT)
-	)
-	# enable protocols
-	for x in ${PROTOCOLS}; do
-		case ${x/+/} in
-			msn) x2=Libmsn ;;
-			zeroconf) x2=bonjour ;;
-			xmpp) x2=jabber ;;
-			*) x2='' ;;
-		esac
-		mycmakeargs+=($(cmake-utils_use_with ${x/+/} ${x2}))
-	done
-
-	# enable plugins
-	for x in ${PLUGINS}; do
-		mycmakeargs+=($(cmake-utils_use_with ${x/+/}))
-	done
-
-	kde4-meta_src_configure
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-
-	#if use telepathy; then
-	#	elog "To use kopete telepathy plugins, you need to start gabble first:"
-	#	elog "GABBLE_PERSIST=1 telepathy-gabble &"
-	#	elog "export TELEPATHY_DATA_PATH='${EPREFIX}/usr/share/telepathy/managers/'"
-	#fi
-
-	if ! use ssl; then
-		if use xmpp || use msn; then # || use irc; then
-			echo
-			elog "In order to use ssl in xmpp and msn you'll need to"
-			elog "install app-crypt/qca-ossl package."
-			echo
-		fi
-	fi
-}
diff --git a/kde-base/korganizer/ChangeLog b/kde-base/korganizer/ChangeLog
index edf92c28cc42..e8847aa8f5de 100644
--- a/kde-base/korganizer/ChangeLog
+++ b/kde-base/korganizer/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/korganizer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/ChangeLog,v 1.204 2011/10/21 23:13:22 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/ChangeLog,v 1.205 2011/10/28 19:03:36 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -korganizer-4.6.1.ebuild, -korganizer-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -korganizer-4.6.1.ebuild, -korganizer-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   21 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   korganizer-4.4.11.1.ebuild, korganizer-4.6.1.ebuild, korganizer-4.7.1.ebuild,
diff --git a/kde-base/korganizer/korganizer-4.6.1.ebuild b/kde-base/korganizer/korganizer-4.6.1.ebuild
deleted file mode 100644
index 413e7f192ceb..000000000000
--- a/kde-base/korganizer/korganizer-4.6.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/korganizer-4.6.1.ebuild,v 1.2 2011/10/21 23:13:22 dilfridge Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="A Personal Organizer for KDE"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
-	$(add_kdebase_dep kdepim-common-libs)
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep ktimezoned)
-"
-
-# Moved after 4.3.90
-add_blocker kontact-specialdates
-
-KMLOADLIBS="kdepim-common-libs"
-
-# xml targets from kmail are being uncommented by kde4-meta.eclass
-KMEXTRACTONLY="
-	akonadi_next/
-	calendarviews/
-	kdgantt2/
-	kmail/
-	knode/org.kde.knode.xml
-	libkdepimdbusinterfaces/
-"
-
-KMCOMPILEONLY="
-	incidenceeditor-ng/
-	calendarsupport/
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.5.64_missing_header.patch"
-)
-
-src_unpack() {
-	if use kontact; then
-		KMEXTRA="${KMEXTRA}
-			kontact/plugins/planner/
-			kontact/plugins/specialdates/
-		"
-	fi
-
-	kde4-meta_src_unpack
-}
-
-src_install() {
-	kde4-meta_src_install
-	# colliding with kdepim-common-libs
-	rm -rf "${ED}"/usr/share/kde4/servicetypes/calendarplugin.desktop
-	rm -rf "${ED}"/usr/share/kde4/servicetypes/calendardecoration.desktop
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-
-	if ! has_version kde-base/kdepim-kresources:${SLOT}; then
-		echo
-		elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
-		echo
-	fi
-}
diff --git a/kde-base/korganizer/korganizer-4.7.1.ebuild b/kde-base/korganizer/korganizer-4.7.1.ebuild
deleted file mode 100644
index 257ddbf2bdc5..000000000000
--- a/kde-base/korganizer/korganizer-4.7.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/korganizer-4.7.1.ebuild,v 1.2 2011/10/21 23:13:22 dilfridge Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="A Personal Organizer for KDE"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
-	$(add_kdebase_dep kdepim-common-libs)
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep ktimezoned)
-"
-
-# Moved after 4.3.90
-add_blocker kontact-specialdates
-
-KMLOADLIBS="kdepim-common-libs"
-
-# xml targets from kmail are being uncommented by kde4-meta.eclass
-KMEXTRACTONLY="
-	akonadi_next/
-	calendarviews/
-	kdgantt2/
-	kmail/
-	knode/org.kde.knode.xml
-	libkdepimdbusinterfaces/
-"
-
-KMCOMPILEONLY="
-	incidenceeditor-ng/
-	calendarsupport/
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.5.64_missing_header.patch"
-)
-
-src_unpack() {
-	if use kontact; then
-		KMEXTRA="${KMEXTRA}
-			kontact/plugins/planner/
-			kontact/plugins/specialdates/
-		"
-	fi
-
-	kde4-meta_src_unpack
-}
-
-src_install() {
-	kde4-meta_src_install
-	# colliding with kdepim-common-libs
-	rm -rf "${ED}"/usr/share/kde4/servicetypes/calendarplugin.desktop
-	rm -rf "${ED}"/usr/share/kde4/servicetypes/calendardecoration.desktop
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-
-	if ! has_version kde-base/kdepim-kresources:${SLOT}; then
-		echo
-		elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
-		echo
-	fi
-}
diff --git a/kde-base/korundum/ChangeLog b/kde-base/korundum/ChangeLog
index 739a27eca182..aea1be39ce65 100644
--- a/kde-base/korundum/ChangeLog
+++ b/kde-base/korundum/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/korundum
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/korundum/ChangeLog,v 1.90 2011/10/15 17:25:57 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korundum/ChangeLog,v 1.91 2011/10/28 19:03:23 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -korundum-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -korundum-4.7.0.ebuild:
diff --git a/kde-base/korundum/korundum-4.7.1.ebuild b/kde-base/korundum/korundum-4.7.1.ebuild
deleted file mode 100644
index 3f7a5dbb7811..000000000000
--- a/kde-base/korundum/korundum-4.7.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/korundum/korundum-4.7.1.ebuild,v 1.1 2011/09/07 20:13:59 alexxy Exp $
-
-EAPI=4
-
-OPENGL_REQUIRED="always"
-KDE_SCM="git"
-
-USE_RUBY="ruby18"
-# No ruby19 for three reasons:
-# 1) it does not build (yet) - will likely be solved soon
-# 2) cmake bails when configuring twice or more - solved with CMAKE_IN_SOURCE_BUILD=1
-# 3) the ebuild can only be installed for one ruby variant, otherwise the compiled
-#    files with identical path+name will overwrite each other - difficult :(
-
-inherit kde4-base ruby-ng
-
-DESCRIPTION="KDE Ruby bindings"
-KEYWORDS="~amd64 ~x86"
-IUSE="akonadi debug kate okular semantic-desktop"
-
-DEPEND="
-	$(add_kdebase_dep qtruby)
-	$(add_kdebase_dep smokekde 'akonadi?,kate?,okular?,semantic-desktop=')
-	$(add_kdebase_dep smokeqt)
-"
-RDEPEND="${DEPEND}
-	!dev-ruby/qt4-qtruby
-"
-
-# Split from kdebindings-ruby in 4.7
-add_blocker kdebindings-ruby
-
-pkg_setup() {
-	ruby-ng_pkg_setup
-	kde4-base_pkg_setup
-}
-
-src_unpack() {
-	local S="${WORKDIR}/${P}"
-	kde4-base_src_unpack
-
-	cd "${WORKDIR}"
-	mkdir all
-	mv ${P} all/ || die "Could not move sources"
-}
-
-all_ruby_prepare() {
-	kde4-base_src_prepare
-}
-
-each_ruby_configure() {
-	CMAKE_USE_DIR=${S}
-	mycmakeargs=(
-		-DRUBY_LIBRARY=$(ruby_get_libruby)
-		-DRUBY_INCLUDE_PATH=$(ruby_get_hdrdir)
-		-DRUBY_EXECUTABLE=${RUBY}
-		$(cmake-utils_use_with akonadi)
-		$(cmake-utils_use_with akonadi KdepimLibs)
-		$(cmake-utils_use_disable kate)
-		$(cmake-utils_use_with okular)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-	)
-	kde4-base_src_configure
-}
-
-each_ruby_compile() {
-	CMAKE_USE_DIR=${S}
-	kde4-base_src_compile
-}
-
-each_ruby_install() {
-	CMAKE_USE_DIR=${S}
-	kde4-base_src_install
-}
diff --git a/kde-base/kpasswdserver/ChangeLog b/kde-base/kpasswdserver/ChangeLog
index c54f92eb8c17..7373a5e572af 100644
--- a/kde-base/kpasswdserver/ChangeLog
+++ b/kde-base/kpasswdserver/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kpasswdserver
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpasswdserver/ChangeLog,v 1.96 2011/10/15 17:25:47 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpasswdserver/ChangeLog,v 1.97 2011/10/28 19:03:17 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kpasswdserver-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kpasswdserver-4.7.0.ebuild:
diff --git a/kde-base/kpasswdserver/kpasswdserver-4.7.1.ebuild b/kde-base/kpasswdserver/kpasswdserver-4.7.1.ebuild
deleted file mode 100644
index b373381fbead..000000000000
--- a/kde-base/kpasswdserver/kpasswdserver-4.7.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpasswdserver/kpasswdserver-4.7.1.ebuild,v 1.1 2011/09/07 20:13:58 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KDED Password Module"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kpat/ChangeLog b/kde-base/kpat/ChangeLog
index c45d0db77e56..d06b4f8afefd 100644
--- a/kde-base/kpat/ChangeLog
+++ b/kde-base/kpat/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kpat
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpat/ChangeLog,v 1.185 2011/10/15 17:26:06 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpat/ChangeLog,v 1.186 2011/10/28 19:03:36 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kpat-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kpat-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kpat/kpat-4.7.1.ebuild b/kde-base/kpat/kpat-4.7.1.ebuild
deleted file mode 100644
index e991c44992cb..000000000000
--- a/kde-base/kpat/kpat-4.7.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpat/kpat-4.7.1.ebuild,v 1.1 2011/09/07 20:13:55 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE patience game"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kppp/ChangeLog b/kde-base/kppp/ChangeLog
index 6bef060e3275..5dcdd76bc510 100644
--- a/kde-base/kppp/ChangeLog
+++ b/kde-base/kppp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kppp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kppp/ChangeLog,v 1.187 2011/10/15 17:26:10 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kppp/ChangeLog,v 1.188 2011/10/28 19:03:41 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kppp-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kppp-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kppp/kppp-4.7.1.ebuild b/kde-base/kppp/kppp-4.7.1.ebuild
deleted file mode 100644
index c2fb42b2f171..000000000000
--- a/kde-base/kppp/kppp-4.7.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kppp/kppp-4.7.1.ebuild,v 1.1 2011/09/07 20:13:52 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdenetwork"
-inherit kde4-meta
-
-DESCRIPTION="KDE: A dialer and front-end to pppd."
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	net-dialup/ppp
-"
diff --git a/kde-base/kquitapp/ChangeLog b/kde-base/kquitapp/ChangeLog
index 9a599af3b18f..7b476ffc3112 100644
--- a/kde-base/kquitapp/ChangeLog
+++ b/kde-base/kquitapp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kquitapp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kquitapp/ChangeLog,v 1.96 2011/10/15 17:26:08 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kquitapp/ChangeLog,v 1.97 2011/10/28 19:03:23 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kquitapp-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kquitapp-4.7.0.ebuild:
diff --git a/kde-base/kquitapp/kquitapp-4.7.1.ebuild b/kde-base/kquitapp/kquitapp-4.7.1.ebuild
deleted file mode 100644
index cbddbc72c761..000000000000
--- a/kde-base/kquitapp/kquitapp-4.7.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kquitapp/kquitapp-4.7.1.ebuild,v 1.1 2011/09/07 20:13:47 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="A CLI application quitter"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/krdc/ChangeLog b/kde-base/krdc/ChangeLog
index 3f5484c6bc6b..f08abcae022a 100644
--- a/kde-base/krdc/ChangeLog
+++ b/kde-base/krdc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/krdc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krdc/ChangeLog,v 1.200 2011/10/15 17:26:05 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krdc/ChangeLog,v 1.201 2011/10/28 19:03:35 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -krdc-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -krdc-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/krdc/krdc-4.7.1.ebuild b/kde-base/krdc/krdc-4.7.1.ebuild
deleted file mode 100644
index 1917370acd30..000000000000
--- a/kde-base/krdc/krdc-4.7.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krdc/krdc-4.7.1.ebuild,v 1.1 2011/09/07 20:13:46 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdenetwork"
-inherit kde4-meta
-
-DESCRIPTION="KDE remote desktop connection (RDP and VNC) client"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug jpeg rdesktop vnc zeroconf"
-
-#nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 4.3.61
-#telepathy? ( >=net-libs/telepathy-qt4-0.18 ) not yet in portage/overlay
-
-DEPEND="
-	jpeg? ( virtual/jpeg )
-	vnc? ( >=net-libs/libvncserver-0.9 )
-	zeroconf? (
-		|| (
-			net-dns/avahi
-			net-misc/mDNSResponder
-		)
-	)
-"
-RDEPEND="${DEPEND}
-	rdesktop? ( net-misc/rdesktop )
-"
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_TelepathyQt4=OFF
-		$(cmake-utils_use_with jpeg)
-		# $(cmake-utils_use_with telepathy TelepathyQt4)
-		$(cmake-utils_use_with vnc LibVNCServer)
-		$(cmake-utils_use_with zeroconf DNSSD)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kreadconfig/ChangeLog b/kde-base/kreadconfig/ChangeLog
index d314515dc2b6..2f5d7e60dbc2 100644
--- a/kde-base/kreadconfig/ChangeLog
+++ b/kde-base/kreadconfig/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kreadconfig
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kreadconfig/ChangeLog,v 1.164 2011/10/15 17:25:56 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kreadconfig/ChangeLog,v 1.165 2011/10/28 19:03:42 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kreadconfig-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kreadconfig-4.7.0.ebuild:
diff --git a/kde-base/kreadconfig/kreadconfig-4.7.1.ebuild b/kde-base/kreadconfig/kreadconfig-4.7.1.ebuild
deleted file mode 100644
index b355b669622c..000000000000
--- a/kde-base/kreadconfig/kreadconfig-4.7.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kreadconfig/kreadconfig-4.7.1.ebuild,v 1.1 2011/09/07 20:13:43 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KDE: A command-line tool to read KConfig entries"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kremotecontrol/ChangeLog b/kde-base/kremotecontrol/ChangeLog
index dc59576d7868..12cea695e18f 100644
--- a/kde-base/kremotecontrol/ChangeLog
+++ b/kde-base/kremotecontrol/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kremotecontrol
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kremotecontrol/ChangeLog,v 1.28 2011/10/15 17:25:50 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kremotecontrol/ChangeLog,v 1.29 2011/10/28 19:03:19 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kremotecontrol-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kremotecontrol-4.7.0.ebuild:
diff --git a/kde-base/kremotecontrol/kremotecontrol-4.7.1.ebuild b/kde-base/kremotecontrol/kremotecontrol-4.7.1.ebuild
deleted file mode 100644
index e32c21a1ae90..000000000000
--- a/kde-base/kremotecontrol/kremotecontrol-4.7.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kremotecontrol/kremotecontrol-4.7.1.ebuild,v 1.1 2011/09/07 20:14:02 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeutils"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
-
-DESCRIPTION="KDE frontend for remote controls"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep libkworkspace)
-	$(add_kdebase_dep solid)
-"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	${kde_eclass}_src_unpack
-}
diff --git a/kde-base/kreversi/ChangeLog b/kde-base/kreversi/ChangeLog
index 7cafa2205581..c66e57fc13dd 100644
--- a/kde-base/kreversi/ChangeLog
+++ b/kde-base/kreversi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kreversi
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kreversi/ChangeLog,v 1.187 2011/10/15 17:26:04 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kreversi/ChangeLog,v 1.188 2011/10/28 19:03:33 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kreversi-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kreversi-4.7.0.ebuild:
diff --git a/kde-base/kreversi/kreversi-4.7.1.ebuild b/kde-base/kreversi/kreversi-4.7.1.ebuild
deleted file mode 100644
index bc6e5f6bc703..000000000000
--- a/kde-base/kreversi/kreversi-4.7.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kreversi/kreversi-4.7.1.ebuild,v 1.1 2011/09/07 20:13:56 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit games-ggz kde4-meta
-
-DESCRIPTION="KDE Board Game"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-src_prepare() {
-	# cmake is doing this really weird
-	sed -i \
-		-e "s:register_ggz_module:#register_ggz_module:g" \
-		${PN}/CMakeLists.txt || die "ggz removal failed"
-
-	kde4-meta_src_prepare
-}
-
-src_install() {
-	kde4-meta_src_install
-	# and also we have to prepare the ggz dir
-	insinto "${GGZ_MODDIR}"
-	newins ${PN}/module.dsc ${P}.dsc
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-	games-ggz_pkg_postinst
-}
-
-pkg_postrm() {
-	kde4-meta_pkg_postrm
-	games-ggz_pkg_postrm
-}
diff --git a/kde-base/krfb/ChangeLog b/kde-base/krfb/ChangeLog
index 9468188ad58d..503121fcab6a 100644
--- a/kde-base/krfb/ChangeLog
+++ b/kde-base/krfb/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/krfb
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krfb/ChangeLog,v 1.188 2011/10/15 17:26:08 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krfb/ChangeLog,v 1.189 2011/10/28 19:03:37 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -krfb-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -krfb-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/krfb/krfb-4.7.1.ebuild b/kde-base/krfb/krfb-4.7.1.ebuild
deleted file mode 100644
index 8c0ad3f3cf11..000000000000
--- a/kde-base/krfb/krfb-4.7.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krfb/krfb-4.7.1.ebuild,v 1.1 2011/09/07 20:13:57 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdenetwork"
-inherit kde4-meta
-
-DESCRIPTION="VNC-compatible server to share KDE desktops"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	sys-libs/zlib
-	virtual/jpeg
-	!aqua? ( x11-libs/libXdamage )
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/krossjava/ChangeLog b/kde-base/krossjava/ChangeLog
index 07efece43d13..1b4e054b2e13 100644
--- a/kde-base/krossjava/ChangeLog
+++ b/kde-base/krossjava/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/krossjava
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krossjava/ChangeLog,v 1.65 2011/10/15 17:26:14 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krossjava/ChangeLog,v 1.66 2011/10/28 19:03:46 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -krossjava-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -krossjava-4.7.0.ebuild:
diff --git a/kde-base/krossjava/krossjava-4.7.1.ebuild b/kde-base/krossjava/krossjava-4.7.1.ebuild
deleted file mode 100644
index d4566b7c8e4b..000000000000
--- a/kde-base/krossjava/krossjava-4.7.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krossjava/krossjava-4.7.1.ebuild,v 1.1 2011/09/07 20:14:04 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kross-interpreters"
-KMMODULE="java"
-KDE_SCM="git"
-inherit java-pkg-2 java-ant-2 kde4-meta eutils
-
-DESCRIPTION="Java plugin for the kdelibs/kross scripting framework."
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug"
-
-DEPEND="
-	>=virtual/jdk-1.5
-"
-RDEPEND="
-	>=virtual/jre-1.5
-"
-
-RESTRICT="test"
-
-pkg_setup() {
-	kde4-meta_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_prepare() {
-	find "${S}" -iname '*.jar' | xargs rm -v
-	kde4-meta_src_prepare
-	java-pkg-2_src_prepare
-}
-
-src_configure() {
-	kde4-meta_src_configure
-	java-ant-2_src_configure
-}
-
-src_compile() {
-	kde4-meta_src_compile
-	cd "${S}/java/${PN}/java/" || die
-	eant makejar
-}
-
-src_install() {
-	kde4-meta_src_install
-	java-pkg_dojar "${ED}/usr/$(get_libdir)/kde4/kross/kross.jar"
-
-	dosym ../../../share/${PN}-${SLOT}/lib/kross.jar \
-		/usr/$(get_libdir)/kde4/kross/kross.jar
-	java-pkg_regso "${ED}/usr/$(get_libdir)/kde4/krossjava.so"
-}
-
-pkg_preinst() {
-	kde4-meta_pkg_preinst
-	java-pkg-2_pkg_preinst
-}
diff --git a/kde-base/krosspython/ChangeLog b/kde-base/krosspython/ChangeLog
index 652e88f85b3a..02d131e0c91c 100644
--- a/kde-base/krosspython/ChangeLog
+++ b/kde-base/krosspython/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/krosspython
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krosspython/ChangeLog,v 1.79 2011/10/15 17:25:57 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krosspython/ChangeLog,v 1.80 2011/10/28 19:03:27 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -krosspython-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -krosspython-4.7.0.ebuild:
diff --git a/kde-base/krosspython/krosspython-4.7.1.ebuild b/kde-base/krosspython/krosspython-4.7.1.ebuild
deleted file mode 100644
index 98104c252493..000000000000
--- a/kde-base/krosspython/krosspython-4.7.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krosspython/krosspython-4.7.1.ebuild,v 1.1 2011/09/07 20:13:59 alexxy Exp $
-
-EAPI=3
-
-KDE_SCM="git"
-KMNAME="kross-interpreters"
-KMMODULE="python"
-PYTHON_DEPEND="2"
-inherit python kde4-meta
-
-DESCRIPTION="Kross scripting framework: Python interpreter"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-pkg_setup() {
-	python_set_active_version 2
-	kde4-meta_pkg_setup
-}
diff --git a/kde-base/krossruby/ChangeLog b/kde-base/krossruby/ChangeLog
index e9a72768fe0f..38fe868c0a4f 100644
--- a/kde-base/krossruby/ChangeLog
+++ b/kde-base/krossruby/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/krossruby
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krossruby/ChangeLog,v 1.53 2011/10/15 17:25:54 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krossruby/ChangeLog,v 1.54 2011/10/28 19:03:24 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -krossruby-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -krossruby-4.7.0.ebuild:
diff --git a/kde-base/krossruby/krossruby-4.7.1.ebuild b/kde-base/krossruby/krossruby-4.7.1.ebuild
deleted file mode 100644
index fc9d49722e60..000000000000
--- a/kde-base/krossruby/krossruby-4.7.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krossruby/krossruby-4.7.1.ebuild,v 1.1 2011/09/07 20:13:53 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kross-interpreters"
-KMMODULE="ruby"
-KDE_SCM="git"
-
-USE_RUBY="ruby18"
-# No ruby19 for three reasons:
-# 1) it does not build (yet) - will likely be solved soon
-# 2) cmake bails when configuring twice or more - solved with CMAKE_IN_SOURCE_BUILD=1
-# 3) the ebuild can only be installed for one ruby variant, otherwise the compiled
-#    files with identical path+name will overwrite each other - difficult :(
-
-inherit kde4-meta ruby-ng
-
-DESCRIPTION="Kross scripting framework: Ruby interpreter"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND=""
-RDEPEND=""
-
-# Split from kdebindings-ruby in 4.7
-add_blocker kdebindings-ruby
-
-pkg_setup() {
-	ruby-ng_pkg_setup
-	kde4-meta_pkg_setup
-}
-
-src_unpack() {
-	local S="${WORKDIR}/${P}"
-	kde4-meta_src_unpack
-
-	cd "${WORKDIR}"
-	mkdir all
-	mv ${P} all/ || die "Could not move sources"
-}
-
-all_ruby_prepare() {
-	kde4-meta_src_prepare
-}
-
-each_ruby_configure() {
-	local CMAKE_USE_DIR=${S}
-	local mycmakeargs=(
-		-DRUBY_LIBRARY=$(ruby_get_libruby)
-		-DRUBY_INCLUDE_DIR=$(ruby_get_hdrdir)
-		-DRUBY_EXECUTABLE=${RUBY}
-	)
-	kde4-meta_src_configure
-}
-
-each_ruby_compile() {
-	local CMAKE_USE_DIR=${S}
-	kde4-meta_src_compile
-}
-
-each_ruby_install() {
-	local CMAKE_USE_DIR=${S}
-	kde4-meta_src_install
-}
diff --git a/kde-base/kruler/ChangeLog b/kde-base/kruler/ChangeLog
index 5bda0b8b4b21..397ded568aab 100644
--- a/kde-base/kruler/ChangeLog
+++ b/kde-base/kruler/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kruler
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kruler/ChangeLog,v 1.181 2011/10/15 17:26:07 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kruler/ChangeLog,v 1.182 2011/10/28 19:03:37 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kruler-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kruler-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kruler/kruler-4.7.1.ebuild b/kde-base/kruler/kruler-4.7.1.ebuild
deleted file mode 100644
index d8980fc9a6fe..000000000000
--- a/kde-base/kruler/kruler-4.7.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kruler/kruler-4.7.1.ebuild,v 1.1 2011/09/07 20:13:52 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="A screen ruler for KDE"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/krunner/ChangeLog b/kde-base/krunner/ChangeLog
index 08f345e8ca1a..e3ea5ac53d7c 100644
--- a/kde-base/krunner/ChangeLog
+++ b/kde-base/krunner/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/krunner
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krunner/ChangeLog,v 1.106 2011/10/15 17:25:52 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krunner/ChangeLog,v 1.107 2011/10/28 19:03:22 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -krunner-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -krunner-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/krunner/krunner-4.7.1.ebuild b/kde-base/krunner/krunner-4.7.1.ebuild
deleted file mode 100644
index 6347348c382c..000000000000
--- a/kde-base/krunner/krunner-4.7.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krunner/krunner-4.7.1.ebuild,v 1.1 2011/09/07 20:14:03 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="KDE Command Runner"
-IUSE="debug"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-COMMONDEPEND="
-	$(add_kdebase_dep kcheckpass)
-	$(add_kdebase_dep kephal)
-	$(add_kdebase_dep ksmserver)
-	$(add_kdebase_dep ksysguard)
-	$(add_kdebase_dep libkworkspace)
-	$(add_kdebase_dep libplasmagenericshell)
-	!aqua? (
-		x11-libs/libXcursor
-		x11-libs/libXScrnSaver
-	)
-"
-DEPEND="${COMMONDEPEND}
-	!aqua? (
-		x11-libs/libXcursor
-		x11-proto/scrnsaverproto
-	)
-"
-RDEPEND="${COMMONDEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}"-4.6.2-noxf86misc.patch )
-
-KMEXTRACTONLY="
-	libs/kdm/
-	libs/kephal/
-	libs/ksysguard/
-	libs/kworkspace/
-	libs/plasmagenericshell/
-	kcheckpass/
-	ksmserver/org.kde.KSMServerInterface.xml
-	ksysguard/
-	plasma/screensaver/shell/org.kde.plasma-overlay.App.xml
-"
-
-KMLOADLIBS="libkworkspace"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with opengl OpenGL)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/ksaneplugin/ChangeLog b/kde-base/ksaneplugin/ChangeLog
index 429147c7c313..1296b83a04d1 100644
--- a/kde-base/ksaneplugin/ChangeLog
+++ b/kde-base/ksaneplugin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/ksaneplugin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksaneplugin/ChangeLog,v 1.77 2011/10/15 17:26:17 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksaneplugin/ChangeLog,v 1.78 2011/10/28 19:03:48 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -ksaneplugin-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -ksaneplugin-4.7.0.ebuild:
diff --git a/kde-base/ksaneplugin/ksaneplugin-4.7.1.ebuild b/kde-base/ksaneplugin/ksaneplugin-4.7.1.ebuild
deleted file mode 100644
index 41b455889f0b..000000000000
--- a/kde-base/ksaneplugin/ksaneplugin-4.7.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksaneplugin/ksaneplugin-4.7.1.ebuild,v 1.1 2011/09/07 20:13:39 alexxy Exp $
-
-EAPI=4
-
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="SANE Plugin for KDE"
-HOMEPAGE="http://www.kipi-plugins.org"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep libksane)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/kscd/ChangeLog b/kde-base/kscd/ChangeLog
index 6fd3849e8f68..5ae4901a8f5a 100644
--- a/kde-base/kscd/ChangeLog
+++ b/kde-base/kscd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kscd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/ChangeLog,v 1.190 2011/10/15 17:26:09 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/ChangeLog,v 1.191 2011/10/28 19:03:39 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kscd-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kscd-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kscd/kscd-4.7.1.ebuild b/kde-base/kscd/kscd-4.7.1.ebuild
deleted file mode 100644
index 28af88a94b80..000000000000
--- a/kde-base/kscd/kscd-4.7.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/kscd-4.7.1.ebuild,v 1.1 2011/09/07 20:14:02 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdemultimedia"
-inherit kde4-meta
-
-DESCRIPTION="KDE CD player"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep libkcddb)
-	$(add_kdebase_dep libkcompactdisc)
-	media-libs/musicbrainz:3
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	libkcompactdisc/
-"
-
-src_unpack() {
-	use handbook && KMEXTRA="doc/kcontrol/cddbretrieval"
-
-	kde4-meta_src_unpack
-}
diff --git a/kde-base/kscreensaver/ChangeLog b/kde-base/kscreensaver/ChangeLog
index 876e11424872..23b9a50f9bcd 100644
--- a/kde-base/kscreensaver/ChangeLog
+++ b/kde-base/kscreensaver/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kscreensaver
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/ChangeLog,v 1.195 2011/10/15 17:25:56 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/ChangeLog,v 1.196 2011/10/28 19:03:40 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kscreensaver-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kscreensaver-4.7.0.ebuild:
diff --git a/kde-base/kscreensaver/kscreensaver-4.7.1.ebuild b/kde-base/kscreensaver/kscreensaver-4.7.1.ebuild
deleted file mode 100644
index c613f2789ead..000000000000
--- a/kde-base/kscreensaver/kscreensaver-4.7.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/kscreensaver-4.7.1.ebuild,v 1.1 2011/09/07 20:14:07 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="KDE screensaver framework"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug pam"
-
-RDEPEND="
-	dev-libs/glib:2
-	$(add_kdebase_dep kcheckpass)
-	>=x11-libs/libxklavier-3.2
-	>=x11-libs/libXrandr-1.2.1
-	x11-libs/libXtst
-	opengl? ( virtual/opengl )
-	pam? ( >=kde-base/kdebase-pam-7 )
-"
-DEPEND="${RDEPEND}
-	x11-proto/randrproto
-"
-
-PATCHES=(
-	"${FILESDIR}/kdebase-4.0.2-pam-optional.patch"
-	"${FILESDIR}/${PN}-4.5.95-nsfw.patch"
-	"${FILESDIR}/${PN}-4.6.4-xf86misc.patch"
-)
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with pam)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kshisen/ChangeLog b/kde-base/kshisen/ChangeLog
index 57a4ae6a9345..58cc33eb50c2 100644
--- a/kde-base/kshisen/ChangeLog
+++ b/kde-base/kshisen/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kshisen
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kshisen/ChangeLog,v 1.184 2011/10/15 17:26:02 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kshisen/ChangeLog,v 1.185 2011/10/28 19:03:31 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kshisen-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kshisen-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kshisen/kshisen-4.7.1.ebuild b/kde-base/kshisen/kshisen-4.7.1.ebuild
deleted file mode 100644
index 1c9778f6577e..000000000000
--- a/kde-base/kshisen/kshisen-4.7.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kshisen/kshisen-4.7.1.ebuild,v 1.1 2011/09/07 20:14:08 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="A KDE game similiar to Mahjongg"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep libkmahjongg)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/ksirk/ChangeLog b/kde-base/ksirk/ChangeLog
index 2c431d3c169b..9911713cc195 100644
--- a/kde-base/ksirk/ChangeLog
+++ b/kde-base/ksirk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/ksirk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksirk/ChangeLog,v 1.83 2011/10/15 17:26:05 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksirk/ChangeLog,v 1.84 2011/10/28 19:03:35 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -ksirk-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -ksirk-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/ksirk/ksirk-4.7.1.ebuild b/kde-base/ksirk/ksirk-4.7.1.ebuild
deleted file mode 100644
index a825c9eceeca..000000000000
--- a/kde-base/ksirk/ksirk-4.7.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksirk/ksirk-4.7.1.ebuild,v 1.1 2011/09/07 20:13:57 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE: Ksirk is a KDE port of the board game risk"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	app-crypt/qca:2
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/ksmserver/ChangeLog b/kde-base/ksmserver/ChangeLog
index c534b1e6b8b1..a6ada23b1cc3 100644
--- a/kde-base/ksmserver/ChangeLog
+++ b/kde-base/ksmserver/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/ksmserver
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmserver/ChangeLog,v 1.189 2011/10/15 17:26:06 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmserver/ChangeLog,v 1.190 2011/10/28 19:03:35 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -ksmserver-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -ksmserver-4.7.0.ebuild:
diff --git a/kde-base/ksmserver/ksmserver-4.7.1.ebuild b/kde-base/ksmserver/ksmserver-4.7.1.ebuild
deleted file mode 100644
index cc6d154118f3..000000000000
--- a/kde-base/ksmserver/ksmserver-4.7.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmserver/ksmserver-4.7.1.ebuild,v 1.1 2011/09/07 20:14:08 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="The reliable KDE session manager that talks the standard X11R6"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kcminit)
-	$(add_kdebase_dep libkworkspace)
-	$(add_kdebase_dep solid)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	kcminit/main.h
-	libs/kworkspace/
-	solid/
-"
-
-KMLOADLIBS="libkworkspace"
diff --git a/kde-base/ksnapshot/ChangeLog b/kde-base/ksnapshot/ChangeLog
index 5899d35d227f..252d8fecf43b 100644
--- a/kde-base/ksnapshot/ChangeLog
+++ b/kde-base/ksnapshot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/ksnapshot
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnapshot/ChangeLog,v 1.185 2011/10/15 17:25:56 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnapshot/ChangeLog,v 1.186 2011/10/28 19:03:26 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -ksnapshot-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -ksnapshot-4.7.0.ebuild:
diff --git a/kde-base/ksnapshot/ksnapshot-4.7.1.ebuild b/kde-base/ksnapshot/ksnapshot-4.7.1.ebuild
deleted file mode 100644
index 97f639094a2c..000000000000
--- a/kde-base/ksnapshot/ksnapshot-4.7.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnapshot/ksnapshot-4.7.1.ebuild,v 1.1 2011/09/07 20:13:54 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE Screenshot Utility"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug kipi"
-
-DEPEND="
-	kipi? ( $(add_kdebase_dep libkipi) )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-4.7-kipi.patch" )
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with kipi)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/kde-base/kspaceduel/ChangeLog b/kde-base/kspaceduel/ChangeLog
index 67cbc08724dc..d3f3bfc6dc02 100644
--- a/kde-base/kspaceduel/ChangeLog
+++ b/kde-base/kspaceduel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kspaceduel
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kspaceduel/ChangeLog,v 1.183 2011/10/15 17:25:49 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kspaceduel/ChangeLog,v 1.184 2011/10/28 19:03:19 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kspaceduel-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kspaceduel-4.7.0.ebuild:
diff --git a/kde-base/kspaceduel/kspaceduel-4.7.1.ebuild b/kde-base/kspaceduel/kspaceduel-4.7.1.ebuild
deleted file mode 100644
index a0ace505ef07..000000000000
--- a/kde-base/kspaceduel/kspaceduel-4.7.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kspaceduel/kspaceduel-4.7.1.ebuild,v 1.1 2011/09/07 20:13:45 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE Space Game"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/ksplash/ChangeLog b/kde-base/ksplash/ChangeLog
index 0ad7315879f4..9c74ff5efa52 100644
--- a/kde-base/ksplash/ChangeLog
+++ b/kde-base/ksplash/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/ksplash
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplash/ChangeLog,v 1.102 2011/10/15 17:25:47 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplash/ChangeLog,v 1.103 2011/10/28 19:03:32 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -ksplash-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -ksplash-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/ksplash/ksplash-4.7.1.ebuild b/kde-base/ksplash/ksplash-4.7.1.ebuild
deleted file mode 100644
index 28c1fd66bd30..000000000000
--- a/kde-base/ksplash/ksplash-4.7.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplash/ksplash-4.7.1.ebuild,v 1.1 2011/09/07 20:13:56 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="KDE splashscreen framework (the splashscreen of KDE itself, not of individual apps)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="3dnow altivec debug mmx sse sse2 xinerama"
-
-COMMONDEPEND="
-	media-libs/libpng
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${COMMONDEPEND}
-	xinerama? ( x11-proto/xineramaproto )
-"
-RDEPEND="${COMMONDEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" )
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_has 3dnow X86_3DNOW)
-		$(cmake-utils_use_has altivec PPC_ALTIVEC)
-		$(cmake-utils_use_has mmx X86_MMX)
-		$(cmake-utils_use_has sse X86_SSE)
-		$(cmake-utils_use_has sse2 X86_SSE2)
-		$(cmake-utils_use_with xinerama X11_Xinerama)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/ksquares/ChangeLog b/kde-base/ksquares/ChangeLog
index d594210e283c..eebc44dc35b2 100644
--- a/kde-base/ksquares/ChangeLog
+++ b/kde-base/ksquares/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/ksquares
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksquares/ChangeLog,v 1.94 2011/10/15 17:25:55 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksquares/ChangeLog,v 1.95 2011/10/28 19:03:25 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -ksquares-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -ksquares-4.7.0.ebuild:
diff --git a/kde-base/ksquares/ksquares-4.7.1.ebuild b/kde-base/ksquares/ksquares-4.7.1.ebuild
deleted file mode 100644
index eb546ea14772..000000000000
--- a/kde-base/ksquares/ksquares-4.7.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksquares/ksquares-4.7.1.ebuild,v 1.1 2011/09/07 20:13:41 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit games-ggz kde4-meta
-
-DESCRIPTION="KSquares is an implementation of the game squares for KDE4"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-src_prepare() {
-	# cmake is doing this really weird
-	sed -i \
-		-e "s:register_ggz_module:#register_ggz_module:g" \
-		${PN}/src/CMakeLists.txt || die "ggz removal failed"
-
-	kde4-meta_src_prepare
-}
-
-src_install() {
-	kde4-meta_src_install
-	# and also we have to prepare the ggz dir
-	insinto "${GGZ_MODDIR}"
-	newins ${PN}/src/module.dsc ${P}.dsc
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-	games-ggz_pkg_postinst
-}
-
-pkg_postrm() {
-	kde4-meta_pkg_postrm
-	games-ggz_pkg_postrm
-}
diff --git a/kde-base/kstars/ChangeLog b/kde-base/kstars/ChangeLog
index 5846e2174ef1..359fc23f5065 100644
--- a/kde-base/kstars/ChangeLog
+++ b/kde-base/kstars/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kstars
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/ChangeLog,v 1.201 2011/10/15 17:26:08 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/ChangeLog,v 1.202 2011/10/28 19:03:37 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kstars-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kstars-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kstars/kstars-4.7.1.ebuild b/kde-base/kstars/kstars-4.7.1.ebuild
deleted file mode 100644
index fe7cef58efce..000000000000
--- a/kde-base/kstars/kstars-4.7.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/kstars-4.7.1.ebuild,v 1.1 2011/09/07 20:13:55 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE Desktop Planetarium"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug fits indi"
-
-DEPEND="
-	dev-cpp/eigen:2
-	$(add_kdebase_dep libkdeedu)
-	fits? ( >=sci-libs/cfitsio-0.390 )
-	indi? ( >=sci-libs/indilib-0.6.2[fits?] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.4.65-solaris.patch
-)
-
-src_configure() {
-	# Bug 308903
-	use ppc64 && append-flags -mminimal-toc
-
-	mycmakeargs=(
-		$(cmake-utils_use_with fits CFitsio)
-		$(cmake-utils_use_with indi)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/kde-base/kstart/ChangeLog b/kde-base/kstart/ChangeLog
index 46c5d1931637..f7677ab1d399 100644
--- a/kde-base/kstart/ChangeLog
+++ b/kde-base/kstart/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kstart
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstart/ChangeLog,v 1.166 2011/10/15 17:25:54 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstart/ChangeLog,v 1.167 2011/10/28 19:03:24 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kstart-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kstart-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kstart/kstart-4.7.1.ebuild b/kde-base/kstart/kstart-4.7.1.ebuild
deleted file mode 100644
index 95ce15138cad..000000000000
--- a/kde-base/kstart/kstart-4.7.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstart/kstart-4.7.1.ebuild,v 1.1 2011/09/07 20:13:53 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KDE: Utility to launch applications with special window properties"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kstartperf/ChangeLog b/kde-base/kstartperf/ChangeLog
index 927911618a44..4af6e67ad8bd 100644
--- a/kde-base/kstartperf/ChangeLog
+++ b/kde-base/kstartperf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kstartperf
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstartperf/ChangeLog,v 1.78 2011/10/15 17:25:49 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstartperf/ChangeLog,v 1.79 2011/10/28 19:03:18 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kstartperf-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kstartperf-4.7.0.ebuild:
diff --git a/kde-base/kstartperf/kstartperf-4.7.1.ebuild b/kde-base/kstartperf/kstartperf-4.7.1.ebuild
deleted file mode 100644
index 4979a7c7c09d..000000000000
--- a/kde-base/kstartperf/kstartperf-4.7.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstartperf/kstartperf-4.7.1.ebuild,v 1.1 2011/09/07 20:13:43 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kdesdk"
-inherit kde4-meta
-
-DESCRIPTION="Measures starting performance of applications"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kstartupconfig/ChangeLog b/kde-base/kstartupconfig/ChangeLog
index 958c736b9cbb..a4fe08a70697 100644
--- a/kde-base/kstartupconfig/ChangeLog
+++ b/kde-base/kstartupconfig/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kstartupconfig
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstartupconfig/ChangeLog,v 1.96 2011/10/15 17:26:13 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstartupconfig/ChangeLog,v 1.97 2011/10/28 19:03:45 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kstartupconfig-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kstartupconfig-4.7.0.ebuild:
diff --git a/kde-base/kstartupconfig/kstartupconfig-4.7.1.ebuild b/kde-base/kstartupconfig/kstartupconfig-4.7.1.ebuild
deleted file mode 100644
index df114bb28627..000000000000
--- a/kde-base/kstartupconfig/kstartupconfig-4.7.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstartupconfig/kstartupconfig-4.7.1.ebuild,v 1.1 2011/09/07 20:14:00 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="KDE: Utility to launch applications with special window properties"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kstyles/ChangeLog b/kde-base/kstyles/ChangeLog
index 53280646f376..71ee20ae943a 100644
--- a/kde-base/kstyles/ChangeLog
+++ b/kde-base/kstyles/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kstyles
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstyles/ChangeLog,v 1.97 2011/10/15 17:26:16 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstyles/ChangeLog,v 1.98 2011/10/28 19:03:47 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kstyles-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kstyles-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kstyles/kstyles-4.7.1.ebuild b/kde-base/kstyles/kstyles-4.7.1.ebuild
deleted file mode 100644
index 33e7e8dacce7..000000000000
--- a/kde-base/kstyles/kstyles-4.7.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstyles/kstyles-4.7.1.ebuild,v 1.1 2011/09/07 20:14:01 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="KDE: A set of different KDE styles."
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep liboxygenstyle)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	libs/oxygen
-"
diff --git a/kde-base/ksudoku/ChangeLog b/kde-base/ksudoku/ChangeLog
index 5a80c908c878..3ece5b67c6b3 100644
--- a/kde-base/ksudoku/ChangeLog
+++ b/kde-base/ksudoku/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/ksudoku
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksudoku/ChangeLog,v 1.97 2011/10/15 17:26:02 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksudoku/ChangeLog,v 1.98 2011/10/28 19:03:24 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -ksudoku-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -ksudoku-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/ksudoku/ksudoku-4.7.1.ebuild b/kde-base/ksudoku/ksudoku-4.7.1.ebuild
deleted file mode 100644
index 8266ba36f17f..000000000000
--- a/kde-base/ksudoku/ksudoku-4.7.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksudoku/ksudoku-4.7.1.ebuild,v 1.1 2011/09/07 20:13:42 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-OPENGL_REQUIRED="always"
-inherit kde4-meta
-
-DESCRIPTION="KDE Sudoku"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	!games-puzzle/ksudoku
-"
diff --git a/kde-base/ksysguard/ChangeLog b/kde-base/ksysguard/ChangeLog
index a4ff1cbdda84..2b478bcae90f 100644
--- a/kde-base/ksysguard/ChangeLog
+++ b/kde-base/ksysguard/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/ksysguard
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ChangeLog,v 1.218 2011/10/15 17:26:09 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ChangeLog,v 1.219 2011/10/28 19:03:40 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -ksysguard-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -ksysguard-4.7.0.ebuild:
diff --git a/kde-base/ksysguard/ksysguard-4.7.1.ebuild b/kde-base/ksysguard/ksysguard-4.7.1.ebuild
deleted file mode 100644
index a552c61ec7fc..000000000000
--- a/kde-base/ksysguard/ksysguard-4.7.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ksysguard-4.7.1.ebuild,v 1.1 2011/09/07 20:13:40 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-workspace"
-CPPUNIT_REQUIRED="optional"
-VIRTUALX_REQUIRED=test
-inherit kde4-meta
-
-DESCRIPTION="KSysguard is a network enabled task manager and system monitor application."
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug lm_sensors test"
-
-COMMONDEPEND="
-	x11-libs/libXrender
-	x11-libs/libXres
-	lm_sensors? ( sys-apps/lm_sensors )
-"
-DEPEND="${COMMONDEPEND}
-	x11-proto/renderproto
-"
-RDEPEND="${COMMONDEPEND}"
-
-KMEXTRA="
-	libs/ksysguard/
-"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with lm_sensors Sensors)
-	)
-
-	kde4-meta_src_configure
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-	ewarn "Note that ksysguard has powerful features; one of these is the executing of arbitrary"
-	ewarn "programs with elevated privileges (as data sources). So be careful opening worksheets"
-	ewarn "from untrusted sources!"
-}
diff --git a/kde-base/ksystemlog/ChangeLog b/kde-base/ksystemlog/ChangeLog
index 89365952f2b3..c4e34a2be90a 100644
--- a/kde-base/ksystemlog/ChangeLog
+++ b/kde-base/ksystemlog/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/ksystemlog
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksystemlog/ChangeLog,v 1.87 2011/10/15 17:26:07 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksystemlog/ChangeLog,v 1.88 2011/10/28 19:03:37 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -ksystemlog-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -ksystemlog-4.7.0.ebuild:
diff --git a/kde-base/ksystemlog/ksystemlog-4.7.1.ebuild b/kde-base/ksystemlog/ksystemlog-4.7.1.ebuild
deleted file mode 100644
index 1d5d385dd403..000000000000
--- a/kde-base/ksystemlog/ksystemlog-4.7.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksystemlog/ksystemlog-4.7.1.ebuild,v 1.1 2011/09/07 20:13:51 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdeadmin"
-
-VIRTUALX_REQUIRED=test
-inherit kde4-meta
-
-DESCRIPTION="KDE system log viewer"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug test"
-
-RESTRICT=test
-# bug 378101
-
-src_prepare() {
-	kde4-meta_src_prepare
-
-	if use test; then
-		# beat this stupid test into shape: the test files contain no year, so
-		# comparison succeeds only in 2007 !!!
-		local theyear=$(date +%Y)
-		einfo Setting the current year as ${theyear} in the test files
-		sed -e "s:2007:${theyear}:g" -i ksystemlog/tests/systemAnalyzerTest.cpp
-
-		# one test consistently fails, so comment it out for the moment
-		sed -e "s:systemAnalyzerTest:# dont run systemAnalyzerTest:g" -i ksystemlog/tests/CMakeLists.txt
-	fi
-}
diff --git a/kde-base/ksystraycmd/ChangeLog b/kde-base/ksystraycmd/ChangeLog
index 7adf7497b9cb..a0b77a107db9 100644
--- a/kde-base/ksystraycmd/ChangeLog
+++ b/kde-base/ksystraycmd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/ksystraycmd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksystraycmd/ChangeLog,v 1.174 2011/10/15 17:26:11 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksystraycmd/ChangeLog,v 1.175 2011/10/28 19:03:29 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -ksystraycmd-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -ksystraycmd-4.7.0.ebuild:
diff --git a/kde-base/ksystraycmd/ksystraycmd-4.7.1.ebuild b/kde-base/ksystraycmd/ksystraycmd-4.7.1.ebuild
deleted file mode 100644
index 7aaf4ea6fe7b..000000000000
--- a/kde-base/ksystraycmd/ksystraycmd-4.7.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksystraycmd/ksystraycmd-4.7.1.ebuild,v 1.1 2011/09/07 20:13:48 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="Ksystraycmd embeds applications given as argument into the system tray."
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kteatime/ChangeLog b/kde-base/kteatime/ChangeLog
index ca021fd8a94d..59f259f6651d 100644
--- a/kde-base/kteatime/ChangeLog
+++ b/kde-base/kteatime/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kteatime
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kteatime/ChangeLog,v 1.182 2011/10/15 17:26:16 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kteatime/ChangeLog,v 1.183 2011/10/28 19:03:47 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kteatime-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kteatime-4.7.0.ebuild:
diff --git a/kde-base/kteatime/kteatime-4.7.1.ebuild b/kde-base/kteatime/kteatime-4.7.1.ebuild
deleted file mode 100644
index 829cdc2bfb71..000000000000
--- a/kde-base/kteatime/kteatime-4.7.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kteatime/kteatime-4.7.1.ebuild,v 1.1 2011/09/07 20:14:03 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdetoys"
-inherit kde4-meta
-
-DESCRIPTION="KDE utility for making a fine cup of tea"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/ktimer/ChangeLog b/kde-base/ktimer/ChangeLog
index 16f10b3614eb..b2bf1ee13ecb 100644
--- a/kde-base/ktimer/ChangeLog
+++ b/kde-base/ktimer/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/ktimer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimer/ChangeLog,v 1.182 2011/10/15 17:26:03 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimer/ChangeLog,v 1.183 2011/10/28 19:03:32 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -ktimer-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -ktimer-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/ktimer/ktimer-4.7.1.ebuild b/kde-base/ktimer/ktimer-4.7.1.ebuild
deleted file mode 100644
index 18f9a8e276db..000000000000
--- a/kde-base/ktimer/ktimer-4.7.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimer/ktimer-4.7.1.ebuild,v 1.1 2011/09/07 20:13:56 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeutils"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
-
-DESCRIPTION="KDE Timer"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/ktimetracker/ChangeLog b/kde-base/ktimetracker/ChangeLog
index 53365f513dfb..0b5856c598fb 100644
--- a/kde-base/ktimetracker/ChangeLog
+++ b/kde-base/ktimetracker/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/ktimetracker
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimetracker/ChangeLog,v 1.87 2011/10/15 17:26:17 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimetracker/ChangeLog,v 1.88 2011/10/28 19:03:48 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -ktimetracker-4.6.1.ebuild, -ktimetracker-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -ktimetracker-4.6.1.ebuild, -ktimetracker-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -ktimetracker-4.7.0.ebuild:
diff --git a/kde-base/ktimetracker/ktimetracker-4.6.1.ebuild b/kde-base/ktimetracker/ktimetracker-4.6.1.ebuild
deleted file mode 100644
index d988cf66d6bc..000000000000
--- a/kde-base/ktimetracker/ktimetracker-4.6.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimetracker/ktimetracker-4.6.1.ebuild,v 1.1 2011/07/11 14:01:20 tampakrap Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="KTimeTracker tracks time spent on various tasks."
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	$(add_kdebase_dep kdepim-kresources)
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep kdepim-common-libs)
-	x11-libs/libXScrnSaver
-"
-DEPEND="${RDEPEND}
-	x11-proto/scrnsaverproto
-"
-
-KMEXTRACTONLY="
-	kresources/
-"
-
-KMLOADLIBS="kdepim-common-libs"
-
-src_unpack() {
-	if use kontact; then
-		KMEXTRA="${KMEXTRA} kontact/plugins/ktimetracker"
-	fi
-
-	kde4-meta_src_unpack
-}
diff --git a/kde-base/ktimetracker/ktimetracker-4.7.1.ebuild b/kde-base/ktimetracker/ktimetracker-4.7.1.ebuild
deleted file mode 100644
index a5e4cca871d2..000000000000
--- a/kde-base/ktimetracker/ktimetracker-4.7.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimetracker/ktimetracker-4.7.1.ebuild,v 1.1 2011/09/07 20:13:58 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="KTimeTracker tracks time spent on various tasks."
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	$(add_kdebase_dep kdepim-kresources)
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep kdepim-common-libs)
-	x11-libs/libXScrnSaver
-"
-DEPEND="${RDEPEND}
-	x11-proto/scrnsaverproto
-"
-
-KMEXTRACTONLY="
-	kresources/
-"
-
-KMLOADLIBS="kdepim-common-libs"
-
-src_unpack() {
-	if use kontact; then
-		KMEXTRA="${KMEXTRA} kontact/plugins/ktimetracker"
-	fi
-
-	kde4-meta_src_unpack
-}
diff --git a/kde-base/ktimezoned/ChangeLog b/kde-base/ktimezoned/ChangeLog
index b64c9ca46b95..913c81354519 100644
--- a/kde-base/ktimezoned/ChangeLog
+++ b/kde-base/ktimezoned/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/ktimezoned
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimezoned/ChangeLog,v 1.96 2011/10/15 17:26:04 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimezoned/ChangeLog,v 1.97 2011/10/28 19:03:39 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -ktimezoned-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -ktimezoned-4.7.0.ebuild:
diff --git a/kde-base/ktimezoned/ktimezoned-4.7.1.ebuild b/kde-base/ktimezoned/ktimezoned-4.7.1.ebuild
deleted file mode 100644
index 5365114f98e0..000000000000
--- a/kde-base/ktimezoned/ktimezoned-4.7.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimezoned/ktimezoned-4.7.1.ebuild,v 1.1 2011/09/07 20:13:48 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KDE: Timezone daemon"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/ktouch/ChangeLog b/kde-base/ktouch/ChangeLog
index 616b6a336ab9..0a8e0e04f57d 100644
--- a/kde-base/ktouch/ChangeLog
+++ b/kde-base/ktouch/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/ktouch
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktouch/ChangeLog,v 1.192 2011/10/15 17:25:48 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktouch/ChangeLog,v 1.193 2011/10/28 19:03:18 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -ktouch-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -ktouch-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/ktouch/ktouch-4.7.1.ebuild b/kde-base/ktouch/ktouch-4.7.1.ebuild
deleted file mode 100644
index 4b2ca450f835..000000000000
--- a/kde-base/ktouch/ktouch-4.7.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktouch/ktouch-4.7.1.ebuild,v 1.1 2011/09/07 20:13:39 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE: A program that helps you to learn and practice touch typing"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	$(add_kdebase_dep knotify)
-"
diff --git a/kde-base/ktraderclient/ChangeLog b/kde-base/ktraderclient/ChangeLog
index 6c8f7cbf05f9..c2aac259d994 100644
--- a/kde-base/ktraderclient/ChangeLog
+++ b/kde-base/ktraderclient/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/ktraderclient
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktraderclient/ChangeLog,v 1.96 2011/10/15 17:26:11 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktraderclient/ChangeLog,v 1.97 2011/10/28 19:03:42 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -ktraderclient-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -ktraderclient-4.7.0.ebuild:
diff --git a/kde-base/ktraderclient/ktraderclient-4.7.1.ebuild b/kde-base/ktraderclient/ktraderclient-4.7.1.ebuild
deleted file mode 100644
index 987f9b2730c1..000000000000
--- a/kde-base/ktraderclient/ktraderclient-4.7.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktraderclient/ktraderclient-4.7.1.ebuild,v 1.1 2011/09/07 20:14:00 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="A command-line tool for querying the KDE trader system"
-IUSE="debug"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
diff --git a/kde-base/ktron/ChangeLog b/kde-base/ktron/ChangeLog
index 0729d48c4f5b..02f2f23c23d9 100644
--- a/kde-base/ktron/ChangeLog
+++ b/kde-base/ktron/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/ktron
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktron/ChangeLog,v 1.159 2011/10/15 17:26:00 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktron/ChangeLog,v 1.160 2011/10/28 19:03:29 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -ktron-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -ktron-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/ktron/ktron-4.7.1.ebuild b/kde-base/ktron/ktron-4.7.1.ebuild
deleted file mode 100644
index 1e50eb0fa2e5..000000000000
--- a/kde-base/ktron/ktron-4.7.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktron/ktron-4.7.1.ebuild,v 1.1 2011/09/07 20:13:51 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE Tron game"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/ktuberling/ChangeLog b/kde-base/ktuberling/ChangeLog
index b1198158e215..9761199977e2 100644
--- a/kde-base/ktuberling/ChangeLog
+++ b/kde-base/ktuberling/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/ktuberling
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktuberling/ChangeLog,v 1.183 2011/10/15 17:26:09 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktuberling/ChangeLog,v 1.184 2011/10/28 19:03:35 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -ktuberling-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -ktuberling-4.7.0.ebuild:
diff --git a/kde-base/ktuberling/ktuberling-4.7.1.ebuild b/kde-base/ktuberling/ktuberling-4.7.1.ebuild
deleted file mode 100644
index 3b01f69591b2..000000000000
--- a/kde-base/ktuberling/ktuberling-4.7.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktuberling/ktuberling-4.7.1.ebuild,v 1.1 2011/09/07 20:13:53 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE: potato game for kids"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kturtle/ChangeLog b/kde-base/kturtle/ChangeLog
index 89549e39041f..64e8c27818ba 100644
--- a/kde-base/kturtle/ChangeLog
+++ b/kde-base/kturtle/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kturtle
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kturtle/ChangeLog,v 1.185 2011/10/15 17:26:14 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kturtle/ChangeLog,v 1.186 2011/10/28 19:03:46 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kturtle-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kturtle-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kturtle/kturtle-4.7.1.ebuild b/kde-base/kturtle/kturtle-4.7.1.ebuild
deleted file mode 100644
index e7aa2c292330..000000000000
--- a/kde-base/kturtle/kturtle-4.7.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kturtle/kturtle-4.7.1.ebuild,v 1.1 2011/09/07 20:13:48 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE: Educational programming environment using the Logo programming language"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	$(add_kdebase_dep knotify)
-"
diff --git a/kde-base/ktux/ChangeLog b/kde-base/ktux/ChangeLog
index 2cbe2abbed67..45ebf60015ad 100644
--- a/kde-base/ktux/ChangeLog
+++ b/kde-base/ktux/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/ktux
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktux/ChangeLog,v 1.180 2011/10/15 17:25:51 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktux/ChangeLog,v 1.181 2011/10/28 19:03:21 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -ktux-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -ktux-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/ktux/ktux-4.7.1.ebuild b/kde-base/ktux/ktux-4.7.1.ebuild
deleted file mode 100644
index 45770f7c9dbc..000000000000
--- a/kde-base/ktux/ktux-4.7.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktux/ktux-4.7.1.ebuild,v 1.1 2011/09/07 20:13:41 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kdetoys"
-inherit kde4-meta
-
-DESCRIPTION="KDE: screensaver featuring the Space-Faring Tux"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-# libkworkspace - only as a stub to provide KDE4Workspace config
-DEPEND="
-	$(add_kdebase_dep kscreensaver)
-	$(add_kdebase_dep libkworkspace)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/kubrick/ChangeLog b/kde-base/kubrick/ChangeLog
index 443e6b00159b..f1c98169c8a3 100644
--- a/kde-base/kubrick/ChangeLog
+++ b/kde-base/kubrick/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kubrick
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kubrick/ChangeLog,v 1.82 2011/10/15 17:26:12 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kubrick/ChangeLog,v 1.83 2011/10/28 19:03:43 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kubrick-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kubrick-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kubrick/kubrick-4.7.1.ebuild b/kde-base/kubrick/kubrick-4.7.1.ebuild
deleted file mode 100644
index 48bc8140d54d..000000000000
--- a/kde-base/kubrick/kubrick-4.7.1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kubrick/kubrick-4.7.1.ebuild,v 1.1 2011/09/07 20:14:03 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-OPENGL_REQUIRED="always"
-inherit kde4-meta
-
-DESCRIPTION="KDE: Kubrick is a game based on \"Rubik's Cube\" puzzle."
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kuiserver/ChangeLog b/kde-base/kuiserver/ChangeLog
index 8daa0deda4c4..18a0232ecee9 100644
--- a/kde-base/kuiserver/ChangeLog
+++ b/kde-base/kuiserver/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kuiserver
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kuiserver/ChangeLog,v 1.96 2011/10/15 17:25:56 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kuiserver/ChangeLog,v 1.97 2011/10/28 19:03:25 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kuiserver-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kuiserver-4.7.0.ebuild:
diff --git a/kde-base/kuiserver/kuiserver-4.7.1.ebuild b/kde-base/kuiserver/kuiserver-4.7.1.ebuild
deleted file mode 100644
index a88750b10293..000000000000
--- a/kde-base/kuiserver/kuiserver-4.7.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kuiserver/kuiserver-4.7.1.ebuild,v 1.1 2011/09/07 20:13:43 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KDE: Progress Info UI server"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kuiviewer/ChangeLog b/kde-base/kuiviewer/ChangeLog
index 5835146198f7..007fc843f1ca 100644
--- a/kde-base/kuiviewer/ChangeLog
+++ b/kde-base/kuiviewer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kuiviewer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kuiviewer/ChangeLog,v 1.167 2011/10/15 17:26:00 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kuiviewer/ChangeLog,v 1.168 2011/10/28 19:03:30 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kuiviewer-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kuiviewer-4.7.0.ebuild:
diff --git a/kde-base/kuiviewer/kuiviewer-4.7.1.ebuild b/kde-base/kuiviewer/kuiviewer-4.7.1.ebuild
deleted file mode 100644
index 6c3e42fed2e8..000000000000
--- a/kde-base/kuiviewer/kuiviewer-4.7.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kuiviewer/kuiviewer-4.7.1.ebuild,v 1.1 2011/09/07 20:13:55 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kdesdk"
-
-inherit kde4-meta
-
-DESCRIPTION="KDE utility that displays and tests UI files generated by Qt Designer."
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kurifilter-plugins/ChangeLog b/kde-base/kurifilter-plugins/ChangeLog
index 703a0ed298b6..9d90ef57aba6 100644
--- a/kde-base/kurifilter-plugins/ChangeLog
+++ b/kde-base/kurifilter-plugins/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kurifilter-plugins
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kurifilter-plugins/ChangeLog,v 1.93 2011/10/15 17:26:12 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kurifilter-plugins/ChangeLog,v 1.94 2011/10/28 19:03:43 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kurifilter-plugins-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kurifilter-plugins-4.7.0.ebuild:
diff --git a/kde-base/kurifilter-plugins/kurifilter-plugins-4.7.1.ebuild b/kde-base/kurifilter-plugins/kurifilter-plugins-4.7.1.ebuild
deleted file mode 100644
index f4cc1d5537ff..000000000000
--- a/kde-base/kurifilter-plugins/kurifilter-plugins-4.7.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kurifilter-plugins/kurifilter-plugins-4.7.1.ebuild,v 1.1 2011/09/07 20:14:08 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KDE: Plugins to manage filtering URIs."
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-RESTRICT="test" # Tests segfault. Last checked on 4.0.3.
diff --git a/kde-base/kuser/ChangeLog b/kde-base/kuser/ChangeLog
index a869d1dbc238..659aecada1e9 100644
--- a/kde-base/kuser/ChangeLog
+++ b/kde-base/kuser/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kuser
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kuser/ChangeLog,v 1.183 2011/10/15 17:26:12 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kuser/ChangeLog,v 1.184 2011/10/28 19:03:43 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kuser-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kuser-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kuser/kuser-4.7.1.ebuild b/kde-base/kuser/kuser-4.7.1.ebuild
deleted file mode 100644
index f6bfa7302885..000000000000
--- a/kde-base/kuser/kuser-4.7.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kuser/kuser-4.7.1.ebuild,v 1.1 2011/09/07 20:13:42 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdeadmin"
-
-inherit kde4-meta
-
-DESCRIPTION="KDE application that helps you manage system users"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-"
-# notify is needed for dialogs
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep knotify)
-"
diff --git a/kde-base/kwallet/ChangeLog b/kde-base/kwallet/ChangeLog
index cfa642e7a26c..1c1361d55d1f 100644
--- a/kde-base/kwallet/ChangeLog
+++ b/kde-base/kwallet/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kwallet
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwallet/ChangeLog,v 1.93 2011/10/15 17:26:05 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwallet/ChangeLog,v 1.94 2011/10/28 19:03:34 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kwallet-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kwallet-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kwallet/kwallet-4.7.1.ebuild b/kde-base/kwallet/kwallet-4.7.1.ebuild
deleted file mode 100644
index 0380535ef881..000000000000
--- a/kde-base/kwallet/kwallet-4.7.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwallet/kwallet-4.7.1.ebuild,v 1.1 2011/09/07 20:14:00 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeutils"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
-
-DESCRIPTION="KDE Wallet Management Tool"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kwalletd/ChangeLog b/kde-base/kwalletd/ChangeLog
index 1347b27c6758..e1e5f89cd2f6 100644
--- a/kde-base/kwalletd/ChangeLog
+++ b/kde-base/kwalletd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kwalletd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwalletd/ChangeLog,v 1.81 2011/10/15 17:26:06 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwalletd/ChangeLog,v 1.82 2011/10/28 19:03:41 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kwalletd-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kwalletd-4.7.0.ebuild:
diff --git a/kde-base/kwalletd/kwalletd-4.7.1.ebuild b/kde-base/kwalletd/kwalletd-4.7.1.ebuild
deleted file mode 100644
index fa355c9cd3c1..000000000000
--- a/kde-base/kwalletd/kwalletd-4.7.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwalletd/kwalletd-4.7.1.ebuild,v 1.1 2011/09/07 20:13:46 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KDE Password Server"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kwin/ChangeLog b/kde-base/kwin/ChangeLog
index 7c69fc3c2234..87414bc425c3 100644
--- a/kde-base/kwin/ChangeLog
+++ b/kde-base/kwin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kwin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.249 2011/10/15 17:26:01 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.250 2011/10/28 19:03:31 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kwin-4.7.1-r1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kwin-4.7.0-r1.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kwin/kwin-4.7.1-r1.ebuild b/kde-base/kwin/kwin-4.7.1-r1.ebuild
deleted file mode 100644
index 7945c37c8dbb..000000000000
--- a/kde-base/kwin/kwin-4.7.1-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.7.1-r1.ebuild,v 1.2 2011/09/25 19:31:41 dilfridge Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="KDE window manager"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug gles xinerama"
-
-COMMONDEPEND="
-	$(add_kdebase_dep kephal)
-	$(add_kdebase_dep libkworkspace)
-	$(add_kdebase_dep liboxygenstyle)
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXfixes
-	>=x11-libs/libXrandr-1.2.1
-	x11-libs/libXrender
-	opengl? ( >=media-libs/mesa-7.10 )
-	gles? (
-		|| (  ( >=media-libs/mesa-7.10[egl(+),gles] <media-libs/mesa-7.12[egl(+),gles] )
-			>=media-libs/mesa-7.12[egl(+),gles2] )
-	)
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${COMMONDEPEND}
-	x11-proto/compositeproto
-	x11-proto/damageproto
-	x11-proto/fixesproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	xinerama? ( x11-proto/xineramaproto )
-"
-RDEPEND="${COMMONDEPEND}
-	x11-apps/scripts
-"
-
-KMEXTRACTONLY="
-	ksmserver/
-	libs/kephal/
-	libs/oxygen/
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
-	"${FILESDIR}/${PN}-4.7.1-performance.patch"
-)
-
-# you can use just gles or opengl or none
-REQUIRED_USE="opengl? ( !gles ) gles? ( !opengl )"
-
-src_configure() {
-	# FIXME Remove when activity API moved away from libkworkspace
-	append-cppflags "-I${EPREFIX}/usr/include/kworkspace"
-
-	mycmakeargs=(
-		$(cmake-utils_use_with gles OpenGLES)
-		$(cmake-utils_use gles KWIN_BUILD_WITH_OPENGLES)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with xinerama X11_Xinerama)
-		-DWITH_X11_Xcomposite=ON
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kwordquiz/ChangeLog b/kde-base/kwordquiz/ChangeLog
index d801b50e5da4..3f56a912210b 100644
--- a/kde-base/kwordquiz/ChangeLog
+++ b/kde-base/kwordquiz/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kwordquiz
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwordquiz/ChangeLog,v 1.188 2011/10/15 17:25:51 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwordquiz/ChangeLog,v 1.189 2011/10/28 19:03:21 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kwordquiz-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kwordquiz-4.7.0.ebuild:
diff --git a/kde-base/kwordquiz/kwordquiz-4.7.1.ebuild b/kde-base/kwordquiz/kwordquiz-4.7.1.ebuild
deleted file mode 100644
index 8a75d4dbcc88..000000000000
--- a/kde-base/kwordquiz/kwordquiz-4.7.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwordquiz/kwordquiz-4.7.1.ebuild,v 1.1 2011/09/07 20:14:02 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE: A powerful flashcard and vocabulary learning program"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep libkdeedu)
-"
diff --git a/kde-base/kwrite/ChangeLog b/kde-base/kwrite/ChangeLog
index 9e770178e7e4..b143a4c37e29 100644
--- a/kde-base/kwrite/ChangeLog
+++ b/kde-base/kwrite/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kwrite
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwrite/ChangeLog,v 1.96 2011/10/15 17:26:04 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwrite/ChangeLog,v 1.97 2011/10/28 19:03:25 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kwrite-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kwrite-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kwrite/kwrite-4.7.1.ebuild b/kde-base/kwrite/kwrite-4.7.1.ebuild
deleted file mode 100644
index e0b424b99aec..000000000000
--- a/kde-base/kwrite/kwrite-4.7.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwrite/kwrite-4.7.1.ebuild,v 1.1 2011/09/07 20:14:05 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kate"
-KDE_SCM="git"
-inherit kde4-meta
-
-DESCRIPTION="KDE MDI editor/IDE"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	$(add_kdebase_dep katepart)
-"
diff --git a/kde-base/kwrited/ChangeLog b/kde-base/kwrited/ChangeLog
index 7c849f57694b..8019e56caf27 100644
--- a/kde-base/kwrited/ChangeLog
+++ b/kde-base/kwrited/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kwrited
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwrited/ChangeLog,v 1.80 2011/10/15 17:26:07 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwrited/ChangeLog,v 1.81 2011/10/28 19:03:37 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kwrited-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kwrited-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/kwrited/kwrited-4.7.1.ebuild b/kde-base/kwrited/kwrited-4.7.1.ebuild
deleted file mode 100644
index 914a56a6dd32..000000000000
--- a/kde-base/kwrited/kwrited-4.7.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwrited/kwrited-4.7.1.ebuild,v 1.1 2011/09/07 20:14:03 alexxy Exp $
-
-EAPI=4
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="KDE daemon listening for wall and write messages."
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	>=sys-libs/libutempter-1.1.5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/libkcddb/ChangeLog b/kde-base/libkcddb/ChangeLog
index 967ede10d010..5aeb694b153c 100644
--- a/kde-base/libkcddb/ChangeLog
+++ b/kde-base/libkcddb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/libkcddb
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcddb/ChangeLog,v 1.187 2011/10/15 17:26:09 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcddb/ChangeLog,v 1.188 2011/10/28 19:03:40 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -libkcddb-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -libkcddb-4.7.0.ebuild:
diff --git a/kde-base/libkcddb/libkcddb-4.7.1.ebuild b/kde-base/libkcddb/libkcddb-4.7.1.ebuild
deleted file mode 100644
index 6979a4c81a3d..000000000000
--- a/kde-base/libkcddb/libkcddb-4.7.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcddb/libkcddb-4.7.1.ebuild,v 1.1 2011/09/07 20:13:54 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kdemultimedia"
-inherit kde4-meta
-
-DESCRIPTION="KDE library for CDDB"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug musicbrainz"
-
-# tests require network access and compare static data with online data
-# bug 280996
-RESTRICT=test
-
-DEPEND="
-	musicbrainz? ( media-libs/musicbrainz:3 )
-"
-RDEPEND="${DEPEND}"
-
-KMSAVELIBS="true"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with musicbrainz MusicBrainz3)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/libkcompactdisc/ChangeLog b/kde-base/libkcompactdisc/ChangeLog
index 2c0786788e94..63d342dfde44 100644
--- a/kde-base/libkcompactdisc/ChangeLog
+++ b/kde-base/libkcompactdisc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/libkcompactdisc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcompactdisc/ChangeLog,v 1.93 2011/10/15 17:25:58 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcompactdisc/ChangeLog,v 1.94 2011/10/28 19:03:27 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -libkcompactdisc-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -libkcompactdisc-4.7.0.ebuild:
diff --git a/kde-base/libkcompactdisc/libkcompactdisc-4.7.1.ebuild b/kde-base/libkcompactdisc/libkcompactdisc-4.7.1.ebuild
deleted file mode 100644
index 44815b230750..000000000000
--- a/kde-base/libkcompactdisc/libkcompactdisc-4.7.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcompactdisc/libkcompactdisc-4.7.1.ebuild,v 1.1 2011/09/07 20:13:53 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kdemultimedia"
-inherit kde4-meta
-
-DESCRIPTION="KDE library for playing & ripping CDs"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="alsa debug"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with alsa)
-	)
-	kde4-meta_src_configure
-}
diff --git a/kde-base/libkdcraw/ChangeLog b/kde-base/libkdcraw/ChangeLog
index 0d95daa1b2c2..6e64a772bd11 100644
--- a/kde-base/libkdcraw/ChangeLog
+++ b/kde-base/libkdcraw/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/libkdcraw
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdcraw/ChangeLog,v 1.91 2011/10/15 17:26:16 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdcraw/ChangeLog,v 1.92 2011/10/28 19:03:48 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -libkdcraw-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -libkdcraw-4.7.0.ebuild:
diff --git a/kde-base/libkdcraw/libkdcraw-4.7.1.ebuild b/kde-base/libkdcraw/libkdcraw-4.7.1.ebuild
deleted file mode 100644
index cdfc17085bf1..000000000000
--- a/kde-base/libkdcraw/libkdcraw-4.7.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdcraw/libkdcraw-4.7.1.ebuild,v 1.1 2011/09/07 20:14:07 alexxy Exp $
-
-EAPI=4
-
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE digital camera raw image library wrapper"
-HOMEPAGE="http://www.kipi-plugins.org"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	media-libs/lcms:0
-	virtual/jpeg
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/libkdeedu/ChangeLog b/kde-base/libkdeedu/ChangeLog
index e4914fd39e8b..b59d9447c39c 100644
--- a/kde-base/libkdeedu/ChangeLog
+++ b/kde-base/libkdeedu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/libkdeedu
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdeedu/ChangeLog,v 1.188 2011/10/15 17:26:08 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdeedu/ChangeLog,v 1.189 2011/10/28 19:03:37 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -libkdeedu-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -libkdeedu-4.7.0.ebuild:
diff --git a/kde-base/libkdeedu/libkdeedu-4.7.1.ebuild b/kde-base/libkdeedu/libkdeedu-4.7.1.ebuild
deleted file mode 100644
index 614d0cd230d8..000000000000
--- a/kde-base/libkdeedu/libkdeedu-4.7.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdeedu/libkdeedu-4.7.1.ebuild,v 1.1 2011/09/07 20:13:47 alexxy Exp $
-
-EAPI=4
-
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="Common library for KDE educational apps"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-# 4 of 4 tests fail. Last checked for 4.6.1. Tests are fundamentally broken,
-# see bug 258857 for details.
-RESTRICT=test
-
-add_blocker kvtml-data
diff --git a/kde-base/libkdegames/ChangeLog b/kde-base/libkdegames/ChangeLog
index 1117111ace2c..cf54931a03cd 100644
--- a/kde-base/libkdegames/ChangeLog
+++ b/kde-base/libkdegames/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/libkdegames
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdegames/ChangeLog,v 1.189 2011/10/15 17:25:52 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdegames/ChangeLog,v 1.190 2011/10/28 19:03:26 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -libkdegames-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -libkdegames-4.7.0.ebuild:
diff --git a/kde-base/libkdegames/libkdegames-4.7.1.ebuild b/kde-base/libkdegames/libkdegames-4.7.1.ebuild
deleted file mode 100644
index 8ff044868a48..000000000000
--- a/kde-base/libkdegames/libkdegames-4.7.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdegames/libkdegames-4.7.1.ebuild,v 1.1 2011/09/07 20:13:44 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="Base library common to many KDE games."
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	>=dev-games/ggz-client-libs-0.0.14
-"
-RDEPEND="${DEPEND}"
-
-KMSAVELIBS="true"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.2.0-darwin.patch
-)
diff --git a/kde-base/libkexiv2/ChangeLog b/kde-base/libkexiv2/ChangeLog
index 22772abf6fb2..e27a86549e50 100644
--- a/kde-base/libkexiv2/ChangeLog
+++ b/kde-base/libkexiv2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/libkexiv2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkexiv2/ChangeLog,v 1.90 2011/10/15 17:26:07 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkexiv2/ChangeLog,v 1.91 2011/10/28 19:03:39 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -libkexiv2-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -libkexiv2-4.7.0.ebuild:
diff --git a/kde-base/libkexiv2/libkexiv2-4.7.1.ebuild b/kde-base/libkexiv2/libkexiv2-4.7.1.ebuild
deleted file mode 100644
index 4f1bc846374d..000000000000
--- a/kde-base/libkexiv2/libkexiv2-4.7.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkexiv2/libkexiv2-4.7.1.ebuild,v 1.1 2011/09/07 20:13:47 alexxy Exp $
-
-EAPI=4
-
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE Image Plugin Interface: an exiv2 library wrapper"
-HOMEPAGE="http://www.kipi-plugins.org"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	>=media-gfx/exiv2-0.20
-	media-libs/lcms:0
-	virtual/jpeg
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/libkipi/ChangeLog b/kde-base/libkipi/ChangeLog
index 58c56ba80a33..ce0f1d2ab54d 100644
--- a/kde-base/libkipi/ChangeLog
+++ b/kde-base/libkipi/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/libkipi
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkipi/ChangeLog,v 1.84 2011/10/15 17:26:02 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkipi/ChangeLog,v 1.85 2011/10/28 19:03:32 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -libkipi-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -libkipi-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/libkipi/libkipi-4.7.1.ebuild b/kde-base/libkipi/libkipi-4.7.1.ebuild
deleted file mode 100644
index 9813e0250c3b..000000000000
--- a/kde-base/libkipi/libkipi-4.7.1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkipi/libkipi-4.7.1.ebuild,v 1.1 2011/09/07 20:13:45 alexxy Exp $
-
-EAPI=4
-
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="A library for image plugins accross KDE applications."
-HOMEPAGE="http://www.kipi-plugins.org"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/libkmahjongg/ChangeLog b/kde-base/libkmahjongg/ChangeLog
index c12de51761c9..80a122e7f455 100644
--- a/kde-base/libkmahjongg/ChangeLog
+++ b/kde-base/libkmahjongg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/libkmahjongg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkmahjongg/ChangeLog,v 1.91 2011/10/15 17:26:08 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkmahjongg/ChangeLog,v 1.92 2011/10/28 19:03:37 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -libkmahjongg-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -libkmahjongg-4.7.0.ebuild:
diff --git a/kde-base/libkmahjongg/libkmahjongg-4.7.1.ebuild b/kde-base/libkmahjongg/libkmahjongg-4.7.1.ebuild
deleted file mode 100644
index 76bbfce18e72..000000000000
--- a/kde-base/libkmahjongg/libkmahjongg-4.7.1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkmahjongg/libkmahjongg-4.7.1.ebuild,v 1.1 2011/09/07 20:13:48 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="LibKMahjongg for KDE"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-KMLOADLIBS="libkdegames"
diff --git a/kde-base/libkonq/ChangeLog b/kde-base/libkonq/ChangeLog
index 572ef60db944..d15480898b51 100644
--- a/kde-base/libkonq/ChangeLog
+++ b/kde-base/libkonq/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/libkonq
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkonq/ChangeLog,v 1.194 2011/10/15 17:26:11 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkonq/ChangeLog,v 1.195 2011/10/28 19:03:28 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -libkonq-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -libkonq-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/libkonq/libkonq-4.7.1.ebuild b/kde-base/libkonq/libkonq-4.7.1.ebuild
deleted file mode 100644
index d60d8dd732e9..000000000000
--- a/kde-base/libkonq/libkonq-4.7.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkonq/libkonq-4.7.1.ebuild,v 1.1 2011/09/07 20:13:40 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-baseapps"
-KMMODULE="lib/konq"
-CPPUNIT_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="The embeddable part of konqueror"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-RESTRICT="test"
-
-KMSAVELIBS="true"
-
-PATCHES=( "${FILESDIR}/${PN}-4.5.56-cmake.patch" )
diff --git a/kde-base/libksane/ChangeLog b/kde-base/libksane/ChangeLog
index a6aec98bff3d..66ff79ac8493 100644
--- a/kde-base/libksane/ChangeLog
+++ b/kde-base/libksane/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/libksane
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libksane/ChangeLog,v 1.84 2011/10/15 17:26:14 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libksane/ChangeLog,v 1.85 2011/10/28 19:03:36 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -libksane-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -libksane-4.7.0.ebuild:
diff --git a/kde-base/libksane/libksane-4.7.1.ebuild b/kde-base/libksane/libksane-4.7.1.ebuild
deleted file mode 100644
index 0f8e493c5d4c..000000000000
--- a/kde-base/libksane/libksane-4.7.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libksane/libksane-4.7.1.ebuild,v 1.1 2011/09/07 20:13:45 alexxy Exp $
-
-EAPI=4
-
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="SANE Library interface for KDE"
-HOMEPAGE="http://www.kipi-plugins.org"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-LICENSE="LGPL-2"
-
-DEPEND="
-	media-gfx/sane-backends
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/libkworkspace/ChangeLog b/kde-base/libkworkspace/ChangeLog
index aacc3ec211c7..83bc49690d9d 100644
--- a/kde-base/libkworkspace/ChangeLog
+++ b/kde-base/libkworkspace/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/libkworkspace
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkworkspace/ChangeLog,v 1.108 2011/10/15 17:26:09 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkworkspace/ChangeLog,v 1.109 2011/10/28 19:03:39 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -libkworkspace-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -libkworkspace-4.7.0.ebuild:
diff --git a/kde-base/libkworkspace/libkworkspace-4.7.1.ebuild b/kde-base/libkworkspace/libkworkspace-4.7.1.ebuild
deleted file mode 100644
index f04a2c135d6d..000000000000
--- a/kde-base/libkworkspace/libkworkspace-4.7.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkworkspace/libkworkspace-4.7.1.ebuild,v 1.1 2011/09/07 20:13:45 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-KMMODULE="libs/kworkspace"
-inherit kde4-meta
-
-DESCRIPTION="A library for KDE desktop applications"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-KMEXTRACTONLY="
-	ksmserver/org.kde.KSMServerInterface.xml
-	kwin/org.kde.KWin.xml
-"
-
-KMSAVELIBS="true"
-
-DEPEND="
-	x11-libs/libxkbfile
-	x11-libs/libXcomposite
-"
-RDEPEND=${DEPEND}
-
-src_prepare() {
-	sed -i -e 's/install( FILES kdisplaymanager.h/install( FILES kdisplaymanager.h screenpreviewwidget.h/' \
-		libs/kworkspace/CMakeLists.txt || die "failed to provide screenpreviewwidget.h"
-
-	kde4-meta_src_prepare
-}
diff --git a/kde-base/liboxygenstyle/ChangeLog b/kde-base/liboxygenstyle/ChangeLog
index 8b711ca18234..086fc15aef20 100644
--- a/kde-base/liboxygenstyle/ChangeLog
+++ b/kde-base/liboxygenstyle/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/liboxygenstyle
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/liboxygenstyle/ChangeLog,v 1.29 2011/10/15 17:26:17 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/liboxygenstyle/ChangeLog,v 1.30 2011/10/28 19:03:48 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -liboxygenstyle-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -liboxygenstyle-4.7.0.ebuild:
diff --git a/kde-base/liboxygenstyle/liboxygenstyle-4.7.1.ebuild b/kde-base/liboxygenstyle/liboxygenstyle-4.7.1.ebuild
deleted file mode 100644
index d5a246d1c0ca..000000000000
--- a/kde-base/liboxygenstyle/liboxygenstyle-4.7.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/liboxygenstyle/liboxygenstyle-4.7.1.ebuild,v 1.1 2011/09/07 20:13:49 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-KMMODULE="libs/oxygen"
-inherit kde4-meta
-
-DESCRIPTION="Library to support the Oxygen style in KDE"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/libplasmaclock/ChangeLog b/kde-base/libplasmaclock/ChangeLog
index 094e31e1328b..4595c62b31e0 100644
--- a/kde-base/libplasmaclock/ChangeLog
+++ b/kde-base/libplasmaclock/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/libplasmaclock
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libplasmaclock/ChangeLog,v 1.82 2011/10/15 17:26:06 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libplasmaclock/ChangeLog,v 1.83 2011/10/28 19:03:31 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -libplasmaclock-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -libplasmaclock-4.7.0.ebuild:
diff --git a/kde-base/libplasmaclock/libplasmaclock-4.7.1.ebuild b/kde-base/libplasmaclock/libplasmaclock-4.7.1.ebuild
deleted file mode 100644
index a65504d7d659..000000000000
--- a/kde-base/libplasmaclock/libplasmaclock-4.7.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libplasmaclock/libplasmaclock-4.7.1.ebuild,v 1.1 2011/09/07 20:13:59 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-KMMODULE="libs/plasmaclock"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="Libraries for KDE Plasma's clocks"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +holidays"
-
-DEPEND="
-	$(add_kdebase_dep kephal)
-	holidays? ( $(add_kdebase_dep kdepimlibs) )
-"
-RDEPEND="${DEPEND}"
-
-KMSAVELIBS="true"
-
-KMEXTRACTONLY="
-	libs/kephal/
-"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with holidays KdepimLibs)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/libplasmagenericshell/ChangeLog b/kde-base/libplasmagenericshell/ChangeLog
index 161ac89759cb..1d2b0fdb34f8 100644
--- a/kde-base/libplasmagenericshell/ChangeLog
+++ b/kde-base/libplasmagenericshell/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/libplasmagenericshell
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libplasmagenericshell/ChangeLog,v 1.47 2011/10/15 17:25:48 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libplasmagenericshell/ChangeLog,v 1.48 2011/10/28 19:03:17 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -libplasmagenericshell-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -libplasmagenericshell-4.7.0.ebuild:
diff --git a/kde-base/libplasmagenericshell/libplasmagenericshell-4.7.1.ebuild b/kde-base/libplasmagenericshell/libplasmagenericshell-4.7.1.ebuild
deleted file mode 100644
index b09607eeb205..000000000000
--- a/kde-base/libplasmagenericshell/libplasmagenericshell-4.7.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libplasmagenericshell/libplasmagenericshell-4.7.1.ebuild,v 1.1 2011/09/07 20:14:04 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-KMMODULE="libs/plasmagenericshell"
-inherit kde4-meta
-
-DESCRIPTION="Libraries for the KDE Plasma shell"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug test"
-
-DEPEND="
-	$(add_kdebase_dep kephal)
-	$(add_kdebase_dep libkworkspace)
-"
-
-RDEPEND="${DEPEND}"
-
-KMSAVELIBS="true"
-
-KMEXTRACTONLY="
-	libs/kephal/kephal/
-	plasma/desktop/shell/data/
-"
diff --git a/kde-base/libtaskmanager/ChangeLog b/kde-base/libtaskmanager/ChangeLog
index 1ae517a9de30..d8b321ad1124 100644
--- a/kde-base/libtaskmanager/ChangeLog
+++ b/kde-base/libtaskmanager/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/libtaskmanager
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libtaskmanager/ChangeLog,v 1.97 2011/10/15 17:25:56 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libtaskmanager/ChangeLog,v 1.98 2011/10/28 19:03:26 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -libtaskmanager-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -libtaskmanager-4.7.0.ebuild:
diff --git a/kde-base/libtaskmanager/libtaskmanager-4.7.1.ebuild b/kde-base/libtaskmanager/libtaskmanager-4.7.1.ebuild
deleted file mode 100644
index d815e91fd73a..000000000000
--- a/kde-base/libtaskmanager/libtaskmanager-4.7.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libtaskmanager/libtaskmanager-4.7.1.ebuild,v 1.1 2011/09/07 20:14:07 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-KMMODULE="libs/taskmanager"
-inherit kde4-meta
-
-DESCRIPTION="A library that provides basic taskmanager functionality"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kephal)
-	$(add_kdebase_dep libkworkspace)
-"
-RDEPEND="${DEPEND}"
-
-KMSAVELIBS="true"
-
-KMEXTRACTONLY="
-	libs/kephal/
-	libs/kworkspace/
-"
diff --git a/kde-base/lokalize/ChangeLog b/kde-base/lokalize/ChangeLog
index 1bcea8d4a6c2..d02999c42c9d 100644
--- a/kde-base/lokalize/ChangeLog
+++ b/kde-base/lokalize/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/lokalize
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/lokalize/ChangeLog,v 1.85 2011/10/15 17:25:48 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lokalize/ChangeLog,v 1.86 2011/10/28 19:03:17 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -lokalize-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -lokalize-4.7.0.ebuild:
diff --git a/kde-base/lokalize/lokalize-4.7.1.ebuild b/kde-base/lokalize/lokalize-4.7.1.ebuild
deleted file mode 100644
index fb23ec5eec27..000000000000
--- a/kde-base/lokalize/lokalize-4.7.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/lokalize/lokalize-4.7.1.ebuild,v 1.3 2011/09/27 20:55:44 dilfridge Exp $
-
-EAPI=3
-
-KDE_HANDBOOK="optional"
-KMNAME="kdesdk"
-PYTHON_DEPEND="2"
-inherit python kde4-meta
-
-DESCRIPTION="KDE4 translation tool"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug semantic-desktop"
-
-DEPEND="
-	>=app-text/hunspell-1.2.8
-	>=x11-libs/qt-sql-4.5.0:4[sqlite]
-	semantic-desktop? ( dev-libs/soprano )
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdesdk-strigi-analyzer)
-	$(add_kdebase_dep krosspython)
-	$(add_kdebase_dep pykde4)
-"
-
-PATCHES=( "${FILESDIR}/${PN}"-4.6.5-hunspell.patch )
-
-pkg_setup() {
-	kde4-meta_pkg_setup
-	python_set_active_version 2
-}
-
-src_install() {
-	kde4-meta_src_install
-	python_convert_shebangs -q -r $(python_get_version) "${ED}${PREFIX}/share/apps/${PN}"
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-	echo
-	elog "To be able to autofetch KDE translations in new project wizard, install subversion client:"
-	elog "	emerge -vau subversion"
-	echo
-}
diff --git a/kde-base/lskat/ChangeLog b/kde-base/lskat/ChangeLog
index 817ca0c87a18..125f1cfdc812 100644
--- a/kde-base/lskat/ChangeLog
+++ b/kde-base/lskat/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/lskat
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/lskat/ChangeLog,v 1.184 2011/10/15 17:26:05 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lskat/ChangeLog,v 1.185 2011/10/28 19:03:35 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -lskat-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -lskat-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/lskat/lskat-4.7.1.ebuild b/kde-base/lskat/lskat-4.7.1.ebuild
deleted file mode 100644
index 170a6930c5fe..000000000000
--- a/kde-base/lskat/lskat-4.7.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/lskat/lskat-4.7.1.ebuild,v 1.1 2011/09/07 20:13:44 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="Skat game for KDE"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/marble/ChangeLog b/kde-base/marble/ChangeLog
index b2e219838217..a0a348d656e0 100644
--- a/kde-base/marble/ChangeLog
+++ b/kde-base/marble/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/marble
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.109 2011/10/15 17:25:49 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.110 2011/10/28 19:03:19 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -marble-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -marble-4.7.0.ebuild,
   -marble-4.7.0-r1.ebuild:
diff --git a/kde-base/marble/marble-4.7.1.ebuild b/kde-base/marble/marble-4.7.1.ebuild
deleted file mode 100644
index be5625d39ddf..000000000000
--- a/kde-base/marble/marble-4.7.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.7.1.ebuild,v 1.1 2011/09/07 20:13:47 alexxy Exp $
-
-EAPI=3
-
-KDE_HANDBOOK="optional"
-KDE_REQUIRED="optional"
-CPPUNIT_REQUIRED="optional"
-PYTHON_DEPEND="python? 2"
-KDE_SCM="git"
-inherit kde4-base python
-
-DESCRIPTION="Generic geographical map widget"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug designer-plugin gps +kde plasma python"
-
-# tests fail / segfault. Last checked for 4.2.88
-RESTRICT=test
-
-DEPEND="
-	gps? ( >=sci-geosciences/gpsd-2.95[qt4] )
-	python? (
-		>=dev-python/PyQt4-4.4.4-r1
-		kde? ( $(add_kdebase_dep pykde4) )
-	)
-"
-RDEPEND="${DEPEND}
-	!sci-geosciences/marble
-"
-
-PATCHES=(
-			"${FILESDIR}/${PN}-4.7-magic-r1.patch"
-			"${FILESDIR}/${PN}-4.5.5-gpsd.patch"
-)
-
-pkg_setup() {
-	python_set_active_version 2
-	kde4-base_pkg_setup
-}
-
-src_prepare() {
-	kde4-base_src_prepare
-	python_convert_shebangs -r $(python_get_version) .
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN)
-		$(cmake-utils_use python EXPERIMENTAL_PYTHON_BINDINGS)
-		$(cmake-utils_use_with python PyQt4)
-		$(cmake-utils_use_with python PythonLibrary)
-		$(cmake-utils_use_with python SIP)
-		$(cmake-utils_use_with gps libgps)
-		-DWITH_liblocation=0
-	)
-	use kde || mycmakeargs=(
-		-DQTONLY=ON
-		${mycmakeargs[@]}
-	)
-	use kde && mycmakeargs=(
-		$(cmake-utils_use_with plasma)
-		$(cmake-utils_use_with python PyKDE4)
-		${mycmakeargs[@]}
-	)
-
-	find "${S}/marble/src/bindings/python/sip" -name "*.sip" | xargs -- sed -i 's/#include <marble\//#include </'
-
-	kde4-base_src_configure
-}
-
-src_install() {
-	if use plasma; then
-		insinto /usr/share/apps/cmake/modules
-		doins "${S}"/cmake/modules/FindMarbleWidget.cmake
-	fi
-	kde4-base_src_install
-}
diff --git a/kde-base/mplayerthumbs/ChangeLog b/kde-base/mplayerthumbs/ChangeLog
index 9f2ef8b8b440..407365ad4e0a 100644
--- a/kde-base/mplayerthumbs/ChangeLog
+++ b/kde-base/mplayerthumbs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/mplayerthumbs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/mplayerthumbs/ChangeLog,v 1.68 2011/10/15 17:25:48 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/mplayerthumbs/ChangeLog,v 1.69 2011/10/28 19:03:17 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -mplayerthumbs-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -mplayerthumbs-4.7.0.ebuild:
diff --git a/kde-base/mplayerthumbs/mplayerthumbs-4.7.1.ebuild b/kde-base/mplayerthumbs/mplayerthumbs-4.7.1.ebuild
deleted file mode 100644
index 1a2c7c23973e..000000000000
--- a/kde-base/mplayerthumbs/mplayerthumbs-4.7.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/mplayerthumbs/mplayerthumbs-4.7.1.ebuild,v 1.1 2011/09/07 20:13:38 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kdemultimedia"
-inherit kde4-meta
-
-DESCRIPTION="A Thumbnail Generator for Video Files on KDE filemanagers."
-HOMEPAGE="http://www.kde-apps.org/content/show.php?content=41180"
-LICENSE="GPL-2"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	!media-video/mplayerthumbs
-	|| (
-		$(add_kdebase_dep dolphin)
-		$(add_kdebase_dep konqueror)
-	)
-"
-
-src_configure() {
-	mycmakeargs=(
-		-DENABLE_PHONON_SUPPORT=ON
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/nepomuk/ChangeLog b/kde-base/nepomuk/ChangeLog
index 3cdeb7e008ab..3cb7d7a37306 100644
--- a/kde-base/nepomuk/ChangeLog
+++ b/kde-base/nepomuk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/nepomuk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/nepomuk/ChangeLog,v 1.101 2011/10/15 17:25:57 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nepomuk/ChangeLog,v 1.102 2011/10/28 19:03:38 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -nepomuk-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -nepomuk-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/nepomuk/nepomuk-4.7.1.ebuild b/kde-base/nepomuk/nepomuk-4.7.1.ebuild
deleted file mode 100644
index d72e9ec8a9fc..000000000000
--- a/kde-base/nepomuk/nepomuk-4.7.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/nepomuk/nepomuk-4.7.1.ebuild,v 1.1 2011/09/07 20:14:03 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="Nepomuk KDE4 client"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	>=app-misc/strigi-0.6.3[dbus,qt4]
-	>=dev-libs/soprano-2.6.51[dbus,raptor,redland,virtuoso]
-	$(add_kdebase_dep kdelibs 'semantic-desktop')
-	!kde-misc/nepomukcontroller
-"
-RDEPEND="${DEPEND}"
-
-# BLOCKS:
-# kde-base/akonadi: installed nepomuk ontologies, which were supposed to be here
-add_blocker akonadi '<4.2.60'
diff --git a/kde-base/nsplugins/ChangeLog b/kde-base/nsplugins/ChangeLog
index 199077b175f9..57164e1f0e67 100644
--- a/kde-base/nsplugins/ChangeLog
+++ b/kde-base/nsplugins/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/nsplugins
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/ChangeLog,v 1.213 2011/10/15 17:26:12 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/ChangeLog,v 1.214 2011/10/28 19:03:26 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -nsplugins-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -nsplugins-4.7.0.ebuild:
diff --git a/kde-base/nsplugins/nsplugins-4.7.1.ebuild b/kde-base/nsplugins/nsplugins-4.7.1.ebuild
deleted file mode 100644
index fecb3962121d..000000000000
--- a/kde-base/nsplugins/nsplugins-4.7.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/nsplugins-4.7.1.ebuild,v 1.1 2011/09/07 20:13:43 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-baseapps"
-inherit kde4-meta
-
-DESCRIPTION="Netscape plugins support for Konqueror."
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	x11-libs/libXt
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep konqueror)
-"
-
-KMEXTRACTONLY="
-	konqueror/settings/
-"
-
-PATCHES=( "${FILESDIR}/${PN}"-4.6.1-enablefinal.patch )
diff --git a/kde-base/okteta/ChangeLog b/kde-base/okteta/ChangeLog
index 95fc0e6b311f..706f424deb22 100644
--- a/kde-base/okteta/ChangeLog
+++ b/kde-base/okteta/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/okteta
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/okteta/ChangeLog,v 1.86 2011/10/15 17:26:11 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/okteta/ChangeLog,v 1.87 2011/10/28 19:03:42 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -okteta-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -okteta-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/okteta/okteta-4.7.1.ebuild b/kde-base/okteta/okteta-4.7.1.ebuild
deleted file mode 100644
index f46248410e64..000000000000
--- a/kde-base/okteta/okteta-4.7.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/okteta/okteta-4.7.1.ebuild,v 1.1 2011/09/07 20:13:54 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdesdk"
-inherit kde4-meta
-
-DESCRIPTION="KDE hexeditor"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	app-crypt/qca:2
-"
-RDEPEND="${DEPEND}"
-
-# Tests hang, last checked in 4.3.3
-RESTRICT="test"
diff --git a/kde-base/okular/ChangeLog b/kde-base/okular/ChangeLog
index c4c8de4cdc3b..7bfd327a1195 100644
--- a/kde-base/okular/ChangeLog
+++ b/kde-base/okular/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/okular
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/ChangeLog,v 1.115 2011/10/15 17:26:14 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/ChangeLog,v 1.116 2011/10/28 19:03:46 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -okular-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -okular-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/okular/okular-4.7.1.ebuild b/kde-base/okular/okular-4.7.1.ebuild
deleted file mode 100644
index 302cdba339a4..000000000000
--- a/kde-base/okular/okular-4.7.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/okular-4.7.1.ebuild,v 1.2 2011/09/28 22:41:10 reavertm Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="Okular is an universal document viewer based on KPDF for KDE 4."
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="chm crypt debug djvu ebook +jpeg +ps +pdf +tiff"
-
-DEPEND="
-	media-libs/freetype
-	media-libs/qimageblitz
-	sys-libs/zlib
-	chm? ( dev-libs/chmlib )
-	crypt? ( app-crypt/qca:2 )
-	djvu? ( app-text/djvu )
-	ebook? ( app-text/ebook-tools )
-	jpeg? ( virtual/jpeg:0 )
-	pdf? ( >=app-text/poppler-0.12.3-r3[lcms,qt4,-exceptions(-)] )
-	ps? ( app-text/libspectre )
-	tiff? ( media-libs/tiff )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with chm)
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with djvu DjVuLibre)
-		$(cmake-utils_use_with ebook EPub)
-		$(cmake-utils_use_with jpeg)
-		$(cmake-utils_use_with ps LibSpectre)
-		$(cmake-utils_use_with pdf PopplerQt4)
-		$(cmake-utils_use_with pdf Poppler)
-		$(cmake-utils_use_with tiff)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/kde-base/oxygen-icons/ChangeLog b/kde-base/oxygen-icons/ChangeLog
index e7c5c6e05008..119f5f390436 100644
--- a/kde-base/oxygen-icons/ChangeLog
+++ b/kde-base/oxygen-icons/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/oxygen-icons
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/oxygen-icons/ChangeLog,v 1.81 2011/10/15 17:26:01 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/oxygen-icons/ChangeLog,v 1.82 2011/10/28 19:03:30 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -oxygen-icons-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -oxygen-icons-4.7.0.ebuild:
diff --git a/kde-base/oxygen-icons/oxygen-icons-4.7.1.ebuild b/kde-base/oxygen-icons/oxygen-icons-4.7.1.ebuild
deleted file mode 100644
index 641c77d1044b..000000000000
--- a/kde-base/oxygen-icons/oxygen-icons-4.7.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/oxygen-icons/oxygen-icons-4.7.1.ebuild,v 1.1 2011/09/07 20:14:02 alexxy Exp $
-
-EAPI=4
-
-if [[ ${PV} == *9999 ]]; then
-	KMNAME="kdesupport"
-else
-	# Upstream does not ship releases properly so we dont want all versions
-	MY_PV="4.7.0"
-	MY_P="${PN}-${MY_PV}"
-fi
-KDE_REQUIRED="never"
-inherit kde4-base
-
-DESCRIPTION="Oxygen SVG icon theme."
-HOMEPAGE="http://www.oxygen-icons.org/"
-# Note that the upstream tarball is .bz2, ours is .xz -- if upstream
-# changes its compression format to .xz, we will need to change the
-# filename of one of the tarballs
-[[ ${PV} == *9999 ]] || \
-SRC_URI="
-	!bindist? ( http://dev.gentoo.org/~scarabeus/${MY_P}.tar.xz )
-	bindist? ( ${SRC_URI//${PV}/${MY_PV}} )
-"
-
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="aqua bindist"
-
-DEPEND="
-	!bindist? ( app-arch/xz-utils )
-"
-RDEPEND=""
-
-[[ ${PV} == *9999 ]] || S=${WORKDIR}/${MY_P}
-
-# Block conflicting packages
-add_blocker kdebase-data '<4.2.67'
-add_blocker kdepim-icons 4.2.89
-add_blocker step 4.2.98
-add_blocker kmail '<4.3.2'
diff --git a/kde-base/palapeli/ChangeLog b/kde-base/palapeli/ChangeLog
index f6292b501082..c44c7a8214d2 100644
--- a/kde-base/palapeli/ChangeLog
+++ b/kde-base/palapeli/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/palapeli
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/palapeli/ChangeLog,v 1.42 2011/10/15 17:26:12 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/palapeli/ChangeLog,v 1.43 2011/10/28 19:03:43 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -palapeli-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -palapeli-4.7.0.ebuild:
diff --git a/kde-base/palapeli/palapeli-4.7.1.ebuild b/kde-base/palapeli/palapeli-4.7.1.ebuild
deleted file mode 100644
index 74b621c3a491..000000000000
--- a/kde-base/palapeli/palapeli-4.7.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/palapeli/palapeli-4.7.1.ebuild,v 1.1 2011/09/07 20:13:56 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE jigsaw puzzle game"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/parley/ChangeLog b/kde-base/parley/ChangeLog
index 980b51fb207c..c04e4642ca54 100644
--- a/kde-base/parley/ChangeLog
+++ b/kde-base/parley/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/parley
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/parley/ChangeLog,v 1.97 2011/10/15 17:26:05 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/parley/ChangeLog,v 1.98 2011/10/28 19:03:34 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -parley-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -parley-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/parley/parley-4.7.1.ebuild b/kde-base/parley/parley-4.7.1.ebuild
deleted file mode 100644
index b56d6f21840a..000000000000
--- a/kde-base/parley/parley-4.7.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/parley/parley-4.7.1.ebuild,v 1.1 2011/09/07 20:14:03 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE Educational: vocabulary trainer"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +plasma"
-
-DEPEND="
-	$(add_kdebase_dep libkdeedu)
-"
-
-KMEXTRACTONLY="
-	libkdeedu/keduvocdocument
-"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with plasma)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/kde-base/perlkde/ChangeLog b/kde-base/perlkde/ChangeLog
index dfdb2f414a5b..80ed51ee3290 100644
--- a/kde-base/perlkde/ChangeLog
+++ b/kde-base/perlkde/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/perlkde
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/perlkde/ChangeLog,v 1.7 2011/10/28 18:32:57 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/perlkde/ChangeLog,v 1.8 2011/10/28 19:03:42 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -perlkde-4.7.1.ebuild,
+  -perlkde-4.7.1-r1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -perlkde-4.7.1.ebuild,
+  -perlkde-4.7.1-r1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -perlkde-4.7.2.ebuild:
   Remove old
diff --git a/kde-base/perlkde/perlkde-4.7.1-r1.ebuild b/kde-base/perlkde/perlkde-4.7.1-r1.ebuild
deleted file mode 100644
index 719e7d2b1210..000000000000
--- a/kde-base/perlkde/perlkde-4.7.1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/perlkde/perlkde-4.7.1-r1.ebuild,v 1.1 2011/10/19 20:44:22 dilfridge Exp $
-
-EAPI=4
-
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE Perl bindings"
-KEYWORDS="~amd64 ~x86"
-IUSE="akonadi attica debug kate okular semantic-desktop test"
-
-RDEPEND="
-	>=dev-lang/perl-5.10.1
-	$(add_kdebase_dep perlqt)
-	$(add_kdebase_dep smokekde 'akonadi?,attica?,kate?,okular?,semantic-desktop=')
-	semantic-desktop? ( >=dev-libs/soprano-2.6.51 )
-"
-DEPEND="${RDEPEND}
-	test? ( dev-perl/List-MoreUtils )
-"
-
-# Split from kdebindings-perl in 4.7
-add_blocker kdebindings-perl
-
-PATCHES=( "${FILESDIR}/${PN}-4.7.2-vendor.patch" )
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with akonadi)
-		$(cmake-utils_use_with akonadi KdepimLibs)
-		$(cmake-utils_use_with attica LibAttica)
-		$(cmake-utils_use_disable kate)
-		$(cmake-utils_use_with okular)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-	)
-	kde4-base_src_configure
-}
diff --git a/kde-base/perlkde/perlkde-4.7.1.ebuild b/kde-base/perlkde/perlkde-4.7.1.ebuild
deleted file mode 100644
index 17a2f28e6216..000000000000
--- a/kde-base/perlkde/perlkde-4.7.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/perlkde/perlkde-4.7.1.ebuild,v 1.1 2011/09/07 20:14:06 alexxy Exp $
-
-EAPI=4
-
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE Perl bindings"
-KEYWORDS="~amd64 ~x86"
-IUSE="akonadi attica debug kate okular semantic-desktop test"
-
-RDEPEND="
-	>=dev-lang/perl-5.10.1
-	$(add_kdebase_dep perlqt)
-	$(add_kdebase_dep smokekde 'akonadi?,attica?,kate?,okular?,semantic-desktop=')
-	semantic-desktop? ( >=dev-libs/soprano-2.6.51 )
-"
-DEPEND="${RDEPEND}
-	test? ( dev-perl/List-MoreUtils )
-"
-
-# Split from kdebindings-perl in 4.7
-add_blocker kdebindings-perl
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with akonadi)
-		$(cmake-utils_use_with akonadi KdepimLibs)
-		$(cmake-utils_use_with attica LibAttica)
-		$(cmake-utils_use_disable kate)
-		$(cmake-utils_use_with okular)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-	)
-	kde4-base_src_configure
-}
diff --git a/kde-base/perlqt/ChangeLog b/kde-base/perlqt/ChangeLog
index 598d0be1e430..52e420a508a8 100644
--- a/kde-base/perlqt/ChangeLog
+++ b/kde-base/perlqt/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/perlqt
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/perlqt/ChangeLog,v 1.8 2011/10/28 18:33:27 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/perlqt/ChangeLog,v 1.9 2011/10/28 19:03:44 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -perlqt-4.7.1.ebuild,
+  -perlqt-4.7.1-r1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -perlqt-4.7.1.ebuild,
+  -perlqt-4.7.1-r1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -perlqt-4.7.2.ebuild:
   Remove old
diff --git a/kde-base/perlqt/perlqt-4.7.1-r1.ebuild b/kde-base/perlqt/perlqt-4.7.1-r1.ebuild
deleted file mode 100644
index 361a202d31e1..000000000000
--- a/kde-base/perlqt/perlqt-4.7.1-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/perlqt/perlqt-4.7.1-r1.ebuild,v 1.1 2011/10/18 23:09:59 dilfridge Exp $
-
-EAPI=4
-
-DECLARATIVE_REQUIRED="optional"
-MULTIMEDIA_REQUIRED="optional"
-OPENGL_REQUIRED="optional"
-QTHELP_REQUIRED="optional"
-KDE_REQUIRED="never"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="Qt Perl bindings"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug phonon qimageblitz qscintilla qwt test webkit"
-
-RDEPEND="
-	>=dev-lang/perl-5.10.1
-	$(add_kdebase_dep smokeqt 'declarative?,multimedia?,opengl?,phonon?,qimageblitz?,qscintilla?,qthelp?,qwt?,webkit?')
-"
-DEPEND="${RDEPEND}
-	test? ( dev-perl/List-MoreUtils )
-"
-
-# Split from kdebindings-perl in 4.7
-add_blocker kdebindings-perl
-
-PATCHES=( "${FILESDIR}/${PN}-4.7.2-vendor.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_Qt3Support=ON
-		$(cmake-utils_use_disable declarative QtDeclarative)
-		$(cmake-utils_use_disable multimedia QtMultimedia)
-		$(cmake-utils_use_disable opengl QtOpenGL)
-		$(cmake-utils_use_with phonon)
-		$(cmake-utils_use_with qimageblitz QImageBlitz)
-		$(cmake-utils_use_with qscintilla QScintilla)
-		$(cmake-utils_use_disable qthelp QtHelp)
-		$(cmake-utils_use_disable qwt)
-		$(cmake-utils_use_disable webkit QtWebKit)
-	)
-	kde4-base_src_configure
-}
diff --git a/kde-base/perlqt/perlqt-4.7.1.ebuild b/kde-base/perlqt/perlqt-4.7.1.ebuild
deleted file mode 100644
index cbdbf8f5ed82..000000000000
--- a/kde-base/perlqt/perlqt-4.7.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/perlqt/perlqt-4.7.1.ebuild,v 1.2 2011/09/07 20:44:03 alexxy Exp $
-
-EAPI=4
-
-DECLARATIVE_REQUIRED="optional"
-MULTIMEDIA_REQUIRED="optional"
-OPENGL_REQUIRED="optional"
-QTHELP_REQUIRED="optional"
-KDE_REQUIRED="never"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="Qt Perl bindings"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug phonon qimageblitz qscintilla qwt test webkit"
-
-RDEPEND="
-	>=dev-lang/perl-5.10.1
-	$(add_kdebase_dep smokeqt 'declarative?,multimedia?,opengl?,phonon?,qimageblitz?,qscintilla?,qthelp?,qwt?,webkit?')
-"
-DEPEND="${RDEPEND}
-	test? ( dev-perl/List-MoreUtils )
-"
-
-# Split from kdebindings-perl in 4.7
-add_blocker kdebindings-perl
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_Qt3Support=ON
-		$(cmake-utils_use_disable declarative QtDeclarative)
-		$(cmake-utils_use_disable multimedia QtMultimedia)
-		$(cmake-utils_use_disable opengl QtOpenGL)
-		$(cmake-utils_use_with phonon)
-		$(cmake-utils_use_with qimageblitz QImageBlitz)
-		$(cmake-utils_use_with qscintilla QScintilla)
-		$(cmake-utils_use_disable qthelp QtHelp)
-		$(cmake-utils_use_disable qwt)
-		$(cmake-utils_use_disable webkit QtWebKit)
-	)
-	kde4-base_src_configure
-}
diff --git a/kde-base/phonon-kde/ChangeLog b/kde-base/phonon-kde/ChangeLog
index 7572d7321d1f..9ccc198745ec 100644
--- a/kde-base/phonon-kde/ChangeLog
+++ b/kde-base/phonon-kde/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/phonon-kde
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/ChangeLog,v 1.96 2011/10/15 17:26:15 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/ChangeLog,v 1.97 2011/10/28 19:03:46 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -phonon-kde-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -phonon-kde-4.7.0.ebuild:
diff --git a/kde-base/phonon-kde/phonon-kde-4.7.1.ebuild b/kde-base/phonon-kde/phonon-kde-4.7.1.ebuild
deleted file mode 100644
index 03b134a2dc20..000000000000
--- a/kde-base/phonon-kde/phonon-kde-4.7.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/phonon-kde-4.7.1.ebuild,v 1.1 2011/09/07 20:14:08 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-KMMODULE="phonon"
-inherit kde4-meta
-
-DESCRIPTION="Phonon KDE Integration"
-HOMEPAGE="http://phonon.kde.org"
-
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-2"
-IUSE="alsa debug xine pulseaudio"
-
-DEPEND="
-	>=media-libs/phonon-4.4.3[xine?]
-	alsa? ( media-libs/alsa-lib )
-	pulseaudio? (
-		dev-libs/glib:2
-		media-libs/libcanberra
-		>=media-sound/pulseaudio-0.9.21[glib]
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	mycmakeargs=(
-		-DBUILD_tests=OFF
-		$(cmake-utils_use_with alsa)
-		$(cmake-utils_use_with xine)
-		$(cmake-utils_use_with pulseaudio PulseAudio)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/plasma-apps/ChangeLog b/kde-base/plasma-apps/ChangeLog
index 4871661d2c0c..74632fc69f2d 100644
--- a/kde-base/plasma-apps/ChangeLog
+++ b/kde-base/plasma-apps/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/plasma-apps
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-apps/ChangeLog,v 1.85 2011/10/15 17:25:56 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-apps/ChangeLog,v 1.86 2011/10/28 19:03:43 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -plasma-apps-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -plasma-apps-4.7.0.ebuild:
diff --git a/kde-base/plasma-apps/plasma-apps-4.7.1.ebuild b/kde-base/plasma-apps/plasma-apps-4.7.1.ebuild
deleted file mode 100644
index 038aec7c9786..000000000000
--- a/kde-base/plasma-apps/plasma-apps-4.7.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-apps/plasma-apps-4.7.1.ebuild,v 1.1 2011/09/07 20:13:54 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-baseapps"
-KMMODULE="plasma"
-inherit kde4-meta
-
-DESCRIPTION="Additional Applets for Plasma"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep libkonq)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/plasma-runtime/ChangeLog b/kde-base/plasma-runtime/ChangeLog
index 10892c3e78eb..77ce2df89003 100644
--- a/kde-base/plasma-runtime/ChangeLog
+++ b/kde-base/plasma-runtime/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/plasma-runtime
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-runtime/ChangeLog,v 1.72 2011/10/15 17:25:50 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-runtime/ChangeLog,v 1.73 2011/10/28 19:03:20 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -plasma-runtime-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -plasma-runtime-4.7.0.ebuild:
diff --git a/kde-base/plasma-runtime/plasma-runtime-4.7.1.ebuild b/kde-base/plasma-runtime/plasma-runtime-4.7.1.ebuild
deleted file mode 100644
index e1e480b8b4d8..000000000000
--- a/kde-base/plasma-runtime/plasma-runtime-4.7.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-runtime/plasma-runtime-4.7.1.ebuild,v 1.1 2011/09/07 20:13:51 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-KMMODULE="plasma"
-DECLARATIVE_REQUIRED="always"
-inherit kde4-meta
-
-DESCRIPTION="Script engine and package tool for plasma"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-# cloned from workspace thus introduce collisions.
-add_blocker plasma-workspace '<4.5.60'
-add_blocker kdelibs '<4.5.60'
diff --git a/kde-base/plasma-workspace/ChangeLog b/kde-base/plasma-workspace/ChangeLog
index 378bd68123ba..e0013556bdda 100644
--- a/kde-base/plasma-workspace/ChangeLog
+++ b/kde-base/plasma-workspace/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/plasma-workspace
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.127 2011/10/15 17:25:56 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.128 2011/10/28 19:03:28 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -plasma-workspace-4.7.1.ebuild, -plasma-workspace-4.7.1-r1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -plasma-workspace-4.7.1.ebuild, -plasma-workspace-4.7.1-r1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -plasma-workspace-4.7.0.ebuild:
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.7.1-r1.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.7.1-r1.ebuild
deleted file mode 100644
index 2621cdba38e4..000000000000
--- a/kde-base/plasma-workspace/plasma-workspace-4.7.1-r1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.7.1-r1.ebuild,v 1.1 2011/09/27 21:45:52 abcd Exp $
-
-EAPI=3
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-workspace"
-KMMODULE="plasma"
-PYTHON_DEPEND="python? 2"
-inherit python kde4-meta
-
-DESCRIPTION="Plasma: KDE desktop framework"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug google-gadgets gps python qalculate +rss semantic-desktop xinerama"
-
-COMMONDEPEND="
-	$(add_kdebase_dep kactivities)
-	$(add_kdebase_dep kdelibs 'semantic-desktop=')
-	$(add_kdebase_dep kephal)
-	$(add_kdebase_dep ksysguard)
-	$(add_kdebase_dep libkworkspace)
-	$(add_kdebase_dep libplasmagenericshell)
-	$(add_kdebase_dep libtaskmanager)
-	$(add_kdebase_dep solid)
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	google-gadgets? ( >=x11-misc/google-gadgets-0.11.0[qt4] )
-	gps? ( >=sci-geosciences/gpsd-2.37 )
-	python? (
-		>=dev-python/PyQt4-4.4.0[X]
-		>=dev-python/sip-4.7.1
-		$(add_kdebase_dep pykde4)
-	)
-	qalculate? ( sci-libs/libqalculate )
-	rss? (
-		$(add_kdebase_dep kdepimlibs 'semantic-desktop=')
-		$(add_kdebase_dep libplasmaclock 'holidays')
-	)
-	!rss? ( $(add_kdebase_dep libplasmaclock '-holidays') )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${COMMONDEPEND}
-	rss? ( dev-libs/boost )
-	x11-proto/compositeproto
-	x11-proto/damageproto
-	x11-proto/fixesproto
-	x11-proto/renderproto
-	xinerama? ( x11-proto/xineramaproto )
-"
-RDEPEND="${COMMONDEPEND}
-	$(add_kdebase_dep activitymanager)
-	$(add_kdebase_dep plasma-runtime)
-"
-
-KMEXTRA="
-	statusnotifierwatcher/
-"
-KMEXTRACTONLY="
-	krunner/dbus/org.freedesktop.ScreenSaver.xml
-	krunner/dbus/org.kde.krunner.App.xml
-	ksmserver/org.kde.KSMServerInterface.xml
-	libs/kephal/
-	libs/kworkspace/
-	libs/taskmanager/
-	libs/plasmagenericshell/
-	libs/ksysguard/
-	ksysguard/
-"
-
-KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
-)
-
-pkg_setup() {
-	python_set_active_version 2
-	kde4-meta_pkg_setup
-}
-
-src_unpack() {
-	if use handbook; then
-		KMEXTRA+=" doc/plasma-desktop"
-	fi
-
-	kde4-meta_src_unpack
-}
-
-src_prepare() {
-	sed -i -e '1ifind_package(KdepimLibs)' plasma/CMakeLists.txt || die
-
-	kde4-meta_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with google-gadgets Googlegadgets)
-		$(cmake-utils_use_with gps libgps)
-		$(cmake-utils_use_with python SIP)
-		$(cmake-utils_use_with python PyQt4)
-		$(cmake-utils_use_with python PyKDE4)
-		$(cmake-utils_use_with qalculate)
-		$(cmake-utils_use_with rss KdepimLibs)
-		$(cmake-utils_use_with semantic-desktop Akonadi)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with xinerama X11_Xinerama)
-		-DWITH_Xmms=OFF
-	)
-
-	kde4-meta_src_configure
-}
-
-src_install() {
-	kde4-meta_src_install
-
-	rm -f \
-		"${ED}$(python_get_sitedir)"/PyKDE4/*.py[co] \
-		"${ED}"/usr/share/apps/plasma_scriptengine_python/*.py[co]
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-
-	if use python; then
-		python_mod_optimize \
-			PyKDE4 \
-			/usr/share/apps/plasma_scriptengine_python
-	fi
-}
-
-pkg_postrm() {
-	kde4-meta_pkg_postrm
-
-	if [[ -d ${EPREFIX}/usr/share/apps/plasma_scriptengine_python ]]; then
-		python_mod_cleanup \
-			PyKDE4 \
-			/usr/share/apps/plasma_scriptengine_python
-	fi
-}
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.7.1.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.7.1.ebuild
deleted file mode 100644
index cb98f3049e04..000000000000
--- a/kde-base/plasma-workspace/plasma-workspace-4.7.1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.7.1.ebuild,v 1.1 2011/09/07 20:13:54 alexxy Exp $
-
-EAPI=3
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-workspace"
-KMMODULE="plasma"
-PYTHON_DEPEND="python? 2"
-inherit python kde4-meta
-
-DESCRIPTION="Plasma: KDE desktop framework"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug google-gadgets gps python qalculate +rss semantic-desktop xinerama"
-
-COMMONDEPEND="
-	$(add_kdebase_dep kdelibs 'semantic-desktop=')
-	$(add_kdebase_dep kephal)
-	$(add_kdebase_dep ksysguard)
-	$(add_kdebase_dep libkworkspace)
-	$(add_kdebase_dep libplasmagenericshell)
-	$(add_kdebase_dep libtaskmanager)
-	$(add_kdebase_dep solid)
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	google-gadgets? ( >=x11-misc/google-gadgets-0.11.0[qt4] )
-	gps? ( >=sci-geosciences/gpsd-2.37 )
-	python? (
-		>=dev-python/PyQt4-4.4.0[X]
-		>=dev-python/sip-4.7.1
-		$(add_kdebase_dep pykde4)
-	)
-	qalculate? ( sci-libs/libqalculate )
-	rss? (
-		$(add_kdebase_dep kdepimlibs 'semantic-desktop=')
-		$(add_kdebase_dep libplasmaclock 'holidays')
-	)
-	!rss? ( $(add_kdebase_dep libplasmaclock '-holidays') )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${COMMONDEPEND}
-	rss? ( dev-libs/boost )
-	x11-proto/compositeproto
-	x11-proto/damageproto
-	x11-proto/fixesproto
-	x11-proto/renderproto
-	xinerama? ( x11-proto/xineramaproto )
-"
-RDEPEND="${COMMONDEPEND}
-	$(add_kdebase_dep activitymanager)
-	$(add_kdebase_dep plasma-runtime)
-"
-
-KMEXTRA="
-	statusnotifierwatcher/
-"
-KMEXTRACTONLY="
-	krunner/dbus/org.freedesktop.ScreenSaver.xml
-	krunner/dbus/org.kde.krunner.App.xml
-	ksmserver/org.kde.KSMServerInterface.xml
-	libs/kephal/
-	libs/kworkspace/
-	libs/taskmanager/
-	libs/plasmagenericshell/
-	libs/ksysguard/
-	ksysguard/
-"
-
-KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
-)
-
-pkg_setup() {
-	python_set_active_version 2
-	kde4-meta_pkg_setup
-}
-
-src_unpack() {
-	if use handbook; then
-		KMEXTRA+=" doc/plasma-desktop"
-	fi
-
-	kde4-meta_src_unpack
-}
-
-src_prepare() {
-	sed -i -e '1ifind_package(KdepimLibs)' plasma/CMakeLists.txt || die
-
-	kde4-meta_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with google-gadgets Googlegadgets)
-		$(cmake-utils_use_with gps libgps)
-		$(cmake-utils_use_with python SIP)
-		$(cmake-utils_use_with python PyQt4)
-		$(cmake-utils_use_with python PyKDE4)
-		$(cmake-utils_use_with qalculate)
-		$(cmake-utils_use_with rss KdepimLibs)
-		$(cmake-utils_use_with semantic-desktop Akonadi)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with xinerama X11_Xinerama)
-		-DWITH_Xmms=OFF
-	)
-
-	kde4-meta_src_configure
-}
-
-src_install() {
-	kde4-meta_src_install
-
-	rm -f \
-		"${ED}$(python_get_sitedir)"/PyKDE4/*.py[co] \
-		"${ED}"/usr/share/apps/plasma_scriptengine_python/*.py[co]
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-
-	if use python; then
-		python_mod_optimize \
-			PyKDE4 \
-			/usr/share/apps/plasma_scriptengine_python
-	fi
-}
-
-pkg_postrm() {
-	kde4-meta_pkg_postrm
-
-	if [[ -d ${EPREFIX}/usr/share/apps/plasma_scriptengine_python ]]; then
-		python_mod_cleanup \
-			PyKDE4 \
-			/usr/share/apps/plasma_scriptengine_python
-	fi
-}
diff --git a/kde-base/powerdevil/ChangeLog b/kde-base/powerdevil/ChangeLog
index 3d7e86468021..9f29a1227e40 100644
--- a/kde-base/powerdevil/ChangeLog
+++ b/kde-base/powerdevil/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/powerdevil
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/powerdevil/ChangeLog,v 1.88 2011/10/15 17:26:07 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/powerdevil/ChangeLog,v 1.89 2011/10/28 19:03:36 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -powerdevil-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -powerdevil-4.7.0.ebuild:
diff --git a/kde-base/powerdevil/powerdevil-4.7.1.ebuild b/kde-base/powerdevil/powerdevil-4.7.1.ebuild
deleted file mode 100644
index f7cf17874e8b..000000000000
--- a/kde-base/powerdevil/powerdevil-4.7.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/powerdevil/powerdevil-4.7.1.ebuild,v 1.1 2011/09/07 20:13:38 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="PowerDevil is an utility for KDE4 for Laptop Powermanagement."
-HOMEPAGE="http://www.kde-apps.org/content/show.php/PowerDevil?content=85078"
-LICENSE="GPL-2"
-
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +pm-utils"
-
-DEPEND="
-	$(add_kdebase_dep libkworkspace)
-	$(add_kdebase_dep solid)
-"
-RDEPEND="${DEPEND}
-	!sys-power/powerdevil
-	pm-utils? ( sys-power/pm-utils )
-"
-
-KMEXTRACTONLY="
-	krunner/
-	ksmserver/org.kde.KSMServerInterface.xml
-"
diff --git a/kde-base/printer-applet/ChangeLog b/kde-base/printer-applet/ChangeLog
index 85d19222355e..90fbfffd43fd 100644
--- a/kde-base/printer-applet/ChangeLog
+++ b/kde-base/printer-applet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/printer-applet
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/printer-applet/ChangeLog,v 1.58 2011/10/15 17:25:50 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/printer-applet/ChangeLog,v 1.59 2011/10/28 19:03:20 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -printer-applet-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -printer-applet-4.7.0.ebuild:
diff --git a/kde-base/printer-applet/printer-applet-4.7.1.ebuild b/kde-base/printer-applet/printer-applet-4.7.1.ebuild
deleted file mode 100644
index 843485798e98..000000000000
--- a/kde-base/printer-applet/printer-applet-4.7.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/printer-applet/printer-applet-4.7.1.ebuild,v 1.1 2011/09/07 20:13:57 alexxy Exp $
-
-EAPI=3
-
-KDE_HANDBOOK="optional"
-PYTHON_DEPEND="2"
-KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeutils"
-	kde_eclass="kde4-meta"
-fi
-inherit python ${kde_eclass}
-
-DESCRIPTION="KDE printer system tray utility"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=app-admin/system-config-printer-common-1.2.2
-	$(add_kdebase_dep pykde4)
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	${kde_eclass}_pkg_setup
-	python_set_active_version 2
-}
-
-src_prepare() {
-	${kde_eclass}_src_prepare
-
-	# Rename printer-applet -> printer-applet-kde
-	local newname="printer-applet-kde"
-	sed -e "/PYKDE4_ADD_EXECUTABLE/s/ printer-applet[[:space:]]*)/ ${newname})/" \
-		-e "/install/s/)/ RENAME ${newname}.desktop)/" \
-		-i printer-applet/CMakeLists.txt || die "failed to rename printer-applet executable"
-	sed -e "/Exec/s/printer-applet/${newname}/" \
-		-i printer-applet/printer-applet.desktop || die "failed to patch .desktop file"
-}
-
-src_install() {
-	${kde_eclass}_src_install
-	python_convert_shebangs -q -r $(python_get_version) "${ED}"
-}
-
-pkg_postrm() {
-	python_mod_cleanup "${PREFIX}share/apps/${PN}"
-}
diff --git a/kde-base/pykde4/ChangeLog b/kde-base/pykde4/ChangeLog
index d14918968f67..617fed093c09 100644
--- a/kde-base/pykde4/ChangeLog
+++ b/kde-base/pykde4/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/pykde4
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.134 2011/10/15 17:25:48 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.135 2011/10/28 19:03:48 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -pykde4-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -pykde4-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/pykde4/pykde4-4.7.1.ebuild b/kde-base/pykde4/pykde4-4.7.1.ebuild
deleted file mode 100644
index 4fa02f59ebfb..000000000000
--- a/kde-base/pykde4/pykde4-4.7.1.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.7.1.ebuild,v 1.1 2011/09/07 20:13:56 alexxy Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="*:2.5"
-RESTRICT_PYTHON_ABIS="*-jython 2.4"
-PYTHON_USE_WITH="threads"
-SUPPORT_PYTHON_ABIS="1"
-
-OPENGL_REQUIRED="always"
-KDE_SCM="git"
-inherit python portability kde4-base
-
-DESCRIPTION="Python bindings for KDE4"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc examples semantic-desktop"
-
-# blocker added due to compatibility issues and error during compile time
-RDEPEND="
-	!dev-python/pykde
-	>=dev-python/sip-4.12.3-r2
-	$(add_kdebase_dep kdelibs 'opengl,semantic-desktop=')
-	semantic-desktop? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
-	aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,aqua] )
-	!aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,X] )
-"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.6.3-python-3.2.patch
-)
-
-pkg_setup() {
-	python_pkg_setup
-	kde4-base_pkg_setup
-
-	have_python2=false
-
-	scan_python_versions() {
-		[[ ${PYTHON_ABI} == 2.* ]] && have_python2=true
-		:
-	}
-	python_execute_function -q scan_python_versions
-	if ! ${have_python2}; then
-		ewarn "You do not have a Python 2 version selected."
-		ewarn "kpythonpluginfactory will not be built"
-	fi
-}
-
-src_prepare() {
-	kde4-base_src_prepare
-
-	if ! use examples; then
-		sed -e '/^ADD_SUBDIRECTORY(examples)/s/^/# DISABLED /' -i CMakeLists.txt \
-			|| die "Failed to disable examples"
-	fi
-
-	# See bug 322351
-	use arm && epatch "${FILESDIR}/${PN}-4.4.4-arm-sip.patch"
-
-	sed -i -e 's/kpythonpluginfactory /kpython${PYTHON_SHORT_VERSION}pluginfactory /g' kpythonpluginfactory/CMakeLists.txt
-
-	if ${have_python2}; then
-		mkdir -p "${WORKDIR}/wrapper" || die "failed to copy wrapper"
-		cp "${FILESDIR}/kpythonpluginfactorywrapper.c" "${WORKDIR}/wrapper" || die "failed to copy wrapper"
-	fi
-}
-
-src_configure() {
-	configuration() {
-		local mycmakeargs=(
-			-DWITH_PolkitQt=OFF
-			-DWITH_QScintilla=OFF
-			$(cmake-utils_use_with semantic-desktop Soprano)
-			$(cmake-utils_use_with semantic-desktop Nepomuk)
-			$(cmake-utils_use_with semantic-desktop KdepimLibs)
-			-DPYTHON_EXECUTABLE=$(PYTHON -a)
-		)
-		local CMAKE_BUILD_DIR=${S}_build-${PYTHON_ABI}
-		kde4-base_src_configure
-	}
-
-	python_execute_function configuration
-}
-
-echo_and_run() {
-	echo "$@"
-	"$@"
-}
-
-src_compile() {
-	compilation() {
-		local CMAKE_BUILD_DIR=${S}_build-${PYTHON_ABI}
-		kde4-base_src_compile
-	}
-	python_execute_function compilation
-
-	if ${have_python2}; then
-		cd "${WORKDIR}/wrapper"
-		echo_and_run libtool --tag=CC --mode=compile $(tc-getCC) \
-			-shared \
-			${CFLAGS} ${CPPFLAGS} \
-			-DEPREFIX="\"${EPREFIX}\"" \
-			-DPLUGIN_DIR="\"/usr/$(get_libdir)/kde4\"" -c \
-			-o kpythonpluginfactorywrapper.lo \
-			kpythonpluginfactorywrapper.c
-		echo_and_run libtool --tag=CC --mode=link $(tc-getCC) \
-			-shared -module -avoid-version \
-			${CFLAGS} ${LDFLAGS} \
-			-o kpythonpluginfactory.la \
-			-rpath "${EPREFIX}/usr/$(get_libdir)/kde4" \
-			kpythonpluginfactorywrapper.lo \
-			$(dlopen_lib)
-	fi
-}
-
-src_install() {
-	installation() {
-		cd "${S}_build-${PYTHON_ABI}"
-		emake DESTDIR="${T}/images/${PYTHON_ABI}" install || die "emake install failed for Python ${PYTHON_ABI}"
-	}
-	python_execute_function installation
-
-	python_merge_intermediate_installation_images "${T}/images"
-
-	# As we don't call the eclass's src_install, we have to install the docs manually
-	DOCS=("${S}"/{AUTHORS,NEWS,README})
-	use doc && HTML_DOCS=("${S}/docs/html/")
-	base_src_install_docs
-
-	if ${have_python2}; then
-		cd "${WORKDIR}/wrapper"
-		echo_and_run libtool --mode=install install kpythonpluginfactory.la "${ED}/usr/$(get_libdir)/kde4/kpythonpluginfactory.la"
-		rm "${ED}/usr/$(get_libdir)/kde4/kpythonpluginfactory.la"
-	fi
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	python_mod_optimize PyKDE4 PyQt4/uic/pykdeuic4.py PyQt4/uic/widget-plugins/kde4.py
-
-	if use examples; then
-		echo
-		elog "PyKDE4 examples have been installed to"
-		elog "${EPREFIX}/usr/share/apps/${PN}/examples"
-		echo
-	fi
-}
-
-pkg_postrm() {
-	kde4-base_pkg_postrm
-
-	python_mod_cleanup PyKDE4 PyQt4/uic/pykdeuic4.py PyQt4/uic/widget-plugins/kde4.py
-}
diff --git a/kde-base/qguiplatformplugin_kde/ChangeLog b/kde-base/qguiplatformplugin_kde/ChangeLog
index 88e26c3738c4..8aa7eecabce5 100644
--- a/kde-base/qguiplatformplugin_kde/ChangeLog
+++ b/kde-base/qguiplatformplugin_kde/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/qguiplatformplugin_kde
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/qguiplatformplugin_kde/ChangeLog,v 1.45 2011/10/15 17:26:04 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qguiplatformplugin_kde/ChangeLog,v 1.46 2011/10/28 19:03:33 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -qguiplatformplugin_kde-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -qguiplatformplugin_kde-4.7.0.ebuild:
diff --git a/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.7.1.ebuild b/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.7.1.ebuild
deleted file mode 100644
index acbe005e7036..000000000000
--- a/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.7.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.7.1.ebuild,v 1.1 2011/09/07 20:14:04 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="Helps integration of pure Qt applications with KDE Workspace"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/qtruby/ChangeLog b/kde-base/qtruby/ChangeLog
index 0cb76430faea..7ae455cdc93d 100644
--- a/kde-base/qtruby/ChangeLog
+++ b/kde-base/qtruby/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/qtruby
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/qtruby/ChangeLog,v 1.89 2011/10/15 17:26:01 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtruby/ChangeLog,v 1.90 2011/10/28 19:03:30 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -qtruby-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -qtruby-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/qtruby/qtruby-4.7.1.ebuild b/kde-base/qtruby/qtruby-4.7.1.ebuild
deleted file mode 100644
index f618816c97e3..000000000000
--- a/kde-base/qtruby/qtruby-4.7.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/qtruby/qtruby-4.7.1.ebuild,v 1.1 2011/09/07 20:13:52 alexxy Exp $
-
-EAPI=4
-
-OPENGL_REQUIRED="always"
-DECLARATIVE_REQUIRED="optional"
-KDE_REQUIRED="never"
-KDE_SCM="git"
-USE_RUBY="ruby18"
-# No ruby19 for three reasons:
-# 1) it does not build (yet) - will likely be solved soon
-# 2) cmake bails when configuring twice or more - solved with CMAKE_IN_SOURCE_BUILD=1
-# 3) the ebuild can only be installed for one ruby variant, otherwise the compiled
-#    files with identical path+name will overwrite each other - difficult :(
-
-inherit kde4-base ruby-ng
-
-DESCRIPTION="Qt Ruby bindings"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug phonon qscintilla qwt webkit"
-
-DEPEND="
-	$(add_kdebase_dep smokeqt 'declarative?,opengl,phonon?,qscintilla?,qwt?,webkit?')
-"
-
-RDEPEND="${DEPEND}
-	!dev-ruby/qt4-qtruby
-"
-
-# Split from kdebindings-ruby in 4.7
-add_blocker kdebindings-ruby
-
-pkg_setup() {
-	ruby-ng_pkg_setup
-	kde4-base_pkg_setup
-}
-
-src_unpack() {
-	local S="${WORKDIR}/${P}"
-	kde4-base_src_unpack
-
-	cd "${WORKDIR}"
-	mkdir all
-	mv ${P} all/ || die "Could not move sources"
-}
-
-all_ruby_prepare() {
-	kde4-base_src_prepare
-}
-
-each_ruby_configure() {
-	local CMAKE_USE_DIR=${S}
-	mycmakeargs=(
-		-DRUBY_LIBRARY=$(ruby_get_libruby)
-		-DRUBY_INCLUDE_PATH=$(ruby_get_hdrdir)
-		-DRUBY_EXECUTABLE=${RUBY}
-		$(cmake-utils_use_disable declarative QtDeclarative)
-		$(cmake-utils_use_with phonon)
-		$(cmake-utils_use_with qscintilla QScintilla)
-		$(cmake-utils_use_with qwt Qwt5)
-		$(cmake-utils_use_disable webkit QtWebKit)
-	)
-	kde4-base_src_configure
-}
-
-each_ruby_compile() {
-	local CMAKE_USE_DIR=${S}
-	kde4-base_src_compile
-}
-
-each_ruby_install() {
-	local CMAKE_USE_DIR=${S}
-	kde4-base_src_install
-}
diff --git a/kde-base/qyoto/ChangeLog b/kde-base/qyoto/ChangeLog
index 5820cba28f99..8bcf1dff1345 100644
--- a/kde-base/qyoto/ChangeLog
+++ b/kde-base/qyoto/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/qyoto
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/qyoto/ChangeLog,v 1.4 2011/10/15 17:26:02 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qyoto/ChangeLog,v 1.5 2011/10/28 19:03:32 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -qyoto-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -qyoto-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/qyoto/qyoto-4.7.1.ebuild b/kde-base/qyoto/qyoto-4.7.1.ebuild
deleted file mode 100644
index d9d8c4d37681..000000000000
--- a/kde-base/qyoto/qyoto-4.7.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/qyoto/qyoto-4.7.1.ebuild,v 1.1 2011/09/07 20:13:43 alexxy Exp $
-
-EAPI=4
-
-KDE_REQUIRED="never"
-KDE_SCM="git"
-inherit kde4-base mono
-
-DESCRIPTION="C# bindings for Qt"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +phonon qscintilla webkit"
-
-DEPEND="
-	dev-lang/mono
-	$(add_kdebase_dep smokeqt 'opengl,phonon?,qscintilla?,webkit?')
-"
-RDEPEND="${DEPEND}"
-
-# Split from kdebindings-csharp in 4.7
-add_blocker kdebindings-csharp
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with phonon)
-		$(cmake-utils_use_disable qscintilla QScintilla)
-		$(cmake-utils_use_disable webkit QtWebKit)
-	)
-	kde4-base_src_configure
-}
diff --git a/kde-base/renamedlg-plugins/ChangeLog b/kde-base/renamedlg-plugins/ChangeLog
index b510309473c5..92f9fea885dd 100644
--- a/kde-base/renamedlg-plugins/ChangeLog
+++ b/kde-base/renamedlg-plugins/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/renamedlg-plugins
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/renamedlg-plugins/ChangeLog,v 1.83 2011/10/15 17:25:59 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/renamedlg-plugins/ChangeLog,v 1.84 2011/10/28 19:03:21 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -renamedlg-plugins-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -renamedlg-plugins-4.7.0.ebuild:
diff --git a/kde-base/renamedlg-plugins/renamedlg-plugins-4.7.1.ebuild b/kde-base/renamedlg-plugins/renamedlg-plugins-4.7.1.ebuild
deleted file mode 100644
index 0b9c9ec575d2..000000000000
--- a/kde-base/renamedlg-plugins/renamedlg-plugins-4.7.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/renamedlg-plugins/renamedlg-plugins-4.7.1.ebuild,v 1.1 2011/09/07 20:13:44 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-KMMODULE="renamedlgplugins"
-inherit kde4-meta
-
-DESCRIPTION="KDE RenameDlg plugins"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/rocs/ChangeLog b/kde-base/rocs/ChangeLog
index cf08a9a766cf..5f60609cd928 100644
--- a/kde-base/rocs/ChangeLog
+++ b/kde-base/rocs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/rocs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/rocs/ChangeLog,v 1.48 2011/10/15 17:25:54 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/rocs/ChangeLog,v 1.49 2011/10/28 19:03:38 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -rocs-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -rocs-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/rocs/rocs-4.7.1.ebuild b/kde-base/rocs/rocs-4.7.1.ebuild
deleted file mode 100644
index 2e2d61b4fd6a..000000000000
--- a/kde-base/rocs/rocs-4.7.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/rocs/rocs-4.7.1.ebuild,v 1.1 2011/09/07 20:14:08 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE4 interface to work with Graph Theory"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="dev-libs/boost"
-DEPEND="
-	${RDEPEND}
-	>=dev-cpp/eigen-2.0.3:2
-"
-
-RESTRICT="test"
-# bug 376909
diff --git a/kde-base/smokegen/ChangeLog b/kde-base/smokegen/ChangeLog
index e24dabfa4ad2..a1132589e6ac 100644
--- a/kde-base/smokegen/ChangeLog
+++ b/kde-base/smokegen/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/smokegen
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/smokegen/ChangeLog,v 1.4 2011/10/15 17:25:52 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smokegen/ChangeLog,v 1.5 2011/10/28 19:03:23 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -smokegen-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -smokegen-4.7.0.ebuild:
diff --git a/kde-base/smokegen/smokegen-4.7.1.ebuild b/kde-base/smokegen/smokegen-4.7.1.ebuild
deleted file mode 100644
index db0ab82d588a..000000000000
--- a/kde-base/smokegen/smokegen-4.7.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/smokegen/smokegen-4.7.1.ebuild,v 1.1 2011/09/07 20:13:41 alexxy Exp $
-
-EAPI=4
-
-KDE_REQUIRED="never"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="Scripting Meta Object Kompiler Engine - generators"
-KEYWORDS="~amd64 ~x86"
-IUSE="aqua debug"
-
-DEPEND="
-	x11-libs/qt-core:4[aqua=]
-"
-RDEPEND="${DEPEND}"
-
-add_blocker smoke
diff --git a/kde-base/smokekde/ChangeLog b/kde-base/smokekde/ChangeLog
index 7d5cde8de475..c85abddb0194 100644
--- a/kde-base/smokekde/ChangeLog
+++ b/kde-base/smokekde/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/smokekde
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/smokekde/ChangeLog,v 1.4 2011/10/15 17:25:53 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smokekde/ChangeLog,v 1.5 2011/10/28 19:03:38 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -smokekde-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -smokekde-4.7.0.ebuild:
diff --git a/kde-base/smokekde/smokekde-4.7.1.ebuild b/kde-base/smokekde/smokekde-4.7.1.ebuild
deleted file mode 100644
index 18c0d4db456a..000000000000
--- a/kde-base/smokekde/smokekde-4.7.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/smokekde/smokekde-4.7.1.ebuild,v 1.1 2011/09/07 20:14:04 alexxy Exp $
-
-EAPI=4
-
-KDE_SCM="git"
-
-inherit kde4-base
-
-DESCRIPTION="Scripting Meta Object Kompiler Engine - KDE bindings"
-KEYWORDS="~amd64 ~x86"
-IUSE="akonadi attica debug kate okular semantic-desktop"
-
-DEPEND="
-	$(add_kdebase_dep kdelibs 'semantic-desktop=')
-	$(add_kdebase_dep smokeqt)
-	akonadi? ( $(add_kdebase_dep kdepimlibs) )
-	attica? ( dev-libs/libattica )
-	kate? ( $(add_kdebase_dep kate) )
-	okular? ( $(add_kdebase_dep okular) )
-"
-RDEPEND="${DEPEND}"
-
-add_blocker smoke
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with akonadi)
-		$(cmake-utils_use_with akonadi KdepimLibs)
-		$(cmake-utils_use_with attica LibAttica)
-		$(cmake-utils_use_disable kate)
-		$(cmake-utils_use_with okular)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-	)
-	kde4-base_src_configure
-}
diff --git a/kde-base/smokeqt/ChangeLog b/kde-base/smokeqt/ChangeLog
index f87c20eff2c8..26d626e58d27 100644
--- a/kde-base/smokeqt/ChangeLog
+++ b/kde-base/smokeqt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/smokeqt
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/smokeqt/ChangeLog,v 1.4 2011/10/15 17:25:54 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smokeqt/ChangeLog,v 1.5 2011/10/28 19:03:39 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -smokeqt-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -smokeqt-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/smokeqt/smokeqt-4.7.1.ebuild b/kde-base/smokeqt/smokeqt-4.7.1.ebuild
deleted file mode 100644
index 3522e569e9eb..000000000000
--- a/kde-base/smokeqt/smokeqt-4.7.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/smokeqt/smokeqt-4.7.1.ebuild,v 1.1 2011/09/07 20:13:42 alexxy Exp $
-
-EAPI=4
-
-DECLARATIVE_REQUIRED="optional"
-MULTIMEDIA_REQUIRED="optional"
-QTHELP_REQUIRED="optional"
-OPENGL_REQUIRED="optional"
-KDE_REQUIRED="never"
-
-KDE_SCM="git"
-
-inherit kde4-base
-
-DESCRIPTION="Scripting Meta Object Kompiler Engine - Qt bindings"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +phonon qimageblitz qscintilla qwt webkit"
-
-# Maybe make more of Qt optional?
-DEPEND="
-	$(add_kdebase_dep smokegen)
-	x11-libs/qt-core:4
-	x11-libs/qt-dbus:4
-	x11-libs/qt-gui:4
-	x11-libs/qt-script:4
-	x11-libs/qt-sql:4
-	x11-libs/qt-svg:4
-	x11-libs/qt-test:4
-	phonon? ( >=media-libs/phonon-4.4.3 )
-	qimageblitz? ( >=media-libs/qimageblitz-0.0.4 )
-	qscintilla? ( x11-libs/qscintilla )
-	qwt? ( x11-libs/qwt:5 )
-	webkit? ( x11-libs/qt-webkit:4 )
-"
-RDEPEND="${DEPEND}"
-
-# Split in 4.7
-add_blocker smoke
-
-src_configure() {
-	mycmakeargs=(
-		-DDISABLE_Qt3Support=ON
-		-DWITH_QT3_SUPPORT=OFF
-		$(cmake-utils_use_disable declarative QtDeclarative)
-		$(cmake-utils_use_disable multimedia QtMultimedia)
-		$(cmake-utils_use_disable opengl QtOpenGL)
-		$(cmake-utils_use_with phonon)
-		$(cmake-utils_use_with qimageblitz QImageBlitz)
-		$(cmake-utils_use_with qscintilla QScintilla)
-		$(cmake-utils_use_disable qthelp QtHelp)
-		$(cmake-utils_use_disable qwt Qwt5)
-		$(cmake-utils_use_disable webkit QtWebKit)
-	)
-	kde4-base_src_configure
-}
diff --git a/kde-base/solid-runtime/ChangeLog b/kde-base/solid-runtime/ChangeLog
index c684d94b1d86..8afc871dd34d 100644
--- a/kde-base/solid-runtime/ChangeLog
+++ b/kde-base/solid-runtime/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/solid-runtime
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/solid-runtime/ChangeLog,v 1.47 2011/10/15 17:25:52 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/solid-runtime/ChangeLog,v 1.48 2011/10/28 19:03:22 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -solid-runtime-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -solid-runtime-4.7.0.ebuild:
diff --git a/kde-base/solid-runtime/solid-runtime-4.7.1.ebuild b/kde-base/solid-runtime/solid-runtime-4.7.1.ebuild
deleted file mode 100644
index ab27f43f5d2c..000000000000
--- a/kde-base/solid-runtime/solid-runtime-4.7.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/solid-runtime/solid-runtime-4.7.1.ebuild,v 1.1 2011/09/07 20:13:41 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-KMNOMODULE=true
-inherit kde4-meta
-
-DESCRIPTION="KDE SC solid runtime modules (autoeject, automounter and others)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-# Packages merged around 4.3.77
-add_blocker solidautoeject
-add_blocker solid-device-automounter
-add_blocker solid-hardware
-add_blocker soliduiserver
-# Moved away from workspace
-add_blocker solid '<4.5.69'
-
-KMEXTRA="
-	solid-device-automounter/
-	solid-hardware/
-	solid-networkstatus/
-	solidautoeject/
-	soliduiserver/
-"
diff --git a/kde-base/solid/ChangeLog b/kde-base/solid/ChangeLog
index c80d56ef3df6..03236df96807 100644
--- a/kde-base/solid/ChangeLog
+++ b/kde-base/solid/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/solid
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/ChangeLog,v 1.117 2011/10/21 23:56:15 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/ChangeLog,v 1.118 2011/10/28 19:03:33 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -solid-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   21 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> solid-4.7.1.ebuild,
   solid-4.7.2.ebuild:
diff --git a/kde-base/solid/solid-4.7.1.ebuild b/kde-base/solid/solid-4.7.1.ebuild
deleted file mode 100644
index 9aaf30aa0e67..000000000000
--- a/kde-base/solid/solid-4.7.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/solid-4.7.1.ebuild,v 1.3 2011/10/21 23:56:15 dilfridge Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-CPPUNIT_REQUIRED="test"
-inherit kde4-meta
-
-DESCRIPTION="Solid: the KDE hardware library"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug bluetooth networkmanager wicd"
-
-DEPEND="
-	networkmanager? ( net-misc/networkmanager )
-	wicd? ( net-misc/wicd )
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep solid-runtime)
-"
-
-PDEPEND="bluetooth? ( net-wireless/bluedevil )"
-
-KMEXTRA="
-	libs/solid/
-"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with networkmanager NetworkManager)
-		$(cmake-utils_use_build wicd)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/step/ChangeLog b/kde-base/step/ChangeLog
index ef1a533f9f1b..9d5c919e4b07 100644
--- a/kde-base/step/ChangeLog
+++ b/kde-base/step/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/step
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/step/ChangeLog,v 1.86 2011/10/15 17:26:06 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/step/ChangeLog,v 1.87 2011/10/28 19:03:43 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -step-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -step-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/step/step-4.7.1.ebuild b/kde-base/step/step-4.7.1.ebuild
deleted file mode 100644
index 5611be882b3f..000000000000
--- a/kde-base/step/step-4.7.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/step/step-4.7.1.ebuild,v 1.1 2011/09/07 20:13:58 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="The KDE physics simulator"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +gsl +qalculate"
-
-DEPEND="
-	>=dev-cpp/eigen-2.0.3:2
-	sci-libs/cln
-	>=sci-mathematics/gmm-3.0
-	gsl? ( >=sci-libs/gsl-1.9-r1 )
-	qalculate? ( >=sci-libs/libqalculate-0.9.5 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3.2-solaris.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with gsl)
-		$(cmake-utils_use_with qalculate)
-	)
-	kde4-base_src_configure
-}
diff --git a/kde-base/superkaramba/ChangeLog b/kde-base/superkaramba/ChangeLog
index 02a6504350b3..74b0e3bf5cdf 100644
--- a/kde-base/superkaramba/ChangeLog
+++ b/kde-base/superkaramba/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/superkaramba
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/ChangeLog,v 1.177 2011/10/15 17:25:58 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/ChangeLog,v 1.178 2011/10/28 19:03:27 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -superkaramba-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -superkaramba-4.7.0.ebuild:
diff --git a/kde-base/superkaramba/superkaramba-4.7.1.ebuild b/kde-base/superkaramba/superkaramba-4.7.1.ebuild
deleted file mode 100644
index 72846376ec27..000000000000
--- a/kde-base/superkaramba/superkaramba-4.7.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/superkaramba-4.7.1.ebuild,v 1.1 2011/09/07 20:13:39 alexxy Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="python? 2"
-KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeutils"
-	kde_eclass="kde4-meta"
-fi
-inherit python ${kde_eclass}
-
-DESCRIPTION="A tool to create interactive applets for the KDE desktop."
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug python"
-
-DEPEND="
-	media-libs/qimageblitz
-	python? ( $(add_kdebase_dep pykde4) )
-"
-RDEPEND="${DEPEND}
-	python? ( $(add_kdebase_dep krosspython) )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-as-needed.patch" )
-
-pkg_setup() {
-	${kde_eclass}_pkg_setup
-	python_set_active_version 2
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with python PythonLibs)
-	)
-
-	${kde_eclass}_src_configure
-}
diff --git a/kde-base/svgpart/ChangeLog b/kde-base/svgpart/ChangeLog
index 17accd0fd979..1c643990c40d 100644
--- a/kde-base/svgpart/ChangeLog
+++ b/kde-base/svgpart/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/svgpart
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/svgpart/ChangeLog,v 1.94 2011/10/15 17:25:57 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/svgpart/ChangeLog,v 1.95 2011/10/28 19:03:26 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -svgpart-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -svgpart-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/svgpart/svgpart-4.7.1.ebuild b/kde-base/svgpart/svgpart-4.7.1.ebuild
deleted file mode 100644
index 8e3e84f5c2dc..000000000000
--- a/kde-base/svgpart/svgpart-4.7.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/svgpart/svgpart-4.7.1.ebuild,v 1.1 2011/09/07 20:13:54 alexxy Exp $
-
-EAPI=4
-
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="Svgpart is a kpart for viewing SVGs"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/sweeper/ChangeLog b/kde-base/sweeper/ChangeLog
index 3f3249c649ca..2cbafac4ecf9 100644
--- a/kde-base/sweeper/ChangeLog
+++ b/kde-base/sweeper/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/sweeper
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/sweeper/ChangeLog,v 1.90 2011/10/15 17:25:59 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/sweeper/ChangeLog,v 1.91 2011/10/28 19:03:29 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -sweeper-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -sweeper-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/sweeper/sweeper-4.7.1.ebuild b/kde-base/sweeper/sweeper-4.7.1.ebuild
deleted file mode 100644
index 58cd04d54a32..000000000000
--- a/kde-base/sweeper/sweeper-4.7.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/sweeper/sweeper-4.7.1.ebuild,v 1.1 2011/09/07 20:14:06 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeutils"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
-
-DESCRIPTION="KDE Privacy Settings Widget"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/system-config-printer-kde/ChangeLog b/kde-base/system-config-printer-kde/ChangeLog
index 775ff71b01ff..0452a3c17b19 100644
--- a/kde-base/system-config-printer-kde/ChangeLog
+++ b/kde-base/system-config-printer-kde/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/system-config-printer-kde
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/system-config-printer-kde/ChangeLog,v 1.57 2011/10/28 17:54:21 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/system-config-printer-kde/ChangeLog,v 1.58 2011/10/28 19:03:24 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -system-config-printer-kde-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
 *system-config-printer-kde-4.7.2-r1 (28 Oct 2011)
 
diff --git a/kde-base/system-config-printer-kde/system-config-printer-kde-4.7.1.ebuild b/kde-base/system-config-printer-kde/system-config-printer-kde-4.7.1.ebuild
deleted file mode 100644
index ea7a8004c365..000000000000
--- a/kde-base/system-config-printer-kde/system-config-printer-kde-4.7.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/system-config-printer-kde/system-config-printer-kde-4.7.1.ebuild,v 1.1 2011/09/07 20:14:01 alexxy Exp $
-
-EAPI=3
-
-KMNAME="kdeadmin"
-PYTHON_DEPEND="2"
-inherit python kde4-meta
-
-DESCRIPTION="KDE port of Red Hat's Gnome system-config-printer"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=app-admin/system-config-printer-common-1.2.2
-	>=dev-python/pycups-1.9.49
-	$(add_kdebase_dep pykde4)
-"
-RDEPEND="${DEPEND}
-	net-print/cups[dbus]
-"
-
-pkg_setup() {
-	kde4-meta_pkg_setup
-	python_set_active_version 2
-}
-
-src_install() {
-	kde4-meta_src_install
-	python_convert_shebangs -q -r $(python_get_version) "${ED}"
-}
-
-pkg_postrm() {
-	python_mod_cleanup "${PREFIX}share/apps/${PN}"
-}
diff --git a/kde-base/systemsettings/ChangeLog b/kde-base/systemsettings/ChangeLog
index 6514892ca848..1f18231b8ede 100644
--- a/kde-base/systemsettings/ChangeLog
+++ b/kde-base/systemsettings/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/systemsettings
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.118 2011/10/15 17:26:04 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.119 2011/10/28 19:03:34 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -systemsettings-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -systemsettings-4.7.0.ebuild:
diff --git a/kde-base/systemsettings/systemsettings-4.7.1.ebuild b/kde-base/systemsettings/systemsettings-4.7.1.ebuild
deleted file mode 100644
index 8656e804978c..000000000000
--- a/kde-base/systemsettings/systemsettings-4.7.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.7.1.ebuild,v 1.1 2011/09/07 20:13:45 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-workspace"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="System settings utility"
-IUSE="debug gtk +usb xinerama"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-COMMONDEPEND="
-	dev-libs/glib:2
-	$(add_kdebase_dep libkworkspace)
-	media-libs/fontconfig
-	>=media-libs/freetype-2
-	>=x11-libs/libxklavier-3.2
-	x11-libs/libXcursor
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXft
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	opengl? ( virtual/opengl )
-	usb? ( =virtual/libusb-0* )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${COMMONDEPEND}
-	x11-proto/kbproto
-	x11-proto/xextproto
-	xinerama? ( x11-proto/xineramaproto )
-"
-RDEPEND="${COMMONDEPEND}
-	sys-libs/timezone-data
-	x11-apps/setxkbmap
-	x11-misc/xkeyboard-config
-	gtk? ( kde-misc/kcm-gtk-config )
-"
-
-KMEXTRA="
-	kcontrol/
-"
-KMEXTRACTONLY="
-	krunner/dbus/org.kde.krunner.App.xml
-	krunner/dbus/org.kde.screensaver.xml
-	kwin/
-	libs/
-	plasma/
-"
-
-add_blocker kcontrol '<4.3.98'
-add_blocker konqueror '<4.4.70'
-add_blocker kdeaccessibility-colorschemes '<4.6.50'
-
-PATCHES=( "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" )
-
-src_unpack() {
-	if use handbook; then
-		KMEXTRA+="
-			doc/kcontrol
-			doc/kfontview
-		"
-	fi
-
-	kde4-meta_src_unpack
-}
-
-src_prepare() {
-	sed -i -e 's/systemsettingsrc DESTINATION ${SYSCONF_INSTALL_DIR}/systemsettingsrc DESTINATION ${CONFIG_INSTALL_DIR}/' \
-		systemsettings/CMakeLists.txt \
-		|| die "Failed to fix systemsettingsrc install location"
-
-	kde4-meta_src_prepare
-}
-
-# FIXME: is have_openglxvisual found without screensaver
-src_configure() {
-	# Old keyboard-detection code is unmaintained,
-	# so we force the new stuff, using libxklavier.
-	mycmakeargs=(
-		-DUSE_XKLAVIER=ON -DWITH_LibXKlavier=ON
-		-DWITH_GLIB2=ON -DWITH_GObject=ON
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with usb)
-		$(cmake-utils_use_with xinerama X11_Xinerama)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/thumbnailers/ChangeLog b/kde-base/thumbnailers/ChangeLog
index a422b85efc8c..5e12731b87f0 100644
--- a/kde-base/thumbnailers/ChangeLog
+++ b/kde-base/thumbnailers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/thumbnailers
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/thumbnailers/ChangeLog,v 1.66 2011/10/15 17:26:01 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/thumbnailers/ChangeLog,v 1.67 2011/10/28 19:03:30 dilfridge Exp $
+
+  28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -thumbnailers-4.7.1.ebuild:
+  Drop KDEpim 4.6.1 and KDE 4.7.1
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -thumbnailers-4.7.0.ebuild:
diff --git a/kde-base/thumbnailers/thumbnailers-4.7.1.ebuild b/kde-base/thumbnailers/thumbnailers-4.7.1.ebuild
deleted file mode 100644
index 3b056c745881..000000000000
--- a/kde-base/thumbnailers/thumbnailers-4.7.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/thumbnailers/thumbnailers-4.7.1.ebuild,v 1.1 2011/09/07 20:13:44 alexxy Exp $
-
-EAPI=4
-
-KDE_SCM="git"
-KMNAME="kdegraphics-thumbnailers"
-inherit kde4-base
-
-DESCRIPTION="KDE 4 thumbnail generators for PDF/PS files"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep libkdcraw)
-	$(add_kdebase_dep libkexiv2)
-	media-libs/lcms:0
-"
-RDEPEND="${DEPEND}"
-
-add_blocker kdegraphics-strigi-analyzer '<4.2.91'
-
-S="${WORKDIR}/${KMNAME}-${PV}"
author	Andreas K. Hüttel <dilfridge@gentoo.org>	2011-10-28 19:03:48 +0000
committer	Andreas K. Hüttel <dilfridge@gentoo.org>	2011-10-28 19:03:48 +0000
commit	77b20615bb930cef6da50398d4bc456f89272bf8 (patch)
tree	2e9b2c7048cfe75f38525f73bf365449c94c6ad8 /kde-base
parent	Drop KDEpim 4.6.1 and KDE 4.7.1 (diff)
download	gentoo-2-77b20615bb930cef6da50398d4bc456f89272bf8.tar.gz gentoo-2-77b20615bb930cef6da50398d4bc456f89272bf8.tar.bz2 gentoo-2-77b20615bb930cef6da50398d4bc456f89272bf8.zip