gentoo resync : 28.04.2021

7 files changed, 177 insertions, 10 deletions

diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index ffe0bcbb1970..c8f803ed0df5 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -4,12 +4,14 @@ DIST xen-4.13.2-upstream-patches-4.tar.xz 65324 BLAKE2B 0e71e4600fffcf1341a52103
 DIST xen-4.13.2-upstream-patches-5.tar.xz 76580 BLAKE2B 8eeab100c14d769174e7d935d4e081ffc2d72b771f8022ce5c31b89d860ddba5381baf55b87443dc3bc555b404595492d30bc7f2a103c77762004acfce70446e SHA512 5dd5c63267e9542626315efec94642901cff55f4a1f8148c58f86677254381242fce3d6c5c0ae72665b452441c54647d0b9a132a2a18ffb4ff7eaad86ef227de
 DIST xen-4.13.2-upstream-patches-6.tar.xz 80980 BLAKE2B a20643c4f89f197e4001c0181249bc1a22b60874bc077ba2abee716b8e64bbbea0885a64632f3120960425a741328ceba1b44dc10a7a24039b328e1ded28f752 SHA512 0b097dfb04404ec6c609d35d924b3d2306c5f2de0501aa0b8e007e0af9a4ef394fae2d736435401bf8bd1fd661171c71ba712585bdb195649e3350ef9f953115
 DIST xen-4.13.2.tar.gz 39037826 BLAKE2B ad2b7c3003ca29e5e60a85c581f706ef87d99eadf939ed36ebe8f6698582f7a29dbdaf502039b60a0afe7ad4ae6ce89713e69dc8b8a7d5abe65063da7f1baa5b SHA512 cd3092281c97e9421e303aa288aac04dcccd5536ba7c0ff4d51fbf3d07b5ffacfe3456ba06f5cf63577dafbf8cf3a5d9825ceb5e9ef8ca1427900cc3e57b50a3
+DIST xen-4.13.3.tar.gz 39044539 BLAKE2B 5d0e57c76e12e1b86b78bbf561e947d70b9569a24412617a640346d2358b141a2741e7a3be454df52d198ad63e58b1519288de62330417c70e72445703f3fac2 SHA512 622127d824b9c49b57282a887fb404e0bad05ff60bccade82e4e0e9b5ad975ff9aa1fba83392e6d8379e9a15340e8ae9785c0913eb11027816e4600432eea6b6
 DIST xen-4.14.1-upstream-patches-2.tar.xz 22920 BLAKE2B 890cd9bcc3c72b4ed192476a913de0377d50ddeb180e0d6dc4720e86662387a699ad74b263adf2b867b2421fcf3efdcacaa17bf581643afc50c9dc7e8a3dfc60 SHA512 ca0e53f40fe23d9a6c6374b460fcc0c8063e511f03ca86c02291fcb73bf9f91594de6fd615609997e0aac2e9c59ccc8512e4151a1d2646a70f3b5bacd95ad325
 DIST xen-4.14.1-upstream-patches-3.tar.xz 27864 BLAKE2B 69a67e863a30c0079f7955dd5306f69890a4f6db91d4cf2d1806a2bbd8afad88db7789c7eda8da0ff2a945da04916ff4ab5eaa9e529a417112ae01e31151d0dc SHA512 19e5ef39616fffbff20b2f658d61e50e21741fe3c5c4ca89f67e72a1606b3a593f93e9090fb0b5c76c1c801f931c237d2be6329bd174fa911d66b81ad4a332dd
 DIST xen-4.14.1.tar.gz 39970115 BLAKE2B 21e5838b2b4d78420dcaaae2b8fc98ac876230217e6a3764aa643920150b8cef96025663e6a2fc423ab15f7f470b62547e91ce1be0337fc78f00c148c7ff40ab SHA512 c75cbec82793435f5a7026626ffdb2e9a2166b42d2be4b2f1194240e0312458124f0ebd53eeb02ce7330c22afe402a28a96b32f8af66e41e9416fe94535724c9
