9 files changed, 31 insertions, 24 deletions
diff --git a/kde-base/kdesdk-misc/Manifest b/kde-base/kdesdk-misc/Manifest
index 5b72c564d52..f10566cdb29 100644
--- a/kde-base/kdesdk-misc/Manifest
+++ b/kde-base/kdesdk-misc/Manifest
@@ -1,4 +1,4 @@
-EBUILD kdesdk-misc-4.4.9999.ebuild 355 RMD160 ca7b24b56a00216b89ddaea783493f480cd2443d SHA1 8b876edad0682293fdf1d5a85324a6e2bb939a3c SHA256 230d22ae3bb3604dda2558a63ae9ee0274835229e45320b4c37fed32f01706b1
-EBUILD kdesdk-misc-4.5.9999.ebuild 563 RMD160 8df125add008510463bf1db28ff1ea24f28d5e34 SHA1 617f7d7c1c4b6ef9fa2d50032f5830f936ec4a07 SHA256 479c386d3e52996cee9f87b7d639b0b2ba9f479d550255862e43790846e536a7
-EBUILD kdesdk-misc-9999.ebuild 563 RMD160 8df125add008510463bf1db28ff1ea24f28d5e34 SHA1 617f7d7c1c4b6ef9fa2d50032f5830f936ec4a07 SHA256 479c386d3e52996cee9f87b7d639b0b2ba9f479d550255862e43790846e536a7
-MISC metadata.xml 226 RMD160 d6ea51ccbeb3d62c926fb2420da18ad1f0e1644c SHA1 f29f286c3e2a46902de16e217aeb978bc0e52d46 SHA256 1ec96715f569a53a825a6ed145b5fd0b73d36616f256affd0a11d4e7f864d5b3
+EBUILD kdesdk-misc-4.4.9999.ebuild 535 RMD160 477a8d012f9b27ba28557db6eb7e1bfe1e3de17e SHA1 d6448c1e839328c2ffccc4ae587ceb4ecc114480 SHA256 2ccd7d7535cf74bb91198dd257cbd4a242ff741eb934314b7bf88d258852342c
+EBUILD kdesdk-misc-4.5.9999.ebuild 559 RMD160 106d12df8af3964055dfdb0d3e7609d70ecd1cf5 SHA1 ba8d59192aa328357f734c6413fa3667336077b3 SHA256 239fddd6a5de6eb21db1393a05d587eb056507e018d6142d434ffcbed930e8cd
+EBUILD kdesdk-misc-9999.ebuild 559 RMD160 106d12df8af3964055dfdb0d3e7609d70ecd1cf5 SHA1 ba8d59192aa328357f734c6413fa3667336077b3 SHA256 239fddd6a5de6eb21db1393a05d587eb056507e018d6142d434ffcbed930e8cd
+MISC metadata.xml 227 RMD160 159a88ee5bec5a5a987f8781fdcda09e20f2ad94 SHA1 47649f6a54d140ecbe1a05e9b4a7b610d760f818 SHA256 a98f09f3e065e728b8fd1f8a11dd92f0b26faf18587f0b0b195415e6d6664596
diff --git a/kde-base/kdesdk-misc/kdesdk-misc-4.4.9999.ebuild b/kde-base/kdesdk-misc/kdesdk-misc-4.4.9999.ebuild
index 65d6498d882..7e000677b27 100644
--- a/kde-base/kdesdk-misc/kdesdk-misc-4.4.9999.ebuild
+++ b/kde-base/kdesdk-misc/kdesdk-misc-4.4.9999.ebuild
@@ -4,14 +4,18 @@
 
 EAPI="3"
 
-KMNAME="${PN/-*/}"
+KMNAME="kdesdk"
 KMNOMODULE="true"
-
 inherit kde4-meta
 
 DESCRIPTION="KDE miscellaneous SDK tools"
 KEYWORDS=""
-IUSE="debug +handbook"
+IUSE="debug extras"
+
+DEPEND="
+	extras? ( >=dev-java/antlr-2.7.7:0[cxx,script] )
+"
+RDEPEND="${DEPEND}"
 
 KMEXTRA="
 	kmtrace/
@@ -22,3 +26,11 @@ KMEXTRA="
 	poxml/
 	scheck/
 "
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with extras Antlr2)
+	)
+
+	kde4-meta_src_configure
+}
diff --git a/kde-base/kdesdk-misc/kdesdk-misc-4.5.9999.ebuild b/kde-base/kdesdk-misc/kdesdk-misc-4.5.9999.ebuild
index 8f72ccc2ad2..5f2fb756847 100644
--- a/kde-base/kdesdk-misc/kdesdk-misc-4.5.9999.ebuild
+++ b/kde-base/kdesdk-misc/kdesdk-misc-4.5.9999.ebuild
@@ -5,9 +5,8 @@
 EAPI="3"
 
 KDE_HANDBOOK="optional"
-KMNAME="${PN/-*/}"
+KMNAME="kdesdk"
 KMNOMODULE="true"
-
 inherit kde4-meta
 
 DESCRIPTION="KDE miscellaneous SDK tools"
diff --git a/kde-base/kdesdk-misc/kdesdk-misc-9999.ebuild b/kde-base/kdesdk-misc/kdesdk-misc-9999.ebuild
index 8f72ccc2ad2..5f2fb756847 100644
--- a/kde-base/kdesdk-misc/kdesdk-misc-9999.ebuild
+++ b/kde-base/kdesdk-misc/kdesdk-misc-9999.ebuild
@@ -5,9 +5,8 @@
 EAPI="3"
 
 KDE_HANDBOOK="optional"
