gentoo resync : 30.06.2019

4 files changed, 92 insertions, 4 deletions

diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index 99d08b3216ba..b9aea849f7dd 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -5,13 +5,14 @@ AUX kexec-tools-2.0.4-disable-kexec-test.patch 473 BLAKE2B ad62ae055cd4443ee4dcb
 AUX kexec-tools-2.0.4-out-of-source.patch 816 BLAKE2B 88dc0a8f01c65a32b6ae081ea222760845fe243aad1057e3620ed4c932a32edebf943f9557b2f67751bbcea1f91778c0c065e246d419d5725eb68edcb1e58ced SHA512 4839800f99e2bdb7dfbf3aa1f3ad795feb63b4e493812a50d4baa839a27b5e96319c4e848969cbcedf627a32ed5fbfb312461c2ac89b73daaa7f8f680f35f504
 AUX kexec.conf 340 BLAKE2B a65aa0f402c712c10f6095b37b620dacfe883ad621f5403d8190febf582f3ab7e8b821091321036bff104ee5cebab21062830c774778ca17a34a2df76065cfb8 SHA512 66beb57ee13dba70f75f12326643270a0c888e178fdfca8ba7a566a874707aebe2afebb6ceae976dfb0aaf3135048daad6277e70580e4c7911b9ddbf74e4f00a
 AUX kexec.conf-2.0.4 1013 BLAKE2B 7594bf8c150d1165f30449526b658c78feab82526e649aa8cce35b6a47b2abd5a208b7ae4376f0330ea2194ae63f786bf0c30682f734f1b604be131e6e63570e SHA512 96db2834454aa4d038061e9b1f918932da3d3054021487425d0f70c6ad32096b9433ae2f3921e83196b23af901c32e591df3d6a84a6d14e064608d8ad895a599
-AUX kexec.init-2.0.13-r1 3655 BLAKE2B 25c2f1a607042520cdf5b52e5945fc38a119c090488613c7ca889b8f821cbf348475e4a28d6e0134a3a98cb32ebc79410b21f343154b8e15a9c259114557e047 SHA512 1d04e14e6fe1debc55fa23029a68f78f2d2a408c12bee6d55252109da178c3dbc998db4ccc7f05f7f8c65b333b50d6a1da7bf0d325ee6cae2f00840078d8a457
+AUX kexec.init-2.0.13-r1 3688 BLAKE2B b0bfb8e94a1cf03c95c8a4b20164345a0ae46830ab59659e469854105d4d7665c77983414fb7fdd069c91002fd4d4f6a215da9dbb395c700a379483d720d9b22 SHA512 ff515de615fc2eb377b8235b33a3c047f9fe63f070181844bcf77761c464b557d9ecfcde2c631e5f09cb3f4a0dfb545485f02a4671c2d0cdf8943fc508250bd2
 AUX kexec.service 407 BLAKE2B 7854172c36f550fece58b6cb351a6bd8b4ab8b5a11da0fd629048f8cc2866baa11ee7311424f998360f02dc2c1210be32222283c2bd2f93e1bf4bf65ec903203 SHA512 9f0fa6d39c67048fe774fee0f2e8ed10e9e12a2468e7dda193cd8c5bd8b4cf49819d14703efad35c91265cd4e03c6f5460934b5fe92efd06eab8dc619920b1e3
 DIST kexec-tools-2.0.17.tar.xz 290612 BLAKE2B 57ec5b5ed33a5c5bbe433099d6e80663717c8a086bdb8b95f4a1d81fd7e546619c0064698454dc79f489313f98696ee6dee4cafbc8b1b93db5c7909cdf7a6234 SHA512 e0f254ca2b26fa02cb61ba9a0735423b26bac2693fbd920eaf7cc2822c298de958bd65f7c37947ca1f6811a3752a58f7cf8aa903494f0109ea76b7159a037fa6
 DIST kexec-tools-2.0.18.tar.xz 289816 BLAKE2B b894a5c563810b0a537a3837e902a8d1a3b903c2028393047d6e28d125582f82a4f7ad7c192857f7f58c2fb045deb39e6caf115434c8ba826c705d1363c6b683 SHA512 a4142e703a752eb270da29f02ea4fb213f3f4f965e73bb483c388a378821094317a4c63406ab0afe118f79eb168ff63b9d2d9530551c984592165430e269d697
 DIST kexec-tools-2.0.19.tar.xz 292348 BLAKE2B c9827d77c82f11351086f4cdf4bacd076a03c744969952706ffd6f17395f28fba2437dac976e12e8e5648ca09fac6ff241daf9b8d3fee215519ded9f18441ff0 SHA512 68b15fe46f9633d55c5ae51a6e7114b0c66bd8f4fe81197f581121939a7b21990a2eea89a0961ac6eb7af364ba0d3981ea504df81c7b4cc0b288ca6ac896730f
 EBUILD kexec-tools-2.0.17-r1.ebuild 1881 BLAKE2B 458a2767140a75c145ce95b8fd8eb1f3eb2a7edc0dee7a268153147a056582c7f7eba7bb7d2cc1ecefebe96fc065c1537280383ab88b6d3a2d169f33db8375f4 SHA512 59f734eb8c42cc73b40c6736845903d74d87cc8a124f0b90b8bebf8345a5518b7d77eb7a7919dbde95997aba88efe079ddd6d817531732e1f43f106076a64c6d
 EBUILD kexec-tools-2.0.18.ebuild 1803 BLAKE2B 5b881f3c12d4492773f44f9d0ddff1288c5492d4dc554b848e8d7c7a5acd7f308dd96297f251a0ae2164153b6b4892bf78fd5d72c7f325f1e9f9d5c7e761b779 SHA512 ac037d307873e0662b1551a89fd5e2e2bfcd09ce3266cfb25970466b6179495a3c89be14afda22f64dc62424376334963b7d5aca4f77ee53dd28fdcbee5de9f6
