gentoo resync : 02.05.2018

5 files changed, 12 insertions, 259 deletions

diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index 2072eac569a1..f4392b38fb70 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -1,20 +1,16 @@
 AUX 90_kexec 199 BLAKE2B 37bcd66beccc32a884b0c2fca9cbba14784b8e6bc7238c14397f0ded788b503df1f7d6fff01c9b9a6bc159c1a6e01821c4c78c144091a7e13bb2bbe88ab5a98c SHA512 31837eb7df9b5c9b63c5f500e55fb584e315ac20f328490ff812a265f1a01604724bf4699f142255f7c5fa78cb2d8f2d6220a91961ac90df644b5d545d47ca39
 AUX README.Gentoo 937 BLAKE2B 88a8912015e1cab0d382661d6bdc82689c91970d6d84c949e99a932b4d153b0753183380930b753d23d1c40ab7f44cae784f716e54bc3609a28741ab0b5b1348 SHA512 f082763692def43a97866b88443daf08a2bc1b0dccdc90160d12effa16e1293d8db6935c72ca9dd5502f844078241cbecdfde15b6e8f67a2cca8f3e89f14e654
-AUX kexec-tools-2.0.0-respect-LDFLAGS.patch 293 BLAKE2B b8a5c43b2236381e27229c546449a8bef122541488c186b4eb74c3b4c4d4706a8aeb1a820b1c56ceb45ada1784418eb9ded73f4afa7e5206ceab07c7cce4c9d8 SHA512 c5213462a1e543a357c128af51c9da260fcfa5bcddd9d6bd2fadc84f0456722752e2e7a5584de84d1beca580e07e40ec424eb2577d604beb186403975f7fcd1e
 AUX kexec-tools-2.0.4-disable-kexec-test.patch 473 BLAKE2B ad62ae055cd4443ee4dcb4d9a5be1c918a9e1337545f60c683a1a47b848020d0f8fbdc38c7111e505424783191faf3e221ffa642169d2d055d5e17e6b19b9d0d SHA512 c7fe9176db7c3f9c84add1c263c5a695684bf1db55d47152534f0bbb97c084ad5d3f2090307d0bdfcf5622fa810aca3c104f81b3d24baa76f42d3f32d1d4bbad
 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.4-r2 3507 BLAKE2B b3ba5edc86fb18f86110348886ea89d38a5421948c69eeccf3c8931abad533e0614ec2eabb174d673c8b6590768cac802c00fdb0f48d2c2286faa9c5591127e0 SHA512 a1b1d907a349b66b97bdbd04fcb0baf03add50816538591a6273e2c3e991b36dd9e15cbe694d915e369ad425c313673b2f9dfd756000fae22102c73ed07deff2
 AUX kexec.service 407 BLAKE2B 7854172c36f550fece58b6cb351a6bd8b4ab8b5a11da0fd629048f8cc2866baa11ee7311424f998360f02dc2c1210be32222283c2bd2f93e1bf4bf65ec903203 SHA512 9f0fa6d39c67048fe774fee0f2e8ed10e9e12a2468e7dda193cd8c5bd8b4cf49819d14703efad35c91265cd4e03c6f5460934b5fe92efd06eab8dc619920b1e3
 DIST kexec-tools-2.0.14.tar.xz 283640 BLAKE2B f84b5485904c0d4bbe5f7fdae391a4fb0b2a7436e078f23de649e79aaa7dfcdeff99139230a299bf2b9b0554ac13fa833e31211682c92f07cd6b8072907e35aa SHA512 8c1f9d1f4bb69a621961d45091f9c8349535ae69b80168423663685b44d89e1b9324d5cd11c83e86d805a3371f4f1600b0def551c52efb3c6cf020e9c11c273f
-DIST kexec-tools-2.0.15.tar.xz 286944 BLAKE2B 00344b607fbbca77398e74bf7f6506efa124ddb4ad0f2e55424a40b90ac0d1a6336dd43f4c8804323e12598f1647cd105880960abfda7df8215c787dae150bda SHA512 0bddf31b9bb0e203b813d820e1e248974c2d62cb388dfaf4f2f4971f764cc71e54edbaeaeb663c15d6fa06574beceb87d9ffd7d822ac6699d86c54645096e7e9
 DIST kexec-tools-2.0.16.tar.xz 287888 BLAKE2B 7e7bbe11dc2792be3cab6318c12b6866bf6b373fb7bf2d7601ef68a39dd5882aceab7c8905ce0d9b0af1da2072b3f3d2677bd9e006676c484e1d6506ac7036fa SHA512 f2f06e7702fef20c8d7d6aabe1b264e2e2689e5c38cc00dbc2186dd7fa0479edb2dc9e307dd2ad7f03db47015e966e577f11576172604ef01c1bcca471fe2c24
