gentoo resync : 02.06.2019

6 files changed, 93 insertions, 235 deletions

diff --git a/sys-kernel/kpatch/Manifest b/sys-kernel/kpatch/Manifest
index e0c20cdc3fda..cae833fba9cf 100644
--- a/sys-kernel/kpatch/Manifest
+++ b/sys-kernel/kpatch/Manifest
@@ -1,8 +1,4 @@
-DIST kpatch-0.4.0.tar.gz 124433 BLAKE2B 6ea18c4d590426f9db95e16d555307e264d1b7db362d421f72eaaf897703f7883c44cc49bd98b48d8789453962259d0b0e301aca325c94be6c21061d0621a9cf SHA512 0bbb49a06d02e9eb026be458eb904cf50f50461a67f16835a306bb3a4a57ef88b86ecf6bca6dfc91b921ba87b4c8b9d532e2a77e987e7c71583b8cb53520a1d7
-DIST kpatch-0.6.0.tar.gz 153337 BLAKE2B 5c132b885f9f8bc3c7b514997a0b8b77280d0387431dd3eb73f45da4678b281961a03452b0ec590b37fc9568192135528a9a42bd5005530bd8b9175fe652f7b1 SHA512 7ac27639773a851ad6689743100ff973b4e3a30efc386bdf413c8f6167068d93c2d18820d87e1f1e96405fa3545dcb80a72db0011f07218a692f91f1f3c3655a
-DIST kpatch-0.6.2.tar.gz 148110 BLAKE2B 9903c9423ee6268a0d87c55336e418a964474a3d7f35dd1ad613be7645a932cd09991652cd4a3af0b08a686f39e7c6c7f4b12d80c20c7ecd663aa703821503f8 SHA512 65098195330a2dbea4f8648c87c41f3a7751ffcb83b4e4c5f0a1146f91a8ae8c305d8f111a69304b31f1f12dd26da788af31a5477899bda098b7391cd0a32eca
-EBUILD kpatch-0.4.0-r1.ebuild 1921 BLAKE2B 3b35c292949f73c13efe8b429e96034d9982d923b937962a184dd4d742d31e86a05433db9a4e44aa3ab043aea3e7d2c9b5d619ed53c2833f16640ca6244f163f SHA512 ab0db6ce451aebd04142d1439f8e2e66d36a6e7abd548f3fbada115650d512c62c1a01918d4529ead08b06e66b5ad6521122efe788a35ca09c65ce9b47e94300
-EBUILD kpatch-0.6.0.ebuild 1921 BLAKE2B 9a4ea4154f650aee4364f5e727d60659f5fbf35a6b1a681410a92454854d7f45078f4cc240aa0b60cef079873fa202c719ea3e67c5bf2888a041ca6fcbcbbb6a SHA512 fbda6b2f18f0d3256d6fec90549027417867456b6d86fd6fd3983a2d08752f672bfa5f56d2de316c47ff5ebfe1bf86d985680aa75441d488359c2ac0a64381e0
-EBUILD kpatch-0.6.2.ebuild 1921 BLAKE2B 9a4ea4154f650aee4364f5e727d60659f5fbf35a6b1a681410a92454854d7f45078f4cc240aa0b60cef079873fa202c719ea3e67c5bf2888a041ca6fcbcbbb6a SHA512 fbda6b2f18f0d3256d6fec90549027417867456b6d86fd6fd3983a2d08752f672bfa5f56d2de316c47ff5ebfe1bf86d985680aa75441d488359c2ac0a64381e0
+DIST kpatch-0.6.3.tar.gz 153100 BLAKE2B e95d1880ffc9ff6038bba98902d0f1e97c9f7f8d0f90eedc281c4bf0570217668cf7b701d038d6f06e9885ebdbb4407cc554d5175cf17eb8fd5051381f75deb3 SHA512 0d266dd837ad651d7f46047cf2c8de527d08274a885a154c53354f4b3c5679d91c766d7d42294ffe71cc548e5ee865c7555f24001882b806f2fb48825f9b0c06
+EBUILD kpatch-0.6.3.ebuild 2429 BLAKE2B f5c29e68e94f581ef722fdcca5abb8ffd915eb0d518a6e6633314072ad260d1dc8577706beb54e3166ea6b43ba4981d0ee54e35ad23442e9292d06f24d6136ea SHA512 de23464be4721f19f8be75f58e3203a747c5c2f0193fcfe4c2a56b1a6ac4b8dcba9d7bcad61694313218cd85d574bcc52319cd6f019d6d052527d25dff6a393a
 EBUILD kpatch-9999.ebuild 1952 BLAKE2B 40d2f4405a96d90e1162aa05110ffded881e3a2a75edab8716f877495502dc4fa3945ebbef9f6086b30ff97194eeb99a686dd811d5c5e5a0806c2545edbd7189 SHA512 f60f2e00b2194083b84bb92d31c0b8c48bb108cf5ba1ff0837585f91950c9c9101bcd8bfeab59e31dd63320cd4f37212a9f08fe8c68101a0891f675457f30adc