+EBUILD kexec-tools-2.0.19-r1.ebuild 1810 BLAKE2B c6b96d35aa23c19ed30fc7fd1e2845d0b8be4cdeaef788048efe3db5ca4d18a7bdd6a7b757fcad40bd1be2e095af91f6ec64a87a214f114a58b8863a2bd52d3c SHA512 b546f22894a881f87aff2ccc561e1d90f3e7c6422bde5979b70f14f2a318e5938c5a61de0b79f03ed08d05a6c5e2965777d6ff4eef754dd80cc54bb54ac2c2ab
 EBUILD kexec-tools-2.0.19.ebuild 1803 BLAKE2B a5e20d74b3dd81fe0ce0f8998271a4f1682f1b9d9347ed044a17ca7a9580527c3461a7bece4bda7ebc7092465d7574904cb88ebdd35ea280b1c918f83543f38a SHA512 b76b7fe09faf6412dd2e55a22011af24ffd054df362bc802fd7f6bf713346374b34ea2c949d65d73357f5592251e302c34ec1cd66b9e51965e3c1279da6323aa
-EBUILD kexec-tools-9999.ebuild 1803 BLAKE2B a5e20d74b3dd81fe0ce0f8998271a4f1682f1b9d9347ed044a17ca7a9580527c3461a7bece4bda7ebc7092465d7574904cb88ebdd35ea280b1c918f83543f38a SHA512 b76b7fe09faf6412dd2e55a22011af24ffd054df362bc802fd7f6bf713346374b34ea2c949d65d73357f5592251e302c34ec1cd66b9e51965e3c1279da6323aa
+EBUILD kexec-tools-9999.ebuild 1810 BLAKE2B c6b96d35aa23c19ed30fc7fd1e2845d0b8be4cdeaef788048efe3db5ca4d18a7bdd6a7b757fcad40bd1be2e095af91f6ec64a87a214f114a58b8863a2bd52d3c SHA512 b546f22894a881f87aff2ccc561e1d90f3e7c6422bde5979b70f14f2a318e5938c5a61de0b79f03ed08d05a6c5e2965777d6ff4eef754dd80cc54bb54ac2c2ab
 MISC metadata.xml 490 BLAKE2B 87c80e53801415341290c29dbc0728a4d084519c38f5c5d14bedde32596111f4cbb91c72ed36b6a8fe3f63ad715df57d59b2a61730ebe08ff7f2bc868c8ff916 SHA512 6f4b25178cc6b8ff3fea664f2717eb7268d9e71c4ca46c170887eb836f9d78dff7e64067968175d018dc22bbcc2bb8cd6fd5f44edba0966fa568f9fd827a1cff
diff --git a/sys-apps/kexec-tools/files/kexec.init-2.0.13-r1 b/sys-apps/kexec-tools/files/kexec.init-2.0.13-r1
index 5415b3bc85c0..167b792de85d 100644
--- a/sys-apps/kexec-tools/files/kexec.init-2.0.13-r1
+++ b/sys-apps/kexec-tools/files/kexec.init-2.0.13-r1
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Set up some defaults.
@@ -38,8 +38,10 @@ image_path() {
 	local gkarch="$(get_genkernel_arch $karch)"
 	for x in \
 		"bzImage" \
+		"vmlinux" \
 		"vmlinuz" \
 		"bzImage-${kver}" \
+		"vmlinux-${kver}" \
 		"vmlinuz-${kver}" \
 		"kernel-genkernel-${karch}-${kver}" \
 		"kernel-genkernel-${gkarch}-${kver}" \
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.19-r1.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.19-r1.ebuild
new file mode 100644
index 000000000000..d9c36c6dcf7b
--- /dev/null
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.19-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic libtool linux-info systemd
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git"
+else
+	SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Load another kernel from the currently executing Linux kernel"
+HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="booke lzma xen zlib"
+
+REQUIRED_USE="lzma? ( zlib )"
+
+DEPEND="
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~KEXEC"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch
+	"${FILESDIR}"/${PN}-2.0.4-out-of-source.patch
+)
+
+pkg_setup() {
+	# GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC)
+	export ASFLAGS="${CCASFLAGS}"
+}
+
+src_prepare() {
+	default
+	if [[ ${PV} == "9999" ]] ; then
+		eautoreconf
+	else
+		elibtoolize
+	fi
+	filter-flags '-mindirect-branch=thunk*'
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with booke)
+		$(use_with lzma)
+		$(use_with xen)
+		$(use_with zlib)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	dodoc "${FILESDIR}"/README.Gentoo
+
+	newinitd "${FILESDIR}"/kexec.init-2.0.13-r1 kexec
+	newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec
+
+	insinto /etc
+	doins "${FILESDIR}"/kexec.conf
+
+	insinto /etc/kernel/postinst.d
+	doins "${FILESDIR}"/90_kexec
+
+	systemd_dounit "${FILESDIR}"/kexec.service
+}
+
+pkg_postinst() {
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		elog "For systemd support the new config file is"
+		elog "   /etc/kexec.conf"
+		elog "Please adopt it to your needs as there is no autoconfig anymore"
+	fi
+}
diff --git a/sys-apps/kexec-tools/kexec-tools-9999.ebuild b/sys-apps/kexec-tools/kexec-tools-9999.ebuild
index b2fcd90aca6c..d9c36c6dcf7b 100644
--- a/sys-apps/kexec-tools/kexec-tools-9999.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git"
 else
 	SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Load another kernel from the currently executing Linux kernel"