summaryrefslogtreecommitdiff
path: root/kde-base
diff options
context:
space:
mode:
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/kde-dev-scripts/kde-dev-scripts-9999.ebuild (renamed from kde-base/kdesdk-scripts/kdesdk-scripts-9999.ebuild)12
-rw-r--r--kde-base/kde-dev-scripts/metadata.xml5
-rw-r--r--kde-base/kdesdk-meta/kdesdk-meta-9999.ebuild2
-rw-r--r--kde-base/kdesdk-scripts/kdesdk-scripts-4.10.49.9999.ebuild18
4 files changed, 23 insertions, 14 deletions
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
}