Merge branch 'develop' of git.calculate-linux.org:/repo/distros into develop

mhiretskiy 329
當前提交 2b03f2e8ef

@ -1,4 +1,4 @@
# Calculate path=/var/lib/calculate name=ini.env format=samba cl_update_world==rebuild||cl_update_world==merge||ini(overlay-distros.world)==
[overlay-distros]
world = 20200122
world = 20200405

@ -11,7 +11,7 @@ net-misc/vconfig
#in#
#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXS)!=#
#net-vpn/networkmanager-l2tp
net-vpn/networkmanager-l2tp
net-vpn/networkmanager-openvpn
net-vpn/networkmanager-pptp
net-vpn/networkmanager-vpnc

@ -62,6 +62,7 @@ sys-fs/exfat-utils
sys-fs/fuse-exfat
sys-fs/ntfs3g
sys-power/acpi
sys-power/acpid
sys-power/cpupower
sys-power/powernowd
sys-power/powertop

@ -0,0 +1,7 @@
# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
#-ini(overlay-distros.world,#-cut()-#)-#
#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXS)!=#
sys-power/acpid
#in#

@ -0,0 +1,7 @@
# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
#-ini(overlay-distros.world,#-cut()-#)-#
#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXS)!=#
net-vpn/networkmanager-l2tp
#in#
載入中…
取消
儲存