-EBUILD xen-4.13.2-r5.ebuild 4460 BLAKE2B 8d0dda6a6c205410d844b8360d2f87de162613882c76f94ea0fde3ca39d30dd75d57b1e18963d22203f19138d3ceb1bf13a6281e8c40e213f1f749374bf73314 SHA512 4789c3808a7631c17df0194435da037ed26d48a68b179aef1638809e793d2ef761cdcc7c4d46f8186273cc9813da3f36090722fc619579affeec16ccf7871ba0
-EBUILD xen-4.13.2-r6.ebuild 4461 BLAKE2B 51ec4190284c97258c5eee7769b0bd049fb63be964dc1077010a432b922ec484659e09864006a4186b0b177c9933da0bfc9e3c82cd018107ff46db5631710bcb SHA512 fc3dc7a4e67118f1d744d197111fdc8d9f74832a27d0142282fbc59f7a064421ec7e4913a179ffa293987434ac6b7d30e917c0fedb6d9c0a8f547d050c5c9bdd
-EBUILD xen-4.13.2-r7.ebuild 4461 BLAKE2B 937b7c55ade61f88f6399a190c7e6ceb73c809563b391843a1f9c3fc2ad36b64f5ffa8314cc33cb75898af95e778b5d1fc1c93c331fe1d33c7812fcd965311e5 SHA512 5b77d97f4345da17720b01c3245f507119dd29f7aa336b3cf737080e86aac11990dfa74136b8d821c783da628d608bd815a9603bf32fa89ce9df3a68b4f29d00
-EBUILD xen-4.14.1-r2.ebuild 4461 BLAKE2B dba0b2e36c540adcef17e9ad611b15937f139cdea43732397f1825b8a2d5b03bf3c30d7b86e335cadbabf3dd4993e8a911e90789898d0900f0664e872c41c1d2 SHA512 32d97681abf3a0a9e17825e088a7221b577ec7902060c3b7a420de388c6ae48657350ec214886802479591a5111f1c6aece6430b38b5afa20e91ed07e272bf17
-EBUILD xen-4.14.1-r3.ebuild 4461 BLAKE2B ce6b3d356ca85e1d55465dc5f72c8fca29b9446fc010d8eb25ee837eb941fca1e5093c5be6330a115c20793d6c2ff82b6264a80992dc86a1dc92dac91f210d1f SHA512 1de68efb23d4efd211dcd557ee375355186854e43c8f202b873d1ddb4574fbac387eee48ee74a1ddb60af149967a380b807f9ea653dc3c866f9b24fb4b818e53
+EBUILD xen-4.13.2-r5.ebuild 4462 BLAKE2B 23b67cc2be75f65f8df0a814ebc7e3c4af8f238f399d6a9ddf4301a6a66835ab8948e1e8aa3c58cdb34015e2060762be7aeaca4c1e1ee9a752d56960ea656fa0 SHA512 b9ff56e040ba0a3062c392e8e8ad553ba90039589dcab0898e7ac4c9c988988faae93cdc5e2b50c03c1159581640054ba32d794da77051a1a598b51305e31a0e
+EBUILD xen-4.13.2-r6.ebuild 4463 BLAKE2B 2d9284848a1d31d2500fd6e3944b983f21ca59bd624714f2bc0603844d8c98fc467c1bf64d0fdf43d8eb3f33c7fad2f42c11f0407e64bc13acfb7f8eecd7b1cb SHA512 30661e28c232c1e28cdb4f97a35eaa962e122480124dffd3686ccfdc34d104449de07ee73d22a49d91ebdc62c385493de48bf6eb7aa8b97a8f07234fc647d9c2
+EBUILD xen-4.13.2-r7.ebuild 4463 BLAKE2B 451be1f8e4cc97f6f5256b2e4acacec0120f2e0502aee689d4b21ebfb4151124c63e9a81ac493a4eabcb5448b95132768d89aa5351f2f792c46f60c2b5fb8968 SHA512 3e8c15495fe6f33addfff272c75d19c2c5ef447e74dde562aac6a18981d629fe447cbde7a5c44aa11a577d204b0968cb11a6fa8d59cd21b43af178a68480150e
+EBUILD xen-4.13.3.ebuild 4461 BLAKE2B da41c70eb656b08ed46b7f6147c6b2d4b68368a0c3b0fe0bcb35d5ac279007158420b1035dc0ba6ab37565dc5345062bcb3689d932bed686bb240e06ac255ea8 SHA512 fbbb200018af4aa700e27890eff7d949f47c60187d815dd682f093b2364c78e33d194c5e66c19be09cb3f5d5be91f61e5c47782b3bfaab94aa3a29e572b22fe8
+EBUILD xen-4.14.1-r2.ebuild 4463 BLAKE2B c782dfe3b5194e243a8498b7412ce4968ec1ea540a4c9936b742afb58cefe9e18c27a39e93806847f43af0490bab1653cce315e66b1a272fbff24de9d09034c8 SHA512 5dd673fbee69a5b112e550baf8c2f7c7fe5d82dd9d5e18e31e4184619352a79135a3bf2618a045ddaee45046705f3c2862a9b2691b66cd3b92147846c3e17f8b
+EBUILD xen-4.14.1-r3.ebuild 4463 BLAKE2B b5686d303cca46753ea5594bdea94d002d03abd1ba6874d8a95ea2f9755aa47b246b23279ef7eec9d339b316582dde5e3823989f86f18b495d8a37eee4e3c129 SHA512 12f094a2d7dc120a3b51f4298114ad8990fcf0aeed1278cee25082ea698e4c8482d34d617f7d2b8042581fc87e38a0a4369f7c95f713428d8c9f986dd2157113
 MISC metadata.xml 675 BLAKE2B aee4c4775c388078e51a97212be21fee3ddd4771121a129b7ddf0e2454dc3bd91f4fa1a2ce2a2057c655a0d32ae9631c9fd29a77a247601867949be4aa79de26 SHA512 f77204ce3cffb9c453c779de4cb7e41591972c5b59567a88d02ba079bd6f827d4aec23d9ce7c28b3affcadd370858cb1e66f6448b32e0dfb795af6a1be8598d2
