diff options
| -rw-r--r-- | kde-apps/solid-runtime/solid-runtime-16.04.3.ebuild | 2 | ||||
| -rw-r--r-- | kde-misc/networkmanagement/networkmanagement-0.9.0.12.ebuild | 4 | ||||
| -rw-r--r-- | kde-misc/plasma-nm/Manifest | 1 | ||||
| -rw-r--r-- | kde-misc/plasma-nm/metadata.xml | 12 | ||||
| -rw-r--r-- | kde-plasma/plasma-nm/Manifest | 1 | ||||
| -rw-r--r-- | kde-plasma/plasma-nm/files/plasma-nm-0.9.3.6-networkmanager-1.0.6.patch (renamed from kde-misc/plasma-nm/files/plasma-nm-0.9.3.6-networkmanager-1.0.6.patch) | 0 | ||||
| -rw-r--r-- | kde-plasma/plasma-nm/plasma-nm-0.9.3.6.ebuild (renamed from kde-misc/plasma-nm/plasma-nm-0.9.3.6.ebuild) | 0 | ||||
| -rw-r--r-- | kde-plasma/plasma-nm/plasma-nm-5.7.5.ebuild | 2 | ||||
| -rw-r--r-- | kde-plasma/plasma-nm/plasma-nm-5.8.2.ebuild | 2 | ||||
| -rw-r--r-- | profiles/updates/4Q-2016 | 1 |
10 files changed, 7 insertions, 18 deletions
diff --git a/kde-apps/solid-runtime/solid-runtime-16.04.3.ebuild b/kde-apps/solid-runtime/solid-runtime-16.04.3.ebuild index 44bbb054b723..93411a709363 100644 --- a/kde-apps/solid-runtime/solid-runtime-16.04.3.ebuild +++ b/kde-apps/solid-runtime/solid-runtime-16.04.3.ebuild @@ -24,7 +24,7 @@ KMEXTRA=" DEPEND="" RDEPEND="${DEPEND} bluetooth? ( || ( net-wireless/bluedevil kde-plasma/bluedevil ) ) - networkmanager? ( || ( kde-misc/plasma-nm kde-misc/networkmanagement kde-plasma/plasma-nm ) ) + networkmanager? ( || ( kde-plasma/plasma-nm:* kde-misc/networkmanagement ) ) " PATCHES=( "${FILESDIR}/${PN}-4.14.3-networkmanager-1.0.6.patch" ) diff --git a/kde-misc/networkmanagement/networkmanagement-0.9.0.12.ebuild b/kde-misc/networkmanagement/networkmanagement-0.9.0.12.ebuild index a2174028dcf8..8acef267324c 100644 --- a/kde-misc/networkmanagement/networkmanagement-0.9.0.12.ebuild +++ b/kde-misc/networkmanagement/networkmanagement-0.9.0.12.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -30,7 +30,7 @@ DEPEND=" " RDEPEND="${DEPEND} !kde-base/solid - !kde-misc/plasma-nm + !kde-plasma/plasma-nm:4 " src_configure() { diff --git a/kde-misc/plasma-nm/Manifest b/kde-misc/plasma-nm/Manifest deleted file mode 100644 index 3e1a6bb7f5c6..000000000000 --- a/kde-misc/plasma-nm/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST plasma-nm-0.9.3.6.tar.xz 551320 SHA256 56b5c8221761fac30808117c7f8fa11a9e3cdb4b2d16a733d33996bc7136b64b SHA512 50f3e5020f4437d710709a301b981f888898c293a71dff3aee809255207a0f97caf5d3811b453da2338df93238ef33a79e85cb3598ee38d8a41255d8a572e256 WHIRLPOOL 2486304f8c5c169105e2ea0527e7fb291cc9c9f9fee36a2cdc9d5aff7f5a72cb8bdda692ac54f621c63a84b2e48ba2c429e20a4bbe7efa91ecb48a393286dc7c diff --git a/kde-misc/plasma-nm/metadata.xml b/kde-misc/plasma-nm/metadata.xml deleted file mode 100644 index b346d4af9201..000000000000 --- a/kde-misc/plasma-nm/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>kde@gentoo.org</email> - <name>Gentoo KDE Project</name> - </maintainer> - <use> - <flag name="modemmanager">Enable support for mobile broadband devices</flag> - <flag name="openconnect">Build support for the OpenConnect VPN client</flag> - </use> -</pkgmetadata> diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest index fe7142949810..7b1111fc695e 100644 --- a/kde-plasma/plasma-nm/Manifest +++ b/kde-plasma/plasma-nm/Manifest @@ -1,2 +1,3 @@ +DIST plasma-nm-0.9.3.6.tar.xz 551320 SHA256 56b5c8221761fac30808117c7f8fa11a9e3cdb4b2d16a733d33996bc7136b64b SHA512 50f3e5020f4437d710709a301b981f888898c293a71dff3aee809255207a0f97caf5d3811b453da2338df93238ef33a79e85cb3598ee38d8a41255d8a572e256 WHIRLPOOL 2486304f8c5c169105e2ea0527e7fb291cc9c9f9fee36a2cdc9d5aff7f5a72cb8bdda692ac54f621c63a84b2e48ba2c429e20a4bbe7efa91ecb48a393286dc7c DIST plasma-nm-5.7.5.tar.xz 638176 SHA256 eb74256c962703097bb6f20b10c8ef2f1646e92256772db4ec81ff4df71aedee SHA512 f806ee6b764fe7022ad82f55fb2ba28d4157a655722e02bc1b344d5e6c97ee1137938134a25ab842968174a03d72dffa20e7ab6eea4bcb5d44c5a609fa41817a WHIRLPOOL 36bbe87dfb6a783dba6d240c0f8a6361a1c4211c7f3892338288e479fd82fc22d79a018d400383e2b0085d7797a45adcecb55f5c3f54be959578e20127b96268 DIST plasma-nm-5.8.2.tar.xz 643944 SHA256 4260fbcd437b899eb17001f58a0a3973131faab2dc0702dab8ef9cf49186b60c SHA512 59186ad1f82de7914365d5c716ba0dd9c5199dba7ad9255584eaf51b4c7e71724acf9a3863141ef87223b616ae16210a78898c662e2ad7c51c16acfa7799e048 WHIRLPOOL d46cd03de7b6867591913007c0e8e8cb143d7213f80d1f361cdb183ff6bfd1035a808b7343c4729ca2d6986a2c4885a28d3f85ce087c58f431dc5c2b6b1729fc 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 index 1151763886c3..1151763886c3 100644 --- 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 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 index 6bdcc223fa08..6bdcc223fa08 100644 --- a/kde-misc/plasma-nm/plasma-nm-0.9.3.6.ebuild +++ b/kde-plasma/plasma-nm/plasma-nm-0.9.3.6.ebuild diff --git a/kde-plasma/plasma-nm/plasma-nm-5.7.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.7.5.ebuild index 68352dcee055..06f95db6440f 100644 --- a/kde-plasma/plasma-nm/plasma-nm-5.7.5.ebuild +++ b/kde-plasma/plasma-nm/plasma-nm-5.7.5.ebuild @@ -52,7 +52,7 @@ DEPEND=" " RDEPEND="${DEPEND} $(add_plasma_dep plasma-workspace) - !kde-misc/plasma-nm + !kde-plasma/plasma-nm:4 " src_configure() { diff --git a/kde-plasma/plasma-nm/plasma-nm-5.8.2.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.8.2.ebuild index e7a396db9bea..d88fb05f82df 100644 --- a/kde-plasma/plasma-nm/plasma-nm-5.8.2.ebuild +++ b/kde-plasma/plasma-nm/plasma-nm-5.8.2.ebuild @@ -52,7 +52,7 @@ DEPEND=" " RDEPEND="${DEPEND} $(add_plasma_dep plasma-workspace) - !kde-misc/plasma-nm + !kde-plasma/plasma-nm:4 " src_configure() { diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016 index f01e876510e7..46380ee1dfd9 100644 --- a/profiles/updates/4Q-2016 +++ b/profiles/updates/4Q-2016 @@ -2,3 +2,4 @@ move net-analyzer/ipv6-toolkit net-analyzer/ipv6toolkit move dev-ml/qcheck dev-ml/iTeML move x11-apps/xvfb-run x11-misc/xvfb-run move kde-plasma/plasma-mediacenter media-video/plasma-mediacenter +move kde-misc/plasma-nm kde-plasma/plasma-nm |