sys-process/criu: version bump 2.1

Package-Manager: portage-2.2.28

3 files changed, 169 insertions, 0 deletions

diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 77aa45fcf8f2..8eb69291de74 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -2,3 +2,4 @@ DIST criu-1.6.1.tar.bz2 484598 SHA256 c74810383b7e524be0d909b9a6c1805e0887ac93cf
 DIST criu-1.7.2.tar.bz2 508012 SHA256 f5d377fd2a3c8824c592f6c27147cb4d37333ca0ce8b9c6e85a8b7cd8479b21d SHA512 3e35d90b8cd66b96df193b37907825fbf785eea332146c767b267cbda5b6e1ae6a0d5570945990e4288f6406d8507f6c33a792c5db232cbaf396342a65b53de3 WHIRLPOOL 164cbc9d6a4969e6116644bded88b9aec8a9bc0fb737e69eaacd641376db7d274598ff3647a912ab19155d4097de8a1eaa5ea82642b4f3ba93c01b4a6725493d
 DIST criu-1.8.tar.bz2 534200 SHA256 d1d6693d23181b1cd7378d77c142e41bcac3cb2ae5c71ea4c5b7de01f65575bb SHA512 de3f63613124606be08e5323f465c63811c35c457f4b1a311434aeb02590ebf652845b727b9e10b8a9eb9402c97e772ff044135bec7797cc6e4ad972efc9172d WHIRLPOOL 2f2d18f5fbd1608acfd6ce9e1283cf05a1574b2a141cd4cf29bcacc370ed0bfce488187e40250edeb396daf8fc38f2a2e960ffd8773511a82eebce3a74663e9f
 DIST criu-2.0.tar.bz2 548581 SHA256 e80726cc54f74751ae6f63a5b0cf9a2882ffc3fd2aa11b311da0384635d418ff SHA512 ebe785c3da9d54ba517254f7851f0283ccf3826cba30a07c6c74a7253f2d7235f32bb921623a23e6103a3c3e4461e1bc5dc06484270c8e25929c8e981a8b036f WHIRLPOOL 7999a2aeb40f9a932a8b1d11c842f78c710718f08ca1f29b373c69d34b82ebc7ab9b6a659460a058333d6591b64ef76215cdc2d70760cbd57c4d1444d9abe622
