1 |
commit: 9b65b90b2942ce7673855a6b9ba738892d47e9a0 |
2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 29 11:53:28 2016 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 29 11:54:27 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b65b90b |
7 |
|
8 |
kde-misc/plasma-nm -> kde-plasma/plasma-nm |
9 |
|
10 |
kde-apps/solid-runtime/solid-runtime-16.04.3.ebuild | 2 +- |
11 |
kde-misc/networkmanagement/networkmanagement-0.9.0.12.ebuild | 4 ++-- |
12 |
kde-misc/plasma-nm/Manifest | 1 - |
13 |
kde-misc/plasma-nm/metadata.xml | 12 ------------ |
14 |
kde-plasma/plasma-nm/Manifest | 1 + |
15 |
.../files/plasma-nm-0.9.3.6-networkmanager-1.0.6.patch | 0 |
16 |
{kde-misc => kde-plasma}/plasma-nm/plasma-nm-0.9.3.6.ebuild | 0 |
17 |
kde-plasma/plasma-nm/plasma-nm-5.7.5.ebuild | 2 +- |
18 |
kde-plasma/plasma-nm/plasma-nm-5.8.2.ebuild | 2 +- |
19 |
profiles/updates/4Q-2016 | 1 + |
20 |
10 files changed, 7 insertions(+), 18 deletions(-) |
21 |
|
22 |
diff --git a/kde-apps/solid-runtime/solid-runtime-16.04.3.ebuild b/kde-apps/solid-runtime/solid-runtime-16.04.3.ebuild |
23 |
index 44bbb05..93411a7 100644 |
24 |
--- a/kde-apps/solid-runtime/solid-runtime-16.04.3.ebuild |
25 |
+++ b/kde-apps/solid-runtime/solid-runtime-16.04.3.ebuild |
26 |
@@ -24,7 +24,7 @@ KMEXTRA=" |
27 |
DEPEND="" |
28 |
RDEPEND="${DEPEND} |
29 |
bluetooth? ( || ( net-wireless/bluedevil kde-plasma/bluedevil ) ) |
30 |
- networkmanager? ( || ( kde-misc/plasma-nm kde-misc/networkmanagement kde-plasma/plasma-nm ) ) |
31 |
+ networkmanager? ( || ( kde-plasma/plasma-nm:* kde-misc/networkmanagement ) ) |
32 |
" |
33 |
|
34 |
PATCHES=( "${FILESDIR}/${PN}-4.14.3-networkmanager-1.0.6.patch" ) |
35 |
|
36 |
diff --git a/kde-misc/networkmanagement/networkmanagement-0.9.0.12.ebuild b/kde-misc/networkmanagement/networkmanagement-0.9.0.12.ebuild |
37 |
index a217402..8acef26 100644 |
38 |
--- a/kde-misc/networkmanagement/networkmanagement-0.9.0.12.ebuild |
39 |
+++ b/kde-misc/networkmanagement/networkmanagement-0.9.0.12.ebuild |
40 |
@@ -1,4 +1,4 @@ |
41 |
-# Copyright 1999-2015 Gentoo Foundation |
42 |
+# Copyright 1999-2016 Gentoo Foundation |
43 |
# Distributed under the terms of the GNU General Public License v2 |
44 |
# $Id$ |
45 |
|
46 |
@@ -30,7 +30,7 @@ DEPEND=" |
47 |
" |
48 |
RDEPEND="${DEPEND} |
49 |
!kde-base/solid |
50 |
- !kde-misc/plasma-nm |
51 |
+ !kde-plasma/plasma-nm:4 |
52 |
" |
53 |
|
54 |
src_configure() { |
55 |
|
56 |
diff --git a/kde-misc/plasma-nm/Manifest b/kde-misc/plasma-nm/Manifest |
57 |
deleted file mode 100644 |
58 |
index 3e1a6bb..00000000 |
59 |
--- a/kde-misc/plasma-nm/Manifest |
60 |
+++ /dev/null |
61 |
@@ -1 +0,0 @@ |
62 |
-DIST plasma-nm-0.9.3.6.tar.xz 551320 SHA256 56b5c8221761fac30808117c7f8fa11a9e3cdb4b2d16a733d33996bc7136b64b SHA512 50f3e5020f4437d710709a301b981f888898c293a71dff3aee809255207a0f97caf5d3811b453da2338df93238ef33a79e85cb3598ee38d8a41255d8a572e256 WHIRLPOOL 2486304f8c5c169105e2ea0527e7fb291cc9c9f9fee36a2cdc9d5aff7f5a72cb8bdda692ac54f621c63a84b2e48ba2c429e20a4bbe7efa91ecb48a393286dc7c |
63 |
|
64 |
diff --git a/kde-misc/plasma-nm/metadata.xml b/kde-misc/plasma-nm/metadata.xml |
65 |
deleted file mode 100644 |
66 |
index b346d4a..00000000 |
67 |
--- a/kde-misc/plasma-nm/metadata.xml |
68 |
+++ /dev/null |
69 |
@@ -1,12 +0,0 @@ |
70 |
-<?xml version="1.0" encoding="UTF-8"?> |
71 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
72 |
-<pkgmetadata> |
73 |
- <maintainer type="project"> |
74 |
- <email>kde@g.o</email> |
75 |
- <name>Gentoo KDE Project</name> |
76 |
- </maintainer> |
77 |
- <use> |
78 |
- <flag name="modemmanager">Enable support for mobile broadband devices</flag> |
79 |
- <flag name="openconnect">Build support for the OpenConnect VPN client</flag> |
80 |
- </use> |
81 |
-</pkgmetadata> |
82 |
|
83 |
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest |
84 |
index fe71429..7b1111f 100644 |
85 |
--- a/kde-plasma/plasma-nm/Manifest |
86 |
+++ b/kde-plasma/plasma-nm/Manifest |
87 |
@@ -1,2 +1,3 @@ |
88 |
+DIST plasma-nm-0.9.3.6.tar.xz 551320 SHA256 56b5c8221761fac30808117c7f8fa11a9e3cdb4b2d16a733d33996bc7136b64b SHA512 50f3e5020f4437d710709a301b981f888898c293a71dff3aee809255207a0f97caf5d3811b453da2338df93238ef33a79e85cb3598ee38d8a41255d8a572e256 WHIRLPOOL 2486304f8c5c169105e2ea0527e7fb291cc9c9f9fee36a2cdc9d5aff7f5a72cb8bdda692ac54f621c63a84b2e48ba2c429e20a4bbe7efa91ecb48a393286dc7c |
89 |
DIST plasma-nm-5.7.5.tar.xz 638176 SHA256 eb74256c962703097bb6f20b10c8ef2f1646e92256772db4ec81ff4df71aedee SHA512 f806ee6b764fe7022ad82f55fb2ba28d4157a655722e02bc1b344d5e6c97ee1137938134a25ab842968174a03d72dffa20e7ab6eea4bcb5d44c5a609fa41817a WHIRLPOOL 36bbe87dfb6a783dba6d240c0f8a6361a1c4211c7f3892338288e479fd82fc22d79a018d400383e2b0085d7797a45adcecb55f5c3f54be959578e20127b96268 |
90 |
DIST plasma-nm-5.8.2.tar.xz 643944 SHA256 4260fbcd437b899eb17001f58a0a3973131faab2dc0702dab8ef9cf49186b60c SHA512 59186ad1f82de7914365d5c716ba0dd9c5199dba7ad9255584eaf51b4c7e71724acf9a3863141ef87223b616ae16210a78898c662e2ad7c51c16acfa7799e048 WHIRLPOOL d46cd03de7b6867591913007c0e8e8cb143d7213f80d1f361cdb183ff6bfd1035a808b7343c4729ca2d6986a2c4885a28d3f85ce087c58f431dc5c2b6b1729fc |
91 |
|
92 |
diff --git a/kde-misc/plasma-nm/files/plasma-nm-0.9.3.6-networkmanager-1.0.6.patch b/kde-plasma/plasma-nm/files/plasma-nm-0.9.3.6-networkmanager-1.0.6.patch |
93 |
similarity index 100% |
94 |
rename from kde-misc/plasma-nm/files/plasma-nm-0.9.3.6-networkmanager-1.0.6.patch |
95 |
rename to kde-plasma/plasma-nm/files/plasma-nm-0.9.3.6-networkmanager-1.0.6.patch |
96 |
|
97 |
diff --git a/kde-misc/plasma-nm/plasma-nm-0.9.3.6.ebuild b/kde-plasma/plasma-nm/plasma-nm-0.9.3.6.ebuild |
98 |
similarity index 100% |
99 |
rename from kde-misc/plasma-nm/plasma-nm-0.9.3.6.ebuild |
100 |
rename to kde-plasma/plasma-nm/plasma-nm-0.9.3.6.ebuild |
101 |
|
102 |
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.7.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.7.5.ebuild |
103 |
index 68352dc..06f95db 100644 |
104 |
--- a/kde-plasma/plasma-nm/plasma-nm-5.7.5.ebuild |
105 |
+++ b/kde-plasma/plasma-nm/plasma-nm-5.7.5.ebuild |
106 |
@@ -52,7 +52,7 @@ DEPEND=" |
107 |
" |
108 |
RDEPEND="${DEPEND} |
109 |
$(add_plasma_dep plasma-workspace) |
110 |
- !kde-misc/plasma-nm |
111 |
+ !kde-plasma/plasma-nm:4 |
112 |
" |
113 |
|
114 |
src_configure() { |
115 |
|
116 |
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.8.2.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.8.2.ebuild |
117 |
index e7a396d..d88fb05 100644 |
118 |
--- a/kde-plasma/plasma-nm/plasma-nm-5.8.2.ebuild |
119 |
+++ b/kde-plasma/plasma-nm/plasma-nm-5.8.2.ebuild |
120 |
@@ -52,7 +52,7 @@ DEPEND=" |
121 |
" |
122 |
RDEPEND="${DEPEND} |
123 |
$(add_plasma_dep plasma-workspace) |
124 |
- !kde-misc/plasma-nm |
125 |
+ !kde-plasma/plasma-nm:4 |
126 |
" |
127 |
|
128 |
src_configure() { |
129 |
|
130 |
diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016 |
131 |
index f01e876..46380ee 100644 |
132 |
--- a/profiles/updates/4Q-2016 |
133 |
+++ b/profiles/updates/4Q-2016 |
134 |
@@ -2,3 +2,4 @@ move net-analyzer/ipv6-toolkit net-analyzer/ipv6toolkit |
135 |
move dev-ml/qcheck dev-ml/iTeML |
136 |
move x11-apps/xvfb-run x11-misc/xvfb-run |
137 |
move kde-plasma/plasma-mediacenter media-video/plasma-mediacenter |
138 |
+move kde-misc/plasma-nm kde-plasma/plasma-nm |