Pkg move kde-plasma/bluez-qt -> kde-franeworks/bluez-qt

Moved to frameworks by upstream.

15 files changed, 14 insertions, 9 deletions

diff --git a/Documentation/package.accept_keywords/.kde-frameworks-live/kde-frameworks-live b/Documentation/package.accept_keywords/.kde-frameworks-live/kde-frameworks-live
index 18918ecafb..5700a7a213 100644
--- a/Documentation/package.accept_keywords/.kde-frameworks-live/kde-frameworks-live
+++ b/Documentation/package.accept_keywords/.kde-frameworks-live/kde-frameworks-live
@@ -1,4 +1,5 @@
 ~kde-frameworks/attica-9999 **
+~kde-frameworks/bluez-qt-9999 **
 ~kde-frameworks/extra-cmake-modules-9999 **
 ~kde-frameworks/frameworkintegration-9999 **
 ~kde-frameworks/kactivities-9999 **
diff --git a/Documentation/package.accept_keywords/.kde-plasma-live/kde-plasma-live b/Documentation/package.accept_keywords/.kde-plasma-live/kde-plasma-live
index e34f4771a3..2051463482 100644
--- a/Documentation/package.accept_keywords/.kde-plasma-live/kde-plasma-live
+++ b/Documentation/package.accept_keywords/.kde-plasma-live/kde-plasma-live
@@ -1,6 +1,5 @@
 ~kde-plasma/baloo-9999 **
 ~kde-plasma/bluedevil-9999 **
-~kde-plasma/bluez-qt-9999 **
 ~kde-plasma/breeze-9999 **
 ~kde-plasma/kde-cli-tools-9999 **
 ~kde-plasma/kde-gtk-config-9999 **
diff --git a/Documentation/package.accept_keywords/kde-frameworks-live.keywords b/Documentation/package.accept_keywords/kde-frameworks-live.keywords
index 4ce9d51fa1..b1727a71c6 100644
--- a/Documentation/package.accept_keywords/kde-frameworks-live.keywords
+++ b/Documentation/package.accept_keywords/kde-frameworks-live.keywords
@@ -2,6 +2,7 @@
 # You can use this file to keyword/unkeyword KDE Frameworks live.
 # Edit Documentation/package.keywords/.kde-frameworks-live.base/ files instead.
 ~kde-frameworks/attica-9999 **
+~kde-frameworks/bluez-qt-9999 **
 ~kde-frameworks/extra-cmake-modules-9999 **
 ~kde-frameworks/frameworkintegration-9999 **
 ~kde-frameworks/kactivities-9999 **
diff --git a/Documentation/package.accept_keywords/kde-plasma-live.keywords b/Documentation/package.accept_keywords/kde-plasma-live.keywords
index d7aad9f24b..baba112843 100644
--- a/Documentation/package.accept_keywords/kde-plasma-live.keywords
+++ b/Documentation/package.accept_keywords/kde-plasma-live.keywords
@@ -3,7 +3,6 @@
 # Edit Documentation/package.keywords/.kde-plasma-live.base/ files instead.
 ~kde-plasma/baloo-9999 **
 ~kde-plasma/bluedevil-9999 **
-~kde-plasma/bluez-qt-9999 **
 ~kde-plasma/breeze-9999 **
 ~kde-plasma/kde-cli-tools-9999 **
 ~kde-plasma/kde-gtk-config-9999 **
diff --git a/Documentation/package.mask/kde-frameworks-live b/Documentation/package.mask/kde-frameworks-live
index bc774b2bc0..cd659cf3f2 100644
--- a/Documentation/package.mask/kde-frameworks-live
+++ b/Documentation/package.mask/kde-frameworks-live
@@ -2,6 +2,7 @@
 # Live packages are masked by default.
 # Edit Documentation/package.unmask/.kde-frameworks-live/ files instead.
 ~kde-frameworks/attica-9999
+~kde-frameworks/bluez-qt-9999
 ~kde-frameworks/extra-cmake-modules-9999
 ~kde-frameworks/frameworkintegration-9999
 ~kde-frameworks/kactivities-9999
diff --git a/Documentation/package.mask/kde-plasma-live b/Documentation/package.mask/kde-plasma-live
index 823f26b7e0..fcfe362544 100644
--- a/Documentation/package.mask/kde-plasma-live
+++ b/Documentation/package.mask/kde-plasma-live
@@ -3,7 +3,6 @@
 # Edit Documentation/package.unmask/.kde-plasma-live/ files instead.
 ~kde-plasma/baloo-9999
 ~kde-plasma/bluedevil-9999
-~kde-plasma/bluez-qt-9999
 ~kde-plasma/breeze-9999
 ~kde-plasma/kde-cli-tools-9999
 ~kde-plasma/kde-gtk-config-9999
