gentoo resync : 22.01.2019

3 files changed, 130 insertions, 2 deletions

diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index f4a6ecc3b771..1710f302c087 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -6,11 +6,13 @@ AUX 2.4/criu-2.4-makefile.patch 2497 BLAKE2B c9ea525b59aba01f6418ede5cd68fe02878
 AUX 2.5/criu-2.5-automagic-libbsd.patch 516 BLAKE2B d7d1f929dade8247b1d4999aab073cc27cb2f0e3823c589e2313df5d1bd55162e3c3a7cc6eadfe0929fe8e51a774017acbb4b1f1582c7f72221d1c3f354aaa60 SHA512 01f1a6ac36c8c40b2f0d4cecafb2783d7bf7be51af042710615aa79318ef7914cef063b437428c4c2c8b2dd02434abbec7affd3983b4da74aabe429b1ce947b6
 AUX criu-2.8-automagic-libbsd.patch 511 BLAKE2B afcda80c50a2ea0a74f3578c56b2dcfe1bbb3ff17dc88bb0ea7da16fa8db21e1adb5e2f85479459d079991f7d9f2b443881d9a8d07cae1b1b541ac5a691f37ac SHA512 d43280f988965dc6c7932767a896fa252234aefee99b85651d2d3ea0ffac7dd3fce60c067d9eb7c847ad941cb20eca68a118f77246d56831d083ba01aa8f037a
 DIST criu-2.5.tar.bz2 605226 BLAKE2B c4086b9822b119a648bda4f6cc831eba5b7e3fba5af41f8f0b1c00dac7d4aff88a71e81569c4559fd98113e76eba0653c67684f443c1c803c453209367a4c875 SHA512 ccf942005ff3b2a567726ddb8aa44048c130f1adf6e2cbdf48e919043c84a4e1c03ad0ec34b44263e5764bea62807a2cc0fa1135b929ad3166fb9486c2880570
+DIST criu-3.11.tar.bz2 809858 BLAKE2B 873502887a66ab5c9017b55d55ec2b391d0576e4c97f391bcd896041ac4f12f55ba40e9a9190e2a9cc802aa3c3280d68d26e9440507a5201194cbe6b1ff3661e SHA512 d201ca54b20512a4ad890c5081bbee5d1621e65bdf0a672a7a9b74a67cfdb8d451e566c32502eb8ed53c83826f8d5976a77ec451bdf667d89f8fa77c82663d1a
 DIST criu-3.6.tar.bz2 739437 BLAKE2B 0f128cf69a5a073df3abc736e3081b7d266573575c038a457fdf8adcdab668d957559f3b9a16606ff31871c3bf5e111349995c496c4236b5191340486814981f SHA512 5849024ac4660a5537ed37b6d98adf61d3f071e2a181d873a1f7ca6c4d00a4258445b4bc840e908d907bc34daf8a818450f54e6cdf4826a679e756c0cbc5d586
 DIST criu-3.7.tar.bz2 749499 BLAKE2B 41222983183910b8a039a69e1a425993703e4f461c1cc0e64e92f877aff571d56c7f32cdae7848ef1633a15cac9e7b746f8c84a71f3607f7fc22959964820258 SHA512 8feb9e2579c04b67a7fe9631bb662504a7eb78550c3951cbe29252d87d9258fd6994533f6e60b0017b6a6e21bbdd5e7cd7e8a255be53b77b57efacec4e50140f
 DIST criu-3.9.tar.bz2 772167 BLAKE2B 7c781acc9d6353a4e32c5daa9606332030d4c99d10c00d7f1c59beb54c1bc4cfb2ca0eea0663caa5ef936de436ac2efadf8c6b01a55e06905bd5a7fb91cf29e8 SHA512 875a4bfb809d7b479bb6357a4e114f2f5caaaf2940019a41cc6494fd90025d72b5fc4129be89eef1b9f62a5358eb96509fd15a33b64fe2b8f7f805dc8110b994
 EBUILD criu-2.5-r1.ebuild 2342 BLAKE2B 9e6707f582403bc60ae035e5c6197a786dca87277cfd2013ca593b666708f270d9d644e1a481738b9936b890823ec488fa7ebdaae8c8338a6f7cb27fa2e51c62 SHA512 9b6cf63124c3e10d79ee548f8b909520dfe424509768d4ee2c873e4011c8915fc2cfe3019d7aa147e05f9e57b2c2cf1900d06a76153be7446280022f12dfd014
