| 1 |
commit: 88bd0eed5732aad4479f3ccc79c26640ff535ef8 |
| 2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 31 11:28:27 2015 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 31 11:28:27 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=88bd0eed |
| 7 |
|
| 8 |
Pkg move kde-plasma/bluez-qt -> kde-franeworks/bluez-qt |
| 9 |
|
| 10 |
Moved to frameworks by upstream. |
| 11 |
|
| 12 |
.../package.accept_keywords/.kde-frameworks-live/kde-frameworks-live | 1 + |
| 13 |
.../package.accept_keywords/.kde-plasma-live/kde-plasma-live | 1 - |
| 14 |
Documentation/package.accept_keywords/kde-frameworks-live.keywords | 1 + |
| 15 |
Documentation/package.accept_keywords/kde-plasma-live.keywords | 1 - |
| 16 |
Documentation/package.mask/kde-frameworks-live | 1 + |
| 17 |
Documentation/package.mask/kde-plasma-live | 1 - |
| 18 |
Documentation/package.unmask/kde-frameworks-live | 1 + |
| 19 |
Documentation/package.unmask/kde-plasma-live | 1 - |
| 20 |
{kde-plasma => kde-frameworks}/bluez-qt/bluez-qt-9999.ebuild | 4 +++- |
| 21 |
kde-frameworks/bluez-qt/metadata.xml | 5 +++++ |
| 22 |
kde-plasma/bluedevil/bluedevil-9999.ebuild | 2 +- |
| 23 |
kde-plasma/plasma-meta/plasma-meta-9999.ebuild | 1 - |
| 24 |
profiles/updates/2Q-2015 | 1 - |
| 25 |
sets/kde-frameworks-live | 1 + |
| 26 |
sets/kde-plasma-live | 1 - |
| 27 |
15 files changed, 14 insertions(+), 9 deletions(-) |
| 28 |
|
| 29 |
diff --git a/Documentation/package.accept_keywords/.kde-frameworks-live/kde-frameworks-live b/Documentation/package.accept_keywords/.kde-frameworks-live/kde-frameworks-live |
| 30 |
index 18918ec..5700a7a 100644 |
| 31 |
--- a/Documentation/package.accept_keywords/.kde-frameworks-live/kde-frameworks-live |
| 32 |
+++ b/Documentation/package.accept_keywords/.kde-frameworks-live/kde-frameworks-live |
| 33 |
@@ -1,4 +1,5 @@ |
| 34 |
~kde-frameworks/attica-9999 ** |
| 35 |
+~kde-frameworks/bluez-qt-9999 ** |
| 36 |
~kde-frameworks/extra-cmake-modules-9999 ** |
| 37 |
~kde-frameworks/frameworkintegration-9999 ** |
| 38 |
~kde-frameworks/kactivities-9999 ** |
| 39 |
|
| 40 |
diff --git a/Documentation/package.accept_keywords/.kde-plasma-live/kde-plasma-live b/Documentation/package.accept_keywords/.kde-plasma-live/kde-plasma-live |
| 41 |
index e34f477..2051463 100644 |
| 42 |
--- a/Documentation/package.accept_keywords/.kde-plasma-live/kde-plasma-live |
| 43 |
+++ b/Documentation/package.accept_keywords/.kde-plasma-live/kde-plasma-live |
| 44 |
@@ -1,6 +1,5 @@ |
| 45 |
~kde-plasma/baloo-9999 ** |
| 46 |
~kde-plasma/bluedevil-9999 ** |
| 47 |
-~kde-plasma/bluez-qt-9999 ** |
| 48 |
~kde-plasma/breeze-9999 ** |
| 49 |
~kde-plasma/kde-cli-tools-9999 ** |
| 50 |
~kde-plasma/kde-gtk-config-9999 ** |
| 51 |
|
| 52 |
diff --git a/Documentation/package.accept_keywords/kde-frameworks-live.keywords b/Documentation/package.accept_keywords/kde-frameworks-live.keywords |
| 53 |
index 4ce9d51..b1727a7 100644 |
| 54 |
--- a/Documentation/package.accept_keywords/kde-frameworks-live.keywords |
| 55 |
+++ b/Documentation/package.accept_keywords/kde-frameworks-live.keywords |
| 56 |
@@ -2,6 +2,7 @@ |
| 57 |
# You can use this file to keyword/unkeyword KDE Frameworks live. |
| 58 |
# Edit Documentation/package.keywords/.kde-frameworks-live.base/ files instead. |
| 59 |
~kde-frameworks/attica-9999 ** |
| 60 |
+~kde-frameworks/bluez-qt-9999 ** |
| 61 |
~kde-frameworks/extra-cmake-modules-9999 ** |
| 62 |
~kde-frameworks/frameworkintegration-9999 ** |
| 63 |
~kde-frameworks/kactivities-9999 ** |
| 64 |
|
| 65 |
diff --git a/Documentation/package.accept_keywords/kde-plasma-live.keywords b/Documentation/package.accept_keywords/kde-plasma-live.keywords |
| 66 |
index d7aad9f..baba112 100644 |
| 67 |
--- a/Documentation/package.accept_keywords/kde-plasma-live.keywords |
| 68 |
+++ b/Documentation/package.accept_keywords/kde-plasma-live.keywords |
| 69 |
@@ -3,7 +3,6 @@ |
| 70 |
# Edit Documentation/package.keywords/.kde-plasma-live.base/ files instead. |
| 71 |
~kde-plasma/baloo-9999 ** |
| 72 |
~kde-plasma/bluedevil-9999 ** |
| 73 |
-~kde-plasma/bluez-qt-9999 ** |
| 74 |
~kde-plasma/breeze-9999 ** |
| 75 |
~kde-plasma/kde-cli-tools-9999 ** |
| 76 |
~kde-plasma/kde-gtk-config-9999 ** |
| 77 |
|
| 78 |
diff --git a/Documentation/package.mask/kde-frameworks-live b/Documentation/package.mask/kde-frameworks-live |
| 79 |
index bc774b2..cd659cf 100644 |
| 80 |
--- a/Documentation/package.mask/kde-frameworks-live |
| 81 |
+++ b/Documentation/package.mask/kde-frameworks-live |
| 82 |
@@ -2,6 +2,7 @@ |
| 83 |
# Live packages are masked by default. |
| 84 |
# Edit Documentation/package.unmask/.kde-frameworks-live/ files instead. |
| 85 |
~kde-frameworks/attica-9999 |
| 86 |
+~kde-frameworks/bluez-qt-9999 |
| 87 |
~kde-frameworks/extra-cmake-modules-9999 |
| 88 |
~kde-frameworks/frameworkintegration-9999 |
| 89 |
~kde-frameworks/kactivities-9999 |
| 90 |
|
| 91 |
diff --git a/Documentation/package.mask/kde-plasma-live b/Documentation/package.mask/kde-plasma-live |
| 92 |
index 823f26b..fcfe362 100644 |
| 93 |
--- a/Documentation/package.mask/kde-plasma-live |
| 94 |
+++ b/Documentation/package.mask/kde-plasma-live |
| 95 |
@@ -3,7 +3,6 @@ |
| 96 |
# Edit Documentation/package.unmask/.kde-plasma-live/ files instead. |
| 97 |
~kde-plasma/baloo-9999 |
| 98 |
~kde-plasma/bluedevil-9999 |
| 99 |
-~kde-plasma/bluez-qt-9999 |
| 100 |
~kde-plasma/breeze-9999 |
| 101 |
~kde-plasma/kde-cli-tools-9999 |
| 102 |
~kde-plasma/kde-gtk-config-9999 |
| 103 |
|
| 104 |
diff --git a/Documentation/package.unmask/kde-frameworks-live b/Documentation/package.unmask/kde-frameworks-live |
| 105 |
index bc774b2..cd659cf 100644 |
| 106 |
--- a/Documentation/package.unmask/kde-frameworks-live |
| 107 |
+++ b/Documentation/package.unmask/kde-frameworks-live |
| 108 |
@@ -2,6 +2,7 @@ |
| 109 |
# Live packages are masked by default. |
| 110 |
# Edit Documentation/package.unmask/.kde-frameworks-live/ files instead. |
| 111 |
~kde-frameworks/attica-9999 |
| 112 |
+~kde-frameworks/bluez-qt-9999 |
| 113 |
~kde-frameworks/extra-cmake-modules-9999 |
| 114 |
~kde-frameworks/frameworkintegration-9999 |
| 115 |
~kde-frameworks/kactivities-9999 |
| 116 |
|
| 117 |
diff --git a/Documentation/package.unmask/kde-plasma-live b/Documentation/package.unmask/kde-plasma-live |
| 118 |
index 823f26b..fcfe362 100644 |
| 119 |
--- a/Documentation/package.unmask/kde-plasma-live |
| 120 |
+++ b/Documentation/package.unmask/kde-plasma-live |
| 121 |
@@ -3,7 +3,6 @@ |
| 122 |
# Edit Documentation/package.unmask/.kde-plasma-live/ files instead. |
| 123 |
~kde-plasma/baloo-9999 |
| 124 |
~kde-plasma/bluedevil-9999 |
| 125 |
-~kde-plasma/bluez-qt-9999 |
| 126 |
~kde-plasma/breeze-9999 |
| 127 |
~kde-plasma/kde-cli-tools-9999 |
| 128 |
~kde-plasma/kde-gtk-config-9999 |
| 129 |
|
| 130 |
diff --git a/kde-plasma/bluez-qt/bluez-qt-9999.ebuild b/kde-frameworks/bluez-qt/bluez-qt-9999.ebuild |
| 131 |
similarity index 90% |
| 132 |
rename from kde-plasma/bluez-qt/bluez-qt-9999.ebuild |
| 133 |
rename to kde-frameworks/bluez-qt/bluez-qt-9999.ebuild |
| 134 |
index f06229d..c3bae7a 100644 |
| 135 |
--- a/kde-plasma/bluez-qt/bluez-qt-9999.ebuild |
| 136 |
+++ b/kde-frameworks/bluez-qt/bluez-qt-9999.ebuild |
| 137 |
@@ -16,7 +16,9 @@ DEPEND=" |
| 138 |
dev-qt/qtdeclarative:5 |
| 139 |
dev-qt/qtnetwork:5 |
| 140 |
" |
| 141 |
-RDEPEND="${DEPEND}" |
| 142 |
+RDEPEND="${DEPEND} |
| 143 |
+ !kde-plasma/bluez-qt |
| 144 |
+" |
| 145 |
|
| 146 |
src_configure() { |
| 147 |
local mycmakeargs=( |
| 148 |
|
| 149 |
diff --git a/kde-frameworks/bluez-qt/metadata.xml b/kde-frameworks/bluez-qt/metadata.xml |
| 150 |
new file mode 100644 |
| 151 |
index 0000000..a23f444 |
| 152 |
--- /dev/null |
| 153 |
+++ b/kde-frameworks/bluez-qt/metadata.xml |
| 154 |
@@ -0,0 +1,5 @@ |
| 155 |
+<?xml version="1.0" encoding="UTF-8"?> |
| 156 |
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 157 |
+<pkgmetadata> |
| 158 |
+ <herd>kde</herd> |
| 159 |
+</pkgmetadata> |
| 160 |
|
| 161 |
diff --git a/kde-plasma/bluedevil/bluedevil-9999.ebuild b/kde-plasma/bluedevil/bluedevil-9999.ebuild |
| 162 |
index 76bc353..962a4e9 100644 |
| 163 |
--- a/kde-plasma/bluedevil/bluedevil-9999.ebuild |
| 164 |
+++ b/kde-plasma/bluedevil/bluedevil-9999.ebuild |
| 165 |
@@ -12,6 +12,7 @@ KEYWORDS="" |
| 166 |
IUSE="" |
| 167 |
|
| 168 |
COMMON_DEPEND=" |
| 169 |
+ $(add_frameworks_dep bluez-qt) |
| 170 |
$(add_frameworks_dep kcompletion) |
| 171 |
$(add_frameworks_dep kconfig) |
| 172 |
$(add_frameworks_dep kconfigwidgets) |
| 173 |
@@ -24,7 +25,6 @@ COMMON_DEPEND=" |
| 174 |
$(add_frameworks_dep knotifications) |
| 175 |
$(add_frameworks_dep kwidgetsaddons) |
| 176 |
$(add_frameworks_dep plasma) |
| 177 |
- $(add_plasma_dep bluez-qt) |
| 178 |
dev-qt/qtdbus:5 |
| 179 |
dev-qt/qtdeclarative:5 |
| 180 |
dev-qt/qtgui:5 |
| 181 |
|
| 182 |
diff --git a/kde-plasma/plasma-meta/plasma-meta-9999.ebuild b/kde-plasma/plasma-meta/plasma-meta-9999.ebuild |
| 183 |
index e54849f..0d9f4a4 100644 |
| 184 |
--- a/kde-plasma/plasma-meta/plasma-meta-9999.ebuild |
| 185 |
+++ b/kde-plasma/plasma-meta/plasma-meta-9999.ebuild |
| 186 |
@@ -43,7 +43,6 @@ RDEPEND=" |
| 187 |
$(add_plasma_dep systemsettings) |
| 188 |
bluetooth? ( |
| 189 |
$(add_plasma_dep bluedevil) |
| 190 |
- $(add_plasma_dep bluez-qt) |
| 191 |
) |
| 192 |
display-manager? ( |
| 193 |
sddm? ( x11-misc/sddm ) |
| 194 |
|
| 195 |
diff --git a/profiles/updates/2Q-2015 b/profiles/updates/2Q-2015 |
| 196 |
index 8f3f784..5e97ba4 100644 |
| 197 |
--- a/profiles/updates/2Q-2015 |
| 198 |
+++ b/profiles/updates/2Q-2015 |
| 199 |
@@ -1,3 +1,2 @@ |
| 200 |
move dev-libs/extra-cmake-modules kde-frameworks/extra-cmake-modules |
| 201 |
slotmove kde-frameworks/extra-cmake-modules 0 5 |
| 202 |
-move kde-frameworks/bluez-qt kde-plasma/bluez-qt |
| 203 |
|
| 204 |
diff --git a/sets/kde-frameworks-live b/sets/kde-frameworks-live |
| 205 |
index d5e95a8..c5eeedc 100644 |
| 206 |
--- a/sets/kde-frameworks-live |
| 207 |
+++ b/sets/kde-frameworks-live |
| 208 |
@@ -1,4 +1,5 @@ |
| 209 |
~kde-frameworks/attica-9999 |
| 210 |
+~kde-frameworks/bluez-qt-9999 |
| 211 |
~kde-frameworks/extra-cmake-modules-9999 |
| 212 |
~kde-frameworks/frameworkintegration-9999 |
| 213 |
~kde-frameworks/kactivities-9999 |
| 214 |
|
| 215 |
diff --git a/sets/kde-plasma-live b/sets/kde-plasma-live |
| 216 |
index 89dfc82..115b546 100644 |
| 217 |
--- a/sets/kde-plasma-live |
| 218 |
+++ b/sets/kde-plasma-live |
| 219 |
@@ -1,6 +1,5 @@ |
| 220 |
~kde-plasma/baloo-9999 |
| 221 |
~kde-plasma/bluedevil-9999 |
| 222 |
-~kde-plasma/bluez-qt-9999 |
| 223 |
~kde-plasma/breeze-9999 |
| 224 |
~kde-plasma/kde-cli-tools-9999 |
| 225 |
~kde-plasma/kde-gtk-config-9999 |
Archives