app-emulation/libvirt: Update kernel checks for kernels > 4.4, bug #5…

…87758

Thanks to Nicolas Bock for the patch.

Package-Manager: portage-2.2.28

app-emulation/libvirt/libvirt-1.2.21-r2.ebuild

@@ -174,7 +174,13 @@ pkg_setup() {
 		~!GRKERNSEC_CHROOT_CAPS"
 	# Handle specific kernel versions for different features
 	kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
-	kernel_is ge 3 6 && CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
+	kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
+	if $(kernel_is ge 3 6); then
+		CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
+		if $(kernel_is lt 4 5); then
+			CONFIG_CHECK+=" ~MEMCG_KMEM "
+		fi
+	fi
 
 	use macvtap && CONFIG_CHECK+="
 		~MACVTAP"

app-emulation/libvirt/libvirt-1.3.5-r1.ebuild

@@ -174,7 +174,12 @@ pkg_setup() {
 		~!GRKERNSEC_CHROOT_CAPS"
 	# Handle specific kernel versions for different features
 	kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
-	kernel_is ge 3 6 && CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
+	if $(kernel_is ge 3 6); then
+		CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
+		if $(kernel_is lt 4 5); then
+			CONFIG_CHECK+=" ~MEMCG_KMEM "
+		fi
+	fi
 
 	use macvtap && CONFIG_CHECK+="
 		~MACVTAP"

app-emulation/libvirt/libvirt-9999.ebuild

@@ -173,8 +173,14 @@ pkg_setup() {
 		~!GRKERNSEC_CHROOT_CHMOD
 		~!GRKERNSEC_CHROOT_CAPS"
 	# Handle specific kernel versions for different features
+	krnel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
 	kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
-	kernel_is ge 3 6 && CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
+	if $(kernel_is ge 3 6); then
+		CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
+		if $(kernel_is lt 4 5); then
+			CONFIG_CHECK+=" ~MEMCG_KMEM "
+		fi
+	fi
 
 	use macvtap && CONFIG_CHECK+="
 		~MACVTAP"