KDE 4.8.4 version bump

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64, RepoMan options: --force)

581 files changed, 10270 insertions, 288 deletions

diff --git a/kde-base/akonadiconsole/ChangeLog b/kde-base/akonadiconsole/ChangeLog
index 607f9c2f58e3..c31f9640692f 100644
--- a/kde-base/akonadiconsole/ChangeLog
+++ b/kde-base/akonadiconsole/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/akonadiconsole
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadiconsole/ChangeLog,v 1.32 2012/05/24 11:38:05 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadiconsole/ChangeLog,v 1.33 2012/06/21 21:54:57 dilfridge Exp $
+
+*akonadiconsole-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +akonadiconsole-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -akonadiconsole-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/akonadiconsole/akonadiconsole-4.8.4.ebuild b/kde-base/akonadiconsole/akonadiconsole-4.8.4.ebuild
new file mode 100644
index 000000000000..d97e8047acfb
--- /dev/null
+++ b/kde-base/akonadiconsole/akonadiconsole-4.8.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadiconsole/akonadiconsole-4.8.4.ebuild,v 1.1 2012/06/21 21:54:57 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="Akonadi developer console"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	akonadi_next/
+	calendarsupport/
+	messageviewer/
+"
diff --git a/kde-base/akregator/ChangeLog b/kde-base/akregator/ChangeLog
index 76a878b12fb5..a0692395e1b7 100644
--- a/kde-base/akregator/ChangeLog
+++ b/kde-base/akregator/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/akregator
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/ChangeLog,v 1.222 2012/05/24 11:37:58 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/ChangeLog,v 1.223 2012/06/21 21:54:58 dilfridge Exp $
+
+*akregator-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +akregator-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -akregator-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/akregator/akregator-4.8.4.ebuild b/kde-base/akregator/akregator-4.8.4.ebuild
new file mode 100644
index 000000000000..de1cf59c801e
--- /dev/null
+++ b/kde-base/akregator/akregator-4.8.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/akregator-4.8.4.ebuild,v 1.1 2012/06/21 21:54:58 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="KDE news feed aggregator."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMLOADLIBS="kdepim-common-libs"
diff --git a/kde-base/amor/ChangeLog b/kde-base/amor/ChangeLog
index dec53679e12b..2ad14e12b03e 100644
--- a/kde-base/amor/ChangeLog
+++ b/kde-base/amor/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/amor
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/amor/ChangeLog,v 1.213 2012/05/24 11:37:51 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/amor/ChangeLog,v 1.214 2012/06/21 21:54:48 dilfridge Exp $
+
+*amor-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +amor-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -amor-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/amor/amor-4.8.4.ebuild b/kde-base/amor/amor-4.8.4.ebuild
new file mode 100644
index 000000000000..464db92a11c4
--- /dev/null
+++ b/kde-base/amor/amor-4.8.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/amor/amor-4.8.4.ebuild,v 1.1 2012/06/21 21:54:48 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdetoys"
+inherit kde4-meta
+
+DESCRIPTION="KDE: Amusing Misuse Of Resources - desktop-dwelling creature"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/analitza/ChangeLog b/kde-base/analitza/ChangeLog
index 58992674b2f2..7b0d12595b91 100644
--- a/kde-base/analitza/ChangeLog
+++ b/kde-base/analitza/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/analitza
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/analitza/ChangeLog,v 1.13 2012/05/24 11:38:05 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/analitza/ChangeLog,v 1.14 2012/06/21 21:54:40 dilfridge Exp $
+
+*analitza-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +analitza-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -analitza-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/analitza/analitza-4.8.4.ebuild b/kde-base/analitza/analitza-4.8.4.ebuild
new file mode 100644
index 000000000000..530759a216a4
--- /dev/null
+++ b/kde-base/analitza/analitza-4.8.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/analitza/analitza-4.8.4.ebuild,v 1.1 2012/06/21 21:54:40 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="never"
+inherit kde4-base
+
+DESCRIPTION="KDE library for mathematical features"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug readline"
+
+DEPEND="
+	readline? ( sys-libs/readline )
+"
+RDEPEND="${DEPEND}"
+
+add_blocker kalgebra 4.7.50
+
+PATCHES=( "${FILESDIR}/${PN}-solaris-graph2d.patch" )
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with readline)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/kde-base/ark/ChangeLog b/kde-base/ark/ChangeLog
index 976d319d5e36..a8bb8340ff18 100644
--- a/kde-base/ark/ChangeLog
+++ b/kde-base/ark/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/ark
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ark/ChangeLog,v 1.230 2012/05/24 11:38:09 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ark/ChangeLog,v 1.231 2012/06/21 21:54:41 dilfridge Exp $
+
+*ark-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +ark-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -ark-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/ark/ark-4.8.4.ebuild b/kde-base/ark/ark-4.8.4.ebuild
new file mode 100644
index 000000000000..70514c5602b0
--- /dev/null
+++ b/kde-base/ark/ark-4.8.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ark/ark-4.8.4.ebuild,v 1.1 2012/06/21 21:54:41 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE Archiving tool"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+archive +bzip2 debug lzma"
+
+DEPEND="
+	$(add_kdebase_dep libkonq)
+	sys-libs/zlib
+	archive? ( >=app-arch/libarchive-2.6.1[bzip2?,lzma?,zlib] )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with archive LibArchive)
+		$(cmake-utils_use_with bzip2 BZip2)
+		$(cmake-utils_use_with lzma LibLZMA)
+	)
+	kde4-base_src_configure
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+	elog "For creating rar archives, install app-arch/rar"
+}
diff --git a/kde-base/attica/ChangeLog b/kde-base/attica/ChangeLog
index 229e14df2c42..a8d19e14ec3d 100644
--- a/kde-base/attica/ChangeLog
+++ b/kde-base/attica/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/attica
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/attica/ChangeLog,v 1.75 2012/05/24 11:38:09 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/attica/ChangeLog,v 1.76 2012/06/21 21:54:48 dilfridge Exp $
+
+*attica-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +attica-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -attica-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/attica/attica-4.8.4.ebuild b/kde-base/attica/attica-4.8.4.ebuild
new file mode 100644
index 000000000000..83468165a9e4
--- /dev/null
+++ b/kde-base/attica/attica-4.8.4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/attica/attica-4.8.4.ebuild,v 1.1 2012/06/21 21:54:48 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="Open Collaboration Services provider management"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	>=dev-libs/libattica-0.1.4
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-base/blinken/ChangeLog b/kde-base/blinken/ChangeLog
index 82ca36ae9d45..c3da2c998d2e 100644
--- a/kde-base/blinken/ChangeLog
+++ b/kde-base/blinken/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/blinken
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/blinken/ChangeLog,v 1.187 2012/05/24 11:37:46 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/blinken/ChangeLog,v 1.188 2012/06/21 21:54:27 dilfridge Exp $
+
+*blinken-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +blinken-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -blinken-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/blinken/blinken-4.8.4.ebuild b/kde-base/blinken/blinken-4.8.4.ebuild
new file mode 100644
index 000000000000..36fbe0788367
--- /dev/null
+++ b/kde-base/blinken/blinken-4.8.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/blinken/blinken-4.8.4.ebuild,v 1.1 2012/06/21 21:54:27 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE version of the Simon Says game."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep libkdeedu)
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep knotify)
+"
diff --git a/kde-base/blogilo/ChangeLog b/kde-base/blogilo/ChangeLog
index 61acb7224780..f4882a58974b 100644
--- a/kde-base/blogilo/ChangeLog
+++ b/kde-base/blogilo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/blogilo
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/blogilo/ChangeLog,v 1.70 2012/05/24 11:38:02 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/blogilo/ChangeLog,v 1.71 2012/06/21 21:54:38 dilfridge Exp $
+
+*blogilo-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +blogilo-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -blogilo-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/blogilo/blogilo-4.8.4.ebuild b/kde-base/blogilo/blogilo-4.8.4.ebuild
new file mode 100644
index 000000000000..b47f81c75c13
--- /dev/null
+++ b/kde-base/blogilo/blogilo-4.8.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/blogilo/blogilo-4.8.4.ebuild,v 1.1 2012/06/21 21:54:38 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="KDE Blogging Client"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+"
+RDEPEND="${DEPEND}
+"
diff --git a/kde-base/bomber/ChangeLog b/kde-base/bomber/ChangeLog
index 79828649d543..958891429c0b 100644
--- a/kde-base/bomber/ChangeLog
+++ b/kde-base/bomber/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/bomber
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/bomber/ChangeLog,v 1.102 2012/05/24 11:37:52 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/bomber/ChangeLog,v 1.103 2012/06/21 21:54:49 dilfridge Exp $
+
+*bomber-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +bomber-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -bomber-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/bomber/bomber-4.8.4.ebuild b/kde-base/bomber/bomber-4.8.4.ebuild
new file mode 100644
index 000000000000..0e15ec370cc7
--- /dev/null
+++ b/kde-base/bomber/bomber-4.8.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/bomber/bomber-4.8.4.ebuild,v 1.1 2012/06/21 21:54:49 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+inherit kde4-meta
+
+DESCRIPTION="KDE arcade bombing game"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/bovo/ChangeLog b/kde-base/bovo/ChangeLog
index 11b7d033581e..4c994a55d49e 100644
--- a/kde-base/bovo/ChangeLog
+++ b/kde-base/bovo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/bovo
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/bovo/ChangeLog,v 1.117 2012/05/24 11:38:00 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/bovo/ChangeLog,v 1.118 2012/06/21 21:54:37 dilfridge Exp $
+
+*bovo-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +bovo-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -bovo-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/bovo/bovo-4.8.4.ebuild b/kde-base/bovo/bovo-4.8.4.ebuild
new file mode 100644
index 000000000000..8e9335ca2a4d
--- /dev/null
+++ b/kde-base/bovo/bovo-4.8.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/bovo/bovo-4.8.4.ebuild,v 1.1 2012/06/21 21:54:37 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+inherit kde4-meta
+
+DESCRIPTION="Five-in-a-row Board Game"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/cantor/ChangeLog b/kde-base/cantor/ChangeLog
index ca3a0b6cc14a..46f4367e0fb5 100644
--- a/kde-base/cantor/ChangeLog
+++ b/kde-base/cantor/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/cantor
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/cantor/ChangeLog,v 1.71 2012/06/16 16:45:24 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/cantor/ChangeLog,v 1.72 2012/06/21 21:54:46 dilfridge Exp $
+
+*cantor-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +cantor-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   16 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> cantor-4.7.4.ebuild,
   cantor-4.8.3.ebuild, metadata.xml:
diff --git a/kde-base/cantor/cantor-4.8.4.ebuild b/kde-base/cantor/cantor-4.8.4.ebuild
new file mode 100644
index 000000000000..5141c21826bb
--- /dev/null
+++ b/kde-base/cantor/cantor-4.8.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/cantor/cantor-4.8.4.ebuild,v 1.1 2012/06/21 21:54:46 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE4 interface for doing mathematics and scientific computing"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="analitza debug postscript +R"
+
+# TODO Add Sage Mathematics Software backend (http://www.sagemath.org)
+RDEPEND="
+	analitza? ( $(add_kdebase_dep analitza) )
+	postscript? ( app-text/libspectre )
+	R? ( dev-lang/R )
+"
+DEPEND="${RDEPEND}
+	>=dev-cpp/eigen-2.0.3:2
+"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with analitza)
+		$(cmake-utils_use_with postscript LibSpectre)
+		$(cmake-utils_use_with R)
+	)
+	kde4-base_src_configure
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	if ! use R; then
+		echo
+		ewarn "You have decided to build ${PN} with no backend."
+		ewarn "To have this application functional, please do one of below:"
+		ewarn "    # emerge -va1 '='${CATEGORY}/${P} with 'R' USE flag enabled"
+		ewarn "    # emerge -vaDu sci-mathematics/maxima"
+		echo
+	fi
+}
diff --git a/kde-base/cervisia/ChangeLog b/kde-base/cervisia/ChangeLog
index 450ef781fca7..260180560da5 100644
--- a/kde-base/cervisia/ChangeLog
+++ b/kde-base/cervisia/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/cervisia
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/cervisia/ChangeLog,v 1.207 2012/05/24 11:37:48 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/cervisia/ChangeLog,v 1.208 2012/06/21 21:54:46 dilfridge Exp $
+
+*cervisia-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +cervisia-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -cervisia-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/cervisia/cervisia-4.8.4.ebuild b/kde-base/cervisia/cervisia-4.8.4.ebuild
new file mode 100644
index 000000000000..0e6ec5359efe
--- /dev/null
+++ b/kde-base/cervisia/cervisia-4.8.4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/cervisia/cervisia-4.8.4.ebuild,v 1.1 2012/06/21 21:54:47 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdesdk"
+inherit kde4-meta
+
+DESCRIPTION="Cervisia - A KDE CVS frontend"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	dev-vcs/cvs
+"
diff --git a/kde-base/dolphin-plugins/ChangeLog b/kde-base/dolphin-plugins/ChangeLog
index b0f412fa17c0..50788977192b 100644
--- a/kde-base/dolphin-plugins/ChangeLog
+++ b/kde-base/dolphin-plugins/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/dolphin-plugins
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin-plugins/ChangeLog,v 1.53 2012/05/24 11:37:48 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin-plugins/ChangeLog,v 1.54 2012/06/21 21:54:40 dilfridge Exp $
+
+*dolphin-plugins-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +dolphin-plugins-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -dolphin-plugins-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/dolphin-plugins/dolphin-plugins-4.8.4.ebuild b/kde-base/dolphin-plugins/dolphin-plugins-4.8.4.ebuild
new file mode 100644
index 000000000000..7b7eac3646bd
--- /dev/null
+++ b/kde-base/dolphin-plugins/dolphin-plugins-4.8.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin-plugins/dolphin-plugins-4.8.4.ebuild,v 1.1 2012/06/21 21:54:40 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kdesdk"
+inherit kde4-meta
+
+DESCRIPTION="Extra Dolphin plugins"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug bazaar git mercurial subversion"
+
+DEPEND="
+	$(add_kdebase_dep libkonq)
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep kompare)
+	bazaar? ( dev-vcs/bzr )
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
+	subversion? ( dev-vcs/subversion )
+"
+
+KMLOADLIBS="libkonq"
+
+#
+# See bug 351147 for why this is necessary
+#
+src_prepare() {
+	echo 'macro_optional_add_subdirectory ( dolphin-plugins )' >> CMakeLists.txt || die
+	echo > dolphin-plugins/CMakeLists.txt || die
+	use bazaar && echo 'add_subdirectory ( bazaar )' >> dolphin-plugins/CMakeLists.txt
+	use git && echo 'add_subdirectory ( git )' >> dolphin-plugins/CMakeLists.txt
+	use mercurial && echo 'add_subdirectory ( hg )' >> dolphin-plugins/CMakeLists.txt
+	use subversion && echo 'add_subdirectory ( svn )' >> dolphin-plugins/CMakeLists.txt
+
+	kde4-meta_src_prepare
+}
+
+src_install() {
+	{ use bazaar || use git || use mercurial || use subversion; } && kde4-meta_src_install
+}
+
+pkg_postinst() {
+	if ! use bazaar && ! use git && ! use mercurial && ! use subversion ; then
+		einfo
+		einfo "You have disabled all plugin use flags. If you want to have vcs"
+		einfo "integration in dolphin, enable those of your needs."
+		einfo
+	fi
+}
diff --git a/kde-base/dolphin/ChangeLog b/kde-base/dolphin/ChangeLog
index 3f6e8e4d2fe0..313877382150 100644
--- a/kde-base/dolphin/ChangeLog
+++ b/kde-base/dolphin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/dolphin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/ChangeLog,v 1.139 2012/05/24 11:37:53 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/ChangeLog,v 1.140 2012/06/21 21:55:05 dilfridge Exp $
+
+*dolphin-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +dolphin-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -dolphin-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/dolphin/dolphin-4.8.4.ebuild b/kde-base/dolphin/dolphin-4.8.4.ebuild
new file mode 100644
index 000000000000..54e99b090b3c
--- /dev/null
+++ b/kde-base/dolphin/dolphin-4.8.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/dolphin-4.8.4.ebuild,v 1.1 2012/06/21 21:55:05 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-baseapps"
+inherit kde4-meta
+
+DESCRIPTION="A KDE filemanager focusing on usability"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug semantic-desktop thumbnail"
+
+DEPEND="
+	$(add_kdebase_dep kdelibs 'semantic-desktop=')
+	$(add_kdebase_dep libkonq)
+	semantic-desktop? ( dev-libs/shared-desktop-ontologies )
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep kfind)
+"
+PDEPEND="
+	thumbnail? (
+		$(add_kdebase_dep thumbnailers)
+		|| (
+			$(add_kdebase_dep ffmpegthumbs)
+			$(add_kdebase_dep mplayerthumbs)
+		)
+	)
+"
+
+KMLOADLIBS="libkonq"
+
+RESTRICT="test"
+# bug 393129
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+	)
+
+	kde4-meta_src_configure
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+	echo
+	elog "For .exe file preview support, install media-gfx/icoutils."
+	echo
+}
diff --git a/kde-base/dragonplayer/ChangeLog b/kde-base/dragonplayer/ChangeLog
index 052d91d616ff..b6fbbc181715 100644
--- a/kde-base/dragonplayer/ChangeLog
+++ b/kde-base/dragonplayer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/dragonplayer
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dragonplayer/ChangeLog,v 1.116 2012/05/24 11:38:00 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dragonplayer/ChangeLog,v 1.117 2012/06/21 21:55:00 dilfridge Exp $
+
+*dragonplayer-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +dragonplayer-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -dragonplayer-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/dragonplayer/dragonplayer-4.8.4.ebuild b/kde-base/dragonplayer/dragonplayer-4.8.4.ebuild
new file mode 100644
index 000000000000..500b2666436c
--- /dev/null
+++ b/kde-base/dragonplayer/dragonplayer-4.8.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dragonplayer/dragonplayer-4.8.4.ebuild,v 1.1 2012/06/21 21:55:00 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdemultimedia"
+inherit kde4-meta
+
+DESCRIPTION="Dragon Player is a simple video player for KDE 4"
+HOMEPAGE="http://www.dragonplayer.net/"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+LICENSE="GPL-2"
+IUSE="debug xine"
+
+RDEPEND="
+	>=media-libs/phonon-4.4.3
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
diff --git a/kde-base/drkonqi/ChangeLog b/kde-base/drkonqi/ChangeLog
index f6a830a89d79..d03817dc08a8 100644
--- a/kde-base/drkonqi/ChangeLog
+++ b/kde-base/drkonqi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/drkonqi
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/drkonqi/ChangeLog,v 1.226 2012/05/24 11:37:45 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/drkonqi/ChangeLog,v 1.227 2012/06/21 21:54:57 dilfridge Exp $
+
+*drkonqi-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +drkonqi-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -drkonqi-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/drkonqi/drkonqi-4.8.4.ebuild b/kde-base/drkonqi/drkonqi-4.8.4.ebuild
new file mode 100644
index 000000000000..62c4b0159521
--- /dev/null
+++ b/kde-base/drkonqi/drkonqi-4.8.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/drkonqi/drkonqi-4.8.4.ebuild,v 1.1 2012/06/21 21:54:57 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="KDE crash handler, gives the user feedback if a program crashed"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+	if ! has_version "sys-devel/gdb"; then
+		elog "For more usability consider installing following packages:"
+		elog "    sys-devel/gdb - Easier debugging support"
+	fi
+}
diff --git a/kde-base/ffmpegthumbs/ChangeLog b/kde-base/ffmpegthumbs/ChangeLog
index bc01ddf8a683..9da478f86535 100644
--- a/kde-base/ffmpegthumbs/ChangeLog
+++ b/kde-base/ffmpegthumbs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/ffmpegthumbs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ffmpegthumbs/ChangeLog,v 1.58 2012/06/03 09:01:32 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ffmpegthumbs/ChangeLog,v 1.59 2012/06/21 21:55:00 dilfridge Exp $
+
+*ffmpegthumbs-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +ffmpegthumbs-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   03 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
   ffmpegthumbs-4.8.3.ebuild:
diff --git a/kde-base/ffmpegthumbs/ffmpegthumbs-4.8.4.ebuild b/kde-base/ffmpegthumbs/ffmpegthumbs-4.8.4.ebuild
new file mode 100644
index 000000000000..7e7734ac36aa
--- /dev/null
+++ b/kde-base/ffmpegthumbs/ffmpegthumbs-4.8.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ffmpegthumbs/ffmpegthumbs-4.8.4.ebuild,v 1.1 2012/06/21 21:55:00 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kdemultimedia"
+inherit kde4-meta
+
+DESCRIPTION="A FFmpeg based thumbnail Generator for Video Files."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	virtual/ffmpeg
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-4.8.1-ffmpeg.patch" )
diff --git a/kde-base/filelight/ChangeLog b/kde-base/filelight/ChangeLog
index f4587dd8a9ab..d28e39f38755 100644
--- a/kde-base/filelight/ChangeLog
+++ b/kde-base/filelight/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/filelight
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/filelight/ChangeLog,v 1.49 2012/05/24 11:37:54 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/filelight/ChangeLog,v 1.50 2012/06/21 21:54:34 dilfridge Exp $
+
+*filelight-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +filelight-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -filelight-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/filelight/filelight-4.8.4.ebuild b/kde-base/filelight/filelight-4.8.4.ebuild
new file mode 100644
index 000000000000..90a442c42518
--- /dev/null
+++ b/kde-base/filelight/filelight-4.8.4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/filelight/filelight-4.8.4.ebuild,v 1.1 2012/06/21 21:54:34 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="Filelight creates an interactive map of concentric, segmented rings that help visualise disk usage."
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	x11-apps/xdpyinfo
+"
diff --git a/kde-base/freespacenotifier/ChangeLog b/kde-base/freespacenotifier/ChangeLog
index 019ff444c484..700249698b9b 100644
--- a/kde-base/freespacenotifier/ChangeLog
+++ b/kde-base/freespacenotifier/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/freespacenotifier
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/freespacenotifier/ChangeLog,v 1.57 2012/05/24 11:38:01 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/freespacenotifier/ChangeLog,v 1.58 2012/06/21 21:54:52 dilfridge Exp $
+
+*freespacenotifier-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +freespacenotifier-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org>
   -freespacenotifier-4.8.1.ebuild:
diff --git a/kde-base/freespacenotifier/freespacenotifier-4.8.4.ebuild b/kde-base/freespacenotifier/freespacenotifier-4.8.4.ebuild
new file mode 100644
index 000000000000..b0b489966dce
--- /dev/null
+++ b/kde-base/freespacenotifier/freespacenotifier-4.8.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/freespacenotifier/freespacenotifier-4.8.4.ebuild,v 1.1 2012/06/21 21:54:52 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+inherit kde4-meta
+
+DESCRIPTION="A module that monitors free disk space on the home dir"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/granatier/ChangeLog b/kde-base/granatier/ChangeLog
index c810163bed4b..b5b16aaba0e2 100644
--- a/kde-base/granatier/ChangeLog
+++ b/kde-base/granatier/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/granatier
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/granatier/ChangeLog,v 1.67 2012/05/24 11:37:52 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/granatier/ChangeLog,v 1.68 2012/06/21 21:54:59 dilfridge Exp $
+
+*granatier-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +granatier-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -granatier-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/granatier/granatier-4.8.4.ebuild b/kde-base/granatier/granatier-4.8.4.ebuild
new file mode 100644
index 000000000000..0d2626c8527f
--- /dev/null
+++ b/kde-base/granatier/granatier-4.8.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/granatier/granatier-4.8.4.ebuild,v 1.1 2012/06/21 21:54:59 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+inherit kde4-meta
+
+DESCRIPTION="KDE Bomberman game"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	media-libs/libsndfile
+	media-libs/openal
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-base/gwenview/ChangeLog b/kde-base/gwenview/ChangeLog
index d098ba675b3e..cf185916ef23 100644
--- a/kde-base/gwenview/ChangeLog
+++ b/kde-base/gwenview/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/gwenview
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/gwenview/ChangeLog,v 1.130 2012/05/24 11:38:10 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/gwenview/ChangeLog,v 1.131 2012/06/21 21:54:36 dilfridge Exp $
+
+*gwenview-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +gwenview-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -gwenview-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/gwenview/gwenview-4.8.4.ebuild b/kde-base/gwenview/gwenview-4.8.4.ebuild
new file mode 100644
index 000000000000..9867294f87be
--- /dev/null
+++ b/kde-base/gwenview/gwenview-4.8.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/gwenview/gwenview-4.8.4.ebuild,v 1.1 2012/06/21 21:54:36 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE image viewer"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug kipi semantic-desktop"
+
+# tests hang, last checked for 4.2.96
+RESTRICT="test"
+
+DEPEND="
+	$(add_kdebase_dep kdelibs 'semantic-desktop=')
+	$(add_kdebase_dep libkonq)
+	>=media-gfx/exiv2-0.19
+	virtual/jpeg
+	kipi? ( $(add_kdebase_dep libkipi) )
+"
+RDEPEND="${DEPEND}"
+
+KMLOADLIBS="libkonq"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_with kipi)
+	)
+
+	if use semantic-desktop; then
+		mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=Nepomuk)
+	else
+		mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=None)
+	fi
+
+	kde4-base_src_configure
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	echo
+	elog "For SVG support, emerge -va kde-base/svgpart"
+	echo
+	use kipi && elog "The plugins for the KIPI inteface can be found in media-plugins/kipi-plugins"
+	use kipi && echo
+}
diff --git a/kde-base/jovie/ChangeLog b/kde-base/jovie/ChangeLog
index edbd67a1261f..47ae0b9e978d 100644
--- a/kde-base/jovie/ChangeLog
+++ b/kde-base/jovie/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/jovie
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/jovie/ChangeLog,v 1.52 2012/05/24 11:37:52 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/jovie/ChangeLog,v 1.53 2012/06/21 21:54:42 dilfridge Exp $
+
+*jovie-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +jovie-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -jovie-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/jovie/jovie-4.8.4.ebuild b/kde-base/jovie/jovie-4.8.4.ebuild
new file mode 100644
index 000000000000..3b234fb7f46e
--- /dev/null
+++ b/kde-base/jovie/jovie-4.8.4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/jovie/jovie-4.8.4.ebuild,v 1.1 2012/06/21 21:54:42 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+
+inherit kde4-base
+
+DESCRIPTION="Jovie is a text to speech application"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	app-accessibility/speech-dispatcher
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-base/juk/ChangeLog b/kde-base/juk/ChangeLog
index 6f26422d3db3..17235953efd6 100644
--- a/kde-base/juk/ChangeLog
+++ b/kde-base/juk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/juk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/ChangeLog,v 1.226 2012/05/24 11:38:08 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/ChangeLog,v 1.227 2012/06/21 21:54:41 dilfridge Exp $
+
+*juk-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +juk-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -juk-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/juk/juk-4.8.4.ebuild b/kde-base/juk/juk-4.8.4.ebuild
new file mode 100644
index 000000000000..ae3945ed9ab8
--- /dev/null
+++ b/kde-base/juk/juk-4.8.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/juk-4.8.4.ebuild,v 1.1 2012/06/21 21:54:41 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdemultimedia"
+inherit kde4-meta
+
+DESCRIPTION="Jukebox and music manager for KDE."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	>=media-libs/taglib-1.6
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	# http://bugs.gentoo.org/410551 for disabling deprecated TunePimp support
+	mycmakeargs=(
+		-DWITH_TunePimp=OFF
+	)
+
+	kde4-meta_src_configure
+}
diff --git a/kde-base/kabcclient/ChangeLog b/kde-base/kabcclient/ChangeLog
index 01cf3823a08b..01b06500cef5 100644
--- a/kde-base/kabcclient/ChangeLog
+++ b/kde-base/kabcclient/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kabcclient
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kabcclient/ChangeLog,v 1.95 2012/05/24 11:37:53 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kabcclient/ChangeLog,v 1.96 2012/06/21 21:55:03 dilfridge Exp $
+
+*kabcclient-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kabcclient-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kabcclient-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kabcclient/kabcclient-4.8.4.ebuild b/kde-base/kabcclient/kabcclient-4.8.4.ebuild
new file mode 100644
index 000000000000..3765fa62e6f4
--- /dev/null
+++ b/kde-base/kabcclient/kabcclient-4.8.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kabcclient/kabcclient-4.8.4.ebuild,v 1.1 2012/06/21 21:55:03 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+KMMODULE="console/${PN}"
+inherit kde4-meta
+
+DESCRIPTION="A command line client for accessing the KDE addressbook"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	kde4-meta_src_install
+
+	# work around NULL DT_RPATH in kabc2mutt
+	dosym kabcclient ${PREFIX}/bin/kabc2mutt
+}
diff --git a/kde-base/kaccessible/ChangeLog b/kde-base/kaccessible/ChangeLog
index 84b86d507a1f..228a9ed7e1de 100644
--- a/kde-base/kaccessible/ChangeLog
+++ b/kde-base/kaccessible/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kaccessible
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaccessible/ChangeLog,v 1.49 2012/05/24 11:37:43 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaccessible/ChangeLog,v 1.50 2012/06/21 21:54:30 dilfridge Exp $
+
+*kaccessible-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kaccessible-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kaccessible-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kaccessible/kaccessible-4.8.4.ebuild b/kde-base/kaccessible/kaccessible-4.8.4.ebuild
new file mode 100644
index 000000000000..3672381234cc
--- /dev/null
+++ b/kde-base/kaccessible/kaccessible-4.8.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaccessible/kaccessible-4.8.4.ebuild,v 1.1 2012/06/21 21:54:30 dilfridge Exp $
+
+EAPI=4
+
+inherit kde4-base
+
+DESCRIPTION="Provides accessibility services like focus tracking"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug +speechd"
+
+DEPEND="speechd? ( app-accessibility/speech-dispatcher )"
+RDEPEND=${DEPEND}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with speechd)
+	)
+	kde4-base_src_configure
+}
diff --git a/kde-base/kactivities/ChangeLog b/kde-base/kactivities/ChangeLog
index 72bde9c7c3c1..6cbc8c991863 100644
--- a/kde-base/kactivities/ChangeLog
+++ b/kde-base/kactivities/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kactivities
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kactivities/ChangeLog,v 1.27 2012/05/24 11:37:45 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kactivities/ChangeLog,v 1.28 2012/06/21 21:54:56 dilfridge Exp $
+
+*kactivities-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kactivities-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kactivities-4.8.1.ebuild,
   -kactivities-4.8.1-r1.ebuild:
diff --git a/kde-base/kactivities/kactivities-4.8.4.ebuild b/kde-base/kactivities/kactivities-4.8.4.ebuild
new file mode 100644
index 000000000000..cc216dc8ceb4
--- /dev/null
+++ b/kde-base/kactivities/kactivities-4.8.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kactivities/kactivities-4.8.4.ebuild,v 1.1 2012/06/21 21:54:56 dilfridge Exp $
+
+EAPI=4
+
+inherit kde4-base
+
+DESCRIPTION="KDE Activity Manager"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="semantic-desktop"
+
+DEPEND="$(add_kdebase_dep kdelibs 'semantic-desktop=')"
+RDEPEND="${DEPEND}"
+
+# Split out from kdelibs in 4.7.1-r2
+add_blocker kdelibs 4.7.1-r1
+# Moved here in 4.8
+add_blocker activitymanager
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+	)
+	kde4-base_src_configure
+}
diff --git a/kde-base/kaddressbook/ChangeLog b/kde-base/kaddressbook/ChangeLog
index e79b0f604fb3..800840007746 100644
--- a/kde-base/kaddressbook/ChangeLog
+++ b/kde-base/kaddressbook/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kaddressbook
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/ChangeLog,v 1.220 2012/05/24 11:37:43 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/ChangeLog,v 1.221 2012/06/21 21:54:27 dilfridge Exp $
+
+*kaddressbook-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kaddressbook-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kaddressbook-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kaddressbook/kaddressbook-4.8.4.ebuild b/kde-base/kaddressbook/kaddressbook-4.8.4.ebuild
new file mode 100644
index 000000000000..acfdd128c28a
--- /dev/null
+++ b/kde-base/kaddressbook/kaddressbook-4.8.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-4.8.4.ebuild,v 1.1 2012/06/21 21:54:27 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="The KDE Address Book"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	>=dev-libs/grantlee-0.1.4
+	$(add_kdebase_dep kdelibs 'semantic-desktop')
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRA="
+	plugins/kaddressbook/
+	plugins/ktexteditor/
+"
+KMEXTRACTONLY="
+	akonadi_next/
+	calendarsupport/
+	libkleo/
+"
+
+KMLOADLIBS="kdepim-common-libs"
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	if ! has_version kde-base/kdepim-kresources:${SLOT}; then
+		echo
+		elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
+		echo
+	fi
+}
diff --git a/kde-base/kajongg/ChangeLog b/kde-base/kajongg/ChangeLog
index 19fa24868cd2..d05de7884207 100644
--- a/kde-base/kajongg/ChangeLog
+++ b/kde-base/kajongg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kajongg
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kajongg/ChangeLog,v 1.55 2012/05/24 11:37:45 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kajongg/ChangeLog,v 1.56 2012/06/21 21:55:05 dilfridge Exp $
+
+*kajongg-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kajongg-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kajongg-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kajongg/kajongg-4.8.4.ebuild b/kde-base/kajongg/kajongg-4.8.4.ebuild
new file mode 100644
index 000000000000..e58ebb71cdbe
--- /dev/null
+++ b/kde-base/kajongg/kajongg-4.8.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kajongg/kajongg-4.8.4.ebuild,v 1.1 2012/06/21 21:55:05 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+PYTHON_DEPEND="2:2.6"
+inherit kde4-meta python
+
+DESCRIPTION="The classical Mah Jongg for four players"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	dev-db/sqlite:3
+	$(add_kdebase_dep libkdegames)
+	$(add_kdebase_dep pykde4)
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep libkmahjongg)
+	>=dev-python/twisted-8.2.0
+"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+	kde4-meta_pkg_setup
+}
+
+src_prepare() {
+	python_convert_shebangs -r 2 kajongg/src
+	kde4-meta_src_prepare
+}
diff --git a/kde-base/kalarm/ChangeLog b/kde-base/kalarm/ChangeLog
index 49ab04ef40ea..5454dc5f0ed4 100644
--- a/kde-base/kalarm/ChangeLog
+++ b/kde-base/kalarm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kalarm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/ChangeLog,v 1.213 2012/05/24 11:38:08 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/ChangeLog,v 1.214 2012/06/21 21:54:48 dilfridge Exp $
+
+*kalarm-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kalarm-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kalarm-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kalarm/kalarm-4.8.4.ebuild b/kde-base/kalarm/kalarm-4.8.4.ebuild
new file mode 100644
index 000000000000..a5e6fe89e8e1
--- /dev/null
+++ b/kde-base/kalarm/kalarm-4.8.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/kalarm-4.8.4.ebuild,v 1.1 2012/06/21 21:54:48 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="Personal alarm message, command and email scheduler for KDE"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+	$(add_kdebase_dep kdepim-common-libs)
+	media-libs/phonon
+"
+DEPEND="${RDEPEND}"
+
+KMEXTRACTONLY="
+	kmail/
+"
diff --git a/kde-base/kalgebra/ChangeLog b/kde-base/kalgebra/ChangeLog
index b1139183b73b..78a98065c4a9 100644
--- a/kde-base/kalgebra/ChangeLog
+++ b/kde-base/kalgebra/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kalgebra
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalgebra/ChangeLog,v 1.129 2012/05/24 11:38:11 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalgebra/ChangeLog,v 1.130 2012/06/21 21:55:06 dilfridge Exp $
+
+*kalgebra-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kalgebra-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kalgebra-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kalgebra/kalgebra-4.8.4.ebuild b/kde-base/kalgebra/kalgebra-4.8.4.ebuild
new file mode 100644
index 000000000000..21d49a2cb822
--- /dev/null
+++ b/kde-base/kalgebra/kalgebra-4.8.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalgebra/kalgebra-4.8.4.ebuild,v 1.1 2012/06/21 21:55:06 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+OPENGL_REQUIRED="optional"
+inherit kde4-base
+
+DESCRIPTION="MathML-based graph calculator for KDE."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug +plasma readline"
+
+DEPEND="
+	$(add_kdebase_dep analitza)
+	$(add_kdebase_dep libkdeedu)
+	readline? ( sys-libs/readline )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with readline)
+		$(cmake-utils_use_with plasma)
+		$(cmake-utils_use_with opengl OpenGL)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/kde-base/kalzium/ChangeLog b/kde-base/kalzium/ChangeLog
index 5624b3c005e9..b58b97548b22 100644
--- a/kde-base/kalzium/ChangeLog
+++ b/kde-base/kalzium/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kalzium
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/ChangeLog,v 1.226 2012/05/24 11:38:05 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/ChangeLog,v 1.227 2012/06/21 21:54:28 dilfridge Exp $
+
+*kalzium-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kalzium-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kalzium-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kalzium/kalzium-4.8.4.ebuild b/kde-base/kalzium/kalzium-4.8.4.ebuild
new file mode 100644
index 000000000000..14fc64074425
--- /dev/null
+++ b/kde-base/kalzium/kalzium-4.8.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/kalzium-4.8.4.ebuild,v 1.1 2012/06/21 21:54:28 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+CPPUNIT_REQUIRED="optional"
+OPENGL_REQUIRED="always"
+inherit kde4-base flag-o-matic
+
+DESCRIPTION="KDE: periodic table of the elements."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="editor debug +plasma solver"
+
+RDEPEND="
+	$(add_kdebase_dep libkdeedu)
+	editor? ( >=sci-chemistry/openbabel-2.2 )
+"
+DEPEND="${RDEPEND}
+	editor? ( >=dev-cpp/eigen-2.0.3:2 )
+	solver? ( dev-ml/facile[ocamlopt] )
+"
+
+KMEXTRACTONLY="
+	libkdeedu/kdeeduui/
+	libkdeedu/libscience/
+"
+
+src_configure(){
+	# Fix missing finite()
+	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H
+
+	mycmakeargs=(
+		$(cmake-utils_use_with editor Eigen2)
+		$(cmake-utils_use_with editor OpenBabel2)
+		$(cmake-utils_use_with editor OpenGL)
+		$(cmake-utils_use_with solver OCaml)
+		$(cmake-utils_use_with solver Libfacile)
+	)
+
+	kde4-base_src_configure
+}
+
+src_test(){ :; } #see bug 376911
diff --git a/kde-base/kamera/ChangeLog b/kde-base/kamera/ChangeLog
index 5b9aee743ecb..86d2383b0d55 100644
--- a/kde-base/kamera/ChangeLog
+++ b/kde-base/kamera/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kamera
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kamera/ChangeLog,v 1.206 2012/05/24 11:37:47 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kamera/ChangeLog,v 1.207 2012/06/21 21:54:27 dilfridge Exp $
+
+*kamera-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kamera-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kamera-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kamera/kamera-4.8.4.ebuild b/kde-base/kamera/kamera-4.8.4.ebuild
new file mode 100644
index 000000000000..374673bbbe35
--- /dev/null
+++ b/kde-base/kamera/kamera-4.8.4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kamera/kamera-4.8.4.ebuild,v 1.1 2012/06/21 21:54:27 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE digital camera manager"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	media-libs/libgphoto2
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-base/kanagram/ChangeLog b/kde-base/kanagram/ChangeLog
index d30a2c501626..a36635ab9540 100644
--- a/kde-base/kanagram/ChangeLog
+++ b/kde-base/kanagram/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kanagram
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kanagram/ChangeLog,v 1.186 2012/05/24 11:37:47 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kanagram/ChangeLog,v 1.187 2012/06/21 21:54:48 dilfridge Exp $
+
+*kanagram-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kanagram-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kanagram-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kanagram/kanagram-4.8.4.ebuild b/kde-base/kanagram/kanagram-4.8.4.ebuild
new file mode 100644
index 000000000000..e08c43676e3e
--- /dev/null
+++ b/kde-base/kanagram/kanagram-4.8.4.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kanagram/kanagram-4.8.4.ebuild,v 1.1 2012/06/21 21:54:48 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE: letter order game."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep libkdeedu)
+"
diff --git a/kde-base/kapman/ChangeLog b/kde-base/kapman/ChangeLog
index 24fd1dd34458..24d5f43aaa47 100644
--- a/kde-base/kapman/ChangeLog
+++ b/kde-base/kapman/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kapman
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kapman/ChangeLog,v 1.100 2012/05/24 11:37:50 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kapman/ChangeLog,v 1.101 2012/06/21 21:54:58 dilfridge Exp $
+
+*kapman-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kapman-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kapman-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kapman/kapman-4.8.4.ebuild b/kde-base/kapman/kapman-4.8.4.ebuild
new file mode 100644
index 000000000000..8211d79f762b
--- /dev/null
+++ b/kde-base/kapman/kapman-4.8.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kapman/kapman-4.8.4.ebuild,v 1.1 2012/06/21 21:54:58 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+inherit kde4-meta
+
+DESCRIPTION="Pac-Man clone for KDE"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kapptemplate/ChangeLog b/kde-base/kapptemplate/ChangeLog
index 8c37e7384387..51422f7ba1d0 100644
--- a/kde-base/kapptemplate/ChangeLog
+++ b/kde-base/kapptemplate/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kapptemplate
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kapptemplate/ChangeLog,v 1.185 2012/05/24 11:37:53 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kapptemplate/ChangeLog,v 1.186 2012/06/21 21:54:58 dilfridge Exp $
+
+*kapptemplate-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kapptemplate-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kapptemplate-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kapptemplate/kapptemplate-4.8.4.ebuild b/kde-base/kapptemplate/kapptemplate-4.8.4.ebuild
new file mode 100644
index 000000000000..2d1a76888229
--- /dev/null
+++ b/kde-base/kapptemplate/kapptemplate-4.8.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kapptemplate/kapptemplate-4.8.4.ebuild,v 1.1 2012/06/21 21:54:58 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdesdk"
+inherit kde4-meta
+
+DESCRIPTION="KAppTemplate - A shell script to create the necessary framework to develop KDE applications."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kate/ChangeLog b/kde-base/kate/ChangeLog
index 7df3a59c8ace..98d14d144b5e 100644
--- a/kde-base/kate/ChangeLog
+++ b/kde-base/kate/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kate
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kate/ChangeLog,v 1.233 2012/05/24 11:37:57 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kate/ChangeLog,v 1.234 2012/06/21 21:54:36 dilfridge Exp $
+
+*kate-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kate-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kate-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kate/kate-4.8.4.ebuild b/kde-base/kate/kate-4.8.4.ebuild
new file mode 100644
index 000000000000..d524320af4e4
--- /dev/null
+++ b/kde-base/kate/kate-4.8.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kate/kate-4.8.4.ebuild,v 1.1 2012/06/21 21:54:36 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kate"
+inherit kde4-meta
+
+DESCRIPTION="Kate is an MDI texteditor."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug +plasma"
+
+DEPEND="
+	dev-libs/libxml2
+	dev-libs/libxslt
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep katepart)
+"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with plasma)
+	)
+
+	kde4-meta_src_configure
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	if ! has_version kde-base/kaddressbook:${SLOT}; then
+		echo
+		elog "File templates plugin requires kde-base/kaddressbook:${SLOT}."
+		elog "Please install it if you plan to use this plugin."
+		echo
+	fi
+}
diff --git a/kde-base/katepart/ChangeLog b/kde-base/katepart/ChangeLog
index 5e8eb865b90e..f348d3d0b504 100644
--- a/kde-base/katepart/ChangeLog
+++ b/kde-base/katepart/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/katepart
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/katepart/ChangeLog,v 1.31 2012/05/24 11:38:11 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/katepart/ChangeLog,v 1.32 2012/06/21 21:54:42 dilfridge Exp $
+
+*katepart-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +katepart-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -katepart-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/katepart/katepart-4.8.4.ebuild b/kde-base/katepart/katepart-4.8.4.ebuild
new file mode 100644
index 000000000000..7f1c7ce92c08
--- /dev/null
+++ b/kde-base/katepart/katepart-4.8.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/katepart/katepart-4.8.4.ebuild,v 1.1 2012/06/21 21:54:42 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kate"
+KMMODULE="part"
+inherit kde4-meta
+
+DESCRIPTION="KDE Editor KPart"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RESTRICT="test"
+# bug 392993
+
+add_blocker kdelibs 4.6.50
+
+src_configure() {
+	local mycmakeargs=(
+		"-DKDE4_BUILD_TESTS=OFF"
+	)
+
+	kde4-meta_src_configure
+}
diff --git a/kde-base/katomic/ChangeLog b/kde-base/katomic/ChangeLog
index 7c0c68a8d691..adc62bba242a 100644
--- a/kde-base/katomic/ChangeLog
+++ b/kde-base/katomic/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/katomic
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/katomic/ChangeLog,v 1.208 2012/05/24 11:37:46 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/katomic/ChangeLog,v 1.209 2012/06/21 21:54:45 dilfridge Exp $
+
+*katomic-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +katomic-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -katomic-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/katomic/katomic-4.8.4.ebuild b/kde-base/katomic/katomic-4.8.4.ebuild
new file mode 100644
index 000000000000..67227555cce1
--- /dev/null
+++ b/kde-base/katomic/katomic-4.8.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/katomic/katomic-4.8.4.ebuild,v 1.1 2012/06/21 21:54:45 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+KDE_SELINUX_MODULE="games"
+inherit kde4-meta
+
+DESCRIPTION="KDE Atomic Entertainment Game"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kbattleship/ChangeLog b/kde-base/kbattleship/ChangeLog
index 6d74af2b3520..2e367ffd1a7b 100644
--- a/kde-base/kbattleship/ChangeLog
+++ b/kde-base/kbattleship/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kbattleship
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbattleship/ChangeLog,v 1.212 2012/05/24 11:38:04 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbattleship/ChangeLog,v 1.213 2012/06/21 21:54:31 dilfridge Exp $
+
+*kbattleship-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kbattleship-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kbattleship-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kbattleship/kbattleship-4.8.4.ebuild b/kde-base/kbattleship/kbattleship-4.8.4.ebuild
new file mode 100644
index 000000000000..7e78c8d1a10f
--- /dev/null
+++ b/kde-base/kbattleship/kbattleship-4.8.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbattleship/kbattleship-4.8.4.ebuild,v 1.1 2012/06/21 21:54:31 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+KDE_SELINUX_MODULE="games"
+inherit games-ggz kde4-meta
+
+DESCRIPTION="The KDE Battleship clone"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+src_prepare() {
+	# cmake is doing this really weird
+	sed -i \
+		-e "s:register_ggz_module:#register_ggz_module:g" \
+		"${PN}"/src/CMakeLists.txt || die "ggz removal failed"
+
+	kde4-meta_src_prepare
+}
+
+src_install() {
+	kde4-meta_src_install
+	# and also we have to prepare the ggz dir
+	insinto "${GGZ_MODDIR}"
+	newins ${PN}/src/module.dsc ${P}.dsc
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+	games-ggz_pkg_postinst
+}
+
+pkg_postrm() {
+	kde4-meta_pkg_postrm
+	games-ggz_pkg_postrm
+}
diff --git a/kde-base/kblackbox/ChangeLog b/kde-base/kblackbox/ChangeLog
index 17a22958e39b..29467d61b150 100644
--- a/kde-base/kblackbox/ChangeLog
+++ b/kde-base/kblackbox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kblackbox
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kblackbox/ChangeLog,v 1.207 2012/05/24 11:38:11 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kblackbox/ChangeLog,v 1.208 2012/06/21 21:54:51 dilfridge Exp $
+
+*kblackbox-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kblackbox-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kblackbox-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kblackbox/kblackbox-4.8.4.ebuild b/kde-base/kblackbox/kblackbox-4.8.4.ebuild
new file mode 100644
index 000000000000..2ffa77ad0b05
--- /dev/null
+++ b/kde-base/kblackbox/kblackbox-4.8.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kblackbox/kblackbox-4.8.4.ebuild,v 1.1 2012/06/21 21:54:51 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+KDE_SELINUX_MODULE="games"
+inherit kde4-meta
+
+DESCRIPTION="KDE Blackbox Game"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kblocks/ChangeLog b/kde-base/kblocks/ChangeLog
index 0d8fcf4d38db..d18cac7157c6 100644
--- a/kde-base/kblocks/ChangeLog
+++ b/kde-base/kblocks/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kblocks
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kblocks/ChangeLog,v 1.105 2012/05/24 11:38:08 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kblocks/ChangeLog,v 1.106 2012/06/21 21:54:41 dilfridge Exp $
+
+*kblocks-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kblocks-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kblocks-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kblocks/kblocks-4.8.4.ebuild b/kde-base/kblocks/kblocks-4.8.4.ebuild
new file mode 100644
index 000000000000..62a7714836f0
--- /dev/null
+++ b/kde-base/kblocks/kblocks-4.8.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kblocks/kblocks-4.8.4.ebuild,v 1.1 2012/06/21 21:54:41 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+inherit kde4-meta
+
+DESCRIPTION="KDE: Kblocks is a single-player Tetris-like game."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kbounce/ChangeLog b/kde-base/kbounce/ChangeLog
index ce84083a7bac..06c51f841386 100644
--- a/kde-base/kbounce/ChangeLog
+++ b/kde-base/kbounce/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kbounce
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbounce/ChangeLog,v 1.207 2012/05/24 11:38:10 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbounce/ChangeLog,v 1.208 2012/06/21 21:54:42 dilfridge Exp $
+
+*kbounce-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kbounce-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kbounce-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kbounce/kbounce-4.8.4.ebuild b/kde-base/kbounce/kbounce-4.8.4.ebuild
new file mode 100644
index 000000000000..98e55fff2cad
--- /dev/null
+++ b/kde-base/kbounce/kbounce-4.8.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbounce/kbounce-4.8.4.ebuild,v 1.1 2012/06/21 21:54:42 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+KDE_SELINUX_MODULE="games"
+inherit kde4-meta
+
+DESCRIPTION="KDE Bounce Ball Game"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kbreakout/ChangeLog b/kde-base/kbreakout/ChangeLog
index 7b391cd6564d..d81d36c090ff 100644
--- a/kde-base/kbreakout/ChangeLog
+++ b/kde-base/kbreakout/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kbreakout
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbreakout/ChangeLog,v 1.105 2012/05/24 11:38:11 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbreakout/ChangeLog,v 1.106 2012/06/21 21:55:05 dilfridge Exp $
+
+*kbreakout-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kbreakout-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kbreakout-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kbreakout/kbreakout-4.8.4.ebuild b/kde-base/kbreakout/kbreakout-4.8.4.ebuild
new file mode 100644
index 000000000000..6a664c94a90c
--- /dev/null
+++ b/kde-base/kbreakout/kbreakout-4.8.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbreakout/kbreakout-4.8.4.ebuild,v 1.1 2012/06/21 21:55:05 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+inherit kde4-meta
+
+DESCRIPTION="KDE: A Breakout-like game for KDE."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kbruch/ChangeLog b/kde-base/kbruch/ChangeLog
index bb6fb0cea86d..47ea7f30a2c5 100644
--- a/kde-base/kbruch/ChangeLog
+++ b/kde-base/kbruch/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kbruch
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbruch/ChangeLog,v 1.204 2012/05/24 11:37:56 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbruch/ChangeLog,v 1.205 2012/06/21 21:54:41 dilfridge Exp $
+
+*kbruch-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kbruch-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kbruch-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kbruch/kbruch-4.8.4.ebuild b/kde-base/kbruch/kbruch-4.8.4.ebuild
new file mode 100644
index 000000000000..abacb0b6e773
--- /dev/null
+++ b/kde-base/kbruch/kbruch-4.8.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbruch/kbruch-4.8.4.ebuild,v 1.1 2012/06/21 21:54:41 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE Educational: Learn calculating with fractions"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kcachegrind/ChangeLog b/kde-base/kcachegrind/ChangeLog
index 8259ecc8570a..002586aea1ef 100644
--- a/kde-base/kcachegrind/ChangeLog
+++ b/kde-base/kcachegrind/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kcachegrind
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcachegrind/ChangeLog,v 1.202 2012/05/24 11:37:49 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcachegrind/ChangeLog,v 1.203 2012/06/21 21:54:56 dilfridge Exp $
+
+*kcachegrind-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kcachegrind-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kcachegrind-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kcachegrind/kcachegrind-4.8.4.ebuild b/kde-base/kcachegrind/kcachegrind-4.8.4.ebuild
new file mode 100644
index 000000000000..19e289c2b5cb
--- /dev/null
+++ b/kde-base/kcachegrind/kcachegrind-4.8.4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcachegrind/kcachegrind-4.8.4.ebuild,v 1.1 2012/06/21 21:54:56 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdesdk"
+inherit kde4-meta
+
+DESCRIPTION="KDE Frontend for Cachegrind"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	media-gfx/graphviz
+"
diff --git a/kde-base/kcalc/ChangeLog b/kde-base/kcalc/ChangeLog
index 6f141bb0fb62..e6751cc09a81 100644
--- a/kde-base/kcalc/ChangeLog
+++ b/kde-base/kcalc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kcalc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/ChangeLog,v 1.216 2012/05/24 11:38:03 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/ChangeLog,v 1.217 2012/06/21 21:54:37 dilfridge Exp $
+
+*kcalc-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kcalc-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kcalc-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kcalc/kcalc-4.8.4.ebuild b/kde-base/kcalc/kcalc-4.8.4.ebuild
new file mode 100644
index 000000000000..ac8ed823dd94
--- /dev/null
+++ b/kde-base/kcalc/kcalc-4.8.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/kcalc-4.8.4.ebuild,v 1.1 2012/06/21 21:54:37 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+CPPUNIT_REQUIRED="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE calculator"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	dev-libs/gmp
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"
+# bug 393093
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.3.2-solaris-knumber_priv.patch
+)
+
+src_test() {
+	LANG=C kde4-base_src_test
+}
diff --git a/kde-base/kcharselect/ChangeLog b/kde-base/kcharselect/ChangeLog
index 574a0951b566..a11c24f8dd25 100644
--- a/kde-base/kcharselect/ChangeLog
+++ b/kde-base/kcharselect/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kcharselect
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcharselect/ChangeLog,v 1.196 2012/05/24 11:37:51 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcharselect/ChangeLog,v 1.197 2012/06/21 21:55:06 dilfridge Exp $
+
+*kcharselect-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kcharselect-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kcharselect-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kcharselect/kcharselect-4.8.4.ebuild b/kde-base/kcharselect/kcharselect-4.8.4.ebuild
new file mode 100644
index 000000000000..ec8695d9fd85
--- /dev/null
+++ b/kde-base/kcharselect/kcharselect-4.8.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcharselect/kcharselect-4.8.4.ebuild,v 1.1 2012/06/21 21:55:06 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE character selection utility"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kcheckpass/ChangeLog b/kde-base/kcheckpass/ChangeLog
index 010c0c7d6b93..97bf56d6a385 100644
--- a/kde-base/kcheckpass/ChangeLog
+++ b/kde-base/kcheckpass/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kcheckpass
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/ChangeLog,v 1.224 2012/05/24 11:38:12 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/ChangeLog,v 1.225 2012/06/21 21:55:03 dilfridge Exp $
+
+*kcheckpass-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kcheckpass-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kcheckpass-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kcheckpass/kcheckpass-4.8.4.ebuild b/kde-base/kcheckpass/kcheckpass-4.8.4.ebuild
new file mode 100644
index 000000000000..538208d73134
--- /dev/null
+++ b/kde-base/kcheckpass/kcheckpass-4.8.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/kcheckpass-4.8.4.ebuild,v 1.1 2012/06/21 21:55:03 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+inherit kde4-meta
+
+DESCRIPTION="A simple password checker, used by any software in need of user authentication."
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug pam"
+
+RDEPEND="
+	pam? (
+		>=kde-base/kdebase-pam-7
+		virtual/pam
+	)
+"
+DEPEND="${RDEPEND}
+	x11-libs/libxkbfile
+"
+
+src_prepare() {
+	kde4-meta_src_prepare
+
+	use pam && epatch "${FILESDIR}/${PN}-4.4.2-no-SUID-no-GUID.patch"
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with pam)
+	)
+
+	kde4-meta_src_configure
+}
diff --git a/kde-base/kcminit/ChangeLog b/kde-base/kcminit/ChangeLog
index a6a650edcde7..a2b9eb4bd6ef 100644
--- a/kde-base/kcminit/ChangeLog
+++ b/kde-base/kcminit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kcminit
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcminit/ChangeLog,v 1.202 2012/05/24 11:38:00 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcminit/ChangeLog,v 1.203 2012/06/21 21:55:02 dilfridge Exp $
+
+*kcminit-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kcminit-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kcminit-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kcminit/kcminit-4.8.4.ebuild b/kde-base/kcminit/kcminit-4.8.4.ebuild
new file mode 100644
index 000000000000..90a35bd7605d
--- /dev/null
+++ b/kde-base/kcminit/kcminit-4.8.4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcminit/kcminit-4.8.4.ebuild,v 1.1 2012/06/21 21:55:02 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+inherit kde4-meta
+
+DESCRIPTION="KCMInit - runs startups initialization for Control Modules."
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep ksplash)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-base/kcmshell/ChangeLog b/kde-base/kcmshell/ChangeLog
index e4fc3492b9fe..f46cb54caef5 100644
--- a/kde-base/kcmshell/ChangeLog
+++ b/kde-base/kcmshell/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kcmshell
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcmshell/ChangeLog,v 1.123 2012/05/24 11:37:51 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcmshell/ChangeLog,v 1.124 2012/06/21 21:54:56 dilfridge Exp $
+
+*kcmshell-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kcmshell-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kcmshell-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kcmshell/kcmshell-4.8.4.ebuild b/kde-base/kcmshell/kcmshell-4.8.4.ebuild
new file mode 100644
index 000000000000..c9b101609519
--- /dev/null
+++ b/kde-base/kcmshell/kcmshell-4.8.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcmshell/kcmshell-4.8.4.ebuild,v 1.1 2012/06/21 21:54:56 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="KCMShell is a utility to host KDE control modules independently of SystemSettings."
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kcolorchooser/ChangeLog b/kde-base/kcolorchooser/ChangeLog
index 1cda158e8e71..a3a80b113a72 100644
--- a/kde-base/kcolorchooser/ChangeLog
+++ b/kde-base/kcolorchooser/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kcolorchooser
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcolorchooser/ChangeLog,v 1.116 2012/05/24 11:37:43 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcolorchooser/ChangeLog,v 1.117 2012/06/21 21:54:30 dilfridge Exp $
+
+*kcolorchooser-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kcolorchooser-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kcolorchooser-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kcolorchooser/kcolorchooser-4.8.4.ebuild b/kde-base/kcolorchooser/kcolorchooser-4.8.4.ebuild
new file mode 100644
index 000000000000..31c9691613c5
--- /dev/null
+++ b/kde-base/kcolorchooser/kcolorchooser-4.8.4.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcolorchooser/kcolorchooser-4.8.4.ebuild,v 1.1 2012/06/21 21:54:30 dilfridge Exp $
+
+EAPI=4
+
+inherit kde4-base
+
+DESCRIPTION="KDE color selector/editor"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kcontrol/ChangeLog b/kde-base/kcontrol/ChangeLog
index 8c1997ae0cac..713cde21d583 100644
--- a/kde-base/kcontrol/ChangeLog
+++ b/kde-base/kcontrol/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kcontrol
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/ChangeLog,v 1.251 2012/05/24 11:37:59 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/ChangeLog,v 1.252 2012/06/21 21:54:39 dilfridge Exp $
+
+*kcontrol-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kcontrol-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kcontrol-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kcontrol/kcontrol-4.8.4.ebuild b/kde-base/kcontrol/kcontrol-4.8.4.ebuild
new file mode 100644
index 000000000000..a9683d946a09
--- /dev/null
+++ b/kde-base/kcontrol/kcontrol-4.8.4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/kcontrol-4.8.4.ebuild,v 1.1 2012/06/21 21:54:39 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="The KDE Control Center"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	$(add_kdebase_dep kdnssd)
+	$(add_kdebase_dep khotkeys)
+"
diff --git a/kde-base/kcron/ChangeLog b/kde-base/kcron/ChangeLog
index 40a925630671..17f374a54ee2 100644
--- a/kde-base/kcron/ChangeLog
+++ b/kde-base/kcron/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kcron
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcron/ChangeLog,v 1.205 2012/05/24 11:37:42 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcron/ChangeLog,v 1.206 2012/06/21 21:54:39 dilfridge Exp $
+
+*kcron-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kcron-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kcron-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kcron/kcron-4.8.4.ebuild b/kde-base/kcron/kcron-4.8.4.ebuild
new file mode 100644
index 000000000000..785fb8f012b1
--- /dev/null
+++ b/kde-base/kcron/kcron-4.8.4.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcron/kcron-4.8.4.ebuild,v 1.1 2012/06/21 21:54:39 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdeadmin"
+inherit kde4-meta
+
+DESCRIPTION="KDE Task Scheduler"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="!prefix? ( virtual/cron )"
diff --git a/kde-base/kde-env/ChangeLog b/kde-base/kde-env/ChangeLog
index 61caf1ee6fb5..25d0207d86f9 100644
--- a/kde-base/kde-env/ChangeLog
+++ b/kde-base/kde-env/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kde-env
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/ChangeLog,v 1.146 2012/05/24 11:37:44 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/ChangeLog,v 1.147 2012/06/21 21:55:00 dilfridge Exp $
+
+*kde-env-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kde-env-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kde-env-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kde-env/kde-env-4.8.4.ebuild b/kde-base/kde-env/kde-env-4.8.4.ebuild
new file mode 100644
index 000000000000..5fc8f961d56b
--- /dev/null
+++ b/kde-base/kde-env/kde-env-4.8.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:55:00 dilfridge Exp $
+
+EAPI=4
+
+CMAKE_REQUIRED="never"
+KDE_REQUIRED="never"
+inherit kde4-base
+
+DESCRIPTION="Environment setting required for all KDE4 apps to run."
+SRC_URI=""
+ESVN_REPO_URI=""
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+LICENSE="as-is"
+IUSE="aqua"
+
+add_blocker kdelibs 4.6.80
+
+S=${WORKDIR}
+
+src_unpack() {
+	:
+}
+
+src_prepare() {
+	:
+}
+
+src_install() {
+	# number goes down with version
+	cat <<-EOF > 43kdepaths
+CONFIG_PROTECT="/usr/share/config"
+#KDE_IS_PRELINKED=1
+EOF
+	doenvd 43kdepaths
+
+	# Properly place xinitrc.d file that exports XDG_MENU_PREFIX to env
+	cat <<EOF > 11-xdg-menu-kde-4
+#!/bin/sh
+
+if [ -z \${XDG_MENU_PREFIX} ] && [ "\${DESKTOP_SESSION}" = "KDE-4" ]; then
+	export XDG_MENU_PREFIX="kde-4-"
+fi
+EOF
+	exeinto /etc/X11/xinit/xinitrc.d/
+	doexe 11-xdg-menu-kde-4 || die "doexe failed"
+}
+
+pkg_preinst() {
+	:
+}
+
+src_test() {
+	:
+}
diff --git a/kde-base/kde-l10n/ChangeLog b/kde-base/kde-l10n/ChangeLog
index 6cadb8b75da7..1204acbb4e2f 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-l10n/ChangeLog,v 1.137 2012/05/24 11:37:43 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-l10n/ChangeLog,v 1.138 2012/06/21 21:54:27 dilfridge Exp $
+
+*kde-l10n-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kde-l10n-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kde-l10n-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kde-l10n/kde-l10n-4.8.4.ebuild b/kde-base/kde-l10n/kde-l10n-4.8.4.ebuild
new file mode 100644
index 000000000000..b780172928e1
--- /dev/null
+++ b/kde-base/kde-l10n/kde-l10n-4.8.4.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:27 dilfridge Exp $
+
+EAPI=4
+
+inherit kde4-base
+
+DESCRIPTION="KDE internationalization package"
+HOMEPAGE="http://www.kde.org/"
+LICENSE="GPL-2"
+
+DEPEND="
+	sys-devel/gettext
+"
+RDEPEND="!<kde-misc/konq-plugins-4.6"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+handbook"
+
+# /usr/portage/distfiles $ ls -1 kde-l10n-*-${PV}.* |sed -e 's:-${PV}.tar.xz::' -e 's:kde-l10n-::' |tr '\n' ' '
+MY_LANGS="ar bg bs ca ca@valencia cs da de el en_GB es et eu fa fi fr ga gl he
+hr hu ia id is it ja kk km ko lt lv nb nds nl nn pa pl pt pt_BR ro ru si sk sl
+sr sv tg th tr ug uk vi wa zh_CN zh_TW"
+
+URI_BASE="${SRC_URI/-${PV}.tar.xz/}"
+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.xz )"
+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
+
+	[[ -n ${A} ]] && unpack ${A}
+	cd "${S}"
+
+	# add all linguas to cmake
+	if [[ -n ${A} ]]; then
+		for LNG in ${LINGUAS}; do
+			DIR="${PN}-${LNG}-${PV}"
+			if [[ -d "${DIR}" ]] ; then
+				echo "add_subdirectory( ${DIR} )" >> "${S}"/CMakeLists.txt
+			fi
+		done
+	fi
+}
+
+src_prepare() {
+	find "${S}" -name CMakeLists.txt -type f \
+		-exec sed -i -e 's:^ *add_subdirectory( *kdepim-runtime *):# no kdepim-runtime:g' {} +
+	find "${S}" -name CMakeLists.txt -type f \
+		-exec sed -i -e 's:^ *add_subdirectory( *kdepim *):# no kdepim:g' {} +
+
+	kde4-base_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_build handbook docs)
+	)
+	[[ -n ${A} ]] && kde4-base_src_configure
+}
+
+src_compile() {
+	[[ -n ${A} ]] && kde4-base_src_compile
+}
+
+src_test() {
+	[[ -n ${A} ]] && kde4-base_src_test
+}
+
+src_install() {
+	[[ -n ${A} ]] && kde4-base_src_install
+}
diff --git a/kde-base/kde-meta/ChangeLog b/kde-base/kde-meta/ChangeLog
index acd82ee668be..4e24de4182d7 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/ChangeLog,v 1.225 2012/05/24 11:37:41 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/ChangeLog,v 1.226 2012/06/21 21:54:43 dilfridge Exp $
+
+*kde-meta-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kde-meta-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kde-meta-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kde-meta/kde-meta-4.8.4.ebuild b/kde-base/kde-meta/kde-meta-4.8.4.ebuild
new file mode 100644
index 000000000000..0737bb544cd0
--- /dev/null
+++ b/kde-base/kde-meta/kde-meta-4.8.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:43 dilfridge Exp $
+
+EAPI=4
+inherit kde4-meta-pkg
+
+DESCRIPTION="KDE - merge this to pull in all split kde-base/* packages"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="accessibility nls sdk semantic-desktop"
+
+RDEPEND="
+	$(add_kdebase_dep kate)
+	$(add_kdebase_dep kdeadmin-meta)
+	$(add_kdebase_dep kdeartwork-meta)
+	$(add_kdebase_dep kdebase-meta)
+	$(add_kdebase_dep kdeedu-meta)
+	$(add_kdebase_dep kdegames-meta)
+	$(add_kdebase_dep kdegraphics-meta)
+	$(add_kdebase_dep kdemultimedia-meta)
+	$(add_kdebase_dep kdenetwork-meta)
+	$(add_kdebase_dep kdeplasma-addons)
+	$(add_kdebase_dep kdetoys-meta)
+	$(add_kdebase_dep kdeutils-meta)
+	accessibility? ( $(add_kdebase_dep kdeaccessibility-meta) )
+	nls? ( $(add_kdebase_dep kde-l10n) )
+	sdk? (
+		$(add_kdebase_dep kdebindings-meta)
+		$(add_kdebase_dep kdesdk-meta)
+		$(add_kdebase_dep kdewebdev-meta)
+	)
+	semantic-desktop? (
+		$(add_kdebase_dep kdepim-meta "" 4.4.11.1)
+	)
+"
diff --git a/kde-base/kde-wallpapers/ChangeLog b/kde-base/kde-wallpapers/ChangeLog
index 61a86bae16ea..5002cebb1016 100644
--- a/kde-base/kde-wallpapers/ChangeLog
+++ b/kde-base/kde-wallpapers/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kde-wallpapers
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-wallpapers/ChangeLog,v 1.63 2012/05/24 11:38:11 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-wallpapers/ChangeLog,v 1.64 2012/06/21 21:54:55 dilfridge Exp $
+
+*kde-wallpapers-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kde-wallpapers-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kde-wallpapers-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kde-wallpapers/kde-wallpapers-4.8.4.ebuild b/kde-base/kde-wallpapers/kde-wallpapers-4.8.4.ebuild
new file mode 100644
index 000000000000..3dcefc9ad8be
--- /dev/null
+++ b/kde-base/kde-wallpapers/kde-wallpapers-4.8.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-wallpapers/kde-wallpapers-4.8.4.ebuild,v 1.1 2012/06/21 21:54:55 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-wallpapers"
+inherit kde4-base
+
+DESCRIPTION="KDE wallpapers"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+add_blocker kdebase-wallpapers
+
+src_configure() {
+	mycmakeargs=( -DWALLPAPER_INSTALL_DIR="${EPREFIX}/usr/share/wallpapers" )
+
+	kde4-base_src_configure
+}
diff --git a/kde-base/kdeaccessibility-meta/ChangeLog b/kde-base/kdeaccessibility-meta/ChangeLog
index 8ec53031213c..b7fa1c6eee8c 100644
--- a/kde-base/kdeaccessibility-meta/ChangeLog
+++ b/kde-base/kdeaccessibility-meta/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdeaccessibility-meta
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-meta/ChangeLog,v 1.209 2012/05/24 11:37:52 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-meta/ChangeLog,v 1.210 2012/06/21 21:54:58 dilfridge Exp $
+
+*kdeaccessibility-meta-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdeaccessibility-meta-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org>
   -kdeaccessibility-meta-4.8.1.ebuild:
diff --git a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.8.4.ebuild b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.8.4.ebuild
new file mode 100644
index 000000000000..e750530e25b8
--- /dev/null
+++ b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.8.4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:58 dilfridge Exp $
+
+EAPI=4
+inherit kde4-meta-pkg
+
+DESCRIPTION="kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	$(add_kdebase_dep jovie)
+	$(add_kdebase_dep kaccessible)
+	$(add_kdebase_dep kmag)
+	$(add_kdebase_dep kmousetool)
+	$(add_kdebase_dep kmouth)
+"
diff --git a/kde-base/kdeaccounts-plugin/ChangeLog b/kde-base/kdeaccounts-plugin/ChangeLog
index 23d7c13ed9ea..398209271167 100644
--- a/kde-base/kdeaccounts-plugin/ChangeLog
+++ b/kde-base/kdeaccounts-plugin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdeaccounts-plugin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccounts-plugin/ChangeLog,v 1.113 2012/05/24 11:37:58 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccounts-plugin/ChangeLog,v 1.114 2012/06/21 21:54:51 dilfridge Exp $
+
+*kdeaccounts-plugin-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdeaccounts-plugin-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org>
   -kdeaccounts-plugin-4.8.1.ebuild:
diff --git a/kde-base/kdeaccounts-plugin/kdeaccounts-plugin-4.8.4.ebuild b/kde-base/kdeaccounts-plugin/kdeaccounts-plugin-4.8.4.ebuild
new file mode 100644
index 000000000000..5cc63217374e
--- /dev/null
+++ b/kde-base/kdeaccounts-plugin/kdeaccounts-plugin-4.8.4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:51 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kdesdk"
+inherit kde4-meta
+
+DESCRIPTION="Addressbook Plugin that puts names/email addresses of all KDE SVN accounts into an addressbook"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-base/kdeadmin-meta/ChangeLog b/kde-base/kdeadmin-meta/ChangeLog
index e96bfca0872e..0b6d5257e813 100644
--- a/kde-base/kdeadmin-meta/ChangeLog
+++ b/kde-base/kdeadmin-meta/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdeadmin-meta
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin-meta/ChangeLog,v 1.217 2012/05/24 11:37:46 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin-meta/ChangeLog,v 1.218 2012/06/21 21:54:29 dilfridge Exp $
+
+*kdeadmin-meta-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdeadmin-meta-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kdeadmin-meta-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kdeadmin-meta/kdeadmin-meta-4.8.4.ebuild b/kde-base/kdeadmin-meta/kdeadmin-meta-4.8.4.ebuild
new file mode 100644
index 000000000000..0dd2aa00ee98
--- /dev/null
+++ b/kde-base/kdeadmin-meta/kdeadmin-meta-4.8.4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:29 dilfridge Exp $
+
+EAPI=4
+inherit kde4-meta-pkg
+
+DESCRIPTION="KDE administration tools - merge this to pull in all kdeadmin-derived packages"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cups"
+
+RDEPEND="
+	$(add_kdebase_dep kcron)
+	$(add_kdebase_dep ksystemlog)
+	$(add_kdebase_dep kuser)
+	cups? ( $(add_kdebase_dep system-config-printer-kde) )
+"
diff --git a/kde-base/kdeartwork-colorschemes/ChangeLog b/kde-base/kdeartwork-colorschemes/ChangeLog
index ecae37e82b6b..40a705319235 100644
--- a/kde-base/kdeartwork-colorschemes/ChangeLog
+++ b/kde-base/kdeartwork-colorschemes/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdeartwork-colorschemes
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-colorschemes/ChangeLog,v 1.115 2012/05/24 11:37:49 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-colorschemes/ChangeLog,v 1.116 2012/06/21 21:54:43 dilfridge Exp $
+
+*kdeartwork-colorschemes-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdeartwork-colorschemes-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org>
   -kdeartwork-colorschemes-4.8.1.ebuild:
diff --git a/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-4.8.4.ebuild b/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-4.8.4.ebuild
new file mode 100644
index 000000000000..fafb73abfc88
--- /dev/null
+++ b/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-4.8.4.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:43 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kdeartwork"
+KMMODULE="ColorSchemes"
+inherit kde4-meta
+
+DESCRIPTION="KDE extra colorschemes"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+# Moved here in 4.7
+add_blocker kdeaccessibility-colorschemes
diff --git a/kde-base/kdeartwork-desktopthemes/ChangeLog b/kde-base/kdeartwork-desktopthemes/ChangeLog
index 925559f337cf..683aee225072 100644
--- a/kde-base/kdeartwork-desktopthemes/ChangeLog
+++ b/kde-base/kdeartwork-desktopthemes/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdeartwork-desktopthemes
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-desktopthemes/ChangeLog,v 1.101 2012/05/24 11:37:54 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-desktopthemes/ChangeLog,v 1.102 2012/06/21 21:54:34 dilfridge Exp $
+
+*kdeartwork-desktopthemes-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdeartwork-desktopthemes-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org>
   -kdeartwork-desktopthemes-4.8.1.ebuild:
diff --git a/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-4.8.4.ebuild b/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-4.8.4.ebuild
new file mode 100644
index 000000000000..e5c325add0b0
--- /dev/null
+++ b/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-4.8.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:34 dilfridge Exp $
+
+EAPI=4
+
+KMMODULE="desktopthemes"
+KMNAME="kdeartwork"
+inherit kde4-meta
+
+DESCRIPTION="Additional KDE4 Plasma themes"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
diff --git a/kde-base/kdeartwork-emoticons/ChangeLog b/kde-base/kdeartwork-emoticons/ChangeLog
index 503a99e530b3..1dcc0ef31766 100644
--- a/kde-base/kdeartwork-emoticons/ChangeLog
+++ b/kde-base/kdeartwork-emoticons/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdeartwork-emoticons
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-emoticons/ChangeLog,v 1.187 2012/05/24 11:38:08 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-emoticons/ChangeLog,v 1.188 2012/06/21 21:54:50 dilfridge Exp $
+
+*kdeartwork-emoticons-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdeartwork-emoticons-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org>
   -kdeartwork-emoticons-4.8.1.ebuild:
diff --git a/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-4.8.4.ebuild b/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-4.8.4.ebuild
new file mode 100644
index 000000000000..19533a1b4f1f
--- /dev/null
+++ b/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-4.8.4.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:50 dilfridge Exp $
+
+EAPI=4
+
+RESTRICT="binchecks strip"
+
+KMMODULE="emoticons"
+KMNAME="kdeartwork"
+inherit kde4-meta
+
+DESCRIPTION="EmotIcons (icons for things like smilies :-) for kde"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
diff --git a/kde-base/kdeartwork-iconthemes/ChangeLog b/kde-base/kdeartwork-iconthemes/ChangeLog
index f9b012e7c41d..8d067fe36a5b 100644
--- a/kde-base/kdeartwork-iconthemes/ChangeLog
+++ b/kde-base/kdeartwork-iconthemes/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdeartwork-iconthemes
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-iconthemes/ChangeLog,v 1.207 2012/05/24 11:37:43 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-iconthemes/ChangeLog,v 1.208 2012/06/21 21:54:44 dilfridge Exp $
+
+*kdeartwork-iconthemes-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdeartwork-iconthemes-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org>
   -kdeartwork-iconthemes-4.8.1.ebuild:
diff --git a/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.8.4.ebuild b/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.8.4.ebuild
new file mode 100644
index 000000000000..56d3ef1409bb
--- /dev/null
+++ b/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.8.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:44 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kdeartwork"
+KMMODULE="IconThemes"
+inherit kde4-meta
+
+DESCRIPTION="Icon themes for kde"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+# Provides nuvola icon theme
+RDEPEND="
+	!x11-themes/nuvola
+"
+
+# Moved here in 4.7
+add_blocker kdeaccessibility-iconthemes
diff --git a/kde-base/kdeartwork-kscreensaver/ChangeLog b/kde-base/kdeartwork-kscreensaver/ChangeLog
index be83d54729e6..48496d88013d 100644
--- a/kde-base/kdeartwork-kscreensaver/ChangeLog
+++ b/kde-base/kdeartwork-kscreensaver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdeartwork-kscreensaver
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/ChangeLog,v 1.223 2012/05/24 11:38:05 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/ChangeLog,v 1.224 2012/06/21 21:55:03 dilfridge Exp $
+
+*kdeartwork-kscreensaver-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdeartwork-kscreensaver-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org>
   -kdeartwork-kscreensaver-4.8.1.ebuild:
diff --git a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.8.4.ebuild b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.8.4.ebuild
new file mode 100644
index 000000000000..fe49de7955f1
--- /dev/null
+++ b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.8.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:55:03 dilfridge Exp $
+
+EAPI=4
+
+KMMODULE="kscreensaver"
+KMNAME="kdeartwork"
+OPENGL_REQUIRED="optional"
+inherit kde4-meta
+
+DESCRIPTION="Extra screensavers for kde"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug +eigen +kexiv2 opengl xscreensaver"
+
+# libkworkspace - only as a stub to provide KDE4Workspace config
+RDEPEND="
+	$(add_kdebase_dep kscreensaver 'opengl?')
+	$(add_kdebase_dep libkworkspace)
+	media-libs/libart_lgpl
+	kexiv2? ( $(add_kdebase_dep libkexiv2) )
+	opengl? ( virtual/opengl )
+	xscreensaver? ( x11-misc/xscreensaver )
+"
+DEPEND="${RDEPEND}
+	eigen? ( dev-cpp/eigen:2 )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-xscreensaver.patch"
+	"${FILESDIR}/${PN}-4.5.95-webcollage.patch" )
+
+src_configure() {
+	mycmakeargs=(
+		-DKSCREENSAVER_SOUND_SUPPORT=ON
+		$(cmake-utils_use_with eigen Eigen2)
+		$(cmake-utils_use_with kexiv2)
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with xscreensaver)
+	)
+
+	kde4-meta_src_configure
+}
diff --git a/kde-base/kdeartwork-meta/ChangeLog b/kde-base/kdeartwork-meta/ChangeLog
index 822ed8e84760..3be9d37865cf 100644
--- a/kde-base/kdeartwork-meta/ChangeLog
+++ b/kde-base/kdeartwork-meta/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdeartwork-meta
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-meta/ChangeLog,v 1.213 2012/05/24 11:38:04 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-meta/ChangeLog,v 1.214 2012/06/21 21:54:49 dilfridge Exp $
+
+*kdeartwork-meta-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdeartwork-meta-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kdeartwork-meta-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kdeartwork-meta/kdeartwork-meta-4.8.4.ebuild b/kde-base/kdeartwork-meta/kdeartwork-meta-4.8.4.ebuild
new file mode 100644
index 000000000000..206b74a08565
--- /dev/null
+++ b/kde-base/kdeartwork-meta/kdeartwork-meta-4.8.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:49 dilfridge Exp $
+
+EAPI=4
+inherit kde4-meta-pkg
+
+DESCRIPTION="kdeartwork - merge this to pull in all kdeartwork-derived packages"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	$(add_kdebase_dep kdeartwork-colorschemes)
+	$(add_kdebase_dep kdeartwork-desktopthemes)
+	$(add_kdebase_dep kdeartwork-emoticons)
+	$(add_kdebase_dep kdeartwork-iconthemes)
+	$(add_kdebase_dep kdeartwork-kscreensaver)
+	$(add_kdebase_dep kdeartwork-sounds)
+	$(add_kdebase_dep kdeartwork-styles)
+	$(add_kdebase_dep kdeartwork-wallpapers)
+	$(add_kdebase_dep kdeartwork-weatherwallpapers)
+"
diff --git a/kde-base/kdeartwork-sounds/ChangeLog b/kde-base/kdeartwork-sounds/ChangeLog
index 21e5ba6c1f37..e3595f199af4 100644
--- a/kde-base/kdeartwork-sounds/ChangeLog
+++ b/kde-base/kdeartwork-sounds/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdeartwork-sounds
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-sounds/ChangeLog,v 1.187 2012/05/24 11:37:54 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-sounds/ChangeLog,v 1.188 2012/06/21 21:54:55 dilfridge Exp $
+
+*kdeartwork-sounds-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdeartwork-sounds-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org>
   -kdeartwork-sounds-4.8.1.ebuild:
diff --git a/kde-base/kdeartwork-sounds/kdeartwork-sounds-4.8.4.ebuild b/kde-base/kdeartwork-sounds/kdeartwork-sounds-4.8.4.ebuild
new file mode 100644
index 000000000000..4bcd21a3c457
--- /dev/null
+++ b/kde-base/kdeartwork-sounds/kdeartwork-sounds-4.8.4.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:55 dilfridge Exp $
+
+EAPI=4
+
+RESTRICT="binchecks strip"
+
+KMMODULE="sounds"
+KMNAME="kdeartwork"
+inherit kde4-meta
+
+DESCRIPTION="Extra sound themes for kde"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
diff --git a/kde-base/kdeartwork-styles/ChangeLog b/kde-base/kdeartwork-styles/ChangeLog
index 0032d3ff39a3..ef384e090397 100644
--- a/kde-base/kdeartwork-styles/ChangeLog
+++ b/kde-base/kdeartwork-styles/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdeartwork-styles
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-styles/ChangeLog,v 1.207 2012/05/24 11:37:49 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-styles/ChangeLog,v 1.208 2012/06/21 21:54:32 dilfridge Exp $
+
+*kdeartwork-styles-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdeartwork-styles-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org>
   -kdeartwork-styles-4.8.1.ebuild:
diff --git a/kde-base/kdeartwork-styles/kdeartwork-styles-4.8.4.ebuild b/kde-base/kdeartwork-styles/kdeartwork-styles-4.8.4.ebuild
new file mode 100644
index 000000000000..6ae5c8a2408e
--- /dev/null
+++ b/kde-base/kdeartwork-styles/kdeartwork-styles-4.8.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:32 dilfridge Exp $
+
+EAPI=4
+
+KMMODULE="styles"
+KMNAME="kdeartwork"
+inherit kde4-meta
+
+DESCRIPTION="Extra KWin styles and window decorations"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+add_blocker kwin '<4.5.67'
+
+DEPEND="
+		$(add_kdebase_dep kwin)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRA="
+	aurorae/
+	kwin-styles/
+"
diff --git a/kde-base/kdeartwork-wallpapers/ChangeLog b/kde-base/kdeartwork-wallpapers/ChangeLog
index 4295b2f8319c..2598a7aa4158 100644
--- a/kde-base/kdeartwork-wallpapers/ChangeLog
+++ b/kde-base/kdeartwork-wallpapers/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdeartwork-wallpapers
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-wallpapers/ChangeLog,v 1.205 2012/05/24 11:37:45 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-wallpapers/ChangeLog,v 1.206 2012/06/21 21:54:29 dilfridge Exp $
+
+*kdeartwork-wallpapers-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdeartwork-wallpapers-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org>
   -kdeartwork-wallpapers-4.8.1.ebuild:
diff --git a/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.8.4.ebuild b/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.8.4.ebuild
new file mode 100644
index 000000000000..31ad6dc1a4f0
--- /dev/null
+++ b/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.8.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:29 dilfridge Exp $
+
+EAPI=4
+
+RESTRICT="binchecks strip"
+
+KMMODULE="wallpapers"
+KMNAME="kdeartwork"
+inherit kde4-meta
+
+DESCRIPTION="Wallpapers from kde"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+KMEXTRA="
+	HighResolutionWallpapers/
+"
diff --git a/kde-base/kdeartwork-weatherwallpapers/ChangeLog b/kde-base/kdeartwork-weatherwallpapers/ChangeLog
index 2ab4583e938a..38bb9b2e2f07 100644
--- a/kde-base/kdeartwork-weatherwallpapers/ChangeLog
+++ b/kde-base/kdeartwork-weatherwallpapers/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdeartwork-weatherwallpapers
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-weatherwallpapers/ChangeLog,v 1.91 2012/05/24 11:37:56 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-weatherwallpapers/ChangeLog,v 1.92 2012/06/21 21:55:01 dilfridge Exp $
+
+*kdeartwork-weatherwallpapers-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdeartwork-weatherwallpapers-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org>
   -kdeartwork-weatherwallpapers-4.8.1.ebuild:
diff --git a/kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-4.8.4.ebuild b/kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-4.8.4.ebuild
new file mode 100644
index 000000000000..7f043c948386
--- /dev/null
+++ b/kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-4.8.4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:55:01 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kdeartwork"
+KMMODULE="WeatherWallpapers"
+inherit kde4-meta
+
+DESCRIPTION="Weather aware wallpapers. Changes with weather outside."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	$(add_kdebase_dep kdeartwork-wallpapers)
+"
diff --git a/kde-base/kdebase-cursors/ChangeLog b/kde-base/kdebase-cursors/ChangeLog
index 5470ab6ba6b6..0aea987cf2e2 100644
--- a/kde-base/kdebase-cursors/ChangeLog
+++ b/kde-base/kdebase-cursors/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdebase-cursors
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-cursors/ChangeLog,v 1.110 2012/05/24 11:38:00 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-cursors/ChangeLog,v 1.111 2012/06/21 21:54:37 dilfridge Exp $
+
+*kdebase-cursors-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdebase-cursors-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kdebase-cursors-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kdebase-cursors/kdebase-cursors-4.8.4.ebuild b/kde-base/kdebase-cursors/kdebase-cursors-4.8.4.ebuild
new file mode 100644
index 000000000000..cf35550add7c
--- /dev/null
+++ b/kde-base/kdebase-cursors/kdebase-cursors-4.8.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:37 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+KMMODULE="cursors"
+inherit kde4-meta
+
+DESCRIPTION="oxygen cursors from kdebase"
+IUSE=""
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
diff --git a/kde-base/kdebase-data/ChangeLog b/kde-base/kdebase-data/ChangeLog
index 131bdd07f8d5..ee1f93c15a31 100644
--- a/kde-base/kdebase-data/ChangeLog
+++ b/kde-base/kdebase-data/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdebase-data
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/ChangeLog,v 1.225 2012/05/24 11:37:58 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/ChangeLog,v 1.226 2012/06/21 21:55:03 dilfridge Exp $
+
+*kdebase-data-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdebase-data-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kdebase-data-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kdebase-data/kdebase-data-4.8.4.ebuild b/kde-base/kdebase-data/kdebase-data-4.8.4.ebuild
new file mode 100644
index 000000000000..74ce4851b8a9
--- /dev/null
+++ b/kde-base/kdebase-data/kdebase-data-4.8.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:55:03 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+KMNOMODULE="true"
+inherit kde4-meta
+
+DESCRIPTION="Icons, localization data and various .desktop files from kdebase."
+IUSE="+wallpapers"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	wallpapers? ( $(add_kdebase_dep kde-wallpapers) )
+	$(add_kdebase_dep oxygen-icons)
+	x11-themes/hicolor-icon-theme
+"
+
+KMEXTRA="
+	l10n/
+	localization/
+	pics/
+"
+# Note that the eclass doesn't do this for us, because of KMNOMODULE="true".
+KMEXTRACTONLY="
+	config-runtime.h.cmake
+	kde4
+"
+
+src_configure() {
+	# Remove remnants of hicolor-icon-theme
+	sed -e "s:add_subdirectory[[:space:]]*([[:space:]]*hicolor[[:space:]]*):#donotwant:g" \
+		-i pics/CMakeLists.txt \
+		|| die "failed to remove remnants of hicolor-icon-theme"
+
+	kde4-meta_src_configure
+}
diff --git a/kde-base/kdebase-desktoptheme/ChangeLog b/kde-base/kdebase-desktoptheme/ChangeLog
index 5870b74326ff..22e16154b838 100644
--- a/kde-base/kdebase-desktoptheme/ChangeLog
+++ b/kde-base/kdebase-desktoptheme/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdebase-desktoptheme
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-desktoptheme/ChangeLog,v 1.113 2012/05/24 11:38:04 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-desktoptheme/ChangeLog,v 1.114 2012/06/21 21:54:59 dilfridge Exp $
+
+*kdebase-desktoptheme-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdebase-desktoptheme-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org>
   -kdebase-desktoptheme-4.8.1.ebuild:
diff --git a/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.8.4.ebuild b/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.8.4.ebuild
new file mode 100644
index 000000000000..b38ca75d571e
--- /dev/null
+++ b/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.8.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:59 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+KMMODULE="desktoptheme"
+inherit kde4-meta
+
+DESCRIPTION="Oxygen KDE4 desktop theme."
+IUSE=""
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
diff --git a/kde-base/kdebase-kioslaves/ChangeLog b/kde-base/kdebase-kioslaves/ChangeLog
index ea3b8ed4b8f6..09eb24b6d454 100644
--- a/kde-base/kdebase-kioslaves/ChangeLog
+++ b/kde-base/kdebase-kioslaves/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdebase-kioslaves
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.262 2012/05/24 11:37:46 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.263 2012/06/21 21:54:30 dilfridge Exp $
+
+*kdebase-kioslaves-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdebase-kioslaves-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org>
   -kdebase-kioslaves-4.8.1.ebuild:
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.8.4.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.8.4.ebuild
new file mode 100644
index 000000000000..000288c4361b
--- /dev/null
+++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.8.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:30 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-runtime"
+KMMODULE="kioslave"
+inherit kde4-meta
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+DESCRIPTION="kioslave: the kde VFS framework - kioslave plugins present a filesystem-like view of arbitrary data"
+IUSE="+bzip2 exif debug lzma openexr samba +sftp"
+
+# tests hang, last checked for 4.2.96
+RESTRICT="test"
+
+DEPEND="
+	!aqua? ( x11-libs/libXcursor )
+	bzip2? ( app-arch/bzip2 )
+	exif? ( media-gfx/exiv2 )
+	openexr? ( media-libs/openexr )
+	samba? ( net-fs/samba[smbclient] )
+	sftp? ( >=net-libs/libssh-0.4.0[sftp] )
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep kdelibs 'bzip2?,lzma?')
+	$(add_kdebase_dep kdialog)
+	virtual/ssh
+	!aqua? ( !kernel_SunOS? ( virtual/eject ) )
+"
+
+KMEXTRA="
+	kioexec
+	kdeeject
+"
+
+src_configure() {
+	mycmakeargs=(
+		-DWITH_SLP=OFF
+		$(cmake-utils_use_with bzip2 BZip2)
+		$(cmake-utils_use_with exif Exiv2)
+		$(cmake-utils_use_with lzma LibLZMA)
+		$(cmake-utils_use_with openexr OpenEXR)
+		$(cmake-utils_use_with samba)
+		$(cmake-utils_use_with sftp LibSSH)
+	)
+	kde4-meta_src_configure
+}
diff --git a/kde-base/kdebase-menu-icons/ChangeLog b/kde-base/kdebase-menu-icons/ChangeLog
index 85a0b2093a11..bc4a7df812a8 100644
--- a/kde-base/kdebase-menu-icons/ChangeLog
+++ b/kde-base/kdebase-menu-icons/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdebase-menu-icons
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-menu-icons/ChangeLog,v 1.98 2012/05/24 11:37:51 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-menu-icons/ChangeLog,v 1.99 2012/06/21 21:54:36 dilfridge Exp $
+
+*kdebase-menu-icons-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdebase-menu-icons-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org>
   -kdebase-menu-icons-4.8.1.ebuild:
diff --git a/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.8.4.ebuild b/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.8.4.ebuild
new file mode 100644
index 000000000000..c1cbf60360ca
--- /dev/null
+++ b/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.8.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:36 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+KMMODULE="menu"
+inherit kde4-meta
+
+DESCRIPTION="KDE menu icons"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
diff --git a/kde-base/kdebase-menu/ChangeLog b/kde-base/kdebase-menu/ChangeLog
index 4c2702103acb..d589d4d5914a 100644
--- a/kde-base/kdebase-menu/ChangeLog
+++ b/kde-base/kdebase-menu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdebase-menu
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-menu/ChangeLog,v 1.98 2012/05/24 11:38:09 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-menu/ChangeLog,v 1.99 2012/06/21 21:54:43 dilfridge Exp $
+
+*kdebase-menu-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdebase-menu-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kdebase-menu-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kdebase-menu/kdebase-menu-4.8.4.ebuild b/kde-base/kdebase-menu/kdebase-menu-4.8.4.ebuild
new file mode 100644
index 000000000000..961486d3bc37
--- /dev/null
+++ b/kde-base/kdebase-menu/kdebase-menu-4.8.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:43 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+KMMODULE="kde-menu"
+inherit kde4-meta
+
+DESCRIPTION="KDE Menu query tool."
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kdebase-meta/ChangeLog b/kde-base/kdebase-meta/ChangeLog
index d5d5bba99b6b..8bcd029ae84f 100644
--- a/kde-base/kdebase-meta/ChangeLog
+++ b/kde-base/kdebase-meta/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdebase-meta
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-meta/ChangeLog,v 1.228 2012/05/24 11:38:10 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-meta/ChangeLog,v 1.229 2012/06/21 21:54:36 dilfridge Exp $
+
+*kdebase-meta-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdebase-meta-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kdebase-meta-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kdebase-meta/kdebase-meta-4.8.4.ebuild b/kde-base/kdebase-meta/kdebase-meta-4.8.4.ebuild
new file mode 100644
index 000000000000..10847da3fe8e
--- /dev/null
+++ b/kde-base/kdebase-meta/kdebase-meta-4.8.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:36 dilfridge Exp $
+
+EAPI=4
+inherit kde4-meta-pkg
+
+DESCRIPTION="Merge this to pull in all kdebase-derived packages"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+wallpapers"
+
+RDEPEND="
+	$(add_kdebase_dep dolphin)
+	$(add_kdebase_dep freespacenotifier)
+	$(add_kdebase_dep kcheckpass)
+	$(add_kdebase_dep kcminit)
+	wallpapers? ( $(add_kdebase_dep kde-wallpapers) )
+	$(add_kdebase_dep kdebase-cursors)
+	$(add_kdebase_dep kdebase-runtime-meta)
+	$(add_kdebase_dep kdebase-startkde)
+	$(add_kdebase_dep kdepasswd)
+	$(add_kdebase_dep kdialog)
+	$(add_kdebase_dep keditbookmarks)
+	$(add_kdebase_dep kephal)
+	$(add_kdebase_dep kfind)
+	$(add_kdebase_dep kfmclient)
+	$(add_kdebase_dep khotkeys)
+	$(add_kdebase_dep kinfocenter)
+	$(add_kdebase_dep klipper)
+	$(add_kdebase_dep kmenuedit)
+	$(add_kdebase_dep konq-plugins)
+	$(add_kdebase_dep konqueror)
+	$(add_kdebase_dep konsole)
+	$(add_kdebase_dep kscreensaver)
+	$(add_kdebase_dep ksmserver)
+	$(add_kdebase_dep ksplash)
+	$(add_kdebase_dep kstartupconfig)
+	$(add_kdebase_dep kstyles)
+	$(add_kdebase_dep ksysguard)
+	$(add_kdebase_dep ksystraycmd)
+	$(add_kdebase_dep kwin)
+	$(add_kdebase_dep kwrite)
+	$(add_kdebase_dep kwrited)
+	$(add_kdebase_dep libkonq)
+	$(add_kdebase_dep libkworkspace)
+	$(add_kdebase_dep liboxygenstyle)
+	$(add_kdebase_dep libplasmaclock)
+	$(add_kdebase_dep libplasmagenericshell)
+	$(add_kdebase_dep libtaskmanager)
+	$(add_kdebase_dep nsplugins)
+	$(add_kdebase_dep phonon-kde)
+	$(add_kdebase_dep plasma-apps)
+	$(add_kdebase_dep plasma-workspace)
+	$(add_kdebase_dep powerdevil)
+	$(add_kdebase_dep qguiplatformplugin_kde)
+	$(add_kdebase_dep solid)
+	$(add_kdebase_dep systemsettings)
+	!prefix? ( $(add_kdebase_dep kdm) )
+"
diff --git a/kde-base/kdebase-runtime-meta/ChangeLog b/kde-base/kdebase-runtime-meta/ChangeLog
index b215162a13a3..1cbb81318211 100644
--- a/kde-base/kdebase-runtime-meta/ChangeLog
+++ b/kde-base/kdebase-runtime-meta/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdebase-runtime-meta
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-runtime-meta/ChangeLog,v 1.79 2012/05/24 11:37:55 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-runtime-meta/ChangeLog,v 1.80 2012/06/21 21:54:57 dilfridge Exp $
+
+*kdebase-runtime-meta-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdebase-runtime-meta-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org>
   -kdebase-runtime-meta-4.8.1-r1.ebuild:
diff --git a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.8.4.ebuild b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.8.4.ebuild
new file mode 100644
index 000000000000..6df824f0e96b
--- /dev/null
+++ b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.8.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:57 dilfridge Exp $
+
+EAPI=4
+inherit kde4-meta-pkg
+
+DESCRIPTION="Merge this to pull in all kdebase-runtime-derived packages"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+handbook semantic-desktop"
+
+RDEPEND="
+	$(add_kdebase_dep attica)
+	$(add_kdebase_dep drkonqi)
+	$(add_kdebase_dep kcmshell)
+	$(add_kdebase_dep kcontrol)
+	$(add_kdebase_dep kdebase-data)
+	$(add_kdebase_dep kdebase-desktoptheme)
+	$(add_kdebase_dep kdebase-kioslaves)
+	$(add_kdebase_dep kdebase-menu)
+	$(add_kdebase_dep kdebase-menu-icons)
+	$(add_kdebase_dep kdebugdialog)
+	$(add_kdebase_dep kdesu)
+	$(add_kdebase_dep kdontchangethehostname)
+	$(add_kdebase_dep keditfiletype)
+	$(add_kdebase_dep kfile)
+	$(add_kdebase_dep kglobalaccel)
+	$(add_kdebase_dep kiconfinder)
+	$(add_kdebase_dep kioclient)
+	$(add_kdebase_dep kmimetypefinder)
+	$(add_kdebase_dep knetattach)
+	$(add_kdebase_dep knewstuff)
+	$(add_kdebase_dep kpasswdserver)
+	$(add_kdebase_dep kquitapp)
+	$(add_kdebase_dep kstart)
+	$(add_kdebase_dep ktimezoned)
+	$(add_kdebase_dep ktraderclient)
+	$(add_kdebase_dep kuiserver)
+	$(add_kdebase_dep kurifilter-plugins)
+	$(add_kdebase_dep kwallet)
+	$(add_kdebase_dep kwalletd)
+	$(add_kdebase_dep plasma-runtime)
+	$(add_kdebase_dep renamedlg-plugins)
+	$(add_kdebase_dep solid-runtime)
+	handbook? ( $(add_kdebase_dep khelpcenter) )
+	semantic-desktop? ( $(add_kdebase_dep nepomuk) )
+"
diff --git a/kde-base/kdebase-startkde/ChangeLog b/kde-base/kdebase-startkde/ChangeLog
index 390f5d1e91d1..b6e4999ac8a4 100644
--- a/kde-base/kdebase-startkde/ChangeLog
+++ b/kde-base/kdebase-startkde/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdebase-startkde
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.276 2012/05/24 11:37:59 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.277 2012/06/21 21:54:42 dilfridge Exp $
+
+*kdebase-startkde-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdebase-startkde-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kdebase-startkde-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.8.4.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.8.4.ebuild
new file mode 100644
index 000000000000..f08ee77bc795
--- /dev/null
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.8.4.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:42 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+KMNOMODULE="true"
+inherit kde4-meta multilib prefix
+
+DESCRIPTION="Startkde script, which starts a complete KDE session, and associated scripts"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+wallpapers"
+
+# The KDE apps called from the startkde script.
+# These provide the most minimal KDE desktop.
+RDEPEND="
+	$(add_kdebase_dep kcminit)
+	$(add_kdebase_dep kdebase-runtime-meta)
+	wallpapers? ( $(add_kdebase_dep kde-wallpapers) )
+	$(add_kdebase_dep kfmclient)
+	$(add_kdebase_dep knotify)
+	$(add_kdebase_dep kreadconfig)
+	$(add_kdebase_dep krunner)
+	$(add_kdebase_dep ksmserver)
+	$(add_kdebase_dep ksplash)
+	$(add_kdebase_dep kstartupconfig)
+	$(add_kdebase_dep kwin)
+	$(add_kdebase_dep phonon-kde)
+	$(add_kdebase_dep plasma-apps)
+	$(add_kdebase_dep plasma-workspace)
+	$(add_kdebase_dep systemsettings)
+	x11-apps/mkfontdir
+	x11-apps/xmessage
+	x11-apps/xprop
+	x11-apps/xrandr
+	x11-apps/xrdb
+	x11-apps/xsetroot
+	x11-apps/xset
+"
+
+KMEXTRACTONLY="
+	ConfigureChecks.cmake
+	kdm/
+	startkde.cmake
+"
+
+PATCHES=("${FILESDIR}/gentoo-startkde4-4.patch")
+
+src_prepare() {
+	kde4-meta_src_prepare
+
+	cp "${FILESDIR}/KDE-4" "${T}"
+
+	# fix ${EPREFIX}
+	eprefixify startkde.cmake "${T}/KDE-4"
+}
+
+src_install() {
+	kde4-meta_src_install
+
+	# startup and shutdown scripts
+	insinto /etc/kde/startup
+	doins "${FILESDIR}/agent-startup.sh"
+
+	insinto /etc/kde/shutdown
+	doins "${FILESDIR}/agent-shutdown.sh"
+
+	# x11 session script
+	exeinto /etc/X11/Sessions
+	doexe "${T}/KDE-4"
+
+	# freedesktop compliant session script
+	sed -e "s:\${BIN_INSTALL_DIR}:${EPREFIX}/usr/bin:g" \
+		"${S}/kdm/kfrontend/sessions/kde-plasma.desktop.cmake" > "${T}/KDE-4.desktop"
+	insinto /usr/share/xsessions
+	doins "${T}/KDE-4.desktop"
+}
+
+pkg_postinst () {
+	kde4-meta_pkg_postinst
+
+	echo
+	elog "To enable gpg-agent and/or ssh-agent in KDE sessions,"
+	elog "edit ${EPREFIX}/etc/kde/startup/agent-startup.sh and"
+	elog "${EPREFIX}/etc/kde/shutdown/agent-shutdown.sh"
+	echo
+	elog "The name of the session script has changed."
+	elog "If you currently have XSESSION=\"kde-$(get_kde_version)\" in your"
+	elog "configuration files, you will need to change it to"
+	elog "XSESSION=\"KDE-4\""
+}
diff --git a/kde-base/kdebindings-meta/ChangeLog b/kde-base/kdebindings-meta/ChangeLog
index a442b35b95cd..db7b55694803 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-meta/ChangeLog,v 1.133 2012/05/24 11:38:10 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-meta/ChangeLog,v 1.134 2012/06/21 21:54:29 dilfridge Exp $
+
+*kdebindings-meta-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdebindings-meta-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kdebindings-meta-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kdebindings-meta/kdebindings-meta-4.8.4.ebuild b/kde-base/kdebindings-meta/kdebindings-meta-4.8.4.ebuild
new file mode 100644
index 000000000000..2cd5ca68b6c3
--- /dev/null
+++ b/kde-base/kdebindings-meta/kdebindings-meta-4.8.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:29 dilfridge Exp $
+
+EAPI=4
+inherit kde4-meta-pkg
+
+DESCRIPTION="KDE bindings - merge this to pull in all kdebindings-derived packages"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="csharp java perl python ruby"
+
+RDEPEND="
+	$(add_kdebase_dep smokegen)
+	$(add_kdebase_dep smokekde)
+	$(add_kdebase_dep smokeqt)
+	csharp? (
+		$(add_kdebase_dep kimono)
+		$(add_kdebase_dep qyoto)
+	)
+	java? ( $(add_kdebase_dep krossjava) )
+	perl? (
+		$(add_kdebase_dep perlkde)
+		$(add_kdebase_dep perlqt)
+	)
+	python? (
+		$(add_kdebase_dep krosspython)
+		$(add_kdebase_dep pykde4)
+	)
+	ruby? (
+		$(add_kdebase_dep korundum)
+		$(add_kdebase_dep krossruby)
+		$(add_kdebase_dep qtruby)
+	)
+"
diff --git a/kde-base/kdebugdialog/ChangeLog b/kde-base/kdebugdialog/ChangeLog
index 412f92c0780e..0db84a6b44f0 100644
--- a/kde-base/kdebugdialog/ChangeLog
+++ b/kde-base/kdebugdialog/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdebugdialog
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebugdialog/ChangeLog,v 1.196 2012/05/24 11:37:46 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebugdialog/ChangeLog,v 1.197 2012/06/21 21:54:51 dilfridge Exp $
+
+*kdebugdialog-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdebugdialog-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kdebugdialog-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kdebugdialog/kdebugdialog-4.8.4.ebuild b/kde-base/kdebugdialog/kdebugdialog-4.8.4.ebuild
new file mode 100644
index 000000000000..df83f657da4a
--- /dev/null
+++ b/kde-base/kdebugdialog/kdebugdialog-4.8.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebugdialog/kdebugdialog-4.8.4.ebuild,v 1.1 2012/06/21 21:54:51 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="KDE: A dialog box for setting preferences for debug output"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kdeedu-meta/ChangeLog b/kde-base/kdeedu-meta/ChangeLog
index 34029700673b..47c9ca6ea919 100644
--- a/kde-base/kdeedu-meta/ChangeLog
+++ b/kde-base/kdeedu-meta/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdeedu-meta
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu-meta/ChangeLog,v 1.214 2012/05/24 11:37:59 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu-meta/ChangeLog,v 1.215 2012/06/21 21:55:02 dilfridge Exp $
+
+*kdeedu-meta-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdeedu-meta-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kdeedu-meta-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kdeedu-meta/kdeedu-meta-4.8.4.ebuild b/kde-base/kdeedu-meta/kdeedu-meta-4.8.4.ebuild
new file mode 100644
index 000000000000..30773f78cdc6
--- /dev/null
+++ b/kde-base/kdeedu-meta/kdeedu-meta-4.8.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:55:02 dilfridge Exp $
+
+EAPI=4
+inherit kde4-meta-pkg
+
+DESCRIPTION="KDE educational apps - merge this to pull in all kdeedu-derived packages"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	$(add_kdebase_dep analitza)
+	$(add_kdebase_dep blinken)
+	$(add_kdebase_dep cantor)
+	$(add_kdebase_dep kalgebra)
+	$(add_kdebase_dep kalzium)
+	$(add_kdebase_dep kanagram)
+	$(add_kdebase_dep kbruch)
+	$(add_kdebase_dep kgeography)
+	$(add_kdebase_dep khangman)
+	$(add_kdebase_dep kig)
+	$(add_kdebase_dep kiten)
+	$(add_kdebase_dep klettres)
+	$(add_kdebase_dep kmplot)
+	$(add_kdebase_dep kstars)
+	$(add_kdebase_dep ktouch)
+	$(add_kdebase_dep kturtle)
+	$(add_kdebase_dep kwordquiz)
+	$(add_kdebase_dep libkdeedu)
+	$(add_kdebase_dep marble)
+	$(add_kdebase_dep parley)
+	$(add_kdebase_dep rocs)
+	$(add_kdebase_dep step)
+"
diff --git a/kde-base/kdegames-meta/ChangeLog b/kde-base/kdegames-meta/ChangeLog
index 1258993f3a07..baf22a8ae2ad 100644
--- a/kde-base/kdegames-meta/ChangeLog
+++ b/kde-base/kdegames-meta/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdegames-meta
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames-meta/ChangeLog,v 1.216 2012/05/24 11:37:50 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames-meta/ChangeLog,v 1.217 2012/06/21 21:54:28 dilfridge Exp $
+
+*kdegames-meta-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdegames-meta-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kdegames-meta-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kdegames-meta/kdegames-meta-4.8.4.ebuild b/kde-base/kdegames-meta/kdegames-meta-4.8.4.ebuild
new file mode 100644
index 000000000000..940eb599d024
--- /dev/null
+++ b/kde-base/kdegames-meta/kdegames-meta-4.8.4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:28 dilfridge Exp $
+
+EAPI=4
+inherit kde4-meta-pkg
+
+DESCRIPTION="kdegames - merge this to pull in all kdegames-derived packages"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="opengl python"
+
+RDEPEND="
+	$(add_kdebase_dep bomber)
+	$(add_kdebase_dep bovo)
+	$(add_kdebase_dep granatier)
+	$(add_kdebase_dep kapman)
+	$(add_kdebase_dep katomic)
+	$(add_kdebase_dep kbattleship)
+	$(add_kdebase_dep kblackbox)
+	$(add_kdebase_dep kblocks)
+	$(add_kdebase_dep kbounce)
+	$(add_kdebase_dep kbreakout)
+	$(add_kdebase_dep kdiamond)
+	$(add_kdebase_dep kfourinline)
+	$(add_kdebase_dep kgoldrunner)
+	$(add_kdebase_dep killbots)
+	$(add_kdebase_dep kigo)
+	$(add_kdebase_dep kiriki)
+	$(add_kdebase_dep kjumpingcube)
+	$(add_kdebase_dep klickety)
+	$(add_kdebase_dep klines)
+	$(add_kdebase_dep kmahjongg)
+	$(add_kdebase_dep kmines)
+	$(add_kdebase_dep knetwalk)
+	$(add_kdebase_dep kolf)
+	$(add_kdebase_dep kollision)
+	$(add_kdebase_dep konquest)
+	$(add_kdebase_dep kpat)
+	$(add_kdebase_dep kreversi)
+	$(add_kdebase_dep kshisen)
+	$(add_kdebase_dep ksirk)
+	$(add_kdebase_dep kspaceduel)
+	$(add_kdebase_dep ksquares)
+	$(add_kdebase_dep ktron)
+	$(add_kdebase_dep ktuberling)
+	$(add_kdebase_dep kubrick)
+	$(add_kdebase_dep libkdegames)
+	$(add_kdebase_dep libkmahjongg)
+	$(add_kdebase_dep lskat)
+	$(add_kdebase_dep palapeli)
+	opengl? ( $(add_kdebase_dep ksudoku) )
+	python? ( $(add_kdebase_dep kajongg) )
+"
diff --git a/kde-base/kdegraphics-meta/ChangeLog b/kde-base/kdegraphics-meta/ChangeLog
index d24223933bf8..ec58c36df527 100644
--- a/kde-base/kdegraphics-meta/ChangeLog
+++ b/kde-base/kdegraphics-meta/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdegraphics-meta
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-meta/ChangeLog,v 1.218 2012/05/24 11:37:47 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-meta/ChangeLog,v 1.219 2012/06/21 21:54:30 dilfridge Exp $
+
+*kdegraphics-meta-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdegraphics-meta-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kdegraphics-meta-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kdegraphics-meta/kdegraphics-meta-4.8.4.ebuild b/kde-base/kdegraphics-meta/kdegraphics-meta-4.8.4.ebuild
new file mode 100644
index 000000000000..91042bf2aded
--- /dev/null
+++ b/kde-base/kdegraphics-meta/kdegraphics-meta-4.8.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:30 dilfridge Exp $
+
+EAPI=4
+inherit kde4-meta-pkg
+
+DESCRIPTION="kdegraphics - merge this to pull in all kdegraphics-derived packages"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="scanner"
+
+RDEPEND="
+	$(add_kdebase_dep gwenview)
+	$(add_kdebase_dep kamera)
+	$(add_kdebase_dep kcolorchooser)
+	$(add_kdebase_dep kdegraphics-mobipocket)
+	$(add_kdebase_dep kdegraphics-strigi-analyzer)
+	$(add_kdebase_dep kgamma)
+	$(add_kdebase_dep kolourpaint)
+	$(add_kdebase_dep kruler)
+	$(add_kdebase_dep ksnapshot)
+	$(add_kdebase_dep libkdcraw)
+	$(add_kdebase_dep libkexiv2)
+	$(add_kdebase_dep libkipi)
+	$(add_kdebase_dep okular)
+	$(add_kdebase_dep svgpart)
+	$(add_kdebase_dep thumbnailers)
+	scanner? (
+		$(add_kdebase_dep ksaneplugin)
+		$(add_kdebase_dep libksane)
+	)
+"
diff --git a/kde-base/kdegraphics-mobipocket/ChangeLog b/kde-base/kdegraphics-mobipocket/ChangeLog
index e1adaebc1901..ea74cc0c1908 100644
--- a/kde-base/kdegraphics-mobipocket/ChangeLog
+++ b/kde-base/kdegraphics-mobipocket/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdegraphics-mobipocket
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-mobipocket/ChangeLog,v 1.13 2012/05/24 11:37:51 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-mobipocket/ChangeLog,v 1.14 2012/06/21 21:54:50 dilfridge Exp $
+
+*kdegraphics-mobipocket-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdegraphics-mobipocket-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org>
   -kdegraphics-mobipocket-4.8.1.ebuild:
diff --git a/kde-base/kdegraphics-mobipocket/kdegraphics-mobipocket-4.8.4.ebuild b/kde-base/kdegraphics-mobipocket/kdegraphics-mobipocket-4.8.4.ebuild
new file mode 100644
index 000000000000..ebd7e9f4fec8
--- /dev/null
+++ b/kde-base/kdegraphics-mobipocket/kdegraphics-mobipocket-4.8.4.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-mobipocket/kdegraphics-mobipocket-4.8.4.ebuild,v 1.1 2012/06/21 21:54:50 dilfridge Exp $
+
+EAPI=4
+
+inherit kde4-base
+
+DESCRIPTION="Library to support mobipocket ebooks"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kdegraphics-strigi-analyzer/ChangeLog b/kde-base/kdegraphics-strigi-analyzer/ChangeLog
index c091943b8d64..3ab4aaa0dc6b 100644
--- a/kde-base/kdegraphics-strigi-analyzer/ChangeLog
+++ b/kde-base/kdegraphics-strigi-analyzer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdegraphics-strigi-analyzer
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-strigi-analyzer/ChangeLog,v 1.107 2012/05/24 11:37:51 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-strigi-analyzer/ChangeLog,v 1.108 2012/06/21 21:54:33 dilfridge Exp $
+
+*kdegraphics-strigi-analyzer-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdegraphics-strigi-analyzer-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org>
   -kdegraphics-strigi-analyzer-4.8.1.ebuild:
diff --git a/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-4.8.4.ebuild b/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-4.8.4.ebuild
new file mode 100644
index 000000000000..a9f83f7db5f7
--- /dev/null
+++ b/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-4.8.4.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:33 dilfridge Exp $
+
+EAPI=4
+
+inherit kde4-base
+
+DESCRIPTION="kdegraphics: strigi plugins"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	app-misc/strigi
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 6c166deeaefe..6409f88ea713 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.849 2012/06/07 22:27:05 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.850 2012/06/21 21:54:47 dilfridge Exp $
+
+*kdelibs-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kdelibs-4.8.4.ebuild,
+  +files/kdelibs-4.8.4-bytecode.patch, +files/kdelibs-4.8.4-power.patch,
+  +files/kdelibs-4.8.4-sopranorevert1.patch,
+  +files/kdelibs-4.8.4-sopranorevert2.patch:
+  Version bump KDE SC 4.8.4
 
   07 Jun 2012; Zac Medico <zmedico@gentoo.org> kdelibs-4.7.4-r12.ebuild,
   kdelibs-4.7.4.ebuild, kdelibs-4.8.3.ebuild:
diff --git a/kde-base/kdelibs/files/kdelibs-4.8.4-bytecode.patch b/kde-base/kdelibs/files/kdelibs-4.8.4-bytecode.patch
new file mode 100644
index 000000000000..6920121afb8d
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.8.4-bytecode.patch
@@ -0,0 +1,78 @@
+--- cmake/modules/PythonMacros.cmake.orig	2012-05-31 23:28:04.035788719 +0200
++++ cmake/modules/PythonMacros.cmake	2012-05-31 23:30:13.997840354 +0200
+@@ -24,39 +24,41 @@
+   INSTALL(FILES ${SOURCE_FILE} DESTINATION ${DESINATION_DIR})
+ 
+   # Byte compile and install the .pyc file.        
+-  GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
+-  GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME)
+-  GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE)
+-  GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH)
+-
+-  if(WIN32)
+-    string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}")
+-  endif(WIN32)
+-
+-  SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
+-  SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
+-
+-  FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
+-
+-  SET(_message "-DMESSAGE=Byte-compiling ${_bin_py}")
+-
+-  GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE)
+-  IF(_abs_bin_py STREQUAL ${_absfilename})    # Don't copy the file onto itself.
+-    ADD_CUSTOM_COMMAND(
+-      TARGET compile_python_files
+-      COMMAND ${CMAKE_COMMAND} -E echo ${_message}
+-      COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
+-      DEPENDS ${_absfilename}
+-    )
+-  ELSE(_abs_bin_py STREQUAL ${_absfilename})
+-    ADD_CUSTOM_COMMAND(
+-      TARGET compile_python_files
+-      COMMAND ${CMAKE_COMMAND} -E echo ${_message} 
+-      COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py}
+-      COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
+-      DEPENDS ${_absfilename}
+-    )
+-  ENDIF(_abs_bin_py STREQUAL ${_absfilename})
++  IF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "")
++    GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
++    GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME)
++    GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE)
++    GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH)
++
++    if(WIN32)
++      string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}")
++    endif(WIN32)
++
++    SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
++    SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
++
++    FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
++
++    SET(_message "-DMESSAGE=Byte-compiling ${_bin_py}")
++
++    GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE)
++    IF(_abs_bin_py STREQUAL ${_absfilename})    # Don't copy the file onto itself.
++      ADD_CUSTOM_COMMAND(
++        TARGET compile_python_files
++        COMMAND ${CMAKE_COMMAND} -E echo ${_message}
++        COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
++        DEPENDS ${_absfilename}
++      )
++    ELSE(_abs_bin_py STREQUAL ${_absfilename})
++      ADD_CUSTOM_COMMAND(
++        TARGET compile_python_files
++        COMMAND ${CMAKE_COMMAND} -E echo ${_message} 
++        COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py}
++        COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
++        DEPENDS ${_absfilename}
++      )
++    ENDIF(_abs_bin_py STREQUAL ${_absfilename})
+ 
+-  INSTALL(FILES ${_bin_pyc} DESTINATION ${DESINATION_DIR})
++    INSTALL(FILES ${_bin_pyc} DESTINATION ${DESINATION_DIR})
++  ENDIF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "")
+ ENDMACRO(PYTHON_INSTALL)
diff --git a/kde-base/kdelibs/files/kdelibs-4.8.4-power.patch b/kde-base/kdelibs/files/kdelibs-4.8.4-power.patch
new file mode 100644
index 000000000000..61ea0aa5d7f5
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.8.4-power.patch
@@ -0,0 +1,25 @@
+From 5926264d13900efec70aaac434b7b67f9d8e6837 Mon Sep 17 00:00:00 2001
+From: Lukas Tinkl <lukas@kde.org>
+Date: Tue, 19 Jun 2012 18:27:04 +0200
+Subject: [PATCH 5/5] correctly report power saving status
+
+---
+ solid/solid/powermanagement.cpp |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/solid/solid/powermanagement.cpp b/solid/solid/powermanagement.cpp
+index 8dc8535..faadea4 100644
+--- a/solid/solid/powermanagement.cpp
++++ b/solid/solid/powermanagement.cpp
+@@ -73,7 +73,7 @@ Solid::PowerManagement::Notifier::Notifier()
+ 
+ bool Solid::PowerManagement::appShouldConserveResources()
+ {
+-    return globalPowerManager->powerSaveStatus;
++    return globalPowerManager->managerIface.GetPowerSaveStatus();
+ }
+ 
+ QSet<Solid::PowerManagement::SleepState> Solid::PowerManagement::supportedSleepStates()
+-- 
+1.7.9.2
+
diff --git a/kde-base/kdelibs/files/kdelibs-4.8.4-sopranorevert1.patch b/kde-base/kdelibs/files/kdelibs-4.8.4-sopranorevert1.patch
new file mode 100644
index 000000000000..59c3174710af
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.8.4-sopranorevert1.patch
@@ -0,0 +1,28 @@
+From 76e0376d7582cfe5b898c56bf3779ca2279dace8 Mon Sep 17 00:00:00 2001
+From: Vishesh Handa <me@vhanda.in>
+Date: Thu, 14 Jun 2012 02:55:32 +0530
+Subject: [PATCH 1/5] Revert "Disconnect before re-connecting. Soprano does
+ not do that for us."
+
+This reverts commit 3708be2d09700b21f934c2129218e1c7ea44efdf.
+
+This is being done so that KDE 4.8.x works with Soprano 2.7.6
+---
+ nepomuk/core/nepomukmainmodel.cpp |    1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/nepomuk/core/nepomukmainmodel.cpp b/nepomuk/core/nepomukmainmodel.cpp
+index 8dc0b1f..ff742d7 100644
+--- a/nepomuk/core/nepomukmainmodel.cpp
++++ b/nepomuk/core/nepomukmainmodel.cpp
+@@ -97,7 +97,6 @@ public:
+         if ( forced || (!m_socketConnectFailed && !localSocketClient.isConnected()) ) {
+             delete localSocketModel;
+             localSocketModel = 0;
+-            localSocketClient.disconnect();
+             QString socketName = KGlobal::dirs()->locateLocal( "socket", "nepomuk-socket" );
+             kDebug() << "Connecting to local socket" << socketName;
+             if ( localSocketClient.connect( socketName ) ) {
+-- 
+1.7.9.2
+
diff --git a/kde-base/kdelibs/files/kdelibs-4.8.4-sopranorevert2.patch b/kde-base/kdelibs/files/kdelibs-4.8.4-sopranorevert2.patch
new file mode 100644
index 000000000000..206e654fe53a
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.8.4-sopranorevert2.patch
@@ -0,0 +1,29 @@
+From bde5aad1e9f7bfb6f8d5c60197797de4a315158d Mon Sep 17 00:00:00 2001
+From: Vishesh Handa <me@vhanda.in>
+Date: Thu, 14 Jun 2012 02:56:31 +0530
+Subject: [PATCH 2/5] Revert "Always rec-connect if forced (ie. when Nepomuk
+ server restarts)"
+
+This reverts commit a43824a200ed76cef48a90bd3aee8547698b7c91.
+
+This is done so that 4.8.x works with Soprano 2.7.6
+---
+ nepomuk/core/nepomukmainmodel.cpp |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/nepomuk/core/nepomukmainmodel.cpp b/nepomuk/core/nepomukmainmodel.cpp
+index ff742d7..be23b38 100644
+--- a/nepomuk/core/nepomukmainmodel.cpp
++++ b/nepomuk/core/nepomukmainmodel.cpp
+@@ -94,7 +94,7 @@ public:
+ 
+         // we may get disconnected from the server but we don't want to try
+         // to connect every time the model is requested
+-        if ( forced || (!m_socketConnectFailed && !localSocketClient.isConnected()) ) {
++        if ( !m_socketConnectFailed && !localSocketClient.isConnected() ) {
+             delete localSocketModel;
+             localSocketModel = 0;
+             QString socketName = KGlobal::dirs()->locateLocal( "socket", "nepomuk-socket" );
+-- 
+1.7.9.2
+
diff --git a/kde-base/kdelibs/kdelibs-4.8.4.ebuild b/kde-base/kdelibs/kdelibs-4.8.4.ebuild
new file mode 100644
index 000000000000..d536e5931446
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-4.8.4.ebuild
@@ -0,0 +1,315 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.8.4.ebuild,v 1.1 2012/06/21 21:54:47 dilfridge Exp $
+
+EAPI=4
+
+CPPUNIT_REQUIRED="optional"
+DECLARATIVE_REQUIRED="always"
+OPENGL_REQUIRED="optional"
+inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic
+
+# The "master" branch is out of date, so use KDE/4.8 per upstream's
+# recommendation.
+EGIT_BRANCH="KDE/4.8"
+
+DESCRIPTION="KDE libraries needed by all KDE programs."
+HOMEPAGE="http://www.kde.org/"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+LICENSE="LGPL-2.1"
+IUSE="3dnow acl alsa altivec +bzip2 debug doc fam +handbook jpeg2k kerberos lzma
+mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +udisks
++upower upnp zeroconf"
+
+REQUIRED_USE="
+	udisks? ( udev )
+	upower? ( udev )
+"
+
+# needs the kate regression testsuite from svn
+RESTRICT="test"
+
+COMMONDEPEND="
+	app-crypt/qca:2
+	>=app-misc/strigi-0.7.7
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xsl-stylesheets
+	>=dev-libs/libattica-0.1.90
+	>=dev-libs/libdbusmenu-qt-0.3.2
+	dev-libs/libpcre[unicode]
+	dev-libs/libxml2
+	dev-libs/libxslt
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/giflib
+	>=media-libs/libpng-1.4
+	>=media-libs/phonon-4.4.3
+	sys-libs/zlib
+	virtual/jpeg
+	>=x11-misc/shared-mime-info-0.60
+	acl? ( virtual/acl )
+	alsa? ( media-libs/alsa-lib )
+	!aqua? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXau
+		x11-libs/libXcursor
+		x11-libs/libXdmcp
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXft
+		x11-libs/libXpm
+		x11-libs/libXrender
+		x11-libs/libXScrnSaver
+		x11-libs/libXtst
+		!kernel_SunOS? ( sys-libs/libutempter )
+	)
+	bzip2? ( app-arch/bzip2 )
+	fam? ( virtual/fam )
+	jpeg2k? ( media-libs/jasper )
+	kerberos? ( virtual/krb5 )
+	openexr? (
+		media-libs/openexr
+		media-libs/ilmbase
+	)
+	policykit? ( >=sys-auth/polkit-qt-0.103.0 )
+	semantic-desktop? (
+		>=dev-libs/shared-desktop-ontologies-0.8.1
+		>=dev-libs/soprano-2.7.6[dbus,raptor,redland]
+	)
+	spell? ( app-text/enchant )
+	ssl? ( dev-libs/openssl )
+	udev? ( sys-fs/udev )
+	upnp? ( media-libs/herqq )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+"
+DEPEND="${COMMONDEPEND}
+	doc? ( app-doc/doxygen )
+	nls? ( virtual/libintl )
+"
+RDEPEND="${COMMONDEPEND}
+	!x11-libs/qt-phonon
+	>=app-crypt/gnupg-2.0.11
+	app-misc/ca-certificates
+	$(add_kdebase_dep kde-env)
+	!aqua? (
+		x11-apps/iceauth
+		x11-apps/rgb
+		>=x11-misc/xdg-utils-1.0.2-r3
+		udisks? ( sys-fs/udisks:0 )
+		upower? ( sys-power/upower )
+	)
+"
+PDEPEND="
+	$(add_kdebase_dep katepart)
+	|| ( ( $(add_kdebase_dep kfmclient) ) x11-misc/xdg-utils )
+	handbook? ( $(add_kdebase_dep khelpcenter) )
+	policykit? (
+		>=kde-misc/polkit-kde-kcmodules-0.98_pre20101127
+		>=sys-auth/polkit-kde-agent-0.99
+	)
+	semantic-desktop? ( $(add_kdebase_dep nepomuk) )
+"
+
+# Force the upgrade of plasma-workspace to a version that explicitly depends on kactivities
+add_blocker plasma-workspace 4.7.1
+
+# file collision, bug 394991
+add_blocker kcontrol 4.4.50
+
+PATCHES=(
+	"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch"
+	"${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"
+	"${FILESDIR}/${PN}-4.7.96-mimetypes.patch"
+	"${FILESDIR}/${PN}-4.4.90-xslt.patch"
+	"${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch"
+	"${FILESDIR}/${PN}-4.8.1-norpath.patch"
+	"${FILESDIR}/${PN}-4.8.2-calculator_key.patch"
+	"${FILESDIR}/${PN}-4.8.4-bytecode.patch"
+	"${FILESDIR}/${PN}-4.8.4-sopranorevert1.patch"
+	"${FILESDIR}/${PN}-4.8.4-sopranorevert2.patch"
+	"${FILESDIR}/${PN}-4.8.4-power.patch"
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		[[ $(gcc-major-version) -lt 4 ]] || \
+				( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
+			&& die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
+	fi
+}
+
+src_prepare() {
+	kde4-base_src_prepare
+	use arm && epatch "${FILESDIR}/${PN}-4.6.2-armlinking.patch"
+
+	# Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work)
+	sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \
+		-i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed."
+
+	if use aqua; then
+		sed -i -e \
+			"s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \
+			cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake"
+
+		#if [[ ${CHOST} == *-darwin8 ]]; then
+		sed -i -e \
+			"s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \
+			cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake"
+		#fi
+
+		# solid/solid/backends/iokit doesn't properly link, so disable it.
+		sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \
+			|| die "disabling solid/solid/backends/iokit failed"
+		sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \
+			|| die "disabling solid/solid/backends/iokit failed"
+
+		# There's no fdatasync on OSX and the check fails to detect that.
+		sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \
+			|| die "disabling fdatasync failed"
+
+		# Fix nameser include to nameser8_compat
+		sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \
+			|| die "fixing nameser include failed"
+		append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1
+
+		# Try to fix kkeyserver_mac
+		epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		epatch "${FILESDIR}/kdelibs-4.3.2-solaris-ksyscoca.patch"
+		# getgrouplist not in solaris libc
+		epatch "${FILESDIR}/kdelibs-4.3.2-solaris-getgrouplist.patch"
+		# solaris has no d_type element in dir_ent
+		epatch "${FILESDIR}/kdelibs-4.3.2-solaris-fileunix.patch"
+	fi
+}
+
+src_configure() {
+	if use zeroconf; then
+		if has_version net-dns/avahi; then
+			mycmakeargs=(-DWITH_Avahi=ON -DWITH_DNSSD=OFF)
+		else
+			die "USE=\"zeroconf\" enabled but net-dns/avahi wasn't found."
+		fi
+	else
+		mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=OFF)
+	fi
+	mycmakeargs+=(
+		-DWITH_HSPELL=OFF
+		-DWITH_ASPELL=OFF
+		-DKDE_DEFAULT_HOME=.kde4
+		-DKAUTH_BACKEND=POLKITQT-1
+		-DBUILD_libkactivities=OFF
+		$(cmake-utils_use_build handbook doc)
+		$(cmake-utils_use_has 3dnow X86_3DNOW)
+		$(cmake-utils_use_has altivec PPC_ALTIVEC)
+		$(cmake-utils_use_has mmx X86_MMX)
+		$(cmake-utils_use_has sse X86_SSE)
+		$(cmake-utils_use_has sse2 X86_SSE2)
+		$(cmake-utils_use_with acl)
+		$(cmake-utils_use_with alsa)
+		$(cmake-utils_use_with bzip2 BZip2)
+		$(cmake-utils_use_with fam)
+		$(cmake-utils_use_with jpeg2k Jasper)
+		$(cmake-utils_use_with kerberos GSSAPI)
+		$(cmake-utils_use_with lzma LibLZMA)
+		$(cmake-utils_use_with nls Libintl)
+		$(cmake-utils_use_with openexr OpenEXR)
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with policykit PolkitQt-1)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_with semantic-desktop SharedDesktopOntologies)
+		$(cmake-utils_use_with spell ENCHANT)
+		$(cmake-utils_use_with ssl OpenSSL)
+		$(cmake-utils_use_with udev UDev)
+		$(cmake-utils_use_with upnp HUpnp)
+	)
+	kde4-base_src_configure
+}
+
+src_compile() {
+	kde4-base_src_compile
+
+	# The building of apidox is not managed anymore by the build system
+	if use doc; then
+		einfo "Building API documentation"
+		cd "${S}"/doc/api/
+		./doxygen.sh "${S}" || die "APIDOX generation failed"
+	fi
+}
+
+src_install() {
+	kde4-base_src_install
+
+	# use system certificates
+	rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die
+	dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt
+
+	if use doc; then
+		einfo "Installing API documentation. This could take a bit of time."
+		cd "${S}"/doc/api/
+		docinto /HTML/en/kdelibs-apidox
+		dohtml -r ${P}-apidocs/*
+	fi
+
+	if use aqua; then
+		einfo "fixing ${PN} plugins"
+
+		local _PV=${PV:0:3}.0
+		local _dir=${EPREFIX}/usr/$(get_libdir)/kde4/plugins/script
+
+		install_name_tool -id \
+			"${_dir}/libkrossqtsplugin.${_PV}.dylib" \
+			"${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \
+			|| die "failed fixing libkrossqtsplugin.${_PV}.dylib"
+
+		einfo "fixing ${PN} cmake detection files"
+		#sed -i -e \
+		#	"s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \
+		echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \
+			"${ED}"/usr/share/apps/cmake/modules/FindXKB.cmake \
+			|| die "failed fixing FindXKB.cmake"
+	fi
+
+	einfo Installing environment file.
+	# Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined.
+	echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde"
+	echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde"
+	doenvd "${T}/77kde"
+}
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+
+	if use zeroconf; then
+		echo
+		elog "To make zeroconf support available in KDE make sure that the 'mdnsd' daemon"
+		elog "is running."
+		echo
+		einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns"
+		einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf"
+		einfo "to include 'mdns', e.g.:"
+		einfo "	hosts: files mdns dns"
+		echo
+	fi
+
+	elog "Your homedir is set to \${HOME}/.kde4"
+	echo
+
+	kde4-base_pkg_postinst
+}
+
+pkg_prerm() {
+	# Remove ksycoca4 global database
+	rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4
+}
+
+pkg_postrm() {
+	fdo-mime_mime_database_update
+
+	kde4-base_pkg_postrm
+}
diff --git a/kde-base/kdemultimedia-kioslaves/ChangeLog b/kde-base/kdemultimedia-kioslaves/ChangeLog
index 8b849f1145c9..1ad22b806abc 100644
--- a/kde-base/kdemultimedia-kioslaves/ChangeLog
+++ b/kde-base/kdemultimedia-kioslaves/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdemultimedia-kioslaves
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/ChangeLog,v 1.219 2012/05/24 11:37:59 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/ChangeLog,v 1.220 2012/06/21 21:54:54 dilfridge Exp $
+
+*kdemultimedia-kioslaves-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdemultimedia-kioslaves-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org>
   -kdemultimedia-kioslaves-4.8.1.ebuild:
diff --git a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.8.4.ebuild b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.8.4.ebuild
new file mode 100644
index 000000000000..d65a9719a780
--- /dev/null
+++ b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.8.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:54 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdemultimedia"
+KMMODULE="kioslave"
+inherit kde4-meta
+
+DESCRIPTION="KDE kioslaves from the kdemultimedia package"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug encode flac vorbis"
+
+# 4 of 9 tests fail. Last checked for 4.2.88
+RESTRICT=test
+
+DEPEND="
+	$(add_kdebase_dep libkcddb)
+	$(add_kdebase_dep libkcompactdisc)
+	media-sound/cdparanoia
+	encode? (
+		flac? ( >=media-libs/flac-1.1.2 )
+		vorbis? ( media-libs/libvorbis )
+	)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	libkcompactdisc/
+"
+KMCOMPILEONLY="
+	libkcddb/
+"
+
+KMLOADLIBS="libkcddb"
+
+src_configure() {
+	if use encode; then
+		mycmakeargs=(
+			$(cmake-utils_use_with flac)
+			$(cmake-utils_use_with vorbis OggVorbis)
+		)
+	else
+		mycmakeargs=(-DWITH_OggVorbis=OFF -DWITH_Flac=OFF)
+	fi
+
+	kde4-meta_src_configure
+}
diff --git a/kde-base/kdemultimedia-meta/ChangeLog b/kde-base/kdemultimedia-meta/ChangeLog
index b1e728f8d9ce..2b09e5ddb887 100644
--- a/kde-base/kdemultimedia-meta/ChangeLog
+++ b/kde-base/kdemultimedia-meta/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdemultimedia-meta
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-meta/ChangeLog,v 1.215 2012/05/24 11:38:06 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-meta/ChangeLog,v 1.216 2012/06/21 21:55:05 dilfridge Exp $
+
+*kdemultimedia-meta-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdemultimedia-meta-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org>
   -kdemultimedia-meta-4.8.1.ebuild:
diff --git a/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.8.4.ebuild b/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.8.4.ebuild
new file mode 100644
index 000000000000..9aeb3a9ce993
--- /dev/null
+++ b/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.8.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:55:05 dilfridge Exp $
+
+EAPI=4
+inherit kde4-meta-pkg
+
+DESCRIPTION="kdemultimedia - merge this to pull in all kdemultimedia-derived packages"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="ffmpeg +mplayer"
+
+RDEPEND="
+	$(add_kdebase_dep dragonplayer)
+	$(add_kdebase_dep juk)
+	$(add_kdebase_dep kdemultimedia-kioslaves)
+	$(add_kdebase_dep kmix)
+	$(add_kdebase_dep kscd)
+	$(add_kdebase_dep libkcddb)
+	$(add_kdebase_dep libkcompactdisc)
+	mplayer? ( $(add_kdebase_dep mplayerthumbs) )
+	ffmpeg? ( $(add_kdebase_dep ffmpegthumbs) )
+"
diff --git a/kde-base/kdenetwork-filesharing/ChangeLog b/kde-base/kdenetwork-filesharing/ChangeLog
index 6ff0a9789203..45e903553ae8 100644
--- a/kde-base/kdenetwork-filesharing/ChangeLog
+++ b/kde-base/kdenetwork-filesharing/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdenetwork-filesharing
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-filesharing/ChangeLog,v 1.206 2012/05/24 11:38:08 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-filesharing/ChangeLog,v 1.207 2012/06/21 21:54:29 dilfridge Exp $
+
+*kdenetwork-filesharing-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdenetwork-filesharing-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org>
   -kdenetwork-filesharing-4.8.1.ebuild:
diff --git a/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.8.4.ebuild b/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.8.4.ebuild
new file mode 100644
index 000000000000..732892ebb349
--- /dev/null
+++ b/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.8.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:29 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kdenetwork"
+KMMODULE="filesharing"
+inherit kde4-meta
+
+DESCRIPTION="kcontrol filesharing config module for NFS, SMB etc"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kdenetwork-meta/ChangeLog b/kde-base/kdenetwork-meta/ChangeLog
index 955dc01c9db4..2e4ddf7cdd5b 100644
--- a/kde-base/kdenetwork-meta/ChangeLog
+++ b/kde-base/kdenetwork-meta/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdenetwork-meta
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-meta/ChangeLog,v 1.217 2012/05/24 11:37:44 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-meta/ChangeLog,v 1.218 2012/06/21 21:54:28 dilfridge Exp $
+
+*kdenetwork-meta-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdenetwork-meta-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kdenetwork-meta-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kdenetwork-meta/kdenetwork-meta-4.8.4.ebuild b/kde-base/kdenetwork-meta/kdenetwork-meta-4.8.4.ebuild
new file mode 100644
index 000000000000..1f01c00fb869
--- /dev/null
+++ b/kde-base/kdenetwork-meta/kdenetwork-meta-4.8.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:28 dilfridge Exp $
+
+EAPI=4
+inherit kde4-meta-pkg
+
+DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived packages"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="ppp"
+
+RDEPEND="
+	$(add_kdebase_dep kdenetwork-filesharing)
+	$(add_kdebase_dep kdnssd)
+	$(add_kdebase_dep kget)
+	$(add_kdebase_dep kopete)
+	$(add_kdebase_dep krdc)
+	$(add_kdebase_dep krfb)
+	ppp? ( $(add_kdebase_dep kppp) )
+"
diff --git a/kde-base/kdepasswd/ChangeLog b/kde-base/kdepasswd/ChangeLog
index 8242b02e90af..5cfb99e2bb99 100644
--- a/kde-base/kdepasswd/ChangeLog
+++ b/kde-base/kdepasswd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdepasswd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepasswd/ChangeLog,v 1.222 2012/05/24 11:38:03 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepasswd/ChangeLog,v 1.223 2012/06/21 21:54:31 dilfridge Exp $
+
+*kdepasswd-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdepasswd-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kdepasswd-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kdepasswd/kdepasswd-4.8.4.ebuild b/kde-base/kdepasswd/kdepasswd-4.8.4.ebuild
new file mode 100644
index 000000000000..668f3584f68e
--- /dev/null
+++ b/kde-base/kdepasswd/kdepasswd-4.8.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepasswd/kdepasswd-4.8.4.ebuild,v 1.1 2012/06/21 21:54:31 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-baseapps"
+inherit kde4-meta
+
+DESCRIPTION="KDE GUI for passwd"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep libkonq)
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep kdesu)
+"
+
+KMLOADLIBS="libkonq"
diff --git a/kde-base/kdepim-common-libs/ChangeLog b/kde-base/kdepim-common-libs/ChangeLog
index 026e64176ddc..b840cc8f36f3 100644
--- a/kde-base/kdepim-common-libs/ChangeLog
+++ b/kde-base/kdepim-common-libs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdepim-common-libs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-common-libs/ChangeLog,v 1.37 2012/05/24 11:38:04 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-common-libs/ChangeLog,v 1.38 2012/06/21 21:54:44 dilfridge Exp $
+
+*kdepim-common-libs-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdepim-common-libs-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org>
   -kdepim-common-libs-4.8.1.ebuild:
diff --git a/kde-base/kdepim-common-libs/kdepim-common-libs-4.8.4.ebuild b/kde-base/kdepim-common-libs/kdepim-common-libs-4.8.4.ebuild
new file mode 100644
index 000000000000..d7da5ab56e13
--- /dev/null
+++ b/kde-base/kdepim-common-libs/kdepim-common-libs-4.8.4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-common-libs/kdepim-common-libs-4.8.4.ebuild,v 1.1 2012/06/21 21:54:44 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kdepim"
+KMNOMODULE="true"
+inherit kde4-meta
+
+DESCRIPTION="Common libraries for KDE PIM apps"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	app-crypt/gpgme
+	>=app-office/akonadi-server-1.3.60
+	>=dev-libs/shared-desktop-ontologies-0.6.50
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+"
+RDEPEND="${DEPEND}
+	app-crypt/gnupg
+	$(add_kdebase_dep kdepim-runtime)
+"
+
+# @Since >4.4.76 merged here
+add_blocker akonadi
+add_blocker libkdepim
+add_blocker libkleo
+add_blocker libkpgp
+add_blocker kaddressbook '<4.4.90'
+# kdepim-wizards removed since 4.8.0
+add_blocker kdepim-wizards
+add_blocker kmail '<4.4.80'
+add_blocker korganizer '<4.5.67'
+
+RESTRICT="test"
+# bug 393131
+
+KMEXTRA="
+	akonadi_next/
+	calendarsupport/
+	calendarviews/
+	incidenceeditor-ng/
+	libkdepim/
+	libkdepimdbusinterfaces/
+	libkleo/
+	libkpgp/
+	kdgantt2/
+	messagecomposer/
+	messagecore/
+	messagelist/
+	messageviewer/
+	ontologies/
+	templateparser/
+"
+
+KMEXTRACTONLY="
+	kleopatra/
+	kmail/
+	knode/org.kde.knode.xml
+	korganizer/korgac/org.kde.korganizer.KOrgac.xml
+	korganizer/org.kde.korganizer.Korganizer.xml
+"
+
+KMSAVELIBS="true"
diff --git a/kde-base/kdepim-icons/ChangeLog b/kde-base/kdepim-icons/ChangeLog
index 5e622c03567f..583e4ba91091 100644
--- a/kde-base/kdepim-icons/ChangeLog
+++ b/kde-base/kdepim-icons/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdepim-icons
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-icons/ChangeLog,v 1.110 2012/05/24 11:37:43 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-icons/ChangeLog,v 1.111 2012/06/21 21:54:27 dilfridge Exp $
+
+*kdepim-icons-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdepim-icons-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kdepim-icons-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kdepim-icons/kdepim-icons-4.8.4.ebuild b/kde-base/kdepim-icons/kdepim-icons-4.8.4.ebuild
new file mode 100644
index 000000000000..a39ded978e76
--- /dev/null
+++ b/kde-base/kdepim-icons/kdepim-icons-4.8.4.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:27 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kdepim"
+KMMODULE="icons"
+inherit kde4-meta
+
+DESCRIPTION="KDE PIM icons"
+IUSE=""
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="$(add_kdebase_dep kdepimlibs)"
+RDEPEND=""
diff --git a/kde-base/kdepim-kresources/ChangeLog b/kde-base/kdepim-kresources/ChangeLog
index 95203375cdfd..53b2157cd1cb 100644
--- a/kde-base/kdepim-kresources/ChangeLog
+++ b/kde-base/kdepim-kresources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdepim-kresources
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kresources/ChangeLog,v 1.219 2012/05/24 11:37:47 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kresources/ChangeLog,v 1.220 2012/06/21 21:54:30 dilfridge Exp $
+
+*kdepim-kresources-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdepim-kresources-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org>
   -kdepim-kresources-4.8.1.ebuild:
diff --git a/kde-base/kdepim-kresources/kdepim-kresources-4.8.4.ebuild b/kde-base/kdepim-kresources/kdepim-kresources-4.8.4.ebuild
new file mode 100644
index 000000000000..f3aec1e7cbd4
--- /dev/null
+++ b/kde-base/kdepim-kresources/kdepim-kresources-4.8.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:30 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kdepim"
+KMMODULE="kresources"
+inherit kde4-meta
+
+DESCRIPTION="KDE PIM groupware plugin collection"
+IUSE="debug"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	kmail/
+	knotes/
+	korganizer/version.h
+"
+
+KMLOADLIBS="kdepim-common-libs"
diff --git a/kde-base/kdepim-meta/ChangeLog b/kde-base/kdepim-meta/ChangeLog
index c1768f91063d..242fe28f6755 100644
--- a/kde-base/kdepim-meta/ChangeLog
+++ b/kde-base/kdepim-meta/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdepim-meta
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/ChangeLog,v 1.219 2012/05/24 11:38:07 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/ChangeLog,v 1.220 2012/06/21 21:54:33 dilfridge Exp $
+
+*kdepim-meta-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdepim-meta-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kdepim-meta-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kdepim-meta/kdepim-meta-4.8.4.ebuild b/kde-base/kdepim-meta/kdepim-meta-4.8.4.ebuild
new file mode 100644
index 000000000000..9cddb6736243
--- /dev/null
+++ b/kde-base/kdepim-meta/kdepim-meta-4.8.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:33 dilfridge Exp $
+
+EAPI=4
+inherit kde4-meta-pkg
+
+DESCRIPTION="kdepim - merge this to pull in all kdepim-derived packages"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	$(add_kdebase_dep akonadiconsole)
+	$(add_kdebase_dep akregator)
+	$(add_kdebase_dep blogilo)
+	$(add_kdebase_dep kabcclient)
+	$(add_kdebase_dep kaddressbook)
+	$(add_kdebase_dep kalarm)
+	$(add_kdebase_dep kdepim-icons)
+	$(add_kdebase_dep kdepim-kresources)
+	$(add_kdebase_dep kdepim-runtime)
+	$(add_kdebase_dep kdepim-strigi-analyzer)
+	$(add_kdebase_dep kjots)
+	$(add_kdebase_dep kleopatra)
+	$(add_kdebase_dep kmail)
+	$(add_kdebase_dep knode)
+	$(add_kdebase_dep knotes)
+	$(add_kdebase_dep konsolekalendar)
+	$(add_kdebase_dep kontact)
+	$(add_kdebase_dep korganizer)
+	$(add_kdebase_dep ktimetracker)
+"
diff --git a/kde-base/kdepim-runtime/ChangeLog b/kde-base/kdepim-runtime/ChangeLog
index 818b33bf3690..33d409a9dddb 100644
--- a/kde-base/kdepim-runtime/ChangeLog
+++ b/kde-base/kdepim-runtime/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdepim-runtime
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.81 2012/05/24 11:45:44 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.82 2012/06/21 21:54:44 dilfridge Exp $
+
+*kdepim-runtime-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdepim-runtime-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kdepim-runtime-4.8.3.ebuild,
   kdepim-runtime-4.8.3-r2.ebuild:
diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.8.4.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.8.4.ebuild
new file mode 100644
index 000000000000..bec7a69fa4ce
--- /dev/null
+++ b/kde-base/kdepim-runtime/kdepim-runtime-4.8.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:44 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kdepim-runtime"
+inherit kde4-base
+
+DESCRIPTION="KDE PIM runtime plugin collection"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RESTRICT="test"
+# Would need test programs _testrunner and akonaditest from kdepimlibs, see bug 313233
+
+DEPEND="
+	app-misc/strigi
+	>=app-office/akonadi-server-1.7.0
+	dev-libs/boost
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	dev-libs/shared-desktop-ontologies
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+	x11-misc/shared-mime-info
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep kdepim-icons)
+"
+
+# nepomuk_email_feeder moved here in 4.8
+add_blocker kdepim-common-libs 4.7.50
diff --git a/kde-base/kdepim-strigi-analyzer/ChangeLog b/kde-base/kdepim-strigi-analyzer/ChangeLog
index bcbd18616bec..5cce32e5140c 100644
--- a/kde-base/kdepim-strigi-analyzer/ChangeLog
+++ b/kde-base/kdepim-strigi-analyzer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdepim-strigi-analyzer
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-strigi-analyzer/ChangeLog,v 1.106 2012/05/24 11:37:42 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-strigi-analyzer/ChangeLog,v 1.107 2012/06/21 21:54:58 dilfridge Exp $
+
+*kdepim-strigi-analyzer-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdepim-strigi-analyzer-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org>
   -kdepim-strigi-analyzer-4.8.1.ebuild:
diff --git a/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-4.8.4.ebuild b/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-4.8.4.ebuild
new file mode 100644
index 000000000000..49e5a4046ddb
--- /dev/null
+++ b/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-4.8.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:58 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kdepim"
+KMMODULE="strigi-analyzer"
+inherit kde4-meta
+
+DESCRIPTION="kdepim: strigi plugins"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	app-misc/strigi
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	libkleo/
+	libkpgp/
+	messageviewer/
+"
diff --git a/kde-base/kdepimlibs/ChangeLog b/kde-base/kdepimlibs/ChangeLog
index f75fc26d4081..0910975404a6 100644
--- a/kde-base/kdepimlibs/ChangeLog
+++ b/kde-base/kdepimlibs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdepimlibs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/ChangeLog,v 1.149 2012/05/30 10:40:42 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/ChangeLog,v 1.150 2012/06/21 21:54:26 dilfridge Exp $
+
+*kdepimlibs-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdepimlibs-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   30 May 2012; Michael Palimaka <kensington@gentoo.org> kdepimlibs-4.8.3.ebuild:
   Add boost as an rdep, since headers that include it are installed. Fixes bug
diff --git a/kde-base/kdepimlibs/kdepimlibs-4.8.4.ebuild b/kde-base/kdepimlibs/kdepimlibs-4.8.4.ebuild
new file mode 100644
index 000000000000..a85824ae3247
--- /dev/null
+++ b/kde-base/kdepimlibs/kdepimlibs-4.8.4.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/kdepimlibs-4.8.4.ebuild,v 1.1 2012/06/21 21:54:26 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+CPPUNIT_REQUIRED="optional"
+inherit kde4-base
+
+DESCRIPTION="Common library for KDE PIM apps."
+HOMEPAGE="http://www.kde.org/"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+LICENSE="LGPL-2.1"
+IUSE="debug ldap prison 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
+	$(add_kdebase_dep kdelibs 'semantic-desktop=')
+	prison? ( media-libs/prison )
+	semantic-desktop? (
+		>=app-office/akonadi-server-1.7.0
+		media-libs/phonon
+		x11-misc/shared-mime-info
+	)
+	ldap? ( net-nds/openldap )
+"
+# boost is not linked to, but headers which include it are installed
+# bug #418071
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	kde4-base_src_prepare
+
+	# Disable hardcoded checks
+	sed -r -e '/find_package\((Akonadi|SharedDesktopOntologies|Soprano|Nepomuk)/{/macro_optional_/!s/find/macro_optional_&/}' \
+		-e '/macro_log_feature\((Akonadi|SHAREDDESKTOPONTOLOGIES|Soprano|Nepomuk)_FOUND/s/ TRUE / FALSE /' \
+		-e '/add_subdirectory\((akonadi|mailtransport)/{/macro_optional_/!s/add/macro_optional_&/}' \
+		-i CMakeLists.txt || die
+	if ! use semantic-desktop; then
+		sed -e '/include(SopranoAddOntology)/s/^/#DISABLED /' \
+			-i CMakeLists.txt || die
+		# More reliable than -DBUILD_akonadi=OFF
+		rm -r akonadi mailtransport || die
+	fi
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_build handbook doc)
+		$(cmake-utils_use_with ldap)
+		$(cmake-utils_use_with semantic-desktop Akonadi)
+		$(cmake-utils_use_with semantic-desktop SharedDesktopOntologies)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use !semantic-desktop KALARM_USE_KRESOURCES)
+		$(cmake-utils_use_with prison)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/kde-base/kdeplasma-addons/ChangeLog b/kde-base/kdeplasma-addons/ChangeLog
index ac187c41c7ac..dc42aadb59d0 100644
--- a/kde-base/kdeplasma-addons/ChangeLog
+++ b/kde-base/kdeplasma-addons/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdeplasma-addons
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.137 2012/06/17 21:11:05 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.138 2012/06/21 21:54:34 dilfridge Exp $
+
+*kdeplasma-addons-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdeplasma-addons-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   17 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
   kdeplasma-addons-4.8.3.ebuild:
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.8.4.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.8.4.ebuild
new file mode 100644
index 000000000000..2c1ef1f03bde
--- /dev/null
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.8.4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:34 dilfridge Exp $
+
+EAPI=4
+
+inherit kde4-base
+
+DESCRIPTION="Extra Plasma applets and engines"
+HOMEPAGE="http://www.kde.org/"
+LICENSE="GPL-2 LGPL-2"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="attica debug desktopglobe exif fcitx ibus qalculate qwt scim semantic-desktop"
+
+# krunner is only needed to generate dbus interface for lancelot
+COMMON_DEPEND="
+	app-crypt/qca:2
+	app-crypt/qca-ossl:2
+	$(add_kdebase_dep kdelibs 'semantic-desktop=')
+	$(add_kdebase_dep krunner)
+	$(add_kdebase_dep plasma-workspace 'semantic-desktop=')
+	x11-misc/shared-mime-info
+	attica? ( dev-libs/libattica )
+	desktopglobe? ( $(add_kdebase_dep marble) )
+	exif? ( $(add_kdebase_dep libkexiv2) )
+	fcitx? ( app-i18n/fcitx[dbus(+)] )
+	ibus? ( app-i18n/ibus )
+	qalculate? ( sci-libs/libqalculate )
+	qwt? ( x11-libs/qwt:5 )
+	scim? ( app-i18n/scim )
+	semantic-desktop? (
+		$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+		$(add_kdebase_dep plasma-workspace 'rss')
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/eigen:2
+"
+RDEPEND="${COMMON_DEPEND}
+"
+
+src_configure() {
+	mycmakeargs=(
+		-DDBUS_INTERFACES_INSTALL_DIR="${EPREFIX}/usr/share/dbus-1/interfaces/"
+		$(cmake-utils_use_with attica LibAttica)
+		$(cmake-utils_use_with desktopglobe Marble)
+		$(cmake-utils_use_with exif Kexiv2)
+		$(cmake-utils_use_with ibus)
+		$(cmake-utils_use_with qalculate)
+		$(cmake-utils_use_with qwt)
+		$(cmake-utils_use_with semantic-desktop KdepimLibs)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with scim)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/kde-base/kdesdk-kioslaves/ChangeLog b/kde-base/kdesdk-kioslaves/ChangeLog
index ca6d90baf23b..354656f27f57 100644
--- a/kde-base/kdesdk-kioslaves/ChangeLog
+++ b/kde-base/kdesdk-kioslaves/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdesdk-kioslaves
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/ChangeLog,v 1.208 2012/05/24 11:37:55 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/ChangeLog,v 1.209 2012/06/21 21:54:50 dilfridge Exp $
+
+*kdesdk-kioslaves-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdesdk-kioslaves-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kdesdk-kioslaves-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.8.4.ebuild b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.8.4.ebuild
new file mode 100644
index 000000000000..6a4a35ff85f5
--- /dev/null
+++ b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.8.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:50 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kdesdk"
+KMMODULE="kioslave"
+inherit kde4-meta
+
+DESCRIPTION="kioslaves from kdesdk package"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug subversion"
+
+DEPEND="
+	subversion? (
+		dev-libs/apr
+		dev-vcs/subversion
+	)
+"
+RDEPEND="${DEPEND}
+	subversion? ( !>=dev-vcs/kdesvn-1.5.2:4 )
+"
+
+src_configure() {
+	mycmakeargs=(
+		-DAPRCONFIG_EXECUTABLE="${EPREFIX}"/usr/bin/apr-1-config
+		$(cmake-utils_use_with subversion SVN)
+	)
+
+	kde4-meta_src_configure
+}
diff --git a/kde-base/kdesdk-meta/ChangeLog b/kde-base/kdesdk-meta/ChangeLog
index 077b9126e484..b1a5475a7c96 100644
--- a/kde-base/kdesdk-meta/ChangeLog
+++ b/kde-base/kdesdk-meta/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdesdk-meta
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-meta/ChangeLog,v 1.202 2012/05/24 11:37:42 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-meta/ChangeLog,v 1.203 2012/06/21 21:54:26 dilfridge Exp $
+
+*kdesdk-meta-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdesdk-meta-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kdesdk-meta-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kdesdk-meta/kdesdk-meta-4.8.4.ebuild b/kde-base/kdesdk-meta/kdesdk-meta-4.8.4.ebuild
new file mode 100644
index 000000000000..7b321f396715
--- /dev/null
+++ b/kde-base/kdesdk-meta/kdesdk-meta-4.8.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:26 dilfridge Exp $
+
+EAPI=4
+inherit kde4-meta-pkg
+
+DESCRIPTION="KDE SDK - merge this to pull in all kdesdk-derived packages"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cvs"
+
+RDEPEND="
+	cvs? ( $(add_kdebase_dep cervisia) )
+	$(add_kdebase_dep dolphin-plugins)
+	$(add_kdebase_dep kapptemplate)
+	$(add_kdebase_dep kate)
+	$(add_kdebase_dep kcachegrind)
+	$(add_kdebase_dep kdeaccounts-plugin)
+	$(add_kdebase_dep kdesdk-kioslaves)
+	$(add_kdebase_dep kdesdk-misc)
+	$(add_kdebase_dep kdesdk-scripts)
+	$(add_kdebase_dep kdesdk-strigi-analyzer)
+	$(add_kdebase_dep kompare)
+	$(add_kdebase_dep kstartperf)
+	$(add_kdebase_dep kuiviewer)
+	$(add_kdebase_dep lokalize)
+	$(add_kdebase_dep okteta)
+	$(add_kdebase_dep umbrello)
+"
diff --git a/kde-base/kdesdk-misc/ChangeLog b/kde-base/kdesdk-misc/ChangeLog
index aa2529b83826..4b0476129ba3 100644
--- a/kde-base/kdesdk-misc/ChangeLog
+++ b/kde-base/kdesdk-misc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdesdk-misc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-misc/ChangeLog,v 1.187 2012/05/24 11:37:54 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-misc/ChangeLog,v 1.188 2012/06/21 21:54:59 dilfridge Exp $
+
+*kdesdk-misc-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdesdk-misc-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kdesdk-misc-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kdesdk-misc/kdesdk-misc-4.8.4.ebuild b/kde-base/kdesdk-misc/kdesdk-misc-4.8.4.ebuild
new file mode 100644
index 000000000000..620beb1272f4
--- /dev/null
+++ b/kde-base/kdesdk-misc/kdesdk-misc-4.8.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:59 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kdesdk"
+KMNOMODULE="true"
+inherit kde4-meta
+
+DESCRIPTION="KDE miscellaneous SDK tools"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug extras"
+
+DEPEND="
+	extras? ( >=dev-java/antlr-2.7.7:0[cxx,script] )
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRA="
+	doc/kmtrace/
+	doc/poxml/
+	kmtrace/
+	kpartloader/
+	kprofilemethod/
+	kspy/
+	kunittest/
+	poxml/
+	scheck/
+"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with extras Antlr2)
+	)
+
+	kde4-meta_src_configure
+}
diff --git a/kde-base/kdesdk-scripts/ChangeLog b/kde-base/kdesdk-scripts/ChangeLog
index abcce926959d..0976770149ae 100644
--- a/kde-base/kdesdk-scripts/ChangeLog
+++ b/kde-base/kdesdk-scripts/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdesdk-scripts
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-scripts/ChangeLog,v 1.196 2012/05/24 11:37:54 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-scripts/ChangeLog,v 1.197 2012/06/21 21:54:56 dilfridge Exp $
+
+*kdesdk-scripts-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdesdk-scripts-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kdesdk-scripts-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kdesdk-scripts/kdesdk-scripts-4.8.4.ebuild b/kde-base/kdesdk-scripts/kdesdk-scripts-4.8.4.ebuild
new file mode 100644
index 000000000000..ad2155cb9b54
--- /dev/null
+++ b/kde-base/kdesdk-scripts/kdesdk-scripts-4.8.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:56 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdesdk"
+KMMODULE="scripts"
+inherit kde4-meta
+
+DESCRIPTION="KDE SDK Scripts"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	app-arch/advancecomp
+"
+
+src_prepare() {
+	# bug 275069
+	sed -ie 's:colorsvn::' scripts/CMakeLists.txt || die
+
+	kde4-meta_src_prepare
+}
diff --git a/kde-base/kdesdk-strigi-analyzer/ChangeLog b/kde-base/kdesdk-strigi-analyzer/ChangeLog
index c49d89e0a735..e304424dc3f8 100644
--- a/kde-base/kdesdk-strigi-analyzer/ChangeLog
+++ b/kde-base/kdesdk-strigi-analyzer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdesdk-strigi-analyzer
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-strigi-analyzer/ChangeLog,v 1.104 2012/05/24 11:37:45 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-strigi-analyzer/ChangeLog,v 1.105 2012/06/21 21:54:45 dilfridge Exp $
+
+*kdesdk-strigi-analyzer-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdesdk-strigi-analyzer-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org>
   -kdesdk-strigi-analyzer-4.8.1.ebuild:
diff --git a/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.8.4.ebuild b/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.8.4.ebuild
new file mode 100644
index 000000000000..e3ee4fbf9c93
--- /dev/null
+++ b/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.8.4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:45 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kdesdk"
+KMMODULE="strigi-analyzer"
+inherit kde4-meta
+
+DESCRIPTION="kdesdk: strigi plugins"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	app-misc/strigi
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-base/kdesu/ChangeLog b/kde-base/kdesu/ChangeLog
index c0cf09b9aa87..e95fae878a4f 100644
--- a/kde-base/kdesu/ChangeLog
+++ b/kde-base/kdesu/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdesu
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesu/ChangeLog,v 1.218 2012/05/24 11:37:58 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesu/ChangeLog,v 1.219 2012/06/21 21:54:49 dilfridge Exp $
+
+*kdesu-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kdesu-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kdesu-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kdesu/kdesu-4.8.4.ebuild b/kde-base/kdesu/kdesu-4.8.4.ebuild
new file mode 100644
index 000000000000..f520d8f31562
--- /dev/null
+++ b/kde-base/kdesu/kdesu-4.8.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesu/kdesu-4.8.4.ebuild,v 1.1 2012/06/21 21:54:49 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+# FIXME: Is default command ( su/sudo ) still configurable,
+# if not, USE-flag ?
+DESCRIPTION="KDE: gui for su(1)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+src_configure() {
+	# Upstream moved kdesu to libexec first, then decided to move it back
+	# to /${PREFIX}/bin/ , so I'm doing that now already.
+	sed -e '/kdesu_executable/s:LIBEXEC_INSTALL_DIR:BIN_INSTALL_DIR:' \
+		-i "${S}"/kdesu/kdesu/CMakeLists.txt || \
+		die "Moving kdesu from libexec to bin failed."
+
+	kde4-meta_src_configure
+}
diff --git a/kde-base/kdetoys-meta/ChangeLog b/kde-base/kdetoys-meta/ChangeLog
index d3eb279e703f..84e83189c274 100644
--- a/kde-base/kdetoys-meta/ChangeLog
+++ b/kde-base/kdetoys-meta/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdetoys-meta
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys-meta/ChangeLog,v 1.211 2012/05/24 11:37:48 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys-meta/ChangeLog,v 1.212 2012/06/21 21:54:50 dilfridge Exp $
+
+*kdetoys-meta-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdetoys-meta-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kdetoys-meta-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kdetoys-meta/kdetoys-meta-4.8.4.ebuild b/kde-base/kdetoys-meta/kdetoys-meta-4.8.4.ebuild
new file mode 100644
index 000000000000..9864de2f92a0
--- /dev/null
+++ b/kde-base/kdetoys-meta/kdetoys-meta-4.8.4.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:50 dilfridge Exp $
+
+EAPI=4
+inherit kde4-meta-pkg
+
+DESCRIPTION="KDE toys - merge this to pull in all kdetoys-derived packages"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	$(add_kdebase_dep amor)
+	$(add_kdebase_dep kteatime)
+	$(add_kdebase_dep ktux)
+"
diff --git a/kde-base/kdeutils-meta/ChangeLog b/kde-base/kdeutils-meta/ChangeLog
index 3c86f6524fba..64af26bcbc77 100644
--- a/kde-base/kdeutils-meta/ChangeLog
+++ b/kde-base/kdeutils-meta/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdeutils-meta
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils-meta/ChangeLog,v 1.215 2012/05/24 11:37:57 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils-meta/ChangeLog,v 1.216 2012/06/21 21:54:39 dilfridge Exp $
+
+*kdeutils-meta-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdeutils-meta-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kdeutils-meta-4.8.1-r1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kdeutils-meta/kdeutils-meta-4.8.4.ebuild b/kde-base/kdeutils-meta/kdeutils-meta-4.8.4.ebuild
new file mode 100644
index 000000000000..b1510d607d1d
--- /dev/null
+++ b/kde-base/kdeutils-meta/kdeutils-meta-4.8.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:39 dilfridge Exp $
+
+EAPI=4
+inherit kde4-meta-pkg
+
+DESCRIPTION="kdeutils - merge this to pull in all kdeutils-derived packages"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cups floppy"
+
+RDEPEND="
+	$(add_kdebase_dep ark)
+	$(add_kdebase_dep filelight)
+	$(add_kdebase_dep kcalc)
+	$(add_kdebase_dep kcharselect)
+	$(add_kdebase_dep kdf)
+	$(add_kdebase_dep kgpg)
+	$(add_kdebase_dep kremotecontrol)
+	$(add_kdebase_dep ktimer)
+	$(add_kdebase_dep kwallet)
+	$(add_kdebase_dep superkaramba)
+	$(add_kdebase_dep sweeper)
+	cups? ( $(add_kdebase_dep printer-applet) )
+	floppy? ( $(add_kdebase_dep kfloppy) )
+"
diff --git a/kde-base/kdewebdev-meta/ChangeLog b/kde-base/kdewebdev-meta/ChangeLog
index 8408e880c68e..85d8d34d1f9c 100644
--- a/kde-base/kdewebdev-meta/ChangeLog
+++ b/kde-base/kdewebdev-meta/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdewebdev-meta
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev-meta/ChangeLog,v 1.196 2012/05/24 11:37:58 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev-meta/ChangeLog,v 1.197 2012/06/21 21:54:39 dilfridge Exp $
+
+*kdewebdev-meta-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdewebdev-meta-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kdewebdev-meta-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kdewebdev-meta/kdewebdev-meta-4.8.4.ebuild b/kde-base/kdewebdev-meta/kdewebdev-meta-4.8.4.ebuild
new file mode 100644
index 000000000000..1316f0555e9f
--- /dev/null
+++ b/kde-base/kdewebdev-meta/kdewebdev-meta-4.8.4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:39 dilfridge Exp $
+
+EAPI=4
+inherit kde4-meta-pkg
+
+DESCRIPTION="KDE WebDev - merge this to pull in all kdewebdev-derived packages"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	$(add_kdebase_dep kfilereplace)
+	$(add_kdebase_dep kimagemapeditor)
+	$(add_kdebase_dep klinkstatus)
+	$(add_kdebase_dep kommander)
+"
diff --git a/kde-base/kdf/ChangeLog b/kde-base/kdf/ChangeLog
index 03be8f48d119..42f0c9246c6f 100644
--- a/kde-base/kdf/ChangeLog
+++ b/kde-base/kdf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdf
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdf/ChangeLog,v 1.205 2012/05/24 11:37:52 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdf/ChangeLog,v 1.206 2012/06/21 21:54:49 dilfridge Exp $
+
+*kdf-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kdf-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kdf-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kdf/kdf-4.8.4.ebuild b/kde-base/kdf/kdf-4.8.4.ebuild
new file mode 100644
index 000000000000..71a02fba428c
--- /dev/null
+++ b/kde-base/kdf/kdf-4.8.4.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdf/kdf-4.8.4.ebuild,v 1.1 2012/06/21 21:54:49 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE free disk space utility"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+src_unpack() {
+	kde4-base_src_unpack
+}
diff --git a/kde-base/kdialog/ChangeLog b/kde-base/kdialog/ChangeLog
index 7b36f83b3ffd..69111d6ef2ba 100644
--- a/kde-base/kdialog/ChangeLog
+++ b/kde-base/kdialog/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdialog
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdialog/ChangeLog,v 1.208 2012/05/24 11:37:58 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdialog/ChangeLog,v 1.209 2012/06/21 21:54:35 dilfridge Exp $
+
+*kdialog-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kdialog-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kdialog-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kdialog/kdialog-4.8.4.ebuild b/kde-base/kdialog/kdialog-4.8.4.ebuild
new file mode 100644
index 000000000000..6cda3e1820a6
--- /dev/null
+++ b/kde-base/kdialog/kdialog-4.8.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdialog/kdialog-4.8.4.ebuild,v 1.1 2012/06/21 21:54:35 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-baseapps"
+inherit kde4-meta
+
+DESCRIPTION="KDialog can be used to show nice dialog boxes from shell scripts"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kdiamond/ChangeLog b/kde-base/kdiamond/ChangeLog
index 1e537eaa6b66..23df1f5daa5f 100644
--- a/kde-base/kdiamond/ChangeLog
+++ b/kde-base/kdiamond/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdiamond
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdiamond/ChangeLog,v 1.105 2012/05/24 11:38:00 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdiamond/ChangeLog,v 1.106 2012/06/21 21:55:05 dilfridge Exp $
+
+*kdiamond-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdiamond-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kdiamond-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kdiamond/kdiamond-4.8.4.ebuild b/kde-base/kdiamond/kdiamond-4.8.4.ebuild
new file mode 100644
index 000000000000..0d4dc13bdbfd
--- /dev/null
+++ b/kde-base/kdiamond/kdiamond-4.8.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdiamond/kdiamond-4.8.4.ebuild,v 1.1 2012/06/21 21:55:05 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+inherit kde4-meta
+
+DESCRIPTION="KDE: KDiamond is a three-in-a-row game."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog
index 88e24ee5c5ba..c0cb55015d57 100644
--- a/kde-base/kdm/ChangeLog
+++ b/kde-base/kdm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.296 2012/06/07 22:28:32 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.297 2012/06/21 21:54:52 dilfridge Exp $
+
+*kdm-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kdm-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   07 Jun 2012; Zac Medico <zmedico@gentoo.org> kdm-4.7.4-r1.ebuild,
   kdm-4.7.4.ebuild, kdm-4.8.3.ebuild:
diff --git a/kde-base/kdm/kdm-4.8.4.ebuild b/kde-base/kdm/kdm-4.8.4.ebuild
new file mode 100644
index 000000000000..6f474c551f5c
--- /dev/null
+++ b/kde-base/kdm/kdm-4.8.4.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.8.4.ebuild,v 1.1 2012/06/21 21:54:52 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-workspace"
+inherit kde4-meta flag-o-matic user
+
+DESCRIPTION="KDE login manager, similar to xdm and gdm"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+consolekit debug kerberos pam"
+
+DEPEND="
+	$(add_kdebase_dep libkworkspace)
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXtst
+	consolekit? (
+		>=sys-apps/dbus-1.0.2
+		sys-auth/consolekit
+	)
+	kerberos? ( virtual/krb5 )
+	pam? (
+		$(add_kdebase_dep kcheckpass)
+		virtual/pam
+	)
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep kdepasswd)
+	>=x11-apps/xinit-1.0.5-r2
+	x11-apps/xmessage
+"
+
+KMEXTRA="
+	libs/kdm/
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch"
+	"${FILESDIR}/${PN}-4.7.3-revertcrashlogic.patch"
+)
+
+pkg_setup() {
+	kde4-meta_pkg_setup
+
+	# Create kdm:kdm user
+	KDM_HOME=/var/lib/kdm
+	enewgroup kdm
+	enewuser kdm -1 -1 "${KDM_HOME}" kdm
+}
+
+src_configure() {
+	# genkdmconf breaks with -O3
+	# last checked in 4.2.95
+	replace-flags -O3 -O2
+
+	mycmakeargs=(
+		$(cmake-utils_use kerberos KDE4_KRB5AUTH)
+		$(cmake-utils_use_with pam)
+		$(cmake-utils_use_with consolekit CkConnector)
+	)
+
+	kde4-meta_src_configure
+}
+
+src_install() {
+	export GENKDMCONF_FLAGS="--no-old --no-backup"
+
+	kde4-meta_src_install
+
+	# an equivalent file is already installed by kde-base/startkde, bug 377151
+	rm "${ED}/usr/share/apps/kdm/sessions/kde-plasma.desktop" || die
+
+	# Customize the kdmrc configuration:
+	# - SessionDirs set to /usr/share/xsessions
+	# - increase server timeout to 30s
+	# - TerminateServer=true to workaround X server regen bug, bug 278473
+	# - DataDir set to /var/lib/kdm
+	# - FaceDir set to /var/lib/kdm/faces
+	sed -e "s|^.*SessionsDirs=.*$|#&\nSessionsDirs=${EPREFIX}/usr/share/apps/kdm/sessions,${EPREFIX}/usr/share/xsessions|" \
+		-e "/#ServerTimeout=/s/^.*$/ServerTimeout=30/" \
+		-e "/#TerminateServer=/s/^.*$/TerminateServer=true/" \
+		-e "s|^.*DataDir=.*$|#&\nDataDir=${EPREFIX}${KDM_HOME}|" \
+		-e "s|^.*FaceDir=.*$|#&\nFaceDir=${EPREFIX}${KDM_HOME}/faces|" \
+		-i "${ED}"/usr/share/config/kdm/kdmrc \
+		|| die "Failed to set ServerTimeout and SessionsDirs correctly in kdmrc."
+
+	# Don't install empty dir
+	rmdir "${ED}"/usr/share/config/kdm/sessions
+
+	# Set up permissions to kdm work directory
+	keepdir "${KDM_HOME}"
+	fowners root:kdm "${KDM_HOME}"
+	fperms 1770 "${KDM_HOME}"
+
+	# install logrotate file
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/kdm-logrotate kdm
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	local file src dest dir old_dirs=(
+		/var/lib/kdm-live
+		/var/lib/kdm-4.6
+		/var/lib/kdm-4.5
+		/var/lib/kdm-4.4
+		/usr/share/apps/kdm
+		/usr/kde/4.4/share/apps/kdm
+		/usr/kde/4.3/share/apps/kdm
+		/usr/kde/4.2/share/apps/kdm
+	)
+
+	mkdir -p "${EROOT}${KDM_HOME}/faces"
+	# Set the default kdm face icon if it's not already set by the system admin
+	# because this is user-overrideable in that way, it's not in src_install
+	for file in faces/.default.face.icon:default1.png faces/root.face.icon:root1.png kdmsts: ; do
+		src=${file#*:}
+		dest=${file%:*}
+		if [[ ! -e ${EROOT}${KDM_HOME}/$dest ]]; then
+			for dir in "${old_dirs[@]}"; do
+				if [[ -e ${EROOT}${dir}/${dest} ]]; then
+					cp "${EROOT}${dir}/${dest}" "${EROOT}${KDM_HOME}/${dest}"
+					break 2
+				fi
+			done
+			if [[ -n ${src} ]]; then
+				cp "${EROOT}/usr/share/apps/kdm/pics/users/${src}" \
+					"${EROOT}${KDM_HOME}/${dest}"
+			fi
+		fi
+	done
+	for dir in "${old_dirs[@]}"; do
+		if [[ ${dir} != /usr/* && -d ${EROOT}${dir} ]]; then
+			echo
+			elog "The directory ${EROOT%/}${dir} still exists from an older installation of KDE."
+			elog "You may wish to copy relevant settings into ${EROOT%/}${KDM_HOME}."
+			echo
+			elog "After doing so, you may delete the directory."
+			echo
+		fi
+	done
+
+	# Make sure permissions are correct -- old installations may have
+	# gotten this wrong
+	use prefix || chown root:kdm "${EROOT}${KDM_HOME}"
+	chmod 1770 "${EROOT}${KDM_HOME}"
+
+	if use consolekit; then
+		echo
+		elog "You have compiled 'kdm' with consolekit support. If you want to use kdm,"
+		elog "make sure consolekit daemon is running and started at login time"
+		elog
+		elog "rc-update add consolekit default && /etc/init.d/consolekit start"
+		echo
+	fi
+}
diff --git a/kde-base/kdnssd/ChangeLog b/kde-base/kdnssd/ChangeLog
index 5d202f3955ef..ca0e3abc61dd 100644
--- a/kde-base/kdnssd/ChangeLog
+++ b/kde-base/kdnssd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdnssd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdnssd/ChangeLog,v 1.220 2012/05/24 11:37:48 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdnssd/ChangeLog,v 1.221 2012/06/21 21:55:03 dilfridge Exp $
+
+*kdnssd-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kdnssd-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kdnssd-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kdnssd/kdnssd-4.8.4.ebuild b/kde-base/kdnssd/kdnssd-4.8.4.ebuild
new file mode 100644
index 000000000000..1a45b78bb180
--- /dev/null
+++ b/kde-base/kdnssd/kdnssd-4.8.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdnssd/kdnssd-4.8.4.ebuild,v 1.1 2012/06/21 21:55:03 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kdenetwork"
+inherit kde4-meta
+
+DESCRIPTION="A DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug zeroconf"
+
+DEPEND="
+	zeroconf? ( $(add_kdebase_dep kdelibs zeroconf) )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	mycmakeargs=(-DWITH_Xmms=OFF -DWITH_DNSSD=ON)
+
+	kde4-meta_src_configure
+}
diff --git a/kde-base/kdontchangethehostname/ChangeLog b/kde-base/kdontchangethehostname/ChangeLog
index 43b7a50c35dd..16f67da84212 100644
--- a/kde-base/kdontchangethehostname/ChangeLog
+++ b/kde-base/kdontchangethehostname/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdontchangethehostname
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdontchangethehostname/ChangeLog,v 1.56 2012/05/24 11:38:00 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdontchangethehostname/ChangeLog,v 1.57 2012/06/21 21:54:38 dilfridge Exp $
+
+*kdontchangethehostname-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdontchangethehostname-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org>
   -kdontchangethehostname-4.8.1.ebuild:
diff --git a/kde-base/kdontchangethehostname/kdontchangethehostname-4.8.4.ebuild b/kde-base/kdontchangethehostname/kdontchangethehostname-4.8.4.ebuild
new file mode 100644
index 000000000000..4289ff287296
--- /dev/null
+++ b/kde-base/kdontchangethehostname/kdontchangethehostname-4.8.4.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdontchangethehostname/kdontchangethehostname-4.8.4.ebuild,v 1.1 2012/06/21 21:54:38 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="Tool to inform KDE about a change in hostname"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	x11-apps/xauth
+"
diff --git a/kde-base/keditbookmarks/ChangeLog b/kde-base/keditbookmarks/ChangeLog
index 2c51a6a0fc04..74c25ab2cb56 100644
--- a/kde-base/keditbookmarks/ChangeLog
+++ b/kde-base/keditbookmarks/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/keditbookmarks
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/keditbookmarks/ChangeLog,v 1.123 2012/05/24 11:37:54 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/keditbookmarks/ChangeLog,v 1.124 2012/06/21 21:54:49 dilfridge Exp $
+
+*keditbookmarks-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +keditbookmarks-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -keditbookmarks-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/keditbookmarks/keditbookmarks-4.8.4.ebuild b/kde-base/keditbookmarks/keditbookmarks-4.8.4.ebuild
new file mode 100644
index 000000000000..0bdc811f911d
--- /dev/null
+++ b/kde-base/keditbookmarks/keditbookmarks-4.8.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/keditbookmarks/keditbookmarks-4.8.4.ebuild,v 1.1 2012/06/21 21:54:49 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-baseapps"
+VIRTUALX_REQUIRED=test
+inherit kde4-meta
+
+DESCRIPTION="KDE's bookmarks editor"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep libkonq)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	lib/konq/
+"
diff --git a/kde-base/keditfiletype/ChangeLog b/kde-base/keditfiletype/ChangeLog
index 14269abdaa43..3d5386c65f96 100644
--- a/kde-base/keditfiletype/ChangeLog
+++ b/kde-base/keditfiletype/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/keditfiletype
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/keditfiletype/ChangeLog,v 1.97 2012/05/24 11:37:43 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/keditfiletype/ChangeLog,v 1.98 2012/06/21 21:54:25 dilfridge Exp $
+
+*keditfiletype-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +keditfiletype-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -keditfiletype-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/keditfiletype/keditfiletype-4.8.4.ebuild b/kde-base/keditfiletype/keditfiletype-4.8.4.ebuild
new file mode 100644
index 000000000000..bb8bf1cb7cba
--- /dev/null
+++ b/kde-base/keditfiletype/keditfiletype-4.8.4.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/keditfiletype/keditfiletype-4.8.4.ebuild,v 1.1 2012/06/21 21:54:25 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="KDE mime/file type assocciation editor"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+# test fails, last checked for 4.2.89
+RESTRICT=test
diff --git a/kde-base/kephal/ChangeLog b/kde-base/kephal/ChangeLog
index 808ce895ae2d..0fc6d487b7ae 100644
--- a/kde-base/kephal/ChangeLog
+++ b/kde-base/kephal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kephal
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kephal/ChangeLog,v 1.107 2012/05/24 11:38:11 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kephal/ChangeLog,v 1.108 2012/06/21 21:54:25 dilfridge Exp $
+
+*kephal-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kephal-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kephal-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kephal/kephal-4.8.4.ebuild b/kde-base/kephal/kephal-4.8.4.ebuild
new file mode 100644
index 000000000000..4300cdd1f9f3
--- /dev/null
+++ b/kde-base/kephal/kephal-4.8.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kephal/kephal-4.8.4.ebuild,v 1.1 2012/06/21 21:54:25 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+KMMODULE="libs/kephal"
+inherit kde4-meta
+
+DESCRIPTION="Allows handling of multihead systems via the XRandR extension"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	x11-libs/libxkbfile
+	x11-libs/libXrandr
+"
+DEPEND="${RDEPEND}
+	x11-proto/randrproto
+"
diff --git a/kde-base/kfile/ChangeLog b/kde-base/kfile/ChangeLog
index 8d33caf2dd01..a414a4407c09 100644
--- a/kde-base/kfile/ChangeLog
+++ b/kde-base/kfile/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kfile
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfile/ChangeLog,v 1.123 2012/05/24 11:37:42 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfile/ChangeLog,v 1.124 2012/06/21 21:54:43 dilfridge Exp $
+
+*kfile-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kfile-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kfile-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kfile/kfile-4.8.4.ebuild b/kde-base/kfile/kfile-4.8.4.ebuild
new file mode 100644
index 000000000000..386e84affbc6
--- /dev/null
+++ b/kde-base/kfile/kfile-4.8.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfile/kfile-4.8.4.ebuild,v 1.1 2012/06/21 21:54:43 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="A commandline frontend to KFileMetaInfo"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kfilereplace/ChangeLog b/kde-base/kfilereplace/ChangeLog
index 999228de9217..c3720da96b30 100644
--- a/kde-base/kfilereplace/ChangeLog
+++ b/kde-base/kfilereplace/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kfilereplace
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfilereplace/ChangeLog,v 1.204 2012/05/24 11:37:55 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfilereplace/ChangeLog,v 1.205 2012/06/21 21:54:50 dilfridge Exp $
+
+*kfilereplace-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kfilereplace-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kfilereplace-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kfilereplace/kfilereplace-4.8.4.ebuild b/kde-base/kfilereplace/kfilereplace-4.8.4.ebuild
new file mode 100644
index 000000000000..4912da255ab2
--- /dev/null
+++ b/kde-base/kfilereplace/kfilereplace-4.8.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfilereplace/kfilereplace-4.8.4.ebuild,v 1.1 2012/06/21 21:54:50 dilfridge Exp $
+
+EAPI=4
+KDE_HANDBOOK="optional"
+KMNAME="kdewebdev"
+inherit kde4-meta
+
+DESCRIPTION="KDE web development - powerful search and replace in multiple files"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kfind/ChangeLog b/kde-base/kfind/ChangeLog
index 49fc40934aa1..7abea99f1109 100644
--- a/kde-base/kfind/ChangeLog
+++ b/kde-base/kfind/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kfind
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfind/ChangeLog,v 1.219 2012/05/24 11:38:08 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfind/ChangeLog,v 1.220 2012/06/21 21:54:43 dilfridge Exp $
+
+*kfind-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kfind-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kfind-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kfind/kfind-4.8.4.ebuild b/kde-base/kfind/kfind-4.8.4.ebuild
new file mode 100644
index 000000000000..dfa41bf93b1a
--- /dev/null
+++ b/kde-base/kfind/kfind-4.8.4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfind/kfind-4.8.4.ebuild,v 1.1 2012/06/21 21:54:43 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-baseapps"
+inherit kde4-meta
+
+DESCRIPTION="KDE file finder utility"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep libkonq)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-base/kfloppy/ChangeLog b/kde-base/kfloppy/ChangeLog
index 1cd3b33d76c1..bcb9c1dfade5 100644
--- a/kde-base/kfloppy/ChangeLog
+++ b/kde-base/kfloppy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kfloppy
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfloppy/ChangeLog,v 1.199 2012/05/24 11:37:59 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfloppy/ChangeLog,v 1.200 2012/06/21 21:54:53 dilfridge Exp $
+
+*kfloppy-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kfloppy-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kfloppy-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kfloppy/kfloppy-4.8.4.ebuild b/kde-base/kfloppy/kfloppy-4.8.4.ebuild
new file mode 100644
index 000000000000..1a08234507c5
--- /dev/null
+++ b/kde-base/kfloppy/kfloppy-4.8.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfloppy/kfloppy-4.8.4.ebuild,v 1.1 2012/06/21 21:54:53 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kfmclient/ChangeLog b/kde-base/kfmclient/ChangeLog
index 2e9c0089df77..1e05b97cd93a 100644
--- a/kde-base/kfmclient/ChangeLog
+++ b/kde-base/kfmclient/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kfmclient
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfmclient/ChangeLog,v 1.92 2012/05/24 11:37:41 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfmclient/ChangeLog,v 1.93 2012/06/21 21:54:44 dilfridge Exp $
+
+*kfmclient-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kfmclient-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kfmclient-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kfmclient/kfmclient-4.8.4.ebuild b/kde-base/kfmclient/kfmclient-4.8.4.ebuild
new file mode 100644
index 000000000000..2d71fdf5b554
--- /dev/null
+++ b/kde-base/kfmclient/kfmclient-4.8.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfmclient/kfmclient-4.8.4.ebuild,v 1.1 2012/06/21 21:54:44 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-baseapps"
+KMMODULE="konqueror/client"
+inherit kde4-meta
+
+DESCRIPTION="KDE tool for opening URLs from the command line"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+KMEXTRACTONLY="
+	konqueror/kfmclient.desktop
+	konqueror/kfmclient_dir.desktop
+	konqueror/kfmclient_html.desktop
+	konqueror/kfmclient_war.desktop
+	konqueror/src/org.kde.Konqueror.Main.xml
+	konqueror/src/org.kde.Konqueror.MainWindow.xml
+"
+
+src_prepare() {
+	kde4-meta_src_prepare
+
+	# Do not install non-kfmclient *.desktop files
+	sed -e "/konqbrowser\.desktop/d" \
+		-e "/konqueror\.desktop/s/^/#DONOTWANT/" \
+		-e "/install(FILES profile/s/^/#DONOTWANT/" \
+		-i konqueror/CMakeLists.txt \
+		|| die "Failed to omit .desktop files"
+}
diff --git a/kde-base/kfourinline/ChangeLog b/kde-base/kfourinline/ChangeLog
index ea27847a8dad..893374c67aea 100644
--- a/kde-base/kfourinline/ChangeLog
+++ b/kde-base/kfourinline/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kfourinline
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfourinline/ChangeLog,v 1.116 2012/05/24 11:37:43 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfourinline/ChangeLog,v 1.117 2012/06/21 21:54:28 dilfridge Exp $
+
+*kfourinline-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kfourinline-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kfourinline-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kfourinline/kfourinline-4.8.4.ebuild b/kde-base/kfourinline/kfourinline-4.8.4.ebuild
new file mode 100644
index 000000000000..a96cd0726a38
--- /dev/null
+++ b/kde-base/kfourinline/kfourinline-4.8.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfourinline/kfourinline-4.8.4.ebuild,v 1.1 2012/06/21 21:54:28 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+inherit kde4-meta
+
+DESCRIPTION="KDE four-in-a-row game."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kgamma/ChangeLog b/kde-base/kgamma/ChangeLog
index 63f7e14cc761..aefcb7144804 100644
--- a/kde-base/kgamma/ChangeLog
+++ b/kde-base/kgamma/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kgamma
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgamma/ChangeLog,v 1.210 2012/05/24 11:37:45 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgamma/ChangeLog,v 1.211 2012/06/21 21:54:57 dilfridge Exp $
+
+*kgamma-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kgamma-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kgamma-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kgamma/kgamma-4.8.4.ebuild b/kde-base/kgamma/kgamma-4.8.4.ebuild
new file mode 100644
index 000000000000..f7b1ca83c474
--- /dev/null
+++ b/kde-base/kgamma/kgamma-4.8.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgamma/kgamma-4.8.4.ebuild,v 1.1 2012/06/21 21:54:57 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+
+inherit kde4-base
+
+DESCRIPTION="KDE screen gamma values kcontrol module"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	x11-libs/libXxf86vm
+"
+DEPEND="${RDEPEND}
+	x11-proto/xf86vidmodeproto
+"
diff --git a/kde-base/kgeography/ChangeLog b/kde-base/kgeography/ChangeLog
index cae56a5ad131..4b58f5fb5b13 100644
--- a/kde-base/kgeography/ChangeLog
+++ b/kde-base/kgeography/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kgeography
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgeography/ChangeLog,v 1.181 2012/05/24 11:38:10 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgeography/ChangeLog,v 1.182 2012/06/21 21:54:42 dilfridge Exp $
+
+*kgeography-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kgeography-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kgeography-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kgeography/kgeography-4.8.4.ebuild b/kde-base/kgeography/kgeography-4.8.4.ebuild
new file mode 100644
index 000000000000..ba0d2919c475
--- /dev/null
+++ b/kde-base/kgeography/kgeography-4.8.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgeography/kgeography-4.8.4.ebuild,v 1.1 2012/06/21 21:54:42 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE: a geography learning tool"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kget/ChangeLog b/kde-base/kget/ChangeLog
index 31c8baea38c6..b2d6d4614ccd 100644
--- a/kde-base/kget/ChangeLog
+++ b/kde-base/kget/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kget
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/ChangeLog,v 1.229 2012/05/24 11:37:52 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/ChangeLog,v 1.230 2012/06/21 21:54:49 dilfridge Exp $
+
+*kget-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kget-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kget-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kget/kget-4.8.4.ebuild b/kde-base/kget/kget-4.8.4.ebuild
new file mode 100644
index 000000000000..14948a15b3c0
--- /dev/null
+++ b/kde-base/kget/kget-4.8.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/kget-4.8.4.ebuild,v 1.1 2012/06/21 21:54:49 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdenetwork"
+inherit kde4-meta
+
+DESCRIPTION="An advanced download manager for KDE"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug bittorrent mms semantic-desktop sqlite webkit"
+
+RDEPEND="
+	app-crypt/qca:2
+	$(add_kdebase_dep kdelibs 'semantic-desktop=')
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep libkonq)
+	$(add_kdebase_dep libkworkspace)
+	$(add_kdebase_dep solid)
+	bittorrent? ( >=net-libs/libktorrent-1.0.3 )
+	mms? ( media-libs/libmms )
+	sqlite? ( dev-db/sqlite:3 )
+	webkit? ( >=kde-misc/kwebkitpart-0.9.6 )
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with bittorrent KTorrent)
+		$(cmake-utils_use_with mms LibMms)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_with sqlite)
+		$(cmake-utils_use_with webkit KWebKitPart)
+	)
+	kde4-meta_src_configure
+}
diff --git a/kde-base/kglobalaccel/ChangeLog b/kde-base/kglobalaccel/ChangeLog
index 506c46f98185..ef2eb2ed7803 100644
--- a/kde-base/kglobalaccel/ChangeLog
+++ b/kde-base/kglobalaccel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kglobalaccel
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kglobalaccel/ChangeLog,v 1.98 2012/05/24 11:38:01 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kglobalaccel/ChangeLog,v 1.99 2012/06/21 21:54:35 dilfridge Exp $
+
+*kglobalaccel-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kglobalaccel-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kglobalaccel-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kglobalaccel/kglobalaccel-4.8.4.ebuild b/kde-base/kglobalaccel/kglobalaccel-4.8.4.ebuild
new file mode 100644
index 000000000000..b26f83afd79e
--- /dev/null
+++ b/kde-base/kglobalaccel/kglobalaccel-4.8.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kglobalaccel/kglobalaccel-4.8.4.ebuild,v 1.1 2012/06/21 21:54:35 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="KDE's Global Shortcut Daemon"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+src_configure() {
+	mycmakeargs=(
+		-DKDEBASE_KGLOBALACCEL_REMOVE_OBSOLETE_KDED_DESKTOP_FILE=NOTFOUND
+		-DKDEBASE_KGLOBALACCEL_REMOVE_OBSOLETE_KDED_PLUGIN=NOTFOUND
+	)
+
+	kde4-meta_src_configure
+}
diff --git a/kde-base/kgoldrunner/ChangeLog b/kde-base/kgoldrunner/ChangeLog
index 367aedc2481a..cc98f5f9a4eb 100644
--- a/kde-base/kgoldrunner/ChangeLog
+++ b/kde-base/kgoldrunner/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kgoldrunner
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgoldrunner/ChangeLog,v 1.208 2012/05/24 11:37:55 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgoldrunner/ChangeLog,v 1.209 2012/06/21 21:54:29 dilfridge Exp $
+
+*kgoldrunner-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kgoldrunner-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kgoldrunner-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kgoldrunner/kgoldrunner-4.8.4.ebuild b/kde-base/kgoldrunner/kgoldrunner-4.8.4.ebuild
new file mode 100644
index 000000000000..f239672a90ee
--- /dev/null
+++ b/kde-base/kgoldrunner/kgoldrunner-4.8.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgoldrunner/kgoldrunner-4.8.4.ebuild,v 1.1 2012/06/21 21:54:29 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+KDE_SELINUX_MODULE="games"
+inherit kde4-meta
+
+DESCRIPTION="KDE: KGoldrunner is a game of action and puzzle solving"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	media-libs/libsndfile
+	media-libs/openal
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-base/kgpg/ChangeLog b/kde-base/kgpg/ChangeLog
index 00ef3bb29a75..480773d4630b 100644
--- a/kde-base/kgpg/ChangeLog
+++ b/kde-base/kgpg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kgpg
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgpg/ChangeLog,v 1.216 2012/05/24 11:38:10 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgpg/ChangeLog,v 1.217 2012/06/21 21:54:42 dilfridge Exp $
+
+*kgpg-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kgpg-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kgpg-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kgpg/kgpg-4.8.4.ebuild b/kde-base/kgpg/kgpg-4.8.4.ebuild
new file mode 100644
index 000000000000..85edc1b8e5fc
--- /dev/null
+++ b/kde-base/kgpg/kgpg-4.8.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgpg/kgpg-4.8.4.ebuild,v 1.1 2012/06/21 21:54:42 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KDE_SELINUX_MODULE="gpg"
+inherit kde4-base
+
+DESCRIPTION="KDE gpg keyring manager"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+"
+RDEPEND="${DEPEND}
+	app-crypt/gnupg
+"
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	if ! has_version app-crypt/dirmngr ; then
+		elog "For improved key search functionality, install app-crypt/dirmngr."
+	fi
+}
diff --git a/kde-base/khangman/ChangeLog b/kde-base/khangman/ChangeLog
index 7275dd592b06..f90342b09e88 100644
--- a/kde-base/khangman/ChangeLog
+++ b/kde-base/khangman/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/khangman
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/khangman/ChangeLog,v 1.213 2012/05/24 11:37:41 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khangman/ChangeLog,v 1.214 2012/06/21 21:55:07 dilfridge Exp $
+
+*khangman-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +khangman-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -khangman-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/khangman/khangman-4.8.4.ebuild b/kde-base/khangman/khangman-4.8.4.ebuild
new file mode 100644
index 000000000000..059e726d610d
--- /dev/null
+++ b/kde-base/khangman/khangman-4.8.4.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khangman/khangman-4.8.4.ebuild,v 1.1 2012/06/21 21:55:07 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="Classical hangman game for KDE"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep libkdeedu)
+"
diff --git a/kde-base/khelpcenter/ChangeLog b/kde-base/khelpcenter/ChangeLog
index 665a83aae557..8ca72b3cc4a2 100644
--- a/kde-base/khelpcenter/ChangeLog
+++ b/kde-base/khelpcenter/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/khelpcenter
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/khelpcenter/ChangeLog,v 1.226 2012/05/24 11:37:47 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khelpcenter/ChangeLog,v 1.227 2012/06/21 21:54:29 dilfridge Exp $
+
+*khelpcenter-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +khelpcenter-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -khelpcenter-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/khelpcenter/khelpcenter-4.8.4.ebuild b/kde-base/khelpcenter/khelpcenter-4.8.4.ebuild
new file mode 100644
index 000000000000..b46f4a63da9c
--- /dev/null
+++ b/kde-base/khelpcenter/khelpcenter-4.8.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khelpcenter/khelpcenter-4.8.4.ebuild,v 1.1 2012/06/21 21:54:29 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="always"
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="The KDE Help Center"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	$(add_kdebase_dep kdesu)
+	>=www-misc/htdig-3.2.0_beta6-r1
+"
+
+KMEXTRA="
+	doc/documentationnotfound/
+	doc/glossary/
+	doc/onlinehelp/
+"
diff --git a/kde-base/khotkeys/ChangeLog b/kde-base/khotkeys/ChangeLog
index 5929269b1e45..0df944325a91 100644
--- a/kde-base/khotkeys/ChangeLog
+++ b/kde-base/khotkeys/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/khotkeys
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/khotkeys/ChangeLog,v 1.221 2012/05/24 11:38:09 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khotkeys/ChangeLog,v 1.222 2012/06/21 21:54:46 dilfridge Exp $
+
+*khotkeys-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +khotkeys-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -khotkeys-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/khotkeys/khotkeys-4.8.4.ebuild b/kde-base/khotkeys/khotkeys-4.8.4.ebuild
new file mode 100644
index 000000000000..7af215846843
--- /dev/null
+++ b/kde-base/khotkeys/khotkeys-4.8.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khotkeys/khotkeys-4.8.4.ebuild,v 1.1 2012/06/21 21:54:46 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+inherit kde4-meta
+
+DESCRIPTION="KDE: hotkey daemon"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep libkworkspace)
+	x11-libs/libXtst
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	libs/kworkspace/
+"
diff --git a/kde-base/kiconfinder/ChangeLog b/kde-base/kiconfinder/ChangeLog
index 9855981cc255..5a938fe63107 100644
--- a/kde-base/kiconfinder/ChangeLog
+++ b/kde-base/kiconfinder/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kiconfinder
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kiconfinder/ChangeLog,v 1.113 2012/05/24 11:37:44 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kiconfinder/ChangeLog,v 1.114 2012/06/21 21:54:28 dilfridge Exp $
+
+*kiconfinder-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kiconfinder-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kiconfinder-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kiconfinder/kiconfinder-4.8.4.ebuild b/kde-base/kiconfinder/kiconfinder-4.8.4.ebuild
new file mode 100644
index 000000000000..26a5dc52dccc
--- /dev/null
+++ b/kde-base/kiconfinder/kiconfinder-4.8.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kiconfinder/kiconfinder-4.8.4.ebuild,v 1.1 2012/06/21 21:54:28 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="Finds an icon based on its name"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kig/ChangeLog b/kde-base/kig/ChangeLog
index fe5a621a2c05..6b907e5c0238 100644
--- a/kde-base/kig/ChangeLog
+++ b/kde-base/kig/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kig
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/ChangeLog,v 1.217 2012/05/24 11:38:09 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/ChangeLog,v 1.218 2012/06/21 21:54:38 dilfridge Exp $
+
+*kig-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kig-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kig-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kig/kig-4.8.4.ebuild b/kde-base/kig/kig-4.8.4.ebuild
new file mode 100644
index 000000000000..5dfd69638aea
--- /dev/null
+++ b/kde-base/kig/kig-4.8.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/kig-4.8.4.ebuild,v 1.1 2012/06/21 21:54:38 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE Interactive Geometry tool"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug kig-scripting"
+
+DEPEND="
+	kig-scripting? ( >=dev-libs/boost-1.32 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with kig-scripting BoostPython)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/kde-base/kigo/ChangeLog b/kde-base/kigo/ChangeLog
index 6b727aaf2b1f..1727e027dfdd 100644
--- a/kde-base/kigo/ChangeLog
+++ b/kde-base/kigo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kigo
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kigo/ChangeLog,v 1.69 2012/05/24 11:37:44 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kigo/ChangeLog,v 1.70 2012/06/21 21:54:47 dilfridge Exp $
+
+*kigo-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kigo-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kigo-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kigo/kigo-4.8.4.ebuild b/kde-base/kigo/kigo-4.8.4.ebuild
new file mode 100644
index 000000000000..4767e937ad83
--- /dev/null
+++ b/kde-base/kigo/kigo-4.8.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kigo/kigo-4.8.4.ebuild,v 1.1 2012/06/21 21:54:47 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+inherit games-ggz kde4-meta
+
+DESCRIPTION="KDE Go game"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	games-board/gnugo
+"
+
+src_install() {
+	kde4-meta_src_install
+	# and also we have to prepare the ggz dir
+	insinto "${GGZ_MODDIR}"
+	newins ${PN}/src/module.dsc ${P}.dsc
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+	games-ggz_pkg_postinst
+}
+
+pkg_postrm() {
+	kde4-meta_pkg_postrm
+	games-ggz_pkg_postrm
+}
diff --git a/kde-base/killbots/ChangeLog b/kde-base/killbots/ChangeLog
index a2b1a00bfda2..6ae6cfb7fc2d 100644
--- a/kde-base/killbots/ChangeLog
+++ b/kde-base/killbots/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/killbots
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/killbots/ChangeLog,v 1.103 2012/05/24 11:37:49 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/killbots/ChangeLog,v 1.104 2012/06/21 21:54:47 dilfridge Exp $
+
+*killbots-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +killbots-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -killbots-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/killbots/killbots-4.8.4.ebuild b/kde-base/killbots/killbots-4.8.4.ebuild
new file mode 100644
index 000000000000..2684b71f47e5
--- /dev/null
+++ b/kde-base/killbots/killbots-4.8.4.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/killbots/killbots-4.8.4.ebuild,v 1.1 2012/06/21 21:54:47 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+inherit kde4-meta
+
+DESCRIPTION="Kill the bots or they kill you!"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+# Tests hang, last checked in 4.3.3
+RESTRICT="test"
diff --git a/kde-base/kimagemapeditor/ChangeLog b/kde-base/kimagemapeditor/ChangeLog
index cf8d33ecb21b..171685d4c0fc 100644
--- a/kde-base/kimagemapeditor/ChangeLog
+++ b/kde-base/kimagemapeditor/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kimagemapeditor
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kimagemapeditor/ChangeLog,v 1.201 2012/05/24 11:38:08 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kimagemapeditor/ChangeLog,v 1.202 2012/06/21 21:54:48 dilfridge Exp $
+
+*kimagemapeditor-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kimagemapeditor-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kimagemapeditor-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kimagemapeditor/kimagemapeditor-4.8.4.ebuild b/kde-base/kimagemapeditor/kimagemapeditor-4.8.4.ebuild
new file mode 100644
index 000000000000..9999d6f080b7
--- /dev/null
+++ b/kde-base/kimagemapeditor/kimagemapeditor-4.8.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kimagemapeditor/kimagemapeditor-4.8.4.ebuild,v 1.1 2012/06/21 21:54:48 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdewebdev"
+inherit kde4-meta
+
+DESCRIPTION="KDE web development - image map editor"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kimono/ChangeLog b/kde-base/kimono/ChangeLog
index 8590d7cb008d..37d70041c845 100644
--- a/kde-base/kimono/ChangeLog
+++ b/kde-base/kimono/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kimono
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kimono/ChangeLog,v 1.30 2012/05/24 11:37:57 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kimono/ChangeLog,v 1.31 2012/06/21 21:54:36 dilfridge Exp $
+
+*kimono-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kimono-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kimono-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kimono/kimono-4.8.4.ebuild b/kde-base/kimono/kimono-4.8.4.ebuild
new file mode 100644
index 000000000000..81b9175e8a8d
--- /dev/null
+++ b/kde-base/kimono/kimono-4.8.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kimono/kimono-4.8.4.ebuild,v 1.1 2012/06/21 21:54:36 dilfridge Exp $
+
+EAPI=4
+
+inherit kde4-base mono
+
+DESCRIPTION="C# bindings for KDE"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="akonadi debug plasma semantic-desktop"
+
+DEPEND="
+	dev-lang/mono
+	$(add_kdebase_dep qyoto 'webkit')
+	$(add_kdebase_dep smokeqt)
+	$(add_kdebase_dep smokekde 'semantic-desktop=')
+	plasma? ( $(add_kdebase_dep smokeqt 'webkit') )
+	semantic-desktop? ( >=dev-libs/soprano-2.7.6[clucene] )
+"
+RDEPEND="${DEPEND}"
+
+# Split from kdebindings-csharp in 4.7
+add_blocker kdebindings-csharp
+
+src_prepare() {
+	kde4-base_src_prepare
+
+	sed -i "/add_subdirectory( examples )/ s:^:#:" plasma/CMakeLists.txt
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with akonadi)
+		$(cmake-utils_use_with akonadi KdepimLibs)
+		$(cmake-utils_use_disable plasma)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+	)
+	kde4-base_src_configure
+}
diff --git a/kde-base/kinfocenter/ChangeLog b/kde-base/kinfocenter/ChangeLog
index b622e8e07eee..e45178213a66 100644
--- a/kde-base/kinfocenter/ChangeLog
+++ b/kde-base/kinfocenter/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kinfocenter
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kinfocenter/ChangeLog,v 1.120 2012/05/24 11:37:49 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kinfocenter/ChangeLog,v 1.121 2012/06/21 21:54:32 dilfridge Exp $
+
+*kinfocenter-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kinfocenter-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kinfocenter-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kinfocenter/kinfocenter-4.8.4.ebuild b/kde-base/kinfocenter/kinfocenter-4.8.4.ebuild
new file mode 100644
index 000000000000..ea453af08e1c
--- /dev/null
+++ b/kde-base/kinfocenter/kinfocenter-4.8.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kinfocenter/kinfocenter-4.8.4.ebuild,v 1.1 2012/06/21 21:54:32 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-workspace"
+OPENGL_REQUIRED="optional"
+inherit kde4-meta
+
+DESCRIPTION="The KDE Info Center"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug ieee1394"
+
+DEPEND="
+	$(add_kdebase_dep solid)
+	sys-apps/pciutils
+	ieee1394? ( sys-libs/libraw1394 )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+"
+RDEPEND="${DEPEND}
+	sys-apps/usbutils
+"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with ieee1394 RAW1394)
+		$(cmake-utils_use_with opengl OpenGL)
+	)
+
+	kde4-meta_src_configure
+}
diff --git a/kde-base/kioclient/ChangeLog b/kde-base/kioclient/ChangeLog
index 1db1a943c0f0..f7b668e1d398 100644
--- a/kde-base/kioclient/ChangeLog
+++ b/kde-base/kioclient/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kioclient
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kioclient/ChangeLog,v 1.123 2012/05/24 11:37:50 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kioclient/ChangeLog,v 1.124 2012/06/21 21:54:49 dilfridge Exp $
+
+*kioclient-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kioclient-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kioclient-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kioclient/kioclient-4.8.4.ebuild b/kde-base/kioclient/kioclient-4.8.4.ebuild
new file mode 100644
index 000000000000..2f083a148748
--- /dev/null
+++ b/kde-base/kioclient/kioclient-4.8.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kioclient/kioclient-4.8.4.ebuild,v 1.1 2012/06/21 21:54:49 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="Command-line tool for network-transparent operations"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kiriki/ChangeLog b/kde-base/kiriki/ChangeLog
index be6a411b6bc9..5b3b6c9dba89 100644
--- a/kde-base/kiriki/ChangeLog
+++ b/kde-base/kiriki/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kiriki
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kiriki/ChangeLog,v 1.115 2012/05/24 11:38:09 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kiriki/ChangeLog,v 1.116 2012/06/21 21:54:59 dilfridge Exp $
+
+*kiriki-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kiriki-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kiriki-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kiriki/kiriki-4.8.4.ebuild b/kde-base/kiriki/kiriki-4.8.4.ebuild
new file mode 100644
index 000000000000..f792d25bd42a
--- /dev/null
+++ b/kde-base/kiriki/kiriki-4.8.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kiriki/kiriki-4.8.4.ebuild,v 1.1 2012/06/21 21:54:59 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+inherit kde4-meta
+
+DESCRIPTION="Kiriki - a gtali clone for KDE4"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kiten/ChangeLog b/kde-base/kiten/ChangeLog
index c3229d28ddec..66b3e0f75bb9 100644
--- a/kde-base/kiten/ChangeLog
+++ b/kde-base/kiten/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kiten
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kiten/ChangeLog,v 1.208 2012/05/24 11:37:59 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kiten/ChangeLog,v 1.209 2012/06/21 21:54:37 dilfridge Exp $
+
+*kiten-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kiten-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kiten-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kiten/kiten-4.8.4.ebuild b/kde-base/kiten/kiten-4.8.4.ebuild
new file mode 100644
index 000000000000..0a431e258694
--- /dev/null
+++ b/kde-base/kiten/kiten-4.8.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kiten/kiten-4.8.4.ebuild,v 1.1 2012/06/21 21:54:37 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE Japanese dictionary and reference"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kjots/ChangeLog b/kde-base/kjots/ChangeLog
index 743427164213..65f59ff07181 100644
--- a/kde-base/kjots/ChangeLog
+++ b/kde-base/kjots/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kjots
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kjots/ChangeLog,v 1.207 2012/05/24 11:37:42 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kjots/ChangeLog,v 1.208 2012/06/21 21:54:40 dilfridge Exp $
+
+*kjots-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kjots-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kjots-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kjots/kjots-4.8.4.ebuild b/kde-base/kjots/kjots-4.8.4.ebuild
new file mode 100644
index 000000000000..ac8f0e602116
--- /dev/null
+++ b/kde-base/kjots/kjots-4.8.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kjots/kjots-4.8.4.ebuild,v 1.1 2012/06/21 21:54:40 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="KDE note taking utility"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	>=dev-libs/grantlee-0.1
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	akonadi_next/
+"
diff --git a/kde-base/kjumpingcube/ChangeLog b/kde-base/kjumpingcube/ChangeLog
index 77c87ea5f298..0ac6736eafe4 100644
--- a/kde-base/kjumpingcube/ChangeLog
+++ b/kde-base/kjumpingcube/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kjumpingcube
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kjumpingcube/ChangeLog,v 1.208 2012/05/24 11:37:52 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kjumpingcube/ChangeLog,v 1.209 2012/06/21 21:54:34 dilfridge Exp $
+
+*kjumpingcube-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kjumpingcube-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kjumpingcube-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kjumpingcube/kjumpingcube-4.8.4.ebuild b/kde-base/kjumpingcube/kjumpingcube-4.8.4.ebuild
new file mode 100644
index 000000000000..824a4d924fef
--- /dev/null
+++ b/kde-base/kjumpingcube/kjumpingcube-4.8.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kjumpingcube/kjumpingcube-4.8.4.ebuild,v 1.1 2012/06/21 21:54:34 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+KDE_SELINUX_MODULE="games"
+inherit kde4-meta
+
+DESCRIPTION="KDE: Tactical one or two player game"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kleopatra/ChangeLog b/kde-base/kleopatra/ChangeLog
index 5c03eba8eded..75e08228f9e8 100644
--- a/kde-base/kleopatra/ChangeLog
+++ b/kde-base/kleopatra/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kleopatra
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kleopatra/ChangeLog,v 1.114 2012/05/24 11:37:51 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kleopatra/ChangeLog,v 1.115 2012/06/21 21:54:29 dilfridge Exp $
+
+*kleopatra-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kleopatra-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kleopatra-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kleopatra/kleopatra-4.8.4.ebuild b/kde-base/kleopatra/kleopatra-4.8.4.ebuild
new file mode 100644
index 000000000000..d47a8b3b455f
--- /dev/null
+++ b/kde-base/kleopatra/kleopatra-4.8.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kleopatra/kleopatra-4.8.4.ebuild,v 1.1 2012/06/21 21:54:29 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="Kleopatra - KDE X.509 key manager"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	app-crypt/gpgme
+	dev-libs/boost
+	dev-libs/libassuan
+	dev-libs/libgpg-error
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}
+	app-crypt/gnupg
+"
+
+KMEXTRACTONLY="
+	libkleo/
+"
+
+src_unpack() {
+	if use handbook; then
+		KMEXTRA="
+			doc/kwatchgnupg
+		"
+	fi
+
+	kde4-meta_src_unpack
+}
diff --git a/kde-base/klettres/ChangeLog b/kde-base/klettres/ChangeLog
index ca9fc389f200..7ade4ae48588 100644
--- a/kde-base/klettres/ChangeLog
+++ b/kde-base/klettres/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/klettres
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klettres/ChangeLog,v 1.211 2012/05/24 11:37:49 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klettres/ChangeLog,v 1.212 2012/06/21 21:54:55 dilfridge Exp $
+
+*klettres-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +klettres-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -klettres-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/klettres/klettres-4.8.4.ebuild b/kde-base/klettres/klettres-4.8.4.ebuild
new file mode 100644
index 000000000000..7edf38107fb2
--- /dev/null
+++ b/kde-base/klettres/klettres-4.8.4.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klettres/klettres-4.8.4.ebuild,v 1.1 2012/06/21 21:54:55 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE: KLettres helps a very young child or an adult learning "
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	$(add_kdebase_dep knotify)
+"
diff --git a/kde-base/klickety/ChangeLog b/kde-base/klickety/ChangeLog
index 4440457697fc..fccff5022a90 100644
--- a/kde-base/klickety/ChangeLog
+++ b/kde-base/klickety/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/klickety
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klickety/ChangeLog,v 1.144 2012/05/24 11:37:45 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klickety/ChangeLog,v 1.145 2012/06/21 21:54:39 dilfridge Exp $
+
+*klickety-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +klickety-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -klickety-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/klickety/klickety-4.8.4.ebuild b/kde-base/klickety/klickety-4.8.4.ebuild
new file mode 100644
index 000000000000..ccf0af2c6c01
--- /dev/null
+++ b/kde-base/klickety/klickety-4.8.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klickety/klickety-4.8.4.ebuild,v 1.1 2012/06/21 21:54:39 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+KDE_SELINUX_MODULE="games"
+inherit kde4-meta
+
+DESCRIPTION="A KDE game almost the same as ksame, but a bit different."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/klines/ChangeLog b/kde-base/klines/ChangeLog
index 19ca5eb1c35c..165ebcafa504 100644
--- a/kde-base/klines/ChangeLog
+++ b/kde-base/klines/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/klines
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klines/ChangeLog,v 1.208 2012/05/24 11:37:56 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klines/ChangeLog,v 1.209 2012/06/21 21:55:00 dilfridge Exp $
+
+*klines-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +klines-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -klines-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/klines/klines-4.8.4.ebuild b/kde-base/klines/klines-4.8.4.ebuild
new file mode 100644
index 000000000000..2bc404d47156
--- /dev/null
+++ b/kde-base/klines/klines-4.8.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klines/klines-4.8.4.ebuild,v 1.1 2012/06/21 21:55:01 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+KDE_SELINUX_MODULE="games"
+inherit kde4-meta
+
+DESCRIPTION="KDE: Kolor Lines - a little game about balls and how to get rid of them"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/klinkstatus/ChangeLog b/kde-base/klinkstatus/ChangeLog
index bdd4fea90556..2c0d6d76254a 100644
--- a/kde-base/klinkstatus/ChangeLog
+++ b/kde-base/klinkstatus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/klinkstatus
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klinkstatus/ChangeLog,v 1.209 2012/05/24 11:37:45 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klinkstatus/ChangeLog,v 1.210 2012/06/21 21:55:05 dilfridge Exp $
+
+*klinkstatus-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +klinkstatus-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -klinkstatus-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/klinkstatus/klinkstatus-4.8.4.ebuild b/kde-base/klinkstatus/klinkstatus-4.8.4.ebuild
new file mode 100644
index 000000000000..499a770b742b
--- /dev/null
+++ b/kde-base/klinkstatus/klinkstatus-4.8.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klinkstatus/klinkstatus-4.8.4.ebuild,v 1.1 2012/06/21 21:55:05 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdewebdev"
+inherit kde4-meta
+
+DESCRIPTION="KDE web development - link validity checker"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug tidy"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+	tidy? ( app-text/htmltidy )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	mycmakeargs=(
+		-DWITH_KdepimLibs=ON
+		$(cmake-utils_use_with tidy LibTidy)
+	)
+
+	kde4-meta_src_configure
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	echo
+	elog "To use scripting in ${PN}, install dev-lang/ruby."
+	echo
+}
diff --git a/kde-base/klipper/ChangeLog b/kde-base/klipper/ChangeLog
index ef9c3f4e817d..6a1fa89c4b01 100644
--- a/kde-base/klipper/ChangeLog
+++ b/kde-base/klipper/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/klipper
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klipper/ChangeLog,v 1.218 2012/05/24 11:37:48 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klipper/ChangeLog,v 1.219 2012/06/21 21:54:45 dilfridge Exp $
+
+*klipper-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +klipper-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -klipper-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/klipper/klipper-4.8.4.ebuild b/kde-base/klipper/klipper-4.8.4.ebuild
new file mode 100644
index 000000000000..d6c2e3a60836
--- /dev/null
+++ b/kde-base/klipper/klipper-4.8.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klipper/klipper-4.8.4.ebuild,v 1.1 2012/06/21 21:54:45 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-workspace"
+inherit kde4-meta
+
+DESCRIPTION="Applet for KDE and X clipboard management"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug prison"
+
+DEPEND="
+	$(add_kdebase_dep libkworkspace)
+	$(add_kdebase_dep libtaskmanager)
+	prison? ( media-libs/prison )
+	!aqua? ( x11-libs/libXfixes )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with prison)
+	)
+
+	kde4-meta_src_configure
+}
diff --git a/kde-base/kmag/ChangeLog b/kde-base/kmag/ChangeLog
index a224123d85a5..f4210275eb88 100644
--- a/kde-base/kmag/ChangeLog
+++ b/kde-base/kmag/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kmag
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmag/ChangeLog,v 1.204 2012/05/24 11:38:01 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmag/ChangeLog,v 1.205 2012/06/21 21:54:54 dilfridge Exp $
+
+*kmag-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kmag-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kmag-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kmag/kmag-4.8.4.ebuild b/kde-base/kmag/kmag-4.8.4.ebuild
new file mode 100644
index 000000000000..f8d951cd1166
--- /dev/null
+++ b/kde-base/kmag/kmag-4.8.4.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmag/kmag-4.8.4.ebuild,v 1.1 2012/06/21 21:54:54 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE screen magnifier"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	$(add_kdebase_dep kaccessible)
+"
diff --git a/kde-base/kmahjongg/ChangeLog b/kde-base/kmahjongg/ChangeLog
index 57139d134d0c..9979c2ee8e9e 100644
--- a/kde-base/kmahjongg/ChangeLog
+++ b/kde-base/kmahjongg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kmahjongg
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmahjongg/ChangeLog,v 1.209 2012/05/24 11:37:51 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmahjongg/ChangeLog,v 1.210 2012/06/21 21:54:53 dilfridge Exp $
+
+*kmahjongg-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kmahjongg-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kmahjongg-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kmahjongg/kmahjongg-4.8.4.ebuild b/kde-base/kmahjongg/kmahjongg-4.8.4.ebuild
new file mode 100644
index 000000000000..6a251215dcfa
--- /dev/null
+++ b/kde-base/kmahjongg/kmahjongg-4.8.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmahjongg/kmahjongg-4.8.4.ebuild,v 1.1 2012/06/21 21:54:53 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+KDE_SELINUX_MODULE="games"
+inherit kde4-meta
+
+DESCRIPTION="Mahjongg for KDE"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep libkmahjongg)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	libkdegames/
+	libkmahjongg/
+"
diff --git a/kde-base/kmail/ChangeLog b/kde-base/kmail/ChangeLog
index e47b52a5785d..2c90af29a233 100644
--- a/kde-base/kmail/ChangeLog
+++ b/kde-base/kmail/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kmail
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.288 2012/06/07 22:32:32 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.289 2012/06/21 21:54:58 dilfridge Exp $
+
+*kmail-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kmail-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   07 Jun 2012; Zac Medico <zmedico@gentoo.org> kmail-4.4.11.1.ebuild,
   kmail-4.7.4-r1.ebuild, kmail-4.7.4.ebuild, kmail-4.8.3.ebuild:
diff --git a/kde-base/kmail/kmail-4.8.4.ebuild b/kde-base/kmail/kmail-4.8.4.ebuild
new file mode 100644
index 000000000000..e7b66044da81
--- /dev/null
+++ b/kde-base/kmail/kmail-4.8.4.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.8.4.ebuild,v 1.1 2012/06/21 21:54:58 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+VIRTUALX_REQUIRED=test
+inherit flag-o-matic kde4-meta
+
+DESCRIPTION="KMail is the email component of Kontact, the integrated personal information manager of KDE."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+	$(add_kdebase_dep korganizer)
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"
+# bug 393147
+
+KMEXTRACTONLY="
+	akonadi_next/
+	calendarsupport/
+	korganizer/
+	kresources/
+	libkleo/
+	libkpgp/
+	libkdepimdbusinterfaces/
+	kdgantt2/
+"
+KMCOMPILEONLY="
+	messagecomposer/
+	messagecore/
+	messagelist/
+	messageviewer/
+	templateparser/
+	incidenceeditor-ng/
+	calendarsupport/
+"
+KMEXTRA="
+	kmailcvt/
+	ksendemail/
+	libksieve/
+	mailcommon/
+	mailfilteragent/
+	ontologies/
+	plugins/messageviewer/
+"
+
+KMLOADLIBS="kdepim-common-libs"
+
+src_configure() {
+	# Bug 308903
+	use ppc64 && append-flags -mminimal-toc
+
+	kde4-meta_src_configure
+}
+
+src_compile() {
+	kde4-meta_src_compile kmail_xml
+	kde4-meta_src_compile
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	if ! has_version kde-base/kdepim-kresources:${SLOT}; then
+		echo
+		elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
+		echo
+	fi
+	if ! has_version kde-base/kleopatra:${SLOT}; then
+		echo
+		elog "For certificate management and the gnupg log viewer, please install kde-base/kleopatra:${SLOT}"
+		echo
+	fi
+}
diff --git a/kde-base/kmenuedit/ChangeLog b/kde-base/kmenuedit/ChangeLog
index 2eecccf01bd0..d7b298293d3c 100644
--- a/kde-base/kmenuedit/ChangeLog
+++ b/kde-base/kmenuedit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kmenuedit
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmenuedit/ChangeLog,v 1.211 2012/05/24 11:38:03 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmenuedit/ChangeLog,v 1.212 2012/06/21 21:55:05 dilfridge Exp $
+
+*kmenuedit-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kmenuedit-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kmenuedit-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kmenuedit/kmenuedit-4.8.4.ebuild b/kde-base/kmenuedit/kmenuedit-4.8.4.ebuild
new file mode 100644
index 000000000000..23f5a1be5301
--- /dev/null
+++ b/kde-base/kmenuedit/kmenuedit-4.8.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmenuedit/kmenuedit-4.8.4.ebuild,v 1.1 2012/06/21 21:55:05 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-workspace"
+inherit kde4-meta
+
+DESCRIPTION="KDE menu editor"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	$(add_kdebase_dep khotkeys)
+"
+DEPEND=${RDEPEND}
+
+KMEXTRACTONLY="
+	libs/kworkspace/
+"
+
+src_configure() {
+	sed -i -e \
+		"s:\${CMAKE_CURRENT_BINARY_DIR}/../khotkeys/app/org.kde.khotkeys.xml:${EPREFIX}/usr/share/dbus-1/interfaces/org.kde.khotkeys.xml:g" \
+		kmenuedit/CMakeLists.txt \
+		|| die "sed failed"
+
+	kde4-meta_src_configure
+}
diff --git a/kde-base/kmimetypefinder/ChangeLog b/kde-base/kmimetypefinder/ChangeLog
index 6fa8b5431c85..173966c5098e 100644
--- a/kde-base/kmimetypefinder/ChangeLog
+++ b/kde-base/kmimetypefinder/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kmimetypefinder
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmimetypefinder/ChangeLog,v 1.123 2012/05/24 11:37:45 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmimetypefinder/ChangeLog,v 1.124 2012/06/21 21:54:45 dilfridge Exp $
+
+*kmimetypefinder-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kmimetypefinder-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kmimetypefinder-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kmimetypefinder/kmimetypefinder-4.8.4.ebuild b/kde-base/kmimetypefinder/kmimetypefinder-4.8.4.ebuild
new file mode 100644
index 000000000000..b7fd2cde3a88
--- /dev/null
+++ b/kde-base/kmimetypefinder/kmimetypefinder-4.8.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmimetypefinder/kmimetypefinder-4.8.4.ebuild,v 1.1 2012/06/21 21:54:45 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="KDE application to report the mimetype for a given file"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kmines/ChangeLog b/kde-base/kmines/ChangeLog
index 64f5d0e8c0f6..14550f0e86cd 100644
--- a/kde-base/kmines/ChangeLog
+++ b/kde-base/kmines/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kmines
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmines/ChangeLog,v 1.208 2012/05/24 11:37:58 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmines/ChangeLog,v 1.209 2012/06/21 21:54:48 dilfridge Exp $
+
+*kmines-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kmines-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kmines-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kmines/kmines-4.8.4.ebuild b/kde-base/kmines/kmines-4.8.4.ebuild
new file mode 100644
index 000000000000..5f1c4ba4e9a5
--- /dev/null
+++ b/kde-base/kmines/kmines-4.8.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmines/kmines-4.8.4.ebuild,v 1.1 2012/06/21 21:54:48 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+KDE_SELINUX_MODULE="games"
+inherit kde4-meta
+
+DESCRIPTION="KMines is a classic mine sweeper game"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kmix/ChangeLog b/kde-base/kmix/ChangeLog
index 355d4a12d815..0895f44b3a31 100644
--- a/kde-base/kmix/ChangeLog
+++ b/kde-base/kmix/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kmix
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/ChangeLog,v 1.217 2012/05/24 11:37:47 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/ChangeLog,v 1.218 2012/06/21 21:54:31 dilfridge Exp $
+
+*kmix-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kmix-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kmix-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kmix/kmix-4.8.4.ebuild b/kde-base/kmix/kmix-4.8.4.ebuild
new file mode 100644
index 000000000000..362377a83df7
--- /dev/null
+++ b/kde-base/kmix/kmix-4.8.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/kmix-4.8.4.ebuild,v 1.1 2012/06/21 21:54:31 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdemultimedia"
+inherit kde4-meta
+
+DESCRIPTION="KDE mixer gui"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="alsa debug pulseaudio"
+
+DEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.14a )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.12 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with pulseaudio PulseAudio)
+		$(cmake-utils_use_with alsa)
+	)
+
+	kde4-meta_src_configure
+}
diff --git a/kde-base/kmousetool/ChangeLog b/kde-base/kmousetool/ChangeLog
index 5a0fd59770f1..db6a631f6d52 100644
--- a/kde-base/kmousetool/ChangeLog
+++ b/kde-base/kmousetool/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kmousetool
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmousetool/ChangeLog,v 1.206 2012/05/24 11:37:50 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmousetool/ChangeLog,v 1.207 2012/06/21 21:54:59 dilfridge Exp $
+
+*kmousetool-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kmousetool-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kmousetool-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kmousetool/kmousetool-4.8.4.ebuild b/kde-base/kmousetool/kmousetool-4.8.4.ebuild
new file mode 100644
index 000000000000..3d9839518c1d
--- /dev/null
+++ b/kde-base/kmousetool/kmousetool-4.8.4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmousetool/kmousetool-4.8.4.ebuild,v 1.1 2012/06/21 21:54:59 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+
+inherit kde4-base
+
+DESCRIPTION="KDE program that clicks the mouse for you."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	$(add_kdebase_dep knotify)
+"
diff --git a/kde-base/kmouth/ChangeLog b/kde-base/kmouth/ChangeLog
index f4b1147fc963..dfce498054cd 100644
--- a/kde-base/kmouth/ChangeLog
+++ b/kde-base/kmouth/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kmouth
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmouth/ChangeLog,v 1.205 2012/05/24 11:38:10 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmouth/ChangeLog,v 1.206 2012/06/21 21:55:04 dilfridge Exp $
+
+*kmouth-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kmouth-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kmouth-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kmouth/kmouth-4.8.4.ebuild b/kde-base/kmouth/kmouth-4.8.4.ebuild
new file mode 100644
index 000000000000..b949c37d97ad
--- /dev/null
+++ b/kde-base/kmouth/kmouth-4.8.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmouth/kmouth-4.8.4.ebuild,v 1.1 2012/06/21 21:55:05 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+
+inherit kde4-base
+
+DESCRIPTION="KDE application that reads what you type out loud. Doesn't include a speech synthesizer."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kmplot/ChangeLog b/kde-base/kmplot/ChangeLog
index a280516eafc1..a55377fe2d3c 100644
--- a/kde-base/kmplot/ChangeLog
+++ b/kde-base/kmplot/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kmplot
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmplot/ChangeLog,v 1.211 2012/05/24 11:37:56 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmplot/ChangeLog,v 1.212 2012/06/21 21:54:48 dilfridge Exp $
+
+*kmplot-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kmplot-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kmplot-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kmplot/kmplot-4.8.4.ebuild b/kde-base/kmplot/kmplot-4.8.4.ebuild
new file mode 100644
index 000000000000..f7b103313d0a
--- /dev/null
+++ b/kde-base/kmplot/kmplot-4.8.4.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmplot/kmplot-4.8.4.ebuild,v 1.1 2012/06/21 21:54:48 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="Mathematical function plotter for KDE"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	$(add_kdebase_dep knotify)
+"
diff --git a/kde-base/knetattach/ChangeLog b/kde-base/knetattach/ChangeLog
index 8f75fb6e023a..643abd46aba5 100644
--- a/kde-base/knetattach/ChangeLog
+++ b/kde-base/knetattach/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/knetattach
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knetattach/ChangeLog,v 1.216 2012/05/24 11:37:55 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knetattach/ChangeLog,v 1.217 2012/06/21 21:54:35 dilfridge Exp $
+
+*knetattach-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +knetattach-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -knetattach-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/knetattach/knetattach-4.8.4.ebuild b/kde-base/knetattach/knetattach-4.8.4.ebuild
new file mode 100644
index 000000000000..0d7b7d46eb31
--- /dev/null
+++ b/kde-base/knetattach/knetattach-4.8.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knetattach/knetattach-4.8.4.ebuild,v 1.1 2012/06/21 21:54:35 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="KDE network wizard"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/knetwalk/ChangeLog b/kde-base/knetwalk/ChangeLog
index 7d9ba1a378f2..254ab03ccffe 100644
--- a/kde-base/knetwalk/ChangeLog
+++ b/kde-base/knetwalk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/knetwalk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knetwalk/ChangeLog,v 1.138 2012/05/24 11:37:54 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knetwalk/ChangeLog,v 1.139 2012/06/21 21:55:04 dilfridge Exp $
+
+*knetwalk-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +knetwalk-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -knetwalk-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/knetwalk/knetwalk-4.8.4.ebuild b/kde-base/knetwalk/knetwalk-4.8.4.ebuild
new file mode 100644
index 000000000000..badad27e02d2
--- /dev/null
+++ b/kde-base/knetwalk/knetwalk-4.8.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knetwalk/knetwalk-4.8.4.ebuild,v 1.1 2012/06/21 21:55:04 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+inherit kde4-meta
+
+DESCRIPTION="KDE: Knetwalk is the kde version of the popular NetWalk game for system administrators"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/knewstuff/ChangeLog b/kde-base/knewstuff/ChangeLog
index e2e2a200d204..4d83eb824ee9 100644
--- a/kde-base/knewstuff/ChangeLog
+++ b/kde-base/knewstuff/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/knewstuff
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knewstuff/ChangeLog,v 1.122 2012/05/24 11:38:04 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knewstuff/ChangeLog,v 1.123 2012/06/21 21:54:53 dilfridge Exp $
+
+*knewstuff-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +knewstuff-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -knewstuff-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/knewstuff/knewstuff-4.8.4.ebuild b/kde-base/knewstuff/knewstuff-4.8.4.ebuild
new file mode 100644
index 000000000000..315c9a3f570e
--- /dev/null
+++ b/kde-base/knewstuff/knewstuff-4.8.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knewstuff/knewstuff-4.8.4.ebuild,v 1.1 2012/06/21 21:54:53 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="KDE4 software to download and upload 'new stuff'"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/knode/ChangeLog b/kde-base/knode/ChangeLog
index ad4a3bbd5ce9..044be084a6f4 100644
--- a/kde-base/knode/ChangeLog
+++ b/kde-base/knode/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/knode
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/ChangeLog,v 1.212 2012/05/24 11:37:43 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/ChangeLog,v 1.213 2012/06/21 21:54:52 dilfridge Exp $
+
+*knode-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +knode-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -knode-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/knode/knode-4.8.4.ebuild b/kde-base/knode/knode-4.8.4.ebuild
new file mode 100644
index 000000000000..459215f05e11
--- /dev/null
+++ b/kde-base/knode/knode-4.8.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/knode-4.8.4.ebuild,v 1.1 2012/06/21 21:54:52 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="A newsreader for KDE"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+# test fails, last checked for 4.2.96
+RESTRICT=test
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	libkleo/
+	libkpgp/
+	messagecomposer/
+	messageviewer/
+"
+
+KMLOADLIBS="kdepim-common-libs"
+
+src_unpack() {
+	if use handbook; then
+		KMEXTRA="
+			doc/kioslave/news
+		"
+	fi
+
+	kde4-meta_src_unpack
+}
diff --git a/kde-base/knotes/ChangeLog b/kde-base/knotes/ChangeLog
index c4bcefae1fe6..58ca9057e33b 100644
--- a/kde-base/knotes/ChangeLog
+++ b/kde-base/knotes/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/knotes
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knotes/ChangeLog,v 1.204 2012/05/24 11:38:09 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knotes/ChangeLog,v 1.205 2012/06/21 21:55:04 dilfridge Exp $
+
+*knotes-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +knotes-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -knotes-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/knotes/knotes-4.8.4.ebuild b/kde-base/knotes/knotes-4.8.4.ebuild
new file mode 100644
index 000000000000..0fae554cb359
--- /dev/null
+++ b/kde-base/knotes/knotes-4.8.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knotes/knotes-4.8.4.ebuild,v 1.1 2012/06/21 21:55:04 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="KDE Notes application"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMLOADLIBS="kdepim-common-libs"
diff --git a/kde-base/knotify/ChangeLog b/kde-base/knotify/ChangeLog
index 8c0eb9767571..126f61485471 100644
--- a/kde-base/knotify/ChangeLog
+++ b/kde-base/knotify/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/knotify
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knotify/ChangeLog,v 1.125 2012/05/24 11:38:01 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knotify/ChangeLog,v 1.126 2012/06/21 21:54:33 dilfridge Exp $
+
+*knotify-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +knotify-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -knotify-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/knotify/knotify-4.8.4.ebuild b/kde-base/knotify/knotify-4.8.4.ebuild
new file mode 100644
index 000000000000..131a5f91fc55
--- /dev/null
+++ b/kde-base/knotify/knotify-4.8.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knotify/knotify-4.8.4.ebuild,v 1.1 2012/06/21 21:54:33 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="The KDE notification daemon."
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kolf/ChangeLog b/kde-base/kolf/ChangeLog
index 8e4d12722693..f994f1f4ca66 100644
--- a/kde-base/kolf/ChangeLog
+++ b/kde-base/kolf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kolf
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kolf/ChangeLog,v 1.208 2012/05/24 11:37:41 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kolf/ChangeLog,v 1.209 2012/06/21 21:54:40 dilfridge Exp $
+
+*kolf-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kolf-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kolf-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kolf/kolf-4.8.4.ebuild b/kde-base/kolf/kolf-4.8.4.ebuild
new file mode 100644
index 000000000000..8363ff7caca0
--- /dev/null
+++ b/kde-base/kolf/kolf-4.8.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kolf/kolf-4.8.4.ebuild,v 1.1 2012/06/21 21:54:40 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+KDE_SELINUX_MODULE="games"
+inherit kde4-meta
+
+DESCRIPTION="KDE Minigolf Game"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kollision/ChangeLog b/kde-base/kollision/ChangeLog
index 6903ac2cca96..2e3006138f1a 100644
--- a/kde-base/kollision/ChangeLog
+++ b/kde-base/kollision/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kollision
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kollision/ChangeLog,v 1.104 2012/05/24 11:38:06 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kollision/ChangeLog,v 1.105 2012/06/21 21:54:54 dilfridge Exp $
+
+*kollision-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kollision-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kollision-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kollision/kollision-4.8.4.ebuild b/kde-base/kollision/kollision-4.8.4.ebuild
new file mode 100644
index 000000000000..7c60551804f2
--- /dev/null
+++ b/kde-base/kollision/kollision-4.8.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kollision/kollision-4.8.4.ebuild,v 1.1 2012/06/21 21:54:54 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+inherit kde4-meta
+
+DESCRIPTION="KDE: A simple ball dodging game"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kolourpaint/ChangeLog b/kde-base/kolourpaint/ChangeLog
index c24aa6f5a7c9..b6e00b6f33e9 100644
--- a/kde-base/kolourpaint/ChangeLog
+++ b/kde-base/kolourpaint/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kolourpaint
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kolourpaint/ChangeLog,v 1.212 2012/05/24 11:37:50 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kolourpaint/ChangeLog,v 1.213 2012/06/21 21:54:40 dilfridge Exp $
+
+*kolourpaint-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kolourpaint-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kolourpaint-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kolourpaint/kolourpaint-4.8.4.ebuild b/kde-base/kolourpaint/kolourpaint-4.8.4.ebuild
new file mode 100644
index 000000000000..a8abc63b9952
--- /dev/null
+++ b/kde-base/kolourpaint/kolourpaint-4.8.4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kolourpaint/kolourpaint-4.8.4.ebuild,v 1.1 2012/06/21 21:54:40 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="Paint Program for KDE"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+LICENSE="BSD LGPL-2"
+IUSE="debug scanner"
+
+DEPEND="media-libs/qimageblitz"
+RDEPEND="${DEPEND}
+	scanner? ( kde-base/ksaneplugin )"
diff --git a/kde-base/kommander/ChangeLog b/kde-base/kommander/ChangeLog
index 5b433e156316..8d99d7c09e72 100644
--- a/kde-base/kommander/ChangeLog
+++ b/kde-base/kommander/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kommander
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kommander/ChangeLog,v 1.206 2012/05/24 11:37:42 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kommander/ChangeLog,v 1.207 2012/06/21 21:54:34 dilfridge Exp $
+
+*kommander-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kommander-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kommander-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kommander/kommander-4.8.4.ebuild b/kde-base/kommander/kommander-4.8.4.ebuild
new file mode 100644
index 000000000000..69498236bed5
--- /dev/null
+++ b/kde-base/kommander/kommander-4.8.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kommander/kommander-4.8.4.ebuild,v 1.1 2012/06/21 21:54:34 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdewebdev"
+inherit kde4-meta
+
+DESCRIPTION="KDE dialog system for scripting"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kompare/ChangeLog b/kde-base/kompare/ChangeLog
index 666d57be28fe..b0784f3a665a 100644
--- a/kde-base/kompare/ChangeLog
+++ b/kde-base/kompare/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kompare
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kompare/ChangeLog,v 1.205 2012/05/24 11:38:02 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kompare/ChangeLog,v 1.206 2012/06/21 21:55:03 dilfridge Exp $
+
+*kompare-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kompare-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kompare-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kompare/kompare-4.8.4.ebuild b/kde-base/kompare/kompare-4.8.4.ebuild
new file mode 100644
index 000000000000..e0135ad4c71d
--- /dev/null
+++ b/kde-base/kompare/kompare-4.8.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kompare/kompare-4.8.4.ebuild,v 1.1 2012/06/21 21:55:03 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdesdk"
+inherit kde4-meta
+
+DESCRIPTION="Kompare is a program to view the differences between files."
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/konq-plugins/ChangeLog b/kde-base/konq-plugins/ChangeLog
index f6fe11acf598..288c60cf2c19 100644
--- a/kde-base/konq-plugins/ChangeLog
+++ b/kde-base/konq-plugins/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/konq-plugins
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konq-plugins/ChangeLog,v 1.145 2012/05/24 11:38:02 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konq-plugins/ChangeLog,v 1.146 2012/06/21 21:55:00 dilfridge Exp $
+
+*konq-plugins-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +konq-plugins-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -konq-plugins-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/konq-plugins/konq-plugins-4.8.4.ebuild b/kde-base/konq-plugins/konq-plugins-4.8.4.ebuild
new file mode 100644
index 000000000000..aff2f94a382e
--- /dev/null
+++ b/kde-base/konq-plugins/konq-plugins-4.8.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konq-plugins/konq-plugins-4.8.4.ebuild,v 1.1 2012/06/21 21:55:00 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-baseapps"
+inherit kde4-meta
+
+DESCRIPTION="Various plugins for konqueror"
+HOMEPAGE="http://kde.org/"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug tidy"
+
+DEPEND="
+	$(add_kdebase_dep libkonq)
+	tidy? ( app-text/htmltidy )
+"
+RDEPEND="${DEPEND}
+	!kde-misc/konq-plugins
+	$(add_kdebase_dep kcmshell)
+	$(add_kdebase_dep konqueror)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DKdeWebKit=OFF
+		-DWebKitPart=OFF
+		$(cmake-utils_use_with tidy LibTidy)
+	)
+
+	kde4-meta_src_configure
+}
diff --git a/kde-base/konqueror/ChangeLog b/kde-base/konqueror/ChangeLog
index b9c57dea503e..79c150c817bb 100644
--- a/kde-base/konqueror/ChangeLog
+++ b/kde-base/konqueror/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/konqueror
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/ChangeLog,v 1.243 2012/05/24 11:37:50 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/ChangeLog,v 1.244 2012/06/21 21:54:33 dilfridge Exp $
+
+*konqueror-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +konqueror-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -konqueror-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/konqueror/konqueror-4.8.4.ebuild b/kde-base/konqueror/konqueror-4.8.4.ebuild
new file mode 100644
index 000000000000..2969455204c5
--- /dev/null
+++ b/kde-base/konqueror/konqueror-4.8.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/konqueror-4.8.4.ebuild,v 1.1 2012/06/21 21:54:33 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-baseapps"
+inherit flag-o-matic kde4-meta
+
+DESCRIPTION="KDE: Web browser, file manager, ..."
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+bookmarks debug svg"
+# 4 of 4 tests fail. Last checked for 4.0.3
+RESTRICT="test"
+
+DEPEND="
+	$(add_kdebase_dep libkonq)
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep kfind)
+	$(add_kdebase_dep kfmclient)
+	bookmarks? ( $(add_kdebase_dep keditbookmarks) )
+	svg? ( $(add_kdebase_dep svgpart) )
+"
+
+KMEXTRACTONLY="
+	konqueror/client/
+	lib/konq/
+"
+
+src_prepare() {
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
+
+	kde4-meta_src_prepare
+
+	# Do not install *.desktop files for kfmclient
+	sed -e "/kfmclient\.desktop/d" -i konqueror/CMakeLists.txt \
+		|| die "Failed to omit .desktop files"
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	echo
+	elog "If you want to use konqueror as a filemanager, install the dolphin kpart:"
+	elog "emerge -1 kde-base/dolphin:${SLOT}"
+	elog
+	elog "To use Java on webpages: emerge jre"
+	echo
+}
diff --git a/kde-base/konquest/ChangeLog b/kde-base/konquest/ChangeLog
index 0c88fca497d4..86c78d205359 100644
--- a/kde-base/konquest/ChangeLog
+++ b/kde-base/konquest/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/konquest
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konquest/ChangeLog,v 1.208 2012/05/24 11:38:06 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konquest/ChangeLog,v 1.209 2012/06/21 21:54:54 dilfridge Exp $
+
+*konquest-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +konquest-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -konquest-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/konquest/konquest-4.8.4.ebuild b/kde-base/konquest/konquest-4.8.4.ebuild
new file mode 100644
index 000000000000..0ccd21a6e77c
--- /dev/null
+++ b/kde-base/konquest/konquest-4.8.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konquest/konquest-4.8.4.ebuild,v 1.1 2012/06/21 21:54:54 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+KDE_SELINUX_MODULE="games"
+inherit kde4-meta
+
+DESCRIPTION="Galactic Strategy KDE Game"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/konsole/ChangeLog b/kde-base/konsole/ChangeLog
index 935b7933b099..dd7be56f4e73 100644
--- a/kde-base/konsole/ChangeLog
+++ b/kde-base/konsole/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/konsole
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/ChangeLog,v 1.233 2012/05/24 11:37:51 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/ChangeLog,v 1.234 2012/06/21 21:54:43 dilfridge Exp $
+
+*konsole-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +konsole-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -konsole-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/konsole/konsole-4.8.4.ebuild b/kde-base/konsole/konsole-4.8.4.ebuild
new file mode 100644
index 000000000000..4121cf3ce3ac
--- /dev/null
+++ b/kde-base/konsole/konsole-4.8.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/konsole-4.8.4.ebuild,v 1.1 2012/06/21 21:54:43 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+
+KDE_DOC_DIRS="doc/manual"
+inherit kde4-base
+
+DESCRIPTION="X terminal for use with KDE"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+COMMONDEPEND="
+	!aqua? (
+		$(add_kdebase_dep libkonq)
+		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.7.0-tests.patch"
+)
diff --git a/kde-base/konsolekalendar/ChangeLog b/kde-base/konsolekalendar/ChangeLog
index da4ca40042ca..aea76d78f3a2 100644
--- a/kde-base/konsolekalendar/ChangeLog
+++ b/kde-base/konsolekalendar/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/konsolekalendar
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konsolekalendar/ChangeLog,v 1.193 2012/05/24 11:38:06 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsolekalendar/ChangeLog,v 1.194 2012/06/21 21:54:52 dilfridge Exp $
+
+*konsolekalendar-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +konsolekalendar-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -konsolekalendar-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/konsolekalendar/konsolekalendar-4.8.4.ebuild b/kde-base/konsolekalendar/konsolekalendar-4.8.4.ebuild
new file mode 100644
index 000000000000..580db5181f80
--- /dev/null
+++ b/kde-base/konsolekalendar/konsolekalendar-4.8.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsolekalendar/konsolekalendar-4.8.4.ebuild,v 1.1 2012/06/21 21:54:52 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+KMMODULE="console/${PN}"
+inherit kde4-meta
+
+DESCRIPTION="A command line interface to KDE calendars"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMLOADLIBS="kdepim-common-libs"
diff --git a/kde-base/kontact/ChangeLog b/kde-base/kontact/ChangeLog
index d45ac3b90390..173dbdac7d38 100644
--- a/kde-base/kontact/ChangeLog
+++ b/kde-base/kontact/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kontact
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/ChangeLog,v 1.217 2012/05/24 11:38:12 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/ChangeLog,v 1.218 2012/06/21 21:55:07 dilfridge Exp $
+
+*kontact-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kontact-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kontact-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kontact/kontact-4.8.4.ebuild b/kde-base/kontact/kontact-4.8.4.ebuild
new file mode 100644
index 000000000000..5fce4f674160
--- /dev/null
+++ b/kde-base/kontact/kontact-4.8.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/kontact-4.8.4.ebuild,v 1.1 2012/06/21 21:55:07 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="KDE personal information manager"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMLOADLIBS="kdepim-common-libs"
+KMSAVELIBS="true"
+
+# We remove plugins that are related to external kdepim programs. This way
+# kontact doesn't have to depend on all programs it has plugins for.
+# kcontactmanager gone from kdesvn
+#
+KMEXTRACTONLY="
+	kontact/plugins/akregator/
+	kontact/plugins/kaddressbook/
+	kontact/plugins/kjots/
+	kontact/plugins/kmail/
+	kontact/plugins/knode/
+	kontact/plugins/knotes/
+	kontact/plugins/korganizer/
+	kontact/plugins/ktimetracker/
+	kontact/plugins/planner/
+	kontact/plugins/specialdates/
+	libkdepimdbusinterfaces/
+"
+
+src_unpack() {
+	if use handbook; then
+		KMEXTRA+="
+			doc/kontact-admin/
+		"
+	fi
+
+	kde4-meta_src_unpack
+}
diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index 87283f9ea50d..b50d39eb998d 100644
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kopete
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.320 2012/05/24 11:37:53 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.321 2012/06/21 21:54:57 dilfridge Exp $
+
+*kopete-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kopete-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kopete-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kopete/kopete-4.8.4.ebuild b/kde-base/kopete/kopete-4.8.4.ebuild
new file mode 100644
index 000000000000..ab7a7443cddd
--- /dev/null
+++ b/kde-base/kopete/kopete-4.8.4.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.8.4.ebuild,v 1.1 2012/06/21 21:54:57 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdenetwork"
+inherit kde4-meta multilib
+
+DESCRIPTION="KDE multi-protocol IM client"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug ssl v4l"
+
+# tests hang, last checked for 4.2.96
+RESTRICT=test
+
+# Available plugins
+#
+#	addbookmarks: NO DEPS
+#	alias: NO DEPS (disabled upstream)
+#	autoreplace: NO DEPS
+#	contactnotes: NO DEPS
+#	highlight: NO DEPS
+#	history: NO DEPS
+#	latex: virtual/latex as RDEPEND
+#	nowlistening: NO DEPS
+#	otr: libotr
+#	pipes: NO DEPS
+#	privacy: NO DEPS
+#	statistics: dev-db/sqlite:3
+#	texteffect: NO DEPS
+#	translator: NO DEPS
+#	urlpicpreview: NO DEPS
+#	webpresence: libxml2 libxslt
+# NOTE: By default we enable all plugins that don't have any dependencies
+PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight +history latex
++nowlistening otr +pipes +privacy +statistics +texteffect +translator
++urlpicpreview webpresence"
+
+# Available protocols
+#
+#	gadu: net-libs/libgadu @since 4.3
+#	groupwise: app-crypt/qca:2
+#	irc: NO DEPS, probably will fail so inform user about it
+#	xmpp: net-dns/libidn app-crypt/qca:2 ENABLED BY DEFAULT NETWORK
+#	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
+#	meanwhile: net-libs/meanwhile
+#	msn: libmsn == this is wlm plugin, we disable msn one
+#	oscar: NO DEPS
+#	qq: NO DEPS
+#   telepathy: net-libs/decibel
+#   testbed: NO DEPS
+#	winpopup: NO DEPS (we're adding samba as RDEPEND so it works)
+#	yahoo: media-libs/jasper
+#	zeroconf (bonjour): NO DEPS
+PROTOCOLS="gadu groupwise jingle meanwhile msn oscar qq skype
+sms testbed winpopup +xmpp yahoo zeroconf"
+
+# disabled protocols
+#   telepathy: net-libs/decibel
+#   irc: NO DEPS
+
+IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
+
+COMMONDEPEND="
+	dev-libs/libpcre
+	$(add_kdebase_dep kdepimlibs)
+	media-libs/qimageblitz
+	>=x11-libs/qt-gui-4.4.0:4[mng]
+	!aqua? ( x11-libs/libXScrnSaver )
+	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
+	groupwise? ( app-crypt/qca:2 )
+	jingle? (
+		>=media-libs/mediastreamer-2.3.0
+		media-libs/speex
+		net-libs/ortp
+	)
+	meanwhile? ( net-libs/meanwhile )
+	msn? ( >=net-libs/libmsn-4.1 )
+	otr? ( >=net-libs/libotr-3.2.0 )
+	statistics? ( dev-db/sqlite:3 )
+	v4l? ( media-libs/libv4l )
+	webpresence? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+	)
+	xmpp? (
+		app-crypt/qca:2
+		net-dns/libidn
+	)
+	yahoo? ( media-libs/jasper )
+"
+RDEPEND="${COMMONDEPEND}
+	latex? (
+		|| (
+			media-gfx/imagemagick
+			media-gfx/graphicsmagick[imagemagick]
+		)
+		virtual/latex-base
+	)
+	sms? ( app-mobilephone/smssend )
+	ssl? ( app-crypt/qca-ossl )
+	winpopup? ( net-fs/samba )
+"
+#	telepathy? ( net-libs/decibel )"
+DEPEND="${COMMONDEPEND}
+	!aqua? ( x11-proto/scrnsaverproto )
+"
+
+src_prepare() {
+	sed -e "s:lib/mozilla:$(get_libdir)/mozilla:" \
+		-i kopete/protocols/skype/skypebuttons/CMakeLists.txt || die "sed failed"
+
+	kde4-meta_src_prepare
+}
+
+src_configure() {
+	local x x2
+	# Handle common stuff
+	mycmakeargs=(
+		$(cmake-utils_use_with jingle GOOGLETALK)
+		$(cmake-utils_use_with jingle LiboRTP)
+		$(cmake-utils_use_with jingle Mediastreamer)
+		$(cmake-utils_use_with jingle Speex)
+		$(cmake-utils_use_disable v4l VIDEOSUPPORT)
+	)
+	# enable protocols
+	for x in ${PROTOCOLS}; do
+		case ${x/+/} in
+			msn) x2=Libmsn ;;
+			zeroconf) x2=bonjour ;;
+			xmpp) x2=jabber ;;
+			*) x2='' ;;
+		esac
+		mycmakeargs+=($(cmake-utils_use_with ${x/+/} ${x2}))
+	done
+
+	# enable plugins
+	for x in ${PLUGINS}; do
+		mycmakeargs+=($(cmake-utils_use_with ${x/+/}))
+	done
+
+	kde4-meta_src_configure
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	#if use telepathy; then
+	#	elog "To use kopete telepathy plugins, you need to start gabble first:"
+	#	elog "GABBLE_PERSIST=1 telepathy-gabble &"
+	#	elog "export TELEPATHY_DATA_PATH='${EPREFIX}/usr/share/telepathy/managers/'"
+	#fi
+
+	if ! use ssl; then
+		if use xmpp || use msn; then # || use irc; then
+			echo
+			elog "In order to use ssl in xmpp and msn you'll need to"
+			elog "install app-crypt/qca-ossl package."
+			echo
+		fi
+	fi
+}
diff --git a/kde-base/korganizer/ChangeLog b/kde-base/korganizer/ChangeLog
index 043f41a2816f..182742bc9cb5 100644
--- a/kde-base/korganizer/ChangeLog
+++ b/kde-base/korganizer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/korganizer
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/ChangeLog,v 1.228 2012/05/24 11:38:01 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/ChangeLog,v 1.229 2012/06/21 21:54:38 dilfridge Exp $
+
+*korganizer-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +korganizer-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -korganizer-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/korganizer/korganizer-4.8.4.ebuild b/kde-base/korganizer/korganizer-4.8.4.ebuild
new file mode 100644
index 000000000000..f3a6521e7c3a
--- /dev/null
+++ b/kde-base/korganizer/korganizer-4.8.4.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/korganizer-4.8.4.ebuild,v 1.1 2012/06/21 21:54:38 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="A Personal Organizer for KDE"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+	$(add_kdebase_dep kdepim-common-libs)
+	sys-libs/zlib
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep ktimezoned)
+"
+
+RESTRICT="test"
+# bug 393135
+
+KMLOADLIBS="kdepim-common-libs"
+
+KMEXTRACTONLY="
+	akonadi_next/
+	calendarviews/
+	kdgantt2/
+	kmail/
+	knode/org.kde.knode.xml
+	libkdepimdbusinterfaces/
+"
+
+KMCOMPILEONLY="
+	incidenceeditor-ng/
+	calendarsupport/
+"
+
+src_unpack() {
+	if use kontact; then
+		KMEXTRA="${KMEXTRA}
+			kontact/plugins/planner/
+			kontact/plugins/specialdates/
+		"
+	fi
+
+	kde4-meta_src_unpack
+}
+
+src_install() {
+	kde4-meta_src_install
+	# colliding with kdepim-common-libs
+	rm -rf "${ED}"/usr/share/kde4/servicetypes/calendarplugin.desktop
+	rm -rf "${ED}"/usr/share/kde4/servicetypes/calendardecoration.desktop
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	if ! has_version kde-base/kdepim-kresources:${SLOT}; then
+		echo
+		elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
+		echo
+	fi
+}
diff --git a/kde-base/korundum/ChangeLog b/kde-base/korundum/ChangeLog
index 64e4738c780d..c7828bea5105 100644
--- a/kde-base/korundum/ChangeLog
+++ b/kde-base/korundum/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/korundum
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/korundum/ChangeLog,v 1.115 2012/05/24 11:37:47 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korundum/ChangeLog,v 1.116 2012/06/21 21:54:58 dilfridge Exp $
+
+*korundum-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +korundum-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -korundum-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/korundum/korundum-4.8.4.ebuild b/kde-base/korundum/korundum-4.8.4.ebuild
new file mode 100644
index 000000000000..b6007bb7ff70
--- /dev/null
+++ b/kde-base/korundum/korundum-4.8.4.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korundum/korundum-4.8.4.ebuild,v 1.1 2012/06/21 21:54:58 dilfridge Exp $
+
+EAPI=4
+
+OPENGL_REQUIRED="always"
+
+USE_RUBY="ruby18"
+# No ruby19 for three reasons:
+# 1) it does not build (yet) - will likely be solved soon
+# 2) cmake bails when configuring twice or more - solved with CMAKE_IN_SOURCE_BUILD=1
+# 3) the ebuild can only be installed for one ruby variant, otherwise the compiled
+#    files with identical path+name will overwrite each other - difficult :(
+
+inherit kde4-base ruby-ng
+
+DESCRIPTION="KDE Ruby bindings"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="akonadi debug kate okular"
+
+# unfortunately single modules cannot be disabled with cmake defines
+# possible more useflags have no effect... does anyone actually build this stuff?
+# may need some hacking, for now semantic-desktop just becomes a hard dependency
+
+DEPEND="
+	$(add_kdebase_dep qtruby)
+	$(add_kdebase_dep smokekde 'kate?,okular?,semantic-desktop')
+	$(add_kdebase_dep smokeqt)
+"
+RDEPEND="${DEPEND}
+"
+
+# Split from kdebindings-ruby in 4.7
+add_blocker kdebindings-ruby
+
+pkg_setup() {
+	ruby-ng_pkg_setup
+	kde4-base_pkg_setup
+}
+
+src_unpack() {
+	local S="${WORKDIR}/${P}"
+	kde4-base_src_unpack
+
+	cd "${WORKDIR}"
+	mkdir all
+	mv ${P} all/ || die "Could not move sources"
+}
+
+all_ruby_prepare() {
+	kde4-base_src_prepare
+}
+
+each_ruby_configure() {
+	CMAKE_USE_DIR=${S}
+	mycmakeargs=(
+		-DRUBY_LIBRARY=$(ruby_get_libruby)
+		-DRUBY_INCLUDE_PATH=$(ruby_get_hdrdir)
+		-DRUBY_EXECUTABLE=${RUBY}
+		$(cmake-utils_use_with akonadi)
+		$(cmake-utils_use_with akonadi KdepimLibs)
+		$(cmake-utils_use_disable kate)
+		$(cmake-utils_use_with okular)
+	)
+	kde4-base_src_configure
+}
+
+each_ruby_compile() {
+	CMAKE_USE_DIR=${S}
+	kde4-base_src_compile
+}
+
+each_ruby_install() {
+	CMAKE_USE_DIR=${S}
+	kde4-base_src_install
+}
diff --git a/kde-base/kpasswdserver/ChangeLog b/kde-base/kpasswdserver/ChangeLog
index 4d4f70c55aa9..8057ef3507a9 100644
--- a/kde-base/kpasswdserver/ChangeLog
+++ b/kde-base/kpasswdserver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kpasswdserver
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpasswdserver/ChangeLog,v 1.123 2012/05/24 11:37:59 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpasswdserver/ChangeLog,v 1.124 2012/06/21 21:55:02 dilfridge Exp $
+
+*kpasswdserver-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kpasswdserver-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kpasswdserver-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kpasswdserver/kpasswdserver-4.8.4.ebuild b/kde-base/kpasswdserver/kpasswdserver-4.8.4.ebuild
new file mode 100644
index 000000000000..9c2a7f98a57e
--- /dev/null
+++ b/kde-base/kpasswdserver/kpasswdserver-4.8.4.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpasswdserver/kpasswdserver-4.8.4.ebuild,v 1.1 2012/06/21 21:55:02 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="KDED Password Module"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RESTRICT="test"
+# bug 393097
diff --git a/kde-base/kpat/ChangeLog b/kde-base/kpat/ChangeLog
index c62b267991dd..52c38ceb6545 100644
--- a/kde-base/kpat/ChangeLog
+++ b/kde-base/kpat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kpat
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpat/ChangeLog,v 1.209 2012/05/24 11:38:01 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpat/ChangeLog,v 1.210 2012/06/21 21:54:55 dilfridge Exp $
+
+*kpat-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kpat-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kpat-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kpat/kpat-4.8.4.ebuild b/kde-base/kpat/kpat-4.8.4.ebuild
new file mode 100644
index 000000000000..cdfce738a3f9
--- /dev/null
+++ b/kde-base/kpat/kpat-4.8.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpat/kpat-4.8.4.ebuild,v 1.1 2012/06/21 21:54:55 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+KDE_SELINUX_MODULE="games"
+inherit kde4-meta
+
+DESCRIPTION="KDE patience game"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kppp/ChangeLog b/kde-base/kppp/ChangeLog
index 4055c2319990..bd1b0786d7dd 100644
--- a/kde-base/kppp/ChangeLog
+++ b/kde-base/kppp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kppp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kppp/ChangeLog,v 1.211 2012/05/24 11:38:05 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kppp/ChangeLog,v 1.212 2012/06/21 21:54:54 dilfridge Exp $
+
+*kppp-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kppp-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kppp-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kppp/kppp-4.8.4.ebuild b/kde-base/kppp/kppp-4.8.4.ebuild
new file mode 100644
index 000000000000..a316b7aac81d
--- /dev/null
+++ b/kde-base/kppp/kppp-4.8.4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kppp/kppp-4.8.4.ebuild,v 1.1 2012/06/21 21:54:54 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdenetwork"
+inherit kde4-meta
+
+DESCRIPTION="KDE: A dialer and front-end to pppd."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	net-dialup/ppp
+"
diff --git a/kde-base/kquitapp/ChangeLog b/kde-base/kquitapp/ChangeLog
index 0fd6a7b96ae9..5c8aab2febae 100644
--- a/kde-base/kquitapp/ChangeLog
+++ b/kde-base/kquitapp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kquitapp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kquitapp/ChangeLog,v 1.122 2012/05/24 11:37:47 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kquitapp/ChangeLog,v 1.123 2012/06/21 21:54:38 dilfridge Exp $
+
+*kquitapp-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kquitapp-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kquitapp-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kquitapp/kquitapp-4.8.4.ebuild b/kde-base/kquitapp/kquitapp-4.8.4.ebuild
new file mode 100644
index 000000000000..0f2f66dcd595
--- /dev/null
+++ b/kde-base/kquitapp/kquitapp-4.8.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kquitapp/kquitapp-4.8.4.ebuild,v 1.1 2012/06/21 21:54:38 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="A CLI application quitter"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/krdc/ChangeLog b/kde-base/krdc/ChangeLog
index 3650e18b4c64..90c16953fdc7 100644
--- a/kde-base/krdc/ChangeLog
+++ b/kde-base/krdc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/krdc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krdc/ChangeLog,v 1.225 2012/05/24 11:38:00 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krdc/ChangeLog,v 1.226 2012/06/21 21:54:37 dilfridge Exp $
+
+*krdc-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +krdc-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -krdc-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/krdc/krdc-4.8.4.ebuild b/kde-base/krdc/krdc-4.8.4.ebuild
new file mode 100644
index 000000000000..08d441c16262
--- /dev/null
+++ b/kde-base/krdc/krdc-4.8.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krdc/krdc-4.8.4.ebuild,v 1.1 2012/06/21 21:54:37 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdenetwork"
+inherit kde4-meta
+
+DESCRIPTION="KDE remote desktop connection (RDP and VNC) client"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug jpeg rdesktop vnc zeroconf"
+
+#nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 4.3.61
+#telepathy? ( >=net-libs/telepathy-qt4-0.18 ) not yet in portage/overlay
+
+DEPEND="
+	jpeg? ( virtual/jpeg )
+	vnc? ( >=net-libs/libvncserver-0.9 )
+	zeroconf? ( net-dns/avahi )
+"
+RDEPEND="${DEPEND}
+	rdesktop? ( net-misc/rdesktop )
+"
+
+src_configure() {
+	mycmakeargs=(
+		-DWITH_TelepathyQt4=OFF
+		$(cmake-utils_use_with jpeg)
+		# $(cmake-utils_use_with telepathy TelepathyQt4)
+		$(cmake-utils_use_with vnc LibVNCServer)
+		$(cmake-utils_use_with zeroconf DNSSD)
+	)
+
+	kde4-meta_src_configure
+}
diff --git a/kde-base/kreadconfig/ChangeLog b/kde-base/kreadconfig/ChangeLog
index 90753f33f7d4..232da15f908a 100644
--- a/kde-base/kreadconfig/ChangeLog
+++ b/kde-base/kreadconfig/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kreadconfig
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kreadconfig/ChangeLog,v 1.189 2012/05/24 11:38:06 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kreadconfig/ChangeLog,v 1.190 2012/06/21 21:54:32 dilfridge Exp $
+
+*kreadconfig-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kreadconfig-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kreadconfig-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kreadconfig/kreadconfig-4.8.4.ebuild b/kde-base/kreadconfig/kreadconfig-4.8.4.ebuild
new file mode 100644
index 000000000000..cf6c81125c76
--- /dev/null
+++ b/kde-base/kreadconfig/kreadconfig-4.8.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kreadconfig/kreadconfig-4.8.4.ebuild,v 1.1 2012/06/21 21:54:32 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="KDE: A command-line tool to read KConfig entries"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kremotecontrol/ChangeLog b/kde-base/kremotecontrol/ChangeLog
index 6bdee60df0f0..d8991f4f4e42 100644
--- a/kde-base/kremotecontrol/ChangeLog
+++ b/kde-base/kremotecontrol/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kremotecontrol
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kremotecontrol/ChangeLog,v 1.52 2012/05/24 11:37:44 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kremotecontrol/ChangeLog,v 1.53 2012/06/21 21:54:34 dilfridge Exp $
+
+*kremotecontrol-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kremotecontrol-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kremotecontrol-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kremotecontrol/kremotecontrol-4.8.4.ebuild b/kde-base/kremotecontrol/kremotecontrol-4.8.4.ebuild
new file mode 100644
index 000000000000..acbb31069798
--- /dev/null
+++ b/kde-base/kremotecontrol/kremotecontrol-4.8.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kremotecontrol/kremotecontrol-4.8.4.ebuild,v 1.1 2012/06/21 21:54:34 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE frontend for remote controls"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep libkworkspace)
+	$(add_kdebase_dep solid)
+"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	kde4-base_src_unpack
+}
diff --git a/kde-base/kreversi/ChangeLog b/kde-base/kreversi/ChangeLog
index 47fb45e8e005..be618aa72531 100644
--- a/kde-base/kreversi/ChangeLog
+++ b/kde-base/kreversi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kreversi
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kreversi/ChangeLog,v 1.211 2012/05/24 11:37:57 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kreversi/ChangeLog,v 1.212 2012/06/21 21:54:51 dilfridge Exp $
+
+*kreversi-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kreversi-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kreversi-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kreversi/kreversi-4.8.4.ebuild b/kde-base/kreversi/kreversi-4.8.4.ebuild
new file mode 100644
index 000000000000..5f631f71f972
--- /dev/null
+++ b/kde-base/kreversi/kreversi-4.8.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kreversi/kreversi-4.8.4.ebuild,v 1.1 2012/06/21 21:54:51 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+KDE_SELINUX_MODULE="games"
+inherit games-ggz kde4-meta
+
+DESCRIPTION="KDE Board Game"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+src_prepare() {
+	# cmake is doing this really weird
+	sed -i \
+		-e "s:register_ggz_module:#register_ggz_module:g" \
+		${PN}/CMakeLists.txt || die "ggz removal failed"
+
+	kde4-meta_src_prepare
+}
+
+src_install() {
+	kde4-meta_src_install
+	# and also we have to prepare the ggz dir
+	insinto "${GGZ_MODDIR}"
+	newins ${PN}/module.dsc ${P}.dsc
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+	games-ggz_pkg_postinst
+}
+
+pkg_postrm() {
+	kde4-meta_pkg_postrm
+	games-ggz_pkg_postrm
+}
diff --git a/kde-base/krfb/ChangeLog b/kde-base/krfb/ChangeLog
index 3d11aafd9e43..840a1ab44bac 100644
--- a/kde-base/krfb/ChangeLog
+++ b/kde-base/krfb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/krfb
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krfb/ChangeLog,v 1.212 2012/05/24 11:38:02 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krfb/ChangeLog,v 1.213 2012/06/21 21:55:02 dilfridge Exp $
+
+*krfb-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +krfb-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -krfb-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/krfb/krfb-4.8.4.ebuild b/kde-base/krfb/krfb-4.8.4.ebuild
new file mode 100644
index 000000000000..e966fbe5ae2f
--- /dev/null
+++ b/kde-base/krfb/krfb-4.8.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krfb/krfb-4.8.4.ebuild,v 1.1 2012/06/21 21:55:02 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdenetwork"
+inherit kde4-meta
+
+DESCRIPTION="VNC-compatible server to share KDE desktops"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	sys-libs/zlib
+	virtual/jpeg
+	!aqua? ( x11-libs/libXdamage )
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-base/krossjava/ChangeLog b/kde-base/krossjava/ChangeLog
index 355a06d1894f..884f4a9ded0b 100644
--- a/kde-base/krossjava/ChangeLog
+++ b/kde-base/krossjava/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/krossjava
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krossjava/ChangeLog,v 1.89 2012/05/24 11:38:09 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krossjava/ChangeLog,v 1.90 2012/06/21 21:55:04 dilfridge Exp $
+
+*krossjava-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +krossjava-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -krossjava-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/krossjava/krossjava-4.8.4.ebuild b/kde-base/krossjava/krossjava-4.8.4.ebuild
new file mode 100644
index 000000000000..8c1bd2cb6f7a
--- /dev/null
+++ b/kde-base/krossjava/krossjava-4.8.4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krossjava/krossjava-4.8.4.ebuild,v 1.1 2012/06/21 21:55:04 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kross-interpreters"
+KMMODULE="java"
+inherit java-pkg-2 java-ant-2 kde4-meta multilib
+
+DESCRIPTION="Java plugin for the kdelibs/kross scripting framework."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	>=virtual/jdk-1.5
+"
+RDEPEND="
+	>=virtual/jre-1.5
+"
+
+pkg_setup() {
+	kde4-meta_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
+src_prepare() {
+	find "${S}" -iname '*.jar' | xargs rm -v
+	kde4-meta_src_prepare
+	java-pkg-2_src_prepare
+}
+
+src_configure() {
+	kde4-meta_src_configure
+	java-ant-2_src_configure
+}
+
+src_compile() {
+	kde4-meta_src_compile
+	cd "${S}/java/${PN}/java/" || die
+	eant makejar
+}
+
+src_install() {
+	kde4-meta_src_install
+	java-pkg_dojar "${ED}/usr/$(get_libdir)/kde4/kross/kross.jar"
+
+	dosym ../../../share/${PN}-${SLOT}/lib/kross.jar \
+		/usr/$(get_libdir)/kde4/kross/kross.jar
+	java-pkg_regso "${ED}/usr/$(get_libdir)/kde4/krossjava.so"
+}
+
+pkg_preinst() {
+	kde4-meta_pkg_preinst
+	java-pkg-2_pkg_preinst
+}
diff --git a/kde-base/krosspython/ChangeLog b/kde-base/krosspython/ChangeLog
index bd53b99a6e02..d90e574eea54 100644
--- a/kde-base/krosspython/ChangeLog
+++ b/kde-base/krosspython/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/krosspython
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krosspython/ChangeLog,v 1.104 2012/05/24 11:37:51 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krosspython/ChangeLog,v 1.105 2012/06/21 21:54:39 dilfridge Exp $
+
+*krosspython-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +krosspython-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -krosspython-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/krosspython/krosspython-4.8.4.ebuild b/kde-base/krosspython/krosspython-4.8.4.ebuild
new file mode 100644
index 000000000000..94c548d216cb
--- /dev/null
+++ b/kde-base/krosspython/krosspython-4.8.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krosspython/krosspython-4.8.4.ebuild,v 1.1 2012/06/21 21:54:39 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kross-interpreters"
+KMMODULE="python"
+PYTHON_DEPEND="2"
+inherit python kde4-meta
+
+DESCRIPTION="Kross scripting framework: Python interpreter"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+	kde4-meta_pkg_setup
+}
diff --git a/kde-base/krossruby/ChangeLog b/kde-base/krossruby/ChangeLog
index baf76fed5c5c..786572846232 100644
--- a/kde-base/krossruby/ChangeLog
+++ b/kde-base/krossruby/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/krossruby
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krossruby/ChangeLog,v 1.76 2012/05/24 11:37:48 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krossruby/ChangeLog,v 1.77 2012/06/21 21:54:46 dilfridge Exp $
+
+*krossruby-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +krossruby-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -krossruby-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/krossruby/krossruby-4.8.4.ebuild b/kde-base/krossruby/krossruby-4.8.4.ebuild
new file mode 100644
index 000000000000..da2562bc3ec4
--- /dev/null
+++ b/kde-base/krossruby/krossruby-4.8.4.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krossruby/krossruby-4.8.4.ebuild,v 1.1 2012/06/21 21:54:46 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kross-interpreters"
+KMMODULE="ruby"
+
+USE_RUBY="ruby18"
+# No ruby19 for three reasons:
+# 1) it does not build (yet) - will likely be solved soon
+# 2) cmake bails when configuring twice or more - solved with CMAKE_IN_SOURCE_BUILD=1
+# 3) the ebuild can only be installed for one ruby variant, otherwise the compiled
+#    files with identical path+name will overwrite each other - difficult :(
+
+inherit kde4-meta ruby-ng
+
+DESCRIPTION="Kross scripting framework: Ruby interpreter"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND=""
+RDEPEND=""
+
+# Split from kdebindings-ruby in 4.7
+add_blocker kdebindings-ruby
+
+pkg_setup() {
+	ruby-ng_pkg_setup
+	kde4-meta_pkg_setup
+}
+
+src_unpack() {
+	local S="${WORKDIR}/${P}"
+	kde4-meta_src_unpack
+
+	cd "${WORKDIR}"
+	mkdir all
+	mv ${P} all/ || die "Could not move sources"
+}
+
+all_ruby_prepare() {
+	kde4-meta_src_prepare
+}
+
+each_ruby_configure() {
+	local CMAKE_USE_DIR=${S}
+	local mycmakeargs=(
+		-DRUBY_LIBRARY=$(ruby_get_libruby)
+		-DRUBY_INCLUDE_DIR=$(ruby_get_hdrdir)
+		-DRUBY_EXECUTABLE=${RUBY}
+	)
+	kde4-meta_src_configure
+}
+
+each_ruby_compile() {
+	local CMAKE_USE_DIR=${S}
+	kde4-meta_src_compile
+}
+
+each_ruby_install() {
+	local CMAKE_USE_DIR=${S}
+	kde4-meta_src_install
+}
diff --git a/kde-base/kruler/ChangeLog b/kde-base/kruler/ChangeLog
index 108979262c4f..238376429a8b 100644
--- a/kde-base/kruler/ChangeLog
+++ b/kde-base/kruler/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kruler
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kruler/ChangeLog,v 1.205 2012/05/24 11:38:01 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kruler/ChangeLog,v 1.206 2012/06/21 21:54:30 dilfridge Exp $
+
+*kruler-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kruler-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kruler-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kruler/kruler-4.8.4.ebuild b/kde-base/kruler/kruler-4.8.4.ebuild
new file mode 100644
index 000000000000..20eb754c75c8
--- /dev/null
+++ b/kde-base/kruler/kruler-4.8.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kruler/kruler-4.8.4.ebuild,v 1.1 2012/06/21 21:54:30 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="A screen ruler for KDE"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/krunner/ChangeLog b/kde-base/krunner/ChangeLog
index 2583fb7cf284..e36742f35229 100644
--- a/kde-base/krunner/ChangeLog
+++ b/kde-base/krunner/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/krunner
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krunner/ChangeLog,v 1.131 2012/05/24 11:37:46 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krunner/ChangeLog,v 1.132 2012/06/21 21:54:44 dilfridge Exp $
+
+*krunner-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +krunner-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -krunner-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/krunner/krunner-4.8.4.ebuild b/kde-base/krunner/krunner-4.8.4.ebuild
new file mode 100644
index 000000000000..1f88dd58952b
--- /dev/null
+++ b/kde-base/krunner/krunner-4.8.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krunner/krunner-4.8.4.ebuild,v 1.1 2012/06/21 21:54:44 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+OPENGL_REQUIRED="optional"
+inherit kde4-meta
+
+DESCRIPTION="KDE Command Runner"
+IUSE="debug"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+COMMONDEPEND="
+	$(add_kdebase_dep kcheckpass)
+	$(add_kdebase_dep kephal)
+	$(add_kdebase_dep ksmserver)
+	$(add_kdebase_dep ksysguard)
+	$(add_kdebase_dep libkworkspace)
+	$(add_kdebase_dep libplasmagenericshell)
+	!aqua? (
+		x11-libs/libXcursor
+		x11-libs/libXScrnSaver
+	)
+"
+DEPEND="${COMMONDEPEND}
+	!aqua? (
+		x11-libs/libXcursor
+		x11-proto/scrnsaverproto
+	)
+"
+RDEPEND="${COMMONDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}"-4.6.2-noxf86misc.patch )
+
+KMEXTRACTONLY="
+	libs/kdm/
+	libs/kephal/
+	libs/ksysguard/
+	libs/kworkspace/
+	libs/plasmagenericshell/
+	kcheckpass/
+	ksmserver/org.kde.KSMServerInterface.xml
+	ksysguard/
+	plasma/screensaver/shell/org.kde.plasma-overlay.App.xml
+"
+
+KMLOADLIBS="libkworkspace"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with opengl OpenGL)
+	)
+
+	kde4-meta_src_configure
+}
diff --git a/kde-base/ksaneplugin/ChangeLog b/kde-base/ksaneplugin/ChangeLog
index 86d6ab8e49f0..de224160925e 100644
--- a/kde-base/ksaneplugin/ChangeLog
+++ b/kde-base/ksaneplugin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/ksaneplugin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksaneplugin/ChangeLog,v 1.101 2012/05/24 11:38:11 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksaneplugin/ChangeLog,v 1.102 2012/06/21 21:54:55 dilfridge Exp $
+
+*ksaneplugin-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +ksaneplugin-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -ksaneplugin-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/ksaneplugin/ksaneplugin-4.8.4.ebuild b/kde-base/ksaneplugin/ksaneplugin-4.8.4.ebuild
new file mode 100644
index 000000000000..30fd58ce381a
--- /dev/null
+++ b/kde-base/ksaneplugin/ksaneplugin-4.8.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksaneplugin/ksaneplugin-4.8.4.ebuild,v 1.1 2012/06/21 21:54:55 dilfridge Exp $
+
+EAPI=4
+
+inherit kde4-base
+
+DESCRIPTION="SANE Plugin for KDE"
+HOMEPAGE="http://www.kipi-plugins.org"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep libksane)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-base/kscd/ChangeLog b/kde-base/kscd/ChangeLog
index 8deb84c1ab5c..006a4b9c4ef8 100644
--- a/kde-base/kscd/ChangeLog
+++ b/kde-base/kscd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kscd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/ChangeLog,v 1.217 2012/05/24 11:38:04 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/ChangeLog,v 1.218 2012/06/21 21:54:55 dilfridge Exp $
+
+*kscd-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kscd-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kscd-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kscd/kscd-4.8.4.ebuild b/kde-base/kscd/kscd-4.8.4.ebuild
new file mode 100644
index 000000000000..dd9fdf31ac25
--- /dev/null
+++ b/kde-base/kscd/kscd-4.8.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/kscd-4.8.4.ebuild,v 1.1 2012/06/21 21:54:55 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kdemultimedia"
+inherit kde4-meta
+
+DESCRIPTION="KDE CD player"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep libkcddb)
+	$(add_kdebase_dep libkcompactdisc)
+	media-libs/musicbrainz:3
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	libkcompactdisc/
+"
diff --git a/kde-base/kscreensaver/ChangeLog b/kde-base/kscreensaver/ChangeLog
index bcb8ec0da7a7..e0c6083b3719 100644
--- a/kde-base/kscreensaver/ChangeLog
+++ b/kde-base/kscreensaver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kscreensaver
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/ChangeLog,v 1.220 2012/05/24 11:38:04 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/ChangeLog,v 1.221 2012/06/21 21:54:59 dilfridge Exp $
+
+*kscreensaver-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kscreensaver-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kscreensaver-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kscreensaver/kscreensaver-4.8.4.ebuild b/kde-base/kscreensaver/kscreensaver-4.8.4.ebuild
new file mode 100644
index 000000000000..670d2c702766
--- /dev/null
+++ b/kde-base/kscreensaver/kscreensaver-4.8.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/kscreensaver-4.8.4.ebuild,v 1.1 2012/06/21 21:54:59 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+OPENGL_REQUIRED="optional"
+inherit kde4-meta
+
+DESCRIPTION="KDE screensaver framework"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+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 )
+"
+DEPEND="${RDEPEND}
+	x11-proto/randrproto
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.5.95-nsfw.patch"
+	"${FILESDIR}/${PN}-4.6.4-xf86misc.patch"
+)
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with opengl OpenGL)
+	)
+
+	kde4-meta_src_configure
+}
diff --git a/kde-base/ksecrets/Manifest b/kde-base/ksecrets/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/kde-base/ksecrets/Manifest
diff --git a/kde-base/kshisen/ChangeLog b/kde-base/kshisen/ChangeLog
index 8d73f49159c8..0513a225af26 100644
--- a/kde-base/kshisen/ChangeLog
+++ b/kde-base/kshisen/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kshisen
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kshisen/ChangeLog,v 1.208 2012/05/24 11:37:55 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kshisen/ChangeLog,v 1.209 2012/06/21 21:54:58 dilfridge Exp $
+
+*kshisen-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kshisen-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kshisen-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kshisen/kshisen-4.8.4.ebuild b/kde-base/kshisen/kshisen-4.8.4.ebuild
new file mode 100644
index 000000000000..587858941c61
--- /dev/null
+++ b/kde-base/kshisen/kshisen-4.8.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kshisen/kshisen-4.8.4.ebuild,v 1.1 2012/06/21 21:54:58 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+KDE_SELINUX_MODULE="games"
+inherit kde4-meta
+
+DESCRIPTION="A KDE game similiar to Mahjongg"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep libkmahjongg)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-base/ksirk/ChangeLog b/kde-base/ksirk/ChangeLog
index e629513f5fc6..c331487093b3 100644
--- a/kde-base/ksirk/ChangeLog
+++ b/kde-base/ksirk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/ksirk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksirk/ChangeLog,v 1.107 2012/05/24 11:37:59 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksirk/ChangeLog,v 1.108 2012/06/21 21:54:44 dilfridge Exp $
+
+*ksirk-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +ksirk-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -ksirk-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/ksirk/ksirk-4.8.4.ebuild b/kde-base/ksirk/ksirk-4.8.4.ebuild
new file mode 100644
index 000000000000..e5ce5c9ca038
--- /dev/null
+++ b/kde-base/ksirk/ksirk-4.8.4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksirk/ksirk-4.8.4.ebuild,v 1.1 2012/06/21 21:54:44 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+inherit kde4-meta
+
+DESCRIPTION="KDE: Ksirk is a KDE port of the board game risk"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	app-crypt/qca:2
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-base/ksmserver/ChangeLog b/kde-base/ksmserver/ChangeLog
index aa9c84d6e464..75bc0f77fe12 100644
--- a/kde-base/ksmserver/ChangeLog
+++ b/kde-base/ksmserver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/ksmserver
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmserver/ChangeLog,v 1.214 2012/05/24 11:38:00 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmserver/ChangeLog,v 1.215 2012/06/21 21:55:07 dilfridge Exp $
+
+*ksmserver-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +ksmserver-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -ksmserver-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/ksmserver/ksmserver-4.8.4.ebuild b/kde-base/ksmserver/ksmserver-4.8.4.ebuild
new file mode 100644
index 000000000000..aa31327534d7
--- /dev/null
+++ b/kde-base/ksmserver/ksmserver-4.8.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmserver/ksmserver-4.8.4.ebuild,v 1.1 2012/06/21 21:55:07 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+inherit kde4-meta
+
+DESCRIPTION="The reliable KDE session manager that talks the standard X11R6"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kcminit)
+	$(add_kdebase_dep libkworkspace)
+	$(add_kdebase_dep solid)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	kcminit/main.h
+	libs/kworkspace/
+	solid/
+"
+
+KMLOADLIBS="libkworkspace"
diff --git a/kde-base/ksnapshot/ChangeLog b/kde-base/ksnapshot/ChangeLog
index 5b0b956fe397..869a4dd79313 100644
--- a/kde-base/ksnapshot/ChangeLog
+++ b/kde-base/ksnapshot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/ksnapshot
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnapshot/ChangeLog,v 1.210 2012/05/24 11:37:50 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnapshot/ChangeLog,v 1.211 2012/06/21 21:54:40 dilfridge Exp $
+
+*ksnapshot-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +ksnapshot-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -ksnapshot-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/ksnapshot/ksnapshot-4.8.4.ebuild b/kde-base/ksnapshot/ksnapshot-4.8.4.ebuild
new file mode 100644
index 000000000000..c068f20aef5b
--- /dev/null
+++ b/kde-base/ksnapshot/ksnapshot-4.8.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnapshot/ksnapshot-4.8.4.ebuild,v 1.1 2012/06/21 21:54:40 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE Screenshot Utility"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug kipi"
+
+DEPEND="
+	kipi? ( $(add_kdebase_dep libkipi) )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with kipi)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/kde-base/kspaceduel/ChangeLog b/kde-base/kspaceduel/ChangeLog
index 901fa5c22f99..3fb85ee543e4 100644
--- a/kde-base/kspaceduel/ChangeLog
+++ b/kde-base/kspaceduel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kspaceduel
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kspaceduel/ChangeLog,v 1.207 2012/05/24 11:37:43 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kspaceduel/ChangeLog,v 1.208 2012/06/21 21:54:33 dilfridge Exp $
+
+*kspaceduel-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kspaceduel-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kspaceduel-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kspaceduel/kspaceduel-4.8.4.ebuild b/kde-base/kspaceduel/kspaceduel-4.8.4.ebuild
new file mode 100644
index 000000000000..a2bb8fe17911
--- /dev/null
+++ b/kde-base/kspaceduel/kspaceduel-4.8.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kspaceduel/kspaceduel-4.8.4.ebuild,v 1.1 2012/06/21 21:54:33 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+KDE_SELINUX_MODULE="games"
+inherit kde4-meta
+
+DESCRIPTION="KDE Space Game"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/ksplash/ChangeLog b/kde-base/ksplash/ChangeLog
index 34a1ad960f56..2fd42188b6fb 100644
--- a/kde-base/ksplash/ChangeLog
+++ b/kde-base/ksplash/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/ksplash
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplash/ChangeLog,v 1.127 2012/05/24 11:37:56 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplash/ChangeLog,v 1.128 2012/06/21 21:54:50 dilfridge Exp $
+
+*ksplash-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +ksplash-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -ksplash-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/ksplash/ksplash-4.8.4.ebuild b/kde-base/ksplash/ksplash-4.8.4.ebuild
new file mode 100644
index 000000000000..d725c7c344d1
--- /dev/null
+++ b/kde-base/ksplash/ksplash-4.8.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplash/ksplash-4.8.4.ebuild,v 1.1 2012/06/21 21:54:50 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+inherit kde4-meta
+
+DESCRIPTION="KDE splashscreen framework (the splashscreen of KDE itself, not of individual apps)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="3dnow altivec debug mmx sse sse2 xinerama"
+
+COMMONDEPEND="
+	media-libs/libpng
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${COMMONDEPEND}
+	xinerama? ( x11-proto/xineramaproto )
+"
+RDEPEND="${COMMONDEPEND}"
+
+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)
+	)
+
+	kde4-meta_src_configure
+}
diff --git a/kde-base/ksquares/ChangeLog b/kde-base/ksquares/ChangeLog
index d474fa54e0ee..3caa74fbfa63 100644
--- a/kde-base/ksquares/ChangeLog
+++ b/kde-base/ksquares/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/ksquares
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksquares/ChangeLog,v 1.118 2012/05/24 11:37:49 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksquares/ChangeLog,v 1.119 2012/06/21 21:54:32 dilfridge Exp $
+
+*ksquares-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +ksquares-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -ksquares-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/ksquares/ksquares-4.8.4.ebuild b/kde-base/ksquares/ksquares-4.8.4.ebuild
new file mode 100644
index 000000000000..3941dfae78c9
--- /dev/null
+++ b/kde-base/ksquares/ksquares-4.8.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksquares/ksquares-4.8.4.ebuild,v 1.1 2012/06/21 21:54:32 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+inherit games-ggz kde4-meta
+
+DESCRIPTION="KSquares is an implementation of the game squares for KDE4"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+src_prepare() {
+	# cmake is doing this really weird
+	sed -i \
+		-e "s:register_ggz_module:#register_ggz_module:g" \
+		${PN}/src/CMakeLists.txt || die "ggz removal failed"
+
+	kde4-meta_src_prepare
+}
+
+src_install() {
+	kde4-meta_src_install
+	# and also we have to prepare the ggz dir
+	insinto "${GGZ_MODDIR}"
+	newins ${PN}/src/module.dsc ${P}.dsc
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+	games-ggz_pkg_postinst
+}
+
+pkg_postrm() {
+	kde4-meta_pkg_postrm
+	games-ggz_pkg_postrm
+}
diff --git a/kde-base/kstars/ChangeLog b/kde-base/kstars/ChangeLog
index d55395fcc01d..fe299785a1a8 100644
--- a/kde-base/kstars/ChangeLog
+++ b/kde-base/kstars/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kstars
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/ChangeLog,v 1.227 2012/06/07 22:34:35 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/ChangeLog,v 1.228 2012/06/21 21:54:53 dilfridge Exp $
+
+*kstars-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kstars-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   07 Jun 2012; Zac Medico <zmedico@gentoo.org> kstars-4.7.4.ebuild,
   kstars-4.8.3.ebuild:
diff --git a/kde-base/kstars/kstars-4.8.4.ebuild b/kde-base/kstars/kstars-4.8.4.ebuild
new file mode 100644
index 000000000000..daea9101af4c
--- /dev/null
+++ b/kde-base/kstars/kstars-4.8.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/kstars-4.8.4.ebuild,v 1.1 2012/06/21 21:54:53 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+inherit flag-o-matic kde4-base
+
+DESCRIPTION="KDE Desktop Planetarium"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug fits indi"
+
+DEPEND="
+	dev-cpp/eigen:2
+	$(add_kdebase_dep libkdeedu)
+	fits? ( >=sci-libs/cfitsio-0.390 )
+	indi? ( >=sci-libs/indilib-0.9.1 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.4.65-solaris.patch
+)
+
+src_configure() {
+	# Bug 308903
+	use ppc64 && append-flags -mminimal-toc
+
+	mycmakeargs=(
+		$(cmake-utils_use_with fits CFitsio)
+		$(cmake-utils_use_with indi)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/kde-base/kstart/ChangeLog b/kde-base/kstart/ChangeLog
index c036b9e29ba5..35e1618d83f6 100644
--- a/kde-base/kstart/ChangeLog
+++ b/kde-base/kstart/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kstart
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstart/ChangeLog,v 1.191 2012/05/24 11:37:48 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstart/ChangeLog,v 1.192 2012/06/21 21:54:46 dilfridge Exp $
+
+*kstart-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kstart-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kstart-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kstart/kstart-4.8.4.ebuild b/kde-base/kstart/kstart-4.8.4.ebuild
new file mode 100644
index 000000000000..39f7b4bfa832
--- /dev/null
+++ b/kde-base/kstart/kstart-4.8.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstart/kstart-4.8.4.ebuild,v 1.1 2012/06/21 21:54:46 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="KDE: Utility to launch applications with special window properties"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kstartperf/ChangeLog b/kde-base/kstartperf/ChangeLog
index ec6ce0c88cce..d97f6125dd3e 100644
--- a/kde-base/kstartperf/ChangeLog
+++ b/kde-base/kstartperf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kstartperf
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstartperf/ChangeLog,v 1.102 2012/05/24 11:37:43 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstartperf/ChangeLog,v 1.103 2012/06/21 21:54:33 dilfridge Exp $
+
+*kstartperf-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kstartperf-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kstartperf-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kstartperf/kstartperf-4.8.4.ebuild b/kde-base/kstartperf/kstartperf-4.8.4.ebuild
new file mode 100644
index 000000000000..204ebebdbe6c
--- /dev/null
+++ b/kde-base/kstartperf/kstartperf-4.8.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstartperf/kstartperf-4.8.4.ebuild,v 1.1 2012/06/21 21:54:33 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kdesdk"
+inherit kde4-meta
+
+DESCRIPTION="Measures starting performance of applications"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kstartupconfig/ChangeLog b/kde-base/kstartupconfig/ChangeLog
index 6a917d41e7c6..6031322c88f4 100644
--- a/kde-base/kstartupconfig/ChangeLog
+++ b/kde-base/kstartupconfig/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kstartupconfig
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstartupconfig/ChangeLog,v 1.121 2012/05/24 11:38:08 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstartupconfig/ChangeLog,v 1.122 2012/06/21 21:55:04 dilfridge Exp $
+
+*kstartupconfig-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kstartupconfig-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kstartupconfig-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kstartupconfig/kstartupconfig-4.8.4.ebuild b/kde-base/kstartupconfig/kstartupconfig-4.8.4.ebuild
new file mode 100644
index 000000000000..8b7aa5b18cdc
--- /dev/null
+++ b/kde-base/kstartupconfig/kstartupconfig-4.8.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstartupconfig/kstartupconfig-4.8.4.ebuild,v 1.1 2012/06/21 21:55:04 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+inherit kde4-meta
+
+DESCRIPTION="KDE: Utility to launch applications with special window properties"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kstyles/ChangeLog b/kde-base/kstyles/ChangeLog
index 9ecff18c783d..3b83af53c5fe 100644
--- a/kde-base/kstyles/ChangeLog
+++ b/kde-base/kstyles/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kstyles
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstyles/ChangeLog,v 1.127 2012/05/24 11:38:11 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstyles/ChangeLog,v 1.128 2012/06/21 21:54:38 dilfridge Exp $
+
+*kstyles-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kstyles-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kstyles-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kstyles/kstyles-4.8.4.ebuild b/kde-base/kstyles/kstyles-4.8.4.ebuild
new file mode 100644
index 000000000000..84bd13c4eaf7
--- /dev/null
+++ b/kde-base/kstyles/kstyles-4.8.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstyles/kstyles-4.8.4.ebuild,v 1.1 2012/06/21 21:54:38 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+inherit kde4-meta
+
+DESCRIPTION="KDE: A set of different KDE styles."
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep liboxygenstyle)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	libs/oxygen
+"
diff --git a/kde-base/ksudoku/ChangeLog b/kde-base/ksudoku/ChangeLog
index 6e15714406e0..d0327dd557e6 100644
--- a/kde-base/ksudoku/ChangeLog
+++ b/kde-base/ksudoku/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/ksudoku
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksudoku/ChangeLog,v 1.121 2012/05/24 11:37:48 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksudoku/ChangeLog,v 1.122 2012/06/21 21:54:31 dilfridge Exp $
+
+*ksudoku-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +ksudoku-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -ksudoku-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/ksudoku/ksudoku-4.8.4.ebuild b/kde-base/ksudoku/ksudoku-4.8.4.ebuild
new file mode 100644
index 000000000000..42f123b70a4d
--- /dev/null
+++ b/kde-base/ksudoku/ksudoku-4.8.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksudoku/ksudoku-4.8.4.ebuild,v 1.1 2012/06/21 21:54:31 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+OPENGL_REQUIRED="always"
+inherit kde4-meta
+
+DESCRIPTION="KDE Sudoku"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/ksysguard/ChangeLog b/kde-base/ksysguard/ChangeLog
index 1f00af85e5f9..9481465edf69 100644
--- a/kde-base/ksysguard/ChangeLog
+++ b/kde-base/ksysguard/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/ksysguard
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ChangeLog,v 1.245 2012/05/24 11:38:04 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ChangeLog,v 1.246 2012/06/21 21:54:35 dilfridge Exp $
+
+*ksysguard-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +ksysguard-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -ksysguard-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/ksysguard/ksysguard-4.8.4.ebuild b/kde-base/ksysguard/ksysguard-4.8.4.ebuild
new file mode 100644
index 000000000000..38ed051c75cd
--- /dev/null
+++ b/kde-base/ksysguard/ksysguard-4.8.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ksysguard-4.8.4.ebuild,v 1.1 2012/06/21 21:54:35 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-workspace"
+CPPUNIT_REQUIRED="optional"
+VIRTUALX_REQUIRED=test
+inherit kde4-meta
+
+DESCRIPTION="KSysguard is a network enabled task manager and system monitor application."
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug lm_sensors test"
+
+COMMONDEPEND="
+	x11-libs/libXrender
+	x11-libs/libXres
+	lm_sensors? ( sys-apps/lm_sensors )
+"
+DEPEND="${COMMONDEPEND}
+	x11-proto/renderproto
+"
+RDEPEND="${COMMONDEPEND}"
+
+RESTRICT="test"
+# bug 393091
+
+KMEXTRA="
+	libs/ksysguard/
+"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with lm_sensors Sensors)
+	)
+
+	kde4-meta_src_configure
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+	ewarn "Note that ksysguard has powerful features; one of these is the executing of arbitrary"
+	ewarn "programs with elevated privileges (as data sources). So be careful opening worksheets"
+	ewarn "from untrusted sources!"
+}
diff --git a/kde-base/ksystemlog/ChangeLog b/kde-base/ksystemlog/ChangeLog
index d43efe99d92e..c24cf0be8afa 100644
--- a/kde-base/ksystemlog/ChangeLog
+++ b/kde-base/ksystemlog/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/ksystemlog
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksystemlog/ChangeLog,v 1.111 2012/05/24 11:38:02 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksystemlog/ChangeLog,v 1.112 2012/06/21 21:54:44 dilfridge Exp $
+
+*ksystemlog-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +ksystemlog-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -ksystemlog-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/ksystemlog/ksystemlog-4.8.4.ebuild b/kde-base/ksystemlog/ksystemlog-4.8.4.ebuild
new file mode 100644
index 000000000000..6f0e56dbab63
--- /dev/null
+++ b/kde-base/ksystemlog/ksystemlog-4.8.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksystemlog/ksystemlog-4.8.4.ebuild,v 1.1 2012/06/21 21:54:44 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdeadmin"
+
+VIRTUALX_REQUIRED=test
+inherit kde4-meta
+
+DESCRIPTION="KDE system log viewer"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug test"
+
+RESTRICT=test
+# bug 378101
+
+src_prepare() {
+	kde4-meta_src_prepare
+
+	if use test; then
+		# beat this stupid test into shape: the test files contain no year, so
+		# comparison succeeds only in 2007 !!!
+		local theyear=$(date +%Y)
+		einfo Setting the current year as ${theyear} in the test files
+		sed -e "s:2007:${theyear}:g" -i ksystemlog/tests/systemAnalyzerTest.cpp
+
+		# one test consistently fails, so comment it out for the moment
+		sed -e "s:systemAnalyzerTest:# dont run systemAnalyzerTest:g" -i ksystemlog/tests/CMakeLists.txt
+	fi
+}
diff --git a/kde-base/ksystraycmd/ChangeLog b/kde-base/ksystraycmd/ChangeLog
index 53cb27a1919b..550863109093 100644
--- a/kde-base/ksystraycmd/ChangeLog
+++ b/kde-base/ksystraycmd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/ksystraycmd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksystraycmd/ChangeLog,v 1.199 2012/05/24 11:37:53 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksystraycmd/ChangeLog,v 1.200 2012/06/21 21:54:54 dilfridge Exp $
+
+*ksystraycmd-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +ksystraycmd-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -ksystraycmd-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/ksystraycmd/ksystraycmd-4.8.4.ebuild b/kde-base/ksystraycmd/ksystraycmd-4.8.4.ebuild
new file mode 100644
index 000000000000..508c8a5ce017
--- /dev/null
+++ b/kde-base/ksystraycmd/ksystraycmd-4.8.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksystraycmd/ksystraycmd-4.8.4.ebuild,v 1.1 2012/06/21 21:54:54 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+inherit kde4-meta
+
+DESCRIPTION="Ksystraycmd embeds applications given as argument into the system tray."
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kteatime/ChangeLog b/kde-base/kteatime/ChangeLog
index b59c81d7e7c7..04ccc987d8c8 100644
--- a/kde-base/kteatime/ChangeLog
+++ b/kde-base/kteatime/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kteatime
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kteatime/ChangeLog,v 1.206 2012/05/24 11:38:11 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kteatime/ChangeLog,v 1.207 2012/06/21 21:54:59 dilfridge Exp $
+
+*kteatime-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kteatime-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kteatime-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kteatime/kteatime-4.8.4.ebuild b/kde-base/kteatime/kteatime-4.8.4.ebuild
new file mode 100644
index 000000000000..0affc1d56fad
--- /dev/null
+++ b/kde-base/kteatime/kteatime-4.8.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kteatime/kteatime-4.8.4.ebuild,v 1.1 2012/06/21 21:54:59 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdetoys"
+inherit kde4-meta
+
+DESCRIPTION="KDE utility for making a fine cup of tea"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/ktimer/ChangeLog b/kde-base/ktimer/ChangeLog
index de03ff549045..ef63bd7bef7f 100644
--- a/kde-base/ktimer/ChangeLog
+++ b/kde-base/ktimer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/ktimer
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimer/ChangeLog,v 1.206 2012/05/24 11:37:57 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimer/ChangeLog,v 1.207 2012/06/21 21:54:51 dilfridge Exp $
+
+*ktimer-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +ktimer-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -ktimer-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/ktimer/ktimer-4.8.4.ebuild b/kde-base/ktimer/ktimer-4.8.4.ebuild
new file mode 100644
index 000000000000..3b5db5a37b55
--- /dev/null
+++ b/kde-base/ktimer/ktimer-4.8.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimer/ktimer-4.8.4.ebuild,v 1.1 2012/06/21 21:54:51 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE Timer"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/ktimetracker/ChangeLog b/kde-base/ktimetracker/ChangeLog
index ca8350ecd129..3a567116c332 100644
--- a/kde-base/ktimetracker/ChangeLog
+++ b/kde-base/ktimetracker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/ktimetracker
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimetracker/ChangeLog,v 1.110 2012/05/24 11:38:12 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimetracker/ChangeLog,v 1.111 2012/06/21 21:54:41 dilfridge Exp $
+
+*ktimetracker-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +ktimetracker-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -ktimetracker-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/ktimetracker/ktimetracker-4.8.4.ebuild b/kde-base/ktimetracker/ktimetracker-4.8.4.ebuild
new file mode 100644
index 000000000000..9e4c7c1d1edc
--- /dev/null
+++ b/kde-base/ktimetracker/ktimetracker-4.8.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimetracker/ktimetracker-4.8.4.ebuild,v 1.1 2012/06/21 21:54:41 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="KTimeTracker tracks time spent on various tasks."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	$(add_kdebase_dep kdepim-kresources)
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep kdepim-common-libs)
+	x11-libs/libXScrnSaver
+"
+DEPEND="${RDEPEND}
+	x11-proto/scrnsaverproto
+"
+
+KMEXTRACTONLY="
+	kresources/
+"
+
+KMLOADLIBS="kdepim-common-libs"
+
+src_unpack() {
+	if use kontact; then
+		KMEXTRA="${KMEXTRA} kontact/plugins/ktimetracker"
+	fi
+
+	kde4-meta_src_unpack
+}
diff --git a/kde-base/ktimezoned/ChangeLog b/kde-base/ktimezoned/ChangeLog
index 2141c5c4ecca..417ca740a79b 100644
--- a/kde-base/ktimezoned/ChangeLog
+++ b/kde-base/ktimezoned/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/ktimezoned
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimezoned/ChangeLog,v 1.122 2012/05/24 11:38:03 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimezoned/ChangeLog,v 1.123 2012/06/21 21:54:36 dilfridge Exp $
+
+*ktimezoned-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +ktimezoned-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -ktimezoned-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/ktimezoned/ktimezoned-4.8.4.ebuild b/kde-base/ktimezoned/ktimezoned-4.8.4.ebuild
new file mode 100644
index 000000000000..48daa79d4df1
--- /dev/null
+++ b/kde-base/ktimezoned/ktimezoned-4.8.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimezoned/ktimezoned-4.8.4.ebuild,v 1.1 2012/06/21 21:54:36 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="KDE: Timezone daemon"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/ktouch/ChangeLog b/kde-base/ktouch/ChangeLog
index debdf9d7954f..b0cca1ed3557 100644
--- a/kde-base/ktouch/ChangeLog
+++ b/kde-base/ktouch/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/ktouch
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktouch/ChangeLog,v 1.216 2012/05/24 11:37:42 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktouch/ChangeLog,v 1.217 2012/06/21 21:54:26 dilfridge Exp $
+
+*ktouch-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +ktouch-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -ktouch-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/ktouch/ktouch-4.8.4.ebuild b/kde-base/ktouch/ktouch-4.8.4.ebuild
new file mode 100644
index 000000000000..03c39d416f62
--- /dev/null
+++ b/kde-base/ktouch/ktouch-4.8.4.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktouch/ktouch-4.8.4.ebuild,v 1.1 2012/06/21 21:54:26 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE: A program that helps you to learn and practice touch typing"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	$(add_kdebase_dep knotify)
+"
diff --git a/kde-base/ktraderclient/ChangeLog b/kde-base/ktraderclient/ChangeLog
index 7c5c0b9a6595..59a28a24739a 100644
--- a/kde-base/ktraderclient/ChangeLog
+++ b/kde-base/ktraderclient/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/ktraderclient
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktraderclient/ChangeLog,v 1.122 2012/05/24 11:38:06 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktraderclient/ChangeLog,v 1.123 2012/06/21 21:54:52 dilfridge Exp $
+
+*ktraderclient-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +ktraderclient-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -ktraderclient-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/ktraderclient/ktraderclient-4.8.4.ebuild b/kde-base/ktraderclient/ktraderclient-4.8.4.ebuild
new file mode 100644
index 000000000000..9132206b60e4
--- /dev/null
+++ b/kde-base/ktraderclient/ktraderclient-4.8.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktraderclient/ktraderclient-4.8.4.ebuild,v 1.1 2012/06/21 21:54:52 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="A command-line tool for querying the KDE trader system"
+IUSE="debug"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
diff --git a/kde-base/ktron/ChangeLog b/kde-base/ktron/ChangeLog
index 193415c16707..26565120c7f5 100644
--- a/kde-base/ktron/ChangeLog
+++ b/kde-base/ktron/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/ktron
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktron/ChangeLog,v 1.183 2012/05/24 11:37:54 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktron/ChangeLog,v 1.184 2012/06/21 21:54:28 dilfridge Exp $
+
+*ktron-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +ktron-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -ktron-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/ktron/ktron-4.8.4.ebuild b/kde-base/ktron/ktron-4.8.4.ebuild
new file mode 100644
index 000000000000..abd0a760e4c4
--- /dev/null
+++ b/kde-base/ktron/ktron-4.8.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktron/ktron-4.8.4.ebuild,v 1.1 2012/06/21 21:54:28 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kdegames"
+KDE_SELINUX_MODULE="games"
+inherit kde4-meta
+
+DESCRIPTION="KDE Tron game"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/ktuberling/ChangeLog b/kde-base/ktuberling/ChangeLog
index 7aff11e4cb95..e7897eac20fa 100644
--- a/kde-base/ktuberling/ChangeLog
+++ b/kde-base/ktuberling/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/ktuberling
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktuberling/ChangeLog,v 1.207 2012/05/24 11:38:00 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktuberling/ChangeLog,v 1.208 2012/06/21 21:55:07 dilfridge Exp $
+
+*ktuberling-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +ktuberling-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -ktuberling-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/ktuberling/ktuberling-4.8.4.ebuild b/kde-base/ktuberling/ktuberling-4.8.4.ebuild
new file mode 100644
index 000000000000..c679ef7953e8
--- /dev/null
+++ b/kde-base/ktuberling/ktuberling-4.8.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktuberling/ktuberling-4.8.4.ebuild,v 1.1 2012/06/21 21:55:07 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+KDE_SELINUX_MODULE="games"
+inherit kde4-meta
+
+DESCRIPTION="KDE: potato game for kids"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kturtle/ChangeLog b/kde-base/kturtle/ChangeLog
index c156b315a9ce..019f4b1b5b75 100644
--- a/kde-base/kturtle/ChangeLog
+++ b/kde-base/kturtle/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kturtle
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kturtle/ChangeLog,v 1.209 2012/05/24 11:38:10 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kturtle/ChangeLog,v 1.210 2012/06/21 21:54:41 dilfridge Exp $
+
+*kturtle-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kturtle-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kturtle-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kturtle/kturtle-4.8.4.ebuild b/kde-base/kturtle/kturtle-4.8.4.ebuild
new file mode 100644
index 000000000000..9c1d369a3aae
--- /dev/null
+++ b/kde-base/kturtle/kturtle-4.8.4.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kturtle/kturtle-4.8.4.ebuild,v 1.1 2012/06/21 21:54:41 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE: Educational programming environment using the Logo programming language"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	$(add_kdebase_dep knotify)
+"
diff --git a/kde-base/ktux/ChangeLog b/kde-base/ktux/ChangeLog
index 19a9d08257bb..6208a0a99907 100644
--- a/kde-base/ktux/ChangeLog
+++ b/kde-base/ktux/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/ktux
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktux/ChangeLog,v 1.204 2012/05/24 11:37:46 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktux/ChangeLog,v 1.205 2012/06/21 21:54:29 dilfridge Exp $
+
+*ktux-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +ktux-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -ktux-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/ktux/ktux-4.8.4.ebuild b/kde-base/ktux/ktux-4.8.4.ebuild
new file mode 100644
index 000000000000..53ad604abc11
--- /dev/null
+++ b/kde-base/ktux/ktux-4.8.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktux/ktux-4.8.4.ebuild,v 1.1 2012/06/21 21:54:29 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kdetoys"
+inherit kde4-meta
+
+DESCRIPTION="KDE: screensaver featuring the Space-Faring Tux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+# libkworkspace - only as a stub to provide KDE4Workspace config
+DEPEND="
+	$(add_kdebase_dep kscreensaver)
+	$(add_kdebase_dep libkworkspace)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-base/kubrick/ChangeLog b/kde-base/kubrick/ChangeLog
index d9744dcf14f9..c34b9a7d244d 100644
--- a/kde-base/kubrick/ChangeLog
+++ b/kde-base/kubrick/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kubrick
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kubrick/ChangeLog,v 1.106 2012/05/24 11:38:07 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kubrick/ChangeLog,v 1.107 2012/06/21 21:54:36 dilfridge Exp $
+
+*kubrick-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kubrick-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kubrick-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kubrick/kubrick-4.8.4.ebuild b/kde-base/kubrick/kubrick-4.8.4.ebuild
new file mode 100644
index 000000000000..45d8c42e743f
--- /dev/null
+++ b/kde-base/kubrick/kubrick-4.8.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kubrick/kubrick-4.8.4.ebuild,v 1.1 2012/06/21 21:54:36 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+OPENGL_REQUIRED="always"
+inherit kde4-meta
+
+DESCRIPTION="KDE: Kubrick is a game based on \"Rubik's Cube\" puzzle."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kuiserver/ChangeLog b/kde-base/kuiserver/ChangeLog
index 49b326aa6623..eabc86d18b2f 100644
--- a/kde-base/kuiserver/ChangeLog
+++ b/kde-base/kuiserver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kuiserver
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kuiserver/ChangeLog,v 1.122 2012/05/24 11:37:49 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kuiserver/ChangeLog,v 1.123 2012/06/21 21:54:32 dilfridge Exp $
+
+*kuiserver-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kuiserver-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kuiserver-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kuiserver/kuiserver-4.8.4.ebuild b/kde-base/kuiserver/kuiserver-4.8.4.ebuild
new file mode 100644
index 000000000000..39a001a5e4fd
--- /dev/null
+++ b/kde-base/kuiserver/kuiserver-4.8.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kuiserver/kuiserver-4.8.4.ebuild,v 1.1 2012/06/21 21:54:32 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="KDE: Progress Info UI server"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kuiviewer/ChangeLog b/kde-base/kuiviewer/ChangeLog
index 06b81f87e450..1a4bf146ddbb 100644
--- a/kde-base/kuiviewer/ChangeLog
+++ b/kde-base/kuiviewer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kuiviewer
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kuiviewer/ChangeLog,v 1.191 2012/05/24 11:37:54 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kuiviewer/ChangeLog,v 1.192 2012/06/21 21:54:49 dilfridge Exp $
+
+*kuiviewer-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kuiviewer-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kuiviewer-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kuiviewer/kuiviewer-4.8.4.ebuild b/kde-base/kuiviewer/kuiviewer-4.8.4.ebuild
new file mode 100644
index 000000000000..78f3705d70e8
--- /dev/null
+++ b/kde-base/kuiviewer/kuiviewer-4.8.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kuiviewer/kuiviewer-4.8.4.ebuild,v 1.1 2012/06/21 21:54:50 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kdesdk"
+
+inherit kde4-meta
+
+DESCRIPTION="KDE utility that displays and tests UI files generated by Qt Designer."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kurifilter-plugins/ChangeLog b/kde-base/kurifilter-plugins/ChangeLog
index 398ba81d836f..235d00f26e56 100644
--- a/kde-base/kurifilter-plugins/ChangeLog
+++ b/kde-base/kurifilter-plugins/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kurifilter-plugins
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kurifilter-plugins/ChangeLog,v 1.118 2012/05/24 11:38:07 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kurifilter-plugins/ChangeLog,v 1.119 2012/06/21 21:55:07 dilfridge Exp $
+
+*kurifilter-plugins-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kurifilter-plugins-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org>
   -kurifilter-plugins-4.8.1.ebuild:
diff --git a/kde-base/kurifilter-plugins/kurifilter-plugins-4.8.4.ebuild b/kde-base/kurifilter-plugins/kurifilter-plugins-4.8.4.ebuild
new file mode 100644
index 000000000000..3634211df1c8
--- /dev/null
+++ b/kde-base/kurifilter-plugins/kurifilter-plugins-4.8.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:55:07 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="KDE: Plugins to manage filtering URIs."
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+RESTRICT="test" # Tests fail. Last checked on 4.8.3.
diff --git a/kde-base/kuser/ChangeLog b/kde-base/kuser/ChangeLog
index 51b967d27b11..fb504b49de6c 100644
--- a/kde-base/kuser/ChangeLog
+++ b/kde-base/kuser/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kuser
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kuser/ChangeLog,v 1.207 2012/05/24 11:38:07 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kuser/ChangeLog,v 1.208 2012/06/21 21:54:54 dilfridge Exp $
+
+*kuser-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kuser-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kuser-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kuser/kuser-4.8.4.ebuild b/kde-base/kuser/kuser-4.8.4.ebuild
new file mode 100644
index 000000000000..ca4e3455a07a
--- /dev/null
+++ b/kde-base/kuser/kuser-4.8.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kuser/kuser-4.8.4.ebuild,v 1.1 2012/06/21 21:54:55 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdeadmin"
+
+inherit kde4-meta
+
+DESCRIPTION="KDE application that helps you manage system users"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+"
+# notify is needed for dialogs
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep knotify)
+"
diff --git a/kde-base/kwallet/ChangeLog b/kde-base/kwallet/ChangeLog
index 15468540ea85..625199e036c8 100644
--- a/kde-base/kwallet/ChangeLog
+++ b/kde-base/kwallet/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kwallet
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwallet/ChangeLog,v 1.118 2012/05/24 11:37:59 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwallet/ChangeLog,v 1.119 2012/06/21 21:55:06 dilfridge Exp $
+
+*kwallet-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kwallet-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kwallet-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kwallet/kwallet-4.8.4.ebuild b/kde-base/kwallet/kwallet-4.8.4.ebuild
new file mode 100644
index 000000000000..9163c47bdcfa
--- /dev/null
+++ b/kde-base/kwallet/kwallet-4.8.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwallet/kwallet-4.8.4.ebuild,v 1.1 2012/06/21 21:55:06 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE Wallet Management Tool"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kwalletd/ChangeLog b/kde-base/kwalletd/ChangeLog
index cd25d6471e1e..47c7a45f335c 100644
--- a/kde-base/kwalletd/ChangeLog
+++ b/kde-base/kwalletd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kwalletd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwalletd/ChangeLog,v 1.108 2012/05/24 11:38:05 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwalletd/ChangeLog,v 1.109 2012/06/21 21:54:27 dilfridge Exp $
+
+*kwalletd-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kwalletd-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kwalletd-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kwalletd/kwalletd-4.8.4.ebuild b/kde-base/kwalletd/kwalletd-4.8.4.ebuild
new file mode 100644
index 000000000000..ae2c44be9b47
--- /dev/null
+++ b/kde-base/kwalletd/kwalletd-4.8.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwalletd/kwalletd-4.8.4.ebuild,v 1.1 2012/06/21 21:54:27 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="KDE Password Server"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/kwin/ChangeLog b/kde-base/kwin/ChangeLog
index 2a288e7bb558..9b7f7bd6ffac 100644
--- a/kde-base/kwin/ChangeLog
+++ b/kde-base/kwin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kwin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.279 2012/06/07 22:35:57 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.280 2012/06/21 21:54:50 dilfridge Exp $
+
+*kwin-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kwin-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   07 Jun 2012; Zac Medico <zmedico@gentoo.org> kwin-4.7.4.ebuild,
   kwin-4.8.3.ebuild:
diff --git a/kde-base/kwin/kwin-4.8.4.ebuild b/kde-base/kwin/kwin-4.8.4.ebuild
new file mode 100644
index 000000000000..6a22e87dc292
--- /dev/null
+++ b/kde-base/kwin/kwin-4.8.4.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.8.4.ebuild,v 1.1 2012/06/21 21:54:50 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+OPENGL_REQUIRED="always"
+inherit flag-o-matic kde4-meta
+
+DESCRIPTION="KDE window manager"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug gles opengl"
+
+COMMONDEPEND="
+	$(add_kdebase_dep kactivities)
+	$(add_kdebase_dep kdelibs opengl)
+	$(add_kdebase_dep kephal)
+	$(add_kdebase_dep libkworkspace)
+	$(add_kdebase_dep liboxygenstyle)
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXfixes
+	>=x11-libs/libXrandr-1.2.1
+	x11-libs/libXrender
+	opengl? ( >=media-libs/mesa-7.10 )
+	gles? (
+		|| (  ( >=media-libs/mesa-7.10[egl(+),gles] <media-libs/mesa-7.12[egl(+),gles] )
+			>=media-libs/mesa-7.12[egl(+),gles2] )
+	)
+"
+DEPEND="${COMMONDEPEND}
+	x11-proto/compositeproto
+	x11-proto/damageproto
+	x11-proto/fixesproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+"
+RDEPEND="${COMMONDEPEND}
+	x11-apps/scripts
+"
+
+KMEXTRACTONLY="
+	ksmserver/
+	libs/kephal/
+	libs/oxygen/
+"
+
+# you need one of these
+REQUIRED_USE="!opengl? ( gles ) !gles? ( opengl )"
+
+src_configure() {
+	# FIXME Remove when activity API moved away from libkworkspace
+	append-cppflags "-I${EPREFIX}/usr/include/kworkspace"
+
+	mycmakeargs=(
+		$(cmake-utils_use_with gles OpenGLES)
+		$(cmake-utils_use gles KWIN_BUILD_WITH_OPENGLES)
+		$(cmake-utils_use_with opengl OpenGL)
+		-DWITH_X11_Xcomposite=ON
+	)
+
+	kde4-meta_src_configure
+}
diff --git a/kde-base/kwordquiz/ChangeLog b/kde-base/kwordquiz/ChangeLog
index 0bc3ea071c3f..a32e1645e2a0 100644
--- a/kde-base/kwordquiz/ChangeLog
+++ b/kde-base/kwordquiz/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kwordquiz
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwordquiz/ChangeLog,v 1.212 2012/05/24 11:37:45 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwordquiz/ChangeLog,v 1.213 2012/06/21 21:54:56 dilfridge Exp $
+
+*kwordquiz-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kwordquiz-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kwordquiz-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kwordquiz/kwordquiz-4.8.4.ebuild b/kde-base/kwordquiz/kwordquiz-4.8.4.ebuild
new file mode 100644
index 000000000000..a73171f09e92
--- /dev/null
+++ b/kde-base/kwordquiz/kwordquiz-4.8.4.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwordquiz/kwordquiz-4.8.4.ebuild,v 1.1 2012/06/21 21:54:56 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE: A powerful flashcard and vocabulary learning program"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep libkdeedu)
+"
diff --git a/kde-base/kwrite/ChangeLog b/kde-base/kwrite/ChangeLog
index 7355314947b7..44f4f9e697ab 100644
--- a/kde-base/kwrite/ChangeLog
+++ b/kde-base/kwrite/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kwrite
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwrite/ChangeLog,v 1.121 2012/05/24 11:37:49 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwrite/ChangeLog,v 1.122 2012/06/21 21:55:02 dilfridge Exp $
+
+*kwrite-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kwrite-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kwrite-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kwrite/kwrite-4.8.4.ebuild b/kde-base/kwrite/kwrite-4.8.4.ebuild
new file mode 100644
index 000000000000..b9f3ee1885db
--- /dev/null
+++ b/kde-base/kwrite/kwrite-4.8.4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwrite/kwrite-4.8.4.ebuild,v 1.1 2012/06/21 21:55:02 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kate"
+KMEXTRACTONLY="doc/kate"
+inherit kde4-meta
+
+DESCRIPTION="KDE MDI editor/IDE"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	$(add_kdebase_dep katepart)
+"
diff --git a/kde-base/kwrited/ChangeLog b/kde-base/kwrited/ChangeLog
index 9bdc4a161bc2..acd73c8cf13f 100644
--- a/kde-base/kwrited/ChangeLog
+++ b/kde-base/kwrited/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kwrited
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwrited/ChangeLog,v 1.105 2012/05/24 11:38:02 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwrited/ChangeLog,v 1.106 2012/06/21 21:54:40 dilfridge Exp $
+
+*kwrited-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +kwrited-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -kwrited-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/kwrited/kwrited-4.8.4.ebuild b/kde-base/kwrited/kwrited-4.8.4.ebuild
new file mode 100644
index 000000000000..3b6d578e0e0c
--- /dev/null
+++ b/kde-base/kwrited/kwrited-4.8.4.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwrited/kwrited-4.8.4.ebuild,v 1.1 2012/06/21 21:54:40 dilfridge Exp $
+
+EAPI=4
+KMNAME="kde-workspace"
+inherit kde4-meta
+
+DESCRIPTION="KDE daemon listening for wall and write messages."
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	>=sys-libs/libutempter-1.1.5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-base/libkcddb/ChangeLog b/kde-base/libkcddb/ChangeLog
index 0db2cb6d395e..bc95ce70dff8 100644
--- a/kde-base/libkcddb/ChangeLog
+++ b/kde-base/libkcddb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/libkcddb
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcddb/ChangeLog,v 1.211 2012/05/24 11:38:04 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcddb/ChangeLog,v 1.212 2012/06/21 21:55:07 dilfridge Exp $
+
+*libkcddb-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +libkcddb-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -libkcddb-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/libkcddb/libkcddb-4.8.4.ebuild b/kde-base/libkcddb/libkcddb-4.8.4.ebuild
new file mode 100644
index 000000000000..cb4c66ebcb26
--- /dev/null
+++ b/kde-base/libkcddb/libkcddb-4.8.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcddb/libkcddb-4.8.4.ebuild,v 1.1 2012/06/21 21:55:07 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kdemultimedia"
+inherit kde4-meta
+
+DESCRIPTION="KDE library for CDDB"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug musicbrainz"
+
+# tests require network access and compare static data with online data
+# bug 280996
+RESTRICT=test
+
+DEPEND="
+	musicbrainz? ( media-libs/musicbrainz:3 )
+"
+RDEPEND="${DEPEND}"
+add_blocker kscd "<4.8.4"
+
+KMSAVELIBS="true"
+
+KMEXTRACTONLY="
+	libkcddb/kcmcddb/doc
+"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with musicbrainz MusicBrainz3)
+	)
+
+	kde4-meta_src_configure
+}
diff --git a/kde-base/libkcompactdisc/ChangeLog b/kde-base/libkcompactdisc/ChangeLog
index 26dd6ff2ac96..f2c167c9a1ac 100644
--- a/kde-base/libkcompactdisc/ChangeLog
+++ b/kde-base/libkcompactdisc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/libkcompactdisc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcompactdisc/ChangeLog,v 1.117 2012/05/24 11:38:10 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcompactdisc/ChangeLog,v 1.118 2012/06/21 21:54:48 dilfridge Exp $
+
+*libkcompactdisc-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +libkcompactdisc-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -libkcompactdisc-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/libkcompactdisc/libkcompactdisc-4.8.4.ebuild b/kde-base/libkcompactdisc/libkcompactdisc-4.8.4.ebuild
new file mode 100644
index 000000000000..b3ea07c1fdd8
--- /dev/null
+++ b/kde-base/libkcompactdisc/libkcompactdisc-4.8.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcompactdisc/libkcompactdisc-4.8.4.ebuild,v 1.1 2012/06/21 21:54:48 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kdemultimedia"
+inherit kde4-meta
+
+DESCRIPTION="KDE library for playing & ripping CDs"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="alsa debug"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with alsa)
+	)
+	kde4-meta_src_configure
+}
diff --git a/kde-base/libkdcraw/ChangeLog b/kde-base/libkdcraw/ChangeLog
index 89ff558b0b5f..d40390c6b4ba 100644
--- a/kde-base/libkdcraw/ChangeLog
+++ b/kde-base/libkdcraw/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/libkdcraw
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdcraw/ChangeLog,v 1.116 2012/05/24 11:38:11 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdcraw/ChangeLog,v 1.117 2012/06/21 21:54:55 dilfridge Exp $
+
+*libkdcraw-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +libkdcraw-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -libkdcraw-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/libkdcraw/libkdcraw-4.8.4.ebuild b/kde-base/libkdcraw/libkdcraw-4.8.4.ebuild
new file mode 100644
index 000000000000..2a504e2d3bde
--- /dev/null
+++ b/kde-base/libkdcraw/libkdcraw-4.8.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdcraw/libkdcraw-4.8.4.ebuild,v 1.1 2012/06/21 21:54:55 dilfridge Exp $
+
+EAPI=4
+
+inherit kde4-base
+
+DESCRIPTION="KDE digital camera raw image library wrapper"
+HOMEPAGE="http://www.kipi-plugins.org"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	media-libs/lcms:0
+	virtual/jpeg
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-base/libkdeedu/ChangeLog b/kde-base/libkdeedu/ChangeLog
index c5fde83e1c81..64dfb800124b 100644
--- a/kde-base/libkdeedu/ChangeLog
+++ b/kde-base/libkdeedu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/libkdeedu
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdeedu/ChangeLog,v 1.212 2012/05/24 11:38:02 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdeedu/ChangeLog,v 1.213 2012/06/21 21:54:38 dilfridge Exp $
+
+*libkdeedu-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +libkdeedu-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -libkdeedu-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/libkdeedu/libkdeedu-4.8.4.ebuild b/kde-base/libkdeedu/libkdeedu-4.8.4.ebuild
new file mode 100644
index 000000000000..fc40518f4787
--- /dev/null
+++ b/kde-base/libkdeedu/libkdeedu-4.8.4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdeedu/libkdeedu-4.8.4.ebuild,v 1.1 2012/06/21 21:54:38 dilfridge Exp $
+
+EAPI=4
+
+inherit kde4-base
+
+DESCRIPTION="Common library for KDE educational apps"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+# 4 of 4 tests fail. Last checked for 4.6.1. Tests are fundamentally broken,
+# see bug 258857 for details.
+RESTRICT=test
+
+add_blocker kvtml-data
diff --git a/kde-base/libkdegames/ChangeLog b/kde-base/libkdegames/ChangeLog
index de849dddeb50..e2794acea901 100644
--- a/kde-base/libkdegames/ChangeLog
+++ b/kde-base/libkdegames/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/libkdegames
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdegames/ChangeLog,v 1.213 2012/05/24 11:37:50 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdegames/ChangeLog,v 1.214 2012/06/21 21:54:45 dilfridge Exp $
+
+*libkdegames-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +libkdegames-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -libkdegames-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/libkdegames/libkdegames-4.8.4.ebuild b/kde-base/libkdegames/libkdegames-4.8.4.ebuild
new file mode 100644
index 000000000000..30caafa66b72
--- /dev/null
+++ b/kde-base/libkdegames/libkdegames-4.8.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdegames/libkdegames-4.8.4.ebuild,v 1.1 2012/06/21 21:54:45 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kdegames"
+inherit kde4-meta
+
+DESCRIPTION="Base library common to many KDE games."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	>=dev-games/ggz-client-libs-0.0.14
+"
+RDEPEND="${DEPEND}"
+
+KMSAVELIBS="true"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.2.0-darwin.patch
+)
diff --git a/kde-base/libkexiv2/ChangeLog b/kde-base/libkexiv2/ChangeLog
index 8e6fea33ae3a..1f151d5fec66 100644
--- a/kde-base/libkexiv2/ChangeLog
+++ b/kde-base/libkexiv2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/libkexiv2
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkexiv2/ChangeLog,v 1.114 2012/05/24 11:38:03 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkexiv2/ChangeLog,v 1.115 2012/06/21 21:54:29 dilfridge Exp $
+
+*libkexiv2-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +libkexiv2-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -libkexiv2-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/libkexiv2/libkexiv2-4.8.4.ebuild b/kde-base/libkexiv2/libkexiv2-4.8.4.ebuild
new file mode 100644
index 000000000000..58a8fa6e0fdf
--- /dev/null
+++ b/kde-base/libkexiv2/libkexiv2-4.8.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkexiv2/libkexiv2-4.8.4.ebuild,v 1.1 2012/06/21 21:54:29 dilfridge Exp $
+
+EAPI=4
+
+inherit kde4-base
+
+DESCRIPTION="KDE Image Plugin Interface: an exiv2 library wrapper"
+HOMEPAGE="http://www.kipi-plugins.org"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	>=media-gfx/exiv2-0.20
+	media-libs/lcms:0
+	virtual/jpeg
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-base/libkipi/ChangeLog b/kde-base/libkipi/ChangeLog
index 8d3b3fc90695..84eb22522227 100644
--- a/kde-base/libkipi/ChangeLog
+++ b/kde-base/libkipi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/libkipi
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkipi/ChangeLog,v 1.108 2012/05/24 11:37:56 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkipi/ChangeLog,v 1.109 2012/06/21 21:54:36 dilfridge Exp $
+
+*libkipi-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +libkipi-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -libkipi-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/libkipi/libkipi-4.8.4.ebuild b/kde-base/libkipi/libkipi-4.8.4.ebuild
new file mode 100644
index 000000000000..2047f66b9a78
--- /dev/null
+++ b/kde-base/libkipi/libkipi-4.8.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkipi/libkipi-4.8.4.ebuild,v 1.1 2012/06/21 21:54:36 dilfridge Exp $
+
+EAPI=4
+
+inherit kde4-base
+
+DESCRIPTION="A library for image plugins accross KDE applications."
+HOMEPAGE="http://www.kipi-plugins.org"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/libkmahjongg/ChangeLog b/kde-base/libkmahjongg/ChangeLog
index 77642988aea4..e316e52fe180 100644
--- a/kde-base/libkmahjongg/ChangeLog
+++ b/kde-base/libkmahjongg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/libkmahjongg
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkmahjongg/ChangeLog,v 1.115 2012/05/24 11:38:02 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkmahjongg/ChangeLog,v 1.116 2012/06/21 21:54:53 dilfridge Exp $
+
+*libkmahjongg-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +libkmahjongg-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -libkmahjongg-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/libkmahjongg/libkmahjongg-4.8.4.ebuild b/kde-base/libkmahjongg/libkmahjongg-4.8.4.ebuild
new file mode 100644
index 000000000000..4b8364a3eb40
--- /dev/null
+++ b/kde-base/libkmahjongg/libkmahjongg-4.8.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkmahjongg/libkmahjongg-4.8.4.ebuild,v 1.1 2012/06/21 21:54:53 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kdegames"
+inherit kde4-meta
+
+DESCRIPTION="LibKMahjongg for KDE"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+KMLOADLIBS="libkdegames"
diff --git a/kde-base/libkonq/ChangeLog b/kde-base/libkonq/ChangeLog
index 6856317eb94e..bfa8f83083b9 100644
--- a/kde-base/libkonq/ChangeLog
+++ b/kde-base/libkonq/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/libkonq
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkonq/ChangeLog,v 1.220 2012/05/24 11:37:52 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkonq/ChangeLog,v 1.221 2012/06/21 21:54:33 dilfridge Exp $
+
+*libkonq-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +libkonq-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -libkonq-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/libkonq/libkonq-4.8.4.ebuild b/kde-base/libkonq/libkonq-4.8.4.ebuild
new file mode 100644
index 000000000000..6c4994c41a3d
--- /dev/null
+++ b/kde-base/libkonq/libkonq-4.8.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkonq/libkonq-4.8.4.ebuild,v 1.1 2012/06/21 21:54:33 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-baseapps"
+KMMODULE="lib/konq"
+CPPUNIT_REQUIRED="optional"
+inherit kde4-meta
+
+DESCRIPTION="The embeddable part of konqueror"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+RESTRICT="test"
+
+KMSAVELIBS="true"
+
+PATCHES=( "${FILESDIR}/${PN}-4.8.3-cmake.patch" )
diff --git a/kde-base/libksane/ChangeLog b/kde-base/libksane/ChangeLog
index 7896de93cc43..f4575558e7d8 100644
--- a/kde-base/libksane/ChangeLog
+++ b/kde-base/libksane/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/libksane
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libksane/ChangeLog,v 1.109 2012/05/24 11:38:01 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libksane/ChangeLog,v 1.110 2012/06/21 21:54:52 dilfridge Exp $
+
+*libksane-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +libksane-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -libksane-4.8.1.ebuild,
   -libksane-4.8.1-r1.ebuild:
diff --git a/kde-base/libksane/libksane-4.8.4.ebuild b/kde-base/libksane/libksane-4.8.4.ebuild
new file mode 100644
index 000000000000..eaba8074138d
--- /dev/null
+++ b/kde-base/libksane/libksane-4.8.4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libksane/libksane-4.8.4.ebuild,v 1.1 2012/06/21 21:54:52 dilfridge Exp $
+
+EAPI=4
+
+inherit kde4-base
+
+DESCRIPTION="SANE Library interface for KDE"
+HOMEPAGE="http://www.kipi-plugins.org"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+LICENSE="LGPL-2"
+
+DEPEND="
+	media-gfx/sane-backends
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-base/libkworkspace/ChangeLog b/kde-base/libkworkspace/ChangeLog
index 1df420c48c83..f0252d281ce3 100644
--- a/kde-base/libkworkspace/ChangeLog
+++ b/kde-base/libkworkspace/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/libkworkspace
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkworkspace/ChangeLog,v 1.136 2012/05/24 11:38:03 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkworkspace/ChangeLog,v 1.137 2012/06/21 21:55:02 dilfridge Exp $
+
+*libkworkspace-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +libkworkspace-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -libkworkspace-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/libkworkspace/libkworkspace-4.8.4.ebuild b/kde-base/libkworkspace/libkworkspace-4.8.4.ebuild
new file mode 100644
index 000000000000..0461af600364
--- /dev/null
+++ b/kde-base/libkworkspace/libkworkspace-4.8.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkworkspace/libkworkspace-4.8.4.ebuild,v 1.1 2012/06/21 21:55:02 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+KMMODULE="libs/kworkspace"
+inherit kde4-meta
+
+DESCRIPTION="A library for KDE desktop applications"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+KMEXTRACTONLY="
+	ksmserver/org.kde.KSMServerInterface.xml
+	kwin/org.kde.KWin.xml
+"
+
+KMSAVELIBS="true"
+
+DEPEND="
+	x11-libs/libxkbfile
+	x11-libs/libXcomposite
+"
+RDEPEND=${DEPEND}
+
+src_prepare() {
+	sed -i -e 's/install( FILES kdisplaymanager.h/install( FILES kdisplaymanager.h screenpreviewwidget.h/' \
+		libs/kworkspace/CMakeLists.txt || die "failed to provide screenpreviewwidget.h"
+
+	kde4-meta_src_prepare
+}
diff --git a/kde-base/liboxygenstyle/ChangeLog b/kde-base/liboxygenstyle/ChangeLog
index 0a0c1f377863..5f06f9978bb1 100644
--- a/kde-base/liboxygenstyle/ChangeLog
+++ b/kde-base/liboxygenstyle/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/liboxygenstyle
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/liboxygenstyle/ChangeLog,v 1.56 2012/05/24 11:38:11 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/liboxygenstyle/ChangeLog,v 1.57 2012/06/21 21:54:49 dilfridge Exp $
+
+*liboxygenstyle-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +liboxygenstyle-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -liboxygenstyle-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/liboxygenstyle/liboxygenstyle-4.8.4.ebuild b/kde-base/liboxygenstyle/liboxygenstyle-4.8.4.ebuild
new file mode 100644
index 000000000000..0afb668d71df
--- /dev/null
+++ b/kde-base/liboxygenstyle/liboxygenstyle-4.8.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/liboxygenstyle/liboxygenstyle-4.8.4.ebuild,v 1.1 2012/06/21 21:54:49 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+KMMODULE="libs/oxygen"
+inherit kde4-meta
+
+DESCRIPTION="Library to support the Oxygen style in KDE"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/libplasmaclock/ChangeLog b/kde-base/libplasmaclock/ChangeLog
index b987a56166a1..b5ca30390f5a 100644
--- a/kde-base/libplasmaclock/ChangeLog
+++ b/kde-base/libplasmaclock/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/libplasmaclock
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libplasmaclock/ChangeLog,v 1.108 2012/05/24 11:37:55 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libplasmaclock/ChangeLog,v 1.109 2012/06/21 21:54:57 dilfridge Exp $
+
+*libplasmaclock-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +libplasmaclock-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -libplasmaclock-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/libplasmaclock/libplasmaclock-4.8.4.ebuild b/kde-base/libplasmaclock/libplasmaclock-4.8.4.ebuild
new file mode 100644
index 000000000000..68b73dea0267
--- /dev/null
+++ b/kde-base/libplasmaclock/libplasmaclock-4.8.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libplasmaclock/libplasmaclock-4.8.4.ebuild,v 1.1 2012/06/21 21:54:57 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+KMMODULE="libs/plasmaclock"
+inherit kde4-meta
+
+DESCRIPTION="Libraries for KDE Plasma's clocks"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug +holidays"
+
+DEPEND="
+	$(add_kdebase_dep kephal)
+	holidays? ( $(add_kdebase_dep kdepimlibs) )
+"
+RDEPEND="${DEPEND}"
+
+KMSAVELIBS="true"
+
+KMEXTRACTONLY="
+	libs/kephal/
+"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with holidays KdepimLibs)
+	)
+
+	kde4-meta_src_configure
+}
diff --git a/kde-base/libplasmagenericshell/ChangeLog b/kde-base/libplasmagenericshell/ChangeLog
index bfdc8ec428ab..ac3c1b30e91d 100644
--- a/kde-base/libplasmagenericshell/ChangeLog
+++ b/kde-base/libplasmagenericshell/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/libplasmagenericshell
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libplasmagenericshell/ChangeLog,v 1.72 2012/05/24 11:37:42 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libplasmagenericshell/ChangeLog,v 1.73 2012/06/21 21:54:45 dilfridge Exp $
+
+*libplasmagenericshell-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +libplasmagenericshell-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org>
   -libplasmagenericshell-4.8.1.ebuild:
diff --git a/kde-base/libplasmagenericshell/libplasmagenericshell-4.8.4.ebuild b/kde-base/libplasmagenericshell/libplasmagenericshell-4.8.4.ebuild
new file mode 100644
index 000000000000..363eeeccc367
--- /dev/null
+++ b/kde-base/libplasmagenericshell/libplasmagenericshell-4.8.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libplasmagenericshell/libplasmagenericshell-4.8.4.ebuild,v 1.1 2012/06/21 21:54:45 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+KMMODULE="libs/plasmagenericshell"
+inherit kde4-meta
+
+DESCRIPTION="Libraries for the KDE Plasma shell"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug test"
+
+DEPEND="
+	$(add_kdebase_dep kephal)
+	$(add_kdebase_dep libkworkspace)
+"
+
+RDEPEND="${DEPEND}"
+
+KMSAVELIBS="true"
+
+KMEXTRACTONLY="
+	libs/kephal/kephal/
+	plasma/desktop/shell/data/
+"
diff --git a/kde-base/libtaskmanager/ChangeLog b/kde-base/libtaskmanager/ChangeLog
index bdaa5edab06b..432037aa3093 100644
--- a/kde-base/libtaskmanager/ChangeLog
+++ b/kde-base/libtaskmanager/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/libtaskmanager
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libtaskmanager/ChangeLog,v 1.122 2012/05/24 11:37:50 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libtaskmanager/ChangeLog,v 1.123 2012/06/21 21:55:06 dilfridge Exp $
+
+*libtaskmanager-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +libtaskmanager-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -libtaskmanager-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/libtaskmanager/libtaskmanager-4.8.4.ebuild b/kde-base/libtaskmanager/libtaskmanager-4.8.4.ebuild
new file mode 100644
index 000000000000..a6bc08fc11d2
--- /dev/null
+++ b/kde-base/libtaskmanager/libtaskmanager-4.8.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libtaskmanager/libtaskmanager-4.8.4.ebuild,v 1.1 2012/06/21 21:55:06 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+KMMODULE="libs/taskmanager"
+inherit kde4-meta
+
+DESCRIPTION="A library that provides basic taskmanager functionality"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kactivities)
+	$(add_kdebase_dep kephal)
+	$(add_kdebase_dep ksysguard)
+	$(add_kdebase_dep libkworkspace)
+"
+RDEPEND="${DEPEND}"
+
+KMSAVELIBS="true"
+
+KMEXTRACTONLY="
+	libs/kephal/
+	libs/kworkspace/
+"
+
+src_prepare() {
+	kde4-meta_src_prepare
+	sed -e 's:ksysguard/processcore/processes.h:ksysguard/processes.h:g' -i "${S}/libs/taskmanager/taskitem.cpp" || die
+	sed -e 's:ksysguard/processcore/process.h:ksysguard/process.h:g' -i "${S}/libs/taskmanager/taskitem.cpp" || die
+}
diff --git a/kde-base/lokalize/ChangeLog b/kde-base/lokalize/ChangeLog
index 5e8de1039d00..ee390279d0c3 100644
--- a/kde-base/lokalize/ChangeLog
+++ b/kde-base/lokalize/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/lokalize
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/lokalize/ChangeLog,v 1.111 2012/05/24 11:37:42 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lokalize/ChangeLog,v 1.112 2012/06/21 21:54:43 dilfridge Exp $
+
+*lokalize-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +lokalize-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -lokalize-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/lokalize/lokalize-4.8.4.ebuild b/kde-base/lokalize/lokalize-4.8.4.ebuild
new file mode 100644
index 000000000000..ea8ca33f411a
--- /dev/null
+++ b/kde-base/lokalize/lokalize-4.8.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lokalize/lokalize-4.8.4.ebuild,v 1.1 2012/06/21 21:54:43 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdesdk"
+PYTHON_DEPEND="2"
+inherit python kde4-meta
+
+DESCRIPTION="KDE4 translation tool"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug semantic-desktop"
+
+DEPEND="
+	>=app-text/hunspell-1.2.8
+	>=x11-libs/qt-sql-4.5.0:4[sqlite]
+	semantic-desktop? ( >=dev-libs/soprano-2.7.6 )
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep kdesdk-strigi-analyzer)
+	$(add_kdebase_dep krosspython)
+	$(add_kdebase_dep pykde4)
+"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+	kde4-meta_pkg_setup
+}
+
+src_install() {
+	kde4-meta_src_install
+	python_convert_shebangs -q -r $(python_get_version) "${ED}/usr/share/apps/${PN}"
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+	echo
+	elog "To be able to autofetch KDE translations in new project wizard, install subversion client:"
+	elog "	emerge -vau subversion"
+	echo
+}
diff --git a/kde-base/lskat/ChangeLog b/kde-base/lskat/ChangeLog
index bb660a03a801..e0d21cb3a33d 100644
--- a/kde-base/lskat/ChangeLog
+++ b/kde-base/lskat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/lskat
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/lskat/ChangeLog,v 1.208 2012/05/24 11:38:00 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lskat/ChangeLog,v 1.209 2012/06/21 21:54:35 dilfridge Exp $
+
+*lskat-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +lskat-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -lskat-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/lskat/lskat-4.8.4.ebuild b/kde-base/lskat/lskat-4.8.4.ebuild
new file mode 100644
index 000000000000..4c3c37399019
--- /dev/null
+++ b/kde-base/lskat/lskat-4.8.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lskat/lskat-4.8.4.ebuild,v 1.1 2012/06/21 21:54:35 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+KDE_SELINUX_MODULE="games"
+inherit kde4-meta
+
+DESCRIPTION="Skat game for KDE"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/marble/ChangeLog b/kde-base/marble/ChangeLog
index aa62e51bc973..828b267ed6d2 100644
--- a/kde-base/marble/ChangeLog
+++ b/kde-base/marble/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/marble
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.142 2012/05/24 11:37:51 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.143 2012/06/21 21:54:39 dilfridge Exp $
+
+*marble-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +marble-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -marble-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/marble/marble-4.8.4.ebuild b/kde-base/marble/marble-4.8.4.ebuild
new file mode 100644
index 000000000000..4260d95a405b
--- /dev/null
+++ b/kde-base/marble/marble-4.8.4.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.8.4.ebuild,v 1.1 2012/06/21 21:54:39 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KDE_REQUIRED="optional"
+CPPUNIT_REQUIRED="optional"
+PYTHON_DEPEND="python? 2"
+inherit kde4-base python
+
+DESCRIPTION="Generic geographical map widget"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug designer-plugin gps +kde plasma python"
+
+# tests fail / segfault. Last checked for 4.2.88
+# RESTRICT=test
+
+DEPEND="
+	gps? ( >=sci-geosciences/gpsd-2.95[qt4] )
+	python? (
+		>=dev-python/PyQt4-4.4.4-r1
+		kde? ( $(add_kdebase_dep pykde4) )
+	)
+"
+RDEPEND="${DEPEND}
+"
+
+REQUIRED_USE="
+	plasma? ( kde )
+	python? ( kde )
+"
+
+pkg_setup() {
+	python_set_active_version 2
+	kde4-base_pkg_setup
+	python_pkg_setup
+}
+
+src_prepare() {
+	kde4-base_src_prepare
+	python_convert_shebangs -r $(python_get_version) .
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN)
+		$(cmake-utils_use python EXPERIMENTAL_PYTHON_BINDINGS)
+		$(cmake-utils_use_with python PyQt4)
+		$(cmake-utils_use_with python PythonLibrary)
+		$(cmake-utils_use_with python SIP)
+		$(cmake-utils_use_with gps libgps)
+		$(cmake-utils_use !kde QTONLY)
+		$(cmake-utils_use_with plasma)
+		-DWITH_liblocation=0
+		$(use kde && cmake-utils_use_with python PyKDE4)
+	)
+
+	kde4-base_src_configure
+}
+
+src_test() {
+	if use kde; then
+		elog "Marble tests can only be run in the qt-only version"
+	else
+		kde4-base_src_test
+	fi
+}
diff --git a/kde-base/mplayerthumbs/ChangeLog b/kde-base/mplayerthumbs/ChangeLog
index 7f67ffb68919..bb2a5fee402a 100644
--- a/kde-base/mplayerthumbs/ChangeLog
+++ b/kde-base/mplayerthumbs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/mplayerthumbs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/mplayerthumbs/ChangeLog,v 1.92 2012/05/24 11:37:42 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/mplayerthumbs/ChangeLog,v 1.93 2012/06/21 21:54:26 dilfridge Exp $
+
+*mplayerthumbs-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +mplayerthumbs-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -mplayerthumbs-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/mplayerthumbs/mplayerthumbs-4.8.4.ebuild b/kde-base/mplayerthumbs/mplayerthumbs-4.8.4.ebuild
new file mode 100644
index 000000000000..2a5bfad6dd53
--- /dev/null
+++ b/kde-base/mplayerthumbs/mplayerthumbs-4.8.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/mplayerthumbs/mplayerthumbs-4.8.4.ebuild,v 1.1 2012/06/21 21:54:26 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kdemultimedia"
+inherit kde4-meta
+
+DESCRIPTION="A Thumbnail Generator for Video Files on KDE filemanagers."
+HOMEPAGE="http://www.kde-apps.org/content/show.php?content=41180"
+LICENSE="GPL-2"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	|| (
+		$(add_kdebase_dep dolphin)
+		$(add_kdebase_dep konqueror)
+	)
+"
+
+src_configure() {
+	mycmakeargs=(
+		-DENABLE_PHONON_SUPPORT=ON
+	)
+
+	kde4-meta_src_configure
+}
diff --git a/kde-base/nepomuk/ChangeLog b/kde-base/nepomuk/ChangeLog
index 9a2a0265cd71..b6eaae44b62d 100644
--- a/kde-base/nepomuk/ChangeLog
+++ b/kde-base/nepomuk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/nepomuk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/nepomuk/ChangeLog,v 1.130 2012/05/24 11:38:03 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nepomuk/ChangeLog,v 1.131 2012/06/21 21:54:55 dilfridge Exp $
+
+*nepomuk-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +nepomuk-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -nepomuk-4.8.1-r1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/nepomuk/nepomuk-4.8.4.ebuild b/kde-base/nepomuk/nepomuk-4.8.4.ebuild
new file mode 100644
index 000000000000..48da3e531d87
--- /dev/null
+++ b/kde-base/nepomuk/nepomuk-4.8.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nepomuk/nepomuk-4.8.4.ebuild,v 1.1 2012/06/21 21:54:55 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="Nepomuk KDE4 client"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	>=app-misc/strigi-0.7.7[dbus,qt4]
+	>=dev-libs/soprano-2.7.6[dbus,raptor,redland,virtuoso]
+	$(add_kdebase_dep kdelibs 'semantic-desktop')
+	!kde-misc/nepomukcontroller
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"
+# bug 392989
diff --git a/kde-base/nsplugins/ChangeLog b/kde-base/nsplugins/ChangeLog
index 84b68d340261..bd27bdcb4c66 100644
--- a/kde-base/nsplugins/ChangeLog
+++ b/kde-base/nsplugins/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/nsplugins
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/ChangeLog,v 1.239 2012/05/24 11:37:50 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/ChangeLog,v 1.240 2012/06/21 21:54:32 dilfridge Exp $
+
+*nsplugins-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +nsplugins-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -nsplugins-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/nsplugins/nsplugins-4.8.4.ebuild b/kde-base/nsplugins/nsplugins-4.8.4.ebuild
new file mode 100644
index 000000000000..af2dc1279f8f
--- /dev/null
+++ b/kde-base/nsplugins/nsplugins-4.8.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/nsplugins-4.8.4.ebuild,v 1.1 2012/06/21 21:54:33 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-baseapps"
+inherit kde4-meta
+
+DESCRIPTION="Netscape plugins support for Konqueror."
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	x11-libs/libXt
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep konqueror)
+"
+
+KMEXTRACTONLY="
+	konqueror/settings/
+"
diff --git a/kde-base/okteta/ChangeLog b/kde-base/okteta/ChangeLog
index 091d335ef773..8ae94d4374f9 100644
--- a/kde-base/okteta/ChangeLog
+++ b/kde-base/okteta/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/okteta
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/okteta/ChangeLog,v 1.112 2012/05/24 11:38:06 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/okteta/ChangeLog,v 1.113 2012/06/21 21:55:03 dilfridge Exp $
+
+*okteta-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +okteta-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -okteta-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/okteta/okteta-4.8.4.ebuild b/kde-base/okteta/okteta-4.8.4.ebuild
new file mode 100644
index 000000000000..53017964b55b
--- /dev/null
+++ b/kde-base/okteta/okteta-4.8.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/okteta/okteta-4.8.4.ebuild,v 1.1 2012/06/21 21:55:03 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdesdk"
+inherit kde4-meta
+
+DESCRIPTION="KDE hexeditor"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	app-crypt/qca:2
+"
+RDEPEND="${DEPEND}"
+
+# bug #264917, removes failing test
+PATCHES=( "${FILESDIR}/${PN}-4.8.2-test.patch" )
diff --git a/kde-base/okular/ChangeLog b/kde-base/okular/ChangeLog
index 38d14b15226e..1a216c1d73ad 100644
--- a/kde-base/okular/ChangeLog
+++ b/kde-base/okular/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/okular
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/ChangeLog,v 1.141 2012/06/16 16:44:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/ChangeLog,v 1.142 2012/06/21 21:55:04 dilfridge Exp $
+
+*okular-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +okular-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   16 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> okular-4.7.4.ebuild,
   okular-4.8.3.ebuild, metadata.xml:
diff --git a/kde-base/okular/okular-4.8.4.ebuild b/kde-base/okular/okular-4.8.4.ebuild
new file mode 100644
index 000000000000..3a69a653a3b1
--- /dev/null
+++ b/kde-base/okular/okular-4.8.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/okular-4.8.4.ebuild,v 1.1 2012/06/21 21:55:04 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="Okular is an universal document viewer based on KPDF for KDE 4."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="chm crypt debug djvu ebook +jpeg +postscript +pdf +tiff"
+
+DEPEND="
+	media-libs/freetype
+	media-libs/qimageblitz
+	sys-libs/zlib
+	chm? ( dev-libs/chmlib )
+	crypt? ( app-crypt/qca:2 )
+	djvu? ( app-text/djvu )
+	ebook? ( app-text/ebook-tools )
+	jpeg? ( virtual/jpeg:0 )
+	pdf? ( >=app-text/poppler-0.12.3-r3[qt4,-exceptions(-)] )
+	postscript? ( app-text/libspectre )
+	tiff? ( media-libs/tiff )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with chm)
+		$(cmake-utils_use_with crypt QCA2)
+		$(cmake-utils_use_with djvu DjVuLibre)
+		$(cmake-utils_use_with ebook EPub)
+		$(cmake-utils_use_with jpeg)
+		$(cmake-utils_use_with postscript LibSpectre)
+		$(cmake-utils_use_with pdf PopplerQt4)
+		$(cmake-utils_use_with pdf Poppler)
+		$(cmake-utils_use_with tiff)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/kde-base/oxygen-icons/ChangeLog b/kde-base/oxygen-icons/ChangeLog
index e5b799540e1a..da9f92e296b3 100644
--- a/kde-base/oxygen-icons/ChangeLog
+++ b/kde-base/oxygen-icons/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/oxygen-icons
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/oxygen-icons/ChangeLog,v 1.109 2012/05/24 11:37:54 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/oxygen-icons/ChangeLog,v 1.110 2012/06/21 21:54:55 dilfridge Exp $
+
+*oxygen-icons-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +oxygen-icons-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -oxygen-icons-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/oxygen-icons/oxygen-icons-4.8.4.ebuild b/kde-base/oxygen-icons/oxygen-icons-4.8.4.ebuild
new file mode 100644
index 000000000000..2352a8c4cf2d
--- /dev/null
+++ b/kde-base/oxygen-icons/oxygen-icons-4.8.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:55 dilfridge Exp $
+
+EAPI=4
+
+if [[ ${PV} == *9999 ]]; then
+	KMNAME="kdesupport"
+else
+	# Upstream does not ship releases properly so we dont want all versions
+	MY_PV="4.8.1"
+	MY_P="${PN}-${MY_PV}"
+fi
+KDE_REQUIRED="never"
+inherit kde4-base
+
+DESCRIPTION="Oxygen SVG icon theme."
+HOMEPAGE="http://www.oxygen-icons.org/"
+[[ ${PV} == *9999 ]] || \
+SRC_URI="
+	!bindist? ( http://dev.gentoo.org/~dilfridge/distfiles/${MY_P}.repacked.tar.xz )
+	bindist? ( ${SRC_URI//${PV}/${MY_PV}} )
+"
+
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="aqua bindist"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+[[ ${PV} == *9999 ]] || S=${WORKDIR}/${MY_P}
diff --git a/kde-base/palapeli/ChangeLog b/kde-base/palapeli/ChangeLog
index e6ee1b028169..af0396e73203 100644
--- a/kde-base/palapeli/ChangeLog
+++ b/kde-base/palapeli/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/palapeli
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/palapeli/ChangeLog,v 1.66 2012/05/24 11:38:07 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/palapeli/ChangeLog,v 1.67 2012/06/21 21:55:00 dilfridge Exp $
+
+*palapeli-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +palapeli-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -palapeli-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/palapeli/palapeli-4.8.4.ebuild b/kde-base/palapeli/palapeli-4.8.4.ebuild
new file mode 100644
index 000000000000..0795d5554140
--- /dev/null
+++ b/kde-base/palapeli/palapeli-4.8.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/palapeli/palapeli-4.8.4.ebuild,v 1.1 2012/06/21 21:55:00 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+inherit kde4-meta
+
+DESCRIPTION="KDE jigsaw puzzle game"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/parley/ChangeLog b/kde-base/parley/ChangeLog
index 07e92035126d..471b230d83cc 100644
--- a/kde-base/parley/ChangeLog
+++ b/kde-base/parley/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/parley
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/parley/ChangeLog,v 1.121 2012/05/24 11:38:03 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/parley/ChangeLog,v 1.122 2012/06/21 21:54:53 dilfridge Exp $
+
+*parley-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +parley-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -parley-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/parley/parley-4.8.4.ebuild b/kde-base/parley/parley-4.8.4.ebuild
new file mode 100644
index 000000000000..a9e29caaceae
--- /dev/null
+++ b/kde-base/parley/parley-4.8.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/parley/parley-4.8.4.ebuild,v 1.1 2012/06/21 21:54:53 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE Educational: vocabulary trainer"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug +plasma"
+
+DEPEND="
+	$(add_kdebase_dep libkdeedu)
+"
+
+KMEXTRACTONLY="
+	libkdeedu/keduvocdocument
+"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with plasma)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/kde-base/perlkde/ChangeLog b/kde-base/perlkde/ChangeLog
index bdd527cccb94..faa59e136cf9 100644
--- a/kde-base/perlkde/ChangeLog
+++ b/kde-base/perlkde/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/perlkde
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/perlkde/ChangeLog,v 1.31 2012/05/24 11:38:06 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/perlkde/ChangeLog,v 1.32 2012/06/21 21:54:42 dilfridge Exp $
+
+*perlkde-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +perlkde-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -perlkde-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/perlkde/perlkde-4.8.4.ebuild b/kde-base/perlkde/perlkde-4.8.4.ebuild
new file mode 100644
index 000000000000..638d4bdd5718
--- /dev/null
+++ b/kde-base/perlkde/perlkde-4.8.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/perlkde/perlkde-4.8.4.ebuild,v 1.1 2012/06/21 21:54:42 dilfridge Exp $
+
+EAPI=4
+
+inherit kde4-base
+
+DESCRIPTION="KDE Perl bindings"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="akonadi attica debug kate okular semantic-desktop test"
+
+RDEPEND="
+	>=dev-lang/perl-5.10.1
+	$(add_kdebase_dep perlqt)
+	$(add_kdebase_dep smokekde 'attica?,kate?,okular?,semantic-desktop=')
+	semantic-desktop? ( >=dev-libs/soprano-2.7.6 )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-perl/List-MoreUtils )
+"
+
+# Split from kdebindings-perl in 4.7
+add_blocker kdebindings-perl
+
+PATCHES=( "${FILESDIR}/${PN}-4.7.2-vendor.patch" )
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with akonadi)
+		$(cmake-utils_use_with akonadi KdepimLibs)
+		$(cmake-utils_use_with attica LibAttica)
+		$(cmake-utils_use_disable kate)
+		$(cmake-utils_use_with okular)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+	)
+	kde4-base_src_configure
+}
diff --git a/kde-base/perlqt/ChangeLog b/kde-base/perlqt/ChangeLog
index dec7a1e11ffd..782185b3c280 100644
--- a/kde-base/perlqt/ChangeLog
+++ b/kde-base/perlqt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/perlqt
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/perlqt/ChangeLog,v 1.35 2012/05/24 11:38:08 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/perlqt/ChangeLog,v 1.36 2012/06/21 21:54:47 dilfridge Exp $
+
+*perlqt-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +perlqt-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -perlqt-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/perlqt/perlqt-4.8.4.ebuild b/kde-base/perlqt/perlqt-4.8.4.ebuild
new file mode 100644
index 000000000000..9da2c02adfe1
--- /dev/null
+++ b/kde-base/perlqt/perlqt-4.8.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/perlqt/perlqt-4.8.4.ebuild,v 1.1 2012/06/21 21:54:47 dilfridge Exp $
+
+EAPI=4
+
+DECLARATIVE_REQUIRED="optional"
+MULTIMEDIA_REQUIRED="optional"
+OPENGL_REQUIRED="optional"
+QTHELP_REQUIRED="optional"
+KDE_REQUIRED="never"
+VIRTUALX_REQUIRED="test"
+inherit kde4-base
+
+DESCRIPTION="Qt Perl bindings"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug phonon qimageblitz qscintilla qwt webkit"
+
+RDEPEND="
+	>=dev-lang/perl-5.10.1
+	dev-perl/List-MoreUtils
+	$(add_kdebase_dep smokeqt 'declarative?,multimedia?,opengl?,phonon?,qimageblitz?,qscintilla?,qthelp?,qwt?,webkit?')
+"
+DEPEND=${RDEPEND}
+
+# Split from kdebindings-perl in 4.7
+add_blocker kdebindings-perl
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.7.2-vendor.patch"
+	"${FILESDIR}/${PN}-4.8.1-tests.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_Qt3Support=ON
+		$(cmake-utils_use_disable declarative QtDeclarative)
+		$(cmake-utils_use_disable multimedia QtMultimedia)
+		$(cmake-utils_use_disable opengl QtOpenGL)
+		$(cmake-utils_use_with phonon)
+		$(cmake-utils_use_with qimageblitz QImageBlitz)
+		$(cmake-utils_use_with qscintilla QScintilla)
+		$(cmake-utils_use_disable qthelp QtHelp)
+		$(cmake-utils_use_disable qwt)
+		$(cmake-utils_use_disable webkit QtWebKit)
+	)
+	kde4-base_src_configure
+}
+
+src_test() {
+	PERL5LIB="${CMAKE_BUILD_DIR}/blib/arch:${CMAKE_BUILD_DIR}/blib/lib" kde4-base_src_test
+}
diff --git a/kde-base/phonon-kde/ChangeLog b/kde-base/phonon-kde/ChangeLog
index b9e47b2f42ed..b2ac026372e5 100644
--- a/kde-base/phonon-kde/ChangeLog
+++ b/kde-base/phonon-kde/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/phonon-kde
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/ChangeLog,v 1.124 2012/05/24 11:38:10 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/ChangeLog,v 1.125 2012/06/21 21:54:46 dilfridge Exp $
+
+*phonon-kde-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +phonon-kde-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -phonon-kde-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/phonon-kde/phonon-kde-4.8.4.ebuild b/kde-base/phonon-kde/phonon-kde-4.8.4.ebuild
new file mode 100644
index 000000000000..d45ef699371b
--- /dev/null
+++ b/kde-base/phonon-kde/phonon-kde-4.8.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:46 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+KMMODULE="phonon"
+inherit kde4-meta
+
+DESCRIPTION="Phonon KDE Integration"
+HOMEPAGE="http://phonon.kde.org"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+LICENSE="GPL-2"
+IUSE="alsa debug pulseaudio"
+
+DEPEND="
+	>=media-libs/phonon-4.4.3
+	alsa? ( media-libs/alsa-lib )
+	pulseaudio? (
+		dev-libs/glib:2
+		media-libs/libcanberra
+		>=media-sound/pulseaudio-0.9.21[glib]
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	mycmakeargs=(
+		-DBUILD_tests=OFF
+		-DWITH_Xine=OFF
+		$(cmake-utils_use_with alsa)
+		$(cmake-utils_use_with pulseaudio PulseAudio)
+	)
+
+	kde4-meta_src_configure
+}
diff --git a/kde-base/plasma-apps/ChangeLog b/kde-base/plasma-apps/ChangeLog
index 2c56b8279b96..c1a50d7e09be 100644
--- a/kde-base/plasma-apps/ChangeLog
+++ b/kde-base/plasma-apps/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/plasma-apps
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-apps/ChangeLog,v 1.110 2012/05/24 11:38:06 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-apps/ChangeLog,v 1.111 2012/06/21 21:54:47 dilfridge Exp $
+
+*plasma-apps-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +plasma-apps-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -plasma-apps-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/plasma-apps/plasma-apps-4.8.4.ebuild b/kde-base/plasma-apps/plasma-apps-4.8.4.ebuild
new file mode 100644
index 000000000000..6861d6c3fa93
--- /dev/null
+++ b/kde-base/plasma-apps/plasma-apps-4.8.4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:47 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-baseapps"
+KMMODULE="plasma"
+inherit kde4-meta
+
+DESCRIPTION="Additional Applets for Plasma"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep libkonq)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-base/plasma-runtime/ChangeLog b/kde-base/plasma-runtime/ChangeLog
index c7e9430b7fc8..83635ef71365 100644
--- a/kde-base/plasma-runtime/ChangeLog
+++ b/kde-base/plasma-runtime/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/plasma-runtime
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-runtime/ChangeLog,v 1.99 2012/05/24 11:37:44 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-runtime/ChangeLog,v 1.100 2012/06/21 21:54:44 dilfridge Exp $
+
+*plasma-runtime-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +plasma-runtime-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -plasma-runtime-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/plasma-runtime/plasma-runtime-4.8.4.ebuild b/kde-base/plasma-runtime/plasma-runtime-4.8.4.ebuild
new file mode 100644
index 000000000000..abb6492c977f
--- /dev/null
+++ b/kde-base/plasma-runtime/plasma-runtime-4.8.4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:44 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+KMMODULE="plasma"
+DECLARATIVE_REQUIRED="always"
+inherit kde4-meta
+
+DESCRIPTION="Script engine and package tool for plasma"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+# file collisions, bug 394997
+add_blocker plasma-workspace 4.4.50
diff --git a/kde-base/plasma-workspace/ChangeLog b/kde-base/plasma-workspace/ChangeLog
index d78fccf69bee..32c209673131 100644
--- a/kde-base/plasma-workspace/ChangeLog
+++ b/kde-base/plasma-workspace/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/plasma-workspace
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.162 2012/05/24 11:37:58 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.163 2012/06/21 21:54:47 dilfridge Exp $
+
+*plasma-workspace-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +plasma-workspace-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -plasma-workspace-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.8.4.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.8.4.ebuild
new file mode 100644
index 000000000000..b337be756f18
--- /dev/null
+++ b/kde-base/plasma-workspace/plasma-workspace-4.8.4.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:47 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-workspace"
+KMMODULE="plasma"
+PYTHON_DEPEND="python? 2"
+inherit python kde4-meta
+
+DESCRIPTION="Plasma: KDE desktop framework"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug google-gadgets gps python qalculate +rss semantic-desktop"
+
+COMMONDEPEND="
+	$(add_kdebase_dep kactivities)
+	$(add_kdebase_dep kdelibs 'semantic-desktop=')
+	$(add_kdebase_dep kephal)
+	$(add_kdebase_dep ksysguard)
+	$(add_kdebase_dep libkworkspace)
+	$(add_kdebase_dep libplasmagenericshell)
+	$(add_kdebase_dep libtaskmanager)
+	$(add_kdebase_dep solid)
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	google-gadgets? ( >=x11-misc/google-gadgets-0.11.0[qt4] )
+	gps? ( >=sci-geosciences/gpsd-2.37 )
+	python? (
+		>=dev-python/PyQt4-4.4.0[X]
+		>=dev-python/sip-4.7.1
+		$(add_kdebase_dep pykde4)
+	)
+	qalculate? ( sci-libs/libqalculate )
+	rss? (
+		$(add_kdebase_dep kdepimlibs 'semantic-desktop=')
+		$(add_kdebase_dep libplasmaclock 'holidays')
+	)
+	!rss? ( $(add_kdebase_dep libplasmaclock '-holidays') )
+"
+DEPEND="${COMMONDEPEND}
+	rss? ( dev-libs/boost )
+	x11-proto/compositeproto
+	x11-proto/damageproto
+	x11-proto/fixesproto
+	x11-proto/renderproto
+"
+RDEPEND="${COMMONDEPEND}
+	$(add_kdebase_dep plasma-runtime)
+"
+
+KMEXTRA="
+	statusnotifierwatcher/
+"
+KMEXTRACTONLY="
+	krunner/dbus/org.freedesktop.ScreenSaver.xml
+	krunner/dbus/org.kde.krunner.App.xml
+	ksmserver/org.kde.KSMServerInterface.xml
+	libs/kephal/
+	libs/kworkspace/
+	libs/taskmanager/
+	libs/plasmagenericshell/
+	libs/ksysguard/
+	ksysguard/
+"
+
+KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+	kde4-meta_pkg_setup
+}
+
+src_unpack() {
+	if use handbook; then
+		KMEXTRA+=" doc/plasma-desktop"
+	fi
+
+	kde4-meta_src_unpack
+}
+
+src_prepare() {
+	sed -i -e '1ifind_package(KdepimLibs)' plasma/CMakeLists.txt || die
+
+	kde4-meta_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with google-gadgets Googlegadgets)
+		$(cmake-utils_use_with gps libgps)
+		$(cmake-utils_use_with python SIP)
+		$(cmake-utils_use_with python PyQt4)
+		$(cmake-utils_use_with python PyKDE4)
+		$(cmake-utils_use_with qalculate)
+		$(cmake-utils_use_with rss KdepimLibs)
+		$(cmake-utils_use_with semantic-desktop Akonadi)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		-DWITH_Xmms=OFF
+	)
+
+	kde4-meta_src_configure
+}
+
+src_install() {
+	kde4-meta_src_install
+
+	rm -f \
+		"${ED}$(python_get_sitedir)"/PyKDE4/*.py[co] \
+		"${ED}"/usr/share/apps/plasma_scriptengine_python/*.py[co]
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	if use python; then
+		python_mod_optimize \
+			PyKDE4 \
+			/usr/share/apps/plasma_scriptengine_python
+	fi
+}
+
+pkg_postrm() {
+	kde4-meta_pkg_postrm
+
+	if [[ -d ${EPREFIX}/usr/share/apps/plasma_scriptengine_python ]]; then
+		python_mod_cleanup \
+			PyKDE4 \
+			/usr/share/apps/plasma_scriptengine_python
+	fi
+}
diff --git a/kde-base/powerdevil/ChangeLog b/kde-base/powerdevil/ChangeLog
index 5eaeeaaaaef1..37e1e5ab6d53 100644
--- a/kde-base/powerdevil/ChangeLog
+++ b/kde-base/powerdevil/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/powerdevil
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/powerdevil/ChangeLog,v 1.114 2012/05/24 11:38:01 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/powerdevil/ChangeLog,v 1.115 2012/06/21 21:54:26 dilfridge Exp $
+
+*powerdevil-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +powerdevil-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -powerdevil-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/powerdevil/powerdevil-4.8.4.ebuild b/kde-base/powerdevil/powerdevil-4.8.4.ebuild
new file mode 100644
index 000000000000..15933a17ba9c
--- /dev/null
+++ b/kde-base/powerdevil/powerdevil-4.8.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/powerdevil/powerdevil-4.8.4.ebuild,v 1.1 2012/06/21 21:54:26 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+inherit kde4-meta
+
+DESCRIPTION="PowerDevil is an utility for KDE4 for Laptop Powermanagement."
+HOMEPAGE="http://www.kde-apps.org/content/show.php/PowerDevil?content=85078"
+LICENSE="GPL-2"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug +pm-utils"
+
+DEPEND="
+	$(add_kdebase_dep kactivities)
+	$(add_kdebase_dep libkworkspace)
+	$(add_kdebase_dep solid)
+"
+RDEPEND="${DEPEND}
+	pm-utils? ( sys-power/pm-utils )
+"
+
+KMEXTRACTONLY="
+	krunner/
+	ksmserver/org.kde.KSMServerInterface.xml
+"
diff --git a/kde-base/printer-applet/ChangeLog b/kde-base/printer-applet/ChangeLog
index c87c687bd62e..c88695842066 100644
--- a/kde-base/printer-applet/ChangeLog
+++ b/kde-base/printer-applet/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/printer-applet
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/printer-applet/ChangeLog,v 1.82 2012/05/24 11:37:45 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/printer-applet/ChangeLog,v 1.83 2012/06/21 21:54:38 dilfridge Exp $
+
+*printer-applet-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +printer-applet-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -printer-applet-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/printer-applet/printer-applet-4.8.4.ebuild b/kde-base/printer-applet/printer-applet-4.8.4.ebuild
new file mode 100644
index 000000000000..c0d37340a195
--- /dev/null
+++ b/kde-base/printer-applet/printer-applet-4.8.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:38 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+PYTHON_DEPEND="2"
+inherit python kde4-base
+
+DESCRIPTION="KDE printer system tray utility"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="
+	>=app-admin/system-config-printer-common-1.2.2
+	$(add_kdebase_dep pykde4)
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	kde4-base_pkg_setup
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	kde4-base_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 CMakeLists.txt || die "failed to rename printer-applet executable"
+	sed -e "/Exec/s/printer-applet/${newname}/" \
+		-i printer-applet.desktop || die "failed to patch .desktop file"
+}
+
+src_install() {
+	kde4-base_src_install
+	python_convert_shebangs -q -r $(python_get_version) "${ED}"
+}
+
+pkg_postrm() {
+	python_mod_cleanup "${PREFIX}share/apps/${PN}"
+}
diff --git a/kde-base/pykde4/ChangeLog b/kde-base/pykde4/ChangeLog
index 113794ffa50b..b59e9e46e2e4 100644
--- a/kde-base/pykde4/ChangeLog
+++ b/kde-base/pykde4/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/pykde4
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.163 2012/05/24 11:38:12 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.164 2012/06/21 21:54:50 dilfridge Exp $
+
+*pykde4-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +pykde4-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -pykde4-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/pykde4/pykde4-4.8.4.ebuild b/kde-base/pykde4/pykde4-4.8.4.ebuild
new file mode 100644
index 000000000000..e82c5e3c081e
--- /dev/null
+++ b/kde-base/pykde4/pykde4-4.8.4.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.8.4.ebuild,v 1.1 2012/06/21 21:54:51 dilfridge Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="*:2.5"
+RESTRICT_PYTHON_ABIS="*-jython 2.4 2.7-pypy-*"
+PYTHON_USE_WITH="threads"
+SUPPORT_PYTHON_ABIS="1"
+
+OPENGL_REQUIRED="always"
+inherit python portability kde4-base multilib
+
+DESCRIPTION="Python bindings for KDE4"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc examples semantic-desktop"
+REQUIRED_USE="test? ( semantic-desktop )"
+
+# blocker added due to compatibility issues and error during compile time
+RDEPEND="
+	>=dev-python/sip-4.12.3-r2
+	$(add_kdebase_dep kdelibs 'opengl,semantic-desktop=')
+	semantic-desktop? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
+	aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,aqua] )
+	!aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,X] )
+"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+"
+
+pkg_setup() {
+	python_pkg_setup
+	kde4-base_pkg_setup
+
+	have_python2=false
+
+	scan_python_versions() {
+		[[ ${PYTHON_ABI} == 2.* ]] && have_python2=true
+		:
+	}
+	python_execute_function -q scan_python_versions
+	if ! ${have_python2}; then
+		ewarn "You do not have a Python 2 version selected."
+		ewarn "kpythonpluginfactory will not be built"
+	fi
+}
+
+src_prepare() {
+	kde4-base_src_prepare
+
+	if ! use examples; then
+		sed -e '/^ADD_SUBDIRECTORY(examples)/s/^/# DISABLED /' -i CMakeLists.txt \
+			|| die "Failed to disable examples"
+	fi
+
+	# See bug 322351
+	use arm && epatch "${FILESDIR}/${PN}-4.4.4-arm-sip.patch"
+
+	sed -i -e 's/kpythonpluginfactory /kpython${PYTHON_SHORT_VERSION}pluginfactory /g' kpythonpluginfactory/CMakeLists.txt
+
+	if ${have_python2}; then
+		mkdir -p "${WORKDIR}/wrapper" || die "failed to copy wrapper"
+		cp "${FILESDIR}/kpythonpluginfactorywrapper.c" "${WORKDIR}/wrapper" || die "failed to copy wrapper"
+	fi
+}
+
+src_configure() {
+	configuration() {
+		local mycmakeargs=(
+			-DWITH_PolkitQt=OFF
+			-DWITH_QScintilla=OFF
+			$(cmake-utils_use_with semantic-desktop Soprano)
+			$(cmake-utils_use_with semantic-desktop Nepomuk)
+			$(cmake-utils_use_with semantic-desktop KdepimLibs)
+			-DPYTHON_EXECUTABLE=$(PYTHON -a)
+		)
+		local CMAKE_BUILD_DIR=${S}_build-${PYTHON_ABI}
+		kde4-base_src_configure
+	}
+
+	python_execute_function configuration
+}
+
+echo_and_run() {
+	echo "$@"
+	"$@"
+}
+
+src_compile() {
+	compilation() {
+		local CMAKE_BUILD_DIR=${S}_build-${PYTHON_ABI}
+		kde4-base_src_compile
+	}
+	python_execute_function compilation
+
+	if ${have_python2}; then
+		cd "${WORKDIR}/wrapper"
+		echo_and_run libtool --tag=CC --mode=compile $(tc-getCC) \
+			-shared \
+			${CFLAGS} ${CPPFLAGS} \
+			-DEPREFIX="\"${EPREFIX}\"" \
+			-DPLUGIN_DIR="\"/usr/$(get_libdir)/kde4\"" -c \
+			-o kpythonpluginfactorywrapper.lo \
+			kpythonpluginfactorywrapper.c
+		echo_and_run libtool --tag=CC --mode=link $(tc-getCC) \
+			-shared -module -avoid-version \
+			${CFLAGS} ${LDFLAGS} \
+			-o kpythonpluginfactory.la \
+			-rpath "${EPREFIX}/usr/$(get_libdir)/kde4" \
+			kpythonpluginfactorywrapper.lo \
+			$(dlopen_lib)
+	fi
+}
+
+src_install() {
+	installation() {
+		cd "${S}_build-${PYTHON_ABI}"
+		emake DESTDIR="${T}/images/${PYTHON_ABI}" install
+	}
+	python_execute_function installation
+
+	python_merge_intermediate_installation_images "${T}/images"
+
+	# As we don't call the eclass's src_install, we have to install the docs manually
+	DOCS=("${S}"/{AUTHORS,NEWS,README})
+	use doc && HTML_DOCS=("${S}/docs/html/")
+	base_src_install_docs
+
+	if ${have_python2}; then
+		cd "${WORKDIR}/wrapper"
+		echo_and_run libtool --mode=install install kpythonpluginfactory.la "${ED}/usr/$(get_libdir)/kde4/kpythonpluginfactory.la"
+		rm "${ED}/usr/$(get_libdir)/kde4/kpythonpluginfactory.la"
+	fi
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	python_mod_optimize PyKDE4 PyQt4/uic/pykdeuic4.py PyQt4/uic/widget-plugins/kde4.py
+
+	if use examples; then
+		echo
+		elog "PyKDE4 examples have been installed to"
+		elog "${EPREFIX}/usr/share/apps/${PN}/examples"
+		echo
+	fi
+}
+
+pkg_postrm() {
+	kde4-base_pkg_postrm
+
+	python_mod_cleanup PyKDE4 PyQt4/uic/pykdeuic4.py PyQt4/uic/widget-plugins/kde4.py
+}
diff --git a/kde-base/qguiplatformplugin_kde/ChangeLog b/kde-base/qguiplatformplugin_kde/ChangeLog
index bc17235780b7..098d294fca92 100644
--- a/kde-base/qguiplatformplugin_kde/ChangeLog
+++ b/kde-base/qguiplatformplugin_kde/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/qguiplatformplugin_kde
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/qguiplatformplugin_kde/ChangeLog,v 1.70 2012/05/24 11:37:58 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qguiplatformplugin_kde/ChangeLog,v 1.71 2012/06/21 21:54:51 dilfridge Exp $
+
+*qguiplatformplugin_kde-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +qguiplatformplugin_kde-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org>
   -qguiplatformplugin_kde-4.8.1.ebuild:
diff --git a/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.8.4.ebuild b/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.8.4.ebuild
new file mode 100644
index 000000000000..976fe3eb3717
--- /dev/null
+++ b/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.8.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:51 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+inherit kde4-meta
+
+DESCRIPTION="Helps integration of pure Qt applications with KDE Workspace"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/qtruby/ChangeLog b/kde-base/qtruby/ChangeLog
index 64d6b4107b5b..637c2b83e30e 100644
--- a/kde-base/qtruby/ChangeLog
+++ b/kde-base/qtruby/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/qtruby
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/qtruby/ChangeLog,v 1.112 2012/05/24 11:37:55 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtruby/ChangeLog,v 1.113 2012/06/21 21:54:46 dilfridge Exp $
+
+*qtruby-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +qtruby-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -qtruby-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/qtruby/qtruby-4.8.4.ebuild b/kde-base/qtruby/qtruby-4.8.4.ebuild
new file mode 100644
index 000000000000..d4a040960d99
--- /dev/null
+++ b/kde-base/qtruby/qtruby-4.8.4.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtruby/qtruby-4.8.4.ebuild,v 1.1 2012/06/21 21:54:46 dilfridge Exp $
+
+EAPI=4
+
+OPENGL_REQUIRED="always"
+DECLARATIVE_REQUIRED="optional"
+KDE_REQUIRED="never"
+USE_RUBY="ruby18"
+# No ruby19 for three reasons:
+# 1) it does not build (yet) - will likely be solved soon
+# 2) cmake bails when configuring twice or more - solved with CMAKE_IN_SOURCE_BUILD=1
+# 3) the ebuild can only be installed for one ruby variant, otherwise the compiled
+#    files with identical path+name will overwrite each other - difficult :(
+
+inherit kde4-base ruby-ng
+
+DESCRIPTION="Qt Ruby bindings"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug phonon qscintilla qwt webkit"
+
+DEPEND="
+	$(add_kdebase_dep smokeqt 'declarative?,opengl,phonon?,qscintilla?,qwt?,webkit?')
+"
+
+RDEPEND="${DEPEND}
+"
+
+# Split from kdebindings-ruby in 4.7
+add_blocker kdebindings-ruby
+
+pkg_setup() {
+	ruby-ng_pkg_setup
+	kde4-base_pkg_setup
+}
+
+src_unpack() {
+	local S="${WORKDIR}/${P}"
+	kde4-base_src_unpack
+
+	cd "${WORKDIR}"
+	mkdir all
+	mv ${P} all/ || die "Could not move sources"
+}
+
+all_ruby_prepare() {
+	kde4-base_src_prepare
+}
+
+each_ruby_configure() {
+	local CMAKE_USE_DIR=${S}
+	mycmakeargs=(
+		-DRUBY_LIBRARY=$(ruby_get_libruby)
+		-DRUBY_INCLUDE_PATH=$(ruby_get_hdrdir)
+		-DRUBY_EXECUTABLE=${RUBY}
+		$(cmake-utils_use_disable declarative QtDeclarative)
+		$(cmake-utils_use_with phonon)
+		$(cmake-utils_use_with qscintilla QScintilla)
+		$(cmake-utils_use_with qwt Qwt5)
+		$(cmake-utils_use_disable webkit QtWebKit)
+	)
+	kde4-base_src_configure
+}
+
+each_ruby_compile() {
+	local CMAKE_USE_DIR=${S}
+	kde4-base_src_compile
+}
+
+each_ruby_install() {
+	local CMAKE_USE_DIR=${S}
+	kde4-base_src_install
+}
diff --git a/kde-base/qyoto/ChangeLog b/kde-base/qyoto/ChangeLog
index 310fec302a5d..7438b2ffdab5 100644
--- a/kde-base/qyoto/ChangeLog
+++ b/kde-base/qyoto/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/qyoto
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/qyoto/ChangeLog,v 1.28 2012/05/24 11:37:56 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qyoto/ChangeLog,v 1.29 2012/06/21 21:54:36 dilfridge Exp $
+
+*qyoto-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +qyoto-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -qyoto-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/qyoto/qyoto-4.8.4.ebuild b/kde-base/qyoto/qyoto-4.8.4.ebuild
new file mode 100644
index 000000000000..81cf163a3018
--- /dev/null
+++ b/kde-base/qyoto/qyoto-4.8.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qyoto/qyoto-4.8.4.ebuild,v 1.1 2012/06/21 21:54:36 dilfridge Exp $
+
+EAPI=4
+
+KDE_REQUIRED="never"
+inherit kde4-base mono
+
+DESCRIPTION="C# bindings for Qt"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug +phonon qscintilla webkit"
+
+DEPEND="
+	dev-lang/mono
+	$(add_kdebase_dep smokeqt 'opengl,phonon?,qscintilla?,webkit?')
+"
+RDEPEND="${DEPEND}"
+
+# Split from kdebindings-csharp in 4.7
+add_blocker kdebindings-csharp
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with phonon)
+		$(cmake-utils_use_disable qscintilla QScintilla)
+		$(cmake-utils_use_disable webkit QtWebKit)
+	)
+	kde4-base_src_configure
+}
diff --git a/kde-base/renamedlg-plugins/ChangeLog b/kde-base/renamedlg-plugins/ChangeLog
index a05a793f4ea5..c01f83ba337f 100644
--- a/kde-base/renamedlg-plugins/ChangeLog
+++ b/kde-base/renamedlg-plugins/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/renamedlg-plugins
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/renamedlg-plugins/ChangeLog,v 1.108 2012/05/24 11:37:46 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/renamedlg-plugins/ChangeLog,v 1.109 2012/06/21 21:54:34 dilfridge Exp $
+
+*renamedlg-plugins-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +renamedlg-plugins-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org>
   -renamedlg-plugins-4.8.1.ebuild:
diff --git a/kde-base/renamedlg-plugins/renamedlg-plugins-4.8.4.ebuild b/kde-base/renamedlg-plugins/renamedlg-plugins-4.8.4.ebuild
new file mode 100644
index 000000000000..ae559cbc1031
--- /dev/null
+++ b/kde-base/renamedlg-plugins/renamedlg-plugins-4.8.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:34 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+KMMODULE="renamedlgplugins"
+inherit kde4-meta
+
+DESCRIPTION="KDE RenameDlg plugins"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/rocs/ChangeLog b/kde-base/rocs/ChangeLog
index 45fa06b9873a..8f0f145f7560 100644
--- a/kde-base/rocs/ChangeLog
+++ b/kde-base/rocs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/rocs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/rocs/ChangeLog,v 1.75 2012/05/24 11:38:03 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/rocs/ChangeLog,v 1.76 2012/06/21 21:55:06 dilfridge Exp $
+
+*rocs-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +rocs-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -rocs-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/rocs/rocs-4.8.4.ebuild b/kde-base/rocs/rocs-4.8.4.ebuild
new file mode 100644
index 000000000000..c5979b503529
--- /dev/null
+++ b/kde-base/rocs/rocs-4.8.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/rocs/rocs-4.8.4.ebuild,v 1.1 2012/06/21 21:55:06 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE4 interface to work with Graph Theory"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND=">=dev-libs/boost-1.43"
+DEPEND="
+	${RDEPEND}
+	>=dev-cpp/eigen-2.0.3:2
+"
+
+RESTRICT="test"
+# bug 376909
diff --git a/kde-base/smokegen/ChangeLog b/kde-base/smokegen/ChangeLog
index 622378748b59..7f52cebb9e80 100644
--- a/kde-base/smokegen/ChangeLog
+++ b/kde-base/smokegen/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/smokegen
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/smokegen/ChangeLog,v 1.28 2012/05/24 11:37:47 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smokegen/ChangeLog,v 1.29 2012/06/21 21:54:30 dilfridge Exp $
+
+*smokegen-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +smokegen-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -smokegen-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/smokegen/smokegen-4.8.4.ebuild b/kde-base/smokegen/smokegen-4.8.4.ebuild
new file mode 100644
index 000000000000..13fb121b59d9
--- /dev/null
+++ b/kde-base/smokegen/smokegen-4.8.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smokegen/smokegen-4.8.4.ebuild,v 1.1 2012/06/21 21:54:31 dilfridge Exp $
+
+EAPI=4
+
+KDE_REQUIRED="never"
+inherit kde4-base
+
+DESCRIPTION="Scripting Meta Object Kompiler Engine - generators"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="aqua debug"
+
+DEPEND="
+	x11-libs/qt-core:4[aqua=]
+"
+RDEPEND="${DEPEND}"
+
+add_blocker smoke
diff --git a/kde-base/smokekde/ChangeLog b/kde-base/smokekde/ChangeLog
index c9b69942e857..9064b28cd750 100644
--- a/kde-base/smokekde/ChangeLog
+++ b/kde-base/smokekde/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/smokekde
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/smokekde/ChangeLog,v 1.28 2012/05/24 11:38:03 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smokekde/ChangeLog,v 1.29 2012/06/21 21:55:03 dilfridge Exp $
+
+*smokekde-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +smokekde-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -smokekde-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/smokekde/smokekde-4.8.4.ebuild b/kde-base/smokekde/smokekde-4.8.4.ebuild
new file mode 100644
index 000000000000..652f6eaff6ee
--- /dev/null
+++ b/kde-base/smokekde/smokekde-4.8.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smokekde/smokekde-4.8.4.ebuild,v 1.1 2012/06/21 21:55:03 dilfridge Exp $
+
+EAPI=4
+
+inherit kde4-base
+
+DESCRIPTION="Scripting Meta Object Kompiler Engine - KDE bindings"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="attica debug kate okular semantic-desktop"
+
+DEPEND="
+	$(add_kdebase_dep kdelibs 'semantic-desktop=')
+	$(add_kdebase_dep smokeqt)
+	attica? ( dev-libs/libattica )
+	kate? ( $(add_kdebase_dep kate) )
+	okular? ( $(add_kdebase_dep okular) )
+	semantic-desktop? ( $(add_kdebase_dep kdepimlibs) )
+"
+RDEPEND="${DEPEND}"
+
+add_blocker smoke
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with attica LibAttica)
+		$(cmake-utils_use_disable kate)
+		$(cmake-utils_use_with okular)
+		$(cmake-utils_use_with semantic-desktop Akonadi)
+		$(cmake-utils_use_with semantic-desktop KdepimLibs)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+	)
+	kde4-base_src_configure
+}
diff --git a/kde-base/smokeqt/ChangeLog b/kde-base/smokeqt/ChangeLog
index 3569ff2b5da9..1589ea94d7fd 100644
--- a/kde-base/smokeqt/ChangeLog
+++ b/kde-base/smokeqt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/smokeqt
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/smokeqt/ChangeLog,v 1.27 2012/05/24 11:38:03 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smokeqt/ChangeLog,v 1.28 2012/06/21 21:54:31 dilfridge Exp $
+
+*smokeqt-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +smokeqt-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -smokeqt-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/smokeqt/smokeqt-4.8.4.ebuild b/kde-base/smokeqt/smokeqt-4.8.4.ebuild
new file mode 100644
index 000000000000..c43824ec493f
--- /dev/null
+++ b/kde-base/smokeqt/smokeqt-4.8.4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smokeqt/smokeqt-4.8.4.ebuild,v 1.1 2012/06/21 21:54:31 dilfridge Exp $
+
+EAPI=4
+
+DECLARATIVE_REQUIRED="optional"
+MULTIMEDIA_REQUIRED="optional"
+QTHELP_REQUIRED="optional"
+OPENGL_REQUIRED="optional"
+KDE_REQUIRED="never"
+
+inherit kde4-base
+
+DESCRIPTION="Scripting Meta Object Kompiler Engine - Qt bindings"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug +phonon qimageblitz qscintilla qwt webkit"
+
+# Maybe make more of Qt optional?
+DEPEND="
+	$(add_kdebase_dep smokegen)
+	x11-libs/qt-core:4
+	x11-libs/qt-dbus:4
+	x11-libs/qt-gui:4
+	x11-libs/qt-script:4
+	x11-libs/qt-sql:4
+	x11-libs/qt-svg:4
+	x11-libs/qt-test:4
+	phonon? ( >=media-libs/phonon-4.4.3 )
+	qimageblitz? ( >=media-libs/qimageblitz-0.0.4 )
+	qscintilla? ( x11-libs/qscintilla )
+	qwt? ( x11-libs/qwt:5 )
+	webkit? ( x11-libs/qt-webkit:4 )
+"
+RDEPEND="${DEPEND}"
+
+# Split in 4.7
+add_blocker smoke
+
+src_configure() {
+	mycmakeargs=(
+		-DDISABLE_Qt3Support=ON
+		-DWITH_QT3_SUPPORT=OFF
+		$(cmake-utils_use_disable declarative QtDeclarative)
+		$(cmake-utils_use_disable multimedia QtMultimedia)
+		$(cmake-utils_use_disable opengl QtOpenGL)
+		$(cmake-utils_use_with phonon)
+		$(cmake-utils_use_with qimageblitz QImageBlitz)
+		$(cmake-utils_use_with qscintilla QScintilla)
+		$(cmake-utils_use_disable qthelp QtHelp)
+		$(cmake-utils_use_disable qwt Qwt5)
+		$(cmake-utils_use_disable webkit QtWebKit)
+	)
+	kde4-base_src_configure
+}
diff --git a/kde-base/solid-runtime/ChangeLog b/kde-base/solid-runtime/ChangeLog
index 795e6276eff1..d6496680fee7 100644
--- a/kde-base/solid-runtime/ChangeLog
+++ b/kde-base/solid-runtime/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/solid-runtime
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/solid-runtime/ChangeLog,v 1.74 2012/05/24 11:37:46 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/solid-runtime/ChangeLog,v 1.75 2012/06/21 21:54:30 dilfridge Exp $
+
+*solid-runtime-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +solid-runtime-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -solid-runtime-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/solid-runtime/solid-runtime-4.8.4.ebuild b/kde-base/solid-runtime/solid-runtime-4.8.4.ebuild
new file mode 100644
index 000000000000..d12cc4ab328a
--- /dev/null
+++ b/kde-base/solid-runtime/solid-runtime-4.8.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:54:30 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+KMNOMODULE=true
+inherit kde4-meta
+
+DESCRIPTION="KDE SC solid runtime modules (autoeject, automounter and others)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+KMEXTRA="
+	solid-device-automounter/
+	solid-hardware/
+	solid-networkstatus/
+	solidautoeject/
+	soliduiserver/
+"
+
+# file collisions, bug 395001
+add_blocker solid 4.4.50
diff --git a/kde-base/solid/ChangeLog b/kde-base/solid/ChangeLog
index 03b945485ffe..1f532d5cee1d 100644
--- a/kde-base/solid/ChangeLog
+++ b/kde-base/solid/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/solid
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/ChangeLog,v 1.144 2012/05/24 11:37:57 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/ChangeLog,v 1.145 2012/06/21 21:54:34 dilfridge Exp $
+
+*solid-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +solid-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -solid-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/solid/solid-4.8.4.ebuild b/kde-base/solid/solid-4.8.4.ebuild
new file mode 100644
index 000000000000..0735efed4573
--- /dev/null
+++ b/kde-base/solid/solid-4.8.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/solid-4.8.4.ebuild,v 1.1 2012/06/21 21:54:34 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+CPPUNIT_REQUIRED="test"
+inherit kde4-meta
+
+DESCRIPTION="Solid: the KDE hardware library"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug bluetooth networkmanager wicd"
+
+DEPEND="
+	networkmanager? ( net-misc/networkmanager )
+	wicd? ( net-misc/wicd )
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep solid-runtime)
+"
+
+PDEPEND="bluetooth? ( net-wireless/bluedevil )"
+
+KMEXTRA="
+	libs/solid/
+"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with networkmanager NetworkManager)
+		$(cmake-utils_use_build wicd)
+	)
+
+	kde4-meta_src_configure
+}
diff --git a/kde-base/step/ChangeLog b/kde-base/step/ChangeLog
index 016323602949..db3d6ae9c8be 100644
--- a/kde-base/step/ChangeLog
+++ b/kde-base/step/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/step
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/step/ChangeLog,v 1.110 2012/05/24 11:38:07 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/step/ChangeLog,v 1.111 2012/06/21 21:54:28 dilfridge Exp $
+
+*step-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +step-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -step-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/step/step-4.8.4.ebuild b/kde-base/step/step-4.8.4.ebuild
new file mode 100644
index 000000000000..cf9442c20f19
--- /dev/null
+++ b/kde-base/step/step-4.8.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/step/step-4.8.4.ebuild,v 1.1 2012/06/21 21:54:28 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="The KDE physics simulator"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug +gsl +qalculate"
+
+DEPEND="
+	>=dev-cpp/eigen-2.0.3:2
+	sci-libs/cln
+	>=sci-mathematics/gmm-3.0
+	gsl? ( >=sci-libs/gsl-1.9-r1 )
+	qalculate? ( >=sci-libs/libqalculate-0.9.5 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.3.2-solaris.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with gsl)
+		$(cmake-utils_use_with qalculate)
+	)
+	kde4-base_src_configure
+}
diff --git a/kde-base/superkaramba/ChangeLog b/kde-base/superkaramba/ChangeLog
index 70fc408dd6a5..b40a52f3d5ac 100644
--- a/kde-base/superkaramba/ChangeLog
+++ b/kde-base/superkaramba/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/superkaramba
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/ChangeLog,v 1.202 2012/05/24 11:37:52 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/ChangeLog,v 1.203 2012/06/21 21:54:39 dilfridge Exp $
+
+*superkaramba-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +superkaramba-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -superkaramba-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/superkaramba/superkaramba-4.8.4.ebuild b/kde-base/superkaramba/superkaramba-4.8.4.ebuild
new file mode 100644
index 000000000000..3caba54e1f3a
--- /dev/null
+++ b/kde-base/superkaramba/superkaramba-4.8.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/superkaramba-4.8.4.ebuild,v 1.1 2012/06/21 21:54:39 dilfridge Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="python? 2"
+inherit python kde4-base
+
+DESCRIPTION="A tool to create interactive applets for the KDE desktop."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug python"
+
+DEPEND="
+	media-libs/qimageblitz
+	python? ( $(add_kdebase_dep pykde4) )
+"
+RDEPEND="${DEPEND}
+	python? ( $(add_kdebase_dep krosspython) )
+"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+	kde4-base_pkg_setup
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with python PythonLibs)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/kde-base/svgpart/ChangeLog b/kde-base/svgpart/ChangeLog
index 1b317fcdefab..a1265d8832fd 100644
--- a/kde-base/svgpart/ChangeLog
+++ b/kde-base/svgpart/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/svgpart
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/svgpart/ChangeLog,v 1.119 2012/05/24 11:37:50 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/svgpart/ChangeLog,v 1.120 2012/06/21 21:54:27 dilfridge Exp $
+
+*svgpart-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +svgpart-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -svgpart-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/svgpart/svgpart-4.8.4.ebuild b/kde-base/svgpart/svgpart-4.8.4.ebuild
new file mode 100644
index 000000000000..7876fe476eec
--- /dev/null
+++ b/kde-base/svgpart/svgpart-4.8.4.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/svgpart/svgpart-4.8.4.ebuild,v 1.1 2012/06/21 21:54:27 dilfridge Exp $
+
+EAPI=4
+
+inherit kde4-base
+
+DESCRIPTION="Svgpart is a kpart for viewing SVGs"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/sweeper/ChangeLog b/kde-base/sweeper/ChangeLog
index 890648668f6b..8edab75a924c 100644
--- a/kde-base/sweeper/ChangeLog
+++ b/kde-base/sweeper/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/sweeper
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/sweeper/ChangeLog,v 1.114 2012/05/24 11:37:53 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/sweeper/ChangeLog,v 1.115 2012/06/21 21:54:48 dilfridge Exp $
+
+*sweeper-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> +sweeper-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -sweeper-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/sweeper/sweeper-4.8.4.ebuild b/kde-base/sweeper/sweeper-4.8.4.ebuild
new file mode 100644
index 000000000000..f09f80edb2e3
--- /dev/null
+++ b/kde-base/sweeper/sweeper-4.8.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/sweeper/sweeper-4.8.4.ebuild,v 1.1 2012/06/21 21:54:48 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE Privacy Settings Widget"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
diff --git a/kde-base/system-config-printer-kde/ChangeLog b/kde-base/system-config-printer-kde/ChangeLog
index c1b098ac7a8e..8f4c9b996805 100644
--- a/kde-base/system-config-printer-kde/ChangeLog
+++ b/kde-base/system-config-printer-kde/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/system-config-printer-kde
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/system-config-printer-kde/ChangeLog,v 1.82 2012/05/24 11:37:48 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/system-config-printer-kde/ChangeLog,v 1.83 2012/06/21 21:55:01 dilfridge Exp $
+
+*system-config-printer-kde-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +system-config-printer-kde-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org>
   -system-config-printer-kde-4.8.1.ebuild:
diff --git a/kde-base/system-config-printer-kde/system-config-printer-kde-4.8.4.ebuild b/kde-base/system-config-printer-kde/system-config-printer-kde-4.8.4.ebuild
new file mode 100644
index 000000000000..8f45865cf503
--- /dev/null
+++ b/kde-base/system-config-printer-kde/system-config-printer-kde-4.8.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/06/21 21:55:01 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kdeadmin"
+PYTHON_DEPEND="2"
+inherit python kde4-meta
+
+DESCRIPTION="KDE port of Red Hat's Gnome system-config-printer"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+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() {
+	python_set_active_version 2
+	python_pkg_setup
+	kde4-meta_pkg_setup
+}
+
+src_install() {
+	kde4-meta_src_install
+	python_convert_shebangs -q -r $(python_get_version) "${ED}"
+}
+
+pkg_postrm() {
+	python_mod_cleanup "${PREFIX}share/apps/${PN}"
+}
diff --git a/kde-base/systemsettings/ChangeLog b/kde-base/systemsettings/ChangeLog
index 0d9a1842f73f..b1c9fbde061a 100644
--- a/kde-base/systemsettings/ChangeLog
+++ b/kde-base/systemsettings/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/systemsettings
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.151 2012/05/24 11:37:58 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.152 2012/06/21 21:54:37 dilfridge Exp $
+
+*systemsettings-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +systemsettings-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -systemsettings-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/systemsettings/systemsettings-4.8.4.ebuild b/kde-base/systemsettings/systemsettings-4.8.4.ebuild
new file mode 100644
index 000000000000..651d4bf07485
--- /dev/null
+++ b/kde-base/systemsettings/systemsettings-4.8.4.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.8.4.ebuild,v 1.1 2012/06/21 21:54:37 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-workspace"
+OPENGL_REQUIRED="optional"
+VIRTUALX_REQUIRED="test"
+VIRTUALDBUS_TEST="true"
+inherit kde4-meta
+
+DESCRIPTION="System settings utility"
+IUSE="debug gtk +usb"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+COMMONDEPEND="
+	dev-libs/glib:2
+	$(add_kdebase_dep libkworkspace)
+	media-libs/fontconfig
+	>=media-libs/freetype-2
+	>=x11-libs/libxklavier-3.2
+	x11-libs/libXcursor
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXft
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	opengl? ( virtual/opengl )
+	usb? ( virtual/libusb:0 )
+"
+DEPEND="${COMMONDEPEND}
+	x11-proto/kbproto
+	x11-proto/xextproto
+"
+RDEPEND="${COMMONDEPEND}
+	sys-libs/timezone-data
+	x11-apps/setxkbmap
+	x11-misc/xkeyboard-config
+	gtk? ( kde-misc/kde-gtk-config )
+"
+
+KMEXTRA="
+	kcontrol/
+"
+KMEXTRACTONLY="
+	krunner/dbus/org.kde.krunner.App.xml
+	krunner/dbus/org.kde.screensaver.xml
+	kwin/
+	libs/
+	plasma/
+"
+
+add_blocker kdeaccessibility-colorschemes '<4.6.50'
+
+src_unpack() {
+	if use handbook; then
+		KMEXTRA+="
+			doc/kcontrol
+			doc/kfontview
+		"
+	fi
+
+	kde4-meta_src_unpack
+}
+
+src_prepare() {
+	sed -i -e 's/systemsettingsrc DESTINATION ${SYSCONF_INSTALL_DIR}/systemsettingsrc DESTINATION ${CONFIG_INSTALL_DIR}/' \
+		systemsettings/CMakeLists.txt \
+		|| die "Failed to fix systemsettingsrc install location"
+
+	kde4-meta_src_prepare
+}
+
+# FIXME: is have_openglxvisual found without screensaver
+src_configure() {
+	# Old keyboard-detection code is unmaintained,
+	# so we force the new stuff, using libxklavier.
+	mycmakeargs=(
+		-DUSE_XKLAVIER=ON -DWITH_LibXKlavier=ON
+		-DWITH_GLIB2=ON -DWITH_GObject=ON
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with usb)
+	)
+
+	kde4-meta_src_configure
+}
diff --git a/kde-base/thumbnailers/ChangeLog b/kde-base/thumbnailers/ChangeLog
index 0a41fe4df41a..176863b7c274 100644
--- a/kde-base/thumbnailers/ChangeLog
+++ b/kde-base/thumbnailers/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/thumbnailers
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/thumbnailers/ChangeLog,v 1.90 2012/05/24 11:37:54 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/thumbnailers/ChangeLog,v 1.91 2012/06/21 21:54:35 dilfridge Exp $
+
+*thumbnailers-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +thumbnailers-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -thumbnailers-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/thumbnailers/thumbnailers-4.8.4.ebuild b/kde-base/thumbnailers/thumbnailers-4.8.4.ebuild
new file mode 100644
index 000000000000..6dec1b1b7e65
--- /dev/null
+++ b/kde-base/thumbnailers/thumbnailers-4.8.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/thumbnailers/thumbnailers-4.8.4.ebuild,v 1.1 2012/06/21 21:54:35 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kdegraphics-thumbnailers"
+inherit kde4-base
+
+DESCRIPTION="KDE 4 thumbnail generators for PDF/PS files"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep libkdcraw)
+	$(add_kdebase_dep libkexiv2)
+	media-libs/lcms:0
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${KMNAME}-${PV}"
diff --git a/kde-base/umbrello/ChangeLog b/kde-base/umbrello/ChangeLog
index ec6c6f3a3280..0497a7c0ed8d 100644
--- a/kde-base/umbrello/ChangeLog
+++ b/kde-base/umbrello/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/umbrello
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/ChangeLog,v 1.207 2012/05/24 11:37:53 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/ChangeLog,v 1.208 2012/06/21 21:54:31 dilfridge Exp $
+
+*umbrello-4.8.4 (21 Jun 2012)
+
+  21 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +umbrello-4.8.4.ebuild:
+  Version bump KDE SC 4.8.4
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -umbrello-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/umbrello/umbrello-4.8.4.ebuild b/kde-base/umbrello/umbrello-4.8.4.ebuild
new file mode 100644
index 000000000000..773e93261890
--- /dev/null
+++ b/kde-base/umbrello/umbrello-4.8.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/umbrello-4.8.4.ebuild,v 1.1 2012/06/21 21:54:31 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdesdk"
+
+inherit kde4-meta
+
+DESCRIPTION="KDE UML Modeller"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	dev-libs/libxml2
+	dev-libs/libxslt
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"