10 files changed, 32 insertions, 20 deletions
diff --git a/Documentation/package.keywords/.kde-live/kdesdk-live b/Documentation/package.keywords/.kde-live/kdesdk-live
index 7e8dceb08e1..16ef947a31a 100644
--- a/Documentation/package.keywords/.kde-live/kdesdk-live
+++ b/Documentation/package.keywords/.kde-live/kdesdk-live
@@ -3,10 +3,10 @@
 ~kde-base/kapptemplate-9999 **
 ~kde-base/kate-9999 **
 ~kde-base/kcachegrind-9999 **
+~kde-base/kde-dev-scripts-9999 **
 ~kde-base/kdesdk-kioslaves-9999 **
 ~kde-base/kdesdk-meta-9999 **
 ~kde-base/kdesdk-misc-9999 **
-~kde-base/kdesdk-scripts-9999 **
 ~kde-base/kdesdk-strigi-analyzer-9999 **
 ~kde-base/kompare-9999 **
 ~kde-base/kstartperf-9999 **
diff --git a/Documentation/package.keywords/kde-live.keywords b/Documentation/package.keywords/kde-live.keywords
index 7b68e9d30f9..04772e2d445 100644
--- a/Documentation/package.keywords/kde-live.keywords
+++ b/Documentation/package.keywords/kde-live.keywords
@@ -280,10 +280,10 @@
 ~kde-base/kapptemplate-9999 **
 ~kde-base/kate-9999 **
 ~kde-base/kcachegrind-9999 **
+~kde-base/kde-dev-scripts-9999 **
 ~kde-base/kdesdk-kioslaves-9999 **
 ~kde-base/kdesdk-meta-9999 **
 ~kde-base/kdesdk-misc-9999 **
-~kde-base/kdesdk-scripts-9999 **
 ~kde-base/kdesdk-strigi-analyzer-9999 **
 ~kde-base/kompare-9999 **
 ~kde-base/kstartperf-9999 **
diff --git a/Documentation/package.mask/kde-live b/Documentation/package.mask/kde-live
index 04d277987df..abb4acf2f82 100644
--- a/Documentation/package.mask/kde-live
+++ b/Documentation/package.mask/kde-live
@@ -280,10 +280,10 @@
 ~kde-base/kapptemplate-9999 **
 ~kde-base/kate-9999 **
 ~kde-base/kcachegrind-9999 **
+~kde-base/kde-dev-scripts-9999 **
 ~kde-base/kdesdk-kioslaves-9999 **
 ~kde-base/kdesdk-meta-9999 **
 ~kde-base/kdesdk-misc-9999 **
-~kde-base/kdesdk-scripts-9999 **
 ~kde-base/kdesdk-strigi-analyzer-9999 **
 ~kde-base/kompare-9999 **
 ~kde-base/kstartperf-9999 **
diff --git a/Documentation/package.unmask/kde-live b/Documentation/package.unmask/kde-live
index 02e3edf484c..704f56aa301 100644
--- a/Documentation/package.unmask/kde-live
+++ b/Documentation/package.unmask/kde-live
@@ -280,10 +280,10 @@
 ~kde-base/kapptemplate-9999
 ~kde-base/kate-9999
 ~kde-base/kcachegrind-9999
+~kde-base/kde-dev-scripts-9999
 ~kde-base/kdesdk-kioslaves-9999
 ~kde-base/kdesdk-meta-9999
 ~kde-base/kdesdk-misc-9999
-~kde-base/kdesdk-scripts-9999
 ~kde-base/kdesdk-strigi-analyzer-9999
 ~kde-base/kompare-9999
 ~kde-base/kstartperf-9999
diff --git a/app-office/skrooge/skrooge-9999.ebuild b/app-office/skrooge/skrooge-9999.ebuild
index a5cf29475f6..f506b5a038f 100644
--- a/app-office/skrooge/skrooge-9999.ebuild
+++ b/app-office/skrooge/skrooge-9999.ebuild
@@ -25,7 +25,10 @@ DEPEND="
 	x11-libs/qt-sql:4[sqlite]
 "
 RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdesdk-scripts)
+	|| (
+		( $(add_kdebase_dep kde-dev-scripts) )
+		( $(add_kdebase_dep kdesdk-scripts) )
+	)
 "
 
 DOCS=( AUTHORS CHANGELOG README TODO )
