diff options
22 files changed, 43 insertions, 48 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 e5a3e678859..c185802a211 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 55e0666332b..3f0cfde3dd7 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 de026e762e2..3e5a2ec303a 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 31cd5d7a046..71cb8798297 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 d8aa56c5b28..b171aaa3db6 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 97e57d44b80..7bec98a1db1 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 d8aa56c5b28..b171aaa3db6 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/Manifest b/kde-base/libmm-qt/Manifest index da38d1ef54d..da38d1ef54d 100644 --- a/net-libs/libmm-qt/Manifest +++ b/kde-base/libmm-qt/Manifest diff --git a/net-libs/libmm-qt/libmm-qt-5.0.93.ebuild b/kde-base/libmm-qt/libmm-qt-5.0.93.ebuild index 92d065a6140..0889417db30 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 index 1cd10f0a7d6..0889417db30 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 index 5de8ebc9683..0889417db30 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/kde-base/libmm-qt/libmm-qt-5.1.9999.ebuild b/kde-base/libmm-qt/libmm-qt-5.1.9999.ebuild new file mode 100644 index 00000000000..96df83dd300 --- /dev/null +++ b/kde-base/libmm-qt/libmm-qt-5.1.9999.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +inherit kde5 + +DESCRIPTION="Modemmanager bindings for Qt" +LICENSE="LGPL-2" +KEYWORDS="" +IUSE="" + +RDEPEND=" + dev-qt/qtdbus:5 + dev-qt/qtxml:5 + net-misc/mobile-broadband-provider-info + >=net-misc/networkmanager-0.9.8[modemmanager] +" +DEPEND="${RDEPEND}" diff --git a/net-libs/libmm-qt/libmm-qt-9999.ebuild b/kde-base/libmm-qt/libmm-qt-9999.ebuild index 5de8ebc9683..96df83dd300 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 index a23f444b67d..a23f444b67d 100644 --- a/net-libs/libmm-qt/metadata.xml +++ b/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 0ead3f6e7d0..4bfff388704 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 c03d672791b..5f659f9756f 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 fa02dd543e7..9e30e0d582c 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 fa02dd543e7..9e30e0d582c 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 867b303b51c..f6c8aa8b126 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 4f3c147958d..6ad5a312698 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 2d612e62dc0..4486c2a0f49 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 1d837a229f6..1e44d49c933 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 |