-DIST kexec-tools-2.0.4.tar.xz 271604 BLAKE2B f3359e91295b1c37bd94d3ea7889e948e0716781375f3387077962313615986947b0ac134023876b88cf92b5f0b5e1d3d5d97099ac799d0ba182b58f1bb4674c SHA512 2514f407d9150d2615dffc91a525fb28f159bef92b9543f9802e2618746b7d4c04137668ad8a8d8f0b75f68ed9057d09629ce736b6a061b5cf817b9d904f549e
+DIST kexec-tools-2.0.17.tar.xz 290612 BLAKE2B 57ec5b5ed33a5c5bbe433099d6e80663717c8a086bdb8b95f4a1d81fd7e546619c0064698454dc79f489313f98696ee6dee4cafbc8b1b93db5c7909cdf7a6234 SHA512 e0f254ca2b26fa02cb61ba9a0735423b26bac2693fbd920eaf7cc2822c298de958bd65f7c37947ca1f6811a3752a58f7cf8aa903494f0109ea76b7159a037fa6
 EBUILD kexec-tools-2.0.14.ebuild 1700 BLAKE2B 13e47f83fcb672fb4bbc33234f4e1b249171ce883a3515c3d046243c6981bf211652d37e3d4d952850abda95c130ebeb8b909270221658b148725aa20158aa99 SHA512 3fbfc404e7e83a7a74efa5d1ffdf18239ba0e342a0a8a53d1e18b5cc97dd3258d78448b1c5ba20c22559ad18a4488917f3a9feeb711a98fb5720b65cbf47053a
-EBUILD kexec-tools-2.0.15.ebuild 1709 BLAKE2B 659d4ca60e032a34c793e9a2076192b1e89d43576122940456343f5d5b662476fd3c31aac0fe4013facabfc3d02d0ed9e6dc82085c4cee3bf9be71921a99922f SHA512 2a55d5f45633ef05a2fd7bafe0da9052e7f994f698705eb1e3707ae0a0b916c16354e0ea4fd0a8b575217c773f1b7e79b3eedf5f2d5a475829afb49267621ef7
 EBUILD kexec-tools-2.0.16.ebuild 1763 BLAKE2B e04d8b08d79df40644ecc4f2940dd68de6e3201756d7282328fc362b8770e65961cc4f0fdc928ecd63d966132202043c3e1b1a89b655ae779d5d2e9a258ed4d2 SHA512 59e742b204778dbcdde57368509d0a76456dbad1495e3a977de6dbd59e9156447a8ade274bdc916ef62bdb615f3018b3a7f238ac9b1704b35d301599a4f06274
-EBUILD kexec-tools-2.0.4-r2.ebuild 1639 BLAKE2B ffd12a8db13e9075fb7992fdf1c59c52de7f1c950dd25366513db71f41856a977c55e88df61ea3581aefb61ce4ee10abc61cce4048a3bfd32fd3a8925bac26a8 SHA512 0b1fdd825a235646f6589e1043a7edb190d3aeab6ec4dc153235140995d5ee6b09c226eb159182a3cebfcd9ff9251e241ef12fc0313a6f092a8187e197a3ce82
+EBUILD kexec-tools-2.0.17.ebuild 1806 BLAKE2B c387eddd9fbc233349c2f05ed461b95d7ed96a3fdcce74f490d7aec4563a658106725201e992a49b40bb849f725bec81225edbf70285c88f3777f0b6c48e3dc9 SHA512 4912c208396fcbc1b76f4098e95cf970f6ae9c7b7b5621d5e08f7e2a04bfb60a481c27ea55aba02fa722c82ba127c6f2af201a2a475ed56a41703838f862e14f
 EBUILD kexec-tools-9999.ebuild 1806 BLAKE2B c387eddd9fbc233349c2f05ed461b95d7ed96a3fdcce74f490d7aec4563a658106725201e992a49b40bb849f725bec81225edbf70285c88f3777f0b6c48e3dc9 SHA512 4912c208396fcbc1b76f4098e95cf970f6ae9c7b7b5621d5e08f7e2a04bfb60a481c27ea55aba02fa722c82ba127c6f2af201a2a475ed56a41703838f862e14f
 MISC metadata.xml 490 BLAKE2B 87c80e53801415341290c29dbc0728a4d084519c38f5c5d14bedde32596111f4cbb91c72ed36b6a8fe3f63ad715df57d59b2a61730ebe08ff7f2bc868c8ff916 SHA512 6f4b25178cc6b8ff3fea664f2717eb7268d9e71c4ca46c170887eb836f9d78dff7e64067968175d018dc22bbcc2bb8cd6fd5f44edba0966fa568f9fd827a1cff