+EBUILD criu-3.11.ebuild 2916 BLAKE2B e25e06379c1056adf33c0172f59bbc335fc0dc4b3b3a170e9a8fd2c3119b8a33911b987205743af750db106d409ac4d6cfd1c800e62743168e3c75c37b27d28d SHA512 f3844e81b27675fb686445f3cf6809d9ba7b6586064d448f39d51b5206e49bbb18597f9d2faa8238022480eaabe1c7f8b5467a8ece6753f4953b241c937ba4b0
 EBUILD criu-3.6.ebuild 2536 BLAKE2B 72958629ad1b82af05194890c8de5ac7f09558d98b9d54ef7edd29afc4d9c5dc58122209d515b61de13eb8d036b8222f5670fccfde321c96f1d5a536a63619ba SHA512 e1f212536f091c4d87c92b30440dc67734d15c453471389f057d94594c17f79e2b1ad3a21f9c138009d3aa84546206ffedbe5e4238a691b71132d41f38f5dad3
 EBUILD criu-3.7.ebuild 2731 BLAKE2B 56f4cc2ae30e2b63114da6377c6b8cbe2597ec3406340796d4a60a90faa16be07c8db8d9e3f7038898f0fe7c3911b5df7260561fcbe7fa0c42267ca4d52c8ca6 SHA512 748b92a6dc5e4453cbb91656db75257376ee016909324cbd3982d8c2087b58857c7236a4159bdb46711aacb32779eaef4675deb847b97023fbf77614bd3ebc39
-EBUILD criu-3.9.ebuild 2894 BLAKE2B 744ce1f3784854ec89265532bc7805a2a728d43c296953b45e11df6e600877088cebc554050fd0f113d73eb6f711259bfe4ca0118bb4506a6bd446b89f108c3d SHA512 012799dc23ea084a5fcb1afee6c94e211bee9682485729b54311a04447248712d77e63682f8c03775db19cee9cebf50fc7e3fd8595e588b8cecbeff5ef1850d4
+EBUILD criu-3.9.ebuild 2916 BLAKE2B e25e06379c1056adf33c0172f59bbc335fc0dc4b3b3a170e9a8fd2c3119b8a33911b987205743af750db106d409ac4d6cfd1c800e62743168e3c75c37b27d28d SHA512 f3844e81b27675fb686445f3cf6809d9ba7b6586064d448f39d51b5206e49bbb18597f9d2faa8238022480eaabe1c7f8b5467a8ece6753f4953b241c937ba4b0
 MISC metadata.xml 480 BLAKE2B 55ce3f89b53789b3ed3e9a19fd4dbf3184941572269b3ef489c3cbbef8bac8a3aac58ea84887ac0c99919797e74c289ffaa617fc8370f936c9c34c27b976ace1 SHA512 0a108eed5d8cdb1818b9c497377b3a83b282354c9402f1ee6473df4eca6ab75f508b3faba55a88007ca225238ac0c00fa1c0d845fdd4c98556f1c03b6f33a764
