commit: 8c381a12cdbb630a99c68b8d5be93097bb12ccd2
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 14 13:47:53 2014 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Oct 14 13:47:53 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8c381a12
Move libmm-qt from net-libs to kde-base as it is part of Plasma 5 proper.
---
.../package.accept_keywords/.kde-plasma-live/kde-plasma-live | 2 ++
.../package.accept_keywords/kde-plasma-5.0.keywords | 1 +
.../package.accept_keywords/kde-plasma-live.keywords | 2 ++
Documentation/package.mask/kde-plasma-5.0 | 1 +
Documentation/package.mask/kde-plasma-live | 2 ++
Documentation/package.unmask/kde-plasma-5.0 | 1 +
Documentation/package.unmask/kde-plasma-live | 2 ++
{net-libs => kde-base}/libmm-qt/libmm-qt-5.0.93.ebuild | 12 +-----------
{net-libs => kde-base}/libmm-qt/libmm-qt-5.0.95.ebuild | 12 +-----------
{net-libs => kde-base}/libmm-qt/libmm-qt-5.1.0.ebuild | 12 +-----------
.../libmm-qt/libmm-qt-5.1.9999.ebuild | 12 +-----------
{net-libs => kde-base}/libmm-qt/libmm-qt-9999.ebuild | 12 +-----------
{net-libs => kde-base}/libmm-qt/metadata.xml | 0
kde-base/plasma-nm/plasma-nm-5.0.2.ebuild | 2 +-
kde-base/plasma-nm/plasma-nm-5.1.0.ebuild | 2 +-
kde-base/plasma-nm/plasma-nm-5.1.9999.ebuild | 2 +-
kde-base/plasma-nm/plasma-nm-9999.ebuild | 2 +-
sets/kde-plasma | 1 +
sets/kde-plasma-5.0 | 1 +
sets/kde-plasma-5.1 | 1 +
sets/kde-plasma-live | 1 +
21 files changed, 24 insertions(+), 59 deletions(-)
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 e5a3e67..c185802 100644
--- a/Documentation/package.accept_keywords/.kde-plasma-live/kde-plasma-live
+++ b/Documentation/package.accept_keywords/.kde-plasma-live/kde-plasma-live
@@ -12,7 +12,9 @@
~kde-base/kwayland-9999 **
~kde-base/kwin-9999 **
~kde-base/kwrited-9999 **
+~kde-base/libkscreen-9999 **
~kde-base/libksysguard-9999 **
+~kde-base/libmm-qt-9999 **
~kde-base/libnm-qt-9999 **
~kde-base/milou-9999 **
~kde-base/oxygen-9999 **
diff --git a/Documentation/package.accept_keywords/kde-plasma-5.0.keywords
b/Documentation/package.accept_keywords/kde-plasma-5.0.keywords
index 55e0666..3f0cfde 100644
--- a/Documentation/package.accept_keywords/kde-plasma-5.0.keywords
+++ b/Documentation/package.accept_keywords/kde-plasma-5.0.keywords
@@ -15,6 +15,7 @@
<kde-base/kwrited-5.0.50:5
<kde-base/libkscreen-5.0.50:5
<kde-base/libksysguard-5.0.50:5
+<kde-base/libmm-qt-5.0.50:5
<kde-base/libnm-qt-5.0.50:5
<kde-base/milou-5.0.50:5
<kde-base/oxygen-5.0.50:5
diff --git a/Documentation/package.accept_keywords/kde-plasma-live.keywords
b/Documentation/package.accept_keywords/kde-plasma-live.keywords
index de026e7..3e5a2ec 100644
--- a/Documentation/package.accept_keywords/kde-plasma-live.keywords
+++ b/Documentation/package.accept_keywords/kde-plasma-live.keywords
@@ -15,7 +15,9 @@
~kde-base/kwayland-9999 **
~kde-base/kwin-9999 **
~kde-base/kwrited-9999 **
+~kde-base/libkscreen-9999 **
~kde-base/libksysguard-9999 **
+~kde-base/libmm-qt-9999 **
~kde-base/libnm-qt-9999 **
~kde-base/milou-9999 **
~kde-base/oxygen-9999 **
diff --git a/Documentation/package.mask/kde-plasma-5.0
b/Documentation/package.mask/kde-plasma-5.0
index 31cd5d7..71cb879 100644
--- a/Documentation/package.mask/kde-plasma-5.0
+++ b/Documentation/package.mask/kde-plasma-5.0
@@ -15,6 +15,7 @@
>=kde-base/kwrited-5.0:5
>=kde-base/libkscreen-5.0:5
>=kde-base/libksysguard-5.0:5
+>=kde-base/libmm-qt-5.0:5
>=kde-base/libnm-qt-5.0:5
>=kde-base/milou-5.0:5
>=kde-base/oxygen-5.0:5
diff --git a/Documentation/package.mask/kde-plasma-live
b/Documentation/package.mask/kde-plasma-live
index d8aa56c..b171aaa 100644
--- a/Documentation/package.mask/kde-plasma-live
+++ b/Documentation/package.mask/kde-plasma-live
@@ -15,7 +15,9 @@
~kde-base/kwayland-9999
~kde-base/kwin-9999
~kde-base/kwrited-9999
+~kde-base/libkscreen-9999
~kde-base/libksysguard-9999
+~kde-base/libmm-qt-9999
~kde-base/libnm-qt-9999
~kde-base/milou-9999
~kde-base/oxygen-9999
diff --git a/Documentation/package.unmask/kde-plasma-5.0
b/Documentation/package.unmask/kde-plasma-5.0
index 97e57d4..7bec98a 100644
--- a/Documentation/package.unmask/kde-plasma-5.0
+++ b/Documentation/package.unmask/kde-plasma-5.0
@@ -15,6 +15,7 @@
<kde-base/kwrited-5.0.50:5
<kde-base/libkscreen-5.0.50:5
<kde-base/libksysguard-5.0.50:5
+<kde-base/libmm-qt-5.0.50:5
<kde-base/libnm-qt-5.0.50:5
<kde-base/milou-5.0.50:5
<kde-base/oxygen-5.0.50:5
diff --git a/Documentation/package.unmask/kde-plasma-live
b/Documentation/package.unmask/kde-plasma-live
index d8aa56c..b171aaa 100644
--- a/Documentation/package.unmask/kde-plasma-live
+++ b/Documentation/package.unmask/kde-plasma-live
@@ -15,7 +15,9 @@
~kde-base/kwayland-9999
~kde-base/kwin-9999
~kde-base/kwrited-9999
+~kde-base/libkscreen-9999
~kde-base/libksysguard-9999
+~kde-base/libmm-qt-9999
~kde-base/libnm-qt-9999
~kde-base/milou-9999
~kde-base/oxygen-9999
diff --git a/net-libs/libmm-qt/libmm-qt-5.0.93.ebuild
b/kde-base/libmm-qt/libmm-qt-5.0.93.ebuild
similarity index 56%
copy from net-libs/libmm-qt/libmm-qt-5.0.93.ebuild
copy to kde-base/libmm-qt/libmm-qt-5.0.93.ebuild
index 92d065a..0889417 100644
--- a/net-libs/libmm-qt/libmm-qt-5.0.93.ebuild
+++ b/kde-base/libmm-qt/libmm-qt-5.0.93.ebuild
@@ -6,19 +6,9 @@ EAPI=5
inherit kde5
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
- KEYWORDS="~amd64 ~x86"
- SRC_URI="mirror://kde/stable/plasma/5.0.2/${P}.tar.xz"
-else
- KEYWORDS=""
-fi
-
DESCRIPTION="Modemmanager bindings for Qt"
-HOMEPAGE="https://projects.kde.org/projects/extragear/libs/libmm-qt";
-
LICENSE="LGPL-2"
-# maybe remove SLOT when it becomes a official KDE Framework
-SLOT="0"
+KEYWORDS=" ~amd64"
IUSE=""
RDEPEND="
diff --git a/net-libs/libmm-qt/libmm-qt-5.0.95.ebuild
b/kde-base/libmm-qt/libmm-qt-5.0.95.ebuild
similarity index 56%
rename from net-libs/libmm-qt/libmm-qt-5.0.95.ebuild
rename to kde-base/libmm-qt/libmm-qt-5.0.95.ebuild
index 1cd10f0..0889417 100644
--- a/net-libs/libmm-qt/libmm-qt-5.0.95.ebuild
+++ b/kde-base/libmm-qt/libmm-qt-5.0.95.ebuild
@@ -6,19 +6,9 @@ EAPI=5
inherit kde5
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
- KEYWORDS="~amd64 ~x86"
- SRC_URI="mirror://kde/unstable/plasma/${PV}/${P}.tar.xz"
-else
- KEYWORDS=""
-fi
-
DESCRIPTION="Modemmanager bindings for Qt"
-HOMEPAGE="https://projects.kde.org/projects/extragear/libs/libmm-qt";
-
LICENSE="LGPL-2"
-# maybe remove SLOT when it becomes a official KDE Framework
-SLOT="0"
+KEYWORDS=" ~amd64"
IUSE=""
RDEPEND="
diff --git a/net-libs/libmm-qt/libmm-qt-5.1.0.ebuild
b/kde-base/libmm-qt/libmm-qt-5.1.0.ebuild
similarity index 56%
rename from net-libs/libmm-qt/libmm-qt-5.1.0.ebuild
rename to kde-base/libmm-qt/libmm-qt-5.1.0.ebuild
index 5de8ebc..0889417 100644
--- a/net-libs/libmm-qt/libmm-qt-5.1.0.ebuild
+++ b/kde-base/libmm-qt/libmm-qt-5.1.0.ebuild
@@ -6,19 +6,9 @@ EAPI=5
inherit kde5
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
- KEYWORDS="~amd64 ~x86"
- SRC_URI="mirror://kde/stable/plasma/${PV}/${P}.tar.xz"
-else
- KEYWORDS=""
-fi
-
DESCRIPTION="Modemmanager bindings for Qt"
-HOMEPAGE="https://projects.kde.org/projects/extragear/libs/libmm-qt";
-
LICENSE="LGPL-2"
-# maybe remove SLOT when it becomes a official KDE Framework
-SLOT="0"
+KEYWORDS=" ~amd64"
IUSE=""
RDEPEND="
diff --git a/net-libs/libmm-qt/libmm-qt-5.0.93.ebuild
b/kde-base/libmm-qt/libmm-qt-5.1.9999.ebuild
similarity index 56%
rename from net-libs/libmm-qt/libmm-qt-5.0.93.ebuild
rename to kde-base/libmm-qt/libmm-qt-5.1.9999.ebuild
index 92d065a..96df83d 100644
--- a/net-libs/libmm-qt/libmm-qt-5.0.93.ebuild
+++ b/kde-base/libmm-qt/libmm-qt-5.1.9999.ebuild
@@ -6,19 +6,9 @@ EAPI=5
inherit kde5
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
- KEYWORDS="~amd64 ~x86"
- SRC_URI="mirror://kde/stable/plasma/5.0.2/${P}.tar.xz"
-else
- KEYWORDS=""
-fi
-
DESCRIPTION="Modemmanager bindings for Qt"
-HOMEPAGE="https://projects.kde.org/projects/extragear/libs/libmm-qt";
-
LICENSE="LGPL-2"
-# maybe remove SLOT when it becomes a official KDE Framework
-SLOT="0"
+KEYWORDS=""
IUSE=""
RDEPEND="
diff --git a/net-libs/libmm-qt/libmm-qt-9999.ebuild
b/kde-base/libmm-qt/libmm-qt-9999.ebuild
similarity index 56%
rename from net-libs/libmm-qt/libmm-qt-9999.ebuild
rename to kde-base/libmm-qt/libmm-qt-9999.ebuild
index 5de8ebc..96df83d 100644
--- a/net-libs/libmm-qt/libmm-qt-9999.ebuild
+++ b/kde-base/libmm-qt/libmm-qt-9999.ebuild
@@ -6,19 +6,9 @@ EAPI=5
inherit kde5
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
- KEYWORDS="~amd64 ~x86"
- SRC_URI="mirror://kde/stable/plasma/${PV}/${P}.tar.xz"
-else
- KEYWORDS=""
-fi
-
DESCRIPTION="Modemmanager bindings for Qt"
-HOMEPAGE="https://projects.kde.org/projects/extragear/libs/libmm-qt";
-
LICENSE="LGPL-2"
-# maybe remove SLOT when it becomes a official KDE Framework
-SLOT="0"
+KEYWORDS=""
IUSE=""
RDEPEND="
diff --git a/net-libs/libmm-qt/metadata.xml b/kde-base/libmm-qt/metadata.xml
similarity index 100%
rename from net-libs/libmm-qt/metadata.xml
rename to kde-base/libmm-qt/metadata.xml
diff --git a/kde-base/plasma-nm/plasma-nm-5.0.2.ebuild
b/kde-base/plasma-nm/plasma-nm-5.0.2.ebuild
index 0ead3f6..4bfff38 100644
--- a/kde-base/plasma-nm/plasma-nm-5.0.2.ebuild
+++ b/kde-base/plasma-nm/plasma-nm-5.0.2.ebuild
@@ -40,7 +40,7 @@ DEPEND="
>=net-libs/libnm-qt-5.0[teamd=]
net-misc/mobile-broadband-provider-info
>=net-misc/networkmanager-0.9.10.0[teamd=]
- modemmanager? ( >=net-libs/libmm-qt-5.0 )
+ modemmanager? ( $(add_kdebase_dep libmm-qt) )
openconnect? (
net-misc/networkmanager-openconnect
net-misc/openconnect
diff --git a/kde-base/plasma-nm/plasma-nm-5.1.0.ebuild
b/kde-base/plasma-nm/plasma-nm-5.1.0.ebuild
index c03d672..5f659f9 100644
--- a/kde-base/plasma-nm/plasma-nm-5.1.0.ebuild
+++ b/kde-base/plasma-nm/plasma-nm-5.1.0.ebuild
@@ -40,8 +40,8 @@ DEPEND="
net-misc/mobile-broadband-provider-info
>=net-misc/networkmanager-0.9.10.0[teamd=]
modemmanager? (
+ $(add_kdebase_dep libmm-qt)
dev-qt/qtxml:5
- >=net-libs/libmm-qt-5.0
)
openconnect? (
dev-qt/qtxml:5
diff --git a/kde-base/plasma-nm/plasma-nm-5.1.9999.ebuild
b/kde-base/plasma-nm/plasma-nm-5.1.9999.ebuild
index fa02dd5..9e30e0d 100644
--- a/kde-base/plasma-nm/plasma-nm-5.1.9999.ebuild
+++ b/kde-base/plasma-nm/plasma-nm-5.1.9999.ebuild
@@ -40,8 +40,8 @@ DEPEND="
net-misc/mobile-broadband-provider-info
>=net-misc/networkmanager-0.9.10.0[teamd=]
modemmanager? (
+ $(add_kdebase_dep libmm-qt)
dev-qt/qtxml:5
- >=net-libs/libmm-qt-5.0
)
openconnect? (
dev-qt/qtxml:5
diff --git a/kde-base/plasma-nm/plasma-nm-9999.ebuild
b/kde-base/plasma-nm/plasma-nm-9999.ebuild
index fa02dd5..9e30e0d 100644
--- a/kde-base/plasma-nm/plasma-nm-9999.ebuild
+++ b/kde-base/plasma-nm/plasma-nm-9999.ebuild
@@ -40,8 +40,8 @@ DEPEND="
net-misc/mobile-broadband-provider-info
>=net-misc/networkmanager-0.9.10.0[teamd=]
modemmanager? (
+ $(add_kdebase_dep libmm-qt)
dev-qt/qtxml:5
- >=net-libs/libmm-qt-5.0
)
openconnect? (
dev-qt/qtxml:5
diff --git a/sets/kde-plasma b/sets/kde-plasma
index 867b303..f6c8aa8 100644
--- a/sets/kde-plasma
+++ b/sets/kde-plasma
@@ -13,6 +13,7 @@ kde-base/kwin:5
kde-base/kwrited:5
kde-base/libkscreen:5
kde-base/libksysguard:5
+kde-base/libmm-qt:5
kde-base/libnm-qt:5
kde-base/milou:5
kde-base/oxygen:5
diff --git a/sets/kde-plasma-5.0 b/sets/kde-plasma-5.0
index 4f3c147..6ad5a31 100644
--- a/sets/kde-plasma-5.0
+++ b/sets/kde-plasma-5.0
@@ -12,6 +12,7 @@
<kde-base/kwrited-5.0.50:5
<kde-base/libkscreen-5.0.50:5
<kde-base/libksysguard-5.0.50:5
+<kde-base/libmm-qt-5.0.50:5
<kde-base/libnm-qt-5.0.50:5
<kde-base/milou-5.0.50:5
<kde-base/oxygen-5.0.50:5
diff --git a/sets/kde-plasma-5.1 b/sets/kde-plasma-5.1
index 2d612e6..4486c2a 100644
--- a/sets/kde-plasma-5.1
+++ b/sets/kde-plasma-5.1
@@ -14,6 +14,7 @@
<kde-base/kwrited-5.1.50:5
<kde-base/libkscreen-5.1.50:5
<kde-base/libksysguard-5.1.50:5
+<kde-base/libmm-qt-5.1.50:5
<kde-base/libnm-qt-5.1.50:5
<kde-base/milou-5.1.50:5
<kde-base/oxygen-5.1.50:5
diff --git a/sets/kde-plasma-live b/sets/kde-plasma-live
index 1d837a2..1e44d49 100644
--- a/sets/kde-plasma-live
+++ b/sets/kde-plasma-live
@@ -14,6 +14,7 @@
~kde-base/kwrited-9999
~kde-base/libkscreen-9999
~kde-base/libksysguard-9999
+~kde-base/libmm-qt-9999
~kde-base/libnm-qt-9999
~kde-base/milou-9999
~kde-base/oxygen-9999