diff --git a/Documentation/package.unmask/kde-frameworks-live b/Documentation/package.unmask/kde-frameworks-live
index bc774b2bc0..cd659cf3f2 100644
--- a/Documentation/package.unmask/kde-frameworks-live
+++ b/Documentation/package.unmask/kde-frameworks-live
@@ -2,6 +2,7 @@
 # Live packages are masked by default.
 # Edit Documentation/package.unmask/.kde-frameworks-live/ files instead.
 ~kde-frameworks/attica-9999
+~kde-frameworks/bluez-qt-9999
 ~kde-frameworks/extra-cmake-modules-9999
 ~kde-frameworks/frameworkintegration-9999
 ~kde-frameworks/kactivities-9999
diff --git a/Documentation/package.unmask/kde-plasma-live b/Documentation/package.unmask/kde-plasma-live
index 823f26b7e0..fcfe362544 100644
--- a/Documentation/package.unmask/kde-plasma-live
+++ b/Documentation/package.unmask/kde-plasma-live
@@ -3,7 +3,6 @@
 # Edit Documentation/package.unmask/.kde-plasma-live/ files instead.
 ~kde-plasma/baloo-9999
 ~kde-plasma/bluedevil-9999
-~kde-plasma/bluez-qt-9999
 ~kde-plasma/breeze-9999
 ~kde-plasma/kde-cli-tools-9999
 ~kde-plasma/kde-gtk-config-9999
diff --git a/kde-plasma/bluez-qt/bluez-qt-9999.ebuild b/kde-frameworks/bluez-qt/bluez-qt-9999.ebuild
index f06229d4b0..c3bae7a5b6 100644
--- a/kde-plasma/bluez-qt/bluez-qt-9999.ebuild
+++ b/kde-frameworks/bluez-qt/bluez-qt-9999.ebuild
@@ -16,7 +16,9 @@ DEPEND="
 	dev-qt/qtdeclarative:5
 	dev-qt/qtnetwork:5
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!kde-plasma/bluez-qt
+"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-frameworks/bluez-qt/metadata.xml b/kde-frameworks/bluez-qt/metadata.xml
new file mode 100644
index 0000000000..a23f444b67
--- /dev/null
+++ b/kde-frameworks/bluez-qt/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-plasma/bluedevil/bluedevil-9999.ebuild b/kde-plasma/bluedevil/bluedevil-9999.ebuild
index 76bc35397a..962a4e9ffa 100644
--- a/kde-plasma/bluedevil/bluedevil-9999.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-9999.ebuild
@@ -12,6 +12,7 @@ KEYWORDS=""
 IUSE=""
 
 COMMON_DEPEND="
+	$(add_frameworks_dep bluez-qt)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
@@ -24,7 +25,6 @@ COMMON_DEPEND="
 	$(add_frameworks_dep knotifications)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep plasma)
-	$(add_plasma_dep bluez-qt)
 	dev-qt/qtdbus:5
 	dev-qt/qtdeclarative:5
 	dev-qt/qtgui:5
diff --git a/kde-plasma/plasma-meta/plasma-meta-9999.ebuild b/kde-plasma/plasma-meta/plasma-meta-9999.ebuild
index e54849ff72..0d9f4a4c0c 100644
--- a/kde-plasma/plasma-meta/plasma-meta-9999.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-9999.ebuild
@@ -43,7 +43,6 @@ RDEPEND="
 	$(add_plasma_dep systemsettings)
 	bluetooth? (
 		$(add_plasma_dep bluedevil)
-		$(add_plasma_dep bluez-qt)
 	)
 	display-manager? (
 		sddm? ( x11-misc/sddm )
diff --git a/profiles/updates/2Q-2015 b/profiles/updates/2Q-2015
index 8f3f7843b7..5e97ba4f13 100644
--- a/profiles/updates/2Q-2015
+++ b/profiles/updates/2Q-2015
@@ -1,3 +1,2 @@
 move dev-libs/extra-cmake-modules kde-frameworks/extra-cmake-modules
 slotmove kde-frameworks/extra-cmake-modules 0 5
-move kde-frameworks/bluez-qt kde-plasma/bluez-qt
diff --git a/sets/kde-frameworks-live b/sets/kde-frameworks-live
index d5e95a82fe..c5eeedc185 100644
--- a/sets/kde-frameworks-live
+++ b/sets/kde-frameworks-live
@@ -1,4 +1,5 @@
 ~kde-frameworks/attica-9999
+~kde-frameworks/bluez-qt-9999
 ~kde-frameworks/extra-cmake-modules-9999
 ~kde-frameworks/frameworkintegration-9999
 ~kde-frameworks/kactivities-9999
diff --git a/sets/kde-plasma-live b/sets/kde-plasma-live
index 89dfc8270c..115b546071 100644
--- a/sets/kde-plasma-live
+++ b/sets/kde-plasma-live
@@ -1,6 +1,5 @@
 ~kde-plasma/baloo-9999
 ~kde-plasma/bluedevil-9999
-~kde-plasma/bluez-qt-9999
 ~kde-plasma/breeze-9999
 ~kde-plasma/kde-cli-tools-9999
 ~kde-plasma/kde-gtk-config-9999