diff --git a/app-emulation/xen/xen-4.13.2-r5.ebuild b/app-emulation/xen/xen-4.13.2-r5.ebuild
index c0be32c3c8ec..1c318430ddcc 100644
--- a/app-emulation/xen/xen-4.13.2-r5.ebuild
+++ b/app-emulation/xen/xen-4.13.2-r5.ebuild
@@ -10,7 +10,7 @@ inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
 MY_PV=${PV/_/-}
 MY_P=${PN}-${MY_PV}
 
-if [[ $PV == *9999 ]]; then
+if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
 	SRC_URI=""
diff --git a/app-emulation/xen/xen-4.13.2-r6.ebuild b/app-emulation/xen/xen-4.13.2-r6.ebuild
index 43eeeb028b8e..bae6d65988c1 100644
--- a/app-emulation/xen/xen-4.13.2-r6.ebuild
+++ b/app-emulation/xen/xen-4.13.2-r6.ebuild
@@ -10,7 +10,7 @@ inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
 MY_PV=${PV/_/-}
 MY_P=${PN}-${MY_PV}
 
-if [[ $PV == *9999 ]]; then
+if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
 	SRC_URI=""
diff --git a/app-emulation/xen/xen-4.13.2-r7.ebuild b/app-emulation/xen/xen-4.13.2-r7.ebuild
index b1c2f8918a01..4f243abd0510 100644
--- a/app-emulation/xen/xen-4.13.2-r7.ebuild
+++ b/app-emulation/xen/xen-4.13.2-r7.ebuild
@@ -10,7 +10,7 @@ inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
 MY_PV=${PV/_/-}
 MY_P=${PN}-${MY_PV}
 
-if [[ $PV == *9999 ]]; then
+if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
 	SRC_URI=""