-MISC metadata.xml 308 BLAKE2B 326cea5516e2914ea6b9077f6aea441891ec7d7bfad7f3d98cab3179aeacb559d2535395f69732b397afa6651938ad186ca6b2b7fb249f1c8c612c4349347201 SHA512 1094168fbbb63ed9328edc7ab2904b648f30f893d3fde7c2de2716a2b4bbcd32a72bc271974e2b006510e8abcebcc6f684670b550ff44e6267954c519eb06469
+MISC metadata.xml 761 BLAKE2B 04355e1d4a8b0cd049c5957290ae001ea5baf2e849da174eadaa6f527c4288e9f33129c633a90e95e549a76b8339a66f9ff3c1f7a6ea35f49e2600a07dffccf1 SHA512 edfc81d5e271bcdd66c4f79f1c50512092e2e0a46d5124b3a6c2ac31071b0f0e2c8e6a97e5935cf5cca7e9f28ffb1dcd4346977a67c9bb15175454fd94f661b8
diff --git a/sys-kernel/kpatch/kpatch-0.4.0-r1.ebuild b/sys-kernel/kpatch/kpatch-0.4.0-r1.ebuild
deleted file mode 100644
index 2dae0d7a5246..000000000000
--- a/sys-kernel/kpatch/kpatch-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info linux-mod flag-o-matic
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/dynup/${PN}.git"
-else
-	SRC_URI="https://github.com/dynup/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Dynamic kernel patching for Linux"
-HOMEPAGE="https://github.com/dynup/kpatch"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="examples +modules test"
-
-RDEPEND="
-	app-crypt/pesign
-	dev-libs/openssl:0=
-	sys-libs/zlib
-	sys-apps/pciutils
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-libs/elfutils
-	sys-devel/bison
-"
-
-pkg_pretend() {
-	if kernel_is gt 3 9 0; then
-		if ! linux_config_exists; then
-			eerror "Unable to check the currently running kernel for kpatch support"
-			eerror "Please be sure a .config file is available in the kernel src dir"
-			eerror "and ensure the kernel has been built."
-		else
-			# Fail to build if these kernel options are not enabled (see kpatch/kmod/core/Makefile)
-			CONFIG_CHECK="FUNCTION_TRACER HAVE_FENTRY MODULES SYSFS KALLSYMS_ALL"
-			ERROR_FUNCTION_TRACER="CONFIG_FUNCTION_TRACER must be enabled in the kernel's config file"
-			ERROR_HAVE_FENTRY="CONFIG_HAVE_FENTRY must be enabled in the kernel's config file"
-			ERROR_MODULES="CONFIG_MODULES must be enabled in the kernel's config file"
-			ERROR_SYSFS="CONFIG_SYSFS must be enabled in the kernel's config file"
-			ERROR_KALLSYMS_ALL="CONFIG_KALLSYMS_ALL must be enabled in the kernel's config file"
-		fi
-	else
-		eerror
-		eerror "kpatch is not available for Linux kernels below 4.0.0"
-		eerror
-		die "Upgrade the kernel sources before installing kpatch."
-	fi
-
-	check_extra_config
-}
-
-src_prepare() {
-	replace-flags '-O?' '-O1'
-	default
-}
-
-src_compile() {
-	set_arch_to_kernel
-	emake all
-}
-
-src_install() {
-	set_arch_to_kernel
-	emake DESTDIR="${D}" PREFIX="/usr" install
-
-	einstalldocs
-}
diff --git a/sys-kernel/kpatch/kpatch-0.6.0.ebuild b/sys-kernel/kpatch/kpatch-0.6.0.ebuild
deleted file mode 100644
index e9cdeb7b5ac3..000000000000
--- a/sys-kernel/kpatch/kpatch-0.6.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info linux-mod flag-o-matic
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/dynup/${PN}.git"
-else
-	SRC_URI="https://github.com/dynup/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Dynamic kernel patching for Linux"
-HOMEPAGE="https://github.com/dynup/kpatch"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="examples +modules test"
-
-RDEPEND="
-	app-crypt/pesign
-	dev-libs/openssl:0=
-	sys-libs/zlib
-	sys-apps/pciutils
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-libs/elfutils
-	sys-devel/bison
-"
-
-pkg_pretend() {
-	if kernel_is gt 3 9 0; then
-		if ! linux_config_exists; then
-			eerror "Unable to check the currently running kernel for kpatch support"
-			eerror "Please be sure a .config file is available in the kernel src dir"
-			eerror "and ensure the kernel has been built."
-		else
-			# Fail to build if these kernel options are not enabled (see kpatch/kmod/core/Makefile)
-			CONFIG_CHECK="FUNCTION_TRACER HAVE_FENTRY MODULES SYSFS KALLSYMS_ALL"
-			ERROR_FUNCTION_TRACER="CONFIG_FUNCTION_TRACER must be enabled in the kernel's config file"
-			ERROR_HAVE_FENTRY="CONFIG_HAVE_FENTRY must be enabled in the kernel's config file"
-			ERROR_MODULES="CONFIG_MODULES must be enabled in the kernel's config file"
-			ERROR_SYSFS="CONFIG_SYSFS must be enabled in the kernel's config file"
-			ERROR_KALLSYMS_ALL="CONFIG_KALLSYMS_ALL must be enabled in the kernel's config file"
-		fi
-	else
-		eerror
-		eerror "kpatch is not available for Linux kernels below 4.0.0"
-		eerror
-		die "Upgrade the kernel sources before installing kpatch."
-	fi
-
-	check_extra_config
-}
-
-src_prepare() {
-	replace-flags '-O?' '-O1'
-	default
-}
-
-src_compile() {
-	set_arch_to_kernel
-	emake all
-}
-
-src_install() {
-	set_arch_to_kernel
-	emake DESTDIR="${D}" PREFIX="/usr" install
-
-	einstalldocs
-}
diff --git a/sys-kernel/kpatch/kpatch-0.6.2.ebuild b/sys-kernel/kpatch/kpatch-0.6.2.ebuild
deleted file mode 100644
index e9cdeb7b5ac3..000000000000
--- a/sys-kernel/kpatch/kpatch-0.6.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info linux-mod flag-o-matic
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/dynup/${PN}.git"
-else
-	SRC_URI="https://github.com/dynup/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Dynamic kernel patching for Linux"
-HOMEPAGE="https://github.com/dynup/kpatch"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="examples +modules test"
-
-RDEPEND="
-	app-crypt/pesign
-	dev-libs/openssl:0=
-	sys-libs/zlib
-	sys-apps/pciutils
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-libs/elfutils
-	sys-devel/bison
-"
-
-pkg_pretend() {
-	if kernel_is gt 3 9 0; then
-		if ! linux_config_exists; then
-			eerror "Unable to check the currently running kernel for kpatch support"
-			eerror "Please be sure a .config file is available in the kernel src dir"
-			eerror "and ensure the kernel has been built."
-		else
-			# Fail to build if these kernel options are not enabled (see kpatch/kmod/core/Makefile)
-			CONFIG_CHECK="FUNCTION_TRACER HAVE_FENTRY MODULES SYSFS KALLSYMS_ALL"
-			ERROR_FUNCTION_TRACER="CONFIG_FUNCTION_TRACER must be enabled in the kernel's config file"
-			ERROR_HAVE_FENTRY="CONFIG_HAVE_FENTRY must be enabled in the kernel's config file"
-			ERROR_MODULES="CONFIG_MODULES must be enabled in the kernel's config file"
-			ERROR_SYSFS="CONFIG_SYSFS must be enabled in the kernel's config file"
-			ERROR_KALLSYMS_ALL="CONFIG_KALLSYMS_ALL must be enabled in the kernel's config file"
-		fi
-	else
-		eerror
-		eerror "kpatch is not available for Linux kernels below 4.0.0"
-		eerror
-		die "Upgrade the kernel sources before installing kpatch."
-	fi
-
-	check_extra_config
-}
-
-src_prepare() {
-	replace-flags '-O?' '-O1'
-	default
-}
-
-src_compile() {
-	set_arch_to_kernel
-	emake all
-}
-
-src_install() {
-	set_arch_to_kernel
-	emake DESTDIR="${D}" PREFIX="/usr" install
-
-	einstalldocs
-}
diff --git a/sys-kernel/kpatch/kpatch-0.6.3.ebuild b/sys-kernel/kpatch/kpatch-0.6.3.ebuild
new file mode 100644
index 000000000000..763ccbeac5d3
--- /dev/null
+++ b/sys-kernel/kpatch/kpatch-0.6.3.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic linux-mod
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dynup/${PN}.git"
+else
+	SRC_URI="https://github.com/dynup/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Dynamic kernel patching for Linux"
+HOMEPAGE="https://github.com/dynup/kpatch"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+kpatch-build +kpatch kmod doc contrib test"
+
+RDEPEND="
+	app-crypt/pesign
+	dev-libs/openssl:0=
+	sys-libs/zlib
+	sys-apps/pciutils
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-libs/elfutils
+	sys-devel/bison
+	test? ( dev-util/shellcheck-bin )
+"
+
+pkg_setup() {
+	if use kmod; then
+		if kernel_is gt 3 9 0; then
+			if ! linux_config_exists; then
+				eerror "Unable to check the currently running kernel for kpatch support"
+				eerror "Please be sure a .config file is available in the kernel src dir"
+				eerror "and ensure the kernel has been built."
+			else
+				# Fail to build if these kernel options are not enabled (see kpatch/kmod/core/Makefile)
+				CONFIG_CHECK="FUNCTION_TRACER HAVE_FENTRY MODULES SYSFS KALLSYMS_ALL"
+				ERROR_FUNCTION_TRACER="CONFIG_FUNCTION_TRACER must be enabled in the kernel's config file"
+				ERROR_HAVE_FENTRY="CONFIG_HAVE_FENTRY must be enabled in the kernel's config file"
+				ERROR_MODULES="CONFIG_MODULES must be enabled in the kernel's config file"
+				ERROR_SYSFS="CONFIG_SYSFS must be enabled in the kernel's config file"
+				ERROR_KALLSYMS_ALL="CONFIG_KALLSYMS_ALL must be enabled in the kernel's config file"
+			fi
+		else
+			eerror
+			eerror "kpatch is not available for Linux kernels below 4.0.0"
+			eerror
+			die "Upgrade the kernel sources before installing kpatch."
+		fi
+	check_extra_config
+	fi
+
+}
+
+src_prepare() {
+	replace-flags '-O?' '-O1'
+	default
+}
+
+src_compile() {
+	use kpatch-build && emake -C kpatch-build
+	use kpatch && emake -C kpatch
+	use kmod && set_arch_to_kernel && emake -C kmod
+	use doc && emake -C doc
+	use contrib && emake -C contrib
+	use test && emake check
+}
+
+src_install() {
+	use kpatch-build && emake DESTDIR="${D}" PREFIX="/usr" install -C kpatch-build
+	use kpatch && emake DESTDIR="${D}" PREFIX="/usr" install -C kpatch
+	use kmod && set_arch_to_kernel && emake DESTDIR="${D}" PREFIX="/usr" install -C kmod
+	use contrib && emake DESTDIR="${D}" PREFIX="/usr" install -C contrib
+	use doc && einstalldocs
+}
diff --git a/sys-kernel/kpatch/metadata.xml b/sys-kernel/kpatch/metadata.xml
index b393adbecca2..7e000f09b137 100644
--- a/sys-kernel/kpatch/metadata.xml
+++ b/sys-kernel/kpatch/metadata.xml
@@ -5,4 +5,10 @@
 		<email>alicef@gentoo.org</email>
 	</maintainer>
 	<longdescription lang="en">Dynamic kernel patching for the Linux kernel</longdescription>
+<use>
+		<flag name="kpatch-build">Enable tools which convert a source diff patch to a patch module.</flag>
+		<flag name="kpatch">Enable a command-line tool which allows a user to manage a collection of patch modules.</flag>
+		<flag name="kmod">Enable a kernel module (.ko file) which provides an interface for the patch modules to register new functions for replacement.</flag>
+		<flag name="contrib">Enable contrib kpatch services files.</flag>
+</use>
 </pkgmetadata>