+DIST criu-2.1.tar.bz2 556820 SHA256 7a9fe6f2858a3086e652e17ffb85174f72cf19e87e776fc5ddab66013f16d4c4 SHA512 19fd57464a757a3b668ebf5ba70ea80d591d0df70a325ad5929408239f3439ef1cabe68367c778e386e5b818adf4fc4b98dccf729d2b5d656f12389e3f6d9439 WHIRLPOOL 4c193d96ff83ec08e8cb2de1ea1a2b11ceb6980d64cfc71bb2f9e1b518aa7b15ab7a2838fb2559aaa82c1e72378c5d0c5175bb437fff1040d0e95a60e5c8525c
diff --git a/sys-process/criu/criu-2.1.ebuild b/sys-process/criu/criu-2.1.ebuild
new file mode 100644
index 000000000000..40e9317daece
--- /dev/null
+++ b/sys-process/criu/criu-2.1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils toolchain-funcs linux-info flag-o-matic python-r1 python-utils-r1
+
+DESCRIPTION="utility to checkpoint/restore a process tree"
+HOMEPAGE="http://criu.org/"
+SRC_URI="http://download.openvz.org/criu/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE="python setproctitle"
+
+RDEPEND="dev-libs/protobuf-c
+	dev-libs/libnl:3
+	python? ( ${PYTHON_DEPS} )
+	setproctitle? ( dev-libs/libbsd )"
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	app-text/xmlto"
+RDEPEND="${RDEPEND}
+	python? (
+		dev-libs/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"
+
+RESTRICT="test"
+
+src_prepare() {
+	epatch "${FILESDIR}"/2.0/${PN}-2.0-flags.patch
+	epatch "${FILESDIR}"/${PV}/${P}-makefile.patch
+	epatch "${FILESDIR}"/2.0/${PN}-2.0-automagic-libbsd.patch
+	epatch "${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_compile() {
+	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) \
+		all docs
+}
+
+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)" \
+		install
+
+	dodoc CREDITS README.md
+
+	if use python ; then
+		cd lib
+		python_foreach_impl install_crit
+	fi
+}
diff --git a/sys-process/criu/files/2.1/criu-2.1-makefile.patch b/sys-process/criu/files/2.1/criu-2.1-makefile.patch
new file mode 100644
index 000000000000..fb316391aa60
--- /dev/null
+++ b/sys-process/criu/files/2.1/criu-2.1-makefile.patch
@@ -0,0 +1,75 @@
+diff --git a/Makefile.install b/Makefile.install
+index 6fcf25e..103373b 100644
+--- a/Makefile.install
++++ b/Makefile.install
+@@ -5,23 +5,10 @@ PREFIX		?= /usr/local
+ SBINDIR		?= $(PREFIX)/sbin
+ MANDIR		?= $(PREFIX)/share/man
+ SYSTEMDUNITDIR	?= $(PREFIX)/lib/systemd/system/
+-LOGROTATEDIR	?= $(PREFIX)/etc/logrotate.d/
++LOGROTATEDIR	?= $(SYSCONFDIR)/etc/logrotate.d/
+ LIBDIR		?= $(PREFIX)/lib
+ INCLUDEDIR	?= $(PREFIX)/include/criu
+ 
+-#
+-# For recent Debian/Ubuntu with multiarch support.
+-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null)
+-ifneq "$(DEB_HOST_MULTIARCH)" ""
+-        LIBDIR			?= $(PREFIX)/lib/$(DEB_HOST_MULTIARCH)
+-else
+-        #
+-        # For most other systems
+-        ifeq "$(shell uname -m)" "x86_64"
+-                LIBDIR		?= $(PREFIX)/lib64
+-        endif
+-endif
+-
+ export SBINDIR MANDIR SYSTEMDUNITDIR LOGROTATEDIR
+ export INCLUDEDIR LIBDIR DESTDIR PREFIX
+ 
+diff --git a/lib/Makefile b/lib/Makefile
+index f372a52..7312fcb 100644
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -21,8 +21,12 @@ lib-c: c/$(CRIU_SO)
+ #
+ # Python bindings.
+ lib-py:
++ifeq ($(PYCRIU),yes)
+ 	$(call msg-gen, $@)
+ 	$(Q) $(MAKE) -C py all
++else
++	$(Q) echo "no py criu"
++endif
+ .PHONY: lib-py
+ 
+ all: lib-c lib-py
+@@ -39,7 +43,7 @@ clean:
+ 	$(Q) $(RM) -r build usr
+ .PHONY: clean
+ 
+-install: lib-c lib-py ../crit/crit c/criu.pc.in
++install: lib-c ../crit/crit c/criu.pc.in
+ 	$(E) "  INSTALL " $(CRIU_SO)
+ 	$(Q) mkdir -p $(DESTDIR)$(LIBDIR)
+ 	$(Q) install -m 755 c/$(CRIU_SO) $(DESTDIR)$(LIBDIR)/$(CRIU_SO).$(CRIU_SO_VERSION_MAJOR).$(CRIU_SO_VERSION_MINOR)
+@@ -51,6 +55,4 @@ install: lib-c lib-py ../crit/crit c/criu.pc.in
+ 	$(Q) mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
+ 	$(Q) sed -e 's,@version@,$(CRIU_VERSION),' -e 's,@libdir@,$(LIBDIR),' -e 's,@includedir@,$(dir $(INCLUDEDIR)),' c/criu.pc.in > c/criu.pc
+ 	$(Q) install -m 644 c/criu.pc $(DESTDIR)$(LIBDIR)/pkgconfig
+-	$(E) "  INSTALL " crit
+-	$(Q) python ../scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX)
+ .PHONY: install
+diff --git a/scripts/nmk/scripts/build.mk b/scripts/nmk/scripts/build.mk
+index bd40944..3cfbffa 100644
+--- a/scripts/nmk/scripts/build.mk
++++ b/scripts/nmk/scripts/build.mk
+@@ -87,7 +87,7 @@ builtin-name	:= $(strip $(builtin-name))
+ 
+ #
+ # Link flags.
+-ld_flags	:= $(strip $(LDFLAGS) $(ldflags-y))
++ld_flags	:= $(strip $(RAW_LDFLAGS) $(ldflags-y))
+ 
+ #
+ # $(obj) related rules.