regular.mk: use kde4-plasma-nm* plugins

plasma-applet-networkmanager has been superseded by a bunch of kde4-plasma-nm* packages; only the main one has been included in regular-kde4 flavour since the switch resulting in the lack of VPN/mobile connectivity options. My opinion still is that plasma-applet-networkmanager should be returned as a metapackage for p7/branch timespan so that images could be built no matter whether it's sisyphus or p7 at hand. Oh well.

regular.mk: use kde4-plasma-nm* plugins
d48d7124 · Michael Shigorin · 561941a2 · d48d7124 · d48d7124 · d48d7124
Commit d48d7124 authored Apr 29, 2014 by Michael Shigorin
Showing with 19 additions and 25 deletions

regular.mk conf.d/regular.mk +1 -1

base+kde4mobile pkg.in/lists/tagged/base+kde4mobile +0 -10

network+kde4 pkg.in/lists/tagged/network+kde4 +18 -0

regular+kde4 pkg.in/lists/tagged/regular+kde4 +0 -14

No files found.
--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -134,7 +134,7 @@ distro/regular-tde-sysv: distro/.regular-sysv mixin/regular-tde \

 distro/regular-kde4: distro/.regular-desktop use/x11/kde4 use/x11/kdm4 \
 	use/fonts/zerg +pulse +plymouth +nm
-	@$(call add,LIVE_LISTS,$(call tags,regular kde4))
+	@$(call add,LIVE_LISTS,$(call tags,(regular || network) && kde4))
 	@$(call add,LIVE_PACKAGES,rosa-imagewriter)

 distro/regular-razorqt: distro/.regular-desktop +razorqt +plymouth; @:

--- a/pkg.in/lists/tagged/base+kde4mobile
+++ b/pkg.in/lists/tagged/base+kde4mobile
@@ -16,14 +16,4 @@ vlc-mini

 libqt4-sql-sqlite

-NetworkManager
-NetworkManager-vpnc
-NetworkManager-openvpn
-NetworkManager-pptp
 wpa_gui
-
-kde4-plasma-nm
-NetworkManager-applet-gtk-
-NetworkManager-openvpn-gtk-
-NetworkManager-pptp-gtk-
-NetworkManager-vpnc-gtk-
--- a/pkg.in/lists/tagged/network+kde4
+++ b/pkg.in/lists/tagged/network+kde4
+NetworkManager
+NetworkManager-vpnc
+NetworkManager-openvpn
+NetworkManager-pptp
+
+NetworkManager-applet-gtk-
+NetworkManager-openvpn-gtk-
+NetworkManager-pptp-gtk-
+NetworkManager-vpnc-gtk-
+
+kde4-plasma-nm
+kde4-plasma-nm-connect-l2tp
+kde4-plasma-nm-connect-mobile
+kde4-plasma-nm-connect-openconnect
+kde4-plasma-nm-connect-openvpn
+kde4-plasma-nm-connect-pptp
+kde4-plasma-nm-connect-strongswan
+kde4-plasma-nm-connect-vpnc
--- a/pkg.in/lists/tagged/regular+kde4
+++ b/pkg.in/lists/tagged/regular+kde4
@@ -5,20 +5,6 @@ phonon-gstreamer
 synaptic-kde
 synaptic-usermode-

-kde4-plasma-nm
-kde4-plasma-nm-connect-l2tp
-kde4-plasma-nm-connect-mobile
-kde4-plasma-nm-connect-openconnect
-kde4-plasma-nm-connect-openvpn
-kde4-plasma-nm-connect-pptp
-kde4-plasma-nm-connect-strongswan
-kde4-plasma-nm-connect-vpnc
-
-NetworkManager-applet-gtk-
-NetworkManager-openvpn-gtk-
-NetworkManager-pptp-gtk-
-NetworkManager-vpnc-gtk-
-
 gtk2-theme-oxygen-gtk
 gtk3-theme-oxygen-gtk