diff --git a/app-emulation/xen/xen-4.13.3.ebuild b/app-emulation/xen/xen-4.13.3.ebuild
new file mode 100644
index 000000000000..556820b0cbae
--- /dev/null
+++ b/app-emulation/xen/xen-4.13.3.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
+	SRC_URI=""
+else
+	KEYWORDS="amd64 ~arm -x86"
+	UPSTREAM_VER=
+	SECURITY_VER=
+	GENTOO_VER=
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
+		${UPSTREAM_PATCHSET_URI}
+		${SECURITY_PATCHSET_URI}
+		${GENTOO_PATCHSET_URI}"
+fi
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="https://www.xenproject.org"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug efi flask"
+
+DEPEND="${PYTHON_DEPS}
+	efi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!efi? ( >=sys-devel/binutils-2.22 )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+# no tests are available for the hypervisor
+# prevent the silliness of /usr/lib/debug/usr/lib/debug files
+# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
+RESTRICT="test splitdebug strip"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="arm? ( debug )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+	if use flask ; then
+		export "XSM_ENABLE=y"
+		export "FLASK_ENABLE=y"
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	[[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+	einfo "Try to apply Xen Security patch set"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		source "${WORKDIR}"/patches-security/${PV}.conf
+
+		local i
+		for i in ${XEN_SECURITY_MAIN}; do
+			eapply "${WORKDIR}"/patches-security/xen/$i
+		done
+	fi
+
+	# Gentoo's patchset
+	[[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
+
+	eapply "${FILESDIR}"/${PN}-4.11-efi.patch
+
+	# Drop .config
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	if use efi; then
+		export EFI_VENDOR="gentoo"
+		export EFI_MOUNTPOINT="/boot"
+	fi
+
+	default
+}
+
+src_configure() {
+	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
+
+	use debug && myopt="${myopt} debug=y"
+
+	# remove flags
+	unset CFLAGS
+	unset LDFLAGS
+	unset ASFLAGS
+
+	tc-ld-disable-gold # Bug 700374
+}
+
+src_compile() {
+	# Send raw LDFLAGS so that --as-needed works
+	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	# The 'make install' doesn't 'mkdir -p' the subdirs
+	if use efi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
+
+	emake LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" DESTDIR="${D}" -C xen ${myopt} install
+
+	# make install likes to throw in some extra EFI bits if it built
+	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide:"
+	elog " https://wiki.gentoo.org/wiki/Xen"
+
+	use efi && einfo "The efi executable is installed in /boot/efi/gentoo"
+
+	elog "You can optionally block the installation of /boot/xen-syms by an entry"
+	elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
+	elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
+
+	ewarn
+	ewarn "Xen 4.12+ changed the default scheduler to credit2 which can cause"
+	ewarn "domU lockups on multi-cpu systems. The legacy credit scheduler seems"
+	ewarn "to work fine."
+	ewarn
+	ewarn "Add sched=credit to xen command line options to use the legacy scheduler."
+	ewarn
+	ewarn "https://wiki.gentoo.org/wiki/Xen#Xen_domU_hanging_with_Xen_4.12.2B"
+}
diff --git a/app-emulation/xen/xen-4.14.1-r2.ebuild b/app-emulation/xen/xen-4.14.1-r2.ebuild
index fb4f1614c207..1c207fc9ecaf 100644
--- a/app-emulation/xen/xen-4.14.1-r2.ebuild
+++ b/app-emulation/xen/xen-4.14.1-r2.ebuild
@@ -10,7 +10,7 @@ inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
 MY_PV=${PV/_/-}
 MY_P=${PN}-${MY_PV}
 
-if [[ $PV == *9999 ]]; then
+if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
 	SRC_URI=""
diff --git a/app-emulation/xen/xen-4.14.1-r3.ebuild b/app-emulation/xen/xen-4.14.1-r3.ebuild
index 603655bdcde0..e3002595a4ce 100644
--- a/app-emulation/xen/xen-4.14.1-r3.ebuild
+++ b/app-emulation/xen/xen-4.14.1-r3.ebuild
@@ -10,7 +10,7 @@ inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
 MY_PV=${PV/_/-}
 MY_P=${PN}-${MY_PV}
 
-if [[ $PV == *9999 ]]; then
+if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
 	SRC_URI=""