summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/package.keywords/kde-extras-live.keywords2
-rw-r--r--Documentation/package.unmask/kde-live2
-rw-r--r--kde-misc/kwebkitpart/Manifest2
-rw-r--r--kde-misc/kwebkitpart/kwebkitpart-9999.ebuild (renamed from kde-misc/webkit-kpart/webkit-kpart-9999.ebuild)10
-rw-r--r--kde-misc/kwebkitpart/metadata.xml (renamed from kde-misc/webkit-kpart/metadata.xml)0
-rw-r--r--kde-misc/webkit-kpart/Manifest2
-rw-r--r--sets/kde-extras-live2
7 files changed, 12 insertions, 8 deletions
diff --git a/Documentation/package.keywords/kde-extras-live.keywords b/Documentation/package.keywords/kde-extras-live.keywords
index 577c6440b90..7ee4ba112f9 100644
--- a/Documentation/package.keywords/kde-extras-live.keywords
+++ b/Documentation/package.keywords/kde-extras-live.keywords
@@ -25,11 +25,11 @@
~kde-misc/konq-plugins-9999 **
~kde-misc/kportagetray-9999 **
~kde-misc/krusader-9999 **
+~kde-misc/kwebkitpart-9999 **
~kde-misc/menubar-9999 **
~kde-misc/plasma-emergelog-9999 **
~kde-misc/raptormenu-9999 **
~kde-misc/translatoid-9999 **
-~kde-misc/webkit-kpart-9999 **
~kde-misc/yakuake-9999 **
~mail-client/mailody-9999 **
~media-gfx/digikam-9999 **
diff --git a/Documentation/package.unmask/kde-live b/Documentation/package.unmask/kde-live
index 062165d057a..c7d470e53a7 100644
--- a/Documentation/package.unmask/kde-live
+++ b/Documentation/package.unmask/kde-live
@@ -29,11 +29,11 @@ kde-base/kde-l10n:live
~kde-misc/konq-plugins-9999
~kde-misc/kportagetray-9999
~kde-misc/krusader-9999
+~kde-misc/kwebkitpart-9999
~kde-misc/menubar-9999
~kde-misc/plasma-emergelog-9999
~kde-misc/raptormenu-9999
~kde-misc/translatoid-9999
-~kde-misc/webkit-kpart-9999
~kde-misc/yakuake-9999
~mail-client/mailody-9999
~media-gfx/digikam-9999
diff --git a/kde-misc/kwebkitpart/Manifest b/kde-misc/kwebkitpart/Manifest
new file mode 100644
index 00000000000..482f20e6c38
--- /dev/null
+++ b/kde-misc/kwebkitpart/Manifest
@@ -0,0 +1,2 @@
+EBUILD kwebkitpart-9999.ebuild 374 RMD160 dbad997129d295e064391300fa15a06fcfb629b3 SHA1 88b440ff620cf14c60254a130975566972b65d4b SHA256 d2d97a1c2f8d1c3a2b69a5a6c1f2456fb8641da771130fd211db4ac8b6f6cb51
+MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-misc/webkit-kpart/webkit-kpart-9999.ebuild b/kde-misc/kwebkitpart/kwebkitpart-9999.ebuild
index b2ac9cb34d7..4859cd1a594 100644
--- a/kde-misc/webkit-kpart/webkit-kpart-9999.ebuild
+++ b/kde-misc/kwebkitpart/kwebkitpart-9999.ebuild
@@ -5,8 +5,8 @@
EAPI="2"
WEBKIT_REQUIRED="always"
-KMNAME="playground/libs"
-KMMODULE="webkitkde"
+KMNAME="kdereview"
+KMMODULE="kwebkitpart"
inherit kde4-base
DESCRIPTION="A WebKit KPart for konqueror"
@@ -14,5 +14,9 @@ HOMEPAGE="http://kde.org"
LICENSE="GPL-2"
KEYWORDS=""
-SLOT="0"
+SLOT="4"
IUSE="debug"
+
+RDEPEND="
+ !kde-misc/webkit-kpart
+"
diff --git a/kde-misc/webkit-kpart/metadata.xml b/kde-misc/kwebkitpart/metadata.xml
index 8d1e86a9cef..8d1e86a9cef 100644
--- a/kde-misc/webkit-kpart/metadata.xml
+++ b/kde-misc/kwebkitpart/metadata.xml
diff --git a/kde-misc/webkit-kpart/Manifest b/kde-misc/webkit-kpart/Manifest
deleted file mode 100644
index ada4e8c0476..00000000000
--- a/kde-misc/webkit-kpart/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD webkit-kpart-9999.ebuild 341 RMD160 3d87d094793e58c9942cff537c7214d0ad40a8b7 SHA1 c1dc1b7312a2ca0039b1aca6c1e4a0aff872018f SHA256 70d36264db16540630d05e53fab2806b71ac5537caf746cb2aacaa057ccc873f
-MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/sets/kde-extras-live b/sets/kde-extras-live
index 6fcbb1d5ddf..7224ad642b9 100644
--- a/sets/kde-extras-live
+++ b/sets/kde-extras-live
@@ -24,11 +24,11 @@
~kde-misc/konq-plugins-9999
~kde-misc/kportagetray-9999
~kde-misc/krusader-9999
+~kde-misc/kwebkitpart-9999
~kde-misc/menubar-9999
~kde-misc/plasma-emergelog-9999
~kde-misc/raptormenu-9999
~kde-misc/translatoid-9999
-~kde-misc/webkit-kpart-9999
~kde-misc/yakuake-9999
~mail-client/mailody-9999
~media-gfx/digikam-9999