1 |
commit: ce272f34d6dafedb450bcaf8a7e888b4dd9cd8e5 |
2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Oct 30 15:42:19 2016 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Oct 30 15:42:45 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce272f34 |
7 |
|
8 |
net-wireless/bluedevil -> kde-plasma/bluedevil |
9 |
|
10 |
kde-apps/solid-runtime/solid-runtime-16.04.3.ebuild | 2 +- |
11 |
kde-plasma/bluedevil/Manifest | 1 + |
12 |
{net-wireless => kde-plasma}/bluedevil/bluedevil-2.1.1.ebuild | 2 +- |
13 |
kde-plasma/bluedevil/bluedevil-5.7.5.ebuild | 3 +-- |
14 |
kde-plasma/bluedevil/bluedevil-5.8.2.ebuild | 3 +-- |
15 |
net-wireless/bluedevil/Manifest | 1 - |
16 |
net-wireless/bluedevil/metadata.xml | 8 -------- |
17 |
profiles/updates/4Q-2016 | 1 + |
18 |
8 files changed, 6 insertions(+), 15 deletions(-) |
19 |
|
20 |
diff --git a/kde-apps/solid-runtime/solid-runtime-16.04.3.ebuild b/kde-apps/solid-runtime/solid-runtime-16.04.3.ebuild |
21 |
index 93411a7..e95e675 100644 |
22 |
--- a/kde-apps/solid-runtime/solid-runtime-16.04.3.ebuild |
23 |
+++ b/kde-apps/solid-runtime/solid-runtime-16.04.3.ebuild |
24 |
@@ -23,7 +23,7 @@ KMEXTRA=" |
25 |
|
26 |
DEPEND="" |
27 |
RDEPEND="${DEPEND} |
28 |
- bluetooth? ( || ( net-wireless/bluedevil kde-plasma/bluedevil ) ) |
29 |
+ bluetooth? ( kde-plasma/bluedevil:* ) |
30 |
networkmanager? ( || ( kde-plasma/plasma-nm:* kde-misc/networkmanagement ) ) |
31 |
" |
32 |
|
33 |
|
34 |
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest |
35 |
index 4d2b384..2643e48 100644 |
36 |
--- a/kde-plasma/bluedevil/Manifest |
37 |
+++ b/kde-plasma/bluedevil/Manifest |
38 |
@@ -1,2 +1,3 @@ |
39 |
+DIST bluedevil-2.1.1.tar.xz 162060 SHA256 f18dc3848363dd7f7cce61475f336426c17b83224260cff705a96a535d0b9de5 SHA512 c5908db65dc2b3971af01b8555cb244257ed80592fe85417f2778cf3d236e34da402e8bf9bb4beba796b6d1401a1dcb1b4a651db1f57422314e3d030199e8bc4 WHIRLPOOL 858c29b76ac36af75d47c894f5da1e088d821801aaae695df619c95f8fab97ff22247d0451d3a9e7ec2253db836b4a7c1bf54a5f1b218e75030ba80189a6a193 |
40 |
DIST bluedevil-5.7.5.tar.xz 139004 SHA256 5d1ca0db68f73ceed3bc3add8b9b9327a136db9740f237e7604efdd982536dcf SHA512 b99ee8f7f2834b62a8b73a6b4434c9cc762a572085c95c442096733a75f9eadb34224585ca18539832580094f855b89bff79c3e94712e1010dcc846d63e9de51 WHIRLPOOL 1797f775c47e34828e6cdb9e56e29f0a80c86fbddadf39183e5778719e07d6f2019af5310eaa79384aeea3e0def272f3c8fed25fe14e90caaa80ba12704f5d82 |
41 |
DIST bluedevil-5.8.2.tar.xz 141068 SHA256 cd6a3629703313e8ca66c927e629afd550a7fbc259b3e83187c8a923e0860bd5 SHA512 f1a7796c23a47a0a698b2990232da221032254bdc60eb366da93e6794ef60b874c215fa99d0c719b99f84cbb56e023691a9121edbc73321b84cc8f2071b49e73 WHIRLPOOL 2478b4ea0a13ed1412294e0211a7450d3bf9d94284e3daed7992621fd546f8f64add25956c70a491f8525edd5adc141f909e134834f9ab7b3ba7fd5b39866c72 |
42 |
|
43 |
diff --git a/net-wireless/bluedevil/bluedevil-2.1.1.ebuild b/kde-plasma/bluedevil/bluedevil-2.1.1.ebuild |
44 |
similarity index 93% |
45 |
rename from net-wireless/bluedevil/bluedevil-2.1.1.ebuild |
46 |
rename to kde-plasma/bluedevil/bluedevil-2.1.1.ebuild |
47 |
index 2fe99a3..c8865de 100644 |
48 |
--- a/net-wireless/bluedevil/bluedevil-2.1.1.ebuild |
49 |
+++ b/kde-plasma/bluedevil/bluedevil-2.1.1.ebuild |
50 |
@@ -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 |
51 |
sr@ijekavian sr@ijekavianlatin sr@Latn sv th tr ug uk zh_CN zh_TW" |
52 |
inherit kde4-base |
53 |
|
54 |
-DESCRIPTION="Bluetooth stack for KDE" |
55 |
+DESCRIPTION="Bluetooth stack for KDE Plasma" |
56 |
HOMEPAGE="https://projects.kde.org/projects/extragear/base/bluedevil" |
57 |
SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" |
58 |
|
59 |
|
60 |
diff --git a/kde-plasma/bluedevil/bluedevil-5.7.5.ebuild b/kde-plasma/bluedevil/bluedevil-5.7.5.ebuild |
61 |
index 87bff0a..0e5e4bf 100644 |
62 |
--- a/kde-plasma/bluedevil/bluedevil-5.7.5.ebuild |
63 |
+++ b/kde-plasma/bluedevil/bluedevil-5.7.5.ebuild |
64 |
@@ -37,6 +37,5 @@ RDEPEND="${COMMON_DEPEND} |
65 |
$(add_plasma_dep kde-cli-tools) |
66 |
!app-mobilephone/obexd |
67 |
!app-mobilephone/obex-data-server |
68 |
- !net-wireless/bluedevil |
69 |
- !net-wireless/kbluetooth |
70 |
+ !kde-plasma/bluedevil:4 |
71 |
" |
72 |
|
73 |
diff --git a/kde-plasma/bluedevil/bluedevil-5.8.2.ebuild b/kde-plasma/bluedevil/bluedevil-5.8.2.ebuild |
74 |
index b492cda..17b1025 100644 |
75 |
--- a/kde-plasma/bluedevil/bluedevil-5.8.2.ebuild |
76 |
+++ b/kde-plasma/bluedevil/bluedevil-5.8.2.ebuild |
77 |
@@ -37,6 +37,5 @@ RDEPEND="${COMMON_DEPEND} |
78 |
$(add_plasma_dep kde-cli-tools) |
79 |
!app-mobilephone/obexd |
80 |
!app-mobilephone/obex-data-server |
81 |
- !net-wireless/bluedevil |
82 |
- !net-wireless/kbluetooth |
83 |
+ !kde-plasma/bluedevil:4 |
84 |
" |
85 |
|
86 |
diff --git a/net-wireless/bluedevil/Manifest b/net-wireless/bluedevil/Manifest |
87 |
deleted file mode 100644 |
88 |
index 5faffa4..00000000 |
89 |
--- a/net-wireless/bluedevil/Manifest |
90 |
+++ /dev/null |
91 |
@@ -1 +0,0 @@ |
92 |
-DIST bluedevil-2.1.1.tar.xz 162060 SHA256 f18dc3848363dd7f7cce61475f336426c17b83224260cff705a96a535d0b9de5 SHA512 c5908db65dc2b3971af01b8555cb244257ed80592fe85417f2778cf3d236e34da402e8bf9bb4beba796b6d1401a1dcb1b4a651db1f57422314e3d030199e8bc4 WHIRLPOOL 858c29b76ac36af75d47c894f5da1e088d821801aaae695df619c95f8fab97ff22247d0451d3a9e7ec2253db836b4a7c1bf54a5f1b218e75030ba80189a6a193 |
93 |
|
94 |
diff --git a/net-wireless/bluedevil/metadata.xml b/net-wireless/bluedevil/metadata.xml |
95 |
deleted file mode 100644 |
96 |
index 2fdbf33..00000000 |
97 |
--- a/net-wireless/bluedevil/metadata.xml |
98 |
+++ /dev/null |
99 |
@@ -1,8 +0,0 @@ |
100 |
-<?xml version="1.0" encoding="UTF-8"?> |
101 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
102 |
-<pkgmetadata> |
103 |
- <maintainer type="project"> |
104 |
- <email>kde@g.o</email> |
105 |
- <name>Gentoo KDE Project</name> |
106 |
- </maintainer> |
107 |
-</pkgmetadata> |
108 |
|
109 |
diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016 |
110 |
index 86f2556..5ac29d1 100644 |
111 |
--- a/profiles/updates/4Q-2016 |
112 |
+++ b/profiles/updates/4Q-2016 |
113 |
@@ -5,3 +5,4 @@ move kde-plasma/plasma-mediacenter media-video/plasma-mediacenter |
114 |
move kde-misc/plasma-nm kde-plasma/plasma-nm |
115 |
slotmove app-office/akonadi-server 0 4 |
116 |
move app-office/akonadi-server kde-apps/akonadi |
117 |
+move net-wireless/bluedevil kde-plasma/bluedevil |