diff --git a/sys-apps/kexec-tools/files/kexec-tools-2.0.0-respect-LDFLAGS.patch b/sys-apps/kexec-tools/files/kexec-tools-2.0.0-respect-LDFLAGS.patch
deleted file mode 100644
index 040d138ece06..000000000000
--- a/sys-apps/kexec-tools/files/kexec-tools-2.0.0-respect-LDFLAGS.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdump/Makefile
-+++ kdump/Makefile
-@@ -18,7 +18,7 @@
- $(KDUMP): CC=$(TARGET_CC)
- $(KDUMP): $(KDUMP_OBJS)
- 	@$(MKDIR) -p $(@D)
--	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -o $@ $(KDUMP_OBJS)
-+	$(LINK.o) $(CFLAGS) -o $@ $(KDUMP_OBJS)
- 
- $(KDUMP_MANPAGE): kdump/kdump.8
- 	$(MKDIR) -p     $(MANDIR)/man8
diff --git a/sys-apps/kexec-tools/files/kexec.init-2.0.4-r2 b/sys-apps/kexec-tools/files/kexec.init-2.0.4-r2
deleted file mode 100644
index f60cb2a7cafa..000000000000
--- a/sys-apps/kexec-tools/files/kexec.init-2.0.4-r2
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need localmount
-}
-
-image_path() {
-	local x= kver=$(uname -r) karch=$(uname -m)
-	BOOTPART="${BOOTPART:-/boot}"
-	KNAME="${KNAME:-bzImage}"
-	if [ -e "${KNAME}" ]; then
-		echo "${KNAME}"
-		return 0
-	fi
-	for x in "${KNAME#${BOOTPART}}" vmlinuz \
-		bzImage-${kver} vmlinuz-${kver} \
-		kernel-genkernel-${karch}-${kver} \
-		kernel-${kver} kernel-${karch}; do
-		if [ -e "${BOOTPART}/${x}" ]; then
-			echo "${BOOTPART}/${x}"
-			return 0
-		fi
-	done
-
-	return 1
-}
-
-initrd_path() {
-	local x= kver=$(uname -r) karch=$(uname -m)
-	BOOTPART="${BOOTPART:-/boot}"
-	INITRD="${INITRD:-initrd}"
-	if [ -e "${INITRD}" ]; then
-		echo "${INITRD}"
-		return 0
-	fi
-	for x in "${INITRD#${BOOTPART}}" \
-		initrd.img-${kver} initrd-${kver}.img \
-		initrd-${kver} initramfs-${kver}.img \
-		initramfs-genkernel-${karch}-${kver} ; do
-		if [ -e "${BOOTPART}/${x}" ]; then
-			echo "${BOOTPART}/${x}"
-			return 0
-		fi
-	done
-
-	return 1
-}
-
-mount_boot(){
-	local ret
-
-	[ -n "${DONT_MOUNT_BOOT}" ] && return 1
-	grep -q " ${BOOTPART:-/boot} " /proc/mounts && return 1
-
-	BOOTPART="${BOOTPART:-/boot}"
-	ebegin "Mounting ${BOOTPART}"
-	mount "${BOOTPART}"; ret=$?
-	eend ${ret}
-	return ${ret}
-}
-
-load_image() {
-	local ret
-	if [ "${KNAME}" = "-" ]; then
-		ebegin "Disabling kexec"
-		kexec -u; ret=$?
-		eend ${ret}
-		return ${ret}
-	fi
-
-	BOOTPART="${BOOTPART:-/boot}"
-	local img= initrd="$(initrd_path)" mounted=false initrdopt=
-
-	if ! img="$(image_path)"; then
-		if mount_boot; then
-			if img="$(image_path)"; then
-				mounted=true
-				initrd="$(initrd_path)"
-			else
-				eerror "No kernel image found in ${BOOTPART}!"
-				umount "${BOOTPART}"
-				return 1
-			fi
-		else
-			eerror "No kernel image found in ${BOOTPART}!"
-			return 1
-		fi
-	fi
-
-	if [ -n "${INITRD}" ] && \
-		! [ "${BOOTPART}/${INITRD#${BOOTPART}}" = "${initrd}" ]; then
-		eerror "Requested initrd: ${INITRD#${BOOTPART}}"
-		eerror "could not be found"
-		return 1
-	fi
-
-	[ -n "${ROOTPART}" ] || \
-		ROOTPART="$(readlink -f "$(sed -n '/^\/[^ ]* \/ / s,^\([^ ]*\).*,\1,p' /proc/mounts)")"
-
-	[ -n "${KPARAM}" ] || KEXEC_OPT_ARGS="${KEXEC_OPT_ARGS} --reuse-cmdline"
-
-	[ -n "${initrd}" ] && [ -e "${initrd}" ] && initrdopt="--initrd=${initrd}"
-
-	local msg=
-	[ -n "${initrd}" ] && \
-		msg="with ${initrd}"
-	einfo "Using kernel image ${img} ${msg} for kexec"
-
-	ebegin "Setting kexec with ${KEXEC_OPT_ARGS} -l ${img} root=${ROOTPART} ${KPARAM} ${initrdopt}"
-	kexec ${KEXEC_OPT_ARGS} -l "${img}" --append="root=${ROOTPART} ${KPARAM}" ${initrdopt}
-	local res=$?
-
-	${mounted} && umount "${BOOTPART}"
-	eend ${res}
-	return ${res}
-}
-
-start() {
-	if [ "${LOAD_DURING_SHUTDOWN:-yes}" = "yes" ]; then
-		local ret=0
-		BOOTPART="${BOOTPART:-/boot}"
-		if mount_boot; then
-			mounted=true
-		fi
-		if ! image_path > /dev/null; then
-			ewarn "Cannot find kernel image!"
-			ewarn "Please make sure a valid kernel image is present before reboot."
-			return 0
-		fi
-		if [ -n "${mounted}" ]; then
-			ebegin "Unmounting ${BOOTPART}"
-			umount "${BOOTPART}"; ret=$?
-			eend ${ret}
-		fi
-		return ${ret}
-	else
-		ebegin "Configuring kexec"
-		load_image
-		eend $?
-	fi
-}
-
-stop() {
-	[ "${LOAD_DURING_SHUTDOWN:-yes}" != "yes" ] && return 0
-
-	if ! yesno $RC_REBOOT; then
-		einfo "Not rebooting, so disabling"
-		kexec -u
-		return 0
-	fi
-
-	if [ -f /nokexec ]; then
-		einfo "Not using kexec during reboot"
-		rm -f /nokexec
-		kexec -u
-		return 0
-	fi
-
-	ebegin "Configuring kexec"
-	load_image
-	eend $?
-}
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.15.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.17.ebuild
index f3f01574c051..89ef61b3896d 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.15.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.17.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git"
-	AUTOTOOLS_AUTORECONF=true
+	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 ~x86"
 fi
 