-KMNAME="${PN/-*/}"
+KMNAME="kdesdk"
 KMNOMODULE="true"
-
 inherit kde4-meta
 
 DESCRIPTION="KDE miscellaneous SDK tools"
diff --git a/kde-base/kdesdk-misc/metadata.xml b/kde-base/kdesdk-misc/metadata.xml
index 2dc0eee228a..f1e21d4c8f9 100644
--- a/kde-base/kdesdk-misc/metadata.xml
+++ b/kde-base/kdesdk-misc/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>kde</herd>
 <use>
-	<flag name="extras">Build p2xml and swappo tools</flag>
+	<flag name="extras">Build po2xml and swappo tools</flag>
 </use>
 </pkgmetadata>
diff --git a/kde-base/kdesdk-scripts/Manifest b/kde-base/kdesdk-scripts/Manifest
index c38e959a597..fccbdbd7a60 100644
--- a/kde-base/kdesdk-scripts/Manifest
+++ b/kde-base/kdesdk-scripts/Manifest
@@ -1,4 +1,4 @@
-EBUILD kdesdk-scripts-4.4.9999.ebuild 367 RMD160 7a90314402672940ab3f7bef1c6d04208cdf9d08 SHA1 6e3f24f3c1017453ab98af2d5c6debac97b3874b SHA256 3ff06b2f3826fb33ffac833f5dc1311569c3c314d50b429abae60131d0fa0601
-EBUILD kdesdk-scripts-4.5.9999.ebuild 391 RMD160 a6194329434d3974c45a9660e8f5d95036696f98 SHA1 33c061857821a0c787c7bde67bea81713d702ee0 SHA256 cfc7aa95ff808386da84fc24444617c0c42e6c5766953ee6e120b6eeda352ddf
-EBUILD kdesdk-scripts-9999.ebuild 391 RMD160 a6194329434d3974c45a9660e8f5d95036696f98 SHA1 33c061857821a0c787c7bde67bea81713d702ee0 SHA256 cfc7aa95ff808386da84fc24444617c0c42e6c5766953ee6e120b6eeda352ddf
+EBUILD kdesdk-scripts-4.4.9999.ebuild 361 RMD160 5514c1c0276a6fb3cc1e689fba6e48cc0e7e7ae1 SHA1 4b7fb2c03bca5073ae7c4445b12fb5a5ee305346 SHA256 ecf602ab1659e1e96363bf445ef5357457ab5d1c7ad6d354a83de2452734463d
+EBUILD kdesdk-scripts-4.5.9999.ebuild 385 RMD160 20bbb908591b1ea77a32d912e2eba44a73e2c681 SHA1 6afdb319cc4b68d4861c88987a20fc5e9d9fee88 SHA256 0dcff9fb0b912ed37985ac5c995df37eac6d406364de8a08d76648ae44de33d7
+EBUILD kdesdk-scripts-9999.ebuild 385 RMD160 20bbb908591b1ea77a32d912e2eba44a73e2c681 SHA1 6afdb319cc4b68d4861c88987a20fc5e9d9fee88 SHA256 0dcff9fb0b912ed37985ac5c995df37eac6d406364de8a08d76648ae44de33d7
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kdesdk-scripts/kdesdk-scripts-4.4.9999.ebuild b/kde-base/kdesdk-scripts/kdesdk-scripts-4.4.9999.ebuild
index 3284559b250..0b5d1a1973f 100644
--- a/kde-base/kdesdk-scripts/kdesdk-scripts-4.4.9999.ebuild
+++ b/kde-base/kdesdk-scripts/kdesdk-scripts-4.4.9999.ebuild
@@ -4,9 +4,8 @@
 
 EAPI="3"
 
-KMNAME="${PN/-*/}"
-KMMODULE="${PN/*-/}"
-
+KMNAME="kdesdk"
+KMMODULE="scripts"
 inherit kde4-meta
 
 DESCRIPTION="KDE SDK Scripts"
diff --git a/kde-base/kdesdk-scripts/kdesdk-scripts-4.5.9999.ebuild b/kde-base/kdesdk-scripts/kdesdk-scripts-4.5.9999.ebuild
index 5e0ad2adbfe..e1ab20cdf49 100644
--- a/kde-base/kdesdk-scripts/kdesdk-scripts-4.5.9999.ebuild
+++ b/kde-base/kdesdk-scripts/kdesdk-scripts-4.5.9999.ebuild
@@ -5,9 +5,8 @@
 EAPI="3"
 
 KDE_HANDBOOK="optional"
-KMNAME="${PN/-*/}"
-KMMODULE="${PN/*-/}"
-
+KMNAME="kdesdk"
+KMMODULE="scripts"
 inherit kde4-meta
 
 DESCRIPTION="KDE SDK Scripts"
diff --git a/kde-base/kdesdk-scripts/kdesdk-scripts-9999.ebuild b/kde-base/kdesdk-scripts/kdesdk-scripts-9999.ebuild
index 5e0ad2adbfe..e1ab20cdf49 100644
--- a/kde-base/kdesdk-scripts/kdesdk-scripts-9999.ebuild
+++ b/kde-base/kdesdk-scripts/kdesdk-scripts-9999.ebuild
@@ -5,9 +5,8 @@
 EAPI="3"
 
 KDE_HANDBOOK="optional"
-KMNAME="${PN/-*/}"
-KMMODULE="${PN/*-/}"
-
+KMNAME="kdesdk"
+KMMODULE="scripts"
 inherit kde4-meta
 
 DESCRIPTION="KDE SDK Scripts"