Drop old. Version bump.

(Portage version: 2.2_rc67/cvs/Linux x86_64, RepoMan options: --force)

844 files changed, 3493 insertions, 8541 deletions

diff --git a/kde-base/akonadi/ChangeLog b/kde-base/akonadi/ChangeLog
index b82410b99f48..350e91c33d58 100644
--- a/kde-base/akonadi/ChangeLog
+++ b/kde-base/akonadi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/akonadi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/ChangeLog,v 1.60 2010/06/05 14:54:01 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/ChangeLog,v 1.61 2010/06/06 14:41:55 scarabeus Exp $
+
+*akonadi-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -akonadi-4.4.2.ebuild, -akonadi-4.4.3.ebuild, +akonadi-4.4.4.ebuild:
+  Remove old. Version bump.
 
   05 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org> akonadi-4.4.2.ebuild,
   akonadi-4.4.3.ebuild:
diff --git a/kde-base/akonadi/akonadi-4.4.3.ebuild b/kde-base/akonadi/akonadi-4.4.3.ebuild
deleted file mode 100644
index 065bf9a39099..000000000000
--- a/kde-base/akonadi/akonadi-4.4.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/akonadi-4.4.3.ebuild,v 1.3 2010/06/05 14:54:01 reavertm Exp $
-
-EAPI="3"
-
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="An extensible cross-desktop storage service for PIM data and meta data"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	>=app-office/akonadi-server-1.3.1
-	$(add_kdebase_dep kdelibs 'semantic-desktop')
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
-	$(add_kdebase_dep libkdepim)
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdepim-runtime)
-"
-
-KMEXTRA="
-	akonadiconsole/
-"
-
-# @since 4.3 - blocks kdemaildir - no longer provided (it's in akonadi now)
-add_blocker kdemaildir
-add_blocker kdepim-kresources '<4.2.95'
-
-src_configure() {
-	mycmakeargs=(
-		# Set the dbus dirs, otherwise it searches in KDEDIR
-		-DAKONADI_DBUS_INTERFACES_INSTALL_DIR="${EPREFIX}/usr/share/dbus-1/interfaces"
-		-DAKONADI_DBUS_SERVICES_INSTALL_DIR="${EPREFIX}/usr/share/dbus-1/services"
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/akonadi/akonadi-4.4.2.ebuild b/kde-base/akonadi/akonadi-4.4.4.ebuild
index 12a3a4cd90ea..74070afb22a8 100644
--- a/kde-base/akonadi/akonadi-4.4.2.ebuild
+++ b/kde-base/akonadi/akonadi-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/akonadi-4.4.2.ebuild,v 1.2 2010/06/05 14:54:01 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/akonadi-4.4.4.ebuild,v 1.1 2010/06/06 14:41:55 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/akregator/ChangeLog b/kde-base/akregator/ChangeLog
index 77707878c33d..3a204c449e5c 100644
--- a/kde-base/akregator/ChangeLog
+++ b/kde-base/akregator/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/akregator
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/ChangeLog,v 1.158 2010/05/03 21:09:06 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/ChangeLog,v 1.159 2010/06/06 14:42:01 scarabeus Exp $
+
+*akregator-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -akregator-4.4.2.ebuild, -akregator-4.4.3.ebuild, +akregator-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -akregator-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/akregator/akregator-4.4.3.ebuild b/kde-base/akregator/akregator-4.4.3.ebuild
deleted file mode 100644
index 2091f6c4b128..000000000000
--- a/kde-base/akregator/akregator-4.4.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/akregator-4.4.3.ebuild,v 1.1 2010/05/03 20:11:49 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="KDE news feed aggregator."
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep libkdepim)
-"
-RDEPEND="${DEPEND}"
-
-KMLOADLIBS="libkdepim"
diff --git a/kde-base/akregator/akregator-4.4.2.ebuild b/kde-base/akregator/akregator-4.4.4.ebuild
index 34885e4941b8..469d8aecb2fa 100644
--- a/kde-base/akregator/akregator-4.4.2.ebuild
+++ b/kde-base/akregator/akregator-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/akregator-4.4.2.ebuild,v 1.1 2010/03/30 19:19:21 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/akregator-4.4.4.ebuild,v 1.1 2010/06/06 14:42:01 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/amor/ChangeLog b/kde-base/amor/ChangeLog
index 61fb3122bc7d..07173ef2d98d 100644
--- a/kde-base/amor/ChangeLog
+++ b/kde-base/amor/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/amor
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/amor/ChangeLog,v 1.151 2010/05/03 21:09:24 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/amor/ChangeLog,v 1.152 2010/06/06 14:41:56 scarabeus Exp $
+
+*amor-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -amor-4.4.2.ebuild,
+  -amor-4.4.3.ebuild, +amor-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -amor-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/amor/amor-4.4.3.ebuild b/kde-base/amor/amor-4.4.3.ebuild
deleted file mode 100644
index e9b89fd40a44..000000000000
--- a/kde-base/amor/amor-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/amor/amor-4.4.3.ebuild,v 1.1 2010/05/03 20:12:12 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdetoys"
-inherit kde4-meta
-
-DESCRIPTION="KDE: Amusing Misuse Of Resources - desktop-dwelling creature"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/amor/amor-4.4.2.ebuild b/kde-base/amor/amor-4.4.4.ebuild
index 30a87ce464f9..5ae1e1479f39 100644
--- a/kde-base/amor/amor-4.4.2.ebuild
+++ b/kde-base/amor/amor-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/amor/amor-4.4.2.ebuild,v 1.1 2010/03/30 19:20:01 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/amor/amor-4.4.4.ebuild,v 1.1 2010/06/06 14:41:56 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/ark/ChangeLog b/kde-base/ark/ChangeLog
index dccfb46316bf..c88031b00b3b 100644
--- a/kde-base/ark/ChangeLog
+++ b/kde-base/ark/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/ark
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ark/ChangeLog,v 1.155 2010/05/03 21:09:39 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ark/ChangeLog,v 1.156 2010/06/06 14:41:44 scarabeus Exp $
+
+*ark-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -ark-4.4.2.ebuild,
+  -ark-4.4.3.ebuild, +ark-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -ark-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/ark/ark-4.4.3.ebuild b/kde-base/ark/ark-4.4.3.ebuild
deleted file mode 100644
index ab9529e0a2e0..000000000000
--- a/kde-base/ark/ark-4.4.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ark/ark-4.4.3.ebuild,v 1.1 2010/05/03 20:12:31 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdeutils"
-inherit kde4-meta
-
-DESCRIPTION="KDE Archiving tool"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+archive +bzip2 debug +handbook lzma zip"
-
-DEPEND="
-	$(add_kdebase_dep libkonq)
-	archive? ( >=app-arch/libarchive-2.6.1[bzip2?,lzma?,zlib] )
-	lzma? ( app-arch/xz-utils )
-	zip? ( >=dev-libs/libzip-0.8 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with archive LibArchive)
-		$(cmake-utils_use_with bzip2 BZip2)
-		$(cmake-utils_use_with lzma LibLZMA)
-		$(cmake-utils_use_with zip LibZip)
-	)
-	kde4-meta_src_configure
-}
diff --git a/kde-base/ark/ark-4.4.2.ebuild b/kde-base/ark/ark-4.4.4.ebuild
index b9e51869ca89..890464f19891 100644
--- a/kde-base/ark/ark-4.4.2.ebuild
+++ b/kde-base/ark/ark-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ark/ark-4.4.2.ebuild,v 1.1 2010/03/30 19:20:28 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ark/ark-4.4.4.ebuild,v 1.1 2010/06/06 14:41:44 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/attica/ChangeLog b/kde-base/attica/ChangeLog
index beae28db6e0d..cd7ff962f613 100644
--- a/kde-base/attica/ChangeLog
+++ b/kde-base/attica/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/attica
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/attica/ChangeLog,v 1.12 2010/05/28 22:44:15 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/attica/ChangeLog,v 1.13 2010/06/06 14:41:56 scarabeus Exp $
+
+*attica-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -attica-4.4.2.ebuild,
+  -attica-4.4.3.ebuild, +attica-4.4.4.ebuild:
+  Remove old. Version bump.
 
   28 May 2010; Maciej Mrozowski <reavertm@gentoo.org> attica-4.4.2.ebuild,
   attica-4.4.3.ebuild:
diff --git a/kde-base/attica/attica-4.4.3.ebuild b/kde-base/attica/attica-4.4.3.ebuild
deleted file mode 100644
index 10654af3312b..000000000000
--- a/kde-base/attica/attica-4.4.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/attica/attica-4.4.3.ebuild,v 1.4 2010/05/28 22:44:15 reavertm Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-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.2
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/attica/attica-4.4.2.ebuild b/kde-base/attica/attica-4.4.4.ebuild
index 3b6f7252c502..bc3f51aac96a 100644
--- a/kde-base/attica/attica-4.4.2.ebuild
+++ b/kde-base/attica/attica-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/attica/attica-4.4.2.ebuild,v 1.3 2010/05/28 22:44:15 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/attica/attica-4.4.4.ebuild,v 1.1 2010/06/06 14:41:56 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/blinken/ChangeLog b/kde-base/blinken/ChangeLog
index 9b80de2a5a75..c5be5ae4a03f 100644
--- a/kde-base/blinken/ChangeLog
+++ b/kde-base/blinken/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/blinken
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/blinken/ChangeLog,v 1.126 2010/05/03 21:10:14 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/blinken/ChangeLog,v 1.127 2010/06/06 14:42:18 scarabeus Exp $
+
+*blinken-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -blinken-4.4.2.ebuild, -blinken-4.4.3.ebuild, +blinken-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -blinken-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/blinken/blinken-4.4.3.ebuild b/kde-base/blinken/blinken-4.4.3.ebuild
deleted file mode 100644
index 4f7d791b09c9..000000000000
--- a/kde-base/blinken/blinken-4.4.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/blinken/blinken-4.4.3.ebuild,v 1.1 2010/05/03 20:13:12 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdeedu"
-inherit kde4-meta
-
-DESCRIPTION="KDE version of the Simon Says game."
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-DEPEND="
-	$(add_kdebase_dep libkdeedu)
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep knotify)
-"
-
-KMEXTRACTONLY="libkdeedu/kdeeduui"
diff --git a/kde-base/blinken/blinken-4.4.2.ebuild b/kde-base/blinken/blinken-4.4.4.ebuild
index e43420a8d3ee..46348c0ee997 100644
--- a/kde-base/blinken/blinken-4.4.2.ebuild
+++ b/kde-base/blinken/blinken-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/blinken/blinken-4.4.2.ebuild,v 1.1 2010/03/30 19:21:23 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/blinken/blinken-4.4.4.ebuild,v 1.1 2010/06/06 14:42:18 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/blogilo/ChangeLog b/kde-base/blogilo/ChangeLog
index bd969083f34d..266a18139d72 100644
--- a/kde-base/blogilo/ChangeLog
+++ b/kde-base/blogilo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/blogilo
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/blogilo/ChangeLog,v 1.9 2010/05/03 21:10:32 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/blogilo/ChangeLog,v 1.10 2010/06/06 14:42:20 scarabeus Exp $
+
+*blogilo-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -blogilo-4.4.2.ebuild, -blogilo-4.4.3.ebuild, +blogilo-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -blogilo-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/blogilo/blogilo-4.4.2.ebuild b/kde-base/blogilo/blogilo-4.4.2.ebuild
deleted file mode 100644
index 4b930ec8d5c0..000000000000
--- a/kde-base/blogilo/blogilo-4.4.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/blogilo/blogilo-4.4.2.ebuild,v 1.1 2010/03/30 19:21:49 spatz Exp $
-
-EAPI="3"
-
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="KDE Blogging Client"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-"
-RDEPEND="${DEPEND}
-	!kde-misc/bilbo
-	!kde-misc/blogilo
-"
diff --git a/kde-base/blogilo/blogilo-4.4.3.ebuild b/kde-base/blogilo/blogilo-4.4.4.ebuild
index 6b1a0868c890..07cf4358ca73 100644
--- a/kde-base/blogilo/blogilo-4.4.3.ebuild
+++ b/kde-base/blogilo/blogilo-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/blogilo/blogilo-4.4.3.ebuild,v 1.1 2010/05/03 20:13:30 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/blogilo/blogilo-4.4.4.ebuild,v 1.1 2010/06/06 14:42:20 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/bomber/ChangeLog b/kde-base/bomber/ChangeLog
index 9378ebbb93c1..86bcf7504d18 100644
--- a/kde-base/bomber/ChangeLog
+++ b/kde-base/bomber/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/bomber
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/bomber/ChangeLog,v 1.41 2010/05/03 21:10:48 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/bomber/ChangeLog,v 1.42 2010/06/06 14:41:21 scarabeus Exp $
+
+*bomber-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -bomber-4.4.2.ebuild,
+  -bomber-4.4.3.ebuild, +bomber-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -bomber-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/bomber/bomber-4.4.2.ebuild b/kde-base/bomber/bomber-4.4.2.ebuild
deleted file mode 100644
index 0d972472efc2..000000000000
--- a/kde-base/bomber/bomber-4.4.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/bomber/bomber-4.4.2.ebuild,v 1.1 2010/03/30 19:22:17 spatz Exp $
-
-EAPI="3"
-
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE arcade bombing game"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/bomber/bomber-4.4.3.ebuild b/kde-base/bomber/bomber-4.4.4.ebuild
index 975169688c19..1f5f2ddab009 100644
--- a/kde-base/bomber/bomber-4.4.3.ebuild
+++ b/kde-base/bomber/bomber-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/bomber/bomber-4.4.3.ebuild,v 1.1 2010/05/03 20:13:50 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/bomber/bomber-4.4.4.ebuild,v 1.1 2010/06/06 14:41:21 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/bovo/ChangeLog b/kde-base/bovo/ChangeLog
index d85ca5183245..25ee8e28826d 100644
--- a/kde-base/bovo/ChangeLog
+++ b/kde-base/bovo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/bovo
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/bovo/ChangeLog,v 1.56 2010/05/03 21:11:04 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/bovo/ChangeLog,v 1.57 2010/06/06 14:41:38 scarabeus Exp $
+
+*bovo-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -bovo-4.4.2.ebuild,
+  -bovo-4.4.3.ebuild, +bovo-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -bovo-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/bovo/bovo-4.4.2.ebuild b/kde-base/bovo/bovo-4.4.2.ebuild
deleted file mode 100644
index d26327bd2fdb..000000000000
--- a/kde-base/bovo/bovo-4.4.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/bovo/bovo-4.4.2.ebuild,v 1.1 2010/03/30 19:22:44 spatz Exp $
-
-EAPI="3"
-
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="Five-in-a-row Board Game"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/bovo/bovo-4.4.3.ebuild b/kde-base/bovo/bovo-4.4.4.ebuild
index 690d11e88e88..9595e8ac9dbd 100644
--- a/kde-base/bovo/bovo-4.4.3.ebuild
+++ b/kde-base/bovo/bovo-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/bovo/bovo-4.4.3.ebuild,v 1.1 2010/05/03 20:14:10 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/bovo/bovo-4.4.4.ebuild,v 1.1 2010/06/06 14:41:38 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/cantor/ChangeLog b/kde-base/cantor/ChangeLog
index 8a60d68035a8..a2876ed6d2b6 100644
--- a/kde-base/cantor/ChangeLog
+++ b/kde-base/cantor/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/cantor
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/cantor/ChangeLog,v 1.8 2010/05/03 21:11:21 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/cantor/ChangeLog,v 1.9 2010/06/06 14:41:38 scarabeus Exp $
+
+*cantor-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -cantor-4.4.2.ebuild,
+  -cantor-4.4.3.ebuild, +cantor-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -cantor-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/cantor/cantor-4.4.3.ebuild b/kde-base/cantor/cantor-4.4.3.ebuild
deleted file mode 100644
index 33f9a3e6894a..000000000000
--- a/kde-base/cantor/cantor-4.4.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/cantor/cantor-4.4.3.ebuild,v 1.1 2010/05/03 20:14:31 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdeedu"
-inherit kde4-meta
-
-DESCRIPTION="KDE4 interface for doing mathematics and scientific computing"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook 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-meta_src_configure
-}
-
-pkg_postinst() {
-	kde4-meta_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/cantor/cantor-4.4.2.ebuild b/kde-base/cantor/cantor-4.4.4.ebuild
index 53c8b9bb9785..7d1eabff990f 100644
--- a/kde-base/cantor/cantor-4.4.2.ebuild
+++ b/kde-base/cantor/cantor-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/cantor/cantor-4.4.2.ebuild,v 1.1 2010/03/30 19:23:11 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/cantor/cantor-4.4.4.ebuild,v 1.1 2010/06/06 14:41:38 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/cervisia/ChangeLog b/kde-base/cervisia/ChangeLog
index ebb955c1fc6b..1d6f9639140a 100644
--- a/kde-base/cervisia/ChangeLog
+++ b/kde-base/cervisia/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/cervisia
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/cervisia/ChangeLog,v 1.145 2010/05/03 21:11:38 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/cervisia/ChangeLog,v 1.146 2010/06/06 14:42:04 scarabeus Exp $
+
+*cervisia-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -cervisia-4.4.2.ebuild, -cervisia-4.4.3.ebuild, +cervisia-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -cervisia-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/cervisia/cervisia-4.4.3.ebuild b/kde-base/cervisia/cervisia-4.4.3.ebuild
deleted file mode 100644
index 4e887f5327f6..000000000000
--- a/kde-base/cervisia/cervisia-4.4.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/cervisia/cervisia-4.4.3.ebuild,v 1.1 2010/05/03 20:14:51 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdesdk"
-inherit kde4-meta
-
-DESCRIPTION="Cervisia - A KDE CVS frontend"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-RDEPEND="
-	dev-util/cvs
-"
diff --git a/kde-base/cervisia/cervisia-4.4.2.ebuild b/kde-base/cervisia/cervisia-4.4.4.ebuild
index a759d48700d5..637f55facb6e 100644
--- a/kde-base/cervisia/cervisia-4.4.2.ebuild
+++ b/kde-base/cervisia/cervisia-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/cervisia/cervisia-4.4.2.ebuild,v 1.1 2010/03/30 19:23:37 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/cervisia/cervisia-4.4.4.ebuild,v 1.1 2010/06/06 14:42:04 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/dolphin/ChangeLog b/kde-base/dolphin/ChangeLog
index 7d0888c6c693..64238679d47b 100644
--- a/kde-base/dolphin/ChangeLog
+++ b/kde-base/dolphin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/dolphin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/ChangeLog,v 1.72 2010/05/03 21:11:55 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/ChangeLog,v 1.73 2010/06/06 14:42:17 scarabeus Exp $
+
+*dolphin-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -dolphin-4.4.2.ebuild, -dolphin-4.4.3.ebuild, +dolphin-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -dolphin-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/dolphin/dolphin-4.4.3.ebuild b/kde-base/dolphin/dolphin-4.4.3.ebuild
deleted file mode 100644
index 3b1a7f47f3e4..000000000000
--- a/kde-base/dolphin/dolphin-4.4.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/dolphin-4.4.3.ebuild,v 1.1 2010/05/03 20:15:12 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-apps"
-inherit kde4-meta
-
-DESCRIPTION="A KDE filemanager focusing on usability"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook semantic-desktop subversion 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)
-	subversion? (
-		dev-util/subversion
-		$(add_kdebase_dep kompare)
-	)
-"
-PDEPEND="
-	thumbnail? ( $(add_kdebase_dep mplayerthumbs) )
-"
-
-KMLOADLIBS="libkonq"
-
-src_prepare() {
-	kde4-meta_src_prepare
-
-	if ! use subversion; then
-		sed -e '/install(.*fileviewsvnplugin.*)/s/^/#DONOTINSTALL /g' \
-			-i dolphin/src/CMakeLists.txt || die 'failed to disable subversion plugin'
-	fi
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/dolphin/dolphin-4.4.2.ebuild b/kde-base/dolphin/dolphin-4.4.4.ebuild
index 673adc689bd5..47de51605e47 100644
--- a/kde-base/dolphin/dolphin-4.4.2.ebuild
+++ b/kde-base/dolphin/dolphin-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/dolphin-4.4.2.ebuild,v 1.1 2010/03/30 19:24:05 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/dolphin-4.4.4.ebuild,v 1.1 2010/06/06 14:42:17 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/dragonplayer/ChangeLog b/kde-base/dragonplayer/ChangeLog
index 416ad7ab4f95..fd03bc7ad70e 100644
--- a/kde-base/dragonplayer/ChangeLog
+++ b/kde-base/dragonplayer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/dragonplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dragonplayer/ChangeLog,v 1.54 2010/05/03 21:12:13 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dragonplayer/ChangeLog,v 1.55 2010/06/06 14:42:12 scarabeus Exp $
+
+*dragonplayer-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -dragonplayer-4.4.2.ebuild, -dragonplayer-4.4.3.ebuild,
+  +dragonplayer-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -dragonplayer-4.4.1.ebuild:
diff --git a/kde-base/dragonplayer/dragonplayer-4.4.3.ebuild b/kde-base/dragonplayer/dragonplayer-4.4.3.ebuild
deleted file mode 100644
index 1f0eaaa68b88..000000000000
--- a/kde-base/dragonplayer/dragonplayer-4.4.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dragonplayer/dragonplayer-4.4.3.ebuild,v 1.1 2010/05/03 20:15:31 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdemultimedia"
-inherit kde4-meta
-
-DESCRIPTION="Dragon Player is a simple video player for KDE 4"
-HOMEPAGE="http://www.dragonplayer.net/"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-2"
-IUSE="debug +handbook"
-
-RDEPEND="
-	aqua? ( >=media-libs/xine-lib-1.1.9 )
-	!aqua? ( >=media-libs/xine-lib-1.1.9[xcb] )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
diff --git a/kde-base/dragonplayer/dragonplayer-4.4.2.ebuild b/kde-base/dragonplayer/dragonplayer-4.4.4.ebuild
index e125a0b7ae43..d6c9ee659ae1 100644
--- a/kde-base/dragonplayer/dragonplayer-4.4.2.ebuild
+++ b/kde-base/dragonplayer/dragonplayer-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dragonplayer/dragonplayer-4.4.2.ebuild,v 1.1 2010/03/30 19:24:31 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dragonplayer/dragonplayer-4.4.4.ebuild,v 1.1 2010/06/06 14:42:13 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/drkonqi/ChangeLog b/kde-base/drkonqi/ChangeLog
index 29317b5a6994..e15d10da4f2f 100644
--- a/kde-base/drkonqi/ChangeLog
+++ b/kde-base/drkonqi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/drkonqi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/drkonqi/ChangeLog,v 1.162 2010/05/04 08:01:23 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/drkonqi/ChangeLog,v 1.163 2010/06/06 14:42:08 scarabeus Exp $
+
+*drkonqi-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -drkonqi-4.4.2.ebuild, -drkonqi-4.4.3.ebuild, +drkonqi-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org> drkonqi-4.4.3.ebuild:
   Restore accidently dropped ~x86-fbsd keyword on KDE SC 4.4.3
diff --git a/kde-base/drkonqi/drkonqi-4.4.3.ebuild b/kde-base/drkonqi/drkonqi-4.4.3.ebuild
deleted file mode 100644
index d90e5035f6d7..000000000000
--- a/kde-base/drkonqi/drkonqi-4.4.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/drkonqi/drkonqi-4.4.3.ebuild,v 1.2 2010/05/04 08:01:23 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KDE crash handler, gives the user feedback if a program crashed"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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/drkonqi/drkonqi-4.4.2.ebuild b/kde-base/drkonqi/drkonqi-4.4.4.ebuild
index d3cb268f644e..6f23ed5f8668 100644
--- a/kde-base/drkonqi/drkonqi-4.4.2.ebuild
+++ b/kde-base/drkonqi/drkonqi-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/drkonqi/drkonqi-4.4.2.ebuild,v 1.2 2010/05/03 05:00:17 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/drkonqi/drkonqi-4.4.4.ebuild,v 1.1 2010/06/06 14:42:08 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/granatier/ChangeLog b/kde-base/granatier/ChangeLog
index 8b37ad5af33c..cca02264b698 100644
--- a/kde-base/granatier/ChangeLog
+++ b/kde-base/granatier/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/granatier
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/granatier/ChangeLog,v 1.8 2010/05/03 21:12:47 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/granatier/ChangeLog,v 1.9 2010/06/06 14:42:10 scarabeus Exp $
+
+*granatier-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -granatier-4.4.2.ebuild, -granatier-4.4.3.ebuild, +granatier-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -granatier-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/granatier/granatier-4.4.3.ebuild b/kde-base/granatier/granatier-4.4.3.ebuild
deleted file mode 100644
index 38fa2189d01d..000000000000
--- a/kde-base/granatier/granatier-4.4.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/granatier/granatier-4.4.3.ebuild,v 1.1 2010/05/03 20:16:09 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE Bomberman game"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook gluon"
-
-DEPEND="
-	gluon? ( media-libs/gluon )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	mycmakeargs+="
-		$(cmake-utils_use_with gluon)
-	"
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/granatier/granatier-4.4.2.ebuild b/kde-base/granatier/granatier-4.4.4.ebuild
index 78b0c70cacd9..0d954f2c6bf8 100644
--- a/kde-base/granatier/granatier-4.4.2.ebuild
+++ b/kde-base/granatier/granatier-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/granatier/granatier-4.4.2.ebuild,v 1.1 2010/03/30 19:25:27 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/granatier/granatier-4.4.4.ebuild,v 1.1 2010/06/06 14:42:10 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/gwenview/ChangeLog b/kde-base/gwenview/ChangeLog
index 6d0036d1f796..6bc56644dee2 100644
--- a/kde-base/gwenview/ChangeLog
+++ b/kde-base/gwenview/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/gwenview
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/gwenview/ChangeLog,v 1.62 2010/05/03 21:13:05 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/gwenview/ChangeLog,v 1.63 2010/06/06 14:41:30 scarabeus Exp $
+
+*gwenview-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -gwenview-4.4.2.ebuild, -gwenview-4.4.3.ebuild, +gwenview-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -gwenview-4.4.1.ebuild,
   -gwenview-4.4.1-r1.ebuild:
diff --git a/kde-base/gwenview/gwenview-4.4.3.ebuild b/kde-base/gwenview/gwenview-4.4.3.ebuild
deleted file mode 100644
index 9711e6467ad8..000000000000
--- a/kde-base/gwenview/gwenview-4.4.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/gwenview/gwenview-4.4.3.ebuild,v 1.1 2010/05/03 20:16:28 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdegraphics"
-inherit kde4-meta
-
-DESCRIPTION="KDE image viewer"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook kipi semantic-desktop"
-
-# tests hang, last checked for 4.2.96
-RESTRICT="test"
-
-DEPEND="
-	$(add_kdebase_dep kdelibs 'semantic-desktop?')
-	>=media-gfx/exiv2-0.18
-	media-libs/jpeg
-	kipi? ( $(add_kdebase_dep libkipi) )
-"
-RDEPEND="${DEPEND}"
-
-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-meta_src_configure
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-
-	echo
-	elog "For SVG support, emerge -va kde-base/svgpart"
-	echo
-}
diff --git a/kde-base/gwenview/gwenview-4.4.2.ebuild b/kde-base/gwenview/gwenview-4.4.4.ebuild
index 72cf42d116f9..d9e6737c9d0a 100644
--- a/kde-base/gwenview/gwenview-4.4.2.ebuild
+++ b/kde-base/gwenview/gwenview-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/gwenview/gwenview-4.4.2.ebuild,v 1.2 2010/04/29 03:56:32 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/gwenview/gwenview-4.4.4.ebuild,v 1.1 2010/06/06 14:41:30 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/juk/ChangeLog b/kde-base/juk/ChangeLog
index 45bb652ac43d..6674b518fc41 100644
--- a/kde-base/juk/ChangeLog
+++ b/kde-base/juk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/juk
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/ChangeLog,v 1.165 2010/05/03 21:13:23 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/ChangeLog,v 1.166 2010/06/06 14:41:43 scarabeus Exp $
+
+*juk-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -juk-4.4.2.ebuild,
+  -juk-4.4.3.ebuild, +juk-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -juk-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/juk/juk-4.4.3.ebuild b/kde-base/juk/juk-4.4.3.ebuild
deleted file mode 100644
index 1e54d4df7f64..000000000000
--- a/kde-base/juk/juk-4.4.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/juk-4.4.3.ebuild,v 1.1 2010/05/03 20:16:47 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdemultimedia"
-inherit kde4-meta
-
-DESCRIPTION="Jukebox and music manager for KDE."
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook 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/juk/juk-4.4.2.ebuild b/kde-base/juk/juk-4.4.4.ebuild
index da61fa7932df..c013165e8540 100644
--- a/kde-base/juk/juk-4.4.2.ebuild
+++ b/kde-base/juk/juk-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/juk-4.4.2.ebuild,v 1.1 2010/03/30 19:26:21 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/juk-4.4.4.ebuild,v 1.1 2010/06/06 14:41:43 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kabcclient/ChangeLog b/kde-base/kabcclient/ChangeLog
index d6c59ff6b16a..e760cf65a452 100644
--- a/kde-base/kabcclient/ChangeLog
+++ b/kde-base/kabcclient/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kabcclient
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kabcclient/ChangeLog,v 1.34 2010/05/03 21:13:41 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kabcclient/ChangeLog,v 1.35 2010/06/06 14:42:19 scarabeus Exp $
+
+*kabcclient-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kabcclient-4.4.2.ebuild, -kabcclient-4.4.3.ebuild,
+  +kabcclient-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kabcclient-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kabcclient/kabcclient-4.4.3.ebuild b/kde-base/kabcclient/kabcclient-4.4.3.ebuild
deleted file mode 100644
index 3a77eeccfadf..000000000000
--- a/kde-base/kabcclient/kabcclient-4.4.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kabcclient/kabcclient-4.4.3.ebuild,v 1.1 2010/05/03 20:17:06 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdepim"
-KMMODULE="console/${PN}"
-inherit kde4-meta
-
-DESCRIPTION="A command line client for accessing the KDE addressbook"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-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 || die "couldn't symlink kabc2mutt to kabcclient"
-}
diff --git a/kde-base/kabcclient/kabcclient-4.4.2.ebuild b/kde-base/kabcclient/kabcclient-4.4.4.ebuild
index adced17dabde..e26d9fc78015 100644
--- a/kde-base/kabcclient/kabcclient-4.4.2.ebuild
+++ b/kde-base/kabcclient/kabcclient-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kabcclient/kabcclient-4.4.2.ebuild,v 1.1 2010/03/30 19:26:48 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kabcclient/kabcclient-4.4.4.ebuild,v 1.1 2010/06/06 14:42:19 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kaddressbook/ChangeLog b/kde-base/kaddressbook/ChangeLog
index 3a81dd27ec0a..5d80cacdcd3d 100644
--- a/kde-base/kaddressbook/ChangeLog
+++ b/kde-base/kaddressbook/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kaddressbook
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/ChangeLog,v 1.154 2010/06/05 14:57:44 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/ChangeLog,v 1.155 2010/06/06 14:41:22 scarabeus Exp $
+
+*kaddressbook-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kaddressbook-4.4.2.ebuild, -kaddressbook-4.4.3.ebuild,
+  +kaddressbook-4.4.4.ebuild:
+  Remove old. Version bump.
 
   05 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org>
   kaddressbook-4.4.2.ebuild, kaddressbook-4.4.3.ebuild:
diff --git a/kde-base/kaddressbook/kaddressbook-4.4.3.ebuild b/kde-base/kaddressbook/kaddressbook-4.4.3.ebuild
deleted file mode 100644
index 1ba4c6588907..000000000000
--- a/kde-base/kaddressbook/kaddressbook-4.4.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-4.4.3.ebuild,v 1.2 2010/06/05 14:57:44 reavertm Exp $
-
-EAPI="3"
-
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="The KDE Address Book"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-DEPEND="
-	$(add_kdebase_dep kdelibs 'semantic-desktop')
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
-	$(add_kdebase_dep libkdepim)
-	$(add_kdebase_dep libkleo)
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdepim-runtime)
-"
-
-KMEXTRA="
-	plugins/kaddressbook/
-	plugins/ktexteditor/
-"
-KMEXTRACTONLY="
-	libkleo/
-"
-
-KMLOADLIBS="libkdepim"
-
-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.4.2.ebuild b/kde-base/kaddressbook/kaddressbook-4.4.4.ebuild
index 489f2fa4533d..a27a46f6fafa 100644
--- a/kde-base/kaddressbook/kaddressbook-4.4.2.ebuild
+++ b/kde-base/kaddressbook/kaddressbook-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-4.4.2.ebuild,v 1.2 2010/06/05 14:57:44 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-4.4.4.ebuild,v 1.1 2010/06/06 14:41:22 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kalarm/ChangeLog b/kde-base/kalarm/ChangeLog
index ce1d6bd1af8b..8c49bb022aee 100644
--- a/kde-base/kalarm/ChangeLog
+++ b/kde-base/kalarm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kalarm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/ChangeLog,v 1.145 2010/06/05 14:57:55 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/ChangeLog,v 1.146 2010/06/06 14:42:07 scarabeus Exp $
+
+*kalarm-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -kalarm-4.4.2.ebuild,
+  -kalarm-4.4.3.ebuild, +kalarm-4.4.4.ebuild:
+  Remove old. Version bump.
 
   05 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org> kalarm-4.4.2.ebuild,
   kalarm-4.4.3.ebuild:
diff --git a/kde-base/kalarm/kalarm-4.4.3.ebuild b/kde-base/kalarm/kalarm-4.4.3.ebuild
deleted file mode 100644
index cb4aa5272225..000000000000
--- a/kde-base/kalarm/kalarm-4.4.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/kalarm-4.4.3.ebuild,v 1.2 2010/06/05 14:57:55 reavertm Exp $
-
-EAPI="3"
-
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="Personal alarm message, command and email scheduler for KDE"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-RDEPEND="
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
-	$(add_kdebase_dep libkdepim)
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	dev-libs/libxslt
-"
-
-KMEXTRACTONLY="
-	kmail/
-"
-
-src_configure() {
-	mycmakeargs=(
-		-DBUILD_akonadi=OFF
-		-DXSLTPROC_EXECUTABLE="${EPREFIX}"/usr/bin/xsltproc
-	)
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kalarm/kalarm-4.4.2.ebuild b/kde-base/kalarm/kalarm-4.4.4.ebuild
index 811af8f0518b..17cde32313dc 100644
--- a/kde-base/kalarm/kalarm-4.4.2.ebuild
+++ b/kde-base/kalarm/kalarm-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/kalarm-4.4.2.ebuild,v 1.2 2010/06/05 14:57:55 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/kalarm-4.4.4.ebuild,v 1.1 2010/06/06 14:42:07 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kalgebra/ChangeLog b/kde-base/kalgebra/ChangeLog
index 8e178fbaf12c..84e8a1142588 100644
--- a/kde-base/kalgebra/ChangeLog
+++ b/kde-base/kalgebra/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kalgebra
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalgebra/ChangeLog,v 1.61 2010/05/03 21:14:14 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalgebra/ChangeLog,v 1.62 2010/06/06 14:42:20 scarabeus Exp $
+
+*kalgebra-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kalgebra-4.4.2.ebuild, -kalgebra-4.4.3.ebuild, +kalgebra-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kalgebra-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kalgebra/kalgebra-4.4.3.ebuild b/kde-base/kalgebra/kalgebra-4.4.3.ebuild
deleted file mode 100644
index c84b90c3978f..000000000000
--- a/kde-base/kalgebra/kalgebra-4.4.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalgebra/kalgebra-4.4.3.ebuild,v 1.1 2010/05/03 20:18:05 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdeedu"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="MathML-based graph calculator for KDE."
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook +plasma readline"
-
-DEPEND="
-	readline? ( sys-libs/readline )
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="libkdeedu/kdeeduui"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3.2-solaris-graph2d.patch
-)
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with readline)
-		$(cmake-utils_use_with plasma)
-		$(cmake-utils_use_with opengl OpenGL)
-	)
-
-	kde4-meta_src_configure
-}
-
-src_test() {
-	# disable broken test
-	sed -i -e '/mathmlpresentationtest/ s/^/#DO_NOT_RUN_TEST /' \
-		"${S}"/"${PN}"/analitza/tests/CMakeLists.txt || \
-		die "sed to disable mathmlpresentationtest failed."
-
-	kde4-meta_src_test
-}
diff --git a/kde-base/kalgebra/kalgebra-4.4.2.ebuild b/kde-base/kalgebra/kalgebra-4.4.4.ebuild
index a94c7413a7d8..f892527abcaa 100644
--- a/kde-base/kalgebra/kalgebra-4.4.2.ebuild
+++ b/kde-base/kalgebra/kalgebra-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalgebra/kalgebra-4.4.2.ebuild,v 1.1 2010/03/30 19:28:19 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalgebra/kalgebra-4.4.4.ebuild,v 1.1 2010/06/06 14:42:20 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kalzium/ChangeLog b/kde-base/kalzium/ChangeLog
index 624b34fe323e..d68a3a97dc74 100644
--- a/kde-base/kalzium/ChangeLog
+++ b/kde-base/kalzium/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kalzium
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/ChangeLog,v 1.164 2010/05/03 21:14:30 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/ChangeLog,v 1.165 2010/06/06 14:42:14 scarabeus Exp $
+
+*kalzium-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kalzium-4.4.2.ebuild, -kalzium-4.4.3.ebuild, +kalzium-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kalzium-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kalzium/kalzium-4.4.3.ebuild b/kde-base/kalzium/kalzium-4.4.3.ebuild
deleted file mode 100644
index 0b5b86dc6724..000000000000
--- a/kde-base/kalzium/kalzium-4.4.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/kalzium-4.4.3.ebuild,v 1.1 2010/05/03 20:18:25 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdeedu"
-CPPUNIT_REQUIRED="optional"
-OPENGL_REQUIRED="always"
-inherit flag-o-matic kde4-meta
-
-DESCRIPTION="KDE: periodic table of the elements."
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="editor debug +handbook +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-meta_src_configure
-}
diff --git a/kde-base/kalzium/kalzium-4.4.2.ebuild b/kde-base/kalzium/kalzium-4.4.4.ebuild
index aa0a64d2e085..fb386e924d59 100644
--- a/kde-base/kalzium/kalzium-4.4.2.ebuild
+++ b/kde-base/kalzium/kalzium-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/kalzium-4.4.2.ebuild,v 1.1 2010/03/30 19:28:46 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/kalzium-4.4.4.ebuild,v 1.1 2010/06/06 14:42:14 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kamera/ChangeLog b/kde-base/kamera/ChangeLog
index 5a35191b0bd7..dc21ee1df9dd 100644
--- a/kde-base/kamera/ChangeLog
+++ b/kde-base/kamera/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kamera
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kamera/ChangeLog,v 1.146 2010/05/03 21:14:45 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kamera/ChangeLog,v 1.147 2010/06/06 14:41:50 scarabeus Exp $
+
+*kamera-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -kamera-4.4.2.ebuild,
+  -kamera-4.4.3.ebuild, +kamera-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kamera-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kamera/kamera-4.4.3.ebuild b/kde-base/kamera/kamera-4.4.3.ebuild
deleted file mode 100644
index bbd0cd91aa7b..000000000000
--- a/kde-base/kamera/kamera-4.4.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kamera/kamera-4.4.3.ebuild,v 1.1 2010/05/03 20:18:44 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdegraphics"
-inherit kde4-meta
-
-DESCRIPTION="KDE digital camera manager"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-DEPEND="
-	media-libs/libgphoto2
-"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	if use handbook; then
-		KMEXTRA="
-			doc/kcontrol/${PN}
-		"
-	fi
-
-	kde4-meta_src_unpack
-}
diff --git a/kde-base/kamera/kamera-4.4.2.ebuild b/kde-base/kamera/kamera-4.4.4.ebuild
index 03c26f7fde0c..7b0dee4e5596 100644
--- a/kde-base/kamera/kamera-4.4.2.ebuild
+++ b/kde-base/kamera/kamera-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kamera/kamera-4.4.2.ebuild,v 1.1 2010/03/30 19:29:12 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kamera/kamera-4.4.4.ebuild,v 1.1 2010/06/06 14:41:50 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kanagram/ChangeLog b/kde-base/kanagram/ChangeLog
index 20f5865c0f6c..43bb1cc81b9e 100644
--- a/kde-base/kanagram/ChangeLog
+++ b/kde-base/kanagram/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kanagram
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kanagram/ChangeLog,v 1.126 2010/05/03 21:15:03 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kanagram/ChangeLog,v 1.127 2010/06/06 14:41:28 scarabeus Exp $
+
+*kanagram-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kanagram-4.4.2.ebuild, -kanagram-4.4.3.ebuild, +kanagram-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kanagram-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kanagram/kanagram-4.4.3.ebuild b/kde-base/kanagram/kanagram-4.4.3.ebuild
deleted file mode 100644
index 94d98e14e00b..000000000000
--- a/kde-base/kanagram/kanagram-4.4.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kanagram/kanagram-4.4.3.ebuild,v 1.1 2010/05/03 20:19:04 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdeedu"
-inherit kde4-meta
-
-DESCRIPTION="KDE: letter order game."
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-DEPEND="
-	$(add_kdebase_dep libkdeedu)
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kvtml-data)
-"
-
-KMEXTRACTONLY="
-	libkdeedu/kdeeduui/
-	libkdeedu/keduvocdocument/
-"
diff --git a/kde-base/kanagram/kanagram-4.4.2.ebuild b/kde-base/kanagram/kanagram-4.4.4.ebuild
index 7b166bc0b072..f8e2def00723 100644
--- a/kde-base/kanagram/kanagram-4.4.2.ebuild
+++ b/kde-base/kanagram/kanagram-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kanagram/kanagram-4.4.2.ebuild,v 1.1 2010/03/30 19:29:39 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kanagram/kanagram-4.4.4.ebuild,v 1.1 2010/06/06 14:41:28 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kapman/ChangeLog b/kde-base/kapman/ChangeLog
index 9fd822175f78..1b19da5bd36c 100644
--- a/kde-base/kapman/ChangeLog
+++ b/kde-base/kapman/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kapman
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kapman/ChangeLog,v 1.40 2010/05/03 21:15:21 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kapman/ChangeLog,v 1.41 2010/06/06 14:41:33 scarabeus Exp $
+
+*kapman-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -kapman-4.4.2.ebuild,
+  -kapman-4.4.3.ebuild, +kapman-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kapman-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kapman/kapman-4.4.3.ebuild b/kde-base/kapman/kapman-4.4.3.ebuild
deleted file mode 100644
index 05f0604d353b..000000000000
--- a/kde-base/kapman/kapman-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kapman/kapman-4.4.3.ebuild,v 1.1 2010/05/03 20:19:24 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="Pac-Man clone for KDE"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/kapman/kapman-4.4.2.ebuild b/kde-base/kapman/kapman-4.4.4.ebuild
index dfeda6baf681..08718d2e9e6f 100644
--- a/kde-base/kapman/kapman-4.4.2.ebuild
+++ b/kde-base/kapman/kapman-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kapman/kapman-4.4.2.ebuild,v 1.1 2010/03/30 19:30:07 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kapman/kapman-4.4.4.ebuild,v 1.1 2010/06/06 14:41:33 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kappfinder/ChangeLog b/kde-base/kappfinder/ChangeLog
index 4ada732c8a24..76cf23d3003b 100644
--- a/kde-base/kappfinder/ChangeLog
+++ b/kde-base/kappfinder/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kappfinder
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kappfinder/ChangeLog,v 1.155 2010/05/03 21:15:38 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kappfinder/ChangeLog,v 1.156 2010/06/06 14:41:28 scarabeus Exp $
+
+*kappfinder-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kappfinder-4.4.2.ebuild, -kappfinder-4.4.3.ebuild,
+  +kappfinder-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kappfinder-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kappfinder/kappfinder-4.4.2.ebuild b/kde-base/kappfinder/kappfinder-4.4.2.ebuild
deleted file mode 100644
index 01785879e320..000000000000
--- a/kde-base/kappfinder/kappfinder-4.4.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kappfinder/kappfinder-4.4.2.ebuild,v 1.1 2010/03/30 19:30:35 spatz Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-apps"
-inherit kde4-meta
-
-DESCRIPTION="KDE tool that looks for well-known apps in your path and creates entries for them in the KDE menu"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/kappfinder/kappfinder-4.4.3.ebuild b/kde-base/kappfinder/kappfinder-4.4.4.ebuild
index 5b2c4460f80b..da75330a60d2 100644
--- a/kde-base/kappfinder/kappfinder-4.4.3.ebuild
+++ b/kde-base/kappfinder/kappfinder-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kappfinder/kappfinder-4.4.3.ebuild,v 1.1 2010/05/03 20:19:43 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kappfinder/kappfinder-4.4.4.ebuild,v 1.1 2010/06/06 14:41:28 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kapptemplate/ChangeLog b/kde-base/kapptemplate/ChangeLog
index 525f4ca3ca45..9bfc096e3932 100644
--- a/kde-base/kapptemplate/ChangeLog
+++ b/kde-base/kapptemplate/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kapptemplate
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kapptemplate/ChangeLog,v 1.125 2010/05/03 21:15:55 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kapptemplate/ChangeLog,v 1.126 2010/06/06 14:42:10 scarabeus Exp $
+
+*kapptemplate-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kapptemplate-4.4.2.ebuild, -kapptemplate-4.4.3.ebuild,
+  +kapptemplate-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kapptemplate-4.4.1.ebuild:
diff --git a/kde-base/kapptemplate/kapptemplate-4.4.3.ebuild b/kde-base/kapptemplate/kapptemplate-4.4.3.ebuild
deleted file mode 100644
index 68d978eb148f..000000000000
--- a/kde-base/kapptemplate/kapptemplate-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kapptemplate/kapptemplate-4.4.3.ebuild,v 1.1 2010/05/03 20:20:02 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdesdk"
-inherit kde4-meta
-
-DESCRIPTION="KAppTemplate - A shell script to create the necessary framework to develop KDE applications."
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/kapptemplate/kapptemplate-4.4.2.ebuild b/kde-base/kapptemplate/kapptemplate-4.4.4.ebuild
index bba7172c3edd..cea38c214805 100644
--- a/kde-base/kapptemplate/kapptemplate-4.4.2.ebuild
+++ b/kde-base/kapptemplate/kapptemplate-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kapptemplate/kapptemplate-4.4.2.ebuild,v 1.1 2010/03/30 19:31:01 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kapptemplate/kapptemplate-4.4.4.ebuild,v 1.1 2010/06/06 14:42:10 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kate/ChangeLog b/kde-base/kate/ChangeLog
index 106a63e8648b..61a151226529 100644
--- a/kde-base/kate/ChangeLog
+++ b/kde-base/kate/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kate
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kate/ChangeLog,v 1.173 2010/05/03 21:16:13 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kate/ChangeLog,v 1.174 2010/06/06 14:41:35 scarabeus Exp $
+
+*kate-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -kate-4.4.2.ebuild,
+  -kate-4.4.3.ebuild, +kate-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kate-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kate/kate-4.4.3.ebuild b/kde-base/kate/kate-4.4.3.ebuild
deleted file mode 100644
index f88b8a8f4ca1..000000000000
--- a/kde-base/kate/kate-4.4.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kate/kate-4.4.3.ebuild,v 1.1 2010/05/03 20:20:21 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdesdk"
-inherit kde4-meta
-
-DESCRIPTION="Kate is an MDI texteditor."
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook +plasma"
-
-DEPEND="
-	dev-libs/libxml2
-	dev-libs/libxslt
-"
-RDEPEND="${DEPEND}"
-
-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/kate/kate-4.4.2.ebuild b/kde-base/kate/kate-4.4.4.ebuild
index ea6d344e4be6..8c01088a7370 100644
--- a/kde-base/kate/kate-4.4.2.ebuild
+++ b/kde-base/kate/kate-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kate/kate-4.4.2.ebuild,v 1.1 2010/03/30 19:31:27 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kate/kate-4.4.4.ebuild,v 1.1 2010/06/06 14:41:35 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/katomic/ChangeLog b/kde-base/katomic/ChangeLog
index c066705c5925..f7f19d88f268 100644
--- a/kde-base/katomic/ChangeLog
+++ b/kde-base/katomic/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/katomic
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/katomic/ChangeLog,v 1.148 2010/05/03 21:16:29 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/katomic/ChangeLog,v 1.149 2010/06/06 14:41:23 scarabeus Exp $
+
+*katomic-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -katomic-4.4.2.ebuild, -katomic-4.4.3.ebuild, +katomic-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -katomic-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/katomic/katomic-4.4.3.ebuild b/kde-base/katomic/katomic-4.4.3.ebuild
deleted file mode 100644
index 9ebf46abb46d..000000000000
--- a/kde-base/katomic/katomic-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/katomic/katomic-4.4.3.ebuild,v 1.1 2010/05/03 20:20:41 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE Atomic Entertainment Game"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/katomic/katomic-4.4.2.ebuild b/kde-base/katomic/katomic-4.4.4.ebuild
index 044043d83647..593ff6224fa2 100644
--- a/kde-base/katomic/katomic-4.4.2.ebuild
+++ b/kde-base/katomic/katomic-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/katomic/katomic-4.4.2.ebuild,v 1.1 2010/03/30 19:31:53 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/katomic/katomic-4.4.4.ebuild,v 1.1 2010/06/06 14:41:23 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kbattleship/ChangeLog b/kde-base/kbattleship/ChangeLog
index cfeb1a40c0af..5f9bb87eac23 100644
--- a/kde-base/kbattleship/ChangeLog
+++ b/kde-base/kbattleship/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kbattleship
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbattleship/ChangeLog,v 1.152 2010/05/03 21:16:45 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbattleship/ChangeLog,v 1.153 2010/06/06 14:41:25 scarabeus Exp $
+
+*kbattleship-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kbattleship-4.4.2.ebuild, -kbattleship-4.4.3.ebuild,
+  +kbattleship-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kbattleship-4.4.1.ebuild:
diff --git a/kde-base/kbattleship/kbattleship-4.4.3.ebuild b/kde-base/kbattleship/kbattleship-4.4.3.ebuild
deleted file mode 100644
index 58bba5a35454..000000000000
--- a/kde-base/kbattleship/kbattleship-4.4.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbattleship/kbattleship-4.4.3.ebuild,v 1.1 2010/05/03 20:21:02 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdegames"
-inherit games-ggz kde4-meta
-
-DESCRIPTION="The KDE Battleship clone"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-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 /usr/share/ggz/modules
-	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/kbattleship/kbattleship-4.4.2.ebuild b/kde-base/kbattleship/kbattleship-4.4.4.ebuild
index 0d7bed03fad4..a4554150aee0 100644
--- a/kde-base/kbattleship/kbattleship-4.4.2.ebuild
+++ b/kde-base/kbattleship/kbattleship-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbattleship/kbattleship-4.4.2.ebuild,v 1.1 2010/03/30 19:32:22 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbattleship/kbattleship-4.4.4.ebuild,v 1.1 2010/06/06 14:41:25 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kblackbox/ChangeLog b/kde-base/kblackbox/ChangeLog
index 6c6c7901a9e5..e551caf79886 100644
--- a/kde-base/kblackbox/ChangeLog
+++ b/kde-base/kblackbox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kblackbox
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kblackbox/ChangeLog,v 1.147 2010/05/03 21:17:03 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kblackbox/ChangeLog,v 1.148 2010/06/06 14:42:03 scarabeus Exp $
+
+*kblackbox-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kblackbox-4.4.2.ebuild, -kblackbox-4.4.3.ebuild, +kblackbox-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kblackbox-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kblackbox/kblackbox-4.4.3.ebuild b/kde-base/kblackbox/kblackbox-4.4.3.ebuild
deleted file mode 100644
index 7d56364e96f9..000000000000
--- a/kde-base/kblackbox/kblackbox-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kblackbox/kblackbox-4.4.3.ebuild,v 1.1 2010/05/03 20:21:22 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE Blackbox Game"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/kblackbox/kblackbox-4.4.2.ebuild b/kde-base/kblackbox/kblackbox-4.4.4.ebuild
index 0fb1f0066718..844a1be4db93 100644
--- a/kde-base/kblackbox/kblackbox-4.4.2.ebuild
+++ b/kde-base/kblackbox/kblackbox-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kblackbox/kblackbox-4.4.2.ebuild,v 1.1 2010/03/30 19:32:48 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kblackbox/kblackbox-4.4.4.ebuild,v 1.1 2010/06/06 14:42:03 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kblocks/ChangeLog b/kde-base/kblocks/ChangeLog
index 4c2e41d4d019..7c79ef00718c 100644
--- a/kde-base/kblocks/ChangeLog
+++ b/kde-base/kblocks/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kblocks
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kblocks/ChangeLog,v 1.45 2010/05/03 21:17:20 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kblocks/ChangeLog,v 1.46 2010/06/06 14:41:43 scarabeus Exp $
+
+*kblocks-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kblocks-4.4.2.ebuild, -kblocks-4.4.3.ebuild, +kblocks-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kblocks-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kblocks/kblocks-4.4.3.ebuild b/kde-base/kblocks/kblocks-4.4.3.ebuild
deleted file mode 100644
index e39efc96d5ac..000000000000
--- a/kde-base/kblocks/kblocks-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kblocks/kblocks-4.4.3.ebuild,v 1.1 2010/05/03 20:21:42 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE: Kblocks is a single-player Tetris-like game."
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/kblocks/kblocks-4.4.2.ebuild b/kde-base/kblocks/kblocks-4.4.4.ebuild
index 6e929f619087..6490cece0cee 100644
--- a/kde-base/kblocks/kblocks-4.4.2.ebuild
+++ b/kde-base/kblocks/kblocks-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kblocks/kblocks-4.4.2.ebuild,v 1.1 2010/03/30 19:33:16 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kblocks/kblocks-4.4.4.ebuild,v 1.1 2010/06/06 14:41:43 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kbounce/ChangeLog b/kde-base/kbounce/ChangeLog
index 20ba361fe1b5..1228407f2dcd 100644
--- a/kde-base/kbounce/ChangeLog
+++ b/kde-base/kbounce/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kbounce
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbounce/ChangeLog,v 1.147 2010/05/03 21:17:36 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbounce/ChangeLog,v 1.148 2010/06/06 14:41:45 scarabeus Exp $
+
+*kbounce-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kbounce-4.4.2.ebuild, -kbounce-4.4.3.ebuild, +kbounce-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kbounce-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kbounce/kbounce-4.4.3.ebuild b/kde-base/kbounce/kbounce-4.4.3.ebuild
deleted file mode 100644
index f1b572827ab3..000000000000
--- a/kde-base/kbounce/kbounce-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbounce/kbounce-4.4.3.ebuild,v 1.1 2010/05/03 20:22:02 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE Bounce Ball Game"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/kbounce/kbounce-4.4.2.ebuild b/kde-base/kbounce/kbounce-4.4.4.ebuild
index 95e77e164af3..0346b5658804 100644
--- a/kde-base/kbounce/kbounce-4.4.2.ebuild
+++ b/kde-base/kbounce/kbounce-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbounce/kbounce-4.4.2.ebuild,v 1.1 2010/03/30 19:33:43 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbounce/kbounce-4.4.4.ebuild,v 1.1 2010/06/06 14:41:45 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kbreakout/ChangeLog b/kde-base/kbreakout/ChangeLog
index a67ab01c07ea..679f7ef8ef77 100644
--- a/kde-base/kbreakout/ChangeLog
+++ b/kde-base/kbreakout/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kbreakout
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbreakout/ChangeLog,v 1.45 2010/05/03 21:17:53 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbreakout/ChangeLog,v 1.46 2010/06/06 14:41:31 scarabeus Exp $
+
+*kbreakout-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kbreakout-4.4.2.ebuild, -kbreakout-4.4.3.ebuild, +kbreakout-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kbreakout-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kbreakout/kbreakout-4.4.3.ebuild b/kde-base/kbreakout/kbreakout-4.4.3.ebuild
deleted file mode 100644
index c4306e0c807d..000000000000
--- a/kde-base/kbreakout/kbreakout-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbreakout/kbreakout-4.4.3.ebuild,v 1.1 2010/05/03 20:22:23 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE: A Breakout-like game for KDE."
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/kbreakout/kbreakout-4.4.2.ebuild b/kde-base/kbreakout/kbreakout-4.4.4.ebuild
index 9fc7fa6cc312..d105f2c79e41 100644
--- a/kde-base/kbreakout/kbreakout-4.4.2.ebuild
+++ b/kde-base/kbreakout/kbreakout-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbreakout/kbreakout-4.4.2.ebuild,v 1.1 2010/03/30 19:34:12 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbreakout/kbreakout-4.4.4.ebuild,v 1.1 2010/06/06 14:41:31 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kbruch/ChangeLog b/kde-base/kbruch/ChangeLog
index ce453465e68f..19cdc6d85524 100644
--- a/kde-base/kbruch/ChangeLog
+++ b/kde-base/kbruch/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kbruch
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbruch/ChangeLog,v 1.144 2010/05/03 21:18:11 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbruch/ChangeLog,v 1.145 2010/06/06 14:41:44 scarabeus Exp $
+
+*kbruch-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -kbruch-4.4.2.ebuild,
+  -kbruch-4.4.3.ebuild, +kbruch-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kbruch-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kbruch/kbruch-4.4.3.ebuild b/kde-base/kbruch/kbruch-4.4.3.ebuild
deleted file mode 100644
index 2e73ce21bf0b..000000000000
--- a/kde-base/kbruch/kbruch-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbruch/kbruch-4.4.3.ebuild,v 1.1 2010/05/03 20:22:43 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdeedu"
-inherit kde4-meta
-
-DESCRIPTION="KDE Educational: Learn calculating with fractions"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/kbruch/kbruch-4.4.2.ebuild b/kde-base/kbruch/kbruch-4.4.4.ebuild
index cdb8430a23d7..d58af6a8dda1 100644
--- a/kde-base/kbruch/kbruch-4.4.2.ebuild
+++ b/kde-base/kbruch/kbruch-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbruch/kbruch-4.4.2.ebuild,v 1.1 2010/03/30 19:34:41 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbruch/kbruch-4.4.4.ebuild,v 1.1 2010/06/06 14:41:45 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kbugbuster/ChangeLog b/kde-base/kbugbuster/ChangeLog
index ef8892f0fee0..2f87eaa2a89e 100644
--- a/kde-base/kbugbuster/ChangeLog
+++ b/kde-base/kbugbuster/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kbugbuster
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbugbuster/ChangeLog,v 1.138 2010/05/03 21:18:27 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbugbuster/ChangeLog,v 1.139 2010/06/06 14:41:34 scarabeus Exp $
+
+*kbugbuster-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kbugbuster-4.4.2.ebuild, -kbugbuster-4.4.3.ebuild,
+  +kbugbuster-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kbugbuster-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kbugbuster/kbugbuster-4.4.3.ebuild b/kde-base/kbugbuster/kbugbuster-4.4.3.ebuild
deleted file mode 100644
index 5c7c60a77021..000000000000
--- a/kde-base/kbugbuster/kbugbuster-4.4.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbugbuster/kbugbuster-4.4.3.ebuild,v 1.1 2010/05/03 20:23:02 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdesdk"
-inherit kde4-meta
-
-DESCRIPTION="KBugBuster - A tool for checking and reporting KDE apps' bugs"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/kbugbuster/kbugbuster-4.4.2.ebuild b/kde-base/kbugbuster/kbugbuster-4.4.4.ebuild
index 0b50c2692f5e..d01c72df4c1e 100644
--- a/kde-base/kbugbuster/kbugbuster-4.4.2.ebuild
+++ b/kde-base/kbugbuster/kbugbuster-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbugbuster/kbugbuster-4.4.2.ebuild,v 1.1 2010/03/30 19:35:07 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbugbuster/kbugbuster-4.4.4.ebuild,v 1.1 2010/06/06 14:41:34 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kcachegrind/ChangeLog b/kde-base/kcachegrind/ChangeLog
index 372c444cb562..7a908c51e288 100644
--- a/kde-base/kcachegrind/ChangeLog
+++ b/kde-base/kcachegrind/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kcachegrind
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcachegrind/ChangeLog,v 1.142 2010/05/03 21:18:43 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcachegrind/ChangeLog,v 1.143 2010/06/06 14:41:37 scarabeus Exp $
+
+*kcachegrind-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kcachegrind-4.4.2.ebuild, -kcachegrind-4.4.3.ebuild,
+  +kcachegrind-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kcachegrind-4.4.1.ebuild:
diff --git a/kde-base/kcachegrind/kcachegrind-4.4.2.ebuild b/kde-base/kcachegrind/kcachegrind-4.4.2.ebuild
deleted file mode 100644
index c72ecc2c7c63..000000000000
--- a/kde-base/kcachegrind/kcachegrind-4.4.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcachegrind/kcachegrind-4.4.2.ebuild,v 1.1 2010/03/30 19:35:34 spatz Exp $
-
-EAPI="3"
-
-KMNAME="kdesdk"
-inherit kde4-meta
-
-DESCRIPTION="KDE Frontend for Cachegrind"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-RDEPEND="
-	media-gfx/graphviz
-"
diff --git a/kde-base/kcachegrind/kcachegrind-4.4.3.ebuild b/kde-base/kcachegrind/kcachegrind-4.4.4.ebuild
index 4fc6b2b0d855..55a477659e7e 100644
--- a/kde-base/kcachegrind/kcachegrind-4.4.3.ebuild
+++ b/kde-base/kcachegrind/kcachegrind-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcachegrind/kcachegrind-4.4.3.ebuild,v 1.1 2010/05/03 20:23:21 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcachegrind/kcachegrind-4.4.4.ebuild,v 1.1 2010/06/06 14:41:37 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kcalc/ChangeLog b/kde-base/kcalc/ChangeLog
index 54148999e6fc..27e588e3f9a8 100644
--- a/kde-base/kcalc/ChangeLog
+++ b/kde-base/kcalc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kcalc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/ChangeLog,v 1.151 2010/06/03 21:00:57 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/ChangeLog,v 1.152 2010/06/06 14:41:37 scarabeus Exp $
+
+*kcalc-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -kcalc-4.4.2.ebuild,
+  -kcalc-4.4.3.ebuild, +kcalc-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 Jun 2010; Dror Levin <spatz@gentoo.org> kcalc-4.4.2.ebuild,
   kcalc-4.4.3.ebuild:
diff --git a/kde-base/kcalc/kcalc-4.4.3.ebuild b/kde-base/kcalc/kcalc-4.4.3.ebuild
deleted file mode 100644
index 9701583e243d..000000000000
--- a/kde-base/kcalc/kcalc-4.4.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/kcalc-4.4.3.ebuild,v 1.2 2010/06/03 21:00:57 spatz Exp $
-
-EAPI="3"
-
-KMNAME="kdeutils"
-CPPUNIT_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="KDE calculator"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-DEPEND="
-	dev-libs/gmp
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3.2-solaris-knumber_priv.patch
-)
-
-src_test() {
-	LANG=C kde4-meta_src_test
-}
diff --git a/kde-base/kcalc/kcalc-4.4.2.ebuild b/kde-base/kcalc/kcalc-4.4.4.ebuild
index ee3b44f1f130..3fa803207aeb 100644
--- a/kde-base/kcalc/kcalc-4.4.2.ebuild
+++ b/kde-base/kcalc/kcalc-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/kcalc-4.4.2.ebuild,v 1.2 2010/06/03 21:00:57 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/kcalc-4.4.4.ebuild,v 1.1 2010/06/06 14:41:38 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kcharselect/ChangeLog b/kde-base/kcharselect/ChangeLog
index f81f6c0a545f..fdd8292de2dd 100644
--- a/kde-base/kcharselect/ChangeLog
+++ b/kde-base/kcharselect/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kcharselect
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcharselect/ChangeLog,v 1.136 2010/05/03 21:19:17 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcharselect/ChangeLog,v 1.137 2010/06/06 14:42:19 scarabeus Exp $
+
+*kcharselect-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kcharselect-4.4.2.ebuild, -kcharselect-4.4.3.ebuild,
+  +kcharselect-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kcharselect-4.4.1.ebuild:
diff --git a/kde-base/kcharselect/kcharselect-4.4.3.ebuild b/kde-base/kcharselect/kcharselect-4.4.3.ebuild
deleted file mode 100644
index ef5f6b1f22dd..000000000000
--- a/kde-base/kcharselect/kcharselect-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcharselect/kcharselect-4.4.3.ebuild,v 1.1 2010/05/03 20:24:01 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdeutils"
-inherit kde4-meta
-
-DESCRIPTION="KDE character selection utility"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/kcharselect/kcharselect-4.4.2.ebuild b/kde-base/kcharselect/kcharselect-4.4.4.ebuild
index 87417f90385c..7adeef5865b8 100644
--- a/kde-base/kcharselect/kcharselect-4.4.2.ebuild
+++ b/kde-base/kcharselect/kcharselect-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcharselect/kcharselect-4.4.2.ebuild,v 1.1 2010/03/30 19:36:29 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcharselect/kcharselect-4.4.4.ebuild,v 1.1 2010/06/06 14:42:19 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kcheckpass/ChangeLog b/kde-base/kcheckpass/ChangeLog
index 98454ef1555c..25fbfc756065 100644
--- a/kde-base/kcheckpass/ChangeLog
+++ b/kde-base/kcheckpass/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kcheckpass
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/ChangeLog,v 1.160 2010/06/04 20:14:41 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/ChangeLog,v 1.161 2010/06/06 14:42:08 scarabeus Exp $
+
+*kcheckpass-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kcheckpass-4.4.2.ebuild, -kcheckpass-4.4.2-r1.ebuild,
+  -kcheckpass-4.4.3-r1.ebuild, +kcheckpass-4.4.4.ebuild:
+  Remove old. Version bump.
 
 *kcheckpass-4.4.3-r1 (04 Jun 2010)
 
diff --git a/kde-base/kcheckpass/kcheckpass-4.4.2-r1.ebuild b/kde-base/kcheckpass/kcheckpass-4.4.2-r1.ebuild
deleted file mode 100644
index 920c77876830..000000000000
--- a/kde-base/kcheckpass/kcheckpass-4.4.2-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/kcheckpass-4.4.2-r1.ebuild,v 1.1 2010/04/09 04:00:09 tampakrap Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-workspace"
-inherit kde4-meta
-
-DESCRIPTION="A simple password checker, used by any software in need of user authentication."
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug pam"
-
-DEPEND="
-	pam? (
-		>=kde-base/kdebase-pam-7
-		virtual/pam
-	)
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-		"${FILESDIR}/kdebase-4.0.2-pam-optional.patch"
-		"${FILESDIR}/${P}-no-SUID-no-GUID.patch"
-		)
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with pam)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kcheckpass/kcheckpass-4.4.2.ebuild b/kde-base/kcheckpass/kcheckpass-4.4.2.ebuild
deleted file mode 100644
index 71b05d24e391..000000000000
--- a/kde-base/kcheckpass/kcheckpass-4.4.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/kcheckpass-4.4.2.ebuild,v 1.1 2010/03/30 19:37:02 spatz Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-workspace"
-inherit kde4-meta
-
-DESCRIPTION="A simple password checker, used by any software in need of user authentication."
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug pam"
-
-DEPEND="
-	pam? (
-		>=kde-base/kdebase-pam-7
-		virtual/pam
-	)
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/kdebase-4.0.2-pam-optional.patch" )
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with pam)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kcheckpass/kcheckpass-4.4.3-r1.ebuild b/kde-base/kcheckpass/kcheckpass-4.4.4.ebuild
index c09279cc8dd9..941b76308b49 100644
--- a/kde-base/kcheckpass/kcheckpass-4.4.3-r1.ebuild
+++ b/kde-base/kcheckpass/kcheckpass-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/kcheckpass-4.4.3-r1.ebuild,v 1.1 2010/06/04 20:14:41 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/kcheckpass-4.4.4.ebuild,v 1.1 2010/06/06 14:42:08 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kcminit/ChangeLog b/kde-base/kcminit/ChangeLog
index 67b39d0b8d43..efe4f20e7343 100644
--- a/kde-base/kcminit/ChangeLog
+++ b/kde-base/kcminit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kcminit
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcminit/ChangeLog,v 1.140 2010/05/03 21:19:50 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcminit/ChangeLog,v 1.141 2010/06/06 14:42:19 scarabeus Exp $
+
+*kcminit-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kcminit-4.4.2.ebuild, -kcminit-4.4.3.ebuild, +kcminit-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kcminit-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kcminit/kcminit-4.4.3.ebuild b/kde-base/kcminit/kcminit-4.4.3.ebuild
deleted file mode 100644
index c1e3d93d37ae..000000000000
--- a/kde-base/kcminit/kcminit-4.4.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcminit/kcminit-4.4.3.ebuild,v 1.1 2010/05/03 20:24:46 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-workspace"
-inherit kde4-meta
-
-DESCRIPTION="KCMInit - runs startups initialization for Control Modules."
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep ksplash)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/kcminit/kcminit-4.4.2.ebuild b/kde-base/kcminit/kcminit-4.4.4.ebuild
index 45eddb8a5abc..0e45a82edeab 100644
--- a/kde-base/kcminit/kcminit-4.4.2.ebuild
+++ b/kde-base/kcminit/kcminit-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcminit/kcminit-4.4.2.ebuild,v 1.1 2010/03/30 19:37:32 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcminit/kcminit-4.4.4.ebuild,v 1.1 2010/06/06 14:42:19 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kcmshell/ChangeLog b/kde-base/kcmshell/ChangeLog
index 2295adb8b78f..1464c0aca17c 100644
--- a/kde-base/kcmshell/ChangeLog
+++ b/kde-base/kcmshell/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kcmshell
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcmshell/ChangeLog,v 1.60 2010/05/04 08:02:15 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcmshell/ChangeLog,v 1.61 2010/06/06 14:41:47 scarabeus Exp $
+
+*kcmshell-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kcmshell-4.4.2.ebuild, -kcmshell-4.4.3.ebuild, +kcmshell-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org> kcmshell-4.4.3.ebuild:
   Restore accidently dropped ~x86-fbsd keyword on KDE SC 4.4.3
diff --git a/kde-base/kcmshell/kcmshell-4.4.3.ebuild b/kde-base/kcmshell/kcmshell-4.4.3.ebuild
deleted file mode 100644
index f134d861b908..000000000000
--- a/kde-base/kcmshell/kcmshell-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcmshell/kcmshell-4.4.3.ebuild,v 1.2 2010/05/04 08:02:15 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KCMShell is a utility to host KDE control modules independently of SystemSettings."
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kcmshell/kcmshell-4.4.2.ebuild b/kde-base/kcmshell/kcmshell-4.4.4.ebuild
index 8819d295c089..21dbbe6d6626 100644
--- a/kde-base/kcmshell/kcmshell-4.4.2.ebuild
+++ b/kde-base/kcmshell/kcmshell-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcmshell/kcmshell-4.4.2.ebuild,v 1.2 2010/05/03 06:02:06 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcmshell/kcmshell-4.4.4.ebuild,v 1.1 2010/06/06 14:41:47 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kcolorchooser/ChangeLog b/kde-base/kcolorchooser/ChangeLog
index be13ccf892b8..45fdff926a82 100644
--- a/kde-base/kcolorchooser/ChangeLog
+++ b/kde-base/kcolorchooser/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kcolorchooser
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcolorchooser/ChangeLog,v 1.56 2010/05/03 21:20:24 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcolorchooser/ChangeLog,v 1.57 2010/06/06 14:41:50 scarabeus Exp $
+
+*kcolorchooser-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kcolorchooser-4.4.2.ebuild, -kcolorchooser-4.4.3.ebuild,
+  +kcolorchooser-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kcolorchooser-4.4.1.ebuild:
diff --git a/kde-base/kcolorchooser/kcolorchooser-4.4.3.ebuild b/kde-base/kcolorchooser/kcolorchooser-4.4.3.ebuild
deleted file mode 100644
index 81f297e16e39..000000000000
--- a/kde-base/kcolorchooser/kcolorchooser-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcolorchooser/kcolorchooser-4.4.3.ebuild,v 1.1 2010/05/03 20:25:24 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdegraphics"
-inherit kde4-meta
-
-DESCRIPTION="KDE color selector/editor"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kcolorchooser/kcolorchooser-4.4.2.ebuild b/kde-base/kcolorchooser/kcolorchooser-4.4.4.ebuild
index 3ac6897a3c86..288663c93767 100644
--- a/kde-base/kcolorchooser/kcolorchooser-4.4.2.ebuild
+++ b/kde-base/kcolorchooser/kcolorchooser-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcolorchooser/kcolorchooser-4.4.2.ebuild,v 1.1 2010/03/30 19:38:25 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcolorchooser/kcolorchooser-4.4.4.ebuild,v 1.1 2010/06/06 14:41:50 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kcontrol/ChangeLog b/kde-base/kcontrol/ChangeLog
index 6881090500b8..6e753d1e49b3 100644
--- a/kde-base/kcontrol/ChangeLog
+++ b/kde-base/kcontrol/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kcontrol
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/ChangeLog,v 1.188 2010/05/04 08:07:54 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/ChangeLog,v 1.189 2010/06/06 14:41:26 scarabeus Exp $
+
+*kcontrol-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kcontrol-4.4.2.ebuild, -kcontrol-4.4.3.ebuild, +kcontrol-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org> kcontrol-4.4.3.ebuild:
   Restore accidently dropped ~x86-fbsd keyword on KDE SC 4.4.3
diff --git a/kde-base/kcontrol/kcontrol-4.4.2.ebuild b/kde-base/kcontrol/kcontrol-4.4.2.ebuild
deleted file mode 100644
index fae0e626f58e..000000000000
--- a/kde-base/kcontrol/kcontrol-4.4.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/kcontrol-4.4.2.ebuild,v 1.2 2010/05/03 05:45:17 aballier Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-runtime"
-inherit kde4-meta
-
-DESCRIPTION="The KDE Control Center"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-RDEPEND="
-	$(add_kdebase_dep kdnssd)
-	$(add_kdebase_dep khotkeys)
-"
-
-add_blocker systemsettings '<4.2.91'
diff --git a/kde-base/kcontrol/kcontrol-4.4.3.ebuild b/kde-base/kcontrol/kcontrol-4.4.4.ebuild
index da86c5f9ee5b..212d8876416b 100644
--- a/kde-base/kcontrol/kcontrol-4.4.3.ebuild
+++ b/kde-base/kcontrol/kcontrol-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/kcontrol-4.4.3.ebuild,v 1.2 2010/05/04 08:07:54 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/kcontrol-4.4.4.ebuild,v 1.1 2010/06/06 14:41:26 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kcron/ChangeLog b/kde-base/kcron/ChangeLog
index f7e99fc2e8f8..a73b96ddc41c 100644
--- a/kde-base/kcron/ChangeLog
+++ b/kde-base/kcron/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kcron
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcron/ChangeLog,v 1.145 2010/05/03 21:20:58 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcron/ChangeLog,v 1.146 2010/06/06 14:42:06 scarabeus Exp $
+
+*kcron-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -kcron-4.4.2.ebuild,
+  -kcron-4.4.3.ebuild, +kcron-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kcron-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kcron/kcron-4.4.3.ebuild b/kde-base/kcron/kcron-4.4.3.ebuild
deleted file mode 100644
index 49bf6a28fff9..000000000000
--- a/kde-base/kcron/kcron-4.4.3.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcron/kcron-4.4.3.ebuild,v 1.1 2010/05/03 20:26:03 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdeadmin"
-inherit kde4-meta
-
-DESCRIPTION="KDE Task Scheduler"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-RDEPEND="!prefix? ( virtual/cron )"
diff --git a/kde-base/kcron/kcron-4.4.2.ebuild b/kde-base/kcron/kcron-4.4.4.ebuild
index 79f6a5ff3e79..56b607c241fe 100644
--- a/kde-base/kcron/kcron-4.4.2.ebuild
+++ b/kde-base/kcron/kcron-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcron/kcron-4.4.2.ebuild,v 1.1 2010/03/30 19:39:43 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcron/kcron-4.4.4.ebuild,v 1.1 2010/06/06 14:42:06 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kde-env/ChangeLog b/kde-base/kde-env/ChangeLog
index 33591854467f..c8ccd6c54a17 100644
--- a/kde-base/kde-env/ChangeLog
+++ b/kde-base/kde-env/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kde-env
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/ChangeLog,v 1.77 2010/05/04 08:08:12 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/ChangeLog,v 1.78 2010/06/06 14:42:08 scarabeus Exp $
+
+*kde-env-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kde-env-4.4.2.ebuild, -kde-env-4.4.3.ebuild, +kde-env-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org> kde-env-4.4.3.ebuild:
   Restore accidently dropped ~x86-fbsd keyword on KDE SC 4.4.3
diff --git a/kde-base/kde-env/kde-env-4.4.3.ebuild b/kde-base/kde-env/kde-env-4.4.3.ebuild
deleted file mode 100644
index c661e4bc43b7..000000000000
--- a/kde-base/kde-env/kde-env-4.4.3.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2010 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.4.3.ebuild,v 1.2 2010/05/04 08:08:12 alexxy Exp $
-
-EAPI="3"
-
-CMAKE_REQUIRED="never"
-KDE_REQUIRED="never"
-inherit kde4-base
-
-DESCRIPTION="Environment setting required for all KDE4 apps to run."
-HOMEPAGE="http://kde.org"
-[[ ${PV} = *9999* ]] && ESVN_REPO_URI="" || SRC_URI=""
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-LICENSE="as-is"
-IUSE="aqua"
-
-add_blocker kdelibs 4.2.2-r1 '<3.5.10-r3:3.5' 4.2.70:4.3
-
-S=${WORKDIR}
-
-src_unpack() {
-	:
-}
-
-src_prepare() {
-	:
-}
-
-src_install() {
-	if use kdeprefix; then
-		# List all the multilib libdirs
-		local _libdir _libdirs
-		for _libdir in $(get_all_libdirs); do
-			_libdirs+=":${EKDEDIR}/${_libdir}"
-		done
-		_libdirs=${_libdirs#:}
-
-		# number goes down with version
-		cat <<-EOF > 43kdepaths-${SLOT}
-PATH="${EKDEDIR}/bin"
-ROOTPATH="${EKDEDIR}/sbin:${EKDEDIR}/bin"
-LDPATH="${_libdirs}"
-MANPATH="${EKDEDIR}/share/man"
-CONFIG_PROTECT="${KDEDIR}/share/config ${KDEDIR}/env ${KDEDIR}/shutdown /usr/share/config"
-#KDE_IS_PRELINKED=1
-PKG_CONFIG_PATH="${EKDEDIR}/$(get_libdir)/pkgconfig"
-XDG_DATA_DIRS="${EKDEDIR}/share"
-EOF
-		doenvd 43kdepaths-${SLOT}
-		cat <<-EOF > 50-kde-${SLOT}
-SEARCH_DIRS="${EKDEDIR}/bin ${EKDEDIR}/lib*"
-EOF
-		insinto /etc/revdep-rebuild
-		doins 50-kde-${SLOT}
-
-		# kdeglobals needed to make third party apps installed in /usr work
-		cat <<-EOF > kdeglobals
-[Directories][\$i]
-prefixes=${EPREFIX}/usr
-EOF
-		insinto ${KDEDIR}/share/config
-		doins kdeglobals
-
-		KDE_X="KDE-${SLOT}"
-	else
-		# Much simpler for the FHS compliant -kdeprefix install
-		# number goes down with version
-		cat <<-EOF > 43kdepaths
-CONFIG_PROTECT="/usr/share/config"
-#KDE_IS_PRELINKED=1
-EOF
-		doenvd 43kdepaths
-
-		KDE_X="KDE-4"
-	fi
-
-	# Properly place xinitrc.d file that exports XDG_MENU_PREFIX to env
-	cat <<EOF > 11-xdg-menu-${KDE_X}
-#!/bin/sh
-
-if [ -z \${XDG_MENU_PREFIX} ] && [ "\${DESKTOP_SESSION}" = "${KDE_X}" ]; then
-	export XDG_MENU_PREFIX="kde-${SLOT}-"
-fi
-EOF
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe 11-xdg-menu-${KDE_X} || die "doexe failed"
-}
-
-pkg_preinst() {
-	:
-}
-
-src_test() {
-	:
-}
diff --git a/kde-base/kde-env/kde-env-4.4.2.ebuild b/kde-base/kde-env/kde-env-4.4.4.ebuild
index 710a00d38bca..0461dd619fb3 100644
--- a/kde-base/kde-env/kde-env-4.4.2.ebuild
+++ b/kde-base/kde-env/kde-env-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.2 2010/05/02 12:52:36 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/kde-env-4.4.4.ebuild,v 1.1 2010/06/06 14:42:08 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kde-l10n/ChangeLog b/kde-base/kde-l10n/ChangeLog
index 2ca957d2c635..b1812e31e8cd 100644
--- a/kde-base/kde-l10n/ChangeLog
+++ b/kde-base/kde-l10n/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kde-l10n
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-l10n/ChangeLog,v 1.62 2010/05/03 21:30:10 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-l10n/ChangeLog,v 1.63 2010/06/06 14:41:22 scarabeus Exp $
+
+*kde-l10n-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kde-l10n-4.4.2.ebuild, -kde-l10n-4.4.3.ebuild, +kde-l10n-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kde-l10n-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kde-l10n/kde-l10n-4.4.3.ebuild b/kde-base/kde-l10n/kde-l10n-4.4.3.ebuild
deleted file mode 100644
index 4c9ce2a88a3e..000000000000
--- a/kde-base/kde-l10n/kde-l10n-4.4.3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2010 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.4.3.ebuild,v 1.1 2010/05/03 20:37:52 alexxy Exp $
-
-EAPI="2"
-
-inherit kde4-base
-
-DESCRIPTION="KDE internationalization package"
-HOMEPAGE="http://www.kde.org/"
-LICENSE="GPL-2"
-
-DEPEND="
-	sys-devel/gettext
-"
-RDEPEND=""
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+handbook"
-
-MY_LANGS="ar bg ca ca@valencia cs csb da de el en_GB eo es et eu
-		fi fr fy ga gl gu he hi hr hu id is it ja kk km kn ko lt lv
-		mai mk ml nb nds nl nn pa pl pt pt_BR ro ru si sk sl sr sv tg
-		tr 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_configure() {
-	mycmakeargs="${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-l10n/kde-l10n-4.4.2.ebuild b/kde-base/kde-l10n/kde-l10n-4.4.4.ebuild
index 8d2ea4d639be..953bac18c08c 100644
--- a/kde-base/kde-l10n/kde-l10n-4.4.2.ebuild
+++ b/kde-base/kde-l10n/kde-l10n-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.1 2010/03/30 20:42:45 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-l10n/kde-l10n-4.4.4.ebuild,v 1.1 2010/06/06 14:41:22 scarabeus Exp $
 
 EAPI="2"
 
diff --git a/kde-base/kde-meta/ChangeLog b/kde-base/kde-meta/ChangeLog
index 95b72fea6e18..fd2476d54852 100644
--- a/kde-base/kde-meta/ChangeLog
+++ b/kde-base/kde-meta/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kde-meta
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/ChangeLog,v 1.164 2010/05/03 21:30:42 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/ChangeLog,v 1.165 2010/06/06 14:42:06 scarabeus Exp $
+
+*kde-meta-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kde-meta-4.4.2.ebuild, -kde-meta-4.4.3.ebuild, +kde-meta-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kde-meta-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kde-meta/kde-meta-4.4.2.ebuild b/kde-base/kde-meta/kde-meta-4.4.2.ebuild
deleted file mode 100644
index 0333bec0e9de..000000000000
--- a/kde-base/kde-meta/kde-meta-4.4.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2010 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.4.2.ebuild,v 1.1 2010/03/30 20:44:50 spatz Exp $
-
-EAPI="3"
-inherit kde4-functions
-
-DESCRIPTION="KDE - merge this to pull in all non-developer, split kde-base/* packages"
-HOMEPAGE="http://www.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="4.4"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="accessibility aqua kdeprefix nls semantic-desktop"
-
-# excluded: kdebindings, kdesdk, kdevelop, since these are developer-only
-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)
-	$(add_kdebase_dep kdewebdev-meta)
-	accessibility? ( $(add_kdebase_dep kdeaccessibility-meta) )
-	nls? ( $(add_kdebase_dep kde-l10n) )
-	semantic-desktop? ( $(add_kdebase_dep kdepim-meta) )
-	$(block_other_slots)
-"
diff --git a/kde-base/kde-meta/kde-meta-4.4.3.ebuild b/kde-base/kde-meta/kde-meta-4.4.4.ebuild
index 4a8bc72b13a9..50225d41f2a9 100644
--- a/kde-base/kde-meta/kde-meta-4.4.3.ebuild
+++ b/kde-base/kde-meta/kde-meta-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.3.ebuild,v 1.1 2010/05/03 20:39:16 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/kde-meta-4.4.4.ebuild,v 1.1 2010/06/06 14:42:06 scarabeus Exp $
 
 EAPI="3"
 inherit kde4-functions
diff --git a/kde-base/kdeaccessibility-colorschemes/ChangeLog b/kde-base/kdeaccessibility-colorschemes/ChangeLog
index 9aeedbd7e3d7..0dea5723b781 100644
--- a/kde-base/kdeaccessibility-colorschemes/ChangeLog
+++ b/kde-base/kdeaccessibility-colorschemes/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdeaccessibility-colorschemes
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-colorschemes/ChangeLog,v 1.56 2010/05/03 21:21:15 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-colorschemes/ChangeLog,v 1.57 2010/06/06 14:41:51 scarabeus Exp $
+
+*kdeaccessibility-colorschemes-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdeaccessibility-colorschemes-4.4.2.ebuild,
+  -kdeaccessibility-colorschemes-4.4.3.ebuild,
+  +kdeaccessibility-colorschemes-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kdeaccessibility-colorschemes-4.4.1.ebuild:
diff --git a/kde-base/kdeaccessibility-colorschemes/kdeaccessibility-colorschemes-4.4.3.ebuild b/kde-base/kdeaccessibility-colorschemes/kdeaccessibility-colorschemes-4.4.3.ebuild
deleted file mode 100644
index 9d4c9a4af1b5..000000000000
--- a/kde-base/kdeaccessibility-colorschemes/kdeaccessibility-colorschemes-4.4.3.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-colorschemes/kdeaccessibility-colorschemes-4.4.3.ebuild,v 1.1 2010/05/03 20:26:22 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="${PN/-*/}"
-KMMODULE="ColorSchemes"
-
-inherit kde4-meta
-
-DESCRIPTION="KDE high contrast color schemes"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/kde-base/kdeaccessibility-colorschemes/kdeaccessibility-colorschemes-4.4.2.ebuild b/kde-base/kdeaccessibility-colorschemes/kdeaccessibility-colorschemes-4.4.4.ebuild
index 5629eb0c1dce..8718e01625f9 100644
--- a/kde-base/kdeaccessibility-colorschemes/kdeaccessibility-colorschemes-4.4.2.ebuild
+++ b/kde-base/kdeaccessibility-colorschemes/kdeaccessibility-colorschemes-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-colorschemes/kdeaccessibility-colorschemes-4.4.2.ebuild,v 1.1 2010/03/30 19:40:41 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-colorschemes/kdeaccessibility-colorschemes-4.4.4.ebuild,v 1.1 2010/06/06 14:41:51 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kdeaccessibility-iconthemes/ChangeLog b/kde-base/kdeaccessibility-iconthemes/ChangeLog
index 1559c12767de..ed6762f0ad8f 100644
--- a/kde-base/kdeaccessibility-iconthemes/ChangeLog
+++ b/kde-base/kdeaccessibility-iconthemes/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdeaccessibility-iconthemes
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-iconthemes/ChangeLog,v 1.144 2010/05/03 21:21:31 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-iconthemes/ChangeLog,v 1.145 2010/06/06 14:42:16 scarabeus Exp $
+
+*kdeaccessibility-iconthemes-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdeaccessibility-iconthemes-4.4.2.ebuild,
+  -kdeaccessibility-iconthemes-4.4.3.ebuild,
+  +kdeaccessibility-iconthemes-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kdeaccessibility-iconthemes-4.4.1.ebuild:
diff --git a/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-4.4.3.ebuild b/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-4.4.3.ebuild
deleted file mode 100644
index 4fbd25587288..000000000000
--- a/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-4.4.3.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-4.4.3.ebuild,v 1.1 2010/05/03 20:26:41 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="${PN/-*/}"
-KMMODULE="IconThemes"
-
-inherit kde4-meta
-
-DESCRIPTION="KDE Icon Themes designed with accessibility in mind"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-4.4.2.ebuild b/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-4.4.4.ebuild
index 4633beca6c48..cf51d74a10d5 100644
--- a/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-4.4.2.ebuild
+++ b/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-4.4.2.ebuild,v 1.1 2010/03/30 19:41:08 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-4.4.4.ebuild,v 1.1 2010/06/06 14:42:16 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kdeaccessibility-meta/ChangeLog b/kde-base/kdeaccessibility-meta/ChangeLog
index 729649eeaa63..cc793f1923d3 100644
--- a/kde-base/kdeaccessibility-meta/ChangeLog
+++ b/kde-base/kdeaccessibility-meta/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdeaccessibility-meta
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-meta/ChangeLog,v 1.149 2010/05/03 21:21:47 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-meta/ChangeLog,v 1.150 2010/06/06 14:41:21 scarabeus Exp $
+
+*kdeaccessibility-meta-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdeaccessibility-meta-4.4.2.ebuild, -kdeaccessibility-meta-4.4.3.ebuild,
+  +kdeaccessibility-meta-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kdeaccessibility-meta-4.4.1.ebuild:
diff --git a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.4.3.ebuild b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.4.3.ebuild
deleted file mode 100644
index 18b82d98efe5..000000000000
--- a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.4.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.4.3.ebuild,v 1.1 2010/05/03 20:26:59 alexxy Exp $
-
-EAPI="3"
-inherit kde4-functions
-
-DESCRIPTION="kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages"
-HOMEPAGE="http://www.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="4.4"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="aqua kdeprefix"
-
-RDEPEND="
-	$(add_kdebase_dep kdeaccessibility-colorschemes)
-	$(add_kdebase_dep kdeaccessibility-iconthemes)
-	$(add_kdebase_dep kmag)
-	$(add_kdebase_dep kmousetool)
-	$(add_kdebase_dep kmouth)
-	$(add_kdebase_dep kttsd)
-	$(block_other_slots)
-"
-# The following are disabled in CMakeLists.txt
-# >=kde-base/kbstateapplet-${PV}:${SLOT} - kicker applet
-# >=kde-base/ksayit-${PV}:${SLOT} - doesn't compile
diff --git a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.4.2.ebuild b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.4.4.ebuild
index 3f3b8baebe57..1517dc8904c6 100644
--- a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.4.2.ebuild
+++ b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.1 2010/03/30 19:41:34 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.4.4.ebuild,v 1.1 2010/06/06 14:41:21 scarabeus Exp $
 
 EAPI="3"
 inherit kde4-functions
diff --git a/kde-base/kdeaccounts-plugin/ChangeLog b/kde-base/kdeaccounts-plugin/ChangeLog
index 45d0a90fcb0d..8658b4fdd93d 100644
--- a/kde-base/kdeaccounts-plugin/ChangeLog
+++ b/kde-base/kdeaccounts-plugin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdeaccounts-plugin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccounts-plugin/ChangeLog,v 1.53 2010/05/03 21:22:06 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccounts-plugin/ChangeLog,v 1.54 2010/06/06 14:41:41 scarabeus Exp $
+
+*kdeaccounts-plugin-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdeaccounts-plugin-4.4.2.ebuild, -kdeaccounts-plugin-4.4.3.ebuild,
+  +kdeaccounts-plugin-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kdeaccounts-plugin-4.4.1.ebuild:
diff --git a/kde-base/kdeaccounts-plugin/kdeaccounts-plugin-4.4.3.ebuild b/kde-base/kdeaccounts-plugin/kdeaccounts-plugin-4.4.3.ebuild
deleted file mode 100644
index 6584dfc51c01..000000000000
--- a/kde-base/kdeaccounts-plugin/kdeaccounts-plugin-4.4.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2010 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.4.3.ebuild,v 1.1 2010/05/03 20:27:20 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdesdk"
-inherit kde4-meta
-
-DESCRIPTION="Addressbook Plugin that puts names/email addresses of all KDE SVN accounts into an addressbook"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/kdeaccounts-plugin/kdeaccounts-plugin-4.4.2.ebuild b/kde-base/kdeaccounts-plugin/kdeaccounts-plugin-4.4.4.ebuild
index 20cb4c49e1a0..e7236b05d1e4 100644
--- a/kde-base/kdeaccounts-plugin/kdeaccounts-plugin-4.4.2.ebuild
+++ b/kde-base/kdeaccounts-plugin/kdeaccounts-plugin-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.1 2010/03/30 19:42:00 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccounts-plugin/kdeaccounts-plugin-4.4.4.ebuild,v 1.1 2010/06/06 14:41:41 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kdeadmin-meta/ChangeLog b/kde-base/kdeadmin-meta/ChangeLog
index 4dd41697fe47..568590b843a0 100644
--- a/kde-base/kdeadmin-meta/ChangeLog
+++ b/kde-base/kdeadmin-meta/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdeadmin-meta
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin-meta/ChangeLog,v 1.157 2010/05/03 21:22:22 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin-meta/ChangeLog,v 1.158 2010/06/06 14:41:26 scarabeus Exp $
+
+*kdeadmin-meta-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdeadmin-meta-4.4.2.ebuild, -kdeadmin-meta-4.4.3.ebuild,
+  +kdeadmin-meta-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kdeadmin-meta-4.4.1.ebuild:
diff --git a/kde-base/kdeadmin-meta/kdeadmin-meta-4.4.3.ebuild b/kde-base/kdeadmin-meta/kdeadmin-meta-4.4.3.ebuild
deleted file mode 100644
index 366d525632ce..000000000000
--- a/kde-base/kdeadmin-meta/kdeadmin-meta-4.4.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2010 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.4.3.ebuild,v 1.1 2010/05/03 20:27:38 alexxy Exp $
-
-EAPI="3"
-inherit kde4-functions
-
-DESCRIPTION="KDE administration tools - merge this to pull in all kdeadmin-derived packages"
-HOMEPAGE="http://www.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="4.4"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="aqua cups kdeprefix"
-
-RDEPEND="
-	$(add_kdebase_dep kcron)
-	$(add_kdebase_dep knetworkconf)
-	$(add_kdebase_dep ksystemlog)
-	$(add_kdebase_dep kuser)
-	cups? ( $(add_kdebase_dep system-config-printer-kde) )
-	$(block_other_slots)
-"
-
-## The following package was just added and has a questionable interest to Gentoo
-#	>=kde-base/kpackage-${PV}:${SLOT}
-
-## the following packages are currently missing in kde 4.1
-#>=kde-base/kdeadmin-kfile-plugins-${PV}:${SLOT}
-#>=kde-base/secpolicy-${PV}:${SLOT}
diff --git a/kde-base/kdeadmin-meta/kdeadmin-meta-4.4.2.ebuild b/kde-base/kdeadmin-meta/kdeadmin-meta-4.4.4.ebuild
index 62d258217b81..acc83732ca31 100644
--- a/kde-base/kdeadmin-meta/kdeadmin-meta-4.4.2.ebuild
+++ b/kde-base/kdeadmin-meta/kdeadmin-meta-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.1 2010/03/30 19:42:26 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin-meta/kdeadmin-meta-4.4.4.ebuild,v 1.1 2010/06/06 14:41:26 scarabeus Exp $
 
 EAPI="3"
 inherit kde4-functions
diff --git a/kde-base/kdeartwork-colorschemes/ChangeLog b/kde-base/kdeartwork-colorschemes/ChangeLog
index d5bca3d4e2f0..d3c5303f8291 100644
--- a/kde-base/kdeartwork-colorschemes/ChangeLog
+++ b/kde-base/kdeartwork-colorschemes/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdeartwork-colorschemes
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-colorschemes/ChangeLog,v 1.55 2010/05/03 21:22:38 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-colorschemes/ChangeLog,v 1.56 2010/06/06 14:42:02 scarabeus Exp $
+
+*kdeartwork-colorschemes-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdeartwork-colorschemes-4.4.2.ebuild,
+  -kdeartwork-colorschemes-4.4.3.ebuild,
+  +kdeartwork-colorschemes-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kdeartwork-colorschemes-4.4.1.ebuild:
diff --git a/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-4.4.3.ebuild b/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-4.4.3.ebuild
deleted file mode 100644
index d43f19b48f14..000000000000
--- a/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-4.4.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2010 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.4.3.ebuild,v 1.1 2010/05/03 20:27:59 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdeartwork"
-KMMODULE="ColorSchemes"
-inherit kde4-meta
-
-DESCRIPTION="KDE extra colorschemes"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-4.4.2.ebuild b/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-4.4.4.ebuild
index 2fb98e0d4df9..ad3a74a7bba8 100644
--- a/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-4.4.2.ebuild
+++ b/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.1 2010/03/30 19:42:55 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-4.4.4.ebuild,v 1.1 2010/06/06 14:42:02 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kdeartwork-desktopthemes/ChangeLog b/kde-base/kdeartwork-desktopthemes/ChangeLog
index c562158322d1..c792853381ed 100644
--- a/kde-base/kdeartwork-desktopthemes/ChangeLog
+++ b/kde-base/kdeartwork-desktopthemes/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdeartwork-desktopthemes
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-desktopthemes/ChangeLog,v 1.41 2010/05/03 21:22:56 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-desktopthemes/ChangeLog,v 1.42 2010/06/06 14:41:34 scarabeus Exp $
+
+*kdeartwork-desktopthemes-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdeartwork-desktopthemes-4.4.2.ebuild,
+  -kdeartwork-desktopthemes-4.4.3.ebuild,
+  +kdeartwork-desktopthemes-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kdeartwork-desktopthemes-4.4.1.ebuild:
diff --git a/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-4.4.2.ebuild b/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-4.4.2.ebuild
deleted file mode 100644
index dd465e3c5a14..000000000000
--- a/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-4.4.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2010 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.4.2.ebuild,v 1.1 2010/03/30 19:43:22 spatz Exp $
-
-EAPI="3"
-
-KMMODULE="desktopthemes"
-KMNAME="kdeartwork"
-inherit kde4-meta
-
-DESCRIPTION="Additional themes from kde"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-4.4.3.ebuild b/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-4.4.4.ebuild
index 7ec468cba8e6..755f8b7d9458 100644
--- a/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-4.4.3.ebuild
+++ b/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.3.ebuild,v 1.1 2010/05/03 20:28:21 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-4.4.4.ebuild,v 1.1 2010/06/06 14:41:34 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kdeartwork-emoticons/ChangeLog b/kde-base/kdeartwork-emoticons/ChangeLog
index 57fc52540452..3159cd5c8a37 100644
--- a/kde-base/kdeartwork-emoticons/ChangeLog
+++ b/kde-base/kdeartwork-emoticons/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdeartwork-emoticons
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-emoticons/ChangeLog,v 1.127 2010/05/03 21:23:14 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-emoticons/ChangeLog,v 1.128 2010/06/06 14:41:37 scarabeus Exp $
+
+*kdeartwork-emoticons-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdeartwork-emoticons-4.4.2.ebuild, -kdeartwork-emoticons-4.4.3.ebuild,
+  +kdeartwork-emoticons-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kdeartwork-emoticons-4.4.1.ebuild:
diff --git a/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-4.4.3.ebuild b/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-4.4.3.ebuild
deleted file mode 100644
index 84a8174fe1da..000000000000
--- a/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-4.4.3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-4.4.3.ebuild,v 1.1 2010/05/03 20:28:43 alexxy Exp $
-
-EAPI="3"
-
-RESTRICT="binchecks strip"
-
-KMMODULE="emoticons"
-KMNAME="kdeartwork"
-inherit kde4-meta
-
-DESCRIPTION="EmotIcons (icons for things like smilies :-) for kde"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-4.4.2.ebuild b/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-4.4.4.ebuild
index db81dc74a069..78a179dac236 100644
--- a/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-4.4.2.ebuild
+++ b/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.1 2010/03/30 19:43:50 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-4.4.4.ebuild,v 1.1 2010/06/06 14:41:37 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kdeartwork-iconthemes/ChangeLog b/kde-base/kdeartwork-iconthemes/ChangeLog
index 3b2117c70aee..b64ec125c44e 100644
--- a/kde-base/kdeartwork-iconthemes/ChangeLog
+++ b/kde-base/kdeartwork-iconthemes/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdeartwork-iconthemes
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-iconthemes/ChangeLog,v 1.146 2010/05/03 21:23:31 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-iconthemes/ChangeLog,v 1.147 2010/06/06 14:41:51 scarabeus Exp $
+
+*kdeartwork-iconthemes-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdeartwork-iconthemes-4.4.2.ebuild, -kdeartwork-iconthemes-4.4.3.ebuild,
+  +kdeartwork-iconthemes-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kdeartwork-iconthemes-4.4.1.ebuild:
diff --git a/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.4.3.ebuild b/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.4.3.ebuild
deleted file mode 100644
index 5b245462e95d..000000000000
--- a/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.4.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2010 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.4.3.ebuild,v 1.1 2010/05/03 20:29:03 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdeartwork"
-KMMODULE="IconThemes"
-inherit kde4-meta
-
-DESCRIPTION="Icon themes for kde"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-# Provides nuvola icon theme
-RDEPEND="
-	!kdeprefix? ( !x11-themes/nuvola )
-"
diff --git a/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.4.2.ebuild b/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.4.4.ebuild
index 5a96d44552f7..57755e00deb1 100644
--- a/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.4.2.ebuild
+++ b/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.1 2010/03/30 19:44:20 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.4.4.ebuild,v 1.1 2010/06/06 14:41:51 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kdeartwork-kscreensaver/ChangeLog b/kde-base/kdeartwork-kscreensaver/ChangeLog
index d8572b8c54df..d253c7efb69c 100644
--- a/kde-base/kdeartwork-kscreensaver/ChangeLog
+++ b/kde-base/kdeartwork-kscreensaver/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdeartwork-kscreensaver
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/ChangeLog,v 1.162 2010/05/03 21:23:47 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/ChangeLog,v 1.163 2010/06/06 14:41:40 scarabeus Exp $
+
+*kdeartwork-kscreensaver-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdeartwork-kscreensaver-4.4.2.ebuild,
+  -kdeartwork-kscreensaver-4.4.3.ebuild,
+  +kdeartwork-kscreensaver-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kdeartwork-kscreensaver-4.4.1.ebuild:
diff --git a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.4.3.ebuild b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.4.3.ebuild
deleted file mode 100644
index b16ec1c21b93..000000000000
--- a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.4.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2010 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.4.3.ebuild,v 1.1 2010/05/03 20:29:25 alexxy Exp $
-
-EAPI="3"
-
-KMMODULE="kscreensaver"
-KMNAME="kdeartwork"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="Extra screensavers for kde"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +eigen 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 )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-xscreensaver.patch" )
-
-src_prepare() {
-	sed -i -e 's/${KDE4WORKSPACE_KSCREENSAVER_LIBRARY}/kscreensaver/g' \
-		kscreensaver/{kdesavers{,/asciiquarium},kpartsaver}/CMakeLists.txt \
-		|| die "Failed to patch CMake files"
-
-	kde4-meta_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DKSCREENSAVER_SOUND_SUPPORT=ON
-		$(cmake-utils_use_with eigen Eigen2)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with xscreensaver)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.4.2.ebuild b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.4.4.ebuild
index 10e64615ec51..d0d6c4f80841 100644
--- a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.4.2.ebuild
+++ b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.1 2010/03/30 19:44:50 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.4.4.ebuild,v 1.1 2010/06/06 14:41:40 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kdeartwork-meta/ChangeLog b/kde-base/kdeartwork-meta/ChangeLog
index 98dc0724913b..054f8e558dc7 100644
--- a/kde-base/kdeartwork-meta/ChangeLog
+++ b/kde-base/kdeartwork-meta/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdeartwork-meta
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-meta/ChangeLog,v 1.153 2010/05/03 21:24:05 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-meta/ChangeLog,v 1.154 2010/06/06 14:41:42 scarabeus Exp $
+
+*kdeartwork-meta-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdeartwork-meta-4.4.2.ebuild, -kdeartwork-meta-4.4.3.ebuild,
+  +kdeartwork-meta-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kdeartwork-meta-4.4.1.ebuild:
diff --git a/kde-base/kdeartwork-meta/kdeartwork-meta-4.4.2.ebuild b/kde-base/kdeartwork-meta/kdeartwork-meta-4.4.2.ebuild
deleted file mode 100644
index b6cc10cf81d1..000000000000
--- a/kde-base/kdeartwork-meta/kdeartwork-meta-4.4.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-meta/kdeartwork-meta-4.4.2.ebuild,v 1.1 2010/03/30 19:45:18 spatz Exp $
-
-EAPI="3"
-inherit kde4-functions
-
-DESCRIPTION="kdeartwork - merge this to pull in all kdeartwork-derived packages"
-HOMEPAGE="http://www.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="4.4"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="aqua kdeprefix"
-
-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)
-	$(block_other_slots)
-"
diff --git a/kde-base/kdeartwork-meta/kdeartwork-meta-4.4.3.ebuild b/kde-base/kdeartwork-meta/kdeartwork-meta-4.4.4.ebuild
index b2c0a14435fb..747e766cbd40 100644
--- a/kde-base/kdeartwork-meta/kdeartwork-meta-4.4.3.ebuild
+++ b/kde-base/kdeartwork-meta/kdeartwork-meta-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.3.ebuild,v 1.1 2010/05/03 20:29:43 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-meta/kdeartwork-meta-4.4.4.ebuild,v 1.1 2010/06/06 14:41:42 scarabeus Exp $
 
 EAPI="3"
 inherit kde4-functions
diff --git a/kde-base/kdeartwork-sounds/ChangeLog b/kde-base/kdeartwork-sounds/ChangeLog
index 21f58f19d157..573af9d68e3d 100644
--- a/kde-base/kdeartwork-sounds/ChangeLog
+++ b/kde-base/kdeartwork-sounds/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdeartwork-sounds
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-sounds/ChangeLog,v 1.127 2010/05/03 21:24:23 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-sounds/ChangeLog,v 1.128 2010/06/06 14:42:07 scarabeus Exp $
+
+*kdeartwork-sounds-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdeartwork-sounds-4.4.2.ebuild, -kdeartwork-sounds-4.4.3.ebuild,
+  +kdeartwork-sounds-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kdeartwork-sounds-4.4.1.ebuild:
diff --git a/kde-base/kdeartwork-sounds/kdeartwork-sounds-4.4.3.ebuild b/kde-base/kdeartwork-sounds/kdeartwork-sounds-4.4.3.ebuild
deleted file mode 100644
index 01e758384e79..000000000000
--- a/kde-base/kdeartwork-sounds/kdeartwork-sounds-4.4.3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-sounds/kdeartwork-sounds-4.4.3.ebuild,v 1.1 2010/05/03 20:30:02 alexxy Exp $
-
-EAPI="3"
-
-RESTRICT="binchecks strip"
-
-KMMODULE="sounds"
-KMNAME="kdeartwork"
-inherit kde4-meta
-
-DESCRIPTION="Extra sound themes for kde"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/kde-base/kdeartwork-sounds/kdeartwork-sounds-4.4.2.ebuild b/kde-base/kdeartwork-sounds/kdeartwork-sounds-4.4.4.ebuild
index e3e5a9cdc669..bc55fe20cef6 100644
--- a/kde-base/kdeartwork-sounds/kdeartwork-sounds-4.4.2.ebuild
+++ b/kde-base/kdeartwork-sounds/kdeartwork-sounds-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.1 2010/03/30 19:45:46 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-sounds/kdeartwork-sounds-4.4.4.ebuild,v 1.1 2010/06/06 14:42:07 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kdeartwork-styles/ChangeLog b/kde-base/kdeartwork-styles/ChangeLog
index 5bdc852d8018..b004ed0143da 100644
--- a/kde-base/kdeartwork-styles/ChangeLog
+++ b/kde-base/kdeartwork-styles/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdeartwork-styles
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-styles/ChangeLog,v 1.146 2010/05/03 21:24:40 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-styles/ChangeLog,v 1.147 2010/06/06 14:41:31 scarabeus Exp $
+
+*kdeartwork-styles-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdeartwork-styles-4.4.2.ebuild, -kdeartwork-styles-4.4.3.ebuild,
+  +kdeartwork-styles-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kdeartwork-styles-4.4.1.ebuild:
diff --git a/kde-base/kdeartwork-styles/kdeartwork-styles-4.4.3.ebuild b/kde-base/kdeartwork-styles/kdeartwork-styles-4.4.3.ebuild
deleted file mode 100644
index 7473785e1626..000000000000
--- a/kde-base/kdeartwork-styles/kdeartwork-styles-4.4.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2010 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.4.3.ebuild,v 1.1 2010/05/03 20:30:24 alexxy Exp $
-
-EAPI="3"
-
-KMMODULE="styles"
-KMNAME="kdeartwork"
-inherit kde4-meta
-
-DESCRIPTION="Extra styles for kde"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kdeartwork-styles/kdeartwork-styles-4.4.2.ebuild b/kde-base/kdeartwork-styles/kdeartwork-styles-4.4.4.ebuild
index 3e2fd8653dd2..9ee5a198f2e4 100644
--- a/kde-base/kdeartwork-styles/kdeartwork-styles-4.4.2.ebuild
+++ b/kde-base/kdeartwork-styles/kdeartwork-styles-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.1 2010/03/30 19:46:14 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-styles/kdeartwork-styles-4.4.4.ebuild,v 1.1 2010/06/06 14:41:31 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kdeartwork-wallpapers/ChangeLog b/kde-base/kdeartwork-wallpapers/ChangeLog
index 174bb165564a..0fbac2f1a6b9 100644
--- a/kde-base/kdeartwork-wallpapers/ChangeLog
+++ b/kde-base/kdeartwork-wallpapers/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdeartwork-wallpapers
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-wallpapers/ChangeLog,v 1.143 2010/05/03 21:24:56 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-wallpapers/ChangeLog,v 1.144 2010/06/06 14:41:25 scarabeus Exp $
+
+*kdeartwork-wallpapers-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdeartwork-wallpapers-4.4.2.ebuild, -kdeartwork-wallpapers-4.4.3.ebuild,
+  +kdeartwork-wallpapers-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kdeartwork-wallpapers-4.4.1.ebuild:
diff --git a/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.4.3.ebuild b/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.4.3.ebuild
deleted file mode 100644
index ee1f5f21a060..000000000000
--- a/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.4.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2010 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.4.3.ebuild,v 1.1 2010/05/03 20:30:45 alexxy Exp $
-
-EAPI="3"
-
-RESTRICT="binchecks strip"
-
-KMMODULE="wallpapers"
-KMNAME="kdeartwork"
-inherit kde4-meta
-
-DESCRIPTION="Wallpapers from kde"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-add_blocker kdebase-wallpapers '<4.4.0'
diff --git a/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.4.2.ebuild b/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.4.4.ebuild
index 11ca00db00a7..ee182581e9e6 100644
--- a/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.4.2.ebuild
+++ b/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.1 2010/03/30 19:46:42 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.4.4.ebuild,v 1.1 2010/06/06 14:41:25 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kdeartwork-weatherwallpapers/ChangeLog b/kde-base/kdeartwork-weatherwallpapers/ChangeLog
index f70a5cc8cc25..c1dd9b174af6 100644
--- a/kde-base/kdeartwork-weatherwallpapers/ChangeLog
+++ b/kde-base/kdeartwork-weatherwallpapers/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdeartwork-weatherwallpapers
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-weatherwallpapers/ChangeLog,v 1.31 2010/05/03 21:25:13 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-weatherwallpapers/ChangeLog,v 1.32 2010/06/06 14:41:40 scarabeus Exp $
+
+*kdeartwork-weatherwallpapers-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdeartwork-weatherwallpapers-4.4.2.ebuild,
+  -kdeartwork-weatherwallpapers-4.4.3.ebuild,
+  +kdeartwork-weatherwallpapers-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kdeartwork-weatherwallpapers-4.4.1.ebuild:
diff --git a/kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-4.4.3.ebuild b/kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-4.4.3.ebuild
deleted file mode 100644
index 7639b9465cc9..000000000000
--- a/kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-4.4.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2010 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.4.3.ebuild,v 1.1 2010/05/03 20:31:05 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdeartwork"
-KMMODULE="WeatherWallpapers"
-inherit kde4-meta
-
-DESCRIPTION="Weather aware wallpapers. Changes with weather outside."
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	$(add_kdebase_dep kdeartwork-wallpapers)
-"
diff --git a/kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-4.4.2.ebuild b/kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-4.4.4.ebuild
index be5eb128d446..93ddaccfb664 100644
--- a/kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-4.4.2.ebuild
+++ b/kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.1 2010/03/30 19:47:10 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-4.4.4.ebuild,v 1.1 2010/06/06 14:41:40 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kdebase-cursors/ChangeLog b/kde-base/kdebase-cursors/ChangeLog
index 9c0bf354de0d..59751dc44d16 100644
--- a/kde-base/kdebase-cursors/ChangeLog
+++ b/kde-base/kdebase-cursors/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdebase-cursors
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-cursors/ChangeLog,v 1.48 2010/05/03 21:25:30 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-cursors/ChangeLog,v 1.49 2010/06/06 14:41:38 scarabeus Exp $
+
+*kdebase-cursors-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdebase-cursors-4.4.2.ebuild, -kdebase-cursors-4.4.3.ebuild,
+  +kdebase-cursors-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kdebase-cursors-4.4.1.ebuild:
diff --git a/kde-base/kdebase-cursors/kdebase-cursors-4.4.2.ebuild b/kde-base/kdebase-cursors/kdebase-cursors-4.4.2.ebuild
deleted file mode 100644
index 5be2374180c1..000000000000
--- a/kde-base/kdebase-cursors/kdebase-cursors-4.4.2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2010 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.4.2.ebuild,v 1.1 2010/03/30 19:47:41 spatz Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-workspace"
-KMEXTRA="cursors"
-KMNOMODULE="true"
-inherit kde4-meta
-
-DESCRIPTION="oxygen cursors from kdebase"
-IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
diff --git a/kde-base/kdebase-cursors/kdebase-cursors-4.4.3.ebuild b/kde-base/kdebase-cursors/kdebase-cursors-4.4.4.ebuild
index 927b3ba3aa11..e5975bfb8a6b 100644
--- a/kde-base/kdebase-cursors/kdebase-cursors-4.4.3.ebuild
+++ b/kde-base/kdebase-cursors/kdebase-cursors-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.3.ebuild,v 1.1 2010/05/03 20:31:25 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-cursors/kdebase-cursors-4.4.4.ebuild,v 1.1 2010/06/06 14:41:38 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kdebase-data/ChangeLog b/kde-base/kdebase-data/ChangeLog
index 4d9084c0a599..764759401fb8 100644
--- a/kde-base/kdebase-data/ChangeLog
+++ b/kde-base/kdebase-data/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdebase-data
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/ChangeLog,v 1.161 2010/05/04 08:08:30 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/ChangeLog,v 1.162 2010/06/06 14:41:55 scarabeus Exp $
+
+*kdebase-data-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdebase-data-4.4.2.ebuild, -kdebase-data-4.4.3.ebuild,
+  +kdebase-data-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   kdebase-data-4.4.3.ebuild:
diff --git a/kde-base/kdebase-data/kdebase-data-4.4.3.ebuild b/kde-base/kdebase-data/kdebase-data-4.4.3.ebuild
deleted file mode 100644
index 03533e343cfc..000000000000
--- a/kde-base/kdebase-data/kdebase-data-4.4.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2010 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.4.3.ebuild,v 1.2 2010/05/04 08:08:30 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-runtime"
-KMNOMODULE="true"
-inherit kde4-meta
-
-DESCRIPTION="Icons, localization data and various .desktop files from kdebase."
-IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	$(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-data/kdebase-data-4.4.2.ebuild b/kde-base/kdebase-data/kdebase-data-4.4.4.ebuild
index 4ca2a86e6489..8e4fe02751d0 100644
--- a/kde-base/kdebase-data/kdebase-data-4.4.2.ebuild
+++ b/kde-base/kdebase-data/kdebase-data-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.2 2010/05/03 07:17:25 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/kdebase-data-4.4.4.ebuild,v 1.1 2010/06/06 14:41:55 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kdebase-desktoptheme/ChangeLog b/kde-base/kdebase-desktoptheme/ChangeLog
index 6f0063eab19e..364ae728018d 100644
--- a/kde-base/kdebase-desktoptheme/ChangeLog
+++ b/kde-base/kdebase-desktoptheme/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdebase-desktoptheme
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-desktoptheme/ChangeLog,v 1.48 2010/05/04 08:08:49 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-desktoptheme/ChangeLog,v 1.49 2010/06/06 14:42:10 scarabeus Exp $
+
+*kdebase-desktoptheme-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdebase-desktoptheme-4.4.2.ebuild, -kdebase-desktoptheme-4.4.3.ebuild,
+  +kdebase-desktoptheme-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   kdebase-desktoptheme-4.4.3.ebuild:
diff --git a/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.4.2.ebuild b/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.4.2.ebuild
deleted file mode 100644
index 5ad1ce031d80..000000000000
--- a/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.4.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2010 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.4.2.ebuild,v 1.2 2010/05/03 07:20:53 aballier Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-runtime"
-KMMODULE="desktoptheme"
-inherit kde4-meta
-
-DESCRIPTION="Oxygen KDE4 desktop theme."
-IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
diff --git a/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.4.3.ebuild b/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.4.4.ebuild
index f05abcfb5705..978b576bed39 100644
--- a/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.4.3.ebuild
+++ b/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.3.ebuild,v 1.2 2010/05/04 08:08:49 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.4.4.ebuild,v 1.1 2010/06/06 14:42:10 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kdebase-kioslaves/ChangeLog b/kde-base/kdebase-kioslaves/ChangeLog
index 5d259c215cd9..a663e811e60a 100644
--- a/kde-base/kdebase-kioslaves/ChangeLog
+++ b/kde-base/kdebase-kioslaves/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdebase-kioslaves
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.195 2010/05/04 07:39:44 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.196 2010/06/06 14:41:27 scarabeus Exp $
+
+*kdebase-kioslaves-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdebase-kioslaves-4.4.2.ebuild, -kdebase-kioslaves-4.4.3.ebuild,
+  +kdebase-kioslaves-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kdebase-kioslaves-4.4.1-r1.ebuild:
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.4.3.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.4.3.ebuild
deleted file mode 100644
index bfa001b8acfe..000000000000
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.4.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.4.3.ebuild,v 1.1 2010/05/03 20:32:24 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-runtime"
-KMMODULE="kioslave"
-inherit kde4-meta
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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 +handbook 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-3.0*
-			>=net-fs/samba-3.4.6[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
-}
-
-pkg_postinst() {
-	echo
-	elog "Note that if you upgrade strigi, you have to rebuild this package."
-	echo
-
-	kde4-meta_pkg_postinst
-}
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.4.2.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.4.4.ebuild
index 38165105f68c..74fd6d551ca7 100644
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.4.2.ebuild
+++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.2 2010/04/07 16:02:56 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.4.4.ebuild,v 1.1 2010/06/06 14:41:27 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kdebase-menu-icons/ChangeLog b/kde-base/kdebase-menu-icons/ChangeLog
index e51a9c909c88..376b925bad32 100644
--- a/kde-base/kdebase-menu-icons/ChangeLog
+++ b/kde-base/kdebase-menu-icons/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdebase-menu-icons
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-menu-icons/ChangeLog,v 1.35 2010/05/04 08:09:26 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-menu-icons/ChangeLog,v 1.36 2010/06/06 14:41:50 scarabeus Exp $
+
+*kdebase-menu-icons-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdebase-menu-icons-4.4.2.ebuild, -kdebase-menu-icons-4.4.3.ebuild,
+  +kdebase-menu-icons-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   kdebase-menu-icons-4.4.3.ebuild:
diff --git a/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.4.2.ebuild b/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.4.2.ebuild
deleted file mode 100644
index 80c37753f9ef..000000000000
--- a/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.4.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.4.2.ebuild,v 1.2 2010/05/03 07:15:12 aballier Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-runtime"
-KMMODULE="menu"
-inherit kde4-meta
-
-DESCRIPTION="KDE menu icons"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-add_blocker kde-menu-icons
diff --git a/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.4.3.ebuild b/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.4.4.ebuild
index 7361b32a2eff..ea93f618d21a 100644
--- a/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.4.3.ebuild
+++ b/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.3.ebuild,v 1.2 2010/05/04 08:09:26 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.4.4.ebuild,v 1.1 2010/06/06 14:41:50 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kdebase-menu/ChangeLog b/kde-base/kdebase-menu/ChangeLog
index 773fc12eb05b..767e2734ef7a 100644
--- a/kde-base/kdebase-menu/ChangeLog
+++ b/kde-base/kdebase-menu/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdebase-menu
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-menu/ChangeLog,v 1.35 2010/05/04 08:09:07 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-menu/ChangeLog,v 1.36 2010/06/06 14:42:13 scarabeus Exp $
+
+*kdebase-menu-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdebase-menu-4.4.2.ebuild, -kdebase-menu-4.4.3.ebuild,
+  +kdebase-menu-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   kdebase-menu-4.4.3.ebuild:
diff --git a/kde-base/kdebase-menu/kdebase-menu-4.4.2.ebuild b/kde-base/kdebase-menu/kdebase-menu-4.4.2.ebuild
deleted file mode 100644
index 1e3e81cabd60..000000000000
--- a/kde-base/kdebase-menu/kdebase-menu-4.4.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-menu/kdebase-menu-4.4.2.ebuild,v 1.2 2010/05/03 07:13:08 aballier Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-runtime"
-KMMODULE="kde-menu"
-inherit kde4-meta
-
-DESCRIPTION="KDE Menu query tool."
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-add_blocker kde-menu
diff --git a/kde-base/kdebase-menu/kdebase-menu-4.4.3.ebuild b/kde-base/kdebase-menu/kdebase-menu-4.4.4.ebuild
index 9674bd591cc1..b7cefcfefca8 100644
--- a/kde-base/kdebase-menu/kdebase-menu-4.4.3.ebuild
+++ b/kde-base/kdebase-menu/kdebase-menu-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.3.ebuild,v 1.2 2010/05/04 08:09:07 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-menu/kdebase-menu-4.4.4.ebuild,v 1.1 2010/06/06 14:42:13 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kdebase-meta/ChangeLog b/kde-base/kdebase-meta/ChangeLog
index cdd2dbf16b6f..b83ee68b2f09 100644
--- a/kde-base/kdebase-meta/ChangeLog
+++ b/kde-base/kdebase-meta/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdebase-meta
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-meta/ChangeLog,v 1.163 2010/05/03 21:26:54 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-meta/ChangeLog,v 1.164 2010/06/06 14:41:45 scarabeus Exp $
+
+*kdebase-meta-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdebase-meta-4.4.2.ebuild, -kdebase-meta-4.4.3.ebuild,
+  +kdebase-meta-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kdebase-meta-4.4.1.ebuild:
diff --git a/kde-base/kdebase-meta/kdebase-meta-4.4.3.ebuild b/kde-base/kdebase-meta/kdebase-meta-4.4.3.ebuild
deleted file mode 100644
index 7cb88b59803d..000000000000
--- a/kde-base/kdebase-meta/kdebase-meta-4.4.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2010 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.4.3.ebuild,v 1.1 2010/05/03 20:33:21 alexxy Exp $
-
-EAPI="3"
-inherit kde4-functions
-
-DESCRIPTION="Merge this to pull in all kdebase-derived packages"
-HOMEPAGE="http://www.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="4.4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="aqua kdeprefix policykit"
-
-RDEPEND="
-	$(add_kdebase_dep dolphin)
-	$(add_kdebase_dep kappfinder)
-	$(add_kdebase_dep kcheckpass)
-	$(add_kdebase_dep kcminit)
-	$(add_kdebase_dep kdebase-cursors)
-	$(add_kdebase_dep kdebase-runtime-meta)
-	$(add_kdebase_dep kdebase-startkde)
-	$(add_kdebase_dep kdebase-wallpapers)
-	$(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 konqueror)
-	$(add_kdebase_dep konsole)
-	$(add_kdebase_dep kscreensaver)
-	$(add_kdebase_dep ksmserver)
-	$(add_kdebase_dep ksplash)
-	$(add_kdebase_dep kstartupconfig)
-	$(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 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) )
-	policykit? ( >=sys-auth/polkit-kde-0.95.1 )
-	$(block_other_slots)
-"
diff --git a/kde-base/kdebase-meta/kdebase-meta-4.4.2.ebuild b/kde-base/kdebase-meta/kdebase-meta-4.4.4.ebuild
index 6656e490ff2f..b62fd197788c 100644
--- a/kde-base/kdebase-meta/kdebase-meta-4.4.2.ebuild
+++ b/kde-base/kdebase-meta/kdebase-meta-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.1 2010/03/30 19:50:20 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-meta/kdebase-meta-4.4.4.ebuild,v 1.1 2010/06/06 14:41:45 scarabeus Exp $
 
 EAPI="3"
 inherit kde4-functions
diff --git a/kde-base/kdebase-runtime-meta/ChangeLog b/kde-base/kdebase-runtime-meta/ChangeLog
index 83aae642a8b6..9b7eb8b314a8 100644
--- a/kde-base/kdebase-runtime-meta/ChangeLog
+++ b/kde-base/kdebase-runtime-meta/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdebase-runtime-meta
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-runtime-meta/ChangeLog,v 1.16 2010/05/03 21:27:11 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-runtime-meta/ChangeLog,v 1.17 2010/06/06 14:42:04 scarabeus Exp $
+
+*kdebase-runtime-meta-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdebase-runtime-meta-4.4.2.ebuild, -kdebase-runtime-meta-4.4.3.ebuild,
+  +kdebase-runtime-meta-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kdebase-runtime-meta-4.4.1.ebuild:
diff --git a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.4.3.ebuild b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.4.3.ebuild
deleted file mode 100644
index 38b9944fae16..000000000000
--- a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.4.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2010 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.4.3.ebuild,v 1.1 2010/05/03 20:33:37 alexxy Exp $
-
-EAPI="3"
-inherit kde4-functions
-
-DESCRIPTION="Merge this to pull in all kdebase-runtime-derived packages"
-HOMEPAGE="http://www.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="4.4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="aqua +handbook kdeprefix semantic-desktop"
-
-RDEPEND="
-	$(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 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 kstyles)
-	$(add_kdebase_dep ktimezoned)
-	$(add_kdebase_dep ktraderclient)
-	$(add_kdebase_dep kuiserver)
-	$(add_kdebase_dep kurifilter-plugins)
-	$(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) )
-	$(block_other_slots)
-"
diff --git a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.4.2.ebuild b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.4.4.ebuild
index 3406f8c017b7..97a46a655c52 100644
--- a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.4.2.ebuild
+++ b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.1 2010/03/30 19:50:46 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.4.4.ebuild,v 1.1 2010/06/06 14:42:04 scarabeus Exp $
 
 EAPI="3"
 inherit kde4-functions
diff --git a/kde-base/kdebase-startkde/ChangeLog b/kde-base/kdebase-startkde/ChangeLog
index 88d899f5ce98..5680fa2e5444 100644
--- a/kde-base/kdebase-startkde/ChangeLog
+++ b/kde-base/kdebase-startkde/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdebase-startkde
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.203 2010/05/03 21:27:34 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.204 2010/06/06 14:42:09 scarabeus Exp $
+
+*kdebase-startkde-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdebase-startkde-4.4.2.ebuild, -kdebase-startkde-4.4.3.ebuild,
+  +kdebase-startkde-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kdebase-startkde-4.4.1.ebuild:
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.4.3.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.4.3.ebuild
deleted file mode 100644
index ab95881f915e..000000000000
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.4.3.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2010 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.4.3.ebuild,v 1.1 2010/05/03 20:34:03 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-workspace"
-KMNOMODULE="true"
-inherit kde4-meta multilib prefix
-
-DESCRIPTION="Startkde script, which starts a complete KDE session, and associated scripts"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-# 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)
-	$(add_kdebase_dep kdebase-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/
-	safestartkde.cmake
-	startkde.cmake
-"
-
-PATCHES=("${FILESDIR}/gentoo-startkde4-2.patch")
-
-src_prepare() {
-	kde4-meta_src_prepare
-
-	# Patch the startkde script to setup the environment for KDE
-	# List all the multilib libdirs
-	local _libdir _libdirs=
-	for _libdir in $(get_all_libdirs); do
-		_libdirs+=":${EKDEDIR}/${_libdir}"
-	done
-	_libdirs=${_libdirs#:}
-
-	# Sort the LDFLAGS out if necessary
-	if use kdeprefix; then
-		sed -e "s#@REPLACE_LDFLAGS@#export LDFLAGS=${_libdirs}:\$LDFLAGS#" \
-			-i startkde.cmake || die "Sed for LDPATH failed."
-	else
-		sed -e "s#@REPLACE_LDFLAGS@##" \
-			-i startkde.cmake || die "sed for LDPATH failed"
-	fi
-
-	# Complete LDPATH
-	sed -e "s#@REPLACE_LIBDIR@#$(get_libdir)#" \
-		-i startkde.cmake || die "Sed for REPLACE_LIBDIR failed."
-	# Now fix the prefix
-	sed -e "s#@REPLACE_PREFIX@#${KDEDIR}#" \
-		-i startkde.cmake || die "Sed for REPLACE_PREFIX failed."
-	# ... and fix ${EPREFIX}
-	eprefixify startkde.cmake
-}
-
-src_install() {
-	kde4-meta_src_install
-
-	# startup and shutdown scripts
-	if use kdeprefix; then
-		insinto "${KDEDIR}/env"
-	else
-		insinto "/etc/kde/startup"
-	fi
-	doins "${FILESDIR}/agent-startup.sh" || die "doexe agent-startup.sh failed"
-
-	if use kdeprefix; then
-		exeinto "${KDEDIR}/shutdown"
-	else
-		exeinto "/etc/kde/shutdown"
-	fi
-	doexe "${FILESDIR}/agent-shutdown.sh" || die "doexe agent-shutdown.sh failed"
-
-	if use kdeprefix; then
-		KDE_X="KDE-${SLOT}"
-	else
-		KDE_X="KDE-4"
-	fi
-
-	# x11 session script
-	cat <<-EOF > "${T}/${KDE_X}"
-	#!/bin/sh
-	exec "${EKDEDIR}/bin/startkde"
-	EOF
-	exeinto /etc/X11/Sessions
-	doexe "${T}/${KDE_X}" || die "doexe ${KDE_X} failed"
-
-	# freedesktop compliant session script
-	sed -e "s:\${KDE4_BIN_INSTALL_DIR}:${EKDEDIR}/bin:g;s:Name=KDE:Name=KDE ${SLOT}:" \
-		"${S}/kdm/kfrontend/sessions/kde.desktop.cmake" > "${T}/${KDE_X}.desktop"
-	insinto /usr/share/xsessions
-	doins "${T}/${KDE_X}.desktop" || die "doins ${KDE_X}.desktop failed"
-}
-
-pkg_postinst () {
-	kde4-meta_pkg_postinst
-
-	echo
-	elog "To enable gpg-agent and/or ssh-agent in KDE sessions,"
-	if use kdeprefix; then
-		elog "edit ${EKDEDIR}/env/agent-startup.sh and"
-		elog "${EKDEDIR}/shutdown/agent-shutdown.sh"
-	else
-		elog "edit ${EPREFIX}/etc/kde/startup/agent-startup.sh and"
-		elog "${EPREFIX}/etc/kde/shutdown/agent-shutdown.sh"
-	fi
-	echo
-	elog "The name of the session script has changed."
-	elog "If you currently have XSESSION=\"kde-${SLOT}\" in your"
-	elog "configuration files, you will need to change it to"
-	elog "XSESSION=\"${KDE_X}\""
-}
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.4.2.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.4.4.ebuild
index 250057d3cfd3..9dc34d1d364d 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.4.2.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.1 2010/03/30 19:51:27 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-4.4.4.ebuild,v 1.1 2010/06/06 14:42:09 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kdebase-wallpapers/ChangeLog b/kde-base/kdebase-wallpapers/ChangeLog
index 08777f62aba6..a5c2c2f2c8ff 100644
--- a/kde-base/kdebase-wallpapers/ChangeLog
+++ b/kde-base/kdebase-wallpapers/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdebase-wallpapers
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-wallpapers/ChangeLog,v 1.35 2010/05/03 21:27:53 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-wallpapers/ChangeLog,v 1.36 2010/06/06 14:42:06 scarabeus Exp $
+
+*kdebase-wallpapers-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdebase-wallpapers-4.4.2.ebuild, -kdebase-wallpapers-4.4.3.ebuild,
+  +kdebase-wallpapers-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kdebase-wallpapers-4.4.1.ebuild:
diff --git a/kde-base/kdebase-wallpapers/kdebase-wallpapers-4.4.3.ebuild b/kde-base/kdebase-wallpapers/kdebase-wallpapers-4.4.3.ebuild
deleted file mode 100644
index c327fe7aa179..000000000000
--- a/kde-base/kdebase-wallpapers/kdebase-wallpapers-4.4.3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-wallpapers/kdebase-wallpapers-4.4.3.ebuild,v 1.1 2010/05/03 20:34:23 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-workspace"
-KMMODULE="wallpapers"
-inherit kde4-meta
-
-DESCRIPTION="KDE wallpapers"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-add_blocker kde-wallpapers
diff --git a/kde-base/kdebase-wallpapers/kdebase-wallpapers-4.4.2.ebuild b/kde-base/kdebase-wallpapers/kdebase-wallpapers-4.4.4.ebuild
index 2d6d4ad47553..3f1b37c2f75f 100644
--- a/kde-base/kdebase-wallpapers/kdebase-wallpapers-4.4.2.ebuild
+++ b/kde-base/kdebase-wallpapers/kdebase-wallpapers-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-wallpapers/kdebase-wallpapers-4.4.2.ebuild,v 1.1 2010/03/30 19:51:55 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-wallpapers/kdebase-wallpapers-4.4.4.ebuild,v 1.1 2010/06/06 14:42:06 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kdebindings-csharp/ChangeLog b/kde-base/kdebindings-csharp/ChangeLog
index 9cbac9013576..7b84389d4a48 100644
--- a/kde-base/kdebindings-csharp/ChangeLog
+++ b/kde-base/kdebindings-csharp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdebindings-csharp
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-csharp/ChangeLog,v 1.32 2010/05/25 03:44:30 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-csharp/ChangeLog,v 1.33 2010/06/06 14:41:55 scarabeus Exp $
+
+*kdebindings-csharp-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdebindings-csharp-4.4.2.ebuild, -kdebindings-csharp-4.4.3.ebuild,
+  +kdebindings-csharp-4.4.4.ebuild:
+  Remove old. Version bump.
 
   25 May 2010; Maciej Mrozowski <reavertm@gentoo.org>
   kdebindings-csharp-4.4.2.ebuild, kdebindings-csharp-4.4.3.ebuild:
diff --git a/kde-base/kdebindings-csharp/kdebindings-csharp-4.4.3.ebuild b/kde-base/kdebindings-csharp/kdebindings-csharp-4.4.3.ebuild
deleted file mode 100644
index 235393d30266..000000000000
--- a/kde-base/kdebindings-csharp/kdebindings-csharp-4.4.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-csharp/kdebindings-csharp-4.4.3.ebuild,v 1.3 2010/05/25 03:44:30 reavertm Exp $
-
-EAPI="3"
-
-KMNAME="kdebindings"
-KMMODULE="csharp"
-WEBKIT_REQUIRED="optional"
-inherit kde4-meta mono
-
-DESCRIPTION="C# bindings for KDE and Qt"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="akonadi +phonon plasma qimageblitz qscintilla semantic-desktop"
-
-DEPEND="
-	dev-lang/mono
-	$(add_kdebase_dep smoke 'akonadi?,phonon?,qimageblitz?,qscintilla?,semantic-desktop?,webkit?')
-	semantic-desktop? ( >=dev-libs/soprano-2.3.73[clucene] )
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="smoke/"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.4.1-make-stuff-optional.patch )
-
-pkg_setup() {
-	kde4-meta_pkg_setup
-
-	if use plasma && ! use webkit; then
-		eerror
-		eerror "The plasma USE flag requires the webkit USE flag to be enabled."
-		eerror
-		eerror "Please enable webkit or disable plasma."
-		die "plasma requires webkit"
-	fi
-}
-
-src_prepare() {
-	kde4-meta_src_prepare
-
-	# Disable soprano index (clucene) bindings
-	rm -f csharp/soprano/soprano/Soprano_Index_{CLuceneIndex,IndexFilterModel}.cs || die
-	sed -e 's/\${SOPRANO_INDEX_LIBRARIES}//g' \
-		-i csharp/soprano/CMakeLists.txt || die 'failed to remove clucene from link'
-
-	sed -e "/add_subdirectory( examples )/ s:^:#:" \
-		-i csharp/plasma/CMakeLists.txt || die 'failed to disable examples'
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with akonadi)
-		$(cmake-utils_use_with akonadi KdepimLibs)
-		$(cmake-utils_use_enable plasma PLASMA_SHARP)
-		$(cmake-utils_use_enable phonon PHONON_SHARP)
-		$(cmake-utils_use_enable qimageblitz QIMAGEBLITZ_SHARP)
-		$(cmake-utils_use_enable qscintilla QSCINTILLA_SHARP)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_enable webkit QTWEBKIT_SHARP)
-	)
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kdebindings-csharp/kdebindings-csharp-4.4.2.ebuild b/kde-base/kdebindings-csharp/kdebindings-csharp-4.4.4.ebuild
index 3403f4aa8350..0e85d03d0f0a 100644
--- a/kde-base/kdebindings-csharp/kdebindings-csharp-4.4.2.ebuild
+++ b/kde-base/kdebindings-csharp/kdebindings-csharp-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-csharp/kdebindings-csharp-4.4.2.ebuild,v 1.3 2010/05/25 03:44:30 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-csharp/kdebindings-csharp-4.4.4.ebuild,v 1.1 2010/06/06 14:41:55 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kdebindings-meta/ChangeLog b/kde-base/kdebindings-meta/ChangeLog
index 5e77f1ea807b..077bc19696fe 100644
--- a/kde-base/kdebindings-meta/ChangeLog
+++ b/kde-base/kdebindings-meta/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdebindings-meta
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-meta/ChangeLog,v 1.74 2010/05/03 21:55:07 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-meta/ChangeLog,v 1.75 2010/06/06 14:41:26 scarabeus Exp $
+
+*kdebindings-meta-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdebindings-meta-4.4.3.ebuild, +kdebindings-meta-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Tomáš Chvátal <scarabeus@gentoo.org> +metadata.xml:
   Add metadata.
diff --git a/kde-base/kdebindings-meta/kdebindings-meta-4.4.3.ebuild b/kde-base/kdebindings-meta/kdebindings-meta-4.4.4.ebuild
index 891cf5a4313c..aebed21350e3 100644
--- a/kde-base/kdebindings-meta/kdebindings-meta-4.4.3.ebuild
+++ b/kde-base/kdebindings-meta/kdebindings-meta-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.3.ebuild,v 1.2 2010/05/09 21:51:49 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-meta/kdebindings-meta-4.4.4.ebuild,v 1.1 2010/06/06 14:41:26 scarabeus Exp $
 
 EAPI="3"
 inherit kde4-functions
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.kde.org/"
 LICENSE="GPL-2"
 SLOT="4.4"
 KEYWORDS="~amd64 ~x86"
-IUSE="aqua csharp kdeprefix java python ruby"
+IUSE="aqua csharp java kdeprefix python ruby"
 
 RDEPEND="
 	$(add_kdebase_dep smoke)
diff --git a/kde-base/kdebindings-ruby/ChangeLog b/kde-base/kdebindings-ruby/ChangeLog
index e44af9af1188..fa6ec1dcb67a 100644
--- a/kde-base/kdebindings-ruby/ChangeLog
+++ b/kde-base/kdebindings-ruby/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdebindings-ruby
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-ruby/ChangeLog,v 1.10 2010/05/20 03:50:18 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-ruby/ChangeLog,v 1.11 2010/06/06 14:42:08 scarabeus Exp $
+
+*kdebindings-ruby-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdebindings-ruby-4.4.2.ebuild, -kdebindings-ruby-4.4.3.ebuild,
+  +kdebindings-ruby-4.4.4.ebuild:
+  Remove old. Version bump.
 
   20 May 2010; Maciej Mrozowski <reavertm@gentoo.org>
   kdebindings-ruby-4.4.2.ebuild, kdebindings-ruby-4.4.3.ebuild,
diff --git a/kde-base/kdebindings-ruby/kdebindings-ruby-4.4.3.ebuild b/kde-base/kdebindings-ruby/kdebindings-ruby-4.4.3.ebuild
deleted file mode 100644
index 102f4dc35f37..000000000000
--- a/kde-base/kdebindings-ruby/kdebindings-ruby-4.4.3.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-ruby/kdebindings-ruby-4.4.3.ebuild,v 1.2 2010/05/20 03:50:18 reavertm Exp $
-
-EAPI="2"
-
-KMNAME="kdebindings"
-KMMODULE="ruby"
-WEBKIT_REQUIRED="optional"
-
-USE_RUBY="ruby18"
-
-inherit kde4-meta ruby-ng
-
-DESCRIPTION="KDE Ruby bindings"
-KEYWORDS="~amd64 ~x86"
-IUSE="akonadi debug okular phonon plasma qscintilla qwt semantic-desktop"
-
-DEPEND="
-	$(add_kdebase_dep smoke 'akonadi?,okular?,phonon?,qscintilla?,qwt?,semantic-desktop?')
-"
-
-RDEPEND="${DEPEND}
-	!dev-ruby/qt4-qtruby
-"
-
-KMEXTRACTONLY="
-	ruby/krossruby
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-fix-linkage.patch
-)
-
-pkg_setup() {
-	ruby-ng_pkg_setup
-	kde4-meta_pkg_setup
-}
-
-src_unpack() {
-	kde4-meta_src_unpack
-
-	cd "${WORKDIR}"
-	mkdir all
-	mv ${P} all/ || die "Could not move sources"
-}
-
-all_ruby_prepare() {
-	kde4-meta_src_prepare
-
-	sed -i -e "s#smoke/smoke.h#smoke.h#" \
-		ruby/qtruby/src/handlers.cpp \
-		ruby/qtruby/src/marshall.h \
-		ruby/qtruby/src/marshall_types.h \
-		ruby/qtruby/src/Qt.cpp \
-		ruby/qtruby/src/qtruby.cpp \
-		ruby/qtruby/src/qtruby.h \
-		ruby/qtruby/src/smokeruby.h || die
-}
-
-each_ruby_configure() {
-	CMAKE_USE_DIR=${S}
-	mycmakeargs=(
-		$(cmake-utils_use_enable akonadi KdepimLibs)
-		$(cmake-utils_use_enable akonadi)
-		$(cmake-utils_use_enable okular)
-		$(cmake-utils_use_enable plasma PLASMA_RUBY)
-		$(cmake-utils_use_enable phonon)
-		$(cmake-utils_use_enable phonon PHONON_RUBY)
-		$(cmake-utils_use_enable qscintilla QScintilla)
-		$(cmake-utils_use_enable qscintilla QSCINTILLA_RUBY)
-		$(cmake-utils_use_enable qwt QWT_RUBY)
-		$(cmake-utils_use_enable semantic-desktop Soprano)
-		$(cmake-utils_use_enable semantic-desktop SOPRANO_RUBY)
-		$(cmake-utils_use_enable semantic-desktop Nepomuk)
-		$(cmake-utils_use_enable webkit QTWEBKIT_RUBY)
-		-DENABLE_KROSSRUBY=OFF
-		-DRUBY_LIBRARY=$(ruby_get_libruby)
-		-DRUBY_INCLUDE_PATH=$(ruby_get_hdrdir)
-		-DRUBY_EXECUTABLE=${RUBY}
-	)
-	kde4-meta_src_configure
-}
-
-each_ruby_compile() {
-	CMAKE_USE_DIR=${S}
-	kde4-meta_src_compile
-}
-
-each_ruby_install() {
-	CMAKE_USE_DIR=${S}
-	kde4-meta_src_install
-}
diff --git a/kde-base/kdebindings-ruby/kdebindings-ruby-4.4.2.ebuild b/kde-base/kdebindings-ruby/kdebindings-ruby-4.4.4.ebuild
index 475fc5712019..770628fc37da 100644
--- a/kde-base/kdebindings-ruby/kdebindings-ruby-4.4.2.ebuild
+++ b/kde-base/kdebindings-ruby/kdebindings-ruby-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-ruby/kdebindings-ruby-4.4.2.ebuild,v 1.2 2010/05/20 03:50:18 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-ruby/kdebindings-ruby-4.4.4.ebuild,v 1.1 2010/06/06 14:42:08 scarabeus Exp $
 
 EAPI="2"
 
diff --git a/kde-base/kdebugdialog/ChangeLog b/kde-base/kdebugdialog/ChangeLog
index 2121b1b1858d..9064d30cb110 100644
--- a/kde-base/kdebugdialog/ChangeLog
+++ b/kde-base/kdebugdialog/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdebugdialog
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebugdialog/ChangeLog,v 1.134 2010/05/04 08:09:44 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebugdialog/ChangeLog,v 1.135 2010/06/06 14:42:10 scarabeus Exp $
+
+*kdebugdialog-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdebugdialog-4.4.2.ebuild, -kdebugdialog-4.4.3.ebuild,
+  +kdebugdialog-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   kdebugdialog-4.4.3.ebuild:
diff --git a/kde-base/kdebugdialog/kdebugdialog-4.4.3.ebuild b/kde-base/kdebugdialog/kdebugdialog-4.4.3.ebuild
deleted file mode 100644
index 0c36768da4e8..000000000000
--- a/kde-base/kdebugdialog/kdebugdialog-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebugdialog/kdebugdialog-4.4.3.ebuild,v 1.2 2010/05/04 08:09:44 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KDE: A dialog box for setting preferences for debug output"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/kdebugdialog/kdebugdialog-4.4.2.ebuild b/kde-base/kdebugdialog/kdebugdialog-4.4.4.ebuild
index 1f37c08a4da0..bb9b0835e366 100644
--- a/kde-base/kdebugdialog/kdebugdialog-4.4.2.ebuild
+++ b/kde-base/kdebugdialog/kdebugdialog-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebugdialog/kdebugdialog-4.4.2.ebuild,v 1.2 2010/05/03 06:28:53 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebugdialog/kdebugdialog-4.4.4.ebuild,v 1.1 2010/06/06 14:42:10 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kdeedu-meta/ChangeLog b/kde-base/kdeedu-meta/ChangeLog
index e80b361515d0..50dc6cc6b411 100644
--- a/kde-base/kdeedu-meta/ChangeLog
+++ b/kde-base/kdeedu-meta/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdeedu-meta
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu-meta/ChangeLog,v 1.154 2010/05/03 21:29:01 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu-meta/ChangeLog,v 1.155 2010/06/06 14:41:41 scarabeus Exp $
+
+*kdeedu-meta-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdeedu-meta-4.4.2.ebuild, -kdeedu-meta-4.4.3.ebuild,
+  +kdeedu-meta-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kdeedu-meta-4.4.1.ebuild:
diff --git a/kde-base/kdeedu-meta/kdeedu-meta-4.4.3.ebuild b/kde-base/kdeedu-meta/kdeedu-meta-4.4.3.ebuild
deleted file mode 100644
index abf2133c785f..000000000000
--- a/kde-base/kdeedu-meta/kdeedu-meta-4.4.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2010 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.4.3.ebuild,v 1.1 2010/05/03 20:36:06 alexxy Exp $
-
-EAPI="3"
-inherit kde4-functions
-
-DESCRIPTION="KDE educational apps - merge this to pull in all kdeedu-derived packages"
-HOMEPAGE="http://www.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="4.4"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="aqua kdeprefix"
-
-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 kvtml-data)
-	$(add_kdebase_dep kwordquiz)
-	$(add_kdebase_dep libkdeedu)
-	$(add_kdebase_dep marble)
-	$(add_kdebase_dep parley)
-	$(add_kdebase_dep rocs)
-	$(add_kdebase_dep step)
-	$(block_other_slots)
-"
diff --git a/kde-base/kdeedu-meta/kdeedu-meta-4.4.2.ebuild b/kde-base/kdeedu-meta/kdeedu-meta-4.4.4.ebuild
index 222e24d503ca..4b4abd4318d7 100644
--- a/kde-base/kdeedu-meta/kdeedu-meta-4.4.2.ebuild
+++ b/kde-base/kdeedu-meta/kdeedu-meta-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.1 2010/03/30 19:53:47 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu-meta/kdeedu-meta-4.4.4.ebuild,v 1.1 2010/06/06 14:41:41 scarabeus Exp $
 
 EAPI="3"
 inherit kde4-functions
diff --git a/kde-base/kdegames-meta/ChangeLog b/kde-base/kdegames-meta/ChangeLog
index f2e7a2738ae5..07da2f23b5f3 100644
--- a/kde-base/kdegames-meta/ChangeLog
+++ b/kde-base/kdegames-meta/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdegames-meta
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames-meta/ChangeLog,v 1.154 2010/05/03 21:29:18 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames-meta/ChangeLog,v 1.155 2010/06/06 14:41:50 scarabeus Exp $
+
+*kdegames-meta-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdegames-meta-4.4.2.ebuild, -kdegames-meta-4.4.3.ebuild,
+  +kdegames-meta-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kdegames-meta-4.4.1.ebuild:
diff --git a/kde-base/kdegames-meta/kdegames-meta-4.4.3.ebuild b/kde-base/kdegames-meta/kdegames-meta-4.4.3.ebuild
deleted file mode 100644
index 5ed18ab88191..000000000000
--- a/kde-base/kdegames-meta/kdegames-meta-4.4.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2010 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.4.3.ebuild,v 1.1 2010/05/03 20:36:43 alexxy Exp $
-
-EAPI="3"
-inherit kde4-functions
-
-DESCRIPTION="kdegames - merge this to pull in all kdegames-derived packages"
-HOMEPAGE="http://www.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="4.4"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="aqua kdeprefix opengl"
-
-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 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 ksame)
-	$(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) )
-	$(block_other_slots)
-"
diff --git a/kde-base/kdegames-meta/kdegames-meta-4.4.2.ebuild b/kde-base/kdegames-meta/kdegames-meta-4.4.4.ebuild
index a45ab7f3a9e3..8e07b8680b5a 100644
--- a/kde-base/kdegames-meta/kdegames-meta-4.4.2.ebuild
+++ b/kde-base/kdegames-meta/kdegames-meta-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.1 2010/03/30 19:54:42 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames-meta/kdegames-meta-4.4.4.ebuild,v 1.1 2010/06/06 14:41:50 scarabeus Exp $
 
 EAPI="3"
 inherit kde4-functions
diff --git a/kde-base/kdegraphics-meta/ChangeLog b/kde-base/kdegraphics-meta/ChangeLog
index 2194cf549067..57febcc4aae0 100644
--- a/kde-base/kdegraphics-meta/ChangeLog
+++ b/kde-base/kdegraphics-meta/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdegraphics-meta
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-meta/ChangeLog,v 1.158 2010/05/03 21:29:34 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-meta/ChangeLog,v 1.159 2010/06/06 14:41:27 scarabeus Exp $
+
+*kdegraphics-meta-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdegraphics-meta-4.4.2.ebuild, -kdegraphics-meta-4.4.3.ebuild,
+  +kdegraphics-meta-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kdegraphics-meta-4.4.1.ebuild:
diff --git a/kde-base/kdegraphics-meta/kdegraphics-meta-4.4.3.ebuild b/kde-base/kdegraphics-meta/kdegraphics-meta-4.4.3.ebuild
deleted file mode 100644
index 26b820ab3533..000000000000
--- a/kde-base/kdegraphics-meta/kdegraphics-meta-4.4.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2010 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.4.3.ebuild,v 1.1 2010/05/03 20:37:01 alexxy Exp $
-
-EAPI="3"
-inherit kde4-functions
-
-DESCRIPTION="kdegraphics - merge this to pull in all kdegraphics-derived packages"
-HOMEPAGE="http://www.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="4.4"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="aqua kdeprefix"
-
-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 ksaneplugin)
-	$(add_kdebase_dep ksnapshot)
-	$(add_kdebase_dep libkdcraw)
-	$(add_kdebase_dep libkexiv2)
-	$(add_kdebase_dep libkipi)
-	$(add_kdebase_dep libksane)
-	$(add_kdebase_dep okular)
-	$(add_kdebase_dep svgpart)
-	$(add_kdebase_dep thumbnailers)
-	$(block_other_slots)
-"
diff --git a/kde-base/kdegraphics-meta/kdegraphics-meta-4.4.2.ebuild b/kde-base/kdegraphics-meta/kdegraphics-meta-4.4.4.ebuild
index ea577c723fcc..8452f608a1db 100644
--- a/kde-base/kdegraphics-meta/kdegraphics-meta-4.4.2.ebuild
+++ b/kde-base/kdegraphics-meta/kdegraphics-meta-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.1 2010/03/30 19:55:09 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-meta/kdegraphics-meta-4.4.4.ebuild,v 1.1 2010/06/06 14:41:27 scarabeus Exp $
 
 EAPI="3"
 inherit kde4-functions
diff --git a/kde-base/kdegraphics-strigi-analyzer/ChangeLog b/kde-base/kdegraphics-strigi-analyzer/ChangeLog
index 023ebc4c8fac..584d9bfd4508 100644
--- a/kde-base/kdegraphics-strigi-analyzer/ChangeLog
+++ b/kde-base/kdegraphics-strigi-analyzer/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdegraphics-strigi-analyzer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-strigi-analyzer/ChangeLog,v 1.47 2010/05/28 23:17:02 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-strigi-analyzer/ChangeLog,v 1.48 2010/06/06 14:41:32 scarabeus Exp $
+
+*kdegraphics-strigi-analyzer-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdegraphics-strigi-analyzer-4.4.2.ebuild,
+  -kdegraphics-strigi-analyzer-4.4.3.ebuild,
+  +kdegraphics-strigi-analyzer-4.4.4.ebuild:
+  Remove old. Version bump.
 
   28 May 2010; Maciej Mrozowski <reavertm@gentoo.org>
   kdegraphics-strigi-analyzer-4.3.3.ebuild,
diff --git a/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-4.4.3.ebuild b/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-4.4.3.ebuild
deleted file mode 100644
index 26e2de8949e4..000000000000
--- a/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-4.4.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2010 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.4.3.ebuild,v 1.2 2010/05/28 23:17:02 reavertm Exp $
-
-EAPI="3"
-
-KMNAME="kdegraphics"
-KMMODULE="strigi-analyzer"
-inherit kde4-meta
-
-DESCRIPTION="kdegraphics: strigi plugins"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-KMEXTRACTONLY="
-	libs/mobipocket/
-"
-
-DEPEND="
-	app-misc/strigi
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-4.4.2.ebuild b/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-4.4.4.ebuild
index 53a73fc432aa..3ec00bd8babc 100644
--- a/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-4.4.2.ebuild
+++ b/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.2 2010/05/28 23:17:02 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-4.4.4.ebuild,v 1.1 2010/06/06 14:41:32 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 9c51539da37f..39a2bc38bd32 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.686 2010/06/05 21:49:07 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.687 2010/06/06 14:41:54 scarabeus Exp $
+
+*kdelibs-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdelibs-4.4.2.ebuild, -kdelibs-4.4.3.ebuild, +kdelibs-4.4.4.ebuild:
+  Remove old. Version bump.
 
   05 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org> kdelibs-4.4.2.ebuild,
   kdelibs-4.4.3.ebuild:
diff --git a/kde-base/kdelibs/kdelibs-4.4.3.ebuild b/kde-base/kdelibs/kdelibs-4.4.3.ebuild
deleted file mode 100644
index 14742020ff74..000000000000
--- a/kde-base/kdelibs/kdelibs-4.4.3.ebuild
+++ /dev/null
@@ -1,310 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.4.3.ebuild,v 1.5 2010/06/05 21:49:07 reavertm Exp $
-
-EAPI="3"
-
-CPPUNIT_REQUIRED="optional"
-OPENGL_REQUIRED="optional"
-WEBKIT_REQUIRED="always"
-inherit kde4-base fdo-mime
-
-DESCRIPTION="KDE libraries needed by all KDE programs."
-HOMEPAGE="http://www.kde.org/"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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 zeroconf"
-
-# needs the kate regression testsuite from svn
-RESTRICT="test"
-
-COMMONDEPEND="
-	app-crypt/qca:2
-	>=app-misc/strigi-0.6.3
-	~dev-libs/libattica-0.1.2
-	dev-libs/libpcre[unicode]
-	dev-libs/libxml2
-	dev-libs/libxslt
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/giflib
-	media-libs/jpeg:0
-	media-libs/libpng
-	sys-libs/zlib
-	>=x11-misc/shared-mime-info-0.60
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	aqua? (
-		>=media-sound/phonon-4.3.80
-		sys-apps/dbus
-	)
-	!aqua? (
-		>=media-sound/phonon-4.3.80[xcb]
-		sys-apps/dbus[X]
-		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/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 )
-	semantic-desktop? (
-		>=dev-libs/shared-desktop-ontologies-0.2
-		>=dev-libs/soprano-2.3.73[dbus,raptor,redland]
-	)
-	spell? ( app-text/enchant )
-	ssl? ( dev-libs/openssl )
-	zeroconf? (
-		|| (
-			net-dns/avahi[mdnsresponder-compat]
-			!bindist? ( net-misc/mDNSResponder )
-		)
-	)
-"
-DEPEND="${COMMONDEPEND}
-	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
-	)
-"
-PDEPEND="
-	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'
-# @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'
-# libnepomukquery moved to kdelibs from plasma-workspace between 4.3.74 -> 4.3.75
-add_blocker plasma-workspace '<4.3.75'
-
-PATCHES=(
-	"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix.patch"
-	"${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs.patch"
-	"${FILESDIR}/dist/23_solid_no_double_build.patch"
-	"${FILESDIR}/${PN}-4.3.80-module-suffix.patch"
-	"${FILESDIR}/${PN}-4.4.66-macos-unbundle.patch"
-	"${FILESDIR}/${PN}-4.3.3-klauncher_kdeinit.patch"
-	"${FILESDIR}/${PN}-4.3.3-klauncher_kioslave.patch"
-	"${FILESDIR}/${PN}-4.3.3-klauncher_mac.patch"
-	"${FILESDIR}/${PN}-4.4.3-mimetypes.patch"
-	"${FILESDIR}/${PN}-4.4.4-renderblock.patch"
-)
-
-src_prepare() {
-	kde4-base_src_prepare
-
-	# Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix.patch to work)
-	local menu_prefix="kde-${SLOT}-"
-	sed -e "s|FILES[[:space:]]applications.menu|FILES applications.menu RENAME ${menu_prefix}applications.menu|g" \
-		-i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed."
-	sed -e "s|@REPLACE_MENU_PREFIX@|${menu_prefix}|g" \
-		-i kded/vfolder_menu.cpp || die "Sed on vfolder_menu.cpp 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
-	if use kdeprefix; then
-		HME=".kde${SLOT}"
-	else
-		HME=".kde4"
-	fi
-	mycmakeargs+=(
-		-DWITH_HSPELL=OFF
-		-DWITH_ASPELL=OFF
-		-DKDE_DEFAULT_HOME=${HME}
-		-DKAUTH_BACKEND=POLKITQT-1
-		$(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)
-	)
-	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}/${KDEDIR}"/share/apps/kssl/ca-bundle.crt || die
-	dosym /etc/ssl/certs/ca-certificates.crt \
-	"${KDEDIR}"/share/apps/kssl/ca-bundle.crt || die
-
-	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/* || die "Install phase of KDE4 API Documentation failed"
-	fi
-
-	if use aqua; then
-		einfo "fixing ${PN} plugins"
-
-		local _PV=${PV:0:3}.0
-		local _dir=${EKDEDIR}/$(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}"/${KDEDIR}/share/apps/cmake/modules/FindXKB.cmake \
-			|| die "failed fixing FindXKB.cmake"
-	fi
-}
-
-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}/${HME}"
-	echo
-
-	if ! has_version sys-apps/hal; then
-		echo
-		ewarn "You need sys-apps/hal for new device notifications, power management and any"
-		ewarn "other hardware related functionalities to work."
-		echo
-	fi
-
-	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/kdelibs/kdelibs-4.4.2.ebuild b/kde-base/kdelibs/kdelibs-4.4.4.ebuild
index 12da963143e6..7e81bf52f982 100644
--- a/kde-base/kdelibs/kdelibs-4.4.2.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.4.2.ebuild,v 1.8 2010/06/05 21:49:07 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.4.4.ebuild,v 1.1 2010/06/06 14:41:55 scarabeus Exp $
 
 EAPI="3"
 
@@ -124,7 +124,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.3.3-klauncher_kdeinit.patch"
 	"${FILESDIR}/${PN}-4.3.3-klauncher_kioslave.patch"
 	"${FILESDIR}/${PN}-4.3.3-klauncher_mac.patch"
-	"${FILESDIR}/${P}-hang.patch"
+	"${FILESDIR}/${PN}-4.4.3-mimetypes.patch"
 )
 
 src_prepare() {
diff --git a/kde-base/kdelirc/ChangeLog b/kde-base/kdelirc/ChangeLog
index 3617ad347318..43ae4509bffa 100644
--- a/kde-base/kdelirc/ChangeLog
+++ b/kde-base/kdelirc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdelirc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelirc/ChangeLog,v 1.101 2010/05/03 21:30:26 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelirc/ChangeLog,v 1.102 2010/06/06 14:42:20 scarabeus Exp $
+
+*kdelirc-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdelirc-4.4.2.ebuild, -kdelirc-4.4.3.ebuild, +kdelirc-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kdelirc-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kdelirc/kdelirc-4.4.3.ebuild b/kde-base/kdelirc/kdelirc-4.4.3.ebuild
deleted file mode 100644
index 7d5b4bc8c103..000000000000
--- a/kde-base/kdelirc/kdelirc-4.4.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelirc/kdelirc-4.4.3.ebuild,v 1.1 2010/05/03 20:38:58 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdeutils"
-inherit kde4-meta
-
-DESCRIPTION="KDE frontend for the Linux Infrared Remote Control system"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug +handbook"
-
-DEPEND="
-	$(add_kdebase_dep solid)
-"
-RDEPEND="${DEPEND}
-	!kde-misc/kdelirc
-	app-misc/lirc
-"
-
-src_prepare() {
-	kde4-meta_src_prepare
-
-	sed -e 's:${KDE4WORKSPACE_SOLIDCONTROL_LIBRARY}:solidcontrol:g' \
-		-i kdelirc/{kcmlirc,kdelirc,irkick}/CMakeLists.txt \
-		|| die "sed failed"
-}
diff --git a/kde-base/kdelirc/kdelirc-4.4.2.ebuild b/kde-base/kdelirc/kdelirc-4.4.4.ebuild
index 5aa8f1278350..efb41a7c0efa 100644
--- a/kde-base/kdelirc/kdelirc-4.4.2.ebuild
+++ b/kde-base/kdelirc/kdelirc-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelirc/kdelirc-4.4.2.ebuild,v 1.1 2010/03/30 20:44:24 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelirc/kdelirc-4.4.4.ebuild,v 1.1 2010/06/06 14:42:20 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kdemultimedia-kioslaves/ChangeLog b/kde-base/kdemultimedia-kioslaves/ChangeLog
index 43d8511fe8fb..96fceb19d5d2 100644
--- a/kde-base/kdemultimedia-kioslaves/ChangeLog
+++ b/kde-base/kdemultimedia-kioslaves/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdemultimedia-kioslaves
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/ChangeLog,v 1.159 2010/05/03 21:31:00 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/ChangeLog,v 1.160 2010/06/06 14:42:02 scarabeus Exp $
+
+*kdemultimedia-kioslaves-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdemultimedia-kioslaves-4.4.2.ebuild,
+  -kdemultimedia-kioslaves-4.4.3.ebuild,
+  +kdemultimedia-kioslaves-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kdemultimedia-kioslaves-4.4.1.ebuild:
diff --git a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.4.3.ebuild b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.4.3.ebuild
deleted file mode 100644
index a27fce46c485..000000000000
--- a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.4.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2010 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.4.3.ebuild,v 1.1 2010/05/03 20:39:35 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdemultimedia"
-KMMODULE="kioslave"
-inherit kde4-meta
-
-DESCRIPTION="KDE kioslaves from the kdemultimedia package"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook 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-kioslaves/kdemultimedia-kioslaves-4.4.2.ebuild b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.4.4.ebuild
index d1452f1fdc15..07614523be29 100644
--- a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.4.2.ebuild
+++ b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.1 2010/03/30 20:45:15 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.4.4.ebuild,v 1.1 2010/06/06 14:42:02 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kdemultimedia-meta/ChangeLog b/kde-base/kdemultimedia-meta/ChangeLog
index 9212d522cde8..597eaa766248 100644
--- a/kde-base/kdemultimedia-meta/ChangeLog
+++ b/kde-base/kdemultimedia-meta/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdemultimedia-meta
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-meta/ChangeLog,v 1.154 2010/05/03 21:31:19 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-meta/ChangeLog,v 1.155 2010/06/06 14:41:52 scarabeus Exp $
+
+*kdemultimedia-meta-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdemultimedia-meta-4.4.2.ebuild, -kdemultimedia-meta-4.4.3.ebuild,
+  +kdemultimedia-meta-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kdemultimedia-meta-4.4.1.ebuild:
diff --git a/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.4.2.ebuild b/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.4.2.ebuild
deleted file mode 100644
index 6e523a3171e1..000000000000
--- a/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.4.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2010 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.4.2.ebuild,v 1.1 2010/03/30 20:45:41 spatz Exp $
-
-EAPI="3"
-inherit kde4-functions
-
-DESCRIPTION="kdemultimedia - merge this to pull in all kdemultimedia-derived packages"
-HOMEPAGE="http://www.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="4.4"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="aqua kdeprefix"
-
-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)
-	$(add_kdebase_dep mplayerthumbs)
-	$(block_other_slots)
-"
diff --git a/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.4.3.ebuild b/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.4.4.ebuild
index 2c994ad4ec2d..511bf9789e63 100644
--- a/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.4.3.ebuild
+++ b/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.3.ebuild,v 1.1 2010/05/03 20:39:52 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.4.4.ebuild,v 1.1 2010/06/06 14:41:52 scarabeus Exp $
 
 EAPI="3"
 inherit kde4-functions
diff --git a/kde-base/kdenetwork-filesharing/ChangeLog b/kde-base/kdenetwork-filesharing/ChangeLog
index 23725fbf0fef..7ec8c6c9b3b1 100644
--- a/kde-base/kdenetwork-filesharing/ChangeLog
+++ b/kde-base/kdenetwork-filesharing/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdenetwork-filesharing
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-filesharing/ChangeLog,v 1.146 2010/05/03 21:31:36 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-filesharing/ChangeLog,v 1.147 2010/06/06 14:41:43 scarabeus Exp $
+
+*kdenetwork-filesharing-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdenetwork-filesharing-4.4.2.ebuild,
+  -kdenetwork-filesharing-4.4.3.ebuild,
+  +kdenetwork-filesharing-4.4.4.ebuild:
+  Drop old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kdenetwork-filesharing-4.4.1.ebuild:
diff --git a/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.4.3.ebuild b/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.4.3.ebuild
deleted file mode 100644
index 9f3e72fa7333..000000000000
--- a/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.4.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2010 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.4.3.ebuild,v 1.1 2010/05/03 20:40:11 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdenetwork"
-KMMODULE="filesharing"
-inherit kde4-meta
-
-DESCRIPTION="kcontrol filesharing config module for NFS, SMB etc"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.4.2.ebuild b/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.4.4.ebuild
index 545919d0f1e1..9a906a7093a7 100644
--- a/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.4.2.ebuild
+++ b/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.1 2010/03/30 20:46:08 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.4.4.ebuild,v 1.1 2010/06/06 14:41:43 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kdenetwork-meta/ChangeLog b/kde-base/kdenetwork-meta/ChangeLog
index 86e339711903..0372fb7e884d 100644
--- a/kde-base/kdenetwork-meta/ChangeLog
+++ b/kde-base/kdenetwork-meta/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdenetwork-meta
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-meta/ChangeLog,v 1.157 2010/05/03 21:31:53 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-meta/ChangeLog,v 1.158 2010/06/06 14:41:24 scarabeus Exp $
+
+*kdenetwork-meta-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdenetwork-meta-4.4.2.ebuild, -kdenetwork-meta-4.4.3.ebuild,
+  +kdenetwork-meta-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kdenetwork-meta-4.4.1.ebuild:
diff --git a/kde-base/kdenetwork-meta/kdenetwork-meta-4.4.3.ebuild b/kde-base/kdenetwork-meta/kdenetwork-meta-4.4.3.ebuild
deleted file mode 100644
index 2ed162b69790..000000000000
--- a/kde-base/kdenetwork-meta/kdenetwork-meta-4.4.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2010 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.4.3.ebuild,v 1.1 2010/05/03 20:40:28 alexxy Exp $
-
-EAPI="3"
-inherit kde4-functions
-
-DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived packages"
-HOMEPAGE="http://www.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="4.4"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="aqua kdeprefix 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) )
-	$(block_other_slots)
-"
diff --git a/kde-base/kdenetwork-meta/kdenetwork-meta-4.4.2.ebuild b/kde-base/kdenetwork-meta/kdenetwork-meta-4.4.4.ebuild
index f718b66cf81e..e07b577aa706 100644
--- a/kde-base/kdenetwork-meta/kdenetwork-meta-4.4.2.ebuild
+++ b/kde-base/kdenetwork-meta/kdenetwork-meta-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.1 2010/03/30 20:46:34 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-meta/kdenetwork-meta-4.4.4.ebuild,v 1.1 2010/06/06 14:41:24 scarabeus Exp $
 
 EAPI="3"
 inherit kde4-functions
diff --git a/kde-base/kdepasswd/ChangeLog b/kde-base/kdepasswd/ChangeLog
index a01192aeddda..6b7a452ff707 100644
--- a/kde-base/kdepasswd/ChangeLog
+++ b/kde-base/kdepasswd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdepasswd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepasswd/ChangeLog,v 1.161 2010/05/03 21:32:11 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepasswd/ChangeLog,v 1.162 2010/06/06 14:41:30 scarabeus Exp $
+
+*kdepasswd-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdepasswd-4.4.2.ebuild, -kdepasswd-4.4.3.ebuild, +kdepasswd-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kdepasswd-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kdepasswd/kdepasswd-4.4.3.ebuild b/kde-base/kdepasswd/kdepasswd-4.4.3.ebuild
deleted file mode 100644
index 619a73f43729..000000000000
--- a/kde-base/kdepasswd/kdepasswd-4.4.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepasswd/kdepasswd-4.4.3.ebuild,v 1.1 2010/05/03 20:40:47 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-apps"
-inherit kde4-meta
-
-DESCRIPTION="KDE GUI for passwd"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-DEPEND="
-	$(add_kdebase_dep libkonq)
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdesu)
-"
-
-KMLOADLIBS="libkonq"
diff --git a/kde-base/kdepasswd/kdepasswd-4.4.2.ebuild b/kde-base/kdepasswd/kdepasswd-4.4.4.ebuild
index a7eee9345612..be943f57bcd1 100644
--- a/kde-base/kdepasswd/kdepasswd-4.4.2.ebuild
+++ b/kde-base/kdepasswd/kdepasswd-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepasswd/kdepasswd-4.4.2.ebuild,v 1.1 2010/03/30 20:47:00 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepasswd/kdepasswd-4.4.4.ebuild,v 1.1 2010/06/06 14:41:31 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kdepim-icons/ChangeLog b/kde-base/kdepim-icons/ChangeLog
index 686c1f2b69c4..3a4a153ad72d 100644
--- a/kde-base/kdepim-icons/ChangeLog
+++ b/kde-base/kdepim-icons/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdepim-icons
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-icons/ChangeLog,v 1.47 2010/05/03 21:32:29 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-icons/ChangeLog,v 1.48 2010/06/06 14:41:22 scarabeus Exp $
+
+*kdepim-icons-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdepim-icons-4.4.2.ebuild, -kdepim-icons-4.4.3.ebuild,
+  +kdepim-icons-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kdepim-icons-4.4.1.ebuild:
diff --git a/kde-base/kdepim-icons/kdepim-icons-4.4.3.ebuild b/kde-base/kdepim-icons/kdepim-icons-4.4.3.ebuild
deleted file mode 100644
index 94e0cb74c0db..000000000000
--- a/kde-base/kdepim-icons/kdepim-icons-4.4.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-icons/kdepim-icons-4.4.3.ebuild,v 1.1 2010/05/03 20:41:05 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdepim"
-KMMODULE="icons"
-inherit kde4-meta
-
-DESCRIPTION="KDE PIM icons"
-IUSE=""
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-src_install() {
-	kde4-meta_src_install
-	# colliding with oxygen icons
-	rm -rf "${ED}"/${KDEDIR}/share/icons/oxygen/16x16/status/meeting-organizer.png
-}
diff --git a/kde-base/kdepim-icons/kdepim-icons-4.4.2.ebuild b/kde-base/kdepim-icons/kdepim-icons-4.4.4.ebuild
index f63144bd472a..248058cad15f 100644
--- a/kde-base/kdepim-icons/kdepim-icons-4.4.2.ebuild
+++ b/kde-base/kdepim-icons/kdepim-icons-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.1 2010/03/30 20:47:31 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-icons/kdepim-icons-4.4.4.ebuild,v 1.1 2010/06/06 14:41:22 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kdepim-kresources/ChangeLog b/kde-base/kdepim-kresources/ChangeLog
index f3910b7ebfef..c2206f396fe0 100644
--- a/kde-base/kdepim-kresources/ChangeLog
+++ b/kde-base/kdepim-kresources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdepim-kresources
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kresources/ChangeLog,v 1.158 2010/05/03 21:32:45 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kresources/ChangeLog,v 1.159 2010/06/06 14:41:28 scarabeus Exp $
+
+*kdepim-kresources-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdepim-kresources-4.4.2.ebuild, -kdepim-kresources-4.4.3.ebuild,
+  +kdepim-kresources-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kdepim-kresources-4.4.1.ebuild:
diff --git a/kde-base/kdepim-kresources/kdepim-kresources-4.4.3.ebuild b/kde-base/kdepim-kresources/kdepim-kresources-4.4.3.ebuild
deleted file mode 100644
index 13df876ced4c..000000000000
--- a/kde-base/kdepim-kresources/kdepim-kresources-4.4.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2010 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.4.3.ebuild,v 1.1 2010/05/03 20:41:25 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdepim"
-KMMODULE="kresources"
-inherit kde4-meta
-
-DESCRIPTION="KDE PIM groupware plugin collection"
-IUSE="debug"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep libkdepim)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	kmail/
-	knotes/
-	korganizer/version.h
-"
-
-KMLOADLIBS="libkdepim"
-
-src_install() {
-	kde4-meta_src_install
-
-	# Install headers needed by kdepim-wizards, egroupware stuff gone
-	insinto "${PREFIX}"/include/${PN}
-	doins "${CMAKE_BUILD_DIR}"/${KMMODULE}/{groupwise,slox}/*.h || \
-			die "Failed to install extra header files"
-}
diff --git a/kde-base/kdepim-kresources/kdepim-kresources-4.4.2.ebuild b/kde-base/kdepim-kresources/kdepim-kresources-4.4.4.ebuild
index bccaedb7971b..566436d6c9eb 100644
--- a/kde-base/kdepim-kresources/kdepim-kresources-4.4.2.ebuild
+++ b/kde-base/kdepim-kresources/kdepim-kresources-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.1 2010/03/30 20:48:00 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kresources/kdepim-kresources-4.4.4.ebuild,v 1.1 2010/06/06 14:41:28 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kdepim-meta/ChangeLog b/kde-base/kdepim-meta/ChangeLog
index 94278f44c411..96a3b51f1614 100644
--- a/kde-base/kdepim-meta/ChangeLog
+++ b/kde-base/kdepim-meta/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdepim-meta
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/ChangeLog,v 1.151 2010/05/03 21:33:20 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/ChangeLog,v 1.152 2010/06/06 14:41:47 scarabeus Exp $
+
+*kdepim-meta-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdepim-meta-4.4.2.ebuild, -kdepim-meta-4.4.3.ebuild,
+  +kdepim-meta-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kdepim-meta-4.4.1.ebuild:
diff --git a/kde-base/kdepim-meta/kdepim-meta-4.4.3.ebuild b/kde-base/kdepim-meta/kdepim-meta-4.4.3.ebuild
deleted file mode 100644
index 3ba7d3d987af..000000000000
--- a/kde-base/kdepim-meta/kdepim-meta-4.4.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2010 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.4.3.ebuild,v 1.1 2010/05/03 20:42:02 alexxy Exp $
-
-EAPI="3"
-inherit kde4-functions
-
-DESCRIPTION="kdepim - merge this to pull in all kdepim-derived packages"
-HOMEPAGE="http://www.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="4.4"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="aqua kdeprefix semantic-desktop"
-
-RDEPEND="
-	$(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)
-	$(add_kdebase_dep libkdepim)
-	$(add_kdebase_dep libkleo)
-	$(add_kdebase_dep libkpgp)
-	semantic-desktop? ( $(add_kdebase_dep akonadi) )
-	$(block_other_slots)
-"
diff --git a/kde-base/kdepim-meta/kdepim-meta-4.4.2.ebuild b/kde-base/kdepim-meta/kdepim-meta-4.4.4.ebuild
index 40f2ca055898..d55d4b72511d 100644
--- a/kde-base/kdepim-meta/kdepim-meta-4.4.2.ebuild
+++ b/kde-base/kdepim-meta/kdepim-meta-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.1 2010/03/30 20:48:51 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/kdepim-meta-4.4.4.ebuild,v 1.1 2010/06/06 14:41:47 scarabeus Exp $
 
 EAPI="3"
 inherit kde4-functions
diff --git a/kde-base/kdepim-runtime/ChangeLog b/kde-base/kdepim-runtime/ChangeLog
index c54f9cfdf8fe..213c863b9420 100644
--- a/kde-base/kdepim-runtime/ChangeLog
+++ b/kde-base/kdepim-runtime/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdepim-runtime
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.9 2010/06/05 15:00:13 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.10 2010/06/06 14:41:40 scarabeus Exp $
+
+*kdepim-runtime-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdepim-runtime-4.4.2.ebuild, -kdepim-runtime-4.4.3.ebuild,
+  +kdepim-runtime-4.4.4.ebuild:
+  Remove old. Version bump.
 
   05 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org>
   kdepim-runtime-4.4.2.ebuild, kdepim-runtime-4.4.3.ebuild:
diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.4.3.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.4.3.ebuild
deleted file mode 100644
index b9b959558e64..000000000000
--- a/kde-base/kdepim-runtime/kdepim-runtime-4.4.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2010 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.4.3.ebuild,v 1.2 2010/06/05 15:00:13 reavertm Exp $
-
-EAPI="3"
-
-if [[ ${PV} = *9999* ]]; then
-	KMNAME="kdepim"
-	KMMODULE="runtime"
-	inherit kde4-meta
-else
-	inherit kde4-base
-fi
-
-DESCRIPTION="KDE PIM runtime plugin collection"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	app-misc/strigi
-	>=app-office/akonadi-server-1.2.1
-	dev-libs/boost
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	$(add_kdebase_dep kdelibs 'semantic-desktop')
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
-	$(add_kdebase_dep libkdepim)
-	x11-misc/shared-mime-info
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdepim-icons)
-"
-
-add_blocker akonadi '<4.3.90'
diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.4.2.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.4.4.ebuild
index 5214b6101e71..ac31bcb95c72 100644
--- a/kde-base/kdepim-runtime/kdepim-runtime-4.4.2.ebuild
+++ b/kde-base/kdepim-runtime/kdepim-runtime-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.2 2010/06/05 15:00:13 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.4.4.ebuild,v 1.1 2010/06/06 14:41:40 scarabeus Exp $
 
 EAPI="3"
 
@@ -18,7 +18,7 @@ IUSE="debug"
 
 DEPEND="
 	app-misc/strigi
-	>=app-office/akonadi-server-1.2.1
+	>=app-office/akonadi-server-1.3.1
 	dev-libs/boost
 	dev-libs/libxml2:2
 	dev-libs/libxslt
diff --git a/kde-base/kdepim-strigi-analyzer/ChangeLog b/kde-base/kdepim-strigi-analyzer/ChangeLog
index 7faf0f3af110..5d232abaa93d 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-strigi-analyzer/ChangeLog,v 1.45 2010/05/03 21:33:53 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-strigi-analyzer/ChangeLog,v 1.46 2010/06/06 14:42:12 scarabeus Exp $
+
+*kdepim-strigi-analyzer-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdepim-strigi-analyzer-4.4.2.ebuild,
+  -kdepim-strigi-analyzer-4.4.3.ebuild,
+  +kdepim-strigi-analyzer-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kdepim-strigi-analyzer-4.4.1.ebuild:
diff --git a/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-4.4.3.ebuild b/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-4.4.3.ebuild
deleted file mode 100644
index 9ec92f3193a0..000000000000
--- a/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-4.4.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-4.4.3.ebuild,v 1.1 2010/05/03 20:42:38 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdepim"
-KMMODULE="strigi-analyzer"
-inherit kde4-meta
-
-DESCRIPTION="kdepim: strigi plugins"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	app-misc/strigi
-	$(add_kdebase_dep kdepimlibs)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-4.4.2.ebuild b/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-4.4.4.ebuild
index 5376cf6e3c72..d8c3eba60b59 100644
--- a/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-4.4.2.ebuild
+++ b/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.1 2010/03/30 20:49:53 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-4.4.4.ebuild,v 1.1 2010/06/06 14:42:12 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kdepim-wizards/ChangeLog b/kde-base/kdepim-wizards/ChangeLog
index 97606c033815..6634c25838af 100644
--- a/kde-base/kdepim-wizards/ChangeLog
+++ b/kde-base/kdepim-wizards/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdepim-wizards
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-wizards/ChangeLog,v 1.143 2010/05/03 21:34:09 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-wizards/ChangeLog,v 1.144 2010/06/06 14:42:00 scarabeus Exp $
+
+*kdepim-wizards-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdepim-wizards-4.4.2.ebuild, -kdepim-wizards-4.4.3.ebuild,
+  +kdepim-wizards-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kdepim-wizards-4.4.1.ebuild:
diff --git a/kde-base/kdepim-wizards/kdepim-wizards-4.4.3.ebuild b/kde-base/kdepim-wizards/kdepim-wizards-4.4.3.ebuild
deleted file mode 100644
index d91dab1f218d..000000000000
--- a/kde-base/kdepim-wizards/kdepim-wizards-4.4.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2010 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.4.3.ebuild,v 1.1 2010/05/03 20:42:58 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdepim"
-KMMODULE="wizards"
-inherit kde4-meta
-
-DESCRIPTION="KDE PIM wizards"
-IUSE="debug"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep kdepim-kresources)
-	$(add_kdebase_dep libkdepim)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	kmail/
-	knotes/
-	kresources/groupwise/
-	kresources/kolab/
-	kresources/slox/
-"
-
-src_prepare() {
-	ln -s "${EKDEDIR}"/include/kdepim-kresources/{kabcsloxprefs.h,kcalsloxprefs.h} \
-		kresources/slox/ \
-		|| die "Failed to link extra_headers."
-	ln -s "${EKDEDIR}"/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.4.2.ebuild b/kde-base/kdepim-wizards/kdepim-wizards-4.4.4.ebuild
index 351c28d53460..87c2389212d0 100644
--- a/kde-base/kdepim-wizards/kdepim-wizards-4.4.2.ebuild
+++ b/kde-base/kdepim-wizards/kdepim-wizards-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.1 2010/03/30 20:50:19 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-wizards/kdepim-wizards-4.4.4.ebuild,v 1.1 2010/06/06 14:42:00 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kdepimlibs/ChangeLog b/kde-base/kdepimlibs/ChangeLog
index d4682ead0366..8cc29a9f257a 100644
--- a/kde-base/kdepimlibs/ChangeLog
+++ b/kde-base/kdepimlibs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdepimlibs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/ChangeLog,v 1.72 2010/06/05 14:49:58 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/ChangeLog,v 1.73 2010/06/06 14:41:40 scarabeus Exp $
+
+*kdepimlibs-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdepimlibs-4.4.2.ebuild, -kdepimlibs-4.4.3.ebuild,
+  +kdepimlibs-4.4.4.ebuild:
+  Remove old. Version bump.
 
   05 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org>
   kdepimlibs-4.4.2.ebuild, kdepimlibs-4.4.3.ebuild:
diff --git a/kde-base/kdepimlibs/kdepimlibs-4.4.3.ebuild b/kde-base/kdepimlibs/kdepimlibs-4.4.3.ebuild
deleted file mode 100644
index 63dc05fd5529..000000000000
--- a/kde-base/kdepimlibs/kdepimlibs-4.4.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/kdepimlibs-4.4.3.ebuild,v 1.2 2010/06/05 14:49:58 reavertm Exp $
-
-EAPI="3"
-
-CPPUNIT_REQUIRED="optional"
-inherit kde4-base
-
-DESCRIPTION="Common library for KDE PIM apps."
-HOMEPAGE="http://www.kde.org/"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-LICENSE="LGPL-2.1"
-IUSE="debug +handbook ldap +semantic-desktop"
-
-# some akonadi tests timeout, that probaly needs more work as its ~700 tests
-RESTRICT="test"
-
-DEPEND="
-	>=app-crypt/gpgme-1.1.6
-	>=dev-libs/boost-1.35.0-r5
-	dev-libs/libgpg-error
-	>=dev-libs/libical-0.43
-	dev-libs/cyrus-sasl
-	semantic-desktop? (
-		>=app-office/akonadi-server-1.3.1
-		media-sound/phonon
-		x11-misc/shared-mime-info
-	)
-	ldap? ( net-nds/openldap )
-"
-RDEPEND="${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)/{/macro_optional_/!s/find/macro_optional_&/}' \
-		-e '/macro_log_feature\((Akonadi)_FOUND/s/ TRUE / FALSE /' \
-		-e '/add_subdirectory\((akonadi|mailtransport)/{/macro_optional_/!s/add/macro_optional_&/}' \
-		-i CMakeLists.txt || die
-	if ! use semantic-desktop; then
-		# 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)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/kde-base/kdepimlibs/kdepimlibs-4.4.2.ebuild b/kde-base/kdepimlibs/kdepimlibs-4.4.4.ebuild
index 42c5df5a4f9f..f1fe46752959 100644
--- a/kde-base/kdepimlibs/kdepimlibs-4.4.2.ebuild
+++ b/kde-base/kdepimlibs/kdepimlibs-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/kdepimlibs-4.4.2.ebuild,v 1.2 2010/06/05 14:49:58 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/kdepimlibs-4.4.4.ebuild,v 1.1 2010/06/06 14:41:40 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kdeplasma-addons/ChangeLog b/kde-base/kdeplasma-addons/ChangeLog
index 7ec4c8e7dc48..934723216727 100644
--- a/kde-base/kdeplasma-addons/ChangeLog
+++ b/kde-base/kdeplasma-addons/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdeplasma-addons
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.59 2010/06/05 14:57:15 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.60 2010/06/06 14:41:36 scarabeus Exp $
+
+*kdeplasma-addons-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdeplasma-addons-4.4.2-r1.ebuild, -kdeplasma-addons-4.4.3.ebuild,
+  +kdeplasma-addons-4.4.4.ebuild:
+  Remove old. Version bump.
 
   05 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org>
   kdeplasma-addons-4.4.2-r1.ebuild, kdeplasma-addons-4.4.3.ebuild:
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.2-r1.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.2-r1.ebuild
deleted file mode 100644
index d58cb928c8a0..000000000000
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.2-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2010 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.4.2-r1.ebuild,v 1.3 2010/06/05 14:57:15 reavertm Exp $
-
-EAPI="3"
-
-KMNAME="kdeplasma-addons"
-WEBKIT_REQUIRED="always"
-inherit kde4-base
-
-DESCRIPTION="Extra Plasma applets and engines."
-HOMEPAGE="http://www.kde.org/"
-LICENSE="GPL-2 LGPL-2"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug desktopglobe exif qalculate qwt rss scim semantic-desktop"
-
-# krunner is only needed to generate dbus interface for lancelot
-COMMON_DEPEND="
-	dev-libs/libattica
-	$(add_kdebase_dep kdelibs 'semantic-desktop?')
-	$(add_kdebase_dep krunner)
-	$(add_kdebase_dep plasma-workspace 'rss?')
-	x11-misc/shared-mime-info
-	desktopglobe? ( $(add_kdebase_dep marble) )
-	exif? ( $(add_kdebase_dep libkexiv2) )
-	qalculate? ( sci-libs/libqalculate )
-	qwt? ( x11-libs/qwt:5 )
-	rss? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
-	scim? ( app-i18n/scim )
-"
-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}
-	!kdeprefix? (
-		!kde-misc/qalculate-applet
-		!kde-misc/plasmaboard
-	)
-"
-
-# kdebase-data: some svg icons moved from data directly here.
-add_blocker kdebase-data '<4.2.88'
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.3-cmake.patch"
-)
-
-src_prepare() {
-	sed -e 's/${KDE4WORKSPACE_PLASMACLOCK_LIBRARY}/plasmaclock/g' \
-		-e 's/${KDE4WORKSPACE_WEATHERION_LIBRARY}/weather_ion/g' \
-		-e 's/${KDE4WORKSPACE_TASKMANAGER_LIBRARY}/taskmanager/g' \
-		-i {libs/plasmaweather,applets/{binary-clock,fuzzy-clock,weather,weatherstation,lancelot/app/src}}/CMakeLists.txt \
-		|| die "Failed to patch CMake files"
-
-	kde4-base_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DDBUS_INTERFACES_INSTALL_DIR="${EKDEDIR}/share/dbus-1/interfaces/"
-		$(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 rss KdepimLibs)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with scim)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.3.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.4.ebuild
index 1e7ae30f0890..1bf8d5602d16 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.3.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.3.ebuild,v 1.4 2010/06/05 14:57:15 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.4.ebuild,v 1.1 2010/06/06 14:41:36 scarabeus Exp $
 
 EAPI="3"
 
@@ -36,8 +36,8 @@ DEPEND="${COMMON_DEPEND}
 # kde-misc/qalculate-applet: since 4.4.0
 RDEPEND="${COMMON_DEPEND}
 	!kdeprefix? (
-		!kde-misc/qalculate-applet
 		!kde-misc/plasmaboard
+		!kde-misc/qalculate-applet
 	)
 "
 
diff --git a/kde-base/kdesdk-kioslaves/ChangeLog b/kde-base/kdesdk-kioslaves/ChangeLog
index 4c66ffc7121f..e87fe984ff88 100644
--- a/kde-base/kdesdk-kioslaves/ChangeLog
+++ b/kde-base/kdesdk-kioslaves/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdesdk-kioslaves
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/ChangeLog,v 1.146 2010/05/03 21:34:45 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/ChangeLog,v 1.147 2010/06/06 14:41:58 scarabeus Exp $
+
+*kdesdk-kioslaves-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdesdk-kioslaves-4.4.2.ebuild, -kdesdk-kioslaves-4.4.3.ebuild,
+  +kdesdk-kioslaves-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kdesdk-kioslaves-4.4.1.ebuild:
diff --git a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.4.3.ebuild b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.4.3.ebuild
deleted file mode 100644
index 272871f178ab..000000000000
--- a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.4.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2010 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.4.3.ebuild,v 1.1 2010/05/03 20:43:36 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdesdk"
-KMMODULE="kioslave"
-inherit kde4-meta
-
-DESCRIPTION="kioslaves from kdesdk package"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug subversion"
-
-DEPEND="
-	subversion? (
-		dev-libs/apr
-		dev-util/subversion
-	)
-"
-RDEPEND="${DEPEND}
-	!kdeprefix? (
-		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-kioslaves/kdesdk-kioslaves-4.4.2.ebuild b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.4.4.ebuild
index 83720f3308a4..142a0ae409b8 100644
--- a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.4.2.ebuild
+++ b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.1 2010/03/30 20:51:10 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.4.4.ebuild,v 1.1 2010/06/06 14:41:58 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kdesdk-meta/ChangeLog b/kde-base/kdesdk-meta/ChangeLog
index 70340863031f..e7de34a14706 100644
--- a/kde-base/kdesdk-meta/ChangeLog
+++ b/kde-base/kdesdk-meta/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdesdk-meta
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-meta/ChangeLog,v 1.142 2010/05/03 21:35:01 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-meta/ChangeLog,v 1.143 2010/06/06 14:41:21 scarabeus Exp $
+
+*kdesdk-meta-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdesdk-meta-4.4.2.ebuild, -kdesdk-meta-4.4.3.ebuild,
+  +kdesdk-meta-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kdesdk-meta-4.4.1.ebuild:
diff --git a/kde-base/kdesdk-meta/kdesdk-meta-4.4.3.ebuild b/kde-base/kdesdk-meta/kdesdk-meta-4.4.3.ebuild
deleted file mode 100644
index 7d83ac821718..000000000000
--- a/kde-base/kdesdk-meta/kdesdk-meta-4.4.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2010 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.4.3.ebuild,v 1.1 2010/05/03 20:43:54 alexxy Exp $
-
-EAPI="3"
-inherit kde4-functions
-
-DESCRIPTION="KDE SDK - merge this to pull in all kdesdk-derived packages"
-HOMEPAGE="http://www.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="4.4"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="aqua kdeprefix"
-
-RDEPEND="
-	$(add_kdebase_dep cervisia)
-	$(add_kdebase_dep kapptemplate)
-	$(add_kdebase_dep kate)
-	$(add_kdebase_dep kbugbuster)
-	$(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 umbrello)
-	$(block_other_slots)
-"
-
-# FIXME:
-# Broken in 4.1.0
-#   >=kde-base/kspy-${PV}:${SLOT}
-#	elibc_glibc? ( >=kde-base/kmtrace-${PV}:${SLOT} )
-#	>=kde-base/kunittest-${PV}:${SLOT}
diff --git a/kde-base/kdesdk-meta/kdesdk-meta-4.4.2.ebuild b/kde-base/kdesdk-meta/kdesdk-meta-4.4.4.ebuild
index 895a1d2e749a..f0a504d9a869 100644
--- a/kde-base/kdesdk-meta/kdesdk-meta-4.4.2.ebuild
+++ b/kde-base/kdesdk-meta/kdesdk-meta-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.1 2010/03/30 20:51:36 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-meta/kdesdk-meta-4.4.4.ebuild,v 1.1 2010/06/06 14:41:21 scarabeus Exp $
 
 EAPI="3"
 inherit kde4-functions
@@ -31,9 +31,3 @@ RDEPEND="
 	$(add_kdebase_dep umbrello)
 	$(block_other_slots)
 "
-
-# FIXME:
-# Broken in 4.1.0
-#   >=kde-base/kspy-${PV}:${SLOT}
-#	elibc_glibc? ( >=kde-base/kmtrace-${PV}:${SLOT} )
-#	>=kde-base/kunittest-${PV}:${SLOT}
diff --git a/kde-base/kdesdk-misc/ChangeLog b/kde-base/kdesdk-misc/ChangeLog
index c2f5cf30b9b7..90eee0cbb92f 100644
--- a/kde-base/kdesdk-misc/ChangeLog
+++ b/kde-base/kdesdk-misc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdesdk-misc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-misc/ChangeLog,v 1.120 2010/05/03 21:35:18 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-misc/ChangeLog,v 1.121 2010/06/06 14:42:10 scarabeus Exp $
+
+*kdesdk-misc-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdesdk-misc-4.4.2.ebuild, -kdesdk-misc-4.4.3.ebuild,
+  +kdesdk-misc-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kdesdk-misc-4.4.1.ebuild:
diff --git a/kde-base/kdesdk-misc/kdesdk-misc-4.4.3.ebuild b/kde-base/kdesdk-misc/kdesdk-misc-4.4.3.ebuild
deleted file mode 100644
index 6f46c8badcc9..000000000000
--- a/kde-base/kdesdk-misc/kdesdk-misc-4.4.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2010 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.4.3.ebuild,v 1.1 2010/05/03 20:44:12 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="${PN/-*/}"
-KMNOMODULE="true"
-
-inherit kde4-meta
-
-DESCRIPTION="KDE miscellaneous SDK tools"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-KMEXTRA="
-	kmtrace/
-	kpartloader/
-	kprofilemethod/
-	kspy/
-	kunittest/
-	poxml/
-	scheck/
-"
diff --git a/kde-base/kdesdk-misc/kdesdk-misc-4.4.2.ebuild b/kde-base/kdesdk-misc/kdesdk-misc-4.4.4.ebuild
index d5afd39d999a..b4116542da26 100644
--- a/kde-base/kdesdk-misc/kdesdk-misc-4.4.2.ebuild
+++ b/kde-base/kdesdk-misc/kdesdk-misc-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.1 2010/03/30 20:52:03 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-misc/kdesdk-misc-4.4.4.ebuild,v 1.1 2010/06/06 14:42:10 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kdesdk-scripts/ChangeLog b/kde-base/kdesdk-scripts/ChangeLog
index 38f238e7271d..3df7102a4f06 100644
--- a/kde-base/kdesdk-scripts/ChangeLog
+++ b/kde-base/kdesdk-scripts/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdesdk-scripts
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-scripts/ChangeLog,v 1.135 2010/05/03 21:35:41 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-scripts/ChangeLog,v 1.136 2010/06/06 14:42:19 scarabeus Exp $
+
+*kdesdk-scripts-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdesdk-scripts-4.4.2.ebuild, -kdesdk-scripts-4.4.3.ebuild,
+  +kdesdk-scripts-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kdesdk-scripts-4.4.1.ebuild:
diff --git a/kde-base/kdesdk-scripts/kdesdk-scripts-4.4.3.ebuild b/kde-base/kdesdk-scripts/kdesdk-scripts-4.4.3.ebuild
deleted file mode 100644
index c5ec4ff405c8..000000000000
--- a/kde-base/kdesdk-scripts/kdesdk-scripts-4.4.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2010 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.4.3.ebuild,v 1.1 2010/05/03 20:44:31 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="${PN/-*/}"
-KMMODULE="${PN/*-/}"
-
-inherit kde4-meta
-
-DESCRIPTION="KDE SDK Scripts"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+handbook debug"
-
-src_prepare() {
-	# bug 275069
-	sed -ie 's:colorsvn::' scripts/CMakeLists.txt || die
-
-	kde4-meta_src_prepare
-}
diff --git a/kde-base/kdesdk-scripts/kdesdk-scripts-4.4.2.ebuild b/kde-base/kdesdk-scripts/kdesdk-scripts-4.4.4.ebuild
index 2728824f878c..3435e0191912 100644
--- a/kde-base/kdesdk-scripts/kdesdk-scripts-4.4.2.ebuild
+++ b/kde-base/kdesdk-scripts/kdesdk-scripts-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.1 2010/03/30 20:52:27 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-scripts/kdesdk-scripts-4.4.4.ebuild,v 1.1 2010/06/06 14:42:19 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kdesdk-strigi-analyzer/ChangeLog b/kde-base/kdesdk-strigi-analyzer/ChangeLog
index a34af1c52748..a72b951fc13b 100644
--- a/kde-base/kdesdk-strigi-analyzer/ChangeLog
+++ b/kde-base/kdesdk-strigi-analyzer/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdesdk-strigi-analyzer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-strigi-analyzer/ChangeLog,v 1.44 2010/05/28 23:20:06 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-strigi-analyzer/ChangeLog,v 1.45 2010/06/06 14:41:52 scarabeus Exp $
+
+*kdesdk-strigi-analyzer-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdesdk-strigi-analyzer-4.4.2.ebuild,
+  -kdesdk-strigi-analyzer-4.4.3.ebuild,
+  +kdesdk-strigi-analyzer-4.4.4.ebuild:
+  Remove old. Version bump.
 
   28 May 2010; Maciej Mrozowski <reavertm@gentoo.org>
   kdesdk-strigi-analyzer-4.3.3.ebuild, kdesdk-strigi-analyzer-4.3.5.ebuild,
diff --git a/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.4.2.ebuild b/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.4.2.ebuild
deleted file mode 100644
index 72f7c2ed9091..000000000000
--- a/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.4.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2010 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.4.2.ebuild,v 1.2 2010/05/28 23:20:06 reavertm Exp $
-
-EAPI="3"
-
-KMNAME="kdesdk"
-KMMODULE="strigi-analyzer"
-inherit kde4-meta
-
-DESCRIPTION="kdesdk: strigi plugins"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	app-misc/strigi
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.4.3.ebuild b/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.4.4.ebuild
index 45ef7d9492cf..2df6dd285bbe 100644
--- a/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.4.3.ebuild
+++ b/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.3.ebuild,v 1.2 2010/05/28 23:20:06 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.4.4.ebuild,v 1.1 2010/06/06 14:41:52 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kdesu/ChangeLog b/kde-base/kdesu/ChangeLog
index dddad499af7e..fc676e74db20 100644
--- a/kde-base/kdesu/ChangeLog
+++ b/kde-base/kdesu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdesu
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesu/ChangeLog,v 1.154 2010/05/04 08:10:27 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesu/ChangeLog,v 1.155 2010/06/06 14:42:12 scarabeus Exp $
+
+*kdesu-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -kdesu-4.4.2.ebuild,
+  -kdesu-4.4.3.ebuild, +kdesu-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org> kdesu-4.4.3.ebuild:
   Restore accidently dropped ~x86-fbsd keyword on KDE SC 4.4.3
diff --git a/kde-base/kdesu/kdesu-4.4.3.ebuild b/kde-base/kdesu/kdesu-4.4.3.ebuild
deleted file mode 100644
index eb2cbf49b773..000000000000
--- a/kde-base/kdesu/kdesu-4.4.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesu/kdesu-4.4.3.ebuild,v 1.2 2010/05/04 08:10:27 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-runtime"
-inherit kde4-meta
-
-# FIXME: Is default command ( su/sudo ) still configurable,
-# if not, USE-flag ?
-DESCRIPTION="KDE: gui for su(1)"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-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/kdesu/kdesu-4.4.2.ebuild b/kde-base/kdesu/kdesu-4.4.4.ebuild
index 6d13208b0f94..3b0b7f2c5a55 100644
--- a/kde-base/kdesu/kdesu-4.4.2.ebuild
+++ b/kde-base/kdesu/kdesu-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesu/kdesu-4.4.2.ebuild,v 1.2 2010/05/03 06:23:22 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesu/kdesu-4.4.4.ebuild,v 1.1 2010/06/06 14:42:12 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kdetoys-meta/ChangeLog b/kde-base/kdetoys-meta/ChangeLog
index 3205c63a292a..73c2b84af4a8 100644
--- a/kde-base/kdetoys-meta/ChangeLog
+++ b/kde-base/kdetoys-meta/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdetoys-meta
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys-meta/ChangeLog,v 1.151 2010/05/03 21:36:32 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys-meta/ChangeLog,v 1.152 2010/06/06 14:41:57 scarabeus Exp $
+
+*kdetoys-meta-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdetoys-meta-4.4.2.ebuild, -kdetoys-meta-4.4.3.ebuild,
+  +kdetoys-meta-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kdetoys-meta-4.4.1.ebuild:
diff --git a/kde-base/kdetoys-meta/kdetoys-meta-4.4.3.ebuild b/kde-base/kdetoys-meta/kdetoys-meta-4.4.3.ebuild
deleted file mode 100644
index c517848131c9..000000000000
--- a/kde-base/kdetoys-meta/kdetoys-meta-4.4.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2010 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.4.3.ebuild,v 1.1 2010/05/03 20:45:26 alexxy Exp $
-
-EAPI="3"
-inherit kde4-functions
-
-DESCRIPTION="KDE toys - merge this to pull in all kdetoys-derived packages"
-HOMEPAGE="http://www.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="4.4"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="aqua kdeprefix"
-
-RDEPEND="
-	$(add_kdebase_dep amor)
-	$(add_kdebase_dep kteatime)
-	$(add_kdebase_dep ktux)
-	$(add_kdebase_dep kweather)
-	$(block_other_slots)
-"
diff --git a/kde-base/kdetoys-meta/kdetoys-meta-4.4.2.ebuild b/kde-base/kdetoys-meta/kdetoys-meta-4.4.4.ebuild
index b2d331dbc1bf..194ae2421cfe 100644
--- a/kde-base/kdetoys-meta/kdetoys-meta-4.4.2.ebuild
+++ b/kde-base/kdetoys-meta/kdetoys-meta-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.1 2010/03/30 20:53:46 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys-meta/kdetoys-meta-4.4.4.ebuild,v 1.1 2010/06/06 14:41:57 scarabeus Exp $
 
 EAPI="3"
 inherit kde4-functions
diff --git a/kde-base/kdeutils-meta/ChangeLog b/kde-base/kdeutils-meta/ChangeLog
index cd4a6a313105..d82e3b9b3cb1 100644
--- a/kde-base/kdeutils-meta/ChangeLog
+++ b/kde-base/kdeutils-meta/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdeutils-meta
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils-meta/ChangeLog,v 1.152 2010/05/03 21:36:51 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils-meta/ChangeLog,v 1.153 2010/06/06 14:41:40 scarabeus Exp $
+
+*kdeutils-meta-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdeutils-meta-4.4.2.ebuild, -kdeutils-meta-4.4.3.ebuild,
+  +kdeutils-meta-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kdeutils-meta-4.4.1.ebuild:
diff --git a/kde-base/kdeutils-meta/kdeutils-meta-4.4.3.ebuild b/kde-base/kdeutils-meta/kdeutils-meta-4.4.3.ebuild
deleted file mode 100644
index 99a1af822dab..000000000000
--- a/kde-base/kdeutils-meta/kdeutils-meta-4.4.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2010 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.4.3.ebuild,v 1.1 2010/05/03 20:45:44 alexxy Exp $
-
-EAPI="3"
-inherit kde4-functions
-
-DESCRIPTION="kdeutils - merge this to pull in all kdeutils-derived packages"
-HOMEPAGE="http://www.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="4.4"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="aqua cups floppy kdeprefix lirc"
-
-RDEPEND="
-	$(add_kdebase_dep ark)
-	$(add_kdebase_dep kcalc)
-	$(add_kdebase_dep kcharselect)
-	$(add_kdebase_dep kdf)
-	$(add_kdebase_dep kgpg)
-	$(add_kdebase_dep ktimer)
-	$(add_kdebase_dep kwallet)
-	$(add_kdebase_dep superkaramba)
-	$(add_kdebase_dep sweeper)
-	$(add_kdebase_dep okteta)
-	cups? ( $(add_kdebase_dep printer-applet) )
-	floppy? ( $(add_kdebase_dep kfloppy) )
-	lirc? ( $(add_kdebase_dep kdelirc) )
-	$(block_other_slots)
-"
diff --git a/kde-base/kdeutils-meta/kdeutils-meta-4.4.2.ebuild b/kde-base/kdeutils-meta/kdeutils-meta-4.4.4.ebuild
index b7e5121e6eab..2c18e57deb44 100644
--- a/kde-base/kdeutils-meta/kdeutils-meta-4.4.2.ebuild
+++ b/kde-base/kdeutils-meta/kdeutils-meta-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.1 2010/03/30 20:54:11 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils-meta/kdeutils-meta-4.4.4.ebuild,v 1.1 2010/06/06 14:41:40 scarabeus Exp $
 
 EAPI="3"
 inherit kde4-functions
diff --git a/kde-base/kdewebdev-meta/ChangeLog b/kde-base/kdewebdev-meta/ChangeLog
index 1cc49a004c60..89ac18fd307a 100644
--- a/kde-base/kdewebdev-meta/ChangeLog
+++ b/kde-base/kdewebdev-meta/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdewebdev-meta
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev-meta/ChangeLog,v 1.136 2010/05/03 21:37:08 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev-meta/ChangeLog,v 1.137 2010/06/06 14:41:37 scarabeus Exp $
+
+*kdewebdev-meta-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdewebdev-meta-4.4.2.ebuild, -kdewebdev-meta-4.4.3.ebuild,
+  +kdewebdev-meta-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kdewebdev-meta-4.4.1.ebuild:
diff --git a/kde-base/kdewebdev-meta/kdewebdev-meta-4.4.3.ebuild b/kde-base/kdewebdev-meta/kdewebdev-meta-4.4.3.ebuild
deleted file mode 100644
index 46f14a5bbc3a..000000000000
--- a/kde-base/kdewebdev-meta/kdewebdev-meta-4.4.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2010 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.4.3.ebuild,v 1.1 2010/05/03 20:46:01 alexxy Exp $
-
-EAPI="3"
-inherit kde4-functions
-
-DESCRIPTION="KDE WebDev - merge this to pull in all kdewebdev-derived packages"
-HOMEPAGE="http://www.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="4.4"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="aqua kdeprefix"
-
-RDEPEND="
-	$(add_kdebase_dep kfilereplace)
-	$(add_kdebase_dep kimagemapeditor)
-	$(add_kdebase_dep klinkstatus)
-	$(add_kdebase_dep kommander)
-	$(block_other_slots)
-"
diff --git a/kde-base/kdewebdev-meta/kdewebdev-meta-4.4.2.ebuild b/kde-base/kdewebdev-meta/kdewebdev-meta-4.4.4.ebuild
index e07d45035c07..bf318124ecad 100644
--- a/kde-base/kdewebdev-meta/kdewebdev-meta-4.4.2.ebuild
+++ b/kde-base/kdewebdev-meta/kdewebdev-meta-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.1 2010/03/30 20:54:37 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev-meta/kdewebdev-meta-4.4.4.ebuild,v 1.1 2010/06/06 14:41:37 scarabeus Exp $
 
 EAPI="3"
 inherit kde4-functions
diff --git a/kde-base/kdf/ChangeLog b/kde-base/kdf/ChangeLog
index 175cafd7565f..84a4562d6cda 100644
--- a/kde-base/kdf/ChangeLog
+++ b/kde-base/kdf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdf
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdf/ChangeLog,v 1.145 2010/05/03 21:37:24 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdf/ChangeLog,v 1.146 2010/06/06 14:41:57 scarabeus Exp $
+
+*kdf-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -kdf-4.4.2.ebuild,
+  -kdf-4.4.3.ebuild, +kdf-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kdf-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kdf/kdf-4.4.3.ebuild b/kde-base/kdf/kdf-4.4.3.ebuild
deleted file mode 100644
index 935d724fc5b5..000000000000
--- a/kde-base/kdf/kdf-4.4.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdf/kdf-4.4.3.ebuild,v 1.1 2010/05/03 20:46:20 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdeutils"
-inherit kde4-meta
-
-DESCRIPTION="KDE free disk space utility"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-src_unpack() {
-	if use handbook; then
-		KMEXTRA="doc/kcontrol/blockdevices"
-	fi
-
-	kde4-meta_src_unpack
-}
diff --git a/kde-base/kdf/kdf-4.4.2.ebuild b/kde-base/kdf/kdf-4.4.4.ebuild
index 0fc03bca81a8..baba048645e8 100644
--- a/kde-base/kdf/kdf-4.4.2.ebuild
+++ b/kde-base/kdf/kdf-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdf/kdf-4.4.2.ebuild,v 1.1 2010/03/30 20:55:03 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdf/kdf-4.4.4.ebuild,v 1.1 2010/06/06 14:41:57 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kdialog/ChangeLog b/kde-base/kdialog/ChangeLog
index ce2dc66e6f48..2d9f59ad2412 100644
--- a/kde-base/kdialog/ChangeLog
+++ b/kde-base/kdialog/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdialog
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdialog/ChangeLog,v 1.147 2010/05/03 21:37:41 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdialog/ChangeLog,v 1.148 2010/06/06 14:42:00 scarabeus Exp $
+
+*kdialog-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdialog-4.4.2.ebuild, -kdialog-4.4.3.ebuild, +kdialog-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kdialog-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kdialog/kdialog-4.4.3.ebuild b/kde-base/kdialog/kdialog-4.4.3.ebuild
deleted file mode 100644
index fd27ed13e813..000000000000
--- a/kde-base/kdialog/kdialog-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdialog/kdialog-4.4.3.ebuild,v 1.1 2010/05/03 20:46:39 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-apps"
-inherit kde4-meta
-
-DESCRIPTION="KDialog can be used to show nice dialog boxes from shell scripts"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kdialog/kdialog-4.4.2.ebuild b/kde-base/kdialog/kdialog-4.4.4.ebuild
index 970ec04a7633..8d6935ffaf52 100644
--- a/kde-base/kdialog/kdialog-4.4.2.ebuild
+++ b/kde-base/kdialog/kdialog-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdialog/kdialog-4.4.2.ebuild,v 1.1 2010/03/30 20:55:29 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdialog/kdialog-4.4.4.ebuild,v 1.1 2010/06/06 14:42:00 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kdiamond/ChangeLog b/kde-base/kdiamond/ChangeLog
index a7fc928134ac..92f6b0d31c9a 100644
--- a/kde-base/kdiamond/ChangeLog
+++ b/kde-base/kdiamond/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdiamond
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdiamond/ChangeLog,v 1.45 2010/05/03 21:37:58 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdiamond/ChangeLog,v 1.46 2010/06/06 14:42:06 scarabeus Exp $
+
+*kdiamond-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdiamond-4.4.2.ebuild, -kdiamond-4.4.3.ebuild, +kdiamond-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kdiamond-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kdiamond/kdiamond-4.4.3.ebuild b/kde-base/kdiamond/kdiamond-4.4.3.ebuild
deleted file mode 100644
index 60ce4eb91039..000000000000
--- a/kde-base/kdiamond/kdiamond-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdiamond/kdiamond-4.4.3.ebuild,v 1.1 2010/05/03 20:46:59 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE: KDiamond is a three-in-a-row game."
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/kdiamond/kdiamond-4.4.2.ebuild b/kde-base/kdiamond/kdiamond-4.4.4.ebuild
index 8e59d2e81651..0621dd7dd6c8 100644
--- a/kde-base/kdiamond/kdiamond-4.4.2.ebuild
+++ b/kde-base/kdiamond/kdiamond-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdiamond/kdiamond-4.4.2.ebuild,v 1.1 2010/03/30 20:55:54 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdiamond/kdiamond-4.4.4.ebuild,v 1.1 2010/06/06 14:42:06 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog
index dcaef42ca8fc..1f005c75237f 100644
--- a/kde-base/kdm/ChangeLog
+++ b/kde-base/kdm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.215 2010/05/31 20:31:35 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.216 2010/06/06 14:41:52 scarabeus Exp $
+
+*kdm-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -kdm-4.4.2-r2.ebuild,
+  -kdm-4.4.3.ebuild, +kdm-4.4.4.ebuild:
+  Remove old. Version bump.
 
   31 May 2010; Joseph Jezak <josejx@gentoo.org> kdm-4.3.5-r1.ebuild:
   Marked ppc stable for bug #315235.
diff --git a/kde-base/kdm/kdm-4.4.2-r2.ebuild b/kde-base/kdm/kdm-4.4.2-r2.ebuild
deleted file mode 100644
index 6e95e0178fd8..000000000000
--- a/kde-base/kdm/kdm-4.4.2-r2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.4.2-r2.ebuild,v 1.1 2010/04/14 18:30:46 reavertm Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-workspace"
-inherit kde4-meta flag-o-matic
-
-DESCRIPTION="KDE login manager, similar to xdm and gdm"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="consolekit debug +handbook kerberos pam"
-
-DEPEND="
-	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
-"
-
-KMEXTRACTONLY="
-	kcontrol/kdm/
-"
-KMEXTRA="
-	libs/kdm/
-"
-
-PATCHES=(
-	"${FILESDIR}/kdebase-4.0.2-pam-optional.patch"
-	"${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch"
-	"${FILESDIR}/${PN}-4.4.2-CVE-2010-0436.patch"
-)
-
-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
-	sed -e "s:^.*SessionsDirs=.*$:#&\nSessionsDirs=${EPREFIX}/usr/share/xsessions:" \
-		-e "s:#ServerTimeout=15:ServerTimeout=30:" \
-		-i "${ED}"/${KDEDIR}/share/config/kdm/kdmrc \
-		|| die "Failed to set ServerTimeout and SessionsDirs correctly in kdmrc."
-
-	# Don't install empty dir
-	rmdir "${ED}${KDEDIR}"/share/config/kdm/sessions
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-
-	# 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
-	if [[ ! -e "${EROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" ]]; then
-		mkdir -p "${EROOT}${KDEDIR}/share/apps/kdm/faces"
-		cp "${EROOT}${KDEDIR}/share/apps/kdm/pics/users/default1.png" \
-			"${EROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon"
-	fi
-	if [[ ! -e "${EROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" ]]; then
-		mkdir -p "${EROOT}${KDEDIR}/share/apps/kdm/faces"
-		cp "${EROOT}${KDEDIR}/share/apps/kdm/pics/users/root1.png" \
-			"${EROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon"
-	fi
-
-	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/kdm/kdm-4.4.3.ebuild b/kde-base/kdm/kdm-4.4.4.ebuild
index e30246f06092..30ebba276fcf 100644
--- a/kde-base/kdm/kdm-4.4.3.ebuild
+++ b/kde-base/kdm/kdm-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.4.3.ebuild,v 1.1 2010/05/03 20:47:24 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.4.4.ebuild,v 1.1 2010/06/06 14:41:52 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kdnssd/ChangeLog b/kde-base/kdnssd/ChangeLog
index 7f6964092a59..479780e7436f 100644
--- a/kde-base/kdnssd/ChangeLog
+++ b/kde-base/kdnssd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdnssd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdnssd/ChangeLog,v 1.157 2010/05/04 08:10:46 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdnssd/ChangeLog,v 1.158 2010/06/06 14:42:14 scarabeus Exp $
+
+*kdnssd-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -kdnssd-4.4.2.ebuild,
+  -kdnssd-4.4.3.ebuild, +kdnssd-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org> kdnssd-4.4.3.ebuild:
   Restore accidently dropped ~x86-fbsd keyword on KDE SC 4.4.3
diff --git a/kde-base/kdnssd/kdnssd-4.4.3.ebuild b/kde-base/kdnssd/kdnssd-4.4.3.ebuild
deleted file mode 100644
index a7ecbf358a14..000000000000
--- a/kde-base/kdnssd/kdnssd-4.4.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdnssd/kdnssd-4.4.3.ebuild,v 1.2 2010/05/04 08:10:46 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdenetwork"
-inherit kde4-meta
-
-DESCRIPTION="A DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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/kdnssd/kdnssd-4.4.2.ebuild b/kde-base/kdnssd/kdnssd-4.4.4.ebuild
index 48710a368f51..92ce2669b129 100644
--- a/kde-base/kdnssd/kdnssd-4.4.2.ebuild
+++ b/kde-base/kdnssd/kdnssd-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdnssd/kdnssd-4.4.2.ebuild,v 1.2 2010/05/03 05:43:55 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdnssd/kdnssd-4.4.4.ebuild,v 1.1 2010/06/06 14:42:14 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/keditbookmarks/ChangeLog b/kde-base/keditbookmarks/ChangeLog
index e3bed7d990e6..89c91fd91503 100644
--- a/kde-base/keditbookmarks/ChangeLog
+++ b/kde-base/keditbookmarks/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/keditbookmarks
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/keditbookmarks/ChangeLog,v 1.60 2010/05/03 21:38:49 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/keditbookmarks/ChangeLog,v 1.61 2010/06/06 14:41:58 scarabeus Exp $
+
+*keditbookmarks-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -keditbookmarks-4.4.2.ebuild, -keditbookmarks-4.4.3.ebuild,
+  +keditbookmarks-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -keditbookmarks-4.4.1.ebuild:
diff --git a/kde-base/keditbookmarks/keditbookmarks-4.4.3.ebuild b/kde-base/keditbookmarks/keditbookmarks-4.4.3.ebuild
deleted file mode 100644
index f9e970fdafc6..000000000000
--- a/kde-base/keditbookmarks/keditbookmarks-4.4.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/keditbookmarks/keditbookmarks-4.4.3.ebuild,v 1.1 2010/05/03 20:48:03 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-apps"
-inherit kde4-meta
-
-DESCRIPTION="KDE's bookmarks editor"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep libkonq)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	lib/konq/
-"
diff --git a/kde-base/keditbookmarks/keditbookmarks-4.4.2.ebuild b/kde-base/keditbookmarks/keditbookmarks-4.4.4.ebuild
index 0e63338a4853..632c8ff0de30 100644
--- a/kde-base/keditbookmarks/keditbookmarks-4.4.2.ebuild
+++ b/kde-base/keditbookmarks/keditbookmarks-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/keditbookmarks/keditbookmarks-4.4.2.ebuild,v 1.1 2010/03/30 20:57:24 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/keditbookmarks/keditbookmarks-4.4.4.ebuild,v 1.1 2010/06/06 14:41:58 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/keditfiletype/ChangeLog b/kde-base/keditfiletype/ChangeLog
index 4ea529f1ae6c..bfd6070b514c 100644
--- a/kde-base/keditfiletype/ChangeLog
+++ b/kde-base/keditfiletype/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/keditfiletype
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/keditfiletype/ChangeLog,v 1.34 2010/05/04 08:11:04 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/keditfiletype/ChangeLog,v 1.35 2010/06/06 14:41:19 scarabeus Exp $
+
+*keditfiletype-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -keditfiletype-4.4.2.ebuild, -keditfiletype-4.4.3.ebuild,
+  +keditfiletype-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   keditfiletype-4.4.3.ebuild:
diff --git a/kde-base/keditfiletype/keditfiletype-4.4.3.ebuild b/kde-base/keditfiletype/keditfiletype-4.4.3.ebuild
deleted file mode 100644
index 9786ad1992f0..000000000000
--- a/kde-base/keditfiletype/keditfiletype-4.4.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/keditfiletype/keditfiletype-4.4.3.ebuild,v 1.2 2010/05/04 08:11:04 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KDE mime/file type assocciation editor"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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/keditfiletype/keditfiletype-4.4.2.ebuild b/kde-base/keditfiletype/keditfiletype-4.4.4.ebuild
index eac4f29201b1..7b7da4b316d2 100644
--- a/kde-base/keditfiletype/keditfiletype-4.4.2.ebuild
+++ b/kde-base/keditfiletype/keditfiletype-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/keditfiletype/keditfiletype-4.4.2.ebuild,v 1.2 2010/05/03 05:24:14 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/keditfiletype/keditfiletype-4.4.4.ebuild,v 1.1 2010/06/06 14:41:19 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kephal/ChangeLog b/kde-base/kephal/ChangeLog
index 09cd2e0c53e1..e77e2c94ffee 100644
--- a/kde-base/kephal/ChangeLog
+++ b/kde-base/kephal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kephal
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kephal/ChangeLog,v 1.44 2010/05/03 21:39:22 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kephal/ChangeLog,v 1.45 2010/06/06 14:41:25 scarabeus Exp $
+
+*kephal-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -kephal-4.4.2.ebuild,
+  -kephal-4.4.3.ebuild, +kephal-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kephal-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kephal/kephal-4.4.3.ebuild b/kde-base/kephal/kephal-4.4.3.ebuild
deleted file mode 100644
index 65922b91aebd..000000000000
--- a/kde-base/kephal/kephal-4.4.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kephal/kephal-4.4.3.ebuild,v 1.1 2010/05/03 20:48:43 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-workspace"
-KMMODULE="libs/kephal"
-inherit kde4-meta
-
-DESCRIPTION="Allows handling of multihead systems via the XRandR extension"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kephal/kephal-4.4.2.ebuild b/kde-base/kephal/kephal-4.4.4.ebuild
index ed15ec07b7d8..d1ed4e454273 100644
--- a/kde-base/kephal/kephal-4.4.2.ebuild
+++ b/kde-base/kephal/kephal-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kephal/kephal-4.4.2.ebuild,v 1.1 2010/03/30 20:58:18 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kephal/kephal-4.4.4.ebuild,v 1.1 2010/06/06 14:41:25 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kfile/ChangeLog b/kde-base/kfile/ChangeLog
index 7ff10cf6d919..55e33071ac12 100644
--- a/kde-base/kfile/ChangeLog
+++ b/kde-base/kfile/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kfile
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfile/ChangeLog,v 1.60 2010/05/04 08:11:23 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfile/ChangeLog,v 1.61 2010/06/06 14:41:49 scarabeus Exp $
+
+*kfile-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -kfile-4.4.2.ebuild,
+  -kfile-4.4.3.ebuild, +kfile-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org> kfile-4.4.3.ebuild:
   Restore accidently dropped ~x86-fbsd keyword on KDE SC 4.4.3
diff --git a/kde-base/kfile/kfile-4.4.3.ebuild b/kde-base/kfile/kfile-4.4.3.ebuild
deleted file mode 100644
index bf94072f3517..000000000000
--- a/kde-base/kfile/kfile-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfile/kfile-4.4.3.ebuild,v 1.2 2010/05/04 08:11:23 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-runtime"
-inherit kde4-meta
-
-DESCRIPTION="A commandline frontend to KFileMetaInfo"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kfile/kfile-4.4.2.ebuild b/kde-base/kfile/kfile-4.4.4.ebuild
index e1cf6a3d4dd8..580dce566ef6 100644
--- a/kde-base/kfile/kfile-4.4.2.ebuild
+++ b/kde-base/kfile/kfile-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfile/kfile-4.4.2.ebuild,v 1.2 2010/05/03 04:51:20 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfile/kfile-4.4.4.ebuild,v 1.1 2010/06/06 14:41:50 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kfilereplace/ChangeLog b/kde-base/kfilereplace/ChangeLog
index d193ed4459af..c0eaf92402fb 100644
--- a/kde-base/kfilereplace/ChangeLog
+++ b/kde-base/kfilereplace/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kfilereplace
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfilereplace/ChangeLog,v 1.144 2010/05/03 21:39:55 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfilereplace/ChangeLog,v 1.145 2010/06/06 14:41:58 scarabeus Exp $
+
+*kfilereplace-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kfilereplace-4.4.2.ebuild, -kfilereplace-4.4.3.ebuild,
+  +kfilereplace-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kfilereplace-4.4.1.ebuild:
diff --git a/kde-base/kfilereplace/kfilereplace-4.4.3.ebuild b/kde-base/kfilereplace/kfilereplace-4.4.3.ebuild
deleted file mode 100644
index 4d1d6527bdb9..000000000000
--- a/kde-base/kfilereplace/kfilereplace-4.4.3.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfilereplace/kfilereplace-4.4.3.ebuild,v 1.1 2010/05/03 20:49:21 alexxy Exp $
-
-EAPI="3"
-KMNAME="kdewebdev"
-inherit kde4-meta
-
-DESCRIPTION="KDE web development - powerful search and replace in multiple files"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/kfilereplace/kfilereplace-4.4.2.ebuild b/kde-base/kfilereplace/kfilereplace-4.4.4.ebuild
index 10000eb4d6cd..0ba1befcd3f4 100644
--- a/kde-base/kfilereplace/kfilereplace-4.4.2.ebuild
+++ b/kde-base/kfilereplace/kfilereplace-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfilereplace/kfilereplace-4.4.2.ebuild,v 1.1 2010/03/30 20:59:26 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfilereplace/kfilereplace-4.4.4.ebuild,v 1.1 2010/06/06 14:41:58 scarabeus Exp $
 
 EAPI="3"
 KMNAME="kdewebdev"
diff --git a/kde-base/kfind/ChangeLog b/kde-base/kfind/ChangeLog
index 5bd32fa7459b..148695087203 100644
--- a/kde-base/kfind/ChangeLog
+++ b/kde-base/kfind/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kfind
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfind/ChangeLog,v 1.158 2010/05/03 21:40:12 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfind/ChangeLog,v 1.159 2010/06/06 14:41:52 scarabeus Exp $
+
+*kfind-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -kfind-4.4.2.ebuild,
+  -kfind-4.4.3.ebuild, +kfind-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kfind-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kfind/kfind-4.4.2.ebuild b/kde-base/kfind/kfind-4.4.2.ebuild
deleted file mode 100644
index ce148e224ac5..000000000000
--- a/kde-base/kfind/kfind-4.4.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfind/kfind-4.4.2.ebuild,v 1.1 2010/03/30 20:59:52 spatz Exp $
-EAPI="3"
-
-KMNAME="kdebase-apps"
-inherit kde4-meta
-
-DESCRIPTION="KDE file finder utility"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-DEPEND="
-	$(add_kdebase_dep libkonq)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/kfind/kfind-4.4.3.ebuild b/kde-base/kfind/kfind-4.4.4.ebuild
index b68c19876daa..6ebf76463562 100644
--- a/kde-base/kfind/kfind-4.4.3.ebuild
+++ b/kde-base/kfind/kfind-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfind/kfind-4.4.3.ebuild,v 1.1 2010/05/03 20:49:40 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfind/kfind-4.4.4.ebuild,v 1.1 2010/06/06 14:41:52 scarabeus Exp $
 EAPI="3"
 
 KMNAME="kdebase-apps"
diff --git a/kde-base/kfloppy/ChangeLog b/kde-base/kfloppy/ChangeLog
index b05d12d2f746..59b9c2e1e3d5 100644
--- a/kde-base/kfloppy/ChangeLog
+++ b/kde-base/kfloppy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kfloppy
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfloppy/ChangeLog,v 1.139 2010/05/03 21:40:28 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfloppy/ChangeLog,v 1.140 2010/06/06 14:42:18 scarabeus Exp $
+
+*kfloppy-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kfloppy-4.4.2.ebuild, -kfloppy-4.4.3.ebuild, +kfloppy-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kfloppy-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kfloppy/kfloppy-4.4.3.ebuild b/kde-base/kfloppy/kfloppy-4.4.3.ebuild
deleted file mode 100644
index 90f194540b5a..000000000000
--- a/kde-base/kfloppy/kfloppy-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfloppy/kfloppy-4.4.3.ebuild,v 1.1 2010/05/03 20:49:59 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdeutils"
-inherit kde4-meta
-
-DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/kfloppy/kfloppy-4.4.2.ebuild b/kde-base/kfloppy/kfloppy-4.4.4.ebuild
index a822195edca6..3ccca98fefec 100644
--- a/kde-base/kfloppy/kfloppy-4.4.2.ebuild
+++ b/kde-base/kfloppy/kfloppy-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfloppy/kfloppy-4.4.2.ebuild,v 1.1 2010/03/30 21:00:18 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfloppy/kfloppy-4.4.4.ebuild,v 1.1 2010/06/06 14:42:18 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kfmclient/ChangeLog b/kde-base/kfmclient/ChangeLog
index 7d0e7f36a4e5..0747493e2507 100644
--- a/kde-base/kfmclient/ChangeLog
+++ b/kde-base/kfmclient/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kfmclient
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfmclient/ChangeLog,v 1.30 2010/05/03 21:40:45 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfmclient/ChangeLog,v 1.31 2010/06/06 14:42:06 scarabeus Exp $
+
+*kfmclient-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kfmclient-4.4.2.ebuild, -kfmclient-4.4.3.ebuild, +kfmclient-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kfmclient-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kfmclient/kfmclient-4.4.3.ebuild b/kde-base/kfmclient/kfmclient-4.4.3.ebuild
deleted file mode 100644
index da4801083b9e..000000000000
--- a/kde-base/kfmclient/kfmclient-4.4.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfmclient/kfmclient-4.4.3.ebuild,v 1.1 2010/05/03 20:50:19 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-apps"
-KMMODULE="konqueror/client"
-inherit kde4-meta
-
-DESCRIPTION="KDE tool for opening URLs from the command line"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-# Moved from kde-base/konqueror in 4.3.0-r2, 4.3.65-r1
-add_blocker konqueror 4.3.0-r1 4.3.65:4.4
-
-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/kfmclient/kfmclient-4.4.2.ebuild b/kde-base/kfmclient/kfmclient-4.4.4.ebuild
index 4f11461cfaa6..9af0719a47cb 100644
--- a/kde-base/kfmclient/kfmclient-4.4.2.ebuild
+++ b/kde-base/kfmclient/kfmclient-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfmclient/kfmclient-4.4.2.ebuild,v 1.1 2010/03/30 21:00:44 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfmclient/kfmclient-4.4.4.ebuild,v 1.1 2010/06/06 14:42:06 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kfourinline/ChangeLog b/kde-base/kfourinline/ChangeLog
index 914395738767..36650e620f1d 100644
--- a/kde-base/kfourinline/ChangeLog
+++ b/kde-base/kfourinline/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kfourinline
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfourinline/ChangeLog,v 1.56 2010/05/03 21:41:02 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfourinline/ChangeLog,v 1.57 2010/06/06 14:41:24 scarabeus Exp $
+
+*kfourinline-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kfourinline-4.4.2.ebuild, -kfourinline-4.4.3.ebuild,
+  +kfourinline-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kfourinline-4.4.1.ebuild:
diff --git a/kde-base/kfourinline/kfourinline-4.4.3.ebuild b/kde-base/kfourinline/kfourinline-4.4.3.ebuild
deleted file mode 100644
index b9eb17a704ae..000000000000
--- a/kde-base/kfourinline/kfourinline-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfourinline/kfourinline-4.4.3.ebuild,v 1.1 2010/05/03 20:50:39 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE four-in-a-row game."
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/kfourinline/kfourinline-4.4.2.ebuild b/kde-base/kfourinline/kfourinline-4.4.4.ebuild
index 2d8c539eee96..f6cd7d93b644 100644
--- a/kde-base/kfourinline/kfourinline-4.4.2.ebuild
+++ b/kde-base/kfourinline/kfourinline-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfourinline/kfourinline-4.4.2.ebuild,v 1.1 2010/03/30 21:01:11 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfourinline/kfourinline-4.4.4.ebuild,v 1.1 2010/06/06 14:41:24 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kgamma/ChangeLog b/kde-base/kgamma/ChangeLog
index 391094bae19a..0f4aee15e410 100644
--- a/kde-base/kgamma/ChangeLog
+++ b/kde-base/kgamma/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kgamma
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgamma/ChangeLog,v 1.148 2010/05/03 21:41:18 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgamma/ChangeLog,v 1.149 2010/06/06 14:41:26 scarabeus Exp $
+
+*kgamma-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -kgamma-4.4.2.ebuild,
+  -kgamma-4.4.3.ebuild, +kgamma-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kgamma-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kgamma/kgamma-4.4.3.ebuild b/kde-base/kgamma/kgamma-4.4.3.ebuild
deleted file mode 100644
index 0fa41f32c730..000000000000
--- a/kde-base/kgamma/kgamma-4.4.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgamma/kgamma-4.4.3.ebuild,v 1.1 2010/05/03 20:50:58 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdegraphics"
-inherit kde4-meta
-
-DESCRIPTION="KDE screen gamma values kcontrol module"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-RDEPEND="
-	x11-libs/libXxf86vm
-"
-DEPEND="${RDEPEND}
-	x11-proto/xf86vidmodeproto
-"
-
-src_unpack() {
-	if use handbook; then
-		KMEXTRA+=" doc/kcontrol/kgamma"
-	fi
-
-	kde4-meta_src_unpack
-}
diff --git a/kde-base/kgamma/kgamma-4.4.2.ebuild b/kde-base/kgamma/kgamma-4.4.4.ebuild
index 0fdac33e3b91..a58c8ccaf66e 100644
--- a/kde-base/kgamma/kgamma-4.4.2.ebuild
+++ b/kde-base/kgamma/kgamma-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgamma/kgamma-4.4.2.ebuild,v 1.1 2010/03/30 21:01:39 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgamma/kgamma-4.4.4.ebuild,v 1.1 2010/06/06 14:41:26 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kgeography/ChangeLog b/kde-base/kgeography/ChangeLog
index 605be107c634..6d0dfd236e03 100644
--- a/kde-base/kgeography/ChangeLog
+++ b/kde-base/kgeography/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kgeography
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgeography/ChangeLog,v 1.121 2010/05/03 21:41:37 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgeography/ChangeLog,v 1.122 2010/06/06 14:41:46 scarabeus Exp $
+
+*kgeography-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kgeography-4.4.2.ebuild, -kgeography-4.4.3.ebuild,
+  +kgeography-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kgeography-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kgeography/kgeography-4.4.3.ebuild b/kde-base/kgeography/kgeography-4.4.3.ebuild
deleted file mode 100644
index 862aaf31b278..000000000000
--- a/kde-base/kgeography/kgeography-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgeography/kgeography-4.4.3.ebuild,v 1.1 2010/05/03 20:51:18 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdeedu"
-inherit kde4-meta
-
-DESCRIPTION="KDE: a geography learning tool"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/kgeography/kgeography-4.4.2.ebuild b/kde-base/kgeography/kgeography-4.4.4.ebuild
index 0fa07937d91b..8ff8186db096 100644
--- a/kde-base/kgeography/kgeography-4.4.2.ebuild
+++ b/kde-base/kgeography/kgeography-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgeography/kgeography-4.4.2.ebuild,v 1.1 2010/03/30 21:02:06 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgeography/kgeography-4.4.4.ebuild,v 1.1 2010/06/06 14:41:46 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kget/ChangeLog b/kde-base/kget/ChangeLog
index 096fdeb39d5f..a219676feb0e 100644
--- a/kde-base/kget/ChangeLog
+++ b/kde-base/kget/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kget
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/ChangeLog,v 1.161 2010/06/01 15:25:07 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/ChangeLog,v 1.162 2010/06/06 14:41:56 scarabeus Exp $
+
+*kget-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kget-4.4.2-r1.ebuild, -kget-4.4.3-r1.ebuild, +kget-4.4.4.ebuild:
+  Remove old. Version bump.
 
   01 Jun 2010; Joseph Jezak <josejx@gentoo.org> kget-4.3.5-r1.ebuild:
   Marked ppc stable for bug #319719.
diff --git a/kde-base/kget/kget-4.4.3-r1.ebuild b/kde-base/kget/kget-4.4.3-r1.ebuild
deleted file mode 100644
index 705c9264bf9c..000000000000
--- a/kde-base/kget/kget-4.4.3-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/kget-4.4.3-r1.ebuild,v 1.1 2010/05/10 22:08:32 reavertm Exp $
-
-EAPI="3"
-
-KMNAME="kdenetwork"
-inherit kde4-meta
-
-DESCRIPTION="An advanced download manager for KDE"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook +plasma semantic-desktop sqlite"
-
-RDEPEND="
-	app-crypt/qca:2
-	dev-libs/gmp
-	dev-libs/libpcre
-	$(add_kdebase_dep kdelibs 'semantic-desktop?')
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep libkonq)
-	$(add_kdebase_dep libkworkspace)
-	sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.3_CVE-2010-1000.patch"
-)
-
-src_configure() {
-	mycmakeargs=(
-		-DENABLE_EMBEDDED_TORRENT_SUPPORT=ON
-		$(cmake-utils_use_with plasma)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with sqlite)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kget/kget-4.4.2-r1.ebuild b/kde-base/kget/kget-4.4.4.ebuild
index 30310a822692..4e48c452e52b 100644
--- a/kde-base/kget/kget-4.4.2-r1.ebuild
+++ b/kde-base/kget/kget-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/kget-4.4.2-r1.ebuild,v 1.1 2010/05/10 22:08:32 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/kget-4.4.4.ebuild,v 1.1 2010/06/06 14:41:56 scarabeus Exp $
 
 EAPI="3"
 
@@ -25,10 +25,6 @@ DEPEND="${RDEPEND}
 	dev-libs/boost
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.3_CVE-2010-1000.patch"
-)
-
 src_configure() {
 	mycmakeargs=(
 		-DENABLE_EMBEDDED_TORRENT_SUPPORT=ON
diff --git a/kde-base/kglobalaccel/ChangeLog b/kde-base/kglobalaccel/ChangeLog
index 61c5576ba73e..ab532948ce5d 100644
--- a/kde-base/kglobalaccel/ChangeLog
+++ b/kde-base/kglobalaccel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kglobalaccel
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kglobalaccel/ChangeLog,v 1.35 2010/05/04 08:11:41 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kglobalaccel/ChangeLog,v 1.36 2010/06/06 14:41:51 scarabeus Exp $
+
+*kglobalaccel-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kglobalaccel-4.4.2.ebuild, -kglobalaccel-4.4.3.ebuild,
+  +kglobalaccel-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   kglobalaccel-4.4.3.ebuild:
diff --git a/kde-base/kglobalaccel/kglobalaccel-4.4.3.ebuild b/kde-base/kglobalaccel/kglobalaccel-4.4.3.ebuild
deleted file mode 100644
index fd924459b70f..000000000000
--- a/kde-base/kglobalaccel/kglobalaccel-4.4.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kglobalaccel/kglobalaccel-4.4.3.ebuild,v 1.2 2010/05/04 08:11:41 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KDE's Global Shortcut Daemon"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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/kglobalaccel/kglobalaccel-4.4.2.ebuild b/kde-base/kglobalaccel/kglobalaccel-4.4.4.ebuild
index 1cdd343817d1..e9cbe315ce00 100644
--- a/kde-base/kglobalaccel/kglobalaccel-4.4.2.ebuild
+++ b/kde-base/kglobalaccel/kglobalaccel-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kglobalaccel/kglobalaccel-4.4.2.ebuild,v 1.2 2010/05/03 06:28:45 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kglobalaccel/kglobalaccel-4.4.4.ebuild,v 1.1 2010/06/06 14:41:51 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kgoldrunner/ChangeLog b/kde-base/kgoldrunner/ChangeLog
index a18fdc55c465..088149042e6b 100644
--- a/kde-base/kgoldrunner/ChangeLog
+++ b/kde-base/kgoldrunner/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kgoldrunner
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgoldrunner/ChangeLog,v 1.148 2010/05/03 21:42:28 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgoldrunner/ChangeLog,v 1.149 2010/06/06 14:41:55 scarabeus Exp $
+
+*kgoldrunner-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kgoldrunner-4.4.2.ebuild, -kgoldrunner-4.4.3.ebuild,
+  +kgoldrunner-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kgoldrunner-4.4.1.ebuild:
diff --git a/kde-base/kgoldrunner/kgoldrunner-4.4.3.ebuild b/kde-base/kgoldrunner/kgoldrunner-4.4.3.ebuild
deleted file mode 100644
index 3db6b8e0bcf1..000000000000
--- a/kde-base/kgoldrunner/kgoldrunner-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgoldrunner/kgoldrunner-4.4.3.ebuild,v 1.1 2010/05/03 20:52:17 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE: KGoldrunner is a game of action and puzzle solving"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/kgoldrunner/kgoldrunner-4.4.2.ebuild b/kde-base/kgoldrunner/kgoldrunner-4.4.4.ebuild
index ea952733f3e6..77b34c9ee36f 100644
--- a/kde-base/kgoldrunner/kgoldrunner-4.4.2.ebuild
+++ b/kde-base/kgoldrunner/kgoldrunner-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgoldrunner/kgoldrunner-4.4.2.ebuild,v 1.1 2010/03/30 21:03:24 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgoldrunner/kgoldrunner-4.4.4.ebuild,v 1.1 2010/06/06 14:41:55 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kgpg/ChangeLog b/kde-base/kgpg/ChangeLog
index 1deb267ee1d3..b6eb3e7ec2fb 100644
--- a/kde-base/kgpg/ChangeLog
+++ b/kde-base/kgpg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kgpg
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgpg/ChangeLog,v 1.156 2010/05/03 21:42:45 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgpg/ChangeLog,v 1.157 2010/06/06 14:41:45 scarabeus Exp $
+
+*kgpg-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -kgpg-4.4.2.ebuild,
+  -kgpg-4.4.3.ebuild, +kgpg-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kgpg-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kgpg/kgpg-4.4.3.ebuild b/kde-base/kgpg/kgpg-4.4.3.ebuild
deleted file mode 100644
index ba362295756a..000000000000
--- a/kde-base/kgpg/kgpg-4.4.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgpg/kgpg-4.4.3.ebuild,v 1.1 2010/05/03 20:52:36 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdeutils"
-inherit kde4-meta
-
-DESCRIPTION="KDE gpg keyring manager"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-"
-RDEPEND="${DEPEND}
-	app-crypt/gnupg
-"
-
-pkg_postinst() {
-	kde4-meta_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/kgpg/kgpg-4.4.2.ebuild b/kde-base/kgpg/kgpg-4.4.4.ebuild
index d32efddccf1d..9e677bca5107 100644
--- a/kde-base/kgpg/kgpg-4.4.2.ebuild
+++ b/kde-base/kgpg/kgpg-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgpg/kgpg-4.4.2.ebuild,v 1.2 2010/05/03 18:16:39 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgpg/kgpg-4.4.4.ebuild,v 1.1 2010/06/06 14:41:45 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/khangman/ChangeLog b/kde-base/khangman/ChangeLog
index 08484485295e..feb2f8a0b5d2 100644
--- a/kde-base/khangman/ChangeLog
+++ b/kde-base/khangman/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/khangman
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/khangman/ChangeLog,v 1.153 2010/05/03 21:43:03 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khangman/ChangeLog,v 1.154 2010/06/06 14:41:29 scarabeus Exp $
+
+*khangman-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -khangman-4.4.2.ebuild, -khangman-4.4.3.ebuild, +khangman-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -khangman-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/khangman/khangman-4.4.3.ebuild b/kde-base/khangman/khangman-4.4.3.ebuild
deleted file mode 100644
index 6747af07a8ea..000000000000
--- a/kde-base/khangman/khangman-4.4.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/khangman/khangman-4.4.3.ebuild,v 1.1 2010/05/03 20:52:56 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdeedu"
-inherit kde4-meta
-
-DESCRIPTION="Classical hangman game for KDE"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-DEPEND="
-	$(add_kdebase_dep libkdeedu)
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kvtml-data)
-"
-
-KMEXTRACTONLY="
-	libkdeedu/keduvocdocument
-"
diff --git a/kde-base/khangman/khangman-4.4.2.ebuild b/kde-base/khangman/khangman-4.4.4.ebuild
index 29ed8330d5d0..1c5e4f09229d 100644
--- a/kde-base/khangman/khangman-4.4.2.ebuild
+++ b/kde-base/khangman/khangman-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/khangman/khangman-4.4.2.ebuild,v 1.1 2010/03/30 21:04:16 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khangman/khangman-4.4.4.ebuild,v 1.1 2010/06/06 14:41:29 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/khelpcenter/ChangeLog b/kde-base/khelpcenter/ChangeLog
index 0f1557dc2e5d..0ff0a9c914ae 100644
--- a/kde-base/khelpcenter/ChangeLog
+++ b/kde-base/khelpcenter/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/khelpcenter
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/khelpcenter/ChangeLog,v 1.161 2010/05/04 08:12:05 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khelpcenter/ChangeLog,v 1.162 2010/06/06 14:41:27 scarabeus Exp $
+
+*khelpcenter-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -khelpcenter-4.4.2.ebuild, -khelpcenter-4.4.3.ebuild,
+  +khelpcenter-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org> khelpcenter-4.4.3.ebuild:
   Restore accidently dropped ~x86-fbsd keyword on KDE SC 4.4.3
diff --git a/kde-base/khelpcenter/khelpcenter-4.4.3.ebuild b/kde-base/khelpcenter/khelpcenter-4.4.3.ebuild
deleted file mode 100644
index 5abfbee34da8..000000000000
--- a/kde-base/khelpcenter/khelpcenter-4.4.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/khelpcenter/khelpcenter-4.4.3.ebuild,v 1.2 2010/05/04 08:12:05 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-runtime"
-inherit kde4-meta
-
-DESCRIPTION="The KDE Help Center"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-RDEPEND="
-	>=www-misc/htdig-3.2.0_beta6-r1
-"
-
-src_unpack() {
-	if use handbook; then
-		KMEXTRA="
-			doc/faq
-			doc/glossary
-			doc/quickstart
-			doc/userguide
-			doc/visualdict
-		"
-	fi
-
-	kde4-meta_src_unpack
-}
diff --git a/kde-base/khelpcenter/khelpcenter-4.4.2.ebuild b/kde-base/khelpcenter/khelpcenter-4.4.4.ebuild
index 81dd06689900..34152ae15b1e 100644
--- a/kde-base/khelpcenter/khelpcenter-4.4.2.ebuild
+++ b/kde-base/khelpcenter/khelpcenter-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/khelpcenter/khelpcenter-4.4.2.ebuild,v 1.2 2010/05/03 06:46:22 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khelpcenter/khelpcenter-4.4.4.ebuild,v 1.1 2010/06/06 14:41:27 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/khotkeys/ChangeLog b/kde-base/khotkeys/ChangeLog
index 87775859f141..3994be648d02 100644
--- a/kde-base/khotkeys/ChangeLog
+++ b/kde-base/khotkeys/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/khotkeys
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/khotkeys/ChangeLog,v 1.157 2010/05/04 08:12:23 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khotkeys/ChangeLog,v 1.158 2010/06/06 14:42:03 scarabeus Exp $
+
+*khotkeys-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -khotkeys-4.4.2.ebuild, -khotkeys-4.4.3.ebuild, +khotkeys-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org> khotkeys-4.4.3.ebuild:
   Restore accidently dropped ~x86-fbsd keyword on KDE SC 4.4.3
diff --git a/kde-base/khotkeys/khotkeys-4.4.3.ebuild b/kde-base/khotkeys/khotkeys-4.4.3.ebuild
deleted file mode 100644
index 0cc6213e2dbd..000000000000
--- a/kde-base/khotkeys/khotkeys-4.4.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/khotkeys/khotkeys-4.4.3.ebuild,v 1.2 2010/05/04 08:12:23 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-workspace"
-inherit kde4-meta
-
-DESCRIPTION="KDE: hotkey daemon"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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/khotkeys/khotkeys-4.4.2.ebuild b/kde-base/khotkeys/khotkeys-4.4.4.ebuild
index 6b1db322762e..94e8580a38fd 100644
--- a/kde-base/khotkeys/khotkeys-4.4.2.ebuild
+++ b/kde-base/khotkeys/khotkeys-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/khotkeys/khotkeys-4.4.2.ebuild,v 1.2 2010/05/03 05:44:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khotkeys/khotkeys-4.4.4.ebuild,v 1.1 2010/06/06 14:42:04 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kiconfinder/ChangeLog b/kde-base/kiconfinder/ChangeLog
index aa6cfd9ab8f4..2d50532e119e 100644
--- a/kde-base/kiconfinder/ChangeLog
+++ b/kde-base/kiconfinder/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kiconfinder
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kiconfinder/ChangeLog,v 1.50 2010/05/04 08:12:40 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kiconfinder/ChangeLog,v 1.51 2010/06/06 14:41:25 scarabeus Exp $
+
+*kiconfinder-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kiconfinder-4.4.2.ebuild, -kiconfinder-4.4.3.ebuild,
+  +kiconfinder-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org> kiconfinder-4.4.3.ebuild:
   Restore accidently dropped ~x86-fbsd keyword on KDE SC 4.4.3
diff --git a/kde-base/kiconfinder/kiconfinder-4.4.3.ebuild b/kde-base/kiconfinder/kiconfinder-4.4.3.ebuild
deleted file mode 100644
index 23dfb28b0c39..000000000000
--- a/kde-base/kiconfinder/kiconfinder-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kiconfinder/kiconfinder-4.4.3.ebuild,v 1.2 2010/05/04 08:12:40 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-runtime"
-inherit kde4-meta
-
-DESCRIPTION="Finds an icon based on its name"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kiconfinder/kiconfinder-4.4.2.ebuild b/kde-base/kiconfinder/kiconfinder-4.4.4.ebuild
index 4819b25669cc..aae271254942 100644
--- a/kde-base/kiconfinder/kiconfinder-4.4.2.ebuild
+++ b/kde-base/kiconfinder/kiconfinder-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kiconfinder/kiconfinder-4.4.2.ebuild,v 1.2 2010/05/03 06:51:14 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kiconfinder/kiconfinder-4.4.4.ebuild,v 1.1 2010/06/06 14:41:25 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kig/ChangeLog b/kde-base/kig/ChangeLog
index a3aaedb75d16..85b938f5e9ca 100644
--- a/kde-base/kig/ChangeLog
+++ b/kde-base/kig/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kig
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/ChangeLog,v 1.157 2010/05/03 21:44:12 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/ChangeLog,v 1.158 2010/06/06 14:41:44 scarabeus Exp $
+
+*kig-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -kig-4.4.2.ebuild,
+  -kig-4.4.3.ebuild, +kig-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kig-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kig/kig-4.4.3.ebuild b/kde-base/kig/kig-4.4.3.ebuild
deleted file mode 100644
index 51d9fb3aa45e..000000000000
--- a/kde-base/kig/kig-4.4.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/kig-4.4.3.ebuild,v 1.1 2010/05/03 20:54:15 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdeedu"
-inherit kde4-meta
-
-DESCRIPTION="KDE Interactive Geometry tool"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook kig-scripting"
-
-DEPEND="
-	kig-scripting? ( >=dev-libs/boost-1.32 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with kig-scripting BoostPython)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kig/kig-4.4.2.ebuild b/kde-base/kig/kig-4.4.4.ebuild
index bbb1cdec7204..4251f39a8ecb 100644
--- a/kde-base/kig/kig-4.4.2.ebuild
+++ b/kde-base/kig/kig-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/kig-4.4.2.ebuild,v 1.1 2010/03/30 21:06:07 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/kig-4.4.4.ebuild,v 1.1 2010/06/06 14:41:44 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kigo/ChangeLog b/kde-base/kigo/ChangeLog
index 6b26540953d3..f523708ffdca 100644
--- a/kde-base/kigo/ChangeLog
+++ b/kde-base/kigo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kigo
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kigo/ChangeLog,v 1.9 2010/05/04 00:11:21 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kigo/ChangeLog,v 1.10 2010/06/06 14:41:45 scarabeus Exp $
+
+*kigo-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kigo-4.4.2-r1.ebuild, -kigo-4.4.3.ebuild, +kigo-4.4.4.ebuild:
+  Remove old. Version bump.
 
 *kigo-4.4.2-r1 (04 May 2010)
 
diff --git a/kde-base/kigo/kigo-4.4.2-r1.ebuild b/kde-base/kigo/kigo-4.4.2-r1.ebuild
deleted file mode 100644
index 3983c491e408..000000000000
--- a/kde-base/kigo/kigo-4.4.2-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kigo/kigo-4.4.2-r1.ebuild,v 1.1 2010/05/04 00:11:21 reavertm Exp $
-
-EAPI="3"
-
-KMNAME="kdegames"
-inherit games-ggz kde4-meta
-
-DESCRIPTION="KDE Go game"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-RDEPEND="
-	games-board/gnugo
-"
-
-src_install() {
-	kde4-meta_src_install
-	# and also we have to prepare the ggz dir
-	insinto /usr/share/ggz/modules
-	newins ${PN}/src/module.dsc ${P}.dsc || die "couldn't install .dsc file"
-}
-
-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/kigo/kigo-4.4.3.ebuild b/kde-base/kigo/kigo-4.4.4.ebuild
index 86962696001c..3d05aff313ed 100644
--- a/kde-base/kigo/kigo-4.4.3.ebuild
+++ b/kde-base/kigo/kigo-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kigo/kigo-4.4.3.ebuild,v 1.1 2010/05/03 20:54:34 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kigo/kigo-4.4.4.ebuild,v 1.1 2010/06/06 14:41:45 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/killbots/ChangeLog b/kde-base/killbots/ChangeLog
index 831394e3ceb6..c575324f6d85 100644
--- a/kde-base/killbots/ChangeLog
+++ b/kde-base/killbots/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/killbots
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/killbots/ChangeLog,v 1.43 2010/05/03 21:44:45 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/killbots/ChangeLog,v 1.44 2010/06/06 14:41:38 scarabeus Exp $
+
+*killbots-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -killbots-4.4.2.ebuild, -killbots-4.4.3.ebuild, +killbots-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -killbots-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/killbots/killbots-4.4.3.ebuild b/kde-base/killbots/killbots-4.4.3.ebuild
deleted file mode 100644
index 8f0c00d18aff..000000000000
--- a/kde-base/killbots/killbots-4.4.3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/killbots/killbots-4.4.3.ebuild,v 1.1 2010/05/03 20:54:54 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="Kill the bots or they kill you!"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-# Tests hang, last checked in 4.3.3
-RESTRICT="test"
diff --git a/kde-base/killbots/killbots-4.4.2.ebuild b/kde-base/killbots/killbots-4.4.4.ebuild
index ba3a980626af..ab2a98c0796d 100644
--- a/kde-base/killbots/killbots-4.4.2.ebuild
+++ b/kde-base/killbots/killbots-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/killbots/killbots-4.4.2.ebuild,v 1.1 2010/03/30 21:07:00 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/killbots/killbots-4.4.4.ebuild,v 1.1 2010/06/06 14:41:38 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kimagemapeditor/ChangeLog b/kde-base/kimagemapeditor/ChangeLog
index e922daeec982..37fc31c8b58f 100644
--- a/kde-base/kimagemapeditor/ChangeLog
+++ b/kde-base/kimagemapeditor/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kimagemapeditor
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kimagemapeditor/ChangeLog,v 1.141 2010/05/03 21:45:03 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kimagemapeditor/ChangeLog,v 1.142 2010/06/06 14:42:15 scarabeus Exp $
+
+*kimagemapeditor-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kimagemapeditor-4.4.2.ebuild, -kimagemapeditor-4.4.3.ebuild,
+  +kimagemapeditor-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kimagemapeditor-4.4.1.ebuild:
diff --git a/kde-base/kimagemapeditor/kimagemapeditor-4.4.3.ebuild b/kde-base/kimagemapeditor/kimagemapeditor-4.4.3.ebuild
deleted file mode 100644
index bb12ab33e30a..000000000000
--- a/kde-base/kimagemapeditor/kimagemapeditor-4.4.3.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kimagemapeditor/kimagemapeditor-4.4.3.ebuild,v 1.1 2010/05/03 20:55:13 alexxy Exp $
-
-EAPI="3"
-KMNAME="kdewebdev"
-inherit kde4-meta
-
-DESCRIPTION="KDE web development - image map editor"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/kimagemapeditor/kimagemapeditor-4.4.2.ebuild b/kde-base/kimagemapeditor/kimagemapeditor-4.4.4.ebuild
index a5652c3bebbe..828be69d8e40 100644
--- a/kde-base/kimagemapeditor/kimagemapeditor-4.4.2.ebuild
+++ b/kde-base/kimagemapeditor/kimagemapeditor-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kimagemapeditor/kimagemapeditor-4.4.2.ebuild,v 1.1 2010/03/30 21:07:25 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kimagemapeditor/kimagemapeditor-4.4.4.ebuild,v 1.1 2010/06/06 14:42:15 scarabeus Exp $
 
 EAPI="3"
 KMNAME="kdewebdev"
diff --git a/kde-base/kinfocenter/ChangeLog b/kde-base/kinfocenter/ChangeLog
index 3f37cec13d19..44394f0008d3 100644
--- a/kde-base/kinfocenter/ChangeLog
+++ b/kde-base/kinfocenter/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kinfocenter
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kinfocenter/ChangeLog,v 1.58 2010/05/03 21:45:22 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kinfocenter/ChangeLog,v 1.59 2010/06/06 14:41:31 scarabeus Exp $
+
+*kinfocenter-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kinfocenter-4.4.2.ebuild, -kinfocenter-4.4.3.ebuild,
+  +kinfocenter-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kinfocenter-4.4.1.ebuild:
diff --git a/kde-base/kinfocenter/kinfocenter-4.4.2.ebuild b/kde-base/kinfocenter/kinfocenter-4.4.2.ebuild
deleted file mode 100644
index 281feb9bfda5..000000000000
--- a/kde-base/kinfocenter/kinfocenter-4.4.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kinfocenter/kinfocenter-4.4.2.ebuild,v 1.1 2010/03/30 21:07:51 spatz Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-apps"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="The KDE Info Center"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook ieee1394"
-
-DEPEND="
-	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/kinfocenter/kinfocenter-4.4.3.ebuild b/kde-base/kinfocenter/kinfocenter-4.4.4.ebuild
index 7ad48de03f15..c399783804a5 100644
--- a/kde-base/kinfocenter/kinfocenter-4.4.3.ebuild
+++ b/kde-base/kinfocenter/kinfocenter-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kinfocenter/kinfocenter-4.4.3.ebuild,v 1.1 2010/05/03 20:55:32 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kinfocenter/kinfocenter-4.4.4.ebuild,v 1.1 2010/06/06 14:41:31 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kioclient/ChangeLog b/kde-base/kioclient/ChangeLog
index 38f6d13b483a..35c9cc09a221 100644
--- a/kde-base/kioclient/ChangeLog
+++ b/kde-base/kioclient/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kioclient
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kioclient/ChangeLog,v 1.60 2010/05/04 08:12:58 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kioclient/ChangeLog,v 1.61 2010/06/06 14:41:43 scarabeus Exp $
+
+*kioclient-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kioclient-4.4.2.ebuild, -kioclient-4.4.3.ebuild, +kioclient-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org> kioclient-4.4.3.ebuild:
   Restore accidently dropped ~x86-fbsd keyword on KDE SC 4.4.3
diff --git a/kde-base/kioclient/kioclient-4.4.3.ebuild b/kde-base/kioclient/kioclient-4.4.3.ebuild
deleted file mode 100644
index eac5cd59cc6f..000000000000
--- a/kde-base/kioclient/kioclient-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kioclient/kioclient-4.4.3.ebuild,v 1.2 2010/05/04 08:12:58 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-runtime"
-inherit kde4-meta
-
-DESCRIPTION="Command-line tool for network-transparent operations"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kioclient/kioclient-4.4.2.ebuild b/kde-base/kioclient/kioclient-4.4.4.ebuild
index 90b3e4587e37..0fb5ca85eacd 100644
--- a/kde-base/kioclient/kioclient-4.4.2.ebuild
+++ b/kde-base/kioclient/kioclient-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kioclient/kioclient-4.4.2.ebuild,v 1.2 2010/05/03 06:30:32 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kioclient/kioclient-4.4.4.ebuild,v 1.1 2010/06/06 14:41:43 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kiriki/ChangeLog b/kde-base/kiriki/ChangeLog
index 1bc9eae6616f..4a0465094295 100644
--- a/kde-base/kiriki/ChangeLog
+++ b/kde-base/kiriki/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kiriki
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kiriki/ChangeLog,v 1.55 2010/05/03 21:45:54 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kiriki/ChangeLog,v 1.56 2010/06/06 14:42:15 scarabeus Exp $
+
+*kiriki-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -kiriki-4.4.2.ebuild,
+  -kiriki-4.4.3.ebuild, +kiriki-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kiriki-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kiriki/kiriki-4.4.3.ebuild b/kde-base/kiriki/kiriki-4.4.3.ebuild
deleted file mode 100644
index d3b1650d9dc2..000000000000
--- a/kde-base/kiriki/kiriki-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kiriki/kiriki-4.4.3.ebuild,v 1.1 2010/05/03 20:56:11 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="Kiriki - a gtali clone for KDE4"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/kiriki/kiriki-4.4.2.ebuild b/kde-base/kiriki/kiriki-4.4.4.ebuild
index ca48899dd24c..e396aa06d48f 100644
--- a/kde-base/kiriki/kiriki-4.4.2.ebuild
+++ b/kde-base/kiriki/kiriki-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kiriki/kiriki-4.4.2.ebuild,v 1.1 2010/03/30 21:08:48 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kiriki/kiriki-4.4.4.ebuild,v 1.1 2010/06/06 14:42:15 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kiten/ChangeLog b/kde-base/kiten/ChangeLog
index 170974c6960a..3bcda38ba830 100644
--- a/kde-base/kiten/ChangeLog
+++ b/kde-base/kiten/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kiten
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kiten/ChangeLog,v 1.148 2010/05/03 21:46:14 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kiten/ChangeLog,v 1.149 2010/06/06 14:41:37 scarabeus Exp $
+
+*kiten-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -kiten-4.4.2.ebuild,
+  -kiten-4.4.3.ebuild, +kiten-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kiten-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kiten/kiten-4.4.2.ebuild b/kde-base/kiten/kiten-4.4.2.ebuild
deleted file mode 100644
index 439d53c8d9ea..000000000000
--- a/kde-base/kiten/kiten-4.4.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kiten/kiten-4.4.2.ebuild,v 1.1 2010/03/30 21:09:16 spatz Exp $
-
-EAPI="3"
-
-KMNAME="kdeedu"
-inherit kde4-meta
-
-DESCRIPTION="KDE Japanese dictionary and reference"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/kiten/kiten-4.4.3.ebuild b/kde-base/kiten/kiten-4.4.4.ebuild
index 17147ce06cac..3d0623a5a94e 100644
--- a/kde-base/kiten/kiten-4.4.3.ebuild
+++ b/kde-base/kiten/kiten-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kiten/kiten-4.4.3.ebuild,v 1.1 2010/05/03 20:56:31 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kiten/kiten-4.4.4.ebuild,v 1.1 2010/06/06 14:41:37 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kjots/ChangeLog b/kde-base/kjots/ChangeLog
index 059623a3a784..c46b3a2051a7 100644
--- a/kde-base/kjots/ChangeLog
+++ b/kde-base/kjots/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kjots
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kjots/ChangeLog,v 1.145 2010/05/03 21:46:31 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kjots/ChangeLog,v 1.146 2010/06/06 14:42:14 scarabeus Exp $
+
+*kjots-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -kjots-4.4.2.ebuild,
+  -kjots-4.4.3.ebuild, +kjots-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kjots-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kjots/kjots-4.4.2.ebuild b/kde-base/kjots/kjots-4.4.2.ebuild
deleted file mode 100644
index 0b0fc79aa7bd..000000000000
--- a/kde-base/kjots/kjots-4.4.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kjots/kjots-4.4.2.ebuild,v 1.1 2010/03/30 21:09:42 spatz Exp $
-
-EAPI="3"
-
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="Kjots - KDE note taking utility"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/kjots/kjots-4.4.3.ebuild b/kde-base/kjots/kjots-4.4.4.ebuild
index c364e48c38e7..802ad9ebc425 100644
--- a/kde-base/kjots/kjots-4.4.3.ebuild
+++ b/kde-base/kjots/kjots-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kjots/kjots-4.4.3.ebuild,v 1.1 2010/05/03 20:56:50 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kjots/kjots-4.4.4.ebuild,v 1.1 2010/06/06 14:42:14 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kjumpingcube/ChangeLog b/kde-base/kjumpingcube/ChangeLog
index bf9c99a9c28d..67c5e5714892 100644
--- a/kde-base/kjumpingcube/ChangeLog
+++ b/kde-base/kjumpingcube/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kjumpingcube
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kjumpingcube/ChangeLog,v 1.148 2010/05/03 21:46:48 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kjumpingcube/ChangeLog,v 1.149 2010/06/06 14:41:33 scarabeus Exp $
+
+*kjumpingcube-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kjumpingcube-4.4.2.ebuild, -kjumpingcube-4.4.3.ebuild,
+  +kjumpingcube-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kjumpingcube-4.4.1.ebuild:
diff --git a/kde-base/kjumpingcube/kjumpingcube-4.4.3.ebuild b/kde-base/kjumpingcube/kjumpingcube-4.4.3.ebuild
deleted file mode 100644
index ed37d8d16dc3..000000000000
--- a/kde-base/kjumpingcube/kjumpingcube-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kjumpingcube/kjumpingcube-4.4.3.ebuild,v 1.1 2010/05/03 20:57:16 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE: Tactical one or two player game"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/kjumpingcube/kjumpingcube-4.4.2.ebuild b/kde-base/kjumpingcube/kjumpingcube-4.4.4.ebuild
index 1a76bf4c27ee..e3dc1e27151f 100644
--- a/kde-base/kjumpingcube/kjumpingcube-4.4.2.ebuild
+++ b/kde-base/kjumpingcube/kjumpingcube-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kjumpingcube/kjumpingcube-4.4.2.ebuild,v 1.1 2010/03/30 21:10:09 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kjumpingcube/kjumpingcube-4.4.4.ebuild,v 1.1 2010/06/06 14:41:33 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kleopatra/ChangeLog b/kde-base/kleopatra/ChangeLog
index cad0ad8149c3..4587ff303050 100644
--- a/kde-base/kleopatra/ChangeLog
+++ b/kde-base/kleopatra/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kleopatra
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kleopatra/ChangeLog,v 1.48 2010/05/03 21:47:04 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kleopatra/ChangeLog,v 1.49 2010/06/06 14:42:07 scarabeus Exp $
+
+*kleopatra-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kleopatra-4.4.2.ebuild, -kleopatra-4.4.3.ebuild,
+  +files/kleopatra-4.4.3-assuan2.patch, +kleopatra-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kleopatra-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kleopatra/files/kleopatra-4.4.3-assuan2.patch b/kde-base/kleopatra/files/kleopatra-4.4.3-assuan2.patch
new file mode 100644
index 000000000000..cb716bcbf7de
--- /dev/null
+++ b/kde-base/kleopatra/files/kleopatra-4.4.3-assuan2.patch
@@ -0,0 +1,1083 @@
+Index: cmake/modules/FindAssuan2.cmake
+===================================================================
+--- cmake/modules/FindAssuan2.cmake	(revision 0)
++++ cmake/modules/FindAssuan2.cmake	(revision 1078528)
+@@ -0,0 +1,251 @@
++# - Try to find the assuan v2 library
++
++# Variables set:
++#  ASSUAN2_{INCLUDES,FOUND,LIBRARIES} will be set for each of the above
++
++# do away with crappy condition repetition on else/endfoo
++set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS_assuan2_saved ${CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS} )
++set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true )
++
++#if this is built-in, please replace, if it isn't, export into a MacroToBool.cmake of it's own
++macro( macro_bool_to_bool FOUND_VAR )
++  foreach( _current_VAR ${ARGN} )
++    if ( ${FOUND_VAR} )
++      set( ${_current_VAR} TRUE )
++    else()
++      set( ${_current_VAR} FALSE )
++    endif()
++  endforeach()
++endmacro()
++
++include (MacroEnsureVersion)
++
++message( STATUS "In FindAssuan2.cmake" )
++
++if ( WIN32 )
++
++  # On Windows, we don't have a libassuan-config script, so we need to
++  # look for the stuff ourselves:
++
++  # in cmake, AND and OR have the same precedence, there's no
++  # subexpressions, and expressions are evaluated short-circuit'ed
++  # IOW: CMake if() suxx.
++  set( _seem_to_have_cached_assuan2 false )
++  if ( ASSUAN2_INCLUDES )
++    if ( ASSUAN2_VANILLA_LIBRARIES )#OR ASSUAN2_QT_LIBRARIES OR ASSUAN2_GLIB_LIBRARIES )
++      set( _seem_to_have_cached_assuan2 true )
++    endif()
++  endif()
++
++  if ( _seem_to_have_cached_assuan2 )
++
++    macro_bool_to_bool( ASSUAN2_VANILLA_LIBRARIES  ASSUAN2_VANILLA_FOUND )
++    # this would have been preferred:
++    #set( ASSUAN2_*_FOUND macro_bool_to_bool(ASSUAN2_*_LIBRARIES) )
++
++    if ( ASSUAN2_VANILLA_FOUND ) #OR ASSUAN2_GLIB_FOUND OR ASSUAN2_QT_FOUND )
++      set( ASSUAN2_FOUND true )
++    else()
++      set( ASSUAN2_FOUND false )
++    endif()
++
++  else()
++
++    set( ASSUAN2_FOUND         false )
++    set( ASSUAN2_VANILLA_FOUND false )
++    #set( ASSUAN2_GLIB_FOUND    false )
++    #set( ASSUAN2_QT_FOUND      false )
++
++    find_path( ASSUAN2_INCLUDES assuan.h
++      ${CMAKE_INCLUDE_PATH}
++      ${CMAKE_INSTALL_PREFIX}/include
++    )
++
++    find_library( _assuan2_library NAMES assuan assuan0 assuan2 libassuan libassuan0 libassuan2
++      PATHS 
++        ${CMAKE_LIBRARY_PATH}
++        ${CMAKE_INSTALL_PREFIX}/lib
++    )
++
++    find_library( _gpg_error_library     NAMES gpg-error libgpg-error gpg-error-0 libgpg-error-0
++      PATHS 
++        ${CMAKE_LIBRARY_PATH}
++        ${CMAKE_INSTALL_PREFIX}/lib
++    )
++
++    set( ASSUAN2_INCLUDES ${ASSUAN2_INCLUDES} )
++
++    if ( _assuan2_library AND _gpg_error_library )
++      set( ASSUAN2_LIBRARIES ${_assuan2_library} ${_gpg_error_library} ws2_32 )
++      set( ASSUAN2_FOUND             true )
++    endif()
++
++  endif()
++
++  macro_bool_to_01( ASSUAN2_FOUND HAVE_ASSUAN2 )
++
++else() # not WIN32
++
++  # On *nix, we have the libassuan-config script which can tell us all we
++  # need to know:
++
++  # see WIN32 case for an explanation of what this does:
++  set( _seem_to_have_cached_assuan2 false )
++  if ( ASSUAN2_INCLUDES AND ASSUAN2_LIBRARIES )
++    set( _seem_to_have_cached_assuan2 true )
++  endif()
++
++  if ( _seem_to_have_cached_assuan2 )
++
++    set( ASSUAN2_FOUND true )
++
++  else()
++
++    set( ASSUAN2_FOUND         false )
++
++    find_program( _ASSUAN2CONFIG_EXECUTABLE NAMES libassuan-config )
++
++    # if libassuan-config has been found
++    if ( _ASSUAN2CONFIG_EXECUTABLE )
++      
++      message( STATUS "Found libassuan-config at ${_ASSUAN2CONFIG_EXECUTABLE}" )
++
++      exec_program( ${_ASSUAN2CONFIG_EXECUTABLE} ARGS --version OUTPUT_VARIABLE ASSUAN2_VERSION )
++
++      set( _ASSUAN2_MIN_VERSION "2.0.0" )
++      macro_ensure_version( ${_ASSUAN2_MIN_VERSION} ${ASSUAN2_VERSION} _ASSUAN2_INSTALLED_VERSION_OK )
++
++      if ( NOT _ASSUAN2_INSTALLED_VERSION_OK )
++
++        message( STATUS "The installed version of assuan is too old: ${ASSUAN2_VERSION} (required: >= ${_ASSUAN2_MIN_VERSION})" )
++
++      else()
++
++        message( STATUS "Found assuan v${ASSUAN2_VERSION}" )
++
++        exec_program( ${_ASSUAN2CONFIG_EXECUTABLE} ARGS --libs OUTPUT_VARIABLE _assuan2_config_libs RETURN_VALUE _ret )
++	if ( _ret )
++	  set( _assuan2_config_libs )
++	endif()
++
++        # append -lgpg-error to the list of libraries, if necessary
++        if ( _assuan2_config_libs AND NOT _assuan2_config_libs MATCHES "lgpg-error" )
++          set( _assuan2_config_libs "${_assuan2_config_libs} -lgpg-error" )
++        endif()
++
++        if ( _assuan2_config_libs )
++
++          exec_program( ${_ASSUAN2CONFIG_EXECUTABLE} ARGS --cflags OUTPUT_VARIABLE _ASSUAN2_CFLAGS )
++
++          if ( _ASSUAN2_CFLAGS )
++            string( REGEX REPLACE "(\r?\n)+$" " " _ASSUAN2_CFLAGS  "${_ASSUAN2_CFLAGS}" )
++            string( REGEX REPLACE " *-I"      ";" ASSUAN2_INCLUDES "${_ASSUAN2_CFLAGS}" )
++          endif()
++
++          if ( _assuan2_config_libs )
++
++            set( _assuan2_library_dirs )
++            set( _assuan2_library_names )
++
++            string( REGEX REPLACE " +" ";" _assuan2_config_libs "${_assuan2_config_libs}" )
++
++            foreach( _flag ${_assuan2_config_libs} )
++              if ( "${_flag}" MATCHES "^-L" )
++                string( REGEX REPLACE "^-L" "" _dir "${_flag}" )
++                file( TO_CMAKE_PATH "${_dir}" _dir )
++                set( _assuan2_library_dirs ${_assuan2_library_dirs} "${_dir}" )
++              elseif( "${_flag}" MATCHES "^-l" )
++                string( REGEX REPLACE "^-l" "" _name "${_flag}" )
++                set( _assuan2_library_names ${_assuan2_library_names} "${_name}" )
++              endif()
++            endforeach()
++
++            set( ASSUAN2_FOUND true )
++
++            foreach( _name ${_assuan2_library_names} )
++              set( _assuan2_${_name}_lib )
++
++              # if -L options were given, look only there
++              if ( _assuan2_library_dirs )
++                find_library( _assuan2_${_name}_lib NAMES ${_name} PATHS ${_assuan2_library_dirs} NO_DEFAULT_PATH )
++              endif()
++
++              # if not found there, look in system directories
++              if ( NOT _assuan2_${_name}_lib )
++                find_library( _assuan2_${_name}_lib NAMES ${_name} )
++              endif()
++
++              # if still not found, then the whole flavour isn't found
++              if ( NOT _assuan2_${_name}_lib )
++                if ( ASSUAN2_FOUND )
++                  set( ASSUAN2_FOUND false )
++                  set( _not_found_reason "dependant library ${_name} wasn't found" )
++                endif()
++              endif()
++
++              set( ASSUAN2_LIBRARIES ${ASSUAN2_LIBRARIES} "${_assuan2_${_name}_lib}" )
++            endforeach()
++
++            #check_c_library_exists_explicit( assuan         assuan_check_version "${_ASSUAN2_CFLAGS}" "${ASSUAN2_LIBRARIES}"         ASSUAN2_FOUND         )
++            if ( ASSUAN2_FOUND )
++              message( STATUS " Checking whether assuan is usable...yes" )
++            else()
++              message( STATUS " Checking whether assuan is usable...no" )
++              message( STATUS "  (${_not_found_reason})" )
++            endif()
++          endif()
++
++          # ensure that they are cached
++          set( ASSUAN2_INCLUDES  ${ASSUAN2_INCLUDES}  )
++          set( ASSUAN2_LIBRARIES ${ASSUAN2_LIBRARIES} )
++
++        endif()
++
++      endif()
++
++    endif()
++
++  endif()
++
++  macro_bool_to_01( ASSUAN2_FOUND         HAVE_ASSUAN2         )
++
++endif() # WIN32 | Unix
++
++
++if ( NOT Assuan2_FIND_QUIETLY )
++
++  if ( ASSUAN2_FOUND )
++    message( STATUS "Usable assuan found." )
++    message( STATUS " Includes:  ${ASSUAN2_INCLUDES}" )
++    message( STATUS " Libraries: ${ASSUAN2_LIBRARIES}" )
++  else()
++    message( STATUS "No usable assuan found." )
++  endif()
++
++  macro_bool_to_bool( Assuan2_FIND_REQUIRED _req )
++
++  if ( WIN32 )
++    set( _assuan2_homepage "http://www.gpg4win.org" )
++  else()
++    set( _assuan2_homepage "http://www.gnupg.org/related_software/libassuan" )
++  endif()
++
++  macro_log_feature(
++    ASSUAN2_FOUND
++    "assuan2"
++    "Assuan v2 IPC library"
++    ${_assuan2_homepage}
++    ${_req}
++    "${_ASSUAN2_MIN_VERSION} or greater"
++    "Needed for Kleopatra to act as the GnuPG UI Server"
++  )
++
++else()
++
++  if ( Assuan2_FIND_REQUIRED AND NOT ASSUAN2_FOUND )
++    message( FATAL_ERROR "" )
++  endif()
++
++endif()
++
++set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS_assuan2_saved )
+Index: kleopatra/ConfigureChecks.cmake
+===================================================================
+--- kleopatra/ConfigureChecks.cmake	(revision 1078527)
++++ kleopatra/ConfigureChecks.cmake	(revision 1078528)
+@@ -1,21 +1,18 @@
+ # assuan configure checks
+ include(CheckFunctionExists)
+ 
+-macro_optional_find_package(Assuan)
++macro_optional_find_package(Assuan2)
+ 
+ set( USABLE_ASSUAN_FOUND false )
+ 
+-if ( ASSUAN_FOUND )
++if ( ASSUAN2_FOUND )
+ 
+-  set( CMAKE_REQUIRED_INCLUDES ${ASSUAN_INCLUDES} )
++  set( CMAKE_REQUIRED_INCLUDES ${ASSUAN2_INCLUDES} )
+ 
+-  if ( WIN32 AND ASSUAN_VANILLA_FOUND )
+-    set( CMAKE_REQUIRED_LIBRARIES ${ASSUAN_VANILLA_LIBRARIES} )
++  if ( ASSUAN2_FOUND )
++    set( CMAKE_REQUIRED_LIBRARIES ${ASSUAN2_LIBRARIES} )
+     set( USABLE_ASSUAN_FOUND true )
+-  elseif( NOT WIN32 AND ASSUAN_PTHREAD_FOUND )
+-    set( CMAKE_REQUIRED_LIBRARIES ${ASSUAN_PTHREAD_LIBRARIES} )
+-    set( USABLE_ASSUAN_FOUND true )
+-  endif( WIN32 AND ASSUAN_VANILLA_FOUND )
++  endif( ASSUAN2_FOUND )
+ 
+   # TODO: this workaround will be removed as soon as we find better solution
+   if(MINGW)
+@@ -24,7 +21,7 @@
+     set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${KDEWIN32_INCLUDE_DIR}/msvc)
+   endif(MINGW)
+ 
+-endif( ASSUAN_FOUND )
++endif( ASSUAN2_FOUND )
+ 
+ if ( USABLE_ASSUAN_FOUND )
+   # check if assuan.h can be compiled standalone (it couldn't, on
+@@ -48,40 +45,6 @@
+ 
+ if ( USABLE_ASSUAN_FOUND )
+ 
+-  # check if assuan has assuan_fd_t
+-  check_cxx_source_compiles("
+-        #include <assuan.h>
+-        int main() {
+-            assuan_fd_t fd = ASSUAN_INVALID_FD;
+-            return fd ? 1 : 0 ;
+-        }
+-        "
+-    HAVE_ASSUAN_FD_T )
+-
+-  if ( WIN32 AND NOT HAVE_ASSUAN_FD_T )
+-    set( USABLE_ASSUAN_FOUND false )
+-  endif ( WIN32 AND NOT HAVE_ASSUAN_FD_T )
+-
+-  # check if assuan has assuan_inquire_ext, old style
+-  check_function_exists( "assuan_inquire_ext" HAVE_ASSUAN_INQUIRE_EXT )
+-
+-  if ( NOT HAVE_ASSUAN_INQUIRE_EXT )
+-    set( USABLE_ASSUAN_FOUND false )
+-  endif( NOT HAVE_ASSUAN_INQUIRE_EXT )
+-
+-  # check if assuan has new-style assuan_inquire_ext:
+-  check_cxx_source_compiles("
+-        #include <assuan.h>
+-        static int handler( void *, int, unsigned char*, size_t ) { return 0; }
+-        int main() {
+-            assuan_context_t ctx = 0;
+-            const size_t maxSize = 0U;
+-            assuan_error_t err = assuan_inquire_ext( ctx, \"FOO\", maxSize, handler, (void*)0 );
+-            return err ? 1 : 0 ;
+-        }
+-        "
+-    HAVE_NEW_STYLE_ASSUAN_INQUIRE_EXT )
+-
+   # check if gpg-error already has GPG_ERR_SOURCE_KLEO
+   check_cxx_source_compiles("
+         #include <gpg-error.h>
+@@ -90,21 +53,6 @@
+         "
+     HAVE_GPG_ERR_SOURCE_KLEO )
+ 
+-  # check if assuan has assuan_sock_get_nonce (via assuan_sock_nonce_t)
+-  # function_exists runs into linking errors - libassuan is static,
+-  # and assuan_sock_get_nonce drags in stuff that needs linking
+-  # against winsock2.
+-  check_cxx_source_compiles("
+-        #include <assuan.h>
+-        static assuan_sock_nonce_t nonce;
+-        int main() { return 0; }
+-        "
+-    HAVE_ASSUAN_SOCK_GET_NONCE )
+-
+-  if ( WIN32 AND NOT HAVE_ASSUAN_SOCK_GET_NONCE )
+-    set( USABLE_ASSUAN_FOUND false )
+-  endif ( WIN32 AND NOT HAVE_ASSUAN_SOCK_GET_NONCE )  
+-
+ endif ( USABLE_ASSUAN_FOUND )
+ 
+ if ( USABLE_ASSUAN_FOUND )
+@@ -113,45 +61,14 @@
+   message( STATUS "NO usable assuan found for Kleopatra" )
+ endif ( USABLE_ASSUAN_FOUND )
+ 
+-#
+-# Check that libassuan (which is built statically) can be linked into a DSO
+-# (e.g. on amd64, this requires it to be compiled with -fPIC).
+-#
+-
+-set ( ASSUAN_LINKABLE_TO_DSO false )
+-
+ OPTION( BUILD_libkleopatraclient "Build directory kleopatra/libkleopatraclient" ${USABLE_ASSUAN_FOUND} )
+ 
+ if ( NOT USABLE_ASSUAN_FOUND )
+   set( BUILD_libkleopatraclient false )
+ endif ( NOT USABLE_ASSUAN_FOUND )
+ 
+-if ( BUILD_libkleopatraclient )
+-
+-  message( STATUS "Checking whether libassuan can be linked against from DSO's" )
+-
+-  set ( YUP TRUE )
+-  if ( YUP )
+-    set ( ASSUAN_LINKABLE_TO_DSO true )
+-    message( STATUS "--> Assuming that it can. If compilation of libkleopatraclient fails on AMD64, check that libassuan is compiled with -fPIC and try again. Otherwise, pass -DBUILD_libkleopatraclient=OFF." )
+-  else ( YUP )
+-  # TODO: make this one executed at configure time, so the check below works:
+-  add_library( dso_with_assuan_check SHARED ${CMAKE_SOURCE_DIR}/kleopatra/dso_with_assuan_check.c )
+-
+-  set( CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} dso_with_assuan_check )
+-  check_cxx_source_compiles( "int main() { return 0; }" ASSUAN_LINKABLE_TO_DSO )
+-
+-  if ( ASSUAN_LINKABLE_TO_DSO )
+-    message( STATUS "Usable assuan found for libkleopatraclient" )
+-  else ( ASSUAN_LINKABLE_TO_DSO )
+-    message( STATUS "NO usable assuan found for libkleopatraclient - if this is AMD64, check that libassuan is compiled with -fPIC" )
+-  endif ( ASSUAN_LINKABLE_TO_DSO )
+-  endif ( YUP )
+-
+-endif ( BUILD_libkleopatraclient )
+-
+ macro_bool_to_01( USABLE_ASSUAN_FOUND  HAVE_USABLE_ASSUAN )
+-macro_bool_to_01( ASSUAN_LINKABLE_TO_DSO HAVE_KLEOPATRACLIENT_LIBRARY )
++macro_bool_to_01( USABLE_ASSUAN_FOUND  HAVE_KLEOPATRACLIENT_LIBRARY )
+ 
+ set(CMAKE_REQUIRED_INCLUDES)
+ set(CMAKE_REQUIRED_LIBRARIES)
+Index: kleopatra/config-kleopatra.h.cmake
+===================================================================
+--- kleopatra/config-kleopatra.h.cmake	(revision 1078527)
++++ kleopatra/config-kleopatra.h.cmake	(revision 1078528)
+@@ -1,18 +1,6 @@
+ /* Define to 1 if you have a recent enough libassuan */
+ #cmakedefine HAVE_USABLE_ASSUAN 1
+ 
+-/* Define to 1 if your libassuan has the assuan_fd_t type  */
+-#cmakedefine HAVE_ASSUAN_FD_T 1
+-
+-/* Define to 1 if your libassuan has the assuan_inquire_ext function */
+-#cmakedefine HAVE_ASSUAN_INQUIRE_EXT 1
+-
+-/* Define to 1 if your assuan_inquire_ext puts the buffer arguments into the callback signature */
+-#cmakedefine HAVE_NEW_STYLE_ASSUAN_INQUIRE_EXT 1
+-
+-/* Define to 1 if your libassuan has the assuan_sock_get_nonce function */
+-#cmakedefine HAVE_ASSUAN_SOCK_GET_NONCE 1
+-
+ /* Define to 1 if you build libkleopatraclient */
+ #cmakedefine HAVE_KLEOPATRACLIENT_LIBRARY 1
+ 
+Index: kleopatra/tests/test_uiserver.cpp
+===================================================================
+--- kleopatra/tests/test_uiserver.cpp	(revision 1078527)
++++ kleopatra/tests/test_uiserver.cpp	(revision 1078528)
+@@ -89,17 +89,17 @@
+     exit( 1 );
+ }
+ 
+-static assuan_error_t data( void * void_ctx, const void * buffer, size_t len ) {
++static gpg_error_t data( void * void_ctx, const void * buffer, size_t len ) {
+     (void)void_ctx; (void)buffer; (void)len;
+     return 0; // ### implement me
+ }
+ 
+-static assuan_error_t status( void * void_ctx, const char * line ) {
++static gpg_error_t status( void * void_ctx, const char * line ) {
+     (void)void_ctx; (void)line;
+     return 0;
+ }
+ 
+-static assuan_error_t inquire( void * void_ctx, const char * keyword ) {
++static gpg_error_t inquire( void * void_ctx, const char * keyword ) {
+     assuan_context_t ctx = (assuan_context_t)void_ctx;
+     assert( ctx );
+     const std::map<std::string,std::string>::const_iterator it = inquireData.find( keyword );
+@@ -121,7 +121,7 @@
+ 
+     const Kleo::WSAStarter _wsastarter;
+ 
+-    assuan_set_assuan_err_source( GPG_ERR_SOURCE_DEFAULT );
++    assuan_set_gpg_err_source( GPG_ERR_SOURCE_DEFAULT );
+ 
+     if ( argc < 3 )
+         usage(); // need socket and command, at least
+@@ -185,7 +185,12 @@
+ 
+     assuan_context_t ctx = 0;
+ 
+-    if ( const gpg_error_t err = assuan_socket_connect_ext( &ctx, socket, -1, ASSUAN_CONNECT_FLAGS ) ) {
++    if ( const gpg_error_t err = assuan_new( &ctx ) ) {
++        qDebug( "%s", Exception( err, "assuan_new" ).what() );
++        return 1;
++    }
++
++    if ( const gpg_error_t err = assuan_socket_connect( ctx, socket, -1, ASSUAN_CONNECT_FLAGS ) ) {
+         qDebug( "%s", Exception( err, "assuan_socket_connect_ext" ).what() );
+         return 1;
+     }
+@@ -279,7 +284,7 @@
+         return 1;
+     }
+ 
+-    assuan_disconnect( ctx );
++    assuan_release( ctx );
+ 
+     return 0;
+ }
+Index: kleopatra/uiserver/assuancommand.h
+===================================================================
+--- kleopatra/uiserver/assuancommand.h	(revision 1078527)
++++ kleopatra/uiserver/assuancommand.h	(revision 1078528)
+@@ -39,6 +39,8 @@
+ #include <gpgme++/global.h>
+ #include <gpgme++/error.h>
+ 
++#include <gpg-error.h>
++
+ #include <kmime/kmime_header_parsing.h>
+ 
+ #include <qwindowdefs.h> // for WId
+@@ -329,16 +331,16 @@
+         virtual boost::shared_ptr<AssuanCommand> create() const = 0;
+         virtual const char * name() const = 0;
+ 
+-        typedef int(*_Handler)( assuan_context_s*, char *);
++        typedef gpg_error_t(*_Handler)( assuan_context_s*, char *);
+         virtual _Handler _handler() const = 0;
+     protected:
+-        static int _handle( assuan_context_s*, char *, const char * );
++        static gpg_error_t _handle( assuan_context_s*, char *, const char * );
+     };
+ 
+     template <typename Command>
+     class GenericAssuanCommandFactory : public AssuanCommandFactory {
+         /* reimp */ AssuanCommandFactory::_Handler _handler() const { return &GenericAssuanCommandFactory::_handle; }
+-        static int _handle( assuan_context_s* _ctx, char * _line ) {
++        static gpg_error_t _handle( assuan_context_s* _ctx, char * _line ) {
+             return AssuanCommandFactory::_handle( _ctx, _line, Command::staticName() );
+         }
+         /* reimp */ boost::shared_ptr<AssuanCommand> create() const { return make(); }
+Index: kleopatra/uiserver/assuanserverconnection.cpp
+===================================================================
+--- kleopatra/uiserver/assuanserverconnection.cpp	(revision 1078527)
++++ kleopatra/uiserver/assuanserverconnection.cpp	(revision 1078528)
+@@ -116,13 +116,18 @@
+ static const int FOR_READING = 0;
+ static const unsigned int MAX_ACTIVE_FDS = 32;
+ 
++static void my_assuan_release( assuan_context_t ctx ) {
++    if ( ctx )
++        assuan_release( ctx );
++}
++
+ // shared_ptr for assuan_context_t w/ deleter enforced to assuan_deinit_server:
+ typedef shared_ptr< remove_pointer<assuan_context_t>::type > AssuanContextBase;
+ struct AssuanContext : AssuanContextBase {
+     AssuanContext() : AssuanContextBase() {}
+-    explicit AssuanContext( assuan_context_t ctx ) : AssuanContextBase( ctx, &assuan_deinit_server ) {}
++    explicit AssuanContext( assuan_context_t ctx ) : AssuanContextBase( ctx, &my_assuan_release ) {}
+ 
+-    void reset( assuan_context_t ctx=0 ) { AssuanContextBase::reset( ctx, &assuan_deinit_server ); }
++    void reset( assuan_context_t ctx=0 ) { AssuanContextBase::reset( ctx, &my_assuan_release ); }
+ };
+ 
+ static inline gpg_error_t assuan_process_done_msg( assuan_context_t ctx, gpg_error_t err, const char * err_msg ) {
+@@ -240,7 +245,8 @@
+ public Q_SLOTS:
+     void slotReadActivity( int ) {
+         assert( ctx );
+-        if ( const int err = assuan_process_next( ctx.get() ) ) {
++        int done = false;
++        if ( const int err = assuan_process_next( ctx.get(), &done ) || done ) {
+             //if ( err == -1 || gpg_err_code(err) == GPG_ERR_EOF ) {
+                 topHalfDeletion();
+                 if ( nohupedCommands.empty() )
+@@ -296,15 +302,17 @@
+     }
+ 
+ private:
+-    static void reset_handler( assuan_context_t ctx_ ) {
++    static gpg_error_t reset_handler( assuan_context_t ctx_, char * ) {
+         assert( assuan_get_pointer( ctx_ ) );
+ 
+         AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx_ ) );
+ 
+         conn.reset();
++
++        return 0;
+     }
+ 
+-    static int option_handler( assuan_context_t ctx_, const char * key, const char * value ) {
++    static gpg_error_t option_handler( assuan_context_t ctx_, const char * key, const char * value ) {
+         assert( assuan_get_pointer( ctx_ ) );
+ 
+         AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx_ ) );
+@@ -317,7 +325,7 @@
+         //return gpg_error( GPG_ERR_UNKNOWN_OPTION );
+     }
+ 
+-    static int session_handler( assuan_context_t ctx_, char * line ) {
++    static gpg_error_t session_handler( assuan_context_t ctx_, char * line ) {
+         assert( assuan_get_pointer( ctx_ ) );
+         AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx_ ) );
+ 
+@@ -344,7 +352,7 @@
+         return assuan_process_done( ctx_, 0 );
+     }
+ 
+-    static int capabilities_handler( assuan_context_t ctx_, char * line ) {
++    static gpg_error_t capabilities_handler( assuan_context_t ctx_, char * line ) {
+         if ( !QByteArray( line ).trimmed().isEmpty() ) {
+             static const QString errorString = i18n("CAPABILITIES does not take arguments");
+             return assuan_process_done_msg( ctx_, gpg_error( GPG_ERR_ASS_PARAMETER ), errorString );
+@@ -357,7 +365,7 @@
+         return assuan_process_done( ctx_, assuan_send_data( ctx_, capabilities, sizeof capabilities - 1 ) );
+     }
+ 
+-    static int getinfo_handler( assuan_context_t ctx_, char * line ) {
++    static gpg_error_t getinfo_handler( assuan_context_t ctx_, char * line ) {
+         assert( assuan_get_pointer( ctx_ ) );
+         AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx_ ) );
+ 
+@@ -386,7 +394,7 @@
+         return assuan_process_done( ctx_, assuan_send_data( ctx_, ba.constData(), ba.size() ) );
+     }
+ 
+-    static int start_keymanager_handler( assuan_context_t ctx_, char * line ) {
++    static gpg_error_t start_keymanager_handler( assuan_context_t ctx_, char * line ) {
+         assert( assuan_get_pointer( ctx_ ) );
+         AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx_ ) );
+ 
+@@ -400,7 +408,7 @@
+         return assuan_process_done( ctx_, 0 );
+     }
+ 
+-    static int start_confdialog_handler( assuan_context_t ctx_, char * line ) {
++    static gpg_error_t start_confdialog_handler( assuan_context_t ctx_, char * line ) {
+         assert( assuan_get_pointer( ctx_ ) );
+         AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx_ ) );
+ 
+@@ -418,7 +426,7 @@
+ 
+     // format: TAG (FD|FD=\d+|FILE=...)
+     template <bool in, typename T_memptr>
+-    static int IO_handler( assuan_context_t ctx_, char * line_, T_memptr which ) {
++    static gpg_error_t IO_handler( assuan_context_t ctx_, char * line_, T_memptr which ) {
+         assert( assuan_get_pointer( ctx_ ) );
+         AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx_ ) );
+ 
+@@ -498,19 +506,19 @@
+ 
+     }
+ 
+-    static int input_handler( assuan_context_t ctx, char * line ) {
++    static gpg_error_t input_handler( assuan_context_t ctx, char * line ) {
+         return IO_handler<true>( ctx, line, &Private::inputs );
+     }
+ 
+-    static int output_handler( assuan_context_t ctx, char * line ) {
++    static gpg_error_t output_handler( assuan_context_t ctx, char * line ) {
+         return IO_handler<false>( ctx, line, &Private::outputs );
+     }
+ 
+-    static int message_handler( assuan_context_t ctx, char * line ) {
++    static gpg_error_t message_handler( assuan_context_t ctx, char * line ) {
+         return IO_handler<true>( ctx, line, &Private::messages );
+     }
+ 
+-    static int file_handler( assuan_context_t ctx_, char * line ) {
++    static gpg_error_t file_handler( assuan_context_t ctx_, char * line ) {
+         assert( assuan_get_pointer( ctx_ ) );
+         AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx_ ) );
+ 
+@@ -572,7 +580,7 @@
+     }
+ 
+     template <typename T_memptr, typename T_memptr2>
+-    static int recipient_sender_handler( T_memptr mp, T_memptr2 info, assuan_context_t ctx, char * line, bool sender=false ) {
++    static gpg_error_t recipient_sender_handler( T_memptr mp, T_memptr2 info, assuan_context_t ctx, char * line, bool sender=false ) {
+         assert( assuan_get_pointer( ctx ) );
+         AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx ) );
+ 
+@@ -656,11 +664,11 @@
+         return assuan_process_done( ctx, 0 );
+     }
+ 
+-    static int recipient_handler( assuan_context_t ctx, char * line ) {
++    static gpg_error_t recipient_handler( assuan_context_t ctx, char * line ) {
+         return recipient_sender_handler( &Private::recipients, &Private::informativeRecipients, ctx, line );
+     }
+ 
+-    static int sender_handler( assuan_context_t ctx, char * line ) {
++    static gpg_error_t sender_handler( assuan_context_t ctx, char * line ) {
+         return recipient_sender_handler( &Private::senders, &Private::informativeSenders, ctx, line, true );
+     }
+ 
+@@ -792,11 +800,15 @@
+     if ( fd == ASSUAN_INVALID_FD )
+         throw Exception( gpg_error( GPG_ERR_INV_ARG ), "pre-assuan_init_socket_server_ext" );
+ 
+-    assuan_context_t naked_ctx = 0;
+-    if ( const gpg_error_t err = assuan_init_socket_server_ext( &naked_ctx, fd, INIT_SOCKET_FLAGS ) )
++    {
++        assuan_context_t naked_ctx = 0;
++        if ( const gpg_error_t err = assuan_new( &naked_ctx ) )
++            throw Exception( err, "assuan_new" );
++        ctx.reset( naked_ctx );
++    }
++    if ( const gpg_error_t err = assuan_init_socket_server( ctx.get(), fd, INIT_SOCKET_FLAGS ) )
+         throw Exception( err, "assuan_init_socket_server_ext" );
+ 
+-    ctx.reset( naked_ctx ); naked_ctx = 0;
+ 
+     // for callbacks, associate the context with this connection:
+     assuan_set_pointer( ctx.get(), this );
+@@ -824,34 +836,34 @@
+ 
+ 
+     // register our INPUT/OUTPUT/MESSGAE/FILE handlers:
+-    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "INPUT",  input_handler ) )
++    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "INPUT",  input_handler, "" ) )
+         throw Exception( err, "register \"INPUT\" handler" );
+-    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "MESSAGE",  message_handler ) )
++    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "MESSAGE",  message_handler, "" ) )
+         throw Exception( err, "register \"MESSAGE\" handler" );
+-    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "OUTPUT", output_handler ) )
++    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "OUTPUT", output_handler, "" ) )
+         throw Exception( err, "register \"OUTPUT\" handler" );
+-    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "FILE", file_handler ) )
++    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "FILE", file_handler, "" ) )
+         throw Exception( err, "register \"FILE\" handler" );
+ 
+ 
+     // register user-defined commands:
+     Q_FOREACH( shared_ptr<AssuanCommandFactory> fac, factories )
+-        if ( const gpg_error_t err = assuan_register_command( ctx.get(), fac->name(), fac->_handler() ) )
++        if ( const gpg_error_t err = assuan_register_command( ctx.get(), fac->name(), fac->_handler(), "" ) )
+             throw Exception( err, std::string( "register \"" ) + fac->name() + "\" handler" );
+ 
+-    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "GETINFO", getinfo_handler ) )
++    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "GETINFO", getinfo_handler, "" ) )
+         throw Exception( err, "register \"GETINFO\" handler" );
+-    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "START_KEYMANAGER", start_keymanager_handler ) )
++    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "START_KEYMANAGER", start_keymanager_handler, "" ) )
+         throw Exception( err, "register \"START_KEYMANAGER\" handler" );
+-    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "START_CONFDIALOG", start_confdialog_handler ) )
++    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "START_CONFDIALOG", start_confdialog_handler, "" ) )
+         throw Exception( err, "register \"START_CONFDIALOG\" handler" );
+-    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "RECIPIENT", recipient_handler ) )
++    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "RECIPIENT", recipient_handler, "" ) )
+         throw Exception( err, "register \"RECIPIENT\" handler" );
+-    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "SENDER", sender_handler ) )
++    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "SENDER", sender_handler, "" ) )
+         throw Exception( err, "register \"SENDER\" handler" );
+-    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "SESSION", session_handler ) )
++    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "SESSION", session_handler, "" ) )
+         throw Exception( err, "register \"SESSION\" handler" );
+-    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "CAPABILITIES", capabilities_handler ) )
++    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "CAPABILITIES", capabilities_handler, "" ) )
+         throw Exception( err, "register \"CAPABILITIES\" handler" );
+ 
+     assuan_set_hello_line( ctx.get(), "GPG UI server (Kleopatra/" KLEOPATRA_VERSION_STRING ") ready to serve" );
+@@ -904,20 +916,14 @@
+     Q_OBJECT
+ public:
+ 
+-#ifdef HAVE_ASSUAN_INQUIRE_EXT
+     explicit InquiryHandler( const char * keyword_, QObject * p=0 )
+         : QObject( p ),
+-# ifndef HAVE_NEW_STYLE_ASSUAN_INQUIRE_EXT
+-          buffer( 0 ),
+-          buflen( 0 ),
+-# endif
+           keyword( keyword_ )
+     {
+ 
+     }
+ 
+-# ifdef HAVE_NEW_STYLE_ASSUAN_INQUIRE_EXT
+-    static int handler( void * cb_data, int rc, unsigned char * buffer, size_t buflen )
++    static gpg_error_t handler( void * cb_data, gpg_error_t rc, unsigned char * buffer, size_t buflen )
+     {
+         assert( cb_data );
+         InquiryHandler * this_ = static_cast<InquiryHandler*>(cb_data);
+@@ -926,26 +932,9 @@
+         delete this_;
+         return 0;
+     }
+-# else
+-    static int handler( void * cb_data, int rc )
+-    {
+-        assert( cb_data );
+-        InquiryHandler * this_ = static_cast<InquiryHandler*>(cb_data);
+-        emit this_->signal( rc, QByteArray::fromRawData( reinterpret_cast<const char*>(this_->buffer), this_->buflen ), this_->keyword );
+-        std::free( this_->buffer );
+-        delete this_;
+-        return 0;
+-    }
+-# endif
+ 
+ private:
+-# ifndef HAVE_NEW_STYLE_ASSUAN_INQUIRE_EXT
+-    friend class ::Kleo::AssuanCommand;
+-    unsigned char * buffer;
+-    size_t buflen;
+-# endif
+     const char * keyword;
+-#endif // HAVE_ASSUAN_INQUIRE_EXT
+ 
+ Q_SIGNALS:
+     void signal( int rc, const QByteArray & data, const QByteArray & keyword );
+@@ -1157,20 +1146,13 @@
+     if ( d->nohup )
+         return makeError( GPG_ERR_INV_OP );
+ 
+-#ifdef HAVE_ASSUAN_INQUIRE_EXT
+     std::auto_ptr<InquiryHandler> ih( new InquiryHandler( keyword, receiver ) );
+     receiver->connect( ih.get(), SIGNAL(signal(int,QByteArray,QByteArray)), slot );
+     if ( const gpg_error_t err = assuan_inquire_ext( d->ctx.get(), keyword,
+-# ifndef HAVE_NEW_STYLE_ASSUAN_INQUIRE_EXT
+-                                                     &ih->buffer, &ih->buflen,
+-# endif
+                                                      maxSize, InquiryHandler::handler, ih.get() ) )
+          return err;
+     ih.release();
+     return 0;
+-#else
+-    return makeError( GPG_ERR_NOT_SUPPORTED ); // libassuan too old
+-#endif // HAVE_ASSUAN_INQUIRE_EXT
+ }
+ 
+ void AssuanCommand::done( const GpgME::Error& err, const QString & details ) {
+@@ -1262,7 +1244,7 @@
+     return d->senders;
+ }
+ 
+-int AssuanCommandFactory::_handle( assuan_context_t ctx, char * line, const char * commandName ) {
++gpg_error_t AssuanCommandFactory::_handle( assuan_context_t ctx, char * line, const char * commandName ) {
+     assert( assuan_get_pointer( ctx ) );
+     AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx ) );
+ 
+Index: kleopatra/uiserver/uiserver.cpp
+===================================================================
+--- kleopatra/uiserver/uiserver.cpp	(revision 1078527)
++++ kleopatra/uiserver/uiserver.cpp	(revision 1078528)
+@@ -73,15 +73,15 @@
+       actualSocketName(),
+       cryptoCommandsEnabled( false )
+ {
+-    assuan_set_assuan_err_source( GPG_ERR_SOURCE_DEFAULT );
++    assuan_set_gpg_err_source( GPG_ERR_SOURCE_DEFAULT );
+ }
+ 
+ bool UiServer::Private::isStaleAssuanSocket( const QString& fileName )
+ {
+     assuan_context_t ctx = 0;
+-    const bool error = assuan_socket_connect_ext( &ctx, QFile::encodeName( fileName ).constData(), -1, 0 );
++    const bool error = assuan_new( &ctx ) || assuan_socket_connect( ctx, QFile::encodeName( fileName ).constData(), -1, 0 );
+     if ( !error )
+-        assuan_disconnect( ctx );
++        assuan_release( ctx );
+     return error;
+ }
+ 
+@@ -166,13 +166,11 @@
+ void UiServer::Private::incomingConnection( int fd ) {
+     try {
+         qDebug( "UiServer: client connect on fd %d", fd );
+-#ifdef HAVE_ASSUAN_SOCK_GET_NONCE
+         if ( assuan_sock_check_nonce( (assuan_fd_t)fd, &nonce ) ) {
+             qDebug( "UiServer: nonce check failed" );
+             assuan_sock_close( (assuan_fd_t)fd );
+             return;
+         }
+-#endif
+         const shared_ptr<AssuanServerConnection> c( new AssuanServerConnection( (assuan_fd_t)fd, factories ) );
+         connect( c.get(), SIGNAL(closed(Kleo::AssuanServerConnection*)),
+                  this, SLOT(slotConnectionClosed(Kleo::AssuanServerConnection*)) );
+Index: kleopatra/uiserver/uiserver_unix.cpp
+===================================================================
+--- kleopatra/uiserver/uiserver_unix.cpp	(revision 1078527)
++++ kleopatra/uiserver/uiserver_unix.cpp	(revision 1078528)
+@@ -61,11 +61,7 @@
+ 
+ void UiServer::Private::doMakeListeningSocket( const QByteArray & encodedFileName ) {
+     // Create a Unix Domain Socket:
+-#ifdef HAVE_ASSUAN_SOCK_GET_NONCE
+     const assuan_fd_t sock = assuan_sock_new( AF_UNIX, SOCK_STREAM, 0 );
+-#else
+-    const assuan_fd_t sock = ::socket( AF_UNIX, SOCK_STREAM, 0 );
+-#endif
+     if ( sock == ASSUAN_INVALID_FD )
+         throw_<std::runtime_error>( i18n( "Could not create socket: %1", systemErrorString() ) );
+ 
+@@ -75,19 +71,13 @@
+         std::memset( &sa, 0, sizeof(sa) );
+         sa.sun_family = AF_UNIX;
+         std::strncpy( sa.sun_path, encodedFileName.constData(), sizeof( sa.sun_path ) - 1 );
+-#ifdef HAVE_ASSUAN_SOCK_GET_NONCE
+         if ( assuan_sock_bind( sock, (struct sockaddr*)&sa, sizeof( sa ) ) )
+-#else
+-        if ( ::bind( sock, (struct sockaddr*)&sa, sizeof( sa ) ) )
+-#endif
+             throw_<std::runtime_error>( i18n( "Could not bind to socket: %1", systemErrorString() ) );
+ 
+         // ### TODO: permissions?
+ 
+-#ifdef HAVE_ASSUAN_SOCK_GET_NONCE
+         if ( assuan_sock_get_nonce( (struct sockaddr*)&sa, sizeof( sa ), &nonce ) )
+             throw_<std::runtime_error>( i18n("Could not get socket nonce: %1", systemErrorString() ) );
+-#endif
+ 
+         // Listen
+         if ( ::listen( sock, SOMAXCONN ) )
+Index: kleopatra/CMakeLists.txt
+===================================================================
+--- kleopatra/CMakeLists.txt	(revision 1078527)
++++ kleopatra/CMakeLists.txt	(revision 1078528)
+@@ -2,7 +2,7 @@
+ 
+ include(MacroOptionalAddSubdirectory)
+ 
+-set( kleopatra_version 2.0.12 )
++set( kleopatra_version 2.1.0 )
+ set( kleopatra_release FALSE )
+ 
+ if (NOT kleopatra_release)
+@@ -28,7 +28,7 @@
+   ${QGPGME_INCLUDES}
+   ${GPGME_INCLUDES} )
+ if (USABLE_ASSUAN_FOUND)
+-   include_directories(${ASSUAN_INCLUDES})
++   include_directories(${ASSUAN2_INCLUDES})
+ endif(USABLE_ASSUAN_FOUND)
+ add_definitions ( -DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS -D_ASSUAN_ONLY_GPG_ERRORS -DQT_STL )
+ remove_definitions ( -DQT_NO_STL )
+@@ -84,11 +84,7 @@
+     selftest/uiservercheck.cpp
+     )
+ 
+-  if ( WIN32 )
+-    set( _kleopatra_uiserver_extra_libs ${ASSUAN_VANILLA_LIBRARIES} )
+-  else ( WIN32 )
+-    set( _kleopatra_uiserver_extra_libs ${ASSUAN_PTHREAD_LIBRARIES} )
+-  endif( WIN32 )
++  set( _kleopatra_uiserver_extra_libs ${ASSUAN2_LIBRARIES} )
+ 
+   if ( HAVE_GPG_ERR_SOURCE_KLEO )
+     add_definitions( -DGPG_ERR_SOURCE_DEFAULT=GPG_ERR_SOURCE_KLEO )
+Index: kleopatra/libkleopatraclient/core/command.cpp
+===================================================================
+--- kleopatra/libkleopatraclient/core/command.cpp	(revision 1078527)
++++ kleopatra/libkleopatraclient/core/command.cpp	(revision 1078528)
+@@ -283,19 +283,19 @@
+ namespace {
+     struct AssuanClientContext : AssuanContextBase {
+         AssuanClientContext() : AssuanContextBase() {}
+-        explicit AssuanClientContext( assuan_context_t ctx ) : AssuanContextBase( ctx, &assuan_disconnect ) {}
+-        void reset( assuan_context_t ctx=0 ) { AssuanContextBase::reset( ctx, &assuan_disconnect ); }
++        explicit AssuanClientContext( assuan_context_t ctx ) : AssuanContextBase( ctx, &assuan_release ) {}
++        void reset( assuan_context_t ctx=0 ) { AssuanContextBase::reset( ctx, &assuan_release ); }
+     };
+ }
+ 
+-static assuan_error_t
++static gpg_error_t
+ my_assuan_transact( const AssuanClientContext & ctx,
+                     const char *command,
+-                    assuan_error_t (*data_cb)( void *, const void *, size_t )=0,
++                    gpg_error_t (*data_cb)( void *, const void *, size_t )=0,
+                     void * data_cb_arg=0,
+-                    assuan_error_t (*inquire_cb)( void *, const char * )=0,
++                    gpg_error_t (*inquire_cb)( void *, const char * )=0,
+                     void * inquire_cb_arg=0,
+-                    assuan_error_t (*status_cb)( void *, const char * )=0,
++                    gpg_error_t (*status_cb)( void *, const char * )=0,
+                     void * status_cb_arg=0)
+ {
+     return assuan_transact( ctx.get(), command, data_cb, data_cb_arg, inquire_cb, inquire_cb_arg, status_cb, status_cb_arg );
+@@ -337,26 +337,26 @@
+     return Command::tr("start_uiserver: not yet implemented");
+ }
+ 
+-static assuan_error_t getinfo_pid_cb( void * opaque, const void * buffer, size_t length ) {
++static gpg_error_t getinfo_pid_cb( void * opaque, const void * buffer, size_t length ) {
+     qint64 & pid = *static_cast<qint64*>( opaque );
+     pid = QByteArray( static_cast<const char*>( buffer ), length ).toLongLong();
+     return 0;
+ }
+ 
+-static assuan_error_t command_data_cb( void * opaque, const void * buffer, size_t length ) {
++static gpg_error_t command_data_cb( void * opaque, const void * buffer, size_t length ) {
+     QByteArray & ba = *static_cast<QByteArray*>( opaque );
+     ba.append( QByteArray( static_cast<const char*>(buffer), length ) );
+     return 0;
+ }
+ 
+-static assuan_error_t send_option( const AssuanClientContext & ctx, const char * name, const QVariant & value ) {
++static gpg_error_t send_option( const AssuanClientContext & ctx, const char * name, const QVariant & value ) {
+     if ( value.isValid() )
+         return my_assuan_transact( ctx, QString().sprintf( "OPTION %s=%s", name, value.toString().toUtf8().constData() ).toUtf8().constData() );
+     else
+         return my_assuan_transact( ctx, QString().sprintf( "OPTION %s", name ).toUtf8().constData() );
+ }
+ 
+-static assuan_error_t send_file( const AssuanClientContext & ctx, const QString & file ) {
++static gpg_error_t send_file( const AssuanClientContext & ctx, const QString & file ) {
+     return my_assuan_transact( ctx, QString().sprintf( "FILE %s", hexencode( QFile::encodeName( file ) ).constData() ).toUtf8().constData() );
+ }
+ 
+@@ -373,21 +373,32 @@
+ 
+     out.canceled = false;
+ 
+-    assuan_error_t err = 0;
++    if ( out.serverLocation.isEmpty() )
++        out.serverLocation = default_socket_name();
+ 
+-    assuan_context_t naked_ctx = 0;
+     AssuanClientContext ctx;
++    gpg_error_t err = 0;
+ 
+-    if ( out.serverLocation.isEmpty() )
+-        out.serverLocation = default_socket_name();
+-
+     const QString socketName = out.serverLocation;
+     if ( socketName.isEmpty() ) {
+         out.errorString = tr("Invalid socket name!");
+         goto leave;
+     }
+ 
+-    err = assuan_socket_connect( &naked_ctx, QFile::encodeName( socketName ).constData(), -1 );
++    {
++        assuan_context_t naked_ctx = 0;
++        err = assuan_new( &naked_ctx );
++        if ( err ) {
++            out.errorString = tr( "Could not allocate resources to connect to Kleopatra UI server at %1: %2" )
++                .arg( socketName, to_error_string( err ) );
++            goto leave;
++        }
++
++        ctx.reset( naked_ctx );
++    }
++
++
++    err = assuan_socket_connect( ctx.get(), QFile::encodeName( socketName ).constData(), -1, 0 );
+     if ( err ) {
+         qDebug( "UI server not running, starting it" );
+         
+@@ -400,7 +411,7 @@
+         // give it a bit of time to start up and try a couple of times
+         for ( int i = 0 ; err && i < 20 ; ++i ) {
+             msleep( 500 );
+-            err = assuan_socket_connect( &naked_ctx, QFile::encodeName( socketName ).constData(), -1 );
++            err = assuan_socket_connect( ctx.get(), QFile::encodeName( socketName ).constData(), -1, 0 );
+         }
+     }
+ 
+@@ -410,9 +421,6 @@
+         goto leave;
+     }
+ 
+-    ctx.reset( naked_ctx );
+-    naked_ctx = 0;
+-
+     out.serverPid = -1;
+     err = my_assuan_transact( ctx, "GETINFO pid", &getinfo_pid_cb, &out.serverPid );
+     if ( err || out.serverPid <= 0 ) {
+Index: kleopatra/libkleopatraclient/core/initialization.cpp
+===================================================================
+--- kleopatra/libkleopatraclient/core/initialization.cpp	(revision 1078527)
++++ kleopatra/libkleopatraclient/core/initialization.cpp	(revision 1078528)
+@@ -29,7 +29,7 @@
+ using namespace KLEOPATRACLIENT_NAMESPACE;
+ 
+ Initialization::Initialization() {
+-    assuan_set_assuan_err_source( GPG_ERR_SOURCE_DEFAULT );
++    assuan_set_gpg_err_source( GPG_ERR_SOURCE_DEFAULT );
+ }
+ 
+ Initialization::~Initialization() {
+Index: kleopatra/libkleopatraclient/core/CMakeLists.txt
+===================================================================
+--- kleopatra/libkleopatraclient/core/CMakeLists.txt	(revision 1078527)
++++ kleopatra/libkleopatraclient/core/CMakeLists.txt	(revision 1078528)
+@@ -1,4 +1,4 @@
+-include_directories( ${ASSUAN_INCLUDES} ${CMAKE_SOURCE_DIR}/kleopatra )
++include_directories( ${ASSUAN2_INCLUDES} ${CMAKE_SOURCE_DIR}/kleopatra )
+ 
+ add_definitions( -D_ASSUAN_ONLY_GPG_ERRORS -DQT_NO_CAST_FROM_ASCII -DQT_NO_KEYWORDS -DQT_NO_CAST_TO_ASCII )
+ 
+@@ -27,9 +27,9 @@
+ 
+ 
+ if ( WIN32 )
+-  target_link_libraries( kleopatraclientcore ${QT_QTCORE_LIBRARY} ${ASSUAN_VANILLA_LIBRARIES} ws2_32 )
++  target_link_libraries( kleopatraclientcore ${QT_QTCORE_LIBRARY} ${ASSUAN2_LIBRARIES} ws2_32 )
+ else ( WIN32 )
+-  target_link_libraries( kleopatraclientcore ${QT_QTCORE_LIBRARY} ${ASSUAN_PTHREAD_LIBRARIES} )
++  target_link_libraries( kleopatraclientcore ${QT_QTCORE_LIBRARY} ${ASSUAN2_LIBRARIES} )
+ endif ( WIN32 )
+ 
+ install(
diff --git a/kde-base/kleopatra/kleopatra-4.4.3.ebuild b/kde-base/kleopatra/kleopatra-4.4.3.ebuild
deleted file mode 100644
index 70eab65a5135..000000000000
--- a/kde-base/kleopatra/kleopatra-4.4.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kleopatra/kleopatra-4.4.3.ebuild,v 1.1 2010/05/03 20:57:35 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="Kleopatra - KDE X.509 key manager"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-DEPEND="
-	app-crypt/gpgme
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep libkdepim)
-	$(add_kdebase_dep libkleo)
-"
-RDEPEND="${DEPEND}
-	app-crypt/gnupg
-"
-
-KMEXTRACTONLY="
-	libkleo
-"
-KMLOADLIBS="libkleo"
-
-src_unpack() {
-	if use handbook; then
-		KMEXTRA="
-			doc/kwatchgnupg
-		"
-	fi
-
-	kde4-meta_src_unpack
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_QGPGME=ON
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kleopatra/kleopatra-4.4.2.ebuild b/kde-base/kleopatra/kleopatra-4.4.4.ebuild
index ecc82b6eae01..881a2f388302 100644
--- a/kde-base/kleopatra/kleopatra-4.4.2.ebuild
+++ b/kde-base/kleopatra/kleopatra-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kleopatra/kleopatra-4.4.2.ebuild,v 1.1 2010/03/30 21:10:34 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kleopatra/kleopatra-4.4.4.ebuild,v 1.1 2010/06/06 14:42:07 scarabeus Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ IUSE="debug +handbook"
 
 DEPEND="
 	app-crypt/gpgme
-	dev-libs/libassuan
+	>=dev-libs/libassuan-2.0.0
 	dev-libs/libgpg-error
 	$(add_kdebase_dep kdepimlibs)
 	$(add_kdebase_dep libkdepim)
@@ -28,6 +28,10 @@ KMEXTRACTONLY="
 "
 KMLOADLIBS="libkleo"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.3-assuan2.patch"
+)
+
 src_unpack() {
 	if use handbook; then
 		KMEXTRA="
diff --git a/kde-base/klettres/ChangeLog b/kde-base/klettres/ChangeLog
index 30608df84537..46bd12aed3aa 100644
--- a/kde-base/klettres/ChangeLog
+++ b/kde-base/klettres/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/klettres
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klettres/ChangeLog,v 1.151 2010/05/03 21:47:24 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klettres/ChangeLog,v 1.152 2010/06/06 14:41:57 scarabeus Exp $
+
+*klettres-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -klettres-4.4.2.ebuild, -klettres-4.4.3.ebuild, +klettres-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -klettres-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/klettres/klettres-4.4.3.ebuild b/kde-base/klettres/klettres-4.4.3.ebuild
deleted file mode 100644
index d53a25716002..000000000000
--- a/kde-base/klettres/klettres-4.4.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klettres/klettres-4.4.3.ebuild,v 1.1 2010/05/03 20:57:55 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdeedu"
-inherit kde4-meta
-
-DESCRIPTION="KDE: KLettres helps a very young child or an adult learning "
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-RDEPEND="
-	$(add_kdebase_dep knotify)
-"
diff --git a/kde-base/klettres/klettres-4.4.2.ebuild b/kde-base/klettres/klettres-4.4.4.ebuild
index e9095b1c5e43..65abb84b65d5 100644
--- a/kde-base/klettres/klettres-4.4.2.ebuild
+++ b/kde-base/klettres/klettres-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klettres/klettres-4.4.2.ebuild,v 1.1 2010/03/30 21:11:01 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klettres/klettres-4.4.4.ebuild,v 1.1 2010/06/06 14:41:57 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/klines/ChangeLog b/kde-base/klines/ChangeLog
index 635722290f66..08a9efaab2d2 100644
--- a/kde-base/klines/ChangeLog
+++ b/kde-base/klines/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/klines
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klines/ChangeLog,v 1.148 2010/05/03 21:47:42 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klines/ChangeLog,v 1.149 2010/06/06 14:41:43 scarabeus Exp $
+
+*klines-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -klines-4.4.2.ebuild,
+  -klines-4.4.3.ebuild, +klines-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -klines-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/klines/klines-4.4.3.ebuild b/kde-base/klines/klines-4.4.3.ebuild
deleted file mode 100644
index 39a73c7f077f..000000000000
--- a/kde-base/klines/klines-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klines/klines-4.4.3.ebuild,v 1.1 2010/05/03 20:58:16 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE: Kolor Lines - a little game about balls and how to get rid of them"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/klines/klines-4.4.2.ebuild b/kde-base/klines/klines-4.4.4.ebuild
index 07807c79d150..67a13c478896 100644
--- a/kde-base/klines/klines-4.4.2.ebuild
+++ b/kde-base/klines/klines-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klines/klines-4.4.2.ebuild,v 1.1 2010/03/30 21:11:28 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klines/klines-4.4.4.ebuild,v 1.1 2010/06/06 14:41:43 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/klinkstatus/ChangeLog b/kde-base/klinkstatus/ChangeLog
index e9db3b759735..20c5c0c68313 100644
--- a/kde-base/klinkstatus/ChangeLog
+++ b/kde-base/klinkstatus/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/klinkstatus
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klinkstatus/ChangeLog,v 1.147 2010/06/05 15:00:44 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klinkstatus/ChangeLog,v 1.148 2010/06/06 14:42:00 scarabeus Exp $
+
+*klinkstatus-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -klinkstatus-4.4.2.ebuild, -klinkstatus-4.4.3.ebuild,
+  +klinkstatus-4.4.4.ebuild:
+  Remove old. Version bump.
 
   05 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org>
   klinkstatus-4.4.2.ebuild, klinkstatus-4.4.3.ebuild:
diff --git a/kde-base/klinkstatus/klinkstatus-4.4.3.ebuild b/kde-base/klinkstatus/klinkstatus-4.4.3.ebuild
deleted file mode 100644
index becb1d751e50..000000000000
--- a/kde-base/klinkstatus/klinkstatus-4.4.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klinkstatus/klinkstatus-4.4.3.ebuild,v 1.2 2010/06/05 15:00:44 reavertm Exp $
-
-EAPI="3"
-KMNAME="kdewebdev"
-inherit kde4-meta
-
-DESCRIPTION="KDE web development - link validity checker"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook 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/klinkstatus/klinkstatus-4.4.2.ebuild b/kde-base/klinkstatus/klinkstatus-4.4.4.ebuild
index 9c50364a2706..c0173e0b05fb 100644
--- a/kde-base/klinkstatus/klinkstatus-4.4.2.ebuild
+++ b/kde-base/klinkstatus/klinkstatus-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klinkstatus/klinkstatus-4.4.2.ebuild,v 1.2 2010/06/05 15:00:44 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klinkstatus/klinkstatus-4.4.4.ebuild,v 1.1 2010/06/06 14:42:00 scarabeus Exp $
 
 EAPI="3"
 KMNAME="kdewebdev"
diff --git a/kde-base/klipper/ChangeLog b/kde-base/klipper/ChangeLog
index d405f4ace7dc..c25482bb9aa2 100644
--- a/kde-base/klipper/ChangeLog
+++ b/kde-base/klipper/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/klipper
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klipper/ChangeLog,v 1.155 2010/05/03 21:48:16 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klipper/ChangeLog,v 1.156 2010/06/06 14:41:25 scarabeus Exp $
+
+*klipper-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -klipper-4.4.2.ebuild, -klipper-4.4.3.ebuild, +klipper-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -klipper-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/klipper/klipper-4.4.3.ebuild b/kde-base/klipper/klipper-4.4.3.ebuild
deleted file mode 100644
index cc84cea725b9..000000000000
--- a/kde-base/klipper/klipper-4.4.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klipper/klipper-4.4.3.ebuild,v 1.1 2010/05/03 20:58:57 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-workspace"
-inherit kde4-meta
-
-DESCRIPTION="Applet for KDE and X clipboard management"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-DEPEND="
-	$(add_kdebase_dep libkworkspace)
-	$(add_kdebase_dep libtaskmanager)
-	!aqua? ( x11-libs/libXfixes )
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/klipper/klipper-4.4.2.ebuild b/kde-base/klipper/klipper-4.4.4.ebuild
index ae3bf571b342..dca03a6653c3 100644
--- a/kde-base/klipper/klipper-4.4.2.ebuild
+++ b/kde-base/klipper/klipper-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klipper/klipper-4.4.2.ebuild,v 1.1 2010/03/30 21:12:20 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klipper/klipper-4.4.4.ebuild,v 1.1 2010/06/06 14:41:25 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kmag/ChangeLog b/kde-base/kmag/ChangeLog
index 3883530d6ee4..b8c4c2ae4f67 100644
--- a/kde-base/kmag/ChangeLog
+++ b/kde-base/kmag/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kmag
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmag/ChangeLog,v 1.144 2010/05/03 21:48:34 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmag/ChangeLog,v 1.145 2010/06/06 14:42:03 scarabeus Exp $
+
+*kmag-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -kmag-4.4.2.ebuild,
+  -kmag-4.4.3.ebuild, +kmag-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kmag-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kmag/kmag-4.4.3.ebuild b/kde-base/kmag/kmag-4.4.3.ebuild
deleted file mode 100644
index 4d7e6e5b614b..000000000000
--- a/kde-base/kmag/kmag-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmag/kmag-4.4.3.ebuild,v 1.1 2010/05/03 20:59:17 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdeaccessibility"
-inherit kde4-meta
-
-DESCRIPTION="KDE screen magnifier"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/kmag/kmag-4.4.2.ebuild b/kde-base/kmag/kmag-4.4.4.ebuild
index aea4850cde2f..5cc768ee1c2b 100644
--- a/kde-base/kmag/kmag-4.4.2.ebuild
+++ b/kde-base/kmag/kmag-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmag/kmag-4.4.2.ebuild,v 1.1 2010/03/30 21:12:46 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmag/kmag-4.4.4.ebuild,v 1.1 2010/06/06 14:42:03 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kmahjongg/ChangeLog b/kde-base/kmahjongg/ChangeLog
index 0e826db14e41..3ad14ac1c44b 100644
--- a/kde-base/kmahjongg/ChangeLog
+++ b/kde-base/kmahjongg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kmahjongg
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmahjongg/ChangeLog,v 1.149 2010/05/03 21:48:53 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmahjongg/ChangeLog,v 1.150 2010/06/06 14:41:29 scarabeus Exp $
+
+*kmahjongg-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kmahjongg-4.4.2.ebuild, -kmahjongg-4.4.3.ebuild, +kmahjongg-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kmahjongg-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kmahjongg/kmahjongg-4.4.2.ebuild b/kde-base/kmahjongg/kmahjongg-4.4.2.ebuild
deleted file mode 100644
index c01931cc23bf..000000000000
--- a/kde-base/kmahjongg/kmahjongg-4.4.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmahjongg/kmahjongg-4.4.2.ebuild,v 1.1 2010/03/30 21:13:13 spatz Exp $
-
-EAPI="3"
-
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="Mahjongg for KDE"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-DEPEND="
-	$(add_kdebase_dep libkmahjongg)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	libkdegames/
-	libkmahjongg/
-"
diff --git a/kde-base/kmahjongg/kmahjongg-4.4.3.ebuild b/kde-base/kmahjongg/kmahjongg-4.4.4.ebuild
index 88c020d91475..994bd38a999d 100644
--- a/kde-base/kmahjongg/kmahjongg-4.4.3.ebuild
+++ b/kde-base/kmahjongg/kmahjongg-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmahjongg/kmahjongg-4.4.3.ebuild,v 1.1 2010/05/03 20:59:38 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmahjongg/kmahjongg-4.4.4.ebuild,v 1.1 2010/06/06 14:41:29 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kmail/ChangeLog b/kde-base/kmail/ChangeLog
index f63773d563f7..52e9b003fd8b 100644
--- a/kde-base/kmail/ChangeLog
+++ b/kde-base/kmail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kmail
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.208 2010/06/06 00:53:11 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.209 2010/06/06 14:42:07 scarabeus Exp $
+
+*kmail-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -kmail-4.4.2.ebuild,
+  -kmail-4.4.3.ebuild, +kmail-4.4.4.ebuild:
+  Remove old. Version bump.
 
   06 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org> kmail-4.4.2.ebuild,
   kmail-4.4.3.ebuild:
diff --git a/kde-base/kmail/kmail-4.4.3.ebuild b/kde-base/kmail/kmail-4.4.3.ebuild
deleted file mode 100644
index b75f766f6bbf..000000000000
--- a/kde-base/kmail/kmail-4.4.3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.4.3.ebuild,v 1.3 2010/06/06 00:53:11 reavertm Exp $
-
-EAPI="3"
-
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="KMail is the email component of Kontact, the integrated personal information manager of KDE."
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-DEPEND="
-	$(add_kdebase_dep kdelibs 'semantic-desktop')
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
-	$(add_kdebase_dep libkdepim)
-	$(add_kdebase_dep libkleo)
-	$(add_kdebase_dep libkpgp)
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdepim-runtime)
-"
-
-add_blocker kmailcvt
-add_blocker libksieve
-add_blocker messagecore
-add_blocker messagelist
-add_blocker messageviewer
-add_blocker mimelib
-
-KMEXTRACTONLY="
-	korganizer/org.kde.Korganizer.Calendar.xml
-	libkleo/
-	libkpgp/
-"
-KMEXTRA="
-	kmailcvt/
-	ksendemail/
-	libksieve/
-	messagecore/
-	messagelist/
-	messageviewer/
-	mimelib/
-	plugins/kmail/
-"
-KMLOADLIBS="libkdepim"
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_IndicateQt=OFF
-	)
-
-	kde4-meta_src_configure
-}
-
-src_compile() {
-	# Bug #276377: kontact/ can build before kmail/, causing a dependency not to be built
-	# Upstream as KDE Bug #198807
-	# (setting MAKEOPTS to trigger a repoman warning)
-	: || MAKEOPTS="-j1"
-	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.4.2.ebuild b/kde-base/kmail/kmail-4.4.4.ebuild
index 0fbc9baec447..6b22cf34aa21 100644
--- a/kde-base/kmail/kmail-4.4.2.ebuild
+++ b/kde-base/kmail/kmail-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.4.2.ebuild,v 1.4 2010/06/06 00:53:11 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.4.4.ebuild,v 1.1 2010/06/06 14:42:07 scarabeus Exp $
 
 EAPI="3"
 
@@ -55,10 +55,11 @@ src_configure() {
 }
 
 src_compile() {
-	# Bug #276377: kontact/ can build before kmail/, causing a dependency not to be built
-	# Upstream as KDE Bug #198807
-	# (setting MAKEOPTS to trigger a repoman warning)
-	: || MAKEOPTS="-j1"
+	# # Bug #276377: kontact/ can build before kmail/, causing a dependency not to be built
+	# # Upstream as KDE Bug #198807
+	# # (setting MAKEOPTS to trigger a repoman warning)
+	# : || MAKEOPTS="-j1"
+	# commented out so this gets more testing again - dilfridge 4/6/2010
 	kde4-meta_src_compile kmail_xml
 	kde4-meta_src_compile
 }
diff --git a/kde-base/kmenuedit/ChangeLog b/kde-base/kmenuedit/ChangeLog
index 7f18ac6a1557..d9297081ffb6 100644
--- a/kde-base/kmenuedit/ChangeLog
+++ b/kde-base/kmenuedit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kmenuedit
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmenuedit/ChangeLog,v 1.148 2010/05/03 21:49:26 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmenuedit/ChangeLog,v 1.149 2010/06/06 14:42:16 scarabeus Exp $
+
+*kmenuedit-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kmenuedit-4.4.2.ebuild, -kmenuedit-4.4.3.ebuild, +kmenuedit-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kmenuedit-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kmenuedit/kmenuedit-4.4.3.ebuild b/kde-base/kmenuedit/kmenuedit-4.4.3.ebuild
deleted file mode 100644
index 6453158a5ac1..000000000000
--- a/kde-base/kmenuedit/kmenuedit-4.4.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmenuedit/kmenuedit-4.4.3.ebuild,v 1.1 2010/05/03 21:00:19 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-workspace"
-inherit kde4-meta
-
-DESCRIPTION="KDE menu editor"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-RDEPEND="
-	$(add_kdebase_dep khotkeys)
-"
-
-KMEXTRACTONLY="
-	libs/kworkspace/
-"
-
-src_configure() {
-	sed -i -e \
-		"s:\${CMAKE_CURRENT_BINARY_DIR}/../khotkeys/app/org.kde.khotkeys.xml:${EKDEDIR}/share/dbus-1/interfaces/org.kde.khotkeys.xml:g" \
-		kmenuedit/CMakeLists.txt \
-		|| die "sed failed"
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kmenuedit/kmenuedit-4.4.2.ebuild b/kde-base/kmenuedit/kmenuedit-4.4.4.ebuild
index 361f48f87c19..dcefbcab90e0 100644
--- a/kde-base/kmenuedit/kmenuedit-4.4.2.ebuild
+++ b/kde-base/kmenuedit/kmenuedit-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmenuedit/kmenuedit-4.4.2.ebuild,v 1.1 2010/03/30 21:14:06 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmenuedit/kmenuedit-4.4.4.ebuild,v 1.1 2010/06/06 14:42:16 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kmimetypefinder/ChangeLog b/kde-base/kmimetypefinder/ChangeLog
index ddb26b5f48da..7d733853171b 100644
--- a/kde-base/kmimetypefinder/ChangeLog
+++ b/kde-base/kmimetypefinder/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kmimetypefinder
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmimetypefinder/ChangeLog,v 1.60 2010/05/04 08:13:16 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmimetypefinder/ChangeLog,v 1.61 2010/06/06 14:41:51 scarabeus Exp $
+
+*kmimetypefinder-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kmimetypefinder-4.4.2.ebuild, -kmimetypefinder-4.4.3.ebuild,
+  +kmimetypefinder-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   kmimetypefinder-4.4.3.ebuild:
diff --git a/kde-base/kmimetypefinder/kmimetypefinder-4.4.3.ebuild b/kde-base/kmimetypefinder/kmimetypefinder-4.4.3.ebuild
deleted file mode 100644
index e8c8cbf25364..000000000000
--- a/kde-base/kmimetypefinder/kmimetypefinder-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmimetypefinder/kmimetypefinder-4.4.3.ebuild,v 1.2 2010/05/04 08:13:16 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KDE application to report the mimetype for a given file"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kmimetypefinder/kmimetypefinder-4.4.2.ebuild b/kde-base/kmimetypefinder/kmimetypefinder-4.4.4.ebuild
index 7de489bc5e2c..4c571f668d27 100644
--- a/kde-base/kmimetypefinder/kmimetypefinder-4.4.2.ebuild
+++ b/kde-base/kmimetypefinder/kmimetypefinder-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmimetypefinder/kmimetypefinder-4.4.2.ebuild,v 1.2 2010/05/03 05:00:03 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmimetypefinder/kmimetypefinder-4.4.4.ebuild,v 1.1 2010/06/06 14:41:52 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kmines/ChangeLog b/kde-base/kmines/ChangeLog
index 825075f88094..d0d90479b6e3 100644
--- a/kde-base/kmines/ChangeLog
+++ b/kde-base/kmines/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kmines
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmines/ChangeLog,v 1.148 2010/05/03 21:50:02 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmines/ChangeLog,v 1.149 2010/06/06 14:41:36 scarabeus Exp $
+
+*kmines-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -kmines-4.4.2.ebuild,
+  -kmines-4.4.3.ebuild, +kmines-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kmines-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kmines/kmines-4.4.3.ebuild b/kde-base/kmines/kmines-4.4.3.ebuild
deleted file mode 100644
index 85f73f78691e..000000000000
--- a/kde-base/kmines/kmines-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmines/kmines-4.4.3.ebuild,v 1.1 2010/05/03 21:00:59 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KMines is a classic mine sweeper game"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/kmines/kmines-4.4.2.ebuild b/kde-base/kmines/kmines-4.4.4.ebuild
index 2333faee86b0..067b1ba2cf73 100644
--- a/kde-base/kmines/kmines-4.4.2.ebuild
+++ b/kde-base/kmines/kmines-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmines/kmines-4.4.2.ebuild,v 1.1 2010/03/30 21:14:57 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmines/kmines-4.4.4.ebuild,v 1.1 2010/06/06 14:41:36 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kmix/ChangeLog b/kde-base/kmix/ChangeLog
index 5c839ec7bec9..1deea52a6bf7 100644
--- a/kde-base/kmix/ChangeLog
+++ b/kde-base/kmix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kmix
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/ChangeLog,v 1.155 2010/05/03 21:50:18 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/ChangeLog,v 1.156 2010/06/06 14:41:28 scarabeus Exp $
+
+*kmix-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -kmix-4.4.2.ebuild,
+  -kmix-4.4.3.ebuild, +kmix-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kmix-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kmix/kmix-4.4.3.ebuild b/kde-base/kmix/kmix-4.4.3.ebuild
deleted file mode 100644
index f2b2709cfe9d..000000000000
--- a/kde-base/kmix/kmix-4.4.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/kmix-4.4.3.ebuild,v 1.1 2010/05/03 21:01:18 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdemultimedia"
-inherit kde4-meta
-
-DESCRIPTION="KDE mixer gui"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="alsa debug +handbook 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/kmix/kmix-4.4.2.ebuild b/kde-base/kmix/kmix-4.4.4.ebuild
index 3f3e4d9cf657..1e56261e5e7d 100644
--- a/kde-base/kmix/kmix-4.4.2.ebuild
+++ b/kde-base/kmix/kmix-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/kmix-4.4.2.ebuild,v 1.1 2010/03/30 21:15:25 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/kmix-4.4.4.ebuild,v 1.1 2010/06/06 14:41:28 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kmousetool/ChangeLog b/kde-base/kmousetool/ChangeLog
index 558732f94a8f..afd99673e8bd 100644
--- a/kde-base/kmousetool/ChangeLog
+++ b/kde-base/kmousetool/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kmousetool
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmousetool/ChangeLog,v 1.146 2010/05/03 21:50:35 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmousetool/ChangeLog,v 1.147 2010/06/06 14:41:20 scarabeus Exp $
+
+*kmousetool-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kmousetool-4.4.2.ebuild, -kmousetool-4.4.3.ebuild,
+  +kmousetool-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kmousetool-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kmousetool/kmousetool-4.4.3.ebuild b/kde-base/kmousetool/kmousetool-4.4.3.ebuild
deleted file mode 100644
index 30137e433fa9..000000000000
--- a/kde-base/kmousetool/kmousetool-4.4.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmousetool/kmousetool-4.4.3.ebuild,v 1.1 2010/05/03 21:01:37 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdeaccessibility"
-
-inherit kde4-meta
-
-DESCRIPTION="KDE program that clicks the mouse for you."
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-RDEPEND="
-	$(add_kdebase_dep knotify)
-"
diff --git a/kde-base/kmousetool/kmousetool-4.4.2.ebuild b/kde-base/kmousetool/kmousetool-4.4.4.ebuild
index b8f11d6be87d..ba9390307d52 100644
--- a/kde-base/kmousetool/kmousetool-4.4.2.ebuild
+++ b/kde-base/kmousetool/kmousetool-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmousetool/kmousetool-4.4.2.ebuild,v 1.1 2010/03/30 21:15:49 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmousetool/kmousetool-4.4.4.ebuild,v 1.1 2010/06/06 14:41:20 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kmouth/ChangeLog b/kde-base/kmouth/ChangeLog
index b42ea1f0e594..be0af97cee72 100644
--- a/kde-base/kmouth/ChangeLog
+++ b/kde-base/kmouth/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kmouth
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmouth/ChangeLog,v 1.145 2010/05/03 21:50:50 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmouth/ChangeLog,v 1.146 2010/06/06 14:42:16 scarabeus Exp $
+
+*kmouth-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -kmouth-4.4.2.ebuild,
+  -kmouth-4.4.3.ebuild, +kmouth-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kmouth-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kmouth/kmouth-4.4.3.ebuild b/kde-base/kmouth/kmouth-4.4.3.ebuild
deleted file mode 100644
index 80a4170ae04f..000000000000
--- a/kde-base/kmouth/kmouth-4.4.3.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmouth/kmouth-4.4.3.ebuild,v 1.1 2010/05/03 21:01:56 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdeaccessibility"
-KMMODULE="kmouth"
-
-inherit kde4-meta
-
-DESCRIPTION="KDE application that reads what you type out loud. Doesn't include a speech synthesizer."
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/kmouth/kmouth-4.4.2.ebuild b/kde-base/kmouth/kmouth-4.4.4.ebuild
index 13af7038c02b..2ae0ffdf2117 100644
--- a/kde-base/kmouth/kmouth-4.4.2.ebuild
+++ b/kde-base/kmouth/kmouth-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmouth/kmouth-4.4.2.ebuild,v 1.1 2010/03/30 21:16:15 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmouth/kmouth-4.4.4.ebuild,v 1.1 2010/06/06 14:42:16 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kmplot/ChangeLog b/kde-base/kmplot/ChangeLog
index 938aac8c8442..a4dede818a93 100644
--- a/kde-base/kmplot/ChangeLog
+++ b/kde-base/kmplot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kmplot
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmplot/ChangeLog,v 1.151 2010/05/03 21:51:05 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmplot/ChangeLog,v 1.152 2010/06/06 14:41:38 scarabeus Exp $
+
+*kmplot-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -kmplot-4.4.2.ebuild,
+  -kmplot-4.4.3.ebuild, +kmplot-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kmplot-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kmplot/kmplot-4.4.2.ebuild b/kde-base/kmplot/kmplot-4.4.2.ebuild
deleted file mode 100644
index 8857b3e26b76..000000000000
--- a/kde-base/kmplot/kmplot-4.4.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmplot/kmplot-4.4.2.ebuild,v 1.1 2010/03/30 21:16:41 spatz Exp $
-
-EAPI="3"
-
-KMNAME="kdeedu"
-inherit kde4-meta
-
-DESCRIPTION="Mathematical function plotter for KDE"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-RDEPEND="
-	$(add_kdebase_dep knotify)
-"
diff --git a/kde-base/kmplot/kmplot-4.4.3.ebuild b/kde-base/kmplot/kmplot-4.4.4.ebuild
index b600be49291a..583a5a8e067b 100644
--- a/kde-base/kmplot/kmplot-4.4.3.ebuild
+++ b/kde-base/kmplot/kmplot-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmplot/kmplot-4.4.3.ebuild,v 1.1 2010/05/03 21:02:18 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmplot/kmplot-4.4.4.ebuild,v 1.1 2010/06/06 14:41:38 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/knetattach/ChangeLog b/kde-base/knetattach/ChangeLog
index 496949357b77..bfd53f465585 100644
--- a/kde-base/knetattach/ChangeLog
+++ b/kde-base/knetattach/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/knetattach
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knetattach/ChangeLog,v 1.153 2010/05/04 08:13:35 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knetattach/ChangeLog,v 1.154 2010/06/06 14:41:34 scarabeus Exp $
+
+*knetattach-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -knetattach-4.4.2.ebuild, -knetattach-4.4.3.ebuild,
+  +knetattach-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org> knetattach-4.4.3.ebuild:
   Restore accidently dropped ~x86-fbsd keyword on KDE SC 4.4.3
diff --git a/kde-base/knetattach/knetattach-4.4.2.ebuild b/kde-base/knetattach/knetattach-4.4.2.ebuild
deleted file mode 100644
index 2258dc0d028c..000000000000
--- a/kde-base/knetattach/knetattach-4.4.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knetattach/knetattach-4.4.2.ebuild,v 1.2 2010/05/03 06:51:10 aballier Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KDE network wizard"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/knetattach/knetattach-4.4.3.ebuild b/kde-base/knetattach/knetattach-4.4.4.ebuild
index 953c24fb662d..1e0bceb41f39 100644
--- a/kde-base/knetattach/knetattach-4.4.3.ebuild
+++ b/kde-base/knetattach/knetattach-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knetattach/knetattach-4.4.3.ebuild,v 1.2 2010/05/04 08:13:35 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knetattach/knetattach-4.4.4.ebuild,v 1.1 2010/06/06 14:41:34 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/knetwalk/ChangeLog b/kde-base/knetwalk/ChangeLog
index 6d581e3afa4f..5e18024a7ab0 100644
--- a/kde-base/knetwalk/ChangeLog
+++ b/kde-base/knetwalk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/knetwalk
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knetwalk/ChangeLog,v 1.78 2010/05/03 21:51:36 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knetwalk/ChangeLog,v 1.79 2010/06/06 14:42:01 scarabeus Exp $
+
+*knetwalk-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -knetwalk-4.4.2.ebuild, -knetwalk-4.4.3.ebuild, +knetwalk-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -knetwalk-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/knetwalk/knetwalk-4.4.3.ebuild b/kde-base/knetwalk/knetwalk-4.4.3.ebuild
deleted file mode 100644
index 6b99d05b9e17..000000000000
--- a/kde-base/knetwalk/knetwalk-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knetwalk/knetwalk-4.4.3.ebuild,v 1.1 2010/05/03 21:02:57 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE: Knetwalk is the kde version of the popular NetWalk game for system administrators"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/knetwalk/knetwalk-4.4.2.ebuild b/kde-base/knetwalk/knetwalk-4.4.4.ebuild
index fc76a1428bce..591f4ac8e343 100644
--- a/kde-base/knetwalk/knetwalk-4.4.2.ebuild
+++ b/kde-base/knetwalk/knetwalk-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knetwalk/knetwalk-4.4.2.ebuild,v 1.1 2010/03/30 21:17:33 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knetwalk/knetwalk-4.4.4.ebuild,v 1.1 2010/06/06 14:42:01 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/knetworkconf/ChangeLog b/kde-base/knetworkconf/ChangeLog
index 3185f42b5597..d7d813f31e85 100644
--- a/kde-base/knetworkconf/ChangeLog
+++ b/kde-base/knetworkconf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/knetworkconf
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knetworkconf/ChangeLog,v 1.73 2010/05/03 21:51:50 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knetworkconf/ChangeLog,v 1.74 2010/06/06 14:41:51 scarabeus Exp $
+
+*knetworkconf-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -knetworkconf-4.4.2.ebuild, -knetworkconf-4.4.3.ebuild,
+  +knetworkconf-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -knetworkconf-4.4.1.ebuild:
diff --git a/kde-base/knetworkconf/knetworkconf-4.4.3.ebuild b/kde-base/knetworkconf/knetworkconf-4.4.3.ebuild
deleted file mode 100644
index 31ebdb99f928..000000000000
--- a/kde-base/knetworkconf/knetworkconf-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knetworkconf/knetworkconf-4.4.3.ebuild,v 1.1 2010/05/03 21:03:16 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdeadmin"
-inherit kde4-meta
-
-DESCRIPTION="KDE control Center Module to confiure Network settings"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/knetworkconf/knetworkconf-4.4.2.ebuild b/kde-base/knetworkconf/knetworkconf-4.4.4.ebuild
index 9081320dd28f..968d3b769b18 100644
--- a/kde-base/knetworkconf/knetworkconf-4.4.2.ebuild
+++ b/kde-base/knetworkconf/knetworkconf-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knetworkconf/knetworkconf-4.4.2.ebuild,v 1.1 2010/03/30 21:17:59 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knetworkconf/knetworkconf-4.4.4.ebuild,v 1.1 2010/06/06 14:41:51 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/knewstuff/ChangeLog b/kde-base/knewstuff/ChangeLog
index c0273043d7f2..e1cf18a14a9f 100644
--- a/kde-base/knewstuff/ChangeLog
+++ b/kde-base/knewstuff/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/knewstuff
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knewstuff/ChangeLog,v 1.59 2010/05/04 08:13:52 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knewstuff/ChangeLog,v 1.60 2010/06/06 14:41:46 scarabeus Exp $
+
+*knewstuff-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -knewstuff-4.4.2.ebuild, -knewstuff-4.4.3.ebuild, +knewstuff-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org> knewstuff-4.4.3.ebuild:
   Restore accidently dropped ~x86-fbsd keyword on KDE SC 4.4.3
diff --git a/kde-base/knewstuff/knewstuff-4.4.3.ebuild b/kde-base/knewstuff/knewstuff-4.4.3.ebuild
deleted file mode 100644
index 7bcd01f92f3e..000000000000
--- a/kde-base/knewstuff/knewstuff-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knewstuff/knewstuff-4.4.3.ebuild,v 1.2 2010/05/04 08:13:52 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KDE4 software to download and upload 'new stuff'"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/knewstuff/knewstuff-4.4.2.ebuild b/kde-base/knewstuff/knewstuff-4.4.4.ebuild
index e748cc7aba1f..4dba70c2449e 100644
--- a/kde-base/knewstuff/knewstuff-4.4.2.ebuild
+++ b/kde-base/knewstuff/knewstuff-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knewstuff/knewstuff-4.4.2.ebuild,v 1.2 2010/05/03 06:23:27 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knewstuff/knewstuff-4.4.4.ebuild,v 1.1 2010/06/06 14:41:46 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/knode/ChangeLog b/kde-base/knode/ChangeLog
index b51435c9a289..ddba80efeddd 100644
--- a/kde-base/knode/ChangeLog
+++ b/kde-base/knode/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/knode
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/ChangeLog,v 1.149 2010/05/03 21:52:21 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/ChangeLog,v 1.150 2010/06/06 14:41:51 scarabeus Exp $
+
+*knode-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -knode-4.4.2.ebuild,
+  -knode-4.4.3.ebuild, +knode-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -knode-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/knode/knode-4.4.2.ebuild b/kde-base/knode/knode-4.4.2.ebuild
deleted file mode 100644
index e49a5049b0df..000000000000
--- a/kde-base/knode/knode-4.4.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/knode-4.4.2.ebuild,v 1.1 2010/03/30 21:18:52 spatz Exp $
-
-EAPI="3"
-
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="A newsreader for KDE"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-# test fails, last checked for 4.2.96
-RESTRICT=test
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep libkdepim)
-	$(add_kdebase_dep libkpgp)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	libkpgp/
-"
-
-KMLOADLIBS="libkdepim"
-
-src_unpack() {
-	if use handbook; then
-		KMEXTRA="
-			doc/kioslave/news
-		"
-	fi
-
-	kde4-meta_src_unpack
-}
diff --git a/kde-base/knode/knode-4.4.3.ebuild b/kde-base/knode/knode-4.4.4.ebuild
index cf075922d404..8379b7a64684 100644
--- a/kde-base/knode/knode-4.4.3.ebuild
+++ b/kde-base/knode/knode-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/knode-4.4.3.ebuild,v 1.1 2010/05/03 21:03:55 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/knode-4.4.4.ebuild,v 1.1 2010/06/06 14:41:51 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/knotes/ChangeLog b/kde-base/knotes/ChangeLog
index 2f4b0383d7a1..aedef82efdb4 100644
--- a/kde-base/knotes/ChangeLog
+++ b/kde-base/knotes/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/knotes
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knotes/ChangeLog,v 1.143 2010/05/03 21:52:37 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knotes/ChangeLog,v 1.144 2010/06/06 14:41:23 scarabeus Exp $
+
+*knotes-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -knotes-4.4.2.ebuild,
+  -knotes-4.4.3.ebuild, +knotes-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -knotes-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/knotes/knotes-4.4.3.ebuild b/kde-base/knotes/knotes-4.4.3.ebuild
deleted file mode 100644
index f71e71b27979..000000000000
--- a/kde-base/knotes/knotes-4.4.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knotes/knotes-4.4.3.ebuild,v 1.1 2010/05/03 21:04:18 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdepim"
-
-inherit kde4-meta
-
-DESCRIPTION="KDE Notes application"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep libkdepim)
-"
-RDEPEND="${DEPEND}"
-
-KMLOADLIBS="libkdepim"
diff --git a/kde-base/knotes/knotes-4.4.2.ebuild b/kde-base/knotes/knotes-4.4.4.ebuild
index 5d8219a2cf7c..6c3cc9e8a592 100644
--- a/kde-base/knotes/knotes-4.4.2.ebuild
+++ b/kde-base/knotes/knotes-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knotes/knotes-4.4.2.ebuild,v 1.1 2010/03/30 21:19:18 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knotes/knotes-4.4.4.ebuild,v 1.1 2010/06/06 14:41:23 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/knotify/ChangeLog b/kde-base/knotify/ChangeLog
index fb37a627cb49..1d5b4b7bfd2e 100644
--- a/kde-base/knotify/ChangeLog
+++ b/kde-base/knotify/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/knotify
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knotify/ChangeLog,v 1.62 2010/05/04 08:14:09 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knotify/ChangeLog,v 1.63 2010/06/06 14:41:39 scarabeus Exp $
+
+*knotify-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -knotify-4.4.2.ebuild, -knotify-4.4.3.ebuild, +knotify-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org> knotify-4.4.3.ebuild:
   Restore accidently dropped ~x86-fbsd keyword on KDE SC 4.4.3
diff --git a/kde-base/knotify/knotify-4.4.3.ebuild b/kde-base/knotify/knotify-4.4.3.ebuild
deleted file mode 100644
index 6c17831f703d..000000000000
--- a/kde-base/knotify/knotify-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knotify/knotify-4.4.3.ebuild,v 1.2 2010/05/04 08:14:09 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-runtime"
-inherit kde4-meta
-
-DESCRIPTION="The KDE notification daemon."
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/knotify/knotify-4.4.2.ebuild b/kde-base/knotify/knotify-4.4.4.ebuild
index 3c2ae2324e81..401dcd122c8d 100644
--- a/kde-base/knotify/knotify-4.4.2.ebuild
+++ b/kde-base/knotify/knotify-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knotify/knotify-4.4.2.ebuild,v 1.2 2010/05/03 06:02:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knotify/knotify-4.4.4.ebuild,v 1.1 2010/06/06 14:41:39 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kolf/ChangeLog b/kde-base/kolf/ChangeLog
index 8990d9967276..f4942e557505 100644
--- a/kde-base/kolf/ChangeLog
+++ b/kde-base/kolf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kolf
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kolf/ChangeLog,v 1.148 2010/05/03 21:53:06 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kolf/ChangeLog,v 1.149 2010/06/06 14:41:44 scarabeus Exp $
+
+*kolf-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -kolf-4.4.2.ebuild,
+  -kolf-4.4.3.ebuild, +kolf-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kolf-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kolf/kolf-4.4.2.ebuild b/kde-base/kolf/kolf-4.4.2.ebuild
deleted file mode 100644
index 2c36a5d4129a..000000000000
--- a/kde-base/kolf/kolf-4.4.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kolf/kolf-4.4.2.ebuild,v 1.1 2010/03/30 21:20:10 spatz Exp $
-
-EAPI="3"
-
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE Minigolf Game"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/kolf/kolf-4.4.3.ebuild b/kde-base/kolf/kolf-4.4.4.ebuild
index f8ab132c00d2..5e487bcf13d1 100644
--- a/kde-base/kolf/kolf-4.4.3.ebuild
+++ b/kde-base/kolf/kolf-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kolf/kolf-4.4.3.ebuild,v 1.1 2010/05/03 21:04:57 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kolf/kolf-4.4.4.ebuild,v 1.1 2010/06/06 14:41:44 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kollision/ChangeLog b/kde-base/kollision/ChangeLog
index fa1312097fbc..8d8676d9ca70 100644
--- a/kde-base/kollision/ChangeLog
+++ b/kde-base/kollision/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kollision
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kollision/ChangeLog,v 1.44 2010/05/03 21:53:20 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kollision/ChangeLog,v 1.45 2010/06/06 14:42:03 scarabeus Exp $
+
+*kollision-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kollision-4.4.2.ebuild, -kollision-4.4.3.ebuild, +kollision-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kollision-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kollision/kollision-4.4.3.ebuild b/kde-base/kollision/kollision-4.4.3.ebuild
deleted file mode 100644
index 65312528bbae..000000000000
--- a/kde-base/kollision/kollision-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kollision/kollision-4.4.3.ebuild,v 1.1 2010/05/03 21:05:24 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE: A simple ball dodging game"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/kollision/kollision-4.4.2.ebuild b/kde-base/kollision/kollision-4.4.4.ebuild
index a248a6834082..f5a19960824b 100644
--- a/kde-base/kollision/kollision-4.4.2.ebuild
+++ b/kde-base/kollision/kollision-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kollision/kollision-4.4.2.ebuild,v 1.1 2010/03/30 21:20:37 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kollision/kollision-4.4.4.ebuild,v 1.1 2010/06/06 14:42:03 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kolourpaint/ChangeLog b/kde-base/kolourpaint/ChangeLog
index a39ac1fa642c..cb73c7cf5b5e 100644
--- a/kde-base/kolourpaint/ChangeLog
+++ b/kde-base/kolourpaint/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kolourpaint
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kolourpaint/ChangeLog,v 1.150 2010/05/03 21:53:35 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kolourpaint/ChangeLog,v 1.151 2010/06/06 14:42:18 scarabeus Exp $
+
+*kolourpaint-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kolourpaint-4.4.2.ebuild, -kolourpaint-4.4.3.ebuild,
+  +kolourpaint-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kolourpaint-4.4.1.ebuild:
diff --git a/kde-base/kolourpaint/kolourpaint-4.4.3.ebuild b/kde-base/kolourpaint/kolourpaint-4.4.3.ebuild
deleted file mode 100644
index 745bf6a27a65..000000000000
--- a/kde-base/kolourpaint/kolourpaint-4.4.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kolourpaint/kolourpaint-4.4.3.ebuild,v 1.2 2010/05/15 16:56:50 reavertm Exp $
-
-EAPI="3"
-
-KMNAME="kdegraphics"
-inherit kde4-meta
-
-DESCRIPTION="Paint Program for KDE"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-LICENSE="BSD LGPL-2"
-IUSE="debug +handbook"
diff --git a/kde-base/kolourpaint/kolourpaint-4.4.2.ebuild b/kde-base/kolourpaint/kolourpaint-4.4.4.ebuild
index 9c95147f6120..6068eb309791 100644
--- a/kde-base/kolourpaint/kolourpaint-4.4.2.ebuild
+++ b/kde-base/kolourpaint/kolourpaint-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kolourpaint/kolourpaint-4.4.2.ebuild,v 1.2 2010/05/15 16:56:50 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kolourpaint/kolourpaint-4.4.4.ebuild,v 1.1 2010/06/06 14:42:18 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kommander/ChangeLog b/kde-base/kommander/ChangeLog
index 3ec29503b7dc..1bd60d8f75be 100644
--- a/kde-base/kommander/ChangeLog
+++ b/kde-base/kommander/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kommander
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kommander/ChangeLog,v 1.146 2010/05/03 21:53:49 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kommander/ChangeLog,v 1.147 2010/06/06 14:41:39 scarabeus Exp $
+
+*kommander-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kommander-4.4.2.ebuild, -kommander-4.4.3.ebuild, +kommander-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kommander-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kommander/kommander-4.4.3.ebuild b/kde-base/kommander/kommander-4.4.3.ebuild
deleted file mode 100644
index d3918ab918e9..000000000000
--- a/kde-base/kommander/kommander-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kommander/kommander-4.4.3.ebuild,v 1.1 2010/05/03 21:06:02 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdewebdev"
-inherit kde4-meta
-
-DESCRIPTION="KDE dialog system for scripting"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/kommander/kommander-4.4.2.ebuild b/kde-base/kommander/kommander-4.4.4.ebuild
index e5a8bfd7a90b..512e4d97a2fb 100644
--- a/kde-base/kommander/kommander-4.4.2.ebuild
+++ b/kde-base/kommander/kommander-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kommander/kommander-4.4.2.ebuild,v 1.1 2010/03/30 21:21:26 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kommander/kommander-4.4.4.ebuild,v 1.1 2010/06/06 14:41:39 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kompare/ChangeLog b/kde-base/kompare/ChangeLog
index 2da2f3c90ae6..82e73c72e23a 100644
--- a/kde-base/kompare/ChangeLog
+++ b/kde-base/kompare/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kompare
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kompare/ChangeLog,v 1.143 2010/05/03 21:54:04 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kompare/ChangeLog,v 1.144 2010/06/06 14:42:13 scarabeus Exp $
+
+*kompare-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kompare-4.4.2.ebuild, -kompare-4.4.3.ebuild, +kompare-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kompare-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kompare/kompare-4.4.3.ebuild b/kde-base/kompare/kompare-4.4.3.ebuild
deleted file mode 100644
index a1f4ef7f4d41..000000000000
--- a/kde-base/kompare/kompare-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kompare/kompare-4.4.3.ebuild,v 1.1 2010/05/03 21:06:22 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdesdk"
-inherit kde4-meta
-
-DESCRIPTION="Kompare is a program to view the differences between files."
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/kompare/kompare-4.4.2.ebuild b/kde-base/kompare/kompare-4.4.4.ebuild
index 1e24c7b7e365..06bbdd39b716 100644
--- a/kde-base/kompare/kompare-4.4.2.ebuild
+++ b/kde-base/kompare/kompare-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kompare/kompare-4.4.2.ebuild,v 1.1 2010/03/30 21:21:52 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kompare/kompare-4.4.4.ebuild,v 1.1 2010/06/06 14:42:13 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/konqueror/ChangeLog b/kde-base/konqueror/ChangeLog
index 0565975f0404..ae87f63c2000 100644
--- a/kde-base/konqueror/ChangeLog
+++ b/kde-base/konqueror/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/konqueror
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/ChangeLog,v 1.181 2010/05/03 21:54:19 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/ChangeLog,v 1.182 2010/06/06 14:41:32 scarabeus Exp $
+
+*konqueror-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -konqueror-4.4.2.ebuild, -konqueror-4.4.3.ebuild, +konqueror-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -konqueror-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/konqueror/konqueror-4.4.3.ebuild b/kde-base/konqueror/konqueror-4.4.3.ebuild
deleted file mode 100644
index 7bb42a22e586..000000000000
--- a/kde-base/konqueror/konqueror-4.4.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/konqueror-4.4.3.ebuild,v 1.1 2010/05/03 21:06:42 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-apps"
-inherit flag-o-matic kde4-meta
-
-DESCRIPTION="KDE: Web browser, file manager, ..."
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+bookmarks debug +handbook svg thumbnail"
-# 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) )
-"
-PDEPEND="
-	thumbnail? ( $(add_kdebase_dep mplayerthumbs) )
-"
-
-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/konqueror/konqueror-4.4.2.ebuild b/kde-base/konqueror/konqueror-4.4.4.ebuild
index 78b693607f9d..440875b4dad5 100644
--- a/kde-base/konqueror/konqueror-4.4.2.ebuild
+++ b/kde-base/konqueror/konqueror-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/konqueror-4.4.2.ebuild,v 1.1 2010/03/30 21:22:18 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/konqueror-4.4.4.ebuild,v 1.1 2010/06/06 14:41:32 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/konquest/ChangeLog b/kde-base/konquest/ChangeLog
index c151ad9ca3f1..1ed4407d721e 100644
--- a/kde-base/konquest/ChangeLog
+++ b/kde-base/konquest/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/konquest
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konquest/ChangeLog,v 1.148 2010/05/03 21:54:35 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konquest/ChangeLog,v 1.149 2010/06/06 14:42:02 scarabeus Exp $
+
+*konquest-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -konquest-4.4.2.ebuild, -konquest-4.4.3.ebuild, +konquest-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -konquest-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/konquest/konquest-4.4.3.ebuild b/kde-base/konquest/konquest-4.4.3.ebuild
deleted file mode 100644
index f5341cb859c7..000000000000
--- a/kde-base/konquest/konquest-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konquest/konquest-4.4.3.ebuild,v 1.1 2010/05/03 21:07:01 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="Galactic Strategy KDE Game"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/konquest/konquest-4.4.2.ebuild b/kde-base/konquest/konquest-4.4.4.ebuild
index 254585e3d44a..3f76f7a554c5 100644
--- a/kde-base/konquest/konquest-4.4.2.ebuild
+++ b/kde-base/konquest/konquest-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konquest/konquest-4.4.2.ebuild,v 1.1 2010/03/30 21:22:46 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konquest/konquest-4.4.4.ebuild,v 1.1 2010/06/06 14:42:02 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/konsole/ChangeLog b/kde-base/konsole/ChangeLog
index 32a1bbbe8ad2..81dab9ec09fd 100644
--- a/kde-base/konsole/ChangeLog
+++ b/kde-base/konsole/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/konsole
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/ChangeLog,v 1.167 2010/06/03 20:41:43 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/ChangeLog,v 1.168 2010/06/06 14:42:07 scarabeus Exp $
+
+*konsole-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -konsole-4.4.2.ebuild, -konsole-4.4.3-r2.ebuild, +konsole-4.4.4.ebuild:
+  Remove old. Version bump.
 
 *konsole-4.4.3-r2 (03 Jun 2010)
 
diff --git a/kde-base/konsole/konsole-4.4.2.ebuild b/kde-base/konsole/konsole-4.4.2.ebuild
deleted file mode 100644
index a7176677fb19..000000000000
--- a/kde-base/konsole/konsole-4.4.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/konsole-4.4.2.ebuild,v 1.4 2010/05/06 20:34:01 reavertm Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-apps"
-inherit kde4-meta
-
-DESCRIPTION="X terminal for use with KDE."
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-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.4.2-remember-size.patch"
-)
diff --git a/kde-base/konsole/konsole-4.4.3-r2.ebuild b/kde-base/konsole/konsole-4.4.4.ebuild
index f0fd9b213567..2e5dacebcea7 100644
--- a/kde-base/konsole/konsole-4.4.3-r2.ebuild
+++ b/kde-base/konsole/konsole-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/konsole-4.4.3-r2.ebuild,v 1.1 2010/06/03 20:41:43 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/konsole-4.4.4.ebuild,v 1.1 2010/06/06 14:42:07 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/konsolekalendar/ChangeLog b/kde-base/konsolekalendar/ChangeLog
index 91a547ce8a03..dd30ce8ab743 100644
--- a/kde-base/konsolekalendar/ChangeLog
+++ b/kde-base/konsolekalendar/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/konsolekalendar
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konsolekalendar/ChangeLog,v 1.132 2010/05/03 21:55:05 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsolekalendar/ChangeLog,v 1.133 2010/06/06 14:41:57 scarabeus Exp $
+
+*konsolekalendar-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -konsolekalendar-4.4.2.ebuild, -konsolekalendar-4.4.3.ebuild,
+  +konsolekalendar-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -konsolekalendar-4.4.1.ebuild:
diff --git a/kde-base/konsolekalendar/konsolekalendar-4.4.3.ebuild b/kde-base/konsolekalendar/konsolekalendar-4.4.3.ebuild
deleted file mode 100644
index f83068f22f90..000000000000
--- a/kde-base/konsolekalendar/konsolekalendar-4.4.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konsolekalendar/konsolekalendar-4.4.3.ebuild,v 1.1 2010/05/03 21:07:44 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdepim"
-KMMODULE="console/${PN}"
-inherit kde4-meta
-
-DESCRIPTION="A command line interface to KDE calendars"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/konsolekalendar/konsolekalendar-4.4.2.ebuild b/kde-base/konsolekalendar/konsolekalendar-4.4.4.ebuild
index f29653ca245b..c8e34e151d19 100644
--- a/kde-base/konsolekalendar/konsolekalendar-4.4.2.ebuild
+++ b/kde-base/konsolekalendar/konsolekalendar-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konsolekalendar/konsolekalendar-4.4.2.ebuild,v 1.1 2010/03/30 21:23:38 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsolekalendar/konsolekalendar-4.4.4.ebuild,v 1.1 2010/06/06 14:41:57 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kontact/ChangeLog b/kde-base/kontact/ChangeLog
index e1882631359f..df3239dbefc0 100644
--- a/kde-base/kontact/ChangeLog
+++ b/kde-base/kontact/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kontact
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/ChangeLog,v 1.154 2010/06/05 14:43:47 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/ChangeLog,v 1.155 2010/06/06 14:41:43 scarabeus Exp $
+
+*kontact-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kontact-4.4.2.ebuild, -kontact-4.4.3.ebuild, +kontact-4.4.4.ebuild:
+  Remove old. Version bump.
 
   05 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org> kontact-4.4.2.ebuild,
   kontact-4.4.3.ebuild:
diff --git a/kde-base/kontact/kontact-4.4.3.ebuild b/kde-base/kontact/kontact-4.4.3.ebuild
deleted file mode 100644
index 5d911847eac0..000000000000
--- a/kde-base/kontact/kontact-4.4.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/kontact-4.4.3.ebuild,v 1.2 2010/06/05 14:43:47 reavertm Exp $
-
-EAPI="3"
-
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="KDE personal information manager"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep libkdepim)
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdepim-runtime)
-"
-
-KMLOADLIBS="libkdepim"
-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
-#
-# xml targets from kmail/ are being uncommented by kde4-meta.eclass
-KMEXTRACTONLY="
-	kmail/
-	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/
-"
-
-src_unpack() {
-	if use handbook; then
-		KMEXTRA+="
-			doc/kontact-admin/
-		"
-	fi
-
-	kde4-meta_src_unpack
-}
diff --git a/kde-base/kontact/kontact-4.4.2.ebuild b/kde-base/kontact/kontact-4.4.4.ebuild
index 8afdd28ac767..0b60066104ce 100644
--- a/kde-base/kontact/kontact-4.4.2.ebuild
+++ b/kde-base/kontact/kontact-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/kontact-4.4.2.ebuild,v 1.2 2010/06/05 14:43:47 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/kontact-4.4.4.ebuild,v 1.1 2010/06/06 14:41:43 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index f9068bd68326..d83576aacb0f 100644
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for kde-base/kopete
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.249 2010/05/15 17:00:22 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.250 2010/06/06 14:42:08 scarabeus Exp $
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -kopete-4.4.2.ebuild,
+  -kopete-4.4.2-r1.ebuild, -kopete-4.4.3.ebuild, +kopete-4.4.4.ebuild,
+  metadata.xml:
+  Drop unused use desc.
+
+*kopete-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -kopete-4.4.2.ebuild,
+  -kopete-4.4.2-r1.ebuild, -kopete-4.4.3.ebuild, +kopete-4.4.4.ebuild:
+  Remove old. Version bump.
 
   15 May 2010; Maciej Mrozowski <reavertm@gentoo.org>
   kopete-4.4.2-r1.ebuild, kopete-4.4.3.ebuild:
diff --git a/kde-base/kopete/kopete-4.4.2-r1.ebuild b/kde-base/kopete/kopete-4.4.2-r1.ebuild
deleted file mode 100644
index 7458d8b5727e..000000000000
--- a/kde-base/kopete/kopete-4.4.2-r1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.4.2-r1.ebuild,v 1.2 2010/05/15 17:00:22 reavertm Exp $
-
-EAPI="3"
-
-KMNAME="kdenetwork"
-inherit kde4-meta
-
-DESCRIPTION="KDE multi-protocol IM client"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook 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
-#	jabber: 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
-#	yahoo: NO DEPS
-#	zeroconfg: (bonjour) NO DEPS
-PROTOCOLS="gadu groupwise +jabber jingle meanwhile msn oscar qq skype sms
-testbed winpopup 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 )
-	jabber? (
-		app-crypt/qca:2
-		net-dns/libidn
-	)
-	jingle? (
-		>=media-libs/mediastreamer-2.3.0
-		media-libs/speex
-		net-libs/ortp
-	)
-	meanwhile? ( net-libs/meanwhile )
-	msn? ( >=net-libs/libmsn-4.0 )
-	otr? ( >=net-libs/libotr-3.2.0 )
-	statistics? ( dev-db/sqlite:3 )
-	webpresence? ( dev-libs/libxml2 dev-libs/libxslt )
-	v4l2? ( media-libs/libv4l )
-"
-RDEPEND="${COMMONDEPEND}
-	latex? (
-		media-gfx/imagemagick
-		virtual/latex-base
-	)
-	sms? ( app-mobilephone/smssend )
-	ssl? ( app-crypt/qca-ossl )
-"
-#	telepathy? ( net-libs/decibel )"
-DEPEND="${COMMONDEPEND}
-	!aqua? ( x11-proto/scrnsaverproto )
-"
-
-PATCHES=( "${FILESDIR}/${P}-yahoo-stealth-fix.patch" )
-
-src_prepare() {
-	sed -e "s:lib/mozilla:$(get_libdir)/mozilla:" \
-		-i kopete/protocols/skype/skypebuttons/CMakeLists.txt || die "sed failed"
-	sed -e '/set (LIBV4L2_REQUIRED TRUE)/s/TRUE/FALSE/' \
-		-i kopete/CMakeLists.txt || die 'failed to make v4l2 optional'
-
-	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_with v4l2 LibV4L2)
-	)
-	# enable protocols
-	for x in ${PROTOCOLS}; do
-		[[ ${x/+/} = msn ]] && x2=Libmsn || x2=""
-		mycmakeargs+=($(cmake-utils_use_with ${x/+/} ${x2}))
-		[[ ${x/+/} = zeroconf ]] && x2=bonjour || x2=""
-		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 jabber || use msn; then # || use irc; then
-			echo
-			#elog "In order to use ssl in jabber, msn and irc you'll need to"
-			elog "In order to use ssl in jabber and msn you'll need to"
-			elog "install app-crypt/qca-ossl package."
-			echo
-		fi
-	fi
-}
diff --git a/kde-base/kopete/kopete-4.4.2.ebuild b/kde-base/kopete/kopete-4.4.2.ebuild
deleted file mode 100644
index 4ca27d7f1083..000000000000
--- a/kde-base/kopete/kopete-4.4.2.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.4.2.ebuild,v 1.1 2010/03/30 21:24:29 spatz Exp $
-
-EAPI="3"
-
-KMNAME="kdenetwork"
-inherit kde4-meta
-
-DESCRIPTION="KDE multi-protocol IM client"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook 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
-#
-#	bonjour: NO DEPS
-#	gadu: net-libs/libgadu @since 4.3
-#	groupwise: app-crypt/qca:2
-#	irc: NO DEPS, probably will fail so inform user about it
-#	jabber: 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
-#	yahoo: NO DEPS
-PROTOCOLS="bonjour gadu groupwise +jabber jingle meanwhile msn oscar qq
-skype sms testbed winpopup yahoo"
-
-# disabled protocols
-#   telepathy: net-libs/decibel
-#   irc: NO DEPS
-
-IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
-
-COMMONDEPEND="
-	dev-libs/libpcre
-	$(add_kdebase_dep kdepimlibs)
-	>=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 )
-	jabber? (
-		app-crypt/qca:2
-		net-dns/libidn
-	)
-	jingle? (
-		>=media-libs/mediastreamer-2.3.0
-		media-libs/speex
-		net-libs/ortp
-	)
-	meanwhile? ( net-libs/meanwhile )
-	msn? ( >=net-libs/libmsn-4.0 )
-	otr? ( >=net-libs/libotr-3.2.0 )
-	statistics? ( dev-db/sqlite:3 )
-	webpresence? ( dev-libs/libxml2 dev-libs/libxslt )
-	v4l2? ( media-libs/libv4l )
-"
-RDEPEND="${COMMONDEPEND}
-	latex? (
-		media-gfx/imagemagick
-		virtual/latex-base
-	)
-	sms? ( app-mobilephone/smssend )
-	ssl? ( app-crypt/qca-ossl )
-"
-#	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"
-	sed -e '/set (LIBV4L2_REQUIRED TRUE)/s/TRUE/FALSE/' \
-		-i kopete/CMakeLists.txt || die 'failed to make v4l2 optional'
-
-	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_with v4l2 LibV4L2)
-	)
-	# enable protocols
-	for x in ${PROTOCOLS}; do
-		[[ ${x/+/} = msn ]] && x2=Libmsn || x2=""
-		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 jabber || use msn; then # || use irc; then
-			echo
-			#elog "In order to use ssl in jabber, msn and irc you'll need to"
-			elog "In order to use ssl in jabber and msn you'll need to"
-			elog "install app-crypt/qca-ossl package."
-			echo
-		fi
-	fi
-}
diff --git a/kde-base/kopete/kopete-4.4.3.ebuild b/kde-base/kopete/kopete-4.4.4.ebuild
index b2c192def3bf..4c55272bcbc4 100644
--- a/kde-base/kopete/kopete-4.4.3.ebuild
+++ b/kde-base/kopete/kopete-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.4.3.ebuild,v 1.2 2010/05/15 17:00:22 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.4.4.ebuild,v 1.1 2010/06/06 14:42:08 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kopete/metadata.xml b/kde-base/kopete/metadata.xml
index f63d5abc811c..b2c6eb169963 100644
--- a/kde-base/kopete/metadata.xml
+++ b/kde-base/kopete/metadata.xml
@@ -37,7 +37,6 @@
 	<flag name="testbed">Enable the testbed protocol.</flag>
 	<flag name="winpopup">Enable pop-up messages sending on windows. (same as good old "net send" messages ;])</flag>
 	<flag name="yahoo">Enable yahoo protocol support.</flag>
-	<flag name="zeroconf">Enable Link-Local Messaging via the bonjour protocol.</flag>
 </use>
 <herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/korganizer/ChangeLog b/kde-base/korganizer/ChangeLog
index 828a847fd3f4..255b9a7ce4a8 100644
--- a/kde-base/korganizer/ChangeLog
+++ b/kde-base/korganizer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/korganizer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/ChangeLog,v 1.162 2010/06/05 14:57:01 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/ChangeLog,v 1.163 2010/06/06 14:41:41 scarabeus Exp $
+
+*korganizer-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -korganizer-4.4.2.ebuild, -korganizer-4.4.3.ebuild,
+  +korganizer-4.4.4.ebuild:
+  Remove old. Version bump.
 
   05 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org>
   korganizer-4.4.2.ebuild, korganizer-4.4.3.ebuild:
diff --git a/kde-base/korganizer/korganizer-4.4.2.ebuild b/kde-base/korganizer/korganizer-4.4.2.ebuild
deleted file mode 100644
index bf8f7f66b8f6..000000000000
--- a/kde-base/korganizer/korganizer-4.4.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/korganizer-4.4.2.ebuild,v 1.2 2010/06/05 14:57:01 reavertm Exp $
-
-EAPI="3"
-
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="A Personal Organizer for KDE"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
-	$(add_kdebase_dep libkdepim)
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-
-# Moved after 4.3.90
-add_blocker kontact-specialdates
-
-# Tests hang, last checked in 4.3.3
-RESTRICT="test"
-
-KMLOADLIBS="libkdepim"
-KMEXTRA="kdgantt1"
-
-# xml targets from kmail are being uncommented by kde4-meta.eclass
-KMEXTRACTONLY="
-	kmail/
-	knode/org.kde.knode.xml
-"
-
-src_unpack() {
-	if use kontact; then
-		KMEXTRA="${KMEXTRA}
-			kontact/plugins/planner/
-			kontact/plugins/specialdates/
-		"
-	fi
-
-	kde4-meta_src_unpack
-}
-
-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.4.3.ebuild b/kde-base/korganizer/korganizer-4.4.4.ebuild
index 71d1ccc2604c..c7edd2e88d23 100644
--- a/kde-base/korganizer/korganizer-4.4.3.ebuild
+++ b/kde-base/korganizer/korganizer-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/korganizer-4.4.3.ebuild,v 1.3 2010/06/05 14:57:01 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/korganizer-4.4.4.ebuild,v 1.1 2010/06/06 14:41:41 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kpasswdserver/ChangeLog b/kde-base/kpasswdserver/ChangeLog
index 2582292d753f..71c6f4327f5f 100644
--- a/kde-base/kpasswdserver/ChangeLog
+++ b/kde-base/kpasswdserver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kpasswdserver
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpasswdserver/ChangeLog,v 1.59 2010/05/04 08:14:27 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpasswdserver/ChangeLog,v 1.60 2010/06/06 14:42:00 scarabeus Exp $
+
+*kpasswdserver-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kpasswdserver-4.4.2.ebuild, -kpasswdserver-4.4.3.ebuild,
+  +kpasswdserver-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   kpasswdserver-4.4.3.ebuild:
diff --git a/kde-base/kpasswdserver/kpasswdserver-4.4.3.ebuild b/kde-base/kpasswdserver/kpasswdserver-4.4.3.ebuild
deleted file mode 100644
index 25a4039218ee..000000000000
--- a/kde-base/kpasswdserver/kpasswdserver-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpasswdserver/kpasswdserver-4.4.3.ebuild,v 1.2 2010/05/04 08:14:27 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KDED Password Module"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kpasswdserver/kpasswdserver-4.4.2.ebuild b/kde-base/kpasswdserver/kpasswdserver-4.4.4.ebuild
index fef62a1753fb..729ea250865c 100644
--- a/kde-base/kpasswdserver/kpasswdserver-4.4.2.ebuild
+++ b/kde-base/kpasswdserver/kpasswdserver-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpasswdserver/kpasswdserver-4.4.2.ebuild,v 1.2 2010/05/03 06:55:45 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpasswdserver/kpasswdserver-4.4.4.ebuild,v 1.1 2010/06/06 14:42:00 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kpat/ChangeLog b/kde-base/kpat/ChangeLog
index 85b80ada51bb..10f9d4df391d 100644
--- a/kde-base/kpat/ChangeLog
+++ b/kde-base/kpat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kpat
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpat/ChangeLog,v 1.149 2010/05/03 21:56:20 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpat/ChangeLog,v 1.150 2010/06/06 14:42:09 scarabeus Exp $
+
+*kpat-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -kpat-4.4.2.ebuild,
+  -kpat-4.4.3.ebuild, +kpat-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kpat-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kpat/kpat-4.4.2.ebuild b/kde-base/kpat/kpat-4.4.2.ebuild
deleted file mode 100644
index acee589a60a7..000000000000
--- a/kde-base/kpat/kpat-4.4.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpat/kpat-4.4.2.ebuild,v 1.1 2010/03/30 21:25:50 spatz Exp $
-
-EAPI="3"
-
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE patience game"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/kpat/kpat-4.4.3.ebuild b/kde-base/kpat/kpat-4.4.4.ebuild
index 1fbb62c246ae..41e98c1403e5 100644
--- a/kde-base/kpat/kpat-4.4.3.ebuild
+++ b/kde-base/kpat/kpat-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpat/kpat-4.4.3.ebuild,v 1.1 2010/05/03 21:09:29 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpat/kpat-4.4.4.ebuild,v 1.1 2010/06/06 14:42:09 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kppp/ChangeLog b/kde-base/kppp/ChangeLog
index da3ea8db7d3b..0bd0fb5e8543 100644
--- a/kde-base/kppp/ChangeLog
+++ b/kde-base/kppp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kppp
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kppp/ChangeLog,v 1.151 2010/05/03 21:56:36 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kppp/ChangeLog,v 1.152 2010/06/06 14:41:54 scarabeus Exp $
+
+*kppp-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -kppp-4.4.2.ebuild,
+  -kppp-4.4.3.ebuild, +kppp-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kppp-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kppp/kppp-4.4.2.ebuild b/kde-base/kppp/kppp-4.4.2.ebuild
deleted file mode 100644
index 72643573b7a2..000000000000
--- a/kde-base/kppp/kppp-4.4.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kppp/kppp-4.4.2.ebuild,v 1.1 2010/03/30 21:26:16 spatz Exp $
-
-EAPI="3"
-
-KMNAME="kdenetwork"
-inherit kde4-meta
-
-DESCRIPTION="KDE: A dialer and front-end to pppd."
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug +handbook"
-
-RDEPEND="
-	net-dialup/ppp
-"
diff --git a/kde-base/kppp/kppp-4.4.3.ebuild b/kde-base/kppp/kppp-4.4.4.ebuild
index 55a5f594caa6..11d043b748dd 100644
--- a/kde-base/kppp/kppp-4.4.3.ebuild
+++ b/kde-base/kppp/kppp-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kppp/kppp-4.4.3.ebuild,v 1.1 2010/05/03 21:09:51 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kppp/kppp-4.4.4.ebuild,v 1.1 2010/06/06 14:41:54 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kquitapp/ChangeLog b/kde-base/kquitapp/ChangeLog
index a7e2af80211e..3b9fd4573998 100644
--- a/kde-base/kquitapp/ChangeLog
+++ b/kde-base/kquitapp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kquitapp
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kquitapp/ChangeLog,v 1.59 2010/05/04 08:14:45 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kquitapp/ChangeLog,v 1.60 2010/06/06 14:41:39 scarabeus Exp $
+
+*kquitapp-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kquitapp-4.4.2.ebuild, -kquitapp-4.4.3.ebuild, +kquitapp-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org> kquitapp-4.4.3.ebuild:
   Restore accidently dropped ~x86-fbsd keyword on KDE SC 4.4.3
diff --git a/kde-base/kquitapp/kquitapp-4.4.3.ebuild b/kde-base/kquitapp/kquitapp-4.4.3.ebuild
deleted file mode 100644
index 641988fd07e7..000000000000
--- a/kde-base/kquitapp/kquitapp-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kquitapp/kquitapp-4.4.3.ebuild,v 1.2 2010/05/04 08:14:45 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-runtime"
-inherit kde4-meta
-
-DESCRIPTION="A CLI application quitter"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kquitapp/kquitapp-4.4.2.ebuild b/kde-base/kquitapp/kquitapp-4.4.4.ebuild
index f7b5368bd543..647621b5f0f9 100644
--- a/kde-base/kquitapp/kquitapp-4.4.2.ebuild
+++ b/kde-base/kquitapp/kquitapp-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kquitapp/kquitapp-4.4.2.ebuild,v 1.2 2010/05/03 06:54:21 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kquitapp/kquitapp-4.4.4.ebuild,v 1.1 2010/06/06 14:41:39 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/krdc/ChangeLog b/kde-base/krdc/ChangeLog
index 67b54a5200fe..8bdd82f45e33 100644
--- a/kde-base/krdc/ChangeLog
+++ b/kde-base/krdc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/krdc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krdc/ChangeLog,v 1.159 2010/05/03 21:57:07 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krdc/ChangeLog,v 1.160 2010/06/06 14:41:37 scarabeus Exp $
+
+*krdc-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -krdc-4.4.2.ebuild,
+  -krdc-4.4.3.ebuild, +krdc-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -krdc-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/krdc/krdc-4.4.3.ebuild b/kde-base/krdc/krdc-4.4.3.ebuild
deleted file mode 100644
index 6dc701c352ff..000000000000
--- a/kde-base/krdc/krdc-4.4.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krdc/krdc-4.4.3.ebuild,v 1.1 2010/05/03 21:10:37 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdenetwork"
-inherit kde4-meta
-
-DESCRIPTION="KDE remote desktop connection (RDP and VNC) client"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook jpeg rdp 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? ( media-libs/jpeg )
-	vnc? ( >=net-libs/libvncserver-0.9 )
-	zeroconf? (
-		|| (
-			net-dns/avahi
-			net-misc/mDNSResponder
-		)
-	)
-"
-RDEPEND="${DEPEND}
-	rdp? ( 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/krdc/krdc-4.4.2.ebuild b/kde-base/krdc/krdc-4.4.4.ebuild
index 42aad49ae21a..fc3e369cafcf 100644
--- a/kde-base/krdc/krdc-4.4.2.ebuild
+++ b/kde-base/krdc/krdc-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krdc/krdc-4.4.2.ebuild,v 1.1 2010/03/30 21:27:08 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krdc/krdc-4.4.4.ebuild,v 1.1 2010/06/06 14:41:37 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kreadconfig/ChangeLog b/kde-base/kreadconfig/ChangeLog
index fbccdebce949..6617f5a94ccc 100644
--- a/kde-base/kreadconfig/ChangeLog
+++ b/kde-base/kreadconfig/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kreadconfig
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kreadconfig/ChangeLog,v 1.128 2010/05/03 21:57:22 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kreadconfig/ChangeLog,v 1.129 2010/06/06 14:41:32 scarabeus Exp $
+
+*kreadconfig-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kreadconfig-4.4.2.ebuild, -kreadconfig-4.4.3.ebuild,
+  +kreadconfig-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kreadconfig-4.4.1.ebuild:
diff --git a/kde-base/kreadconfig/kreadconfig-4.4.3.ebuild b/kde-base/kreadconfig/kreadconfig-4.4.3.ebuild
deleted file mode 100644
index f829283846c5..000000000000
--- a/kde-base/kreadconfig/kreadconfig-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kreadconfig/kreadconfig-4.4.3.ebuild,v 1.1 2010/05/03 21:10:59 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KDE: A command-line tool to read KConfig entries"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kreadconfig/kreadconfig-4.4.2.ebuild b/kde-base/kreadconfig/kreadconfig-4.4.4.ebuild
index 7ab9649f4e5d..05da44ce5a81 100644
--- a/kde-base/kreadconfig/kreadconfig-4.4.2.ebuild
+++ b/kde-base/kreadconfig/kreadconfig-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kreadconfig/kreadconfig-4.4.2.ebuild,v 1.1 2010/03/30 21:27:37 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kreadconfig/kreadconfig-4.4.4.ebuild,v 1.1 2010/06/06 14:41:32 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kreversi/ChangeLog b/kde-base/kreversi/ChangeLog
index 7513fe2945f5..d27bde9ad111 100644
--- a/kde-base/kreversi/ChangeLog
+++ b/kde-base/kreversi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kreversi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kreversi/ChangeLog,v 1.151 2010/05/03 21:57:36 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kreversi/ChangeLog,v 1.152 2010/06/06 14:41:42 scarabeus Exp $
+
+*kreversi-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kreversi-4.4.2.ebuild, -kreversi-4.4.3.ebuild, +kreversi-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kreversi-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kreversi/kreversi-4.4.3.ebuild b/kde-base/kreversi/kreversi-4.4.3.ebuild
deleted file mode 100644
index edbdf6ceddae..000000000000
--- a/kde-base/kreversi/kreversi-4.4.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kreversi/kreversi-4.4.3.ebuild,v 1.1 2010/05/03 21:11:24 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdegames"
-inherit games-ggz kde4-meta
-
-DESCRIPTION="KDE Board Game"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-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 /usr/share/ggz/modules
-	newins ${PN}/module.dsc ${P}.dsc || die "couldn't install .dsc file"
-}
-
-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/kreversi/kreversi-4.4.2.ebuild b/kde-base/kreversi/kreversi-4.4.4.ebuild
index 0e87fd8a9345..d7f2929edb6a 100644
--- a/kde-base/kreversi/kreversi-4.4.2.ebuild
+++ b/kde-base/kreversi/kreversi-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kreversi/kreversi-4.4.2.ebuild,v 1.1 2010/03/30 21:28:08 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kreversi/kreversi-4.4.4.ebuild,v 1.1 2010/06/06 14:41:42 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/krfb/ChangeLog b/kde-base/krfb/ChangeLog
index ceef698123a7..83f0519e9c19 100644
--- a/kde-base/krfb/ChangeLog
+++ b/kde-base/krfb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/krfb
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krfb/ChangeLog,v 1.152 2010/05/03 21:57:52 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krfb/ChangeLog,v 1.153 2010/06/06 14:42:13 scarabeus Exp $
+
+*krfb-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -krfb-4.4.2.ebuild,
+  -krfb-4.4.3.ebuild, +krfb-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -krfb-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/krfb/krfb-4.4.3.ebuild b/kde-base/krfb/krfb-4.4.3.ebuild
deleted file mode 100644
index 0894f942ecfe..000000000000
--- a/kde-base/krfb/krfb-4.4.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krfb/krfb-4.4.3.ebuild,v 1.1 2010/05/03 21:11:48 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdenetwork"
-inherit kde4-meta
-
-DESCRIPTION="VNC-compatible server to share KDE desktops"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook zeroconf"
-
-DEPEND="
-	>=net-libs/libvncserver-0.9
-	net-libs/openslp
-	!aqua? ( x11-libs/libXdamage )
-	zeroconf? (
-		|| (
-			net-dns/avahi[mdnsresponder-compat]
-			net-misc/mDNSResponder
-		)
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	# krfb requires both slp and vnc to build
-	mycmakeargs=(
-		-DWITH_Xmms=OFF -DWITH_SLP=ON -DWITH_LibVNCServer=ON
-		$(cmake-utils_use_with zeroconf DNSSD)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/krfb/krfb-4.4.2.ebuild b/kde-base/krfb/krfb-4.4.4.ebuild
index 44d7b5ecdc13..5f594698d732 100644
--- a/kde-base/krfb/krfb-4.4.2.ebuild
+++ b/kde-base/krfb/krfb-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krfb/krfb-4.4.2.ebuild,v 1.1 2010/03/30 21:28:37 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krfb/krfb-4.4.4.ebuild,v 1.1 2010/06/06 14:42:13 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/krossjava/ChangeLog b/kde-base/krossjava/ChangeLog
index 430398183272..ec0355b7c3d6 100644
--- a/kde-base/krossjava/ChangeLog
+++ b/kde-base/krossjava/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/krossjava
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krossjava/ChangeLog,v 1.29 2010/05/03 21:58:06 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krossjava/ChangeLog,v 1.30 2010/06/06 14:42:16 scarabeus Exp $
+
+*krossjava-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -krossjava-4.4.2.ebuild, -krossjava-4.4.3.ebuild, +krossjava-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -krossjava-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/krossjava/krossjava-4.4.3.ebuild b/kde-base/krossjava/krossjava-4.4.3.ebuild
deleted file mode 100644
index 43b7f9fe54c0..000000000000
--- a/kde-base/krossjava/krossjava-4.4.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krossjava/krossjava-4.4.3.ebuild,v 1.1 2010/05/03 21:12:18 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebindings"
-KMMODULE="java/krossjava"
-inherit java-pkg-2 java-ant-2 kde4-meta eutils
-
-DESCRIPTION="Java plugin for the kdelibs/kross scripting framework."
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="
-	>=virtual/jdk-1.5
-"
-RDEPEND="
-	>=virtual/jre-1.5
-"
-
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${PN}-4.2.3_includes.patch" )
-
-src_prepare() {
-	find "${S}" -iname '*.jar' | xargs rm -v
-	kde4-meta_src_prepare
-	java-pkg-2_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(-DENABLE_KROSSJAVA=ON)
-	kde4-meta_src_configure
-	java-ant-2_src_configure
-}
-
-src_compile() {
-	kde4-meta_src_compile
-	cd "${S}/java/${PN}/${PN}/java/" || die
-	eant makejar
-}
-
-src_install() {
-	kde4-meta_src_install
-	java-pkg_dojar "${ED}/${KDEDIR}/$(get_libdir)/kde4/kross/kross.jar"
-
-	cd "${ED}${KDEDIR}/$(get_libdir)/kde4/kross/" || die
-	local path_prefix="../../../../"
-
-	if [[ ${KDEDIR} != /usr ]]; then
-		path_prefix="${path_prefix}../"
-	fi
-
-	dosym "${path_prefix}usr/share/${PN}-${SLOT}/lib/kross.jar" \
-		"${KDEDIR}/$(get_libdir)/kde4/kross/kross.jar"
-	java-pkg_regso "${ED}/${KDEDIR}/$(get_libdir)/kde4/libkrossjava.so"
-}
diff --git a/kde-base/krossjava/krossjava-4.4.2.ebuild b/kde-base/krossjava/krossjava-4.4.4.ebuild
index 463bf11472dd..7257b011eb87 100644
--- a/kde-base/krossjava/krossjava-4.4.2.ebuild
+++ b/kde-base/krossjava/krossjava-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krossjava/krossjava-4.4.2.ebuild,v 1.1 2010/03/30 21:29:07 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krossjava/krossjava-4.4.4.ebuild,v 1.1 2010/06/06 14:42:16 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/krosspython/ChangeLog b/kde-base/krosspython/ChangeLog
index 60dfdda47873..e77cd5deb143 100644
--- a/kde-base/krosspython/ChangeLog
+++ b/kde-base/krosspython/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/krosspython
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krosspython/ChangeLog,v 1.43 2010/05/03 21:58:21 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krosspython/ChangeLog,v 1.44 2010/06/06 14:42:10 scarabeus Exp $
+
+*krosspython-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -krosspython-4.4.2.ebuild, -krosspython-4.4.3.ebuild,
+  +krosspython-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -krosspython-4.4.1.ebuild:
diff --git a/kde-base/krosspython/krosspython-4.4.3.ebuild b/kde-base/krosspython/krosspython-4.4.3.ebuild
deleted file mode 100644
index efeedf57d5f0..000000000000
--- a/kde-base/krosspython/krosspython-4.4.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krosspython/krosspython-4.4.3.ebuild,v 1.1 2010/05/03 21:12:42 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebindings"
-KMMODULE="python/krosspython"
-PYTHON_DEPEND="2"
-inherit python kde4-meta
-
-DESCRIPTION="Kross scripting framework: Python interpreter"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-pkg_setup() {
-	python_set_active_version 2
-	kde4-meta_pkg_setup
-}
diff --git a/kde-base/krosspython/krosspython-4.4.2.ebuild b/kde-base/krosspython/krosspython-4.4.4.ebuild
index fbd83672c0b7..6e16eb65f7b5 100644
--- a/kde-base/krosspython/krosspython-4.4.2.ebuild
+++ b/kde-base/krosspython/krosspython-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krosspython/krosspython-4.4.2.ebuild,v 1.2 2010/04/14 19:27:38 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krosspython/krosspython-4.4.4.ebuild,v 1.1 2010/06/06 14:42:10 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/krossruby/ChangeLog b/kde-base/krossruby/ChangeLog
index 231fe8a7faa2..beaa2e062c80 100644
--- a/kde-base/krossruby/ChangeLog
+++ b/kde-base/krossruby/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/krossruby
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krossruby/ChangeLog,v 1.36 2010/05/03 21:58:35 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krossruby/ChangeLog,v 1.37 2010/06/06 14:41:53 scarabeus Exp $
+
+*krossruby-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -krossruby-4.4.2.ebuild, -krossruby-4.4.3.ebuild, +krossruby-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -krossruby-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/krossruby/krossruby-4.4.3.ebuild b/kde-base/krossruby/krossruby-4.4.3.ebuild
deleted file mode 100644
index 80c3aadda6e9..000000000000
--- a/kde-base/krossruby/krossruby-4.4.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krossruby/krossruby-4.4.3.ebuild,v 1.1 2010/05/03 21:13:07 alexxy Exp $
-
-EAPI="2"
-
-KMNAME="kdebindings"
-KMMODULE="ruby/krossruby"
-USE_RUBY="ruby18"
-
-inherit kde4-meta ruby-ng
-
-DESCRIPTION="Ruby plugin for the kdelibs/kross scripting framework."
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="debug"
-
-pkg_setup() {
-	ruby-ng_pkg_setup
-	kde4-meta_pkg_setup
-}
-
-src_unpack() {
-	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() {
-	CMAKE_USE_DIR=${S}
-	mycmakeargs=(
-		-DRUBY_LIBRARY=$(ruby_get_libruby)
-		-DRUBY_INCLUDE_PATH=$(ruby_get_hdrdir)
-		-DRUBY_EXECUTABLE=${RUBY}
-	)
-	kde4-meta_src_configure
-}
-
-each_ruby_compile() {
-	CMAKE_USE_DIR=${S}
-	kde4-meta_src_compile
-}
-
-each_ruby_install() {
-	CMAKE_USE_DIR=${S}
-	kde4-meta_src_install
-}
diff --git a/kde-base/krossruby/krossruby-4.4.2.ebuild b/kde-base/krossruby/krossruby-4.4.4.ebuild
index 1659ba70de65..bf795ccaf6b2 100644
--- a/kde-base/krossruby/krossruby-4.4.2.ebuild
+++ b/kde-base/krossruby/krossruby-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krossruby/krossruby-4.4.2.ebuild,v 1.1 2010/03/30 21:29:58 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krossruby/krossruby-4.4.4.ebuild,v 1.1 2010/06/06 14:41:53 scarabeus Exp $
 
 EAPI="2"
 
diff --git a/kde-base/kruler/ChangeLog b/kde-base/kruler/ChangeLog
index 9f02eb4a6b02..862bb4790a6b 100644
--- a/kde-base/kruler/ChangeLog
+++ b/kde-base/kruler/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kruler
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kruler/ChangeLog,v 1.145 2010/05/03 21:58:51 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kruler/ChangeLog,v 1.146 2010/06/06 14:41:24 scarabeus Exp $
+
+*kruler-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -kruler-4.4.2.ebuild,
+  -kruler-4.4.3.ebuild, +kruler-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kruler-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kruler/kruler-4.4.3.ebuild b/kde-base/kruler/kruler-4.4.3.ebuild
deleted file mode 100644
index a00db185cb55..000000000000
--- a/kde-base/kruler/kruler-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kruler/kruler-4.4.3.ebuild,v 1.1 2010/05/03 21:13:31 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdegraphics"
-inherit kde4-meta
-
-DESCRIPTION="A screen ruler for the K Desktop Environment"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/kruler/kruler-4.4.2.ebuild b/kde-base/kruler/kruler-4.4.4.ebuild
index 9753cdd87893..b01f04815a2f 100644
--- a/kde-base/kruler/kruler-4.4.2.ebuild
+++ b/kde-base/kruler/kruler-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kruler/kruler-4.4.2.ebuild,v 1.1 2010/03/30 21:30:24 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kruler/kruler-4.4.4.ebuild,v 1.1 2010/06/06 14:41:24 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/krunner/ChangeLog b/kde-base/krunner/ChangeLog
index 8bf218da69d8..e6f12c6e29c3 100644
--- a/kde-base/krunner/ChangeLog
+++ b/kde-base/krunner/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/krunner
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krunner/ChangeLog,v 1.65 2010/05/03 21:59:05 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krunner/ChangeLog,v 1.66 2010/06/06 14:42:09 scarabeus Exp $
+
+*krunner-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -krunner-4.4.2.ebuild, -krunner-4.4.3.ebuild, +krunner-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -krunner-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/krunner/krunner-4.4.3.ebuild b/kde-base/krunner/krunner-4.4.3.ebuild
deleted file mode 100644
index 15cd032d5948..000000000000
--- a/kde-base/krunner/krunner-4.4.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krunner/krunner-4.4.3.ebuild,v 1.1 2010/05/03 21:13:55 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-workspace"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="KDE Command Runner"
-IUSE="debug"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-COMMONDEPEND="
-	$(add_kdebase_dep kephal)
-	$(add_kdebase_dep ksmserver)
-	$(add_kdebase_dep ksysguard)
-	$(add_kdebase_dep libkworkspace)
-	!aqua? (
-		x11-libs/libXxf86misc
-		x11-libs/libXcursor
-		x11-libs/libXScrnSaver
-	)
-"
-DEPEND="${COMMONDEPEND}
-	!aqua? (
-		x11-libs/libXcursor
-		x11-proto/xf86miscproto
-		x11-proto/scrnsaverproto
-	)
-"
-RDEPEND="${COMMONDEPEND}"
-
-KMEXTRACTONLY="
-	libs/kdm/
-	libs/ksysguard/
-	libs/kworkspace/
-	kcontrol/
-	ksysguard/
-	ksmserver/org.kde.KSMServerInterface.xml
-	plasma/screensaver/shell/org.kde.plasma-overlay.App.xml
-	kcheckpass/
-"
-
-KMLOADLIBS="libkworkspace"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with opengl OpenGL)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/krunner/krunner-4.4.2.ebuild b/kde-base/krunner/krunner-4.4.4.ebuild
index 450c7fe2161b..5e80e86a70a6 100644
--- a/kde-base/krunner/krunner-4.4.2.ebuild
+++ b/kde-base/krunner/krunner-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krunner/krunner-4.4.2.ebuild,v 1.1 2010/03/30 21:30:52 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krunner/krunner-4.4.4.ebuild,v 1.1 2010/06/06 14:42:09 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/ksame/ChangeLog b/kde-base/ksame/ChangeLog
index 57b8a97b8e2f..b62eb3c1e1af 100644
--- a/kde-base/ksame/ChangeLog
+++ b/kde-base/ksame/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/ksame
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksame/ChangeLog,v 1.147 2010/05/03 21:59:21 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksame/ChangeLog,v 1.148 2010/06/06 14:42:12 scarabeus Exp $
+
+*ksame-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -ksame-4.4.2.ebuild,
+  -ksame-4.4.3.ebuild, +ksame-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -ksame-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/ksame/ksame-4.4.3.ebuild b/kde-base/ksame/ksame-4.4.3.ebuild
deleted file mode 100644
index 5f5e84e1191f..000000000000
--- a/kde-base/ksame/ksame-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksame/ksame-4.4.3.ebuild,v 1.1 2010/05/03 21:14:19 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE: Same Game - a little game about balls and how to get rid of them"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/ksame/ksame-4.4.2.ebuild b/kde-base/ksame/ksame-4.4.4.ebuild
index 70360832f620..7dc58fa952a8 100644
--- a/kde-base/ksame/ksame-4.4.2.ebuild
+++ b/kde-base/ksame/ksame-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksame/ksame-4.4.2.ebuild,v 1.1 2010/03/30 21:31:18 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksame/ksame-4.4.4.ebuild,v 1.1 2010/06/06 14:42:12 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/ksaneplugin/ChangeLog b/kde-base/ksaneplugin/ChangeLog
index b54c0a9f4f3a..8faa1074d8d2 100644
--- a/kde-base/ksaneplugin/ChangeLog
+++ b/kde-base/ksaneplugin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/ksaneplugin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksaneplugin/ChangeLog,v 1.40 2010/05/03 21:59:35 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksaneplugin/ChangeLog,v 1.41 2010/06/06 14:42:04 scarabeus Exp $
+
+*ksaneplugin-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -ksaneplugin-4.4.2.ebuild, -ksaneplugin-4.4.3.ebuild,
+  +ksaneplugin-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -ksaneplugin-4.4.1.ebuild:
diff --git a/kde-base/ksaneplugin/ksaneplugin-4.4.2.ebuild b/kde-base/ksaneplugin/ksaneplugin-4.4.2.ebuild
deleted file mode 100644
index cd3372681b59..000000000000
--- a/kde-base/ksaneplugin/ksaneplugin-4.4.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksaneplugin/ksaneplugin-4.4.2.ebuild,v 1.1 2010/03/30 21:31:44 spatz Exp $
-
-EAPI="3"
-
-KMNAME="kdegraphics"
-inherit kde4-meta
-
-DESCRIPTION="SANE Plugin for KDE"
-HOMEPAGE="http://www.kipi-plugins.org"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep libksane)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/ksaneplugin/ksaneplugin-4.4.3.ebuild b/kde-base/ksaneplugin/ksaneplugin-4.4.4.ebuild
index 47d3c99fa9a4..dd4b8cc3507f 100644
--- a/kde-base/ksaneplugin/ksaneplugin-4.4.3.ebuild
+++ b/kde-base/ksaneplugin/ksaneplugin-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksaneplugin/ksaneplugin-4.4.3.ebuild,v 1.1 2010/05/03 21:14:41 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksaneplugin/ksaneplugin-4.4.4.ebuild,v 1.1 2010/06/06 14:42:04 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kscd/ChangeLog b/kde-base/kscd/ChangeLog
index 0a99f840ffc9..c24192f8e6cc 100644
--- a/kde-base/kscd/ChangeLog
+++ b/kde-base/kscd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kscd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/ChangeLog,v 1.154 2010/05/03 21:59:51 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/ChangeLog,v 1.155 2010/06/06 14:42:14 scarabeus Exp $
+
+*kscd-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -kscd-4.4.2.ebuild,
+  -kscd-4.4.3.ebuild, +kscd-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kscd-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kscd/kscd-4.4.3.ebuild b/kde-base/kscd/kscd-4.4.3.ebuild
deleted file mode 100644
index 0ced4726a3a1..000000000000
--- a/kde-base/kscd/kscd-4.4.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/kscd-4.4.3.ebuild,v 1.1 2010/05/03 21:15:04 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdemultimedia"
-inherit kde4-meta
-
-DESCRIPTION="KDE CD player"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-DEPEND="
-	$(add_kdebase_dep libkcddb)
-	$(add_kdebase_dep libkcompactdisc)
-	media-libs/musicbrainz:1
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	libkcompactdisc/
-"
diff --git a/kde-base/kscd/kscd-4.4.2.ebuild b/kde-base/kscd/kscd-4.4.4.ebuild
index 49386a4739dc..e97cd7a2a2fa 100644
--- a/kde-base/kscd/kscd-4.4.2.ebuild
+++ b/kde-base/kscd/kscd-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/kscd-4.4.2.ebuild,v 1.1 2010/03/30 21:32:10 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/kscd-4.4.4.ebuild,v 1.1 2010/06/06 14:42:14 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kscreensaver/ChangeLog b/kde-base/kscreensaver/ChangeLog
index 1f25c33285c6..6e8c6b450b77 100644
--- a/kde-base/kscreensaver/ChangeLog
+++ b/kde-base/kscreensaver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kscreensaver
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/ChangeLog,v 1.157 2010/05/03 22:00:14 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/ChangeLog,v 1.158 2010/06/06 14:42:13 scarabeus Exp $
+
+*kscreensaver-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kscreensaver-4.4.2.ebuild, -kscreensaver-4.4.3.ebuild,
+  +kscreensaver-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kscreensaver-4.4.1.ebuild:
diff --git a/kde-base/kscreensaver/kscreensaver-4.4.2.ebuild b/kde-base/kscreensaver/kscreensaver-4.4.2.ebuild
deleted file mode 100644
index 92514cd94c0d..000000000000
--- a/kde-base/kscreensaver/kscreensaver-4.4.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/kscreensaver-4.4.2.ebuild,v 1.1 2010/03/30 21:32:40 spatz Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-workspace"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="KDE screensaver framework"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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" )
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with pam)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kscreensaver/kscreensaver-4.4.3.ebuild b/kde-base/kscreensaver/kscreensaver-4.4.4.ebuild
index cf417612b09f..e77cc3536073 100644
--- a/kde-base/kscreensaver/kscreensaver-4.4.3.ebuild
+++ b/kde-base/kscreensaver/kscreensaver-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/kscreensaver-4.4.3.ebuild,v 1.1 2010/05/03 21:15:32 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/kscreensaver-4.4.4.ebuild,v 1.1 2010/06/06 14:42:13 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kshisen/ChangeLog b/kde-base/kshisen/ChangeLog
index b37572e17918..ec7d2a9a3125 100644
--- a/kde-base/kshisen/ChangeLog
+++ b/kde-base/kshisen/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kshisen
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kshisen/ChangeLog,v 1.148 2010/05/03 22:00:30 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kshisen/ChangeLog,v 1.149 2010/06/06 14:42:15 scarabeus Exp $
+
+*kshisen-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kshisen-4.4.2.ebuild, -kshisen-4.4.3.ebuild, +kshisen-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kshisen-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kshisen/kshisen-4.4.3.ebuild b/kde-base/kshisen/kshisen-4.4.3.ebuild
deleted file mode 100644
index 19e3319b6ba0..000000000000
--- a/kde-base/kshisen/kshisen-4.4.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kshisen/kshisen-4.4.3.ebuild,v 1.1 2010/05/03 21:15:56 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="A KDE game similiar to Mahjongg"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-DEPEND="
-	$(add_kdebase_dep libkmahjongg)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/kshisen/kshisen-4.4.2.ebuild b/kde-base/kshisen/kshisen-4.4.4.ebuild
index 58768b5cc723..c4b80348b90c 100644
--- a/kde-base/kshisen/kshisen-4.4.2.ebuild
+++ b/kde-base/kshisen/kshisen-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kshisen/kshisen-4.4.2.ebuild,v 1.1 2010/03/30 21:33:08 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kshisen/kshisen-4.4.4.ebuild,v 1.1 2010/06/06 14:42:15 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/ksirk/ChangeLog b/kde-base/ksirk/ChangeLog
index 10ae7500f58f..e615a9e582eb 100644
--- a/kde-base/ksirk/ChangeLog
+++ b/kde-base/ksirk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/ksirk
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksirk/ChangeLog,v 1.46 2010/05/03 22:00:44 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksirk/ChangeLog,v 1.47 2010/06/06 14:42:01 scarabeus Exp $
+
+*ksirk-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -ksirk-4.4.2.ebuild,
+  -ksirk-4.4.3.ebuild, +ksirk-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -ksirk-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/ksirk/ksirk-4.4.3.ebuild b/kde-base/ksirk/ksirk-4.4.3.ebuild
deleted file mode 100644
index cd0efabee37e..000000000000
--- a/kde-base/ksirk/ksirk-4.4.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksirk/ksirk-4.4.3.ebuild,v 1.1 2010/05/03 21:16:21 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE: Ksirk is a KDE port of the board game risk"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-DEPEND="
-	app-crypt/qca:2
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/ksirk/ksirk-4.4.2.ebuild b/kde-base/ksirk/ksirk-4.4.4.ebuild
index b55dfaf19c96..cd199cb4e972 100644
--- a/kde-base/ksirk/ksirk-4.4.2.ebuild
+++ b/kde-base/ksirk/ksirk-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksirk/ksirk-4.4.2.ebuild,v 1.1 2010/03/30 21:33:35 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksirk/ksirk-4.4.4.ebuild,v 1.1 2010/06/06 14:42:01 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/ksmserver/ChangeLog b/kde-base/ksmserver/ChangeLog
index 8eda473b1238..b8b4e0a99c40 100644
--- a/kde-base/ksmserver/ChangeLog
+++ b/kde-base/ksmserver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/ksmserver
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmserver/ChangeLog,v 1.152 2010/05/03 22:01:00 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmserver/ChangeLog,v 1.153 2010/06/06 14:41:54 scarabeus Exp $
+
+*ksmserver-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -ksmserver-4.4.2.ebuild, -ksmserver-4.4.3.ebuild, +ksmserver-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -ksmserver-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/ksmserver/ksmserver-4.4.3.ebuild b/kde-base/ksmserver/ksmserver-4.4.3.ebuild
deleted file mode 100644
index 98ef4cd98e97..000000000000
--- a/kde-base/ksmserver/ksmserver-4.4.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmserver/ksmserver-4.4.3.ebuild,v 1.1 2010/05/03 21:16:43 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-workspace"
-inherit kde4-meta
-
-DESCRIPTION="The reliable KDE session manager that talks the standard X11R6"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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/ksmserver/ksmserver-4.4.2.ebuild b/kde-base/ksmserver/ksmserver-4.4.4.ebuild
index 168081e3ec44..77417ce462b0 100644
--- a/kde-base/ksmserver/ksmserver-4.4.2.ebuild
+++ b/kde-base/ksmserver/ksmserver-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmserver/ksmserver-4.4.2.ebuild,v 1.1 2010/03/30 21:34:02 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmserver/ksmserver-4.4.4.ebuild,v 1.1 2010/06/06 14:41:54 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/ksnapshot/ChangeLog b/kde-base/ksnapshot/ChangeLog
index 405521a68e28..29716c00590f 100644
--- a/kde-base/ksnapshot/ChangeLog
+++ b/kde-base/ksnapshot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/ksnapshot
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnapshot/ChangeLog,v 1.147 2010/05/03 22:01:16 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnapshot/ChangeLog,v 1.148 2010/06/06 14:41:55 scarabeus Exp $
+
+*ksnapshot-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -ksnapshot-4.4.2.ebuild, -ksnapshot-4.4.3.ebuild, +ksnapshot-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -ksnapshot-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/ksnapshot/ksnapshot-4.4.3.ebuild b/kde-base/ksnapshot/ksnapshot-4.4.3.ebuild
deleted file mode 100644
index 622c659d6558..000000000000
--- a/kde-base/ksnapshot/ksnapshot-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnapshot/ksnapshot-4.4.3.ebuild,v 1.1 2010/05/03 21:17:06 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdegraphics"
-inherit kde4-meta
-
-DESCRIPTION="KDE Screenshot Utility"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/ksnapshot/ksnapshot-4.4.2.ebuild b/kde-base/ksnapshot/ksnapshot-4.4.4.ebuild
index 8b3ff268c4d1..3a425f5a1420 100644
--- a/kde-base/ksnapshot/ksnapshot-4.4.2.ebuild
+++ b/kde-base/ksnapshot/ksnapshot-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnapshot/ksnapshot-4.4.2.ebuild,v 1.1 2010/03/30 21:34:28 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnapshot/ksnapshot-4.4.4.ebuild,v 1.1 2010/06/06 14:41:55 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kspaceduel/ChangeLog b/kde-base/kspaceduel/ChangeLog
index 79d7bed6194f..164f923dd30e 100644
--- a/kde-base/kspaceduel/ChangeLog
+++ b/kde-base/kspaceduel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kspaceduel
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kspaceduel/ChangeLog,v 1.147 2010/05/03 22:01:32 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kspaceduel/ChangeLog,v 1.148 2010/06/06 14:41:28 scarabeus Exp $
+
+*kspaceduel-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kspaceduel-4.4.2.ebuild, -kspaceduel-4.4.3.ebuild,
+  +kspaceduel-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kspaceduel-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kspaceduel/kspaceduel-4.4.3.ebuild b/kde-base/kspaceduel/kspaceduel-4.4.3.ebuild
deleted file mode 100644
index e5e2bde5d890..000000000000
--- a/kde-base/kspaceduel/kspaceduel-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kspaceduel/kspaceduel-4.4.3.ebuild,v 1.1 2010/05/03 21:17:30 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE Space Game"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/kspaceduel/kspaceduel-4.4.2.ebuild b/kde-base/kspaceduel/kspaceduel-4.4.4.ebuild
index ebf5b9eba142..47fb6894b249 100644
--- a/kde-base/kspaceduel/kspaceduel-4.4.2.ebuild
+++ b/kde-base/kspaceduel/kspaceduel-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kspaceduel/kspaceduel-4.4.2.ebuild,v 1.1 2010/03/30 21:34:55 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kspaceduel/kspaceduel-4.4.4.ebuild,v 1.1 2010/06/06 14:41:28 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/ksplash/ChangeLog b/kde-base/ksplash/ChangeLog
index 67d0d52180b3..70326e17a70a 100644
--- a/kde-base/ksplash/ChangeLog
+++ b/kde-base/ksplash/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/ksplash
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplash/ChangeLog,v 1.64 2010/05/16 12:13:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplash/ChangeLog,v 1.65 2010/06/06 14:41:58 scarabeus Exp $
+
+*ksplash-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -ksplash-4.4.2-r1.ebuild, -ksplash-4.4.3.ebuild, +ksplash-4.4.4.ebuild:
+  Remove old. Version bump.
 
   16 May 2010; Samuli Suominen <ssuominen@gentoo.org> ksplash-4.3.5.ebuild,
   +files/ksplash-4.3.5-libpng14.patch:
diff --git a/kde-base/ksplash/ksplash-4.4.2-r1.ebuild b/kde-base/ksplash/ksplash-4.4.2-r1.ebuild
deleted file mode 100644
index 9f007648b15f..000000000000
--- a/kde-base/ksplash/ksplash-4.4.2-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplash/ksplash-4.4.2-r1.ebuild,v 1.1 2010/05/03 18:32:39 reavertm Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-workspace"
-inherit kde4-meta
-
-DESCRIPTION="KDE splashscreen framework (the splashscreen of KDE itself, not of individual apps)"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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/ksplash/ksplash-4.4.3.ebuild b/kde-base/ksplash/ksplash-4.4.4.ebuild
index c55134023950..2bc7f523c721 100644
--- a/kde-base/ksplash/ksplash-4.4.3.ebuild
+++ b/kde-base/ksplash/ksplash-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplash/ksplash-4.4.3.ebuild,v 1.1 2010/05/03 21:17:54 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplash/ksplash-4.4.4.ebuild,v 1.1 2010/06/06 14:41:59 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/ksquares/ChangeLog b/kde-base/ksquares/ChangeLog
index 2217e8b5a3da..3762bdf7f5a4 100644
--- a/kde-base/ksquares/ChangeLog
+++ b/kde-base/ksquares/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/ksquares
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksquares/ChangeLog,v 1.58 2010/05/03 22:02:02 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksquares/ChangeLog,v 1.59 2010/06/06 14:41:31 scarabeus Exp $
+
+*ksquares-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -ksquares-4.4.2.ebuild, -ksquares-4.4.3.ebuild, +ksquares-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -ksquares-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/ksquares/ksquares-4.4.3.ebuild b/kde-base/ksquares/ksquares-4.4.3.ebuild
deleted file mode 100644
index f04547142a2d..000000000000
--- a/kde-base/ksquares/ksquares-4.4.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksquares/ksquares-4.4.3.ebuild,v 1.1 2010/05/03 21:18:18 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdegames"
-inherit games-ggz kde4-meta
-
-DESCRIPTION="KSquares is an implementation of the game squares for KDE4"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-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 /usr/share/ggz/modules
-	newins ${PN}/src/module.dsc ${P}.dsc || die "couldn't install .dsc file"
-}
-
-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/ksquares/ksquares-4.4.2.ebuild b/kde-base/ksquares/ksquares-4.4.4.ebuild
index 10ace2b0726f..7fceab5154d3 100644
--- a/kde-base/ksquares/ksquares-4.4.2.ebuild
+++ b/kde-base/ksquares/ksquares-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksquares/ksquares-4.4.2.ebuild,v 1.1 2010/03/30 21:35:50 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksquares/ksquares-4.4.4.ebuild,v 1.1 2010/06/06 14:41:31 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kstars/ChangeLog b/kde-base/kstars/ChangeLog
index f858fa750d38..4e79e5c6de1a 100644
--- a/kde-base/kstars/ChangeLog
+++ b/kde-base/kstars/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kstars
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/ChangeLog,v 1.161 2010/05/03 22:02:17 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/ChangeLog,v 1.162 2010/06/06 14:42:01 scarabeus Exp $
+
+*kstars-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -kstars-4.4.2.ebuild,
+  -kstars-4.4.3.ebuild, +kstars-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kstars-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kstars/kstars-4.4.3.ebuild b/kde-base/kstars/kstars-4.4.3.ebuild
deleted file mode 100644
index ee7fc7b65a65..000000000000
--- a/kde-base/kstars/kstars-4.4.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/kstars-4.4.3.ebuild,v 1.1 2010/05/03 21:18:42 alexxy Exp $
-EAPI="3"
-
-KMNAME="kdeedu"
-inherit kde4-meta
-
-DESCRIPTION="KDE Desktop Planetarium"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug fits +handbook indi"
-
-DEPEND="
-	$(add_kdebase_dep libkdeedu)
-	fits? ( >=sci-libs/cfitsio-0.390 )
-	indi? ( >=sci-libs/indilib-0.6[fits?] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3.80-solaris.patch
-)
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with fits CFitsio)
-		$(cmake-utils_use_with indi)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kstars/kstars-4.4.2.ebuild b/kde-base/kstars/kstars-4.4.4.ebuild
index 8737674d6979..4b2efb9ee6cc 100644
--- a/kde-base/kstars/kstars-4.4.2.ebuild
+++ b/kde-base/kstars/kstars-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/kstars-4.4.2.ebuild,v 1.1 2010/03/30 21:36:18 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/kstars-4.4.4.ebuild,v 1.1 2010/06/06 14:42:01 scarabeus Exp $
 EAPI="3"
 
 KMNAME="kdeedu"
diff --git a/kde-base/kstart/ChangeLog b/kde-base/kstart/ChangeLog
index 91dc48a09918..bfcbf5af3731 100644
--- a/kde-base/kstart/ChangeLog
+++ b/kde-base/kstart/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kstart
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstart/ChangeLog,v 1.130 2010/05/03 22:02:32 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstart/ChangeLog,v 1.131 2010/06/06 14:41:53 scarabeus Exp $
+
+*kstart-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -kstart-4.4.2.ebuild,
+  -kstart-4.4.3.ebuild, +kstart-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kstart-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kstart/kstart-4.4.3.ebuild b/kde-base/kstart/kstart-4.4.3.ebuild
deleted file mode 100644
index ac81cdc36941..000000000000
--- a/kde-base/kstart/kstart-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstart/kstart-4.4.3.ebuild,v 1.1 2010/05/03 21:19:05 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KDE: Utility to launch applications with special window properties"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kstart/kstart-4.4.2.ebuild b/kde-base/kstart/kstart-4.4.4.ebuild
index ccb1899a9846..dbb5582c8624 100644
--- a/kde-base/kstart/kstart-4.4.2.ebuild
+++ b/kde-base/kstart/kstart-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstart/kstart-4.4.2.ebuild,v 1.1 2010/03/30 21:36:45 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstart/kstart-4.4.4.ebuild,v 1.1 2010/06/06 14:41:53 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kstartperf/ChangeLog b/kde-base/kstartperf/ChangeLog
index fedf86373889..24366ad29c70 100644
--- a/kde-base/kstartperf/ChangeLog
+++ b/kde-base/kstartperf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kstartperf
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstartperf/ChangeLog,v 1.42 2010/05/03 22:02:47 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstartperf/ChangeLog,v 1.43 2010/06/06 14:41:32 scarabeus Exp $
+
+*kstartperf-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kstartperf-4.4.2.ebuild, -kstartperf-4.4.3.ebuild,
+  +kstartperf-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kstartperf-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kstartperf/kstartperf-4.4.2.ebuild b/kde-base/kstartperf/kstartperf-4.4.2.ebuild
deleted file mode 100644
index e56d5943b6da..000000000000
--- a/kde-base/kstartperf/kstartperf-4.4.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstartperf/kstartperf-4.4.2.ebuild,v 1.1 2010/03/30 21:37:09 spatz Exp $
-
-EAPI="3"
-
-KMNAME="kdesdk"
-inherit kde4-meta
-
-DESCRIPTION="Messures starting performance of applications"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kstartperf/kstartperf-4.4.3.ebuild b/kde-base/kstartperf/kstartperf-4.4.4.ebuild
index b39ceadf1192..fda4aa574812 100644
--- a/kde-base/kstartperf/kstartperf-4.4.3.ebuild
+++ b/kde-base/kstartperf/kstartperf-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstartperf/kstartperf-4.4.3.ebuild,v 1.1 2010/05/03 21:19:26 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstartperf/kstartperf-4.4.4.ebuild,v 1.1 2010/06/06 14:41:32 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kstartupconfig/ChangeLog b/kde-base/kstartupconfig/ChangeLog
index a608e0f03f2a..5968ab308664 100644
--- a/kde-base/kstartupconfig/ChangeLog
+++ b/kde-base/kstartupconfig/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kstartupconfig
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstartupconfig/ChangeLog,v 1.59 2010/05/03 22:03:02 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstartupconfig/ChangeLog,v 1.60 2010/06/06 14:41:48 scarabeus Exp $
+
+*kstartupconfig-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kstartupconfig-4.4.2.ebuild, -kstartupconfig-4.4.3.ebuild,
+  +kstartupconfig-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kstartupconfig-4.4.1.ebuild:
diff --git a/kde-base/kstartupconfig/kstartupconfig-4.4.3.ebuild b/kde-base/kstartupconfig/kstartupconfig-4.4.3.ebuild
deleted file mode 100644
index d36626e97af7..000000000000
--- a/kde-base/kstartupconfig/kstartupconfig-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstartupconfig/kstartupconfig-4.4.3.ebuild,v 1.1 2010/05/03 21:19:50 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-workspace"
-inherit kde4-meta
-
-DESCRIPTION="KDE: Utility to launch applications with special window properties"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kstartupconfig/kstartupconfig-4.4.2.ebuild b/kde-base/kstartupconfig/kstartupconfig-4.4.4.ebuild
index f41ba0892f09..a7dd012ad663 100644
--- a/kde-base/kstartupconfig/kstartupconfig-4.4.2.ebuild
+++ b/kde-base/kstartupconfig/kstartupconfig-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstartupconfig/kstartupconfig-4.4.2.ebuild,v 1.1 2010/03/30 21:37:37 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstartupconfig/kstartupconfig-4.4.4.ebuild,v 1.1 2010/06/06 14:41:48 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kstyles/ChangeLog b/kde-base/kstyles/ChangeLog
index d7354b2e47b9..2482b9e49cbd 100644
--- a/kde-base/kstyles/ChangeLog
+++ b/kde-base/kstyles/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kstyles
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstyles/ChangeLog,v 1.59 2010/05/04 08:15:02 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstyles/ChangeLog,v 1.60 2010/06/06 14:41:35 scarabeus Exp $
+
+*kstyles-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kstyles-4.4.2.ebuild, -kstyles-4.4.3.ebuild, +kstyles-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org> kstyles-4.4.3.ebuild:
   Restore accidently dropped ~x86-fbsd keyword on KDE SC 4.4.3
diff --git a/kde-base/kstyles/kstyles-4.4.3.ebuild b/kde-base/kstyles/kstyles-4.4.3.ebuild
deleted file mode 100644
index 05c6922aa928..000000000000
--- a/kde-base/kstyles/kstyles-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstyles/kstyles-4.4.3.ebuild,v 1.2 2010/05/04 08:15:02 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KDE: A set of different KDE styles."
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kstyles/kstyles-4.4.2.ebuild b/kde-base/kstyles/kstyles-4.4.4.ebuild
index 287bbaddfc39..52f531791b25 100644
--- a/kde-base/kstyles/kstyles-4.4.2.ebuild
+++ b/kde-base/kstyles/kstyles-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstyles/kstyles-4.4.2.ebuild,v 1.2 2010/05/03 06:02:24 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstyles/kstyles-4.4.4.ebuild,v 1.1 2010/06/06 14:41:35 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/ksudoku/ChangeLog b/kde-base/ksudoku/ChangeLog
index 56c0b2695ae2..6af2fdb7e1a8 100644
--- a/kde-base/ksudoku/ChangeLog
+++ b/kde-base/ksudoku/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/ksudoku
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksudoku/ChangeLog,v 1.60 2010/05/03 22:03:32 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksudoku/ChangeLog,v 1.61 2010/06/06 14:41:29 scarabeus Exp $
+
+*ksudoku-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -ksudoku-4.4.2.ebuild, -ksudoku-4.4.3.ebuild, +ksudoku-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -ksudoku-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/ksudoku/ksudoku-4.4.3.ebuild b/kde-base/ksudoku/ksudoku-4.4.3.ebuild
deleted file mode 100644
index b0e844631103..000000000000
--- a/kde-base/ksudoku/ksudoku-4.4.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksudoku/ksudoku-4.4.3.ebuild,v 1.1 2010/05/03 21:20:36 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdegames"
-OPENGL_REQUIRED="always"
-inherit kde4-meta
-
-DESCRIPTION="KDE Sudoku"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-RDEPEND="
-	!kdeprefix? ( !games-puzzle/ksudoku )
-"
diff --git a/kde-base/ksudoku/ksudoku-4.4.2.ebuild b/kde-base/ksudoku/ksudoku-4.4.4.ebuild
index e4e61e61b2c5..ee9be1285cbc 100644
--- a/kde-base/ksudoku/ksudoku-4.4.2.ebuild
+++ b/kde-base/ksudoku/ksudoku-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksudoku/ksudoku-4.4.2.ebuild,v 1.1 2010/03/30 21:38:28 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksudoku/ksudoku-4.4.4.ebuild,v 1.1 2010/06/06 14:41:29 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/ksysguard/ChangeLog b/kde-base/ksysguard/ChangeLog
index 313cdf1ba325..8741e32d0993 100644
--- a/kde-base/ksysguard/ChangeLog
+++ b/kde-base/ksysguard/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/ksysguard
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ChangeLog,v 1.176 2010/05/03 22:03:47 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ChangeLog,v 1.177 2010/06/06 14:41:18 scarabeus Exp $
+
+*ksysguard-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -ksysguard-4.4.2.ebuild, -ksysguard-4.4.3.ebuild, +ksysguard-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -ksysguard-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/ksysguard/ksysguard-4.4.3.ebuild b/kde-base/ksysguard/ksysguard-4.4.3.ebuild
deleted file mode 100644
index 5bcf0688ef40..000000000000
--- a/kde-base/ksysguard/ksysguard-4.4.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ksysguard-4.4.3.ebuild,v 1.1 2010/05/03 21:20:59 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-workspace"
-CPPUNIT_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="KSysguard is a network enabled task manager and system monitor application."
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook lm_sensors"
-
-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
-}
diff --git a/kde-base/ksysguard/ksysguard-4.4.2.ebuild b/kde-base/ksysguard/ksysguard-4.4.4.ebuild
index 6bfd75c63344..904dbc27304a 100644
--- a/kde-base/ksysguard/ksysguard-4.4.2.ebuild
+++ b/kde-base/ksysguard/ksysguard-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ksysguard-4.4.2.ebuild,v 1.1 2010/03/30 21:38:53 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ksysguard-4.4.4.ebuild,v 1.1 2010/06/06 14:41:18 scarabeus Exp $
 
 EAPI="3"
 
@@ -33,3 +33,10 @@ src_configure() {
 
 	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 62870528a6d1..9425e6a18f5a 100644
--- a/kde-base/ksystemlog/ChangeLog
+++ b/kde-base/ksystemlog/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/ksystemlog
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksystemlog/ChangeLog,v 1.47 2010/05/03 22:04:02 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksystemlog/ChangeLog,v 1.48 2010/06/06 14:41:50 scarabeus Exp $
+
+*ksystemlog-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -ksystemlog-4.4.2.ebuild, -ksystemlog-4.4.3.ebuild,
+  +ksystemlog-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -ksystemlog-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/ksystemlog/ksystemlog-4.4.3.ebuild b/kde-base/ksystemlog/ksystemlog-4.4.3.ebuild
deleted file mode 100644
index 96f61ec1dd08..000000000000
--- a/kde-base/ksystemlog/ksystemlog-4.4.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksystemlog/ksystemlog-4.4.3.ebuild,v 1.1 2010/05/03 21:21:22 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdeadmin"
-
-inherit kde4-meta
-
-DESCRIPTION="KDE system log viewer"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-# Tests hang, last checked in 4.3.3
-RESTRICT="test"
diff --git a/kde-base/ksystemlog/ksystemlog-4.4.2.ebuild b/kde-base/ksystemlog/ksystemlog-4.4.4.ebuild
index deadaa4b8710..90a1675312aa 100644
--- a/kde-base/ksystemlog/ksystemlog-4.4.2.ebuild
+++ b/kde-base/ksystemlog/ksystemlog-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksystemlog/ksystemlog-4.4.2.ebuild,v 1.1 2010/03/30 21:39:19 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksystemlog/ksystemlog-4.4.4.ebuild,v 1.1 2010/06/06 14:41:50 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/ksystraycmd/ChangeLog b/kde-base/ksystraycmd/ChangeLog
index 350a6f14a614..d9f58420ea32 100644
--- a/kde-base/ksystraycmd/ChangeLog
+++ b/kde-base/ksystraycmd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/ksystraycmd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksystraycmd/ChangeLog,v 1.137 2010/05/03 22:04:17 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksystraycmd/ChangeLog,v 1.138 2010/06/06 14:41:46 scarabeus Exp $
+
+*ksystraycmd-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -ksystraycmd-4.4.2.ebuild, -ksystraycmd-4.4.3.ebuild,
+  +ksystraycmd-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -ksystraycmd-4.4.1.ebuild:
diff --git a/kde-base/ksystraycmd/ksystraycmd-4.4.3.ebuild b/kde-base/ksystraycmd/ksystraycmd-4.4.3.ebuild
deleted file mode 100644
index 3d4c59cf3929..000000000000
--- a/kde-base/ksystraycmd/ksystraycmd-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksystraycmd/ksystraycmd-4.4.3.ebuild,v 1.1 2010/05/03 21:21:46 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-workspace"
-inherit kde4-meta
-
-DESCRIPTION="Ksystraycmd embeds applications given as argument into the system tray."
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/ksystraycmd/ksystraycmd-4.4.2.ebuild b/kde-base/ksystraycmd/ksystraycmd-4.4.4.ebuild
index 9bb0ecb06cda..eb1e8a26d098 100644
--- a/kde-base/ksystraycmd/ksystraycmd-4.4.2.ebuild
+++ b/kde-base/ksystraycmd/ksystraycmd-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksystraycmd/ksystraycmd-4.4.2.ebuild,v 1.1 2010/03/30 21:39:45 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksystraycmd/ksystraycmd-4.4.4.ebuild,v 1.1 2010/06/06 14:41:46 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kteatime/ChangeLog b/kde-base/kteatime/ChangeLog
index d1d13131a728..b0a972d235be 100644
--- a/kde-base/kteatime/ChangeLog
+++ b/kde-base/kteatime/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kteatime
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kteatime/ChangeLog,v 1.146 2010/05/03 22:04:32 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kteatime/ChangeLog,v 1.147 2010/06/06 14:41:46 scarabeus Exp $
+
+*kteatime-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kteatime-4.4.2.ebuild, -kteatime-4.4.3.ebuild, +kteatime-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kteatime-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kteatime/kteatime-4.4.3.ebuild b/kde-base/kteatime/kteatime-4.4.3.ebuild
deleted file mode 100644
index bb41cbaac827..000000000000
--- a/kde-base/kteatime/kteatime-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kteatime/kteatime-4.4.3.ebuild,v 1.1 2010/05/03 21:22:12 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdetoys"
-inherit kde4-meta
-
-DESCRIPTION="KDE utility for making a fine cup of tea"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/kteatime/kteatime-4.4.2.ebuild b/kde-base/kteatime/kteatime-4.4.4.ebuild
index d052e4686909..3d16eccdbdb6 100644
--- a/kde-base/kteatime/kteatime-4.4.2.ebuild
+++ b/kde-base/kteatime/kteatime-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kteatime/kteatime-4.4.2.ebuild,v 1.1 2010/03/30 21:40:10 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kteatime/kteatime-4.4.4.ebuild,v 1.1 2010/06/06 14:41:46 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/ktimer/ChangeLog b/kde-base/ktimer/ChangeLog
index 4258165d76a6..fc77979d1e1f 100644
--- a/kde-base/ktimer/ChangeLog
+++ b/kde-base/ktimer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/ktimer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimer/ChangeLog,v 1.146 2010/05/03 22:04:47 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimer/ChangeLog,v 1.147 2010/06/06 14:42:00 scarabeus Exp $
+
+*ktimer-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -ktimer-4.4.2.ebuild,
+  -ktimer-4.4.3.ebuild, +ktimer-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -ktimer-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/ktimer/ktimer-4.4.3.ebuild b/kde-base/ktimer/ktimer-4.4.3.ebuild
deleted file mode 100644
index f7e8d76f881e..000000000000
--- a/kde-base/ktimer/ktimer-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimer/ktimer-4.4.3.ebuild,v 1.1 2010/05/03 21:22:34 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdeutils"
-inherit kde4-meta
-
-DESCRIPTION="KDE Timer"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/ktimer/ktimer-4.4.2.ebuild b/kde-base/ktimer/ktimer-4.4.4.ebuild
index 7ca3ffa69847..6ca0cffdb6b1 100644
--- a/kde-base/ktimer/ktimer-4.4.2.ebuild
+++ b/kde-base/ktimer/ktimer-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimer/ktimer-4.4.2.ebuild,v 1.1 2010/03/30 21:40:36 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimer/ktimer-4.4.4.ebuild,v 1.1 2010/06/06 14:42:00 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/ktimetracker/ChangeLog b/kde-base/ktimetracker/ChangeLog
index 8dff0f242c05..4c64929947c9 100644
--- a/kde-base/ktimetracker/ChangeLog
+++ b/kde-base/ktimetracker/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/ktimetracker
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimetracker/ChangeLog,v 1.49 2010/05/03 22:05:01 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimetracker/ChangeLog,v 1.50 2010/06/06 14:41:44 scarabeus Exp $
+
+*ktimetracker-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -ktimetracker-4.4.2.ebuild, -ktimetracker-4.4.3.ebuild,
+  +ktimetracker-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -ktimetracker-4.4.1.ebuild:
diff --git a/kde-base/ktimetracker/ktimetracker-4.4.2.ebuild b/kde-base/ktimetracker/ktimetracker-4.4.2.ebuild
deleted file mode 100644
index 3a88523bcd6c..000000000000
--- a/kde-base/ktimetracker/ktimetracker-4.4.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimetracker/ktimetracker-4.4.2.ebuild,v 1.1 2010/03/30 21:41:01 spatz Exp $
-
-EAPI="3"
-
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="KTimeTracker tracks time spent on various tasks."
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-RDEPEND="
-	$(add_kdebase_dep kdepim-kresources)
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep libkdepim)
-	x11-libs/libXScrnSaver
-"
-DEPEND="${RDEPEND}
-	x11-proto/scrnsaverproto
-"
-
-KMEXTRACTONLY="
-	kresources/
-"
-
-KMLOADLIBS="libkdepim"
-
-src_unpack() {
-	if use kontact; then
-		KMEXTRA="${KMEXTRA} kontact/plugins/ktimetracker"
-	fi
-
-	kde4-meta_src_unpack
-}
diff --git a/kde-base/ktimetracker/ktimetracker-4.4.3.ebuild b/kde-base/ktimetracker/ktimetracker-4.4.4.ebuild
index df069948ded9..52c648e6675b 100644
--- a/kde-base/ktimetracker/ktimetracker-4.4.3.ebuild
+++ b/kde-base/ktimetracker/ktimetracker-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimetracker/ktimetracker-4.4.3.ebuild,v 1.1 2010/05/03 21:22:57 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimetracker/ktimetracker-4.4.4.ebuild,v 1.1 2010/06/06 14:41:44 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/ktimezoned/ChangeLog b/kde-base/ktimezoned/ChangeLog
index 0dd18d60aab7..d06432a9fdea 100644
--- a/kde-base/ktimezoned/ChangeLog
+++ b/kde-base/ktimezoned/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/ktimezoned
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimezoned/ChangeLog,v 1.59 2010/05/04 08:15:20 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimezoned/ChangeLog,v 1.60 2010/06/06 14:41:41 scarabeus Exp $
+
+*ktimezoned-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -ktimezoned-4.4.2.ebuild, -ktimezoned-4.4.3.ebuild,
+  +ktimezoned-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org> ktimezoned-4.4.3.ebuild:
   Restore accidently dropped ~x86-fbsd keyword on KDE SC 4.4.3
diff --git a/kde-base/ktimezoned/ktimezoned-4.4.2.ebuild b/kde-base/ktimezoned/ktimezoned-4.4.2.ebuild
deleted file mode 100644
index b45cf1dfa28f..000000000000
--- a/kde-base/ktimezoned/ktimezoned-4.4.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimezoned/ktimezoned-4.4.2.ebuild,v 1.2 2010/05/03 06:17:03 aballier Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KDE: Timezone daemon"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/ktimezoned/ktimezoned-4.4.3.ebuild b/kde-base/ktimezoned/ktimezoned-4.4.4.ebuild
index 34c1ddab0aba..821b39f7bbd1 100644
--- a/kde-base/ktimezoned/ktimezoned-4.4.3.ebuild
+++ b/kde-base/ktimezoned/ktimezoned-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimezoned/ktimezoned-4.4.3.ebuild,v 1.2 2010/05/04 08:15:20 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimezoned/ktimezoned-4.4.4.ebuild,v 1.1 2010/06/06 14:41:41 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/ktouch/ChangeLog b/kde-base/ktouch/ChangeLog
index 1097ddedbb20..f50bcaacc726 100644
--- a/kde-base/ktouch/ChangeLog
+++ b/kde-base/ktouch/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/ktouch
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktouch/ChangeLog,v 1.156 2010/05/03 22:05:38 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktouch/ChangeLog,v 1.157 2010/06/06 14:41:20 scarabeus Exp $
+
+*ktouch-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -ktouch-4.4.2.ebuild,
+  -ktouch-4.4.3.ebuild, +ktouch-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -ktouch-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/ktouch/ktouch-4.4.3.ebuild b/kde-base/ktouch/ktouch-4.4.3.ebuild
deleted file mode 100644
index 721374c9fba2..000000000000
--- a/kde-base/ktouch/ktouch-4.4.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktouch/ktouch-4.4.3.ebuild,v 1.1 2010/05/03 21:23:42 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdeedu"
-inherit kde4-meta
-
-DESCRIPTION="KDE: A program that helps you to learn and practice touch typing"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-RDEPEND="
-	$(add_kdebase_dep knotify)
-"
diff --git a/kde-base/ktouch/ktouch-4.4.2.ebuild b/kde-base/ktouch/ktouch-4.4.4.ebuild
index 7af88ffdda6b..efdabe5b28c8 100644
--- a/kde-base/ktouch/ktouch-4.4.2.ebuild
+++ b/kde-base/ktouch/ktouch-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktouch/ktouch-4.4.2.ebuild,v 1.1 2010/03/30 21:41:53 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktouch/ktouch-4.4.4.ebuild,v 1.1 2010/06/06 14:41:20 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/ktraderclient/ChangeLog b/kde-base/ktraderclient/ChangeLog
index 59f38d1a86c8..d94a65297283 100644
--- a/kde-base/ktraderclient/ChangeLog
+++ b/kde-base/ktraderclient/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/ktraderclient
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktraderclient/ChangeLog,v 1.59 2010/05/04 08:15:38 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktraderclient/ChangeLog,v 1.60 2010/06/06 14:42:02 scarabeus Exp $
+
+*ktraderclient-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -ktraderclient-4.4.2.ebuild, -ktraderclient-4.4.3.ebuild,
+  +ktraderclient-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   ktraderclient-4.4.3.ebuild:
diff --git a/kde-base/ktraderclient/ktraderclient-4.4.3.ebuild b/kde-base/ktraderclient/ktraderclient-4.4.3.ebuild
deleted file mode 100644
index adb860f83978..000000000000
--- a/kde-base/ktraderclient/ktraderclient-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktraderclient/ktraderclient-4.4.3.ebuild,v 1.2 2010/05/04 08:15:38 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-runtime"
-inherit kde4-meta
-
-DESCRIPTION="A command-line tool for querying the KDE trader system"
-IUSE="debug"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
diff --git a/kde-base/ktraderclient/ktraderclient-4.4.2.ebuild b/kde-base/ktraderclient/ktraderclient-4.4.4.ebuild
index fb42c40d12cc..18bb4f0ed6c1 100644
--- a/kde-base/ktraderclient/ktraderclient-4.4.2.ebuild
+++ b/kde-base/ktraderclient/ktraderclient-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktraderclient/ktraderclient-4.4.2.ebuild,v 1.2 2010/05/03 06:16:35 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktraderclient/ktraderclient-4.4.4.ebuild,v 1.1 2010/06/06 14:42:03 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/ktron/ChangeLog b/kde-base/ktron/ChangeLog
index b7f4fc42bb12..0fc2701ec292 100644
--- a/kde-base/ktron/ChangeLog
+++ b/kde-base/ktron/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/ktron
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktron/ChangeLog,v 1.123 2010/05/03 22:06:07 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktron/ChangeLog,v 1.124 2010/06/06 14:41:56 scarabeus Exp $
+
+*ktron-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -ktron-4.4.2.ebuild,
+  -ktron-4.4.3.ebuild, +ktron-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -ktron-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/ktron/ktron-4.4.3.ebuild b/kde-base/ktron/ktron-4.4.3.ebuild
deleted file mode 100644
index 397f037cda4f..000000000000
--- a/kde-base/ktron/ktron-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktron/ktron-4.4.3.ebuild,v 1.1 2010/05/03 21:24:28 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE Tron game"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/ktron/ktron-4.4.2.ebuild b/kde-base/ktron/ktron-4.4.4.ebuild
index 12ce7df42b6c..9c792fc51586 100644
--- a/kde-base/ktron/ktron-4.4.2.ebuild
+++ b/kde-base/ktron/ktron-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktron/ktron-4.4.2.ebuild,v 1.1 2010/03/30 21:42:44 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktron/ktron-4.4.4.ebuild,v 1.1 2010/06/06 14:41:56 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kttsd/ChangeLog b/kde-base/kttsd/ChangeLog
index ba56a8ebf08c..5759c7b0ad57 100644
--- a/kde-base/kttsd/ChangeLog
+++ b/kde-base/kttsd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kttsd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kttsd/ChangeLog,v 1.156 2010/05/03 22:06:23 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kttsd/ChangeLog,v 1.157 2010/06/06 14:41:39 scarabeus Exp $
+
+*kttsd-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -kttsd-4.4.2.ebuild,
+  -kttsd-4.4.3.ebuild, +kttsd-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kttsd-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kttsd/kttsd-4.4.3.ebuild b/kde-base/kttsd/kttsd-4.4.3.ebuild
deleted file mode 100644
index c7ac37ab6f6f..000000000000
--- a/kde-base/kttsd/kttsd-4.4.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kttsd/kttsd-4.4.3.ebuild,v 1.1 2010/05/03 21:24:50 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdeaccessibility"
-
-inherit kde4-meta
-
-DESCRIPTION="KDE text-to-speech"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="alsa debug epos festival flite freetts +handbook mbrola"
-
-DEPEND="
-	app-accessibility/speech-dispatcher
-	alsa? ( media-libs/alsa-lib )
-"
-RDEPEND="${DEPEND}
-	epos? ( app-accessibility/epos )
-	festival? ( app-accessibility/festival )
-	flite? ( app-accessibility/flite )
-	freetts? ( app-accessibility/freetts )
-	mbrola? ( app-accessibility/mbrola )
-"
-
-src_configure() {
-	mycmakeargs=(
-		-DKDE4_KTTSD_COMMAND=ON
-		-DKDE4_KTTSD_PHONON=ON
-		$(cmake-utils_use alsa KDE4_KTTSD_ALSA)
-		$(cmake-utils_use epos KDE4_KTTSD_EPOS)
-		$(cmake-utils_use festival KDE4_KTTSD_FESTIVAL)
-		$(cmake-utils_use flite KDE4_KTTSD_FLITE)
-		$(cmake-utils_use freetts KDE4_KTTSD_FREETTS)
-		$(cmake-utils_use mbrola KDE4_KTTSD_HADIFIX)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kttsd/kttsd-4.4.2.ebuild b/kde-base/kttsd/kttsd-4.4.4.ebuild
index a1f0522ad909..3fd82999a235 100644
--- a/kde-base/kttsd/kttsd-4.4.2.ebuild
+++ b/kde-base/kttsd/kttsd-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kttsd/kttsd-4.4.2.ebuild,v 1.1 2010/03/30 21:43:10 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kttsd/kttsd-4.4.4.ebuild,v 1.1 2010/06/06 14:41:39 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/ktuberling/ChangeLog b/kde-base/ktuberling/ChangeLog
index ed6498d575a0..76ac9d902db7 100644
--- a/kde-base/ktuberling/ChangeLog
+++ b/kde-base/ktuberling/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/ktuberling
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktuberling/ChangeLog,v 1.147 2010/05/03 22:06:38 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktuberling/ChangeLog,v 1.148 2010/06/06 14:42:02 scarabeus Exp $
+
+*ktuberling-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -ktuberling-4.4.2.ebuild, -ktuberling-4.4.3.ebuild,
+  +ktuberling-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -ktuberling-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/ktuberling/ktuberling-4.4.3.ebuild b/kde-base/ktuberling/ktuberling-4.4.3.ebuild
deleted file mode 100644
index baaf07f8aea5..000000000000
--- a/kde-base/ktuberling/ktuberling-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktuberling/ktuberling-4.4.3.ebuild,v 1.1 2010/05/03 21:25:13 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE: potato game for kids"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/ktuberling/ktuberling-4.4.2.ebuild b/kde-base/ktuberling/ktuberling-4.4.4.ebuild
index 9ce919511f93..1f03a7124b79 100644
--- a/kde-base/ktuberling/ktuberling-4.4.2.ebuild
+++ b/kde-base/ktuberling/ktuberling-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktuberling/ktuberling-4.4.2.ebuild,v 1.1 2010/03/30 21:43:39 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktuberling/ktuberling-4.4.4.ebuild,v 1.1 2010/06/06 14:42:02 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kturtle/ChangeLog b/kde-base/kturtle/ChangeLog
index 04d12f9d47d8..86b384055b6d 100644
--- a/kde-base/kturtle/ChangeLog
+++ b/kde-base/kturtle/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kturtle
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kturtle/ChangeLog,v 1.149 2010/05/03 22:06:53 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kturtle/ChangeLog,v 1.150 2010/06/06 14:41:45 scarabeus Exp $
+
+*kturtle-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kturtle-4.4.2.ebuild, -kturtle-4.4.3.ebuild, +kturtle-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kturtle-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kturtle/kturtle-4.4.3.ebuild b/kde-base/kturtle/kturtle-4.4.3.ebuild
deleted file mode 100644
index 0be728e357a7..000000000000
--- a/kde-base/kturtle/kturtle-4.4.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kturtle/kturtle-4.4.3.ebuild,v 1.1 2010/05/03 21:25:36 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdeedu"
-inherit kde4-meta
-
-DESCRIPTION="KDE: Educational programming environment using the Logo programming language"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-RDEPEND="
-	$(add_kdebase_dep knotify)
-"
diff --git a/kde-base/kturtle/kturtle-4.4.2.ebuild b/kde-base/kturtle/kturtle-4.4.4.ebuild
index 4e22dfd31540..2de6d17e02e3 100644
--- a/kde-base/kturtle/kturtle-4.4.2.ebuild
+++ b/kde-base/kturtle/kturtle-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kturtle/kturtle-4.4.2.ebuild,v 1.1 2010/03/30 21:44:05 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kturtle/kturtle-4.4.4.ebuild,v 1.1 2010/06/06 14:41:45 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/ktux/ChangeLog b/kde-base/ktux/ChangeLog
index 72299bbbb886..fb999328e8e4 100644
--- a/kde-base/ktux/ChangeLog
+++ b/kde-base/ktux/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/ktux
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktux/ChangeLog,v 1.144 2010/05/03 22:07:08 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktux/ChangeLog,v 1.145 2010/06/06 14:41:26 scarabeus Exp $
+
+*ktux-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -ktux-4.4.2.ebuild,
+  -ktux-4.4.3.ebuild, +ktux-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -ktux-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/ktux/ktux-4.4.3.ebuild b/kde-base/ktux/ktux-4.4.3.ebuild
deleted file mode 100644
index d73dc426c4ef..000000000000
--- a/kde-base/ktux/ktux-4.4.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktux/ktux-4.4.3.ebuild,v 1.1 2010/05/03 21:25:58 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdetoys"
-inherit kde4-meta
-
-DESCRIPTION="KDE: screensaver featuring the Space-Faring Tux"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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}"
-
-src_prepare() {
-	sed -i -e's/${KDE4WORKSPACE_KSCREENSAVER_LIBRARY}/kscreensaver/' \
-		"${PN}"/CMakeLists.txt || die "Failed to patch CMakeLists.txt"
-
-	kde4-meta_src_prepare
-}
diff --git a/kde-base/ktux/ktux-4.4.2.ebuild b/kde-base/ktux/ktux-4.4.4.ebuild
index 1f9b688fc145..bb7cceeea617 100644
--- a/kde-base/ktux/ktux-4.4.2.ebuild
+++ b/kde-base/ktux/ktux-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktux/ktux-4.4.2.ebuild,v 1.1 2010/03/30 21:44:30 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktux/ktux-4.4.4.ebuild,v 1.1 2010/06/06 14:41:26 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kubrick/ChangeLog b/kde-base/kubrick/ChangeLog
index f3e21867408c..745c2b7f8190 100644
--- a/kde-base/kubrick/ChangeLog
+++ b/kde-base/kubrick/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kubrick
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kubrick/ChangeLog,v 1.45 2010/05/03 22:07:24 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kubrick/ChangeLog,v 1.46 2010/06/06 14:42:00 scarabeus Exp $
+
+*kubrick-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kubrick-4.4.2.ebuild, -kubrick-4.4.3.ebuild, +kubrick-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kubrick-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kubrick/kubrick-4.4.3.ebuild b/kde-base/kubrick/kubrick-4.4.3.ebuild
deleted file mode 100644
index c10c0854ca29..000000000000
--- a/kde-base/kubrick/kubrick-4.4.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kubrick/kubrick-4.4.3.ebuild,v 1.1 2010/05/03 21:26:21 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdegames"
-OPENGL_REQUIRED="always"
-inherit kde4-meta
-
-DESCRIPTION="KDE: Kubrick is a games based on \"Rubik\'s Cube\" puzzle."
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/kubrick/kubrick-4.4.2.ebuild b/kde-base/kubrick/kubrick-4.4.4.ebuild
index 0482fd8c2ac2..35ab650428dd 100644
--- a/kde-base/kubrick/kubrick-4.4.2.ebuild
+++ b/kde-base/kubrick/kubrick-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kubrick/kubrick-4.4.2.ebuild,v 1.1 2010/03/30 21:44:57 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kubrick/kubrick-4.4.4.ebuild,v 1.1 2010/06/06 14:42:00 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kuiserver/ChangeLog b/kde-base/kuiserver/ChangeLog
index 3f2d8b75d6be..5103a57f05c3 100644
--- a/kde-base/kuiserver/ChangeLog
+++ b/kde-base/kuiserver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kuiserver
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kuiserver/ChangeLog,v 1.59 2010/05/04 08:15:55 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kuiserver/ChangeLog,v 1.60 2010/06/06 14:41:27 scarabeus Exp $
+
+*kuiserver-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kuiserver-4.4.2.ebuild, -kuiserver-4.4.3.ebuild, +kuiserver-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org> kuiserver-4.4.3.ebuild:
   Restore accidently dropped ~x86-fbsd keyword on KDE SC 4.4.3
diff --git a/kde-base/kuiserver/kuiserver-4.4.3.ebuild b/kde-base/kuiserver/kuiserver-4.4.3.ebuild
deleted file mode 100644
index 4423ccb510d0..000000000000
--- a/kde-base/kuiserver/kuiserver-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kuiserver/kuiserver-4.4.3.ebuild,v 1.2 2010/05/04 08:15:55 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KDE: Progress Info UI server"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kuiserver/kuiserver-4.4.2.ebuild b/kde-base/kuiserver/kuiserver-4.4.4.ebuild
index e365e72e0f07..076da630e264 100644
--- a/kde-base/kuiserver/kuiserver-4.4.2.ebuild
+++ b/kde-base/kuiserver/kuiserver-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kuiserver/kuiserver-4.4.2.ebuild,v 1.2 2010/05/03 07:13:12 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kuiserver/kuiserver-4.4.4.ebuild,v 1.1 2010/06/06 14:41:27 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kuiviewer/ChangeLog b/kde-base/kuiviewer/ChangeLog
index 39a693bdefbd..f23593765d4e 100644
--- a/kde-base/kuiviewer/ChangeLog
+++ b/kde-base/kuiviewer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kuiviewer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kuiviewer/ChangeLog,v 1.131 2010/05/03 22:07:56 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kuiviewer/ChangeLog,v 1.132 2010/06/06 14:41:58 scarabeus Exp $
+
+*kuiviewer-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kuiviewer-4.4.2.ebuild, -kuiviewer-4.4.3.ebuild, +kuiviewer-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kuiviewer-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kuiviewer/kuiviewer-4.4.3.ebuild b/kde-base/kuiviewer/kuiviewer-4.4.3.ebuild
deleted file mode 100644
index 581277b76117..000000000000
--- a/kde-base/kuiviewer/kuiviewer-4.4.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kuiviewer/kuiviewer-4.4.3.ebuild,v 1.1 2010/05/03 21:27:06 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdesdk"
-
-inherit kde4-meta
-
-DESCRIPTION="KDE utility that displays and tests UI files generated by Qt Designer."
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kuiviewer/kuiviewer-4.4.2.ebuild b/kde-base/kuiviewer/kuiviewer-4.4.4.ebuild
index 365bc4dbf60e..95975118b4be 100644
--- a/kde-base/kuiviewer/kuiviewer-4.4.2.ebuild
+++ b/kde-base/kuiviewer/kuiviewer-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kuiviewer/kuiviewer-4.4.2.ebuild,v 1.1 2010/03/30 21:45:48 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kuiviewer/kuiviewer-4.4.4.ebuild,v 1.1 2010/06/06 14:41:58 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kurifilter-plugins/ChangeLog b/kde-base/kurifilter-plugins/ChangeLog
index 6d51b241b380..7f377ff3a25a 100644
--- a/kde-base/kurifilter-plugins/ChangeLog
+++ b/kde-base/kurifilter-plugins/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kurifilter-plugins
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kurifilter-plugins/ChangeLog,v 1.57 2010/05/03 22:08:11 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kurifilter-plugins/ChangeLog,v 1.58 2010/06/06 14:42:18 scarabeus Exp $
+
+*kurifilter-plugins-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kurifilter-plugins-4.4.2.ebuild, -kurifilter-plugins-4.4.3.ebuild,
+  +kurifilter-plugins-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kurifilter-plugins-4.4.1.ebuild:
diff --git a/kde-base/kurifilter-plugins/kurifilter-plugins-4.4.3.ebuild b/kde-base/kurifilter-plugins/kurifilter-plugins-4.4.3.ebuild
deleted file mode 100644
index 76d6040a3253..000000000000
--- a/kde-base/kurifilter-plugins/kurifilter-plugins-4.4.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2010 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.4.3.ebuild,v 1.1 2010/05/03 21:27:33 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KDE: Plugins to manage filtering URIs."
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-RESTRICT="test" # Tests segfault. Last checked on 4.0.3.
diff --git a/kde-base/kurifilter-plugins/kurifilter-plugins-4.4.2.ebuild b/kde-base/kurifilter-plugins/kurifilter-plugins-4.4.4.ebuild
index 9abb55869a15..ddf4bcfe2fb5 100644
--- a/kde-base/kurifilter-plugins/kurifilter-plugins-4.4.2.ebuild
+++ b/kde-base/kurifilter-plugins/kurifilter-plugins-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.1 2010/03/30 21:46:13 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kurifilter-plugins/kurifilter-plugins-4.4.4.ebuild,v 1.1 2010/06/06 14:42:18 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kuser/ChangeLog b/kde-base/kuser/ChangeLog
index f3b972e6a1a3..8bcc31f9761e 100644
--- a/kde-base/kuser/ChangeLog
+++ b/kde-base/kuser/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kuser
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kuser/ChangeLog,v 1.147 2010/05/03 22:08:26 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kuser/ChangeLog,v 1.148 2010/06/06 14:41:22 scarabeus Exp $
+
+*kuser-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -kuser-4.4.2.ebuild,
+  -kuser-4.4.3.ebuild, +kuser-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kuser-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kuser/kuser-4.4.3.ebuild b/kde-base/kuser/kuser-4.4.3.ebuild
deleted file mode 100644
index f338de2512fd..000000000000
--- a/kde-base/kuser/kuser-4.4.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kuser/kuser-4.4.3.ebuild,v 1.1 2010/05/03 21:27:56 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdeadmin"
-
-inherit kde4-meta
-
-DESCRIPTION="KDE application that helps you manage system users"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-"
-# notify is needed for dialogs
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep knotify)
-"
diff --git a/kde-base/kuser/kuser-4.4.2.ebuild b/kde-base/kuser/kuser-4.4.4.ebuild
index 60aee820c4db..349c9a3613fd 100644
--- a/kde-base/kuser/kuser-4.4.2.ebuild
+++ b/kde-base/kuser/kuser-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kuser/kuser-4.4.2.ebuild,v 1.1 2010/03/30 21:46:38 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kuser/kuser-4.4.4.ebuild,v 1.1 2010/06/06 14:41:22 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kvtml-data/ChangeLog b/kde-base/kvtml-data/ChangeLog
index 88b78d6c7178..e33896243d3f 100644
--- a/kde-base/kvtml-data/ChangeLog
+++ b/kde-base/kvtml-data/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kvtml-data
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kvtml-data/ChangeLog,v 1.19 2010/05/03 22:08:42 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kvtml-data/ChangeLog,v 1.20 2010/06/06 14:41:42 scarabeus Exp $
+
+*kvtml-data-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kvtml-data-4.4.2.ebuild, -kvtml-data-4.4.3.ebuild,
+  +kvtml-data-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kvtml-data-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kvtml-data/kvtml-data-4.4.3.ebuild b/kde-base/kvtml-data/kvtml-data-4.4.3.ebuild
deleted file mode 100644
index 8bfaaec7e363..000000000000
--- a/kde-base/kvtml-data/kvtml-data-4.4.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kvtml-data/kvtml-data-4.4.3.ebuild,v 1.1 2010/05/03 21:28:21 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdeedu"
-KMMODULE="data"
-inherit kde4-meta
-
-DESCRIPTION="Kvtml data for various KDE games"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/kde-base/kvtml-data/kvtml-data-4.4.2.ebuild b/kde-base/kvtml-data/kvtml-data-4.4.4.ebuild
index e054e2c11aee..26a6f5961f2a 100644
--- a/kde-base/kvtml-data/kvtml-data-4.4.2.ebuild
+++ b/kde-base/kvtml-data/kvtml-data-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kvtml-data/kvtml-data-4.4.2.ebuild,v 1.1 2010/03/30 21:47:03 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kvtml-data/kvtml-data-4.4.4.ebuild,v 1.1 2010/06/06 14:41:42 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kwallet/ChangeLog b/kde-base/kwallet/ChangeLog
index 35e88b0cf915..bdbf0ea52058 100644
--- a/kde-base/kwallet/ChangeLog
+++ b/kde-base/kwallet/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kwallet
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwallet/ChangeLog,v 1.56 2010/05/03 22:08:58 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwallet/ChangeLog,v 1.57 2010/06/06 14:42:16 scarabeus Exp $
+
+*kwallet-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kwallet-4.4.2.ebuild, -kwallet-4.4.3.ebuild, +kwallet-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kwallet-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kwallet/kwallet-4.4.2.ebuild b/kde-base/kwallet/kwallet-4.4.2.ebuild
deleted file mode 100644
index df7428efe23e..000000000000
--- a/kde-base/kwallet/kwallet-4.4.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwallet/kwallet-4.4.2.ebuild,v 1.1 2010/03/30 21:47:30 spatz Exp $
-
-EAPI="3"
-
-KMNAME="kdeutils"
-inherit kde4-meta
-
-DESCRIPTION="KDE Wallet Management Tool"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/kwallet/kwallet-4.4.3.ebuild b/kde-base/kwallet/kwallet-4.4.4.ebuild
index faf4f1b01704..3619497e4c23 100644
--- a/kde-base/kwallet/kwallet-4.4.3.ebuild
+++ b/kde-base/kwallet/kwallet-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwallet/kwallet-4.4.3.ebuild,v 1.1 2010/05/03 21:28:42 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwallet/kwallet-4.4.4.ebuild,v 1.1 2010/06/06 14:42:16 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kwalletd/ChangeLog b/kde-base/kwalletd/ChangeLog
index 3c3f941f3077..e5754d23ec37 100644
--- a/kde-base/kwalletd/ChangeLog
+++ b/kde-base/kwalletd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kwalletd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwalletd/ChangeLog,v 1.44 2010/05/04 08:16:13 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwalletd/ChangeLog,v 1.45 2010/06/06 14:41:35 scarabeus Exp $
+
+*kwalletd-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kwalletd-4.4.2.ebuild, -kwalletd-4.4.3.ebuild, +kwalletd-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org> kwalletd-4.4.3.ebuild:
   Restore accidently dropped ~x86-fbsd keyword on KDE SC 4.4.3
diff --git a/kde-base/kwalletd/kwalletd-4.4.3.ebuild b/kde-base/kwalletd/kwalletd-4.4.3.ebuild
deleted file mode 100644
index e140eb703986..000000000000
--- a/kde-base/kwalletd/kwalletd-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwalletd/kwalletd-4.4.3.ebuild,v 1.2 2010/05/04 08:16:13 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-runtime"
-inherit kde4-meta
-
-DESCRIPTION="KDE Password Server"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kwalletd/kwalletd-4.4.2.ebuild b/kde-base/kwalletd/kwalletd-4.4.4.ebuild
index a17e45431c00..2d1d0056b8b2 100644
--- a/kde-base/kwalletd/kwalletd-4.4.2.ebuild
+++ b/kde-base/kwalletd/kwalletd-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwalletd/kwalletd-4.4.2.ebuild,v 1.2 2010/05/03 06:46:17 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwalletd/kwalletd-4.4.4.ebuild,v 1.1 2010/06/06 14:41:35 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kweather/ChangeLog b/kde-base/kweather/ChangeLog
index c8da196b20fa..43e9cc279154 100644
--- a/kde-base/kweather/ChangeLog
+++ b/kde-base/kweather/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kweather
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kweather/ChangeLog,v 1.152 2010/05/03 22:09:32 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kweather/ChangeLog,v 1.153 2010/06/06 14:42:16 scarabeus Exp $
+
+*kweather-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kweather-4.4.2.ebuild, -kweather-4.4.3.ebuild, +kweather-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kweather-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kweather/kweather-4.4.2.ebuild b/kde-base/kweather/kweather-4.4.2.ebuild
deleted file mode 100644
index 4b77f2c8a303..000000000000
--- a/kde-base/kweather/kweather-4.4.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kweather/kweather-4.4.2.ebuild,v 1.1 2010/03/30 21:48:26 spatz Exp $
-
-EAPI="3"
-
-KMNAME="kdetoys"
-inherit kde4-meta
-
-DESCRIPTION="KDE weather service daemon"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/kweather/kweather-4.4.3.ebuild b/kde-base/kweather/kweather-4.4.4.ebuild
index 2ad746bed8b9..963bf7b46c3d 100644
--- a/kde-base/kweather/kweather-4.4.3.ebuild
+++ b/kde-base/kweather/kweather-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kweather/kweather-4.4.3.ebuild,v 1.1 2010/05/03 21:29:26 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kweather/kweather-4.4.4.ebuild,v 1.1 2010/06/06 14:42:16 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kwin/ChangeLog b/kde-base/kwin/ChangeLog
index 9507053dfdbd..b409df27f198 100644
--- a/kde-base/kwin/ChangeLog
+++ b/kde-base/kwin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kwin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.196 2010/05/04 00:51:37 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.197 2010/06/06 14:41:58 scarabeus Exp $
+
+*kwin-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -kwin-4.4.2.ebuild,
+  -kwin-4.4.3.ebuild, +kwin-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Maciej Mrozowski <reavertm@gentoo.org> kwin-4.4.2.ebuild,
   +files/kwin-4.4.2-xinerama_cmake_automagic.patch, kwin-4.4.3.ebuild:
diff --git a/kde-base/kwin/kwin-4.4.3.ebuild b/kde-base/kwin/kwin-4.4.3.ebuild
deleted file mode 100644
index 88ea2091b298..000000000000
--- a/kde-base/kwin/kwin-4.4.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.4.3.ebuild,v 1.2 2010/05/04 00:51:37 reavertm Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-workspace"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="KDE window manager"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug xcomposite xinerama"
-
-# NOTE disabled for now: captury? ( media-libs/libcaptury )
-COMMONDEPEND="
-	$(add_kdebase_dep kephal)
-	$(add_kdebase_dep libkworkspace)
-	x11-libs/libXdamage
-	x11-libs/libXfixes
-	>=x11-libs/libXrandr-1.2.1
-	x11-libs/libXrender
-	opengl? ( virtual/opengl )
-	xcomposite? ( x11-libs/libXcomposite )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${COMMONDEPEND}
-	x11-proto/damageproto
-	x11-proto/fixesproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	xcomposite? ( x11-proto/compositeproto )
-	xinerama? ( x11-proto/xineramaproto )
-"
-RDEPEND="${COMMONDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
-)
-
-src_prepare() {
-# NOTE uncomment when enabled again by upstream
-#	if ! use captury; then
-#		sed -e 's:^PKGCONFIG..libcaptury:#DONOTFIND &:' \
-#			-i kwin/effects/CMakeLists.txt || \
-#			die "Making captury optional failed."
-#	fi
-
-	kde4-meta_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with xinerama X11_Xinerama)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kwin/kwin-4.4.2.ebuild b/kde-base/kwin/kwin-4.4.4.ebuild
index 2bd99687e53f..2b7d8ba32d70 100644
--- a/kde-base/kwin/kwin-4.4.2.ebuild
+++ b/kde-base/kwin/kwin-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.4.2.ebuild,v 1.2 2010/05/04 00:51:37 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.4.4.ebuild,v 1.1 2010/06/06 14:41:58 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kwordquiz/ChangeLog b/kde-base/kwordquiz/ChangeLog
index b59ecde87a9b..b7137e4833e2 100644
--- a/kde-base/kwordquiz/ChangeLog
+++ b/kde-base/kwordquiz/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kwordquiz
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwordquiz/ChangeLog,v 1.152 2010/05/03 22:10:07 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwordquiz/ChangeLog,v 1.153 2010/06/06 14:42:08 scarabeus Exp $
+
+*kwordquiz-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kwordquiz-4.4.2.ebuild, -kwordquiz-4.4.3.ebuild, +kwordquiz-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kwordquiz-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kwordquiz/kwordquiz-4.4.3.ebuild b/kde-base/kwordquiz/kwordquiz-4.4.3.ebuild
deleted file mode 100644
index 7bfe2ad6adc1..000000000000
--- a/kde-base/kwordquiz/kwordquiz-4.4.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwordquiz/kwordquiz-4.4.3.ebuild,v 1.1 2010/05/03 21:30:15 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdeedu"
-inherit kde4-meta
-
-DESCRIPTION="KDE: A powerful flashcard and vocabulary learning program"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-DEPEND="
-	$(add_kdebase_dep libkdeedu)
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kvtml-data)
-"
-
-KMEXTRACTONLY="
-	libkdeedu/keduvocdocument
-"
diff --git a/kde-base/kwordquiz/kwordquiz-4.4.2.ebuild b/kde-base/kwordquiz/kwordquiz-4.4.4.ebuild
index d2a4c335e0ac..20df0b0e3a9f 100644
--- a/kde-base/kwordquiz/kwordquiz-4.4.2.ebuild
+++ b/kde-base/kwordquiz/kwordquiz-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwordquiz/kwordquiz-4.4.2.ebuild,v 1.1 2010/03/30 21:49:16 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwordquiz/kwordquiz-4.4.4.ebuild,v 1.1 2010/06/06 14:42:08 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kwrite/ChangeLog b/kde-base/kwrite/ChangeLog
index a179c6f68873..ccd84c158114 100644
--- a/kde-base/kwrite/ChangeLog
+++ b/kde-base/kwrite/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kwrite
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwrite/ChangeLog,v 1.60 2010/05/03 22:10:23 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwrite/ChangeLog,v 1.61 2010/06/06 14:42:04 scarabeus Exp $
+
+*kwrite-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -kwrite-4.4.2.ebuild,
+  -kwrite-4.4.3.ebuild, +kwrite-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kwrite-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kwrite/kwrite-4.4.3.ebuild b/kde-base/kwrite/kwrite-4.4.3.ebuild
deleted file mode 100644
index c48927213d9f..000000000000
--- a/kde-base/kwrite/kwrite-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwrite/kwrite-4.4.3.ebuild,v 1.1 2010/05/03 21:30:38 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-apps"
-inherit kde4-meta
-
-DESCRIPTION="KDE MDI editor/IDE"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/kwrite/kwrite-4.4.2.ebuild b/kde-base/kwrite/kwrite-4.4.4.ebuild
index ab197f0813ba..96ed0a08ae27 100644
--- a/kde-base/kwrite/kwrite-4.4.2.ebuild
+++ b/kde-base/kwrite/kwrite-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwrite/kwrite-4.4.2.ebuild,v 1.1 2010/03/30 21:49:39 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwrite/kwrite-4.4.4.ebuild,v 1.1 2010/06/06 14:42:04 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/kwrited/ChangeLog b/kde-base/kwrited/ChangeLog
index b0fca46b19ae..38d8ae3df1ad 100644
--- a/kde-base/kwrited/ChangeLog
+++ b/kde-base/kwrited/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kwrited
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwrited/ChangeLog,v 1.43 2010/05/03 22:10:40 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwrited/ChangeLog,v 1.44 2010/06/06 14:41:21 scarabeus Exp $
+
+*kwrited-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kwrited-4.4.2.ebuild, -kwrited-4.4.3.ebuild, +kwrited-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kwrited-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/kwrited/kwrited-4.4.2.ebuild b/kde-base/kwrited/kwrited-4.4.2.ebuild
deleted file mode 100644
index 0d255b6ed228..000000000000
--- a/kde-base/kwrited/kwrited-4.4.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwrited/kwrited-4.4.2.ebuild,v 1.1 2010/03/30 21:50:03 spatz Exp $
-
-EAPI="3"
-KMNAME="kdebase-workspace"
-inherit kde4-meta
-
-DESCRIPTION="KDE daemon listening for wall and write messages."
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	>=sys-libs/libutempter-1.1.5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/kwrited/kwrited-4.4.3.ebuild b/kde-base/kwrited/kwrited-4.4.4.ebuild
index 69a45b823344..9cf50bc22e8e 100644
--- a/kde-base/kwrited/kwrited-4.4.3.ebuild
+++ b/kde-base/kwrited/kwrited-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwrited/kwrited-4.4.3.ebuild,v 1.1 2010/05/03 21:31:01 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwrited/kwrited-4.4.4.ebuild,v 1.1 2010/06/06 14:41:21 scarabeus Exp $
 
 EAPI="3"
 KMNAME="kdebase-workspace"
diff --git a/kde-base/libkcddb/ChangeLog b/kde-base/libkcddb/ChangeLog
index 4a79bf7090fa..f10f4ed981d6 100644
--- a/kde-base/libkcddb/ChangeLog
+++ b/kde-base/libkcddb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/libkcddb
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcddb/ChangeLog,v 1.150 2010/05/03 22:10:57 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcddb/ChangeLog,v 1.151 2010/06/06 14:42:17 scarabeus Exp $
+
+*libkcddb-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -libkcddb-4.4.2.ebuild, -libkcddb-4.4.3.ebuild, +libkcddb-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -libkcddb-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/libkcddb/libkcddb-4.4.3.ebuild b/kde-base/libkcddb/libkcddb-4.4.3.ebuild
deleted file mode 100644
index 3700e9a0ea48..000000000000
--- a/kde-base/libkcddb/libkcddb-4.4.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcddb/libkcddb-4.4.3.ebuild,v 1.1 2010/05/03 21:31:24 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdemultimedia"
-inherit kde4-meta
-
-DESCRIPTION="KDE library for CDDB"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug musicbrainz"
-
-# tests fail / timeout, last checked for 4.2.89
-RESTRICT=test
-
-DEPEND="
-	musicbrainz? ( media-libs/musicbrainz:1 )
-"
-RDEPEND="${DEPEND}"
-
-KMSAVELIBS="true"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with musicbrainz MusicBrainz)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/libkcddb/libkcddb-4.4.2.ebuild b/kde-base/libkcddb/libkcddb-4.4.4.ebuild
index f8bd28a6b55d..da5eba1658af 100644
--- a/kde-base/libkcddb/libkcddb-4.4.2.ebuild
+++ b/kde-base/libkcddb/libkcddb-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcddb/libkcddb-4.4.2.ebuild,v 1.1 2010/03/30 21:50:27 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcddb/libkcddb-4.4.4.ebuild,v 1.1 2010/06/06 14:42:17 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/libkcompactdisc/ChangeLog b/kde-base/libkcompactdisc/ChangeLog
index 441f72bd27e5..ce0cf85eb9e3 100644
--- a/kde-base/libkcompactdisc/ChangeLog
+++ b/kde-base/libkcompactdisc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/libkcompactdisc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcompactdisc/ChangeLog,v 1.57 2010/05/03 22:11:13 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcompactdisc/ChangeLog,v 1.58 2010/06/06 14:41:56 scarabeus Exp $
+
+*libkcompactdisc-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -libkcompactdisc-4.4.2.ebuild, -libkcompactdisc-4.4.3.ebuild,
+  +libkcompactdisc-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -libkcompactdisc-4.4.1.ebuild:
diff --git a/kde-base/libkcompactdisc/libkcompactdisc-4.4.2.ebuild b/kde-base/libkcompactdisc/libkcompactdisc-4.4.2.ebuild
deleted file mode 100644
index dcd25ed951d3..000000000000
--- a/kde-base/libkcompactdisc/libkcompactdisc-4.4.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcompactdisc/libkcompactdisc-4.4.2.ebuild,v 1.1 2010/03/30 21:50:50 spatz Exp $
-
-EAPI="3"
-
-KMNAME="kdemultimedia"
-inherit kde4-meta
-
-DESCRIPTION="KDE library for playing & ripping CDs"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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/libkcompactdisc/libkcompactdisc-4.4.3.ebuild b/kde-base/libkcompactdisc/libkcompactdisc-4.4.4.ebuild
index 7a420d499774..e4930327f7fa 100644
--- a/kde-base/libkcompactdisc/libkcompactdisc-4.4.3.ebuild
+++ b/kde-base/libkcompactdisc/libkcompactdisc-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcompactdisc/libkcompactdisc-4.4.3.ebuild,v 1.1 2010/05/03 21:31:47 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcompactdisc/libkcompactdisc-4.4.4.ebuild,v 1.1 2010/06/06 14:41:56 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/libkdcraw/ChangeLog b/kde-base/libkdcraw/ChangeLog
index 4c1e0a9a32ba..554b919ae60f 100644
--- a/kde-base/libkdcraw/ChangeLog
+++ b/kde-base/libkdcraw/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/libkdcraw
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdcraw/ChangeLog,v 1.50 2010/05/03 22:11:30 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdcraw/ChangeLog,v 1.51 2010/06/06 14:42:16 scarabeus Exp $
+
+*libkdcraw-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -libkdcraw-4.4.2.ebuild, -libkdcraw-4.4.3.ebuild, +libkdcraw-4.4.4.ebuild:
+  Remove old. Version bump.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -libkdcraw-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/libkdcraw/libkdcraw-4.4.3.ebuild b/kde-base/libkdcraw/libkdcraw-4.4.3.ebuild
deleted file mode 100644
index a1788563afcf..000000000000
--- a/kde-base/libkdcraw/libkdcraw-4.4.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdcraw/libkdcraw-4.4.3.ebuild,v 1.1 2010/05/03 21:32:11 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdegraphics"
-KMMODULE="libs/${PN}"
-
-inherit kde4-meta
-
-DESCRIPTION="KDE Image Plugin Interface: a dcraw library wrapper"
-HOMEPAGE="http://www.kipi-plugins.org"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	media-libs/jpeg
-	media-libs/lcms
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/libkdcraw/libkdcraw-4.4.2.ebuild b/kde-base/libkdcraw/libkdcraw-4.4.4.ebuild
index afb7eeb2afb6..ae361b76a853 100644
--- a/kde-base/libkdcraw/libkdcraw-4.4.2.ebuild
+++ b/kde-base/libkdcraw/libkdcraw-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdcraw/libkdcraw-4.4.2.ebuild,v 1.1 2010/03/30 21:51:12 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdcraw/libkdcraw-4.4.4.ebuild,v 1.1 2010/06/06 14:42:16 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/libkdeedu/ChangeLog b/kde-base/libkdeedu/ChangeLog
index 01561c97f42c..1e199b81d8a6 100644
--- a/kde-base/libkdeedu/ChangeLog
+++ b/kde-base/libkdeedu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/libkdeedu
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdeedu/ChangeLog,v 1.150 2010/05/04 05:45:32 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdeedu/ChangeLog,v 1.151 2010/06/06 14:41:39 scarabeus Exp $
+
+*libkdeedu-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -libkdeedu-4.4.2.ebuild, -libkdeedu-4.4.3.ebuild, +libkdeedu-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -libkdeedu-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/libkdeedu/libkdeedu-4.4.3.ebuild b/kde-base/libkdeedu/libkdeedu-4.4.3.ebuild
deleted file mode 100644
index 67806cfc4a5a..000000000000
--- a/kde-base/libkdeedu/libkdeedu-4.4.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdeedu/libkdeedu-4.4.3.ebuild,v 1.1 2010/05/03 21:32:36 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdeedu"
-inherit kde4-meta
-
-DESCRIPTION="Common library for KDE educational apps"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-# 4 of 4 tests fail. Last checked for 4.2.87
-RESTRICT=test
-
-src_install() {
-	kde4-meta_src_install
-	# This is installed by kde-base/marble
-	rm "${ED}"/${KDEDIR}/share/apps/cmake/modules/FindMarbleWidget.cmake
-}
diff --git a/kde-base/libkdeedu/libkdeedu-4.4.2.ebuild b/kde-base/libkdeedu/libkdeedu-4.4.4.ebuild
index f8e42c3d522b..bdedb3325624 100644
--- a/kde-base/libkdeedu/libkdeedu-4.4.2.ebuild
+++ b/kde-base/libkdeedu/libkdeedu-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdeedu/libkdeedu-4.4.2.ebuild,v 1.1 2010/03/30 21:51:37 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdeedu/libkdeedu-4.4.4.ebuild,v 1.1 2010/06/06 14:41:39 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/libkdegames/ChangeLog b/kde-base/libkdegames/ChangeLog
index a7eca4a445d8..18356f010e44 100644
--- a/kde-base/libkdegames/ChangeLog
+++ b/kde-base/libkdegames/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/libkdegames
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdegames/ChangeLog,v 1.153 2010/05/04 05:45:47 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdegames/ChangeLog,v 1.154 2010/06/06 14:41:52 scarabeus Exp $
+
+*libkdegames-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -libkdegames-4.4.2.ebuild, -libkdegames-4.4.3.ebuild,
+  +libkdegames-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -libkdegames-4.4.1.ebuild:
diff --git a/kde-base/libkdegames/libkdegames-4.4.3.ebuild b/kde-base/libkdegames/libkdegames-4.4.3.ebuild
deleted file mode 100644
index 62b1585df235..000000000000
--- a/kde-base/libkdegames/libkdegames-4.4.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdegames/libkdegames-4.4.3.ebuild,v 1.1 2010/05/03 21:33:01 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="Base library common to many KDE games."
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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/libkdegames/libkdegames-4.4.2.ebuild b/kde-base/libkdegames/libkdegames-4.4.4.ebuild
index a078a2f8ec4c..79403991accd 100644
--- a/kde-base/libkdegames/libkdegames-4.4.2.ebuild
+++ b/kde-base/libkdegames/libkdegames-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdegames/libkdegames-4.4.2.ebuild,v 1.1 2010/03/30 21:52:03 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdegames/libkdegames-4.4.4.ebuild,v 1.1 2010/06/06 14:41:52 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/libkdepim/ChangeLog b/kde-base/libkdepim/ChangeLog
index d71a7a77adc4..08b8793c4bae 100644
--- a/kde-base/libkdepim/ChangeLog
+++ b/kde-base/libkdepim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/libkdepim
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/ChangeLog,v 1.158 2010/06/05 14:58:33 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/ChangeLog,v 1.159 2010/06/06 14:42:01 scarabeus Exp $
+
+*libkdepim-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -libkdepim-4.4.2.ebuild, -libkdepim-4.4.3.ebuild, +libkdepim-4.4.4.ebuild:
+  Remove old. Version bump.
 
   05 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org>
   libkdepim-4.4.2.ebuild, libkdepim-4.4.3.ebuild:
diff --git a/kde-base/libkdepim/libkdepim-4.4.3.ebuild b/kde-base/libkdepim/libkdepim-4.4.3.ebuild
deleted file mode 100644
index 705097d4dc94..000000000000
--- a/kde-base/libkdepim/libkdepim-4.4.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/libkdepim-4.4.3.ebuild,v 1.2 2010/06/05 14:58:33 reavertm Exp $
-
-EAPI="3"
-
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="Common library for KDE PIM apps"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
-"
-RDEPEND="${DEPEND}"
-
-# @Since >4.2.65 kode removed from kdepim
-add_blocker kode
-
-KMEXTRACTONLY="
-	korganizer/korgac/org.kde.korganizer.KOrgac.xml
-"
-
-KMSAVELIBS="true"
-
-src_install() {
-	kde4-meta_src_install
-
-	# install additional generated headers that are needed by other packages that
-	# are derived from kdepim. e.g. kmail.
-	pushd "${CMAKE_BUILD_DIR}/libkdepim/" 2>/dev/null || die "pushd libkdepim failed"
-	insinto "${PREFIX}/include"
-	doins ui_addresspicker.h ui_categoryselectdialog_base.h || die "Failed to install extra header files."
-	popd 2>/dev/null
-}
diff --git a/kde-base/libkdepim/libkdepim-4.4.2.ebuild b/kde-base/libkdepim/libkdepim-4.4.4.ebuild
index 2d7c3c48a02f..05321385f6f6 100644
--- a/kde-base/libkdepim/libkdepim-4.4.2.ebuild
+++ b/kde-base/libkdepim/libkdepim-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/libkdepim-4.4.2.ebuild,v 1.2 2010/06/05 14:58:33 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/libkdepim-4.4.4.ebuild,v 1.1 2010/06/06 14:42:01 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/libkexiv2/ChangeLog b/kde-base/libkexiv2/ChangeLog
index e33ee0df9f19..3a5905b9a6da 100644
--- a/kde-base/libkexiv2/ChangeLog
+++ b/kde-base/libkexiv2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/libkexiv2
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkexiv2/ChangeLog,v 1.48 2010/05/04 05:46:16 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkexiv2/ChangeLog,v 1.49 2010/06/06 14:41:34 scarabeus Exp $
+
+*libkexiv2-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -libkexiv2-4.4.2.ebuild, -libkexiv2-4.4.3.ebuild, +libkexiv2-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -libkexiv2-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/libkexiv2/libkexiv2-4.4.3.ebuild b/kde-base/libkexiv2/libkexiv2-4.4.3.ebuild
deleted file mode 100644
index 60541794ca44..000000000000
--- a/kde-base/libkexiv2/libkexiv2-4.4.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkexiv2/libkexiv2-4.4.3.ebuild,v 1.1 2010/05/03 21:33:47 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdegraphics"
-KMMODULE="libs/libkexiv2"
-inherit kde4-meta
-
-DESCRIPTION="KDE Image Plugin Interface: an exiv2 library wrapper"
-HOMEPAGE="http://www.kipi-plugins.org"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	>=media-gfx/exiv2-0.18
-	media-libs/jpeg
-	media-libs/lcms
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/libkexiv2/libkexiv2-4.4.2.ebuild b/kde-base/libkexiv2/libkexiv2-4.4.4.ebuild
index 4406bd53f6fe..c9584015ef7a 100644
--- a/kde-base/libkexiv2/libkexiv2-4.4.2.ebuild
+++ b/kde-base/libkexiv2/libkexiv2-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkexiv2/libkexiv2-4.4.2.ebuild,v 1.1 2010/03/30 21:52:49 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkexiv2/libkexiv2-4.4.4.ebuild,v 1.1 2010/06/06 14:41:34 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/libkipi/ChangeLog b/kde-base/libkipi/ChangeLog
index 173fc5933391..cd318c301618 100644
--- a/kde-base/libkipi/ChangeLog
+++ b/kde-base/libkipi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/libkipi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkipi/ChangeLog,v 1.48 2010/05/04 05:46:30 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkipi/ChangeLog,v 1.49 2010/06/06 14:41:32 scarabeus Exp $
+
+*libkipi-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -libkipi-4.4.2.ebuild, -libkipi-4.4.3.ebuild, +libkipi-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -libkipi-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/libkipi/libkipi-4.4.2.ebuild b/kde-base/libkipi/libkipi-4.4.2.ebuild
deleted file mode 100644
index 5b9ff55babf3..000000000000
--- a/kde-base/libkipi/libkipi-4.4.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkipi/libkipi-4.4.2.ebuild,v 1.1 2010/03/30 21:53:10 spatz Exp $
-
-EAPI="3"
-
-KMNAME="kdegraphics"
-KMMODULE="libs/${PN}"
-inherit kde4-meta
-
-DESCRIPTION="A library for image plugins accross KDE applications."
-HOMEPAGE="http://www.kipi-plugins.org"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/libkipi/libkipi-4.4.3.ebuild b/kde-base/libkipi/libkipi-4.4.4.ebuild
index 40b6892c577a..44b2de481036 100644
--- a/kde-base/libkipi/libkipi-4.4.3.ebuild
+++ b/kde-base/libkipi/libkipi-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkipi/libkipi-4.4.3.ebuild,v 1.1 2010/05/03 21:34:08 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkipi/libkipi-4.4.4.ebuild,v 1.1 2010/06/06 14:41:32 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/libkleo/ChangeLog b/kde-base/libkleo/ChangeLog
index a475d06aed9d..2898c21c2d8d 100644
--- a/kde-base/libkleo/ChangeLog
+++ b/kde-base/libkleo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/libkleo
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkleo/ChangeLog,v 1.47 2010/05/04 05:46:44 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkleo/ChangeLog,v 1.48 2010/06/06 14:41:43 scarabeus Exp $
+
+*libkleo-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -libkleo-4.4.2.ebuild, -libkleo-4.4.3.ebuild, +libkleo-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -libkleo-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/libkleo/libkleo-4.4.3.ebuild b/kde-base/libkleo/libkleo-4.4.3.ebuild
deleted file mode 100644
index 302cbe0588c6..000000000000
--- a/kde-base/libkleo/libkleo-4.4.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkleo/libkleo-4.4.3.ebuild,v 1.1 2010/05/03 21:34:31 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="KDE library for encryption handling."
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	app-crypt/gpgme
-	$(add_kdebase_dep kdepimlibs)
-"
-RDEPEND="${DEPEND}
-	app-crypt/gnupg
-"
-
-KMSAVELIBS="true"
-KMEXTRACTONLY="kleopatra/"
diff --git a/kde-base/libkleo/libkleo-4.4.2.ebuild b/kde-base/libkleo/libkleo-4.4.4.ebuild
index 7d8184947fa3..6440d6974fc0 100644
--- a/kde-base/libkleo/libkleo-4.4.2.ebuild
+++ b/kde-base/libkleo/libkleo-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkleo/libkleo-4.4.2.ebuild,v 1.1 2010/03/30 21:53:32 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkleo/libkleo-4.4.4.ebuild,v 1.1 2010/06/06 14:41:43 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/libkmahjongg/ChangeLog b/kde-base/libkmahjongg/ChangeLog
index 3f6ced6beedd..e18a2c69e87c 100644
--- a/kde-base/libkmahjongg/ChangeLog
+++ b/kde-base/libkmahjongg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/libkmahjongg
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkmahjongg/ChangeLog,v 1.55 2010/05/04 05:46:59 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkmahjongg/ChangeLog,v 1.56 2010/06/06 14:42:01 scarabeus Exp $
+
+*libkmahjongg-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -libkmahjongg-4.4.2.ebuild, -libkmahjongg-4.4.3.ebuild,
+  +libkmahjongg-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -libkmahjongg-4.4.1.ebuild:
diff --git a/kde-base/libkmahjongg/libkmahjongg-4.4.3.ebuild b/kde-base/libkmahjongg/libkmahjongg-4.4.3.ebuild
deleted file mode 100644
index 4612c422cc32..000000000000
--- a/kde-base/libkmahjongg/libkmahjongg-4.4.3.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkmahjongg/libkmahjongg-4.4.3.ebuild,v 1.1 2010/05/03 21:34:54 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="LibKMahjongg for KDE"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-KMLOADLIBS="libkdegames"
diff --git a/kde-base/libkmahjongg/libkmahjongg-4.4.2.ebuild b/kde-base/libkmahjongg/libkmahjongg-4.4.4.ebuild
index 28e6a3219fa7..719eae317d2a 100644
--- a/kde-base/libkmahjongg/libkmahjongg-4.4.2.ebuild
+++ b/kde-base/libkmahjongg/libkmahjongg-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkmahjongg/libkmahjongg-4.4.2.ebuild,v 1.1 2010/03/30 21:53:54 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkmahjongg/libkmahjongg-4.4.4.ebuild,v 1.1 2010/06/06 14:42:01 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/libkonq/ChangeLog b/kde-base/libkonq/ChangeLog
index 74aa0ae9d4b7..2d31a985d930 100644
--- a/kde-base/libkonq/ChangeLog
+++ b/kde-base/libkonq/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/libkonq
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkonq/ChangeLog,v 1.158 2010/05/04 05:47:13 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkonq/ChangeLog,v 1.159 2010/06/06 14:41:33 scarabeus Exp $
+
+*libkonq-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -libkonq-4.4.2.ebuild, -libkonq-4.4.3.ebuild, +libkonq-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -libkonq-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/libkonq/libkonq-4.4.3.ebuild b/kde-base/libkonq/libkonq-4.4.3.ebuild
deleted file mode 100644
index bf5b98dc98c4..000000000000
--- a/kde-base/libkonq/libkonq-4.4.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkonq/libkonq-4.4.3.ebuild,v 1.1 2010/05/03 21:35:20 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-apps"
-KMMODULE="lib/konq"
-CPPUNIT_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="The embeddable part of konqueror"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-RESTRICT="test"
-
-KMSAVELIBS="true"
-
-PATCHES=( "${FILESDIR}/fix_includes_install.patch" )
diff --git a/kde-base/libkonq/libkonq-4.4.2.ebuild b/kde-base/libkonq/libkonq-4.4.4.ebuild
index addbc552eab5..6a9c4fafed73 100644
--- a/kde-base/libkonq/libkonq-4.4.2.ebuild
+++ b/kde-base/libkonq/libkonq-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkonq/libkonq-4.4.2.ebuild,v 1.1 2010/03/30 21:54:18 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkonq/libkonq-4.4.4.ebuild,v 1.1 2010/06/06 14:41:33 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/libkpgp/ChangeLog b/kde-base/libkpgp/ChangeLog
index 248b24b89958..cddab6bffbf8 100644
--- a/kde-base/libkpgp/ChangeLog
+++ b/kde-base/libkpgp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/libkpgp
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkpgp/ChangeLog,v 1.126 2010/05/04 05:47:28 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkpgp/ChangeLog,v 1.127 2010/06/06 14:42:03 scarabeus Exp $
+
+*libkpgp-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -libkpgp-4.4.2.ebuild, -libkpgp-4.4.3.ebuild, +libkpgp-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -libkpgp-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/libkpgp/libkpgp-4.4.3.ebuild b/kde-base/libkpgp/libkpgp-4.4.3.ebuild
deleted file mode 100644
index 9db79b905d76..000000000000
--- a/kde-base/libkpgp/libkpgp-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkpgp/libkpgp-4.4.3.ebuild,v 1.1 2010/05/03 21:35:47 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="KDE pgp abstraction library"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/libkpgp/libkpgp-4.4.2.ebuild b/kde-base/libkpgp/libkpgp-4.4.4.ebuild
index 64a0d8d29670..7af44581b471 100644
--- a/kde-base/libkpgp/libkpgp-4.4.2.ebuild
+++ b/kde-base/libkpgp/libkpgp-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkpgp/libkpgp-4.4.2.ebuild,v 1.1 2010/03/30 21:54:40 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkpgp/libkpgp-4.4.4.ebuild,v 1.1 2010/06/06 14:42:03 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/libksane/ChangeLog b/kde-base/libksane/ChangeLog
index b0b29d14e689..48f8cda3cc02 100644
--- a/kde-base/libksane/ChangeLog
+++ b/kde-base/libksane/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/libksane
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libksane/ChangeLog,v 1.48 2010/05/04 05:47:43 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libksane/ChangeLog,v 1.49 2010/06/06 14:41:40 scarabeus Exp $
+
+*libksane-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -libksane-4.4.2.ebuild, -libksane-4.4.3.ebuild, +libksane-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -libksane-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/libksane/libksane-4.4.3.ebuild b/kde-base/libksane/libksane-4.4.3.ebuild
deleted file mode 100644
index d6595c47cda7..000000000000
--- a/kde-base/libksane/libksane-4.4.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libksane/libksane-4.4.3.ebuild,v 1.2 2010/05/15 17:03:13 reavertm Exp $
-
-EAPI="3"
-
-KMNAME="kdegraphics"
-KMMODULE="libs/${PN}"
-inherit kde4-meta
-
-DESCRIPTION="SANE Library interface for KDE"
-HOMEPAGE="http://www.kipi-plugins.org"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-LICENSE="LGPL-2"
-
-DEPEND="
-	media-gfx/sane-backends
-"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	insinto "${KDEDIR}"/share/apps/cmake/modules
-	doins "${S}"/cmake/modules/FindKSane.cmake
-
-	kde4-meta_src_install
-}
diff --git a/kde-base/libksane/libksane-4.4.2.ebuild b/kde-base/libksane/libksane-4.4.4.ebuild
index 8f4d0c6ffee8..cb2d801a560c 100644
--- a/kde-base/libksane/libksane-4.4.2.ebuild
+++ b/kde-base/libksane/libksane-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libksane/libksane-4.4.2.ebuild,v 1.2 2010/05/15 17:03:13 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libksane/libksane-4.4.4.ebuild,v 1.1 2010/06/06 14:41:40 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/libkworkspace/ChangeLog b/kde-base/libkworkspace/ChangeLog
index 77c51653eaf9..7207ce450718 100644
--- a/kde-base/libkworkspace/ChangeLog
+++ b/kde-base/libkworkspace/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/libkworkspace
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkworkspace/ChangeLog,v 1.68 2010/05/04 08:16:30 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkworkspace/ChangeLog,v 1.69 2010/06/06 14:42:10 scarabeus Exp $
+
+*libkworkspace-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -libkworkspace-4.4.2.ebuild, -libkworkspace-4.4.3.ebuild,
+  +libkworkspace-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   libkworkspace-4.4.3.ebuild:
diff --git a/kde-base/libkworkspace/libkworkspace-4.4.3.ebuild b/kde-base/libkworkspace/libkworkspace-4.4.3.ebuild
deleted file mode 100644
index 5b61d3638937..000000000000
--- a/kde-base/libkworkspace/libkworkspace-4.4.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkworkspace/libkworkspace-4.4.3.ebuild,v 1.2 2010/05/04 08:16:30 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-workspace"
-KMMODULE="libs/kworkspace"
-inherit kde4-meta
-
-DESCRIPTION="A library for KDE desktop applications"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-KMEXTRACTONLY="
-	ksmserver/org.kde.KSMServerInterface.xml
-	kwin/org.kde.KWin.xml
-"
-
-KMSAVELIBS="true"
-
-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/libkworkspace/libkworkspace-4.4.2.ebuild b/kde-base/libkworkspace/libkworkspace-4.4.4.ebuild
index 481af77cca64..f9f96605db2b 100644
--- a/kde-base/libkworkspace/libkworkspace-4.4.2.ebuild
+++ b/kde-base/libkworkspace/libkworkspace-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkworkspace/libkworkspace-4.4.2.ebuild,v 1.2 2010/05/03 05:44:05 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkworkspace/libkworkspace-4.4.4.ebuild,v 1.1 2010/06/06 14:42:10 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/libplasmaclock/ChangeLog b/kde-base/libplasmaclock/ChangeLog
index 62607a6edc97..cc7445f1911d 100644
--- a/kde-base/libplasmaclock/ChangeLog
+++ b/kde-base/libplasmaclock/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/libplasmaclock
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libplasmaclock/ChangeLog,v 1.45 2010/05/04 05:48:12 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libplasmaclock/ChangeLog,v 1.46 2010/06/06 14:42:09 scarabeus Exp $
+
+*libplasmaclock-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -libplasmaclock-4.4.2.ebuild, -libplasmaclock-4.4.3.ebuild,
+  +libplasmaclock-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -libplasmaclock-4.4.1.ebuild:
diff --git a/kde-base/libplasmaclock/libplasmaclock-4.4.3.ebuild b/kde-base/libplasmaclock/libplasmaclock-4.4.3.ebuild
deleted file mode 100644
index a0a344d680e1..000000000000
--- a/kde-base/libplasmaclock/libplasmaclock-4.4.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libplasmaclock/libplasmaclock-4.4.3.ebuild,v 1.1 2010/05/03 21:36:57 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-workspace"
-KMMODULE="libs/plasmaclock"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="Libraries for KDE Plasma's clocks"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-KMSAVELIBS="true"
diff --git a/kde-base/libplasmaclock/libplasmaclock-4.4.2.ebuild b/kde-base/libplasmaclock/libplasmaclock-4.4.4.ebuild
index 7c01e5daf750..23d452f5e6c2 100644
--- a/kde-base/libplasmaclock/libplasmaclock-4.4.2.ebuild
+++ b/kde-base/libplasmaclock/libplasmaclock-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libplasmaclock/libplasmaclock-4.4.2.ebuild,v 1.1 2010/03/30 21:55:49 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libplasmaclock/libplasmaclock-4.4.4.ebuild,v 1.1 2010/06/06 14:42:09 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/libplasmagenericshell/ChangeLog b/kde-base/libplasmagenericshell/ChangeLog
index ad049c861bf3..dcf589fb4afe 100644
--- a/kde-base/libplasmagenericshell/ChangeLog
+++ b/kde-base/libplasmagenericshell/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/libplasmagenericshell
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libplasmagenericshell/ChangeLog,v 1.10 2010/05/19 13:51:07 dagger Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libplasmagenericshell/ChangeLog,v 1.11 2010/06/06 14:42:09 scarabeus Exp $
+
+*libplasmagenericshell-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -libplasmagenericshell-4.4.2.ebuild, -libplasmagenericshell-4.4.3.ebuild,
+  +libplasmagenericshell-4.4.4.ebuild:
+  Remove old. Version bump.
 
   19 May 2010; Robert Piasek <dagger@gentoo.org>
   libplasmagenericshell-4.4.3.ebuild:
diff --git a/kde-base/libplasmagenericshell/libplasmagenericshell-4.4.3.ebuild b/kde-base/libplasmagenericshell/libplasmagenericshell-4.4.3.ebuild
deleted file mode 100644
index 4a90a11d5bdd..000000000000
--- a/kde-base/libplasmagenericshell/libplasmagenericshell-4.4.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libplasmagenericshell/libplasmagenericshell-4.4.3.ebuild,v 1.2 2010/05/19 13:51:07 dagger Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-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"
-
-RDEPEND="
-	$(add_kdebase_dep libkworkspace)
-"
-
-KMSAVELIBS="true"
-
-src_unpack() {
-	use test && KMEXTRACTONLY="plasma/desktop/shell/data"
-	kde4-meta_src_unpack
-}
diff --git a/kde-base/libplasmagenericshell/libplasmagenericshell-4.4.2.ebuild b/kde-base/libplasmagenericshell/libplasmagenericshell-4.4.4.ebuild
index 0011c40cc599..dc7f54296ca4 100644
--- a/kde-base/libplasmagenericshell/libplasmagenericshell-4.4.2.ebuild
+++ b/kde-base/libplasmagenericshell/libplasmagenericshell-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libplasmagenericshell/libplasmagenericshell-4.4.2.ebuild,v 1.2 2010/05/03 22:44:51 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libplasmagenericshell/libplasmagenericshell-4.4.4.ebuild,v 1.1 2010/06/06 14:42:09 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/libtaskmanager/ChangeLog b/kde-base/libtaskmanager/ChangeLog
index b10d08878673..e9c942471fc4 100644
--- a/kde-base/libtaskmanager/ChangeLog
+++ b/kde-base/libtaskmanager/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/libtaskmanager
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libtaskmanager/ChangeLog,v 1.60 2010/05/04 05:48:33 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libtaskmanager/ChangeLog,v 1.61 2010/06/06 14:42:15 scarabeus Exp $
+
+*libtaskmanager-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -libtaskmanager-4.4.2.ebuild, -libtaskmanager-4.4.3.ebuild,
+  +libtaskmanager-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -libtaskmanager-4.4.1.ebuild:
diff --git a/kde-base/libtaskmanager/libtaskmanager-4.4.3.ebuild b/kde-base/libtaskmanager/libtaskmanager-4.4.3.ebuild
deleted file mode 100644
index 9a5dedcf589e..000000000000
--- a/kde-base/libtaskmanager/libtaskmanager-4.4.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libtaskmanager/libtaskmanager-4.4.3.ebuild,v 1.1 2010/05/03 21:37:43 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-workspace"
-KMMODULE="libs/taskmanager"
-inherit kde4-meta
-
-DESCRIPTION="A library that provides basic taskmanager functionality"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kephal)
-"
-RDEPEND="${DEPEND}"
-
-KMSAVELIBS="true"
diff --git a/kde-base/libtaskmanager/libtaskmanager-4.4.2.ebuild b/kde-base/libtaskmanager/libtaskmanager-4.4.4.ebuild
index bad6900dcb1f..11ab4d7d5212 100644
--- a/kde-base/libtaskmanager/libtaskmanager-4.4.2.ebuild
+++ b/kde-base/libtaskmanager/libtaskmanager-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libtaskmanager/libtaskmanager-4.4.2.ebuild,v 1.1 2010/03/30 21:56:34 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libtaskmanager/libtaskmanager-4.4.4.ebuild,v 1.1 2010/06/06 14:42:15 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/lokalize/ChangeLog b/kde-base/lokalize/ChangeLog
index f1526ce008cc..43c2d4aa31d4 100644
--- a/kde-base/lokalize/ChangeLog
+++ b/kde-base/lokalize/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/lokalize
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/lokalize/ChangeLog,v 1.45 2010/05/15 20:33:29 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lokalize/ChangeLog,v 1.46 2010/06/06 14:41:49 scarabeus Exp $
+
+*lokalize-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -lokalize-4.4.2-r1.ebuild, -lokalize-4.4.3.ebuild, +lokalize-4.4.4.ebuild:
+  Remove old. Version bump.
 
 *lokalize-4.4.2-r1 (15 May 2010)
 
diff --git a/kde-base/lokalize/lokalize-4.4.2-r1.ebuild b/kde-base/lokalize/lokalize-4.4.2-r1.ebuild
deleted file mode 100644
index f946fc09ec39..000000000000
--- a/kde-base/lokalize/lokalize-4.4.2-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/lokalize/lokalize-4.4.2-r1.ebuild,v 1.1 2010/05/15 20:33:29 reavertm Exp $
-
-EAPI="3"
-
-KMNAME="kdesdk"
-PYTHON_DEPEND="2"
-inherit python kde4-meta
-
-DESCRIPTION="KDE4 translation tool"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-# Althrought they are purely runtime, its too useless without them
-DEPEND="
-	>=app-text/hunspell-1.2.8
-	>=x11-libs/qt-sql-4.5.0:4[sqlite]
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdesdk-strigi-analyzer)
-	$(add_kdebase_dep krosspython)
-	$(add_kdebase_dep pykde4)
-"
-
-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/lokalize/lokalize-4.4.3.ebuild b/kde-base/lokalize/lokalize-4.4.4.ebuild
index cdb183e989f4..10c17716e89e 100644
--- a/kde-base/lokalize/lokalize-4.4.3.ebuild
+++ b/kde-base/lokalize/lokalize-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/lokalize/lokalize-4.4.3.ebuild,v 1.2 2010/05/15 20:33:29 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lokalize/lokalize-4.4.4.ebuild,v 1.1 2010/06/06 14:41:49 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/lskat/ChangeLog b/kde-base/lskat/ChangeLog
index 9da93f758027..1fd155da1f9b 100644
--- a/kde-base/lskat/ChangeLog
+++ b/kde-base/lskat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/lskat
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/lskat/ChangeLog,v 1.148 2010/05/04 05:49:04 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lskat/ChangeLog,v 1.149 2010/06/06 14:41:46 scarabeus Exp $
+
+*lskat-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -lskat-4.4.2.ebuild,
+  -lskat-4.4.3.ebuild, +lskat-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -lskat-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/lskat/lskat-4.4.3.ebuild b/kde-base/lskat/lskat-4.4.3.ebuild
deleted file mode 100644
index 987368a5cac2..000000000000
--- a/kde-base/lskat/lskat-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/lskat/lskat-4.4.3.ebuild,v 1.1 2010/05/03 21:38:28 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="Skat game for KDE"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/lskat/lskat-4.4.2.ebuild b/kde-base/lskat/lskat-4.4.4.ebuild
index 84fd46079537..fe2f255be55d 100644
--- a/kde-base/lskat/lskat-4.4.2.ebuild
+++ b/kde-base/lskat/lskat-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/lskat/lskat-4.4.2.ebuild,v 1.1 2010/03/30 21:57:18 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lskat/lskat-4.4.4.ebuild,v 1.1 2010/06/06 14:41:46 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/marble/ChangeLog b/kde-base/marble/ChangeLog
index e09b6e1dce2a..34d6ed298a6c 100644
--- a/kde-base/marble/ChangeLog
+++ b/kde-base/marble/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/marble
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.67 2010/05/15 21:14:10 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.68 2010/06/06 14:41:34 scarabeus Exp $
+
+*marble-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -marble-4.4.2-r1.ebuild, -marble-4.4.3-r1.ebuild, +marble-4.4.4.ebuild:
+  Remove old. Version bump.
 
 *marble-4.4.3-r1 (15 May 2010)
 *marble-4.4.2-r1 (15 May 2010)
diff --git a/kde-base/marble/marble-4.4.3-r1.ebuild b/kde-base/marble/marble-4.4.3-r1.ebuild
deleted file mode 100644
index b16861fd8dba..000000000000
--- a/kde-base/marble/marble-4.4.3-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.4.3-r1.ebuild,v 1.1 2010/05/15 21:14:10 reavertm Exp $
-
-EAPI="3"
-
-KMNAME="kdeedu"
-CPPUNIT_REQUIRED="optional"
-PYTHON_DEPEND="python? 2"
-inherit python kde4-meta
-
-DESCRIPTION="Generic geographical map widget"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug designer-plugin gps +handbook plasma python"
-
-# tests fail / segfault. Last checked for 4.2.88
-RESTRICT=test
-
-DEPEND="
-	gps? ( sci-geosciences/gpsd )
-	python? (
-		>=dev-python/PyQt4-4.4.4-r1
-		$(add_kdebase_dep pykde4)
-	)
-"
-RDEPEND="${DEPEND}
-	!kdeprefix? ( !sci-geosciences/marble )
-"
-
-pkg_setup() {
-	python_set_active_version 2
-	kde4-meta_pkg_setup
-}
-
-src_prepare() {
-	kde4-meta_src_prepare
-	python_convert_shebangs -r $(python_get_version) .
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN)
-		$(cmake-utils_use_with plasma)
-		$(cmake-utils_use python EXPERIMENTAL_PYTHON_BINDINGS)
-		$(cmake-utils_use_with python PyKDE4)
-		$(cmake-utils_use_with python PyQt4)
-		$(cmake-utils_use_with python PythonLibrary)
-		$(cmake-utils_use_with python SIP)
-	)
-
-	find "${S}/marble/src/bindings/python/sip" -name "*.sip" | xargs -- sed -i 's/#include <marble\//#include </'
-
-	if use gps; then
-		mycmakeargs+=(-DHAVE_LIBGPS=1)
-	else
-		sed -i -e 's:FIND_LIBRARY(libgps_LIBRARIES gps):# LIBGPS DISABLED &:' \
-			marble/Findlibgps.cmake || die "sed to disable gpsd failed."
-	fi
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/marble/marble-4.4.2-r1.ebuild b/kde-base/marble/marble-4.4.4.ebuild
index 99658515e720..201086439c72 100644
--- a/kde-base/marble/marble-4.4.2-r1.ebuild
+++ b/kde-base/marble/marble-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.4.2-r1.ebuild,v 1.1 2010/05/15 21:14:10 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.4.4.ebuild,v 1.1 2010/06/06 14:41:34 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/mplayerthumbs/ChangeLog b/kde-base/mplayerthumbs/ChangeLog
index d139d54687f5..339bde9cb749 100644
--- a/kde-base/mplayerthumbs/ChangeLog
+++ b/kde-base/mplayerthumbs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/mplayerthumbs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/mplayerthumbs/ChangeLog,v 1.30 2010/05/04 05:49:32 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/mplayerthumbs/ChangeLog,v 1.31 2010/06/06 14:41:19 scarabeus Exp $
+
+*mplayerthumbs-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -mplayerthumbs-4.4.2.ebuild, -mplayerthumbs-4.4.3.ebuild,
+  +mplayerthumbs-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -mplayerthumbs-4.4.1.ebuild:
diff --git a/kde-base/mplayerthumbs/mplayerthumbs-4.4.3.ebuild b/kde-base/mplayerthumbs/mplayerthumbs-4.4.3.ebuild
deleted file mode 100644
index 33a4b1c2cdbc..000000000000
--- a/kde-base/mplayerthumbs/mplayerthumbs-4.4.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/mplayerthumbs/mplayerthumbs-4.4.3.ebuild,v 1.1 2010/05/03 21:39:16 alexxy Exp $
-
-EAPI="3"
-
-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="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug mplayer"
-
-RDEPEND="
-	!media-video/mplayerthumbs
-	|| (
-		$(add_kdebase_dep dolphin)
-		$(add_kdebase_dep konqueror)
-	)
-	mplayer? (
-		|| (
-			media-video/mplayer
-			media-video/mplayer-bin
-		)
-	)
-"
-
-src_configure() {
-	mycmakeargs=(
-		-DENABLE_PHONON_SUPPORT=ON
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/mplayerthumbs/mplayerthumbs-4.4.2.ebuild b/kde-base/mplayerthumbs/mplayerthumbs-4.4.4.ebuild
index 02ad7d0e0bd3..583e485eb18f 100644
--- a/kde-base/mplayerthumbs/mplayerthumbs-4.4.2.ebuild
+++ b/kde-base/mplayerthumbs/mplayerthumbs-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/mplayerthumbs/mplayerthumbs-4.4.2.ebuild,v 1.1 2010/03/30 21:58:01 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/mplayerthumbs/mplayerthumbs-4.4.4.ebuild,v 1.1 2010/06/06 14:41:19 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/nepomuk/ChangeLog b/kde-base/nepomuk/ChangeLog
index f29d683bd79a..c3aec55720f5 100644
--- a/kde-base/nepomuk/ChangeLog
+++ b/kde-base/nepomuk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/nepomuk
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/nepomuk/ChangeLog,v 1.63 2010/05/04 08:16:47 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nepomuk/ChangeLog,v 1.64 2010/06/06 14:42:05 scarabeus Exp $
+
+*nepomuk-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -nepomuk-4.4.2.ebuild, -nepomuk-4.4.3.ebuild, +nepomuk-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org> nepomuk-4.4.3.ebuild:
   Restore accidently dropped ~x86-fbsd keyword on KDE SC 4.4.3
diff --git a/kde-base/nepomuk/nepomuk-4.4.3.ebuild b/kde-base/nepomuk/nepomuk-4.4.3.ebuild
deleted file mode 100644
index d90ac7e2ff01..000000000000
--- a/kde-base/nepomuk/nepomuk-4.4.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/nepomuk/nepomuk-4.4.3.ebuild,v 1.2 2010/05/04 08:16:47 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-runtime"
-inherit kde4-meta
-
-DESCRIPTION="Nepomuk KDE4 client"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-DEPEND="
-	>=app-misc/strigi-0.6.3[dbus,qt4]
-	>=dev-libs/soprano-2.3.70[dbus,raptor,redland,virtuoso]
-	$(add_kdebase_dep kdelibs 'semantic-desktop')
-"
-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/nepomuk/nepomuk-4.4.2.ebuild b/kde-base/nepomuk/nepomuk-4.4.4.ebuild
index 634458e3cba6..2f543383d000 100644
--- a/kde-base/nepomuk/nepomuk-4.4.2.ebuild
+++ b/kde-base/nepomuk/nepomuk-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/nepomuk/nepomuk-4.4.2.ebuild,v 1.2 2010/05/03 04:23:56 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nepomuk/nepomuk-4.4.4.ebuild,v 1.1 2010/06/06 14:42:05 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/nsplugins/ChangeLog b/kde-base/nsplugins/ChangeLog
index 1cb5542d4e3a..dbdc1238da45 100644
--- a/kde-base/nsplugins/ChangeLog
+++ b/kde-base/nsplugins/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/nsplugins
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/ChangeLog,v 1.175 2010/05/04 05:50:00 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/ChangeLog,v 1.176 2010/06/06 14:41:32 scarabeus Exp $
+
+*nsplugins-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -nsplugins-4.4.2.ebuild, -nsplugins-4.4.3.ebuild, +nsplugins-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -nsplugins-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/nsplugins/nsplugins-4.4.3.ebuild b/kde-base/nsplugins/nsplugins-4.4.3.ebuild
deleted file mode 100644
index 3dc58747ebff..000000000000
--- a/kde-base/nsplugins/nsplugins-4.4.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/nsplugins-4.4.3.ebuild,v 1.1 2010/05/03 21:40:00 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-apps"
-inherit kde4-meta
-
-DESCRIPTION="Netscape plugins support for Konqueror."
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	x11-libs/libXt
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep konqueror)
-"
-
-KMEXTRACTONLY="
-	konqueror/settings/
-"
diff --git a/kde-base/nsplugins/nsplugins-4.4.2.ebuild b/kde-base/nsplugins/nsplugins-4.4.4.ebuild
index e4ccf7a4d38e..1ce4a2df4364 100644
--- a/kde-base/nsplugins/nsplugins-4.4.2.ebuild
+++ b/kde-base/nsplugins/nsplugins-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/nsplugins-4.4.2.ebuild,v 1.1 2010/03/30 21:58:44 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/nsplugins-4.4.4.ebuild,v 1.1 2010/06/06 14:41:32 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/okteta/ChangeLog b/kde-base/okteta/ChangeLog
index b19deb2e3391..16d70ce89e78 100644
--- a/kde-base/okteta/ChangeLog
+++ b/kde-base/okteta/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/okteta
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/okteta/ChangeLog,v 1.49 2010/05/04 05:50:14 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/okteta/ChangeLog,v 1.50 2010/06/06 14:42:14 scarabeus Exp $
+
+*okteta-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -okteta-4.4.2.ebuild,
+  -okteta-4.4.3.ebuild, +okteta-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -okteta-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/okteta/okteta-4.4.3.ebuild b/kde-base/okteta/okteta-4.4.3.ebuild
deleted file mode 100644
index ebbad61d1592..000000000000
--- a/kde-base/okteta/okteta-4.4.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/okteta/okteta-4.4.3.ebuild,v 1.1 2010/05/03 21:40:22 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdeutils"
-inherit kde4-meta
-
-DESCRIPTION="KDE hexeditor"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-DEPEND="
-	app-crypt/qca:2
-"
-RDEPEND="${DEPEND}"
-
-# Tests hang, last checked in 4.3.3
-RESTRICT="test"
diff --git a/kde-base/okteta/okteta-4.4.2.ebuild b/kde-base/okteta/okteta-4.4.4.ebuild
index 6f205cdfb7e7..66ab2c0ea709 100644
--- a/kde-base/okteta/okteta-4.4.2.ebuild
+++ b/kde-base/okteta/okteta-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/okteta/okteta-4.4.2.ebuild,v 1.1 2010/03/30 21:59:06 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/okteta/okteta-4.4.4.ebuild,v 1.1 2010/06/06 14:42:14 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/okular/ChangeLog b/kde-base/okular/ChangeLog
index 841dcffd5dc7..7419f4cb8853 100644
--- a/kde-base/okular/ChangeLog
+++ b/kde-base/okular/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/okular
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/ChangeLog,v 1.69 2010/05/04 05:50:27 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/ChangeLog,v 1.70 2010/06/06 14:42:15 scarabeus Exp $
+
+*okular-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -okular-4.4.2.ebuild,
+  -okular-4.4.3.ebuild, +okular-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -okular-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/okular/okular-4.4.3.ebuild b/kde-base/okular/okular-4.4.3.ebuild
deleted file mode 100644
index 6c132db52ae7..000000000000
--- a/kde-base/okular/okular-4.4.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/okular-4.4.3.ebuild,v 1.1 2010/05/03 21:40:44 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdegraphics"
-inherit kde4-meta
-
-DESCRIPTION="Okular is an universal document viewer based on KPDF for KDE 4."
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="chm crypt debug djvu ebook +handbook +jpeg +ps +pdf +tiff"
-
-DEPEND="
-	media-libs/freetype
-	sys-libs/zlib
-	chm? ( dev-libs/chmlib )
-	crypt? ( app-crypt/qca:2 )
-	djvu? ( app-text/djvu )
-	ebook? ( app-text/ebook-tools )
-	jpeg? ( media-libs/jpeg:0 )
-	pdf? ( >=app-text/poppler-0.12.3-r3[lcms,qt4] )
-	ps? ( app-text/libspectre )
-	tiff? ( media-libs/tiff )
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="libs/mobipocket"
-
-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-meta_src_configure
-}
-
-src_install() {
-	insinto "${KDEDIR}"/share/apps/cmake/modules
-	doins "${S}"/cmake/modules/FindOkular.cmake
-
-	kde4-meta_src_install
-}
diff --git a/kde-base/okular/okular-4.4.2.ebuild b/kde-base/okular/okular-4.4.4.ebuild
index 1d8edf594332..8174d2a1c4c0 100644
--- a/kde-base/okular/okular-4.4.2.ebuild
+++ b/kde-base/okular/okular-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/okular-4.4.2.ebuild,v 1.1 2010/03/30 21:59:27 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/okular-4.4.4.ebuild,v 1.1 2010/06/06 14:42:15 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/oxygen-icons/ChangeLog b/kde-base/oxygen-icons/ChangeLog
index d65b23c4338c..395940c0f232 100644
--- a/kde-base/oxygen-icons/ChangeLog
+++ b/kde-base/oxygen-icons/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/oxygen-icons
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/oxygen-icons/ChangeLog,v 1.39 2010/05/04 08:17:04 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/oxygen-icons/ChangeLog,v 1.40 2010/06/06 14:42:03 scarabeus Exp $
+
+*oxygen-icons-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -oxygen-icons-4.4.2.ebuild, -oxygen-icons-4.4.3.ebuild,
+  +oxygen-icons-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   oxygen-icons-4.4.3.ebuild:
diff --git a/kde-base/oxygen-icons/oxygen-icons-4.4.3.ebuild b/kde-base/oxygen-icons/oxygen-icons-4.4.3.ebuild
deleted file mode 100644
index 00b15f277570..000000000000
--- a/kde-base/oxygen-icons/oxygen-icons-4.4.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/oxygen-icons/oxygen-icons-4.4.3.ebuild,v 1.2 2010/05/04 08:17:04 alexxy Exp $
-
-EAPI="3"
-
-if [[ ${PV} = *9999* ]]; then
-	KMNAME="kdesupport"
-else
-	KMNAME="oxygen-icons"
-fi
-KDE_REQUIRED="never"
-inherit kde4-base
-
-DESCRIPTION="Oxygen SVG icon theme."
-HOMEPAGE="http://www.oxygen-icons.org/"
-#SRC_URI="mirror://kde/unstable/${PV}/src/${P}.tar.bz2"
-
-LICENSE="LGPL-3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="aqua"
-
-# 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/oxygen-icons/oxygen-icons-4.4.2.ebuild b/kde-base/oxygen-icons/oxygen-icons-4.4.4.ebuild
index f1fbe84ab4ff..0ee2e86fade6 100644
--- a/kde-base/oxygen-icons/oxygen-icons-4.4.2.ebuild
+++ b/kde-base/oxygen-icons/oxygen-icons-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.2 2010/05/03 04:38:49 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/oxygen-icons/oxygen-icons-4.4.4.ebuild,v 1.1 2010/06/06 14:42:03 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/palapeli/ChangeLog b/kde-base/palapeli/ChangeLog
index 6060f1f393df..704f0d794237 100644
--- a/kde-base/palapeli/ChangeLog
+++ b/kde-base/palapeli/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/palapeli
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/palapeli/ChangeLog,v 1.8 2010/05/04 05:50:54 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/palapeli/ChangeLog,v 1.9 2010/06/06 14:42:12 scarabeus Exp $
+
+*palapeli-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -palapeli-4.4.2.ebuild, -palapeli-4.4.3.ebuild, +palapeli-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -palapeli-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/palapeli/palapeli-4.4.3.ebuild b/kde-base/palapeli/palapeli-4.4.3.ebuild
deleted file mode 100644
index 71aefd4bcaad..000000000000
--- a/kde-base/palapeli/palapeli-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/palapeli/palapeli-4.4.3.ebuild,v 1.1 2010/05/03 21:41:36 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdegames"
-inherit kde4-meta
-
-DESCRIPTION="KDE jigsaw puzzle game"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
diff --git a/kde-base/palapeli/palapeli-4.4.2.ebuild b/kde-base/palapeli/palapeli-4.4.4.ebuild
index 050b5bb33567..cbfaa1fd179f 100644
--- a/kde-base/palapeli/palapeli-4.4.2.ebuild
+++ b/kde-base/palapeli/palapeli-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/palapeli/palapeli-4.4.2.ebuild,v 1.1 2010/03/30 22:00:16 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/palapeli/palapeli-4.4.4.ebuild,v 1.1 2010/06/06 14:42:12 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/parley/ChangeLog b/kde-base/parley/ChangeLog
index 636053574a40..97fbeed9ac1d 100644
--- a/kde-base/parley/ChangeLog
+++ b/kde-base/parley/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/parley
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/parley/ChangeLog,v 1.61 2010/05/04 05:51:08 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/parley/ChangeLog,v 1.62 2010/06/06 14:41:37 scarabeus Exp $
+
+*parley-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -parley-4.4.2.ebuild,
+  -parley-4.4.3.ebuild, +parley-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -parley-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/parley/parley-4.4.3.ebuild b/kde-base/parley/parley-4.4.3.ebuild
deleted file mode 100644
index 36909918061e..000000000000
--- a/kde-base/parley/parley-4.4.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/parley/parley-4.4.3.ebuild,v 1.1 2010/05/03 21:41:59 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdeedu"
-inherit kde4-meta
-
-DESCRIPTION="KDE Educational: vocabulary trainer"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook +plasma"
-
-DEPEND="
-	$(add_kdebase_dep libkdeedu)
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kvtml-data)
-"
-
-KMEXTRACTONLY="
-	libkdeedu/keduvocdocument
-"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with plasma)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/parley/parley-4.4.2.ebuild b/kde-base/parley/parley-4.4.4.ebuild
index e6ea6089536d..d460e0cacebe 100644
--- a/kde-base/parley/parley-4.4.2.ebuild
+++ b/kde-base/parley/parley-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/parley/parley-4.4.2.ebuild,v 1.1 2010/03/30 22:00:39 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/parley/parley-4.4.4.ebuild,v 1.1 2010/06/06 14:41:37 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/phonon-kde/ChangeLog b/kde-base/phonon-kde/ChangeLog
index f9d5f12b9cd0..94d075719983 100644
--- a/kde-base/phonon-kde/ChangeLog
+++ b/kde-base/phonon-kde/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/phonon-kde
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/ChangeLog,v 1.53 2010/05/04 05:51:21 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/ChangeLog,v 1.54 2010/06/06 14:41:20 scarabeus Exp $
+
+*phonon-kde-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -phonon-kde-4.4.2.ebuild, -phonon-kde-4.4.3.ebuild,
+  +phonon-kde-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -phonon-kde-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/phonon-kde/phonon-kde-4.4.2.ebuild b/kde-base/phonon-kde/phonon-kde-4.4.2.ebuild
deleted file mode 100644
index a76001f41dd8..000000000000
--- a/kde-base/phonon-kde/phonon-kde-4.4.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2010 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.4.2.ebuild,v 1.1 2010/03/30 22:01:04 spatz Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-runtime"
-KMMODULE="phonon"
-inherit kde4-meta
-
-DESCRIPTION="Phonon KDE Integration"
-HOMEPAGE="http://phonon.kde.org"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-2"
-IUSE="alsa debug +xine"
-
-DEPEND="
-	>=media-sound/phonon-4.3.80[xine?]
-	alsa? ( media-libs/alsa-lib )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	mycmakeargs=(
-		-DBUILD_tests=OFF
-		$(cmake-utils_use_with alsa)
-		$(cmake-utils_use_with xine)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/phonon-kde/phonon-kde-4.4.3.ebuild b/kde-base/phonon-kde/phonon-kde-4.4.4.ebuild
index 8a51800cdc62..2dfaffb88067 100644
--- a/kde-base/phonon-kde/phonon-kde-4.4.3.ebuild
+++ b/kde-base/phonon-kde/phonon-kde-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.3.ebuild,v 1.1 2010/05/03 21:42:22 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/phonon-kde-4.4.4.ebuild,v 1.1 2010/06/06 14:41:20 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/plasma-apps/ChangeLog b/kde-base/plasma-apps/ChangeLog
index d8ff3cb2a2de..a31755cdfb67 100644
--- a/kde-base/plasma-apps/ChangeLog
+++ b/kde-base/plasma-apps/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/plasma-apps
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-apps/ChangeLog,v 1.49 2010/05/04 05:51:35 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-apps/ChangeLog,v 1.50 2010/06/06 14:41:53 scarabeus Exp $
+
+*plasma-apps-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -plasma-apps-4.4.2.ebuild, -plasma-apps-4.4.3.ebuild,
+  +plasma-apps-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -plasma-apps-4.4.1.ebuild:
diff --git a/kde-base/plasma-apps/plasma-apps-4.4.3.ebuild b/kde-base/plasma-apps/plasma-apps-4.4.3.ebuild
deleted file mode 100644
index b1108b0dc1dc..000000000000
--- a/kde-base/plasma-apps/plasma-apps-4.4.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2010 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.4.3.ebuild,v 1.1 2010/05/03 21:42:44 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-apps"
-KMMODULE="plasma"
-inherit kde4-meta
-
-DESCRIPTION="Additional Applets for Plasma"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep libkonq)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/plasma-apps/plasma-apps-4.4.2.ebuild b/kde-base/plasma-apps/plasma-apps-4.4.4.ebuild
index 77a639f6cbe0..bb39b0b837f1 100644
--- a/kde-base/plasma-apps/plasma-apps-4.4.2.ebuild
+++ b/kde-base/plasma-apps/plasma-apps-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.1 2010/03/30 22:01:26 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-apps/plasma-apps-4.4.4.ebuild,v 1.1 2010/06/06 14:41:53 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/plasma-runtime/ChangeLog b/kde-base/plasma-runtime/ChangeLog
index 113f901494be..b0bd6012f881 100644
--- a/kde-base/plasma-runtime/ChangeLog
+++ b/kde-base/plasma-runtime/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/plasma-runtime
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-runtime/ChangeLog,v 1.34 2010/05/04 08:17:22 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-runtime/ChangeLog,v 1.35 2010/06/06 14:41:51 scarabeus Exp $
+
+*plasma-runtime-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -plasma-runtime-4.4.2.ebuild, -plasma-runtime-4.4.3.ebuild,
+  +plasma-runtime-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   plasma-runtime-4.4.3.ebuild:
diff --git a/kde-base/plasma-runtime/plasma-runtime-4.4.3.ebuild b/kde-base/plasma-runtime/plasma-runtime-4.4.3.ebuild
deleted file mode 100644
index a0f924038d3e..000000000000
--- a/kde-base/plasma-runtime/plasma-runtime-4.4.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2010 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.4.3.ebuild,v 1.2 2010/05/04 08:17:22 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-runtime"
-KMMODULE="plasma"
-inherit kde4-meta
-
-DESCRIPTION="Script engine and package tool for plasma"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-# cloned from workspace thus introduce collisions.
-add_blocker plasma-workspace '<4.2.90'
diff --git a/kde-base/plasma-runtime/plasma-runtime-4.4.2.ebuild b/kde-base/plasma-runtime/plasma-runtime-4.4.4.ebuild
index 16d80df21cff..ce648f76c780 100644
--- a/kde-base/plasma-runtime/plasma-runtime-4.4.2.ebuild
+++ b/kde-base/plasma-runtime/plasma-runtime-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.2 2010/05/03 07:04:33 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-runtime/plasma-runtime-4.4.4.ebuild,v 1.1 2010/06/06 14:41:51 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/plasma-workspace/ChangeLog b/kde-base/plasma-workspace/ChangeLog
index e0b349238845..5c03a9f5bcb0 100644
--- a/kde-base/plasma-workspace/ChangeLog
+++ b/kde-base/plasma-workspace/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/plasma-workspace
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.68 2010/06/05 14:57:55 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.69 2010/06/06 14:41:56 scarabeus Exp $
+
+*plasma-workspace-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -plasma-workspace-4.4.2.ebuild, -plasma-workspace-4.4.3.ebuild,
+  +plasma-workspace-4.4.4.ebuild:
+  Remove old. Version bump.
 
   05 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org>
   plasma-workspace-4.4.2.ebuild, plasma-workspace-4.4.3.ebuild:
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.4.3.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.4.3.ebuild
deleted file mode 100644
index 6ee1ebe32b8f..000000000000
--- a/kde-base/plasma-workspace/plasma-workspace-4.4.3.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2010 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.4.3.ebuild,v 1.4 2010/06/05 14:57:55 reavertm Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-workspace"
-KMMODULE="plasma"
-PYTHON_DEPEND="python? 2"
-inherit python kde4-meta
-
-DESCRIPTION="Plasma: KDE desktop framework"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook google-gadgets python 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 libplasmaclock)
-	$(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] )
-	python? (
-		>=dev-python/PyQt4-4.4.0[X]
-		>=dev-python/sip-4.7.1
-		$(add_kdebase_dep pykde4)
-	)
-	rss? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${COMMONDEPEND}
-	x11-proto/compositeproto
-	x11-proto/damageproto
-	x11-proto/fixesproto
-	x11-proto/renderproto
-	xinerama? ( x11-proto/xineramaproto )
-"
-RDEPEND="${COMMONDEPEND}"
-
-KMEXTRACTONLY="
-	krunner/dbus/org.freedesktop.ScreenSaver.xml
-	krunner/dbus/org.kde.krunner.App.xml
-	ksmserver/org.kde.KSMServerInterface.xml
-	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_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with google-gadgets Googlegadgets)
-		$(cmake-utils_use_with python SIP)
-		$(cmake-utils_use_with python PyQt4)
-		$(cmake-utils_use_with python PyKDE4)
-		$(cmake-utils_use_with rss KdepimLibs)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(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}${KDEDIR}"/share/apps/plasma_scriptengine_python/*.py[co]
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-
-	if use python; then
-		python_mod_optimize \
-			PyKDE4 \
-			"${KDEDIR}"/share/apps/plasma_scriptengine_python
-	fi
-}
-
-pkg_postrm() {
-	kde4-meta_pkg_postrm
-
-	if [[ -d ${EKDEDIR}/share/apps/plasma_scriptengine_python ]]; then
-		python_mod_cleanup \
-			PyKDE4 \
-			"${KDEDIR}"/share/apps/plasma_scriptengine_python
-	fi
-}
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.4.2.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.4.4.ebuild
index c6b0ef80daeb..667bab1f70eb 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.4.2.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.5 2010/06/05 14:57:55 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.4.4.ebuild,v 1.1 2010/06/06 14:41:56 scarabeus Exp $
 
 EAPI="3"
 
@@ -42,7 +42,9 @@ DEPEND="${COMMONDEPEND}
 	x11-proto/renderproto
 	xinerama? ( x11-proto/xineramaproto )
 "
-RDEPEND="${COMMONDEPEND}"
+RDEPEND="${COMMONDEPEND}
+	$(add_kdebase_dep plasma-runtime)
+"
 
 KMEXTRACTONLY="
 	krunner/dbus/org.freedesktop.ScreenSaver.xml
diff --git a/kde-base/policykit-kde/ChangeLog b/kde-base/policykit-kde/ChangeLog
index 3888823c5525..065573a3b3c0 100644
--- a/kde-base/policykit-kde/ChangeLog
+++ b/kde-base/policykit-kde/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/policykit-kde
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/policykit-kde/ChangeLog,v 1.32 2010/05/04 05:52:08 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/policykit-kde/ChangeLog,v 1.33 2010/06/06 14:41:18 scarabeus Exp $
+
+*policykit-kde-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -policykit-kde-4.4.2.ebuild, -policykit-kde-4.4.3.ebuild,
+  +policykit-kde-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -policykit-kde-4.4.1.ebuild:
diff --git a/kde-base/policykit-kde/policykit-kde-4.4.3.ebuild b/kde-base/policykit-kde/policykit-kde-4.4.3.ebuild
deleted file mode 100644
index 9018d6b89fd6..000000000000
--- a/kde-base/policykit-kde/policykit-kde-4.4.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/policykit-kde/policykit-kde-4.4.3.ebuild,v 1.1 2010/05/03 21:43:55 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-workspace"
-KMMODULE="PolicyKit-kde"
-inherit kde4-meta
-
-DESCRIPTION="PolicyKit integration module for KDE."
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-LICENSE="GPL-2"
-IUSE="debug"
-
-DEPEND="
-	>=sys-auth/policykit-qt-0.9.3
-"
-RDEPEND="${DEPEND}
-	!kde-misc/policykit-kde
-"
diff --git a/kde-base/policykit-kde/policykit-kde-4.4.2.ebuild b/kde-base/policykit-kde/policykit-kde-4.4.4.ebuild
index d52bb977efda..7e5248857975 100644
--- a/kde-base/policykit-kde/policykit-kde-4.4.2.ebuild
+++ b/kde-base/policykit-kde/policykit-kde-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/policykit-kde/policykit-kde-4.4.2.ebuild,v 1.1 2010/03/30 22:02:34 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/policykit-kde/policykit-kde-4.4.4.ebuild,v 1.1 2010/06/06 14:41:18 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/powerdevil/ChangeLog b/kde-base/powerdevil/ChangeLog
index 30844cad2bc9..5d365631515d 100644
--- a/kde-base/powerdevil/ChangeLog
+++ b/kde-base/powerdevil/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/powerdevil
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/powerdevil/ChangeLog,v 1.49 2010/05/31 10:42:33 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/powerdevil/ChangeLog,v 1.50 2010/06/06 14:41:20 scarabeus Exp $
+
+*powerdevil-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -powerdevil-4.4.2-r1.ebuild, -powerdevil-4.4.3-r1.ebuild,
+  +powerdevil-4.4.4.ebuild:
+  Remove old. Version bump.
 
 *powerdevil-4.4.2-r1 (31 May 2010)
 
diff --git a/kde-base/powerdevil/powerdevil-4.4.2-r1.ebuild b/kde-base/powerdevil/powerdevil-4.4.2-r1.ebuild
deleted file mode 100644
index 02e70dbfcc1d..000000000000
--- a/kde-base/powerdevil/powerdevil-4.4.2-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/powerdevil/powerdevil-4.4.2-r1.ebuild,v 1.1 2010/05/31 10:42:33 reavertm Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +pm-utils"
-
-COMMONDEPEND="
-	$(add_kdebase_dep libkworkspace)
-	$(add_kdebase_dep solid)
-	!aqua? ( x11-libs/libXScrnSaver )
-"
-DEPEND="${COMMONDEPEND}
-	!aqua? ( x11-proto/scrnsaverproto )
-"
-RDEPEND="${COMMONDEPEND}
-	!sys-power/powerdevil
-	pm-utils? ( sys-power/pm-utils )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.3-fix-sleep-205453.patch"
-)
-
-KMEXTRACTONLY="
-	krunner/
-	ksmserver/org.kde.KSMServerInterface.xml
-"
diff --git a/kde-base/powerdevil/powerdevil-4.4.3-r1.ebuild b/kde-base/powerdevil/powerdevil-4.4.4.ebuild
index c8918a6fee0d..e0f6cddef349 100644
--- a/kde-base/powerdevil/powerdevil-4.4.3-r1.ebuild
+++ b/kde-base/powerdevil/powerdevil-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/powerdevil/powerdevil-4.4.3-r1.ebuild,v 1.2 2010/05/31 10:42:33 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/powerdevil/powerdevil-4.4.4.ebuild,v 1.1 2010/06/06 14:41:20 scarabeus Exp $
 
 EAPI="3"
 
@@ -27,11 +27,11 @@ RDEPEND="${COMMONDEPEND}
 	pm-utils? ( sys-power/pm-utils )
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.3-fix-sleep-205453.patch"
-)
-
 KMEXTRACTONLY="
 	krunner/
 	ksmserver/org.kde.KSMServerInterface.xml
 "
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.3-fix-sleep-205453.patch"
+)
diff --git a/kde-base/printer-applet/ChangeLog b/kde-base/printer-applet/ChangeLog
index ee10998eb615..7cb1f62f6ecb 100644
--- a/kde-base/printer-applet/ChangeLog
+++ b/kde-base/printer-applet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/printer-applet
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/printer-applet/ChangeLog,v 1.27 2010/05/17 19:21:11 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/printer-applet/ChangeLog,v 1.28 2010/06/06 14:42:04 scarabeus Exp $
+
+*printer-applet-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -printer-applet-4.4.2.ebuild, -printer-applet-4.4.3.ebuild,
+  +printer-applet-4.4.4.ebuild:
+  Remove old. Version bump.
 
   17 May 2010; Maciej Mrozowski <reavertm@gentoo.org>
   printer-applet-4.4.2.ebuild, printer-applet-4.4.3.ebuild:
diff --git a/kde-base/printer-applet/printer-applet-4.4.3.ebuild b/kde-base/printer-applet/printer-applet-4.4.3.ebuild
deleted file mode 100644
index c91cf8bc4fcb..000000000000
--- a/kde-base/printer-applet/printer-applet-4.4.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2010 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.4.3.ebuild,v 1.2 2010/05/17 19:21:11 reavertm Exp $
-
-EAPI="3"
-
-KMNAME="kdeutils"
-PYTHON_DEPEND="2"
-inherit python kde4-meta
-
-DESCRIPTION="KDE printer system tray utility"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="
-	>=app-admin/system-config-printer-common-1.2.2
-	$(add_kdebase_dep pykde4)
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	kde4-meta_pkg_setup
-	python_set_active_version 2
-}
-
-src_prepare() {
-	kde4-meta_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 "${PN}"/CMakeLists.txt || die "failed to rename printer-applet executable"
-	sed -e "/Exec/s/printer-applet/${newname}/" \
-		-i "${PN}"/printer-applet.desktop || die "failed to patch .desktop file"
-}
-
-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/printer-applet/printer-applet-4.4.2.ebuild b/kde-base/printer-applet/printer-applet-4.4.4.ebuild
index 4adbdbd6e92b..e2f684b8f783 100644
--- a/kde-base/printer-applet/printer-applet-4.4.2.ebuild
+++ b/kde-base/printer-applet/printer-applet-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.2 2010/05/17 19:21:11 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/printer-applet/printer-applet-4.4.4.ebuild,v 1.1 2010/06/06 14:42:04 scarabeus Exp $
 
 EAPI="3"
 
@@ -10,7 +10,7 @@ inherit python kde4-meta
 
 DESCRIPTION="KDE printer system tray utility"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
+IUSE="+handbook"
 
 DEPEND="
 	>=app-admin/system-config-printer-common-1.2.2
diff --git a/kde-base/pykde4/ChangeLog b/kde-base/pykde4/ChangeLog
index 4fc5eaba3c99..cf23fa3c5167 100644
--- a/kde-base/pykde4/ChangeLog
+++ b/kde-base/pykde4/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/pykde4
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.69 2010/06/02 14:17:36 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.70 2010/06/06 14:41:19 scarabeus Exp $
+
+*pykde4-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -pykde4-4.3.3.ebuild,
+  -pykde4-4.4.2.ebuild, -pykde4-4.4.3.ebuild, +pykde4-4.4.4.ebuild:
+  Drop old. Version bump.
 
   02 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org> pykde4-4.4.2.ebuild,
   pykde4-4.4.3.ebuild:
diff --git a/kde-base/pykde4/pykde4-4.3.3.ebuild b/kde-base/pykde4/pykde4-4.3.3.ebuild
deleted file mode 100644
index 2e96ae4e0eae..000000000000
--- a/kde-base/pykde4/pykde4-4.3.3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.3.3.ebuild,v 1.7 2010/02/07 21:24:45 abcd Exp $
-
-EAPI="2"
-
-KMNAME="kdebindings"
-KMMODULE="python/${PN}"
-OPENGL_REQUIRED="always"
-PYTHON_USE_WITH="threads"
-inherit python kde4-meta
-
-DESCRIPTION="Python bindings for KDE4"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE="akonadi debug examples policykit semantic-desktop"
-
-# blocker added due to compatibility issues and error during compile time
-DEPEND="
-	!dev-python/pykde
-	>=dev-python/PyQt4-4.5[dbus,sql,svg,webkit,X]
-	$(add_kdebase_dep kdelibs 'opengl,semantic-desktop?')
-	akonadi? ( $(add_kdebase_dep kdepimlibs) )
-	policykit? ( >=sys-auth/policykit-qt-0.9.2 )
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	python_pkg_setup
-	kde4-meta_pkg_setup
-}
-
-src_prepare() {
-	kde4-meta_src_prepare
-
-	if ! use examples; then
-		sed -e '/^ADD_SUBDIRECTORY(examples)/s/^/# DISABLED /' -i python/${PN}/CMakeLists.txt \
-			|| die "Failed to disable examples"
-	fi
-}
-
-src_configure() {
-	mycmakeargs="${mycmakeargs}
-		-DWITH_QScintilla=OFF
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with akonadi)
-		$(cmake-utils_use_with akonadi KdepimLibs)
-		$(cmake-utils_use_with policykit PolkitQt)
-	"
-
-	kde4-meta_src_configure
-}
-
-src_install() {
-	kde4-meta_src_install
-
-	python_version
-	rm -f \
-		"${D}/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4/*.py[co] \
-		"${D}${PREFIX}"/share/apps/"${PN}"/*.py[co]
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-
-	python_mod_optimize ${ROOT}"usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4
-
-	if use examples; then
-		echo
-		elog "PyKDE4 examples have been installed to"
-		elog "${PREFIX}/share/apps/${PN}/examples"
-		echo
-	fi
-}
-
-pkg_postrm() {
-	kde4-meta_pkg_postrm
-
-	python_mod_cleanup ${ROOT}"usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4
-}
diff --git a/kde-base/pykde4/pykde4-4.4.3.ebuild b/kde-base/pykde4/pykde4-4.4.3.ebuild
deleted file mode 100644
index 6c23708e6ac3..000000000000
--- a/kde-base/pykde4/pykde4-4.4.3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.4.3.ebuild,v 1.4 2010/06/02 14:17:36 reavertm Exp $
-
-EAPI="3"
-
-KMNAME="kdebindings"
-KMMODULE="python/pykde4"
-OPENGL_REQUIRED="always"
-PYTHON_USE_WITH="threads"
-RESTRICT_PYTHON_ABIS="2.4"
-inherit python kde4-meta
-
-DESCRIPTION="Python bindings for KDE4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="akonadi debug doc examples semantic-desktop"
-
-# blocker added due to compatibility issues and error during compile time
-DEPEND="
-	!dev-python/pykde
-	$(add_kdebase_dep kdelibs 'opengl,semantic-desktop?')
-	akonadi? ( $(add_kdebase_dep kdepimlibs) )
-	aqua? ( >=dev-python/PyQt4-4.7[dbus,sql,svg,webkit,aqua] )
-	!aqua? ( >=dev-python/PyQt4-4.7[dbus,sql,svg,webkit,X] )
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	python_pkg_setup
-	kde4-meta_pkg_setup
-}
-
-src_prepare() {
-	kde4-meta_src_prepare
-
-	if ! use examples; then
-		sed -e '/^ADD_SUBDIRECTORY(examples)/s/^/# DISABLED /' -i python/${PN}/CMakeLists.txt \
-			|| die "Failed to disable examples"
-	fi
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_QScintilla=OFF
-		-DWITH_PolkitQt=OFF
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with akonadi KdepimLibs)
-	)
-
-	kde4-meta_src_configure
-}
-
-src_install() {
-	use doc && HTML_DOCS=("${S}/python/pykde4/docs/html/")
-
-	kde4-meta_src_install
-
-	python_convert_shebangs -r $(python_get_version) "${ED}"
-	python_clean_installation_image
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-
-	python_mod_optimize PyKDE4 PyQt4
-
-	if use examples; then
-		echo
-		elog "PyKDE4 examples have been installed to"
-		elog "${EKDEDIR}/share/apps/${PN}/examples"
-		echo
-	fi
-}
-
-pkg_postrm() {
-	kde4-meta_pkg_postrm
-
-	python_mod_cleanup PyKDE4 PyQt4
-}
diff --git a/kde-base/pykde4/pykde4-4.4.2.ebuild b/kde-base/pykde4/pykde4-4.4.4.ebuild
index e0e26c5372ce..298e7feec3fd 100644
--- a/kde-base/pykde4/pykde4-4.4.2.ebuild
+++ b/kde-base/pykde4/pykde4-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.4.2.ebuild,v 1.3 2010/06/02 14:17:36 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.4.4.ebuild,v 1.1 2010/06/06 14:41:19 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/qguiplatformplugin_kde/ChangeLog b/kde-base/qguiplatformplugin_kde/ChangeLog
index 381f6fab1376..6abad591fee0 100644
--- a/kde-base/qguiplatformplugin_kde/ChangeLog
+++ b/kde-base/qguiplatformplugin_kde/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/qguiplatformplugin_kde
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/qguiplatformplugin_kde/ChangeLog,v 1.9 2010/05/19 13:52:37 dagger Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qguiplatformplugin_kde/ChangeLog,v 1.10 2010/06/06 14:41:58 scarabeus Exp $
+
+*qguiplatformplugin_kde-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -qguiplatformplugin_kde-4.4.2.ebuild,
+  -qguiplatformplugin_kde-4.4.3.ebuild,
+  +qguiplatformplugin_kde-4.4.4.ebuild:
+  Remove old. Version bump.
 
   19 May 2010; Robert Piasek <dagger@gentoo.org>
   qguiplatformplugin_kde-4.4.3.ebuild:
diff --git a/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.4.3.ebuild b/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.4.3.ebuild
deleted file mode 100644
index 4187926cfab3..000000000000
--- a/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 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.4.3.ebuild,v 1.2 2010/05/19 13:52:37 dagger Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-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/qguiplatformplugin_kde/qguiplatformplugin_kde-4.4.2.ebuild b/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.4.4.ebuild
index 8d7533631f9c..a6503b654441 100644
--- a/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.4.2.ebuild
+++ b/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.1 2010/03/30 22:04:01 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.4.4.ebuild,v 1.1 2010/06/06 14:41:58 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/renamedlg-plugins/ChangeLog b/kde-base/renamedlg-plugins/ChangeLog
index 9fd2966a728f..012ef1f4b671 100644
--- a/kde-base/renamedlg-plugins/ChangeLog
+++ b/kde-base/renamedlg-plugins/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/renamedlg-plugins
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/renamedlg-plugins/ChangeLog,v 1.47 2010/05/04 05:53:17 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/renamedlg-plugins/ChangeLog,v 1.48 2010/06/06 14:41:33 scarabeus Exp $
+
+*renamedlg-plugins-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -renamedlg-plugins-4.4.2.ebuild, -renamedlg-plugins-4.4.3.ebuild,
+  +renamedlg-plugins-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -renamedlg-plugins-4.4.1.ebuild:
diff --git a/kde-base/renamedlg-plugins/renamedlg-plugins-4.4.3.ebuild b/kde-base/renamedlg-plugins/renamedlg-plugins-4.4.3.ebuild
deleted file mode 100644
index 24f1103a22eb..000000000000
--- a/kde-base/renamedlg-plugins/renamedlg-plugins-4.4.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2010 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.4.3.ebuild,v 1.1 2010/05/03 21:45:48 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-runtime"
-KMMODULE="renamedlgplugins"
-inherit kde4-meta
-
-DESCRIPTION="KDE RenameDlg plugins"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/renamedlg-plugins/renamedlg-plugins-4.4.2.ebuild b/kde-base/renamedlg-plugins/renamedlg-plugins-4.4.4.ebuild
index 6bc3ef3c4c0a..cbc54e173fbc 100644
--- a/kde-base/renamedlg-plugins/renamedlg-plugins-4.4.2.ebuild
+++ b/kde-base/renamedlg-plugins/renamedlg-plugins-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.1 2010/03/30 22:04:21 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/renamedlg-plugins/renamedlg-plugins-4.4.4.ebuild,v 1.1 2010/06/06 14:41:33 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/rocs/ChangeLog b/kde-base/rocs/ChangeLog
index 991fc61a0412..81202ca08071 100644
--- a/kde-base/rocs/ChangeLog
+++ b/kde-base/rocs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/rocs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/rocs/ChangeLog,v 1.9 2010/05/04 05:53:31 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/rocs/ChangeLog,v 1.10 2010/06/06 14:42:19 scarabeus Exp $
+
+*rocs-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -rocs-4.4.2.ebuild,
+  -rocs-4.4.3.ebuild, +rocs-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -rocs-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/rocs/rocs-4.4.2.ebuild b/kde-base/rocs/rocs-4.4.2.ebuild
deleted file mode 100644
index 52ac5bf4547c..000000000000
--- a/kde-base/rocs/rocs-4.4.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/rocs/rocs-4.4.2.ebuild,v 1.1 2010/03/30 22:04:43 spatz Exp $
-
-EAPI="3"
-
-KMNAME="kdeedu"
-inherit kde4-meta
-
-DESCRIPTION="KDE4 interface to work with Graph Theory"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-DEPEND="
-	>=dev-cpp/eigen-2.0.3:2
-"
-RDEPEND=""
diff --git a/kde-base/rocs/rocs-4.4.3.ebuild b/kde-base/rocs/rocs-4.4.4.ebuild
index 69257d0136f7..c95ebf58a0d8 100644
--- a/kde-base/rocs/rocs-4.4.3.ebuild
+++ b/kde-base/rocs/rocs-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/rocs/rocs-4.4.3.ebuild,v 1.1 2010/05/03 21:46:14 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/rocs/rocs-4.4.4.ebuild,v 1.1 2010/06/06 14:42:19 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/smoke/ChangeLog b/kde-base/smoke/ChangeLog
index 977335c7c24e..f39218006d36 100644
--- a/kde-base/smoke/ChangeLog
+++ b/kde-base/smoke/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/smoke
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/ChangeLog,v 1.102 2010/05/20 03:54:41 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/ChangeLog,v 1.103 2010/06/06 14:42:02 scarabeus Exp $
+
+*smoke-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -smoke-4.4.2-r1.ebuild, -smoke-4.4.3-r1.ebuild, +smoke-4.4.4.ebuild:
+  Remove old. Version bump.
 
   20 May 2010; Maciej Mrozowski <reavertm@gentoo.org>
   -files/smoke-4.4.1-webkit-cmake.patch, smoke-4.4.2-r1.ebuild,
diff --git a/kde-base/smoke/smoke-4.4.3-r1.ebuild b/kde-base/smoke/smoke-4.4.3-r1.ebuild
deleted file mode 100644
index c39464d5ab7f..000000000000
--- a/kde-base/smoke/smoke-4.4.3-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/smoke-4.4.3-r1.ebuild,v 1.2 2010/05/20 03:54:41 reavertm Exp $
-
-EAPI="3"
-
-KMNAME="kdebindings"
-MULTIMEDIA_REQUIRED="optional"
-WEBKIT_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="Scripting Meta Object Kompiler Engine"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="akonadi okular +phonon qimageblitz qscintilla qwt semantic-desktop"
-
-COMMON_DEPEND="
-	$(add_kdebase_dep kdelibs 'semantic-desktop?')
-	akonadi? ( $(add_kdebase_dep kdepimlibs) )
-	okular? ( $(add_kdebase_dep okular) )
-	phonon? ( >=media-sound/phonon-4.3.80[xcb] )
-	qimageblitz? ( >=media-libs/qimageblitz-0.0.4 )
-	qscintilla? ( x11-libs/qscintilla )
-	qwt? ( x11-libs/qwt:5 )
-"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-KMEXTRA="generator/"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_enable akonadi)
-		$(cmake-utils_use_enable akonadi Kdepimlibs)
-		$(cmake-utils_use_enable multimedia QTMULTIMEDIA_SMOKE)
-		$(cmake-utils_use_enable okular)
-		$(cmake-utils_use_enable phonon PHONON_SMOKE)
-		$(cmake-utils_use_enable qimageblitz QIMAGEBLITZ_SMOKE)
-		$(cmake-utils_use_enable qscintilla QSCI_SMOKE)
-		$(cmake-utils_use_enable qwt QWT_SMOKE)
-		$(cmake-utils_use_enable semantic-desktop Nepomuk)
-		$(cmake-utils_use_enable semantic-desktop Soprano)
-		$(cmake-utils_use_enable webkit QTWEBKIT_SMOKE)
-	)
-	kde4-meta_src_configure
-}
diff --git a/kde-base/smoke/smoke-4.4.2-r1.ebuild b/kde-base/smoke/smoke-4.4.4.ebuild
index 663b576e9091..1e135aab44fa 100644
--- a/kde-base/smoke/smoke-4.4.2-r1.ebuild
+++ b/kde-base/smoke/smoke-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/smoke-4.4.2-r1.ebuild,v 1.2 2010/05/20 03:54:41 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/smoke-4.4.4.ebuild,v 1.1 2010/06/06 14:42:02 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/solid-runtime/ChangeLog b/kde-base/solid-runtime/ChangeLog
index 1be28df9fb1c..bf8427bb2baf 100644
--- a/kde-base/solid-runtime/ChangeLog
+++ b/kde-base/solid-runtime/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/solid-runtime
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/solid-runtime/ChangeLog,v 1.11 2010/05/19 13:49:34 dagger Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/solid-runtime/ChangeLog,v 1.12 2010/06/06 14:41:23 scarabeus Exp $
+
+*solid-runtime-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -solid-runtime-4.4.2.ebuild, -solid-runtime-4.4.3.ebuild,
+  +solid-runtime-4.4.4.ebuild:
+  Remove old. Version bump.
 
   19 May 2010; Robert Piasek <dagger@gentoo.org> solid-runtime-4.4.3.ebuild:
   keyworded ~arm. Required for @kdebase-4.4.3
diff --git a/kde-base/solid-runtime/solid-runtime-4.4.3.ebuild b/kde-base/solid-runtime/solid-runtime-4.4.3.ebuild
deleted file mode 100644
index 61007aa58c52..000000000000
--- a/kde-base/solid-runtime/solid-runtime-4.4.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2010 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.4.3.ebuild,v 1.3 2010/05/19 13:49:34 dagger Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-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"
-
-DEPEND="
-	$(add_kdebase_dep solid)
-"
-RDEPEND="${DEPEND}"
-
-# Packages merged around 4.3.77
-add_blocker solidautoeject
-add_blocker solid-device-automounter
-add_blocker solid-hardware
-add_blocker soliduiserver
-
-KMEXTRA="
-	solidautoeject/
-	solid-device-automounter/
-	solid-hardware/
-	soliduiserver/
-"
diff --git a/kde-base/solid-runtime/solid-runtime-4.4.2.ebuild b/kde-base/solid-runtime/solid-runtime-4.4.4.ebuild
index f836be87246e..ae46cac7f6f8 100644
--- a/kde-base/solid-runtime/solid-runtime-4.4.2.ebuild
+++ b/kde-base/solid-runtime/solid-runtime-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.2 2010/05/03 07:07:56 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/solid-runtime/solid-runtime-4.4.4.ebuild,v 1.1 2010/06/06 14:41:23 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/solid/ChangeLog b/kde-base/solid/ChangeLog
index 85a4f9a98600..338f9a157fed 100644
--- a/kde-base/solid/ChangeLog
+++ b/kde-base/solid/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/solid
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/ChangeLog,v 1.71 2010/05/04 08:17:40 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/ChangeLog,v 1.72 2010/06/06 14:42:18 scarabeus Exp $
+
+*solid-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -solid-4.4.2.ebuild,
+  -solid-4.4.3.ebuild, +solid-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org> solid-4.4.3.ebuild:
   Restore accidently dropped ~x86-fbsd keyword on KDE SC 4.4.3
diff --git a/kde-base/solid/solid-4.4.3.ebuild b/kde-base/solid/solid-4.4.3.ebuild
deleted file mode 100644
index bb5dda362afa..000000000000
--- a/kde-base/solid/solid-4.4.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/solid-4.4.3.ebuild,v 1.2 2010/05/04 08:17:40 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-workspace"
-CPPUNIT_REQUIRED="test"
-inherit kde4-meta
-
-DESCRIPTION="Solid: the KDE hardware library"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="bluetooth debug networkmanager wicd"
-
-# solid/CMakeLists.txt has an add_subdirectory statement that depends on
-# networkmanager-0.7, referring to a non-existant directory, restricted to =0.6*
-# for now.
-DEPEND="
-	bluetooth? ( net-wireless/bluez )
-	networkmanager? ( >=net-misc/networkmanager-0.7 )
-	wicd? ( net-misc/wicd )
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRA="
-	libs/solid/
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3.1-darwin-compile-powermanager.patch
-)
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with bluetooth BlueZ)
-		$(cmake-utils_use_with networkmanager NetworkManager)
-		$(cmake-utils_use_build wicd)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/solid/solid-4.4.2.ebuild b/kde-base/solid/solid-4.4.4.ebuild
index 1b9d42022ca2..4a0cdb22cfe4 100644
--- a/kde-base/solid/solid-4.4.2.ebuild
+++ b/kde-base/solid/solid-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/solid-4.4.2.ebuild,v 1.2 2010/05/03 07:07:31 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/solid-4.4.4.ebuild,v 1.1 2010/06/06 14:42:18 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/step/ChangeLog b/kde-base/step/ChangeLog
index dd8e63d5da27..6af6e5fe6d11 100644
--- a/kde-base/step/ChangeLog
+++ b/kde-base/step/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/step
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/step/ChangeLog,v 1.50 2010/05/04 05:54:31 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/step/ChangeLog,v 1.51 2010/06/06 14:42:13 scarabeus Exp $
+
+*step-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -step-4.4.2.ebuild,
+  -step-4.4.3.ebuild, +step-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -step-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/step/step-4.4.3.ebuild b/kde-base/step/step-4.4.3.ebuild
deleted file mode 100644
index 68ce32f34c1d..000000000000
--- a/kde-base/step/step-4.4.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/step/step-4.4.3.ebuild,v 1.1 2010/05/03 21:47:50 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdeedu"
-inherit kde4-meta
-
-DESCRIPTION="The KDE physics simulator"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook +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() {
-	mycmakeargs=(
-		$(cmake-utils_use_with gsl)
-		$(cmake-utils_use_with qalculate)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/step/step-4.4.2.ebuild b/kde-base/step/step-4.4.4.ebuild
index cb3f1d47a2be..5907a10344ad 100644
--- a/kde-base/step/step-4.4.2.ebuild
+++ b/kde-base/step/step-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/step/step-4.4.2.ebuild,v 1.1 2010/03/30 22:06:16 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/step/step-4.4.4.ebuild,v 1.1 2010/06/06 14:42:13 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/superkaramba/ChangeLog b/kde-base/superkaramba/ChangeLog
index ae00dd706e27..b31d49dbb88c 100644
--- a/kde-base/superkaramba/ChangeLog
+++ b/kde-base/superkaramba/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/superkaramba
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/ChangeLog,v 1.141 2010/05/04 05:54:44 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/ChangeLog,v 1.142 2010/06/06 14:41:30 scarabeus Exp $
+
+*superkaramba-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -superkaramba-4.4.2.ebuild, -superkaramba-4.4.3.ebuild,
+  +superkaramba-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -superkaramba-4.4.1.ebuild:
diff --git a/kde-base/superkaramba/superkaramba-4.4.3.ebuild b/kde-base/superkaramba/superkaramba-4.4.3.ebuild
deleted file mode 100644
index b99e8483eed3..000000000000
--- a/kde-base/superkaramba/superkaramba-4.4.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/superkaramba-4.4.3.ebuild,v 1.2 2010/05/15 17:08:33 reavertm Exp $
-
-EAPI="3"
-
-KMNAME="kdeutils"
-PYTHON_DEPEND="python? 2"
-inherit python kde4-meta
-
-DESCRIPTION="A tool to create interactive applets for the KDE desktop."
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook 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() {
-	kde4-meta_pkg_setup
-	python_set_active_version 2
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with python PythonLibs)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/superkaramba/superkaramba-4.4.2.ebuild b/kde-base/superkaramba/superkaramba-4.4.4.ebuild
index 73d1c54034f1..c2fb23cc14fa 100644
--- a/kde-base/superkaramba/superkaramba-4.4.2.ebuild
+++ b/kde-base/superkaramba/superkaramba-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/superkaramba-4.4.2.ebuild,v 1.3 2010/05/15 17:08:33 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/superkaramba-4.4.4.ebuild,v 1.1 2010/06/06 14:41:30 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/svgpart/ChangeLog b/kde-base/svgpart/ChangeLog
index 31a13d4e3fe0..efbffd2c87ca 100644
--- a/kde-base/svgpart/ChangeLog
+++ b/kde-base/svgpart/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/svgpart
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/svgpart/ChangeLog,v 1.58 2010/05/04 05:54:58 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/svgpart/ChangeLog,v 1.59 2010/06/06 14:41:55 scarabeus Exp $
+
+*svgpart-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -svgpart-4.4.2.ebuild, -svgpart-4.4.3.ebuild, +svgpart-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -svgpart-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/svgpart/svgpart-4.4.3.ebuild b/kde-base/svgpart/svgpart-4.4.3.ebuild
deleted file mode 100644
index 1a1656dc086d..000000000000
--- a/kde-base/svgpart/svgpart-4.4.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/svgpart/svgpart-4.4.3.ebuild,v 1.1 2010/05/03 21:48:36 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdegraphics"
-inherit kde4-meta
-
-DESCRIPTION="Svgpart is a kpart for viewing SVGs"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/svgpart/svgpart-4.4.2.ebuild b/kde-base/svgpart/svgpart-4.4.4.ebuild
index 5e2587c259cc..2a963ec81cf0 100644
--- a/kde-base/svgpart/svgpart-4.4.2.ebuild
+++ b/kde-base/svgpart/svgpart-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/svgpart/svgpart-4.4.2.ebuild,v 1.1 2010/03/30 22:07:01 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/svgpart/svgpart-4.4.4.ebuild,v 1.1 2010/06/06 14:41:56 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/sweeper/ChangeLog b/kde-base/sweeper/ChangeLog
index bbcebca60684..4f2a227fec9a 100644
--- a/kde-base/sweeper/ChangeLog
+++ b/kde-base/sweeper/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/sweeper
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/sweeper/ChangeLog,v 1.54 2010/05/04 05:55:11 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/sweeper/ChangeLog,v 1.55 2010/06/06 14:41:36 scarabeus Exp $
+
+*sweeper-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -sweeper-4.4.2.ebuild, -sweeper-4.4.3.ebuild, +sweeper-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -sweeper-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/sweeper/sweeper-4.4.2.ebuild b/kde-base/sweeper/sweeper-4.4.2.ebuild
deleted file mode 100644
index e6d0822ae099..000000000000
--- a/kde-base/sweeper/sweeper-4.4.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/sweeper/sweeper-4.4.2.ebuild,v 1.1 2010/03/30 22:07:22 spatz Exp $
-
-EAPI="3"
-
-KMNAME="kdeutils"
-inherit kde4-meta
-
-DESCRIPTION="KDE Privacy Settings Widget"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/sweeper/sweeper-4.4.3.ebuild b/kde-base/sweeper/sweeper-4.4.4.ebuild
index 8a87bf07ba39..1fe9bfa8ed11 100644
--- a/kde-base/sweeper/sweeper-4.4.3.ebuild
+++ b/kde-base/sweeper/sweeper-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/sweeper/sweeper-4.4.3.ebuild,v 1.1 2010/05/03 21:48:59 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/sweeper/sweeper-4.4.4.ebuild,v 1.1 2010/06/06 14:41:36 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/system-config-printer-kde/ChangeLog b/kde-base/system-config-printer-kde/ChangeLog
index 4a1dd4d454c9..3892f4b0dd02 100644
--- a/kde-base/system-config-printer-kde/ChangeLog
+++ b/kde-base/system-config-printer-kde/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/system-config-printer-kde
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/system-config-printer-kde/ChangeLog,v 1.25 2010/05/17 19:23:42 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/system-config-printer-kde/ChangeLog,v 1.26 2010/06/06 14:42:14 scarabeus Exp $
+
+*system-config-printer-kde-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -system-config-printer-kde-4.4.2.ebuild,
+  -system-config-printer-kde-4.4.3.ebuild,
+  +system-config-printer-kde-4.4.4.ebuild:
+  Remove old. Version bump.
 
   17 May 2010; Maciej Mrozowski <reavertm@gentoo.org>
   system-config-printer-kde-4.4.2.ebuild,
diff --git a/kde-base/system-config-printer-kde/system-config-printer-kde-4.4.3.ebuild b/kde-base/system-config-printer-kde/system-config-printer-kde-4.4.3.ebuild
deleted file mode 100644
index 210f2f4c043f..000000000000
--- a/kde-base/system-config-printer-kde/system-config-printer-kde-4.4.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2010 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.4.3.ebuild,v 1.2 2010/05/17 19:23:42 reavertm Exp $
-
-EAPI="3"
-
-KMNAME="kdeadmin"
-PYTHON_DEPEND="2"
-inherit python kde4-meta
-
-DESCRIPTION="KDE port of Red Hat's Gnome system-config-printer"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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/system-config-printer-kde/system-config-printer-kde-4.4.2.ebuild b/kde-base/system-config-printer-kde/system-config-printer-kde-4.4.4.ebuild
index b7892c29d366..658429cb03f0 100644
--- a/kde-base/system-config-printer-kde/system-config-printer-kde-4.4.2.ebuild
+++ b/kde-base/system-config-printer-kde/system-config-printer-kde-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.2 2010/05/17 19:23:42 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/system-config-printer-kde/system-config-printer-kde-4.4.4.ebuild,v 1.1 2010/06/06 14:42:14 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/systemsettings/ChangeLog b/kde-base/systemsettings/ChangeLog
index ac62ed01b0d2..ff31a2a4c99e 100644
--- a/kde-base/systemsettings/ChangeLog
+++ b/kde-base/systemsettings/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/systemsettings
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.78 2010/05/04 08:18:13 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.79 2010/06/06 14:42:12 scarabeus Exp $
+
+*systemsettings-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -systemsettings-4.4.2-r1.ebuild, -systemsettings-4.4.3.ebuild,
+  +systemsettings-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   systemsettings-4.4.3.ebuild:
diff --git a/kde-base/systemsettings/systemsettings-4.4.2-r1.ebuild b/kde-base/systemsettings/systemsettings-4.4.2-r1.ebuild
deleted file mode 100644
index 3e6d708bff96..000000000000
--- a/kde-base/systemsettings/systemsettings-4.4.2-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.4.2-r1.ebuild,v 1.1 2010/05/03 19:37:59 reavertm Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-workspace"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="System settings utility"
-IUSE="debug +handbook +usb xinerama"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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}
-	x11-apps/setxkbmap
-	x11-misc/xkeyboard-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'
-
-PATCHES=( "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" )
-
-src_unpack() {
-	if use handbook; then
-		KMEXTRA="${KMEXTRA}
-			doc/kcontrol
-		"
-	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/systemsettings/systemsettings-4.4.3.ebuild b/kde-base/systemsettings/systemsettings-4.4.4.ebuild
index 9ccec74510ea..bc195b3ebcad 100644
--- a/kde-base/systemsettings/systemsettings-4.4.3.ebuild
+++ b/kde-base/systemsettings/systemsettings-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.4.3.ebuild,v 1.2 2010/05/04 08:18:13 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.4.4.ebuild,v 1.1 2010/06/06 14:42:12 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/thumbnailers/ChangeLog b/kde-base/thumbnailers/ChangeLog
index 0e672fa7631e..9f11061ca51b 100644
--- a/kde-base/thumbnailers/ChangeLog
+++ b/kde-base/thumbnailers/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/thumbnailers
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/thumbnailers/ChangeLog,v 1.30 2010/05/04 05:55:52 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/thumbnailers/ChangeLog,v 1.31 2010/06/06 14:41:34 scarabeus Exp $
+
+*thumbnailers-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -thumbnailers-4.4.2.ebuild, -thumbnailers-4.4.3.ebuild,
+  +thumbnailers-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -thumbnailers-4.4.1.ebuild:
diff --git a/kde-base/thumbnailers/thumbnailers-4.4.3.ebuild b/kde-base/thumbnailers/thumbnailers-4.4.3.ebuild
deleted file mode 100644
index 2bb1cd3be0ee..000000000000
--- a/kde-base/thumbnailers/thumbnailers-4.4.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/thumbnailers/thumbnailers-4.4.3.ebuild,v 1.1 2010/05/03 21:50:09 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdegraphics"
-inherit kde4-meta
-
-DESCRIPTION="KDE 4 thumbnail generators for PDF/PS files"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-KMEXTRACTONLY="
-	libs/mobipocket
-"
-
-DEPEND="
-	$(add_kdebase_dep libkdcraw)
-	$(add_kdebase_dep libkexiv2)
-"
-RDEPEND="${DEPEND}"
-
-add_blocker kdegraphics-strigi-analyzer '<4.2.91'
diff --git a/kde-base/thumbnailers/thumbnailers-4.4.2.ebuild b/kde-base/thumbnailers/thumbnailers-4.4.4.ebuild
index 89751b72d81e..42cca37d72ac 100644
--- a/kde-base/thumbnailers/thumbnailers-4.4.2.ebuild
+++ b/kde-base/thumbnailers/thumbnailers-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/thumbnailers/thumbnailers-4.4.2.ebuild,v 1.1 2010/03/30 22:08:39 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/thumbnailers/thumbnailers-4.4.4.ebuild,v 1.1 2010/06/06 14:41:34 scarabeus Exp $
 
 EAPI="3"
 
diff --git a/kde-base/umbrello/ChangeLog b/kde-base/umbrello/ChangeLog
index d114f39b67a6..476b80ab4716 100644
--- a/kde-base/umbrello/ChangeLog
+++ b/kde-base/umbrello/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/umbrello
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/ChangeLog,v 1.146 2010/05/04 05:56:05 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/ChangeLog,v 1.147 2010/06/06 14:41:57 scarabeus Exp $
+
+*umbrello-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -umbrello-4.4.2.ebuild, -umbrello-4.4.3.ebuild, +umbrello-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -umbrello-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/umbrello/umbrello-4.4.3.ebuild b/kde-base/umbrello/umbrello-4.4.3.ebuild
deleted file mode 100644
index 00b3f3f3b90b..000000000000
--- a/kde-base/umbrello/umbrello-4.4.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/umbrello-4.4.3.ebuild,v 1.1 2010/05/03 21:50:30 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdesdk"
-
-inherit kde4-meta
-
-DESCRIPTION="KDE UML Modeller"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-DEPEND="
-	dev-libs/boost
-	dev-libs/libxml2
-	dev-libs/libxslt
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/umbrello/umbrello-4.4.2.ebuild b/kde-base/umbrello/umbrello-4.4.4.ebuild
index 76027e1fbaae..862a529556ff 100644
--- a/kde-base/umbrello/umbrello-4.4.2.ebuild
+++ b/kde-base/umbrello/umbrello-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/umbrello-4.4.2.ebuild,v 1.1 2010/03/30 22:09:01 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/umbrello-4.4.4.ebuild,v 1.1 2010/06/06 14:41:57 scarabeus Exp $
 
 EAPI="3"