Version bump.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

3 files changed, 87 insertions, 1 deletions

diff --git a/sys-process/criu/ChangeLog b/sys-process/criu/ChangeLog
index e8ce6c14f914..a0f0808a9d29 100644
--- a/sys-process/criu/ChangeLog
+++ b/sys-process/criu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-process/criu
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/criu/ChangeLog,v 1.7 2014/02/19 12:07:18 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/criu/ChangeLog,v 1.8 2014/03/01 05:40:30 radhermit Exp $
+
+*criu-1.2 (01 Mar 2014)
+
+  01 Mar 2014; Tim Harder <radhermit@gentoo.org> +criu-1.2.ebuild,
+  +files/criu-1.2-makefile.patch:
+  Version bump.
 
 *criu-1.1 (19 Feb 2014)
 
diff --git a/sys-process/criu/criu-1.2.ebuild b/sys-process/criu/criu-1.2.ebuild
new file mode 100644
index 000000000000..2cc64a39e720
--- /dev/null
+++ b/sys-process/criu/criu-1.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/criu/criu-1.2.ebuild,v 1.1 2014/03/01 05:40:30 radhermit Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs linux-info flag-o-matic
+
+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"
+
+RDEPEND="dev-libs/protobuf-c"
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	app-text/xmlto"
+
+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}"/${PN}-0.6-flags.patch
+	epatch "${FILESDIR}"/${P}-makefile.patch
+
+	# use raw ldflags for direct ld calls
+	sed -i "s/\$\$\?(LDFLAGS)/$(raw-ldflags)/" scripts/Makefile.build || die
+}
+
+src_compile() {
+	unset ARCH
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" V=1 WERROR=0 all docs
+}
+
+src_test() {
+	# root privileges are required to dump all necessary info
+	if [[ ${EUID} -eq 0 ]] ; then
+		emake -j1 CC="$(tc-getCC)" V=1 WERROR=0 test
+	fi
+}
+
+src_install() {
+	emake SYSCONFDIR="${EPREFIX}"/etc PREFIX="${EPREFIX}"/usr DESTDIR="${D}" install
+	dodoc CREDITS README
+}
diff --git a/sys-process/criu/files/criu-1.2-makefile.patch b/sys-process/criu/files/criu-1.2-makefile.patch
new file mode 100644
index 000000000000..784ed01db608
--- /dev/null
+++ b/sys-process/criu/files/criu-1.2-makefile.patch
@@ -0,0 +1,30 @@
+--- criu-1.2/Makefile
++++ criu-1.2/Makefile
+@@ -256,6 +256,7 @@
+ 	$(Q) mkdir -p $(DESTDIR)$(SYSTEMDUNITDIR)
+ 	$(Q) install -m 644 scripts/sd/criu.socket $(DESTDIR)$(SYSTEMDUNITDIR)
+ 	$(Q) install -m 644 scripts/sd/criu.service $(DESTDIR)$(SYSTEMDUNITDIR)
++	$(Q) mkdir -p $(DESTDIR)$(LOGROTATEDIR)
+ 	$(Q) install -m 644 scripts/logrotate.d/criu-service $(DESTDIR)$(LOGROTATEDIR)
+ 
+ install-man:
+--- criu-1.2/Makefile.inc
++++ criu-1.2/Makefile.inc
+@@ -15,15 +15,9 @@
+ SBINDIR		:= $(PREFIX)/sbin
+ MANDIR		:= $(PREFIX)/share/man
+ SYSTEMDUNITDIR	:= $(PREFIX)/lib/systemd/system/
+-LOGROTATEDIR	:= $(PREFIX)/etc/logrotate.d/
++LOGROTATEDIR	:= $(SYSCONFDIR)/logrotate.d/
+ LIBDIR		:= $(PREFIX)/lib
+-# 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)
+-# For most other systems
+-else ifeq "$(shell uname -m)" "x86_64"
++ifeq "$(shell uname -m)" "x86_64"
+ LIBDIR		:= $(PREFIX)/lib64
+ endif
+