-inherit libtool linux-info systemd
+inherit flag-o-matic libtool linux-info systemd
 
 DESCRIPTION="Load another kernel from the currently executing Linux kernel"
 HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/"
@@ -42,7 +41,12 @@ pkg_setup() {
 
 src_prepare() {
 	default
-	elibtoolize
+	if [[ ${PV} == "9999" ]] ; then
+		eautoreconf
+	else
+		elibtoolize
+	fi
+	filter-flags '-mindirect-branch=thunk*'
 }
 
 src_configure() {
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.4-r2.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.4-r2.ebuild
deleted file mode 100644
index 89c77e7586ba..000000000000
--- a/sys-apps/kexec-tools/kexec-tools-2.0.4-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils flag-o-matic linux-info systemd
-
-DESCRIPTION="Load another kernel from the currently executing Linux kernel"
-HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/"
-SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-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.0-respect-LDFLAGS.patch
-		"${FILESDIR}"/${P}-disable-kexec-test.patch
-		"${FILESDIR}"/${P}-out-of-source.patch
-	)
-
-pkg_setup() {
-	# GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC)
-	export ASFLAGS="${CCASFLAGS}"
-	# to disable the -fPIE -pie in the hardened compiler
-	if gcc-specs-pie ; then
-		filter-flags -fPIE
-		append-ldflags -nopie
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with booke)
-		$(use_with lzma)
-		$(use_with xen)
-		$(use_with zlib)
-		)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	dodoc "${FILESDIR}"/README.Gentoo
-
-	newinitd "${FILESDIR}"/kexec.init-${PVR} kexec
-	newconfd "${FILESDIR}"/kexec.conf-${PV} kexec
-
-	insinto /etc
-	doins "${FILESDIR}"/kexec.conf
-
-	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
-}