Добавлен USE uksm для calculate-sources, изменены условия патчей uksm

eclass/calculate-kernel-7.eclass

@@ -38,7 +38,7 @@ RDEPEND="${CDEPEND} vmlinuz? ( sys-kernel/dracut )"
 detect_version
 detect_arch
 
-IUSE="+vmlinuz muqss pae minimal themes firmware +grub"
+IUSE="+vmlinuz uksm muqss pae minimal themes firmware +grub"
 
 if [[ ${KV_MAJOR} -lt 3 ]]
 then

profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/4500_uksm.patch

@@ -1,4 +1,4 @@
-# Calculate format=diff
+# Calculate format=diff merge(sys-kernel/calculate-sources[uksm])!=
 diff --git a/Documentation/vm/00-INDEX b/Documentation/vm/00-INDEX
 index 11d3d8dcb449..5269998fef8a 100644
 --- a/Documentation/vm/00-INDEX

profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.4/4500_uksm.patch

@@ -1,4 +1,4 @@
-# Calculate format=diff
+# Calculate format=diff merge(sys-kernel/calculate-sources[uksm])!=
 diff --git a/Documentation/vm/00-INDEX b/Documentation/vm/00-INDEX
 index 6a5e2a1..09eaa9a1 100644
 --- a/Documentation/vm/00-INDEX

profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/4500_uksm.patch

@@ -1,4 +1,4 @@
-# Calculate format=diff
+# Calculate format=diff merge(sys-kernel/calculate-sources[uksm])!=
 diff --git a/Documentation/vm/00-INDEX b/Documentation/vm/00-INDEX
 index 6a5e2a1..09eaa9a1 100644
 --- a/Documentation/vm/00-INDEX

sys-kernel/calculate-sources/metadata.xml

@@ -26,4 +26,13 @@
 	<use>
 		<flag name='grub'>Adds sys-boot/grub dependence</flag>
 	</use>
+	<use>
+		<flag name='uksm'>Build kernel with UKSM</flag>
+	</use>
+	<use>
+		<flag name='pae'>Build kernel with PAE</flag>
+	</use>
+	<use>
+		<flag name='muqss'>Build kernel with MuQSS</flag>
+	</use>
 </pkgmetadata>