diff --git a/kde-base/kdesdk-scripts/kdesdk-scripts-9999.ebuild b/kde-base/kde-dev-scripts/kde-dev-scripts-9999.ebuild
index f383b111c4a..cb377dd1165 100644
--- a/kde-base/kdesdk-scripts/kdesdk-scripts-9999.ebuild
+++ b/kde-base/kde-dev-scripts/kde-dev-scripts-9999.ebuild
@@ -5,12 +5,9 @@
 EAPI=5
 
 KDE_HANDBOOK="optional"
-KMNAME="kdesdk"
-KMMODULE="scripts"
-KDE_SCM="svn"
-inherit kde4-meta
+inherit kde4-base
 
-DESCRIPTION="KDE SDK Scripts"
+DESCRIPTION="KDE Development Scripts"
 KEYWORDS=""
 IUSE="debug"
 
@@ -19,10 +16,11 @@ RDEPEND="
 	media-gfx/optipng
 	dev-perl/XML-DOM
 "
+add_blocker kdesdk-scripts
 
 src_prepare() {
 	# bug 275069
-	sed -ie 's:colorsvn::' scripts/CMakeLists.txt || die
+	sed -ie 's:colorsvn::' CMakeLists.txt || die
 
-	kde4-meta_src_prepare
+	kde4-base_src_prepare
 }
diff --git a/kde-base/kde-dev-scripts/metadata.xml b/kde-base/kde-dev-scripts/metadata.xml
new file mode 100644
index 00000000000..8d1e86a9cef
--- /dev/null
+++ b/kde-base/kde-dev-scripts/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>kde</herd>
+</pkgmetadata>
diff --git a/kde-base/kdesdk-meta/kdesdk-meta-9999.ebuild b/kde-base/kdesdk-meta/kdesdk-meta-9999.ebuild
index eec3272c1cd..6665b119d3b 100644
--- a/kde-base/kdesdk-meta/kdesdk-meta-9999.ebuild
+++ b/kde-base/kdesdk-meta/kdesdk-meta-9999.ebuild
@@ -15,9 +15,9 @@ RDEPEND="
 	$(add_kdebase_dep kapptemplate)
 	$(add_kdebase_dep kate)
 	$(add_kdebase_dep kcachegrind)
+	$(add_kdebase_dep kde-dev-scripts)
 	$(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)
diff --git a/kde-base/kdesdk-scripts/kdesdk-scripts-4.10.49.9999.ebuild b/kde-base/kdesdk-scripts/kdesdk-scripts-4.10.49.9999.ebuild
index f383b111c4a..505275d7820 100644
--- a/kde-base/kdesdk-scripts/kdesdk-scripts-4.10.49.9999.ebuild
+++ b/kde-base/kdesdk-scripts/kdesdk-scripts-4.10.49.9999.ebuild
@@ -5,10 +5,16 @@
 EAPI=5
 
 KDE_HANDBOOK="optional"
-KMNAME="kdesdk"
-KMMODULE="scripts"
-KDE_SCM="svn"
-inherit kde4-meta
+if [[ ${PV} == *9999 ]]; then
+	eclass="kde4-base"
+	KMNAME="kde-dev-scripts"
+	KMMODULE="."
+else
+	eclass="kde4-meta"
+	KMNAME="kdesdk"
+	KMMODULE="scripts"
+fi
+inherit ${eclass}
 
 DESCRIPTION="KDE SDK Scripts"
 KEYWORDS=""
@@ -22,7 +28,7 @@ RDEPEND="
 
 src_prepare() {
 	# bug 275069
-	sed -ie 's:colorsvn::' scripts/CMakeLists.txt || die
+	sed -ie 's:colorsvn::' ${KMMODULE}/CMakeLists.txt || die
 
-	kde4-meta_src_prepare
+	${eclass}_src_prepare
 }
diff --git a/sets/kdesdk-live b/sets/kdesdk-live
index cd998828216..d4f56a5eca6 100644
--- a/sets/kdesdk-live
+++ b/sets/kdesdk-live
@@ -3,10 +3,10 @@
 ~kde-base/kapptemplate-9999
 ~kde-base/kate-9999
 ~kde-base/kcachegrind-9999
+~kde-base/kde-dev-scripts-9999
 ~kde-base/kdesdk-kioslaves-9999
 ~kde-base/kdesdk-meta-9999
 ~kde-base/kdesdk-misc-9999
-~kde-base/kdesdk-scripts-9999
 ~kde-base/kdesdk-strigi-analyzer-9999
 ~kde-base/kompare-9999
 ~kde-base/kstartperf-9999