net-wireless/bluedevil -> kde-plasma/bluedevil

8 files changed, 6 insertions, 15 deletions

diff --git a/kde-apps/solid-runtime/solid-runtime-16.04.3.ebuild b/kde-apps/solid-runtime/solid-runtime-16.04.3.ebuild
index 93411a709363..e95e6757354b 100644
--- a/kde-apps/solid-runtime/solid-runtime-16.04.3.ebuild
+++ b/kde-apps/solid-runtime/solid-runtime-16.04.3.ebuild
@@ -23,7 +23,7 @@ KMEXTRA="
 
 DEPEND=""
 RDEPEND="${DEPEND}
-	bluetooth? ( || ( net-wireless/bluedevil kde-plasma/bluedevil ) )
+	bluetooth? ( kde-plasma/bluedevil:* )
 	networkmanager? ( || ( kde-plasma/plasma-nm:* kde-misc/networkmanagement ) )
 "
 
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index 4d2b38421288..2643e487623a 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,2 +1,3 @@
+DIST bluedevil-2.1.1.tar.xz 162060 SHA256 f18dc3848363dd7f7cce61475f336426c17b83224260cff705a96a535d0b9de5 SHA512 c5908db65dc2b3971af01b8555cb244257ed80592fe85417f2778cf3d236e34da402e8bf9bb4beba796b6d1401a1dcb1b4a651db1f57422314e3d030199e8bc4 WHIRLPOOL 858c29b76ac36af75d47c894f5da1e088d821801aaae695df619c95f8fab97ff22247d0451d3a9e7ec2253db836b4a7c1bf54a5f1b218e75030ba80189a6a193
 DIST bluedevil-5.7.5.tar.xz 139004 SHA256 5d1ca0db68f73ceed3bc3add8b9b9327a136db9740f237e7604efdd982536dcf SHA512 b99ee8f7f2834b62a8b73a6b4434c9cc762a572085c95c442096733a75f9eadb34224585ca18539832580094f855b89bff79c3e94712e1010dcc846d63e9de51 WHIRLPOOL 1797f775c47e34828e6cdb9e56e29f0a80c86fbddadf39183e5778719e07d6f2019af5310eaa79384aeea3e0def272f3c8fed25fe14e90caaa80ba12704f5d82
 DIST bluedevil-5.8.2.tar.xz 141068 SHA256 cd6a3629703313e8ca66c927e629afd550a7fbc259b3e83187c8a923e0860bd5 SHA512 f1a7796c23a47a0a698b2990232da221032254bdc60eb366da93e6794ef60b874c215fa99d0c719b99f84cbb56e023691a9121edbc73321b84cc8f2071b49e73 WHIRLPOOL 2478b4ea0a13ed1412294e0211a7450d3bf9d94284e3daed7992621fd546f8f64add25956c70a491f8525edd5adc141f909e134834f9ab7b3ba7fd5b39866c72
diff --git a/net-wireless/bluedevil/bluedevil-2.1.1.ebuild b/kde-plasma/bluedevil/bluedevil-2.1.1.ebuild
index 2fe99a3cec3c..c8865de5f3e9 100644
--- a/net-wireless/bluedevil/bluedevil-2.1.1.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-2.1.1.ebuild
@@ -9,7 +9,7 @@ hu it ja kk km ko lt mai mr ms nb nds nl pa pl pt pt_BR ro ru sk sl sr
 sr@ijekavian sr@ijekavianlatin sr@Latn sv th tr ug uk zh_CN zh_TW"
 inherit kde4-base
 
-DESCRIPTION="Bluetooth stack for KDE"
+DESCRIPTION="Bluetooth stack for KDE Plasma"
 HOMEPAGE="https://projects.kde.org/projects/extragear/base/bluedevil"
 SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 
diff --git a/kde-plasma/bluedevil/bluedevil-5.7.5.ebuild b/kde-plasma/bluedevil/bluedevil-5.7.5.ebuild
index 87bff0a3b0b7..0e5e4bf4beb8 100644
--- a/kde-plasma/bluedevil/bluedevil-5.7.5.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-5.7.5.ebuild
@@ -37,6 +37,5 @@ RDEPEND="${COMMON_DEPEND}
 	$(add_plasma_dep kde-cli-tools)
 	!app-mobilephone/obexd
 	!app-mobilephone/obex-data-server
-	!net-wireless/bluedevil
-	!net-wireless/kbluetooth
+	!kde-plasma/bluedevil:4
 "
diff --git a/kde-plasma/bluedevil/bluedevil-5.8.2.ebuild b/kde-plasma/bluedevil/bluedevil-5.8.2.ebuild
index b492cda9750a..17b1025fba3c 100644
--- a/kde-plasma/bluedevil/bluedevil-5.8.2.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-5.8.2.ebuild
@@ -37,6 +37,5 @@ RDEPEND="${COMMON_DEPEND}
 	$(add_plasma_dep kde-cli-tools)
 	!app-mobilephone/obexd
 	!app-mobilephone/obex-data-server
-	!net-wireless/bluedevil
-	!net-wireless/kbluetooth
+	!kde-plasma/bluedevil:4
 "
diff --git a/net-wireless/bluedevil/Manifest b/net-wireless/bluedevil/Manifest
deleted file mode 100644
index 5faffa474032..000000000000
--- a/net-wireless/bluedevil/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST bluedevil-2.1.1.tar.xz 162060 SHA256 f18dc3848363dd7f7cce61475f336426c17b83224260cff705a96a535d0b9de5 SHA512 c5908db65dc2b3971af01b8555cb244257ed80592fe85417f2778cf3d236e34da402e8bf9bb4beba796b6d1401a1dcb1b4a651db1f57422314e3d030199e8bc4 WHIRLPOOL 858c29b76ac36af75d47c894f5da1e088d821801aaae695df619c95f8fab97ff22247d0451d3a9e7ec2253db836b4a7c1bf54a5f1b218e75030ba80189a6a193
diff --git a/net-wireless/bluedevil/metadata.xml b/net-wireless/bluedevil/metadata.xml
deleted file mode 100644
index 2fdbf33d963d..000000000000
--- a/net-wireless/bluedevil/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016
index 86f25568084c..5ac29d1cf864 100644
--- a/profiles/updates/4Q-2016
+++ b/profiles/updates/4Q-2016
@@ -5,3 +5,4 @@ move kde-plasma/plasma-mediacenter media-video/plasma-mediacenter
 move kde-misc/plasma-nm kde-plasma/plasma-nm
 slotmove app-office/akonadi-server 0 4
 move app-office/akonadi-server kde-apps/akonadi
+move net-wireless/bluedevil kde-plasma/bluedevil