diff --git a/sys-process/criu/criu-3.11.ebuild b/sys-process/criu/criu-3.11.ebuild
new file mode 100644
index 000000000000..09d8af6c2b81
--- /dev/null
+++ b/sys-process/criu/criu-3.11.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit toolchain-funcs linux-info flag-o-matic python-r1 python-utils-r1
+
+DESCRIPTION="utility to checkpoint/restore a process tree"
+HOMEPAGE="https://criu.org/"
+SRC_URI="https://download.openvz.org/criu/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE="doc python selinux setproctitle static-libs"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/protobuf-c
+	dev-libs/libnl:3
+	net-libs/libnet:1.1
+	sys-libs/libcap
+	python? ( ${PYTHON_DEPS} )
+	selinux? ( sys-libs/libselinux )
+	setproctitle? ( dev-libs/libbsd )"
+DEPEND="${RDEPEND}
+	doc? (
+		app-text/asciidoc
+		app-text/xmlto
+	)"
+RDEPEND="${RDEPEND}
+	python? (
+		dev-python/protobuf-python[${PYTHON_USEDEP}]
+		dev-python/ipaddr[${PYTHON_USEDEP}]
+	)"
+
+CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER
+	~IA32_EMULATION ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG ~TUN
+	~NETFILTER_XT_MARK"
+
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/2.2/${PN}-2.2-flags.patch
+	"${FILESDIR}"/2.3/${PN}-2.3-no-git.patch
+	"${FILESDIR}"/${PN}-2.8-automagic-libbsd.patch
+	"${FILESDIR}"/2.0/${PN}-2.0-sysroot.patch
+)
+
+criu_arch() {
+	# criu infers the arch from $(uname -m).  We never want this to happen.
+	case ${ARCH} in
+	amd64) echo "x86";;
+	arm64) echo "aarch64";;
+	*)     echo "${ARCH}";;
+	esac
+}
+
+src_prepare() {
+	default
+
+	if ! use selinux; then
+		sed \
+			-e 's:libselinux:no_libselinux:g' \
+			-i Makefile.config || die
+	fi
+
+	use doc || sed -i 's_\(install: \)install-man _\1_g' Makefile.install
+}
+
+src_configure() {
+	# Gold linker generates invalid object file when used with criu's custom
+	# linker script.  Use the bfd linker instead. See https://crbug.com/839665#c3
+	tc-ld-disable-gold
+}
+
+src_compile() {
+	local target="all $(usex doc 'docs' '')"
+	RAW_LDFLAGS="$(raw-ldflags)" emake \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getLD)" \
+		OBJCOPY="$(tc-getOBJCOPY)" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		ARCH="$(criu_arch)" \
+		V=1 WERROR=0 DEBUG=0 \
+		SETPROCTITLE=$(usex setproctitle) \
+		PYCRIU=$(usex python) \
+		${target}
+}
+
+src_test() {
+	# root privileges are required to dump all necessary info
+	if [[ ${EUID} -eq 0 ]] ; then
+		emake -j1 CC="$(tc-getCC)" ARCH="$(criu_arch)" V=1 WERROR=0 test
+	fi
+}
+
+install_crit() {
+	"${PYTHON:-python}" ../scripts/crit-setup.py install --root="${D}" --prefix="${EPREFIX}/usr/"
+}
+
+src_install() {
+	emake \
+		ARCH="$(criu_arch)" \
+		PREFIX="${EPREFIX}"/usr \
+		LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \
+		DESTDIR="${D}" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		V=1 WERROR=0 DEBUG=0 \
+		install
+
+	use doc && dodoc CREDITS README.md
+
+	if use python ; then
+		cd lib
+		python_foreach_impl install_crit
+	fi
+
+	if ! use static-libs; then
+		find "${D}" -name "*.a" -delete || die
+	fi
+}
diff --git a/sys-process/criu/criu-3.9.ebuild b/sys-process/criu/criu-3.9.ebuild
index 523a1b1c4e52..09d8af6c2b81 100644
--- a/sys-process/criu/criu-3.9.ebuild
+++ b/sys-process/criu/criu-3.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -109,6 +109,7 @@ src_install() {
 		LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \
 		DESTDIR="${D}" \
 		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		V=1 WERROR=0 DEBUG=0 \
 		install
 
 	use doc && dodoc CREDITS README.md