[gentoo-commits] proj/kde-sunset:master commit in: kde-base/kcheckpass/, kde-apps/konq-plugins/, kde-base/kdm/, kde-apps/kpat/, ...

[Andreas Sturmlechner]

commit:     79bfa1058bf406201182c79584af5929e9f699c3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 16 17:13:37 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 16 18:06:53 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=79bfa105

*/*: Undo part of sed gone wrong

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5.10.ebuild     | 2 +-
 kde-apps/kdebase-data/kdebase-data-3.5.10-r1.ebuild                   | 4 ++--
 kde-apps/kdebase-data/kdebase-data-3.5.10.ebuild                      | 4 ++--
 kde-apps/kdebase-kioslaves/kdebase-kioslaves-3.5.10-r1.ebuild         | 2 +-
 kde-apps/kdebase-kioslaves/kdebase-kioslaves-3.5.10-r2.ebuild         | 2 +-
 kde-apps/kdebase-kioslaves/kdebase-kioslaves-3.5.10.ebuild            | 2 +-
 kde-apps/kmail/kmail-3.5.10-r1.ebuild                                 | 4 ++--
 kde-apps/kmail/kmail-3.5.10-r2.ebuild                                 | 4 ++--
 kde-apps/kmail/kmail-3.5.10.ebuild                                    | 4 ++--
 kde-apps/konq-plugins/konq-plugins-3.5.10.ebuild                      | 2 +-
 kde-apps/kpat/kpat-3.5.10.ebuild                                      | 2 +-
 kde-base/kate-plugins/kate-plugins-3.5.10.ebuild                      | 2 +-
 kde-base/kbstateapplet/kbstateapplet-3.5.10.ebuild                    | 2 +-
 kde-base/kcheckpass/kcheckpass-3.5.10.ebuild                          | 2 +-
 kde-base/kde-meta/kde-meta-3.5.10.ebuild                              | 2 +-
 kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.5.10.ebuild  | 2 +-
 kde-base/kdebase-meta/kdebase-meta-3.5.10.ebuild                      | 4 ++--
 kde-base/kdebase-pam/kdebase-pam-7.ebuild                             | 2 +-
 kde-base/kdebase-startkde/kdebase-startkde-3.5.10-r5.ebuild           | 2 +-
 kde-base/kdejava/kdejava-3.5.10.ebuild                                | 2 +-
 kde-base/kdm/kdm-3.5.10.ebuild                                        | 2 +-
 kde-base/kicker-applets/kicker-applets-3.5.10.ebuild                  | 2 +-
 kde-base/kjsembed/kjsembed-3.5.10.ebuild                              | 2 +-
 kde-base/konqueror-akregator/konqueror-akregator-3.5.10.ebuild        | 2 +-
 kde-base/korn/korn-3.5.10.ebuild                                      | 2 +-
 kde-base/kpdf/kpdf-3.5.10-r1.ebuild                                   | 2 +-
 kde-base/kpdf/kpdf-3.5.10-r2.ebuild                                   | 2 +-
 kde-base/kpdf/kpdf-3.5.10-r3.ebuild                                   | 2 +-
 kde-base/kpdf/kpdf-3.5.10-r4.ebuild                                   | 2 +-
 kde-base/kpdf/kpdf-3.5.10.ebuild                                      | 2 +-
 kde-base/kttsd/kttsd-3.5.10.ebuild                                    | 2 +-
 kde-base/kviewshell/kviewshell-3.5.10.ebuild                          | 2 +-
 media-gfx/showimg/showimg-0.9.5-r1.ebuild                             | 2 +-
 media-gfx/showimg/showimg-0.9.5-r2.ebuild                             | 2 +-
 media-video/subtitlecomposer/subtitlecomposer-0.4.3-r1.ebuild         | 2 +-
 sci-mathematics/koctave/koctave-0.70.ebuild                           | 2 +-
 36 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/kde-apps/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5.10.ebuild b/kde-apps/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5.10.ebuild
index 3253f58c..fb1139de 100644
--- a/kde-apps/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5.10.ebuild
+++ b/kde-apps/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5.10.ebuild
@@ -10,7 +10,7 @@ inherit kde-meta
 DESCRIPTION="Extra screensavers for kde"
 KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86"
 IUSE="opengl xscreensaver"
-DEPEND="|| ( >=kde-base/kscreensaver-${PV}:${SLOT} >=kde-frameworks/kdelibs-${PV}:${SLOT} )
+DEPEND="|| ( >=kde-base/kscreensaver-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )
 	media-libs/libart_lgpl
 	opengl? ( virtual/opengl )
 	xscreensaver? ( x11-misc/xscreensaver )"

diff --git a/kde-apps/kdebase-data/kdebase-data-3.5.10-r1.ebuild b/kde-apps/kdebase-data/kdebase-data-3.5.10-r1.ebuild
index d991e3b6..46c42c20 100644
--- a/kde-apps/kdebase-data/kdebase-data-3.5.10-r1.ebuild
+++ b/kde-apps/kdebase-data/kdebase-data-3.5.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kdelibs-data/kdebase-data-3.5.10.ebuild,v 1.7 2009/07/12 09:24:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/kdebase-data-3.5.10.ebuild,v 1.7 2009/07/12 09:24:14 armin76 Exp $
 
 EAPI="1"
 RESTRICT="binchecks strip"
@@ -14,7 +14,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="
-!kde-frameworks/kdelibs-l10n !kde-base/kdebase-applnk !kde-base/kdebase-pics" # replaced these three ebuilds
+!kde-base/kdebase-l10n !kde-base/kdebase-applnk !kde-base/kdebase-pics" # replaced these three ebuilds
 
 KMEXTRA="l10n pics applnk"
 

diff --git a/kde-apps/kdebase-data/kdebase-data-3.5.10.ebuild b/kde-apps/kdebase-data/kdebase-data-3.5.10.ebuild
index 46bf3dd8..af8fc0d7 100644
--- a/kde-apps/kdebase-data/kdebase-data-3.5.10.ebuild
+++ b/kde-apps/kdebase-data/kdebase-data-3.5.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kdelibs-data/kdebase-data-3.5.10.ebuild,v 1.7 2009/07/12 09:24:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/kdebase-data-3.5.10.ebuild,v 1.7 2009/07/12 09:24:14 armin76 Exp $
 
 EAPI="1"
 RESTRICT="binchecks strip"
@@ -14,6 +14,6 @@ KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="
-!kde-frameworks/kdelibs-l10n !kde-base/kdebase-applnk !kde-base/kdebase-pics" # replaced these three ebuilds
+!kde-base/kdebase-l10n !kde-base/kdebase-applnk !kde-base/kdebase-pics" # replaced these three ebuilds
 
 KMEXTRA="l10n pics applnk"

diff --git a/kde-apps/kdebase-kioslaves/kdebase-kioslaves-3.5.10-r1.ebuild b/kde-apps/kdebase-kioslaves/kdebase-kioslaves-3.5.10-r1.ebuild
index 1c56b7e2..b0912faa 100644
--- a/kde-apps/kdebase-kioslaves/kdebase-kioslaves-3.5.10-r1.ebuild
+++ b/kde-apps/kdebase-kioslaves/kdebase-kioslaves-3.5.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kdelibs-kioslaves/kdebase-kioslaves-3.5.10-r1.ebuild,v 1.6 2009/07/08 13:36:05 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.10-r1.ebuild,v 1.6 2009/07/08 13:36:05 alexxy Exp $
 
 EAPI="1"
 KMNAME=kdebase

diff --git a/kde-apps/kdebase-kioslaves/kdebase-kioslaves-3.5.10-r2.ebuild b/kde-apps/kdebase-kioslaves/kdebase-kioslaves-3.5.10-r2.ebuild
index 35dbe97c..d24545a7 100644
--- a/kde-apps/kdebase-kioslaves/kdebase-kioslaves-3.5.10-r2.ebuild
+++ b/kde-apps/kdebase-kioslaves/kdebase-kioslaves-3.5.10-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kdelibs-kioslaves/kdebase-kioslaves-3.5.10-r1.ebuild,v 1.6 2009/07/08 13:36:05 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.10-r1.ebuild,v 1.6 2009/07/08 13:36:05 alexxy Exp $
 
 EAPI="1"
 KMNAME=kdebase

diff --git a/kde-apps/kdebase-kioslaves/kdebase-kioslaves-3.5.10.ebuild b/kde-apps/kdebase-kioslaves/kdebase-kioslaves-3.5.10.ebuild
index 74d03839..343e4f13 100644
--- a/kde-apps/kdebase-kioslaves/kdebase-kioslaves-3.5.10.ebuild
+++ b/kde-apps/kdebase-kioslaves/kdebase-kioslaves-3.5.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kdelibs-kioslaves/kdebase-kioslaves-3.5.10.ebuild,v 1.3 2009/07/12 11:30:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.10.ebuild,v 1.3 2009/07/12 11:30:55 armin76 Exp $
 
 EAPI="1"
 KMNAME=kdebase

diff --git a/kde-apps/kmail/kmail-3.5.10-r1.ebuild b/kde-apps/kmail/kmail-3.5.10-r1.ebuild
index 9fcc2f48..e180305f 100644
--- a/kde-apps/kmail/kmail-3.5.10-r1.ebuild
+++ b/kde-apps/kmail/kmail-3.5.10-r1.ebuild
@@ -29,8 +29,8 @@ RDEPEND="${DEPEND}
 	crypt? ( app-crypt/pinentry )
 	>=kde-base/kdepim-kioslaves-${PV}:${SLOT}
 	>=kde-base/kmailcvt-${PV}:${SLOT}
-	|| ( >=kde-apps/kdebase-kioslaves-${PV}:${SLOT} >=kde-frameworks/kdelibs-${PV}:${SLOT} )
-	|| ( >=kde-apps/kcontrol-${PV}:${SLOT} >=kde-frameworks/kdelibs-${PV}:${SLOT} )" # for the "looknfeel" icon, and probably others.
+	|| ( >=kde-apps/kdebase-kioslaves-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )
+	|| ( >=kde-apps/kcontrol-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )" # for the "looknfeel" icon, and probably others.
 
 KMCOPYLIB="
 	libkdepim libkdepim/

diff --git a/kde-apps/kmail/kmail-3.5.10-r2.ebuild b/kde-apps/kmail/kmail-3.5.10-r2.ebuild
index 2720b12f..27691fc7 100644
--- a/kde-apps/kmail/kmail-3.5.10-r2.ebuild
+++ b/kde-apps/kmail/kmail-3.5.10-r2.ebuild
@@ -29,8 +29,8 @@ RDEPEND="${DEPEND}
 	crypt? ( app-crypt/pinentry )
 	>=kde-base/kdepim-kioslaves-${PV}:${SLOT}
 	>=kde-base/kmailcvt-${PV}:${SLOT}
-	|| ( >=kde-apps/kdebase-kioslaves-${PV}:${SLOT} >=kde-frameworks/kdelibs-${PV}:${SLOT} )
-	|| ( >=kde-apps/kcontrol-${PV}:${SLOT} >=kde-frameworks/kdelibs-${PV}:${SLOT} )" # for the "looknfeel" icon, and probably others.
+	|| ( >=kde-apps/kdebase-kioslaves-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )
+	|| ( >=kde-apps/kcontrol-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )" # for the "looknfeel" icon, and probably others.
 
 KMCOPYLIB="
 	libkdepim libkdepim/

diff --git a/kde-apps/kmail/kmail-3.5.10.ebuild b/kde-apps/kmail/kmail-3.5.10.ebuild
index b31c424c..9fe42659 100644
--- a/kde-apps/kmail/kmail-3.5.10.ebuild
+++ b/kde-apps/kmail/kmail-3.5.10.ebuild
@@ -29,8 +29,8 @@ RDEPEND="${DEPEND}
 	crypt? ( app-crypt/pinentry )
 	>=kde-base/kdepim-kioslaves-${PV}:${SLOT}
 	>=kde-base/kmailcvt-${PV}:${SLOT}
-	|| ( >=kde-apps/kdebase-kioslaves-${PV}:${SLOT} >=kde-frameworks/kdelibs-${PV}:${SLOT} )
-	|| ( >=kde-apps/kcontrol-${PV}:${SLOT} >=kde-frameworks/kdelibs-${PV}:${SLOT} )" # for the "looknfeel" icon, and probably others.
+	|| ( >=kde-apps/kdebase-kioslaves-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )
+	|| ( >=kde-apps/kcontrol-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )" # for the "looknfeel" icon, and probably others.
 
 KMCOPYLIB="
 	libkdepim libkdepim/

diff --git a/kde-apps/konq-plugins/konq-plugins-3.5.10.ebuild b/kde-apps/konq-plugins/konq-plugins-3.5.10.ebuild
index 6883695c..c0588c42 100644
--- a/kde-apps/konq-plugins/konq-plugins-3.5.10.ebuild
+++ b/kde-apps/konq-plugins/konq-plugins-3.5.10.ebuild
@@ -10,7 +10,7 @@ inherit kde-meta
 DESCRIPTION="Various plugins for Konqueror."
 KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86"
 IUSE=""
-DEPEND="|| ( >=kde-apps/konqueror-${PV}:${SLOT} >=kde-frameworks/kdelibs-${PV}:${SLOT} )
+DEPEND="|| ( >=kde-apps/konqueror-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )
 	!kde-misc/metabar"
 RDEPEND="${DEPEND}
 >=kde-base/kdeaddons-docs-konq-plugins-${PV}:${SLOT}"

diff --git a/kde-apps/kpat/kpat-3.5.10.ebuild b/kde-apps/kpat/kpat-3.5.10.ebuild
index b7146f00..cb5e15fd 100644
--- a/kde-apps/kpat/kpat-3.5.10.ebuild
+++ b/kde-apps/kpat/kpat-3.5.10.ebuild
@@ -12,7 +12,7 @@ IUSE="kdehiddenvisibility"
 DEPEND=">=kde-apps/libkdegames-${PV}:${SLOT}"
 
 RDEPEND="${DEPEND}
-	|| ( >=kde-apps/kdebase-data-${PV}:${SLOT} >=kde-frameworks/kdelibs-${PV}:${SLOT} )"
+	|| ( >=kde-apps/kdebase-data-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )"
 
 KMEXTRACTONLY=libkdegames
 KMCOPYLIB="libkdegames libkdegames"

diff --git a/kde-base/kate-plugins/kate-plugins-3.5.10.ebuild b/kde-base/kate-plugins/kate-plugins-3.5.10.ebuild
index d71fe13c..8dd73349 100644
--- a/kde-base/kate-plugins/kate-plugins-3.5.10.ebuild
+++ b/kde-base/kate-plugins/kate-plugins-3.5.10.ebuild
@@ -11,5 +11,5 @@ DESCRIPTION="kate plugins and docs"
 KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
-DEPEND="|| ( >=kde-apps/kate-${PV}:${SLOT} >=kde-frameworks/kdelibs-${PV}:${SLOT} )"
+DEPEND="|| ( >=kde-apps/kate-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )"
 RDEPEND="${DEPEND}"

diff --git a/kde-base/kbstateapplet/kbstateapplet-3.5.10.ebuild b/kde-base/kbstateapplet/kbstateapplet-3.5.10.ebuild
index 38d5b93e..df393c45 100644
--- a/kde-base/kbstateapplet/kbstateapplet-3.5.10.ebuild
+++ b/kde-base/kbstateapplet/kbstateapplet-3.5.10.ebuild
@@ -8,6 +8,6 @@ inherit kde-meta
 DESCRIPTION="KDE panel applet that displays the keyboard status"
 KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86"
 IUSE=""
-DEPEND="|| ( >=kde-apps/kcontrol-${PV}:${SLOT} >=kde-frameworks/kdelibs-${PV}:${SLOT} )"
+DEPEND="|| ( >=kde-apps/kcontrol-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )"
 
 RDEPEND="${DEPEND}"

diff --git a/kde-base/kcheckpass/kcheckpass-3.5.10.ebuild b/kde-base/kcheckpass/kcheckpass-3.5.10.ebuild
index 0ca9d51d..c29e2ccb 100644
--- a/kde-base/kcheckpass/kcheckpass-3.5.10.ebuild
+++ b/kde-base/kcheckpass/kcheckpass-3.5.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="${SRC_URI}
 DESCRIPTION="A simple password checker, used by any software in need of user authentication."
 KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86"
 IUSE="pam kdehiddenvisibility"
-DEPEND="pam? ( kde-frameworks/kdelibs-pam )"
+DEPEND="pam? ( kde-base/kdebase-pam )"
 RDEPEND="${DEPEND}"
 
 src_compile() {

diff --git a/kde-base/kde-meta/kde-meta-3.5.10.ebuild b/kde-base/kde-meta/kde-meta-3.5.10.ebuild
index 36ec8c03..63555d1b 100644
--- a/kde-base/kde-meta/kde-meta-3.5.10.ebuild
+++ b/kde-base/kde-meta/kde-meta-3.5.10.ebuild
@@ -15,7 +15,7 @@ IUSE="accessibility nls"
 RDEPEND="~kde-frameworks/kdelibs-${PV}
 >=kde-base/kdeaddons-meta-${PV}:${SLOT}
 >=kde-apps/kdeadmin-meta-${PV}:${SLOT}
->=kde-frameworks/kdelibs-meta-${PV}:${SLOT}
+>=kde-base/kdebase-meta-${PV}:${SLOT}
 >=kde-base/kdeedu-meta-${PV}:${SLOT}
 >=kde-base/kdegames-meta-${PV}:${SLOT}
 >=kde-base/kdegraphics-meta-${PV}:${SLOT}

diff --git a/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.5.10.ebuild b/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.5.10.ebuild
index 3f11757e..2a900f66 100644
--- a/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.5.10.ebuild
+++ b/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.5.10.ebuild
@@ -11,4 +11,4 @@ DESCRIPTION="Window styles for kde"
 KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
-DEPEND="|| ( >=kde-base/kwin-${PV}:${SLOT} >=kde-frameworks/kdelibs-${PV}:${SLOT} )"
+DEPEND="|| ( >=kde-base/kwin-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )"

diff --git a/kde-base/kdebase-meta/kdebase-meta-3.5.10.ebuild b/kde-base/kdebase-meta/kdebase-meta-3.5.10.ebuild
index c695b6fc..8a945d34 100644
--- a/kde-base/kdebase-meta/kdebase-meta-3.5.10.ebuild
+++ b/kde-base/kdebase-meta/kdebase-meta-3.5.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kdelibs-meta/kdebase-meta-3.5.10.ebuild,v 1.8 2009/08/09 21:03:44 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-meta/kdebase-meta-3.5.10.ebuild,v 1.8 2009/08/09 21:03:44 zmedico Exp $
 
 EAPI="1"
 inherit kde-functions
@@ -12,7 +12,7 @@ SLOT="3.5"
 KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
-RDEPEND=">=kde-frameworks/kdelibs-startkde-${PV}:${SLOT}
+RDEPEND=">=kde-base/kdebase-startkde-${PV}:${SLOT}
 >=kde-apps/drkonqi-${PV}:${SLOT}
 >=kde-base/kappfinder-${PV}:${SLOT}
 >=kde-apps/kate-${PV}:${SLOT}

diff --git a/kde-base/kdebase-pam/kdebase-pam-7.ebuild b/kde-base/kdebase-pam/kdebase-pam-7.ebuild
index 6af20910..8240071a 100644
--- a/kde-base/kdebase-pam/kdebase-pam-7.ebuild
+++ b/kde-base/kdebase-pam/kdebase-pam-7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kdelibs-pam/kdebase-pam-7.ebuild,v 1.10 2009/10/16 04:37:23 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-pam/kdebase-pam-7.ebuild,v 1.10 2009/10/16 04:37:23 abcd Exp $
 
 inherit pam
 

diff --git a/kde-base/kdebase-startkde/kdebase-startkde-3.5.10-r5.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-3.5.10-r5.ebuild
index 42238030..c97d3624 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-3.5.10-r5.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-3.5.10-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kdelibs-startkde/kdebase-startkde-3.5.10-r5.ebuild,v 1.7 2009/07/12 13:40:00 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-3.5.10-r5.ebuild,v 1.7 2009/07/12 13:40:00 armin76 Exp $
 
 EAPI="1"
 KMNAME=kdebase

diff --git a/kde-base/kdejava/kdejava-3.5.10.ebuild b/kde-base/kdejava/kdejava-3.5.10.ebuild
index 9fc82068..a4675b78 100644
--- a/kde-base/kdejava/kdejava-3.5.10.ebuild
+++ b/kde-base/kdejava/kdejava-3.5.10.ebuild
@@ -12,7 +12,7 @@ inherit java-pkg-2 kde-meta
 DESCRIPTION="KDE java bindings"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
-COMMONDEPEND="|| ( ( >=kde-base/kwin-${PV}:${SLOT} >=kde-apps/kcontrol-${PV}:${SLOT} ) >=kde-frameworks/kdelibs-${PV}:${SLOT} )
+COMMONDEPEND="|| ( ( >=kde-base/kwin-${PV}:${SLOT} >=kde-apps/kcontrol-${PV}:${SLOT} ) >=kde-base/kdebase-${PV}:${SLOT} )
 	>=kde-base/qtjava-${PV}:${SLOT}"
 DEPEND=">=virtual/jdk-1.4 $COMMONDEPEND"
 RDEPEND=">=virtual/jre-1.4 $COMMONDEPEND"

diff --git a/kde-base/kdm/kdm-3.5.10.ebuild b/kde-base/kdm/kdm-3.5.10.ebuild
index d01f1f6e..c799a081 100644
--- a/kde-base/kdm/kdm-3.5.10.ebuild
+++ b/kde-base/kdm/kdm-3.5.10.ebuild
@@ -17,7 +17,7 @@ KMEXTRA="kdmlib/"
 KMEXTRACTONLY="libkonq/konq_defaults.h"
 KMCOMPILEONLY="kcontrol/background"
 
-DEPEND="pam? ( kde-frameworks/kdelibs-pam )
+DEPEND="pam? ( kde-base/kdebase-pam )
 	x11-libs/libXau
 	x11-libs/libXtst
 	>=kde-apps/kcontrol-${PV}:${SLOT}"

diff --git a/kde-base/kicker-applets/kicker-applets-3.5.10.ebuild b/kde-base/kicker-applets/kicker-applets-3.5.10.ebuild
index 8e766417..ef594a70 100644
--- a/kde-base/kicker-applets/kicker-applets-3.5.10.ebuild
+++ b/kde-base/kicker-applets/kicker-applets-3.5.10.ebuild
@@ -10,7 +10,7 @@ inherit kde-meta
 DESCRIPTION="kicker applets"
 KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86"
 IUSE=""
-DEPEND="|| ( >=kde-base/kicker-${PV}:${SLOT} >=kde-frameworks/kdelibs-${PV}:${SLOT} )"
+DEPEND="|| ( >=kde-base/kicker-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )"
 
 RDEPEND="${DEPEND}"
 

diff --git a/kde-base/kjsembed/kjsembed-3.5.10.ebuild b/kde-base/kjsembed/kjsembed-3.5.10.ebuild
index 02f2559c..d32cb0b9 100644
--- a/kde-base/kjsembed/kjsembed-3.5.10.ebuild
+++ b/kde-base/kjsembed/kjsembed-3.5.10.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://xmelegance.org/kjsembed/"
 KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86"
 IUSE=""
 
-DEPEND="|| ( >=kde-base/kwin-${PV}:${SLOT} >=kde-frameworks/kdelibs-${PV}:${SLOT} )"
+DEPEND="|| ( >=kde-base/kwin-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )"
 RDEPEND="${DEPEND}"
 
 PATCHES=( "$FILESDIR/no-gtk-glib-check.diff" )

diff --git a/kde-base/konqueror-akregator/konqueror-akregator-3.5.10.ebuild b/kde-base/konqueror-akregator/konqueror-akregator-3.5.10.ebuild
index 20eb6b5e..78051c4a 100644
--- a/kde-base/konqueror-akregator/konqueror-akregator-3.5.10.ebuild
+++ b/kde-base/konqueror-akregator/konqueror-akregator-3.5.10.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="konqueror's akregator plugin"
 KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
-DEPEND="|| ( >=kde-apps/konqueror-${PV}:${SLOT} >=kde-frameworks/kdelibs-${PV}:${SLOT} )"
+DEPEND="|| ( >=kde-apps/konqueror-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )"
 RDEPEND="${DEPEND}
 >=kde-base/kdeaddons-docs-konq-plugins-${PV}:${SLOT}
 || ( >=kde-base/akregator-${PV}:${SLOT} >=kde-base/kdepim-${PV}:${SLOT} )"

diff --git a/kde-base/korn/korn-3.5.10.ebuild b/kde-base/korn/korn-3.5.10.ebuild
index a49e2a93..fef14a6d 100644
--- a/kde-base/korn/korn-3.5.10.ebuild
+++ b/kde-base/korn/korn-3.5.10.ebuild
@@ -13,7 +13,7 @@ IUSE=""
 DEPEND=">=kde-base/mimelib-${PV}:${SLOT}
 >=kde-base/libkmime-${PV}:${SLOT}"
 RDEPEND="${DEPEND}
-	|| ( >=kde-apps/kdebase-kioslaves-${PV}:${SLOT} >=kde-frameworks/kdelibs-${PV}:${SLOT} )
+	|| ( >=kde-apps/kdebase-kioslaves-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )
 	>=kde-base/kdepim-kioslaves-${PV}:${SLOT}"
 
 KMCOPYLIB="libmimelib mimelib

diff --git a/kde-base/kpdf/kpdf-3.5.10-r1.ebuild b/kde-base/kpdf/kpdf-3.5.10-r1.ebuild
index d5a80212..01751056 100644
--- a/kde-base/kpdf/kpdf-3.5.10-r1.ebuild
+++ b/kde-base/kpdf/kpdf-3.5.10-r1.ebuild
@@ -18,7 +18,7 @@ DEPEND=">=media-libs/freetype-2.3
 	media-libs/t1lib
 	>=virtual/poppler-qt3-0.6.1"
 RDEPEND="${DEPEND}
-	|| ( >=kde-base/kdeprint-${PV}:${SLOT} >=kde-frameworks/kdelibs-${PV}:${SLOT} )"
+	|| ( >=kde-base/kdeprint-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )"
 
 PATCHES=( "${FILESDIR}/kde-CVE-2009-1188.patch"
 	"${WORKDIR}/${P}-JBIG2.patch"

diff --git a/kde-base/kpdf/kpdf-3.5.10-r2.ebuild b/kde-base/kpdf/kpdf-3.5.10-r2.ebuild
index 30461859..0c909379 100644
--- a/kde-base/kpdf/kpdf-3.5.10-r2.ebuild
+++ b/kde-base/kpdf/kpdf-3.5.10-r2.ebuild
@@ -18,7 +18,7 @@ DEPEND=">=media-libs/freetype-2.3
 	media-libs/t1lib
 	>=virtual/poppler-qt3-0.6.1"
 RDEPEND="${DEPEND}
-	|| ( >=kde-base/kdeprint-${PV}:${SLOT} >=kde-frameworks/kdelibs-${PV}:${SLOT} )"
+	|| ( >=kde-base/kdeprint-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )"
 
 PATCHES=( "${FILESDIR}/kde-CVE-2009-1188.patch"
 	"${WORKDIR}/${P}-JBIG2.patch"

diff --git a/kde-base/kpdf/kpdf-3.5.10-r3.ebuild b/kde-base/kpdf/kpdf-3.5.10-r3.ebuild
index e0098053..41048f71 100644
--- a/kde-base/kpdf/kpdf-3.5.10-r3.ebuild
+++ b/kde-base/kpdf/kpdf-3.5.10-r3.ebuild
@@ -18,7 +18,7 @@ DEPEND=">=media-libs/freetype-2.3
 	media-libs/t1lib
 	>=app-text/poppler-0.12.3-r3[qt3]"
 RDEPEND="${DEPEND}
-	|| ( >=kde-base/kdeprint-${PV}:${SLOT} >=kde-frameworks/kdelibs-${PV}:${SLOT} )"
+	|| ( >=kde-base/kdeprint-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )"
 
 PATCHES=( "${FILESDIR}/kde-CVE-2009-1188.patch"
 	"${WORKDIR}/${P}-JBIG2.patch"

diff --git a/kde-base/kpdf/kpdf-3.5.10-r4.ebuild b/kde-base/kpdf/kpdf-3.5.10-r4.ebuild
index f8e46870..09664c0c 100644
--- a/kde-base/kpdf/kpdf-3.5.10-r4.ebuild
+++ b/kde-base/kpdf/kpdf-3.5.10-r4.ebuild
@@ -15,7 +15,7 @@ DEPEND=">=media-libs/freetype-2.3
 	media-libs/t1lib
 	>=app-text/poppler-0.12.3-r3[qt3]"
 RDEPEND="${DEPEND}
-	|| ( >=kde-base/kdeprint-${PV}:${SLOT} >=kde-frameworks/kdelibs-${PV}:${SLOT} )"
+	|| ( >=kde-base/kdeprint-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )"
 
 PATCHES=( "${FILESDIR}/kde-CVE-2009-1188.patch"
 	"${FILESDIR}/${KMNAME}_${PN}-r983313.patch"

diff --git a/kde-base/kpdf/kpdf-3.5.10.ebuild b/kde-base/kpdf/kpdf-3.5.10.ebuild
index e761a41f..1bcc12ed 100644
--- a/kde-base/kpdf/kpdf-3.5.10.ebuild
+++ b/kde-base/kpdf/kpdf-3.5.10.ebuild
@@ -15,7 +15,7 @@ DEPEND=">=media-libs/freetype-2.3
 	media-libs/t1lib
 	>=virtual/poppler-qt3-0.6.1"
 RDEPEND="${DEPEND}
-	|| ( >=kde-base/kdeprint-${PV}:${SLOT} >=kde-frameworks/kdelibs-${PV}:${SLOT} )"
+	|| ( >=kde-base/kdeprint-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )"
 
 src_compile() {
 	local myconf="--with-poppler"

diff --git a/kde-base/kttsd/kttsd-3.5.10.ebuild b/kde-base/kttsd/kttsd-3.5.10.ebuild
index 253cb943..ee20d23a 100644
--- a/kde-base/kttsd/kttsd-3.5.10.ebuild
+++ b/kde-base/kttsd/kttsd-3.5.10.ebuild
@@ -11,7 +11,7 @@ IUSE="akode alsa"
 
 DEPEND="akode? ( media-libs/akode )
 	alsa? ( media-libs/alsa-lib )
-	|| ( >=kde-apps/kcontrol-${PV}:${SLOT} >=kde-frameworks/kdelibs-${PV}:${SLOT} )
+	|| ( >=kde-apps/kcontrol-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )
 	!arts? ( !alsa? ( media-libs/akode ) )"
 RDEPEND="${DEPEND}
 	|| ( app-accessibility/festival

diff --git a/kde-base/kviewshell/kviewshell-3.5.10.ebuild b/kde-base/kviewshell/kviewshell-3.5.10.ebuild
index 40992043..1b7574e8 100644
--- a/kde-base/kviewshell/kviewshell-3.5.10.ebuild
+++ b/kde-base/kviewshell/kviewshell-3.5.10.ebuild
@@ -11,4 +11,4 @@ KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND=""
-RDEPEND="|| ( >=kde-apps/kdebase-kioslaves-${PV}:${SLOT} >=kde-frameworks/kdelibs-${PV}:${SLOT} )"
+RDEPEND="|| ( >=kde-apps/kdebase-kioslaves-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )"

diff --git a/media-gfx/showimg/showimg-0.9.5-r1.ebuild b/media-gfx/showimg/showimg-0.9.5-r1.ebuild
index e5ebcafc..cb4efed2 100644
--- a/media-gfx/showimg/showimg-0.9.5-r1.ebuild
+++ b/media-gfx/showimg/showimg-0.9.5-r1.ebuild
@@ -20,7 +20,7 @@ LICENSE="GPL-2"
 KEYWORDS="amd64 ppc ~sparc ~x86"
 IUSE="exif kipi mysql postgres"
 
-DEPEND="|| ( =kde-apps/libkonq-3.5* =kde-frameworks/kdelibs-3.5* )
+DEPEND="|| ( =kde-apps/libkonq-3.5* =kde-base/kdebase-3.5* )
 	mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql-base >=dev-libs/libpqxx-2.6.9 )
 	exif? ( media-libs/libkexif )

diff --git a/media-gfx/showimg/showimg-0.9.5-r2.ebuild b/media-gfx/showimg/showimg-0.9.5-r2.ebuild
index b642dde1..46ec69b8 100644
--- a/media-gfx/showimg/showimg-0.9.5-r2.ebuild
+++ b/media-gfx/showimg/showimg-0.9.5-r2.ebuild
@@ -21,7 +21,7 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ppc ~sparc ~x86"
 IUSE="exif kipi mysql postgres"
 
-DEPEND="|| ( =kde-apps/libkonq-3.5* =kde-frameworks/kdelibs-3.5* )
+DEPEND="|| ( =kde-apps/libkonq-3.5* =kde-base/kdebase-3.5* )
 	mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql-base >=dev-libs/libpqxx-2.6.9 )
 	exif? ( media-libs/libkexif )

diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.4.3-r1.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.4.3-r1.ebuild
index d61916fe..dac0cd52 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.4.3-r1.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.4.3-r1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="amd64 x86"
 IUSE="gstreamer xine mplayer"
 RESTRICT="nomirror"
 
-DEPEND="|| ( kde-apps/kate kde-frameworks/kdelibs )
+DEPEND="|| ( kde-apps/kate kde-base/kdebase )
         gstreamer? ( media-libs/gstreamer )
         xine? ( media-libs/xine-lib )
         mplayer? ( media-video/mplayer )"

diff --git a/sci-mathematics/koctave/koctave-0.70.ebuild b/sci-mathematics/koctave/koctave-0.70.ebuild
index 309f932b..866fb856 100644
--- a/sci-mathematics/koctave/koctave-0.70.ebuild
+++ b/sci-mathematics/koctave/koctave-0.70.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="arts"
 
 DEPEND="sci-mathematics/octave
-	|| ( kde-apps/konsole:3.5 kde-frameworks/kdelibs:3.5 )"
+	|| ( kde-apps/konsole:3.5 kde-base/kdebase:3.5 )"
 
 need-kde 3.5